@pdfme/ui 6.1.13-dev.22 → 6.1.13-dev.24

package/dist/index.js

@@ -22191,6 +22191,43 @@ var pdfDocEncodingDecode = (bytes) => {
 	for (let idx = 0, len = bytes.length; idx < len; idx++) codePoints[idx] = pdfDocEncodingToUnicode[bytes[idx]];
 	return String.fromCodePoint(...codePoints);
 };
+var MARK_CRITICAL_SCRIPTS = [{
+	name: "thai",
+	test: /\p{Script=Thai}/u
+}, {
+	name: "lao",
+	test: /\p{Script=Lao}/u
+}];
+var MARK_CRITICAL_ANY = /[\p{Script=Thai}\p{Script=Lao}]/u;
+var NEUTRAL = /[\p{Script=Common}\p{Script=Inherited}]/u;
+var classifyCodePoint = (ch) => {
+	if (NEUTRAL.test(ch)) return null;
+	for (const { name, test } of MARK_CRITICAL_SCRIPTS) if (test.test(ch)) return name;
+	return "default";
+};
+/**
+* Split `text` into shaping runs at Thai/Lao script boundaries.
+* Concatenating the result always reproduces the input.
+*/
+var splitTextIntoShapingRuns = (text) => {
+	if (text.length === 0) return [];
+	if (!MARK_CRITICAL_ANY.test(text)) return [text];
+	const runs = [];
+	let current = "";
+	let currentClass = null;
+	for (const ch of text) {
+		const cls = classifyCodePoint(ch);
+		if (!(cls === null || currentClass === null || currentClass === cls) && current.length > 0) {
+			runs.push(current);
+			current = "";
+			currentClass = null;
+		}
+		current += ch;
+		if (cls !== null) currentClass = cls;
+	}
+	if (current.length > 0) runs.push(current);
+	return runs;
+};
 function _typeof$18(o) {
 	"@babel/helpers - typeof";
 	return _typeof$18 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -24599,12 +24636,15 @@ var CustomFontEmbedder = class CustomFontEmbedder {
 		_defineProperty$13(this, "fontFeatures", void 0);
 		_defineProperty$13(this, "baseFontName", void 0);
 		_defineProperty$13(this, "glyphCache", void 0);
+		_defineProperty$13(this, "shapedGlyphsById", void 0);
 		_defineProperty$13(this, "allGlyphsInFontSortedById", () => {
-			const glyphs = Array(this.font.characterSet.length);
-			for (let idx = 0, len = glyphs.length; idx < len; idx++) {
+			const glyphs = Array(this.font.characterSet.length + this.shapedGlyphsById.size);
+			for (let idx = 0, len = this.font.characterSet.length; idx < len; idx++) {
 				const codePoint = this.font.characterSet[idx];
 				glyphs[idx] = this.font.glyphForCodePoint(codePoint);
 			}
+			let extraIdx = this.font.characterSet.length;
+			for (const glyph of this.shapedGlyphsById.values()) glyphs[extraIdx++] = glyph;
 			return sortedUniq(glyphs.sort(byAscendingId), (g) => g.id);
 		});
 		this.font = font;
@@ -24614,6 +24654,7 @@ var CustomFontEmbedder = class CustomFontEmbedder {
 		this.customName = customName;
 		this.fontFeatures = fontFeatures;
 		this.baseFontName = "";
+		this.shapedGlyphsById = /* @__PURE__ */ new Map();
 		this.glyphCache = Cache.populatedBy(this.allGlyphsInFontSortedById);
 	}
 	/**
@@ -24621,18 +24662,54 @@ var CustomFontEmbedder = class CustomFontEmbedder {
 	* Unicode, but embedded fonts use their own custom encodings)
 	*/
 	encodeText(text) {
-		const { glyphs } = this.font.layout(text, this.fontFeatures);
+		const glyphs = this.layoutGlyphs(text);
 		const hexCodes = Array(glyphs.length);
 		for (let idx = 0, len = glyphs.length; idx < len; idx++) hexCodes[idx] = toHexStringOfMinLength(glyphs[idx].id, 4);
 		return PDFHexString.of(hexCodes.join(""));
 	}
 	widthOfTextAtSize(text, size) {
-		const { glyphs } = this.font.layout(text, this.fontFeatures);
+		const glyphs = this.layoutGlyphs(text);
 		let totalWidth = 0;
 		for (let idx = 0, len = glyphs.length; idx < len; idx++) totalWidth += glyphs[idx].advanceWidth * this.scale;
 		const scale = size / 1e3;
 		return totalWidth * scale;
 	}
+	/**
+	* Layout `text` as one or more fontkit runs. Thai/Lao spans are shaped
+	* separately so GSUB mark variants are selected even when Latin/CJK leads.
+	* A script tag is never passed — each run has one strong script, so fontkit
+	* auto-detection matches the script we would have specified.
+	*/
+	layoutGlyphs(text) {
+		const runs = splitTextIntoShapingRuns(text);
+		let glyphs;
+		if (runs.length <= 1) glyphs = this.font.layout(runs[0] ?? "", this.fontFeatures).glyphs;
+		else {
+			glyphs = [];
+			for (const run of runs) {
+				const runGlyphs = this.font.layout(run, this.fontFeatures).glyphs;
+				for (let idx = 0, len = runGlyphs.length; idx < len; idx++) glyphs.push(runGlyphs[idx]);
+			}
+		}
+		this.registerShapedGlyphs(glyphs);
+		return glyphs;
+	}
+	/**
+	* GSUB can emit glyphs that are not in `font.characterSet` (e.g. Sarabun
+	* tone gid 736). Retain those objects so `computeWidths()` and
+	* `embedUnicodeCmap()` include them when the full font is embedded.
+	*/
+	registerShapedGlyphs(glyphs) {
+		let added = false;
+		for (let idx = 0, len = glyphs.length; idx < len; idx++) {
+			const glyph = glyphs[idx];
+			if (!this.shapedGlyphsById.has(glyph.id)) {
+				this.shapedGlyphsById.set(glyph.id, glyph);
+				added = true;
+			}
+		}
+		if (added) this.glyphCache.invalidate();
+	}
 	heightOfFontAtSize(size, options = {}) {
 		const { descender = true } = options;
 		const { ascent, descent, bbox } = this.font;
@@ -24767,8 +24844,9 @@ var CustomFontSubsetEmbedder = class CustomFontSubsetEmbedder extends CustomFont
 		this.glyphCache = Cache.populatedBy(() => this.glyphs);
 		this.glyphIdMap = /* @__PURE__ */ new Map();
 	}
+	registerShapedGlyphs(_glyphs) {}
 	encodeText(text) {
-		const { glyphs } = this.font.layout(text, this.fontFeatures);
+		const glyphs = this.layoutGlyphs(text);
 		const hexCodes = Array(glyphs.length);
 		for (let idx = 0, len = glyphs.length; idx < len; idx++) {
 			const glyph = glyphs[idx];