From e596542e26415b7bc113797d5b0769b462edeec7 Mon Sep 17 00:00:00 2001
From: JP Hastings-Spital <jphastings@gmail.com>
Date: Sun, 10 Sep 2023 15:13:03 +0100
Subject: [PATCH] Structure of Memex

---
 assets/scss/_list.scss                        |   4 +
 config.toml                                   |   3 +
 content/memex/_index.md                       |   4 +-
 content/memex/communication/_index.md         |   5 --
 content/memex/language/_index.md              |   9 +++
 .../constrained-writing.md                    |   2 +-
 .../{communication => language}/to-be.md      |   4 +
 .../toki-pona-text.webp                       | Bin
 .../{communication => language}/toki-pona.md  |   0
 .../toki-pona.webp                            | Bin
 content/memex/thought/_index.md               |   1 +
 content/memex/thought/human-rights.md         |   2 +-
 layouts/memex/list.html                       |  51 ++++++++++---
 layouts/memex/single.html                     |  70 +-----------------
 layouts/partials/memex-footer.html            |  31 ++++++++
 layouts/partials/memex-header.html            |  33 +++++++++
 16 files changed, 132 insertions(+), 87 deletions(-)
 delete mode 100644 content/memex/communication/_index.md
 create mode 100644 content/memex/language/_index.md
 rename content/memex/{communication => language}/constrained-writing.md (92%)
 rename content/memex/{communication => language}/to-be.md (99%)
 rename content/memex/{communication => language}/toki-pona-text.webp (100%)
 rename content/memex/{communication => language}/toki-pona.md (100%)
 rename content/memex/{communication => language}/toki-pona.webp (100%)
 create mode 100644 layouts/partials/memex-footer.html
 create mode 100644 layouts/partials/memex-header.html

diff --git a/assets/scss/_list.scss b/assets/scss/_list.scss
index b8b257c9..4dda1a06 100644
--- a/assets/scss/_list.scss
+++ b/assets/scss/_list.scss
@@ -51,6 +51,10 @@
     &-title {
       font-size: 1rem;
       margin: 5px 0 5px 0;
+
+      &.em {
+        font-style: italic;
+      }
     }
 
     &-year {
diff --git a/config.toml b/config.toml
index f84105db..88d3f4d5 100644
--- a/config.toml
+++ b/config.toml
@@ -11,6 +11,9 @@ disableRSS      = false
 # Why 97? Cos. Cos it's a prime number?
 paginate = 97
 
+[frontmatter]
+date = ["date", "publishDate", "lastmod", ":git"]
+
 [markup]
   [markup.goldmark]
     [markup.goldmark.extensions]
diff --git a/content/memex/_index.md b/content/memex/_index.md
index 55a97b17..fdf79c84 100644
--- a/content/memex/_index.md
+++ b/content/memex/_index.md
@@ -1,4 +1,6 @@
-# Memex
+---
+title: Memex
+---
 
 Taking a cue from personal sites around the web, this memex keeps unformed ideas, links and references around for me to find and use later.
 
diff --git a/content/memex/communication/_index.md b/content/memex/communication/_index.md
deleted file mode 100644
index 6efc0553..00000000
--- a/content/memex/communication/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Communication
-emoji: 🗣️
-summary: Sharing information between centres of thought or calculation.
----
diff --git a/content/memex/language/_index.md b/content/memex/language/_index.md
new file mode 100644
index 00000000..4cd6c792
--- /dev/null
+++ b/content/memex/language/_index.md
@@ -0,0 +1,9 @@
+---
+title: Language
+emoji: 🗣️
+summary: How humans communicate.
+---
+
+I've always been a little ashamed of how few languages I speak — even if I can throw a bit of French, Spanish and Japanese around, really its only English I can speak/write with any confidence or capability — compared to many of my friends, my fiancé, and my coworkers all of whom talk to me in their second or third language.
+
+English is wonderful and expressive—I genuinely adore it—but it's so pervasive (my country's colonial past rears its ugly head again) it's very easy to never _need_ to learn any other languages. We're in an odd point in history where that's even feasible, so I like to explore language and the quirks of translation as a way to break out of my linguistic bubble.
diff --git a/content/memex/communication/constrained-writing.md b/content/memex/language/constrained-writing.md
similarity index 92%
rename from content/memex/communication/constrained-writing.md
rename to content/memex/language/constrained-writing.md
index f3d3652b..4933c2f3 100644
--- a/content/memex/communication/constrained-writing.md
+++ b/content/memex/language/constrained-writing.md
@@ -15,4 +15,4 @@ A fascinating restricted writing #mastodon instance, where all accounts' posts a
 
 ## E-Prime
 
