Update release-information

This change depends on a change to the markdown library. Specifically,
the parser's InsideLink must be public.

This means that the #like_this hashtag from the README.md in the
source directory is no longer available, so that test had to be
rewritten.

Another change to reduce the number of false hashtags was to use the
hashtag parser for all situations: It's also used to identify hashtags
in the search query string. The parser doesn't automatically turn the
matches to lower-case, however, so that has to be done when indexing
documents and when searching for hashtags.

The hashtags command for the commandline no longer prints a hash for
all the tags.

.gitignore

@@ -1,3 +1,7 @@
-/oddmu
 test.md
 /testdata/
+/oddmu-darwin-*
+/oddmu-linux-*
+/oddmu-windows-*
+/oddmu.exe
+/oddmu

Makefile

@@ -51,7 +51,7 @@ clean:
 	rm --force oddmu oddmu.exe oddmu-{linux,darwin,windows}-{amd64,arm64}{,.tar.gz}
 	cd man && make clean
 
-dist: oddmu-linux-amd64.tar.gz oddmu-linux-arm64 oddmu-darwin-amd64.tar.gz oddmu-windows-amd64.tar.gz
+dist: oddmu-linux-amd64.tar.gz oddmu-linux-arm64.tar.gz oddmu-darwin-amd64.tar.gz oddmu-windows-amd64.tar.gz
 
 oddmu-linux-amd64: *.go
 	GOOS=linux GOARCH=amd64 go build -o $@

README.md

@@ -138,6 +138,10 @@ edit.
 This man page documents how to setup a systemd unit and have it manage
 Oddmu. “Great configurability brings great burdens.”
 
