X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile.am;h=f295689d08dedf63b67e17a3a6483b7d2bc80741;hb=bae824127a57ff0d08b44814fe862ab430893bbf;hp=2a9341d519b280916170991df746da1e26ef16f1;hpb=cbd1fd189b26016347334c3361bcf79da153cb05;p=charm-bypass.git

diff --git a/Makefile.am b/Makefile.am
index 2a9341d..f295689 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,46 @@
 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           \
+  ticket        \
+  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.
-CharmBypass-Regular.base64: src/CharmBypass-Regular.woff2
-	@BASE64@ -w0 $< > $@
-CharmBypass-Bold.base64: src/CharmBypass-Bold.woff2
+.woff2.base64:
 	@BASE64@ -w0 $< > $@
 
 # Build index.html by substituting the contents of a few (single
-# line!) files into @PLACEHOLDERS@ within src/index.html.in. If you
+# line!) files into @PLACEHOLDERS@ within index.html.in. If you
 # put tildes in src/day.svg this will probably break, so please don't
 # do that.
-index.html: src/index.html.in day.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
+index.html: index.html.in day.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
 	sed -e "s~@CBPREGULAR@~$$(cat CharmBypass-Regular.base64)~" \
             -e "s~@CBPBOLD@~$$(cat CharmBypass-Bold.base64)~" \
             -e "s~@SVGDATA@~$$(cat day.svg)~" \