Simplify contents sidebar styles and markup

css/chao-theorems.css

@@ -1,89 +1,130 @@
 .theorem-environment {
+    position: relative;
+    margin: 1.5rem 0;
+    padding: 1rem 1.25rem;
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
     font-style: italic;
-  margin-top: 1em;
+}
-  padding: 0.5em;
+
-  background-color: whitesmoke;
+.theorem-environment > :first-child {
+    margin-top: 0;
+}
+
+.theorem-environment > :last-child {
+    margin-bottom: 0;
 }
 
 .theorem-header {
-  font-weight: bold;
+    color: var(--color-text);
+    font-weight: 700;
     font-style: normal;
 }
 
 .theorem-header .index:before {
-  content: ' ';
+    content: " ";
 }
 
 .theorem-header .name:before {
-  content: ' (';
+    content: " (";
 }
 
 .theorem-header .name:after {
-  content: ')';
+    content: ")";
 }
 
 .theorem-header:after {
-  content: '.\2002\2002';
+    content: ".\2002\2002";
 }
 
 .theorem-header + p {
     display: inline;
 }
 
-.Proof .type {
+.Proof {
-  font-style: italic;
+    padding-right: 2.5rem;
-  font-weight: normal;
+    font-style: normal;
 }
 
-.Proof {
+.Proof .type {
-  font-style: normal;
+    color: var(--color-linkh);
-  position: relative;
+    font-weight: 400;
+    font-style: italic;
 }
 
 .Proof:after {
-  content: '∎';
+    content: "\220e";
     position: absolute;
-  right: 0px;
+    right: 1rem;
-  bottom: 0px;
+    bottom: 0.85rem;
+    color: var(--color-tag1);
 }
 
 table.postindex {
     width: 100%;
+    border: 0;
+    border-collapse: separate;
+    border-spacing: 0;
+    background: transparent;
+    box-shadow: none;
 }
 
 table.postindex cite {
     font-style: normal;
 }
 
+table.postindex td {
+    padding: 0.65rem 0;
+    border: 0;
+    border-bottom: 1px solid var(--color-border);
+    background: transparent;
+}
+
+table.postindex tr:nth-child(even) td {
+    background: transparent;
+}
+
+table.postindex tr:last-child td {
+    border-bottom: 0;
+}
+
 table.postindex td.right {
-  text-align: right;
     width: 11ex;
+    color: var(--color-tag1);
+    text-align: right;
+    white-space: nowrap;
 }
 
 .header-section-number {
-  margin-right: 10px;
+    margin-right: 0.55rem;
+    color: var(--color-tag1);
 }
 
 .header-section-number:after {
-  content: '.';
+    content: ".";
 }
 
 .csl-entry {
     display: table;
     width: 100%;
+    margin-bottom: 0.75rem;
     table-layout: auto;
 }
 
 .csl-left-margin {
     display: table-cell;
-  padding-right: 0.5em;
-  white-space: nowrap;
     width: 1px;
+    padding-right: 0.75em;
+    color: var(--color-tag1);
+    white-space: nowrap;
 }
 
 .csl-right-inline {
     display: table-cell;
 }
+
 .csl-right-inline a {
     word-break: break-all;
 }

css/default.css

@@ -1,69 +1,170 @@
 :root {
-    --color-text: black;
+    color-scheme: light;
-    --color-tag1: gray;
+    --color-text: #162031;
-    --color-tag2: darkolivegreen;
+    --color-tag1: #6c788c;
-    --color-bg: white;
+    --color-tag2: #547157;
-    --color-link: #337ab7;
+    --color-bg: #f3f6fb;
-    --color-linkhbg: #e6f0ff;
+    --color-surface: rgba(255, 255, 255, 0.84);
-    --color-linkh: #002266;
+    --color-surface-strong: #ffffff;
-    --color-bq: olivedrab;
+    --color-surface-muted: #edf3fb;
-    --color-notice: #fb4f4f;
+    --color-border: rgba(22, 32, 49, 0.12);
+    --color-border-strong: rgba(22, 32, 49, 0.2);
+    --color-link: #225b9c;
+    --color-link-line: rgba(34, 91, 156, 0.28);
+    --color-linkhbg: rgba(89, 143, 211, 0.16);
+    --color-linkh: #163a63;
+    --color-bq: #628b72;
+    --color-notice: #d0455a;
+    --color-shadow: 0 20px 50px rgba(15, 23, 42, 0.08);
+    --color-shadow-soft: 0 10px 30px rgba(15, 23, 42, 0.06);
+    --code-bg: #f6f8fc;
+    --code-border: rgba(55, 65, 81, 0.14);
+    --page-glow-1: rgba(144, 187, 241, 0.18);
+    --page-glow-2: rgba(99, 141, 118, 0.14);
 }
 
 @media (prefers-color-scheme: dark) {
     :root {
-        --color-text: white;
+        color-scheme: dark;
-        --color-bg: black;
+        --color-text: #e7edf7;
+        --color-tag1: #9aa7bb;
+        --color-tag2: #9abf9c;
+        --color-bg: #0b1020;
+        --color-surface: rgba(15, 23, 42, 0.78);
+        --color-surface-strong: #101827;
+        --color-surface-muted: #162238;
+        --color-border: rgba(148, 163, 184, 0.18);
+        --color-border-strong: rgba(148, 163, 184, 0.26);
+        --color-link: #8bc3ff;
+        --color-link-line: rgba(139, 195, 255, 0.35);
+        --color-linkhbg: rgba(139, 195, 255, 0.16);
+        --color-linkh: #d9ecff;
+        --color-bq: #8db59a;
+        --color-notice: #ff8b8b;
+        --color-shadow: 0 24px 60px rgba(0, 0, 0, 0.35);
+        --color-shadow-soft: 0 12px 32px rgba(0, 0, 0, 0.3);
+        --code-bg: #0f172a;
+        --code-border: rgba(148, 163, 184, 0.22);
+        --page-glow-1: rgba(71, 119, 183, 0.22);
+        --page-glow-2: rgba(74, 118, 90, 0.18);
     }
 }
 
+*,
+*::before,
+*::after {
+    box-sizing: border-box;
+}
+
 html {
     scrollbar-gutter: stable;
+    scroll-behavior: smooth;
     font-size: 14pt;
 }
 
 body {
-    font-family: 'Lato', -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Microsoft YaHei', sans-serif;
+    box-sizing: content-box;
+    margin: 0;
+    font-family: "Lato", -apple-system, BlinkMacSystemFont, "PingFang SC", "Microsoft YaHei", sans-serif;
     font-optical-sizing: auto;
     font-weight: 400;
     font-style: normal;
     font-size: 1rem;
-    line-height: 140%;
+    line-height: 1.5;
     color: var(--color-text);
-    background-color: var(--color-bg);
+    background:
+        radial-gradient(circle at top, var(--page-glow-1), transparent 38%),
+        radial-gradient(circle at right top, var(--page-glow-2), transparent 30%),
+        var(--color-bg);
+    background-attachment: fixed;
     text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
 }
+
 body.lang-zh {
     text-align: left;
 }
 
+::selection {
+    background-color: var(--color-linkhbg);
+    color: var(--color-linkh);
+}
+
+main,
+.text-space {
+    min-width: 0;
+}
+
 body a {
     color: var(--color-link);
-    text-decoration: none;
+    text-decoration: underline;
+    text-decoration-thickness: 0.08em;
+    text-underline-offset: 0.18em;
+    text-decoration-color: var(--color-link-line);
+    transition:
+        color 0.18s ease,
+        background-color 0.18s ease,
+        text-decoration-color 0.18s ease;
+    -webkit-box-decoration-break: clone;
+    box-decoration-break: clone;
+}
+
+body a:visited {
+    color: var(--color-link);
 }
 
 .text-space a:hover {
     background-color: var(--color-linkhbg);
     color: var(--color-linkh);
-    text-decoration: none;
+    text-decoration-color: transparent;
+    border-radius: 0.2rem;
 }
+
+body a:focus-visible {
+    outline: 2px solid var(--color-link);
+    outline-offset: 3px;
+    border-radius: 0.25rem;
+}
+
 details {
-    background-color: var(--color-linkhbg);
+    margin: 1.25rem 0;
+    padding: 0.85rem 1rem;
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
 }
+
+details[open] summary {
+    margin-bottom: 0.75rem;
+}
+
+details > :last-child {
+    margin-bottom: 0;
+}
+
+summary {
+    font-weight: 700;
+}
+
 summary:hover {
     cursor: pointer;
+    color: var(--color-linkh);
 }
 
 /* mathML */
-.htmlmathparagraph, mtext,math {
+.htmlmathparagraph,
-    font-family: Lete Sans Math;
+mtext,
+math {
+    font-family: "Lete Sans Math";
 }
+
 .math-container,
 #math-container {
     display: block;
     overflow-x: auto;
     overflow-y: hidden;
-    padding: .5em;
+    padding: 0.5em;
 }
 
 .math-container.math-container-tagged {
@@ -72,7 +173,7 @@ summary:hover {
     align-items: center;
     column-gap: 1rem;
     overflow: visible;
-    padding: .5em 0;
+    padding: 0.5em 0;
 }
 
 .math-container.math-container-tagged .math-tag-spacer {
@@ -83,7 +184,7 @@ summary:hover {
     min-width: 0;
     overflow-x: auto;
     overflow-y: hidden;
-    padding: .5em 0;
+    padding: 0.5em 0;
 }
 
 .math-container.math-container-tagged .math-tag {
@@ -105,6 +206,7 @@ summary:hover {
 }
 
 p {
+    margin: 0 0 1rem;
     hyphens: auto;
 }
 
@@ -117,21 +219,25 @@ header {
     font-family: "IosevkaC", sans-serif;
 }
 
-/* top bar*/
 .navbar {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    gap: 1rem;
+}
+
+.navright {
+    display: flex;
+    flex-wrap: wrap;
 }
 
 .navright a {
     margin: 0 0 0 1em;
 }
 
-/* Links inside the navbar */
 .navbar a {
-    text-decoration: none;
     color: var(--color-text);
+    text-decoration: none;
 }
 
 .navbar a:visited {
@@ -139,37 +245,32 @@ header {
 }
 
 nav {
+    margin-bottom: 1.5rem;
+    padding-bottom: 0.75rem;
     text-align: right;
-    border-bottom: solid 1px var(--color-text);
+    border-bottom: 1px solid var(--color-border-strong);
 }
 
 nav a {
-    font-size: 1.2rem;
+    display: inline-flex;
-    /*margin-left: 0.5em;*/
+    align-items: center;
-    display: inline-block;
     vertical-align: middle;
+    font-size: 1.05rem;
     text-decoration: none;
 }
 
 .uri {
-    word-wrap: break-word;
+    overflow-wrap: anywhere;
-    /* Legacy support */
+    word-break: break-word;
-    overflow-wrap: break-word;
-    /* Modern property */
-    word-break: break-all;
-    /* Break long words if necessary */
     white-space: normal;
-    /* Allow wrapping */
 }
 
-
-
 footer {
-    color: var(--color-text);
+    margin-top: 3rem;
-    font-size: 0.8rem;
+    padding-right: 0.2rem;
-    margin-top: 2em;
+    color: var(--color-tag1);
+    font-size: 0.82rem;
     text-align: right;
-    padding-right: 1em;
 }
 
 h1,
@@ -179,47 +280,63 @@ h4,
 h5,
 h6 {
     text-align: left;
+    text-wrap: balance;
 }
 
 .pagetitle {
+    margin: 0;
     font-size: 2rem;
-    font-weight: normal;
+    font-weight: 400;
     font-style: normal;
     text-align: left;
-    line-height: 100%;
+    line-height: 1;
+    letter-spacing: -0.03em;
 }
 
 h1 {
-    margin-top: 1em;
+    margin-top: 1.5rem;
+    margin-bottom: 0.75rem;
     font-size: 1.44rem;
-    font-weight: bold;
+    font-weight: 700;
     font-style: normal;
-    text-align: left;
+    line-height: 1.1;
-    line-height: 100%;
+    letter-spacing: -0.02em;
 }
 
 h2 {
-    margin-top: 1em;
+    margin-top: 1.75rem;
+    margin-bottom: 0.7rem;
     font-size: 1.2rem;
-    font-weight: bold;
+    font-weight: 700;
-    font-style: normal
+    font-style: normal;
+    line-height: 1.2;
 }
 
 h3 {
-    margin-top: 1em;
+    margin-top: 1.5rem;
+    margin-bottom: 0.6rem;
     font-size: 1rem;
-    font-weight: bold;
+    font-weight: 700;
-    font-style: normal
+    font-style: normal;
+    line-height: 1.25;
+}
+
+h4,
+h5,
+h6 {
+    margin-top: 1.35rem;
+    margin-bottom: 0.55rem;
+    line-height: 1.3;
 }
 
 article .header {
+    color: var(--color-tag1);
     font-size: 1rem;
     font-style: normal;
-    color: var(--color-tag1);
     text-align: left;
+    letter-spacing: 0.02em;
 }
 
-
 .info {
     color: var(--color-tag2);
     font-size: 1rem;
@@ -239,216 +356,375 @@ article .header {
 }
 
 section.body {
-    margin-top: 2rem;
+    margin-top: 1.75rem;
+}
+
+section.body > :first-child {
+    margin-top: 0;
 }
 
 .ascii-art {
+    overflow-x: auto;
     font-family: monospace;
-    line-height: normal;
+    line-height: 1.2;
 }
 
 blockquote {
-    margin: 1rem 0;
+    margin: 1.5rem 0;
-    padding: 0 0 0 1.5em;
+    padding: 1rem 1.25rem;
-    border-left: 3px solid var(--color-bq);
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-left: 4px solid var(--color-bq);
+    border-radius: 0 1rem 1rem 0;
+    box-shadow: var(--color-shadow-soft);
 }
 
 blockquote p {
     margin: 0;
 }
 
-ol {
+ol,
-    padding-left: 2em;
-}
 ul {
-    list-style-type: square;
+    margin: 0 0 1.1rem;
     padding-left: 2em;
 }
-.notes-list {
-    list-style: none;
-    padding-left: 0;
-    margin-left: 0;
-}
-.notes-list li {
-    position: relative;
-    padding-left: 1em;
-}
-.notes-list li::before {
-    content: "-";
-    position: absolute;
-    left: 0;
-}
-li {
-    margin-bottom: 0.15em;
-}
 
-table,
+ul {
+    list-style-type: square;
+}
+
+li {
+    margin-bottom: 0.3em;
+    padding-left: 0.15em;
+}
+
+li::marker {
+    color: var(--color-tag2);
+}
+
+table {
+    margin: 1.5rem 0;
+    border: 1px solid var(--color-border-strong);
+    border-collapse: collapse;
+    background-color: var(--color-surface-strong);
+    box-shadow: var(--color-shadow-soft);
+}
+
 th,
 td {
-    border: 1px solid darkolivegreen;
+    padding: 0.65rem 0.8rem;
-    border-collapse: collapse;
+    border: 1px solid var(--color-border);
     text-align: left;
+    vertical-align: top;
+}
+
+th {
+    background-color: var(--color-surface-muted);
+}
+
+tr:nth-child(even) td {
+    background-color: var(--color-surface);
 }
 
 figure {
     display: flex;
     flex-flow: column;
-    padding: 5px;
+    gap: 0.75rem;
-    margin: auto;
+    padding: 0.9rem;
+    margin: 1.5rem auto;
     max-width: 80%;
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-radius: 1.25rem;
+    box-shadow: var(--color-shadow-soft);
 }
 
+figure img {
+    border-radius: 0.9rem;
+}
 
 figcaption {
-    /* font: italic smaller sans-serif; */
+    padding: 0 0.25rem;
-    padding: 3px;
+    color: var(--color-tag1);
+    font-size: 0.92rem;
     text-align: center;
 }
 
 .caption {
-    display: none
+    display: none;
 }
 
 .centerimg img {
-    margin: 0 auto 0 auto;
     display: block;
+    margin: 0 auto;
 }
 
-
+pre,
-div.highlight,
+div.highlight {
-pre code {
+    margin: 1.5rem 0;
-    margin: auto;
+    padding: 1rem 1.1rem;
-    padding: 10px;
     overflow: auto;
+    background-color: var(--code-bg);
+    border: 1px solid var(--code-border);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
+}
+
+pre code,
+div.highlight pre,
+div.highlight pre code {
     display: block;
+    margin: 0;
+    padding: 0;
+    overflow: visible;
+    background: transparent;
+    border: 0;
+    box-shadow: none;
 }
 
 code {
+    display: inline;
+    margin: 0;
+    padding: 0.12em 0.35em;
+    background-color: var(--code-bg);
+    border: 1px solid var(--code-border);
+    border-radius: 0.45rem;
     font-family: "IosevkaC", monospace;
-    margin: 0 auto;
+    font-size: 0.92em;
-    display: inline-block;
-    padding: 0px 2px;
-    border-radius: 2px;
     font-variant-ligatures: none;
     font-kerning: none;
     text-rendering: optimizeSpeed;
 }
 
-
 .draft-notice {
+    display: table;
+    margin: 1.5rem auto;
+    padding: 0.85rem 1rem;
     color: var(--color-notice);
-    margin: 1em auto;
+    text-align: center;
-    text-align: center
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-left: 4px solid var(--color-notice);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
 }
 
-
 .subtitle {
-    text-align: left;
+    margin-top: 0.5rem;
+    color: var(--color-tag1);
     font-size: 1.2rem;
-    margin-top: 0
+    line-height: 1.4;
+    text-align: left;
 }
+
+.subtitle p {
+    margin: 0.2rem 0;
+}
+
 .gallery {
-    margin-top: 2em;
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    gap: 12px;
+    gap: 1rem;
+    margin-top: 2em;
 }
 
 .gallery img {
+    display: block;
     width: 100%;
     max-width: 320px;
-    display: block;
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
 }
 
-/* phones -- no sidebar no sidenotes*/
+hr {
-@media (max-width: 768px) {
+    margin: 2rem 0;
-    body {
+    border: 0;
-        /* width: 90%; */
+    border-top: 1px solid var(--color-border-strong);
-        margin: auto;
-        padding: 0 5%;
-        text-align: left;
-        max-width: 876px;
-    }
-    mjx-container[display="true"]
-    /*, .katex-display */ {
-        overflow-x: auto;
-        overflow-y: hidden;
-    }
-
-    /* .katex-display>.katex>.katex-html>.tag {
-        display: inline-block;
-        position: relative;
-        padding-left: 10pt;
-    } */
 }
 
 .toc {
     display: none;
 }
 
-/* sidebar. no sidenotes */
+/* phones: no sidebar, no sidenotes */
+@media (max-width: 768px) {
+    body {
+        max-width: 876px;
+        margin: auto;
+        padding: 1rem 5% 3rem;
+        text-align: left;
+        background-attachment: scroll;
+    }
+
+    mjx-container[display="true"] {
+        overflow-x: auto;
+        overflow-y: hidden;
+    }
+
+    figure {
+        max-width: 100%;
+    }
+}
+
+/* sidebar, no sidenotes */
 @media (min-width: 769px) {
     body {
-        max-width: 1350px;
+        display: flex;
-        display: -webkit-flex;
-        -webkit-flex-flow: row wrap;
-        display: -ms-flexbox;
-        -ms-flex-flow: row wrap;
         flex-flow: row wrap;
         width: 95%;
-        padding-right: 5%;
+        max-width: 1350px;
         margin: auto;
+        padding: 1.5rem 5% 3rem 0;
     }
 
     .toc {
-        margin-top: 5rem;
+        display: inline-block;
+        width: 33%;
+        margin-top: 4.5rem;
         margin-left: 0;
         margin-right: 0;
-        width: 33%;
-        display: inline-block;
     }
 
     div#contents ul,
     div#contents-big ul {
-        margin-top: 0.5em;
+        margin-top: 0.3em;
-        margin-bottom: 0.5em;
+        margin-bottom: 0.3em;
-        padding-left: 1em;
+        margin-left: 0.1rem;
-        line-height: 1.2;
+        padding-left: 1.45rem;
+        line-height: 1.25;
         list-style-type: decimal;
-        margin-left: 0
-    }
-
-    div#contents ul.notes-list,
-    div#contents-big ul.notes-list {
-        list-style: none;
-        padding-left: 0;
     }
 
     div#contents-big ul ul {
         list-style-type: none;
+        margin-top: 0.15rem;
+        margin-left: 0.2rem;
+        padding-left: 0.8rem;
+        border-left: 1px solid var(--color-border);
     }
 
     div#contents-big li + li {
-        margin-top: 0.5em
+        margin-top: 0.18rem;
+    }
+
+    div#contents-big li::marker {
+        color: var(--color-tag1);
+        font-family: "IosevkaC", sans-serif;
     }
 
     div#contents-big {
-        font-size: 80%;
-        padding-top: 0;
-        padding-left: 1rem;
-        text-align: left;
-        max-width: 60%;
-        clear: both;
-        margin-right: 4em;
         position: sticky;
-        top: 5rem;
+        top: 6rem;
-        left: 100%
+        max-height: calc(100vh - 7rem);
+        max-height: calc(100dvh - 7rem);
+        left: 100%;
+        clear: both;
+        display: flex;
+        flex-direction: column;
+        max-width: 68%;
+        margin-right: 4em;
+        padding: 0.8rem;
+        background-color: var(--color-surface);
+        background-clip: padding-box;
+        border: 1px solid var(--color-border);
+        border-radius: 1.25rem;
+        box-shadow: var(--color-shadow-soft);
+        backdrop-filter: blur(14px);
+        font-size: 80%;
+        text-align: left;
+    }
+
+    div#contents-big .toc-scroll {
+        min-height: 0;
+        overflow-x: hidden;
+        overflow-y: auto;
+        overscroll-behavior: contain;
+        scrollbar-gutter: stable;
+        scrollbar-width: thin;
+        scrollbar-color: var(--color-border-strong) transparent;
+    }
+
+    div#contents-big .toc-scroll::-webkit-scrollbar {
+        width: 0.7rem;
+    }
+
+    div#contents-big .toc-scroll::-webkit-scrollbar-track {
+        margin-block: 0.45rem;
+        background: transparent;
+    }
+
+    div#contents-big .toc-scroll::-webkit-scrollbar-thumb {
+        background-color: var(--color-border-strong);
+        border: 0.18rem solid transparent;
+        border-radius: 999px;
+        background-clip: content-box;
+    }
+
+    div#contents-big .toc-scroll::-webkit-scrollbar-thumb:hover {
+        background-color: var(--color-tag1);
     }
 
     div#contents-big .mini-header {