-Writing English without _any_ of the forms of the very #to-be. I'm in two minds about this; I love the concept or avoiding accidental definitions—in particular treating oneself as objectively correct "you are tall"—but the [Wikipedia article](https://en.wikipedia.org/wiki/E-Prime#Psychological_effects) calls out some of the criticisms, in particular that _self_ definition of identity is very important!
+Writing English without _any_ of the forms of the verb #to-be. I'm in two minds about this; I love the concept or avoiding accidental definitions—in particular treating oneself as objectively correct "you are tall"—but the [Wikipedia article](https://en.wikipedia.org/wiki/E-Prime#Psychological_effects) calls out some of the criticisms, in particular that _self_ definition of identity is very important!
diff --git a/content/memex/communication/to-be.md b/content/memex/language/to-be.md
similarity index 99%
rename from content/memex/communication/to-be.md
rename to content/memex/language/to-be.md
index eb290b62..99a1a1a2 100644
--- a/content/memex/communication/to-be.md
+++ b/content/memex/language/to-be.md
@@ -11,6 +11,8 @@ links:
 
 I've been facinated by #to-be as a word since I started learning #Spanish and noticed that Ser and Estar can be used to separate out a temporary and permanent state of being; "I am sad" has an implicit temporary nature to it (rather than the permanence that can be implied with English).
 
