Browse Source

resources: define and add missing fonts

Bitmap fonts extracted from public QEMU images, see Utilities/mkpack.py
in RebbleOS repository for more details.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Gerard Marull-Paretas 6 months ago
parent
commit
1a7d6575c1
37 changed files with 133 additions and 17 deletions
  1. BIN
      resources/common/base/pbf/GOTHIC_14.pbf
  2. BIN
      resources/common/base/pbf/GOTHIC_18_BOLD.pbf
  3. BIN
      resources/common/base/pbf/GOTHIC_24.pbf
  4. BIN
      resources/common/base/pbf/GOTHIC_36_BOLD.pbf
  5. 13 0
      resources/common/base/resource_map.json
  6. BIN
      resources/normal/base/pbf/BITHAM_18_LIGHT_SUBSET.pbf
  7. BIN
      resources/normal/base/pbf/BITHAM_30_BLACK.pbf
  8. BIN
      resources/normal/base/pbf/BITHAM_34_LIGHT_SUBSET.pbf
  9. BIN
      resources/normal/base/pbf/BITHAM_34_MEDIUM_NUMBERS.pbf
  10. BIN
      resources/normal/base/pbf/BITHAM_42_BOLD.pbf
  11. BIN
      resources/normal/base/pbf/BITHAM_42_LIGHT.pbf
  12. BIN
      resources/normal/base/pbf/BITHAM_42_MEDIUM_NUMBERS.pbf
  13. BIN
      resources/normal/base/pbf/DROID_SERIF_28_BOLD.pbf
  14. BIN
      resources/normal/base/pbf/EMOJI_14.pbf
  15. BIN
      resources/normal/base/pbf/EMOJI_18.pbf
  16. BIN
      resources/normal/base/pbf/EMOJI_24.pbf
  17. BIN
      resources/normal/base/pbf/EMOJI_28.pbf
  18. BIN
      resources/normal/base/pbf/GOTHIC_09.pbf
  19. BIN
      resources/normal/base/pbf/GOTHIC_14.pbf
  20. BIN
      resources/normal/base/pbf/GOTHIC_14_BOLD.pbf
  21. BIN
      resources/normal/base/pbf/GOTHIC_18.pbf
  22. BIN
      resources/normal/base/pbf/GOTHIC_18_BOLD.pbf
  23. BIN
      resources/normal/base/pbf/GOTHIC_24.pbf
  24. BIN
      resources/normal/base/pbf/GOTHIC_24_BOLD.pbf
  25. BIN
      resources/normal/base/pbf/GOTHIC_28.pbf
  26. BIN
      resources/normal/base/pbf/GOTHIC_28_BOLD.pbf
  27. BIN
      resources/normal/base/pbf/GOTHIC_36.pbf
  28. BIN
      resources/normal/base/pbf/GOTHIC_36_BOLD.pbf
  29. BIN
      resources/normal/base/pbf/LECO_20_BOLD_NUMBERS.pbf
  30. BIN
      resources/normal/base/pbf/LECO_26_BOLD_NUMBERS_AM_PM.pbf
  31. BIN
      resources/normal/base/pbf/LECO_28_LIGHT_NUMBERS.pbf
  32. BIN
      resources/normal/base/pbf/LECO_32_BOLD_NUMBERS.pbf
  33. BIN
      resources/normal/base/pbf/LECO_36_BOLD_NUMBERS.pbf
  34. BIN
      resources/normal/base/pbf/LECO_38_BOLD_NUMBERS.pbf
  35. BIN
      resources/normal/base/pbf/LECO_42_NUMBERS.pbf
  36. 103 17
      resources/normal/base/resource_map.json
  37. 17 0
      resources/prf/base/resource_map.json

BIN
resources/common/base/pbf/GOTHIC_14.pbf


BIN
resources/common/base/pbf/GOTHIC_18_BOLD.pbf


BIN
resources/common/base/pbf/GOTHIC_24.pbf


BIN
resources/common/base/pbf/GOTHIC_36_BOLD.pbf


+ 13 - 0
resources/common/base/resource_map.json

@@ -41,6 +41,19 @@
       "type": "png",
       "name": "SPINNER_BACKGROUND",
       "file": "common/base/images/spinner_background.png"
+    },
+    {
+      "type": "font",
+      "name": "FONT_FALLBACK_INTERNAL",
+      "file": "common/base/pbf/GOTHIC_14.pbf",
+      "builtin": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_18_BOLD",
+      "file": "common/base/pbf/GOTHIC_18_BOLD.pbf",
+      "compatibility": "2.7",
+      "extended": true
     }
   ]
 }

BIN
resources/normal/base/pbf/BITHAM_18_LIGHT_SUBSET.pbf


BIN
resources/normal/base/pbf/BITHAM_30_BLACK.pbf


BIN
resources/normal/base/pbf/BITHAM_34_LIGHT_SUBSET.pbf


BIN
resources/normal/base/pbf/BITHAM_34_MEDIUM_NUMBERS.pbf


