xbintsc 0.5.51 → 0.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (267) hide show
  1. package/README.md +8 -2
  2. package/README.zh-CN.md +9 -3
  3. package/dist/scripts/fetch-tarball.d.ts +28 -0
  4. package/dist/scripts/fetch-tarball.js +57 -0
  5. package/dist/scripts/fetch-tarball.js.map +1 -0
  6. package/dist/scripts/gui-build-options.d.ts +77 -0
  7. package/dist/scripts/gui-build-options.js +134 -0
  8. package/dist/scripts/gui-build-options.js.map +1 -0
  9. package/dist/src/cli/help.d.ts +1 -1
  10. package/dist/src/cli/hints.d.ts +6 -2
  11. package/dist/src/cli/hints.js +16 -2
  12. package/dist/src/cli/hints.js.map +1 -1
  13. package/dist/src/cli/main.js +9 -0
  14. package/dist/src/cli/main.js.map +1 -1
  15. package/dist/src/driver/app-artifacts.d.ts +2 -0
  16. package/dist/src/driver/app-artifacts.js +3 -3
  17. package/dist/src/driver/app-artifacts.js.map +1 -1
  18. package/dist/src/driver/compiler.js +147 -52
  19. package/dist/src/driver/compiler.js.map +1 -1
  20. package/dist/src/driver/icon.d.ts +1 -1
  21. package/dist/src/driver/icon.js +3 -3
  22. package/dist/src/driver/icon.js.map +1 -1
  23. package/dist/src/driver/macos-sdk.d.ts +32 -0
  24. package/dist/src/driver/macos-sdk.js +50 -0
  25. package/dist/src/driver/macos-sdk.js.map +1 -0
  26. package/dist/src/driver/options.d.ts +6 -0
  27. package/dist/src/driver/platform-support.d.ts +45 -0
  28. package/dist/src/driver/platform-support.js +66 -0
  29. package/dist/src/driver/platform-support.js.map +1 -0
  30. package/dist/src/driver/prebuilt.d.ts +26 -0
  31. package/dist/src/driver/prebuilt.js +58 -0
  32. package/dist/src/driver/prebuilt.js.map +1 -0
  33. package/dist/src/driver/runtime-objects.d.ts +11 -0
  34. package/dist/src/driver/runtime-objects.js +14 -5
  35. package/dist/src/driver/runtime-objects.js.map +1 -1
  36. package/dist/src/driver/toolchain-provider.d.ts +8 -0
  37. package/dist/src/driver/toolchain-provider.js +8 -0
  38. package/dist/src/driver/toolchain-provider.js.map +1 -1
  39. package/dist/src/driver/toolchain.d.ts +20 -1
  40. package/dist/src/driver/toolchain.js +19 -0
  41. package/dist/src/driver/toolchain.js.map +1 -1
  42. package/dist/src/driver/version.d.ts +1 -1
  43. package/dist/src/driver/version.js +1 -1
  44. package/dist/src/driver/version.js.map +1 -1
  45. package/dist/src/driver/win-entry.d.ts +1 -1
  46. package/dist/src/driver/win-entry.js +4 -4
  47. package/dist/src/driver/win-entry.js.map +1 -1
  48. package/dist/src/extensions/gui/features.d.ts +9 -6
  49. package/dist/src/extensions/gui/features.js +14 -9
  50. package/dist/src/extensions/gui/features.js.map +1 -1
  51. package/dist/src/extensions/gui/html.d.ts +10 -7
  52. package/dist/src/extensions/gui/html.js +53 -29
  53. package/dist/src/extensions/gui/html.js.map +1 -1
  54. package/dist/src/extensions/node/child_process/index.d.ts +4 -3
  55. package/dist/src/extensions/node/child_process/index.js +4 -3
  56. package/dist/src/extensions/node/child_process/index.js.map +1 -1
  57. package/dist/tests/cli/hints.test.js +9 -1
  58. package/dist/tests/cli/hints.test.js.map +1 -1
  59. package/dist/tests/cli/main.test.js +9 -0
  60. package/dist/tests/cli/main.test.js.map +1 -1
  61. package/dist/tests/driver/compiler.test.js +107 -0
  62. package/dist/tests/driver/compiler.test.js.map +1 -1
  63. package/dist/tests/driver/cxx-compile-flags.test.d.ts +1 -0
  64. package/dist/tests/driver/cxx-compile-flags.test.js +24 -0
  65. package/dist/tests/driver/cxx-compile-flags.test.js.map +1 -0
  66. package/dist/tests/driver/macos-sdk.test.d.ts +1 -0
  67. package/dist/tests/driver/macos-sdk.test.js +83 -0
  68. package/dist/tests/driver/macos-sdk.test.js.map +1 -0
  69. package/dist/tests/driver/platform-support.test.d.ts +1 -0
  70. package/dist/tests/driver/platform-support.test.js +41 -0
  71. package/dist/tests/driver/platform-support.test.js.map +1 -0
  72. package/dist/tests/driver/prebuilt.test.d.ts +1 -0
  73. package/dist/tests/driver/prebuilt.test.js +44 -0
  74. package/dist/tests/driver/prebuilt.test.js.map +1 -0
  75. package/dist/tests/driver/toolchain-provider.test.js +24 -0
  76. package/dist/tests/driver/toolchain-provider.test.js.map +1 -1
  77. package/dist/tests/driver/toolchain.test.js +23 -0
  78. package/dist/tests/driver/toolchain.test.js.map +1 -1
  79. package/dist/tests/e2e/async-await.test.js +4 -2
  80. package/dist/tests/e2e/async-await.test.js.map +1 -1
  81. package/dist/tests/e2e/compile-node.test.js +21 -0
  82. package/dist/tests/e2e/compile-node.test.js.map +1 -1
  83. package/dist/tests/e2e/fetch.test.js +34 -6
  84. package/dist/tests/e2e/fetch.test.js.map +1 -1
  85. package/dist/tests/e2e/gui-css-coverage.test.d.ts +9 -0
  86. package/dist/tests/e2e/gui-css-coverage.test.js +333 -0
  87. package/dist/tests/e2e/gui-css-coverage.test.js.map +1 -0
  88. package/dist/tests/e2e/gui-css-features.test.d.ts +6 -0
  89. package/dist/tests/e2e/gui-css-features.test.js +270 -0
  90. package/dist/tests/e2e/gui-css-features.test.js.map +1 -0
  91. package/dist/tests/e2e/gui-effects.test.js +92 -11
  92. package/dist/tests/e2e/gui-effects.test.js.map +1 -1
  93. package/dist/tests/e2e/gui-example-pelican3d.test.d.ts +10 -0
  94. package/dist/tests/e2e/gui-example-pelican3d.test.js +94 -0
  95. package/dist/tests/e2e/gui-example-pelican3d.test.js.map +1 -0
  96. package/dist/tests/e2e/gui-font-face.test.d.ts +10 -0
  97. package/dist/tests/e2e/gui-font-face.test.js +142 -0
  98. package/dist/tests/e2e/gui-font-face.test.js.map +1 -0
  99. package/dist/tests/e2e/gui-fonts.test.d.ts +10 -0
  100. package/dist/tests/e2e/gui-fonts.test.js +150 -0
  101. package/dist/tests/e2e/gui-fonts.test.js.map +1 -0
  102. package/dist/tests/e2e/gui-helpers.d.ts +5 -0
  103. package/dist/tests/e2e/gui-helpers.js +4 -0
  104. package/dist/tests/e2e/gui-helpers.js.map +1 -1
  105. package/dist/tests/e2e/gui-layout.test.js +3 -2
  106. package/dist/tests/e2e/gui-layout.test.js.map +1 -1
  107. package/dist/tests/e2e/gui-script.test.js +48 -0
  108. package/dist/tests/e2e/gui-script.test.js.map +1 -1
  109. package/dist/tests/e2e/gui-track-sizing.test.d.ts +6 -0
  110. package/dist/tests/e2e/gui-track-sizing.test.js +173 -0
  111. package/dist/tests/e2e/gui-track-sizing.test.js.map +1 -0
  112. package/dist/tests/e2e/gui-transform.test.js +3 -2
  113. package/dist/tests/e2e/gui-transform.test.js.map +1 -1
  114. package/dist/tests/e2e/unhandled-rejection.test.d.ts +14 -0
  115. package/dist/tests/e2e/unhandled-rejection.test.js +107 -0
  116. package/dist/tests/e2e/unhandled-rejection.test.js.map +1 -0
  117. package/dist/tests/extensions/gui-features.test.js +8 -1
  118. package/dist/tests/extensions/gui-features.test.js.map +1 -1
  119. package/dist/tests/extensions/gui.test.js +44 -0
  120. package/dist/tests/extensions/gui.test.js.map +1 -1
  121. package/dist/tests/scripts/fetch-tarball.test.d.ts +1 -0
  122. package/dist/tests/scripts/fetch-tarball.test.js +70 -0
  123. package/dist/tests/scripts/fetch-tarball.test.js.map +1 -0
  124. package/doc/ai/cli.md +6 -0
  125. package/doc/ai/extensions.md +10 -5
  126. package/doc/ai/language-support.md +1 -0
  127. package/doc/ai/troubleshooting.md +32 -2
  128. package/doc/ai/zh-CN/cli.md +5 -0
  129. package/doc/ai/zh-CN/extensions.md +9 -4
  130. package/doc/ai/zh-CN/language-support.md +1 -0
  131. package/doc/ai/zh-CN/troubleshooting.md +27 -2
  132. package/doc/gui/animation.md +39 -9
  133. package/doc/gui/build.md +13 -8
  134. package/doc/gui/dom.md +23 -5
  135. package/doc/gui/known-issues.md +31 -23
  136. package/doc/gui/layout.md +30 -7
  137. package/doc/gui/rendering.md +84 -26
  138. package/doc/gui/webgl.md +4 -0
  139. package/doc/gui-scripts.md +33 -17
  140. package/doc/gui.md +79 -15
  141. package/doc/implemented/async.md +1 -0
  142. package/doc/implemented/modules.md +9 -6
  143. package/doc/implemented/node/child-process.md +12 -4
  144. package/doc/implemented/runtime-core.md +1 -1
  145. package/doc/npm-package.md +23 -2
  146. package/doc/post/make-js-great-again.md +30 -0
  147. package/doc/requirements.md +31 -0
  148. package/doc/unimplemented/deviations.md +1 -0
  149. package/doc/zh-CN/gui/animation.md +33 -10
  150. package/doc/zh-CN/gui/build.md +9 -7
  151. package/doc/zh-CN/gui/dom.md +19 -4
  152. package/doc/zh-CN/gui/known-issues.md +21 -12
  153. package/doc/zh-CN/gui/layout.md +22 -5
  154. package/doc/zh-CN/gui/rendering.md +61 -20
  155. package/doc/zh-CN/gui/webgl.md +1 -0
  156. package/doc/zh-CN/gui-scripts.md +23 -11
  157. package/doc/zh-CN/gui.md +64 -16
  158. package/doc/zh-CN/implemented/async.md +1 -0
  159. package/doc/zh-CN/implemented/modules.md +8 -4
  160. package/doc/zh-CN/implemented/node/child-process.md +10 -3
  161. package/doc/zh-CN/implemented/runtime-core.md +1 -1
  162. package/doc/zh-CN/npm-package.md +18 -1
  163. package/doc/zh-CN/post/make-js-great-again.md +32 -0
  164. package/doc/zh-CN/requirements.md +25 -0
  165. package/doc/zh-CN/unimplemented/deviations.md +1 -0
  166. package/package.json +7 -7
  167. package/runtime/ext_gui/animation_values.cpp +425 -0
  168. package/runtime/ext_gui/animation_values.h +64 -0
  169. package/runtime/ext_gui/css.cpp +172 -21
  170. package/runtime/ext_gui/css.h +75 -4
  171. package/runtime/ext_gui/css_match.cpp +4 -0
  172. package/runtime/ext_gui/css_sheet.cpp +218 -2
  173. package/runtime/ext_gui/document.cpp +42 -192
  174. package/runtime/ext_gui/document.h +25 -12
  175. package/runtime/ext_gui/document_animation.cpp +428 -0
  176. package/runtime/ext_gui/effect_values.cpp +245 -21
  177. package/runtime/ext_gui/gradient_values.cpp +24 -0
  178. package/runtime/ext_gui/grid_values.cpp +23 -0
  179. package/runtime/ext_gui/gui_cursor.cpp +50 -0
  180. package/runtime/ext_gui/gui_events.cpp +16 -4
  181. package/runtime/ext_gui/gui_internal.h +3 -0
  182. package/runtime/ext_gui/image_api.h +3 -1
  183. package/runtime/ext_gui/image_feature.cpp +4 -2
  184. package/runtime/ext_gui/inline_svg.cpp +95 -8
  185. package/runtime/ext_gui/inline_svg.h +5 -1
  186. package/runtime/ext_gui/layout.cpp +3 -2
  187. package/runtime/ext_gui/layout.h +6 -0
  188. package/runtime/ext_gui/layout_flex.cpp +134 -29
  189. package/runtime/ext_gui/layout_flow.cpp +58 -7
  190. package/runtime/ext_gui/layout_flow_internal.h +39 -4
  191. package/runtime/ext_gui/layout_grid.cpp +31 -0
  192. package/runtime/ext_gui/layout_inline.cpp +26 -2
  193. package/runtime/ext_gui/layout_vertical.cpp +196 -0
  194. package/runtime/ext_gui/paint.cpp +67 -9
  195. package/runtime/ext_gui/paint.h +61 -8
  196. package/runtime/ext_gui/paint_backdrop.cpp +211 -0
  197. package/runtime/ext_gui/paint_background.cpp +175 -97
  198. package/runtime/ext_gui/paint_effects.cpp +12 -6
  199. package/runtime/ext_gui/paint_internal.h +27 -0
  200. package/runtime/ext_gui/paint_outline.cpp +44 -0
  201. package/runtime/ext_gui/paint_shadow.cpp +368 -0
  202. package/runtime/ext_gui/renderer.cpp +15 -7
  203. package/runtime/ext_gui/renderer.h +10 -1
  204. package/runtime/ext_gui/renderer_backdrop.cpp +374 -0
  205. package/runtime/ext_gui/renderer_bitmap.cpp +82 -0
  206. package/runtime/ext_gui/renderer_gradient.cpp +51 -17
  207. package/runtime/ext_gui/renderer_image.cpp +6 -1
  208. package/runtime/ext_gui/renderer_internal.h +21 -0
  209. package/runtime/ext_gui/renderer_layer.cpp +27 -1
  210. package/runtime/ext_gui/renderer_text.cpp +2 -1
  211. package/runtime/ext_gui/style.cpp +62 -8
  212. package/runtime/ext_gui/style.h +111 -4
  213. package/runtime/ext_gui/style_cascade.cpp +83 -0
  214. package/runtime/ext_gui/style_internal.h +13 -1
  215. package/runtime/ext_gui/style_length.cpp +92 -0
  216. package/runtime/ext_gui/style_print.cpp +83 -2
  217. package/runtime/ext_gui/style_svg.cpp +40 -0
  218. package/runtime/ext_gui/style_text.cpp +302 -0
  219. package/runtime/ext_gui/style_ui.cpp +150 -0
  220. package/runtime/ext_gui/style_values.cpp +76 -62
  221. package/runtime/ext_gui/style_values_internal.h +23 -0
  222. package/runtime/ext_gui/text.cpp +4 -2
  223. package/runtime/ext_gui/text.h +11 -4
  224. package/runtime/ext_gui/text_cache.cpp +11 -2
  225. package/runtime/ext_gui/text_font_db.cpp +427 -0
  226. package/runtime/ext_gui/text_font_paths.cpp +250 -0
  227. package/runtime/ext_gui/text_font_paths.h +39 -0
  228. package/runtime/ext_gui/text_font_sfnt.cpp +396 -0
  229. package/runtime/ext_gui/text_font_sfnt.h +44 -0
  230. package/runtime/ext_gui/text_fonts.cpp +348 -0
  231. package/runtime/ext_gui/text_fonts.h +78 -0
  232. package/runtime/ext_gui/text_fonts_internal.h +77 -0
  233. package/runtime/ext_gui/text_hb.cpp +63 -179
  234. package/runtime/ext_gui/text_stb.cpp +49 -193
  235. package/runtime/ext_gui/transform.cpp +107 -9
  236. package/runtime/ext_gui/transform.h +5 -0
  237. package/runtime/ext_gui/window.cpp +1 -1
  238. package/runtime/ext_node/child_process/child_process.c +149 -7
  239. package/runtime/rt.h +4 -0
  240. package/runtime/xt_async.c +4 -0
  241. package/runtime/xt_generator.c +2 -0
  242. package/runtime/xt_loop.c +8 -4
  243. package/runtime/xt_promise.c +103 -0
  244. package/scripts/build-gui.ts +17 -5
  245. package/scripts/build-media.ts +89 -10
  246. package/scripts/build-runtime.ts +7 -2
  247. package/scripts/fetch-tarball.ts +71 -0
  248. package/scripts/gui-build-cache.ts +28 -0
  249. package/scripts/gui-build-options.ts +26 -2
  250. package/scripts/package-release.ts +8 -0
  251. package/src/cli/hints.ts +19 -2
  252. package/src/cli/main.ts +11 -0
  253. package/src/driver/app-artifacts.ts +5 -3
  254. package/src/driver/compiler.ts +167 -56
  255. package/src/driver/icon.ts +3 -2
  256. package/src/driver/macos-sdk.ts +52 -0
  257. package/src/driver/options.ts +6 -0
  258. package/src/driver/platform-support.ts +69 -0
  259. package/src/driver/prebuilt.ts +61 -0
  260. package/src/driver/runtime-objects.ts +26 -5
  261. package/src/driver/toolchain-provider.ts +11 -0
  262. package/src/driver/toolchain.ts +26 -1
  263. package/src/driver/version.ts +1 -1
  264. package/src/driver/win-entry.ts +4 -3
  265. package/src/extensions/gui/features.ts +13 -9
  266. package/src/extensions/gui/html.ts +61 -31
  267. package/src/extensions/node/child_process/index.ts +4 -3
