Quote URL in atom:id

2 files changed, 17 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 63c5cd8..965a889 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ all: $(OUTPUTS)
 	xsltproc page.xslt $< > $@
 
 atom.xml: atom.xslt $(DATA) cc.svg by.svg sa.svg
-	xsltproc atom.xslt > atom.xml
+	xsltproc atom.xslt | ./atom-encode-ids > atom.xml
 
 clean:
 	rm -f atom.xml */{index.xhtml,*.small.jpg}
diff --git a/atom-encode-ids b/atom-encode-ids
new file mode 100755
index 0000000..79ac509
--- /dev/null
+++ b/atom-encode-ids
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+import re
+from urllib.parse import quote
+from sys import stdin, stdout
+
+ID_LINE = re.compile(r'(?P<open> +<id>)(?P<url>.+)(?P<close></id>)\n')
+
+
+def encode_id(line: str) -> str:
+    match = re.fullmatch(ID_LINE, line)
+    if match is None: return line
+    return '{open}{iri}{close}\n'.format(iri=quote(match.group('url'), ':/#'),
+                                         **match.groupdict())
+
+
+stdout.writelines(map(encode_id, stdin.readlines()))