Enhance CSS link styles and refactor variable names in site.hs for clarity

assets/css/default.css

@@ -4,6 +4,8 @@
     --color-tag2: darkolivegreen;
     --color-bg: white;
     --color-notice: #fb4f4f;
+    --color-link: #0645ad;
+    --color-link-visited: #551a8b;
 }
 
 html {
@@ -25,9 +27,18 @@ body {
 }
 
 body a {
+    color: var(--color-link);
     text-decoration: none;
 }
 
+body a:visited {
+    color: var(--color-link-visited);
+}
+
+body a[href^="#"]:visited {
+    color: var(--color-link);
+}
+
 body a:hover {
     text-decoration: underline;
 }
@@ -89,10 +100,9 @@ html body div.text-space main ul.post-list {
 header {
     font-weight: 400;
     font-family: "IosevkaC", sans-serif;
-}
+    font-size: 2rem;
-nav a {
-    display: inline-block;
     text-decoration: none;
+    line-height: 120%;
 }
 
 .uri {
@@ -322,18 +332,18 @@ code {
         margin-bottom: 0.5em;
         padding-left: 1em;
         line-height: 1.2;
-        list-style-type: decimal;
-        margin-left: 0
-    }
-
-    div#contents-big ul ul {
         list-style-type: none;
+        margin-left: 0
     }
 
     div#contents-big li+li {
         margin-top: 0.5em
     }
 
+    div#contents-big .toc-section-number {
+        margin-right: 0.2em;
+    }
+
     div#contents-big {
         font-size: 80%;
         padding-top: 0;

assets/templates/default.html

@@ -25,13 +25,15 @@
     </div>
     <div class="text-space">
         <header class="no-print">
-            <nav>
+            <a href="/">/</a>
-                <a href="/">Home</a>
+            $title$
-            </nav>
         </header>
         <main role="main">
-            <h1 class="pagetitle">$title$</h1>
+            <article>
-            $body$
+                <section class="body">
+                    $body$
+                </section>
+            </article>
         </main>
         <footer></footer>
     </div>

assets/templates/post.html

@@ -1,5 +0,0 @@
-<article> 
-    <section class="body">
-        $body$
-    </section>
-</article>

src/ChaoDoc.hs

@@ -1,13 +1,22 @@
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE StandaloneKindSignatures #-}
 
-module ChaoDoc (chaoDocRead, chaoDocWrite, chaoDocPandocCompiler, chaoDocCompiler) where
+module ChaoDoc
+  ( ChaoDocFiles (..),
+    chaoDocRead,
+    chaoDocWrite,
+    chaoDocPandocCompiler,
+    chaoDocCompiler,
+  )
+where
 
 import Control.Monad (guard)
 import Control.Monad.State
 import Data.Char (isSpace)
 import Data.Either
 import Data.Functor
+import Data.Kind (Type)
 import Data.List (find)
 import qualified Data.Map as M
 import Data.Maybe
@@ -16,19 +25,16 @@ import qualified Data.Text as T
 import Hakyll
 import Pangu (isCJK, pangu)
 import SideNoteHTML (usingSideNotesHTML)
-import System.IO.Unsafe
 import Text.Pandoc
 -- import Text.Pandoc.Builder
 import Text.Pandoc.Walk (query, walk, walkM)
 
-cslFile :: String
+type ChaoDocFiles :: Type
-cslFile = "assets/bib_style.csl"
+data ChaoDocFiles = ChaoDocFiles
-
+  { chaoDocCslFile :: FilePath,
-bibFile :: String
+    chaoDocBibFile :: FilePath,
-bibFile = "ref.bib"
+    chaoDocMacroFile :: FilePath
-
+  }
-macroFile :: String
-macroFile = "assets/math-macros.tex"
 
 -- On mac, please do `export LANG=C` before using this thing
 chaoDocRead :: ReaderOptions
@@ -52,23 +58,23 @@ chaoDocWrite =
       writerTOCDepth = 2
     }
 
-chaoDocPandocCompiler :: Compiler (Item Pandoc)
+chaoDocPandocCompiler :: ChaoDocFiles -> Compiler (Item Pandoc)
-chaoDocPandocCompiler = do
+chaoDocPandocCompiler paths = do
-  macros <- T.pack <$> loadBody (fromFilePath macroFile)
+  macros <- T.pack <$> loadBody (fromFilePath $ chaoDocMacroFile paths)
-  csl <- load $ fromFilePath cslFile
+  csl <- load $ fromFilePath $ chaoDocCslFile paths
-  bib <- load $ fromFilePath bibFile
+  bib <- load $ fromFilePath $ chaoDocBibFile paths
   body <- getResourceBody
   let bodyWithMacros =
         fmap (T.unpack . prependMacros macros . normalizeTheoremFenceTitles . T.pack) body
       prepare =
         addMeta "link-citations" (MetaBool True)
           . addMeta "reference-section-title" (MetaInlines [Str "References"])