+---
+
 The [Wikipedia](https://en.wikipedia.org/wiki/E-Prime) article on E-Prime calls out a number of different uses of 'to be' that impressed me, as I'd not thought about how many variable uses it has!
 
 - identity (noun-phrase copula definite-noun) The cat is my only pet.
@@ -22,4 +24,6 @@ The [Wikipedia](https://en.wikipedia.org/wiki/E-Prime) article on E-Prime calls
 - existence: (medial-proadverb-of-location copula noun-phrase) There is a cat.
 - location: (noun-phrase copula location-phrase) The cat is nowhere to be found.
 
+---
+
 The [Wictionary Post](https://en.wiktionary.org/wiki/be) has 23 unique uses of 'to be' in English I should read through!
diff --git a/content/memex/communication/toki-pona-text.webp b/content/memex/language/toki-pona-text.webp
similarity index 100%
rename from content/memex/communication/toki-pona-text.webp
rename to content/memex/language/toki-pona-text.webp
diff --git a/content/memex/communication/toki-pona.md b/content/memex/language/toki-pona.md
similarity index 100%
rename from content/memex/communication/toki-pona.md
rename to content/memex/language/toki-pona.md
diff --git a/content/memex/communication/toki-pona.webp b/content/memex/language/toki-pona.webp
similarity index 100%
rename from content/memex/communication/toki-pona.webp
rename to content/memex/language/toki-pona.webp
diff --git a/content/memex/thought/_index.md b/content/memex/thought/_index.md
index 02ae8b44..71c8b2ba 100644
--- a/content/memex/thought/_index.md
+++ b/content/memex/thought/_index.md
@@ -3,3 +3,4 @@ title: Thought
 emoji: 💭
 summary: Relating to how humans process sensory input.
 ---
+
diff --git a/content/memex/thought/human-rights.md b/content/memex/thought/human-rights.md
index 87a36bf0..a60b00ad 100644
--- a/content/memex/thought/human-rights.md
+++ b/content/memex/thought/human-rights.md
@@ -1,6 +1,6 @@
 ---
 title: Human rights
-draft: true
+draft: false
 tags:
   - philosophy
   - simone-weil
diff --git a/layouts/memex/list.html b/layouts/memex/list.html
index f4d27bda..0d8ce2d8 100644
--- a/layouts/memex/list.html
+++ b/layouts/memex/list.html
@@ -1,5 +1,8 @@
 {{ define "main" }}
     <main class="posts">
+
+        {{ partial "memex-header.html" . }}
+
         <h1>{{ title (replace .Title "-" " ") }}</h1>
 
         {{ if .Content }}
@@ -7,30 +10,49 @@
         {{ end }}
 
         {{ $tags := slice }}
+        {{ $extraPages := slice }}
+        <h2>Memex entries</h2>
         <div class="side-by-side">
             <div class="double">
                 {{ range .Pages }}
-                    {{ if gt (len .Pages) 0 }}
-                    <div class="posts-group">
-                        <div class="post-year">{{ .Params.emoji }}</div>
+                    {{ if eq (len .Pages) 0 }}
+                        {{ $extraPages = append . $extraPages }}
+                    {{ else }}
+                        <div class="posts-group">
+                            <ul class="posts-list">
+                                <li class="post-item">
+                                    <a href="{{.Permalink}}">
+                                        {{ if .Params.emoji }}<span class="post-emoji">{{ .Params.emoji }}</span>{{ end }}
+                                        <span class="post-title em">{{.Title}}</span>
+                                    </a>
+                                </li>
+                                {{ range .Pages }}
+                                    {{ $tags = union $tags .Params.tags }}
+                                    <li class="post-item">
+                                        <a href="{{.Permalink}}">
+                                            <span class="post-title">{{.Title}}</span>
+                                        </a>
+                                    </li>
+                                {{ end }}
+                            </ul>
+                        </div>
+                    {{ end }}
+                {{ end }}
 
+                {{ if gt (len $extraPages) 0 }}
+                    <div class="posts-group">
                         <ul class="posts-list">
+                        {{ range $extraPages }}
+                            {{ $tags = union $tags .Params.tags }}
+                            
                             <li class="post-item">
                                 <a href="{{.Permalink}}">
                                     <span class="post-title">{{.Title}}</span>
                                 </a>
                             </li>
-                            {{ range .Pages }}
-                                {{ $tags = union $tags .Params.tags }}
-                                <li class="post-item">
-                                    <a href="{{.Permalink}}">
-                                        <span class="post-title">{{.Title}}</span>
-                                    </a>
-                                </li>
-                            {{ end }}
+                        {{ end }}
                         </ul>
                     </div>
-                    {{ end }}
                 {{ end }}
             </div>
 
@@ -40,5 +62,10 @@
                 {{ end }}
             </ol>
         </div>
+
+        <hr />
+
+        {{ partial "memex-footer.html" . }}
+        
     </main>
 {{ end }}
diff --git a/layouts/memex/single.html b/layouts/memex/single.html
index 34fc1878..5a784030 100644
--- a/layouts/memex/single.html
+++ b/layouts/memex/single.html
@@ -1,36 +1,7 @@
 {{ define "main" }}
   <main class="post h-entry">
 
-    <div class="post-info">
-      <p class="breadcrumbs">
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-compass">
-          <circle cx="12" cy="12" r="10"></circle>
-          <polygon points="16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76"></polygon>
-        </svg>
-        <a href="/memex">Memex</a> » <a href="{{ .Parent.Permalink }}">{{ .Parent.Title }}</a> » {{ .Title }}
-      </p>
-      <p>
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar">
-          <rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect>
-          <line x1="16" y1="2" x2="16" y2="6"></line>
-          <line x1="8" y1="2" x2="8" y2="6"></line>
-          <line x1="3" y1="10" x2="21" y2="10"></line>
-        </svg>
-        Last updated
-        {{ partial "year-relative-date.html" .Lastmod }}
-      </p>
-      <p class="reading-time">
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-clock">
-          <circle cx="12" cy="12" r="10"></circle>
-          <polyline points="12 6 12 12 16 14"></polyline>
-        </svg>
-        {{ i18n "readingTime" .Page.ReadingTime }}
-      </p>
-      <p class="author h-card" aria-hidden="true">
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user"><path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path><circle cx="12" cy="7" r="4"></circle></svg>
-        <a href="{{ .Site.BaseURL | absURL }}" rel="author" class="p-author u-url">{{ .Site.Author.name }}</a>
-      </p>
-    </div>
+    {{ partial "memex-header.html" . }}
 
     <article>
       <hgroup class="post-title">
@@ -64,48 +35,13 @@
       {{- end }}
 
       <div class="post-content e-content">
-        {{ .Content | replaceRE `#(\w+)` `<a href="/tags/$1">$1</a>` | safeHTML }}
+        {{ .Content | replaceRE `#([\w-]+)` `<a href="/tags/$1">$1</a>` | safeHTML }}
       </div>
     </article>
 
     <hr />
 
-    {{ if ne .Type "site-infra" }}
-      <div class="post-info">
-        {{ partial "tags.html" .Params.tags }}
-        {{ partial "series-tags.html" . }}
-        <p>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
-            <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
-            <polyline points="14 2 14 8 20 8"></polyline>
-            <line x1="16" y1="13" x2="8" y2="13"></line>
-            <line x1="16" y1="17" x2="8" y2="17"></line>
-            <polyline points="10 9 9 9 8 9"></polyline>
-          </svg>
-          {{ i18n "wordCount" .Page.WordCount }}
-        </p>
-
-        <p>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar">
-            <rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect>
-            <line x1="16" y1="2" x2="16" y2="6"></line>
-            <line x1="8" y1="2" x2="8" y2="6"></line>
-            <line x1="3" y1="10" x2="21" y2="10"></line>
-          </svg>
-          <date datetime="{{ dateFormat "2006-01-02T15:04:05-0700" .Lastmod }}" class="dt-updated" title="last updated on {{ dateFormat "Monday Jan 2 2006 at 03:04 MST" .Lastmod }}">
-            {{ if .Site.Params.dateformNumTime }}
-              {{ dateFormat .Site.Params.dateformNumTime .Lastmod }}
-            {{ else }}
-              {{ dateFormat "2006-01-02 15:04" .Lastmod }}
-            {{ end }}
-          </date>
-        </p>
-      </div>
-
-      <hr />
-
-      {{ partial "pagination-single.html" . }}
-    {{ end }}
+    {{ partial "memex-footer.html" . }}
 
     {{ if .Page.Store.Get "hasMermaid" }}
       <script src="/js/mermaid.js"></script>
diff --git a/layouts/partials/memex-footer.html b/layouts/partials/memex-footer.html
new file mode 100644
index 00000000..a3d9eed8
--- /dev/null
+++ b/layouts/partials/memex-footer.html
@@ -0,0 +1,31 @@
+<div class="post-info">
+  {{ partial "tags.html" .Params.tags }}
+  {{ partial "series-tags.html" . }}
+  <p>
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+      <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+      <polyline points="14 2 14 8 20 8"></polyline>
+      <line x1="16" y1="13" x2="8" y2="13"></line>
+      <line x1="16" y1="17" x2="8" y2="17"></line>
+      <polyline points="10 9 9 9 8 9"></polyline>
+    </svg>
+    {{ i18n "wordCount" .Page.WordCount }}
+  </p>
+
+  <p>
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar">
+      <rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect>
+      <line x1="16" y1="2" x2="16" y2="6"></line>
+      <line x1="8" y1="2" x2="8" y2="6"></line>
+      <line x1="3" y1="10" x2="21" y2="10"></line>
+    </svg>
+    <date datetime="{{ dateFormat "2006-01-02T15:04:05-0700" .Lastmod }}" class="dt-updated" title="last updated on {{ dateFormat "Monday Jan 2 2006 at 03:04 MST" .Lastmod }}">
+      {{ if .Site.Params.dateformNumTime }}
+        {{ dateFormat .Site.Params.dateformNumTime .Lastmod }}
+      {{ else }}
+        {{ dateFormat "2006-01-02 15:04" .Lastmod }}
+      {{ end }}
+    </date>
+  </p>
+</div>
+<hr />
diff --git a/layouts/partials/memex-header.html b/layouts/partials/memex-header.html
new file mode 100644
index 00000000..d40402e2
--- /dev/null
+++ b/layouts/partials/memex-header.html
@@ -0,0 +1,33 @@
+<div class="post-info">
+  <p class="breadcrumbs">
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-compass">
+      <circle cx="12" cy="12" r="10"></circle>
+      <polygon points="16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76"></polygon>
+    </svg>
+    {{- range .Ancestors.Reverse }}
+        {{ if ne .RelPermalink "/" }}<a href="{{ .RelPermalink }}">{{ .Title }}</a> » {{end}}
+    {{- end }}
+    {{ .Title }}
+  </p>
+  <p>
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar">
+      <rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect>
+      <line x1="16" y1="2" x2="16" y2="6"></line>
+      <line x1="8" y1="2" x2="8" y2="6"></line>
+      <line x1="3" y1="10" x2="21" y2="10"></line>
+    </svg>
+    Last updated
+    {{ partial "year-relative-date.html" .Lastmod }}
+  </p>
+  <p class="reading-time">
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-clock">
+      <circle cx="12" cy="12" r="10"></circle>
+      <polyline points="12 6 12 12 16 14"></polyline>
+    </svg>
+    {{ i18n "readingTime" .Page.ReadingTime }}
+  </p>
+  <p class="author h-card" aria-hidden="true">
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user"><path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path><circle cx="12" cy="7" r="4"></circle></svg>
+    <a href="{{ .Site.BaseURL | absURL }}" rel="author" class="p-author u-url">{{ .Site.Author.name }}</a>
+  </p>
+</div>
\ No newline at end of file