pdf-parser.js 5.2.26 → 5.2.28

package/dist/cmap-table.js

@@ -3,17 +3,28 @@ import { hasBytes, sfntTableBytes, u16, u32, u8 } from "./sfnt.js";
 const CMAP_HEADER_SIZE = 4;
 const SUBTABLE_RECORD_SIZE = 8;
 const MAX_UNICODE_CODE_POINT = 1114111;
+const SUBTABLE_RECORD_OFFSET_FIELD = 4;
+const CMAP_FORMAT_4 = 4;
+const CMAP_FORMAT_6 = 6;
+const CMAP_FORMAT_12 = 12;
+const INT16_SIGN_BIT = 32768;
+const UINT16_MODULUS = 65536;
+const UINT16_MASK = 65535;
 const FORMAT_4_HEADER_SIZE = 14;
+const FORMAT_4_SEG_COUNT_X2_FIELD = 6;
+const FORMAT_4_PARALLEL_ARRAY_COUNT = 4;
+const MAX_BMP_CODE_POINT = 65535;
+const LAST_MAPPABLE_BMP_CODE = 65534;
 function parseFormat4(bytes, subtableOffset) {
 	if (!hasBytes(bytes, subtableOffset, FORMAT_4_HEADER_SIZE)) return;
-	const segCountX2 = u16(bytes, subtableOffset + 6);
+	const segCountX2 = u16(bytes, subtableOffset + FORMAT_4_SEG_COUNT_X2_FIELD);
 	if (segCountX2 === 0 || segCountX2 % 2 !== 0) return;
 	const segCount = segCountX2 / 2;
 	const endCodesOffset = subtableOffset + FORMAT_4_HEADER_SIZE;
 	const startCodesOffset = endCodesOffset + segCountX2 + 2;
 	const idDeltasOffset = startCodesOffset + segCountX2;
 	const idRangeOffsetsOffset = idDeltasOffset + segCountX2;
-	if (!hasBytes(bytes, endCodesOffset, segCountX2 * 4 + 2)) return;
+	if (!hasBytes(bytes, endCodesOffset, segCountX2 * FORMAT_4_PARALLEL_ARRAY_COUNT + 2)) return;
 	const segments = [];
 	for (let i = 0; i < segCount; i++) {
 		const idRangeOffsetPos = idRangeOffsetsOffset + i * 2;
@@ -21,27 +32,27 @@ function parseFormat4(bytes, subtableOffset) {
 		segments.push({
 			endCode: u16(bytes, endCodesOffset + i * 2),
 			startCode: u16(bytes, startCodesOffset + i * 2),
-			idDelta: rawDelta >= 32768 ? rawDelta - 65536 : rawDelta,
+			idDelta: rawDelta >= INT16_SIGN_BIT ? rawDelta - UINT16_MODULUS : rawDelta,
 			idRangeOffsetPos,
 			idRangeOffset: u16(bytes, idRangeOffsetPos)
 		});
 	}
 	const lookup = (codePoint) => {
-		if (codePoint > 65535) return;
+		if (codePoint > MAX_BMP_CODE_POINT) return;
 		for (const segment of segments) {
 			if (codePoint < segment.startCode || codePoint > segment.endCode) continue;
-			if (segment.idRangeOffset === 0) return codePoint + segment.idDelta & 65535;
+			if (segment.idRangeOffset === 0) return codePoint + segment.idDelta & UINT16_MASK;
 			const glyphIndexAddress = segment.idRangeOffsetPos + segment.idRangeOffset + (codePoint - segment.startCode) * 2;
 			if (!hasBytes(bytes, glyphIndexAddress, 2)) return;
 			const glyphId = u16(bytes, glyphIndexAddress);
-			return glyphId === 0 ? void 0 : glyphId + segment.idDelta & 65535;
+			return glyphId === 0 ? void 0 : glyphId + segment.idDelta & UINT16_MASK;
 		}
 	};
 	return {
 		lookup,
 		forEachMapping(visit) {
 			for (const segment of segments) {
-				const end = Math.min(segment.endCode, 65534);
+				const end = Math.min(segment.endCode, LAST_MAPPABLE_BMP_CODE);
 				for (let code = segment.startCode; code <= end; code++) {
 					const glyphId = lookup(code);
 					if (glyphId !== void 0 && glyphId !== 0) visit(code, glyphId);
@@ -51,10 +62,13 @@ function parseFormat4(bytes, subtableOffset) {
 	};
 }
 const FORMAT_12_HEADER_SIZE = 16;
+const FORMAT_12_NUM_GROUPS_FIELD = 12;
 const FORMAT_12_GROUP_SIZE = 12;
+const FORMAT_12_GROUP_END_CHAR_CODE_FIELD = 4;
+const FORMAT_12_GROUP_START_GLYPH_ID_FIELD = 8;
 function parseFormat12(bytes, subtableOffset) {
 	if (!hasBytes(bytes, subtableOffset, FORMAT_12_HEADER_SIZE)) return;
-	const numGroups = u32(bytes, subtableOffset + 12);
+	const numGroups = u32(bytes, subtableOffset + FORMAT_12_NUM_GROUPS_FIELD);
 	const groupsOffset = subtableOffset + FORMAT_12_HEADER_SIZE;
 	if (!hasBytes(bytes, groupsOffset, numGroups * FORMAT_12_GROUP_SIZE)) return;
 	const groups = [];
@@ -62,8 +76,8 @@ function parseFormat12(bytes, subtableOffset) {
 		const recordOffset = groupsOffset + i * FORMAT_12_GROUP_SIZE;
 		groups.push({
 			startCharCode: u32(bytes, recordOffset),
-			endCharCode: u32(bytes, recordOffset + 4),
-			startGlyphId: u32(bytes, recordOffset + 8)
+			endCharCode: u32(bytes, recordOffset + FORMAT_12_GROUP_END_CHAR_CODE_FIELD),
+			startGlyphId: u32(bytes, recordOffset + FORMAT_12_GROUP_START_GLYPH_ID_FIELD)
 		});
 	}
 	return {
@@ -79,18 +93,20 @@ function parseFormat12(bytes, subtableOffset) {
 	};
 }
 const FORMAT_0_SIZE = 262;
+const FORMAT_0_GLYPH_ID_ARRAY_OFFSET = 6;
+const MAX_FORMAT_0_CODE = 255;
 function parseFormat0(bytes, subtableOffset) {
 	if (!hasBytes(bytes, subtableOffset, FORMAT_0_SIZE)) return;
-	const glyphIdArrayOffset = subtableOffset + 6;
+	const glyphIdArrayOffset = subtableOffset + FORMAT_0_GLYPH_ID_ARRAY_OFFSET;
 	const lookup = (codePoint) => {
-		if (codePoint < 0 || codePoint > 255) return;
+		if (codePoint < 0 || codePoint > MAX_FORMAT_0_CODE) return;
 		const glyphId = u8(bytes, glyphIdArrayOffset + codePoint);
 		return glyphId === 0 ? void 0 : glyphId;
 	};
 	return {
 		lookup,
 		forEachMapping(visit) {
-			for (let code = 0; code <= 255; code++) {
+			for (let code = 0; code <= MAX_FORMAT_0_CODE; code++) {
 				const glyphId = lookup(code);
 				if (glyphId !== void 0) visit(code, glyphId);
 			}
@@ -98,10 +114,12 @@ function parseFormat0(bytes, subtableOffset) {
 	};
 }
 const FORMAT_6_HEADER_SIZE = 10;
+const FORMAT_6_FIRST_CODE_FIELD = 6;
+const FORMAT_6_ENTRY_COUNT_FIELD = 8;
 function parseFormat6(bytes, subtableOffset) {
 	if (!hasBytes(bytes, subtableOffset, FORMAT_6_HEADER_SIZE)) return;
-	const firstCode = u16(bytes, subtableOffset + 6);
-	const entryCount = u16(bytes, subtableOffset + 8);
+	const firstCode = u16(bytes, subtableOffset + FORMAT_6_FIRST_CODE_FIELD);
+	const entryCount = u16(bytes, subtableOffset + FORMAT_6_ENTRY_COUNT_FIELD);
 	const glyphIdArrayOffset = subtableOffset + FORMAT_6_HEADER_SIZE;
 	if (!hasBytes(bytes, glyphIdArrayOffset, entryCount * 2)) return;
 	const lookup = (codePoint) => {
@@ -121,19 +139,29 @@ function parseFormat6(bytes, subtableOffset) {
 		}
 	};
 }
+const PLATFORM_WINDOWS = 3;
+const PLATFORM_UNICODE = 0;
+const ENCODING_WINDOWS_UCS4 = 10;
+const ENCODING_WINDOWS_UNICODE_BMP = 1;
+const RANK_WINDOWS_UCS4_FORMAT_12 = 0;
+const RANK_UNICODE_FORMAT_12 = 1;
+const RANK_OTHER_FORMAT_12 = 2;
+const RANK_WINDOWS_BMP_FORMAT_4 = 3;
+const RANK_OTHER_FORMAT_4 = 4;
+const RANK_FORMAT_6 = 5;
 function preferenceRank(subtable) {
-	if (subtable.format === 12) {
-		if (subtable.platformId === 3 && subtable.encodingId === 10) return 0;
-		if (subtable.platformId === 0) return 1;
-		return 2;
+	if (subtable.format === CMAP_FORMAT_12) {
+		if (subtable.platformId === PLATFORM_WINDOWS && subtable.encodingId === ENCODING_WINDOWS_UCS4) return RANK_WINDOWS_UCS4_FORMAT_12;
+		if (subtable.platformId === PLATFORM_UNICODE) return RANK_UNICODE_FORMAT_12;
+		return RANK_OTHER_FORMAT_12;
 	}
-	if (subtable.format === 4) return subtable.platformId === 3 && subtable.encodingId === 1 ? 3 : 4;
-	return 5;
+	if (subtable.format === CMAP_FORMAT_4) return subtable.platformId === PLATFORM_WINDOWS && subtable.encodingId === ENCODING_WINDOWS_UNICODE_BMP ? RANK_WINDOWS_BMP_FORMAT_4 : RANK_OTHER_FORMAT_4;
+	return RANK_FORMAT_6;
 }
 function parseSubtable(bytes, record) {
-	if (record.format === 12) return parseFormat12(bytes, record.offset);
-	if (record.format === 4) return parseFormat4(bytes, record.offset);
-	if (record.format === 6) return parseFormat6(bytes, record.offset);
+	if (record.format === CMAP_FORMAT_12) return parseFormat12(bytes, record.offset);
+	if (record.format === CMAP_FORMAT_4) return parseFormat4(bytes, record.offset);
+	if (record.format === CMAP_FORMAT_6) return parseFormat6(bytes, record.offset);
 	return record.format === 0 ? parseFormat0(bytes, record.offset) : void 0;
 }
 function readCmapSubtables(font) {
@@ -144,7 +172,7 @@ function readCmapSubtables(font) {
 	const subtables = [];
 	for (let i = 0; i < numTables; i++) {
 		const recordOffset = CMAP_HEADER_SIZE + i * SUBTABLE_RECORD_SIZE;
-		const offset = u32(cmapBytes, recordOffset + 4);
+		const offset = u32(cmapBytes, recordOffset + SUBTABLE_RECORD_OFFSET_FIELD);
 		if (!hasBytes(cmapBytes, offset, 2)) continue;
 		const record = {
 			platformId: u16(cmapBytes, recordOffset),
@@ -163,7 +191,7 @@ function readCmapSubtables(font) {
 	return subtables;
 }
 function buildCmapLookup(font) {
-	return readCmapSubtables(font).filter((s) => s.format === 4 || s.format === 6 || s.format === 12).sort((a, b) => preferenceRank(a) - preferenceRank(b))[0]?.lookup;
+	return readCmapSubtables(font).filter((s) => s.format === CMAP_FORMAT_4 || s.format === CMAP_FORMAT_6 || s.format === CMAP_FORMAT_12).sort((a, b) => preferenceRank(a) - preferenceRank(b))[0]?.lookup;
 }
 //#endregion
 export { buildCmapLookup, readCmapSubtables };

package/dist/cmap.cjs

@@ -2,14 +2,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_bytes_reader = require("./bytes/reader.cjs");
 const require_lexer = require("./lexer.cjs");
 //#region src/cmap.ts
+const BYTE_RADIX = 256;
+const BITS_PER_BYTE = 8;
 function hexBytesToNumber(bytes) {
 	let value = 0;
-	for (const byte of bytes) value = value * 256 + byte;
+	for (const byte of bytes) value = value * BYTE_RADIX + byte;
 	return value;
 }
 function decodeUtf16BEString(bytes) {
 	const units = [];
-	for (let i = 0; i + 1 < bytes.length; i += 2) units.push((bytes[i] ?? 0) << 8 | (bytes[i + 1] ?? 0));
+	for (let i = 0; i + 1 < bytes.length; i += 2) units.push((bytes[i] ?? 0) << BITS_PER_BYTE | (bytes[i + 1] ?? 0));
 	return String.fromCharCode(...units);
 }
 function parseToUnicodeCMap(bytes, sink) {
@@ -85,7 +87,7 @@ function readBfRange(reader, map, sink) {
 function registerBfRangeSingle(map, lo, hi, dstBytes) {
 	if (dstBytes.length < 2) return;
 	const prefix = decodeUtf16BEString(dstBytes.subarray(0, dstBytes.length - 2));
-	const baseUnit = (dstBytes[dstBytes.length - 2] ?? 0) << 8 | (dstBytes[dstBytes.length - 1] ?? 0);
+	const baseUnit = (dstBytes[dstBytes.length - 2] ?? 0) << BITS_PER_BYTE | (dstBytes[dstBytes.length - 1] ?? 0);
 	for (let code = lo; code <= hi; code++) map.set(code, prefix + String.fromCharCode(baseUnit + (code - lo)));
 }
 function readBfRangeArray(reader, map, lo, sink) {

package/dist/cmap.js

@@ -1,14 +1,16 @@
 import { ByteReader } from "./bytes/reader.js";
 import { nextToken } from "./lexer.js";
 //#region src/cmap.ts
+const BYTE_RADIX = 256;
+const BITS_PER_BYTE = 8;
 function hexBytesToNumber(bytes) {
 	let value = 0;
-	for (const byte of bytes) value = value * 256 + byte;
+	for (const byte of bytes) value = value * BYTE_RADIX + byte;
 	return value;
 }
 function decodeUtf16BEString(bytes) {
 	const units = [];
-	for (let i = 0; i + 1 < bytes.length; i += 2) units.push((bytes[i] ?? 0) << 8 | (bytes[i + 1] ?? 0));
+	for (let i = 0; i + 1 < bytes.length; i += 2) units.push((bytes[i] ?? 0) << BITS_PER_BYTE | (bytes[i + 1] ?? 0));
 	return String.fromCharCode(...units);
 }
 function parseToUnicodeCMap(bytes, sink) {
@@ -84,7 +86,7 @@ function readBfRange(reader, map, sink) {
 function registerBfRangeSingle(map, lo, hi, dstBytes) {
 	if (dstBytes.length < 2) return;
 	const prefix = decodeUtf16BEString(dstBytes.subarray(0, dstBytes.length - 2));
-	const baseUnit = (dstBytes[dstBytes.length - 2] ?? 0) << 8 | (dstBytes[dstBytes.length - 1] ?? 0);
+	const baseUnit = (dstBytes[dstBytes.length - 2] ?? 0) << BITS_PER_BYTE | (dstBytes[dstBytes.length - 1] ?? 0);
 	for (let code = lo; code <= hi; code++) map.set(code, prefix + String.fromCharCode(baseUnit + (code - lo)));
 }
 function readBfRangeArray(reader, map, lo, sink) {

package/dist/content-read.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 //#region src/content-read.d.ts
 interface ContentOperation {
   readonly operands: readonly PdfObject[];

package/dist/content-read.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 //#region src/content-read.d.ts
 interface ContentOperation {
   readonly operands: readonly PdfObject[];

package/dist/content-write.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
+const require_afm_widths = require("./afm-widths-BHD2HZIL.cjs");
 const require_objects = require("./objects.cjs");
 const require_bytes_writer = require("./bytes/writer.cjs");
 const require_serialize = require("./serialize.cjs");
@@ -8,6 +8,7 @@ const require_embedded_font = require("./embedded-font.cjs");
 //#region src/content-write.ts
 const GLYPH_SPACE_UNITS_PER_EM = 1e3;
 const EMBEDDED_HORIZONTAL_SCALE_PERCENT = 100;
+const PERCENT_SCALE_FACTOR = 100;
 function writeRgbOperator(writer, color, operator) {
 	writer.writeAscii(`${require_serialize.formatNumber(color.r)} ${require_serialize.formatNumber(color.g)} ${require_serialize.formatNumber(color.b)} ${operator}\n`);
 }
@@ -43,15 +44,15 @@ function writeShowTextBlock(writer, item, resourceName, scalePercent, show) {
 	writer.writeAscii(` ${show.operator}\n`);
 	writer.writeAscii("ET\n");
 }
-function writeStandardText(writer, item, standardName, resourceName, measurer, substitutions) {
+function writeStandardText(writer, item, standardName, resourceName, measurer) {
 	const encoded = require_afm_widths.encodeForShow(item.text, standardName);
-	substitutions.push(...encoded.substitutions);
 	const scale = measurer.horizontalScaleFor(item.font);
-	writeShowTextBlock(writer, item, resourceName, scale * 100, {
+	writeShowTextBlock(writer, item, resourceName, scale * PERCENT_SCALE_FACTOR, {
 		operand: require_objects.pdfHexString(encoded.codes),
 		operator: "Tj"
 	});
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt * scale, measurer.underlineAtSize(item.font, item.sizePt));
+	return encoded.substitutions;
 }
 function embeddedShowOperand(encoded) {
 	if (encoded.kerns.length === 0) return {
@@ -71,22 +72,25 @@ function embeddedShowOperand(encoded) {
 		operator: "TJ"
 	};
 }
-function writeEmbeddedText(writer, item, face, resourceName, missingGlyphs) {
+function writeEmbeddedText(writer, item, face, resourceName) {
 	const encoded = require_embedded_font.encodeForShowEmbedded(item.text, face);
-	missingGlyphs.push(...encoded.substitutions);
 	writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, embeddedShowOperand(encoded));
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt, {
 		offsetPt: face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt,
 		thicknessPt: face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt
 	});
+	return encoded.substitutions;
 }
-function writeText(writer, item, context, substitutions, missingGlyphs) {
+function writeText(writer, item, context) {
 	const font = context.resolveFont(item.font);
-	if (font.kind === "embedded") {
-		writeEmbeddedText(writer, item, font.face, font.resourceName, missingGlyphs);
-		return;
-	}
-	writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer, substitutions);
+	if (font.kind === "embedded") return {
+		substitutions: [],
+		missingGlyphs: writeEmbeddedText(writer, item, font.face, font.resourceName)
+	};
+	return {
+		substitutions: writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer),
+		missingGlyphs: []
+	};
 }
 function paintOperatorFor(fill, stroke, fillRule) {
 	const evenOdd = fillRule === "evenodd";
@@ -332,8 +336,11 @@ function writeContentStream(items, context) {
 			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
 			writer.writeAscii(" >> BDC\n");
 		}
-		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-		else if (item.kind === "image") writeImage(writer, item, context);
+		if (item.kind === "text") {
+			const written = writeText(writer, item, context);
+			substitutions.push(...written.substitutions);
+			missingGlyphs.push(...written.missingGlyphs);
+		} else if (item.kind === "image") writeImage(writer, item, context);
 		else if (item.kind === "rect") writeRect(writer, item);
 		else if (item.kind === "line") writeLine(writer, item);
 		else if (item.kind === "ellipse") writeEllipse(writer, item);

package/dist/content-write.d.cts

@@ -1,6 +1,6 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.cjs";
 import { LayoutItem } from "./layout.cjs";
-import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-CEf-zBCA.cjs";
+import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DgVBedw6.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { LayoutFont, TextMeasurer } from "document-schema.js";
 //#region src/content-write.d.ts
@@ -18,7 +18,7 @@ interface ResolvedImageResource {
 }
 interface ContentWriteContext {
   readonly measurer: TextMeasurer;
-  resolveFont: (font: LayoutFont) => ResolvedFontResource;
+  resolveFont: (font: Readonly<LayoutFont>) => ResolvedFontResource;
   resolveImage: (imageId: string) => ResolvedImageResource;
   readonly layerObjectNumberOf?: (name: string) => number | undefined;
   readonly nextMcid?: () => number;

package/dist/content-write.d.ts

@@ -1,6 +1,6 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.js";
 import { LayoutItem } from "./layout.js";
-import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-Bnhh4juV.js";
+import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-ByD7ZiQS.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { LayoutFont, TextMeasurer } from "document-schema.js";
 //#region src/content-write.d.ts
@@ -18,7 +18,7 @@ interface ResolvedImageResource {
 }
 interface ContentWriteContext {
   readonly measurer: TextMeasurer;
-  resolveFont: (font: LayoutFont) => ResolvedFontResource;
+  resolveFont: (font: Readonly<LayoutFont>) => ResolvedFontResource;
   resolveImage: (imageId: string) => ResolvedImageResource;
   readonly layerObjectNumberOf?: (name: string) => number | undefined;
   readonly nextMcid?: () => number;

package/dist/content-write.js

@@ -1,4 +1,4 @@
-import { h as encodeForShow } from "./afm-widths-blUDDjlI.js";
+import { h as encodeForShow } from "./afm-widths-B_IGbGky.js";
 import { pdfArray, pdfHexString, pdfNum } from "./objects.js";
 import { ByteWriter } from "./bytes/writer.js";
 import { formatNumber, writeObject } from "./serialize.js";
@@ -7,6 +7,7 @@ import { encodeForShowEmbedded } from "./embedded-font.js";
 //#region src/content-write.ts
 const GLYPH_SPACE_UNITS_PER_EM = 1e3;
 const EMBEDDED_HORIZONTAL_SCALE_PERCENT = 100;
+const PERCENT_SCALE_FACTOR = 100;
 function writeRgbOperator(writer, color, operator) {
 	writer.writeAscii(`${formatNumber(color.r)} ${formatNumber(color.g)} ${formatNumber(color.b)} ${operator}\n`);
 }
@@ -42,15 +43,15 @@ function writeShowTextBlock(writer, item, resourceName, scalePercent, show) {
 	writer.writeAscii(` ${show.operator}\n`);
 	writer.writeAscii("ET\n");
 }
-function writeStandardText(writer, item, standardName, resourceName, measurer, substitutions) {
+function writeStandardText(writer, item, standardName, resourceName, measurer) {
 	const encoded = encodeForShow(item.text, standardName);
-	substitutions.push(...encoded.substitutions);
 	const scale = measurer.horizontalScaleFor(item.font);
-	writeShowTextBlock(writer, item, resourceName, scale * 100, {
+	writeShowTextBlock(writer, item, resourceName, scale * PERCENT_SCALE_FACTOR, {
 		operand: pdfHexString(encoded.codes),
 		operator: "Tj"
 	});
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt * scale, measurer.underlineAtSize(item.font, item.sizePt));
+	return encoded.substitutions;
 }
 function embeddedShowOperand(encoded) {
 	if (encoded.kerns.length === 0) return {
@@ -70,22 +71,25 @@ function embeddedShowOperand(encoded) {
 		operator: "TJ"
 	};
 }
-function writeEmbeddedText(writer, item, face, resourceName, missingGlyphs) {
+function writeEmbeddedText(writer, item, face, resourceName) {
 	const encoded = encodeForShowEmbedded(item.text, face);
-	missingGlyphs.push(...encoded.substitutions);
 	writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, embeddedShowOperand(encoded));
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt, {
 		offsetPt: face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt,
 		thicknessPt: face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt
 	});
+	return encoded.substitutions;
 }
-function writeText(writer, item, context, substitutions, missingGlyphs) {
+function writeText(writer, item, context) {
 	const font = context.resolveFont(item.font);
-	if (font.kind === "embedded") {
-		writeEmbeddedText(writer, item, font.face, font.resourceName, missingGlyphs);
-		return;
-	}
-	writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer, substitutions);
+	if (font.kind === "embedded") return {
+		substitutions: [],
+		missingGlyphs: writeEmbeddedText(writer, item, font.face, font.resourceName)
+	};
+	return {
+		substitutions: writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer),
+		missingGlyphs: []
+	};
 }
 function paintOperatorFor(fill, stroke, fillRule) {
 	const evenOdd = fillRule === "evenodd";
@@ -331,8 +335,11 @@ function writeContentStream(items, context) {
 			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
 			writer.writeAscii(" >> BDC\n");
 		}
-		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-		else if (item.kind === "image") writeImage(writer, item, context);
+		if (item.kind === "text") {
+			const written = writeText(writer, item, context);
+			substitutions.push(...written.substitutions);
+			missingGlyphs.push(...written.missingGlyphs);
+		} else if (item.kind === "image") writeImage(writer, item, context);
 		else if (item.kind === "rect") writeRect(writer, item);
 		else if (item.kind === "line") writeLine(writer, item);
 		else if (item.kind === "ellipse") writeEllipse(writer, item);