-          . myFilter
+          . myFilter macros
   readPandocWith chaoDocRead bodyWithMacros
     >>= processPandocBiblio csl bib . fmap prepare
 
-chaoDocCompiler :: Compiler (Item String)
+chaoDocCompiler :: ChaoDocFiles -> Compiler (Item String)
-chaoDocCompiler = chaoDocPandocCompiler <&> writePandocWith chaoDocWrite
+chaoDocCompiler paths = chaoDocPandocCompiler paths <&> writePandocWith chaoDocWrite
 
 addMeta :: T.Text -> MetaValue -> Pandoc -> Pandoc
 addMeta name value (Pandoc meta a) =
@@ -77,8 +83,8 @@ addMeta name value (Pandoc meta a) =
       newMeta = Meta newMap
    in Pandoc newMeta a
 
-myFilter :: Pandoc -> Pandoc
+myFilter :: Text -> Pandoc -> Pandoc
-myFilter = usingSideNotesHTML chaoDocWrite . theoremFilter . panguFilter . equationFilter
+myFilter macros = usingSideNotesHTML chaoDocWrite . theoremFilter macros . panguFilter . equationFilter
 
 pandocToInline :: Pandoc -> [Inline]
 pandocToInline (Pandoc _ blocks) = go (reverse blocks)
@@ -184,8 +190,9 @@ normalizeTheoremClass :: Attr -> Text -> Attr
 normalizeTheoremClass (ident, classes, attrs) theoremType =
   (ident, theoremType : filter ((`notElem` theoremClasses) . normalizeBlockClass) classes, attrs)
 
-theoremFilter :: Pandoc -> Pandoc
+theoremFilter :: Text -> Pandoc -> Pandoc
-theoremFilter doc = walk makeTheorem $ autorefFilter $ evalState (walkM preprocessTheorems doc) 1
+theoremFilter macros doc =
+  walk (makeTheorem macros) $ autorefFilter $ evalState (walkM preprocessTheorems doc) 1
 
 --    [index, type, idx]
 theoremIndex :: Block -> [(Text, (Text, Text))]
@@ -281,27 +288,16 @@ equationAutoref x (Cite citations inlines)
     linkTitle = "Eq. (" <> num <> ")"
 equationAutoref _ y = y
 