@@ -3,8 +3,8 @@
3
3
  *
4
4
  * Installed by the `shaping` link feature through `text_bridge.c`. HarfBuzz does
5
5
  * shaping (ligatures/kerning/complex scripts), FreeType owns the glyph outlines
6
- * and the vertical metrics. We create one HarfBuzz font per (file, pixel size)
7
- * and scale it so that advances come back in 26.6 pixels.
6
+ * and the vertical metrics. We create one HarfBuzz font per (file, collection
7
+ * index, pixel size) and scale it so that advances come back in 26.6 pixels.
8
8
  *
9
9
  * A run is shaped with a *single* face, but that face rarely covers every
10
10
  * codepoint in it — a CJK face such as Microsoft YaHei / PingFang / Noto Sans
@@ -14,9 +14,15 @@
14
14
  * shaped glyph carries the face it came from so the rasteriser draws it from
15
15
  * the right atlas entry. Without this a missing glyph came back as `.notdef`
16
16
  * (glyph 0) and the renderer silently dropped it.
17
+ *
18
+ * The CSS family/weight/style lookup lives in `text_fonts.cpp`; this backend
19
+ * only loads the concrete `(path, collection index)` candidates it is given, so
20
+ * CFF/OTF and arbitrary system families work here even though the default
21
+ * stb_truetype backend cannot outline them.
17
22
  */
