From f33373d4a0cee7468a9a0cc2872c69d0bbd76239 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 16 Oct 2023 00:43:03 -0400
Subject: [PATCH] Makefile.am: use scour to optimize the SVG as part of the
 build

And since scour can also strip the XML prologue, there's no longer any
need for xmllint (or the corresponding build step).
---
 Makefile.am | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2a9341d..0bfed50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,34 @@
 EXTRA_DIST = doc src
 
-# Strip the XML prologue from an Inkscape document to produce
-# something that can be included directly into an HTML5 document.
+# List of element IDs that we use in the HTML document.
+PRECIOUS_IDS =  \
+  bus           \
+  city          \
+  citycopy      \
+  clouds        \
+  cloudscopy    \
+  train         \
+  tram          \
+  trees         \
+  treescopy     \
+  serviceletter \
+  servicename   \
+  sky           \
+  ticketdate    \
+  tickettime
+
+# Optimize our SVG, and remove its XML prologue so that it can be
+# included directly into the HTML document.
 day.svg: src/day.svg
-	@XMLLINT@ -xpath "/*" $< > $@
+	@SCOUR@ --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \
+                --enable-id-stripping \
+                --enable-comment-stripping \
+                --remove-descriptive-elements \
+                --no-renderer-workaround \
+                --strip-xml-prolog \
+                --no-line-breaks \
+                --error-on-flowtext \
+                $< > $@
 
 # Base64-encode a woff2 (web open font format 2.0) file. We use this
 # to embed fonts directly into the CSS that requires them.
-- 
2.44.2