reamkit 1.6.0 → 1.7.0

package/dist/esm/core/drawingml/chart-serializer.d.ts

@@ -0,0 +1,2 @@
+import { Chart } from '../document-model/index.js';
+export declare function chartSpaceXml(chart: Chart): string;

package/dist/esm/core/drawingml/chart-serializer.js

@@ -0,0 +1,53 @@
+//#region src/core/drawingml/chart-serializer.ts
+var C_NS = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+var A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
+var R_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+var GROUP_TAG = {
+	bar: "c:barChart",
+	line: "c:lineChart",
+	pie: "c:pieChart",
+	area: "c:areaChart",
+	scatter: "c:scatterChart",
+	unknown: "c:barChart"
+};
+var CAT_AX_ID = 111111111;
+var VAL_AX_ID = 222222222;
+function chartSpaceXml(chart) {
+	const isScatter = chart.type === "scatter";
+	const isPie = chart.type === "pie" || chart.doughnut === true;
+	const groupTag = chart.doughnut ? "c:doughnutChart" : GROUP_TAG[chart.type] ?? "c:barChart";
+	const inner = (chart.type === "bar" ? `<c:barDir val="${chart.barDir ?? "col"}"/>` : "") + (chart.grouping ? `<c:grouping val="${chart.grouping}"/>` : "") + "<c:varyColors val=\"0\"/>" + chart.series.map((s, i) => seriesXml(s, i, isScatter, chart.categories)).join("") + (chart.showValues ? "<c:dLbls><c:showVal val=\"1\"/></c:dLbls>" : "") + (chart.doughnut ? "<c:holeSize val=\"50\"/>" : "") + (isPie ? "" : `<c:axId val="${CAT_AX_ID}"/><c:axId val="${VAL_AX_ID}"/>`);
+	const axes = isPie ? "" : isScatter ? valAx(CAT_AX_ID, "b", VAL_AX_ID, chart.catAxisTitle) + valAx(VAL_AX_ID, "l", CAT_AX_ID, chart.valAxisTitle) : catAx(CAT_AX_ID, VAL_AX_ID, chart.catAxisTitle) + valAx(VAL_AX_ID, "l", CAT_AX_ID, chart.valAxisTitle);
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><c:chartSpace xmlns:c="${C_NS}" xmlns:a="${A_NS}" xmlns:r="${R_NS}"><c:chart>` + titleXml(chart.title) + `<c:autoTitleDeleted val="${chart.title ? 0 : 1}"/><c:plotArea><c:layout/><${groupTag}>${inner}</${groupTag}>${axes}</c:plotArea>` + (chart.hasLegend ? `<c:legend><c:legendPos val="${chart.legendPos ?? "r"}"/><c:overlay val="0"/></c:legend>` : "") + "<c:plotVisOnly val=\"1\"/></c:chart></c:chartSpace>";
+}
+function seriesXml(s, idx, isScatter, categories) {
+	const tx = s.name ? `<c:tx><c:strRef><c:f>Sheet1!$A$${idx + 1}</c:f><c:strCache><c:ptCount val="1"/><c:pt idx="0"><c:v>${esc(s.name)}</c:v></c:pt></c:strCache></c:strRef></c:tx>` : "";
+	const spPr = s.colorHex ? `<c:spPr><a:solidFill><a:srgbClr val="${s.colorHex}"/></a:solidFill></c:spPr>` : "";
+	const dPts = (s.pointColors ?? []).map((p) => `<c:dPt><c:idx val="${p.idx}"/><c:bubble3D val="0"/><c:spPr><a:solidFill><a:srgbClr val="${p.colorHex}"/></a:solidFill></c:spPr></c:dPt>`).join("");
+	const cat = isScatter ? `<c:xVal>${numRef("A", s.xValues ?? [])}</c:xVal>` : categories.length > 0 ? `<c:cat>${strRef(categories)}</c:cat>` : "";
+	const val = isScatter ? `<c:yVal>${numRef("B", s.values)}</c:yVal>` : `<c:val>${numRef("B", s.values)}</c:val>`;
+	return `<c:ser><c:idx val="${idx}"/><c:order val="${idx}"/>` + tx + spPr + dPts + cat + val + "</c:ser>";
+}
+function strRef(values) {
+	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${esc(v)}</c:v></c:pt>`).join("");
+	return `<c:strRef><c:f>Sheet1!\$A\$1</c:f><c:strCache><c:ptCount val="${values.length}"/>${pts}</c:strCache></c:strRef>`;
+}
+function numRef(col, values) {
+	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${v}</c:v></c:pt>`).join("");
+	return `<c:numRef><c:f>Sheet1!$${col}$1</c:f><c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="${values.length}"/>${pts}</c:numCache></c:numRef>`;
+}
+function titleXml(title) {
+	if (!title) return "";
+	return `<c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>${esc(title)}</a:t></a:r></a:p></c:rich></c:tx><c:overlay val="0"/></c:title>`;
+}
+function catAx(id, crossId, title) {
+	return `<c:catAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="b"/>${titleXml(title)}<c:crossAx val="${crossId}"/></c:catAx>`;
+}
+function valAx(id, pos, crossId, title) {
+	return `<c:valAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="${pos}"/>${titleXml(title)}<c:crossAx val="${crossId}"/></c:valAx>`;
+}
+function esc(s) {
+	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+//#endregion
+export { chartSpaceXml };

package/dist/esm/excel/print-model.js

@@ -309,9 +309,12 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 		const local = brk - colStart;
 		if (local > 0 && local < colCount) colBreaksLocal.add(local);
 	}
-	if (!scaled && colCount > 1 && (totalGridTwips > contentWidthTwips || colBreaksLocal.size > 0)) {
-		const bands = computeColumnBands(columnWidths, contentWidthTwips, colBreaksLocal);
-		if (bands.length > 1) return bandedTables(rows, columnWidths, bands, tableProperties);
+	const fitWide = worksheet.fitToPage ? worksheet.pageSetup?.fitToWidth ?? 1 : 1;
+	const bandWidths = scaled ? columnWidths.map((w) => Math.max(1, Math.floor(w * printScale))) : columnWidths;
+	const bandTotal = bandWidths.reduce((sum, w) => sum + w, 0);
+	if (colCount > 1 && (!scaled || fitWide > 1) && (bandTotal > contentWidthTwips || colBreaksLocal.size > 0)) {
+		const bands = computeColumnBands(bandWidths, contentWidthTwips, colBreaksLocal);
+		if (bands.length > 1) return bandedTables(rows, bandWidths, bands, tableProperties);
 	}
 	const frozen = worksheet.pane && (worksheet.pane.frozenRows > 0 || worksheet.pane.frozenCols > 0) ? {
 		rows: worksheet.pane.frozenRows,

package/dist/esm/excel/xlsx-writer.js

@@ -1,13 +1,22 @@
 import { FEATURES } from "../core/ir/features.js";
 import { buildOpcPackage } from "../core/opc/opc-writer.js";
 import "../core/opc/index.js";
+import { chartSpaceXml } from "../core/drawingml/chart-serializer.js";
 //#region src/excel/xlsx-writer.ts
 var encoder = new TextEncoder();
+var EMU_PER_PT = 12700;
 var REL_OFFICE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
 var REL_WORKSHEET = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet";
 var REL_SHARED_STRINGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings";
 var REL_STYLES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
 var REL_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table";
+var REL_DRAWING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing";
+var REL_CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
+var CT_DRAWING = "application/vnd.openxmlformats-officedocument.drawing+xml";
+var CT_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
+var XDR_NS = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
+var A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
+var C_NS = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 var CT_WORKBOOK = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml";
 var CT_WORKSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
 var CT_SHARED_STRINGS = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml";
@@ -19,16 +28,20 @@ function writeXlsx(sheet) {
 	const losses = [];
 	const worksheetParts = [];
 	const tableParts = [];
+	const drawingParts = [];
 	const worksheetRels = [];
+	const drawingRels = [];
 	const sheetEntries = [];
 	const workbookRels = [];
 	let tableCounter = 0;
+	let drawingCounter = 0;
+	let chartCounter = 0;
 	sheet.sheets.forEach((s, i) => {
 		const idx = i + 1;
 		const rid = `rId${idx}`;
 		const wsPath = `xl/worksheets/sheet${idx}.xml`;
+		const wsRels = [];
 		const tableRelIds = [];
-		const wsTableRels = [];
 		for (const t of s.grid.tables ?? []) {
 			const tid = ++tableCounter;
 			const tRid = `rIdTbl${tid}`;
@@ -38,15 +51,23 @@ function writeXlsx(sheet) {
 				data: encoder.encode(tableXml(t, tid)),
 				contentType: CT_TABLE
 			});
-			wsTableRels.push(rel(tRid, REL_TABLE, `../tables/table${tid}.xml`));
+			wsRels.push(rel(tRid, REL_TABLE, `../tables/table${tid}.xml`));
 		}
-		if (wsTableRels.length > 0) worksheetRels.push({
+		const drawingRelId = emitSheetCharts(s, sheet, idx, {
+			drawingParts,
+			drawingRels,
+			wsRels,
+			nextDrawing: () => ++drawingCounter,
+			nextChart: () => ++chartCounter,
+			losses
+		});
+		if (wsRels.length > 0) worksheetRels.push({
 			sourcePart: wsPath,
-			relationships: wsTableRels
+			relationships: wsRels
 		});
 		worksheetParts.push({
 			path: wsPath,
-			data: encoder.encode(worksheetXml(s.grid, tableRelIds)),
+			data: encoder.encode(worksheetXml(s.grid, tableRelIds, drawingRelId)),
 			contentType: CT_WORKSHEET
 		});
 		workbookRels.push(rel(rid, REL_WORKSHEET, `worksheets/sheet${idx}.xml`));
@@ -55,7 +76,6 @@ function writeXlsx(sheet) {
 			sheetId: idx,
 			rid
 		});
-		recordSheetLosses(s, losses);
 	});
 	const sstRid = `rId${sheet.sheets.length + 1}`;
 	const stylesRid = `rId${sheet.sheets.length + 2}`;
@@ -71,6 +91,7 @@ function writeXlsx(sheet) {
 				},
 				...worksheetParts,
 				...tableParts,
+				...drawingParts,
 				{
 					path: "xl/sharedStrings.xml",
 					data: encoder.encode(sharedStringsXml(sheet.sharedStrings)),
@@ -83,10 +104,14 @@ function writeXlsx(sheet) {
 				}
 			],
 			rootRelationships: [rel("rId1", REL_OFFICE_DOCUMENT, "xl/workbook.xml")],
-			partRelationships: [{
-				sourcePart: "xl/workbook.xml",
-				relationships: workbookRels
-			}, ...worksheetRels]
+			partRelationships: [
+				{
+					sourcePart: "xl/workbook.xml",
+					relationships: workbookRels
+				},
+				...worksheetRels,
+				...drawingRels
+			]
 		}),
 		losses
 	};
@@ -100,19 +125,58 @@ function rel(id, type, target) {
 		targetMode: "Internal"
 	};
 }
-function recordSheetLosses(s, losses) {
-	if (s.charts && s.charts.length > 0) losses.push({
-		severity: "dropped",
-		feature: FEATURES.charts,
-		detail: `sheet "${s.name}": embedded charts not written back`
+function emitSheetCharts(s, doc, idx, ctx) {
+	const refs = s.charts ?? [];
+	if (refs.length === 0 || !doc.chartData) return void 0;
+	const did = ctx.nextDrawing();
+	const drawingPath = `xl/drawings/drawing${did}.xml`;
+	const anchors = [];
+	const dRels = [];
+	refs.forEach((ref, ci) => {
+		const chart = doc.chartData?.get(ref.chartPartPath);
+		if (!chart) {
+			ctx.losses.push({
+				severity: "dropped",
+				feature: FEATURES.charts,
+				detail: `sheet "${s.name}": a chart frame had no resolved data and was dropped`
+			});
+			return;
+		}
+		const cid = ctx.nextChart();
+		ctx.drawingParts.push({
+			path: `xl/charts/chart${cid}.xml`,
+			data: encoder.encode(chartSpaceXml(chart)),
+			contentType: CT_CHART
+		});
+		const cRel = `rIdChart${ci + 1}`;
+		dRels.push(rel(cRel, REL_CHART, `../charts/chart${cid}.xml`));
+		anchors.push(chartAnchorXml(ref, cRel, ci));
+	});
+	if (anchors.length === 0) return void 0;
+	ctx.drawingParts.push({
+		path: drawingPath,
+		data: encoder.encode(`${XML_DECL}<xdr:wsDr xmlns:xdr="${XDR_NS}" xmlns:a="${A_NS}">${anchors.join("")}</xdr:wsDr>`),
+		contentType: CT_DRAWING
 	});
+	ctx.drawingRels.push({
+		sourcePart: drawingPath,
+		relationships: dRels
+	});
+	const dRid = `rIdDraw${idx}`;
+	ctx.wsRels.push(rel(dRid, REL_DRAWING, `../drawings/drawing${did}.xml`));
+	return dRid;
+}
+function chartAnchorXml(ref, chartRelId, index) {
+	const cx = Math.round(ref.widthPt * EMU_PER_PT);
+	const cy = Math.round(ref.heightPt * EMU_PER_PT);
+	return `<xdr:oneCellAnchor><xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${index * 16}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:ext cx="${cx}" cy="${cy}"/><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${index + 2}" name="Chart ${index + 1}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></xdr:xfrm><a:graphic><a:graphicData uri="${C_NS}"><c:chart xmlns:c="${C_NS}" xmlns:r="${R_NS}" r:id="${chartRelId}"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:oneCellAnchor>`;
 }
 function workbookXml(sheets, definedNames, date1904) {
 	const sheetTags = sheets.map((s) => `<sheet name="${escapeAttr(s.name)}" sheetId="${s.sheetId}" r:id="${s.rid}"/>`).join("");
 	const definedNamesXml = definedNames.length > 0 ? `<definedNames>${definedNames.map((d) => `<definedName name="${escapeAttr(d.name)}"${d.localSheetId !== void 0 ? ` localSheetId="${d.localSheetId}"` : ""}>${escapeText(d.value)}</definedName>`).join("")}</definedNames>` : "";
 	return XML_DECL + `<workbook xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (date1904 ? "<workbookPr date1904=\"1\"/>" : "") + `<sheets>${sheetTags}</sheets>` + definedNamesXml + "</workbook>";
 }