-        font-weight: bold;
+        margin: 0 0 0.45rem;
-        margin: 0;
+        color: var(--color-tag1);
+        font-weight: 700;
         font-variant: small-caps;
+        letter-spacing: 0.08em;
+    }
+
+    div#contents-big a {
+        color: var(--color-text);
+        text-decoration: none;
+    }
+
+    div#contents-big li > a {
+        display: block;
+        margin: 0 0.2rem;
+        padding: 0.14rem 0.32rem;
+        border-radius: 0.55rem;
+        border: 1px solid transparent;
+        transition:
+            color 0.18s ease,
+            background-color 0.18s ease,
+            border-color 0.18s ease,
+            transform 0.18s ease;
+    }
+
+    div#contents-big a:visited {
+        color: var(--color-text);
+    }
+
+    div#contents-big a:hover {
+        background-color: var(--color-linkhbg);
+        color: var(--color-linkh);
+    }
+
+    div#contents-big li > a:hover,
+    div#contents-big li > a:focus-visible {
+        border-color: var(--color-border);
+        transform: translateX(2px);
+    }
+
+    div#contents-big li > a:focus-visible,
+    div#contents-big .mini-header a:focus-visible {
+        outline: 2px solid var(--color-link);
+        outline-offset: 2px;
+    }
+
+    div#contents-big .mini-header a {
+        display: inline;
+        margin-left: 0.25rem;
+        color: var(--color-link);
+        font-size: 0.85rem;
+        line-height: 1;
+        vertical-align: baseline;
+        transition: color 0.18s ease;
+    }
+
+    div#contents-big .mini-header a:hover {
+        background-color: transparent;
+        color: var(--color-linkh);
+        transform: none;
     }
 
     .text-space {
@@ -457,6 +733,7 @@ code {
         max-width: 875px;
     }
 }
