diff --git a/.github/workflows/fonts.yml b/.github/workflows/fonts.yml index d08b4062..8cb33a29 100644 --- a/.github/workflows/fonts.yml +++ b/.github/workflows/fonts.yml @@ -97,13 +97,11 @@ jobs: - name: Build fonts run: | - export SOURCE_DATE_EPOCH=$(git log -1 --format=%ct -- src/fonts) make -C src/fonts all rm -f fonts/*.* cp src/fonts/ttf/*.ttf fonts cp src/fonts/woff/*.woff fonts cp src/fonts/woff2/*.woff2 fonts - echo $SOURCE_DATE_EPOCH > fonts/VERSION - name: Build metrics run: ./dockers/fonts/buildMetrics.sh diff --git a/dockers/fonts/buildFonts.sh b/dockers/fonts/buildFonts.sh index a91602fb..2031c514 100755 --- a/dockers/fonts/buildFonts.sh +++ b/dockers/fonts/buildFonts.sh @@ -40,7 +40,6 @@ cleanup() { CONTAINER= trap cleanup EXIT -LAST_COMMIT_DATE="$(git log -1 --format=%ct -- src/fonts)" IMAGE="katex/fonts:DF-$(openssl sha1 dockers/fonts/Dockerfile | tail -c 9)" TMPFILE="$(mktemp "${TMPDIR:-/tmp}/mjf.XXXXXXXX")" FILE="$TMPFILE" @@ -59,7 +58,6 @@ if [[ $(docker images "$IMAGE" | wc -l) -lt 2 ]]; then fi CMDS="set -ex -export SOURCE_DATE_EPOCH=${LAST_COMMIT_DATE} tar xfP katex-fonts.tar.gz make -C fonts all tar cf /fonts.tar ${filetypes[*]/#/fonts/}" @@ -84,5 +82,3 @@ for filetype in "${filetypes[@]}"; do done done rm -rf temp fonts.tar - -echo $LAST_COMMIT_DATE > fonts/VERSION diff --git a/fonts/KaTeX_AMS-Regular.ttf b/fonts/KaTeX_AMS-Regular.ttf index 31b8d8d1..c6f9a5e7 100644 Binary files a/fonts/KaTeX_AMS-Regular.ttf and b/fonts/KaTeX_AMS-Regular.ttf differ diff --git a/fonts/KaTeX_AMS-Regular.woff b/fonts/KaTeX_AMS-Regular.woff index 13000fc5..b804d7b3 100644 Binary files a/fonts/KaTeX_AMS-Regular.woff and b/fonts/KaTeX_AMS-Regular.woff differ diff --git a/fonts/KaTeX_AMS-Regular.woff2 b/fonts/KaTeX_AMS-Regular.woff2 index 378b7981..0acaaff0 100644 Binary files a/fonts/KaTeX_AMS-Regular.woff2 and b/fonts/KaTeX_AMS-Regular.woff2 differ diff --git a/fonts/KaTeX_Caligraphic-Bold.ttf b/fonts/KaTeX_Caligraphic-Bold.ttf index b3e756c1..9ff4a5e0 100644 Binary files a/fonts/KaTeX_Caligraphic-Bold.ttf and b/fonts/KaTeX_Caligraphic-Bold.ttf differ diff --git a/fonts/KaTeX_Caligraphic-Bold.woff b/fonts/KaTeX_Caligraphic-Bold.woff index cf82f36e..9759710d 100644 Binary files a/fonts/KaTeX_Caligraphic-Bold.woff and b/fonts/KaTeX_Caligraphic-Bold.woff differ diff --git a/fonts/KaTeX_Caligraphic-Bold.woff2 b/fonts/KaTeX_Caligraphic-Bold.woff2 index 6e9d50df..f390922e 100644 Binary files a/fonts/KaTeX_Caligraphic-Bold.woff2 and b/fonts/KaTeX_Caligraphic-Bold.woff2 differ diff --git a/fonts/KaTeX_Caligraphic-Regular.ttf b/fonts/KaTeX_Caligraphic-Regular.ttf index a8cdd0e9..f522294f 100644 Binary files a/fonts/KaTeX_Caligraphic-Regular.ttf and b/fonts/KaTeX_Caligraphic-Regular.ttf differ diff --git a/fonts/KaTeX_Caligraphic-Regular.woff b/fonts/KaTeX_Caligraphic-Regular.woff index 24f3b7bc..9bdd534f 100644 Binary files a/fonts/KaTeX_Caligraphic-Regular.woff and b/fonts/KaTeX_Caligraphic-Regular.woff differ diff --git a/fonts/KaTeX_Caligraphic-Regular.woff2 b/fonts/KaTeX_Caligraphic-Regular.woff2 index 0bcce6fb..75344a1f 100644 Binary files a/fonts/KaTeX_Caligraphic-Regular.woff2 and b/fonts/KaTeX_Caligraphic-Regular.woff2 differ diff --git a/fonts/KaTeX_Fraktur-Bold.ttf b/fonts/KaTeX_Fraktur-Bold.ttf index 57cef5cf..4e98259c 100644 Binary files a/fonts/KaTeX_Fraktur-Bold.ttf and b/fonts/KaTeX_Fraktur-Bold.ttf differ diff --git a/fonts/KaTeX_Fraktur-Bold.woff b/fonts/KaTeX_Fraktur-Bold.woff index 56aeb692..e7730f66 100644 Binary files a/fonts/KaTeX_Fraktur-Bold.woff and b/fonts/KaTeX_Fraktur-Bold.woff differ diff --git a/fonts/KaTeX_Fraktur-Bold.woff2 b/fonts/KaTeX_Fraktur-Bold.woff2 index e4ad521a..395f28be 100644 Binary files a/fonts/KaTeX_Fraktur-Bold.woff2 and b/fonts/KaTeX_Fraktur-Bold.woff2 differ diff --git a/fonts/KaTeX_Fraktur-Regular.ttf b/fonts/KaTeX_Fraktur-Regular.ttf index 1793994b..b8461b27 100644 Binary files a/fonts/KaTeX_Fraktur-Regular.ttf and b/fonts/KaTeX_Fraktur-Regular.ttf differ diff --git a/fonts/KaTeX_Fraktur-Regular.woff b/fonts/KaTeX_Fraktur-Regular.woff index 2e15d01d..acab069f 100644 Binary files a/fonts/KaTeX_Fraktur-Regular.woff and b/fonts/KaTeX_Fraktur-Regular.woff differ diff --git a/fonts/KaTeX_Fraktur-Regular.woff2 b/fonts/KaTeX_Fraktur-Regular.woff2 index f481b143..735f6948 100644 Binary files a/fonts/KaTeX_Fraktur-Regular.woff2 and b/fonts/KaTeX_Fraktur-Regular.woff2 differ diff --git a/fonts/KaTeX_Main-Bold.ttf b/fonts/KaTeX_Main-Bold.ttf index e657894e..f33a98da 100644 Binary files a/fonts/KaTeX_Main-Bold.ttf and b/fonts/KaTeX_Main-Bold.ttf differ diff --git a/fonts/KaTeX_Main-Bold.woff b/fonts/KaTeX_Main-Bold.woff index 495fc439..d921b95b 100644 Binary files a/fonts/KaTeX_Main-Bold.woff and b/fonts/KaTeX_Main-Bold.woff differ diff --git a/fonts/KaTeX_Main-Bold.woff2 b/fonts/KaTeX_Main-Bold.woff2 index cdb9ecc3..05496c9e 100644 Binary files a/fonts/KaTeX_Main-Bold.woff2 and b/fonts/KaTeX_Main-Bold.woff2 differ diff --git a/fonts/KaTeX_Main-BoldItalic.ttf b/fonts/KaTeX_Main-BoldItalic.ttf index c11cde76..dc007977 100644 Binary files a/fonts/KaTeX_Main-BoldItalic.ttf and b/fonts/KaTeX_Main-BoldItalic.ttf differ diff --git a/fonts/KaTeX_Main-BoldItalic.woff b/fonts/KaTeX_Main-BoldItalic.woff index 121e242e..67807b0b 100644 Binary files a/fonts/KaTeX_Main-BoldItalic.woff and b/fonts/KaTeX_Main-BoldItalic.woff differ diff --git a/fonts/KaTeX_Main-BoldItalic.woff2 b/fonts/KaTeX_Main-BoldItalic.woff2 index 42171ecf..5931794d 100644 Binary files a/fonts/KaTeX_Main-BoldItalic.woff2 and b/fonts/KaTeX_Main-BoldItalic.woff2 differ diff --git a/fonts/KaTeX_Main-Italic.ttf b/fonts/KaTeX_Main-Italic.ttf index 2f270de3..0e9b0f35 100644 Binary files a/fonts/KaTeX_Main-Italic.ttf and b/fonts/KaTeX_Main-Italic.ttf differ diff --git a/fonts/KaTeX_Main-Italic.woff b/fonts/KaTeX_Main-Italic.woff index c6693779..6f43b594 100644 Binary files a/fonts/KaTeX_Main-Italic.woff and b/fonts/KaTeX_Main-Italic.woff differ diff --git a/fonts/KaTeX_Main-Italic.woff2 b/fonts/KaTeX_Main-Italic.woff2 index e89824d6..b50920e1 100644 Binary files a/fonts/KaTeX_Main-Italic.woff2 and b/fonts/KaTeX_Main-Italic.woff2 differ diff --git a/fonts/KaTeX_Main-Regular.ttf b/fonts/KaTeX_Main-Regular.ttf index 741db9cc..c9076b7d 100644 Binary files a/fonts/KaTeX_Main-Regular.ttf and b/fonts/KaTeX_Main-Regular.ttf differ diff --git a/fonts/KaTeX_Main-Regular.woff b/fonts/KaTeX_Main-Regular.woff index 4c8de9eb..a8e80dfb 100644 Binary files a/fonts/KaTeX_Main-Regular.woff and b/fonts/KaTeX_Main-Regular.woff differ diff --git a/fonts/KaTeX_Main-Regular.woff2 b/fonts/KaTeX_Main-Regular.woff2 index 2aa480a0..5b15437b 100644 Binary files a/fonts/KaTeX_Main-Regular.woff2 and b/fonts/KaTeX_Main-Regular.woff2 differ diff --git a/fonts/KaTeX_Math-BoldItalic.ttf b/fonts/KaTeX_Math-BoldItalic.ttf index c3a1c3e4..728ce7a1 100644 Binary files a/fonts/KaTeX_Math-BoldItalic.ttf and b/fonts/KaTeX_Math-BoldItalic.ttf differ diff --git a/fonts/KaTeX_Math-BoldItalic.woff b/fonts/KaTeX_Math-BoldItalic.woff index 2c471985..0ae390d7 100644 Binary files a/fonts/KaTeX_Math-BoldItalic.woff and b/fonts/KaTeX_Math-BoldItalic.woff differ diff --git a/fonts/KaTeX_Math-BoldItalic.woff2 b/fonts/KaTeX_Math-BoldItalic.woff2 index 82f609f6..29657023 100644 Binary files a/fonts/KaTeX_Math-BoldItalic.woff2 and b/fonts/KaTeX_Math-BoldItalic.woff2 differ diff --git a/fonts/KaTeX_Math-Italic.ttf b/fonts/KaTeX_Math-Italic.ttf index b58dc885..70d559b4 100644 Binary files a/fonts/KaTeX_Math-Italic.ttf and b/fonts/KaTeX_Math-Italic.ttf differ diff --git a/fonts/KaTeX_Math-Italic.woff b/fonts/KaTeX_Math-Italic.woff index 3ee35dc3..eb5159d4 100644 Binary files a/fonts/KaTeX_Math-Italic.woff and b/fonts/KaTeX_Math-Italic.woff differ diff --git a/fonts/KaTeX_Math-Italic.woff2 b/fonts/KaTeX_Math-Italic.woff2 index a2f36177..215c143f 100644 Binary files a/fonts/KaTeX_Math-Italic.woff2 and b/fonts/KaTeX_Math-Italic.woff2 differ diff --git a/fonts/KaTeX_SansSerif-Bold.ttf b/fonts/KaTeX_SansSerif-Bold.ttf index 68d11eee..2f65a8a3 100644 Binary files a/fonts/KaTeX_SansSerif-Bold.ttf and b/fonts/KaTeX_SansSerif-Bold.ttf differ diff --git a/fonts/KaTeX_SansSerif-Bold.woff b/fonts/KaTeX_SansSerif-Bold.woff index cd6dbb1c..8d47c02d 100644 Binary files a/fonts/KaTeX_SansSerif-Bold.woff and b/fonts/KaTeX_SansSerif-Bold.woff differ diff --git a/fonts/KaTeX_SansSerif-Bold.woff2 b/fonts/KaTeX_SansSerif-Bold.woff2 index c2b93c82..cfaa3bda 100644 Binary files a/fonts/KaTeX_SansSerif-Bold.woff2 and b/fonts/KaTeX_SansSerif-Bold.woff2 differ diff --git a/fonts/KaTeX_SansSerif-Italic.ttf b/fonts/KaTeX_SansSerif-Italic.ttf index 2ea5de4d..d5850df9 100644 Binary files a/fonts/KaTeX_SansSerif-Italic.ttf and b/fonts/KaTeX_SansSerif-Italic.ttf differ diff --git a/fonts/KaTeX_SansSerif-Italic.woff b/fonts/KaTeX_SansSerif-Italic.woff index d0225075..7e02df96 100644 Binary files a/fonts/KaTeX_SansSerif-Italic.woff and b/fonts/KaTeX_SansSerif-Italic.woff differ diff --git a/fonts/KaTeX_SansSerif-Italic.woff2 b/fonts/KaTeX_SansSerif-Italic.woff2 index e890b37c..349c06dc 100644 Binary files a/fonts/KaTeX_SansSerif-Italic.woff2 and b/fonts/KaTeX_SansSerif-Italic.woff2 differ diff --git a/fonts/KaTeX_SansSerif-Regular.ttf b/fonts/KaTeX_SansSerif-Regular.ttf index c2066ca2..537279f6 100644 Binary files a/fonts/KaTeX_SansSerif-Regular.ttf and b/fonts/KaTeX_SansSerif-Regular.ttf differ diff --git a/fonts/KaTeX_SansSerif-Regular.woff b/fonts/KaTeX_SansSerif-Regular.woff index e43b4a22..31b84829 100644 Binary files a/fonts/KaTeX_SansSerif-Regular.woff and b/fonts/KaTeX_SansSerif-Regular.woff differ diff --git a/fonts/KaTeX_SansSerif-Regular.woff2 b/fonts/KaTeX_SansSerif-Regular.woff2 index 51037b4d..a90eea85 100644 Binary files a/fonts/KaTeX_SansSerif-Regular.woff2 and b/fonts/KaTeX_SansSerif-Regular.woff2 differ diff --git a/fonts/KaTeX_Script-Regular.ttf b/fonts/KaTeX_Script-Regular.ttf index 1753e887..fd679bf3 100644 Binary files a/fonts/KaTeX_Script-Regular.ttf and b/fonts/KaTeX_Script-Regular.ttf differ diff --git a/fonts/KaTeX_Script-Regular.woff b/fonts/KaTeX_Script-Regular.woff index 2f8b9796..0e7da821 100644 Binary files a/fonts/KaTeX_Script-Regular.woff and b/fonts/KaTeX_Script-Regular.woff differ diff --git a/fonts/KaTeX_Script-Regular.woff2 b/fonts/KaTeX_Script-Regular.woff2 index e84ca236..b3048fc1 100644 Binary files a/fonts/KaTeX_Script-Regular.woff2 and b/fonts/KaTeX_Script-Regular.woff2 differ diff --git a/fonts/KaTeX_Size1-Regular.ttf b/fonts/KaTeX_Size1-Regular.ttf index 31f438bc..871fd7d1 100644 Binary files a/fonts/KaTeX_Size1-Regular.ttf and b/fonts/KaTeX_Size1-Regular.ttf differ diff --git a/fonts/KaTeX_Size1-Regular.woff b/fonts/KaTeX_Size1-Regular.woff index b0a7bb22..7f292d91 100644 Binary files a/fonts/KaTeX_Size1-Regular.woff and b/fonts/KaTeX_Size1-Regular.woff differ diff --git a/fonts/KaTeX_Size1-Regular.woff2 b/fonts/KaTeX_Size1-Regular.woff2 index f10ebd26..c5a8462f 100644 Binary files a/fonts/KaTeX_Size1-Regular.woff2 and b/fonts/KaTeX_Size1-Regular.woff2 differ diff --git a/fonts/KaTeX_Size2-Regular.ttf b/fonts/KaTeX_Size2-Regular.ttf index 8a309fd3..7a212caf 100644 Binary files a/fonts/KaTeX_Size2-Regular.ttf and b/fonts/KaTeX_Size2-Regular.ttf differ diff --git a/fonts/KaTeX_Size2-Regular.woff b/fonts/KaTeX_Size2-Regular.woff index 79ddf33c..d241d9be 100644 Binary files a/fonts/KaTeX_Size2-Regular.woff and b/fonts/KaTeX_Size2-Regular.woff differ diff --git a/fonts/KaTeX_Size2-Regular.woff2 b/fonts/KaTeX_Size2-Regular.woff2 index 4cddb8ba..e1bccfe2 100644 Binary files a/fonts/KaTeX_Size2-Regular.woff2 and b/fonts/KaTeX_Size2-Regular.woff2 differ diff --git a/fonts/KaTeX_Size3-Regular.ttf b/fonts/KaTeX_Size3-Regular.ttf index 14fe2db1..00bff349 100644 Binary files a/fonts/KaTeX_Size3-Regular.ttf and b/fonts/KaTeX_Size3-Regular.ttf differ diff --git a/fonts/KaTeX_Size3-Regular.woff b/fonts/KaTeX_Size3-Regular.woff index 1ecfff9b..e6e9b658 100644 Binary files a/fonts/KaTeX_Size3-Regular.woff and b/fonts/KaTeX_Size3-Regular.woff differ diff --git a/fonts/KaTeX_Size3-Regular.woff2 b/fonts/KaTeX_Size3-Regular.woff2 index e89276f6..249a2866 100644 Binary files a/fonts/KaTeX_Size3-Regular.woff2 and b/fonts/KaTeX_Size3-Regular.woff2 differ diff --git a/fonts/KaTeX_Size4-Regular.ttf b/fonts/KaTeX_Size4-Regular.ttf index f88f27bb..74f08921 100644 Binary files a/fonts/KaTeX_Size4-Regular.ttf and b/fonts/KaTeX_Size4-Regular.ttf differ diff --git a/fonts/KaTeX_Size4-Regular.woff b/fonts/KaTeX_Size4-Regular.woff index d4223a31..e1ec5457 100644 Binary files a/fonts/KaTeX_Size4-Regular.woff and b/fonts/KaTeX_Size4-Regular.woff differ diff --git a/fonts/KaTeX_Size4-Regular.woff2 b/fonts/KaTeX_Size4-Regular.woff2 index 93c7e827..680c1308 100644 Binary files a/fonts/KaTeX_Size4-Regular.woff2 and b/fonts/KaTeX_Size4-Regular.woff2 differ diff --git a/fonts/KaTeX_Typewriter-Regular.ttf b/fonts/KaTeX_Typewriter-Regular.ttf index 15b7a743..c83252c5 100644 Binary files a/fonts/KaTeX_Typewriter-Regular.ttf and b/fonts/KaTeX_Typewriter-Regular.ttf differ diff --git a/fonts/KaTeX_Typewriter-Regular.woff b/fonts/KaTeX_Typewriter-Regular.woff index d7868263..2432419f 100644 Binary files a/fonts/KaTeX_Typewriter-Regular.woff and b/fonts/KaTeX_Typewriter-Regular.woff differ diff --git a/fonts/KaTeX_Typewriter-Regular.woff2 b/fonts/KaTeX_Typewriter-Regular.woff2 index e2ca86a2..771f1af7 100644 Binary files a/fonts/KaTeX_Typewriter-Regular.woff2 and b/fonts/KaTeX_Typewriter-Regular.woff2 differ diff --git a/fonts/VERSION b/fonts/VERSION deleted file mode 100644 index 41ec1995..00000000 --- a/fonts/VERSION +++ /dev/null @@ -1 +0,0 @@ -1630515774 diff --git a/src/fonts/generate_fonts.py b/src/fonts/generate_fonts.py index de86861f..d606b82d 100755 --- a/src/fonts/generate_fonts.py +++ b/src/fonts/generate_fonts.py @@ -15,13 +15,12 @@ if len(sys.argv) < 2: font_file = sys.argv[1] font_name = os.path.splitext(os.path.basename(font_file))[0] -# now or SOURCE_DATE_EPOCH, if present -timestamp = timestampNow() font = TTFont(font_file, recalcBBoxes=False, recalcTimestamp=False) -font['head'].created = timestamp -font['head'].modified = timestamp +# fix timestamp to the epoch +font['head'].created = 0 +font['head'].modified = 0 # remove fontforge timestamps if 'FFTM' in font: @@ -36,8 +35,6 @@ if 'GDEF' in font: font['name'].names = [record for record in font['name'].names if record.platformID != 1] font['cmap'].tables = [table for table in font['cmap'].tables if table.platformID != 1] -font['name'].setName('Version ' + str(timestamp), 5, 3, 1, 1033) - # fix OS/2 and hhea metrics glyf = font['glyf'] ascent = int(max(glyf[c].yMax for c in font.getGlyphOrder() if hasattr(glyf[c], "yMax")))