Commit `c156621a77`

c156621a773f144fb829a63be63b8af33506d975

parent: 17131d475e

Unsigned

cmc <hello@cleberg.net> · 2026-08-11 21:07 UTC

Settle the four remaining differences from the live site

- **The feed carries whole posts again.** `include_content = true` on the feed
  collection, and the template embeds `post.content` rather than the excerpt.
  169 items, 2.9 MB, same as weblorg produces.

- **Section numbering on.** The live site numbers its headings — inherited from
  Emacs' default rather than chosen, but switching generators is the wrong
  moment to quietly redesign 174 pages. The contents list numbers to match. One
  config line to flip if you decide against it.

- **The reply footer follows the live site**: blog posts, garden notes and
  /now/, but not /uses/, /tips/ or /salary/. Two more `[[pages]]` rules.

- **Tags stay one page per tag**, deliberately unlike the live single page with
  every post inlined under an anchor. A tag with its own URL is worth linking
  to, and the index stays short. Each index entry carries the tag's slug as an
  `id`, so old `/tags/#audit` links still land on the right row.

Also fixes the garden emoji, which I had transcribed as 🌳 where the weblorg
template has 🪴 — taken from that template this time rather than typed.

Content now matches the live site on 192 of 195 pages. The three that differ:
footnote section markup, an `org-cite` citation neither generator renders
usefully, and the tags page above.

Layout: unified · split

content/org-ssg.toml +18 −1

	@@ -45,6 +45,16 @@ dir = "templates"
45	match = "blog"	45	match = "blog"
46	template = "post.html"	46	template = "post.html"
47		47
		48	# The live site invites replies on garden notes and /now/ too, but not on /uses/,
		49	# /tips/ or /salary/.
		50	[[pages]]
		51	match = "garden"
		52	template = "post.html"
		53
		54	[[pages]]
		55	match = "now"
		56	template = "post.html"
		57
48	[highlight]	58	[highlight]
49	theme = "InspiredGitHub"	59	theme = "InspiredGitHub"
50		60
	@@ -53,7 +63,10 @@ theme = "InspiredGitHub"
53	# which is what the current site does too.	63	# which is what the current site does too.
54	heading_offset = 1	64	heading_offset = 1
55	toc = true	65	toc = true
56	section_numbers = false	66	# On, because the live site has numbered headings — inherited from Emacs' default rather
		67	# than chosen, but changing it is a design decision to make deliberately rather than a
		68	# side effect of switching generators. One line to flip when you want to.
		69	section_numbers = true
57		70
58	# --- Generated pages -------------------------------------------------------------	71	# --- Generated pages -------------------------------------------------------------
59	# These have no source .org file. weblorg produces the equivalents today through its	72	# These have no source .org file. weblorg produces the equivalents today through its
	@@ -116,3 +129,7 @@ template = "feed.xml"
116	title = "cleberg.net"	129	title = "cleberg.net"
117	sort = "date"	130	sort = "date"
118	order = "desc"	131	order = "desc"
		132	# Whole posts, not excerpts. The live feed carries full content, and a subscriber handed
		133	# excerpts instead would notice. Costs a render of every listed post whenever the feed is
		134	# rebuilt, which is the trade this is worth making for.
		135	include_content = true

content/templates/base.html +5 −3

    Available here: page (.title .url .source .date .date_iso .tags .excerpt .toc
    .keywords), site, nav, root, stylesheet. See the org-ssg guide on Templates. #}
 {#- The table of contents, in the shape Emacs exports it. `page.toc` is a tree of
-    {title, anchor, level, children}, and it is empty when the page has no headings or
+    {title, anchor, level, number, children}, and it is empty when the page has no
-    says `#+OPTIONS: toc:nil` — so pages that opt out simply render nothing here. #}
+    headings or says `#+OPTIONS: toc:nil` — so pages that opt out render nothing here.
+    The number is printed because [html] section_numbers is on; drop it if you turn
+    numbering off, or the contents will number what the headings do not. #}
 {%- macro toc_list(entries) -%}
 <ul>
 {%- for e in entries %}
-<li><a href="#{{ e.anchor }}">{{ e.title }}</a>
+<li><a href="#{{ e.anchor }}">{{ e.number }} {{ e.title }}</a>
 {%- if e.children %}{{ toc_list(e.children) }}{% endif %}</li>
 {%- endfor %}
 </ul>

content/templates/feed.xml +3 −4

     from the site that served it, so every URL here is absolute — which is what
     `| absolute` needs [site] base_url for.
-    One difference from weblorg: <description> carries each post's excerpt rather than its
+    <description> carries each post's full rendered HTML, as weblorg's feed does — the
-    full HTML. org-ssg gives a collection template each entry's metadata, not its rendered
+    collection sets `include_content` to ask for it. #}
-    body. #}
 <rss version="2.0"
      xmlns:content="http://purl.org/rss/1.0/modules/content/"
      xmlns:dc="http://purl.org/dc/elements/1.1/"
 {%- for tag in post.tags %}
       <category>{{ tag }}</category>
 {%- endfor %}
-      <description>{{ post.excerpt }}</description>
+      <description><![CDATA[{{ post.content | safe }}]]></description>
     </item>
 {%- endfor %}
   </channel>

content/templates/garden.html +1 −1

	@@ -6,7 +6,7 @@
6	<p>Notes in various states of growth. Some are stubs, some are developed. Browse	6	<p>Notes in various states of growth. Some are stubs, some are developed. Browse
7	around.</p>	7	around.</p>
8	<section>	8	<section>
9	<h2>🌳 The Growth Stages</h2>	9	<h2>🪴 The Growth Stages</h2>
10	<p>Instead of dates, these metadata labels show how mature a page is:</p>	10	<p>Instead of dates, these metadata labels show how mature a page is:</p>
11	<span><strong>🌱 Seedlings:</strong> Rough notes, raw ideas, or "half-baked"	11	<span><strong>🌱 Seedlings:</strong> Rough notes, raw ideas, or "half-baked"
12	thoughts.</span><br>	12	thoughts.</span><br>

content/templates/tags.html +11 −4

-{# The tag index at /tags/, mirroring theme/templates/tags.html. Receives `groups` —
+{# The tag index at /tags/. Receives `groups` — every tag with its count — rather than
-   every tag with its count — rather than `pages`, because it lists tags and not posts. #}
+   `pages`, because it lists tags and not posts.
+   This deliberately differs in shape from the live weblorg page, which is one page with
+   every post inlined under an `#anchor` per tag. Here each tag is its own page, so a tag
+   has a URL worth linking to and the index stays short. The `id` on each entry keeps the
+   old `/tags/#audit` links landing in the right place — they scroll to the tag and its
+   link, rather than 404ing or dumping the reader at the top of a long page. #}
 {% extends "base.html" %}
 {% block main %}
 <h1>{{ page.title }}</h1>
 <p>Browse posts by topic.</p>
-<ul>
+<ul class="tag-toc">
 {%- for tag in groups %}
-<li><a href="{{ root }}{{ tag.url }}">{{ tag.name }}</a> ({{ tag.count }})</li>
+<li id="{{ tag.slug }}"><a href="{{ root }}{{ tag.url }}">{{ tag.name }}</a>
+<span class="tag-count">({{ tag.count }})</span></li>
 {%- endfor %}
 </ul>
 {% endblock %}

Commit c156621a77

Commit `c156621a77`