+
 /* sidebar + sidenotes */
 @media (min-width: 1200px) {
     body {
@@ -466,7 +743,6 @@ code {
 }
 
 @media print {
-
     .no-print,
     .no-print * {
         display: none !important;
@@ -474,5 +750,16 @@ code {
 
     body {
         margin: auto;
+        background: white;
+    }
+
+    blockquote,
+    details,
+    div#contents-big,
+    figure,
+    pre,
+    div.highlight,
+    table {
+        box-shadow: none;
     }
 }

css/pygentize.css

@@ -1,35 +1,79 @@
-
+:root {
-code.sourceCode
+    --syntax-alert: #c2410c;
-{
+    --syntax-annotation: #0f766e;
-    background: inherit
+    --syntax-attribute: #2563eb;
+    --syntax-number: #7c3aed;
+    --syntax-control: #4d7c0f;
+    --syntax-char: #0f766e;
+    --syntax-constant: #9f1239;
+    --syntax-comment: #7b8794;
+    --syntax-doc: #b45309;
+    --syntax-type-bg: #efe7ff;
+    --syntax-error: #dc2626;
+    --syntax-function: #0f4c81;
+    --syntax-import: #0d9488;
+    --syntax-preprocessor: #92400e;
+    --syntax-special: #0369a1;
+    --syntax-string: #15803d;
+    --syntax-variable: #1d4ed8;
 }
-pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+
-code span.al { color: #CB4B16; font-weight: bold; } /* Alert */
+@media (prefers-color-scheme: dark) {
-code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+    :root {
-code span.at { color: #7d9029; } /* Attribute */
+        --syntax-alert: #fdba74;
-code span.bn { color: #D33682; } /* BaseN */
+        --syntax-annotation: #99f6e4;
-code span.bu { } /* BuiltIn */
+        --syntax-attribute: #93c5fd;
-code span.cf { color: #5F8700; font-weight: bold; } /* ControlFlow */
+        --syntax-number: #d8b4fe;
-code span.ch { color: #16801a; } /* Char */
+        --syntax-control: #bef264;
-code span.cn { color: #880000; } /* Constant */
+        --syntax-char: #86efac;
-code span.co { color: #93A1A1; font-style: italic; } /* Comment */
+        --syntax-constant: #fda4af;
-code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+        --syntax-comment: #94a3b8;
-code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+        --syntax-doc: #fcd34d;
-code span.dt { background-color: #f8edff; } /* DataType */
+        --syntax-type-bg: rgba(216, 180, 254, 0.16);
-code span.dv { color: #D33682; } /* DecVal */
+        --syntax-error: #f87171;
-code span.er { color: #D30102; font-weight: bold; } /* Error */
+        --syntax-function: #bfdbfe;
-code span.ex { } /* Extension */
+        --syntax-import: #5eead4;
-code span.fl { color: #D33682; } /* Float */
+        --syntax-preprocessor: #fdba74;
-code span.fu {  } /* Function */
+        --syntax-special: #7dd3fc;
-code span.im { color: #D70000} /* Import */
+        --syntax-string: #86efac;
-code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+        --syntax-variable: #c4b5fd;
-code span.kw { font-weight: bold; } /* Keyword */
+    }
-code span.op { font-weight: bold; } /* Operator */
+}
-code span.ot { font-weight: bold; } /* Other */
+
-code span.pp { color: #bc7a00; } /* Preprocessor */
+code.sourceCode {
-code span.sc { color: #4070a0; } /* SpecialChar */
+    background: inherit;
-code span.ss { color: #bb6688; } /* SpecialString */
+}
-code span.st { color: #16801a; } /* String */
+
-code span.va { color: #19177c; } /* Variable */
+pre > code.sourceCode > span > a:first-child::before {
-code span.vs { color: #4070a0; } /* VerbatimString */
+    text-decoration: underline;
-code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+}
+
+code span.al { color: var(--syntax-alert); font-weight: 700; }
+code span.an { color: var(--syntax-annotation); font-weight: 700; font-style: italic; }
+code span.at { color: var(--syntax-attribute); }
+code span.bn { color: var(--syntax-number); }
+code span.bu { color: var(--syntax-function); }
+code span.cf { color: var(--syntax-control); font-weight: 700; }
+code span.ch { color: var(--syntax-char); }
+code span.cn { color: var(--syntax-constant); }
+code span.co { color: var(--syntax-comment); font-style: italic; }
+code span.cv { color: var(--syntax-annotation); font-weight: 700; font-style: italic; }
+code span.do { color: var(--syntax-doc); font-style: italic; }
+code span.dt { background-color: var(--syntax-type-bg); }
+code span.dv { color: var(--syntax-number); }
+code span.er { color: var(--syntax-error); font-weight: 700; }
+code span.ex { color: var(--syntax-function); }
+code span.fl { color: var(--syntax-number); }
+code span.fu { color: var(--syntax-function); }
+code span.im { color: var(--syntax-import); }
+code span.in { color: var(--syntax-annotation); font-weight: 700; font-style: italic; }
+code span.kw { color: var(--syntax-control); font-weight: 700; }
+code span.op { color: var(--syntax-function); font-weight: 700; }
+code span.ot { color: var(--syntax-special); font-weight: 700; }
+code span.pp { color: var(--syntax-preprocessor); }
+code span.sc { color: var(--syntax-special); }
+code span.ss { color: var(--syntax-number); }
+code span.st { color: var(--syntax-string); }
+code span.va { color: var(--syntax-variable); }
+code span.vs { color: var(--syntax-special); }
+code span.wa { color: var(--syntax-annotation); font-weight: 700; font-style: italic; }

css/sidenotes.css

@@ -19,127 +19,148 @@ body {
 .sidenote,
 .marginnote,
 .marginnote-left {
+    position: relative;
     float: right;
     clear: right;
-    margin-right: -42%;
     width: 36%;
-    margin-top: 0.3rem;
+    margin-top: 0.45rem;
+    margin-right: -42%;
     margin-bottom: 0;
-    font-size: 0.8em;
+    padding: 0.85rem 1rem;
-    line-height: 1.2;
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
+    backdrop-filter: blur(14px);
     vertical-align: baseline;
-    position: relative;
+    font-size: 0.82em;
+    line-height: 1.45;
     text-align: left;
 }
+
 @media (max-width: 1200px) {
     .sidenote,
     .marginnote,
     .marginnote-left {
-        margin-right: -40%;
         width: 33%;
+        margin-right: -40%;
     }
 }
 
 .marginnote-left {
+    position: relative;
     float: left;
     clear: left;
-    margin-left: -32%;
     width: 25%;
-    position: relative;
+    margin-left: -32%;
     text-align: right;
 }
-/* The first condition is for the case of a left-aligned layout (on a
+
-   smaller screen), and the second condition for a more centered layout
+/* The first condition is for the case of a left-aligned layout
-   on a larger screen.  It's a bit awkward, sadly :/ */
+   (on a smaller screen), and the second condition for a more centered
-@media (max-width: 1349px) or ((min-width: 1367px) and (max-width: 1620px)) {
+   layout on a larger screen. */
+@media (max-width: 1349px), (min-width: 1367px) and (max-width: 1620px) {
     .marginnote-left {
-        margin-left: -33%;
         width: 30%;
+        margin-left: -33%;
     }
 }
 
+.sidenote > :first-child,
+.marginnote > :first-child,
+.marginnote-left > :first-child {
+    margin-top: 0;
+}
+
+.sidenote > :last-child,
+.marginnote > :last-child,
+.marginnote-left > :last-child {
+    margin-bottom: 0;
+}
+
 .sidenote code {
-    font-size: 0.94em;
+    font-size: 0.92em;
 }
 
-/* For some reason, although only `overflow-x` is set in `default.css`,
+/* Block code in side and margin notes gets a vertical scrollbar on some
-   block code in side and marginnotes gets a vertical (!) scrollbar no
+   browsers; disable that. */
-   matter what; disable that.
-*/
 div .marginnote pre,
 div .sidenote pre {
+    margin: 0.75rem 0;
     overflow-y: hidden;
 }
 
 .sidenote-number {
-    counter-increment: sidenote-counter;
     color: var(--color-link);
+    counter-increment: sidenote-counter;
+    font-family: "IosevkaC", sans-serif;
 }
 
 .sidenote-number:after,
 .sidenote:before {
     position: relative;
     vertical-align: baseline;
+    color: var(--color-link);
+    font-family: "IosevkaC", sans-serif;
 }
 
 .sidenote-number:after {
     content: counter(sidenote-counter);
-    font-size: 0.8rem;
     top: -0.5rem;
+    font-size: 0.8rem;
+    font-weight: 700;
 }
 
-/* Properly position siednote number and adjust position of sidenote
+/* Properly position sidenote number and adjust position of sidenote
    paragraphs:
     https://github.com/edwardtufte/tufte-css/issues/93#issuecomment-670695382
 */
 .sidenote::before {
     content: counter(sidenote-counter) " ";
-    font-size: 0.8rem;
-    top: -0.55rem;
     position: absolute;
+    top: -0.55rem;
     right: calc(100% + 0.5em);
+    font-size: 0.8rem;
+    font-weight: 700;
 }
 
 .sidenote p {
-    margin: 1em 0;
+    margin: 0.85em 0;
 }
 
-.sidenote p:first-child {
-    margin-top: 0;
-}
-
-.sidenote p:last-child {
-    margin-bottom: 0;
-}
-
-/* */
-
 input.margin-toggle {
     display: none;
 }
 
 label.sidenote-number {
     display: inline-block;
-    max-height: 2rem; /* should be less than or equal to paragraph line-height */
+    max-height: 2rem;
 }
 
 label.margin-toggle:not(.sidenote-number) {
     display: none;
+    color: var(--color-link);
+    font-family: "IosevkaC", sans-serif;
 }
 
 .iframe-wrapper {
     position: relative;
-    padding-bottom: 56.25%; /* 16:9 */
-    padding-top: 25px;
     height: 0;
+    padding-top: 25px;
+    padding-bottom: 56.25%;
+    overflow: hidden;
+    background-color: var(--color-surface);
+    border: 1px solid var(--color-border);
+    border-radius: 1rem;
+    box-shadow: var(--color-shadow-soft);
 }
 
 .iframe-wrapper iframe {
     position: absolute;
-    top: 0;
+    inset: 0;
-    left: 0;
     width: 100%;
     height: 100%;
+    border: 0;
 }
 
 @media (max-width: 1200px) {
@@ -153,23 +174,24 @@ label.margin-toggle:not(.sidenote-number) {
         display: none;
     }
 
-    /* Linkify sidenotes iff they are clickable */
+    /* Linkify sidenotes iff they are clickable. */
     .margin-toggle,
     .sidenote-number:after {
         color: var(--color-link);
-        text-decoration: none;
+        text-decoration: underline;
+        text-decoration-color: var(--color-link-line);
     }
 
     .margin-toggle:checked + .sidenote,
     .margin-toggle:checked + .marginnote,
     .margin-toggle:checked + .marginnote-left {
-        display: block;
+        position: relative;
         float: left;
         left: 1rem;
         clear: both;
+        display: block;
         width: 95%;
         margin: 1rem 2.5%;
-        position: relative;
         text-align: left;
     }
 

hakyll-blog.cabal

@@ -1,20 +1,13 @@
-name:               hakysidian
+name:               hakyll-blog
 version:            0.1.0.0
 build-type:         Simple
-cabal-version:      2.0
+cabal-version:      >= 1.10
-data-files:
-  templates/*.html
-  css/*.css
-  fonts/*.woff2
-  bib_style.csl
-  favicon.ico
 
 
 executable site
   hs-source-dirs:   src
   main-is:          site.hs
-  autogen-modules:  Paths_hakysidian
+  other-modules:    ChaoDoc, SideNoteHTML, Pangu
-  other-modules:    ChaoDoc, SideNoteHTML, Pangu, Paths_hakysidian
   build-depends:    base   >= 4.18
                   , hakyll >= 4.15
                   , mtl >= 2.2.2
@@ -24,12 +17,10 @@ executable site
                   , tagsoup
                   , text
                   , containers
-                  , directory
                   -- , process
                   -- , regex-compat
                   , array
                   , filepath
-                  , temporary
                   -- , ghc-syntax-highlighter
                   -- , blaze-html >= 0.9
                   , megaparsec

src/site.hs

@@ -2,32 +2,13 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StandaloneKindSignatures #-}
 {-# LANGUAGE ViewPatterns #-}
 
 import ChaoDoc
-import Control.Monad (filterM, forM_, unless)
+import Data.List (sortOn)
-import Data.Kind (Type)
-import Data.List (sortOn, stripPrefix)
 import qualified Data.Text as T
 import Hakyll
-import qualified Paths_hakysidian as Paths
-import System.Directory
-  ( copyFile,
-    createDirectoryIfMissing,
-    createDirectoryLink,
-    createFileLink,
-    doesDirectoryExist,
-    doesFileExist,
-    listDirectory,
-    makeAbsolute,
-    withCurrentDirectory
-  )
-import System.Environment (getArgs, withArgs)
-import System.Exit (die, exitSuccess)
 import System.FilePath
-import System.IO.Error (tryIOError)
-import System.IO.Temp (withSystemTempDirectory)
 import Text.Pandoc
 
 --------------------------------------------------------------------------------
@@ -35,371 +16,35 @@ import Text.Pandoc
 cleanRoute :: Routes
 cleanRoute = customRoute createIndexRoute
   where
-    createIndexRoute :: Identifier -> FilePath
+    createIndexRoute ident = takeDirectory p </> takeBaseName p </> "index.html"
-    createIndexRoute ident
-      | dir == "." = base </> "index.html"
-      | otherwise = dir </> base </> "index.html"
       where
         p = toFilePath ident
-        dir = takeDirectory p
-        base = takeBaseName p
 
 cleanIndexHtmls :: Item String -> Compiler (Item String)
 cleanIndexHtmls = return . fmap (replaceAll pattern replacement)
   where
-    pattern :: String
+    pattern :: String = "/index.html"
-    pattern = "/index.html"
+    replacement :: String -> String = const "/"
-
-    replacement :: String -> String
-    replacement = const "/"
-
-notePattern :: Pattern
-notePattern =
-  fromGlob "*.md"
-    .&&. complement (fromGlob "math-macros.md")
-    .&&. complement (fromGlob "index.md")
-
-reservedMarkdownFiles :: [FilePath]
-reservedMarkdownFiles = ["index.md", "math-macros.md"]
-
-loadNoteLinks :: Compiler [Item String]
-loadNoteLinks = do
-  noteIds <- sortOn toFilePath <$> getMatches notePattern
-  pure [Item noteId "" | noteId <- noteIds]
 
 --------------------------------------------------------------------------------
 
-type CliOptions :: Type
+config :: Configuration
-data CliOptions = CliOptions
+config =
-  { cliContentDir :: Maybe FilePath,
-    cliOutputDir :: Maybe FilePath,
-    cliReferenceBib :: Maybe FilePath,
-    cliMathMacros :: Maybe FilePath,
-    cliCssDir :: Maybe FilePath,
-    cliFontsDir :: Maybe FilePath,
-    cliTemplatesDir :: Maybe FilePath,
-    cliBibStyle :: Maybe FilePath,
-    cliFavicon :: Maybe FilePath
-  }
-
-type ResolvedOptions :: Type
-data ResolvedOptions = ResolvedOptions
-  { resolvedContentDir :: FilePath,
-    resolvedOutputDir :: FilePath,
-    resolvedStoreDir :: FilePath,
-    resolvedTmpDir :: FilePath,
-    resolvedReferenceBib :: FilePath,
-    resolvedMathMacros :: FilePath,
-    resolvedImagesDir :: Maybe FilePath,
-    resolvedCssDir :: FilePath,
-    resolvedFontsDir :: FilePath,
-    resolvedTemplatesDir :: FilePath,
-    resolvedBibStyle :: FilePath,
-    resolvedFavicon :: FilePath
-  }
-
-type ParseResult :: Type
-data ParseResult
-  = Parsed CliOptions [String]
-  | ShowHelp
-
-defaultCliOptions :: CliOptions
-defaultCliOptions =
-  CliOptions
-    { cliContentDir = Nothing,
-      cliOutputDir = Nothing,
-      cliReferenceBib = Nothing,
-      cliMathMacros = Nothing,
-      cliCssDir = Nothing,
-      cliFontsDir = Nothing,
-      cliTemplatesDir = Nothing,
-      cliBibStyle = Nothing,
-      cliFavicon = Nothing
-    }
-
-helpText :: String
-helpText =
-  unlines
-    [ "Hakysidian",
-      "",
-      "Usage:",
-      "  site [options] [build|watch|clean|rebuild|preview ...]",
-      "",
-      "The content directory should contain top-level markdown files,",
-      "an optional images/ folder, plus reference.bib and math-macros.md.",
-      "",
-      "Options:",
-      "  --content-dir PATH      Folder containing markdown files.",
-      "  --output-dir PATH       Destination for generated HTML. Default: CONTENT/_site",
-      "  --reference-bib PATH    Bibliography file. Default: CONTENT/reference.bib",
-      "  --math-macros PATH      Math macros file. Default: CONTENT/math-macros.md",
-      "  --css-dir PATH          Shared CSS directory. Default: packaged asset directory",
-      "  --fonts-dir PATH        Shared fonts directory. Default: packaged asset directory",
-      "  --templates-dir PATH    Shared templates directory. Default: packaged asset directory",
-      "  --bib-style PATH        CSL file. Default: packaged bib_style.csl",
-      "  --favicon PATH          Favicon file. Default: packaged favicon.ico",
-      "  --help                  Show this help text"
-    ]
-
-parseCliArgs :: [String] -> Either String ParseResult
-parseCliArgs = go defaultCliOptions []
-  where
-    go :: CliOptions -> [String] -> [String] -> Either String ParseResult
-    go options passthrough = \case
-      [] -> Right (Parsed options (reverse passthrough))
-      "--" : rest -> Right (Parsed options (reverse passthrough ++ rest))
-      "--help" : _ -> Right ShowHelp
-      "-h" : _ -> Right ShowHelp
-      arg : rest
-        | Just value <- stripPrefix "--content-dir=" arg ->
-            go options {cliContentDir = Just value} passthrough rest
-        | Just value <- stripPrefix "--output-dir=" arg ->
-            go options {cliOutputDir = Just value} passthrough rest
-        | Just value <- stripPrefix "--reference-bib=" arg ->
-            go options {cliReferenceBib = Just value} passthrough rest
-        | Just value <- stripPrefix "--ref=" arg ->
-            go options {cliReferenceBib = Just value} passthrough rest
-        | Just value <- stripPrefix "--math-macros=" arg ->
-            go options {cliMathMacros = Just value} passthrough rest
-        | Just value <- stripPrefix "--css-dir=" arg ->
-            go options {cliCssDir = Just value} passthrough rest
-        | Just value <- stripPrefix "--fonts-dir=" arg ->
-            go options {cliFontsDir = Just value} passthrough rest
-        | Just value <- stripPrefix "--templates-dir=" arg ->
-            go options {cliTemplatesDir = Just value} passthrough rest
-        | Just value <- stripPrefix "--bib-style=" arg ->
-            go options {cliBibStyle = Just value} passthrough rest
-        | Just value <- stripPrefix "--favicon=" arg ->
-            go options {cliFavicon = Just value} passthrough rest
-        | arg == "--content-dir" ->
-            setPathOption "--content-dir" cliContentDir (\x y -> x {cliContentDir = Just y}) options passthrough rest
-        | arg == "--output-dir" ->
-            setPathOption "--output-dir" cliOutputDir (\x y -> x {cliOutputDir = Just y}) options passthrough rest
-        | arg == "--reference-bib" ->
-            setPathOption "--reference-bib" cliReferenceBib (\x y -> x {cliReferenceBib = Just y}) options passthrough rest
-        | arg == "--ref" ->
-            setPathOption "--ref" cliReferenceBib (\x y -> x {cliReferenceBib = Just y}) options passthrough rest
-        | arg == "--math-macros" ->
-            setPathOption "--math-macros" cliMathMacros (\x y -> x {cliMathMacros = Just y}) options passthrough rest
-        | arg == "--css-dir" ->
-            setPathOption "--css-dir" cliCssDir (\x y -> x {cliCssDir = Just y}) options passthrough rest
-        | arg == "--fonts-dir" ->
-            setPathOption "--fonts-dir" cliFontsDir (\x y -> x {cliFontsDir = Just y}) options passthrough rest
-        | arg == "--templates-dir" ->
-            setPathOption "--templates-dir" cliTemplatesDir (\x y -> x {cliTemplatesDir = Just y}) options passthrough rest
-        | arg == "--bib-style" ->
-            setPathOption "--bib-style" cliBibStyle (\x y -> x {cliBibStyle = Just y}) options passthrough rest
-        | arg == "--favicon" ->
-            setPathOption "--favicon" cliFavicon (\x y -> x {cliFavicon = Just y}) options passthrough rest
-        | otherwise ->
-            go options (arg : passthrough) rest
-
-    setPathOption ::
-      String ->
-      (CliOptions -> Maybe FilePath) ->
-      (CliOptions -> FilePath -> CliOptions) ->
-      CliOptions ->
-      [String] ->
-      [String] ->
-      Either String ParseResult
-    setPathOption optionName getter setter options passthrough = \case
-      [] -> Left ("Missing value for " ++ optionName)
-      value : rest
-        | null value -> Left ("Missing value for " ++ optionName)
-        | getter options == Nothing ->
-            go (setter options value) passthrough rest
-        | otherwise ->
-            go (setter options value) passthrough rest
-
-resolveCliOptions :: CliOptions -> IO ResolvedOptions
-resolveCliOptions options = do
-  contentDir <- makeAbsolute (maybe "." id (cliContentDir options))
-  validateDirectoryExists "content directory" contentDir
-
-  let outputDir0 = maybe (contentDir </> "_site") id (cliOutputDir options)
-      referenceBib0 = maybe (contentDir </> "reference.bib") id (cliReferenceBib options)
-      mathMacros0 = maybe (contentDir </> "math-macros.md") id (cliMathMacros options)
-      storeDir0 = contentDir </> ".hakysidian-cache"
-      tmpDir0 = contentDir </> ".hakysidian-tmp"
-
-  outputDir <- makeAbsolute outputDir0
-  referenceBib <- makeAbsolute referenceBib0
-  mathMacros <- makeAbsolute mathMacros0
-  storeDir <- makeAbsolute storeDir0
-  tmpDir <- makeAbsolute tmpDir0
-
-  validateFileExists "reference bibliography" referenceBib
-  validateFileExists "math macros" mathMacros
-
-  imagesDir <- resolveOptionalDirectory (contentDir </> "images")
-  cssDir <- resolveDirectoryOption "css directory" (cliCssDir options) defaultCssDir
-  fontsDir <- resolveDirectoryOption "fonts directory" (cliFontsDir options) defaultFontsDir
-  templatesDir <- resolveDirectoryOption "templates directory" (cliTemplatesDir options) defaultTemplatesDir
-  bibStyle <- resolveFileOption "CSL file" (cliBibStyle options) defaultBibStyle
-  favicon <- resolveFileOption "favicon" (cliFavicon options) defaultFavicon
-
-  pure
-    ResolvedOptions
-      { resolvedContentDir = contentDir,
-        resolvedOutputDir = outputDir,
-        resolvedStoreDir = storeDir,
-        resolvedTmpDir = tmpDir,
-        resolvedReferenceBib = referenceBib,
-        resolvedMathMacros = mathMacros,
-        resolvedImagesDir = imagesDir,
-        resolvedCssDir = cssDir,
-        resolvedFontsDir = fontsDir,
-        resolvedTemplatesDir = templatesDir,
-        resolvedBibStyle = bibStyle,
-        resolvedFavicon = favicon
-      }
-
-defaultCssDir :: IO FilePath
-defaultCssDir = takeDirectory <$> resolvePackagedFile ("css" </> "default.css")
-
-defaultFontsDir :: IO FilePath
-defaultFontsDir = takeDirectory <$> resolvePackagedFile ("fonts" </> "IosevkaCustom-Regular.woff2")
-
-defaultTemplatesDir :: IO FilePath
-defaultTemplatesDir = takeDirectory <$> resolvePackagedFile ("templates" </> "head.html")
-
-defaultBibStyle :: IO FilePath
-defaultBibStyle = resolvePackagedFile "bib_style.csl"
-
-defaultFavicon :: IO FilePath
-defaultFavicon = resolvePackagedFile "favicon.ico"
-
-resolvePackagedFile :: FilePath -> IO FilePath
-resolvePackagedFile relativePath = do
-  installedPath <- Paths.getDataFileName relativePath
-  installedExists <- doesFileExist installedPath
-  if installedExists
-    then pure installedPath
-    else makeAbsolute relativePath
-
-resolveDirectoryOption ::
-  String ->
-  Maybe FilePath ->
-  IO FilePath ->
-  IO FilePath
-resolveDirectoryOption label maybePath defaultAction = do
-  path0 <- maybe defaultAction pure maybePath
-  path <- makeAbsolute path0
-  validateDirectoryExists label path
-  pure path
-
-resolveFileOption ::
-  String ->
-  Maybe FilePath ->
-  IO FilePath ->
-  IO FilePath
-resolveFileOption label maybePath defaultAction = do
-  path0 <- maybe defaultAction pure maybePath
-  path <- makeAbsolute path0
-  validateFileExists label path
-  pure path
-
-resolveOptionalDirectory :: FilePath -> IO (Maybe FilePath)
-resolveOptionalDirectory path0 = do
-  path <- makeAbsolute path0
-  exists <- doesDirectoryExist path
-  pure if exists then Just path else Nothing
-
-validateDirectoryExists :: String -> FilePath -> IO ()
-validateDirectoryExists label path = do
-  exists <- doesDirectoryExist path
-  unless exists $
-    die ("Missing " ++ label ++ ": " ++ path)
-
-validateFileExists :: String -> FilePath -> IO ()
-validateFileExists label path = do
-  exists <- doesFileExist path
-  unless exists $
-    die ("Missing " ++ label ++ ": " ++ path)
-
-findMarkdownSources :: FilePath -> IO [FilePath]
-findMarkdownSources contentDir = do
-  entries <- listDirectory contentDir
-  let candidatePaths = sortOn takeFileName (map (contentDir </>) entries)
-  files <- filterM doesFileExist candidatePaths
-  pure
-    [ path
-      | path <- files,
-        let fileName = takeFileName path,
-        takeExtension fileName == ".md",
-        fileName `notElem` reservedMarkdownFiles
-    ]
-
-prepareStageRoot :: ResolvedOptions -> FilePath -> IO ()
-prepareStageRoot options stageRoot = do
-  createDirectoryIfMissing True stageRoot
-
-  markdownFiles <- findMarkdownSources (resolvedContentDir options)
-  forM_ markdownFiles \path ->
-    linkOrCopyFile path (stageRoot </> takeFileName path)
-
-  forM_ (resolvedImagesDir options) \path ->
-    linkOrCopyDirectory path (stageRoot </> "images")
-
-  linkOrCopyFile (resolvedReferenceBib options) (stageRoot </> "reference.bib")
-  linkOrCopyFile (resolvedMathMacros options) (stageRoot </> "math-macros.md")
-  linkOrCopyDirectory (resolvedCssDir options) (stageRoot </> "css")
-  linkOrCopyDirectory (resolvedFontsDir options) (stageRoot </> "fonts")
-  linkOrCopyDirectory (resolvedTemplatesDir options) (stageRoot </> "templates")
-  linkOrCopyFile (resolvedBibStyle options) (stageRoot </> "bib_style.csl")
-  linkOrCopyFile (resolvedFavicon options) (stageRoot </> "favicon.ico")
-
-linkOrCopyFile :: FilePath -> FilePath -> IO ()
-linkOrCopyFile source destination = do
-  createDirectoryIfMissing True (takeDirectory destination)
-  result <- tryIOError (createFileLink source destination)
-  case result of
-    Right () -> pure ()
-    Left _ -> copyFile source destination
-
-linkOrCopyDirectory :: FilePath -> FilePath -> IO ()
-linkOrCopyDirectory source destination = do
-  createDirectoryIfMissing True (takeDirectory destination)
-  result <- tryIOError (createDirectoryLink source destination)
-  case result of
-    Right () -> pure ()
-    Left _ -> copyDirectoryRecursive source destination
-
-copyDirectoryRecursive :: FilePath -> FilePath -> IO ()
-copyDirectoryRecursive source destination = do
-  createDirectoryIfMissing True destination
-  entries <- listDirectory source
-  forM_ entries \entry -> do
-    let srcPath = source </> entry
-        dstPath = destination </> entry
-    isDirectory <- doesDirectoryExist srcPath
-    if isDirectory
-      then copyDirectoryRecursive srcPath dstPath
-      else copyFile srcPath dstPath
-
---------------------------------------------------------------------------------
-
-config :: ResolvedOptions -> Configuration
-config options =
   defaultConfiguration
-    { destinationDirectory = resolvedOutputDir options,
+    { ignoreFile = \path ->
-      storeDirectory = resolvedStoreDir options,
-      tmpDirectory = resolvedTmpDir options,
-      providerDirectory = ".",
-      ignoreFile = \path ->
         ignoreFile defaultConfiguration path
           || ".git" `elem` splitDirectories (normalise path)
     }
 
-siteRules :: Rules ()
+main :: IO ()
-siteRules = do
+main = hakyllWith config $ do
   match "images/**" $ do
     route idRoute
     compile copyFileCompiler
 
   match "math-macros.md" $ compile getResourceBody
 
-  match "fonts/**" $ do
+  match "fonts/*.woff2" $ do
     route idRoute
     compile copyFileCompiler
 
@@ -407,26 +52,68 @@ siteRules = do
     route idRoute
     compile copyFileCompiler
 
-  match "css/**" $ do
+  -- match "404.html" $ do
+  --   route cleanRoute
+  --   compile copyFileCompiler
+
+  match "css/*" $ do
     route idRoute
     compile compressCssCompiler
 
-  match notePattern $ do
+  -- match "about.md" $ do
+  --   route cleanRoute
+  --   compile $
+  --     chaoDocCompiler
+  --       >>= loadAndApplyTemplate "templates/about.html" defaultContext
+  --       >>= relativizeUrls
+
+  -- -- build up tags
+  -- tags <- buildTags "posts/*" (fromCapture "tags/*.html")
+  -- tagsRules tags $ \tag pattern -> do
+  --   let title = "Posts tagged \"" ++ tag ++ "\""
+  --   route cleanRoute
+  --   compile $ do
+  --     posts <- recentFirst =<< loadAll pattern
+  --     let ctx =
+  --           constField "title" title
+  --             `mappend` listField "posts" (postCtxWithTags tags) (return posts)
+  --             `mappend` defaultContext
+  --     makeItem ""
+  --       >>= loadAndApplyTemplate "templates/tag.html" ctx
+  --       >>= loadAndApplyTemplate "templates/default.html" ctx
+  --       >>= relativizeUrls
+
+  -- create ["tags.html"] $ do
+  --   route cleanRoute
+  --   compile $ do
+  --     makeItem ""
+  --       >>= loadAndApplyTemplate "templates/tags.html" (defaultCtxWithTags tags)
+  --       >>= loadAndApplyTemplate "templates/default.html" (defaultCtxWithTags tags)
+
+  -- match "posts/*" $ do
+  --   route cleanRoute
+  --   compile $ do
+  --     tocCtx <- getTocCtx (postCtxWithTags tags)
+  --     chaoDocCompiler
+  --       >>= loadAndApplyTemplate "templates/post.html" tocCtx
+  --       >>= loadAndApplyTemplate "templates/default.html" tocCtx
+  --       >>= relativizeUrls
+  -- --    >>= katexFilter
+
+  match "notes/*" $ do
     route cleanRoute
     compile $ do
-      notes <- loadNoteLinks
+      tocCtx <- getTocCtx defaultContext
-      tocCtx <- getTocCtx $ listField "notes" defaultContext (return notes) <> defaultContext
       chaoDocCompiler
         >>= loadAndApplyTemplate "templates/note.html" tocCtx
         >>= relativizeUrls
-        >>= cleanIndexHtmls
 
   create ["index.html"] $ do
     route idRoute
     compile $ do
-      notes <- loadNoteLinks
+      notes <- sortOn (toFilePath . itemIdentifier) <$> loadAll "notes/*"
       let notesCtx =
-            listField "notes" defaultContext (return notes)
+            listField "posts" defaultContext (return notes)
               `mappend` constField "title" "Notes"
               `mappend` defaultContext
       makeItem ""
@@ -435,28 +122,103 @@ siteRules = do
         >>= relativizeUrls
         >>= cleanIndexHtmls
 
+  -- create ["archive.html"] $ do
+  --   route cleanRoute
+  --   compile $ do
+  --     posts <- recentFirst =<< loadAll "posts/*"
+  --     let archiveCtx =
+  --           listField "posts" postCtx (return posts)
+  --             `mappend` constField "title" "Archives"
+  --             `mappend` defaultContext
+  --     makeItem ""
+  --       >>= loadAndApplyTemplate "templates/archive.html" archiveCtx
+  --       >>= loadAndApplyTemplate "templates/index.html" archiveCtx
+  --       >>= relativizeUrls
+  --       >>= cleanIndexHtmls
+
+  -- create ["draft.html"] $ do
+  --   route cleanRoute
+  --   compile $ do
+  --     posts <- recentFirst =<< loadAll "posts/*"
+  --     let draftCtx =
+  --           listField "posts" postCtx (return posts)
+  --             `mappend` constField "title" "Drafts"
+  --             `mappend` defaultContext
+  --     makeItem ""
+  --       >>= loadAndApplyTemplate "templates/draft.html" draftCtx
+  --       >>= loadAndApplyTemplate "templates/index.html" draftCtx
+  --       >>= relativizeUrls
+  --       >>= cleanIndexHtmls
+
+  -- match "index.html" $ do
+  --   route idRoute
+  --   compile $ do
+  --     posts <- fmap (take 25) . recentFirst =<< loadAll "posts/*"
+  --     let indexCtx =
+  --           listField "posts" postCtx (return posts)
+  --             `mappend` defaultContext
+  --     getResourceBody
+  --       >>= applyAsTemplate indexCtx
+  --       >>= loadAndApplyTemplate "templates/index.html" indexCtx
+  --       >>= relativizeUrls
+  --       >>= cleanIndexHtmls
+
   match "templates/*" $ compile templateBodyCompiler
 
-main :: IO ()
+-- https://robertwpearce.com/hakyll-pt-2-generating-a-sitemap-xml-file.html
-main = do
+-- create ["sitemap.xml"] $ do
-  rawArgs <- getArgs
+--   route idRoute
-  parseResult <-
+--   compile $ do
-    case parseCliArgs rawArgs of
+--     posts <- recentFirst =<< loadAll "posts/*"
-      Left err -> die err
+--     singlePages <- loadAll (fromList ["about.md"])
-      Right result -> pure result
+--     let pages = posts <> singlePages
-  case parseResult of
+--         sitemapCtx =
-    ShowHelp -> putStrLn helpText >> exitSuccess
+--           constField "root" root
-    Parsed cliOptions hakyllArgs -> do
+--             <> listField "pages" postCtx (return pages) -- here
-      resolved <- resolveCliOptions cliOptions
+--     makeItem ""
-      createDirectoryIfMissing True (resolvedStoreDir resolved)
+--       >>= loadAndApplyTemplate "templates/sitemap.xml" sitemapCtx
-      createDirectoryIfMissing True (resolvedTmpDir resolved)
-      withSystemTempDirectory "hakysidian-stage" \stageRoot -> do
-        prepareStageRoot resolved stageRoot
-        withCurrentDirectory stageRoot $
-          withArgs hakyllArgs $
-            hakyllWith (config resolved) siteRules
 
 --------------------------------------------------------------------------------
+
+-- isZhField :: Context String
+-- isZhField = boolFieldM "isZh" isZh
+--   where
+--     isZh :: Item String -> Compiler Bool
+--     isZh item = do
+--       maybeLang <- getMetadataField (itemIdentifier item) "lang"
+--       return (maybeLang == Just "zh")
+
+-- postCtx :: Context String
+-- postCtx =
+--   dateField "date" "%B %e, %Y"
+--     <> dateField "date" "%Y-%m-%d"
+--     <> isZhField
+--     <> defaultContext
+
+-- postCtxWithTags :: Tags -> Context String
+-- postCtxWithTags tags = tagsField "tags" tags `mappend` postCtx
+
+-- defaultCtxWithTags :: Tags -> Context String
+-- defaultCtxWithTags tags = listField "tags" tagsCtx getAllTags <> defaultContext
+--   where
+--     getAllTags :: Compiler [Item (String, [Identifier])]
+--     getAllTags = pure . map mkItem $ tagsMap tags
+--       where
+--         mkItem :: (String, [Identifier]) -> Item (String, [Identifier])
+--         mkItem x@(t, _) = Item (tagsMakeId tags t) x
+--     tagsCtx =
+--       listFieldWith "posts" (postCtxWithTags tags) getPosts
+--         <> metadataField
+--         <> urlField "url"
+--         <> pathField "path"
+--         <> titleField "title"
+--         <> missingField
+--       where
+--         getPosts ::
+--           Item (String, [Identifier]) ->
+--           Compiler [Item String]
+--         getPosts (itemBody -> (_, is)) = mapM load is
+
 -- toc from https://github.com/slotThe/slotThe.github.io
 getTocCtx :: Context a -> Compiler (Context a)
 getTocCtx ctx = do

templates/note.html

@@ -10,12 +10,12 @@ $partial("templates/head.html")$
         <!-- A table of contents on the left side, but only for screens
                 that are big enough -->
         <div id="contents-big">
-            <p class="mini-header">Notes <a id="up-arrow" href="/">←</a></p>
+            <p class="mini-header"> <a href="#">Contents</a></p>
-            $partial("templates/notes-list.html")$
+            <div class="toc-scroll">
-            <p class="mini-header">Contents <a id="up-arrow" href="#">↑</a></p>
                 $toc$
             </div>
         </div>
+    </div>
     <div class="text-space">
         <main role="main">
             <h1 class="pagetitle">$title$</h1>

templates/notes-list.html

@@ -1,7 +0,0 @@
-<ul class="notes-list">
-    $for(notes)$
-    <li>
-        <a href="$url$">$title$</a>
-    </li>
-    $endfor$
-</ul>

templates/notes.html

@@ -1,2 +1,8 @@
 <h1 class="pagetitle">$title$</h1>
-$partial("templates/notes-list.html")$
+<ul>
+    $for(posts)$
+    <li>
+        <a href="$url$">$title$</a>
+    </li>
+    $endfor$
+</ul>