From 6a6bcf31be609819bce77911e120d9a8b12bc067 Mon Sep 17 00:00:00 2001
From: opfez <opfez@disroot.org>
Date: Fri, 15 Oct 2021 20:25:38 +0200
Subject: [PATCH] changes

---
 .gitignore                    |  1 -
 gen.sh                        | 13 +++++++++----
 resources/_footer.html        |  6 ------
 resources/footer.html         |  4 ++++
 resources/style-formatted.css |  9 +++------
 site-src/index.wtn            |  3 +++
 site-src/now.wtn              |  3 +++
 site-src/reading.wtn          |  9 +++++++++
 8 files changed, 31 insertions(+), 17 deletions(-)
 delete mode 100644 resources/_footer.html
 create mode 100644 resources/footer.html

diff --git a/.gitignore b/.gitignore
index 1efda87..b59e039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 format
 site/*
 resources/style.css
-resources/footer.html
diff --git a/gen.sh b/gen.sh
index e349b95..61c7bf5 100755
--- a/gen.sh
+++ b/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
diff --git a/resources/_footer.html b/resources/_footer.html
deleted file mode 100644
index 20e4bd0..0000000
--- a/resources/_footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-DATE @ date +%s
-
-<hr>
-<p><a href="index.html">index</a> | Last generated DATE
-</body>
-</html>
diff --git a/resources/footer.html b/resources/footer.html
new file mode 100644
index 0000000..72edd25
--- /dev/null
+++ b/resources/footer.html
@@ -0,0 +1,4 @@
+<hr>
+<p><a href="index.html">index</a>
+</body>
+</html>
diff --git a/resources/style-formatted.css b/resources/style-formatted.css
index e4156d5..cabfe58 100644
--- a/resources/style-formatted.css
+++ b/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
diff --git a/site-src/index.wtn b/site-src/index.wtn
index fb91dca..d72d6cd 100644
--- a/site-src/index.wtn
+++ b/site-src/index.wtn
@@ -10,3 +10,6 @@ Welcome to {Codex}.
 {Computation}
 {Language}
 {Aesthetic}
+
+#makro DATE @ date -I
+The wiki was last generated DATE.
diff --git a/site-src/now.wtn b/site-src/now.wtn
index 79d6b6f..b1ba550 100644
--- a/site-src/now.wtn
+++ b/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}.
diff --git a/site-src/reading.wtn b/site-src/reading.wtn
index 6c1fb13..a87d5d3 100644
--- a/site-src/reading.wtn
+++ b/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