BIN
resources/normal/base/pbf/BITHAM_42_BOLD.pbf


BIN
resources/normal/base/pbf/BITHAM_42_LIGHT.pbf


BIN
resources/normal/base/pbf/BITHAM_42_MEDIUM_NUMBERS.pbf


BIN
resources/normal/base/pbf/DROID_SERIF_28_BOLD.pbf


BIN
resources/normal/base/pbf/EMOJI_14.pbf


BIN
resources/normal/base/pbf/EMOJI_18.pbf


BIN
resources/normal/base/pbf/EMOJI_24.pbf


BIN
resources/normal/base/pbf/EMOJI_28.pbf


BIN
resources/normal/base/pbf/GOTHIC_09.pbf


BIN
resources/normal/base/pbf/GOTHIC_14.pbf


BIN
resources/normal/base/pbf/GOTHIC_14_BOLD.pbf


BIN
resources/normal/base/pbf/GOTHIC_18.pbf


BIN
resources/normal/base/pbf/GOTHIC_18_BOLD.pbf


BIN
resources/normal/base/pbf/GOTHIC_24.pbf


BIN
resources/normal/base/pbf/GOTHIC_24_BOLD.pbf


BIN
resources/normal/base/pbf/GOTHIC_28.pbf


BIN
resources/normal/base/pbf/GOTHIC_28_BOLD.pbf


BIN
resources/normal/base/pbf/GOTHIC_36.pbf


BIN
resources/normal/base/pbf/GOTHIC_36_BOLD.pbf


BIN
resources/normal/base/pbf/LECO_20_BOLD_NUMBERS.pbf


BIN
resources/normal/base/pbf/LECO_26_BOLD_NUMBERS_AM_PM.pbf


BIN
resources/normal/base/pbf/LECO_28_LIGHT_NUMBERS.pbf


BIN
resources/normal/base/pbf/LECO_32_BOLD_NUMBERS.pbf


BIN
resources/normal/base/pbf/LECO_36_BOLD_NUMBERS.pbf


BIN
resources/normal/base/pbf/LECO_38_BOLD_NUMBERS.pbf


BIN
resources/normal/base/pbf/LECO_42_NUMBERS.pbf


+ 103 - 17
resources/normal/base/resource_map.json

@@ -125,33 +125,119 @@
       "name": "ACTION_BAR_ICON_SMS",
       "file": "normal/base/images/action_bar_icon_sms.png"
     },
