@pdfme/pdf-lib 6.1.13-dev.22 → 6.1.13-dev.24

package/dist/core/embedders/CustomFontEmbedder.d.ts

@@ -18,6 +18,7 @@ declare class CustomFontEmbedder {
     readonly fontFeatures: TypeFeatures | undefined;
     protected baseFontName: string;
     protected glyphCache: Cache<Glyph[]>;
+    private readonly shapedGlyphsById;
     protected constructor(font: Font, fontData: Uint8Array, customName?: string, fontFeatures?: TypeFeatures);
     /**
      * Encode the JavaScript string into this font. (JavaScript encodes strings in
@@ -25,6 +26,19 @@ declare class CustomFontEmbedder {
      */
     encodeText(text: string): PDFHexString;
     widthOfTextAtSize(text: string, size: number): number;
+    /**
+     * 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.
+     */
+    protected layoutGlyphs(text: string): Glyph[];
+    /**
+     * 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.
+     */
+    protected registerShapedGlyphs(glyphs: Glyph[]): void;
     heightOfFontAtSize(size: number, options?: {
         descender?: boolean;
     }): number;

package/dist/core/embedders/CustomFontSubsetEmbedder.d.ts

@@ -12,6 +12,7 @@ declare class CustomFontSubsetEmbedder extends CustomFontEmbedder {
     private readonly glyphs;
     private readonly glyphIdMap;
     private constructor();
+    protected registerShapedGlyphs(_glyphs: Glyph[]): void;
     encodeText(text: string): PDFHexString;
     protected isCFF(): boolean;
     protected glyphId(glyph?: Glyph): number;

package/dist/index.js

@@ -815,6 +815,45 @@ var pdfDocEncodingDecode = (bytes) => {
 	return String.fromCodePoint(...codePoints);
 };
 //#endregion
+//#region src/utils/scriptRuns.ts
+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;
+};
+//#endregion
 //#region \0@oxc-project+runtime@0.147.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
@@ -3314,12 +3353,15 @@ var CustomFontEmbedder = class CustomFontEmbedder {
 		_defineProperty(this, "fontFeatures", void 0);
 		_defineProperty(this, "baseFontName", void 0);
 		_defineProperty(this, "glyphCache", void 0);
+		_defineProperty(this, "shapedGlyphsById", void 0);
 		_defineProperty(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;
@@ -3329,6 +3371,7 @@ var CustomFontEmbedder = class CustomFontEmbedder {
 		this.customName = customName;
 		this.fontFeatures = fontFeatures;
 		this.baseFontName = "";
+		this.shapedGlyphsById = /* @__PURE__ */ new Map();
 		this.glyphCache = Cache.populatedBy(this.allGlyphsInFontSortedById);
 	}
 	/**
@@ -3336,18 +3379,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;
@@ -3484,8 +3563,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];
@@ -19117,6 +19197,6 @@ var PDFButton = class extends PDFField {
 _PDFButton = PDFButton;
 _defineProperty(PDFButton, "of", (acroPushButton, ref, doc) => new _PDFButton(acroPushButton, ref, doc));
 //#endregion
-export { AFRelationship, AcroButtonFlags, AcroChoiceFlags, AcroFieldFlags, AcroTextFlags, AnnotationFlags, AppearanceCharacteristics, BlendMode, Cache, CharCodes, ColorTypes, CombedTextLayoutError, CorruptPageTreeError, CustomFontEmbedder, CustomFontSubsetEmbedder, DecompressionBombError, Duplex, EncryptedPDFError, ExceededMaxLengthError, FieldAlreadyExistsError, FieldExistsAsNonTerminalError, FileEmbedder, FillRule, FontkitNotRegisteredError, ForeignPageError, ImageAlignment, IndexOutOfBoundsError, InvalidAcroFieldValueError, InvalidFieldNamePartError, InvalidMaxLengthError, InvalidPDFDateStringError, InvalidTargetIndexError, JpegEmbedder, LineCapStyle, LineJoinStyle, MethodNotImplementedError, MissingCatalogError, MissingDAEntryError, MissingKeywordError, MissingOnValueCheckError, MissingPDFHeaderError, MissingPageContentsEmbeddingError, MissingTfOperatorError, MultiSelectValueError, NextByteAssertionError, NoSuchFieldError, NonFullScreenPageMode, NumberParsingError, PDFAcroButton, PDFAcroCheckBox, PDFAcroChoice, PDFAcroComboBox, PDFAcroField, PDFAcroForm, PDFAcroListBox, PDFAcroNonTerminal, PDFAcroPushButton, PDFAcroRadioButton, PDFAcroSignature, PDFAcroTerminal, PDFAcroText, PDFAnnotation, PDFArray, PDFArrayIsNotRectangleError, PDFBool, PDFButton, PDFCatalog, PDFCheckBox, PDFContentStream, PDFContext, PDFCrossRefSection, PDFCrossRefStream, PDFDict, PDFDocument, PDFDropdown, PDFEmbeddedPage, PDFField, PDFFlateStream, PDFFont, PDFForm, PDFHeader, PDFHexString, PDFImage, PDFInvalidObject, PDFInvalidObjectParsingError, PDFJavaScript, PDFName, PDFNull_default as PDFNull, PDFNumber, PDFObject, PDFObjectCopier, PDFObjectParser, PDFObjectParsingError, PDFObjectStream, PDFObjectStreamParser, PDFOperator, PDFOperatorNames, PDFOptionList, PDFPage, PDFPageEmbedder, PDFPageLeaf, PDFPageTree, PDFParser, PDFParsingError, PDFRadioGroup, PDFRawStream, PDFRef, PDFSignature, PDFStream, PDFStreamParsingError, PDFStreamWriter, PDFString, PDFTextField, PDFTrailer, PDFTrailerDict, PDFWidgetAnnotation, PDFWriter, PDFXRefStreamParser, PageEmbeddingMismatchedContextError, PageSizes, ParseSpeeds, PngEmbedder, PrintScaling, PrivateConstructorError, ReadingDirection, RemovePageFromEmptyDocumentError, ReparseError, RichTextFieldReadError, RotationTypes, StalledParserError, StandardFontEmbedder, StandardFontValues, StandardFonts, TextAlignment, TextRenderingMode, UnbalancedParenthesisError, UnexpectedFieldTypeError, UnexpectedObjectTypeError, UnrecognizedStreamTypeError, UnsupportedEncodingError, ViewerPreferences, addRandomSuffix, adjustDimsForRotation, appendBezierCurve, appendQuadraticCurve, arrayAsString, asNumber, asPDFName, asPDFNumber, assertEachIs, assertInteger, assertIs, assertIsOneOf, assertIsOneOfOrUndefined, assertIsSubset, assertMultiple, assertOrUndefined, assertPositive, assertRange, assertRangeOrUndefined, backtick, beginMarkedContent, beginText, breakTextIntoLines, byAscendingId, bytesFor, canBeConvertedToUint8Array, charAtIndex, charFromCode, charFromHexCode, charSplit, cleanText, clip, clipEvenOdd, closePath, cmyk, colorString, colorToComponents, componentsToColor, concatTransformationMatrix, copyStringIntoBuffer, createPDFAcroField, createPDFAcroFields, createTypeErrorMsg, createValueErrorMsg, decodeFromBase64, decodeFromBase64DataUri, decodePDFRawStream, defaultButtonAppearanceProvider, defaultCheckBoxAppearanceProvider, defaultDropdownAppearanceProvider, defaultOptionListAppearanceProvider, defaultRadioGroupAppearanceProvider, defaultTextFieldAppearanceProvider, degrees, degreesToRadians, drawButton, drawCheckBox, drawCheckMark, drawEllipse, drawEllipsePath, drawImage, drawLine, drawLinesOfText, drawObject, drawOptionList, drawPage, drawRadioButton, drawRectangle, drawSvgPath, drawText, drawTextField, drawTextLines, encodeToBase64, endMarkedContent, endPath, endText, error, escapeRegExp, escapedNewlineChars, fill, fillAndStroke, fillEvenOdd, findLastMatch, getType, grayscale, hasSurrogates, hasUtf16BOM, highSurrogate, isArrayEqual, isNewlineChar, isStandardFont, isType, isWithinBMP, last, layoutCombedText, layoutMultilineText, layoutSinglelineText, lineSplit, lineTo, lowSurrogate, mergeIntoTypedArray, mergeLines, mergeUint8Arrays, moveText, moveTo, newlineChars, nextLine, normalizeAppearance, numberToString, padStart, parseDate, pdfDocEncodingDecode, pluckIndices, popGraphicsState, pushGraphicsState, radians, radiansToDegrees, range, rectangle, rectanglesAreEqual, reduceRotation, restoreDashPattern, reverseArray, rgb, rotateAndSkewTextDegreesAndTranslate, rotateAndSkewTextRadiansAndTranslate, rotateDegrees, rotateInPlace, rotateRadians, rotateRectangle, scale, setCharacterSpacing, setCharacterSqueeze, setDashPattern, setFillingCmykColor, setFillingColor, setFillingGrayscaleColor, setFillingRgbColor, setFontAndSize, setGraphicsState, setLineCap, setLineHeight, setLineJoin, setLineWidth, setStrokingCmykColor, setStrokingColor, setStrokingGrayscaleColor, setStrokingRgbColor, setTextMatrix, setTextRenderingMode, setTextRise, setWordSpacing, showText, singleQuote, sizeInBytes, skewDegrees, skewRadians, sortedUniq, square, stringAsByteArray, stroke, sum, toCharCode, toCodePoint, toDegrees, toHexString, toHexStringOfMinLength, toRadians, toUint8Array, translate, typedArrayFor, utf16Decode, utf16Encode, utf8Encode, values, waitForTick };
+export { AFRelationship, AcroButtonFlags, AcroChoiceFlags, AcroFieldFlags, AcroTextFlags, AnnotationFlags, AppearanceCharacteristics, BlendMode, Cache, CharCodes, ColorTypes, CombedTextLayoutError, CorruptPageTreeError, CustomFontEmbedder, CustomFontSubsetEmbedder, DecompressionBombError, Duplex, EncryptedPDFError, ExceededMaxLengthError, FieldAlreadyExistsError, FieldExistsAsNonTerminalError, FileEmbedder, FillRule, FontkitNotRegisteredError, ForeignPageError, ImageAlignment, IndexOutOfBoundsError, InvalidAcroFieldValueError, InvalidFieldNamePartError, InvalidMaxLengthError, InvalidPDFDateStringError, InvalidTargetIndexError, JpegEmbedder, LineCapStyle, LineJoinStyle, MethodNotImplementedError, MissingCatalogError, MissingDAEntryError, MissingKeywordError, MissingOnValueCheckError, MissingPDFHeaderError, MissingPageContentsEmbeddingError, MissingTfOperatorError, MultiSelectValueError, NextByteAssertionError, NoSuchFieldError, NonFullScreenPageMode, NumberParsingError, PDFAcroButton, PDFAcroCheckBox, PDFAcroChoice, PDFAcroComboBox, PDFAcroField, PDFAcroForm, PDFAcroListBox, PDFAcroNonTerminal, PDFAcroPushButton, PDFAcroRadioButton, PDFAcroSignature, PDFAcroTerminal, PDFAcroText, PDFAnnotation, PDFArray, PDFArrayIsNotRectangleError, PDFBool, PDFButton, PDFCatalog, PDFCheckBox, PDFContentStream, PDFContext, PDFCrossRefSection, PDFCrossRefStream, PDFDict, PDFDocument, PDFDropdown, PDFEmbeddedPage, PDFField, PDFFlateStream, PDFFont, PDFForm, PDFHeader, PDFHexString, PDFImage, PDFInvalidObject, PDFInvalidObjectParsingError, PDFJavaScript, PDFName, PDFNull_default as PDFNull, PDFNumber, PDFObject, PDFObjectCopier, PDFObjectParser, PDFObjectParsingError, PDFObjectStream, PDFObjectStreamParser, PDFOperator, PDFOperatorNames, PDFOptionList, PDFPage, PDFPageEmbedder, PDFPageLeaf, PDFPageTree, PDFParser, PDFParsingError, PDFRadioGroup, PDFRawStream, PDFRef, PDFSignature, PDFStream, PDFStreamParsingError, PDFStreamWriter, PDFString, PDFTextField, PDFTrailer, PDFTrailerDict, PDFWidgetAnnotation, PDFWriter, PDFXRefStreamParser, PageEmbeddingMismatchedContextError, PageSizes, ParseSpeeds, PngEmbedder, PrintScaling, PrivateConstructorError, ReadingDirection, RemovePageFromEmptyDocumentError, ReparseError, RichTextFieldReadError, RotationTypes, StalledParserError, StandardFontEmbedder, StandardFontValues, StandardFonts, TextAlignment, TextRenderingMode, UnbalancedParenthesisError, UnexpectedFieldTypeError, UnexpectedObjectTypeError, UnrecognizedStreamTypeError, UnsupportedEncodingError, ViewerPreferences, addRandomSuffix, adjustDimsForRotation, appendBezierCurve, appendQuadraticCurve, arrayAsString, asNumber, asPDFName, asPDFNumber, assertEachIs, assertInteger, assertIs, assertIsOneOf, assertIsOneOfOrUndefined, assertIsSubset, assertMultiple, assertOrUndefined, assertPositive, assertRange, assertRangeOrUndefined, backtick, beginMarkedContent, beginText, breakTextIntoLines, byAscendingId, bytesFor, canBeConvertedToUint8Array, charAtIndex, charFromCode, charFromHexCode, charSplit, cleanText, clip, clipEvenOdd, closePath, cmyk, colorString, colorToComponents, componentsToColor, concatTransformationMatrix, copyStringIntoBuffer, createPDFAcroField, createPDFAcroFields, createTypeErrorMsg, createValueErrorMsg, decodeFromBase64, decodeFromBase64DataUri, decodePDFRawStream, defaultButtonAppearanceProvider, defaultCheckBoxAppearanceProvider, defaultDropdownAppearanceProvider, defaultOptionListAppearanceProvider, defaultRadioGroupAppearanceProvider, defaultTextFieldAppearanceProvider, degrees, degreesToRadians, drawButton, drawCheckBox, drawCheckMark, drawEllipse, drawEllipsePath, drawImage, drawLine, drawLinesOfText, drawObject, drawOptionList, drawPage, drawRadioButton, drawRectangle, drawSvgPath, drawText, drawTextField, drawTextLines, encodeToBase64, endMarkedContent, endPath, endText, error, escapeRegExp, escapedNewlineChars, fill, fillAndStroke, fillEvenOdd, findLastMatch, getType, grayscale, hasSurrogates, hasUtf16BOM, highSurrogate, isArrayEqual, isNewlineChar, isStandardFont, isType, isWithinBMP, last, layoutCombedText, layoutMultilineText, layoutSinglelineText, lineSplit, lineTo, lowSurrogate, mergeIntoTypedArray, mergeLines, mergeUint8Arrays, moveText, moveTo, newlineChars, nextLine, normalizeAppearance, numberToString, padStart, parseDate, pdfDocEncodingDecode, pluckIndices, popGraphicsState, pushGraphicsState, radians, radiansToDegrees, range, rectangle, rectanglesAreEqual, reduceRotation, restoreDashPattern, reverseArray, rgb, rotateAndSkewTextDegreesAndTranslate, rotateAndSkewTextRadiansAndTranslate, rotateDegrees, rotateInPlace, rotateRadians, rotateRectangle, scale, setCharacterSpacing, setCharacterSqueeze, setDashPattern, setFillingCmykColor, setFillingColor, setFillingGrayscaleColor, setFillingRgbColor, setFontAndSize, setGraphicsState, setLineCap, setLineHeight, setLineJoin, setLineWidth, setStrokingCmykColor, setStrokingColor, setStrokingGrayscaleColor, setStrokingRgbColor, setTextMatrix, setTextRenderingMode, setTextRise, setWordSpacing, showText, singleQuote, sizeInBytes, skewDegrees, skewRadians, sortedUniq, splitTextIntoShapingRuns, square, stringAsByteArray, stroke, sum, toCharCode, toCodePoint, toDegrees, toHexString, toHexStringOfMinLength, toRadians, toUint8Array, translate, typedArrayFor, utf16Decode, utf16Encode, utf8Encode, values, waitForTick };
 
 //# sourceMappingURL=index.js.map