index.html.in: use "*" instead of "+" for input pattern validation

[charm-bypass.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc3c9ab2b0f13d05d1ebcff5ec1ad41e5ac15364..3e7137122ee10895ea5f435799ebba439adc9f98 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,16 +13,21 @@ PRECIOUS_IDS =  \
   tram          \
   trees         \
   treescopy     \
-  serviceletter \
+  serviceid     \
   servicename   \
   sky           \
   ticket        \
   ticketdate    \
   tickettime
 
-# Optimize our SVG, and remove its XML prologue so that it can be
-# included directly into the HTML document.
-tableau.min.svg: tableau.svg
+# Optimize our SVG once using XSL, to catch a few things
+# that "scour" misses.
+tableau.min.svg: tableau.svg svgclean.xsl
+       @XSLTPROC@ svgclean.xsl $< > $@
+
+# Optimize our SVG again, and remove its XML prologue so that it can
+# be included directly into the HTML document.
+tableau.min.min.svg: tableau.min.svg
        @SCOUR@ --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \
                 --enable-id-stripping \
                 --enable-comment-stripping \
@@ -35,7 +40,7 @@ tableau.min.svg: tableau.svg
 
 # Use FontForge to convert the sfd source files to woff2.
 .sfd.woff2:
-       @FONTFORGE@ -script sfd2woff $<
+       @FONTFORGE@ -script sfd2woff.ff $<
 
 # Base64-encode a woff2 (web open font format 2.0) file. We use this
 # to embed fonts directly into the CSS that requires them.
@@ -46,10 +51,10 @@ tableau.min.svg: tableau.svg
 # line!) files into @PLACEHOLDERS@ within index.html.in. If you put
 # tildes in tableau.svg this will probably break, so please don't do
 # that.
-index.html: index.html.in tableau.min.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
+index.html: index.html.in tableau.min.min.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 tableau.min.svg)~" \
+            -e "s~@SVGDATA@~$$(cat tableau.min.min.svg)~" \
             $< > $@
 
 # If you really want to, we support installing index.html
@@ -61,4 +66,5 @@ dist_pkgdata_DATA = index.html
 CLEANFILES = $(dist_pkgdata_DATA) \
              CharmBypass-Regular.base64 \
              CharmBypass-Bold.base64 \
-             tableau.min.svg
+             tableau.min.svg \
+             tableau.min.min.svg