+[oddmu-webdav(5)](https://alexschroeder.ch/view/oddmu/oddmu-webdav.5):
+This man page documents how to set up the Apache web server so that
+the wiki can be accessed via Web-DAV.
+
 Leaving:
 
 [oddmu-export(1)](https://alexschroeder.ch/view/oddmu/oddmu-export.1):
@@ -205,9 +209,9 @@ into `$HOME/.local/share/man/`.
 make install
 ```
 
-To install it elsewhere, here's an example using [GNU
-Stow](https://www.gnu.org/software/stow/) to install it into
-`/usr/local/stow` in a way that allows you to uninstall it later:
+Here's an example using [GNU Stow](https://www.gnu.org/software/stow/)
+to install it into `/usr/local/stow` in a way that allows you to
+uninstall it later:
 
 ```sh
 sudo mkdir /usr/local/stow/oddmu
@@ -238,6 +242,7 @@ high-level introduction to the various source files.
   search results
 - `index.go` implements the index of all the hashtags
 - `languages.go` implements the language detection
+- `list.go` implements the file list page
 - `page.go` implements the page loading and saving
 - `parser.go` implements the Markdown parsing
 - `preview.go` implements the `/preview` handler
@@ -307,6 +312,20 @@ to Oddmu, or you can require authentication for certain actions.
 Furthermore, you can do the same for directories, allowing you to use
 subdirectories as separate sites, each with their own editors.
 
+### Templates
+
+The `themes` folder has some ideas of how to tweak the HTML templates.
+
+### Permissions
+
+An unexplored idea would be to parse a config file that has usernames
+and passwords, groups usernames into roles, and assigns access to the
+various actions based on these roles. This would obviate the need for
+a web server acting as a reverse proxy.
+
+Then again, not having to care about roles and permissions has been a
+relief.
+
 ## Dependencies
 
 This section lists the non-standard libraries Oddmu uses and their

RELEASE

@@ -4,6 +4,8 @@ When preparing a new release
 1. Run tests
 
 2. Update man/oddmu-releases.7.txt
+   - add missing items
+   - change "(unreleased)"
 
 3. make docs
 

diff_test.go

@@ -70,6 +70,7 @@ I hate the machine!`
 I shiver at home
 the monitor glares and moans
 my grey heart grows cold`
+	// create s and overwrite it with r
 	p := &Page{Name: "testdata/backup/cold", Body: []byte(s)}
 	p.save()
 	p = &Page{Name: "testdata/backup/cold", Body: []byte(r)}
@@ -78,19 +79,29 @@ my grey heart grows cold`
 	// diff from s to r:
 	assert.Contains(t, body, `<del>fear or cold, who knows?</del>`)
 	assert.Contains(t, body, `<ins>I hate the machine!</ins>`)
+	// save u
 	p = &Page{Name: "testdata/backup/cold", Body: []byte(u)}
 	p.save()
 	body = string(p.Diff())
-	// diff from s to u since r was not 60 min or older
+	// diff from s to u since r was not 60 min or older and so the backup is kept
 	assert.Contains(t, body, `<del>fear or cold, who knows?</del>`)
 	assert.Contains(t, body, `<ins>my grey heart grows cold</ins>`)
 	// set timestamp 2h in the past
 	ts := time.Now().Add(-2 * time.Hour)
 	assert.NoError(t, os.Chtimes("testdata/backup/cold.md~", ts, ts))
+	assert.NoError(t, os.Chtimes("testdata/backup/cold.md", ts, ts))
+	// save r
 	p = &Page{Name: "testdata/backup/cold", Body: []byte(r)}
 	p.save()
 	body = string(p.Diff())
-	// diff from u to r:
+	// diff from u to r since enough time has passed and the old backup is discarded
 	assert.Contains(t, body, `<del>my grey heart grows cold</del>`)
 	assert.Contains(t, body, `<ins>I hate the machine!</ins>`)
+	// save s
+	p = &Page{Name: "testdata/backup/cold", Body: []byte(s)}
+	p.save()
+	body = string(p.Diff())
+	// diff from u to s since this is still "the same" editing window
+	assert.Contains(t, body, `<del>my grey heart grows cold</del>`)
+	assert.Contains(t, body, `<ins>fear or cold, who knows?</ins>`)
 }

edit.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
     <meta name="viewport" content="width=device-width">
+    <base href="/view/{{.Dir}}">
     <title>Editing {{.Title}}</title>
     <style>
 html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe; }

go.mod

@@ -9,7 +9,8 @@ require (
 	github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gabriel-vasile/mimetype v1.4.3
-	github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6
+	github.com/gen2brain/heic v0.3.1
+	github.com/gomarkdown/markdown v0.0.0-20250207164621-7a1f277a159e
 	github.com/google/subcommands v1.2.0
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/microcosm-cc/bluemonday v1.0.26
@@ -24,7 +25,6 @@ require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/ebitengine/purego v0.7.1 // indirect
-	github.com/gen2brain/heic v0.3.1 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -13,12 +13,12 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/gen2brain/heic v0.0.0-20230113233934-ca402e77a786 h1:zvgtcRb2B5gynWjm+Fc9oJZPHXwmcgyH0xCcNm6Rmo4=
-github.com/gen2brain/heic v0.0.0-20230113233934-ca402e77a786/go.mod h1:aKVJoQ0cc9K5Xb058XSnnAxXLliR97qbSqWBlm5ca1E=
 github.com/gen2brain/heic v0.3.1 h1:ClY5YTdXdIanw7pe9ZVUM9XcsqH6CCCa5CZBlm58qOs=
 github.com/gen2brain/heic v0.3.1/go.mod h1:m2sVIf02O7wfO8mJm+PvE91lnq4QYJy2hseUon7So10=
-github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 h1:ZPy+2XJ8u0bB3sNFi+I72gMEMS7MTg7aZCCXPOjV8iw=
-github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/gomarkdown/markdown v0.0.0-20240930133403-7e0a027d98c5 h1:qIhG9h8tUzKsVHn0iHtWUohq7Ve7btgA8rGp7TvrIHw=
+github.com/gomarkdown/markdown v0.0.0-20240930133403-7e0a027d98c5/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/gomarkdown/markdown v0.0.0-20250207164621-7a1f277a159e h1:ESHlT0RVZphh4JGBz49I5R6nTdC8Qyc08vU25GQHzzQ=
+github.com/gomarkdown/markdown v0.0.0-20250207164621-7a1f277a159e/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
@@ -66,8 +66,6 @@ golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

hashtags_cmd_test.go

@@ -8,9 +8,18 @@ import (
 )
 
 func TestHashtagsCmd(t *testing.T) {
+	cleanup(t, "testdata/hashtag")
+	p := &Page{Name: "testdata/hashtag/hash", Body: []byte(`# Hash
+
+I hope for a time
+not like today, relentless,
+just crocus blooming
+
+#Crocus`)}
+	p.save()
 	b := new(bytes.Buffer)
 	s := hashtagsCli(b)
 	assert.Equal(t, subcommands.ExitSuccess, s)
 	x := b.String()
-	assert.Contains(t, x, "#like_this\t")
+	assert.Contains(t, x, "crocus\t")
 }

index.go

@@ -62,10 +62,12 @@ func (idx *indexStore) reset() {
 }
 
 // addDocument adds the text as a new document. This assumes that the index is locked!
+// The hashtags (only!) are used as tokens. They are stored in lower case.
 func (idx *indexStore) addDocument(text []byte) docid {
 	id := idx.next_id
 	idx.next_id++
 	for _, token := range hashtags(text) {
+		token = strings.ToLower(token)
 		ids := idx.token[token]
 		// Don't add same ID more than once. Checking the last
 		// position of the []docid works because the id is
@@ -193,8 +195,8 @@ func (idx *indexStore) update(p *Page) {
 	idx.add(p)
 }
 
-// search searches the index for a query string and returns page
-// names.
+// search searches the index. The query string is parsed for tokens. Each token is turned to lower cased and looked up
+// in the index. Each page in the result must contain all the tokens. Returns page names.
 func (idx *indexStore) search(q string) []string {
 	idx.RLock()
 	defer idx.RUnlock()
@@ -203,6 +205,7 @@ func (idx *indexStore) search(q string) []string {
 	if len(hashtags) > 0 {
 		var r []docid
 		for _, token := range hashtags {
+			token = strings.ToLower(token)
 			if ids, ok := idx.token[token]; ok {
 				if r == nil {
 					r = ids

index_test.go

@@ -11,8 +11,8 @@ func TestIndexAdd(t *testing.T) {
 	idx.reset()
 	idx.Lock()
 	defer idx.Unlock()
-	tag := "#hello"
-	id := idx.addDocument([]byte("oh hi " + tag))
+	tag := "hello"
+	id := idx.addDocument([]byte("oh hi #" + tag))
 	assert.Contains(t, idx.token, tag)
 	idx.deleteDocument(id)
 	assert.NotContains(t, idx.token, tag)
@@ -31,10 +31,19 @@ func TestIndex(t *testing.T) {
 	}
 }
 
+// Lower case hashtag!
 func TestSearchHashtag(t *testing.T) {
+	cleanup(t, "testdata/search-hashtag")
+	p := &Page{Name: "testdata/search-hashtag/search", Body: []byte(`# Search
+
+I'm back in this room
+Shelf, table, chair, and shelf again
+Where are my glasses?
+
+#Searching`)}
+	p.save()
 	index.load()
-	q := "#like_this"
-	pages, _ := search(q, "", "", 1, false)
+	pages, _ := search("#searching", "", "", 1, false)
 	assert.NotZero(t, len(pages))
 }
 

list.go

@@ -0,0 +1,102 @@
+package main
+
+import (
+	"io/fs"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+// ListItem is used to display the list of files.
+type File struct {
+	Name, Title string
+	IsDir, IsUp bool
+	// Date is the last modification date of the file storing the page. As the pages used by Oddmu are plain
+	// Markdown files, they don't contain any metadata. Instead, the last modification date of the file is used.
+	// This makes it work well with changes made to the files outside of Oddmu.
+	Date string
+}
+
+type List struct {
+	Dir string
+	Files []File
+}
+
+// listHandler uses the "list.html" template to enable file management in a particular directory.
+func listHandler(w http.ResponseWriter, r *http.Request, dir string) {
+	files := []File{}
+	d := filepath.FromSlash(dir)
+	if d == "" {
+		d = "."
+	} else if !strings.HasSuffix(d, "/") {
+		http.Redirect(w, r, "/list/"+d+"/", http.StatusFound)
+		return
+	} else {
+		it := File{Name: "..", IsUp: true, IsDir: true }
+		files = append(files, it)
+	}
+	err := filepath.Walk(d, func (path string, fi fs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		isDir := false
+		if fi.IsDir() {
+			if d == path {
+				return nil
+			}
+			isDir = true
+		}
+		name := filepath.ToSlash(path)
+		base := filepath.Base(name)
+		title := ""
+		if !isDir && strings.HasSuffix(name, ".md") {
+			index.RLock()
+			defer index.RUnlock()
+			title = index.titles[name[:len(name)-3]]
+		}
+		if isDir {
+			base += "/"
+		}
+		it := File{Name: base, Title: title, Date: fi.ModTime().Format(time.DateTime), IsDir: isDir }
+		files = append(files, it)
+		if isDir {
+			return filepath.SkipDir
+		}
+		return nil
+	})
+	if err != nil {
+		log.Println(err)
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	renderTemplate(w, dir, "list", &List{Dir: dir, Files: files})
+}
+
+
+// deleteHandler deletes the named file and then redirects back to the list
+func deleteHandler(w http.ResponseWriter, r *http.Request, path string) {
+	fn := filepath.Clean(filepath.FromSlash(path))
+	err := os.RemoveAll(fn) // and all its children!
+	if err != nil {
+		log.Println(err)
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	http.Redirect(w, r, "/list/"+filepath.Dir(fn)+"/", http.StatusFound)
+}
+
+// renameHandler renames the named file and then redirects back to the list
+func renameHandler(w http.ResponseWriter, r *http.Request, path string) {
+	fn := filepath.Clean(filepath.FromSlash(path))
+	target := filepath.Join(filepath.Dir(fn), r.FormValue("name"))
+	err := os.Rename(fn, target)
+	if err != nil {
+		log.Println(err)
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	http.Redirect(w, r, "/list/"+filepath.Dir(target)+"/", http.StatusFound)
+}

list.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport" content="width=device-width">
+    <title>Manage Files</title>
+    <style>
+html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe }
+body { hyphens: auto }
+form { width: 100% }
+table { border-collapse: collapse }
+th:nth-child(3) { max-width: 3ex; overflow: visible }
+td form { display: inline }
+td { padding-right: 1ch }
+td:last-child { padding-right: 0 }
+td:first-child { max-width: 30ch; overflow: hidden }
+tr:nth-child(odd) { background-color: #eed }
+td:first-child, td:last-child { white-space: nowrap }
+    </style>
+  </head>
+  <body lang="en">
+    <header>
+      <a href="#main">Skip navigation</a>
+      <a href="/view/index">Home</a>
+      <a href="/archive/{{.Dir}}data.zip" accesskey="z">Zip</a>
+      <a href="/upload/{{.Dir}}?filename=image-1.jpg" accesskey="u">Upload</a>
+      <form role="search" action="/search/{{.Dir}}" method="GET">
+        <label for="search">Search:</label>
+        <input id="search" type="text" spellcheck="false" name="q" accesskey="f" placeholder="term #tag title:term blog:true" required>
+        <button>Go</button>
+      </form>
+    </header>
+    <main>
+      <h1>Manage Files</h1>
+      <form id="manage">
+        <p><mark>Deletions and renamings take effect immediately and there is no undo!</mark></p>
+      </form>
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Title</th>
+          <th>Delete</th>
+          <th>Rename</th>
+        </tr>{{range .Files}}
+        <tr>
+          <td>{{if .IsDir}}<a href="/list/{{$.Dir}}{{.Name}}">{{.Name}}</a>{{else}}<a href="/view/{{$.Dir}}{{.Name}}">{{.Name}}</a>{{end}}</td>
+          <td>{{.Title}}</td>
+          <td>{{if .IsUp}}{{else}}<button form="manage" formaction="/delete/{{$.Dir}}{{.Name}}" title="Delete {{.Name}}">🗑</button>{{end}}</td>
+          <td>{{if .IsUp}}{{else}}
+            <form action="/rename/{{$.Dir}}{{.Name}}">
+              <input name="name" placeholder="New name"/>
+              <button title="Rename {{.Name}}">♺</button>
+            </form>{{end}}</td>
+        </tr>{{end}}
+      </table>
+    </main>
+  </body>
+</html>

list_test.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
+)
+
+// relies on index.md in the current directory!
+func TestListHandler(t *testing.T) {
+	assert.Contains(t,
+		assert.HTTPBody(makeHandler(listHandler, false), "GET", "/list/", nil),
+		"index.md")
+}
+
+func TestDeleteHandler(t *testing.T) {
+	cleanup(t, "testdata/delete")
+	assert.NoError(t, os.Mkdir("testdata/delete", 0755))
+	p := &Page{Name: "testdata/delete/haiku", Body: []byte(`# Sunset
+
+Walk the fields outside
+See the forest loom above
+And an orange sky
+`)}
+	p.save()
+	list := assert.HTTPBody(makeHandler(listHandler, false), "GET", "/list/testdata/delete/", nil)
+	assert.Contains(t, list, `<a href="/view/testdata/delete/haiku.md">haiku.md</a>`)
+	assert.Contains(t, list, `<td>Sunset</td>`)
+	assert.Contains(t, list, `<button form="manage" formaction="/delete/testdata/delete/haiku.md" title="Delete haiku.md">`)
+}

man/oddmu-apache.5

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-APACHE" "5" "2024-05-09"
+.TH "ODDMU-APACHE" "5" "2024-09-25"
 .PP
 .SH NAME
 .PP
@@ -48,7 +48,7 @@ ServerAdmin alex@alexschroeder\&.ch
 <VirtualHost *:443>
   ServerName transjovian\&.org
   SSLEngine on
-  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(\&.*))?$" 
+  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(\&.*))?$" 
                  "http://localhost:8080/$1"
 </VirtualHost>
 .fi
@@ -126,13 +126,13 @@ ServerAdmin alex@alexschroeder\&.ch
   ServerName transjovian\&.org
   ProxyPassMatch "^/((view|diff|search|archive)/(\&.*))?$" 
                  "http://localhost:8080/$1"
-  RedirectMatch  "^/((edit|save|add|append|upload|drop)/(\&.*))?$" 
+  RedirectMatch  "^/((edit|save|add|append|upload|drop|list|delete|rename)/(\&.*))?$" 
                  "https://transjovian\&.org/$1"
 </VirtualHost>
 <VirtualHost *:443>
   ServerName transjovian\&.org
   SSLEngine on
-  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(\&.*))?$" 
+  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(\&.*))?$" 
                  "http://localhost:8080/$1"
 </VirtualHost>
 .fi
@@ -170,7 +170,7 @@ In that case, you need to use the ProxyPassMatch directive.\&
 .PP
 .nf
 .RS 4
-ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(\&.*))?$" 
+ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(\&.*))?$" 
                "unix:/run/oddmu/oddmu\&.sock|http://localhost/$1"
 .fi
 .RE
@@ -189,7 +189,7 @@ A workaround is to add the redirect manually and drop the question-mark:
 .nf
 .RS 4
 RedirectMatch "^/$" "/view/index"
-ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(\&.*))$" 
+ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(\&.*))$" 
                "unix:/run/oddmu/oddmu\&.sock|http://localhost/$1"
 .fi
 .RE
@@ -234,12 +234,12 @@ htpasswd -D \&.htpasswd berta
 .RE
 .PP
 Modify your site configuration and protect the "/edit/", "/save/", "/add/",
-"/append/", "/upload/" and "/drop/" URLs with a password by adding the following
-to your "<VirtualHost *:443>" section:
+"/append/", "/upload/", "/drop/", "/list/", "/delete/" and "/rename/" URLs with
+a password by adding the following to your "<VirtualHost *:443>" section:
 .PP
 .nf
 .RS 4
-<LocationMatch "^/(edit|save|add|append|upload|drop)/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename)/">
   AuthType Basic
   AuthName "Password Required"
   AuthUserFile /home/oddmu/\&.htpasswd
@@ -263,10 +263,10 @@ expression, all directories matching the regular expression are excluded.\& See
 .PP
 In the following example, ODDMU_FILTER is set to "^secret/".\&
 .PP
-http://transjovian.\&org/search/index?\&q=something does not search the "secret/"
+"http://transjovian.\&org/search/index?\&q=something" does not search the "secret/"
 directory and its subdirectories are excluded.\&
 .PP
-http://transjovian.\&org/search/secret/index?\&q=something searches just the
+"http://transjovian.\&org/search/secret/index?\&q=something" searches just the
 "secret" directory and its subdirectories.\&
 .PP
 You need to configure the web server to prevent access to the "secret/"
@@ -274,7 +274,7 @@ directory:
 .PP
 .nf
 .RS 4
-<LocationMatch "^/(edit|save|add|append|upload|drop|(view|preview|search|archive)/secret)/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename|(view|preview|search|archive)/secret)/">
   AuthType Basic
   AuthName "Password Required"
   AuthUserFile /home/oddmu/\&.htpasswd
@@ -300,8 +300,9 @@ DocumentRoot /home/oddmu
 .PP
 Make sure that none of the subdirectories look like the wiki paths "/view/",
 "/diff/", "/edit/", "/save/", "/add/", "/append/", "/upload/", "/drop/",
-"/search/" or "/archive/".\& For example, create a file called "robots.\&txt"
-containing the following, telling all robots that they'\&re not welcome.\&
+"/list", "/delete/", "/rename/" "/search/" or "/archive/".\& For example, create a
+file called "robots.\&txt" containing the following, telling all robots that
+they'\&re not welcome.\&
 .PP
 .nf
 .RS 4
@@ -349,7 +350,7 @@ This requires a valid login by the user "alex" or "berta":
 .PP
 .nf
 .RS 4
-<LocationMatch "^/(edit|save|add|append|upload|drop)/intetebi/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename)/intetebi/">
   Require user alex berta
 </LocationMatch>
 .fi

man/oddmu-apache.5.txt

@@ -40,7 +40,7 @@ ServerAdmin alex@alexschroeder.ch
 <VirtualHost *:443>
   ServerName transjovian.org
   SSLEngine on
-  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(.*))?$" \
+  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(.*))?$" \
                  "http://localhost:8080/$1"
 </VirtualHost>
 ```
@@ -106,13 +106,13 @@ ServerAdmin alex@alexschroeder.ch
   ServerName transjovian.org
   ProxyPassMatch "^/((view|diff|search|archive)/(.*))?$" \
                  "http://localhost:8080/$1"
-  RedirectMatch  "^/((edit|save|add|append|upload|drop)/(.*))?$" \
+  RedirectMatch  "^/((edit|save|add|append|upload|drop|list|delete|rename)/(.*))?$" \
                  "https://transjovian.org/$1"
 </VirtualHost>
 <VirtualHost *:443>
   ServerName transjovian.org
   SSLEngine on
-  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(.*))?$" \
+  ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(.*))?$" \
                  "http://localhost:8080/$1"
 </VirtualHost>
 ```
@@ -144,7 +144,7 @@ You probably want to serve some static files as well (see *Serve static files*).
 In that case, you need to use the ProxyPassMatch directive.
 
 ```
-ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(.*))?$" \
+ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(.*))?$" \
                "unix:/run/oddmu/oddmu.sock|http://localhost/$1"
 ```
 
@@ -159,7 +159,7 @@ A workaround is to add the redirect manually and drop the question-mark:
 
 ```
 RedirectMatch "^/$" "/view/index"
-ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive)/(.*))$" \
+ProxyPassMatch "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/(.*))$" \
                "unix:/run/oddmu/oddmu.sock|http://localhost/$1"
 ```
 
@@ -197,11 +197,11 @@ htpasswd -D .htpasswd berta
 ```
 
 Modify your site configuration and protect the "/edit/", "/save/", "/add/",
-"/append/", "/upload/" and "/drop/" URLs with a password by adding the following
-to your "<VirtualHost \*:443>" section:
+"/append/", "/upload/", "/drop/", "/list/", "/delete/" and "/rename/" URLs with
+a password by adding the following to your "<VirtualHost \*:443>" section:
 
 ```
-<LocationMatch "^/(edit|save|add|append|upload|drop)/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename)/">
   AuthType Basic
   AuthName "Password Required"
   AuthUserFile /home/oddmu/.htpasswd
@@ -224,17 +224,17 @@ _oddmu-filter_(7).
 
 In the following example, ODDMU_FILTER is set to "^secret/".
 
-http://transjovian.org/search/index?q=something does not search the "secret/"
+"http://transjovian.org/search/index?q=something" does not search the "secret/"
 directory and its subdirectories are excluded.
 
-http://transjovian.org/search/secret/index?q=something searches just the
+"http://transjovian.org/search/secret/index?q=something" searches just the
 "secret" directory and its subdirectories.
 
 You need to configure the web server to prevent access to the "secret/"
 directory:
 
 ```
-<LocationMatch "^/(edit|save|add|append|upload|drop|(view|preview|search|archive)/secret)/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename|(view|preview|search|archive)/secret)/">
   AuthType Basic
   AuthName "Password Required"
   AuthUserFile /home/oddmu/.htpasswd
@@ -257,8 +257,9 @@ DocumentRoot /home/oddmu
 
 Make sure that none of the subdirectories look like the wiki paths "/view/",
 "/diff/", "/edit/", "/save/", "/add/", "/append/", "/upload/", "/drop/",
-"/search/" or "/archive/". For example, create a file called "robots.txt"
-containing the following, telling all robots that they're not welcome.
+"/list", "/delete/", "/rename/" "/search/" or "/archive/". For example, create a
+file called "robots.txt" containing the following, telling all robots that
+they're not welcome.
 
 ```
 User-agent: *
@@ -268,8 +269,8 @@ Disallow: /
 Your site now serves "/robots.txt" without interfering with the wiki, and
 without needing a wiki page.
 
-Another option would be to create a CSS file and use it with a <link> element in
-all the templates instead of relying on the <style> element.
+Another option would be to create a CSS file and use it with a \<link\> element in
+all the templates instead of relying on the \<style\> element.
 
 The "view.html" template would start as follows:
 
@@ -301,7 +302,7 @@ password file mentioned above.
 This requires a valid login by the user "alex" or "berta":
 
 ```
-<LocationMatch "^/(edit|save|add|append|upload|drop)/intetebi/">
+<LocationMatch "^/(edit|save|add|append|upload|drop|list|delete|rename)/intetebi/">
   Require user alex berta
 </LocationMatch>
 ```
@@ -344,10 +345,10 @@ https://httpd.apache.org/docs/current/mod/mod_proxy.html
 "Robot exclusion standard" on Wikipedia.
 https://en.wikipedia.org/wiki/Robot_exclusion_standard
 
-"<style>: The Style Information element"
+"\<style\>: The Style Information element"
 https://developer.mozilla.org/en-US/docs/Web/HTML/Element/style
 
-"<link>: The External Resource Link element"
+"\<link\>: The External Resource Link element"
 https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link
 
 # AUTHORS

man/oddmu-export.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-EXPORT" "1" "2024-08-16"
+.TH "ODDMU-EXPORT" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -33,7 +33,7 @@ XML preamble is printed and appropriate escaping rules are used.\&
 .PP
 By default, the export uses the \fB\fRfeed.\&html\fB\fR template in the current directory.\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Export all the pages into a big XML file:
 .PP

man/oddmu-export.1.txt

@@ -26,7 +26,7 @@ XML preamble is printed and appropriate escaping rules are used.
 
 By default, the export uses the **feed.html** template in the current directory.
 
-# EXAMPLE
+# EXAMPLES
 
 Export all the pages into a big XML file:
 

man/oddmu-filter.7

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-FILTER" "7" "2024-02-19"
+.TH "ODDMU-FILTER" "7" "2024-09-30"
 .PP
 .SH NAME
 .PP
@@ -18,22 +18,17 @@ not just a single page.\& These actions walk the directory tree, including all
 subdirectories.\& In some cases, this is not desirable.\&
 .PP
 Sometimes, subdirectories are separate sites, like the sites of other projects
-or different people.\& Essentially, the subdirectory acts as a different site.\&
-Depending on how you think about it, you might not want to include those "sites"
-in searches or archives of the whole site.\&
-.PP
-What'\&s important in this situation is whether the visitor is looking at the
-"main site" (a page further up in the directory tree) or at a particular page in
-a "separate site".\&
+or different people.\& Depending on how you think about it, you might not want to
+include those "sites" in searches or archives of the whole site.\&
 .PP
 Since directory tree actions always start in the directory the visitor is
-currenly looking at, directory tree actions starting in a "separate site"
+currently looking at, directory tree actions starting in a "separate site"
 automatically act as expected.\& The action is limited to that subdirectory tree.\&
 .PP
 When visitors look at a page in the "main site", however, directory tree actions
 must skip any sub directories that are part of a "separate site".\&
 .PP
-The way to identify separate sates is via the environment variable ODDMU_FILTER.\&
+The way to identify separate sites is via the environment variable ODDMU_FILTER.\&
 It'\&s value is a regular expression matching separate sites.\&
 .PP
 .SH EXAMPLES

man/oddmu-filter.7.txt

@@ -11,22 +11,17 @@ not just a single page. These actions walk the directory tree, including all
 subdirectories. In some cases, this is not desirable.
 
 Sometimes, subdirectories are separate sites, like the sites of other projects
-or different people. Essentially, the subdirectory acts as a different site.
-Depending on how you think about it, you might not want to include those "sites"
-in searches or archives of the whole site.
-
-What's important in this situation is whether the visitor is looking at the
-"main site" (a page further up in the directory tree) or at a particular page in
-a "separate site".
+or different people. Depending on how you think about it, you might not want to
+include those "sites" in searches or archives of the whole site.
 
 Since directory tree actions always start in the directory the visitor is
-currenly looking at, directory tree actions starting in a "separate site"
+currently looking at, directory tree actions starting in a "separate site"
 automatically act as expected. The action is limited to that subdirectory tree.
 
 When visitors look at a page in the "main site", however, directory tree actions
 must skip any sub directories that are part of a "separate site".
 
-The way to identify separate sates is via the environment variable ODDMU_FILTER.
+The way to identify separate sites is via the environment variable ODDMU_FILTER.
 It's value is a regular expression matching separate sites.
 
 # EXAMPLES

man/oddmu-hashtags.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-HASHTAGS" "1" "2024-08-16"
+.TH "ODDMU-HASHTAGS" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -20,7 +20,7 @@ oddmu-hashtags - count the hashtags used
 The "hashtags" subcommand counts all the hashtags used and lists them, separated
 by a TAB character.\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 List the top 10 hashtags.\& This requires 11 lines because of the header line.\&
 .PP

man/oddmu-hashtags.1.txt

@@ -13,7 +13,7 @@ oddmu-hashtags - count the hashtags used
 The "hashtags" subcommand counts all the hashtags used and lists them, separated
 by a TAB character.
 
-# EXAMPLE
+# EXAMPLES
 
 List the top 10 hashtags. This requires 11 lines because of the header line.
 

man/oddmu-html.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-HTML" "1" "2024-08-21"
+.TH "ODDMU-HTML" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -30,7 +30,7 @@ Use the "view.\&html" template to render the page.\& Without this, the HTML
 lacks html and body tags.\&
 .PP
 .RE
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Generate "README.\&html" from "README.\&md":
 .PP

man/oddmu-html.1.txt

@@ -21,7 +21,7 @@ the ".md" extension) and prints the HTML to STDOUT without invoking the
 	Use the "view.html" template to render the page. Without this, the HTML
 	lacks html and body tags.
 
-# EXAMPLE
+# EXAMPLES
 
 Generate "README.html" from "README.md":
 

man/oddmu-list.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-LIST" "1" "2024-08-16"
+.TH "ODDMU-LIST" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -31,7 +31,7 @@ subdirectory are listed, and the directory is stripped from the page name.\&
 Limit the list to a particular directory.\&
 .PP
 .RE
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Create list of links to pages in the "dad" directory, filter it for date pages
 (starting with "2"), format it as a list of links and sort in reverse order.\&

man/oddmu-list.1.txt

@@ -22,7 +22,7 @@ subdirectory are listed, and the directory is stripped from the page name.
 *-dir* _string_
 	Limit the list to a particular directory.
 
-# EXAMPLE
+# EXAMPLES
 
 Create list of links to pages in the "dad" directory, filter it for date pages
 (starting with "2"), format it as a list of links and sort in reverse order.

man/oddmu-missing.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-MISSING" "1" "2024-08-16"
+.TH "ODDMU-MISSING" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -26,7 +26,7 @@ that start with a slash "/" and links that start with a known URL schema
 .PP
 Notably, links that start with ".\&.\&/" are reported as missing.\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Looking for broken links:
 .PP

man/oddmu-missing.1.txt

@@ -19,7 +19,7 @@ that start with a slash "/" and links that start with a known URL schema
 
 Notably, links that start with "../" are reported as missing.
 
-# EXAMPLE
+# EXAMPLES
 
 Looking for broken links:
 

man/oddmu-nginx.5

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-NGINX" "5" "2024-05-09"
+.TH "ODDMU-NGINX" "5" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -27,7 +27,7 @@ section.\& Add a new \fIlocation\fR section after the existing \fIlocation\fR se
 .PP
 .nf
 .RS 4
-location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|search|archive)/ {
+location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/ {
         proxy_pass http://localhost:8080;
 }
 .fi
@@ -53,7 +53,7 @@ location ~ ^/(view|diff|search)/ {
         proxy_pass http://localhost:8080;
 }
 # password required
-location ~ ^/(edit|save|add|append|upload|drop|archive)/ {
+location ~ ^/(edit|save|add|append|upload|drop|list|delete|rename|archive)/ {
         auth_basic            "Oddmu author";
         auth_basic_user_file  /etc/nginx/conf\&.d/htpasswd;
         proxy_pass            http://localhost:8080;
@@ -97,7 +97,7 @@ server configuration.\& On a Debian system, that'\&d be in
 .PP
 .nf
 .RS 4
-location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|search|archive)/ {
+location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/ {
   proxy_pass http://unix:/run/oddmu/oddmu\&.sock:;
 }
 .fi

man/oddmu-nginx.5.txt

@@ -19,7 +19,7 @@ The site is defined in "/etc/nginx/sites-available/default", in the _server_
 section. Add a new _location_ section after the existing _location_ section:
 
 ```
-location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|search|archive)/ {
+location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/ {
         proxy_pass http://localhost:8080;
 }
 ```
@@ -43,7 +43,7 @@ location ~ ^/(view|diff|search)/ {
         proxy_pass http://localhost:8080;
 }
 # password required
-location ~ ^/(edit|save|add|append|upload|drop|archive)/ {
+location ~ ^/(edit|save|add|append|upload|drop|list|delete|rename|archive)/ {
         auth_basic            "Oddmu author";
         auth_basic_user_file  /etc/nginx/conf.d/htpasswd;
         proxy_pass            http://localhost:8080;
@@ -81,7 +81,7 @@ server configuration. On a Debian system, that'd be in
 "/etc/nginx/sites-available/default".
 
 ```
-location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|search|archive)/ {
+location ~ ^/(view|preview|diff|edit|save|add|append|upload|drop|list|delete|rename|search|archive)/ {
   proxy_pass http://unix:/run/oddmu/oddmu.sock:;
 }
 ```

man/oddmu-notify.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-NOTIFY" "1" "2024-02-17"
+.TH "ODDMU-NOTIFY" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -49,7 +49,7 @@ using the asterisk ('\&*'\&).\& If no such list exists, a new one is started at
 bottom of the page.\& This allows you to have a different unnumbered list further
 up on the page, as long as it uses the minus for items ('\&-'\&).\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 After writing the file "2023-11-05-climate.\&md" containing the hashtag
 "#Climate", add links to it from "index.\&md", "changes.\&md", and "Climate.\&md" (if

man/oddmu-notify.1.txt

@@ -42,7 +42,7 @@ using the asterisk ('\*'). If no such list exists, a new one is started at the
 bottom of the page. This allows you to have a different unnumbered list further
 up on the page, as long as it uses the minus for items ('-').
 
-# EXAMPLE
+# EXAMPLES
 
 After writing the file "2023-11-05-climate.md" containing the hashtag
 "#Climate", add links to it from "index.md", "changes.md", and "Climate.md" (if

man/oddmu-releases.7

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-RELEASES" "7" "2024-08-24"
+.TH "ODDMU-RELEASES" "7" "2025-02-09"
 .PP
 .SH NAME
 .PP
@@ -15,6 +15,49 @@ oddmu-releases - what'\&s new?\&
 .PP
 This page lists user-visible features and template changes to consider.\&
 .PP
+.SS 1.15 (2025)
+.PP
+Fix the hashtag detection.\& This was necessary to cut down on the many false
+positives.\& They were most obvious with the \fIhashtags\fR subcommand.\& Now the
+Markdown parser is used at startup to index the pages, making startup slower
+(about twice as long with my blog).\& The Markdown parser is also used to parse
+search terms (where it makes little difference).\&
+.PP
+Fix the timestamp for backup files.\& This was necessary because the diff didn'\&t
+work as intended.\&
+.PP
+.SS 1.14 (2024)
+.PP
+Add \fIlist\fR, \fIdelete\fR and \fIrename\fR actions.\&
+.PP
+This requires a change to your web server setup if you are using a it as a
+reverse proxy because you need to pass these new actions along to Oddmu,
+together with appropriate permission checks.\&
+.PP
+See \fIoddmu-apache\fR(5) or \fIoddmu-nginx\fR(5) for example.\&
+.PP
+In addition to that, you might want a link to the \fIlist\fR action from one of the
+existing templates.\& For example, from upload.\&html:
+.PP
+.nf
+.RS 4
+<p>You can rename and delete files <a href="/list/{{\&.Dir}}">from the file list</a>\&.
+.fi
+.RE
+.PP
+The following line was added to the "preview.\&html" and "edit.\&html" template:
+.PP
+.nf
+.RS 4
+<base href="/view/{{\&.Dir}}">
+.fi
+.RE
+.PP
+You might want to do that as well, if you have your own.\& Without this, links in
+the preview cannot be followed as they all point to \fB/preview\fR instead of
+\fB/view\fR and the link to the list of changes cannot be followed from the edit
+page: it leads to editing the list of changes.\&
+.PP
 .SS 1.13 (2024)
 .PP
 Add \fIexport\fR subcommand.\&

man/oddmu-releases.7.txt

@@ -8,6 +8,45 @@ oddmu-releases - what's new?
 
 This page lists user-visible features and template changes to consider.
 
+## 1.15 (2025)
+
+Fix the hashtag detection. This was necessary to cut down on the many false
+positives. They were most obvious with the _hashtags_ subcommand. Now the
+Markdown parser is used at startup to index the pages, making startup slower
+(about twice as long with my blog). The Markdown parser is also used to parse
+search terms (where it makes little difference).
+
+Fix the timestamp for backup files. This was necessary because the diff didn't
+work as intended.
+
+## 1.14 (2024)
+
+Add _list_, _delete_ and _rename_ actions.
+
+This requires a change to your web server setup if you are using a it as a
+reverse proxy because you need to pass these new actions along to Oddmu,
+together with appropriate permission checks.
+
+See _oddmu-apache_(5) or _oddmu-nginx_(5) for example.
+
+In addition to that, you might want a link to the _list_ action from one of the
+existing templates. For example, from upload.html:
+
+```
+<p>You can rename and delete files <a href="/list/{{.Dir}}">from the file list</a>.
+```
+
+The following line was added to the "preview.html" and "edit.html" template:
+
+```
+<base href="/view/{{.Dir}}">
+```
+
+You might want to do that as well, if you have your own. Without this, links in
+the preview cannot be followed as they all point to */preview* instead of
+*/view* and the link to the list of changes cannot be followed from the edit
+page: it leads to editing the list of changes.
+
 ## 1.13 (2024)
 
 Add _export_ subcommand.

man/oddmu-replace.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-REPLACE" "1" "2024-08-16"
+.TH "ODDMU-REPLACE" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -36,7 +36,7 @@ the term is a regular expression and the replacement can contain
 backreferences ($1, $2, $3, etc.\&) to capture groups.\&
 .PP
 .RE
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Replace "Oddmu" in the Markdown files of the current directory:
 .PP

man/oddmu-replace.1.txt

@@ -25,7 +25,7 @@ the current directory and its subdirectories.
 	the term is a regular expression and the replacement can contain
 	backreferences ($1, $2, $3, etc.) to capture groups.
 
-# EXAMPLE
+# EXAMPLES
 
 Replace "Oddmu" in the Markdown files of the current directory:
 

man/oddmu-search.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-SEARCH" "1" "2024-08-16"
+.TH "ODDMU-SEARCH" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -54,7 +54,7 @@ shown.\& This option allows you to view other pages.\&
 Ignore pagination and just print a long list of results.\&
 .PP
 .RE
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Search for the two words "Alex" and "Schroeder".\& All of the following are
 equivalent: Alex Schroeder, Schroeder Alex, "Alex Schroeder", "Schroeder Alex".\&

man/oddmu-search.1.txt

@@ -39,7 +39,7 @@ scored.
 *-all*
 	Ignore pagination and just print a long list of results.
 
-# EXAMPLE
+# EXAMPLES
 
 Search for the two words "Alex" and "Schroeder". All of the following are
 equivalent: Alex Schroeder, Schroeder Alex, "Alex Schroeder", "Schroeder Alex".

man/oddmu-static.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-STATIC" "1" "2024-03-12"
+.TH "ODDMU-STATIC" "1" "2024-08-29"
 .PP
 .SH NAME
 .PP
@@ -51,7 +51,7 @@ then again, who knows.\& A SQLite file, for example, would change in-place, and
 therefore making changes to it in the destination directory would change the
 original, too.\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Generate a static copy of the site, but only loading language detection for
 German and English, significantly reducing the time it takes to generate the

man/oddmu-static.1.txt

@@ -44,7 +44,7 @@ then again, who knows. A SQLite file, for example, would change in-place, and
 therefore making changes to it in the destination directory would change the
 original, too.
 
-# EXAMPLE
+# EXAMPLES
 
 Generate a static copy of the site, but only loading language detection for
 German and English, significantly reducing the time it takes to generate the

man/oddmu-templates.5

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-TEMPLATES" "5" "2024-07-21" "File Formats Manual"
+.TH "ODDMU-TEMPLATES" "5" "2024-08-30" "File Formats Manual"
 .PP
 .SH NAME
 .PP
@@ -13,9 +13,8 @@ oddmu-templates - how to write the templates
 .PP
 .SH SYNOPSIS
 .PP
-These files act as HTML templates: \fIadd.\&html\fR, \fIdiff.\&html\fR, \fIedit.\&html\fR,
-\fIfeed.\&html\fR, \fIpreview.\&html\fR, \fIsearch.\&html\fR, \fIstatic.\&html\fR, \fIupload.\&html\fR and
-\fIview.\&html\fR.\& They contain special placeholders in double bracers {{like this}}.\&
+Some HTML files act as templates.\& They contain special placeholders in double
+bracers {{like this}}.\&
 .PP
 .SH DESCRIPTION
 .PP
@@ -32,6 +31,8 @@ placeholders.\&
 .IP \(bu 4
 \fIfeed.\&html\fR uses a \fIfeed\fR
 .IP \(bu 4
+\fIlist.\&html\fR uses a \fIlist\fR
+.IP \(bu 4
 \fIpreview.\&html\fR uses a \fIpage\fR
 .IP \(bu 4
 \fIsearch.\&html\fR uses a \fIsearch\fR
@@ -108,6 +109,30 @@ An item is a page plus a date.\& All the properties of a page can be used (see
 .PP
 \fI{{.\&Date}}\fR is the date of the last update to the page, in RFC 822 format.\&
 .PP
+.SS List
+.PP
+The list contains a directory name and an array of files.\&
+.PP
+\fI{{.\&Dir}}\fR is the directory name that is being listed.\&
+.PP
+\fI{{.\&Files}}\fR is the array of files.\& To refer to them, you need to use a \fI{{range
+Files}}\fR … \fI{{end}}\fR construct.\&
+.PP
+Each file has the following attributes:
+.PP
+\fI{{.\&Name}}\fR is the filename.\& The ".\&md" suffix for Markdown files is part of the
+name (unlike page names).\&
+.PP
+\fI{{.\&Title}}\fR is the page title, if the file in question is a Markdown file.\&
+.PP
+\fI{{.\&IsDir}}\fR is a boolean used to indicate that this file is a directory.\&
+.PP
+\fI{{.\&IsUp}}\fR is a boolean used to indicate the entry for the parent directory
+(the first file in the array, unless the directory being listed is the top
+directory).\& The filename of this file is ".\&.\&".\&
+.PP
+\fI{{.\&Date}}\fR is the last modification date of the file.\&
+.PP
 .SS Search
 .PP
 \fI{{.\&Query}}\fR is the query string.\&
@@ -200,7 +225,7 @@ result is added to the "article" element for each snippet.\&
 point, the language isn'\&t known, so "en" is used for the "html" element and no
 language is used for the "textarea" element.\&
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 The following link in a template takes people to today'\&s page.\& If no such page
 exists, they are redirected to the edit form where it can be created.\&

man/oddmu-templates.5.txt

@@ -6,9 +6,8 @@ oddmu-templates - how to write the templates
 
 # SYNOPSIS
 
-These files act as HTML templates: _add.html_, _diff.html_, _edit.html_,
-_feed.html_, _preview.html_, _search.html_, _static.html_, _upload.html_ and
-_view.html_. They contain special placeholders in double bracers {{like this}}.
+Some HTML files act as templates. They contain special placeholders in double
+bracers {{like this}}.
 
 # DESCRIPTION
 
@@ -19,6 +18,7 @@ placeholders.
 - _diff.html_ uses a _page_
 - _edit.html_ uses a _page_
 - _feed.html_ uses a _feed_
+- _list.html_ uses a _list_
 - _preview.html_ uses a _page_
 - _search.html_ uses a _search_
 - _static.html_ uses a _page_
@@ -85,6 +85,30 @@ An item is a page plus a date. All the properties of a page can be used (see
 
 _{{.Date}}_ is the date of the last update to the page, in RFC 822 format.
 
+## List
+
+The list contains a directory name and an array of files.
+
+_{{.Dir}}_ is the directory name that is being listed.
+
+_{{.Files}}_ is the array of files. To refer to them, you need to use a _{{range
+.Files}}_ … _{{end}}_ construct.
+
+Each file has the following attributes:
+
+_{{.Name}}_ is the filename. The ".md" suffix for Markdown files is part of the
+name (unlike page names).
+
+_{{.Title}}_ is the page title, if the file in question is a Markdown file.
+
+_{{.IsDir}}_ is a boolean used to indicate that this file is a directory.
+
+_{{.IsUp}}_ is a boolean used to indicate the entry for the parent directory
+(the first file in the array, unless the directory being listed is the top
+directory). The filename of this file is "..".
+
+_{{.Date}}_ is the last modification date of the file.
+
 ## Search
 
 _{{.Query}}_ is the query string.
@@ -177,7 +201,7 @@ result is added to the "article" element for each snippet.
 point, the language isn't known, so "en" is used for the "html" element and no
 language is used for the "textarea" element.
 
-# EXAMPLE
+# EXAMPLES
 
 The following link in a template takes people to today's page. If no such page
 exists, they are redirected to the edit form where it can be created.

man/oddmu-webdav.5

@@ -0,0 +1,188 @@
+.\" Generated by scdoc 1.11.3
+.\" Complete documentation for this program is not available as a GNU info page
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.nh
+.ad l
+.\" Begin generated content:
+.TH "ODDMU-WEBDAV" "5" "2024-09-25"
+.PP
+.SH NAME
+.PP
+oddmu-webdav - how to setup Web-DAV using Apache for Oddmu
+.PP
+.SH DESCRIPTION
+.PP
+With the Apache Web-DAV module enabled, users can mount the wiki as a remote
+file system and edit files using their favourite text editor.\& If you want to
+offer users direct file access to the wiki, this can be accomplished via ssh,
+sftp or Web-DAV.\&
+.PP
+The benefit of using the Apache Web-DAV module is that access has to be
+configured only once.\&
+.PP
+.SH CONFIGURATION
+.PP
+In the following example, "data" is not an action provided by Oddmu but an
+actual directory for Oddmu files.\& In the example below,
+"/home/alex/campaignwiki.\&org/data" is both the document root for static files
+and the data directory for Oddmu.\& This is the directory where Oddmu needs to
+run.\& When users request the "/data" path, authentication is required but the
+request is not proxied to Oddmu since the "ProxyPassMatch" directive doesn'\&t
+handle "/data".\& Instead, Apache gets to handle it.\& Since "data" is part of all
+the "LocationMatch" directives, credentials are required to save (PUT) files.\&
+.PP
+"Dav On" enables Web-DAV for the "knochentanz" wiki.\& It is enabled for all the
+actions, but since only "/data" is handled by Apache, this has no effect for all
+the other actions, allowing us to specify the required users only once.\&
+.PP
+.nf
+.RS 4
+MDomain campaignwiki\&.org
+
+<VirtualHost *:80>
+    ServerName campaignwiki\&.org
+    Redirect permanent / https://campaignwiki\&.org/
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerAdmin alex@campaignwiki\&.org
+    ServerName campaignwiki\&.org
+    DocumentRoot /home/alex/campaignwiki\&.org
+    <Directory /home/alex/campaignwiki\&.org>
+        Options Includes Indexes MultiViews SymLinksIfOwnerMatch
+        AllowOverride All
+	Require all granted
+    </Directory>
+    SSLEngine on
+    ProxyPassMatch 
+      "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|search|archive/\&.+)/(\&.*))$" 
+      "unix:/home/oddmu/campaignwiki\&.sock|http://localhost/$1"
+    # /archive only for subdirectories
+    Redirect "/archive/data\&.zip" "/view/archive"
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|list|delete)/">
+      AuthType Basic
+      AuthName "Password Required"
+      AuthUserFile /home/oddmu/\&.htpasswd
+      Require user admin alex
+    </LocationMatch>
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|list|delete|archive)/knochentanz">
+      Require user admin alex knochentanz
+      Dav On
+    </LocationMatch>
+</VirtualHost>
+.fi
+.RE
+.PP
+In order for this to work, you must enable the mod_dav_fs module.\& This
+automatically enables to the mod_dav module, too.\& Restart the server after
+installing enabling a module.\&
+.PP
+.nf
+.RS 4
+sudo a2enmod mod_dav_fs
+sudo apachectl restart
+.fi
+.RE
+.PP
+Check the permissions for the data directory.\& If the Oddmu service uses the
+"oddmu" user and Apache uses the "www-data" user, you could add the data
+directory to the "www-data" group and give it write permissions:
+.PP
+.nf
+.RS 4
+sudo chown oddmu:www-data /home/alex/campaignwiki\&.org/data/knochentanz
+sudo chmod g+w /home/alex/campaignwiki\&.org/data/knochentanz
+.fi
+.RE
+.PP
+.SH EXAMPLES
+.PP
+Web-DAV clients are often implemented such that they only work with servers that
+exactly match their assumptions.\& If you'\&re trying to use \fIgvfs\fR(7), the Windows
+File Explorer or the macOS Finder to edit Oddmu pages using Web-DAV, you'\&re on
+your own.\&
+.PP
+This section has examples sessions using tools that work.\&
+.PP
+.SS cadaver
+.PP
+Here'\&s how to use \fIcadaver\fR(1).\& The "edit" command uses the editor specified in
+the EDITOR environment variable.\& In this example, that'\&s
+"emacsclient --alternate-editor= ".\&
+.PP
+.nf
+.RS 4
+cadaver https://campaignwiki\&.org/data/knochentanz/
+Authentication required for Password Required on server `campaignwiki\&.org\&':
+Username: knochentanz
+Password: 
+dav:/data/knochentanz/> edit index\&.md
+Locking `index\&.md\&': succeeded\&.
+Downloading `/data/knochentanz/index\&.md\&' to /tmp/cadaver-edit-fHTllt\&.md
+Progress: [=============================>] 100\&.0% of 2725 bytes succeeded\&.
+Running editor: `emacsclient --alternate-editor= /tmp/cadaver-edit-fHTllt\&.md\&'\&.\&.\&.
+Waiting for Emacs\&.\&.\&.
+Changes were made\&.
+Uploading changes to `/data/knochentanz/index\&.md\&'
+Progress: [=============================>] 100\&.0% of 2726 bytes succeeded\&.
+Unlocking `index\&.md\&': succeeded\&.
+.fi
+.RE
+.PP
+.SS curl and hdav
+.PP
+Here'\&s how to use \fIcurl\fR(1) to get the file from the public "/view" location and
+how to use \fIhdav\fR(1) to put the file to the protected "/data" location.\& In this
+example, \fIed\fR(1) is used to append the word "test" to the file.\&
+.PP
+.nf
+.RS 4
+alex@melanobombus ~> curl --output index\&.md https://campaignwiki\&.org/view/knochentanz/index\&.md
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+100  2726  100  2726    0     0  36662      0 --:--:-- --:--:-- --:--:-- 37861
+alex@melanobombus ~> ed index\&.md 
+2726
+a
+test
+\&.
+w
+2731
+q
+alex@melanobombus ~> hdav put index\&.md https://campaignwiki\&.org/data/knochentanz/index\&.md --username knochentanz
+hDAV version 1\&.3\&.4, Copyright (C) 2012-2016  Clint Adams
+hDAV comes with ABSOLUTELY NO WARRANTY\&.
+This is free software, and you are welcome to redistribute it
+under certain conditions\&.
+
+Password for knochentanz at URL https://campaignwiki\&.org/data/knochentanz/index\&.md: ********
+.fi
+.RE
+.PP
+.SS davfs2
+.PP
+Here'\&s how to use \fIdavfs2\fR(1) using \fImount\fR(1).\& Now the whole wiki is mounted
+and can be edited like local files.\& In this example, \fIecho\fR(1) and redirection
+is used to append the word "test" to a file.\&
+.PP
+.nf
+.RS 4
+alex@melanobombus ~> mkdir knochentanz
+alex@melanobombus ~> sudo mount -t davfs -o username=knochentanz,uid=alex 
+    https://campaignwiki\&.org/data/knochentanz/ knochentanz/
+  Password:  ********
+alex@melanobombus ~> echo test >> knochentanz/index\&.md
+.fi
+.RE
+.PP
+.SH SEE ALSO
+.PP
+\fIoddmu\fR(1), \fIoddmu-apache\fR(5)
+.PP
+"Apache Module mod_dav".\&
+https://httpd.\&apache.\&org/docs/current/mod/mod_dav.\&html
+.PP
+.SH AUTHORS
+.PP
+Maintained by Alex Schroeder <alex@gnu.\&org>.\&

man/oddmu-webdav.5.txt

@@ -0,0 +1,169 @@
+ODDMU-WEBDAV(5)
+
+# NAME
+
+oddmu-webdav - how to setup Web-DAV using Apache for Oddmu
+
+# DESCRIPTION
+
+With the Apache Web-DAV module enabled, users can mount the wiki as a remote
+file system and edit files using their favourite text editor. If you want to
+offer users direct file access to the wiki, this can be accomplished via ssh,
+sftp or Web-DAV.
+
+The benefit of using the Apache Web-DAV module is that access has to be
+configured only once.
+
+# CONFIGURATION
+
+In the following example, "data" is not an action provided by Oddmu but an
+actual directory for Oddmu files. In the example below,
+"/home/alex/campaignwiki.org/data" is both the document root for static files
+and the data directory for Oddmu. This is the directory where Oddmu needs to
+run. When users request the "/data" path, authentication is required but the
+request is not proxied to Oddmu since the "ProxyPassMatch" directive doesn't
+handle "/data". Instead, Apache gets to handle it. Since "data" is part of all
+the "LocationMatch" directives, credentials are required to save (PUT) files.
+
+"Dav On" enables Web-DAV for the "knochentanz" wiki. It is enabled for all the
+actions, but since only "/data" is handled by Apache, this has no effect for all
+the other actions, allowing us to specify the required users only once.
+
+```
+MDomain campaignwiki.org
+
+<VirtualHost *:80>
+    ServerName campaignwiki.org
+    Redirect permanent / https://campaignwiki.org/
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerAdmin alex@campaignwiki.org
+    ServerName campaignwiki.org
+    DocumentRoot /home/alex/campaignwiki.org
+    <Directory /home/alex/campaignwiki.org>
+        Options Includes Indexes MultiViews SymLinksIfOwnerMatch
+        AllowOverride All
+	Require all granted
+    </Directory>
+    SSLEngine on
+    ProxyPassMatch \
+      "^/((view|preview|diff|edit|save|add|append|upload|drop|list|delete|search|archive/.+)/(.*))$" \
+      "unix:/home/oddmu/campaignwiki.sock|http://localhost/$1"
+    # /archive only for subdirectories
+    Redirect "/archive/data.zip" "/view/archive"
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|list|delete)/">
+      AuthType Basic
+      AuthName "Password Required"
+      AuthUserFile /home/oddmu/.htpasswd
+      Require user admin alex
+    </LocationMatch>
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|list|delete|archive)/knochentanz">
+      Require user admin alex knochentanz
+      Dav On
+    </LocationMatch>
+</VirtualHost>
+```
+
+In order for this to work, you must enable the mod_dav_fs module. This
+automatically enables to the mod_dav module, too. Restart the server after
+installing enabling a module.
+
+```
+sudo a2enmod mod_dav_fs
+sudo apachectl restart
+```
+
+Check the permissions for the data directory. If the Oddmu service uses the
+"oddmu" user and Apache uses the "www-data" user, you could add the data
+directory to the "www-data" group and give it write permissions:
+
+```
+sudo chown oddmu:www-data /home/alex/campaignwiki.org/data/knochentanz
+sudo chmod g+w /home/alex/campaignwiki.org/data/knochentanz
+```
+
+# EXAMPLES
+
+Web-DAV clients are often implemented such that they only work with servers that
+exactly match their assumptions. If you're trying to use _gvfs_(7), the Windows
+File Explorer or the macOS Finder to edit Oddmu pages using Web-DAV, you're on
+your own.
+
+This section has examples sessions using tools that work.
+
+## cadaver
+
+Here's how to use _cadaver_(1). The "edit" command uses the editor specified in
+the EDITOR environment variable. In this example, that's
+"emacsclient --alternate-editor= ".
+
+```
+cadaver https://campaignwiki.org/data/knochentanz/
+Authentication required for Password Required on server `campaignwiki.org':
+Username: knochentanz
+Password: 
+dav:/data/knochentanz/> edit index.md
+Locking `index.md': succeeded.
+Downloading `/data/knochentanz/index.md' to /tmp/cadaver-edit-fHTllt.md
+Progress: [=============================>] 100.0% of 2725 bytes succeeded.
+Running editor: `emacsclient --alternate-editor= /tmp/cadaver-edit-fHTllt.md'...
+Waiting for Emacs...
+Changes were made.
+Uploading changes to `/data/knochentanz/index.md'
+Progress: [=============================>] 100.0% of 2726 bytes succeeded.
+Unlocking `index.md': succeeded.
+```
+
+## curl and hdav
+
+Here's how to use _curl_(1) to get the file from the public "/view" location and
+how to use _hdav_(1) to put the file to the protected "/data" location. In this
+example, _ed_(1) is used to append the word "test" to the file.
+
+```
+alex@melanobombus ~> curl --output index.md https://campaignwiki.org/view/knochentanz/index.md
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+100  2726  100  2726    0     0  36662      0 --:--:-- --:--:-- --:--:-- 37861
+alex@melanobombus ~> ed index.md 
+2726
+a
+test
+.
+w
+2731
+q
+alex@melanobombus ~> hdav put index.md https://campaignwiki.org/data/knochentanz/index.md --username knochentanz
+hDAV version 1.3.4, Copyright (C) 2012-2016  Clint Adams
+hDAV comes with ABSOLUTELY NO WARRANTY.
+This is free software, and you are welcome to redistribute it
+under certain conditions.
+
+Password for knochentanz at URL https://campaignwiki.org/data/knochentanz/index.md: ********
+```
+
+## davfs2
+
+Here's how to use _davfs2_(1) using _mount_(1). Now the whole wiki is mounted
+and can be edited like local files. In this example, _echo_(1) and redirection
+is used to append the word "test" to a file.
+
+```
+alex@melanobombus ~> mkdir knochentanz
+alex@melanobombus ~> sudo mount -t davfs -o username=knochentanz,uid=alex \
+    https://campaignwiki.org/data/knochentanz/ knochentanz/
+  Password:  ********
+alex@melanobombus ~> echo test >> knochentanz/index.md
+```
+
+# SEE ALSO
+
+_oddmu_(1), _oddmu-apache_(5)
+
+"Apache Module mod_dav".
+https://httpd.apache.org/docs/current/mod/mod_dav.html
+
+# AUTHORS
+
+Maintained by Alex Schroeder <alex@gnu.org>.

man/oddmu.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU" "1" "2024-08-16"
+.TH "ODDMU" "1" "2024-11-16"
 .PP
 .SH NAME
 .PP
@@ -17,6 +17,8 @@ Oddmu is sometimes written Oddµ because µ is the letter mu.\&
 .PP
 \fBoddmu\fR
 .PP
+\fBoddmu\fR \fIsubcommand\fR [\fIarguments\fR.\&.\&.\&]
+.PP
 .SH DESCRIPTION
 .PP
 Oddmu can be used as a static site generator, turning Markdown files into HTML
@@ -75,6 +77,12 @@ directory:
 .IP \(bu 4
 \fI/drop/dir/name\fR saves an upload
 .IP \(bu 4
+\fI/list/dir/\fR lists the files in a directory
+.IP \(bu 4
+\fI/delete/dir/name\fR deletes a file or directory
+.IP \(bu 4
+\fI/rename/dir/name?\&name=new\fR renames a file or directory
+.IP \(bu 4
 \fI/search/dir/?\&q=term\fR to search for a term
 .IP \(bu 4
 \fI/archive/dir/name.\&zip\fR to download a zip file of a directory
@@ -214,20 +222,32 @@ to generate the HTML for a single page, see \fIoddmu-html\fR(1)
 to generate the HTML for the entire site, using Oddmu as a static site
 generator, see \fIoddmu-static\fR(1)
 .IP \(bu 4
-to search a regular expression and replace it across all files, see
-\fIoddmu-replace\fR(1)
+to export the HTML for the entire site in one big feed, see \fIoddmu-export\fR(1)
 .IP \(bu 4
 to emulate a search of the files, see \fIoddmu-search\fR(1); to understand how the
 search engine indexes pages and how it sorts and scores results, see
 \fIoddmu-search\fR(7)
 .IP \(bu 4
+to search a regular expression and replace it across all files, see
+\fIoddmu-replace\fR(1)
+.IP \(bu 4
+to learn what the most popular hashtags are, see \fIoddmu-hashtags\fR(1)
+.IP \(bu 4
+to print a table of contents (TOC) for a page, see \fIoddmu-toc\fR(1)
+.IP \(bu 4
+to list the outgoing links for a page, see \fIoddmu-links\fR(1)
+.IP \(bu 4
 to find missing pages (local links that go nowhere), see \fIoddmu-missing\fR(1)
 .IP \(bu 4
+to list all the pages with name and title, see \fIoddmu-list\fR(1)
+.IP \(bu 4
 to add links to changes, index and hashtag pages to pages you created locally,
 see \fIoddmu-notify\fR(1)
+.IP \(bu 4
+to display build information, see \fIoddmu-version\fR(1)
 .PD
 .PP
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 When saving a page, the page name is take from the URL and the page content is
 taken from the "body" form parameter.\& To illustrate, here'\&s how to edit a page
@@ -268,9 +288,10 @@ it, it can'\&t be a page name.\& Filenames can contain slashes and Oddmu creates
 subdirectories as necessary.\&
 .PP
 Files may not end with a tilde ('\&~'\&) – these are backup files.\& When saving pages
-and file uploads, the old file renamed to the backup file unless the backup file
-is less than an hour old, thus collapsing all edits made in an hour into a
-single diff when comparing backup and current version.\&
+and file uploads, the old file is renamed to the backup file unless the backup
+file is less than an hour old, thus collapsing all edits made in an hour into a
+single diff when comparing backup and current version.\& The backup also gets an
+updated timestamp so that subsequent edits don'\&t immediately overwrite it.\&
 .PP
 The \fBindex\fR page is the default page.\& People visiting the "root" of the site are
 redirected to "/view/index".\&
@@ -359,6 +380,8 @@ If you run Oddmu as a web server:
 .IP \(bu 4
 \fIoddmu-nginx\fR(5), on how to set up freenginx as a reverse proxy
 .IP \(bu 4
+\fIoddmu-webdav\fR(5), on how to set up Apache as a Web-DAV server
+.IP \(bu 4
 \fIoddmu.\&service\fR(5), on how to run the service under systemd
 .PD
 .PP

man/oddmu.1.txt

@@ -10,6 +10,8 @@ Oddmu is sometimes written Oddµ because µ is the letter mu.
 
 *oddmu*
 
+*oddmu* _subcommand_ [_arguments_...]
+
 # DESCRIPTION
 
 Oddmu can be used as a static site generator, turning Markdown files into HTML
@@ -53,6 +55,9 @@ directory:
 - _/append/dir/name_ appends an addition to a page
 - _/upload/dir/name_ shows a form to upload a file
 - _/drop/dir/name_ saves an upload
+- _/list/dir/_ lists the files in a directory
+- _/delete/dir/name_ deletes a file or directory
+- _/rename/dir/name?name=new_ renames a file or directory
 - _/search/dir/?q=term_ to search for a term
 - _/archive/dir/name.zip_ to download a zip file of a directory
 
@@ -174,16 +179,22 @@ Oddmu can be run on the command-line using various subcommands.
 - to generate the HTML for a single page, see _oddmu-html_(1)
 - to generate the HTML for the entire site, using Oddmu as a static site
   generator, see _oddmu-static_(1)
-- to search a regular expression and replace it across all files, see
-  _oddmu-replace_(1)
+- to export the HTML for the entire site in one big feed, see _oddmu-export_(1)
 - to emulate a search of the files, see _oddmu-search_(1); to understand how the
   search engine indexes pages and how it sorts and scores results, see
   _oddmu-search_(7)
+- to search a regular expression and replace it across all files, see
+  _oddmu-replace_(1)
+- to learn what the most popular hashtags are, see _oddmu-hashtags_(1)
+- to print a table of contents (TOC) for a page, see _oddmu-toc_(1)
+- to list the outgoing links for a page, see _oddmu-links_(1)
 - to find missing pages (local links that go nowhere), see _oddmu-missing_(1)
+- to list all the pages with name and title, see _oddmu-list_(1)
 - to add links to changes, index and hashtag pages to pages you created locally,
   see _oddmu-notify_(1)
+- to display build information, see _oddmu-version_(1)
 
-# EXAMPLE
+# EXAMPLES
 
 When saving a page, the page name is take from the URL and the page content is
 taken from the "body" form parameter. To illustrate, here's how to edit a page
@@ -220,9 +231,10 @@ it, it can't be a page name. Filenames can contain slashes and Oddmu creates
 subdirectories as necessary.
 
 Files may not end with a tilde ('~') – these are backup files. When saving pages
-and file uploads, the old file renamed to the backup file unless the backup file
-is less than an hour old, thus collapsing all edits made in an hour into a
-single diff when comparing backup and current version.
+and file uploads, the old file is renamed to the backup file unless the backup
+file is less than an hour old, thus collapsing all edits made in an hour into a
+single diff when comparing backup and current version. The backup also gets an
+updated timestamp so that subsequent edits don't immediately overwrite it.
 
 The *index* page is the default page. People visiting the "root" of the site are
 redirected to "/view/index".
@@ -300,6 +312,7 @@ If you run Oddmu as a web server:
 
 - _oddmu-apache_(5), on how to set up Apache as a reverse proxy
 - _oddmu-nginx_(5), on how to set up freenginx as a reverse proxy
+- _oddmu-webdav_(5), on how to set up Apache as a Web-DAV server
 - _oddmu.service_(5), on how to run the service under systemd
 
 If you run Oddmu as a static site generator or pages offline and sync them with

man/oddmu.5

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU" "5" "2024-08-17" "File Formats Manual"
+.TH "ODDMU" "5" "2024-09-30" "File Formats Manual"
 .PP
 .SH NAME
 .PP
@@ -89,8 +89,8 @@ Internet
 .SS Fediverse account links
 .PP
 Fediverse accounts look a bit like an at sign followed by an email address, e.\&g.\&
-@alex@alexschroeder.\&ch.\& When rendering a page, these turn into a username linked
-to a profile page.\& In this case, "@alex" would be linked to
+"@alex@alexschroeder.\&ch".\& When rendering a page, these turn into a username
+linked to a profile page.\& In this case, "@alex" would be linked to
 "https://alexschroeder.\&ch/users/alex".\&
 .PP
 In many cases, this works as is.\& In reality, however, the link to the profile
@@ -117,7 +117,7 @@ autolinking of "naked" URLs are supported
 .IP \(bu 4
 strikethrough using two tildes is supported (~~like this~~)
 .IP \(bu 4
-it is strict about prefix heading rules
+a space is required between the last # and the text for headings
 .IP \(bu 4
 you can specify an id for headings ({#id})
 .IP \(bu 4
@@ -126,12 +126,12 @@ trailing backslashes turn into line breaks
 .PP
 .SH FEEDS
 .PP
-Every file can be viewed as feed by using the extension ".\&rss".\& The feed items
+Every file can be viewed as a feed by using the extension ".\&rss".\& The feed items
 are based on links in bullet lists using the asterix ("*").\& The items must
 point to local pages.\& This is why the link may not contain two forward slashes
 ("//").\&
 .PP
-Assume this is the index page.\& The feed would be "/view/index.\&rss".\& It would
+Below is an example index page.\& The feed would be "/view/index.\&rss".\& It would
 contain the pages "Arianism", "Donatism" and "Monophysitism" but it would not
 contain the pages "Feed" and "About" since the list items don'\&t start with an
 asterix.\&
@@ -153,7 +153,8 @@ Recent posts:
 .fi
 .RE
 .PP
-The feed contains at most 10 items, starting at the top.\&
+The feed contains at most 10 items, starting at the top.\& Thus, new items must be
+added at the beginning of the list.\&
 .PP
 .SH PERCENT ENCODING
 .PP

man/oddmu.5.txt

@@ -74,8 +74,8 @@ Internet
 ## Fediverse account links
 
 Fediverse accounts look a bit like an at sign followed by an email address, e.g.
-@alex@alexschroeder.ch. When rendering a page, these turn into a username linked
-to a profile page. In this case, "@alex" would be linked to
+"\@alex@alexschroeder.ch". When rendering a page, these turn into a username
+linked to a profile page. In this case, "@alex" would be linked to
 "https://alexschroeder.ch/users/alex".
 
 In many cases, this works as is. In reality, however, the link to the profile
@@ -96,18 +96,18 @@ The Markdown processor comes with a few extensions:
 - fenced code blocks are supported
 - autolinking of "naked" URLs are supported
 - strikethrough using two tildes is supported (~~like this~~)
-- it is strict about prefix heading rules
+- a space is required between the last # and the text for headings
 - you can specify an id for headings ({#id})
 - trailing backslashes turn into line breaks
 
 # FEEDS
 
-Every file can be viewed as feed by using the extension ".rss". The feed items
+Every file can be viewed as a feed by using the extension ".rss". The feed items
 are based on links in bullet lists using the asterix ("\*"). The items must
 point to local pages. This is why the link may not contain two forward slashes
 ("//").
 
-Assume this is the index page. The feed would be "/view/index.rss". It would
+Below is an example index page. The feed would be "/view/index.rss". It would
 contain the pages "Arianism", "Donatism" and "Monophysitism" but it would not
 contain the pages "Feed" and "About" since the list items don't start with an
 asterix.
@@ -127,7 +127,8 @@ Recent posts:
 * [Monophysitism](monophysitism)
 ```
 
-The feed contains at most 10 items, starting at the top.
+The feed contains at most 10 items, starting at the top. Thus, new items must be
+added at the beginning of the list.
 
 # PERCENT ENCODING
 

man/scdoc-to-markdown

@@ -3,6 +3,12 @@ use strict;
 use warnings;
 my $literal = 0;
 while (<>) {
+  # switch literal style
+  $literal = !$literal if /^```$/;
+  if ($literal) {
+    print;
+    next;
+  }
   # bold
   s/\*([^*]+)\*/**$1**/g;
   # link to oddmu man pages (before italics)
@@ -10,18 +16,16 @@ while (<>) {
   # italic
   s/\b_([^_]+)_\b/*$1*/g;
   # move all H1 headers to H2
-  s/^# /## /;
+  s/^# (.*)/"## ".ucfirst(lc($1))/e;
   # the new H1 title
-  s/^([A-Z.-]*\([1-9]\))( ".*")?$/# $1/;
+  s/^([A-Z.-]*\([1-9]\))( ".*")?$/"# ".lc($1)/e;
   # quoted URLs
   s/"(http.*?)"/`$1`/g;
   # quoted wiki links
   s/"(\[\[[^]]*\]\])"/`$1`/g;
   # quoted Markdown links
   s/"(\[.*?\]\(.*?\))"/`$1`/g;
-  # switch literal style
-  $literal = !$literal if /^```$/;
-  # protect hashtags except within literal blocks
-  s/#([^ #])/\\#$1/ unless $literal;
+  # protect hashtags
+  s/#([^ #])/\\#$1/;
   print;
 }

man_test.go

@@ -7,22 +7,26 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"regexp"
 	"slices"
 	"sort"
 	"strings"
 	"testing"
 )
 
+// Does oddmu(1) link to all the other man pages?
 func TestManPages(t *testing.T) {
 	b, err := os.ReadFile("man/oddmu.1.txt")
 	main := string(b)
 	assert.NoError(t, err)
+	count := 0
 	filepath.Walk("man", func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		if strings.HasSuffix(path, ".txt") &&
 			path != "man/oddmu.1.txt" {
+			count++
 			s := strings.TrimPrefix(path, "man/")
 			s = strings.TrimSuffix(s, ".txt")
 			i := strings.LastIndex(s, ".")
@@ -31,25 +35,81 @@ func TestManPages(t *testing.T) {
 		}
 		return nil
 	})
+	assert.Greater(t, count, 0, "no man pages were found")
 }
 
+// Does oddmu-templates(5) mention all the templates?
+func TestManTemplates(t *testing.T) {
+	b, err := os.ReadFile("man/oddmu-templates.5.txt")
+	man := string(b)
+	assert.NoError(t, err)
+	count := 0
+	filepath.Walk(".", func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if strings.HasSuffix(path, ".html") {
+			count++
+			assert.Contains(t, man, path, path)
+		}
+		if path != "." && info.IsDir() {
+			return filepath.SkipDir
+		}
+		return nil
+	})
+	assert.Greater(t, count, 0, "no templates were found")
+}
+
+// Does oddmu(1) mention all the actions? We're not going to parse the go file and make sure to catch them all. I tried
+// it, and it's convoluted.
+func TestManActions(t *testing.T) {
+	b, err := os.ReadFile("man/oddmu.1.txt")
+	assert.NoError(t, err)
+	main := string(b)
+	b, err = os.ReadFile("wiki.go")
+	assert.NoError(t, err)
+	wiki := string(b)
+	count := 0
+	// this doesn't match the root handler
+	re := regexp.MustCompile(`http.HandleFunc\("(/[a-z]+/)", makeHandler\([a-z]+Handler, (true|false)\)\)`)
+	for _, match := range re.FindAllStringSubmatch(wiki, -1) {
+		count++
+		var path string
+		if match[2] == "true" {
+			path = "_" + match[1] + "dir/name"
+		} else {
+			path = "_" + match[1] + "dir/"
+		}
+		assert.Contains(t, main, path, path)
+	}
+	assert.Greater(t, count, 0, "no handlers were found")
+	// root handler is manual
+	assert.Contains(t, main, "\n- _/_", "root")
+}
+
+// Does the README link to all the man pages and all the Go source files,
+// excluding the command and test files?
 func TestReadme(t *testing.T) {
 	b, err := os.ReadFile("README.md")
-	main := string(b)
+	readme := string(b)
 	assert.NoError(t, err)
+	count := 0
 	filepath.Walk("man", func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		if strings.HasSuffix(path, ".txt") {
+			count++
 			s := strings.TrimPrefix(path, "man/")
 			s = strings.TrimSuffix(s, ".txt")
 			i := strings.LastIndex(s, ".")
 			ref := "[" + s[:i] + "(" + s[i+1:] + ")]"
-			assert.Contains(t, main, ref, ref)
+			assert.Contains(t, readme, ref, ref)
 		}
 		return nil
 	})
+	assert.Greater(t, count, 0, "no man pages were found")
+	count = 0
 	filepath.Walk(".", func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -57,14 +117,17 @@ func TestReadme(t *testing.T) {
 		if strings.HasSuffix(path, ".go") &&
 			!strings.HasSuffix(path, "_test.go") &&
 			!strings.HasSuffix(path, "_cmd.go") {
+			count++
 			s := strings.TrimPrefix(path, "./")
 			ref := "`" + s + "`"
-			assert.Contains(t, main, ref, ref)
+			assert.Contains(t, readme, ref, ref)
 		}
 		return nil
 	})
+	assert.Greater(t, count, 0, "no source pages were found")
 }
 
+// Does the README document all the dependecies, checking all the all the packages with names containing a period?
 func TestDocumentDependencies(t *testing.T) {
 	b, err := os.ReadFile("README.md")
 	readme := string(b)
@@ -83,6 +146,7 @@ func TestDocumentDependencies(t *testing.T) {
 			}
 		}
 	}
+	assert.Greater(t, len(imports), 0, "no imports found")
 	sort.Slice(imports, func(i, j int) bool { return len(imports[i]) < len(imports[j]) })
 IMPORT:
 	for _, name := range imports {

page.go

@@ -88,9 +88,10 @@ func (p *Page) save() error {
 	return os.WriteFile(fp, s, 0644)
 }
 
-// backup a file by renaming (!) it unless the existing backup is less than an hour old. A backup gets a tilde appended
-// to it ("~"). This is true even if the file refers to a binary file like "image.png" and most applications don't know
-// what to do with a file called "image.png~". This expects a file path. Use filepath.FromSlash(path) if necessary.
+// backup a file by renaming it unless the existing backup is less than an hour old. A backup gets a tilde appended to
+// it ("~"). This is true even if the file refers to a binary file like "image.png" and most applications don't know
+// what to do with a file called "image.png~". This expects a file path. Use filepath.FromSlash(path) if necessary. The
+// backup file gets its modification time set to now so that subsequent edits don't immediately overwrite it again.
 func backup(fp string) error {
 	_, err := os.Stat(fp)
 	if err != nil {
@@ -99,7 +100,12 @@ func backup(fp string) error {
 	bp := fp + "~"
 	fi, err := os.Stat(bp)
 	if err != nil || time.Since(fi.ModTime()).Minutes() >= 60 {
-		return os.Rename(fp, bp)
+		err = os.Rename(fp, bp)
+		if err != nil {
+			return err
+		}
+		ts := time.Now()
+		return os.Chtimes(bp, ts, ts)
 	}
 	return nil
 }

parser.go

@@ -37,9 +37,13 @@ func wikiLink(fn func(p *parser.Parser, data []byte, offset int) (int, ast.Node)
 
 // hashtag returns an inline parser function. This indirection is
 // required because we want to receive an array of hashtags found.
+// The hashtags in the array keep their case.
 func hashtag() (func(p *parser.Parser, data []byte, offset int) (int, ast.Node), *[]string) {
 	hashtags := make([]string, 0)
 	return func(p *parser.Parser, data []byte, offset int) (int, ast.Node) {
+		if p.InsideLink {
+			return 0, nil
+		}
 		data = data[offset:]
 		i := 0
 		n := len(data)
@@ -64,15 +68,16 @@ func hashtag() (func(p *parser.Parser, data []byte, offset int) (int, ast.Node),
 // @webfinger@accounts. It also uses the CommonExtensions and Block Attributes, and no MathJax ($).
 func wikiParser() (*parser.Parser, *[]string) {
 	extensions := (parser.CommonExtensions | parser.AutoHeadingIDs | parser.Attributes) & ^parser.MathJax
-	parser := parser.NewWithExtensions(extensions)
-	prev := parser.RegisterInline('[', nil)
-	parser.RegisterInline('[', wikiLink(prev))
+	p := parser.NewWithExtensions(extensions)
+	prev := p.RegisterInline('[', nil)
+	p.RegisterInline('[', wikiLink(prev))
 	fn, hashtags := hashtag()
-	parser.RegisterInline('#', fn)
+	p.RegisterInline('#', fn)
 	if useWebfinger {
-		parser.RegisterInline('@', accountLink)
+		p.RegisterInline('@', accountLink)
+		parser.EscapeChars = append(parser.EscapeChars, '@')
 	}
-	return parser, hashtags
+	return p, hashtags
 }
 
 // wikiRenderer is a Renderer for Markdown that adds lazy loading of images and disables fractions support. Remember
@@ -147,6 +152,13 @@ func (p *Page) images() []ImageData {
 	return images
 }
 
+// hashtags returns an array of hashtags
+func hashtags(s []byte) []string {
+	parser, hashtags := wikiParser()
+	markdown.Parse(s, parser)
+	return *hashtags
+}
+
 // toString for a node returns the text nodes' literals, concatenated. There is no whitespace added so the expectation
 // is that there is only one child node. Otherwise, there may be a space missing between the literals, depending on the
 // exact child nodes they belong to.

parser_test.go

@@ -51,11 +51,13 @@ I am cold, alone</p>
 func TestPageHtmlHashtagCornerCases(t *testing.T) {
 	p := &Page{Body: []byte(`#
 
-ok # #o #ok`)}
+ok # #o #ok
+[oh #ok \#nok](ok)`)}
 	p.renderHtml()
 	r := `<p>#</p>
 
-<p>ok # <a class="tag" href="/search/?q=%23o">#o</a> <a class="tag" href="/search/?q=%23ok">#ok</a></p>
+<p>ok # <a class="tag" href="/search/?q=%23o">#o</a> <a class="tag" href="/search/?q=%23ok">#ok</a>
+<a href="ok">oh #ok #nok</a></p>
 `
 	assert.Equal(t, r, string(p.Html))
 }
@@ -109,3 +111,26 @@ func TestNoFractions(t *testing.T) {
 	p.renderHtml()
 	assert.Contains(t, string(p.Html), "1/6")
 }
+
+// webfinger
+func TestAt(t *testing.T) {
+	// enable webfinger
+	useWebfinger = true
+	// prevent lookups
+	accounts.Lock()
+	accounts.uris = make(map[string]string)
+	accounts.uris["alex@alexschroeder.ch"] = "https://social.alexschroeder.ch/@alex";
+	accounts.Unlock()
+	// test account
+	p := &Page{Body: []byte(`My fedi handle is @alex@alexschroeder.ch.`)}
+	p.renderHtml()
+	assert.Contains(t,string(p.Html),
+		`My fedi handle is <a class="account" href="https://social.alexschroeder.ch/@alex" title="@alex@alexschroeder.ch">@alex</a>.`)
+	// test escaped account
+	p = &Page{Body: []byte(`My fedi handle is \@alex@alexschroeder.ch. \`)}
+	p.renderHtml()
+	assert.Contains(t,string(p.Html),
+		`My fedi handle is @alex@alexschroeder.ch.`)
+	// disable webfinger
+	useWebfinger = false
+}

preview.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
     <meta name="viewport" content="width=device-width">
+    <base href="/view/{{.Dir}}">
     <title>Preview: {{.Title}}</title>
     <style>
 html { max-width: 70ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe; }

preview_test.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/stretchr/testify/assert"
+	"net/url"
+	"testing"
+)
+
+func TestPreview(t *testing.T) {
+	cleanup(t, "testdata/preview")
+
+	data := url.Values{}
+	data.Set("body", "**Hallo**!")
+
+	r := assert.HTTPBody(makeHandler(previewHandler, false), "POST", "/view/testdata/preview/alex", data)
+	assert.Contains(t, r, "<strong>Hallo</strong>!")
+}

search_cmd.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 )
@@ -18,6 +19,8 @@ type searchCmd struct {
 	page    int
 	all     bool
 	extract bool
+	files   bool
+	quiet   bool
 }
 
 func (cmd *searchCmd) SetFlags(f *flag.FlagSet) {
@@ -25,12 +28,14 @@ func (cmd *searchCmd) SetFlags(f *flag.FlagSet) {
 	f.IntVar(&cmd.page, "page", 1, "the page in the search result set, default 1")
 	f.BoolVar(&cmd.all, "all", false, "show all the pages and ignore -page")
 	f.BoolVar(&cmd.extract, "extract", false, "print page extract instead of link list")
+	f.BoolVar(&cmd.files, "files", false, "show just the filenames")
+	f.BoolVar(&cmd.quiet, "quiet", false, "suppress summary line at the top")
 }
 
 func (*searchCmd) Name() string     { return "search" }
 func (*searchCmd) Synopsis() string { return "search pages and print a list of links" }
 func (*searchCmd) Usage() string {
-	return `search [-dir string] [-page <n>|-all] [-extract] <terms>:
+	return `search [-dir string] [-page <n>|-all] [-extract|-files] [-quiet] <terms>:
   Search for pages matching terms and print the result set as a
   Markdown list. Before searching, all the pages are indexed. Thus,
   startup is slow. The benefit is that the page order is exactly as
@@ -39,24 +44,24 @@ func (*searchCmd) Usage() string {
 }
 
 func (cmd *searchCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	return searchCli(os.Stdout, cmd.dir, cmd.page, cmd.all, cmd.extract, false, f.Args())
+	return searchCli(os.Stdout, cmd, f.Args())
 }
 
 // searchCli runs the search command on the command line. It is used
 // here with an io.Writer for easy testing.
-func searchCli(w io.Writer, dir string, n int, all, extract bool, quiet bool, args []string) subcommands.ExitStatus {
-	dir, err := checkDir(dir)
+func searchCli(w io.Writer, cmd *searchCmd, args []string) subcommands.ExitStatus {
+	dir, err := checkDir(cmd.dir)
 	if err != nil {
 		return subcommands.ExitFailure
 	}
 	index.reset()
 	index.load()
 	q := strings.Join(args, " ")
-	items, more := search(q, dir, "", n, true)
-	if !quiet {
+	items, more := search(q, dir, "", cmd.page, true)
+	if !cmd.quiet {
 		fmt.Fprint(os.Stderr, "Search for ", q)
-		if !all {
-			fmt.Fprint(os.Stderr, ", page ", n)
+		if !cmd.all {
+			fmt.Fprint(os.Stderr, ", page ", cmd.page)
 		}
 		fmt.Fprint(os.Stderr, ": ", len(items))
 		if len(items) == 1 {
@@ -65,8 +70,13 @@ func searchCli(w io.Writer, dir string, n int, all, extract bool, quiet bool, ar
 			fmt.Fprint(os.Stderr, " results\n")
 		}
 	}
-	if extract {
+	if cmd.extract {
 		searchExtract(w, items)
+	} else if cmd.files {
+		for _, p := range items {
+			name := filepath.FromSlash(p.Name) + ".md\n"
+			fmt.Fprintf(w, name)
+		}
 	} else {
 		for _, p := range items {
 			name := p.Name

search_cmd_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestSearchCmd(t *testing.T) {
 	b := new(bytes.Buffer)
-	s := searchCli(b, "", 1, false, false, true, []string{"oddµ"})
+	s := searchCli(b, &searchCmd{quiet: true}, []string{"oddµ"})
 	assert.Equal(t, subcommands.ExitSuccess, s)
 	r := `* [Oddµ: A minimal wiki](README)
 * [Themes](themes/index)
@@ -26,7 +26,7 @@ that before we type and speak
 we hear that moment`)}
 	p.save()
 	b := new(bytes.Buffer)
-	s := searchCli(b, "testdata/search", 1, false, false, true, []string{"speak"})
+	s := searchCli(b, &searchCmd{dir: "testdata/search", quiet: true}, []string{"speak"})
 	assert.Equal(t, subcommands.ExitSuccess, s)
 	r := `* [Wait](wait)
 `

search_test.go

@@ -177,7 +177,7 @@ func TestTitleSearch(t *testing.T) {
 	index.load()
 
 	items, more := search("title:readme", "", "", 1, false)
-	assert.Equal(t, 0, len(items), "no page found")
+	assert.Equal(t, 1, len(items), "just one page found") // themes/plain/README
 	assert.False(t, more)
 
 	items, more = search("title:wel", "", "", 1, false) // README also contains "wel"

static_cmd.go

@@ -221,7 +221,7 @@ func staticPage(source, target string) (*Page, error) {
 func staticFeed(source, target string, p *Page, ti time.Time) error {
 	// render feed, maybe
 	base := filepath.Base(source)
-	_, ok := index.token["#"+strings.ToLower(base)]
+	_, ok := index.token[strings.ToLower(base)]
 	if base == "index" || ok {
 		f := feed(p, ti)
 		if len(f.Items) > 0 {

templates.go

@@ -15,7 +15,8 @@ import (
 // templateFiles are the various HTML template files used. These files must exist in the root directory for Oddmu to be
 // able to generate HTML output. This always requires a template.
 var templateFiles = []string{"edit.html", "add.html", "view.html", "preview.html",
-	"diff.html", "search.html", "static.html", "upload.html", "feed.html"}
+	"diff.html", "search.html", "static.html", "upload.html", "feed.html",
+	"list.html" }
 
 // templateStore controls access to map of parsed HTML templates. Make sure to lock and unlock as appropriate. See
 // renderTemplate and loadTemplates.

themes/index.md

@@ -12,5 +12,6 @@ your own sites.
 Theoretical themes:
 
 - [themes/chat](chat/README)
+- [themes/plain](plain/README)
 
 (Up to the [Welcome](../index) page.)

themes/plain/README.md

@@ -0,0 +1,19 @@
+Plain theme
+===========
+
+This makes it look as if the site consists mostly of editable plain
+text. Accordingly, the user interface has been simplified and there
+are no links to the preview, add, diff and upload actions and the
+corresponding templates have been deleted. There is no special static
+or feed template (mostly because the feed would depend on the list of
+links that isn't rendered).
+
+Now, the text is still saved in Markdown files and the Markdown is
+still rendered to HTML – but the "view" template just prints the page
+body inside a "pre" block and ignores the rendered HTML.
+
+This being text files, there are also no links to follow. That is why
+there's no link here back to themes. Sorry!
+
+This also means that you can only edit new files by editing the URL in
+the address bar of your browser since you can't link to them.

themes/plain/edit.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport" content="width=device-width">
+    <title>Editing {{.Title}}</title>
+    <style>
+form, textarea { width: 100% }
+    </style>
+  </head>
+  <body>
+    <form action="/save/{{.Name}}" method="POST">
+      <textarea name="body" rows="20" cols="80" lang="{{.Language}}" autofocus>{{printf "%s" .Body}}</textarea>
+      <p><input type="submit" value="Save">
+        <a href="/view/{{.Name}}"><button type="button">Cancel</button></a></p>
+    </form>
+  </body>
+</html>

themes/plain/search.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport" content="width=device-width">
+    <title>Search for {{.Query}}</title>
+    <style>
+header a { margin-right: 1ch; }
+form { display: inline-block; }
+input#search { width: 20ch; }
+button { background-color: #eee; color: inherit; border-radius: 4px; border-width: 1px; }
+.result { font-size: larger }
+.score { font-size: smaller; opacity: 0.8; }
+.image { display: inline-block; margin-right: 1em; max-width: calc(20% - 1em); font-size: small; }
+.image img { max-width: 100%; }
+    </style>
+  </head>
+  <body>
+    <header>
+      <a href="#main">Skip navigation</a>
+      <a href="/view/index">Home</a>
+      <form role="search" action="/search/{{.Dir}}" method="GET">
+        <label for="search">Search:</label>
+        <input id="search" type="text" value="{{.Query}}" spellcheck="false" name="q" accesskey="f" placeholder="term #tag title:term blog:true" required>
+        <button>Go</button>
+      </form>
+    </header>
+    <main id="main">
+      {{if .Results}}
+      <p>
+        {{if gt .Page 2}}<a href="/search/{{.Dir}}?q={{.Query}}&page=1">First</a>{{end}}
+        {{if gt .Page 1}}<a href="/search/{{.Dir}}?q={{.Query}}&page={{.Previous}}">Previous</a>{{end}}
+        Page {{.Page}}
+        {{if .More}}<a href="/search/{{.Dir}}?q={{.Query}}&page={{.Next}}">Next</a>{{end}}
+      {{range .Items}}
+      <article lang="{{.Language}}">
+        <p><a class="result" href="/view/{{.Name}}">{{.Title}}</a>
+          <span class="score">{{.Score}}</span></p>
+        <blockquote>{{.Html}}</blockquote>
+        {{range .Images}}
+        <p class="image"><a href="/view/{{.Name}}"><img loading="lazy" src="/view/{{.Name}}"></a><br/>{{.Html}}
+        {{end}}
+      </article>
+      {{end}}
+      <p>
+        {{if gt .Page 2}}<a href="/search/{{.Dir}}?q={{.Query}}&page=1">First</a>{{end}}
+        {{if gt .Page 1}}<a href="/search/{{.Dir}}?q={{.Query}}&page={{.Previous}}">Previous</a>{{end}}
+        Page {{.Page}}
+        {{if .More}}<a href="/search/{{.Dir}}?q={{.Query}}&page={{.Next}}">Next</a>{{end}}
+      {{else}}
+      <p>No results.</p>
+      {{end}}
+    </main>
+  </body>
+</html>

themes/plain/view.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="{{.Language}}">
+  <head>
+    <meta charset="utf-8">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport" content="width=device-width">
+    <title>{{.Title}}</title>
+  </head>
+  <body>
+    <header>
+      <a href="#main">Skip navigation</a>
+      <a href="/view/index">Home</a>
+      <a href="/edit/{{.Name}}" accesskey="e">Edit</a>
+      <form role="search" action="/search/{{.Dir}}" method="GET">
+        <label for="search">Search:</label>
+        <input id="search" type="text" spellcheck="false" name="q" accesskey="f" placeholder="term" required>
+        <button>Go</button>
+      </form>
+    </header>
+    <main>
+<pre>
+{{printf "%s" .Body}}
+</pre>
+    </main>
+  </body>
+</html>

themes/transjovian.org/README.md

@@ -1,6 +1,10 @@
 # Transjovian theme
 
-This theme uses a nearly-black background and bright blue links.
+This theme uses a nearly-black background and bright blue links. In
+other words, it always looks like dark mode. This could be annoying,
+but the site is for "a group of people living in the outer reaches of
+our system, beyond Jupiter", so always dark seems appropriate.
+
 There's an added "Raw" link that links to the Markdown file for the page.
 
 (Back up to the [list of themes](../index).)

tokenizer.go

@@ -1,10 +1,8 @@
 package main
 
 import (
-	"bytes"
 	"strings"
 	"unicode"
-	"unicode/utf8"
 )
 
 // lowercaseFilter returns a slice of lower case tokens.
@@ -133,33 +131,3 @@ func highlightTokens(q string) []string {
 	tokens = lowercaseFilter(tokens)
 	return noPredicateFilter(tokens)
 }
-
-// hashtags returns a slice of hashtags. Use this to extract hashtags
-// from a page body. This ignores Markdown completely.
-func hashtags(s []byte) []string {
-	hashtags := make([]string, 0)
-	for {
-		i := bytes.IndexRune(s, '#')
-		if i == -1 {
-			return hashtags
-		}
-		if i > 0 && s[i-1] == '\\' {
-			s = s[i+1:]
-			continue
-		}
-		from := i
-		i++
-		for {
-			r, n := utf8.DecodeRune(s[i:])
-			if n > 0 && (unicode.IsLetter(r) || unicode.IsNumber(r) || r == '_') {
-				i += n
-			} else {
-				break
-			}
-		}
-		if i > from+1 { // not just "#"
-			hashtags = append(hashtags, string(bytes.ToLower(s[from:i])))
-		}
-		s = s[i:]
-	}
-}

tokenizer_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestHashtags(t *testing.T) {
-	assert.EqualValues(t, []string{"#truth"}, hashtags([]byte("This is boring. #Truth")), "hashtags")
+	assert.EqualValues(t, []string{"Truth"}, hashtags([]byte("This is boring. #Truth")), "hashtags")
 }
 
 func TestEscapedHashtags(t *testing.T) {

upload.html

@@ -106,7 +106,7 @@ window.addEventListener('load', uploadFiles.init);
         Picture metadata is only removed if the pictures gets resized.
         Providing a new max width is recommended for all pictures.
         If you’re uploading multiple files, they are all renamed using the filename above and therefore they all get the same extension so they must be of the same type.
-      <p>To delete a file, upload an empty file.
+      <p>You can delete and rename files <a href="/list/{{.Dir}}">from the file list</a>.
       <p><label for="file">Files to upload:</label>
         <input type="file" name="file" required multiple>
       <p><input type="submit" value="Save">

wiki.go

@@ -179,6 +179,9 @@ func serve() {
 	http.HandleFunc("/append/", makeHandler(appendHandler, true))
 	http.HandleFunc("/upload/", makeHandler(uploadHandler, false))
 	http.HandleFunc("/drop/", makeHandler(dropHandler, false))
+	http.HandleFunc("/list/", makeHandler(listHandler, false))
+	http.HandleFunc("/delete/", makeHandler(deleteHandler, true))
+	http.HandleFunc("/rename/", makeHandler(renameHandler, true))
 	http.HandleFunc("/search/", makeHandler(searchHandler, false))
 	go scheduleLoadIndex()
 	go scheduleLoadLanguages()