documents.js 1.67.16 → 1.70.0

package/dist/ooxml/docx/embedded-objects.js

@@ -0,0 +1,91 @@
+import { buildDrawingBlock } from "../../model/embedded-drawing.js";
+import { buildFormulaBlock } from "../../model/formula.js";
+import { collectOfficeMathElements, readOfficeMath } from "../../omml/read.js";
+import { spliceBlocks } from "../../model/block-splice.js";
+import { collectParagraphVectors } from "./vector.js";
+import { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, equationFrame } from "./formula.js";
+//#region src/ooxml/docx/embedded-objects.ts
+function isVectorOnlyRun(run, vectors) {
+	const elementChildren = run.children.filter((child) => child.type === "element");
+	if (elementChildren.length !== 1) return false;
+	if (run.children.some((child) => child.type === "text" && child.value.trim().length > 0)) return false;
+	return vectors.some((detected) => detected.drawingElement === elementChildren[0]);
+}
+function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
+	if (equations.length === 0 && vectors.length === 0) return false;
+	for (const child of paragraph.children) {
+		if (child.type === "text") {
+			if (child.value.trim().length > 0) return false;
+			continue;
+		}
+		if (child.type !== "element") continue;
+		if (PARAGRAPH_NON_CONTENT_TAGS.has(child.tag) || equations.includes(child)) continue;
+		if (child.tag === "m:oMathPara" && collectOfficeMathElements(child.children).every((math) => equations.includes(math))) continue;
+		if (child.tag === "w:r" && isVectorOnlyRun(child, vectors)) continue;
+		return false;
+	}
+	return true;
+}
+function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
+	const paragraphElements = [];
+	collectBodyParagraphs(bodyChildren, paragraphElements);
+	let paragraphOrdinal = 0;
+	const out = [];
+	for (const [sectionIndex, section] of sections.entries()) {
+		const placements = [];
+		const consumedIndices = /* @__PURE__ */ new Set();
+		section.blocks.forEach((block, blockIndex) => {
+			if (block.kind !== "paragraph") return;
+			const paragraph = paragraphElements[paragraphOrdinal];
+			paragraphOrdinal += 1;
+			if (paragraph === void 0) return;
+			const equations = collectOfficeMathElements(paragraph.children);
+			const vectors = collectParagraphVectors(paragraph);
+			if (equations.length === 0 && vectors.length === 0) return;
+			const converted = equations.map((equation) => ({
+				equation,
+				...readOfficeMath(equation)
+			}));
+			const rendered = converted.filter((result) => result.mathml.length > 0);
+			if (rendered.length === 0 && vectors.length === 0) {
+				for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+				return;
+			}
+			const insertAt = blockIndex + 1;
+			if (isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)) consumedIndices.add(blockIndex);
+			for (const result of rendered) placements.push({
+				index: insertAt,
+				build: (sourcePath) => {
+					for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
+					return buildFormulaBlock({ mathml: result.mathml }, equationFrame(result.equation), sourcePath);
+				}
+			});
+			for (const result of converted) {
+				if (result.mathml.length > 0) continue;
+				for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+			}
+			if (vectors.length > 0) {
+				const vectorValues = vectors.map((detected) => detected.vector);
+				placements.push({
+					index: insertAt,
+					build: (sourcePath) => ({
+						...buildDrawingBlock(section.pageSize, vectorValues),
+						sourcePath
+					})
+				});
+			}
+		});
+		if (placements.length === 0 && consumedIndices.size === 0) {
+			out.push(section);
+			continue;
+		}
+		const blocks = spliceBlocks(section.blocks, placements, consumedIndices, (position) => `sections[${sectionIndex}].blocks[${position}]`);
+		out.push({
+			...section,
+			blocks
+		});
+	}
+	return out;
+}
+//#endregion
+export { spliceDocxEmbeddedObjects };

package/dist/ooxml/docx/formula.cjs

