Cleanup pass

Author: Porges

build/src/bib_render.rs

@@ -67,9 +67,9 @@ fn inline_cite(
     reference: &Reference,
 ) -> Option<Box<dyn Fn(&str, Option<Markup>) -> Markup + Send + Sync>> {
     match &reference {
-        Reference::Book(book) => {
+        Reference::Book(Book { common, .. }) | Reference::Thesis(Thesis { common, .. }) => {
             // render only title, not subtitle
-            let before = render_lstr_cite(&book.common.title, None, None, None);
+            let before = render_lstr_cite(&common.title, None, None, None);
             Some(Box::new(
                 move |ref_id: &str, info: Option<Markup>| -> Markup {
                     html! {
@@ -88,11 +88,6 @@ fn inline_cite(
             periodical: Periodical { issued, .. },
             ..
         })
-        | Reference::Thesis(Thesis {
-            common: Common { author, .. },
-            issued,
-            ..
-        })
         | Reference::Chapter(Chapter {
             common: Common { author, .. },
             book: Book {
@@ -335,14 +330,24 @@ fn render_title(r: &Reference) -> Markup {
 
     if matches!(r, Reference::Book(_) | Reference::Thesis(_)) {
         let mut title_lstr = Cow::Borrowed(&r.common().title);
-        if let Reference::Book(b) = r {
-            if let Some(subtitle) = &b.subtitle {
+
+        // Attach subtitle, if any
+        match r {
+            Reference::Book(Book {
+                subtitle: Some(subtitle),
+                ..
+            })
+            | Reference::Thesis(Thesis {
+                subtitle: Some(subtitle),
+                ..
+            }) => {
                 title_lstr = Cow::Owned(LString {
                     value: format!("{}: {}", title_lstr.value, subtitle),
                     lang: title_lstr.lang.clone(),
                     alt: title_lstr.alt.clone(),
                 });
             }
+            _ => {}
         }
 
         let title = render_lstr_just_cite(&title_lstr, None, Some("name"));

build/src/bibliography.rs

@@ -320,6 +320,7 @@ pub struct Patent {
 pub struct Thesis {
     #[serde(flatten)]
     pub common: Common,
+    pub subtitle: Option<String>,
     pub genre: Option<String>,
     pub issued: Date,
     pub volume: Option<u32>,

build/src/templates.rs

@@ -471,16 +471,16 @@ impl Templater {
                 @for game in games_all {
                     li data-name=(game.title_string()) data-countries=(game.countries().iter().map(|c| c.alpha2).join(",")) data-players=[game.players()] data-equipment=[game.equipment()] {
                         a href=(game.url_path()) {
+                            @if game.is_draft() {
+                                "🚧"
+                            }
+
                             span.noun lang=[game.title_lang()] {
                                 (game.title_markup())
                             }
 
                             @if let Some(original_title) = game.original_title() {
-                                " (" (original_title) ")"
-                            }
-
-                            @if game.is_draft() {
-                                " 🚧"
+                                " · " (original_title)
                             }
                         }
                     }

src/articles/cards/japan/hanafuda/art/art.md

@@ -693,19 +693,15 @@ contact them!
 >
 > The <span class="noun" lang="ja-Latn">Kintoki</span> card, by <span class="noun" lang="ja-Latn">Ōishi Tengudō</span>. He is depicted carrying an axe and wearing a shirt with the character <span lang="ja">金</span> (<span lang="ja-Latn">kin</span>, ‘gold’) on it.
 
-This is another regional pattern called {% pronounce lang="ja-Latn"
-word="Awa­-bana" pronouncer="poyotan" file="pronunciation_ja_阿波花.mp3" %}
-(<span lang="ja">阿波花</span>) or {% pronounce lang="ja-Latn"
-word="Kintoki­-bana" pronouncer="poyotan" file='pronunciation_ja_金時花.mp3' %}
+This is another regional pattern called <Pronounce lang="ja-Latn" pronouncer="poyotan" file="pronunciation_ja_阿波花.mp3">Awa-bana</Pronounce>
+(<span lang="ja">阿波花</span>) or <Pronounce lang="ja-Latn" pronouncer="poyotan" file='pronunciation_ja_金時花.mp3'>Kintoki­-bana</Pronounce>
 (<span lang="ja">金時花</span>). It originated in <span class="noun"
 lang="ja-Latn">Awa</span> province, in what is now <span class="noun"
 lang="ja-Latn">Tokushima</span> prefecture.
 
 Like the <span class="noun" lang="ja-Latn">Echigo-bana</span> pattern, some of the <span class="noun"
 lang="ja-Latn">Awa-­bana</span> carry poems (in fact, they carry the same
-poems). The deck also contains an extra card which features the titular {%
-pronounce noun="true" lang="ja-Latn" pronouncer="renad"
-file='pronunciation_ja_kintoki.mp3' word="Kintoki" %} (<span lang="ja">金時
+poems). The deck also contains an extra card which features the titular <Pronounce noun="true" lang="ja-Latn" pronouncer="renad" file='pronunciation_ja_kintoki.mp3'>Kintoki</Pronounce> (<span lang="ja">金時
 </span>), [a legendary strong-boy also known as <span class="noun"
 lang="ja-Latn">Kintarō</span>](https://en.wikipedia.org/wiki/Kintar%C5%8D).
 
@@ -1406,7 +1402,9 @@ prohibited.[@FourSeasons loc. 4261] Wild game such as boar and deer were not
 included: either they escaped the imagination of the Emperor, or they were too
 important as food sources for commoners.
 
-{/* Deer is associated with bush clover but instead we have a boar? But also deer are renowned for being separated from their lovers... */}
+> [!todo]
+> 
+> Deer is associated with bush clover but instead we have a boar? But also deer are renowned for being separated from their lovers...
 
 ### <span lang="ja">8月</span>
 

src/articles/families/fishing-games/fishing-games.md

@@ -29,19 +29,19 @@ In games where cards are played from both hand and stock, after playing a card f
 - played with two-colour chess cards: 
     - [Fishing for Hairtails](games/fishing-for-hairtails/fishing-for-hairtails.md)
 - played with [Ceki cards](articles/cards/ceki/ceki.md):
-    - {% gameref cholek-tiga %}
-    - {% gameref enthit %}
-    - {% gameref thothit %}
-    - {% gameref thothit-kuna %}
+    - [<span class="noun" lang="ms">Cholek Tiga</span>](games/cholek-tiga/cholek-tiga.md)
+    - [<span lang="jv-Latn" class="noun">Enthit</span>](games/thothit/thothit.md#enthit)
+    - [<span lang="jv-Latn" class="noun">Thothit</span>](games/thothit/thothit.md)
+    - [<span lang="jv-Latn" class="noun">Thothit Kuna</span>](games/thothit/thothit.md#thothit-kuna)
 - many [Hanafuda](articles/cards/japan/hanafuda/hanafuda.md) games (which I have yet to document) also fall into this category
 
 The last type are luck-based games where all cards are turned from the stock.  These are commonly gambling or children’s games:
 
 - played with standard cards:
     - [Kings](games/kings/kings.md)
 - played with [Ceki cards](articles/cards/ceki/ceki.md):
-    - {% gameref thothit-yogyakarta %}
-    - {% gameref thit-thit-dulit %}
+    - [<span lang="jv-Latn" class="noun">Thothit Yogyakarta</span>](games/kings/kings.md#thothit-yogya)
+    - [<span lang="jv-Latn" class="noun">Thit-Thit-Dulit</span>](games/kings/kings.md#thit-thit-dulit)
 
 >[!todo]
 >

src/articles/families/staking-games/staking-games.md

@@ -16,7 +16,7 @@ Under this title, I collect games where bets are placed by players, usually on a
 [Belangkai](games/belangkai/belangkai.md)
 </li>
 <li>
-{% gameref chobo-ichi %}
+[<span lang="ja-Latn" class="noun">Chobo-Ichi</span>](games/prinola/prinola.md#chobo-ichi)
 </li>
 <li>
 [Chuck-a-Luck](games/chuck-a-luck/chuck-a-luck.md)
@@ -25,7 +25,7 @@ Under this title, I collect games where bets are placed by players, usually on a
 [Crown & Anchor](games/crown-and-anchor/crown-and-anchor.md)
 </li>
 <li>
-{% gameref dadu-putar %}
+[<span lang="id" class="noun">Dadu Putar</span>](games/prinola/prinola.md#dadu-putar)
 </li>
 <li>
 [Prinola](games/prinola/prinola.md)

src/articles/lists/rabelais.md

@@ -11,19 +11,21 @@ linter-yaml-title-alias: The Games of <cite>Gargantua</cite> (1534—)
 
 One of the most famous historical lists of games is that found in Chaper 22 of <a href="https://en.wikipedia.org/wiki/Fran%C3%A7ois_Rabelais"><span class="noun" lang="fr">François Rabelais</span></a>’ <a href="https://en.wikipedia.org/wiki/Gargantua_and_Pantagruel"><cite lang="fr">Gargantua</cite></a>, first published in 1534. In the original French the list contained 216 games, but in each translation the games that are named were changed and often expanded upon. Many of the games are either invented by Rabelais, or are games for which we no longer know the rules.
 
-An in-depth examination of the games in the list lies [below the table](#the-list-in-depth). 🚧 This article, more than most, is a
-work-in-progress. 🚧
+An in-depth examination of the games in the list lies [below the table](#the-list-in-depth).
+
 
 The first five columns give the lists from five different French editions; the
 remaining columns are from translations into English.
 
 The lists of Nicolaas Jarichides Wieringa (Dutch, 1682) and Johann Fischarts (German, 1590) are given beneath the table as they diverge significantly.
 
-🚧 Note that the entries in the Screech column are out of sync with the others and I haven’t had time to match them up yet. 🚧
+🚧 This article, more than most, is a work-in-progress. Note that the entries in the Screech column are out of sync with the others and I haven’t had time to match them up yet. 🚧
 
 ⚠️ This table is very wide and might scroll horizontally. My notes are at the far right.
 
-{/* Putnam doesn’t attempt translation */}
+> [!todo]
+> 
+> Putnam doesn’t attempt translation
 
 <div class="full-width scroller">
 <table class="small">

src/articles/people/hjr-murray.md

@@ -58,7 +58,7 @@ or <i>saddeh</i> refer to simple mills, not the ‘running mill’ formation.
 >
 > <strong>3.5.32</strong> (p. 48): citation could be misleading there are two articles by Goddard, @Goddard1901 has no reference to Trique.
 
-**§4.9.3** (p. 94): Murray mistakenly suggests that <span lang="ms">tjeki</span> (i.e. {%a ceki%}) is the same as the game <span lang="ms">chuki</span>.
+**§4.9.3** (p. 94): Murray mistakenly suggests that <span lang="ms">tjeki</span> (i.e. [Ceki](articles/cards/ceki/ceki.md)) is the same as the game <span lang="ms">chuki</span>.
 
 ### “Books and articles consulted”
 

src/articles/people/sid-sackson.md

@@ -94,7 +94,7 @@ Suit Yourself
 
 <ul class="columnar">
 <li>
-{% gameref sampen %}
+[<span lang="jv-Latn" class="noun">Sampen</span>](games/sampen/sampen.md)
 </li>
 <li>
 Cha Kau Tsz’
@@ -106,7 +106,7 @@ Khanhoo
 Kowah
 </li>
 <li>
-{% gameref thothit %}
+[Thothit](games/thothit/thothit.md#sackson)
 </li>
 <li>
 [Kabu](games/three-card-game/three-card-game.md#kabu)