et-book font

4 files changed, 16 insertions, 18 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c1ea0b4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/fonts/et-book"]
+	path = assets/fonts/et-book
+	url = https://github.com/edwardtufte/et-book.git
diff --git a/assets/aoidh.css b/assets/aoidh.css
index ddc6ee4..188ffce 100644
--- a/assets/aoidh.css
+++ b/assets/aoidh.css
@@ -28,8 +28,7 @@ body {
 }
 
 body {
-  font-family: 'IBM Plex Serif', Charter, 'Bitstream Charter', 'Sitka Text', serif;
-  font-weight: 400;
+  font-family: et-book, Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif;
   line-height: 1.3em;
   text-rendering: optimizeLegibility;
   color: #000;
@@ -71,14 +70,9 @@ nav a {
 }
 
 li.nav-active a {
-  font-weight: 600;
   box-shadow: .2rem .2rem var(--dark-yellow);
 }
 
-li.nav-ancestor a {
-  font-weight: 600;
-}
-
 nav a:active {
   box-shadow: 0 0;
   text-decoration: none;
@@ -93,7 +87,6 @@ p {
 }
 
 a {
-  font-weight: 450;
   text-decoration: none;
   border: 1px solid transparent;
 }
@@ -117,17 +110,14 @@ a:active {
 
 h1 {
   font-size: 1.15rem;
-  font-weight: 700
 }
 
 h2 {
   font-size: 1.10rem;
-  font-weight: 600;
 }
 
 h3 {
   font-size: 1.05rem;
-  font-weight: 500;
 }
 
 h1, h2, h3 {
@@ -157,10 +147,6 @@ th, td {
   vertical-align: middle;
 }
 
-th, th * {
-  font-weight: 500;
-}
-
 footer {
   margin-top: 2rem;
 }
diff --git a/assets/fonts/et-book b/assets/fonts/et-book
new file mode 160000
+Subproject 24d3a3bbfc880095d3df2b9e9d60d05819138e8
diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html
index 2720637..463dabb 100644
--- a/layouts/_partials/head.html
+++ b/layouts/_partials/head.html
@@ -1,6 +1,15 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title>
-{{- with resources.Get "aoidh.css" | minify }}
-  <link rel="stylesheet" href="{{ .RelPermalink }}">
-{{- end }}
+
+{{ range slice "aoidh.css" "fonts/et-book/et-book.css" }}
+	{{- with resources.Get . }}<link rel="stylesheet" href="{{ .RelPermalink }}">{{ end }}
+{{ end }}
+
+{{- range $style := slice "roman-line-figures" "display-italic-old-style-figures" "bold-line-figures" }}
+	{{- range $fmt := slice "eot" "woff" "ttf" "svg" }}
+		{{- $font := printf "fonts/et-book/et-book/et-book-%s/et-book-%s.%s" $style $style $fmt }}
+		{{- with resources.Get $font }}{{ .Publish }}
+		{{- else }}{{ errorf "font not found: %s" $font }}{{ end }}
+	{{- end -}}
+{{- end -}}