From 56e90e45673833a3c03fa45ce010395e9d4298db Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Wed, 23 Mar 2022 13:46:07 +0100
Subject: [PATCH] Move some attributes around

---
 src/templates/default.html | 12 +++++++++---
 src/templates/gogen.html   |  4 ++--
 ssg/src/Formats/Gogen.hs   | 26 ++++++++++++++++++++++++--
 ssg/src/Main.hs            |  4 +++-
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/templates/default.html b/src/templates/default.html
index 8049a55..2964f0b 100644
--- a/src/templates/default.html
+++ b/src/templates/default.html
@@ -5,7 +5,9 @@
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="$desc$">
+    $if(desc)$
+      <meta name="description" content="$desc$">
+    $endif$
 
     $if(author)$
       <meta name="author" content="$author$">
@@ -18,7 +20,9 @@
     <meta property="og:site_name" content="$siteName$">
     <meta property="og:title" content="$title$">
     <meta property="og:url" content="$root$$url$">
-    <meta property="og:description" content="$desc$">
+    $if(desc)$
+      <meta property="og:description" content="$desc$">
+    $endif$
 
     $if(image)$
       <meta property="og:image" content="$root$$image$">
@@ -33,7 +37,9 @@
     <meta property="twitter:card" content="summary_large_image">
     <meta property="twitter:site" content="$siteName$">
     <meta property="twitter:title" content="$title$">
-    <meta property="twitter:description" content="$desc$">
+    $if(desc)$
+      <meta property="twitter:description" content="$desc$">
+    $endif$
 
     $if(image)$
       <meta property="twitter:image" content="$root$$image$">
diff --git a/src/templates/gogen.html b/src/templates/gogen.html
index d32b4dd..6f72eb8 100644
--- a/src/templates/gogen.html
+++ b/src/templates/gogen.html
@@ -7,9 +7,9 @@
           <small>(updated: $updated$)</small>
         $endif$
       </div>
-      $if(alternative_writings)$
+      $if(alternatives)$
         <div>
-          $alternative_writings$
+          $alternatives$
         </div>
       $endif$
     </header>
diff --git a/ssg/src/Formats/Gogen.hs b/ssg/src/Formats/Gogen.hs
index 40dc2ec..4ca5b4e 100644
--- a/ssg/src/Formats/Gogen.hs
+++ b/ssg/src/Formats/Gogen.hs
@@ -35,13 +35,35 @@ replaceFuriganaWithKanji :: FuriganaTemplate -> String
 replaceFuriganaWithKanji = gsub [re|\[(.*?)\]\((.*?)\)|] (\(kanji:kana:_) -> kanji :: String)
 
 replaceFuriganaWithHtml :: FuriganaTemplate -> String
-replaceFuriganaWithHtml = between "<ruby>" "</ruby>" . gsub [re|\[(.*?)\]\((.*?)\)|] (\(kanji:kana:_) -> "<rb>" ++ kanji ++"</rb> <rp>(</rp><rt> " ++ kana ++ "</rt><rp>)</rp>" :: String)
+replaceFuriganaWithHtml = between "<ruby>" "</ruby>" . gsub regex matchToHtml
   where
+    regex = [re|\[(.*?)\]\((.*?)\)|]
+
+    between :: String -> String -> String -> String
     between x y s = x ++ s ++ y
 
+    matchToHtml :: [String] -> String
+    matchToHtml (kanji:kana:_) =
+      let defaultKanji = if kanji == "" then "〇" else kanji
+      in foldr1 (++) ["<rb>", defaultKanji, "</rb> <rp>(</rp><rt>", kana, "</rt><rp>)</rp>"]
+
+
+
+{- |
+  title: String
+  titleHtml: String
+  finished: Boolean
+  updated: String
+  lang: String
+  antonyms: Maybe [String]
+  synonyms: Maybe [String]
+  leads_here: Maybe [String]
+  alternatives: Maybe [String]
+  see_also: Maybe [String]
+-}
 gogenCtx :: Context String
 gogenCtx =
   dateField "date" "%Y-%m-%d"
   <> field "titleHtml" convertFuriganaTitleHtml
   <> defaultContext
-
+  <> constField "lang" "en"
\ No newline at end of file
diff --git a/ssg/src/Main.hs b/ssg/src/Main.hs
index 27b2719..34e3e7b 100644
--- a/ssg/src/Main.hs
+++ b/ssg/src/Main.hs
@@ -85,7 +85,9 @@ main = hakyllWith config $ do
           constField "type" "article"
           <> field "title" convertFuriganaTitle
           <> field "titleHtml" convertFuriganaTitleHtml
-          <> postCtx
+          <> constField "root" root
+          <> constField "siteName" siteName
+          <> gogenCtx
 
     route $ setExtension ".html"
     compile $ do