10 files changed, 114 insertions, 36 deletions

@@ -6,6 +6,7 @@ UPLOAD_TARGET = hetzner:/var/www/acdw.casa/
 SITE_TITLE = acdw.casa
 
 INPUT = src
+ASSET = asset
 BUILD = build
 
 HTAWK = ./ht.awk
@@ -39,7 +40,7 @@ ITMPC = \
         done) \
         </ul>
 ITMPR = \
-        index.html: ${ITMPL} $$(cat ${TPG}); \
+        index.html: ${ITMPL} _index.htm ${INCLUDES} $$(cat ${TPG}); \
         env HTTMP='$T' HTOUT='\$$@' \
         ${HTSH} "${ITMPL}" < /dev/null > '\$$@'
 
@@ -50,7 +51,7 @@ RTMPR = \
         ${HTSH} "${RTMPL}" < /dev/null > '\$$@'
 
 TMPL = ${PTMPL} ${ITMPL} ${RTMPL}
-BUILD_INPUTS = ${INPUT}/* ${TMPL} ${HT}
+BUILD_INPUTS = ${INPUT}/* ${ASSET}/* ${TMPL} ${HT}
 
 RSYNCEXCLUDE = \
         "*.ht" \
@@ -60,7 +61,8 @@ RSYNCEXCLUDE = \
         "*.awk" \
         "*.bod.txt" \
         "tmpl.*" \
-        "tmp/"
+        "tmp/" \
+        "tw.txt"
 RSYNCEXCLUDEFILE = ${BUILD}/.rsync-exclude
 RSYNC = rsync -auvz --exclude-from="${RSYNCEXCLUDEFILE}" --delete
 
@@ -30,3 +30,7 @@ footer {
     text-align: right;
     padding: 1ch 0;
 }
+
+code {
+    color: #c0ffee;
+}
@@ -11,7 +11,8 @@ function bufpush(s) {
 function buflush() {
     if (BUF) print BUF;
     BUF = "";
-    if (tag && (tag != "html")) print "</" tag ">";
+    if (tag && (tag != "html") && (tag != "raw"))
+        print "</" tag ">";
 }
 
 function esc(t) {
@@ -19,6 +20,7 @@ function esc(t) {
     gsub(/&/, "\\&amp;", t);
     gsub(/</, "\\&lt;", t);
     gsub(/>/, "\\&gt;", t);
+    sub(/^ /, "\\&nbsp;", t);
     return t;
 }
 
@@ -30,7 +32,21 @@ function esc(t) {
     next;
 }
 
+/^```$/ { # Raw block
+    if (! (tag == "raw")) {
+        tag = "raw";
+        getline;
+        bufpush("<pre><code>" $0);
+    } else {
+        bufpush("</code></pre>");
+        buflush();
+        tag = "";
+    }
+    next;
+}
+
 /^=>/ { # Links (Gemini-style)
+    if (tag == "raw") next;
     link = "<a href=\"" esc($2) "\">" $3;
     for (i=4;i<=NF;i++) link = link " " $i;
     link = link "</a>";
@@ -39,21 +55,25 @@ function esc(t) {
 }
 
 /^-/ { # Unordered lists
+    if (tag == "raw") next;
     if (! (tag == "ul")) tag = "ul";
     sub(/^-[ \t]*/, "<li>");
 }
 
 /^[0-9]+\./ { # Ordered lists
+    if (tag == "raw") next;
     if (! (tag == "ol")) tag = "ol";
     sub(/^[0-9]+\.[ \t]/, "<li>");
 }
 
 /^>/ { # Blockquotes
+    if (tag == "raw") next;
     if (! (tag == "blockquote")) tag = "blockquote";
     sub(/^>[ \t]*/,"");
 }
 
 /^#+/ { # Headers