--- processCitations works on AST. If you want to use citations in theorem name,
--- then you need to convert citations there to AST as well and then use processCitations\
--- Thus one need to apply the theorem filter first.
--- autoref still does not work.
-mathMacros :: Text
-mathMacros = unsafePerformIO (pack <$> readFile macroFile)
-{-# NOINLINE mathMacros #-}
-
 prependMacros :: Text -> Text -> Text
 prependMacros macros body = macros <> "\n\n" <> body
 
-prependMathMacros :: Text -> Text
+thmNamePandoc :: Text -> Text -> Pandoc
-prependMathMacros = prependMacros mathMacros
+thmNamePandoc macros x =
-
-thmNamePandoc :: Text -> Pandoc
-thmNamePandoc x =
   fromRight (Pandoc nullMeta []) . runPure $
-    readMarkdown chaoDocRead (prependMathMacros x)
+    readMarkdown chaoDocRead (prependMacros macros x)
 
-makeTheorem :: Block -> Block
+makeTheorem :: Text -> Block -> Block
-makeTheorem (Div attr xs)
+makeTheorem macros (Div attr xs)
   | isNothing t = Div attr xs
   | otherwise = Div (addClass attr "theorem-environment") (Plain [header] : xs)
   where
@@ -318,8 +314,8 @@ makeTheorem (Div attr xs)
     nametext =
       if isNothing name
         then Str ""
-        else Span (addClass nullAttr "name") (pandocToInline $ thmNamePandoc $ fromJust name)
+        else Span (addClass nullAttr "name") (pandocToInline $ thmNamePandoc macros $ fromJust name)
-makeTheorem x = x
+makeTheorem _ x = x
 
 -- pangu filter
 lastChar :: Inline -> Maybe Char

src/site.hs

@@ -9,8 +9,46 @@ import Hakyll
 import System.FilePath
 import Text.Pandoc
 
-mds :: Pattern
+mdfiles :: Pattern
-mds = "main.md"
+mdfiles = "main.md"
+
+images :: Pattern
+images = "images/**"
+
+mathMacro :: FilePath
+mathMacro = "assets/math-macros.tex"
+
+cslfile :: FilePath
+cslfile = "assets/bib_style.csl"
+
+reference :: FilePath
+reference = "ref.bib"
+
+fonts :: Pattern
+fonts = "assets/fonts/*"
+
+favicon :: FilePath
+favicon = "assets/favicon.ico"
+
+css :: Pattern
+css = "assets/css/*"
+
+templatesPattern :: Pattern
+templatesPattern = "assets/templates/*"
+
+templateDefault :: Identifier
+templateDefault = fromFilePath "assets/templates/default.html"
+
+templatePostlist :: Identifier
+templatePostlist = fromFilePath "assets/templates/post-list.html"
+
+chaoDocFiles :: ChaoDocFiles
+chaoDocFiles =
+  ChaoDocFiles
+    { chaoDocCslFile = cslfile,
+      chaoDocBibFile = reference,
+      chaoDocMacroFile = mathMacro
+    }
 
 config :: Configuration
 config =
@@ -22,52 +60,51 @@ config =
 
 main :: IO ()
 main = hakyllWith config $ do
-  match "images/**" $ do
+  match images $ do
     route idRoute
     compile copyFileCompiler
 
-  match "assets/math-macros.tex" $ compile getResourceBody
+  match (fromGlob mathMacro) $ compile getResourceBody
 
-  match "assets/bib_style.csl" $ compile cslCompiler
+  match (fromGlob cslfile) $ compile cslCompiler
 
-  match "ref.bib" $ compile biblioCompiler
+  match (fromGlob reference) $ compile biblioCompiler
 
-  match "assets/fonts/*" $ do
+  match fonts $ do
     route $ gsubRoute "assets/fonts/" (const "fonts/")
     compile copyFileCompiler
 
-  match "assets/favicon.ico" $ do
+  match (fromGlob favicon) $ do
     route $ constRoute "favicon.ico"
     compile copyFileCompiler
 
-  match "assets/css/*" $ do
+  match css $ do
     route $ gsubRoute "assets/css/" (const "css/")
     compile compressCssCompiler
 
-  match mds $ do
+  match mdfiles $ do
     route $ setExtension "html"
     compile $ do
       tocCtx <- getTocCtx defaultContext
-      chaoDocCompiler
+      chaoDocCompiler chaoDocFiles
-        >>= loadAndApplyTemplate "assets/templates/post.html" tocCtx
+        >>= loadAndApplyTemplate templateDefault tocCtx
-        >>= loadAndApplyTemplate "assets/templates/default.html" tocCtx
         >>= relativizeUrls
 
   create ["index.html"] $ do
     route idRoute
     compile $ do
-      posts <- loadAll mds
+      posts <- loadAll mdfiles
       let indexCtx =
-            constField "title" "Notes"
+            constField "title" ""
               `mappend` constField "toc" ""
               `mappend` listField "posts" postCtx (return posts)
               `mappend` defaultContext
       makeItem ""
-        >>= loadAndApplyTemplate "assets/templates/post-list.html" indexCtx
+        >>= loadAndApplyTemplate templatePostlist indexCtx
-        >>= loadAndApplyTemplate "assets/templates/default.html" indexCtx
+        >>= loadAndApplyTemplate templateDefault indexCtx
         >>= relativizeUrls
 
-  match "assets/templates/*" $ compile templateBodyCompiler
+  match templatesPattern $ compile templateBodyCompiler
 
 postCtx :: Context String
 postCtx =
@@ -80,7 +117,7 @@ getTocCtx :: Context a -> Compiler (Context a)
 getTocCtx ctx = do
   noToc <- (Just "true" ==) <$> (getUnderlying >>= (`getMetadataField` "no-toc"))
   writerOpts <- mkTocWriter defaultHakyllWriterOptions
-  toc <- writePandocWith writerOpts <$> chaoDocPandocCompiler
+  toc <- writePandocWith writerOpts <$> chaoDocPandocCompiler chaoDocFiles
   pure $
     mconcat
       [ ctx,
@@ -94,6 +131,7 @@ getTocCtx ctx = do
       pure $
         writerOpts
           { writerTableOfContents = True,
+            writerNumberSections = True,
             writerTOCDepth = 2,
             writerTemplate = tmpl,
             writerHTMLMathMethod = MathML