fonts: Provide Prompt in WOFF2 format as well

Fixes: #13525
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 4ad4d8b5665d2aa745686497f9b33c4c6cda1b4f..a292276e5f166ea3148dc8deaca7533d7c71e343 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -937,7 +937,6 @@ dist_static_fonts_DATA = \
        src/static/fonts/prompt/Prompt-BlackItalic.ttf \
        src/static/fonts/prompt/Prompt-Bold.ttf \
        src/static/fonts/prompt/Prompt-BoldItalic.ttf \
-       src/static/fonts/prompt/Prompt-Bold.ttf \
        src/static/fonts/prompt/Prompt-ExtraBold.ttf \
        src/static/fonts/prompt/Prompt-ExtraBoldItalic.ttf \
        src/static/fonts/prompt/Prompt-ExtraLight.ttf \
@@ -965,6 +964,26 @@ dist_static_fonts_DATA = \
        src/payment-font/fonts/paymentfont-webfont.ttf \
        src/payment-font/fonts/paymentfont-webfont.woff
 
+static_fonts_DATA = \
+       src/static/fonts/prompt/Prompt-Black.woff2 \
+       src/static/fonts/prompt/Prompt-BlackItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Bold.woff2 \
+       src/static/fonts/prompt/Prompt-BoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraBold.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraBoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraLight.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraLightItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Italic.woff2 \
+       src/static/fonts/prompt/Prompt-Light.woff2 \
+       src/static/fonts/prompt/Prompt-LightItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Medium.woff2 \
+       src/static/fonts/prompt/Prompt-MediumItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Regular.woff2 \
+       src/static/fonts/prompt/Prompt-SemiBold.woff2 \
+       src/static/fonts/prompt/Prompt-SemiBoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Thin.woff2 \
+       src/static/fonts/prompt/Prompt-ThinItalic.woff2
+
 static_fontsdir = $(staticdir)/fonts
 
 EXTRA_DIST += \
@@ -972,6 +991,9 @@ EXTRA_DIST += \
        src/static/fonts/prompt/METADATA.pb \
        src/static/fonts/prompt/OFL.txt
 
+CLEANFILES += \
+       $(static_fonts_DATA)
+
 static_img_DATA = \
        src/static/img/apple-touch-icon-192x192-precomposed.png \
        src/static/img/apple-touch-icon-180x180-precomposed.png \
@@ -1166,6 +1188,12 @@ src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(CONVERT) -units PixelsPerInch $< -resize 600x -strip -quality 85 $@
 
+# Fonts
+
+%.woff2: %.ttf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(WOFF2_COMPRESS) $^ >/dev/null
+
 # Video Stuff
 
 # Multi-threading options for faster encoding

diff --git a/configure.ac b/configure.ac
index 2ffe53087f4ad0130cb446f26876074bc1fdc3fd..17ef12942811dd93e3b82d0bb49a68c0765dcb50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,12 @@ if test -z "${JEKYLL}"; then
        AC_MSG_ERROR([jekyll is required])
 fi
 
+# WOFF2
+AC_CHECK_PROG(WOFF2_COMPRESS, [woff2_compress], [woff2_compress])
+if test -z "${WOFF2_COMPRESS}"; then
+       AC_MSG_ERROR([woff2_compress is required])
+fi
+
 # ------------------------------------------------------------------------------
 
 AC_ARG_WITH([systemd],

diff --git a/src/sass/_fonts.sass b/src/sass/_fonts.sass
index 83072cb502c8f8020c5a5338fda6e415c72b6961..a7dc361d3f120ce5eed58506d95355363bc59709 100644 (file)
--- a/src/sass/_fonts.sass
+++ b/src/sass/_fonts.sass
@@ -5,7 +5,7 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: "Prompt"
        font-style: normal
        font-weight: 400
-       src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype")
+       src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype")
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 /* latin */
@@ -13,7 +13,7 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: "Prompt"
        font-style: normal
        font-weight: 400
-       src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype")
+       src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype")
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
 
 /* latin-ext */
@@ -21,7 +21,7 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: 'Prompt'
        font-style: normal
        font-weight: 500
-       src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype")
+       src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype")
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 /* latin */
@@ -29,7 +29,7 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: 'Prompt'
        font-style: normal
        font-weight: 500
-       src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype")
+       src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype")
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
 
 /* latin-ext */
@@ -37,7 +37,7 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: "Prompt"
        font-style: normal
        font-weight: 700
-       src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype")
+       src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype")
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 /* latin */
@@ -45,5 +45,5 @@ $fonts-baseurl: "/static/fonts" !default
        font-family: "Prompt"
        font-style: normal
        font-weight: 700
-       src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype")
+       src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.woff2) format("woff2"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype")
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD