From a4b9a43ca17b403660de7ae7e22a417675069580 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Tue, 27 Jan 2026 12:19:19 +0100 Subject: [PATCH] docs: add font generation commands to builtin font headers (#547) ## Summary * **What is the goal of this PR?** Simple quality of life, ease maintenance * **What changes are included?** Update fontconvert.py to include the command used to generate each font file in the header comment, making it easier to regenerate fonts when needed. I plan on adding options to this scripts (kerning, and maybe ligatures), thus knowing which command was used, even with already existing options like `--additional-intervals`, is important. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**NO**_ --- lib/EpdFont/builtinFonts/bookerly_12_bold.h | 1 + lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h | 1 + lib/EpdFont/builtinFonts/bookerly_12_italic.h | 1 + lib/EpdFont/builtinFonts/bookerly_12_regular.h | 1 + lib/EpdFont/builtinFonts/bookerly_14_bold.h | 1 + lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h | 1 + lib/EpdFont/builtinFonts/bookerly_14_italic.h | 1 + lib/EpdFont/builtinFonts/bookerly_14_regular.h | 1 + lib/EpdFont/builtinFonts/bookerly_16_bold.h | 1 + lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h | 1 + lib/EpdFont/builtinFonts/bookerly_16_italic.h | 1 + lib/EpdFont/builtinFonts/bookerly_16_regular.h | 1 + lib/EpdFont/builtinFonts/bookerly_18_bold.h | 1 + lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h | 1 + lib/EpdFont/builtinFonts/bookerly_18_italic.h | 1 + lib/EpdFont/builtinFonts/bookerly_18_regular.h | 1 + lib/EpdFont/builtinFonts/notosans_12_bold.h | 1 + lib/EpdFont/builtinFonts/notosans_12_bolditalic.h | 1 + lib/EpdFont/builtinFonts/notosans_12_italic.h | 1 + lib/EpdFont/builtinFonts/notosans_12_regular.h | 1 + lib/EpdFont/builtinFonts/notosans_14_bold.h | 1 + lib/EpdFont/builtinFonts/notosans_14_bolditalic.h | 1 + lib/EpdFont/builtinFonts/notosans_14_italic.h | 1 + lib/EpdFont/builtinFonts/notosans_14_regular.h | 1 + lib/EpdFont/builtinFonts/notosans_16_bold.h | 1 + lib/EpdFont/builtinFonts/notosans_16_bolditalic.h | 1 + lib/EpdFont/builtinFonts/notosans_16_italic.h | 1 + lib/EpdFont/builtinFonts/notosans_16_regular.h | 1 + lib/EpdFont/builtinFonts/notosans_18_bold.h | 1 + lib/EpdFont/builtinFonts/notosans_18_bolditalic.h | 1 + lib/EpdFont/builtinFonts/notosans_18_italic.h | 1 + lib/EpdFont/builtinFonts/notosans_18_regular.h | 1 + lib/EpdFont/builtinFonts/notosans_8_regular.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_10_bold.h | 1 + .../builtinFonts/opendyslexic_10_bolditalic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_10_italic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_10_regular.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_12_bold.h | 1 + .../builtinFonts/opendyslexic_12_bolditalic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_12_italic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_12_regular.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_14_bold.h | 1 + .../builtinFonts/opendyslexic_14_bolditalic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_14_italic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_14_regular.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_8_bold.h | 1 + .../builtinFonts/opendyslexic_8_bolditalic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_8_italic.h | 1 + lib/EpdFont/builtinFonts/opendyslexic_8_regular.h | 1 + lib/EpdFont/builtinFonts/ubuntu_10_bold.h | 1 + lib/EpdFont/builtinFonts/ubuntu_10_regular.h | 1 + lib/EpdFont/builtinFonts/ubuntu_12_bold.h | 1 + lib/EpdFont/builtinFonts/ubuntu_12_regular.h | 1 + lib/EpdFont/scripts/fontconvert.py | 14 +++++++++++--- 54 files changed, 64 insertions(+), 3 deletions(-) diff --git a/lib/EpdFont/builtinFonts/bookerly_12_bold.h b/lib/EpdFont/builtinFonts/bookerly_12_bold.h index c20b574..2dd52ca 100644 --- a/lib/EpdFont/builtinFonts/bookerly_12_bold.h +++ b/lib/EpdFont/builtinFonts/bookerly_12_bold.h @@ -3,6 +3,7 @@ * name: bookerly_12_bold * size: 12 * mode: 2-bit + * Command used: fontconvert.py bookerly_12_bold 12 ../builtinFonts/source/Bookerly/Bookerly-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h b/lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h index 6e914f4..32b7510 100644 --- a/lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h +++ b/lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h @@ -3,6 +3,7 @@ * name: bookerly_12_bolditalic * size: 12 * mode: 2-bit + * Command used: fontconvert.py bookerly_12_bolditalic 12 ../builtinFonts/source/Bookerly/Bookerly-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_12_italic.h b/lib/EpdFont/builtinFonts/bookerly_12_italic.h index 1fbd43b..0344d9d 100644 --- a/lib/EpdFont/builtinFonts/bookerly_12_italic.h +++ b/lib/EpdFont/builtinFonts/bookerly_12_italic.h @@ -3,6 +3,7 @@ * name: bookerly_12_italic * size: 12 * mode: 2-bit + * Command used: fontconvert.py bookerly_12_italic 12 ../builtinFonts/source/Bookerly/Bookerly-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_12_regular.h b/lib/EpdFont/builtinFonts/bookerly_12_regular.h index 1e788d4..a64cbb6 100644 --- a/lib/EpdFont/builtinFonts/bookerly_12_regular.h +++ b/lib/EpdFont/builtinFonts/bookerly_12_regular.h @@ -3,6 +3,7 @@ * name: bookerly_12_regular * size: 12 * mode: 2-bit + * Command used: fontconvert.py bookerly_12_regular 12 ../builtinFonts/source/Bookerly/Bookerly-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_14_bold.h b/lib/EpdFont/builtinFonts/bookerly_14_bold.h index 793c6d3..98d280d 100644 --- a/lib/EpdFont/builtinFonts/bookerly_14_bold.h +++ b/lib/EpdFont/builtinFonts/bookerly_14_bold.h @@ -3,6 +3,7 @@ * name: bookerly_14_bold * size: 14 * mode: 2-bit + * Command used: fontconvert.py bookerly_14_bold 14 ../builtinFonts/source/Bookerly/Bookerly-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h b/lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h index 60da39b..21b55bf 100644 --- a/lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h +++ b/lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h @@ -3,6 +3,7 @@ * name: bookerly_14_bolditalic * size: 14 * mode: 2-bit + * Command used: fontconvert.py bookerly_14_bolditalic 14 ../builtinFonts/source/Bookerly/Bookerly-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_14_italic.h b/lib/EpdFont/builtinFonts/bookerly_14_italic.h index a8d196c..592d2ed 100644 --- a/lib/EpdFont/builtinFonts/bookerly_14_italic.h +++ b/lib/EpdFont/builtinFonts/bookerly_14_italic.h @@ -3,6 +3,7 @@ * name: bookerly_14_italic * size: 14 * mode: 2-bit + * Command used: fontconvert.py bookerly_14_italic 14 ../builtinFonts/source/Bookerly/Bookerly-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_14_regular.h b/lib/EpdFont/builtinFonts/bookerly_14_regular.h index 8c8355f..b1c7736 100644 --- a/lib/EpdFont/builtinFonts/bookerly_14_regular.h +++ b/lib/EpdFont/builtinFonts/bookerly_14_regular.h @@ -3,6 +3,7 @@ * name: bookerly_14_regular * size: 14 * mode: 2-bit + * Command used: fontconvert.py bookerly_14_regular 14 ../builtinFonts/source/Bookerly/Bookerly-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_16_bold.h b/lib/EpdFont/builtinFonts/bookerly_16_bold.h index 139d37b..63a791b 100644 --- a/lib/EpdFont/builtinFonts/bookerly_16_bold.h +++ b/lib/EpdFont/builtinFonts/bookerly_16_bold.h @@ -3,6 +3,7 @@ * name: bookerly_16_bold * size: 16 * mode: 2-bit + * Command used: fontconvert.py bookerly_16_bold 16 ../builtinFonts/source/Bookerly/Bookerly-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h b/lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h index c68f120..46a0bb5 100644 --- a/lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h +++ b/lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h @@ -3,6 +3,7 @@ * name: bookerly_16_bolditalic * size: 16 * mode: 2-bit + * Command used: fontconvert.py bookerly_16_bolditalic 16 ../builtinFonts/source/Bookerly/Bookerly-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_16_italic.h b/lib/EpdFont/builtinFonts/bookerly_16_italic.h index bdbb6a6..2d699f6 100644 --- a/lib/EpdFont/builtinFonts/bookerly_16_italic.h +++ b/lib/EpdFont/builtinFonts/bookerly_16_italic.h @@ -3,6 +3,7 @@ * name: bookerly_16_italic * size: 16 * mode: 2-bit + * Command used: fontconvert.py bookerly_16_italic 16 ../builtinFonts/source/Bookerly/Bookerly-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_16_regular.h b/lib/EpdFont/builtinFonts/bookerly_16_regular.h index c980928..2948146 100644 --- a/lib/EpdFont/builtinFonts/bookerly_16_regular.h +++ b/lib/EpdFont/builtinFonts/bookerly_16_regular.h @@ -3,6 +3,7 @@ * name: bookerly_16_regular * size: 16 * mode: 2-bit + * Command used: fontconvert.py bookerly_16_regular 16 ../builtinFonts/source/Bookerly/Bookerly-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_18_bold.h b/lib/EpdFont/builtinFonts/bookerly_18_bold.h index ca8078b..e281af8 100644 --- a/lib/EpdFont/builtinFonts/bookerly_18_bold.h +++ b/lib/EpdFont/builtinFonts/bookerly_18_bold.h @@ -3,6 +3,7 @@ * name: bookerly_18_bold * size: 18 * mode: 2-bit + * Command used: fontconvert.py bookerly_18_bold 18 ../builtinFonts/source/Bookerly/Bookerly-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h b/lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h index 42f4679..4562dc5 100644 --- a/lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h +++ b/lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h @@ -3,6 +3,7 @@ * name: bookerly_18_bolditalic * size: 18 * mode: 2-bit + * Command used: fontconvert.py bookerly_18_bolditalic 18 ../builtinFonts/source/Bookerly/Bookerly-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_18_italic.h b/lib/EpdFont/builtinFonts/bookerly_18_italic.h index 8534b03..643b5cc 100644 --- a/lib/EpdFont/builtinFonts/bookerly_18_italic.h +++ b/lib/EpdFont/builtinFonts/bookerly_18_italic.h @@ -3,6 +3,7 @@ * name: bookerly_18_italic * size: 18 * mode: 2-bit + * Command used: fontconvert.py bookerly_18_italic 18 ../builtinFonts/source/Bookerly/Bookerly-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/bookerly_18_regular.h b/lib/EpdFont/builtinFonts/bookerly_18_regular.h index 6d638e6..a6297ea 100644 --- a/lib/EpdFont/builtinFonts/bookerly_18_regular.h +++ b/lib/EpdFont/builtinFonts/bookerly_18_regular.h @@ -3,6 +3,7 @@ * name: bookerly_18_regular * size: 18 * mode: 2-bit + * Command used: fontconvert.py bookerly_18_regular 18 ../builtinFonts/source/Bookerly/Bookerly-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_12_bold.h b/lib/EpdFont/builtinFonts/notosans_12_bold.h index 5710716..65ade32 100644 --- a/lib/EpdFont/builtinFonts/notosans_12_bold.h +++ b/lib/EpdFont/builtinFonts/notosans_12_bold.h @@ -3,6 +3,7 @@ * name: notosans_12_bold * size: 12 * mode: 2-bit + * Command used: fontconvert.py notosans_12_bold 12 ../builtinFonts/source/NotoSans/NotoSans-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_12_bolditalic.h b/lib/EpdFont/builtinFonts/notosans_12_bolditalic.h index 1b485f7..6ef7ef4 100644 --- a/lib/EpdFont/builtinFonts/notosans_12_bolditalic.h +++ b/lib/EpdFont/builtinFonts/notosans_12_bolditalic.h @@ -3,6 +3,7 @@ * name: notosans_12_bolditalic * size: 12 * mode: 2-bit + * Command used: fontconvert.py notosans_12_bolditalic 12 ../builtinFonts/source/NotoSans/NotoSans-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_12_italic.h b/lib/EpdFont/builtinFonts/notosans_12_italic.h index 994dc40..a599577 100644 --- a/lib/EpdFont/builtinFonts/notosans_12_italic.h +++ b/lib/EpdFont/builtinFonts/notosans_12_italic.h @@ -3,6 +3,7 @@ * name: notosans_12_italic * size: 12 * mode: 2-bit + * Command used: fontconvert.py notosans_12_italic 12 ../builtinFonts/source/NotoSans/NotoSans-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_12_regular.h b/lib/EpdFont/builtinFonts/notosans_12_regular.h index ff47f6f..a89cb38 100644 --- a/lib/EpdFont/builtinFonts/notosans_12_regular.h +++ b/lib/EpdFont/builtinFonts/notosans_12_regular.h @@ -3,6 +3,7 @@ * name: notosans_12_regular * size: 12 * mode: 2-bit + * Command used: fontconvert.py notosans_12_regular 12 ../builtinFonts/source/NotoSans/NotoSans-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_14_bold.h b/lib/EpdFont/builtinFonts/notosans_14_bold.h index 1f948b9..7040358 100644 --- a/lib/EpdFont/builtinFonts/notosans_14_bold.h +++ b/lib/EpdFont/builtinFonts/notosans_14_bold.h @@ -3,6 +3,7 @@ * name: notosans_14_bold * size: 14 * mode: 2-bit + * Command used: fontconvert.py notosans_14_bold 14 ../builtinFonts/source/NotoSans/NotoSans-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_14_bolditalic.h b/lib/EpdFont/builtinFonts/notosans_14_bolditalic.h index f75fa52..f416835 100644 --- a/lib/EpdFont/builtinFonts/notosans_14_bolditalic.h +++ b/lib/EpdFont/builtinFonts/notosans_14_bolditalic.h @@ -3,6 +3,7 @@ * name: notosans_14_bolditalic * size: 14 * mode: 2-bit + * Command used: fontconvert.py notosans_14_bolditalic 14 ../builtinFonts/source/NotoSans/NotoSans-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_14_italic.h b/lib/EpdFont/builtinFonts/notosans_14_italic.h index d7d00a5..18cc49e 100644 --- a/lib/EpdFont/builtinFonts/notosans_14_italic.h +++ b/lib/EpdFont/builtinFonts/notosans_14_italic.h @@ -3,6 +3,7 @@ * name: notosans_14_italic * size: 14 * mode: 2-bit + * Command used: fontconvert.py notosans_14_italic 14 ../builtinFonts/source/NotoSans/NotoSans-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_14_regular.h b/lib/EpdFont/builtinFonts/notosans_14_regular.h index f93afdd..a8f7fbb 100644 --- a/lib/EpdFont/builtinFonts/notosans_14_regular.h +++ b/lib/EpdFont/builtinFonts/notosans_14_regular.h @@ -3,6 +3,7 @@ * name: notosans_14_regular * size: 14 * mode: 2-bit + * Command used: fontconvert.py notosans_14_regular 14 ../builtinFonts/source/NotoSans/NotoSans-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_16_bold.h b/lib/EpdFont/builtinFonts/notosans_16_bold.h index b6a0414..4e34685 100644 --- a/lib/EpdFont/builtinFonts/notosans_16_bold.h +++ b/lib/EpdFont/builtinFonts/notosans_16_bold.h @@ -3,6 +3,7 @@ * name: notosans_16_bold * size: 16 * mode: 2-bit + * Command used: fontconvert.py notosans_16_bold 16 ../builtinFonts/source/NotoSans/NotoSans-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_16_bolditalic.h b/lib/EpdFont/builtinFonts/notosans_16_bolditalic.h index 8452a24..8c5bc3e 100644 --- a/lib/EpdFont/builtinFonts/notosans_16_bolditalic.h +++ b/lib/EpdFont/builtinFonts/notosans_16_bolditalic.h @@ -3,6 +3,7 @@ * name: notosans_16_bolditalic * size: 16 * mode: 2-bit + * Command used: fontconvert.py notosans_16_bolditalic 16 ../builtinFonts/source/NotoSans/NotoSans-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_16_italic.h b/lib/EpdFont/builtinFonts/notosans_16_italic.h index d1a0cac..e129f3e 100644 --- a/lib/EpdFont/builtinFonts/notosans_16_italic.h +++ b/lib/EpdFont/builtinFonts/notosans_16_italic.h @@ -3,6 +3,7 @@ * name: notosans_16_italic * size: 16 * mode: 2-bit + * Command used: fontconvert.py notosans_16_italic 16 ../builtinFonts/source/NotoSans/NotoSans-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_16_regular.h b/lib/EpdFont/builtinFonts/notosans_16_regular.h index 2439819..f07dc56 100644 --- a/lib/EpdFont/builtinFonts/notosans_16_regular.h +++ b/lib/EpdFont/builtinFonts/notosans_16_regular.h @@ -3,6 +3,7 @@ * name: notosans_16_regular * size: 16 * mode: 2-bit + * Command used: fontconvert.py notosans_16_regular 16 ../builtinFonts/source/NotoSans/NotoSans-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_18_bold.h b/lib/EpdFont/builtinFonts/notosans_18_bold.h index cb57a3b..e2eb579 100644 --- a/lib/EpdFont/builtinFonts/notosans_18_bold.h +++ b/lib/EpdFont/builtinFonts/notosans_18_bold.h @@ -3,6 +3,7 @@ * name: notosans_18_bold * size: 18 * mode: 2-bit + * Command used: fontconvert.py notosans_18_bold 18 ../builtinFonts/source/NotoSans/NotoSans-Bold.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_18_bolditalic.h b/lib/EpdFont/builtinFonts/notosans_18_bolditalic.h index bd09ce1..465d847 100644 --- a/lib/EpdFont/builtinFonts/notosans_18_bolditalic.h +++ b/lib/EpdFont/builtinFonts/notosans_18_bolditalic.h @@ -3,6 +3,7 @@ * name: notosans_18_bolditalic * size: 18 * mode: 2-bit + * Command used: fontconvert.py notosans_18_bolditalic 18 ../builtinFonts/source/NotoSans/NotoSans-BoldItalic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_18_italic.h b/lib/EpdFont/builtinFonts/notosans_18_italic.h index 926bd32..0e36e18 100644 --- a/lib/EpdFont/builtinFonts/notosans_18_italic.h +++ b/lib/EpdFont/builtinFonts/notosans_18_italic.h @@ -3,6 +3,7 @@ * name: notosans_18_italic * size: 18 * mode: 2-bit + * Command used: fontconvert.py notosans_18_italic 18 ../builtinFonts/source/NotoSans/NotoSans-Italic.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_18_regular.h b/lib/EpdFont/builtinFonts/notosans_18_regular.h index d8bbe9c..029ff80 100644 --- a/lib/EpdFont/builtinFonts/notosans_18_regular.h +++ b/lib/EpdFont/builtinFonts/notosans_18_regular.h @@ -3,6 +3,7 @@ * name: notosans_18_regular * size: 18 * mode: 2-bit + * Command used: fontconvert.py notosans_18_regular 18 ../builtinFonts/source/NotoSans/NotoSans-Regular.ttf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/notosans_8_regular.h b/lib/EpdFont/builtinFonts/notosans_8_regular.h index 0c01edc..7e33918 100644 --- a/lib/EpdFont/builtinFonts/notosans_8_regular.h +++ b/lib/EpdFont/builtinFonts/notosans_8_regular.h @@ -3,6 +3,7 @@ * name: notosans_8_regular * size: 8 * mode: 1-bit + * Command used: fontconvert.py notosans_8_regular 8 ../builtinFonts/source/NotoSans/NotoSans-Regular.ttf */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_10_bold.h b/lib/EpdFont/builtinFonts/opendyslexic_10_bold.h index eb90062..b3a16e6 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_10_bold.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_10_bold.h @@ -3,6 +3,7 @@ * name: opendyslexic_10_bold * size: 10 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_10_bold 10 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h b/lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h index f2a4571..e939db2 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h @@ -3,6 +3,7 @@ * name: opendyslexic_10_bolditalic * size: 10 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_10_bolditalic 10 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_10_italic.h b/lib/EpdFont/builtinFonts/opendyslexic_10_italic.h index 2e9f412..e0f43bb 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_10_italic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_10_italic.h @@ -3,6 +3,7 @@ * name: opendyslexic_10_italic * size: 10 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_10_italic 10 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_10_regular.h b/lib/EpdFont/builtinFonts/opendyslexic_10_regular.h index 928d752..0fded27 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_10_regular.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_10_regular.h @@ -3,6 +3,7 @@ * name: opendyslexic_10_regular * size: 10 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_10_regular 10 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_12_bold.h b/lib/EpdFont/builtinFonts/opendyslexic_12_bold.h index 5f7c8ec..115a737 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_12_bold.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_12_bold.h @@ -3,6 +3,7 @@ * name: opendyslexic_12_bold * size: 12 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_12_bold 12 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h b/lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h index fdb3f63..54732e1 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h @@ -3,6 +3,7 @@ * name: opendyslexic_12_bolditalic * size: 12 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_12_bolditalic 12 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_12_italic.h b/lib/EpdFont/builtinFonts/opendyslexic_12_italic.h index 4ce9eed..d927f96 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_12_italic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_12_italic.h @@ -3,6 +3,7 @@ * name: opendyslexic_12_italic * size: 12 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_12_italic 12 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_12_regular.h b/lib/EpdFont/builtinFonts/opendyslexic_12_regular.h index 596ee1e..61643c6 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_12_regular.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_12_regular.h @@ -3,6 +3,7 @@ * name: opendyslexic_12_regular * size: 12 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_12_regular 12 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_14_bold.h b/lib/EpdFont/builtinFonts/opendyslexic_14_bold.h index b5de40b..e150dbd 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_14_bold.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_14_bold.h @@ -3,6 +3,7 @@ * name: opendyslexic_14_bold * size: 14 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_14_bold 14 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h b/lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h index dae158c..9aa5e19 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h @@ -3,6 +3,7 @@ * name: opendyslexic_14_bolditalic * size: 14 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_14_bolditalic 14 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_14_italic.h b/lib/EpdFont/builtinFonts/opendyslexic_14_italic.h index d69b842..06fd04d 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_14_italic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_14_italic.h @@ -3,6 +3,7 @@ * name: opendyslexic_14_italic * size: 14 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_14_italic 14 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_14_regular.h b/lib/EpdFont/builtinFonts/opendyslexic_14_regular.h index f45e71a..cda4f87 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_14_regular.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_14_regular.h @@ -3,6 +3,7 @@ * name: opendyslexic_14_regular * size: 14 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_14_regular 14 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_8_bold.h b/lib/EpdFont/builtinFonts/opendyslexic_8_bold.h index b0fc804..72e131d 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_8_bold.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_8_bold.h @@ -3,6 +3,7 @@ * name: opendyslexic_8_bold * size: 8 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_8_bold 8 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h b/lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h index 77336ed..4858ad0 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h @@ -3,6 +3,7 @@ * name: opendyslexic_8_bolditalic * size: 8 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_8_bolditalic 8 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_8_italic.h b/lib/EpdFont/builtinFonts/opendyslexic_8_italic.h index 37dcfa9..62e37b3 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_8_italic.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_8_italic.h @@ -3,6 +3,7 @@ * name: opendyslexic_8_italic * size: 8 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_8_italic 8 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/opendyslexic_8_regular.h b/lib/EpdFont/builtinFonts/opendyslexic_8_regular.h index f68c743..fae287a 100644 --- a/lib/EpdFont/builtinFonts/opendyslexic_8_regular.h +++ b/lib/EpdFont/builtinFonts/opendyslexic_8_regular.h @@ -3,6 +3,7 @@ * name: opendyslexic_8_regular * size: 8 * mode: 2-bit + * Command used: fontconvert.py opendyslexic_8_regular 8 ../builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf --2bit */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/ubuntu_10_bold.h b/lib/EpdFont/builtinFonts/ubuntu_10_bold.h index cab81b1..80032fd 100644 --- a/lib/EpdFont/builtinFonts/ubuntu_10_bold.h +++ b/lib/EpdFont/builtinFonts/ubuntu_10_bold.h @@ -3,6 +3,7 @@ * name: ubuntu_10_bold * size: 10 * mode: 1-bit + * Command used: fontconvert.py ubuntu_10_bold 10 ../builtinFonts/source/Ubuntu/Ubuntu-Bold.ttf */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/ubuntu_10_regular.h b/lib/EpdFont/builtinFonts/ubuntu_10_regular.h index a7292c1..e76ab2c 100644 --- a/lib/EpdFont/builtinFonts/ubuntu_10_regular.h +++ b/lib/EpdFont/builtinFonts/ubuntu_10_regular.h @@ -3,6 +3,7 @@ * name: ubuntu_10_regular * size: 10 * mode: 1-bit + * Command used: fontconvert.py ubuntu_10_regular 10 ../builtinFonts/source/Ubuntu/Ubuntu-Regular.ttf */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/ubuntu_12_bold.h b/lib/EpdFont/builtinFonts/ubuntu_12_bold.h index 9419ed4..5b24d06 100644 --- a/lib/EpdFont/builtinFonts/ubuntu_12_bold.h +++ b/lib/EpdFont/builtinFonts/ubuntu_12_bold.h @@ -3,6 +3,7 @@ * name: ubuntu_12_bold * size: 12 * mode: 1-bit + * Command used: fontconvert.py ubuntu_12_bold 12 ../builtinFonts/source/Ubuntu/Ubuntu-Bold.ttf */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/builtinFonts/ubuntu_12_regular.h b/lib/EpdFont/builtinFonts/ubuntu_12_regular.h index f02de88..23ddbe7 100644 --- a/lib/EpdFont/builtinFonts/ubuntu_12_regular.h +++ b/lib/EpdFont/builtinFonts/ubuntu_12_regular.h @@ -3,6 +3,7 @@ * name: ubuntu_12_regular * size: 12 * mode: 1-bit + * Command used: fontconvert.py ubuntu_12_regular 12 ../builtinFonts/source/Ubuntu/Ubuntu-Regular.ttf */ #pragma once #include "EpdFontData.h" diff --git a/lib/EpdFont/scripts/fontconvert.py b/lib/EpdFont/scripts/fontconvert.py index d11f73b..ba7a44a 100755 --- a/lib/EpdFont/scripts/fontconvert.py +++ b/lib/EpdFont/scripts/fontconvert.py @@ -270,9 +270,17 @@ for index, glyph in enumerate(all_glyphs): glyph_data.extend([b for b in packed]) glyph_props.append(props) -print(f"/**\n * generated by fontconvert.py\n * name: {font_name}\n * size: {size}\n * mode: {'2-bit' if is2Bit else '1-bit'}\n */") -print("#pragma once") -print("#include \"EpdFontData.h\"\n") +print(f"""/** + * generated by fontconvert.py + * name: {font_name} + * size: {size} + * mode: {'2-bit' if is2Bit else '1-bit'} + * Command used: {' '.join(sys.argv)} + */ +#pragma once +#include "EpdFontData.h" +""") + print(f"static const uint8_t {font_name}Bitmaps[{len(glyph_data)}] = {{") for c in chunks(glyph_data, 16): print (" " + " ".join(f"0x{b:02X}," for b in c))