@@ -1,6 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_model_formula = require("../../model/formula.cjs");
-const require_omml_read = require("../../omml/read.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/ooxml/docx/formula.ts
 function collectBodyParagraphs(nodes, out) {
@@ -25,19 +23,6 @@ const PARAGRAPH_NON_CONTENT_TAGS = /* @__PURE__ */ new Set([
 	"w:commentRangeStart",
 	"w:commentRangeEnd"
 ]);
-function isEquationOnlyParagraph(paragraph, equations) {
-	for (const child of paragraph.children) {
-		if (child.type === "text") {
-			if (child.value.trim().length > 0) return false;
-			continue;
-		}
-		if (child.type !== "element") continue;
-		if (PARAGRAPH_NON_CONTENT_TAGS.has(child.tag) || equations.includes(child)) continue;
-		if (child.tag === "m:oMathPara" && require_omml_read.collectOfficeMathElements(child.children).every((math) => equations.includes(math))) continue;
-		return false;
-	}
-	return true;
-}
 const FRAME_HEIGHT_PER_SIZE_PT = 2;
 const DEFAULT_MATH_SIZE_PT = 11;
 function mathRunSizePt(equation) {
@@ -63,47 +48,7 @@ function equationFrame(equation) {
 		heightPt: (mathRunSizePt(equation) ?? DEFAULT_MATH_SIZE_PT) * FRAME_HEIGHT_PER_SIZE_PT
 	};
 }
-function spliceDocxFormulas(sections, bodyChildren, onMathDiagnostic) {
-	const paragraphElements = [];
-	collectBodyParagraphs(bodyChildren, paragraphElements);
-	let paragraphOrdinal = 0;
-	const out = [];
-	for (const [sectionIndex, section] of sections.entries()) {
-		const blocks = [];
-		for (const block of section.blocks) {
-			if (block.kind !== "paragraph") {
-				blocks.push(block);
-				continue;
-			}
-			const paragraph = paragraphElements[paragraphOrdinal];
-			paragraphOrdinal += 1;
-			const equations = paragraph === void 0 ? [] : require_omml_read.collectOfficeMathElements(paragraph.children);
-			if (equations.length === 0 || paragraph === void 0) {
-				blocks.push(block);
-				continue;
-			}
-			const converted = equations.map((equation) => ({
-				equation,
-				...require_omml_read.readOfficeMath(equation)
-			}));
-			if (converted.filter((result) => result.mathml.length > 0).length === 0) {
-				blocks.push(block);
-				for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
-				continue;
-			}
-			if (!isEquationOnlyParagraph(paragraph, equations)) blocks.push(block);
-			for (const result of converted) {
-				const sourcePath = `sections[${sectionIndex}].blocks[${blocks.length}]`;
-				if (result.mathml.length > 0) blocks.push(require_model_formula.buildFormulaBlock({ mathml: result.mathml }, equationFrame(result.equation), sourcePath));
-				for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
-			}
-		}
-		out.push({
-			...section,
-			blocks
-		});
-	}
-	return out;
-}
 //#endregion
-exports.spliceDocxFormulas = spliceDocxFormulas;
+exports.PARAGRAPH_NON_CONTENT_TAGS = PARAGRAPH_NON_CONTENT_TAGS;
+exports.collectBodyParagraphs = collectBodyParagraphs;
+exports.equationFrame = equationFrame;

package/dist/ooxml/docx/formula.d.cts

@@ -1,2 +1,2 @@
-import { n as spliceDocxFormulas, t as OmmlDiagnosticSink } from "../../formula-CiwPw8nY.cjs";
-export { OmmlDiagnosticSink, spliceDocxFormulas };
+import { i as equationFrame, n as PARAGRAPH_NON_CONTENT_TAGS, r as collectBodyParagraphs, t as OmmlDiagnosticSink } from "../../formula-DFc2Ofsk.cjs";
+export { OmmlDiagnosticSink, PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, equationFrame };

package/dist/ooxml/docx/formula.d.ts

@@ -1,2 +1,2 @@
-import { n as spliceDocxFormulas, t as OmmlDiagnosticSink } from "../../formula-CgydMiTt.js";
-export { OmmlDiagnosticSink, spliceDocxFormulas };
+import { i as equationFrame, n as PARAGRAPH_NON_CONTENT_TAGS, r as collectBodyParagraphs, t as OmmlDiagnosticSink } from "../../formula-B_4mdCuK.js";
+export { OmmlDiagnosticSink, PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, equationFrame };

package/dist/ooxml/docx/formula.js

@@ -1,5 +1,3 @@
-import { buildFormulaBlock } from "../../model/formula.js";
-import { collectOfficeMathElements, readOfficeMath } from "../../omml/read.js";
 import { childrenWithTag } from "ooxml.js";
 //#region src/ooxml/docx/formula.ts
 function collectBodyParagraphs(nodes, out) {
@@ -24,19 +22,6 @@ const PARAGRAPH_NON_CONTENT_TAGS = /* @__PURE__ */ new Set([
 	"w:commentRangeStart",
 	"w:commentRangeEnd"
 ]);
-function isEquationOnlyParagraph(paragraph, equations) {
-	for (const child of paragraph.children) {
-		if (child.type === "text") {
-			if (child.value.trim().length > 0) return false;
-			continue;
-		}
-		if (child.type !== "element") continue;
-		if (PARAGRAPH_NON_CONTENT_TAGS.has(child.tag) || equations.includes(child)) continue;
-		if (child.tag === "m:oMathPara" && collectOfficeMathElements(child.children).every((math) => equations.includes(math))) continue;
-		return false;
-	}
-	return true;
-}
 const FRAME_HEIGHT_PER_SIZE_PT = 2;
 const DEFAULT_MATH_SIZE_PT = 11;
 function mathRunSizePt(equation) {
@@ -62,47 +47,5 @@ function equationFrame(equation) {
 		heightPt: (mathRunSizePt(equation) ?? DEFAULT_MATH_SIZE_PT) * FRAME_HEIGHT_PER_SIZE_PT
 	};
 }
-function spliceDocxFormulas(sections, bodyChildren, onMathDiagnostic) {
-	const paragraphElements = [];
-	collectBodyParagraphs(bodyChildren, paragraphElements);
-	let paragraphOrdinal = 0;
-	const out = [];
-	for (const [sectionIndex, section] of sections.entries()) {
-		const blocks = [];
-		for (const block of section.blocks) {
-			if (block.kind !== "paragraph") {
-				blocks.push(block);
-				continue;
-			}
-			const paragraph = paragraphElements[paragraphOrdinal];
-			paragraphOrdinal += 1;
-			const equations = paragraph === void 0 ? [] : collectOfficeMathElements(paragraph.children);
-			if (equations.length === 0 || paragraph === void 0) {
-				blocks.push(block);
-				continue;
-			}
-			const converted = equations.map((equation) => ({
-				equation,
-				...readOfficeMath(equation)
-			}));
-			if (converted.filter((result) => result.mathml.length > 0).length === 0) {
-				blocks.push(block);
-				for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
-				continue;
-			}
-			if (!isEquationOnlyParagraph(paragraph, equations)) blocks.push(block);
-			for (const result of converted) {
-				const sourcePath = `sections[${sectionIndex}].blocks[${blocks.length}]`;
-				if (result.mathml.length > 0) blocks.push(buildFormulaBlock({ mathml: result.mathml }, equationFrame(result.equation), sourcePath));
-				for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
-			}
-		}
-		out.push({
-			...section,
-			blocks
-		});
-	}
-	return out;
-}
 //#endregion
-export { spliceDocxFormulas };
+export { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, equationFrame };

package/dist/ooxml/docx/read.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_ooxml_docx_formula = require("./formula.cjs");
+const require_ooxml_docx_embedded_objects = require("./embedded-objects.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 //#region src/ooxml/docx/read.ts
@@ -11,7 +11,7 @@ function documentBody(pkg) {
 function readDocxContent(pkg, options) {
 	const docxDoc = (0, ooxml_js.readDocx)(pkg);
 	const body = documentBody(pkg);
-	const sections = body === void 0 ? docxDoc.sections : require_ooxml_docx_formula.spliceDocxFormulas(docxDoc.sections, body.children, options?.onMathDiagnostic);
+	const sections = body === void 0 ? docxDoc.sections : require_ooxml_docx_embedded_objects.spliceDocxEmbeddedObjects(docxDoc.sections, body.children, options?.onMathDiagnostic);
 	return {
 		kind: "wordprocessing",
 		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,

package/dist/ooxml/docx/read.d.cts

@@ -1,4 +1,4 @@
-import { t as OmmlDiagnosticSink } from "../../formula-CiwPw8nY.cjs";
+import { t as OmmlDiagnosticSink } from "../../formula-DFc2Ofsk.cjs";
 import { ContentDocument } from "document-schema.js";
 import { Package } from "ooxml.js";
 //#region src/ooxml/docx/read.d.ts

package/dist/ooxml/docx/read.d.ts

@@ -1,4 +1,4 @@
-import { t as OmmlDiagnosticSink } from "../../formula-CgydMiTt.js";
+import { t as OmmlDiagnosticSink } from "../../formula-B_4mdCuK.js";
 import { Package } from "ooxml.js";
 import { ContentDocument } from "document-schema.js";
 //#region src/ooxml/docx/read.d.ts

package/dist/ooxml/docx/read.js

@@ -1,4 +1,4 @@
-import { spliceDocxFormulas } from "./formula.js";
+import { spliceDocxEmbeddedObjects } from "./embedded-objects.js";
 import { childrenWithTag, readDocx, rootElement } from "ooxml.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/ooxml/docx/read.ts
@@ -10,7 +10,7 @@ function documentBody(pkg) {
 function readDocxContent(pkg, options) {
 	const docxDoc = readDocx(pkg);
 	const body = documentBody(pkg);
-	const sections = body === void 0 ? docxDoc.sections : spliceDocxFormulas(docxDoc.sections, body.children, options?.onMathDiagnostic);
+	const sections = body === void 0 ? docxDoc.sections : spliceDocxEmbeddedObjects(docxDoc.sections, body.children, options?.onMathDiagnostic);
 	return {
 		kind: "wordprocessing",
 		formatVersion: CONTENT_FORMAT_VERSION,

package/dist/ooxml/docx/vector.cjs

@@ -0,0 +1,63 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_units = require("../../model/units.cjs");
+const require_edit_drawingml_vector = require("../../edit/drawingml/vector.cjs");
+let ooxml_js = require("ooxml.js");
+//#region src/ooxml/docx/vector.ts
+const WORDPROCESSING_SHAPE_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
+function parseEmuInt(value) {
+	if (value === void 0) return;
+	const parsed = Number.parseInt(value, 10);
+	return Number.isNaN(parsed) ? void 0 : parsed;
+}
+function anchorFrame(anchor) {
+	const positionH = (0, ooxml_js.childrenWithTag)(anchor, "wp:positionH")[0];
+	const positionV = (0, ooxml_js.childrenWithTag)(anchor, "wp:positionV")[0];
+	const extent = (0, ooxml_js.childrenWithTag)(anchor, "wp:extent")[0];
+	if (positionH === void 0 || positionV === void 0 || extent === void 0) return;
+	if ((0, ooxml_js.attr)(positionH, "relativeFrom") !== "page" || (0, ooxml_js.attr)(positionV, "relativeFrom") !== "page") return;
+	const offsetHEl = (0, ooxml_js.childrenWithTag)(positionH, "wp:posOffset")[0];
+	const offsetVEl = (0, ooxml_js.childrenWithTag)(positionV, "wp:posOffset")[0];
+	if (offsetHEl === void 0 || offsetVEl === void 0) return;
+	const xEmu = parseEmuInt((0, ooxml_js.textContent)(offsetHEl).trim());
+	const yEmu = parseEmuInt((0, ooxml_js.textContent)(offsetVEl).trim());
+	const cx = parseEmuInt((0, ooxml_js.attr)(extent, "cx"));
+	const cy = parseEmuInt((0, ooxml_js.attr)(extent, "cy"));
+	if (xEmu === void 0 || yEmu === void 0 || cx === void 0 || cy === void 0) return;
+	return {
+		xPt: require_model_units.emuToPt(xEmu),
+		yPt: require_model_units.emuToPt(yEmu),
+		widthPt: require_model_units.emuToPt(cx),
+		heightPt: require_model_units.emuToPt(cy)
+	};
+}
+function hasRealText(wsp) {
+	for (const txbx of (0, ooxml_js.childrenWithTag)(wsp, "wps:txbx")) for (const txBodyContent of (0, ooxml_js.childrenWithTag)(txbx, "w:txbxContent")) if ((0, ooxml_js.textContent)(txBodyContent).trim().length > 0) return true;
+	return false;
+}
+function collectParagraphVectors(paragraph) {
+	const out = [];
+	for (const run of (0, ooxml_js.childrenWithTag)(paragraph, "w:r")) for (const drawing of (0, ooxml_js.childrenWithTag)(run, "w:drawing")) for (const anchor of (0, ooxml_js.childrenWithTag)(drawing, "wp:anchor")) {
+		const frame = anchorFrame(anchor);
+		if (frame === void 0) continue;
+		for (const graphic of (0, ooxml_js.childrenWithTag)(anchor, "a:graphic")) for (const graphicData of (0, ooxml_js.childrenWithTag)(graphic, "a:graphicData")) {
+			if ((0, ooxml_js.attr)(graphicData, "uri") !== WORDPROCESSING_SHAPE_URI) continue;
+			for (const wsp of (0, ooxml_js.childrenWithTag)(graphicData, "wps:wsp")) {
+				if (hasRealText(wsp)) continue;
+				const spPr = (0, ooxml_js.childrenWithTag)(wsp, "wps:spPr")[0];
+				if (spPr === void 0) continue;
+				const vector = require_edit_drawingml_vector.readDrawingMlVector(spPr, frame);
+				if (vector === void 0) continue;
+				out.push({
+					drawingElement: drawing,
+					vector: {
+						...vector,
+						paintOrder: out.length
+					}
+				});
+			}
+		}
+	}
+	return out;
+}
+//#endregion
+exports.collectParagraphVectors = collectParagraphVectors;

package/dist/ooxml/docx/vector.d.cts

@@ -0,0 +1,10 @@
+import { ContentVector } from "document-schema.js";
+import { XmlElement } from "ooxml.js";
+//#region src/ooxml/docx/vector.d.ts
+interface DetectedParagraphVector {
+  readonly drawingElement: XmlElement;
+  readonly vector: ContentVector;
+}
+declare function collectParagraphVectors(paragraph: XmlElement): readonly DetectedParagraphVector[];
+//#endregion
+export { DetectedParagraphVector, collectParagraphVectors };

package/dist/ooxml/docx/vector.d.ts

@@ -0,0 +1,10 @@
+import { XmlElement } from "ooxml.js";
+import { ContentVector } from "document-schema.js";
+//#region src/ooxml/docx/vector.d.ts
+interface DetectedParagraphVector {
+  readonly drawingElement: XmlElement;
+  readonly vector: ContentVector;
+}
+declare function collectParagraphVectors(paragraph: XmlElement): readonly DetectedParagraphVector[];
+//#endregion
+export { DetectedParagraphVector, collectParagraphVectors };

package/dist/ooxml/docx/vector.js

@@ -0,0 +1,62 @@
+import { emuToPt } from "../../model/units.js";
+import { readDrawingMlVector } from "../../edit/drawingml/vector.js";
+import { attr, childrenWithTag, textContent } from "ooxml.js";
+//#region src/ooxml/docx/vector.ts
+const WORDPROCESSING_SHAPE_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
+function parseEmuInt(value) {
+	if (value === void 0) return;
+	const parsed = Number.parseInt(value, 10);
+	return Number.isNaN(parsed) ? void 0 : parsed;
+}
+function anchorFrame(anchor) {
+	const positionH = childrenWithTag(anchor, "wp:positionH")[0];
+	const positionV = childrenWithTag(anchor, "wp:positionV")[0];
+	const extent = childrenWithTag(anchor, "wp:extent")[0];
+	if (positionH === void 0 || positionV === void 0 || extent === void 0) return;
+	if (attr(positionH, "relativeFrom") !== "page" || attr(positionV, "relativeFrom") !== "page") return;
+	const offsetHEl = childrenWithTag(positionH, "wp:posOffset")[0];
+	const offsetVEl = childrenWithTag(positionV, "wp:posOffset")[0];
+	if (offsetHEl === void 0 || offsetVEl === void 0) return;
+	const xEmu = parseEmuInt(textContent(offsetHEl).trim());
+	const yEmu = parseEmuInt(textContent(offsetVEl).trim());
+	const cx = parseEmuInt(attr(extent, "cx"));
+	const cy = parseEmuInt(attr(extent, "cy"));
+	if (xEmu === void 0 || yEmu === void 0 || cx === void 0 || cy === void 0) return;
+	return {
+		xPt: emuToPt(xEmu),
+		yPt: emuToPt(yEmu),
+		widthPt: emuToPt(cx),
+		heightPt: emuToPt(cy)
+	};
+}
+function hasRealText(wsp) {
+	for (const txbx of childrenWithTag(wsp, "wps:txbx")) for (const txBodyContent of childrenWithTag(txbx, "w:txbxContent")) if (textContent(txBodyContent).trim().length > 0) return true;
+	return false;
+}
+function collectParagraphVectors(paragraph) {
+	const out = [];
+	for (const run of childrenWithTag(paragraph, "w:r")) for (const drawing of childrenWithTag(run, "w:drawing")) for (const anchor of childrenWithTag(drawing, "wp:anchor")) {
+		const frame = anchorFrame(anchor);
+		if (frame === void 0) continue;
+		for (const graphic of childrenWithTag(anchor, "a:graphic")) for (const graphicData of childrenWithTag(graphic, "a:graphicData")) {
+			if (attr(graphicData, "uri") !== WORDPROCESSING_SHAPE_URI) continue;
+			for (const wsp of childrenWithTag(graphicData, "wps:wsp")) {
+				if (hasRealText(wsp)) continue;
+				const spPr = childrenWithTag(wsp, "wps:spPr")[0];
+				if (spPr === void 0) continue;
+				const vector = readDrawingMlVector(spPr, frame);
+				if (vector === void 0) continue;
+				out.push({
+					drawingElement: drawing,
+					vector: {
+						...vector,
+						paintOrder: out.length
+					}
+				});
+			}
+		}
+	}
+	return out;
+}
+//#endregion
+export { collectParagraphVectors };

package/dist/ooxml/pptx/read.cjs

@@ -1,14 +1,38 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_ooxml_pptx_vector = require("./vector.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 //#region src/ooxml/pptx/read.ts
+const PRESENTATION_PART = "ppt/presentation.xml";
+function slidePathsInOrder(pkg) {
+	const presentationRoot = (0, ooxml_js.rootElement)(pkg.parts[PRESENTATION_PART]);
+	if (presentationRoot === void 0) return [];
+	const sldIdLst = (0, ooxml_js.childrenWithTag)(presentationRoot, "p:sldIdLst")[0];
+	if (sldIdLst === void 0) return [];
+	const rels = (0, ooxml_js.resolveRelationships)(pkg, PRESENTATION_PART);
+	const paths = [];
+	for (const sldId of (0, ooxml_js.childrenWithTag)(sldIdLst, "p:sldId")) {
+		const rId = (0, ooxml_js.attr)(sldId, "r:id");
+		const rel = rId === void 0 ? void 0 : rels.get(rId);
+		if (rel !== void 0) paths.push(rel.target);
+	}
+	return paths;
+}
 function readPptxContent(pkg) {
 	const pptxDoc = (0, ooxml_js.readPptx)(pkg);
+	const slidePaths = slidePathsInOrder(pkg);
+	const slides = pptxDoc.slides.map((slide, slideIndex) => {
+		const slidePath = slidePaths[slideIndex];
+		const slideRoot = slidePath === void 0 ? void 0 : (0, ooxml_js.rootElement)(pkg.parts[slidePath]);
+		const cSld = slideRoot === void 0 ? void 0 : (0, ooxml_js.childrenWithTag)(slideRoot, "p:cSld")[0];
+		const spTree = cSld === void 0 ? void 0 : (0, ooxml_js.childrenWithTag)(cSld, "p:spTree")[0];
+		return spTree === void 0 ? slide : require_ooxml_pptx_vector.collapseVectorShapeRuns(slide, slideIndex, spTree.children);
+	});
 	return {
 		kind: "presentation",
 		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: { ...pptxDoc.metadata },
-		slides: pptxDoc.slides
+		slides
 	};
 }
 //#endregion

package/dist/ooxml/pptx/read.js

@@ -1,13 +1,37 @@
-import { readPptx } from "ooxml.js";
+import { collapseVectorShapeRuns } from "./vector.js";
+import { attr, childrenWithTag, readPptx, resolveRelationships, rootElement } from "ooxml.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/ooxml/pptx/read.ts
+const PRESENTATION_PART = "ppt/presentation.xml";
+function slidePathsInOrder(pkg) {
+	const presentationRoot = rootElement(pkg.parts[PRESENTATION_PART]);
+	if (presentationRoot === void 0) return [];
+	const sldIdLst = childrenWithTag(presentationRoot, "p:sldIdLst")[0];
+	if (sldIdLst === void 0) return [];
+	const rels = resolveRelationships(pkg, PRESENTATION_PART);
+	const paths = [];
+	for (const sldId of childrenWithTag(sldIdLst, "p:sldId")) {
+		const rId = attr(sldId, "r:id");
+		const rel = rId === void 0 ? void 0 : rels.get(rId);
+		if (rel !== void 0) paths.push(rel.target);
+	}
+	return paths;
+}
 function readPptxContent(pkg) {
 	const pptxDoc = readPptx(pkg);
+	const slidePaths = slidePathsInOrder(pkg);
+	const slides = pptxDoc.slides.map((slide, slideIndex) => {
+		const slidePath = slidePaths[slideIndex];
+		const slideRoot = slidePath === void 0 ? void 0 : rootElement(pkg.parts[slidePath]);
+		const cSld = slideRoot === void 0 ? void 0 : childrenWithTag(slideRoot, "p:cSld")[0];
+		const spTree = cSld === void 0 ? void 0 : childrenWithTag(cSld, "p:spTree")[0];
+		return spTree === void 0 ? slide : collapseVectorShapeRuns(slide, slideIndex, spTree.children);
+	});
 	return {
 		kind: "presentation",
 		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: { ...pptxDoc.metadata },
-		slides: pptxDoc.slides
+		slides
 	};
 }
 //#endregion

package/dist/ooxml/pptx/vector.cjs

@@ -0,0 +1,96 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_edit_drawingml_vector = require("../../edit/drawingml/vector.cjs");
+const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
+let ooxml_js = require("ooxml.js");
+//#region src/ooxml/pptx/vector.ts
+function isBlankParagraphBlocks(blocks) {
+	return blocks.length === 0 || blocks.every((block) => block.kind === "paragraph" && block.runs.every((run) => run.text.trim().length === 0));
+}
+function collectVectorOnlyShapes(children, shapes, state, out) {
+	for (const node of children) {
+		if (node.type !== "element") continue;
+		if (node.tag === "p:sp") {
+			const shapeIndex = state.shapeIndex;
+			state.shapeIndex += 1;
+			const shape = shapes[shapeIndex];
+			if (shape !== void 0 && isBlankParagraphBlocks(shape.blocks)) {
+				const spPr = (0, ooxml_js.childrenWithTag)(node, "p:spPr")[0];
+				const vector = spPr === void 0 ? void 0 : require_edit_drawingml_vector.readDrawingMlVector(spPr);
+				if (vector !== void 0) out.push({
+					shapeIndex,
+					vector
+				});
+			}
+		} else if (node.tag === "p:pic" || node.tag === "p:graphicFrame") state.shapeIndex += 1;
+		else if (node.tag === "p:grpSp") collectVectorOnlyShapes(node.children, shapes, state, out);
+	}
+}
+function collectSlideVectorGroups(spTreeChildren, shapes) {
+	const state = { shapeIndex: 0 };
+	const found = [];
+	collectVectorOnlyShapes(spTreeChildren, shapes, state, found);
+	const groups = [];
+	for (const item of found) {
+		const last = groups[groups.length - 1];
+		if (last !== void 0 && last.insertAt + last.length === item.shapeIndex) {
+			last.vectors.push(item.vector);
+			last.length += 1;
+			continue;
+		}
+		groups.push({
+			insertAt: item.shapeIndex,
+			length: 1,
+			vectors: [item.vector]
+		});
+	}
+	return groups.map((group) => ({
+		insertAt: group.insertAt,
+		length: group.length,
+		vectors: group.vectors.map((vector, index) => ({
+			...vector,
+			paintOrder: index
+		}))
+	}));
+}
+function collapseVectorShapeRuns(slide, slideIndex, spTreeChildren) {
+	const groups = collectSlideVectorGroups(spTreeChildren, slide.shapes);
+	if (groups.length === 0) return slide;
+	const shapes = [];
+	let index = 0;
+	let groupIndex = 0;
+	while (index < slide.shapes.length) {
+		const group = groups[groupIndex];
+		if (group?.insertAt === index && group !== void 0) {
+			const sourcePath = `slides[${slideIndex}].shapes[${shapes.length}]`;
+			shapes.push({
+				frame: {
+					xPt: 0,
+					yPt: 0,
+					widthPt: slide.size.widthPt,
+					heightPt: slide.size.heightPt
+				},
+				insetLeftPt: 0,
+				insetTopPt: 0,
+				insetRightPt: 0,
+				insetBottomPt: 0,
+				blocks: [{
+					...require_model_embedded_drawing.buildDrawingBlock(slide.size, group.vectors),
+					sourcePath
+				}],
+				sourcePath
+			});
+			index += group.length;
+			groupIndex += 1;
+			continue;
+		}
+		const shape = slide.shapes[index];
+		if (shape !== void 0) shapes.push(shape);
+		index += 1;
+	}
+	return {
+		...slide,
+		shapes
+	};
+}
+//#endregion
+exports.collapseVectorShapeRuns = collapseVectorShapeRuns;

package/dist/ooxml/pptx/vector.d.cts

@@ -0,0 +1,6 @@
+import { ContentSlide } from "document-schema.js";
+import { XmlNode } from "ooxml.js";
+//#region src/ooxml/pptx/vector.d.ts
+declare function collapseVectorShapeRuns(slide: ContentSlide, slideIndex: number, spTreeChildren: readonly XmlNode[]): ContentSlide;
+//#endregion
+export { collapseVectorShapeRuns };

package/dist/ooxml/pptx/vector.d.ts

@@ -0,0 +1,6 @@
+import { XmlNode } from "ooxml.js";
+import { ContentSlide } from "document-schema.js";
+//#region src/ooxml/pptx/vector.d.ts
+declare function collapseVectorShapeRuns(slide: ContentSlide, slideIndex: number, spTreeChildren: readonly XmlNode[]): ContentSlide;
+//#endregion
+export { collapseVectorShapeRuns };