From ebada0773fd93dac5648ab7209ac67a208007d74 Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Tue, 15 Aug 2023 15:30:17 +0200
Subject: Don’t use --jsdom and don’t run in parallel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gen-fonts | 74 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/gen-fonts b/gen-fonts
index 81716ed..6c85422 100755
--- a/gen-fonts
+++ b/gen-fonts
@@ -5,46 +5,40 @@
 make
 mkdir -p fonts
 
-{
-	uni1=`find out -name '*.html' | xargs glyphhanger \
-		--cssSelector=':not(code, pre, kbd, samp)' \
-		--jsdom`
+uni=`find out -name '*.html' | xargs glyphhanger \
+	--cssSelector=':not(code, pre, kbd, samp)'`
 
-	pyftsubset /usr/share/fonts/WOFF2/Vollkorn-Regular.woff2 \
-		--output-file=fonts/vollkorn-regular.woff2 \
-		--flavor=woff2 \
-		--layout-features-=locl \
-		--unicodes="$uni1" \
-		--no-hinting \
-		--desubroutinize
-	pyftsubset /usr/share/fonts/WOFF2/Vollkorn-Italic.woff2 \
-		--output-file=fonts/vollkorn-italic.woff2 \
-		--flavor=woff2 \
-		--layout-features-=locl \
-		--unicodes="$uni1" \
-		--no-hinting \
-		--desubroutinize
-} &
+pyftsubset /usr/share/fonts/WOFF2/Vollkorn-Regular.woff2 \
+	--output-file=fonts/vollkorn-regular.woff2 \
+	--flavor=woff2 \
+	--layout-features-=locl \
+	--layout-features+=lnum \
+	--unicodes="$uni" \
+	--no-hinting \
+	--desubroutinize
+pyftsubset /usr/share/fonts/WOFF2/Vollkorn-Italic.woff2 \
+	--output-file=fonts/vollkorn-italic.woff2 \
+	--flavor=woff2 \
+	--layout-features-=locl \
+	--layout-features+=lnum \
+	--unicodes="$uni" \
+	--no-hinting \
+	--desubroutinize
 
-{
-	uni2=`find out -name '*.html' | xargs glyphhanger \
-		--cssSelector='code, pre, kbd, samp' \
-		--jsdom`
+uni=`find out -name '*.html' | xargs glyphhanger \
+	--cssSelector='code, pre, kbd, samp, :where(code, pre, kbd, samp) *'`
 
-	pyftsubset /usr/share/fonts/iosevka-smooth/woff2-unhinted/iosevka-smooth-regular.woff2 \
-		--output-file=fonts/iosevka-regular.woff2 \
-		--flavor=woff2 \
-		--layout-features-=locl \
-		--unicodes="$uni2" \
-		--no-hinting \
-		--desubroutinize
-	pyftsubset /usr/share/fonts/iosevka-smooth/woff2-unhinted/iosevka-smooth-italic.woff2 \
-		--output-file=fonts/iosevka-italic.woff2 \
-		--flavor=woff2 \
-		--layout-features-=locl \
-		--unicodes="$uni2" \
-		--no-hinting \
-		--desubroutinize
-} &
-
-wait
+pyftsubset /usr/share/fonts/iosevka-smooth/woff2-unhinted/iosevka-smooth-regular.woff2 \
+	--output-file=fonts/iosevka-regular.woff2 \
+	--flavor=woff2 \
+	--layout-features-=locl \
+	--unicodes="$uni" \
+	--no-hinting \
+	--desubroutinize
+pyftsubset /usr/share/fonts/iosevka-smooth/woff2-unhinted/iosevka-smooth-italic.woff2 \
+	--output-file=fonts/iosevka-italic.woff2 \
+	--flavor=woff2 \
+	--layout-features-=locl \
+	--unicodes="$uni" \
+	--no-hinting \
+	--desubroutinize
-- 
cgit v1.2.3