changes

.gitignore

@@ -1,4 +1,3 @@
 format
 site/*
 resources/style.css
-resources/footer.html

gen.sh

@@ -4,15 +4,20 @@
 echo "Generating CSS"
 makros resources/style-formatted.css | tr -d " \t\n\r" > resources/style.css
 
-# Generate the footer
-makros resources/_footer.html > resources/footer.html
-
 # Generate HTML pages from Writan sources
 echo "Generating pages"
 for file in site-src/*; do
     bn=$(basename $file .wtn)
     echo "  $file -> site/$bn.html"
-    ./format $file site/$bn.html
+    # if the file has macros, expand them
+    if grep "#makro" $file >/dev/null; then
+        tmp=$(mktemp)
+        makros $file > $tmp
+        ./format $tmp site/$bn.html
+        rm $tmp
+    else
+        ./format $file site/$bn.html
+    fi
 done
 
 # Generate the site index

resources/_footer.html

@@ -1,6 +0,0 @@
-DATE @ date +%s
-
-<hr>
-<p><a href="index.html">index</a> | Last generated DATE
-</body>
-</html>

resources/footer.html

@@ -0,0 +1,4 @@
+<hr>
+<p><a href="index.html">index</a>
+</body>
+</html>

resources/style-formatted.css

@@ -1,8 +1,6 @@
-FG = #ddd
-NORMALBG = #111
-CODEBG = #1a1a1a
-DATE @ date
-
+#makro FG = #ddd
+#makro NORMALBG = #111
+#makro CODEBG = #1a1a1a
 body {
     color: FG;
     background: NORMALBG;
@@ -55,4 +53,3 @@ hr {
     text-align: left;
     margin-left: 0;
 }
-DATE

site-src/index.wtn

@@ -10,3 +10,6 @@ Welcome to {Codex}.
 {Computation}
 {Language}
 {Aesthetic}
+
+#makro DATE @ date -I
+The wiki was last generated DATE.

site-src/now.wtn

@@ -1,3 +1,6 @@
 * Now
 
 You can see what I'm up to by {finger}ing me at opfez@tilde.town.
+
+I also write small status updates and thoughts I'm having on my {http://fixedpoints.zapto.org/twtxt.txt
+twtxt feed}.

site-src/reading.wtn

@@ -4,6 +4,15 @@ Various texts I've read.
 
 ** 2021
 
+_Roadside Picnic_, Arkady and Boris Strugatsky
+
+_{https://theanarchistlibrary.org/library/margaret-killjoy-cooperative-scavenging
+Cooperative Scavenging}_, Margaret Killjoy
+
+_{https://theanarchistlibrary.org/library/margaret-killjoy-take-what-you-need-and-compost-the-rest-an-introduction-to-post-civilized-theo
+Take What You Need And Compost The Rest: an introduction to post-civilized
+theory}_, Margaret Killjoy
+
 _Vildanden_, Henrik Ibsen
 
 _All Tomorrows_, Cevdet Mehmet Kösemen