]> gitweb.michael.orlitzky.com - charm-bypass.git/commitdiff
Makefile.am,src: replace the existing ticket font with two new ones
authorMichael Orlitzky <michael@orlitzky.com>
Sat, 14 Oct 2023 03:23:52 +0000 (23:23 -0400)
committerMichael Orlitzky <michael@orlitzky.com>
Sat, 14 Oct 2023 03:30:26 +0000 (23:30 -0400)
Using separate regular and bold fonts on the ticket lets us more
accurately mimic the official app. For example, the "service letter"
looks a lot better in bold. This commit replaces tickettext.woff2 by
CharmBypass-Regular.woff2 and CharmBypass-Bold.woff2.

Makefile.am
src/CharmBypass-Bold.woff2 [new file with mode: 0644]
src/CharmBypass-Regular.woff2 [new file with mode: 0644]
src/index.html.in
src/tickettext.woff2 [deleted file]

index 5b92388fffc9ded1536a5303c1e2edf013ea6a2c..2a9341d519b280916170991df746da1e26ef16f1 100644 (file)
@@ -7,15 +7,18 @@ day.svg: src/day.svg
 
 # Base64-encode a woff2 (web open font format 2.0) file. We use this
 # to embed fonts directly into the CSS that requires them.
-tickettext.base64: src/tickettext.woff2
+CharmBypass-Regular.base64: src/CharmBypass-Regular.woff2
+       @BASE64@ -w0 $< > $@
+CharmBypass-Bold.base64: src/CharmBypass-Bold.woff2
        @BASE64@ -w0 $< > $@
 
 # Build index.html by substituting the contents of a few (single
 # line!) files into @PLACEHOLDERS@ within src/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 tickettext.base64
-       sed -e "s~@TICKETFONT@~$$(cat tickettext.base64)~" \
+index.html: src/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)~" \
             $< > $@
 
@@ -25,4 +28,4 @@ dist_pkgdata_DATA = index.html
 
 # Automake doesn't understand our wacky build process so we have to
 # tell it which files are produced by running "make"
-CLEANFILES = $(dist_pkgdata_DATA) tickettext.base64 day.svg
+CLEANFILES = $(dist_pkgdata_DATA) CharmBypass-Regular.base64 CharmBypass-Bold.base64 day.svg
diff --git a/src/CharmBypass-Bold.woff2 b/src/CharmBypass-Bold.woff2
new file mode 100644 (file)
index 0000000..6dc10b5
Binary files /dev/null and b/src/CharmBypass-Bold.woff2 differ
diff --git a/src/CharmBypass-Regular.woff2 b/src/CharmBypass-Regular.woff2
new file mode 100644 (file)
index 0000000..dd5c99e
Binary files /dev/null and b/src/CharmBypass-Regular.woff2 differ
index 755f54020592ab630097dcaa7e4973f8aa47020d..8d19568f74c3664f8d3dead6a39bb6f60be26053 100644 (file)
       /* Define, load, and specify the custom font we use for the ticket
        * date, time, and service name. */
       @font-face {
-       font-family: "CharmBypass Ticket Text";
+       font-family: "CharmBypass Regular";
        src:
-         url("data:font/woff2;base64,@TICKETFONT@") format("woff2")
+         url("data:font/woff2;base64,@CBPREGULAR@") format("woff2")
       }
 
       #servicename, #tickettime, #ticketdate {
-        font-family: "CharmBypass Ticket Text" !important;
+        font-family: "CharmBypass Regular";
+      }
+
+      @font-face {
+       font-family: "CharmBypass Bold";
+       src:
+         url("data:font/woff2;base64,@CBPBOLD@") format("woff2")
+      }
+
+      #serviceletter {
+       font-family: "CharmBypass Bold";
       }
 
       /************************/
diff --git a/src/tickettext.woff2 b/src/tickettext.woff2
deleted file mode 100644 (file)
index 105d9ad..0000000
Binary files a/src/tickettext.woff2 and /dev/null differ