+    if (tag == "raw") next;
     match($0, /^#+/);
     if (! (tag == "h" RLENGTH)) {
         buflush();
@@ -63,6 +83,7 @@ function esc(t) {
 }
 
 /^$/ {
+    if (tag == "raw") next;
     buflush();
     tag = "";
 }
@@ -70,6 +91,7 @@ function esc(t) {
 /./ {
     if (! tag) tag = "p";
     if (! BUF) bufpush("<" tag ">");
+    if (tag == "raw") $0 = esc($0);
     bufpush($0);
 }
 
@@ -27,7 +27,7 @@ htt() { # htt FILES...
 
 ht_build_env() { # ht_build_env FILE...
     print "body() { cat \"$HTBOD\"; }" > "$HTENV"
-    : > "$HTBOD"; # clear out body
+    : > "$HTBOD"; # clear
     while read -r line; do
         case "$line" in
             *@@*:*@@*) # "simple" metadata; just a string
@@ -38,7 +38,8 @@ ht_build_env() { # ht_build_env FILE...
                 print "$line" |
                     sed 's/.*@@\([^:]*\):: \?\(.*\)@@.*/\1() { \2 ; }/'
                 ;;
-        esac >> "$HTENV"
+        esac |
+            sed '/%s() {.*}/d' >> "$HTENV"
         # Still print the line to the body (no need to escape or w/e)
         print "$line" >> "$HTBOD"
     done
@@ -53,7 +54,7 @@ ht_main() { # main TEMPLATE < INPUT
         exit 1
     fi
 
-    eval "ht_build_env; . \"$HTENV\"; print \"\$(htt \"\$@\")\";";
+    eval "ht_build_env; . \"$HTENV\"; htt \"\$@\";";
 }
 
 # To keep this POSIX-compliant, we can't use a bashism like
@@ -0,0 +1,4 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((fundamental-mode . ((compile-command . "make build"))))
@@ -8,7 +8,7 @@
         <title>$(title)</title>
         <link rel="shortcut icon"
               href="data:image/gif;base64,R0lGODdhEAAQAIAAAAByL8zAGiwAAAAAEAAQAAACK4wNqQsX+1hD6kiaXKxQb+ZZYChmpGNinfpxV/q02dzUrx1L+Lzlp60LFgAAOw==" />
-        <link rel="stylesheet" type="text/css" href="static/casa.css">
+        <link rel="stylesheet" type="text/css" href="casa.css">
         <link rel="alternate" type="application/atom+xml" href="feed.xml">
     </head>
     <body>
@@ -1,7 +1,8 @@
 <p>Ahoy!  This here is my little home-away-from-home on the interwebs.
     I'm currently experimenting with a custom little <abbr title="static site generator">SSG</abbr>
     I'm calling <strong>HAT TRICK</strong>.
-    I should probably throw the source up somewhere, but I haven't yet.
+    <del>I should probably throw the source up somewhere, but I haven't yet.</del>
+    <a href="https://git.acdw.net/hat-trick/">Download the source here!</a>
 </p>
 
 
@@ -0,0 +1,49 @@
+;@@title: Paper airplane day and two fire alarms@@
+;@@date: 2022-05-26@@
+
+Apparently, today is National Paper Airplane Day, so we had a little paper
+airplane contest at work.  It was quite fun, though my go-to airplane style
+didn't win over the YouTube-d and other "professionally"-done airplanes.
+
+We also had a potluck with my department and another, and in preparation the
+ovens set off two fire alarms.  The first was totally charred french bread and
+the second was some drippings that were left on foil in the oven for who knows
+how long.  Quite annoying, but the potluck turned out quite well!
+
+I've also sold my desk as we prepare for our move, and I'm looking at others.
+Thinking an Ikea number, maybe.
+
+I'm back on <code>nyan-mode</code> in my mode-line.  Oh, I need to remember the
+<code>actually-selected-window</code> package, which I wrote I belive
+<em>for</em> <code>nyan-mode</code>!  I'll do that when I'm done here.
+
+I also wrote a little function to make it easier to post on this blog.  Here it
+is:
+
+```
+(defun blog-post (title &optional date)
+  "Make a new blog post, with TITLE on DATE."
+  (interactive (list (read-string "Title: ")
+                     (format-time-string "%F")))
+  (let ((blog-directory (expand-file-name "~/src/hat-trick/src/"))
+        (metadata-format ";@@%s: %s@@\n")
+        (slug (string-trim (downcase (replace-regexp-in-string "[^[:alnum:]]"
+                                                               "-" title))
+                           "-" "-")))
+    (find-file (expand-file-name (concat slug ".ht") blog-directory))
+    (insert (format metadata-format "title" title))
+    (when date
+      (insert (format metadata-format "date" date)))
+    (insert "\n")))
+```
+
+I think the next thing I should do is make a major-mode ... or maybe I should
+just use <code>web-mode</code>....
+
+And of course, I need to update the syntax of these .ht files.  They're
+<em>okay</em>, but I think I could improve them in a few ways.  Not that I've
+figured out what those ways are, lol.
+
+<hr>
+
+Wow, this was a long one!  That's good, I spose :)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<rss version="2.0">
-<channel>
- <title>Acdw's Casa</title>
- <description>My casa, in the middle of the web</description>
- <link>https://acdw.casa</link>
- <copyright>2022 Case Duckworth</copyright>
- <lastBuildDate>2022-03-03</lastBuildDate>
- <pubDate>2022-03-03</pubDate>
- <ttl>1800</ttl>
-
- <item>
-  <title>And we're live</title>
-  <description>Hi basement</description>
-  <link>https://acdw.casa/</link>
-  <pubDate>2022-03-03</pubDate>
- </item>
-
- <item>
-   <title>Good Choices License</title>
-   <description>A license for people</description>
-   <link>https://acdw.casa/gcl/</link>
-   <pubDate>2022-05-13</pubDate>
- </item>
-
-</channel>
-</rss>
@@ -0,0 +1,22 @@
+;@@title: TwTxt ? What's next!?@@
+;@@date: 2022-05-25@@
+
+Whoa, two posts in one day.  Better be careful, lol.
+
+Anyway, this is to say I've also got a
+=> tw.txt twtxt
+set up as well, and even forked
+=> https://github.com/duckwork/twtxt-el twtxt.el
+to work for my needs!
+
+Luckily, rsync's <code>--delete</code> flag
+doesn't do anything with excluded files by default, so I can
+just throw it in the site root and have a grand ol' time.
+
+Still to do:
+
+- Finalize hat-trick markup
+- Figure out a way to cross-post to gemini and gopher too, why not
+- Write more content?  I suppose?
+- ...
+- Profit!!!