@glassly/miniapp 0.3.7-dev.960 → 0.3.7-dev.963
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.
- package/dist/display/measurer/TextMeasurer.d.ts.map +1 -1
- package/dist/display/measurer/TextMeasurer.js +10 -1
- package/dist/display/measurer/TextMeasurer.js.map +1 -1
- package/dist/display/measurer/script-detection.d.ts +13 -0
- package/dist/display/measurer/script-detection.d.ts.map +1 -1
- package/dist/display/measurer/script-detection.js +84 -0
- package/dist/display/measurer/script-detection.js.map +1 -1
- package/dist/display/wrapper/TextWrapper.d.ts.map +1 -1
- package/dist/display/wrapper/TextWrapper.js +13 -18
- package/dist/display/wrapper/TextWrapper.js.map +1 -1
- package/package.json +2 -2
- package/src/display/measurer/TextMeasurer.ts +9 -1
- package/src/display/measurer/script-detection.ts +90 -0
- package/src/display/wrapper/TextWrapper.ts +13 -19
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextMeasurer.d.ts","sourceRoot":"","sources":["../../../src/display/measurer/TextMeasurer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"TextMeasurer.d.ts","sourceRoot":"","sources":["../../../src/display/measurer/TextMeasurer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAA;AAMjE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,uCAAuC;IACvC,MAAM,EAAE,UAAU,CAAA;IAClB,mEAAmE;IACnE,YAAY,EAAE,OAAO,CAAA;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAA;IACpB,2BAA2B;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,2DAA2D;IAC3D,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED;;;;;;;;;GASG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiC;gBAE/C,OAAO,EAAE,cAAc;IAMnC;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYjC;;;;;OAKG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAoClD;;;;;;;;;;OAUG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAoBjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoC1B;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI/C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,MAAU,GAAG,MAAM;IAyB9E;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAenD;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAItC;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIrC;;OAEG;IACH,UAAU,IAAI,cAAc;IAI5B;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,WAAW,IAAI,MAAM;IAIrB;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIjC;;OAEG;IACH,cAAc,IAAI,MAAM;IAIxB;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;;OAGG;IACH,UAAU,IAAI,IAAI;CAInB"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { detectScript, isUniformWidthScript } from "./script-detection";
|
|
2
|
+
const NON_SPACING_MARK = /^[\p{Mn}\p{Me}]/u;
|
|
3
|
+
const SPACING_MARK = /^\p{Mc}/u;
|
|
2
4
|
/**
|
|
3
5
|
* Measures text width in pixels based on a DisplayProfile.
|
|
4
6
|
* All measurements are in actual rendered pixels, not abstract units.
|
|
@@ -128,8 +130,15 @@ export class TextMeasurer {
|
|
|
128
130
|
return uniformScripts.korean; // ALL Korean chars are exactly this width
|
|
129
131
|
case "cyrillic":
|
|
130
132
|
return uniformScripts.cyrillic; // ALL Cyrillic chars are exactly this width
|
|
133
|
+
case "unsupported":
|
|
134
|
+
// 3. Drawn by the phone's text engine: a combining mark sits on its letter,
|
|
135
|
+
// a non-spacing one adds nothing, a spacing vowel sign about half a letter.
|
|
136
|
+
if (NON_SPACING_MARK.test(char))
|
|
137
|
+
return 0;
|
|
138
|
+
if (SPACING_MARK.test(char))
|
|
139
|
+
return Math.ceil(fallback.latinMaxWidth / 2);
|
|
131
140
|
}
|
|
132
|
-
//
|
|
141
|
+
// 4. Unmapped Latin or unknown: use MAX width (safe fallback)
|
|
133
142
|
// This guarantees we NEVER overflow - worst case is slight under-utilization
|
|
134
143
|
return fallback.latinMaxWidth;
|
|
135
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextMeasurer.js","sourceRoot":"","sources":["../../../src/display/measurer/TextMeasurer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"TextMeasurer.js","sourceRoot":"","sources":["../../../src/display/measurer/TextMeasurer.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,19 @@ export declare const SCRIPT_RANGES: {
|
|
|
23
23
|
* @returns The script type of the character
|
|
24
24
|
*/
|
|
25
25
|
export declare function detectScript(char: string): ScriptType;
|
|
26
|
+
/**
|
|
27
|
+
* Check if a character is a combining mark (a vowel sign, virama, diacritic
|
|
28
|
+
* or variation selector) that draws on the character before it.
|
|
29
|
+
*/
|
|
30
|
+
export declare function isCombiningMark(char: string): boolean;
|
|
31
|
+
/**
|
|
32
|
+
* Split text into the smallest pieces a line may break between: a character
|
|
33
|
+
* with its combining marks, a conjunct joined by a virama, a ZWJ sequence.
|
|
34
|
+
* Breaking inside one would detach a vowel sign from its consonant (drawn as
|
|
35
|
+
* a dotted circle) or split a conjunct. Plain Latin text yields one piece per
|
|
36
|
+
* code point, like `Array.from`.
|
|
37
|
+
*/
|
|
38
|
+
export declare function breakUnits(text: string): string[];
|
|
26
39
|
/**
|
|
27
40
|
* Check if a character is a CJK character (Chinese, Japanese Kanji).
|
|
28
41
|
* CJK characters can break anywhere without needing a hyphen.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-detection.d.ts","sourceRoot":"","sources":["../../../src/display/measurer/script-detection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;CA4DhB,CAAA;
|
|
1
|
+
{"version":3,"file":"script-detection.d.ts","sourceRoot":"","sources":["../../../src/display/measurer/script-detection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;CA4DhB,CAAA;AA2DV;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CA+DrD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGrD;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBjD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CA6BlF"}
|
|
@@ -56,6 +56,48 @@ export const SCRIPT_RANGES = {
|
|
|
56
56
|
[0x1f900, 0x1f9ff], // Supplemental Symbols
|
|
57
57
|
],
|
|
58
58
|
};
|
|
59
|
+
/**
|
|
60
|
+
* Blocks whose letters the glasses' own fonts draw: Latin, Greek, Cyrillic,
|
|
61
|
+
* CJK, kana and Hangul (plus the punctuation and symbol blocks between them).
|
|
62
|
+
* A letter, mark or digit outside these (Devanagari, Bengali, Tamil, Thai,
|
|
63
|
+
* Arabic, Hebrew, Georgian, Ethiopic, ...) is "unsupported": no glasses font
|
|
64
|
+
* has a glyph for it, so it reaches the glasses as a phone raster or not at all.
|
|
65
|
+
*/
|
|
66
|
+
const GLASSES_FONT_RANGES = [
|
|
67
|
+
[0x0000, 0x036f], // Latin, IPA, spacing modifiers, combining diacriticals
|
|
68
|
+
[0x0370, 0x03ff], // Greek
|
|
69
|
+
[0x0400, 0x052f], // Cyrillic
|
|
70
|
+
[0x1100, 0x11ff], // Hangul Jamo
|
|
71
|
+
[0x1c80, 0x1c8f], // Cyrillic Extended-C
|
|
72
|
+
[0x1d00, 0x1dff], // Phonetic extensions, combining diacriticals supplement
|
|
73
|
+
[0x1e00, 0x1fff], // Latin Extended Additional (Vietnamese), Greek Extended
|
|
74
|
+
[0x2000, 0x2bff], // Punctuation, letterlike symbols, arrows, math, shapes
|
|
75
|
+
[0x2c60, 0x2c7f], // Latin Extended-C
|
|
76
|
+
[0x2de0, 0x2dff], // Cyrillic Extended-A
|
|
77
|
+
[0x2e00, 0x9fff], // Supplemental punctuation, CJK radicals and symbols, kana, Bopomofo, CJK ideographs
|
|
78
|
+
[0xa640, 0xa69f], // Cyrillic Extended-B
|
|
79
|
+
[0xa720, 0xa7ff], // Latin Extended-D
|
|
80
|
+
[0xa960, 0xa97f], // Hangul Jamo Extended-A
|
|
81
|
+
[0xab30, 0xab6f], // Latin Extended-E
|
|
82
|
+
[0xac00, 0xd7ff], // Hangul syllables, Jamo Extended-B
|
|
83
|
+
[0xf900, 0xfaff], // CJK compatibility ideographs
|
|
84
|
+
[0xfb00, 0xfb06], // Latin ligatures
|
|
85
|
+
[0xfe00, 0xfe1f], // Variation selectors (invisible), vertical forms
|
|
86
|
+
[0xfe30, 0xfe4f], // CJK compatibility forms
|
|
87
|
+
[0xff00, 0xffef], // Half- and fullwidth forms
|
|
88
|
+
[0x20000, 0x323af], // CJK extensions B..H
|
|
89
|
+
[0xe0000, 0xe01ef], // Tags, variation selectors supplement (invisible)
|
|
90
|
+
];
|
|
91
|
+
const LETTER_MARK_OR_DIGIT = /^[\p{L}\p{M}\p{Nd}]/u;
|
|
92
|
+
const COMBINING_MARK = /^\p{M}/u;
|
|
93
|
+
const LETTER = /^\p{L}/u;
|
|
94
|
+
/** Viramas (and the Khmer coeng, the Myanmar stacker): the next consonant joins them in one conjunct. */
|
|
95
|
+
const VIRAMAS = new Set([
|
|
96
|
+
0x094d, 0x09cd, 0x0a4d, 0x0acd, 0x0b4d, 0x0bcd, 0x0c4d, 0x0ccd, 0x0d4d, 0x0dca, 0x0f84, 0x1039, 0x17d2, 0x1a60,
|
|
97
|
+
0x1b44, 0xa8c4, 0xa9c0,
|
|
98
|
+
]);
|
|
99
|
+
const ZWNJ = 0x200c;
|
|
100
|
+
const ZWJ = 0x200d;
|
|
59
101
|
/**
|
|
60
102
|
* Check if a code point is within any of the given ranges.
|
|
61
103
|
*/
|
|
@@ -117,9 +159,51 @@ export function detectScript(char) {
|
|
|
117
159
|
inRanges(codePoint, SCRIPT_RANGES.emoji)) {
|
|
118
160
|
return "unsupported";
|
|
119
161
|
}
|
|
162
|
+
// A letter of a script no glasses font has (Devanagari, Tamil, Georgian, ...)
|
|
163
|
+
if (!inRanges(codePoint, GLASSES_FONT_RANGES) && LETTER_MARK_OR_DIGIT.test(char)) {
|
|
164
|
+
return "unsupported";
|
|
165
|
+
}
|
|
120
166
|
// Default to Latin for ASCII letters and anything else
|
|
121
167
|
return "latin";
|
|
122
168
|
}
|
|
169
|
+
/**
|
|
170
|
+
* Check if a character is a combining mark (a vowel sign, virama, diacritic
|
|
171
|
+
* or variation selector) that draws on the character before it.
|
|
172
|
+
*/
|
|
173
|
+
export function isCombiningMark(char) {
|
|
174
|
+
const codePoint = char.codePointAt(0);
|
|
175
|
+
return codePoint !== undefined && codePoint >= 0x300 && COMBINING_MARK.test(char);
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* Split text into the smallest pieces a line may break between: a character
|
|
179
|
+
* with its combining marks, a conjunct joined by a virama, a ZWJ sequence.
|
|
180
|
+
* Breaking inside one would detach a vowel sign from its consonant (drawn as
|
|
181
|
+
* a dotted circle) or split a conjunct. Plain Latin text yields one piece per
|
|
182
|
+
* code point, like `Array.from`.
|
|
183
|
+
*/
|
|
184
|
+
export function breakUnits(text) {
|
|
185
|
+
const units = [];
|
|
186
|
+
let afterVirama = false;
|
|
187
|
+
let afterZwj = false;
|
|
188
|
+
for (const char of text) {
|
|
189
|
+
const codePoint = char.codePointAt(0) ?? 0;
|
|
190
|
+
const attach = units.length > 0 &&
|
|
191
|
+
(afterZwj ||
|
|
192
|
+
isCombiningMark(char) ||
|
|
193
|
+
codePoint === ZWJ ||
|
|
194
|
+
codePoint === ZWNJ ||
|
|
195
|
+
(afterVirama && LETTER.test(char)));
|
|
196
|
+
if (attach) {
|
|
197
|
+
units[units.length - 1] += char;
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
units.push(char);
|
|
201
|
+
}
|
|
202
|
+
afterVirama = VIRAMAS.has(codePoint);
|
|
203
|
+
afterZwj = codePoint === ZWJ;
|
|
204
|
+
}
|
|
205
|
+
return units;
|
|
206
|
+
}
|
|
123
207
|
/**
|
|
124
208
|
* Check if a character is a CJK character (Chinese, Japanese Kanji).
|
|
125
209
|
* CJK characters can break anywhere without needing a hyphen.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-detection.js","sourceRoot":"","sources":["../../../src/display/measurer/script-detection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"script-detection.js","sourceRoot":"","sources":["../../../src/display/measurer/script-detection.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,yBAAyB;IACzB,GAAG,EAAE;QACH,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,8CAA8C;QAChE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;QAChC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;QAClC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;QAClC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;QAClC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,2BAA2B;KACrC;IAEV,oBAAoB;IACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAU;IAErC,oBAAoB;IACpB,QAAQ,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa;QAC/B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB;KAChC;IAEV,SAAS;IACT,MAAM,EAAE;QACN,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;QACrC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;QAChC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,qBAAqB;QACvC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB;QACpC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB;KAC5B;IAEV,WAAW;IACX,QAAQ,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa;QAC/B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa;KACvB;IAEV,kBAAkB;IAClB,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAU;IAEhC,4BAA4B;IAC5B,WAAW,EAAE;QACX,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,8BAA8B;QAC5C,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,mBAAmB;QACjC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,gBAAgB;QAC9B,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,cAAc;KACpB;IAEV,sCAAsC;IACtC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAU;IACnC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAU;IACnC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAU;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,YAAY;QAChC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,+BAA+B;QACnD,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB;QACxC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ;QAC5B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe;QACjC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;QAC7B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB;QACxC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,uBAAuB;KACnC;CACF,CAAA;AAEV;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG;IAC1B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,wDAAwD;IAC1E,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ;IAC1B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAC7B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;IAChC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB;IACxC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,yDAAyD;IAC3E,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,yDAAyD;IAC3E,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,wDAAwD;IAC1E,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IACrC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB;IACxC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,qFAAqF;IACvG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB;IACxC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IACrC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,yBAAyB;IAC3C,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IACrC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,oCAAoC;IACtD,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,+BAA+B;IACjD,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB;IACpC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,kDAAkD;IACpE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC5C,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,4BAA4B;IAC9C,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAC1C,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,mDAAmD;CAC/D,CAAA;AAEV,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AACnD,MAAM,cAAc,GAAG,SAAS,CAAA;AAChC,MAAM,MAAM,GAAG,SAAS,CAAA;AAExB,yGAAyG;AACzG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAC9G,MAAM,EAAE,MAAM,EAAE,MAAM;CACvB,CAAC,CAAA;AACF,MAAM,IAAI,GAAG,MAAM,CAAA;AACnB,MAAM,GAAG,GAAG,MAAM,CAAA;AAElB;;GAEG;AACH,SAAS,QAAQ,CAAC,SAAiB,EAAE,MAA8C;IACjF,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;QAClC,IAAI,SAAS,IAAI,KAAK,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,0EAA0E;IAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACrC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,sDAAsD;IAEtD,mCAAmC;IACnC,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,gBAAgB;IAChB,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChD,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,SAAS;IACT,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,WAAW;IACX,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,UAAU;IACV,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,cAAc;IACd,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,sBAAsB;IACtB,IACE,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC;QACzC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC;QACzC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC;QACvC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,EACxC,CAAC;QACD,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,8EAA8E;IAC9E,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACjF,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,uDAAuD;IACvD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACrC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,IAAI,KAAK,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,WAAW,GAAG,KAAK,CAAA;IACvB,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,MAAM,GACV,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,CAAC,QAAQ;gBACP,eAAe,CAAC,IAAI,CAAC;gBACrB,SAAS,KAAK,GAAG;gBACjB,SAAS,KAAK,IAAI;gBAClB,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACvC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC;QACD,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,QAAQ,GAAG,SAAS,KAAK,GAAG,CAAA;IAC9B,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,OAAO,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,UAAU,CAAA;AAC3E,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAA;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,OAAO,CACL,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,UAAU,CACnH,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,aAAa,CAAA;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAAkB,EAAE,SAAiB;IACvE,kDAAkD;IAClD,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,8BAA8B;IAC9B,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,+BAA+B;IAC/B,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,qEAAqE;IACrE,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;IACxD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,sDAAsD;IACtD,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextWrapper.d.ts","sourceRoot":"","sources":["../../../src/display/wrapper/TextWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAA;AAErD,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAyB,MAAM,SAAS,CAAA;AAG5E;;;;;;;;;;;;;;GAcG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;gBAE1C,QAAQ,EAAE,YAAY,EAAE,cAAc,CAAC,EAAE,WAAW;IAahE;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,UAAU;IA2ErD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAI1D;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO;IAKrD;;OAEG;IACH,UAAU,IAAI,QAAQ,CAAC,WAAW,CAAC;IAInC;;OAEG;IACH,WAAW,IAAI,YAAY;IAI3B;;OAEG;IACH,OAAO,CAAC,aAAa;IA+BrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAIjC;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA2EjC;;OAEG;IACH,OAAO,CAAC,YAAY;IA2DpB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4C1B;;;OAGG;IACH,OAAO,CAAC,cAAc;IA6BtB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAgDzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"TextWrapper.d.ts","sourceRoot":"","sources":["../../../src/display/wrapper/TextWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAA;AAErD,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAyB,MAAM,SAAS,CAAA;AAG5E;;;;;;;;;;;;;;GAcG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;gBAE1C,QAAQ,EAAE,YAAY,EAAE,cAAc,CAAC,EAAE,WAAW;IAahE;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,UAAU;IA2ErD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAI1D;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO;IAKrD;;OAEG;IACH,UAAU,IAAI,QAAQ,CAAC,WAAW,CAAC;IAInC;;OAEG;IACH,WAAW,IAAI,YAAY;IAI3B;;OAEG;IACH,OAAO,CAAC,aAAa;IA+BrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAIjC;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA2EjC;;OAEG;IACH,OAAO,CAAC,YAAY;IA2DpB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4C1B;;;OAGG;IACH,OAAO,CAAC,cAAc;IA6BtB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAgDzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA0BxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAoB1B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isCJKCharacter, needsHyphenForBreak } from "../measurer/script-detection";
|
|
1
|
+
import { breakUnits, isCJKCharacter, needsHyphenForBreak } from "../measurer/script-detection";
|
|
2
2
|
import { DEFAULT_WRAP_OPTIONS } from "./types";
|
|
3
3
|
/**
|
|
4
4
|
* Wraps text to fit display constraints.
|
|
@@ -173,10 +173,10 @@ export class TextWrapper {
|
|
|
173
173
|
const hyphenWidth = this.measurer.measureChar(opts.hyphenChar);
|
|
174
174
|
let currentLine = "";
|
|
175
175
|
let currentWidth = 0;
|
|
176
|
-
const chars =
|
|
176
|
+
const chars = breakUnits(text);
|
|
177
177
|
for (let i = 0; i < chars.length; i++) {
|
|
178
178
|
const char = chars[i];
|
|
179
|
-
const charWidth = this.measurer.
|
|
179
|
+
const charWidth = this.measurer.measureText(char);
|
|
180
180
|
// Would this character fit?
|
|
181
181
|
if (currentWidth + charWidth <= maxWidthPx) {
|
|
182
182
|
currentLine += char;
|
|
@@ -367,12 +367,12 @@ export class TextWrapper {
|
|
|
367
367
|
hyphenateLongWord(word, maxWidthPx, opts) {
|
|
368
368
|
const lines = [];
|
|
369
369
|
const hyphenWidth = this.measurer.measureChar(opts.hyphenChar);
|
|
370
|
-
const chars =
|
|
370
|
+
const chars = breakUnits(word);
|
|
371
371
|
let currentLine = "";
|
|
372
372
|
let currentWidth = 0;
|
|
373
373
|
for (let i = 0; i < chars.length; i++) {
|
|
374
374
|
const char = chars[i];
|
|
375
|
-
const charWidth = this.measurer.
|
|
375
|
+
const charWidth = this.measurer.measureText(char);
|
|
376
376
|
const isLastChar = i === chars.length - 1;
|
|
377
377
|
// Check if we need to break (leaving room for hyphen if not last char)
|
|
378
378
|
const widthNeeded = isLastChar ? charWidth : charWidth + hyphenWidth;
|
|
@@ -413,25 +413,20 @@ export class TextWrapper {
|
|
|
413
413
|
* Returns null if we back off to a space (natural break point - no hyphen needed).
|
|
414
414
|
*/
|
|
415
415
|
backoffForHyphen(line, lineWidth, maxWidthPx, hyphenWidth, opts) {
|
|
416
|
-
|
|
416
|
+
const units = breakUnits(line);
|
|
417
|
+
let kept = units.length;
|
|
417
418
|
let adjustedWidth = lineWidth;
|
|
418
|
-
let remainder = "";
|
|
419
419
|
// Remove characters until hyphen fits
|
|
420
|
-
while (adjustedWidth + hyphenWidth > maxWidthPx &&
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
adjustedLine = adjustedLine.slice(0, -1);
|
|
424
|
-
adjustedWidth -= lastCharWidth;
|
|
425
|
-
remainder = lastChar + remainder;
|
|
420
|
+
while (adjustedWidth + hyphenWidth > maxWidthPx && kept > opts.minCharsBeforeHyphen) {
|
|
421
|
+
kept--;
|
|
422
|
+
adjustedWidth -= this.measurer.measureText(units[kept]);
|
|
426
423
|
// If we've backed off to a space, we've found a natural word boundary
|
|
427
424
|
// No hyphen is needed - just trim the space and break there
|
|
428
|
-
if (
|
|
429
|
-
|
|
430
|
-
adjustedLine = adjustedLine.trimEnd();
|
|
431
|
-
return { line: adjustedLine, remainder, skipHyphen: true };
|
|
425
|
+
if (kept > 0 && units[kept - 1] === " ") {
|
|
426
|
+
return { line: units.slice(0, kept).join("").trimEnd(), remainder: units.slice(kept).join(""), skipHyphen: true };
|
|
432
427
|
}
|
|
433
428
|
}
|
|
434
|
-
return { line:
|
|
429
|
+
return { line: units.slice(0, kept).join(""), remainder: units.slice(kept).join(""), skipHyphen: false };
|
|
435
430
|
}
|
|
436
431
|
/**
|
|
437
432
|
* Merge user options with defaults.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextWrapper.js","sourceRoot":"","sources":["../../../src/display/wrapper/TextWrapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TextWrapper.js","sourceRoot":"","sources":["../../../src/display/wrapper/TextWrapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@glassly/miniapp",
|
|
3
|
-
"version": "0.3.7-dev.
|
|
3
|
+
"version": "0.3.7-dev.963",
|
|
4
4
|
"description": "SDK for building Glassly local miniapps (browser/WebView)",
|
|
5
5
|
"author": "Glassly Labs",
|
|
6
6
|
"license": "MIT",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
}
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@glassly/cloud-protocol": "0.3.7-dev.
|
|
76
|
+
"@glassly/cloud-protocol": "0.3.7-dev.963",
|
|
77
77
|
"eventemitter3": "^5.0.1"
|
|
78
78
|
},
|
|
79
79
|
"devDependencies": {
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import type {DisplayProfile, ScriptType} from "../profiles/types"
|
|
2
2
|
import {detectScript, isUniformWidthScript} from "./script-detection"
|
|
3
3
|
|
|
4
|
+
const NON_SPACING_MARK = /^[\p{Mn}\p{Me}]/u
|
|
5
|
+
const SPACING_MARK = /^\p{Mc}/u
|
|
6
|
+
|
|
4
7
|
/**
|
|
5
8
|
* Character measurement result with detailed breakdown.
|
|
6
9
|
*/
|
|
@@ -179,9 +182,14 @@ export class TextMeasurer {
|
|
|
179
182
|
return uniformScripts.korean // ALL Korean chars are exactly this width
|
|
180
183
|
case "cyrillic":
|
|
181
184
|
return uniformScripts.cyrillic // ALL Cyrillic chars are exactly this width
|
|
185
|
+
case "unsupported":
|
|
186
|
+
// 3. Drawn by the phone's text engine: a combining mark sits on its letter,
|
|
187
|
+
// a non-spacing one adds nothing, a spacing vowel sign about half a letter.
|
|
188
|
+
if (NON_SPACING_MARK.test(char)) return 0
|
|
189
|
+
if (SPACING_MARK.test(char)) return Math.ceil(fallback.latinMaxWidth / 2)
|
|
182
190
|
}
|
|
183
191
|
|
|
184
|
-
//
|
|
192
|
+
// 4. Unmapped Latin or unknown: use MAX width (safe fallback)
|
|
185
193
|
// This guarantees we NEVER overflow - worst case is slight under-utilization
|
|
186
194
|
return fallback.latinMaxWidth
|
|
187
195
|
}
|
|
@@ -66,6 +66,51 @@ export const SCRIPT_RANGES = {
|
|
|
66
66
|
] as const,
|
|
67
67
|
} as const
|
|
68
68
|
|
|
69
|
+
/**
|
|
70
|
+
* Blocks whose letters the glasses' own fonts draw: Latin, Greek, Cyrillic,
|
|
71
|
+
* CJK, kana and Hangul (plus the punctuation and symbol blocks between them).
|
|
72
|
+
* A letter, mark or digit outside these (Devanagari, Bengali, Tamil, Thai,
|
|
73
|
+
* Arabic, Hebrew, Georgian, Ethiopic, ...) is "unsupported": no glasses font
|
|
74
|
+
* has a glyph for it, so it reaches the glasses as a phone raster or not at all.
|
|
75
|
+
*/
|
|
76
|
+
const GLASSES_FONT_RANGES = [
|
|
77
|
+
[0x0000, 0x036f], // Latin, IPA, spacing modifiers, combining diacriticals
|
|
78
|
+
[0x0370, 0x03ff], // Greek
|
|
79
|
+
[0x0400, 0x052f], // Cyrillic
|
|
80
|
+
[0x1100, 0x11ff], // Hangul Jamo
|
|
81
|
+
[0x1c80, 0x1c8f], // Cyrillic Extended-C
|
|
82
|
+
[0x1d00, 0x1dff], // Phonetic extensions, combining diacriticals supplement
|
|
83
|
+
[0x1e00, 0x1fff], // Latin Extended Additional (Vietnamese), Greek Extended
|
|
84
|
+
[0x2000, 0x2bff], // Punctuation, letterlike symbols, arrows, math, shapes
|
|
85
|
+
[0x2c60, 0x2c7f], // Latin Extended-C
|
|
86
|
+
[0x2de0, 0x2dff], // Cyrillic Extended-A
|
|
87
|
+
[0x2e00, 0x9fff], // Supplemental punctuation, CJK radicals and symbols, kana, Bopomofo, CJK ideographs
|
|
88
|
+
[0xa640, 0xa69f], // Cyrillic Extended-B
|
|
89
|
+
[0xa720, 0xa7ff], // Latin Extended-D
|
|
90
|
+
[0xa960, 0xa97f], // Hangul Jamo Extended-A
|
|
91
|
+
[0xab30, 0xab6f], // Latin Extended-E
|
|
92
|
+
[0xac00, 0xd7ff], // Hangul syllables, Jamo Extended-B
|
|
93
|
+
[0xf900, 0xfaff], // CJK compatibility ideographs
|
|
94
|
+
[0xfb00, 0xfb06], // Latin ligatures
|
|
95
|
+
[0xfe00, 0xfe1f], // Variation selectors (invisible), vertical forms
|
|
96
|
+
[0xfe30, 0xfe4f], // CJK compatibility forms
|
|
97
|
+
[0xff00, 0xffef], // Half- and fullwidth forms
|
|
98
|
+
[0x20000, 0x323af], // CJK extensions B..H
|
|
99
|
+
[0xe0000, 0xe01ef], // Tags, variation selectors supplement (invisible)
|
|
100
|
+
] as const
|
|
101
|
+
|
|
102
|
+
const LETTER_MARK_OR_DIGIT = /^[\p{L}\p{M}\p{Nd}]/u
|
|
103
|
+
const COMBINING_MARK = /^\p{M}/u
|
|
104
|
+
const LETTER = /^\p{L}/u
|
|
105
|
+
|
|
106
|
+
/** Viramas (and the Khmer coeng, the Myanmar stacker): the next consonant joins them in one conjunct. */
|
|
107
|
+
const VIRAMAS = new Set([
|
|
108
|
+
0x094d, 0x09cd, 0x0a4d, 0x0acd, 0x0b4d, 0x0bcd, 0x0c4d, 0x0ccd, 0x0d4d, 0x0dca, 0x0f84, 0x1039, 0x17d2, 0x1a60,
|
|
109
|
+
0x1b44, 0xa8c4, 0xa9c0,
|
|
110
|
+
])
|
|
111
|
+
const ZWNJ = 0x200c
|
|
112
|
+
const ZWJ = 0x200d
|
|
113
|
+
|
|
69
114
|
/**
|
|
70
115
|
* Check if a code point is within any of the given ranges.
|
|
71
116
|
*/
|
|
@@ -140,10 +185,55 @@ export function detectScript(char: string): ScriptType {
|
|
|
140
185
|
return "unsupported"
|
|
141
186
|
}
|
|
142
187
|
|
|
188
|
+
// A letter of a script no glasses font has (Devanagari, Tamil, Georgian, ...)
|
|
189
|
+
if (!inRanges(codePoint, GLASSES_FONT_RANGES) && LETTER_MARK_OR_DIGIT.test(char)) {
|
|
190
|
+
return "unsupported"
|
|
191
|
+
}
|
|
192
|
+
|
|
143
193
|
// Default to Latin for ASCII letters and anything else
|
|
144
194
|
return "latin"
|
|
145
195
|
}
|
|
146
196
|
|
|
197
|
+
/**
|
|
198
|
+
* Check if a character is a combining mark (a vowel sign, virama, diacritic
|
|
199
|
+
* or variation selector) that draws on the character before it.
|
|
200
|
+
*/
|
|
201
|
+
export function isCombiningMark(char: string): boolean {
|
|
202
|
+
const codePoint = char.codePointAt(0)
|
|
203
|
+
return codePoint !== undefined && codePoint >= 0x300 && COMBINING_MARK.test(char)
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Split text into the smallest pieces a line may break between: a character
|
|
208
|
+
* with its combining marks, a conjunct joined by a virama, a ZWJ sequence.
|
|
209
|
+
* Breaking inside one would detach a vowel sign from its consonant (drawn as
|
|
210
|
+
* a dotted circle) or split a conjunct. Plain Latin text yields one piece per
|
|
211
|
+
* code point, like `Array.from`.
|
|
212
|
+
*/
|
|
213
|
+
export function breakUnits(text: string): string[] {
|
|
214
|
+
const units: string[] = []
|
|
215
|
+
let afterVirama = false
|
|
216
|
+
let afterZwj = false
|
|
217
|
+
for (const char of text) {
|
|
218
|
+
const codePoint = char.codePointAt(0) ?? 0
|
|
219
|
+
const attach =
|
|
220
|
+
units.length > 0 &&
|
|
221
|
+
(afterZwj ||
|
|
222
|
+
isCombiningMark(char) ||
|
|
223
|
+
codePoint === ZWJ ||
|
|
224
|
+
codePoint === ZWNJ ||
|
|
225
|
+
(afterVirama && LETTER.test(char)))
|
|
226
|
+
if (attach) {
|
|
227
|
+
units[units.length - 1] += char
|
|
228
|
+
} else {
|
|
229
|
+
units.push(char)
|
|
230
|
+
}
|
|
231
|
+
afterVirama = VIRAMAS.has(codePoint)
|
|
232
|
+
afterZwj = codePoint === ZWJ
|
|
233
|
+
}
|
|
234
|
+
return units
|
|
235
|
+
}
|
|
236
|
+
|
|
147
237
|
/**
|
|
148
238
|
* Check if a character is a CJK character (Chinese, Japanese Kanji).
|
|
149
239
|
* CJK characters can break anywhere without needing a hyphen.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {TextMeasurer} from "../measurer/TextMeasurer"
|
|
2
|
-
import {isCJKCharacter, needsHyphenForBreak} from "../measurer/script-detection"
|
|
2
|
+
import {breakUnits, isCJKCharacter, needsHyphenForBreak} from "../measurer/script-detection"
|
|
3
3
|
import type {WrapOptions, WrapResult, LineMetrics, BreakMode} from "./types"
|
|
4
4
|
import {DEFAULT_WRAP_OPTIONS} from "./types"
|
|
5
5
|
|
|
@@ -217,11 +217,11 @@ export class TextWrapper {
|
|
|
217
217
|
let currentLine = ""
|
|
218
218
|
let currentWidth = 0
|
|
219
219
|
|
|
220
|
-
const chars =
|
|
220
|
+
const chars = breakUnits(text)
|
|
221
221
|
|
|
222
222
|
for (let i = 0; i < chars.length; i++) {
|
|
223
223
|
const char = chars[i]
|
|
224
|
-
const charWidth = this.measurer.
|
|
224
|
+
const charWidth = this.measurer.measureText(char)
|
|
225
225
|
|
|
226
226
|
// Would this character fit?
|
|
227
227
|
if (currentWidth + charWidth <= maxWidthPx) {
|
|
@@ -429,14 +429,14 @@ export class TextWrapper {
|
|
|
429
429
|
private hyphenateLongWord(word: string, maxWidthPx: number, opts: Required<WrapOptions>): string[] {
|
|
430
430
|
const lines: string[] = []
|
|
431
431
|
const hyphenWidth = this.measurer.measureChar(opts.hyphenChar)
|
|
432
|
-
const chars =
|
|
432
|
+
const chars = breakUnits(word)
|
|
433
433
|
|
|
434
434
|
let currentLine = ""
|
|
435
435
|
let currentWidth = 0
|
|
436
436
|
|
|
437
437
|
for (let i = 0; i < chars.length; i++) {
|
|
438
438
|
const char = chars[i]
|
|
439
|
-
const charWidth = this.measurer.
|
|
439
|
+
const charWidth = this.measurer.measureText(char)
|
|
440
440
|
const isLastChar = i === chars.length - 1
|
|
441
441
|
|
|
442
442
|
// Check if we need to break (leaving room for hyphen if not last char)
|
|
@@ -485,29 +485,23 @@ export class TextWrapper {
|
|
|
485
485
|
hyphenWidth: number,
|
|
486
486
|
opts: Required<WrapOptions>,
|
|
487
487
|
): {line: string; remainder: string; skipHyphen: boolean} {
|
|
488
|
-
|
|
488
|
+
const units = breakUnits(line)
|
|
489
|
+
let kept = units.length
|
|
489
490
|
let adjustedWidth = lineWidth
|
|
490
|
-
let remainder = ""
|
|
491
491
|
|
|
492
492
|
// Remove characters until hyphen fits
|
|
493
|
-
while (adjustedWidth + hyphenWidth > maxWidthPx &&
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
adjustedLine = adjustedLine.slice(0, -1)
|
|
498
|
-
adjustedWidth -= lastCharWidth
|
|
499
|
-
remainder = lastChar + remainder
|
|
493
|
+
while (adjustedWidth + hyphenWidth > maxWidthPx && kept > opts.minCharsBeforeHyphen) {
|
|
494
|
+
kept--
|
|
495
|
+
adjustedWidth -= this.measurer.measureText(units[kept])
|
|
500
496
|
|
|
501
497
|
// If we've backed off to a space, we've found a natural word boundary
|
|
502
498
|
// No hyphen is needed - just trim the space and break there
|
|
503
|
-
if (
|
|
504
|
-
|
|
505
|
-
adjustedLine = adjustedLine.trimEnd()
|
|
506
|
-
return {line: adjustedLine, remainder, skipHyphen: true}
|
|
499
|
+
if (kept > 0 && units[kept - 1] === " ") {
|
|
500
|
+
return {line: units.slice(0, kept).join("").trimEnd(), remainder: units.slice(kept).join(""), skipHyphen: true}
|
|
507
501
|
}
|
|
508
502
|
}
|
|
509
503
|
|
|
510
|
-
return {line:
|
|
504
|
+
return {line: units.slice(0, kept).join(""), remainder: units.slice(kept).join(""), skipHyphen: false}
|
|
511
505
|
}
|
|
512
506
|
|
|
513
507
|
/**
|