-function worksheetXml(grid, tableRelIds = []) {
+function worksheetXml(grid, tableRelIds = [], drawingRelId) {
 	const dimension = grid.maxRow >= 0 && grid.maxColumn >= 0 ? `<dimension ref="A1:${cellRef(grid.maxRow, grid.maxColumn)}"/>` : "<dimension ref=\"A1\"/>";
 	const colsXml = grid.columns.length > 0 ? `<cols>${grid.columns.map((c) => `<col min="${c.min}" max="${c.max}" width="${c.widthChars}" customWidth="1"/>`).join("")}</cols>` : "";
 	const heightByRow = /* @__PURE__ */ new Map();
@@ -136,7 +200,7 @@ function worksheetXml(grid, tableRelIds = []) {
 		return `<row r="${r + 1}"${heightAttrs}>${cells.map(cellXml).join("")}</row>`;
 	}).join("");
 	const mergesXml = grid.merges.length > 0 ? `<mergeCells count="${grid.merges.length}">${grid.merges.map((m) => `<mergeCell ref="${cellRef(m.startRow, m.startColumn)}:${cellRef(m.endRow, m.endColumn)}"/>`).join("")}</mergeCells>` : "";
-	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
+	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (drawingRelId ? `<drawing r:id="${drawingRelId}"/>` : "") + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
 }
 function sheetViewsXml(pane) {
 	if (!pane || pane.frozenRows <= 0 && pane.frozenCols <= 0) return "";

package/dist/esm/pdf-reader/content.d.ts

@@ -10,5 +10,43 @@ export interface TextRun {
     readonly fontSizePt: number;
     readonly fontKey: string;
     readonly mcid?: number;
+    readonly href?: string;
 }
-export declare function interpretContent(bytes: Uint8Array, fonts: ReadonlyMap<string, ContentFont>): Array<TextRun>;
+export interface ImagePlacement {
+    readonly name: string;
+    readonly ctm: Matrix;
+    readonly mcid?: number;
+}
+export type PathSeg = {
+    readonly op: 'move';
+    readonly x: number;
+    readonly y: number;
+} | {
+    readonly op: 'line';
+    readonly x: number;
+    readonly y: number;
+} | {
+    readonly op: 'cubic';
+    readonly x1: number;
+    readonly y1: number;
+    readonly x2: number;
+    readonly y2: number;
+    readonly x: number;
+    readonly y: number;
+} | {
+    readonly op: 'close';
+};
+export interface VectorPlacement {
+    readonly segs: ReadonlyArray<PathSeg>;
+    readonly fillHex: string;
+    readonly mcid?: number;
+}
+export interface InterpretResult {
+    readonly texts: Array<TextRun>;
+    readonly images: Array<ImagePlacement>;
+    readonly vectors: Array<VectorPlacement>;
+}
+export type Matrix = readonly [number, number, number, number, number, number];
+export declare const IDENTITY: Matrix;
+export declare function multiply(a: Matrix, b: Matrix): Matrix;
+export declare function interpretContent(bytes: Uint8Array, fonts: ReadonlyMap<string, ContentFont>, initialCtm?: Matrix): InterpretResult;

package/dist/esm/pdf-reader/content.js

@@ -44,18 +44,72 @@ function initialState() {
 		wordSpacing: 0,
 		hScale: 1,
 		leading: 0,
-		rise: 0
+		rise: 0,
+		fillColor: "000000"
 	};
 }
