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).

diff --git a/Makefile.am b/Makefile.am
index 2a9341d519b280916170991df746da1e26ef16f1..0bfed50bdcf372d3b0302070dcf6613c103db864 100644 (file)
--- 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.