+    {
+      "type": "font",
+      "name": "GOTHIC_09",
+      "file": "normal/base/pbf/GOTHIC_09.pbf",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_14",
+      "file": "common/base/pbf/GOTHIC_14.pbf",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_14_EMOJI",
+      "file": "normal/base/pbf/EMOJI_14.pbf"
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_14_BOLD",
+      "file": "normal/base/pbf/GOTHIC_14_BOLD.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_18",
+      "file": "normal/base/pbf/GOTHIC_18.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_18_EMOJI",
+      "file": "normal/base/pbf/EMOJI_18.pbf"
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_24",
+      "file": "common/base/pbf/GOTHIC_24.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_24_BOLD",
+      "file": "normal/base/pbf/GOTHIC_24_BOLD.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_24_EMOJI",
+      "file": "normal/base/pbf/EMOJI_24.pbf"
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_28",
+      "file": "normal/base/pbf/GOTHIC_28.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_28_BOLD",
+      "file": "normal/base/pbf/GOTHIC_28_BOLD.pbf",
+      "compatibility": "2.7",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_28_EMOJI",
+      "file": "normal/base/pbf/EMOJI_28.pbf"
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_36",
+      "file": "normal/base/pbf/GOTHIC_36.pbf",
+      "extended": true
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_36_BOLD",
+      "file": "common/base/pbf/GOTHIC_36_BOLD.pbf",
+      "extended": true
+    },
     {
       "type": "font",
       "name": "BITHAM_30_BLACK",
-      "file": "normal/base/ttf/GothamBlack30.ttf",
+      "file": "normal/base/pbf/BITHAM_30_BLACK.pbf",
       "characterList": "normal/base/ttf/basic_latin_codepoints.json",
       "compatibility": "2.7"
     },
     {
       "type": "font",
       "name": "BITHAM_42_BOLD",
-      "file": "normal/base/ttf/Gotham-Bold.otf",
-      "characterList": "normal/base/ttf/basic_latin_codepoints.json",
+      "file": "normal/base/pbf/BITHAM_42_BOLD.pbf",
+      "characterList": "normal/base/pbf/basic_latin_codepoints.json",
       "trackingAdjust": -2,
       "compatibility": "2.7"
     },
     {
       "type": "font",
       "name": "BITHAM_42_LIGHT",
-      "file": "normal/base/ttf/Gotham-Light.otf",
-      "characterList": "normal/base/ttf/basic_latin_codepoints.json",
+      "file": "normal/base/pbf/BITHAM_42_LIGHT.pbf",
+      "characterList": "normal/base/pbf/basic_latin_codepoints.json",
       "trackingAdjust": -3,
       "compatibility": "2.7"
     },
     {
       "type": "font",
       "name": "BITHAM_42_MEDIUM_NUMBERS",
-      "file": "normal/base/ttf/Gotham-Medium.otf",
+      "file": "normal/base/pbf/BITHAM_42_MEDIUM_NUMBERS.pbf",
       "trackingAdjust": -3,
       "characterRegex": "[0-9:-]",
       "compatibility": "2.7"
@@ -159,7 +245,7 @@
     {
       "type": "font",
       "name": "BITHAM_34_MEDIUM_NUMBERS",
-      "file": "normal/base/ttf/Gotham-Medium.otf",
+      "file": "normal/base/pbf/BITHAM_34_MEDIUM_NUMBERS.pbf",
       "trackingAdjust": -2,
       "characterRegex": "[0-9:\\.,-]",
       "compatibility": "2.7"
@@ -167,7 +253,7 @@
     {
       "type": "font",
       "name": "BITHAM_34_LIGHT_SUBSET",
-      "file": "normal/base/ttf/Gotham-Light.otf",
+      "file": "normal/base/pbf/BITHAM_34_LIGHT_SUBSET.pbf",
       "trackingAdjust": -2,
       "characterRegex": "[mikm-]",
       "compatibility": "2.7"
@@ -175,7 +261,7 @@
     {
       "type": "font",
       "name": "BITHAM_18_LIGHT_SUBSET",
-      "file": "normal/base/ttf/Gotham-Light.otf",
+      "file": "normal/base/pbf/BITHAM_18_LIGHT_SUBSET.pbf",
       "trackingAdjust": -1,
       "characterRegex": "[minhkm/-]",
       "compatibility": "2.7"
@@ -197,50 +283,50 @@
     {
       "type": "font",
       "name": "DROID_SERIF_28_BOLD",
-      "file": "normal/base/ttf/DroidSerif28Bold.ttf",
+      "file": "normal/base/ttf/DroidSerif-Bold.ttf",
       "characterList": "normal/base/ttf/basic_latin_codepoints.json",
       "compatibility": "2.7"
     },
     {
       "type": "font",
       "name": "LECO_20_BOLD_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_20_BOLD_NUMBERS.pbf",
       "characterRegex": "[ 0-9:/.,°APMHBLTIN-]"
     },
     {
       "type": "font",
       "name": "LECO_26_BOLD_NUMBERS_AM_PM",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_26_BOLD_NUMBERS_AM_PM.pbf",
       "characterRegex": "[ 0-9:/.,°APMHIK\\+\\-\\%]"
     },
     {
       "type": "font",
       "name": "LECO_32_BOLD_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_32_BOLD_NUMBERS.pbf",
       "characterRegex": "[ 0-9:/.,°-]"
     },
     {
       "type": "font",
       "name": "LECO_36_BOLD_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_36_BOLD_NUMBERS.pbf",
       "characterRegex": "[ 0-9:/.,°-]"
     },
     {
       "type": "font",
       "name": "LECO_38_BOLD_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_38_BOLD_NUMBERS.pbf",
       "characterRegex": "[ 0-9:/.,°?-]"
     },
     {
       "type": "font",
       "name": "LECO_42_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Regular.otf",
+      "file": "normal/base/pbf/LECO_42_NUMBERS.pbf",
       "characterRegex" : "[ 0-9:/.,°-]"
     },
     {
       "type": "font",
       "name": "LECO_28_LIGHT_NUMBERS",
-      "file": "normal/base/ttf/LECO1976Light.otf",
+      "file": "normal/base/pbf/LECO_28_LIGHT_NUMBERS.pbf",
       "characterRegex": "[ 0-9:/.,°-]"
     },
     {

+ 17 - 0
resources/prf/base/resource_map.json

@@ -36,12 +36,29 @@
       "name": "TEST_IMAGE_VEGGIES",
       "file": "prf/base/images/veggies-144x168.png"
     },
+    {
+      "type": "font",
+      "name": "GOTHIC_24_BOLD",
+      "file": "normal/base/pbf/GOTHIC_24_BOLD.pbf"
+    },
     {
       "type": "font",
       "name": "MINCHO_20_PAIR",
       "file": "prf/base/ttf/sazanami-mincho.ttf",
       "characterRegex": "[ペアリング]"
     },
+    {
+      "type": "font",
+      "name": "GOTHIC_14",
+      "file": "common/base/pbf/GOTHIC_14.pbf",
+      "characterList": "prf/base/ttf/codepoints_including_right_single_quote.json"
+    },
+    {
+      "type": "font",
+      "name": "GOTHIC_24",
+      "file": "common/base/pbf/GOTHIC_24.pbf",
+      "characterList": "prf/base/ttf/codepoints_including_right_single_quote.json"
+    },
     {
       "name": "FONT_FALLBACK_INTERNAL",
       "characterRegex": null,