-function interpretContent(bytes, fonts) {
+function interpretContent(bytes, fonts, initialCtm = IDENTITY) {
 	const runs = [];
+	const images = [];
+	const vectors = [];
 	const lexer = new Lexer(bytes);
 	const stack = [];
 	let state = initialState();
+	state.ctm = initialCtm;
 	let tm = IDENTITY;
 	let tlm = IDENTITY;
+	let path = [];
 	let operands = [];
 	const mcStack = [];
+	const toPage = (x, y) => [x * state.ctm[0] + y * state.ctm[2] + state.ctm[4], x * state.ctm[1] + y * state.ctm[3] + state.ctm[5]];
+	const moveTo = (x, y) => {
+		const [px, py] = toPage(x, y);
+		path.push({
+			op: "move",
+			x: px,
+			y: py
+		});
+	};
+	const lineTo = (x, y) => {
+		const [px, py] = toPage(x, y);
+		path.push({
+			op: "line",
+			x: px,
+			y: py
+		});
+	};
+	const curveTo = (a, b, c, d, e, f) => {
+		const [x1, y1] = toPage(a, b);
+		const [x2, y2] = toPage(c, d);
+		const [x, y] = toPage(e, f);
+		path.push({
+			op: "cubic",
+			x1,
+			y1,
+			x2,
+			y2,
+			x,
+			y
+		});
+	};
+	const rectTo = (x, y, w, h) => {
+		moveTo(x, y);
+		lineTo(x + w, y);
+		lineTo(x + w, y + h);
+		lineTo(x, y + h);
+		path.push({ op: "close" });
+	};
+	const fillPath = () => {
+		if (path.length >= 2) {
+			const mcid = mcStack.length > 0 ? mcStack[mcStack.length - 1] : void 0;
+			vectors.push({
+				segs: path,
+				fillHex: state.fillColor,
+				...mcid !== void 0 ? { mcid } : {}
+			});
+		}
+		path = [];
+	};
 	const num = (i) => {
 		const v = operands[i];
 		return typeof v === "number" ? v : 0;
@@ -179,6 +233,61 @@ function interpretContent(bytes, fonts) {
 			case "EMC":
 				mcStack.pop();
 				break;
+			case "Do": {
+				const nm = operands[0];
+				if (nm instanceof PdfName) {
+					const mcid = mcStack.length > 0 ? mcStack[mcStack.length - 1] : void 0;
+					images.push({
+						name: nm.value,
+						ctm: state.ctm,
+						...mcid !== void 0 ? { mcid } : {}
+					});
+				}
+				break;
+			}
+			case "rg":
+				state.fillColor = rgbHex(num(0), num(1), num(2));
+				break;
+			case "g":
+				state.fillColor = grayHex(num(0));
+				break;
+			case "k":
+				state.fillColor = cmykHex(num(0), num(1), num(2), num(3));
+				break;
+			case "m":
+				moveTo(num(0), num(1));
+				break;
+			case "l":
+				lineTo(num(0), num(1));
+				break;
+			case "c":
+				curveTo(num(0), num(1), num(2), num(3), num(4), num(5));
+				break;
+			case "re":
+				rectTo(num(0), num(1), num(2), num(3));
+				break;
+			case "h":
+				path.push({ op: "close" });
+				break;
+			case "f":
+			case "F":
+			case "f*":
+			case "B":
+			case "B*":
+				fillPath();
+				break;
+			case "b":
+			case "b*":
+				path.push({ op: "close" });
+				fillPath();
+				break;
+			case "n":
+			case "S":
+			case "s":
+			case "W":
+			case "W*":
+				path = [];
+				break;
 			default: break;
 		}
 	};
@@ -215,7 +324,26 @@ function interpretContent(bytes, fonts) {
 				break;
 		}
 	}
-	return runs;
+	return {
+		texts: runs,
+		images,
+		vectors
+	};
+}
+function clamp255(v) {
+	return Math.max(0, Math.min(255, Math.round(v * 255)));
+}
+function hex2(v) {
+	return clamp255(v).toString(16).padStart(2, "0");
+}
+function rgbHex(r, g, b) {
+	return (hex2(r) + hex2(g) + hex2(b)).toUpperCase();
+}
+function grayHex(v) {
+	return rgbHex(v, v, v);
+}
+function cmykHex(c, m, y, k) {
+	return rgbHex((1 - c) * (1 - k), (1 - m) * (1 - k), (1 - y) * (1 - k));
 }
 function matrixFromOperands(operands) {
 	const n = (i) => typeof operands[i] === "number" ? operands[i] : 0;
@@ -289,4 +417,4 @@ function skipInlineImage(lexer) {
 	lexer.pos = ei < 0 ? lexer.length : ei + 2;
 }
 //#endregion
-export { interpretContent };
+export { interpretContent, multiply };

package/dist/esm/pdf-reader/crypto.d.ts

@@ -0,0 +1,7 @@
+export declare function rc4(key: Uint8Array, data: Uint8Array): Uint8Array;
+export declare function md5(input: Uint8Array): Uint8Array;
+export declare function sha256(input: Uint8Array): Uint8Array;
+export declare function sha512(input: Uint8Array): Uint8Array;
+export declare function sha384(input: Uint8Array): Uint8Array;
+export declare function aesCbcDecrypt(key: Uint8Array, iv: Uint8Array, data: Uint8Array, stripPad: boolean): Uint8Array;
+export declare function aesCbcEncrypt(key: Uint8Array, iv: Uint8Array, data: Uint8Array): Uint8Array;