18
23
 
19
24
  #include "text_api.h"
25
+ #include "text_fonts.h"
20
26
 
21
27
  #include <ft2build.h>
22
28
  #include FT_FREETYPE_H
@@ -24,11 +30,9 @@
24
30
  #include <hb.h>
25
31
  #include <hb-ot.h>
26
32
 
27
- #include <cmath>
28
33
  #include <cstddef>
29
34
  #include <cstdint>
30
35
  #include <cstdio>
31
- #include <cstdlib>
32
36
  #include <cstring>
33
37
  #include <memory>
34
38
  #include <string>
@@ -43,7 +47,7 @@ struct HbFont {
43
47
  FT_Face ft_face = nullptr;
44
48
  hb_font_t *hb_font = nullptr;
45
49
  std::string path;
46
- bool monospace = false;
50
+ int face_index = 0;
47
51
  float pixel_size = 16.0f;
48
52
  float ascent = 0;
49
53
  float descent = 0;
@@ -57,79 +61,16 @@ struct HbFont {
57
61
 
58
62
  namespace {
59
63
 
60
- const char *const kSansCandidates[] = {
61
- /* Explicit override wins (also checked per family class below). */
62
- nullptr,
63
- /* Fonts with CJK coverage come first: the default face is a single face, so
64
- * it has to be able to render Chinese/Japanese/Korean text as well as
65
- * Latin (see "Implemented text" in doc/gui.md). */
66
- "C:\\Windows\\Fonts\\msyh.ttc", /* Microsoft YaHei (Win 8.1+) */
67
- "C:\\Windows\\Fonts\\msyh.ttf", /* Microsoft YaHei (Win 7) */
68
- "C:\\Windows\\Fonts\\Deng.ttf", /* DengXian */
69
- "C:\\Windows\\Fonts\\simsun.ttc", /* SimSun */
70
- "/System/Library/Fonts/PingFang.ttc",
71
- "/System/Library/Fonts/STHeiti Light.ttc",
72
- "/System/Library/Fonts/Helvetica.ttc",
73
- "/System/Library/Fonts/Supplemental/Arial.ttf",
74
- "/System/Library/Fonts/Supplemental/Verdana.ttf",
75
- "/Library/Fonts/Arial.ttf",
76
- "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
77
- "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
78
- "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
79
- "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
80
- "/usr/share/fonts/TTF/DejaVuSans.ttf",
81
- "/usr/share/fonts/dejavu/DejaVuSans.ttf",
82
- "C:\\Windows\\Fonts\\segoeui.ttf",
83
- "C:\\Windows\\Fonts\\arial.ttf",
84
- };
85
-
86
- const char *const kMonoCandidates[] = {
87
- nullptr,
88
- "C:\\Windows\\Fonts\\msyh.ttc", /* CJK-capable fallback (see above) */
89
- "/System/Library/Fonts/PingFang.ttc",
90
- "/System/Library/Fonts/Menlo.ttc",
91
- "/System/Library/Fonts/Supplemental/Courier New.ttf",
92
- "/System/Library/Fonts/Courier.ttc",
93
- "/Library/Fonts/Courier New.ttf",
94
- "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
95
- "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf",
96
- "/usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf",
97
- "/usr/share/fonts/TTF/DejaVuSansMono.ttf",
98
- "C:\\Windows\\Fonts\\consola.ttf",
99
- "C:\\Windows\\Fonts\\cour.ttf",
100
- };
101
-
102
- /* Faces tried after the primary one for codepoints it does not cover. Symbol
103
- * faces come first (they carry the geometric shapes, arrows, box drawing and
104
- * dingbats the CJK/Latin primary often lacks), then the other family class so
105
- * a monospace run still gets CJK and a sans run still gets monospace-only
106
- * codepoints. The primary and duplicates are dropped when the chain is built. */
107
- const char *const kSymbolCandidates[] = {
108
- nullptr,
109
- "C:\\Windows\\Fonts\\seguisym.ttf", /* Segoe UI Symbol */
110
- "C:\\Windows\\Fonts\\arialuni.ttf", /* Arial Unicode MS */
111
- "/System/Library/Fonts/Apple Symbols.ttf",
112
- "/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
113
- "/usr/share/fonts/truetype/noto/NotoSansSymbols2-Regular.ttf",
114
- "/usr/share/fonts/truetype/noto/NotoSansSymbols-Regular.ttf",
115
- "/usr/share/fonts/truetype/ancient-scripts/Symbola_hint.ttf",
116
- "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
117
- };
118
-
119
64
  struct Engine {
120
65
  bool initialized = false;
121
66
  FT_Library ft = nullptr;
122
67
  bool ft_ok = false;
123
- std::string sans_path;
124
- std::string mono_path;
125
- std::vector<std::string> sans_fallbacks;
126
- std::vector<std::string> mono_fallbacks;
127
68
  std::unordered_map<std::string, std::unique_ptr<HbFont>> cache; // key -> face (may be null)
128
- std::unordered_map<std::string, std::vector<HbFont *>> fallbacks; // class+size -> faces
129
- std::unordered_map<std::string, hb_face_t *> hb_faces; // path -> face
130
- /** Primary face by (family class, pixel size): `xt_text_hb_resolve` and
131
- * `xt_text_hb_metrics` are called per text box per layout, and building the
132
- * 512-byte path key each time showed up in the profile. */
69
+ std::unordered_map<std::string, std::vector<HbFont *>> fallbacks; // face+size -> faces
70
+ std::unordered_map<std::string, hb_face_t *> hb_faces; // path#index -> face
71
+ /** Primary face by (family, weight, style, pixel size): `resolve` and
72
+ * `metrics` are called per text box per layout, and rebuilding the key each
73
+ * time showed up in the profile. */
133
74
  std::unordered_map<std::string, HbFont *> primary;
134
75
  };
135
76
 
@@ -138,15 +79,6 @@ Engine &engine() {
138
79
  return instance;
139
80
  }
140
81
 
141
- bool fileExists(const char *path) {
142
- FILE *file = fopen(path, "rb");
143
- if (file == nullptr) return false;
144
- fclose(file);
145
- return true;
146
- }
147
-
148
- /* Deliberately crude, deterministic per-byte advance (fraction of the font
149
- * size). Used only when no font file can be loaded. */
150
82
  /* Decode one UTF-8 sequence starting at `index`; advances `index`. */
151
83
  uint32_t decodeUtf8(const std::string &text, size_t &index) {
152
84
  unsigned char first = (unsigned char)text[index];
@@ -185,38 +117,6 @@ uint32_t decodeUtf8(const std::string &text, size_t &index) {
185
117
  return code_point;
186
118
  }
187
119
 
188
- bool isMonospaceFamily(const std::string &family) {
189
- return family.find("mono") != std::string::npos || family.find("courier") != std::string::npos ||
190
- family.find("consol") != std::string::npos || family.find("menlo") != std::string::npos ||
191
- family.find("code") != std::string::npos;
192
- }
193
-
194
- const char *firstExisting(const char *const *candidates, size_t count) {
195
- for (size_t i = 0; i < count; i++) {
196
- if (candidates[i] != nullptr && fileExists(candidates[i])) return candidates[i];
197
- }
198
- return nullptr;
199
- }
200
-
201
- void addFallbackPath(std::vector<std::string> &paths, const char *path) {
202
- if (path == nullptr || !fileExists(path)) return;
203
- for (const std::string &entry : paths) {
204
- if (entry == path) return;
205
- }
206
- paths.push_back(path);
207
- }
208
-
209
- /* The chain for a primary face: every existing symbol face, then the other
210
- * family class (CJK coverage for a monospace primary and vice versa). The
211
- * primary itself is skipped because it is tried first, per codepoint. */
212
- void buildFallbackChain(std::vector<std::string> &paths, const std::string &primary,
213
- const std::string &otherClass) {
214
- for (const char *candidate : kSymbolCandidates) {
215
- if (candidate != nullptr && primary != candidate) addFallbackPath(paths, candidate);
216
- }
217
- if (!otherClass.empty() && otherClass != primary) addFallbackPath(paths, otherClass.c_str());
218
- }
219
-
220
120
  void ensureInitialized() {
221
121
  Engine &e = engine();
222
122
  if (e.initialized) return;
@@ -226,60 +126,37 @@ void ensureInitialized() {
226
126
  return;
227
127
  }
228
128
  e.ft_ok = true;
229
-
230
- const size_t sansCount = sizeof(kSansCandidates) / sizeof(kSansCandidates[0]);
231
- const size_t monoCount = sizeof(kMonoCandidates) / sizeof(kMonoCandidates[0]);
232
-
233
- const char *env = std::getenv("XT_GUI_FONT");
234
- if (env != nullptr && env[0] != '\0' && fileExists(env)) e.sans_path = env;
235
- if (e.sans_path.empty()) {
236
- const char *path = firstExisting(kSansCandidates, sansCount);
237
- if (path != nullptr) e.sans_path = path;
238
- }
239
-
240
- const char *envMono = std::getenv("XT_GUI_FONT_MONO");
241
- if (envMono != nullptr && envMono[0] != '\0' && fileExists(envMono)) {
242
- e.mono_path = envMono;
243
- } else if (env != nullptr && env[0] != '\0' && fileExists(env) && isMonospaceFamily(env)) {
244
- e.mono_path = env;
245
- }
246
- if (e.mono_path.empty()) {
247
- const char *path = firstExisting(kMonoCandidates, monoCount);
248
- if (path != nullptr) e.mono_path = path;
249
- }
250
- /* No dedicated monospace face: reuse the sans face so metrics stay real. */
251
- if (e.mono_path.empty()) e.mono_path = e.sans_path;
252
-
253
- buildFallbackChain(e.sans_fallbacks, e.sans_path, e.mono_path);
254
- buildFallbackChain(e.mono_fallbacks, e.mono_path, e.sans_path);
255
129
  }
256
130
 
257
- hb_face_t *hbFaceForPath(const std::string &path) {
131
+ hb_face_t *hbFaceForPath(const std::string &path, int face_index) {
258
132
  Engine &e = engine();
259
- auto it = e.hb_faces.find(path);
133
+ std::string key = path;
134
+ key += '#';
135
+ key += std::to_string(face_index);
136
+ auto it = e.hb_faces.find(key);
260
137
  if (it != e.hb_faces.end()) return it->second;
261
138
  hb_blob_t *blob = hb_blob_create_from_file(path.c_str());
262
139
  hb_face_t *face = nullptr;
263
140
  if (blob != nullptr && hb_blob_get_length(blob) > 0) {
264
- face = hb_face_create(blob, 0);
141
+ face = hb_face_create(blob, (unsigned)face_index);
265
142
  }
266
143
  if (blob != nullptr) hb_blob_destroy(blob);
267
- e.hb_faces[path] = face;
144
+ e.hb_faces.emplace(std::move(key), face);
268
145
  return face;
269
146
  }
270
147
 
271
- std::unique_ptr<HbFont> createFont(const std::string &path, float pixel_size, bool monospace) {
148
+ std::unique_ptr<HbFont> createFont(const std::string &path, int face_index, float pixel_size) {
272
149
  Engine &e = engine();
273
150
  if (!e.ft_ok || path.empty()) return nullptr;
274
151
 
275
152
  FT_Face face = nullptr;
276
- if (FT_New_Face(e.ft, path.c_str(), 0, &face) != 0) return nullptr;
153
+ if (FT_New_Face(e.ft, path.c_str(), face_index, &face) != 0) return nullptr;
277
154
  FT_Set_Pixel_Sizes(face, 0, (FT_UInt)(pixel_size + 0.5f));
278
155
 
279
156
  auto font = std::make_unique<HbFont>();
280
157
  font->ft_face = face;
281
158
  font->path = path;
282
- font->monospace = monospace;
159
+ font->face_index = face_index;
283
160
  font->pixel_size = pixel_size;
284
161
 
285
162
  FT_Size_Metrics metrics = face->size->metrics;
@@ -287,7 +164,7 @@ std::unique_ptr<HbFont> createFont(const std::string &path, float pixel_size, bo
287
164
  font->descent = -metrics.descender / 64.0f;
288
165
  font->line_height = metrics.height / 64.0f;
289
166
 
290
- hb_face_t *hb_face = hbFaceForPath(path);
167
+ hb_face_t *hb_face = hbFaceForPath(path, face_index);
291
168
  if (hb_face != nullptr) {
292
169
  font->hb_font = hb_font_create(hb_face);
293
170
  hb_ot_font_set_funcs(font->hb_font);
@@ -299,42 +176,46 @@ std::unique_ptr<HbFont> createFont(const std::string &path, float pixel_size, bo
299
176
  return font;
300
177
  }
301
178
 
302
- /* Resolve one face by path, keyed by path+class+size so the primary resolved
303
- * through a `FontSpec` and the same face resolved as a fallback share one
304
- * `HbFont` (and one glyph-atlas key). */
305
- HbFont *resolveFacePath(const std::string &path, float pixel_size, bool monospace) {
179
+ /* Resolve one face by path+index, keyed by path+collection index+size so the
180
+ * primary resolved through a `FontSpec` and the same face resolved as a
181
+ * fallback share one `HbFont` (and one glyph-atlas key). */
182
+ HbFont *resolveFacePath(const std::string &path, int face_index, float pixel_size) {
306
183
  Engine &e = engine();
307
184
  if (!e.ft_ok || path.empty()) return nullptr;
308
- char key[512];
309
- std::snprintf(key, sizeof(key), "p|%c|%.2f|%s", monospace ? 'm' : 's', (double)pixel_size,
310
- path.c_str());
185
+ char header[64];
186
+ std::snprintf(header, sizeof(header), "p|%d|%.2f|", face_index, (double)pixel_size);
187
+ std::string key = header;
188
+ key += path;
311
189
  auto it = e.cache.find(key);
312
190
  if (it != e.cache.end()) return it->second.get();
313
- std::unique_ptr<HbFont> font = createFont(path, pixel_size, monospace);
191
+ std::unique_ptr<HbFont> font = createFont(path, face_index, pixel_size);
314
192
  HbFont *raw = font.get();
315
- e.cache.emplace(key, std::move(font));
193
+ e.cache.emplace(std::move(key), std::move(font));
316
194
  return raw;
317
195
  }
318
196
 
319
- /* The resolved fallback faces for a primary, in order, cached per class+size. */
197
+ /* The resolved fallback faces for a primary, in order, cached per face+size. */
320
198
  const std::vector<HbFont *> &fallbackFaces(HbFont *font) {
321
199
  static const std::vector<HbFont *> kEmpty;
322
200
  if (font == nullptr) return kEmpty;
323
201
  Engine &e = engine();
324
- char key[80];
325
- std::snprintf(key, sizeof(key), "f|%c|%.2f", font->monospace ? 'm' : 's',
326
- (double)font->pixel_size);
202
+ char header[64];
203
+ std::snprintf(header, sizeof(header), "f|%.2f|", (double)font->pixel_size);
204
+ std::string key = header;
205
+ key += font->path;
206
+ key += '#';
207
+ key += std::to_string(font->face_index);
327
208
  auto it = e.fallbacks.find(key);
328
209
  if (it != e.fallbacks.end()) return it->second;
329
210
 
330
- const std::vector<std::string> &paths =
331
- font->monospace ? e.mono_fallbacks : e.sans_fallbacks;
211
+ std::vector<FontFaceRef> candidates;
212
+ xt_font_fallback_faces(FontFaceRef{font->path, font->face_index}, false, candidates);
332
213
  std::vector<HbFont *> faces;
333
- for (const std::string &path : paths) {
334
- HbFont *face = resolveFacePath(path, font->pixel_size, font->monospace);
214
+ for (const FontFaceRef &ref : candidates) {
215
+ HbFont *face = resolveFacePath(ref.path, ref.index, font->pixel_size);
335
216
  if (face != nullptr) faces.push_back(face);
336
217
  }
337
- return e.fallbacks.emplace(key, std::move(faces)).first->second;
218
+ return e.fallbacks.emplace(std::move(key), std::move(faces)).first->second;
338
219
  }
339
220
 
340
221
  /* The face that draws `code_point`: the primary when it has the glyph, else the
@@ -399,21 +280,28 @@ HbFont *xt_text_hb_resolve(const FontSpec &spec) {
399
280
  Engine &e = engine();
400
281
  if (!e.ft_ok) return nullptr;
401
282
 
402
- bool mono = isMonospaceFamily(spec.family);
403
- char key[48];
404
- std::snprintf(key, sizeof(key), "%c|%.4f", mono ? 'm' : 's', (double)spec.pixel_size);
283
+ char suffix[80];
284
+ std::snprintf(suffix, sizeof(suffix), "|%d|%d|%.4f", spec.weight, spec.italic ? 1 : 0,
285
+ (double)spec.pixel_size);
286
+ std::string key = spec.family;
287
+ key += suffix;
405
288
  auto cached = e.primary.find(key);
406
289
  if (cached != e.primary.end()) return cached->second;
407
290
 
408
- const std::string &path = mono ? e.mono_path : e.sans_path;
409
- HbFont *font = path.empty() ? nullptr : resolveFacePath(path, spec.pixel_size, mono);
410
- e.primary.emplace(key, font);
291
+ std::vector<FontFaceRef> faces;
292
+ xt_font_face_candidates(spec, false, faces);
293
+ HbFont *font = nullptr;
294
+ for (const FontFaceRef &ref : faces) {
295
+ font = resolveFacePath(ref.path, ref.index, spec.pixel_size);
296
+ if (font != nullptr) break;
297
+ }
298
+ e.primary.emplace(std::move(key), font);
411
299
  return font;
412
300
  }
413
301
 
414
302
  HbFont *xt_text_hb_scale(HbFont *font, float pixel_size) {
415
303
  if (font == nullptr) return nullptr;
416
- return resolveFacePath(font->path, pixel_size, font->monospace);
304
+ return resolveFacePath(font->path, font->face_index, pixel_size);
417
305
  }
418
306
 
419
307
  float xt_text_hb_shape(const std::string &utf8, HbFont *font, std::vector<ShapedGlyph> &out) {
@@ -479,8 +367,8 @@ void xt_text_hb_metrics(const FontSpec &spec, float *ascent, float *descent, flo
479
367
  }
480
368
 
481
369
  bool xt_text_hb_ready() {
482
- ensureInitialized();
483
- return engine().ft_ok;
370
+ FontSpec spec;
371
+ return xt_text_hb_resolve(spec) != nullptr;
484
372
  }
485
373
 
486
374
  void xt_text_hb_shutdown() {
@@ -499,10 +387,6 @@ void xt_text_hb_shutdown() {
499
387
  }
500
388
  e.ft_ok = false;
501
389
  e.initialized = false;
502
- e.sans_path.clear();
503
- e.mono_path.clear();
504
- e.sans_fallbacks.clear();
505
- e.mono_fallbacks.clear();
506
390
  }
507
391
 
508
392
  } // namespace xtgui