Remove link to list from upload.html

It now tries to keep the links sorted.

.gitignore

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

Makefile

@@ -16,6 +16,8 @@ help:
 	@echo "    just build it"
 	@echo make install
 	@echo "    install the files to ~/.local"
+	@echo sudo make install PREFIX=/usr/local
+	@echo "    install the files to /usr/local"
 	@echo make upload
 	@echo "    this is how I upgrade my server"
 	@echo make dist
@@ -51,7 +53,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 $@
@@ -72,7 +74,7 @@ oddmu-windows-amd64.tar.gz: oddmu.exe
 
 %.tar.gz: %
 	tar --create --file $@ --transform='s/^$</oddmu/' --transform='s/^/oddmu\//' --exclude='*~' \
-	  $< Makefile *.socket *.service *.md man/Makefile man/*.1 man/*.5 man/*.7 themes/
+	  $< *.html Makefile *.socket *.service *.md man/Makefile man/*.1 man/*.5 man/*.7 themes/
 
 priv:
 	sudo setcap 'cap_net_bind_service=+ep' oddmu

README.md

@@ -1,28 +1,35 @@
-# Oddµ: A minimal wiki
+# Oddμ: A minimal wiki
 
-This program helps you run a minimal wiki, blog, digital garden, memex
-or Zettelkasten. There is no version history.
+Oddμ (or Oddmu) helps you run a minimal wiki, blog, digital garden,
+memex or Zettelkasten.
 
-It's well suited as a self-hosted, single-user web application, when
-there is no need for collaboration on the site itself. Links and email
-connect you to the rest of the net. The wiki can be public or private.
-Perhaps it just runs on your local machine, unreachable from the
-Internet.
-
-It's well suited as a secondary medium for a close-knit group:
-collaboration and conversation happens elsewhere, in chat, on social
-media. The wiki serves as the text repository that results from these
-discussions. As there are no logins and no version histories, it is
-not possible to undo vandalism and spam. Only allow people you trust
-write-access to the site.
-
-It's well suited as a simple static site generator. There are no
+Oddμ can be run as a static site generator, processing a directory
+with Markdown files, turning them into HTML files. HTML templates
+allow the customisation of headers, footers and styling. There are no
 plugins.
 
-When Oddµ runs as a web server, it serves all the Markdown files
+Oddμ is well suited as a self-hosted, single-user web application,
+when there is no need for collaboration on the site itself. Links and
+email connect you to the rest of the net. The wiki can be public or
+private.
+
+If the site is public, use a regular web server as a proxy to make
+people log in before making changes. As there is no version history,
+it is not possible to undo vandalism and spam. Only grant write-access
+to people you trust.
+
+If the site is private, running on a local machine and unreachable
+from the Internet, no such precautions are necessary.
+
+Oddμ is well suited as a secondary medium for a close-knit group:
+collaboration and conversation happens elsewhere, in chat, on social
+media. The wiki serves as the text repository that results from these
+discussions.
+
+When Oddμ runs as a web server, it serves all the Markdown files
 (ending in `.md`) as web pages. These pages can be edited via the web.
 
-Oddmu adds the following extensions to Markdown: local links `[[like
+Oddμ adds the following extensions to Markdown: local links `[[like
 this]]`, hashtags `#Like_This` and fediverse account links like
 `@alex@alexschroeder.ch`.
 
@@ -32,7 +39,7 @@ necessary.
 
 Other files can be uploaded and images (ending in `.jpg`, `.jpeg`,
 `.png`, `.heic` or `.webp`) can be resized when they are uploaded
-(resulting in `.jpg` or `.png` files).
+(resulting in `.jpg`, `.png` or `.webp` files).
 
 ## Documentation
 
@@ -42,15 +49,15 @@ available:
 
 [oddmu(1)](https://alexschroeder.ch/view/oddmu/oddmu.1): This man page
 has a short introduction to Oddmu, its configuration via templates and
-environment variables, plus points to the other man pages.
+environment variables, plus pointers to the other man pages.
 
 [oddmu(5)](https://alexschroeder.ch/view/oddmu/oddmu.5): This man page
-talks about the Markdown and includes some examples for the
-non-standard features such as table markup. It also talks about the
-Oddmu extensions to Markdown: wiki links, hashtags and fediverse
-account links. Local links must use percent encoding for page names so
-there is a section about percent encoding. The man page also explains
-how feeds are generated.
+talks about Markdown and includes some examples for the non-standard
+features such as table markup. It also talks about the Oddmu
+extensions to Markdown: wiki links, hashtags and fediverse account
+links. Local links must use percent encoding for page names so there
+is a section about percent encoding. The man page also explains how
+feeds are generated.
 
 [oddmu-releases(7)](https://alexschroeder.ch/view/oddmu/oddmu-releases.7):
 This man page lists all the Oddmu versions and their user-visible
@@ -138,6 +145,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):
@@ -163,8 +174,6 @@ make docs
 The `Makefile` in the `man` directory has targets to create Markdown
 and HTML files.
 
-The HEIC library uses C code and prevents cross-compilation.
-
 As the repository changed URLs a few times (from GitHub, to
 self-hosted using `cgit` to self-hosted using `legit`), there is no
 way to install it using `go install`. You need to `git clone` the
@@ -205,9 +214,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 +247,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
@@ -275,18 +285,10 @@ extensions can be added.
 
 ### Filenames and URL path
 
-One of the sad parts of the code is the distinction between path and
-filepath. On a Linux system, this doesn't matter. I suspect that it
-also doesn't matter on MacOS and Windows because the file systems
-handle forward slashes just fine. The code still tries to do the right
-thing. A path that is derived from a URL is a path with slashes.
-Before accessing a file, it has to be turned into a filepath using
-`filepath.FromSlashes` and in the rare case where the inverse happens,
-use `filepath.ToSlashes`. Any path received via the URL path uses
-slashes and needs to be converted to a filepath before passing it to
-any `os` function. Any path received within a `path/filepath.WalkFunc`
-is a filepath and needs to be converted to use slashes when used in
-HTML output.
+There are some simplifications made. The code doesn't consider the
+various encodings (UTF-8 NFC on the web vs UTF-8 NFD for HFS+, for
+example; it also doesn't check for characters in page names that are
+illegal filenames on the filesystem used).
 
 If you need to access the page name in code that is used from a
 template, you have to decode the path. See the code in `diff.go` for
@@ -307,6 +309,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
@@ -328,9 +344,12 @@ in turn can be used by browsers to get hyphenation right. Apache-2.0.
 is used to sniff the MIME type of files with unknown filename
 extensions. MIT.
 
-[github.com/gen2brain/heic](https://github.com/gen2brain/heic) is
-used to decode HEIC files (the new default file format for photos on
-iPhones). LGPL-3.0-only.
+[github.com/gen2brain/heic](https://github.com/gen2brain/heic) is used
+to decode HEIC files (the new default file format for photos on
+iPhones). MIT.
+
+[github.com/gen2brain/webp](https://github.com/gen2brain/webp) is used
+to encode and decode WebP files. MIT.
 
 [github.com/disintegration/imaging](https://github.com/disintegration/imaging)
 is used to resize images. MIT.

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
 
@@ -11,4 +13,10 @@ When preparing a new release
 
 5. Tag the release and push the tag to all remotes
 
-6. cd man && make upload
+6. cd man && make upload
+
+7. make dist
+
+8. create a new release at https://github.com/kensanata/oddmu/releases
+
+9. upload the four .tar.gz binaries to the GitHub release

add.html

@@ -3,20 +3,23 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>Add to {{.Title}}</title>
     <style>
-html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe; }
-form, textarea { width: 100%; }
+html { max-width: 70ch; padding: 1ch; height: calc(100% - 2ch); margin: auto }
+body { hyphens: auto; color: #111; background-color: #ffe; margin: 0; padding: 0; height: 100%; display: flex; flex-flow: column }
+form, textarea { box-sizing: border-box; width: 100%; font-size: inherit }
+#editor { flex: 1 1 auto; display: flex; flex-flow: column }
+textarea { flex: 1 1 auto }
     </style>
   </head>
   <body>
     <h1>Adding to {{.Title}}</h1>
-    <form action="/append/{{.Name}}" method="POST">
+    <form id="editor" action="/append/{{.Path}}" method="POST">
       <textarea name="body" rows="20" cols="80" placeholder="Text" lang="{{.Language}}" autofocus required></textarea>
       <p><label><input type="checkbox" name="notify" checked> Add link to <a href="/view/changes">the list of changes</a>.</label></p>
       <p><input type="submit" value="Add">
-        <a href="/view/{{.Name}}"><button type="button">Cancel</button></a></p>
+        <a href="/view/{{.Path}}"><button type="button">Cancel</button></a></p>
     </form>
   </body>
 </html>

add_append.go

@@ -48,7 +48,7 @@ func appendHandler(w http.ResponseWriter, r *http.Request, name string) {
 			return
 		}
 	}
-	http.Redirect(w, r, "/view/"+name, http.StatusFound)
+	http.Redirect(w, r, "/view/" + nameEscape(name), http.StatusFound)
 }
 
 func (p *Page) append(body []byte) {

add_append_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/stretchr/testify/assert"
+	"net/http"
 	"net/url"
 	"os"
 	"regexp"
@@ -34,15 +35,15 @@ It's not `)}
 	data.Set("body", "barbecue")
 
 	assert.Regexp(t, regexp.MustCompile("a distant fire"),
-		assert.HTTPBody(makeHandler(viewHandler, false),
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet),
 			"GET", "/view/testdata/add/fire", nil))
 	assert.NotRegexp(t, regexp.MustCompile("a distant fire"),
-		assert.HTTPBody(makeHandler(addHandler, true),
+		assert.HTTPBody(makeHandler(addHandler, true, http.MethodGet),
 			"GET", "/add/testdata/add/fire", nil))
-	HTTPRedirectTo(t, makeHandler(appendHandler, true),
+	HTTPRedirectTo(t, makeHandler(appendHandler, true, http.MethodPost),
 		"POST", "/append/testdata/add/fire", data, "/view/testdata/add/fire")
 	assert.Regexp(t, regexp.MustCompile(`not</p>\s*<p>barbecue`),
-		assert.HTTPBody(makeHandler(viewHandler, false),
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet),
 			"GET", "/view/testdata/add/fire", nil))
 }
 
@@ -57,7 +58,7 @@ Blue and green and pebbles gray
 	data := url.Values{}
 	data.Set("body", "Stand in cold water")
 	data.Add("notify", "on")
-	HTTPRedirectTo(t, makeHandler(appendHandler, true),
+	HTTPRedirectTo(t, makeHandler(appendHandler, true, http.MethodPost),
 		"POST", "/append/testdata/append/"+today+"-water",
 		data, "/view/testdata/append/"+today+"-water")
 	// The changes.md file was created

archive.go

@@ -16,7 +16,7 @@ import (
 // are skipped. If the environment variable ODDMU_FILTER is a regular expression that matches the starting directory,
 // this is a "separate site"; if the regular expression does not match, this is the "main site" and page names must also
 // not match the regular expression.
-func archiveHandler(w http.ResponseWriter, r *http.Request, path string) {
+func archiveHandler(w http.ResponseWriter, r *http.Request, name string) {
 	filter := os.Getenv("ODDMU_FILTER")
 	re, err := regexp.Compile(filter)
 	if err != nil {
@@ -24,30 +24,30 @@ func archiveHandler(w http.ResponseWriter, r *http.Request, path string) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	matches := re.MatchString(path)
-	dir := filepath.Dir(filepath.FromSlash(path))
+	matches := re.MatchString(name)
+	dir := filepath.Dir(filepath.FromSlash(name))
 	z := zip.NewWriter(w)
-	err = filepath.Walk(dir, func(path string, info fs.FileInfo, err error) error {
+	err = filepath.Walk(dir, func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		if info.IsDir() {
-			if path != "." && strings.HasPrefix(filepath.Base(path), ".") {
+			if fp != "." && strings.HasPrefix(filepath.Base(fp), ".") {
 				return filepath.SkipDir
 			}
-		} else if !strings.HasPrefix(filepath.Base(path), ".") &&
-			(matches || !re.MatchString(path)) {
-			zf, err := z.Create(path)
+		} else if !strings.HasPrefix(filepath.Base(fp), ".") &&
+			(matches || !re.MatchString(filepath.ToSlash(fp))) {
+			zf, err := z.Create(fp)
 			if err != nil {
 				log.Println(err)
 				return err
 			}
-			file, err := os.Open(path)
+			f, err := os.Open(fp)
 			if err != nil {
 				log.Println(err)
 				return err
 			}
-			_, err = io.Copy(zf, file)
+			_, err = io.Copy(zf, f)
 			if err != nil {
 				log.Println(err)
 				return err

archive_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"archive/zip"
 	"github.com/stretchr/testify/assert"
+	"net/http"
 	"os"
 	"strings"
 	"testing"
@@ -15,7 +16,7 @@ func TestArchive(t *testing.T) {
 	assert.NoError(t, os.WriteFile("testdata/archive/public/index.md", []byte("# Public\nChurch tower bells ringing\nA cold wind biting my ears\nWalk across the square"), 0644))
 	assert.NoError(t, os.WriteFile("testdata/archive/secret/index.md", []byte("# Secret\nMany years ago I danced\nSpending nights in clubs and bars\nIt is my secret"), 0644))
 	os.Setenv("ODDMU_FILTER", "^testdata/archive/secret/")
-	body := assert.HTTPBody(makeHandler(archiveHandler, true), "GET", "/archive/testdata/data.zip", nil)
+	body := assert.HTTPBody(makeHandler(archiveHandler, true, http.MethodGet), "GET", "/archive/testdata/data.zip", nil)
 	r, err := zip.NewReader(strings.NewReader(body), int64(len(body)))
 	assert.NoError(t, err, "Unzip")
 	names := []string{}

changes.go

@@ -20,10 +20,10 @@ func (p *Page) notify() error {
 	if p.Title == "" {
 		p.Title = p.Name
 	}
-	esc := nameEscape(path.Base(p.Name))
+	esc := nameEscape(p.Base())
 	link := "* [" + p.Title + "](" + esc + ")\n"
 	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(` + esc + `\)\n`)
-	dir := path.Dir(p.Name)
+	dir := p.Dir()
 	err := addLinkWithDate(path.Join(dir, "changes"), link, re)
 	if err != nil {
 		log.Printf("Updating changes in %s failed: %s", dir, err)
@@ -31,7 +31,7 @@ func (p *Page) notify() error {
 	}
 	if p.IsBlog() {
 		// Add to the index only if the blog post is for the current year
-		if strings.HasPrefix(path.Base(p.Name), time.Now().Format("2006")) {
+		if strings.HasPrefix(p.Base(), time.Now().Format("2006")) {
 			err := addLink(path.Join(dir, "index"), true, link, re)
 			if err != nil {
 				log.Printf("Updating index in %s failed: %s", dir, err)
@@ -154,21 +154,56 @@ func addLink(name string, mandatory bool, link string, re *regexp.Regexp) error
 		}
 	}
 	org := string(p.Body)
+	addLinkToPage(p, link, re)
+	// only save if something changed
+	if string(p.Body) != org {
+		return p.save()
+	}
+	return nil
+}
+
+func addLinkToPage(p *Page, link string, re *regexp.Regexp) {
 	// if a link exists, that's the place to insert the new link (in which case loc[0] and loc[1] differ)
 	loc := re.FindIndex(p.Body)
 	// if no link exists, find a good place to insert it
 	if loc == nil {
-		// locate the beginning of the list to insert the line
-		re = regexp.MustCompile(`(?m)^\* \[[^\]]+\]\([^\)]+\)\n`)
-		loc = re.FindIndex(p.Body)
-		if loc == nil {
-			// if no list was found, use the end of the page
-			m := len(p.Body)
-			loc = []int{m, m}
-		} else {
-			// if a list item was found, use just the beginning as insertion point
-			loc[1] = loc[0]
+		// locate the list items
+		re = regexp.MustCompile(`(?m)^\* \[[^\]]+\]\([^\)]+\)\n?`)
+		items := re.FindAllIndex(p.Body, -1)
+		first := false
+		pos := -1
+		// skip newer items
+		for i, it := range items {
+			// break if the current line is older (earlier in sort order)
+			stop := string(p.Body[it[0]:it[1]]) < link
+			// before the first match is always a good insert point
+			if i == 0 {
+				pos = it[0]
+				first = true
+			}
+			// if we're not stopping, then after the current item is a good insert point
+			if !stop {
+				pos = it[1]
+				first = false
+			} else {
+				break
+			}
 		}
+		// otherwise it's at the end of the list, after the last item
+		if pos == -1 && len(items) > 0 {
+			pos = items[len(items)-1][1]
+			first = false
+		}
+		// if no list was found, use the end of the page
+		if pos == -1 {
+			pos = len(p.Body)
+			first = true
+		}
+		if first {
+			p.Body, pos = ensureTwoNewlines(p.Body, pos)
+		}
+		// mimic a zero-width match at the insert point
+		loc = []int{pos, pos}
 	}
 	// start with new page content
 	r := []byte("")
@@ -179,9 +214,27 @@ func addLink(name string, mandatory bool, link string, re *regexp.Regexp) error
 	// append the rest
 	r = append(r, p.Body[loc[1]:]...)
 	p.Body = r
-	// only save if something changed
-	if string(p.Body) != org {
-		return p.save()
-	}
-	return nil
+}
+
+// ensureTwoNewlines makes sure that the two bytes before pos in buf are newlines. If the are not, newlines are inserted
+// and pos is increased. The new buf and pos is returned.
+func ensureTwoNewlines(buf []byte, pos int) ([]byte, int) {
+	var insert []byte
+	if pos >= 1 && buf[pos-1] != '\n' {
+		// add two newlines if buf doesn't end with a newline
+		insert = []byte("\n\n")
+	} else if pos >= 2 && buf[pos-2] != '\n' {
+		// add one newline if Body ends with just one newline
+		insert = []byte("\n")
+	}
+	if insert != nil {
+		r := []byte("")
+		r = append(r, buf[:pos]...)
+		r = append(r, insert...)
+		r = append(r, buf[pos:]...)
+		buf = r
+		pos += len(insert)
+
+	}
+	return buf, pos
 }

changes_test.go

@@ -3,12 +3,67 @@ package main
 import (
 	"github.com/stretchr/testify/assert"
 	"os"
+	"regexp"
 	"testing"
 	"time"
 )
 
 // Note TestEditSaveChanges and TestAddAppendChanges.
 
+func TestAddLinkToPageWithNoList(t *testing.T) {
+	// no newlines
+	title := "# Test"
+	p := &Page{Body: []byte(title)}
+	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(2025-08-08\)\n`)
+	link := "* [2025-08-08](2025-08-08)\n"
+	addLinkToPage(p, link, re)
+	assert.Equal(t, title + "\n\n" + link, string(p.Body))
+}
+
+func TestAddLinkToPageWithOlderLink(t *testing.T) {
+	// one newline
+	title := "# Test\n"
+	old := "* [2025-08-08](2025-08-08)\n"
+	p := &Page{Body: []byte(title + old)}
+	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(2025-08-10\)\n`)
+	link := "* [2025-08-10](2025-08-10)\n"
+	addLinkToPage(p, link, re)
+	assert.Equal(t, title + "\n" + link + old, string(p.Body))
+}
+
+func TestAddLinkToPageBetweenToExistingLinks(t *testing.T) {
+	title := "# Test\n\n"
+	new := "* [2025-08-10](2025-08-10)\n"
+	old := "* [2025-08-08](2025-08-08)\n"
+	p := &Page{Body: []byte(title + new + old)}
+	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(2025-08-09\)\n`)
+	link := "* [2025-08-09](2025-08-09)\n"
+	addLinkToPage(p, link, re)
+	assert.Equal(t, title + new + link + old, string(p.Body))
+}
+
+func TestAddLinkToPageBetweenToExistingLinks2(t *testing.T) {
+	title := "# Test\n\n"
+	new := "* [2025-08-10](2025-08-10)\n* [2025-08-09](2025-08-09)\n"
+	old := "* [2025-08-07](2025-08-07)\n"
+	p := &Page{Body: []byte(title + new + old)}
+	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(2025-08-08\)\n`)
+	link := "* [2025-08-08](2025-08-08)\n"
+	addLinkToPage(p, link, re)
+	assert.Equal(t, title + new + link + old, string(p.Body))
+}
+
+func TestAddLinkToPageAtTheEnd(t *testing.T) {
+	title := "# Test\n\n"
+	new := "* [2025-08-10](2025-08-10)\n"
+	old := "* [2025-08-08](2025-08-08)\n"
+	p := &Page{Body: []byte(title + new + old)}
+	re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(2025-08-07\)\n`)
+	link := "* [2025-08-07](2025-08-07)\n"
+	addLinkToPage(p, link, re)
+	assert.Equal(t, title + new + old + link, string(p.Body))
+}
+
 func TestChanges(t *testing.T) {
 	cleanup(t, "testdata/washing")
 	today := time.Now().Format(time.DateOnly)
@@ -48,7 +103,8 @@ Home away from home
 	assert.Contains(t, string(s), line)
 	s, err = os.ReadFile("testdata/changes/Haiku.md")
 	assert.NoError(t, err)
-	assert.Equal(t, intro+line, string(s))
+	// ensure an empty line when adding at the end of the page
+	assert.Equal(t, intro+"\n"+line, string(s))
 	assert.NoFileExists(t, "testdata/changes/Poetry.md")
 }
 

diff.go

@@ -6,7 +6,6 @@ import (
 	"html"
 	"html/template"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -25,11 +24,7 @@ func diffHandler(w http.ResponseWriter, r *http.Request, name string) {
 
 // Diff computes the diff for a page. At this point, renderHtml has already been called so the Name is escaped.
 func (p *Page) Diff() template.HTML {
-	path, err := url.PathUnescape(p.Name)
-	if err != nil {
-		return template.HTML("Cannot unescape " + p.Name)
-	}
-	fp := filepath.FromSlash(path)
+	fp := filepath.FromSlash(p.Name)
 	a := fp + ".md~"
 	t1, err := os.ReadFile(a)
 	if err != nil {

diff.html

@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>{{.Title}}</title>
     <style>
-html { max-width: 70ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe; }
-body { hyphens: auto; }
+html { max-width: 70ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe }
+body { hyphens: auto }
 del  { background-color: #fab }
 ins  { background-color: #af8 }
 pre { white-space: normal; background-color: white; border: 1px solid #eee; padding: 1ch }
@@ -15,11 +15,11 @@ pre { white-space: normal; background-color: white; border: 1px solid #eee; padd
   </head>
   <body>
     <header>
-      <a href="/view/{{.Name}}">Back</a>
+      <a href="/view/{{.Path}}">Back</a>
     </header>
     <main id="main">
       <h1>{{.Title}}</h1>
-      <p>This is the diff between <a href="/view/{{.Name}}.md~">the backup</a> and <a href="/view/{{.Name}}.md">the current copy</a>.</p>
+      <p>This is the diff between <a href="/view/{{.Path}}.md~">the backup</a> and <a href="/view/{{.Path}}.md">the current copy</a>.</p>
       <pre>
 {{.Diff}}
       </pre>

diff_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/stretchr/testify/assert"
+	"net/http"
 	"os"
 	"testing"
 	"time"
@@ -24,7 +25,7 @@ Oh so fresh, so warm.`
 	p.save()
 	p.Body = []byte(r)
 	p.save()
-	body := assert.HTTPBody(makeHandler(diffHandler, true),
+	body := assert.HTTPBody(makeHandler(diffHandler, true, http.MethodGet),
 		"GET", "/diff/testdata/diff/bread", nil)
 	assert.Contains(t, body, `<del>breathe</del>`)
 	assert.Contains(t, body, `<ins>whisper</ins>`)
@@ -47,7 +48,7 @@ Mispronouncing words`
 	p.save()
 	p.Body = []byte(r)
 	p.save()
-	body := assert.HTTPBody(makeHandler(diffHandler, true),
+	body := assert.HTTPBody(makeHandler(diffHandler, true, http.MethodGet),
 		"GET", "/diff/testdata/diff/coup%20de%20grace", nil)
 	assert.Contains(t, body, `<del>s</del>`)
 	assert.Contains(t, body, `<ins>ce</ins>`)
@@ -70,6 +71,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 +80,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

@@ -3,23 +3,27 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <base href="/view/{{.Dir}}">
     <title>Editing {{.Title}}</title>
     <style>
-html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe; }
-form, textarea { width: 100%; }
+html { max-width: 70ch; padding: 1ch; height: calc(100% - 2ch); margin: auto }
+body { hyphens: auto; color: #111; background-color: #ffe; margin: 0; padding: 0; height: 100%; display: flex; flex-flow: column }
+form, textarea { box-sizing: border-box; width: 100%; font-size: inherit }
+#editor { flex: 1 1 auto; display: flex; flex-flow: column }
+textarea { flex: 1 1 auto }
     </style>
   </head>
   <body>
     <h1>Editing {{.Title}}</h1>
-    <form action="/save/{{.Name}}" method="POST">
+    <form id="editor" action="/save/{{.Path}}" method="POST">
       <textarea name="body" rows="20" cols="80" placeholder="# Title
 
 Text" lang="{{.Language}}" autofocus>{{printf "%s" .Body}}</textarea>
       <p><label><input type="checkbox" name="notify" checked> Add link to <a href="changes">the list of changes</a>.</label></p>
       <p><input type="submit" value="Save">
-        <button formaction="/preview/{{.Name}}" type="submit">Preview</button>
-        <a href="/view/{{.Name}}"><button type="button">Cancel</button></a></p>
+        <button formaction="/preview/{{.Path}}" type="submit">Preview</button>
+        <a href="/view/{{.Path}}"><button type="button">Cancel</button></a></p>
     </form>
   </body>
 </html>

edit_save.go

@@ -41,5 +41,5 @@ func saveHandler(w http.ResponseWriter, r *http.Request, name string) {
 			return
 		}
 	}
-	http.Redirect(w, r, "/view/"+name, http.StatusFound)
+	http.Redirect(w, r, "/view/" + nameEscape(name), http.StatusFound)
 }

edit_save_test.go

@@ -16,24 +16,24 @@ func TestEditSave(t *testing.T) {
 	data.Set("body", "Hallo!")
 
 	// View of the non-existing page redirects to the edit page
-	HTTPRedirectTo(t, makeHandler(viewHandler, false),
+	HTTPRedirectTo(t, makeHandler(viewHandler, false, http.MethodGet),
 		"GET", "/view/testdata/save/alex", nil, "/edit/testdata/save/alex")
 	// Edit page can be fetched
-	assert.HTTPStatusCode(t, makeHandler(editHandler, true),
+	assert.HTTPStatusCode(t, makeHandler(editHandler, true, http.MethodGet),
 		"GET", "/edit/testdata/save/alex", nil, 200)
 	// Posting to the save URL saves a page
-	HTTPRedirectTo(t, makeHandler(saveHandler, true),
+	HTTPRedirectTo(t, makeHandler(saveHandler, true, http.MethodPost),
 		"POST", "/save/testdata/save/alex", data, "/view/testdata/save/alex")
 	// Page now contains the text
-	assert.Contains(t, assert.HTTPBody(makeHandler(viewHandler, false),
+	assert.Contains(t, assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet),
 		"GET", "/view/testdata/save/alex", nil),
 		"Hallo!")
 	// Delete the page and you're sent to the empty page
 	data.Set("body", "")
-	HTTPRedirectTo(t, makeHandler(saveHandler, true),
+	HTTPRedirectTo(t, makeHandler(saveHandler, true, http.MethodPost),
 		"POST", "/save/testdata/save/alex", data, "/view/testdata/save/alex")
 	// Viewing the non-existing page redirects to the edit page (like in the beginning)
-	HTTPRedirectTo(t, makeHandler(viewHandler, false),
+	HTTPRedirectTo(t, makeHandler(viewHandler, false, http.MethodGet),
 		"GET", "/view/testdata/save/alex", nil, "/edit/testdata/save/alex")
 }
 
@@ -44,7 +44,7 @@ func TestEditSaveChanges(t *testing.T) {
 	data.Add("notify", "on")
 	today := time.Now().Format("2006-01-02")
 	// Posting to the save URL saves a page
-	HTTPRedirectTo(t, makeHandler(saveHandler, true),
+	HTTPRedirectTo(t, makeHandler(saveHandler, true, http.MethodPost),
 		"POST", "/save/testdata/notification/"+today,
 		data, "/view/testdata/notification/"+today)
 	// The changes.md file was created
@@ -73,15 +73,15 @@ func TestEditId(t *testing.T) {
 	cleanup(t, "testdata/id")
 	data := url.Values{}
 	data.Set("id", "testdata/id/alex")
-	assert.HTTPStatusCode(t, makeHandler(editHandler, true),
+	assert.HTTPStatusCode(t, makeHandler(editHandler, true, http.MethodGet),
 		"GET", "/edit/", data, http.StatusBadRequest,
 		"No slashes in id")
 	data.Set("id", ".alex")
-	assert.HTTPStatusCode(t, makeHandler(editHandler, true),
+	assert.HTTPStatusCode(t, makeHandler(editHandler, true, http.MethodGet),
 		"GET", "/edit/", data, http.StatusForbidden,
 		"No hidden files")
 	data.Set("id", "alex")
-	assert.Contains(t, assert.HTTPBody(makeHandler(editHandler, true),
+	assert.Contains(t, assert.HTTPBody(makeHandler(editHandler, true, http.MethodGet),
 		"GET", "/edit/testdata/id/", data),
 		"Editing testdata/id/alex")
 }

export_cmd.go

@@ -34,10 +34,6 @@ func (*exportCmd) Usage() string {
   it:
 
     oddmu export > /tmp/export.rss
-
-  Options:
-
-  -template "filename" specifies the template to use (default: feed.html)
 `
 }
 

export_cmd_test.go

@@ -13,8 +13,8 @@ func TestExportCmd(t *testing.T) {
 	b := new(bytes.Buffer)
 	s := exportCli(b, "feed.html", minimalIndex(t))
 	assert.Equal(t, subcommands.ExitSuccess, s)
-	assert.Contains(t, b.String(), "<title>Oddµ: A minimal wiki</title>")
-	assert.Contains(t, b.String(), "<title>Welcome to Oddµ</title>")
+	assert.Contains(t, b.String(), "<title>Oddμ: A minimal wiki</title>")
+	assert.Contains(t, b.String(), "<title>Welcome to Oddμ</title>")
 }
 
 func TestExportCmdLanguage(t *testing.T) {
@@ -50,6 +50,6 @@ func TestExportCmdJsonFeed(t *testing.T) {
 	b := new(bytes.Buffer)
 	s := exportCli(b, "testdata/json/template.json", minimalIndex(t))
 	assert.Equal(t, subcommands.ExitSuccess, s)
-	assert.Contains(t, b.String(), `"title": "Oddµ: A minimal wiki"`)
-	assert.Regexp(t, regexp.MustCompile("&lt;h1.*&gt;Welcome to Oddµ&lt;/h1&gt;"), b.String()) // skip id
+	assert.Contains(t, b.String(), `"title": "Oddμ: A minimal wiki"`)
+	assert.Regexp(t, regexp.MustCompile("&lt;h1.*&gt;Welcome to Oddμ&lt;/h1&gt;"), b.String()) // skip id
 }

feed.go

@@ -63,7 +63,7 @@ func feed(p *Page, ti time.Time) *Feed {
 		if !ok || bytes.Contains(link.Destination, []byte("//")) {
 			return ast.GoToNext
 		}
-		name := path.Join(path.Dir(p.Name), string(link.Destination))
+		name := path.Join(p.Dir(), string(link.Destination))
 		fi, err := os.Stat(filepath.FromSlash(name) + ".md")
 		if err != nil {
 			return ast.GoToNext

feed.html

@@ -5,7 +5,7 @@
     <link>https://example.org/</link>
     <managingEditor>you@example.org (Your Name)</managingEditor>
     <webMaster>you@example.org (Your Name)</webMaster>
-    <atom:link href="https://example.org/view/{{.Name}}.rss" rel="self" type="application/rss+xml"/>
+    <atom:link href="https://example.org/view/{{.Path}}.rss" rel="self" type="application/rss+xml"/>
     <description>This is the digital garden of Your Name.</description>
     <image>
       <url>https://example.org/view/logo.jpg</url>
@@ -15,8 +15,8 @@
     {{range .Items}}
     <item>
       <title>{{.Title}}</title>
-      <link>https://example.org/view/{{.Name}}</link>
-      <guid>https://example.org/view/{{.Name}}</guid>
+      <link>https://example.org/view/{{.Path}}</link>
+      <guid>https://example.org/view/{{.Path}}</guid>
       <description>{{.Html}}</description>
       <pubDate>{{.Date}}</pubDate>
       {{range .Hashtags}}

feed_test.go

@@ -8,13 +8,13 @@ import (
 
 func TestFeed(t *testing.T) {
 	assert.Contains(t,
-		assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/index.rss", nil),
-		"Welcome to Oddµ")
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/index.rss", nil),
+		"Welcome to Oddμ")
 }
 
 func TestNoFeed(t *testing.T) {
 	assert.HTTPStatusCode(t,
-		makeHandler(viewHandler, false), "GET", "/view/no-feed.rss", nil, http.StatusNotFound)
+		makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/no-feed.rss", nil, http.StatusNotFound)
 }
 
 func TestFeedItems(t *testing.T) {
@@ -44,7 +44,7 @@ Writing poems about plants.
 * [My Dragon Tree](dragon)`)}
 	p3.save()
 
-	body := assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/testdata/feed/plants.rss", nil)
+	body := assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/testdata/feed/plants.rss", nil)
 	assert.Contains(t, body, "<title>Plants</title>")
 	assert.Contains(t, body, "<title>Cactus</title>")
 	assert.Contains(t, body, "<title>Dragon</title>")

go.mod

@@ -9,7 +9,9 @@ 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/gen2brain/webp v0.5.2
+	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
@@ -23,15 +25,14 @@ require (
 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/ebitengine/purego v0.8.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
 	github.com/rivo/uniseg v0.4.6 // indirect
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/tetratelabs/wazero v1.7.3 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
 	golang.org/x/image v0.15.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect

go.sum

@@ -5,20 +5,20 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA=
-github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
+github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f h1:RMnUwTnNR070mFAEIoqMYjNirHj8i0h79VXTYyBCyVA=
 github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f/go.mod h1:KoE3Ti1qbQXCb3s/XGj0yApHnbnNnn1bXTtB5Auq/Vc=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 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/gen2brain/webp v0.5.2 h1:aYdjbU/2L98m+bqUdkYMOIY93YC+EN3HuZLMaqgMD9U=
+github.com/gen2brain/webp v0.5.2/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
+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=
@@ -57,8 +57,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tetratelabs/wazero v1.7.3 h1:PBH5KVahrt3S2AHgEjKu4u+LlDbbk+nsGE3KLucy6Rw=
-github.com/tetratelabs/wazero v1.7.3/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -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.go

@@ -5,15 +5,26 @@ import (
 	"flag"
 	"fmt"
 	"github.com/google/subcommands"
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/ast"
+	"github.com/hexops/gotextdiff"
+	"github.com/hexops/gotextdiff/myers"
+	"github.com/hexops/gotextdiff/span"
 	"io"
 	"os"
+	"regexp"
 	"sort"
+	"strings"
 )
 
 type hashtagsCmd struct {
+	update bool
+	dryRun bool
 }
 
 func (cmd *hashtagsCmd) SetFlags(f *flag.FlagSet) {
+	f.BoolVar(&cmd.update, "update", false, "create and update hashtag pages")
+	f.BoolVar(&cmd.dryRun, "dry-run", false, "only report the changes it would make")
 }
 
 func (*hashtagsCmd) Name() string     { return "hashtags" }
@@ -25,6 +36,9 @@ func (*hashtagsCmd) Usage() string {
 }
 
 func (cmd *hashtagsCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+	if cmd.update {
+		return hashtagsUpdateCli(os.Stdout, cmd.dryRun)
+	}
 	return hashtagsCli(os.Stdout)
 }
 
@@ -57,3 +71,138 @@ func hashtagsCli(w io.Writer) subcommands.ExitStatus {
 
 	return subcommands.ExitSuccess
 }
+
+// hashtagsUpdateCli runs the hashtags command on the command line and creates and updates the hashtag pages in the
+// current directory. That is, pages in subdirectories are skipped! It is used here with an io.Writer for easy testing.
+func hashtagsUpdateCli(w io.Writer, dryRun bool) subcommands.ExitStatus {
+	index.load()
+	// no locking necessary since this is for the command-line
+	namesMap := make(map[string]string)
+	for hashtag, docids := range index.token {
+		if len(docids) <= 5 {
+			if dryRun {
+				fmt.Fprintf(w, "Skipping #%s because there are not enough entries (%d)\n", hashtag, len(docids))
+			}
+			continue
+		}
+		title, ok := namesMap[hashtag]
+		if (!ok) {
+			title = hashtagName(namesMap, hashtag, docids)
+			namesMap[hashtag] = title
+		}
+		pageName := strings.ReplaceAll(title, " ", "_")
+		h, err := loadPage(pageName)
+		original := ""
+		new := false
+		if err != nil {
+			new = true
+			h = &Page{Name: pageName, Body: []byte("# " + title + "\n\n#" + pageName + "\n\nBlog posts:\n\n")}
+		} else {
+			original = string(h.Body)
+		}
+		for _, docid := range docids {
+			name := index.documents[docid]
+			if strings.Contains(name, "/") {
+				continue
+			}
+			p, err := loadPage(name)
+			if err != nil {
+				fmt.Fprintf(w, "Loading %s: %s\n", name, err)
+				return subcommands.ExitFailure
+			}
+			if !p.IsBlog() {
+				continue
+			}
+			p.handleTitle(false)
+			if p.Title == "" {
+				p.Title = p.Name
+			}
+			esc := nameEscape(p.Base())
+			link := "* [" + p.Title + "](" + esc + ")\n"
+			// I guess & used to get escaped and now no longer does
+			re := regexp.MustCompile(`(?m)^\* \[[^\]]+\]\(` + strings.ReplaceAll(esc, "&", "(&|%26)") + `\)\n`)
+			addLinkToPage(h, link, re)
+		}
+		// only save if something changed
+		if string(h.Body) != original {
+			if dryRun {
+				if new {
+					fmt.Fprintf(w, "Creating %s.md\n", title)
+				} else {
+					fmt.Fprintf(w, "Updating %s.md\n", title)
+				}
+				fn := h.Name + ".md"
+				edits := myers.ComputeEdits(span.URIFromPath(fn), original, string(h.Body))
+				diff := fmt.Sprint(gotextdiff.ToUnified(fn + "~", fn, original, edits))
+				fmt.Fprint(w, diff)
+			} else {
+				err = h.save()
+				if err != nil {
+					fmt.Fprintf(w, "Saving hashtag %s failed: %s", hashtag, err)
+					return subcommands.ExitFailure
+				}
+			}
+		}
+	}
+	return subcommands.ExitSuccess
+}
+
+// Go through all the documents in the same directory and look for hashtag matches in the rendered HTML in order to
+// determine the most likely capitalization.
+func hashtagName (namesMap map[string]string, hashtag string, docids []docid) string {
+	candidate := make(map[string]int)
+	var mostPopular string
+	for _, docid := range docids {
+		name := index.documents[docid]
+		if strings.Contains(name, "/") {
+			continue
+		}
+		p, err := loadPage(name)
+		if err != nil {
+			continue
+		}
+		// parsing finds all the hashtags
+		parser, _ := wikiParser()
+		doc := markdown.Parse(p.Body, parser)
+		ast.WalkFunc(doc, func(node ast.Node, entering bool) ast.WalkStatus {
+			if entering {
+				switch v := node.(type) {
+				case *ast.Link:
+					for _, attr := range v.AdditionalAttributes {
+						if attr == `class="tag"` {
+							tagName := []byte("")
+							ast.WalkFunc(v, func(node ast.Node, entering bool) ast.WalkStatus {
+								if entering && node.AsLeaf() != nil {
+									tagName = append(tagName, node.AsLeaf().Literal...)
+								}
+								return ast.GoToNext
+							})
+							tag := string(tagName[1:])
+							if strings.EqualFold(hashtag, strings.ReplaceAll(tag, " ", "_")) {
+								_, ok := candidate[tag]
+								if ok {
+									candidate[tag] += 1
+								} else {
+									candidate[tag] = 1
+								}
+							}
+						}
+					}
+				}
+			}
+			return ast.GoToNext
+		})
+		count := 0
+		for key, val := range candidate {
+			if val > count {
+				mostPopular = key
+				count = val
+			}
+		}
+		// shortcut
+		if count >= 5 {
+			return mostPopular
+		}
+	}
+	return mostPopular
+}

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")
 }

html_cmd.go

@@ -7,30 +7,32 @@ import (
 	"github.com/google/subcommands"
 	"io"
 	"os"
+	"strings"
 )
 
 type htmlCmd struct {
-	useTemplate bool
+	template string
 }
 
 func (*htmlCmd) Name() string     { return "html" }
 func (*htmlCmd) Synopsis() string { return "render a page as HTML" }
 func (*htmlCmd) Usage() string {
-	return `html [-view] <page name> ...:
+	return `html [-template <template name>] <page name> ...:
   Render one or more pages as HTML.
   Use a single - to read Markdown from stdin.
 `
 }
 
 func (cmd *htmlCmd) SetFlags(f *flag.FlagSet) {
-	f.BoolVar(&cmd.useTemplate, "view", false, "use the 'view.html' template.")
+	f.StringVar(&cmd.template, "template", "",
+		"use the given HTML file as a template (probably view.html or static.html).")
 }
 
 func (cmd *htmlCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	return htmlCli(os.Stdout, cmd.useTemplate, f.Args())
+	return htmlCli(os.Stdout, cmd.template, f.Args())
 }
 
-func htmlCli(w io.Writer, useTemplate bool, args []string) subcommands.ExitStatus {
+func htmlCli(w io.Writer, template string, args []string) subcommands.ExitStatus {
 	if len(args) == 1 && args[0] == "-" {
 		body, err := io.ReadAll(os.Stdin)
 		if err != nil {
@@ -38,15 +40,20 @@ func htmlCli(w io.Writer, useTemplate bool, args []string) subcommands.ExitStatu
 			return subcommands.ExitFailure
 		}
 		p := &Page{Name: "stdin", Body: body}
-		return p.printHtml(w, useTemplate)
+		return p.printHtml(w, template)
 	}
-	for _, arg := range args {
-		p, err := loadPage(arg)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Cannot load %s: %s\n", arg, err)
+	for _, name := range args {
+		if !strings.HasSuffix(name, ".md") {
+			fmt.Fprintf(os.Stderr, "%s does not end in '.md'\n", name)
 			return subcommands.ExitFailure
 		}
-		status := p.printHtml(w, useTemplate)
+		name = name[0:len(name)-3]
+		p, err := loadPage(name)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Cannot load %s: %s\n", name, err)
+			return subcommands.ExitFailure
+		}
+		status := p.printHtml(w, template)
 		if status != subcommands.ExitSuccess {
 			return status
 		}
@@ -54,9 +61,9 @@ func htmlCli(w io.Writer, useTemplate bool, args []string) subcommands.ExitStatu
 	return subcommands.ExitSuccess
 }
 
-func (p *Page) printHtml(w io.Writer, useTemplate bool) subcommands.ExitStatus {
-	if useTemplate {
-		t := "view.html"
+func (p *Page) printHtml(w io.Writer, template string) subcommands.ExitStatus {
+	if len(template) > 0 {
+		t := template
 		loadTemplates()
 		p.handleTitle(true)
 		p.renderHtml()

html_cmd_test.go

@@ -9,9 +9,9 @@ import (
 
 func TestHtmlCmd(t *testing.T) {
 	b := new(bytes.Buffer)
-	s := htmlCli(b, false, []string{"index"})
+	s := htmlCli(b, "", []string{"index.md"})
 	assert.Equal(t, subcommands.ExitSuccess, s)
-	r := `<h1 id="welcome-to-oddµ">Welcome to Oddµ</h1>
+	r := `<h1 id="welcome-to-oddμ">Welcome to Oddμ</h1>
 
 <p>Hello! 🙃</p>
 

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
@@ -137,12 +139,12 @@ func (idx *indexStore) load() (int, error) {
 }
 
 // walk reads a file and adds it to the index. This assumes that the index is locked.
-func (idx *indexStore) walk(path string, info fs.FileInfo, err error) error {
+func (idx *indexStore) walk(fp string, info fs.FileInfo, err error) error {
 	if err != nil {
 		return err
 	}
 	// skip hidden directories and files
-	if path != "." && strings.HasPrefix(filepath.Base(path), ".") {
+	if fp != "." && strings.HasPrefix(filepath.Base(fp), ".") {
 		if info.IsDir() {
 			return filepath.SkipDir
 		} else {
@@ -150,10 +152,10 @@ func (idx *indexStore) walk(path string, info fs.FileInfo, err error) error {
 		}
 	}
 	// skipp all but page files
-	if !strings.HasSuffix(path, ".md") {
+	if !strings.HasSuffix(fp, ".md") {
 		return nil
 	}
-	p, err := loadPage(strings.TrimSuffix(path, ".md"))
+	p, err := loadPage(strings.TrimSuffix(filepath.ToSlash(fp), ".md"))
 	if err != nil {
 		return err
 	}
@@ -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.md

@@ -1,4 +1,4 @@
-# Welcome to Oddµ
+# Welcome to Oddμ
 
 Hello! 🙃
 

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)
@@ -21,7 +21,7 @@ func TestIndexAdd(t *testing.T) {
 // TestIndex relies on README.md being indexed
 func TestIndex(t *testing.T) {
 	index.load()
-	q := "Oddµ"
+	q := "Oddμ"
 	pages, _ := search(q, "", "", 1, false)
 	assert.NotZero(t, len(pages))
 	for _, p := range pages {
@@ -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))
 }
 

links_cmd.go

@@ -7,6 +7,7 @@ import (
 	"github.com/google/subcommands"
 	"io"
 	"os"
+	"strings"
 )
 
 type linksCmd struct {
@@ -43,6 +44,11 @@ func linksCli(w io.Writer, args []string) subcommands.ExitStatus {
 		return subcommands.ExitSuccess
 	}
 	for _, name := range args {
+		if !strings.HasSuffix(name, ".md") {
+			fmt.Fprintf(os.Stderr, "%s does not end in '.md'\n", name)
+			return subcommands.ExitFailure
+		}
+		name = name[0:len(name)-3]
 		p, err := loadPage(name)
 		if err != nil {
 			fmt.Fprintf(w, "Loading %s: %s\n", name, err)

links_cmd_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestLinksCmd(t *testing.T) {
 	b := new(bytes.Buffer)
-	s := linksCli(b, []string{"README"})
+	s := linksCli(b, []string{"README.md"})
 	assert.Equal(t, subcommands.ExitSuccess, s)
 	x := b.String()
 	assert.Contains(t, x, "https://alexschroeder.ch/view/oddmu/oddmu.1\n")

list_cmd_test.go

@@ -12,8 +12,8 @@ func TestListCmd(t *testing.T) {
 	s := listCli(b, "", nil)
 	assert.Equal(t, subcommands.ExitSuccess, s)
 	x := b.String()
-	assert.Contains(t, x, "README\tOddµ: A minimal wiki\n")
-	assert.Contains(t, x, "index\tWelcome to Oddµ\n")
+	assert.Contains(t, x, "README\tOddμ: A minimal wiki\n")
+	assert.Contains(t, x, "index\tWelcome to Oddμ\n")
 }
 
 func TestListSubdirCmd(t *testing.T) {

man/Makefile

@@ -27,7 +27,7 @@ html: ${HTML}
 %.html: %.md
 	@echo Making $@
 	@echo '<!DOCTYPE html>' > $@
-	@oddmu html $(basename $<) | sed --regexp-extended \
+	@oddmu html $< | sed --regexp-extended \
 	  -e 's/<a href="(oddmu[a-z.-]*.[1-9])">([^<>]*)<\/a>/<a href="\1.html">\2<\/a>/g' >> $@
 
 md: ${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" "2025-07-16"
 .PP
 .SH NAME
 .PP
@@ -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/"

man/oddmu-apache.5.txt

@@ -224,10 +224,10 @@ _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/"
@@ -268,8 +268,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:
 
@@ -344,10 +344,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,22 +5,33 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-HASHTAGS" "1" "2024-08-16"
+.TH "ODDMU-HASHTAGS" "1" "2025-08-09"
 .PP
 .SH NAME
 .PP
-oddmu-hashtags - count the hashtags used
+oddmu-hashtags - work with hashtags
 .PP
 .SH SYNOPSIS
 .PP
 \fBoddmu hashtags\fR
 .PP
+\fBoddmu hashtags -update\fR [\fB-dry-run\fR]
+.PP
 .SH DESCRIPTION
 .PP
-The "hashtags" subcommand counts all the hashtags used and lists them, separated
-by a TAB character.\&
+By default, the "hashtags" subcommand counts all the hashtags used and lists
+them, separated by a TAB character.\&
 .PP
-.SH EXAMPLE
+With the \fB-update\fR flag, the hashtag pages are update with links to all the blog
+pages having the corresponding tag.\& This only necessary when migrating a
+collection of Markdown files.\& Ordinarily, Oddmu maintains the hashtag pages
+automatically.\& When writing pages offline, use \fIoddmu-notify\fR(1) to update the
+hashtag pages.\&
+.PP
+Use the \fB-dry-run\fR flag to see what would change with the \fB-update\fR flag without
+actually changing any files.\&
+.PP
+.SH EXAMPLES
 .PP
 List the top 10 hashtags.\& This requires 11 lines because of the header line.\&
 .PP
@@ -30,6 +41,22 @@ oddmu hashtags | head -n 11
 .fi
 .RE
 .PP
+See what kind of changes Oddmu would suggest:
+.PP
+.nf
+.RS 4
+oddmu hashtags -update -dry-run
+.fi
+.RE
+.PP
+And then do it:
+.PP
+.nf
+.RS 4
+oddmu hashtags -update
+.fi
+.RE
+.PP
 .SH SEE ALSO
 .PP
 \fIoddmu\fR(1)

man/oddmu-hashtags.1.txt

@@ -2,18 +2,29 @@ ODDMU-HASHTAGS(1)
 
 # NAME
 
-oddmu-hashtags - count the hashtags used
+oddmu-hashtags - work with hashtags
 
 # SYNOPSIS
 
 *oddmu hashtags*
 
+*oddmu hashtags -update* [*-dry-run*]
+
 # DESCRIPTION
 
-The "hashtags" subcommand counts all the hashtags used and lists them, separated
-by a TAB character.
+By default, the "hashtags" subcommand counts all the hashtags used and lists
+them, separated by a TAB character.
 
-# EXAMPLE
+With the *-update* flag, the hashtag pages are update with links to all the blog
+pages having the corresponding tag. This only necessary when migrating a
+collection of Markdown files. Ordinarily, Oddmu maintains the hashtag pages
+automatically. When writing pages offline, use _oddmu-notify_(1) to update the
+hashtag pages.
+
+Use the *-dry-run* flag to see what would change with the *-update* flag without
+actually changing any files.
+
+# EXAMPLES
 
 List the top 10 hashtags. This requires 11 lines because of the header line.
 
@@ -21,6 +32,18 @@ List the top 10 hashtags. This requires 11 lines because of the header line.
 oddmu hashtags | head -n 11
 ```
 
+See what kind of changes Oddmu would suggest:
+
+```
+oddmu hashtags -update -dry-run
+```
+
+And then do it:
+
+```
+oddmu hashtags -update
+```
+
 # SEE ALSO
 
 _oddmu_(1)

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" "2025-04-05"
 .PP
 .SH NAME
 .PP
@@ -13,30 +13,30 @@ oddmu-html - render Oddmu page HTML
 .PP
 .SH SYNOPSIS
 .PP
-\fBoddmu html\fR [-view] \fIpage-name\fR
+\fBoddmu html\fR [\fB\fR-template\fB\fR \fItemplate-name\fR] \fIpage-name\fR
 .PP
 .SH DESCRIPTION
 .PP
-The "html" subcommand opens the Markdown file for the given page name (appending
-the ".\&md" extension) and prints the HTML to STDOUT without invoking the
-"view.\&html" template.\& Use "-" as the page name if you want to read Markdown from
-\fBstdin\fR.\&
+The "html" subcommand opens the given Markdown file and prints the resulting
+HTML to STDOUT without invoking the "view.\&html" template.\& Use "-" as the page
+name if you want to read Markdown from \fBstdin\fR.\&
 .PP
 .SH OPTIONS
 .PP
-\fB-view\fR
+\fB\fR-template\fB\fR \fItemplate-name\fR
 .RS 4
-Use the "view.\&html" template to render the page.\& Without this, the HTML
-lacks html and body tags.\&
+Use the given template to render the page.\& Without this, the HTML lacks
+html and body tags.\& The only two options that make sense are "view.\&html"
+and "static.\&html".\&
 .PP
 .RE
-.SH EXAMPLE
+.SH EXAMPLES
 .PP
 Generate "README.\&html" from "README.\&md":
 .PP
 .nf
 .RS 4
-oddmu html README > README\&.html
+oddmu html README\&.md > README\&.html
 .fi
 .RE
 .PP

man/oddmu-html.1.txt

@@ -6,27 +6,27 @@ oddmu-html - render Oddmu page HTML
 
 # SYNOPSIS
 
-*oddmu html* [-view] _page-name_
+*oddmu html* [**-template** _template-name_] _page-name_
 
 # DESCRIPTION
 
-The "html" subcommand opens the Markdown file for the given page name (appending
-the ".md" extension) and prints the HTML to STDOUT without invoking the
-"view.html" template. Use "-" as the page name if you want to read Markdown from
-*stdin*.
+The "html" subcommand opens the given Markdown file and prints the resulting
+HTML to STDOUT without invoking the "view.html" template. Use "-" as the page
+name if you want to read Markdown from *stdin*.
 
 # OPTIONS
 
-*-view*
-	Use the "view.html" template to render the page. Without this, the HTML
-	lacks html and body tags.
+**-template** _template-name_
+	Use the given template to render the page. Without this, the HTML lacks
+	html and body tags. The only two options that make sense are "view.html"
+	and "static.html".
 
-# EXAMPLE
+# EXAMPLES
 
 Generate "README.html" from "README.md":
 
 ```
-oddmu html README > README.html
+oddmu html README.md > README.html
 ```
 
 Alternatively:

man/oddmu-links.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-LINKS" "1" "2024-08-15"
+.TH "ODDMU-LINKS" "1" "2025-04-05"
 .PP
 .SH NAME
 .PP
@@ -17,8 +17,8 @@ oddmu-links - list outgoing links for pages
 .PP
 .SH DESCRIPTION
 .PP
-The "links" subcommand lists outgoing links for one or more page names.\& Use "-"
-as the page name if you want to read Markdown from \fBstdin\fR.\&
+The "links" subcommand lists outgoing links for one or more Markdown files.\& Use
+"-" as the page name if you want to read Markdown from \fBstdin\fR.\&
 .PP
 .SH SEE ALSO
 .PP

man/oddmu-links.1.txt

@@ -10,8 +10,8 @@ oddmu-links - list outgoing links for pages
 
 # DESCRIPTION
 
-The "links" subcommand lists outgoing links for one or more page names. Use "-"
-as the page name if you want to read Markdown from *stdin*.
+The "links" subcommand lists outgoing links for one or more Markdown files. Use
+"-" as the page name if you want to read Markdown from *stdin*.
 
 # SEE ALSO
 

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,19 +5,19 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-NGINX" "5" "2024-05-09"
+.TH "ODDMU-NGINX" "5" "2025-07-16"
 .PP
 .SH NAME
 .PP
-oddmu-nginx - how to setup Nginx as a reverse proxy for Oddmu
+oddmu-nginx - how to setup nginx as a reverse proxy for Oddmu
 .PP
 .SH DESCRIPTION
 .PP
 The oddmu program serves the current working directory as a wiki on port 8080.\&
 This is an unpriviledged port so an ordinary user account can do this.\&
 .PP
-This page explains how to setup NGINX on Debian to act as a reverse proxy for
-Oddmu.\& Once this is done, you can use NGINX to provide HTTPS, request users to
+This page explains how to setup nginx on Debian to act as a reverse proxy for
+Oddmu.\& Once this is done, you can use nginx to provide HTTPS, request users to
 authenticate themselves, and so on.\&
 .PP
 .SH CONFIGURATION

man/oddmu-nginx.5.txt

@@ -2,15 +2,15 @@ ODDMU-NGINX(5)
 
 # NAME
 
-oddmu-nginx - how to setup Nginx as a reverse proxy for Oddmu
+oddmu-nginx - how to setup nginx as a reverse proxy for Oddmu
 
 # DESCRIPTION
 
 The oddmu program serves the current working directory as a wiki on port 8080.
 This is an unpriviledged port so an ordinary user account can do this.
 
-This page explains how to setup NGINX on Debian to act as a reverse proxy for
-Oddmu. Once this is done, you can use NGINX to provide HTTPS, request users to
+This page explains how to setup nginx on Debian to act as a reverse proxy for
+Oddmu. Once this is done, you can use nginx to provide HTTPS, request users to
 authenticate themselves, and so on.
 
 # CONFIGURATION

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" "2025-04-05"
 .PP
 .SH NAME
 .PP
@@ -17,8 +17,8 @@ oddmu-notify - add links to changes.\&md, index.\&md, and hashtag pages
 .PP
 .SH DESCRIPTION
 .PP
-The "notify" subcommand takes all the page names provided (without the ".\&md"
-extension) and adds links to it from other pages.\&
+The "notify" subcommand takes all the Markdown files provided and adds links to
+these pages from other pages.\&
 .PP
 A new link is added to the \fBchanges\fR page in the current directory if it doesn'\&t
 exist.\& The current date of the machine Oddmu is running on is used as the
@@ -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
@@ -57,7 +57,7 @@ it exists):
 .PP
 .nf
 .RS 4
-oddmu notify 2023-11-05-climate
+oddmu notify 2023-11-05-climate\&.md
 .fi
 .RE
 .PP

man/oddmu-notify.1.txt

@@ -10,8 +10,8 @@ oddmu-notify - add links to changes.md, index.md, and hashtag pages
 
 # DESCRIPTION
 
-The "notify" subcommand takes all the page names provided (without the ".md"
-extension) and adds links to it from other pages.
+The "notify" subcommand takes all the Markdown files provided and adds links to
+these pages from other pages.
 
 A new link is added to the *changes* page in the current directory if it doesn't
 exist. The current date of the machine Oddmu is running on is used as the
@@ -42,14 +42,14 @@ 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
 it exists):
 
 ```
-oddmu notify 2023-11-05-climate
+oddmu notify 2023-11-05-climate.md
 ```
 
 The changes file might look as follows:

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-08-10"
 .PP
 .SH NAME
 .PP
@@ -15,6 +15,112 @@ oddmu-releases - what'\&s new?\&
 .PP
 This page lists user-visible features and template changes to consider.\&
 .PP
+.SS 1.18 (2025)
+.PP
+The \fIhashtags\fR gained the option of checking and fixing the hashtag pages by
+adding missing links to tagged blog pages.\& See \fIoddmu-hashtags\fR(1) for more.\&
+.PP
+In an effort to remove features that can be handled by the web server, the
+\fIlist\fR, \fIdelete\fR and \fIrename\fR actions were removed again.\& See \fIoddmu-webdav\fR(5)
+for a better solution.\&
+.PP
+You probably need to remove a sentence linking to the list action from the
+upload template ("upload.\&html").\&
+.PP
+.SS 1.17 (2025)
+.PP
+You need to update the upload template ("upload.\&html").\& Many things have
+changed!\& See \fIoddmu-templates\fR(5) for more.\&
+.PP
+You probably want to ensure that the upload link on the view template
+("view.\&html") and others, if you added it, has a \fIfilename\fR and \fIpagename\fR
+parameters.\&
+.PP
+Example:
+.PP
+.nf
+.RS 4
+<a href="/upload/{{\&.Dir}}?filename={{\&.Base}}-1\&.jpg&pagename={{\&.Base}}">Upload</a>
+.fi
+.RE
+.PP
+You need to change {{.\&Name}} to {{.\&Path}} when it is used in URLs, in the list
+template ("list.\&html").\& If you don'\&t do this, file deleting and rename may not
+work on files containing a comma, a semicolon, a questionmark or a hash
+character.\& This fix was necessary because URLs for files containing a
+questionmark or a hash character would end the path at this character and treat
+the rest as a query parameter or fragment, respectively.\&
+.PP
+Updated the example themes.\& Some of my sites got a text area that tries to take
+all the vertical space available.\& This is great for monitors in portrait mode.\&
+.PP
+\fIlist\fR action now skips dot files.\&
+.PP
+.SS 1.16 (2025)
+.PP
+Add support for WebP images for uploading and resizing.\&
+.PP
+You need to change {{.\&Name}} to {{.\&Path}} in HTML templates where pages are
+concerned.\& If you don'\&t do this, your page names (i.\&e.\& filenames for pages) may
+not include a comma, a semicolon, a questionmark or a hash sign.\& This fix was
+necessary because file uploads of filenames with non-ASCII characters ended up
+double-encoded.\&
+.PP
+Note that on the "list.\&html" template, {{.\&Name}} refers to file instead of a
+page and File.\&Path() isn'\&t implemented, yet.\& This is fixed in the next release.\&
+.PP
+Improved the example themes.\& The chat theme got better list styling and better
+upload functionality with automatic "add" button; the plain theme got rocket
+links via JavaScript; the alexschroeder.\&ch theme got a preview button and better
+image support for upload and search; the transjovian.\&org theme got better image
+support for upload.\&
+.PP
+Switch the \fIhtml\fR, \fIlink\fR, \fInotify\fR and \fItoc\fR subcommand to take filenames
+(including the `.\&md` suffix) instead of page names (without the `.\&md` suffix).\&
+.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,106 @@ oddmu-releases - what's new?
 
 This page lists user-visible features and template changes to consider.
 
+## 1.18 (2025)
+
+The _hashtags_ gained the option of checking and fixing the hashtag pages by
+adding missing links to tagged blog pages. See _oddmu-hashtags_(1) for more.
+
+In an effort to remove features that can be handled by the web server, the
+_list_, _delete_ and _rename_ actions were removed again. See _oddmu-webdav_(5)
+for a better solution.
+
+You probably need to remove a sentence linking to the list action from the
+upload template ("upload.html").
+
+## 1.17 (2025)
+
+You need to update the upload template ("upload.html"). Many things have
+changed! See _oddmu-templates_(5) for more.
+
+You probably want to ensure that the upload link on the view template
+("view.html") and others, if you added it, has a _filename_ and _pagename_
+parameters.
+
+Example:
+
+```
+<a href="/upload/{{.Dir}}?filename={{.Base}}-1.jpg&pagename={{.Base}}">Upload</a>
+```
+
+You need to change {{.Name}} to {{.Path}} when it is used in URLs, in the list
+template ("list.html"). If you don't do this, file deleting and rename may not
+work on files containing a comma, a semicolon, a questionmark or a hash
+character. This fix was necessary because URLs for files containing a
+questionmark or a hash character would end the path at this character and treat
+the rest as a query parameter or fragment, respectively.
+
+Updated the example themes. Some of my sites got a text area that tries to take
+all the vertical space available. This is great for monitors in portrait mode.
+
+_list_ action now skips dot files.
+
+## 1.16 (2025)
+
+Add support for WebP images for uploading and resizing.
+
+You need to change {{.Name}} to {{.Path}} in HTML templates where pages are
+concerned. If you don't do this, your page names (i.e. filenames for pages) may
+not include a comma, a semicolon, a questionmark or a hash sign. This fix was
+necessary because file uploads of filenames with non-ASCII characters ended up
+double-encoded.
+
+Note that on the "list.html" template, {{.Name}} refers to file instead of a
+page and File.Path() isn't implemented, yet. This is fixed in the next release.
+
+Improved the example themes. The chat theme got better list styling and better
+upload functionality with automatic "add" button; the plain theme got rocket
+links via JavaScript; the alexschroeder.ch theme got a preview button and better
+image support for upload and search; the transjovian.org theme got better image
+support for upload.
+
+Switch the _html_, _link_, _notify_ and _toc_ subcommand to take filenames
+(including the `.md` suffix) instead of page names (without the `.md` suffix).
+
+## 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" "2025-03-05"
 .PP
 .SH NAME
 .PP
@@ -36,13 +36,13 @@ 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
 .nf
 .RS 4
-oddmu replace Oddmu Oddµ
+oddmu replace Oddmu Oddμ
 .fi
 .RE
 .PP

man/oddmu-replace.1.txt

@@ -25,12 +25,12 @@ 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:
 
 ```
-oddmu replace Oddmu Oddµ
+oddmu replace Oddmu Oddμ
 ```
 
 Result:

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" "2025-03-05"
 .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".\&
@@ -65,7 +65,7 @@ The ordering of terms does not matter.\&
 ~/src/oddmu $ oddmu search Alex Schroeder
 Search for Alex Schroeder, page 1: 3 results
 * [Alex Schroeder theme](themes/alexschroeder\&.ch/README)
-* [Oddµ: A minimal wiki](README)
+* [Oddμ: A minimal wiki](README)
 * [Themes](themes/index)
 .fi
 .RE

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".
@@ -49,7 +49,7 @@ The ordering of terms does not matter.
 ~/src/oddmu $ oddmu search Alex Schroeder
 Search for Alex Schroeder, page 1: 3 results
 * [Alex Schroeder theme](themes/alexschroeder.ch/README)
-* [Oddµ: A minimal wiki](README)
+* [Oddμ: A minimal wiki](README)
 * [Themes](themes/index)
 ```
 

man/oddmu-search.7

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-SEARCH" "7" "2024-02-19"
+.TH "ODDMU-SEARCH" "7" "2025-03-05"
 .PP
 .SH NAME
 .PP
@@ -57,9 +57,9 @@ exactly (without the leading '\&#'\&) is listed first, even if it doesn'\&t cont
 the hashtag.\& It is assumed that this page offers some kind of introduction to
 people searching for the hashtag.\&
 .PP
-Example: When people click on the hashtag "#Oddµ" and a page named "Oddµ" exists
-(in other words, the file "Oddµ.\&md" exists), it is prepended to the results even
-if it doesn'\&t have the hashtag "#Oddµ" and even if it has a title of "Oddµ, a
+Example: When people click on the hashtag "#Oddμ" and a page named "Oddμ" exists
+(in other words, the file "Oddμ.\&md" exists), it is prepended to the results even
+if it doesn'\&t have the hashtag "#Oddμ" and even if it has a title of "Oddμ, a
 minimal wiki" (which wouldn'\&t be an exact match).\&
 .PP
 The score and highlighting of snippets is used to help visitors decide which

man/oddmu-search.7.txt

@@ -44,9 +44,9 @@ exactly (without the leading '#') is listed first, even if it doesn't contain
 the hashtag. It is assumed that this page offers some kind of introduction to
 people searching for the hashtag.
 
-Example: When people click on the hashtag "#Oddµ" and a page named "Oddµ" exists
-(in other words, the file "Oddµ.md" exists), it is prepended to the results even
-if it doesn't have the hashtag "#Oddµ" and even if it has a title of "Oddµ, a
+Example: When people click on the hashtag "#Oddμ" and a page named "Oddμ" exists
+(in other words, the file "Oddμ.md" exists), it is prepended to the results even
+if it doesn't have the hashtag "#Oddμ" and even if it has a title of "Oddμ, a
 minimal wiki" (which wouldn't be an exact match).
 
 The score and highlighting of snippets is used to help visitors decide which

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" "2025-04-26" "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
@@ -43,6 +44,29 @@ placeholders.\&
 \fIview.\&html\fR uses a \fIpage\fR
 .PD
 .PP
+The following property lists always indicate whether the property is
+percent-encoded or not.\& In theory, the html/template package would handle this.\&
+The problem is that the package gives special treatment to the semicolon, comma,
+question-mark and hash-sign as these are potential separators in a URL.\&
+.PP
+Consider the following:
+.PP
+.nf
+.RS 4
+<a href="{{\&.Name}}">{{\&.Name}}</a>
+.fi
+.RE
+.PP
+If \fI.\&Name\fR is "#foo", the html/template package treats it as a URL fragment
+inside the attribute instead of a file path that needs to be escaped to
+"%23foo".\& The same problem arises if \fI.\&Name\fR is "foo?\&" as the questionmark is
+not escaped and therefore treated as the separator between URL path and query
+parameters instead of being part of the name.\&
+.PP
+The consequences for template authors is that the properties that are
+percent-encoded must be used in links where as the regular properties must be
+used outside of links.\&
+.PP
 .SS Page
 .PP
 A page has the following properties:
@@ -50,14 +74,14 @@ A page has the following properties:
 \fI{{.\&Title}}\fR is the page title.\& If the page doesn'\&t provide its own title, the
 page name is used.\&
 .PP
-\fI{{.\&Name}}\fR is the page name, escaped for use in URLs.\& More specifically, it is
-percent-escaped except for the slashes.\& The page name doesn'\&t include the \fI.\&md\fR
-extension.\&
+\fI{{.\&Name}}\fR is the page name.\& The page name doesn'\&t include the \fI.\&md\fR extension.\&
 .PP
-\fI{{.\&Dir}}\fR is the page directory, percent-escaped except for the slashes.\&
+\fI{{.\&Path}}\fR is the page name, percent-encoded.\&
+.PP
+\fI{{.\&Dir}}\fR is the page directory, percent-encoded.\&
 .PP
 \fI{{.\&Base}}\fR is the basename of the current file (without the directory and
-without the \fI.\&md\fR extension), escaped for use in URLs.\&
+without the \fI.\&md\fR extension), percent-encoded.\&
 .PP
 \fI{{.\&Language}}\fR is the suspected language of the page.\& This is used to set the
 language on the \fIview.\&html\fR template.\& See "Non-English hyphenation" below.\&
@@ -108,12 +132,37 @@ 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, percent-encoded.\&
+.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{{.\&Path}}\fR is the page name, percent-encoded.\&
+.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.\&
 .PP
-\fI{{.\&Dir}}\fR is the directory in which the search starts, percent-escaped except
-for the slashes.\&
+\fI{{.\&Dir}}\fR is the directory in which the search starts, percent-encoded.\&
 .PP
 \fI{{.\&Previous}}\fR, \fI{{.\&Page}}\fR and \fI{{.\&Next}}\fR are the previous, current and next
 page number in the results since doing arithmetics in templates is hard.\& The
@@ -150,23 +199,18 @@ search term that matched.\&
 .SS Upload
 .PP
 \fI{{.\&Dir}}\fR is the directory where the uploaded file ends up, based on the URL
-path, percent-escaped except for the slashes.\&
+path, percent-encoded.\&
 .PP
-\fI{{.\&Name}}\fR is the \fIfilename\fR query parameter.\&
+\fI{{.\&FileName}}\fR is the \fIfilename\fR query parameter used to suggested a filename.\&
 .PP
-\fI{{.\&Last}}\fR is the filename of the last file uploaded.\&
+\fI{{.\&FilePath}}\fR is the filename, percent-encoded.\&
 .PP
-\fI{{.\&Actual}}\fR is an array of filenames of all the files uploaded.\& Use {{range
-Actual}} … {{.\&}} … {{end}} to loop over all the filenames.\&
+\fI{{.\&Name}}\fR is the \fIpagename\fR query parameter used to indicate where to append
+links to the files.\&
 .PP
-\fI{{.\&Base}}\fR is the basename of the first file uploaded (without the directory,
-extension and numeric part at the end), escaped for use in URLs.\&
+\fI{{.\&Path}}\fR is the page name, percent-encoded.\&
 .PP
-\fI{{.\&Title}}\fR is the title of the basename, if it exists.\&
-.PP
-\fI{{.\&Image}}\fR is a boolean to indicate whether the last file uploaded has a file
-name indicating an image or not (such as ending in \fI.\&jpg\fR).\& If so, a thumbnail
-can be shown by the template, for example.\&
+\fI{{.\&Title}}\fR is the title of the page, if it exists.\&
 .PP
 \fI{{.\&MaxWidth}}\fR is the \fImaxwidth\fR query parameter, i.\&e.\& the value used for the
 previous image uploaded.\&
@@ -176,6 +220,22 @@ previous image uploaded.\&
 .PP
 \fI{{.\&Today}}\fR is the current date, in ISO format.\&
 .PP
+\fI{{.\&Uploads}}\fR an array of files already uploaded, based on the \fIuploads\fR query
+parameter.\& To refer to them, you need to use a \fI{{range .\&Uploads}}\fR … \fI{{end}}\fR
+construct.\& This is required because the \fIdrop\fR action redirects back to the
+\fIupload\fR action, so after saving one or more files, you can upload even more
+files.\&
+.PP
+Each upload has the following attributes:
+.PP
+\fI{{.\&Name}}\fR is the filename.\&
+.PP
+\fI{{.\&Path}}\fR is the file name, percent-encoded.\&
+.PP
+\fI{{.\&Image}}\fR is a boolean to indicate whether the upload is an image or not
+(such as ending in \fI.\&jpg\fR).\& If so, a thumbnail can be shown by the template, for
+example.\&
+.PP
 .SS Non-English hyphenation
 .PP
 Automatic hyphenation by the browser requires two things: The style sheet must
@@ -189,18 +249,18 @@ use a small number of languages – or just a single language!\& – you can set
 environment variable ODDMU_LANGUAGES to a comma-separated list of ISO 639-1
 codes, e.\&g.\& "en" or "en,de,fr,pt".\&
 .PP
-"view.\&html" is used the template to render a single page and so the language
-detected is added to the "html" element.\&
+"view.\&html" is used to render a single page and so the language detected is
+added to the "html" element.\&
 .PP
 "search.\&html" is the template used to render search results and so "en" is used
 for the "html" element and the language detected for every page in the search
 result is added to the "article" element for each snippet.\&
 .PP
-"edit.\&html" and "add.\&html" are the templates used to edit a page and at that
-point, the language isn'\&t known, so "en" is used for the "html" element and no
-language is used for the "textarea" element.\&
+"edit.\&html" and "add.\&html" are the templates used to edit a page.\& If the page
+already exists, its language is used for the "textarea" element.\& If the page is
+new, 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,12 +18,34 @@ 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_
 - _upload.html_ uses an _upload_
 - _view.html_ uses a _page_
 
+The following property lists always indicate whether the property is
+percent-encoded or not. In theory, the html/template package would handle this.
+The problem is that the package gives special treatment to the semicolon, comma,
+question-mark and hash-sign as these are potential separators in a URL.
+
+Consider the following:
+
+```
+<a href="{{.Name}}">{{.Name}}</a>
+```
+
+If _.Name_ is "#foo", the html/template package treats it as a URL fragment
+inside the attribute instead of a file path that needs to be escaped to
+"%23foo". The same problem arises if _.Name_ is "foo?" as the questionmark is
+not escaped and therefore treated as the separator between URL path and query
+parameters instead of being part of the name.
+
+The consequences for template authors is that the properties that are
+percent-encoded must be used in links where as the regular properties must be
+used outside of links.
+
 ## Page
 
 A page has the following properties:
@@ -32,14 +53,14 @@ A page has the following properties:
 _{{.Title}}_ is the page title. If the page doesn't provide its own title, the
 page name is used.
 
-_{{.Name}}_ is the page name, escaped for use in URLs. More specifically, it is
-percent-escaped except for the slashes. The page name doesn't include the _.md_
-extension.
+_{{.Name}}_ is the page name. The page name doesn't include the _.md_ extension.
 
-_{{.Dir}}_ is the page directory, percent-escaped except for the slashes.
+_{{.Path}}_ is the page name, percent-encoded.
+
+_{{.Dir}}_ is the page directory, percent-encoded.
 
 _{{.Base}}_ is the basename of the current file (without the directory and
-without the _.md_ extension), escaped for use in URLs.
+without the _.md_ extension), percent-encoded.
 
 _{{.Language}}_ is the suspected language of the page. This is used to set the
 language on the _view.html_ template. See "Non-English hyphenation" below.
@@ -85,12 +106,37 @@ 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, percent-encoded.
+
+_{{.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).
+
+_{{.Path}}_ is the page name, percent-encoded.
+
+_{{.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.
 
-_{{.Dir}}_ is the directory in which the search starts, percent-escaped except
-for the slashes.
+_{{.Dir}}_ is the directory in which the search starts, percent-encoded.
 
 _{{.Previous}}_, _{{.Page}}_ and _{{.Next}}_ are the previous, current and next
 page number in the results since doing arithmetics in templates is hard. The
@@ -127,23 +173,18 @@ search term that matched.
 ## Upload
 
 _{{.Dir}}_ is the directory where the uploaded file ends up, based on the URL
-path, percent-escaped except for the slashes.
+path, percent-encoded.
 
-_{{.Name}}_ is the _filename_ query parameter.
+_{{.FileName}}_ is the _filename_ query parameter used to suggested a filename.
 
-_{{.Last}}_ is the filename of the last file uploaded.
+_{{.FilePath}}_ is the filename, percent-encoded.
 
-_{{.Actual}}_ is an array of filenames of all the files uploaded. Use {{range
-.Actual}} … {{.}} … {{end}} to loop over all the filenames.
+_{{.Name}}_ is the _pagename_ query parameter used to indicate where to append
+links to the files.
 
-_{{.Base}}_ is the basename of the first file uploaded (without the directory,
-extension and numeric part at the end), escaped for use in URLs.
+_{{.Path}}_ is the page name, percent-encoded.
 
-_{{.Title}}_ is the title of the basename, if it exists.
-
-_{{.Image}}_ is a boolean to indicate whether the last file uploaded has a file
-name indicating an image or not (such as ending in _.jpg_). If so, a thumbnail
-can be shown by the template, for example.
+_{{.Title}}_ is the title of the page, if it exists.
 
 _{{.MaxWidth}}_ is the _maxwidth_ query parameter, i.e. the value used for the
 previous image uploaded.
@@ -153,6 +194,22 @@ previous image uploaded.
 
 _{{.Today}}_ is the current date, in ISO format.
 
+_{{.Uploads}}_ an array of files already uploaded, based on the _uploads_ query
+parameter. To refer to them, you need to use a _{{range .Uploads}}_ … _{{end}}_
+construct. This is required because the _drop_ action redirects back to the
+_upload_ action, so after saving one or more files, you can upload even more
+files.
+
+Each upload has the following attributes:
+
+_{{.Name}}_ is the filename.
+
+_{{.Path}}_ is the file name, percent-encoded.
+
+_{{.Image}}_ is a boolean to indicate whether the upload is an image or not
+(such as ending in _.jpg_). If so, a thumbnail can be shown by the template, for
+example.
+
 ## Non-English hyphenation
 
 Automatic hyphenation by the browser requires two things: The style sheet must
@@ -166,18 +223,18 @@ use a small number of languages – or just a single language! – you can set t
 environment variable ODDMU_LANGUAGES to a comma-separated list of ISO 639-1
 codes, e.g. "en" or "en,de,fr,pt".
 
-"view.html" is used the template to render a single page and so the language
-detected is added to the "html" element.
+"view.html" is used to render a single page and so the language detected is
+added to the "html" element.
 
 "search.html" is the template used to render search results and so "en" is used
 for the "html" element and the language detected for every page in the search
 result is added to the "article" element for each snippet.
 
-"edit.html" and "add.html" are the templates used to edit a page and at that
-point, the language isn't known, so "en" is used for the "html" element and no
-language is used for the "textarea" element.
+"edit.html" and "add.html" are the templates used to edit a page. If the page
+already exists, its language is used for the "textarea" element. If the page is
+new, 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-toc.1

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU-TOC" "1" "2024-08-15"
+.TH "ODDMU-TOC" "1" "2025-04-05"
 .PP
 .SH NAME
 .PP
@@ -13,13 +13,12 @@ oddmu-toc - print the table of contents (toc) for pages
 .PP
 .SH SYNOPSIS
 .PP
-\fBoddmu toc\fR  \fIpage names.\&.\&.\&\fR
+\fBoddmu toc\fR \fIpage names.\&.\&.\&\fR
 .PP
 .SH DESCRIPTION
 .PP
-The "toc" subcommand prints the table of contents for one or more page
-names.\& Use "-" as the page name if you want to read Markdown from
-\fBstdin\fR.\&
+The "toc" subcommand prints the table of contents for one or more Markdown
+files.\& Use "-" as the page name if you want to read Markdown from \fBstdin\fR.\&
 .PP
 This can be useful for very long pages that need a table of contents
 at the beginning.\&

man/oddmu-toc.1.txt

@@ -6,13 +6,12 @@ oddmu-toc - print the table of contents (toc) for pages
 
 # SYNOPSIS
 
-*oddmu toc*  _page names..._
+*oddmu toc* _page names..._
 
 # DESCRIPTION
 
-The "toc" subcommand prints the table of contents for one or more page
-names. Use "-" as the page name if you want to read Markdown from
-*stdin*.
+The "toc" subcommand prints the table of contents for one or more Markdown
+files. Use "-" as the page name if you want to read Markdown from *stdin*.
 
 This can be useful for very long pages that need a table of contents
 at the beginning.

man/oddmu-webdav.5

@@ -0,0 +1,206 @@
+.\" 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" "2025-07-16"
+.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 manage the files using some other tool.\& Using the Apache Web-DAV
+module means that the same user accounts can be used as for the regular wiki.\&
+.PP
+.SH CONFIGURATION
+.PP
+Consider the "campaignwiki.\&org" site in the example below.\& This site offers
+users their own wikis.\& Thus:
+.PP
+"https://campaignwiki.\&org/" is a regular website with static files.\&
+.PP
+"https://campaignwiki.\&org/view/index" is one of the requests that gets passed to
+a Unix domain socket.\& See "Socket Activation" in \fIoddmu\fR(1).\&
+.PP
+Some of these actions are protected by basic authentication.\& A valid user is
+required to make changes to the site.\& Valid users are "admin" and "alex".\&
+.PP
+"data" is the Oddmu working directory.\& WebDAV is turned on for this directory.\& A
+shortcut has been taken, here: The "data" subdirectory requires authentication
+and offers WebDAV access.\& The other paths also require authentication and map to
+Oddmu actions.\& The fact that WebDAV access is "enabled" for the Oddmu actions
+has no effect.\& The only drawback is that "https://campaignwiki.\&org/data/" now
+requires authentication even if only used for reading.\&
+.PP
+"https://campaignwiki.\&org/view/knochentanz/index" is a separate site called
+"knochentanz".\& The only valid user is "knochentanz".\&
+.PP
+Notice how the \fIarchive\fR action is not available at the top level, only for
+subdirectories.\&
+.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
+    # Static HTML, CSS, JavaScript files and so on are saved here\&.
+    DocumentRoot /home/alex/campaignwiki\&.org
+    <Directory /home/alex/campaignwiki\&.org>
+        Options Indexes MultiViews SymLinksIfOwnerMatch
+        AllowOverride All
+        Require all granted
+    </Directory>
+    SSLEngine on
+    # Any request to the following paths is passed on to the Unix domain socket\&.
+    ProxyPassMatch 
+      "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive/\&.+)/(\&.*))$" 
+      "unix:/home/oddmu/campaignwiki\&.sock|http://localhost/$1"
+    # /archive only for subdirectories
+    Redirect "/archive/data\&.zip" "/view/archive"
+    # Making changes to the wiki requires authentication\&.
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop)/">
+      AuthType Basic
+      AuthName "Password Required"
+      AuthUserFile /home/oddmu/\&.htpasswd
+      Require user admin alex
+      Dav On
+    </LocationMatch>
+    # Making changes to a subdirectory requires different accounts\&.
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|archive)/knochentanz">
+      Require user knochentanz
+    </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.\& Sometimes it works.\& I'\&ve used Nemo 5.\&6.\&4 to connect to the server and
+edited files using gedit 44.\&2.\& But I'\&ve used other file managers and other
+editors with WebDAV support and they didn'\&t work very well.\&
+.PP
+On Windows, try third party tools like WinSCP.\&
+.PP
+This section has examples sessions using command-line 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
+"WinSCP"
+https://winscp.\&net/
+.PP
+.SH AUTHORS
+.PP
+Maintained by Alex Schroeder <alex@gnu.\&org>.\&

man/oddmu-webdav.5.txt

@@ -0,0 +1,187 @@
+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 manage the files using some other tool. Using the Apache Web-DAV
+module means that the same user accounts can be used as for the regular wiki.
+
+# CONFIGURATION
+
+Consider the "campaignwiki.org" site in the example below. This site offers
+users their own wikis. Thus:
+
+"https://campaignwiki.org/" is a regular website with static files.
+
+"https://campaignwiki.org/view/index" is one of the requests that gets passed to
+a Unix domain socket. See "Socket Activation" in _oddmu_(1).
+
+Some of these actions are protected by basic authentication. A valid user is
+required to make changes to the site. Valid users are "admin" and "alex".
+
+"data" is the Oddmu working directory. WebDAV is turned on for this directory. A
+shortcut has been taken, here: The "data" subdirectory requires authentication
+and offers WebDAV access. The other paths also require authentication and map to
+Oddmu actions. The fact that WebDAV access is "enabled" for the Oddmu actions
+has no effect. The only drawback is that "https://campaignwiki.org/data/" now
+requires authentication even if only used for reading.
+
+"https://campaignwiki.org/view/knochentanz/index" is a separate site called
+"knochentanz". The only valid user is "knochentanz".
+
+Notice how the _archive_ action is not available at the top level, only for
+subdirectories.
+
+```
+MDomain campaignwiki.org
+
+<VirtualHost *:80>
+    ServerName campaignwiki.org
+    Redirect permanent / https://campaignwiki.org/
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerAdmin alex@campaignwiki.org
+    ServerName campaignwiki.org
+    # Static HTML, CSS, JavaScript files and so on are saved here.
+    DocumentRoot /home/alex/campaignwiki.org
+    <Directory /home/alex/campaignwiki.org>
+        Options Indexes MultiViews SymLinksIfOwnerMatch
+        AllowOverride All
+        Require all granted
+    </Directory>
+    SSLEngine on
+    # Any request to the following paths is passed on to the Unix domain socket.
+    ProxyPassMatch \
+      "^/((view|preview|diff|edit|save|add|append|upload|drop|search|archive/.+)/(.*))$" \
+      "unix:/home/oddmu/campaignwiki.sock|http://localhost/$1"
+    # /archive only for subdirectories
+    Redirect "/archive/data.zip" "/view/archive"
+    # Making changes to the wiki requires authentication.
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop)/">
+      AuthType Basic
+      AuthName "Password Required"
+      AuthUserFile /home/oddmu/.htpasswd
+      Require user admin alex
+      Dav On
+    </LocationMatch>
+    # Making changes to a subdirectory requires different accounts.
+    <LocationMatch "^/(data|edit|preview|save|add|append|upload|drop|archive)/knochentanz">
+      Require user knochentanz
+    </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. Sometimes it works. I've used Nemo 5.6.4 to connect to the server and
+edited files using gedit 44.2. But I've used other file managers and other
+editors with WebDAV support and they didn't work very well.
+
+On Windows, try third party tools like WinSCP.
+
+This section has examples sessions using command-line 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
+
+"WinSCP"
+https://winscp.net/
+
+# AUTHORS
+
+Maintained by Alex Schroeder <alex@gnu.org>.

man/oddmu.1

@@ -5,18 +5,20 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU" "1" "2024-08-16"
+.TH "ODDMU" "1" "2025-08-09"
 .PP
 .SH NAME
 .PP
 oddmu - a wiki server
 .PP
-Oddmu is sometimes written Oddµ because µ is the letter mu.\&
+Oddmu is sometimes written Oddμ because μ is the letter mu.\&
 .PP
 .SH SYNOPSIS
 .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
@@ -214,20 +216,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 +282,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 +374,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
@@ -367,7 +384,7 @@ Oddmu running as a webserver:
 .PP
 .PD 0
 .IP \(bu 4
-\fIoddmu-hashtags\fR(1), on how to count the hashtags used
+\fIoddmu-hashtags\fR(1), on working with hashtags
 .IP \(bu 4
 \fIoddmu-html\fR(1), on how to render a page
 .IP \(bu 4

man/oddmu.1.txt

@@ -4,12 +4,14 @@ ODDMU(1)
 
 oddmu - a wiki server
 
-Oddmu is sometimes written Oddµ because µ is the letter mu.
+Oddmu is sometimes written Oddμ because μ is the letter mu.
 
 # SYNOPSIS
 
 *oddmu*
 
+*oddmu* _subcommand_ [_arguments_...]
+
 # DESCRIPTION
 
 Oddmu can be used as a static site generator, turning Markdown files into HTML
@@ -174,16 +176,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 +228,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,12 +309,13 @@ 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
 Oddmu running as a webserver:
 
-- _oddmu-hashtags_(1), on how to count the hashtags used
+- _oddmu-hashtags_(1), on working with hashtags
 - _oddmu-html_(1), on how to render a page
 - _oddmu-list_(1), on how to list pages and titles
 - _oddmu-links_(1), on how to list the outgoing links for a page

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" "2025-03-05" "File Formats Manual"
 .PP
 .SH NAME
 .PP
@@ -28,7 +28,7 @@ The page name has to be percent-encoded.\& See the section "Percent Encoding".\&
 If you link to the actual Markdown file (with the ".\&md" extension), then Oddmu
 serves the Markdown file!\&
 .PP
-There are three Oddµ-specific extensions: local links, hashtags and fediverse
+There are three Oddμ-specific extensions: local links, hashtags and fediverse
 account links.\& The Markdown library used features some additional extensions,
 most importantly tables and definition lists.\&
 .PP
@@ -89,12 +89,12 @@ 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
-page needs to be retrieved via webfinger.\& Oddµ does that in the background, and
+page needs to be retrieved via webfinger.\& Oddμ does that in the background, and
 as soon as the information is available, the actual profile link is used when
 pages are rendered.\& In the example above, the result would be
 "https://social.\&alexschroeder.\&ch/@alex".\&
@@ -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

@@ -19,7 +19,7 @@ The page name has to be percent-encoded. See the section "Percent Encoding".
 If you link to the actual Markdown file (with the ".md" extension), then Oddmu
 serves the Markdown file!
 
-There are three Oddµ-specific extensions: local links, hashtags and fediverse
+There are three Oddμ-specific extensions: local links, hashtags and fediverse
 account links. The Markdown library used features some additional extensions,
 most importantly tables and definition lists.
 
@@ -74,12 +74,12 @@ 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
-page needs to be retrieved via webfinger. Oddµ does that in the background, and
+page needs to be retrieved via webfinger. Oddμ does that in the background, and
 as soon as the information is available, the actual profile link is used when
 pages are rendered. In the example above, the result would be
 "https://social.alexschroeder.ch/@alex".
@@ -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/oddmu.service.5

@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "ODDMU.SERVICE" "5" "2024-08-23"
+.TH "ODDMU.SERVICE" "5" "2025-03-14"
 .PP
 .SH NAME
 .PP
@@ -94,8 +94,8 @@ sudo mkdir /run/oddmu
 .fi
 .RE
 .PP
-The unit file for the service defines where the "oddmu" is and where the data
-directory is.\& These are the lines you most likely have to take care of:
+The unit file for the service defines where the Oddmu binary is and where the
+data directory is.\& These are the lines you most likely have to take care of:
 .PP
 .nf
 .RS 4
@@ -152,6 +152,9 @@ Environment="ODDMU_LANGUAGES=de,en"
 .fi
 .RE
 .PP
+Make sure to change the "ExecStart" entry so that it points to your copy of the
+Oddmu binary.\&
+.PP
 Since this is a user service, the same user can edit the files using their
 favourite text editor.\&
 .PP

man/oddmu.service.5.txt

@@ -75,8 +75,8 @@ the directory or change the file name.
 sudo mkdir /run/oddmu
 ```
 
-The unit file for the service defines where the "oddmu" is and where the data
-directory is. These are the lines you most likely have to take care of:
+The unit file for the service defines where the Oddmu binary is and where the
+data directory is. These are the lines you most likely have to take care of:
 
 ```
 ExecStart=/home/oddmu/oddmu
@@ -125,6 +125,9 @@ WorkingDirectory=/home/alex/wiki
 Environment="ODDMU_LANGUAGES=de,en"
 ```
 
+Make sure to change the "ExecStart" entry so that it points to your copy of the
+Oddmu binary.
+
 Since this is a user service, the same user can edit the files using their
 favourite text editor.
 

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,23 +7,27 @@ 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)
-	filepath.Walk("man", func(path string, info fs.FileInfo, err error) error {
+	count := 0
+	filepath.Walk("man", func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
-		if strings.HasSuffix(path, ".txt") &&
-			path != "man/oddmu.1.txt" {
-			s := strings.TrimPrefix(path, "man/")
+		if strings.HasSuffix(fp, ".txt") &&
+			fp != "man/oddmu.1.txt" {
+			count++
+			s := strings.TrimPrefix(fp, "man/")
 			s = strings.TrimSuffix(s, ".txt")
 			i := strings.LastIndex(s, ".")
 			ref := "_" + s[:i] + "_(" + s[i+1:] + ")"
@@ -31,40 +35,99 @@ func TestManPages(t *testing.T) {
 		}
 		return nil
 	})
+	assert.Greater(t, count, 0, "no man pages were found")
 }
 
-func TestReadme(t *testing.T) {
-	b, err := os.ReadFile("README.md")
-	main := string(b)
+// 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)
-	filepath.Walk("man", func(path string, info fs.FileInfo, err error) error {
+	count := 0
+	filepath.Walk(".", func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
-		if strings.HasSuffix(path, ".txt") {
-			s := strings.TrimPrefix(path, "man/")
+		if strings.HasSuffix(fp, ".html") {
+			count++
+			assert.Contains(t, man, fp, fp)
+		}
+		if fp != "." && 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(`\.HandleFunc\("(/[a-z]+/)", makeHandler\([a-z]+Handler, (true|false)(, http\.Method(Get|Post))+\)\)`)
+	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")
+	readme := string(b)
+	assert.NoError(t, err)
+	count := 0
+	filepath.Walk("man", func(fp string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if strings.HasSuffix(fp, ".txt") {
+			count++
+			s := strings.TrimPrefix(fp, "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
 	})
-	filepath.Walk(".", func(path string, info fs.FileInfo, err error) error {
+	assert.Greater(t, count, 0, "no man pages were found")
+	count = 0
+	filepath.Walk(".", func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
-		if strings.HasSuffix(path, ".go") &&
-			!strings.HasSuffix(path, "_test.go") &&
-			!strings.HasSuffix(path, "_cmd.go") {
-			s := strings.TrimPrefix(path, "./")
+		if strings.HasSuffix(fp, ".go") &&
+			!strings.HasSuffix(fp, "_test.go") &&
+			!strings.HasSuffix(fp, "_cmd.go") {
+			count++
+			s := strings.TrimPrefix(fp, "./")
 			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 {

notify_cmd.go

@@ -7,6 +7,7 @@ import (
 	"github.com/google/subcommands"
 	"io"
 	"os"
+	"strings"
 )
 
 type notifyCmd struct {
@@ -32,6 +33,11 @@ func (cmd *notifyCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface
 func notifyCli(w io.Writer, args []string) subcommands.ExitStatus {
 	index.load()
 	for _, name := range args {
+		if !strings.HasSuffix(name, ".md") {
+			fmt.Fprintf(os.Stderr, "%s does not end in '.md'\n", name)
+			return subcommands.ExitFailure
+		}
+		name = name[0:len(name)-3]
 		p, err := loadPage(name)
 		if err != nil {
 			fmt.Fprintf(w, "Loading %s: %s\n", name, err)

page.go

@@ -64,7 +64,7 @@ func nameEscape(s string) string {
 // carriage return characters ("\r"). Page.Title and Page.Html are not saved. There is no caching. Before removing or
 // writing a file, the old copy is renamed to a backup, appending "~". Errors are not logged but returned.
 func (p *Page) save() error {
-	fp := filepath.FromSlash(p.Name + ".md")
+	fp := filepath.FromSlash(p.Name) + ".md"
 	watches.ignore(fp)
 	s := bytes.ReplaceAll(p.Body, []byte{'\r'}, []byte{})
 	if len(s) == 0 {
@@ -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 filepath. 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
 }
@@ -107,13 +113,13 @@ func backup(fp string) error {
 // loadPage loads a Page given a name. The path loaded is that Page.Name with the ".md" extension. The Page.Title is set
 // to the Page.Name (and possibly changed, later). The Page.Body is set to the file content. The Page.Html remains
 // undefined (there is no caching).
-func loadPage(path string) (*Page, error) {
-	path = strings.TrimPrefix(path, "./") // result of a filepath.TreeWalk starting with "."
-	body, err := os.ReadFile(filepath.FromSlash(path + ".md"))
+func loadPage(name string) (*Page, error) {
+	name = strings.TrimPrefix(name, "./") // result of a path.TreeWalk starting with "."
+	body, err := os.ReadFile(filepath.FromSlash(name) + ".md")
 	if err != nil {
 		return nil, err
 	}
-	return &Page{Title: path, Name: path, Body: body}, nil
+	return &Page{Title: name, Name: name, Body: body}, nil
 }
 
 // handleTitle extracts the title from a Page and sets Page.Title, if any. If replace is true, the page title is also
@@ -133,7 +139,6 @@ func (p *Page) handleTitle(replace bool) {
 // summarize sets Page.Html to an extract.
 func (p *Page) summarize(q string) {
 	t := p.plainText()
-	p.Name = nameEscape(p.Name)
 	p.Html = sanitizeStrict(snippets(q, t))
 }
 
@@ -143,20 +148,53 @@ func (p *Page) IsBlog() bool {
 	return blogRe.MatchString(name)
 }
 
-// Dir returns the directory the page is in. It's either the empty string if the page is in the Oddmu working directory,
-// or it ends in a slash. This is used to create the upload link in "view.html", for example.
+const upperhex = "0123456789ABCDEF"
+
+// Path returns the Page.Name with some characters escaped because html/template doesn't escape those. This is suitable
+// for use in HTML templates.
+func (p *Page) Path() string {
+	return pathEncode(p.Name)
+}
+
+// pathEncode returns the page name with some characters escaped because html/template doesn't escape those. This is
+// suitable for use in HTML templates.
+func pathEncode(s string) string {
+	n := strings.Count(s, ";") + strings.Count(s, ",") + strings.Count(s, "?") + strings.Count(s, "#")
+	if n == 0 {
+		return s
+	}
+	t := make([]byte, len(s) + 2*n)
+	j := 0
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case ';', ',', '?', '#':
+			t[j] = '%'
+			t[j+1] = upperhex[s[i]>>4]
+			t[j+2] = upperhex[s[i]&15]
+			j += 3
+		default:
+			t[j] = s[i]
+			j++
+		}
+	}
+	return string(t)
+}
+
+// Dir returns the directory part of the page name, percent-escaped except for the slashes. It's either the empty string
+// if the page is in the Oddmu working directory, or it ends in a slash. This is used to create the upload link in
+// "view.html", for example.
 func (p *Page) Dir() string {
-	d := filepath.Dir(p.Name)
+	d := path.Dir(p.Name)
 	if d == "." {
 		return ""
 	}
-	return d + "/"
+	return pathEncode(d) + "/"
 }
 
-// Base returns the basename of the page name: no directory. This is used to create the upload link in "view.html", for
-// example.
+// Base returns the  basename of the page  name: no directory, percent-escaped except  for the slashes. This  is used to
+// create the upload link in "view.html", for example.
 func (p *Page) Base() string {
-	n := filepath.Base(p.Name)
+	n := path.Base(p.Name)
 	if n == "." {
 		return ""
 	}

page_test.go

@@ -57,7 +57,7 @@ And untouchable`)}
 	p = &Page{Name: "testdata/parents/children/something/other"}
 	// "testdata/parents/children/something/index" is a sibling and doesn't count!
 	parents := p.Parents()
-	assert.Equal(t, "Welcome to Oddµ", parents[0].Title)
+	assert.Equal(t, "Welcome to Oddμ", parents[0].Title)
 	assert.Equal(t, "../../../../index", parents[0].Url)
 	assert.Equal(t, "…", parents[1].Title)
 	assert.Equal(t, "../../../index", parents[1].Url)

parser.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gomarkdown/markdown/parser"
 	"net/url"
 	"path"
-	"path/filepath"
 )
 
 // wikiLink returns an inline parser function. This indirection is
@@ -37,9 +36,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 +67,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
@@ -90,7 +94,6 @@ func (p *Page) renderHtml() {
 	parser, hashtags := wikiParser()
 	renderer := wikiRenderer()
 	maybeUnsafeHTML := markdown.ToHTML(p.Body, parser, renderer)
-	p.Name = nameEscape(p.Name)
 	p.Html = unsafeBytes(maybeUnsafeHTML)
 	p.Hashtags = *hashtags
 }
@@ -124,7 +127,7 @@ func (p *Page) plainText() string {
 
 // images returns an array of ImageData.
 func (p *Page) images() []ImageData {
-	dir := path.Dir(filepath.ToSlash(p.Name))
+	dir := p.Dir()
 	images := make([]ImageData, 0)
 	parser := parser.New()
 	doc := markdown.Parse(p.Body, parser)
@@ -147,6 +150,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.go

@@ -10,8 +10,13 @@ import (
 // otherwise the rendered template has garbage bytes at the end. Note also that we need to remove the title from the
 // page so that the preview works as intended (and much like the "view.html" template) where as the editing requires the
 // page content including the header… which is why it needs to be added in the "preview.html" template. This makes me
-// sad.
+// sad. While viewing the preview, links will point to the /preview path. In order to handle this, regular GET requests
+// are passed on the the {viewHandler}.
 func previewHandler(w http.ResponseWriter, r *http.Request, path string) {
+	if r.Method != http.MethodPost {
+		http.Redirect(w, r, "/view/" + strings.TrimPrefix(path, "/preview/"), http.StatusFound)
+		return
+	}
 	body := strings.ReplaceAll(r.FormValue("body"), "\r", "")
 	p := &Page{Name: path, Body: []byte(body)}
 	p.handleTitle(true)

preview.html

@@ -3,17 +3,18 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <base href="/view/{{.Dir}}">
     <title>Preview: {{.Title}}</title>
     <style>
-html { max-width: 70ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe; }
-body { hyphens: auto; }
-header a { margin-right: 1ch; }
-form { display: inline-block; }
-input#search { width: 12ch; }
-button { background-color: #eee; color: inherit; border-radius: 4px; border-width: 1px; }
+html { max-width: 70ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe }
+body { hyphens: auto }
+header a { margin-right: 1ch }
+form { display: inline-block }
+input#search { width: 12ch }
+button { background-color: #eee; color: inherit; border-radius: 4px; border-width: 1px }
 footer { border-top: 1px solid #888 }
-img { max-width: 100%; }
+img { max-width: 100% }
     </style>
   </head>
   <body>
@@ -27,12 +28,12 @@ img { max-width: 100%; }
     <hr>
     <section id="edit">
       <h2>Editing {{.Title}}</h2>
-      <form action="/save/{{.Name}}" method="POST">
+      <form action="/save/{{.Path}}" method="POST">
         <textarea name="body" rows="20" cols="80" lang="{{.Language}}" autofocus>{{printf "# %s\n\n%s" .Title .Body}}</textarea>
         <p><label><input type="checkbox" name="notify" checked> Add link to <a href="changes">the list of changes</a>.</label></p>
         <p><input type="submit" value="Save">
-          <button formaction="/preview/{{.Name}}" type="submit">Preview</button>
-          <a href="/view/{{.Name}}"><button type="button">Cancel</button></a></p>
+          <button formaction="/preview/{{.Path}}" type="submit">Preview</button>
+          <a href="/view/{{.Path}}"><button type="button">Cancel</button></a></p>
       </form>
     </section>
   </body>

preview_test.go

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

replace_cmd.go

@@ -55,12 +55,12 @@ func replaceCli(w io.Writer, isConfirmed bool, isRegexp bool, args []string) sub
 	}
 	repl := []byte(args[1])
 	changes := 0
-	err := filepath.Walk(".", func(path string, info fs.FileInfo, err error) error {
+	err := filepath.Walk(".", func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		// skip hidden directories and files
-		if path != "." && strings.HasPrefix(filepath.Base(path), ".") {
+		if fp != "." && strings.HasPrefix(filepath.Base(fp), ".") {
 			if info.IsDir() {
 				return filepath.SkipDir
 			} else {
@@ -68,10 +68,10 @@ func replaceCli(w io.Writer, isConfirmed bool, isRegexp bool, args []string) sub
 			}
 		}
 		// skipp all but page files
-		if !strings.HasSuffix(path, ".md") {
+		if !strings.HasSuffix(fp, ".md") {
 			return nil
 		}
-		body, err := os.ReadFile(path)
+		body, err := os.ReadFile(fp)
 		if err != nil {
 			return err
 		}
@@ -79,15 +79,15 @@ func replaceCli(w io.Writer, isConfirmed bool, isRegexp bool, args []string) sub
 		if !slices.Equal(result, body) {
 			changes++
 			if isConfirmed {
-				fmt.Fprintln(w, path)
-				_ = os.Rename(path, path+"~")
-				err = os.WriteFile(path, result, 0644)
+				fmt.Fprintln(w, fp)
+				_ = os.Rename(fp, fp + "~")
+				err = os.WriteFile(fp, result, 0644)
 				if err != nil {
 					return err
 				}
 			} else {
-				edits := myers.ComputeEdits(span.URIFromPath(path+"~"), string(body), string(result))
-				diff := fmt.Sprint(gotextdiff.ToUnified(path+"~", path, string(body), edits))
+				edits := myers.ComputeEdits(span.URIFromPath(fp + "~"), string(body), string(result))
+				diff := fmt.Sprint(gotextdiff.ToUnified(fp + "~", fp, string(body), edits))
 				fmt.Fprintln(w, diff)
 			}
 		}

search.go

@@ -300,3 +300,9 @@ func searchHandler(w http.ResponseWriter, r *http.Request, dir string) {
 		Results: len(items) > 0, More: more}
 	renderTemplate(w, dir, "search", s)
 }
+
+// Path returns the ImageData.Name with some characters escaped because html/template doesn't escape those. This is
+// suitable for use in HTML templates.
+func (img *ImageData) Path() string {
+	return pathEncode(img.Name)
+}

search.html

@@ -3,24 +3,24 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>Search for {{.Query}}</title>
     <style>
-html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe; }
-body { hyphens: auto; }
-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; }
+html { max-width: 70ch; padding: 2ch; margin: auto; color: #111; background-color: #ffe }
+body { hyphens: auto }
+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%; }
+.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="#main">Skip</a>
       <a href="/view/index">Home</a>
       <form role="search" action="/search/{{.Dir}}" method="GET">
         <label for="search">Search:</label>
@@ -38,11 +38,11 @@ button { background-color: #eee; color: inherit; border-radius: 4px; border-widt
         {{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>
+        <p><a class="result" href="/view/{{.Path}}">{{.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}}
+        <p class="image"><a href="/view/{{.Path}}"><img loading="lazy" src="/view/{{.Path}}"></a><br/>{{.Html}}
         {{end}}
       </article>
       {{end}}

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,11 +9,11 @@ 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)
+	r := `* [Oddμ: A minimal wiki](README)
 * [Themes](themes/index)
-* [Welcome to Oddµ](index)
+* [Welcome to Oddμ](index)
 `
 	assert.Equal(t, r, b.String())
 }
@@ -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

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
+	"net/http"
 	"net/url"
 	"slices"
 	"testing"
@@ -61,17 +62,17 @@ func TestSearch(t *testing.T) {
 	index.load()
 
 	data := url.Values{}
-	data.Set("q", "oddµ")
+	data.Set("q", "oddμ")
 
-	body := assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/", data)
+	body := assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/", data)
 	assert.Contains(t, body, "Welcome")
 	assert.Contains(t, body, `<span class="score">5</span>`)
 
-	body = assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/testdata", data)
+	body = assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/testdata", data)
 	assert.NotContains(t, body, "Welcome")
 
 	data.Set("q", "'create a new page'")
-	body = assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/", data)
+	body = assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/", data)
 	assert.Contains(t, body, "Welcome")
 }
 
@@ -158,16 +159,16 @@ Where is lady luck?`)}
 	data := url.Values{}
 	data.Set("q", "luck")
 
-	body := assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/", data)
+	body := assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/", data)
 	assert.Contains(t, body, "luck")
 
-	body = assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/testdata", data)
+	body = assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/testdata", data)
 	assert.Contains(t, body, "luck")
 
-	body = assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/testdata/dir", data)
+	body = assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/testdata/dir", data)
 	assert.Contains(t, body, "luck")
 
-	body = assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/testdata/other", data)
+	body = assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/testdata/other", data)
 	assert.Contains(t, body, "No results")
 }
 
@@ -177,12 +178,12 @@ 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"
 	assert.Equal(t, 1, len(items), "one page found")
-	assert.Equal(t, "index", items[0].Name, "Welcome to Oddµ")
+	assert.Equal(t, "index", items[0].Name, "Welcome to Oddμ")
 	assert.Greater(t, items[0].Score, 0, "matches result in a score")
 	assert.False(t, more)
 
@@ -277,7 +278,7 @@ The silence streches.`)}
 	p.save()
 	data := url.Values{}
 	data.Set("q", "look")
-	body := assert.HTTPBody(makeHandler(searchHandler, false), "GET", "/search/", data)
+	body := assert.HTTPBody(makeHandler(searchHandler, false, http.MethodGet), "GET", "/search/testdata/question/", data)
 	assert.Contains(t, body, "We <b>look</b>")
 	assert.NotContains(t, body, "Odd?")
 	assert.Contains(t, body, "Even?")

static.html

@@ -3,17 +3,17 @@
   <head>
     <meta charset="utf-8">
     <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>{{.Title}}</title>
     <style>
-html { max-width: 65ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe; }
-body { hyphens: auto; }
-header a { margin-right: 1ch; }
-form { display: inline-block; }
-input#search { width: 12ch; }
-button { background-color: #eee; color: inherit; border-radius: 4px; border-width: 1px; }
+html { max-width: 65ch; padding: 1ch; margin: auto; color: #111; background-color: #ffe }
+body { hyphens: auto }
+header a { margin-right: 1ch }
+form { display: inline-block }
+input#search { width: 12ch }
+button { background-color: #eee; color: inherit; border-radius: 4px; border-width: 1px }
 footer { border-top: 1px solid #888 }
-img { max-width: 100%; }
+img { max-width: 100% }
     </style>
   </head>
   <body>

static_cmd.go

@@ -84,7 +84,7 @@ func staticCli(source, target string, jobs int, quiet bool) subcommands.ExitStat
 func staticWalk(source, target string, tasks chan (args), stop chan (error)) {
 	// The error returned here is what's in the stop channel but at the very end, a worker might return an error
 	// even though the walk is already done. This is why we cannot rely on the return value of the walk.
-	filepath.Walk(source, func(path string, info fs.FileInfo, err error) error {
+	filepath.Walk(source, func(fp string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -92,9 +92,8 @@ func staticWalk(source, target string, tasks chan (args), stop chan (error)) {
 		case err := <-stop:
 			return err
 		default:
-			base := filepath.Base(path)
 			// skip hidden directories and files
-			if path != "." && strings.HasPrefix(base, ".") {
+			if fp != "." && strings.HasPrefix(filepath.Base(fp), ".") {
 				if info.IsDir() {
 					return filepath.SkipDir
 				} else {
@@ -102,28 +101,28 @@ func staticWalk(source, target string, tasks chan (args), stop chan (error)) {
 				}
 			}
 			// skip backup files, avoid recursion
-			if strings.HasSuffix(path, "~") || strings.HasPrefix(path, target) {
+			if strings.HasSuffix(fp, "~") || strings.HasPrefix(fp, target) {
 				return nil
 			}
 			// determine the actual target: if source is a/ and target is b/ and path is a/file, then the
 			// target is b/file
-			var actual_target string
+			var actualTarget string
 			if source == "." {
-				actual_target = filepath.Join(target, path)
+				actualTarget = filepath.Join(target, fp)
 			} else {
-				if !strings.HasPrefix(path, source) {
-					return fmt.Errorf("%s is not a subdirectory of %s", path, source)
+				if !strings.HasPrefix(fp, source) {
+					return fmt.Errorf("%s is not a subdirectory of %s", fp, source)
 				}
-				actual_target = filepath.Join(target, path[len(source):])
+				actualTarget = filepath.Join(target, fp[len(source):])
 			}
 			// recreate subdirectories
 			if info.IsDir() {
-				return os.Mkdir(actual_target, 0755)
+				return os.Mkdir(actualTarget, 0755)
 			}
 			// do the task if the target file doesn't exist or if the source file is newer
-			other, err := os.Stat(actual_target)
+			other, err := os.Stat(actualTarget)
 			if err != nil || info.ModTime().After(other.ModTime()) {
-				tasks <- args{source: path, target: actual_target, info: info}
+				tasks <- args{source: fp, target: actualTarget, info: info}
 			}
 			return nil
 		}
@@ -211,7 +210,6 @@ func staticPage(source, target string) (*Page, error) {
 	}
 	renderer := html.NewRenderer(opts)
 	maybeUnsafeHTML := markdown.Render(doc, renderer)
-	p.Name = nameEscape(p.Name)
 	p.Html = unsafeBytes(maybeUnsafeHTML)
 	p.Hashtags = *hashtags
 	return p, write(p, target, "", "static.html")
@@ -221,7 +219,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 {
@@ -257,22 +255,22 @@ func staticLinks(node ast.Node, entering bool) ast.WalkStatus {
 }
 
 // write a page or feed with an appropriate template to a specific destination, overwriting it.
-func write(data any, path, prefix, templateFile string) error {
-	file, err := os.Create(path)
+func write(data any, fp, prefix, templateFile string) error {
+	file, err := os.Create(fp)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Cannot create %s: %s\n", path, err)
+		fmt.Fprintf(os.Stderr, "Cannot create %s: %s\n", fp, err)
 		return err
 	}
 	_, err = file.Write([]byte(prefix))
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Cannot write prefix %s: %s\n", path, err)
+		fmt.Fprintf(os.Stderr, "Cannot write prefix %s: %s\n", fp, err)
 		return err
 	}
 	templates.RLock()
 	defer templates.RUnlock()
 	err = templates.template[templateFile].Execute(file, data)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Cannot execute %s template for %s: %s\n", templateFile, path, err)
+		fmt.Fprintf(os.Stderr, "Cannot execute %s template for %s: %s\n", templateFile, fp, err)
 		return err
 	}
 	return nil

templates.go

@@ -5,7 +5,6 @@ import (
 	"io/fs"
 	"log"
 	"net/http"
-	"path"
 	"path/filepath"
 	"slices"
 	"strings"
@@ -15,17 +14,17 @@ 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.
 type templateStore struct {
 	sync.RWMutex
 
-	// template is a map of parsed HTML templates. The key is their path name. By default, the map only contains
+	// template is a map of parsed HTML templates. The key is their filepath name. By default, the map only contains
 	// top-level templates like "view.html". Subdirectories may contain their own templates which override the
-	// templates in the root directory. If so, they are paths like "dir/view.html", not filepaths. Use
-	// filepath.ToSlash() if necessary.
+	// templates in the root directory. If so, they are filepaths like "dir/view.html".
 	template map[string]*template.Template
 }
 
@@ -57,8 +56,7 @@ func loadTemplate(fp string, info fs.FileInfo, err error) error {
 			log.Println("Cannot parse template:", fp, err)
 			// ignore error
 		} else {
-			// log.Println("Parse template:", path)
-			templates.template[filepath.ToSlash(fp)] = t
+			templates.template[fp] = t
 		}
 	}
 	return nil
@@ -74,7 +72,7 @@ func updateTemplate(fp string) {
 		} else {
 			templates.Lock()
 			defer templates.Unlock()
-			templates.template[filepath.ToSlash(fp)] = t
+			templates.template[fp] = t
 			log.Println("Parse template:", fp)
 		}
 	}
@@ -86,7 +84,7 @@ func removeTemplate(fp string) {
 		filepath.Dir(fp) != "." {
 		templates.Lock()
 		defer templates.Unlock()
-		delete(templates.template, filepath.ToSlash(fp))
+		delete(templates.template, fp)
 		log.Println("Discard template:", fp)
 	}
 }
@@ -98,7 +96,7 @@ func renderTemplate(w http.ResponseWriter, dir, tmpl string, data any) {
 	base := tmpl + ".html"
 	templates.RLock()
 	defer templates.RUnlock()
-	t := templates.template[path.Join(dir, base)]
+	t := templates.template[filepath.Join(dir, base)]
 	if t == nil {
 		t = templates.template[base]
 	}

templates_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"github.com/stretchr/testify/assert"
 	"mime/multipart"
+	"net/http"
 	"testing"
 )
 
@@ -18,13 +19,12 @@ Memories of cold
 `)}
 	p.save()
 	assert.Contains(t,
-		assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/testdata/templates/snow", nil),
-		"Skip navigation")
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/testdata/templates/snow", nil), "Skip")
 	// save a new view handler
 	html := "<body><h1>{{.Title}}</h1>{{.Html}}"
 	form := new(bytes.Buffer)
 	writer := multipart.NewWriter(form)
-	field, err := writer.CreateFormField("name")
+	field, err := writer.CreateFormField("filename")
 	assert.NoError(t, err)
 	field.Write([]byte("view.html"))
 	file, err := writer.CreateFormFile("file", "test.html")
@@ -33,18 +33,17 @@ Memories of cold
 	assert.NoError(t, err)
 	assert.Equal(t, len(html), n)
 	writer.Close()
-	HTTPUploadLocation(t, makeHandler(dropHandler, false), "/drop/testdata/templates/", writer.FormDataContentType(), form)
+	HTTPUploadLocation(t, makeHandler(dropHandler, false, http.MethodPost), "/drop/testdata/templates/", writer.FormDataContentType(), form)
 	assert.FileExists(t, "view.html", "original view.html still exists")
 	assert.FileExists(t, "testdata/templates/view.html", "new view.html also exists")
 	assert.Contains(t,
-		assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/testdata/templates/view.html", nil),
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/testdata/templates/view.html", nil),
 		html)
 	// verify that it works
-	body := assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/testdata/templates/snow", nil)
+	body := assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/testdata/templates/snow", nil)
 	assert.Contains(t, body, "<h1>Snow</h1>")
 	assert.NotContains(t, body, "Skip")
 	// verify that the top level still uses the old template
 	assert.Contains(t,
-		assert.HTTPBody(makeHandler(viewHandler, false), "GET", "/view/index", nil),
-		"Skip navigation")
+		assert.HTTPBody(makeHandler(viewHandler, false, http.MethodGet), "GET", "/view/index", nil), "Skip")
 }

themes/Makefile

@@ -1,11 +1,17 @@
-download:
-	rsync --archive --delete --itemize-changes --exclude='*-*' sibirocobombus:alexschroeder.ch/wiki/'*.html' alexschroeder.ch/
-	rsync --archive sibirocobombus:alexschroeder.ch/css/oddmu-2023.css alexschroeder.ch/oddmu.css
-	sed --in-place=~ --expression='s/\/css\/oddmu-2023\.css/oddmu.css/' alexschroeder.ch/*.html
-	rsync --archive --delete --itemize-changes sibirocobombus:flying-carpet.ch/wiki/'*.html' flying-carpet.ch/
-	rsync --archive --delete --itemize-changes sibirocobombus:campaignwiki.org/data/'*.html' campaignwiki.org/
-	rsync --archive --delete --itemize-changes sibirocobombus.root:/home/oddmu/'*.html' transjovian.org/
+SHELL=/usr/bin/fish
 
+# Manually figure out what needs to change:
+# (ediff-directories "alexschroeder.ch" "/ssh:sibirocobombus:alexschroeder.ch/wiki/" "html$")
+# (ediff-directories "flying-carpet.ch" "/ssh:sibirocobombus.root:/home/claudia/flying-carpet.ch/wiki/" "html$") + fix permissions
+# (ediff-directories "campaignwiki.org" "/ssh:sibirocobombus:campaignwiki.org/data/" "html$")
+# (ediff-directories "communitywiki.org" "/ssh:sibirocobombus:communitywiki.org/data/" "html$")
+# (ediff-directories "transjovian.org" "/ssh:sibirocobombus.root:/home/oddmu/" "html$")
+
+# (ediff-directories "communitywiki.org" ".." "html$")
+
+
+# Upload the theme for the web site. This does not deploy the themes!
 upload:
-	rsync --archive --delete --itemize-changes --exclude=Makefile --exclude='*~' . sibirocobombus:alexschroeder.ch/wiki/oddmu/themes/
-
+	rsync --archive --delete --itemize-changes --exclude=Makefile --exclude='*~' \
+		. sibirocobombus:alexschroeder.ch/wiki/oddmu/themes/
+	@echo Updated the templates for the Oddmu site

themes/alexschroeder.ch/README.md

@@ -2,11 +2,6 @@
 
 At the top there's a text input to quickly create new pages.
 
-This theme comes with an external CSS file. If you plan to use
-subdirectories for your site, you need to change the URL of the CSS in
-the HTML templates to `/view/oddmu.css` or serve it as a static file
-from a `/css` directory.
-
 The CSS switches between light and dark mode based on the visitor's
 setup.