documents.js 1.67.15 → 1.68.0

package/dist/layout/sheets.js

@@ -1,5 +1,5 @@
 import { flipY } from "../model/geometry.js";
-import { COLOR_BLACK as COLOR_BLACK$1, rgbHexToColor } from "../model/color.js";
+import { COLOR_BLACK as COLOR_BLACK$1, rgbHexToColor as rgbHexToColor$1 } from "../model/color.js";
 import { DEFAULT_LAYOUT_FONT } from "../model/style.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { alignmentOffsetPt, formulaSizePtFromFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
@@ -36,9 +36,9 @@ const CELL_TEXT_PADDING_PT = 2;
 const HEADER_LABEL_PADDING_PT = 2;
 const MINIMUM_SCALE = .01;
 const NUMERIC_OVERFLOW_TEXT = "###";
-const GRIDLINE_COLOR = rgbHexToColor("#D0D0D0");
+const GRIDLINE_COLOR = rgbHexToColor$1("#D0D0D0");
 const GRIDLINE_WIDTH_PT = .5;
-const HEADER_LABEL_COLOR = rgbHexToColor("#606060");
+const HEADER_LABEL_COLOR = rgbHexToColor$1("#606060");
 function columnLetters(index) {
 	let n = index + 1;
 	let letters = "";

package/dist/{list-nlhN5bat.d.ts → list-BJVehfU8.d.ts}

@@ -1,4 +1,4 @@
-import { n as ParagraphInit, t as OdtParagraph } from "./paragraph-DndYbWuT.js";
+import { n as ParagraphInit, t as OdtParagraph } from "./paragraph-CjtZP77X.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odt/list.d.ts
 declare class OdtListItem {

package/dist/model/block-splice.cjs

@@ -0,0 +1,18 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/model/block-splice.ts
+function spliceBlocks(blocks, placements, consumedIndices, sourcePathFor) {
+	const out = [];
+	let next = 0;
+	for (let index = 0; index <= blocks.length; index++) {
+		while (next < placements.length && placements[next].index === index) {
+			const { build } = placements[next];
+			out.push(build(sourcePathFor(out.length)));
+			next += 1;
+		}
+		const block = blocks[index];
+		if (block !== void 0 && !consumedIndices.has(index)) out.push(block);
+	}
+	return out;
+}
+//#endregion
+exports.spliceBlocks = spliceBlocks;

package/dist/model/block-splice.d.cts

@@ -0,0 +1,9 @@
+import { ContentBlock } from "document-schema.js";
+//#region src/model/block-splice.d.ts
+interface BlockPlacement {
+  readonly index: number;
+  readonly build: (sourcePath: string) => ContentBlock;
+}
+declare function spliceBlocks(blocks: readonly ContentBlock[], placements: readonly BlockPlacement[], consumedIndices: ReadonlySet<number>, sourcePathFor: (position: number) => string): ContentBlock[];
+//#endregion
+export { BlockPlacement, spliceBlocks };

package/dist/model/block-splice.d.ts

@@ -0,0 +1,9 @@
+import { ContentBlock } from "document-schema.js";
+//#region src/model/block-splice.d.ts
+interface BlockPlacement {
+  readonly index: number;
+  readonly build: (sourcePath: string) => ContentBlock;
+}
+declare function spliceBlocks(blocks: readonly ContentBlock[], placements: readonly BlockPlacement[], consumedIndices: ReadonlySet<number>, sourcePathFor: (position: number) => string): ContentBlock[];
+//#endregion
+export { BlockPlacement, spliceBlocks };

package/dist/model/block-splice.js

@@ -0,0 +1,17 @@
+//#region src/model/block-splice.ts
+function spliceBlocks(blocks, placements, consumedIndices, sourcePathFor) {
+	const out = [];
+	let next = 0;
+	for (let index = 0; index <= blocks.length; index++) {
+		while (next < placements.length && placements[next].index === index) {
+			const { build } = placements[next];
+			out.push(build(sourcePathFor(out.length)));
+			next += 1;
+		}
+		const block = blocks[index];
+		if (block !== void 0 && !consumedIndices.has(index)) out.push(block);
+	}
+	return out;
+}
+//#endregion
+export { spliceBlocks };

package/dist/model/color.d.ts

@@ -1,2 +1,2 @@
-import { a as rgbHexToColor, i as colorToRgbHex, n as LayoutColor, r as LayoutColorSchema, t as COLOR_BLACK } from "../color-C98dn-pT.js";
+import { a as rgbHexToColor, i as colorToRgbHex, n as LayoutColor, r as LayoutColorSchema, t as COLOR_BLACK } from "../color-BHhGSqAh.js";
 export { COLOR_BLACK, type LayoutColor, LayoutColorSchema, colorToRgbHex, rgbHexToColor };

package/dist/odf/odp/read.cjs

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
 const require_odf_formula_detect = require("../formula/detect.cjs");
+const require_odf_vector_detect = require("../vector/detect.cjs");
 let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/odp/read.ts
@@ -22,6 +24,42 @@ function readOdpContent(pkg) {
 					blocks: [require_model_formula.buildFormulaBlock(found.formula, found.frame, `slides[${slideIndex}].shapes[${found.shapeIndex}]`)]
 				};
 			}
+			const groups = require_odf_vector_detect.collectSlideVectorGroups(pageElement.children, pkg);
+			if (groups.length === 0) return;
+			const shapes = [];
+			let shapeIndex = 0;
+			let groupIndex = 0;
+			while (shapeIndex <= slide.shapes.length) {
+				while (groupIndex < groups.length && groups[groupIndex].insertBeforeShapeIndex === shapeIndex) {
+					const group = groups[groupIndex];
+					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
+					});
+					groupIndex += 1;
+				}
+				const shape = slide.shapes[shapeIndex];
+				if (shape !== void 0) shapes.push(shape);
+				shapeIndex += 1;
+			}
+			odpDoc.slides[slideIndex] = {
+				...slide,
+				shapes
+			};
 		});
 	}
 	return {

package/dist/odf/odp/read.js

@@ -1,5 +1,7 @@
+import { buildDrawingBlock } from "../../model/embedded-drawing.js";
 import { buildFormulaBlock } from "../../model/formula.js";
 import { collectSlideFormulaFrames } from "../formula/detect.js";
+import { collectSlideVectorGroups } from "../vector/detect.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { childrenWithTag, findChildElement, readOdp, rootElement } from "odf.js";
 //#region src/odf/odp/read.ts
@@ -21,6 +23,42 @@ function readOdpContent(pkg) {
 					blocks: [buildFormulaBlock(found.formula, found.frame, `slides[${slideIndex}].shapes[${found.shapeIndex}]`)]
 				};
 			}
+			const groups = collectSlideVectorGroups(pageElement.children, pkg);
+			if (groups.length === 0) return;
+			const shapes = [];
+			let shapeIndex = 0;
+			let groupIndex = 0;
+			while (shapeIndex <= slide.shapes.length) {
+				while (groupIndex < groups.length && groups[groupIndex].insertBeforeShapeIndex === shapeIndex) {
+					const group = groups[groupIndex];
+					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: [{
+							...buildDrawingBlock(slide.size, group.vectors),
+							sourcePath
+						}],
+						sourcePath
+					});
+					groupIndex += 1;
+				}
+				const shape = slide.shapes[shapeIndex];
+				if (shape !== void 0) shapes.push(shape);
+				shapeIndex += 1;
+			}
+			odpDoc.slides[slideIndex] = {
+				...slide,
+				shapes
+			};
 		});
 	}
 	return {

package/dist/odf/odt/read.cjs

@@ -1,6 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
+const require_model_block_splice = require("../../model/block-splice.cjs");
 const require_odf_formula_detect = require("../formula/detect.cjs");
+const require_odf_vector_detect = require("../vector/detect.cjs");
 let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/odt/read.ts
@@ -13,11 +16,25 @@ function readOdtContent(pkg) {
 		const text = body === void 0 ? void 0 : (0, odf_js.findChildElement)(body.children, "office:text");
 		if (text !== void 0) {
 			const section = odtDoc.sections[0];
-			const { placements, consumedBlockIndices } = collectFormulaPlacements(text.children, pkg);
-			if (placements.length > 0) odtDoc.sections[0] = {
-				...section,
-				blocks: spliceFormulaBlocks(section.blocks, placements, consumedBlockIndices)
-			};
+			const { placements: formulaPlacements, consumedBlockIndices: formulaConsumed } = collectFormulaPlacements(text.children, pkg);
+			const { placements: vectorPlacements, consumedBlockIndices: vectorConsumed } = collectVectorPlacements(text.children, pkg);
+			if (formulaPlacements.length > 0 || vectorPlacements.length > 0) {
+				const combined = [...formulaPlacements.map((placement) => ({
+					index: placement.index,
+					build: (sourcePath) => require_model_formula.buildFormulaBlock(placement.detected.formula, placement.detected.frame, sourcePath)
+				})), ...vectorPlacements.map((placement) => ({
+					index: placement.index,
+					build: (sourcePath) => ({
+						...require_model_embedded_drawing.buildDrawingBlock(section.pageSize, placement.vectors),
+						sourcePath
+					})
+				}))].sort((a, b) => a.index - b.index);
+				const consumedBlockIndices = /* @__PURE__ */ new Set([...formulaConsumed, ...vectorConsumed]);
+				odtDoc.sections[0] = {
+					...section,
+					blocks: require_model_block_splice.spliceBlocks(section.blocks, combined, consumedBlockIndices, (position) => `sections[0].blocks[${position}]`)
+				};
+			}
 		}
 	}
 	return {
@@ -27,30 +44,29 @@ function readOdtContent(pkg) {
 		sections: odtDoc.sections
 	};
 }
-function pushPlacements(out, index, detected) {
+function pushFormulaPlacements(out, index, detected) {
 	for (const frame of detected) out.push({
 		index,
 		detected: frame
 	});
 }
-function isFormulaOnlyParagraph(paragraph, detected) {
-	if (detected.length === 0) return false;
-	const frames = detected.map((entry) => entry.frameElement);
+function isEmbeddedObjectOnlyParagraph(paragraph, recognisedElements) {
+	if (recognisedElements.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 (!frames.includes(child)) return false;
+		if (!recognisedElements.includes(child)) return false;
 	}
 	return true;
 }
-function pushParagraphPlacements(node, pkg, state) {
+function pushFormulaParagraphPlacement(node, pkg, state) {
 	const detected = require_odf_formula_detect.collectFormulaFrames(node.children, pkg);
 	state.blockCount += 1;
-	if (isFormulaOnlyParagraph(node, detected)) state.consumedBlockIndices.add(state.blockCount - 1);
-	pushPlacements(state.placements, state.blockCount, detected);
+	if (isEmbeddedObjectOnlyParagraph(node, detected.map((entry) => entry.frameElement))) state.consumedBlockIndices.add(state.blockCount - 1);
+	pushFormulaPlacements(state.placements, state.blockCount, detected);
 }
 function collectFormulaPlacements(nodes, pkg) {
 	const state = {
@@ -58,48 +74,97 @@ function collectFormulaPlacements(nodes, pkg) {
 		placements: [],
 		consumedBlockIndices: /* @__PURE__ */ new Set()
 	};
-	walkForPlacements(nodes, pkg, state);
+	walkForFormulaPlacements(nodes, pkg, state);
 	return {
 		placements: state.placements,
 		consumedBlockIndices: state.consumedBlockIndices
 	};
 }
-function walkForPlacements(nodes, pkg, state) {
+function walkForFormulaPlacements(nodes, pkg, state) {
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
-		if (node.tag === "text:p" || node.tag === "text:h") pushParagraphPlacements(node, pkg, state);
-		else if (node.tag === "text:list") walkListForPlacements(node.children, pkg, state);
+		if (node.tag === "text:p" || node.tag === "text:h") pushFormulaParagraphPlacement(node, pkg, state);
+		else if (node.tag === "text:list") walkListForFormulaPlacements(node.children, pkg, state);
 		else if (node.tag === "table:table") {
 			state.blockCount += 1;
-			pushPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames(node.children, pkg));
-		} else if (node.tag === "text:section") walkForPlacements(node.children, pkg, state);
-		else pushPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames([node], pkg));
+			pushFormulaPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames(node.children, pkg));
+		} else if (node.tag === "text:section") walkForFormulaPlacements(node.children, pkg, state);
+		else pushFormulaPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames([node], pkg));
 	}
 }
-function walkListForPlacements(itemNodes, pkg, state) {
+function walkListForFormulaPlacements(itemNodes, pkg, state) {
 	for (const item of itemNodes) {
 		if (item.type !== "element" || item.tag !== "text:list-item") continue;
 		for (const itemChild of item.children) {
 			if (itemChild.type !== "element") continue;
-			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushParagraphPlacements(itemChild, pkg, state);
-			else if (itemChild.tag === "text:list") walkListForPlacements(itemChild.children, pkg, state);
-			else pushPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames([itemChild], pkg));
+			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushFormulaParagraphPlacement(itemChild, pkg, state);
+			else if (itemChild.tag === "text:list") walkListForFormulaPlacements(itemChild.children, pkg, state);
+			else pushFormulaPlacements(state.placements, state.blockCount, require_odf_formula_detect.collectFormulaFrames([itemChild], pkg));
 		}
 	}
 }
-function spliceFormulaBlocks(blocks, placements, consumedBlockIndices) {
-	const out = [];
-	let next = 0;
-	for (let index = 0; index <= blocks.length; index++) {
-		while (next < placements.length && placements[next].index === index) {
-			const { detected } = placements[next];
-			out.push(require_model_formula.buildFormulaBlock(detected.formula, detected.frame, `sections[0].blocks[${out.length}]`));
-			next += 1;
+function vectorTaggedChildren(node) {
+	return node.children.filter((child) => child.type === "element" && require_odf_vector_detect.isVectorElementTag(child.tag));
+}
+function pushVectorParagraphPlacement(node, pkg, state) {
+	const vectors = require_odf_vector_detect.collectContainerVectors(node.children, pkg);
+	state.blockCount += 1;
+	if (vectors.length > 0 && isEmbeddedObjectOnlyParagraph(node, vectorTaggedChildren(node))) state.consumedBlockIndices.add(state.blockCount - 1);
+	if (vectors.length > 0) state.placements.push({
+		index: state.blockCount,
+		vectors
+	});
+}
+function collectVectorPlacements(nodes, pkg) {
+	const state = {
+		blockCount: 0,
+		placements: [],
+		consumedBlockIndices: /* @__PURE__ */ new Set()
+	};
+	walkForVectorPlacements(nodes, pkg, state);
+	return {
+		placements: state.placements,
+		consumedBlockIndices: state.consumedBlockIndices
+	};
+}
+function walkForVectorPlacements(nodes, pkg, state) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag === "text:p" || node.tag === "text:h") pushVectorParagraphPlacement(node, pkg, state);
+		else if (node.tag === "text:list") walkListForVectorPlacements(node.children, pkg, state);
+		else if (node.tag === "table:table") {
+			state.blockCount += 1;
+			const vectors = require_odf_vector_detect.collectContainerVectors(node.children, pkg);
+			if (vectors.length > 0) state.placements.push({
+				index: state.blockCount,
+				vectors
+			});
+		} else if (node.tag === "text:section") walkForVectorPlacements(node.children, pkg, state);
+		else {
+			const vectors = require_odf_vector_detect.collectContainerVectors([node], pkg);
+			if (vectors.length > 0) state.placements.push({
+				index: state.blockCount,
+				vectors
+			});
+		}
+	}
+}
+function walkListForVectorPlacements(itemNodes, pkg, state) {
+	for (const item of itemNodes) {
+		if (item.type !== "element" || item.tag !== "text:list-item") continue;
+		for (const itemChild of item.children) {
+			if (itemChild.type !== "element") continue;
+			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushVectorParagraphPlacement(itemChild, pkg, state);
+			else if (itemChild.tag === "text:list") walkListForVectorPlacements(itemChild.children, pkg, state);
+			else {
+				const vectors = require_odf_vector_detect.collectContainerVectors([itemChild], pkg);
+				if (vectors.length > 0) state.placements.push({
+					index: state.blockCount,
+					vectors
+				});
+			}
 		}
-		const block = blocks[index];
-		if (block !== void 0 && !consumedBlockIndices.has(index)) out.push(block);
 	}
-	return out;
 }
 //#endregion
 exports.readOdtContent = readOdtContent;

package/dist/odf/odt/read.js

@@ -1,5 +1,8 @@
+import { buildDrawingBlock } from "../../model/embedded-drawing.js";
 import { buildFormulaBlock } from "../../model/formula.js";
+import { spliceBlocks } from "../../model/block-splice.js";
 import { collectFormulaFrames } from "../formula/detect.js";
+import { collectContainerVectors, isVectorElementTag } from "../vector/detect.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { findChildElement, readOdt, rootElement } from "odf.js";
 //#region src/odf/odt/read.ts
@@ -12,11 +15,25 @@ function readOdtContent(pkg) {
 		const text = body === void 0 ? void 0 : findChildElement(body.children, "office:text");
 		if (text !== void 0) {
 			const section = odtDoc.sections[0];
-			const { placements, consumedBlockIndices } = collectFormulaPlacements(text.children, pkg);
-			if (placements.length > 0) odtDoc.sections[0] = {
-				...section,
-				blocks: spliceFormulaBlocks(section.blocks, placements, consumedBlockIndices)
-			};
+			const { placements: formulaPlacements, consumedBlockIndices: formulaConsumed } = collectFormulaPlacements(text.children, pkg);
+			const { placements: vectorPlacements, consumedBlockIndices: vectorConsumed } = collectVectorPlacements(text.children, pkg);
+			if (formulaPlacements.length > 0 || vectorPlacements.length > 0) {
+				const combined = [...formulaPlacements.map((placement) => ({
+					index: placement.index,
+					build: (sourcePath) => buildFormulaBlock(placement.detected.formula, placement.detected.frame, sourcePath)
+				})), ...vectorPlacements.map((placement) => ({
+					index: placement.index,
+					build: (sourcePath) => ({
+						...buildDrawingBlock(section.pageSize, placement.vectors),
+						sourcePath
+					})
+				}))].sort((a, b) => a.index - b.index);
+				const consumedBlockIndices = /* @__PURE__ */ new Set([...formulaConsumed, ...vectorConsumed]);
+				odtDoc.sections[0] = {
+					...section,
+					blocks: spliceBlocks(section.blocks, combined, consumedBlockIndices, (position) => `sections[0].blocks[${position}]`)
+				};
+			}
 		}
 	}
 	return {
@@ -26,30 +43,29 @@ function readOdtContent(pkg) {
 		sections: odtDoc.sections
 	};
 }
-function pushPlacements(out, index, detected) {
+function pushFormulaPlacements(out, index, detected) {
 	for (const frame of detected) out.push({
 		index,
 		detected: frame
 	});
 }
-function isFormulaOnlyParagraph(paragraph, detected) {
-	if (detected.length === 0) return false;
-	const frames = detected.map((entry) => entry.frameElement);
+function isEmbeddedObjectOnlyParagraph(paragraph, recognisedElements) {
+	if (recognisedElements.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 (!frames.includes(child)) return false;
+		if (!recognisedElements.includes(child)) return false;
 	}
 	return true;
 }
-function pushParagraphPlacements(node, pkg, state) {
+function pushFormulaParagraphPlacement(node, pkg, state) {
 	const detected = collectFormulaFrames(node.children, pkg);
 	state.blockCount += 1;
-	if (isFormulaOnlyParagraph(node, detected)) state.consumedBlockIndices.add(state.blockCount - 1);
-	pushPlacements(state.placements, state.blockCount, detected);
+	if (isEmbeddedObjectOnlyParagraph(node, detected.map((entry) => entry.frameElement))) state.consumedBlockIndices.add(state.blockCount - 1);
+	pushFormulaPlacements(state.placements, state.blockCount, detected);
 }
 function collectFormulaPlacements(nodes, pkg) {
 	const state = {
@@ -57,48 +73,97 @@ function collectFormulaPlacements(nodes, pkg) {
 		placements: [],
 		consumedBlockIndices: /* @__PURE__ */ new Set()
 	};
-	walkForPlacements(nodes, pkg, state);
+	walkForFormulaPlacements(nodes, pkg, state);
 	return {
 		placements: state.placements,
 		consumedBlockIndices: state.consumedBlockIndices
 	};
 }
-function walkForPlacements(nodes, pkg, state) {
+function walkForFormulaPlacements(nodes, pkg, state) {
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
-		if (node.tag === "text:p" || node.tag === "text:h") pushParagraphPlacements(node, pkg, state);
-		else if (node.tag === "text:list") walkListForPlacements(node.children, pkg, state);
+		if (node.tag === "text:p" || node.tag === "text:h") pushFormulaParagraphPlacement(node, pkg, state);
+		else if (node.tag === "text:list") walkListForFormulaPlacements(node.children, pkg, state);
 		else if (node.tag === "table:table") {
 			state.blockCount += 1;
-			pushPlacements(state.placements, state.blockCount, collectFormulaFrames(node.children, pkg));
-		} else if (node.tag === "text:section") walkForPlacements(node.children, pkg, state);
-		else pushPlacements(state.placements, state.blockCount, collectFormulaFrames([node], pkg));
+			pushFormulaPlacements(state.placements, state.blockCount, collectFormulaFrames(node.children, pkg));
+		} else if (node.tag === "text:section") walkForFormulaPlacements(node.children, pkg, state);
+		else pushFormulaPlacements(state.placements, state.blockCount, collectFormulaFrames([node], pkg));
 	}
 }
-function walkListForPlacements(itemNodes, pkg, state) {
+function walkListForFormulaPlacements(itemNodes, pkg, state) {
 	for (const item of itemNodes) {
 		if (item.type !== "element" || item.tag !== "text:list-item") continue;
 		for (const itemChild of item.children) {
 			if (itemChild.type !== "element") continue;
-			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushParagraphPlacements(itemChild, pkg, state);
-			else if (itemChild.tag === "text:list") walkListForPlacements(itemChild.children, pkg, state);
-			else pushPlacements(state.placements, state.blockCount, collectFormulaFrames([itemChild], pkg));
+			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushFormulaParagraphPlacement(itemChild, pkg, state);
+			else if (itemChild.tag === "text:list") walkListForFormulaPlacements(itemChild.children, pkg, state);
+			else pushFormulaPlacements(state.placements, state.blockCount, collectFormulaFrames([itemChild], pkg));
 		}
 	}
 }
-function spliceFormulaBlocks(blocks, placements, consumedBlockIndices) {
-	const out = [];
-	let next = 0;
-	for (let index = 0; index <= blocks.length; index++) {
-		while (next < placements.length && placements[next].index === index) {
-			const { detected } = placements[next];
-			out.push(buildFormulaBlock(detected.formula, detected.frame, `sections[0].blocks[${out.length}]`));
-			next += 1;
+function vectorTaggedChildren(node) {
+	return node.children.filter((child) => child.type === "element" && isVectorElementTag(child.tag));
+}
+function pushVectorParagraphPlacement(node, pkg, state) {
+	const vectors = collectContainerVectors(node.children, pkg);
+	state.blockCount += 1;
+	if (vectors.length > 0 && isEmbeddedObjectOnlyParagraph(node, vectorTaggedChildren(node))) state.consumedBlockIndices.add(state.blockCount - 1);
+	if (vectors.length > 0) state.placements.push({
+		index: state.blockCount,
+		vectors
+	});
+}
+function collectVectorPlacements(nodes, pkg) {
+	const state = {
+		blockCount: 0,
+		placements: [],
+		consumedBlockIndices: /* @__PURE__ */ new Set()
+	};
+	walkForVectorPlacements(nodes, pkg, state);
+	return {
+		placements: state.placements,
+		consumedBlockIndices: state.consumedBlockIndices
+	};
+}
+function walkForVectorPlacements(nodes, pkg, state) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag === "text:p" || node.tag === "text:h") pushVectorParagraphPlacement(node, pkg, state);
+		else if (node.tag === "text:list") walkListForVectorPlacements(node.children, pkg, state);
+		else if (node.tag === "table:table") {
+			state.blockCount += 1;
+			const vectors = collectContainerVectors(node.children, pkg);
+			if (vectors.length > 0) state.placements.push({
+				index: state.blockCount,
+				vectors
+			});
+		} else if (node.tag === "text:section") walkForVectorPlacements(node.children, pkg, state);
+		else {
+			const vectors = collectContainerVectors([node], pkg);
+			if (vectors.length > 0) state.placements.push({
+				index: state.blockCount,
+				vectors
+			});
+		}
+	}
+}
+function walkListForVectorPlacements(itemNodes, pkg, state) {
+	for (const item of itemNodes) {
+		if (item.type !== "element" || item.tag !== "text:list-item") continue;
+		for (const itemChild of item.children) {
+			if (itemChild.type !== "element") continue;
+			if (itemChild.tag === "text:p" || itemChild.tag === "text:h") pushVectorParagraphPlacement(itemChild, pkg, state);
+			else if (itemChild.tag === "text:list") walkListForVectorPlacements(itemChild.children, pkg, state);
+			else {
+				const vectors = collectContainerVectors([itemChild], pkg);
+				if (vectors.length > 0) state.placements.push({
+					index: state.blockCount,
+					vectors
+				});
+			}
 		}
-		const block = blocks[index];
-		if (block !== void 0 && !consumedBlockIndices.has(index)) out.push(block);
 	}
-	return out;
 }
 //#endregion
 export { readOdtContent };

package/dist/odf/vector/detect.cjs

@@ -0,0 +1,52 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let odf_js = require("odf.js");
+//#region src/odf/vector/detect.ts
+const VECTOR_ELEMENT_TAGS = /* @__PURE__ */ new Set([
+	"draw:rect",
+	"draw:ellipse",
+	"draw:circle",
+	"draw:line",
+	"draw:path",
+	"draw:polygon",
+	"draw:polyline",
+	"draw:custom-shape"
+]);
+function isVectorElementTag(tag) {
+	return VECTOR_ELEMENT_TAGS.has(tag);
+}
+function collectContainerVectors(children, pkg) {
+	return (0, odf_js.readDrawPageContent)(children, pkg).vectors;
+}
+function paintOrderOf(item) {
+	if (item.paintOrder === void 0) throw new Error("expected odf.js's own readDrawPageContent to stamp every shape/vector with a paintOrder");
+	return item.paintOrder;
+}
+function collectSlideVectorGroups(pageChildren, pkg) {
+	const { shapes, vectors } = (0, odf_js.readDrawPageContent)(pageChildren, pkg);
+	const shapePaintOrders = shapes.map(paintOrderOf);
+	const groups = [];
+	for (const vector of vectors) {
+		const vectorOrder = paintOrderOf(vector);
+		const insertBeforeShapeIndex = shapePaintOrders.filter((order) => order < vectorOrder).length;
+		const last = groups[groups.length - 1];
+		if (last?.insertBeforeShapeIndex === insertBeforeShapeIndex && last !== void 0) {
+			last.vectors.push(vector);
+			continue;
+		}
+		groups.push({
+			insertBeforeShapeIndex,
+			vectors: [vector]
+		});
+	}
+	return groups.map((group) => ({
+		insertBeforeShapeIndex: group.insertBeforeShapeIndex,
+		vectors: group.vectors.map((vector, index) => ({
+			...vector,
+			paintOrder: index
+		}))
+	}));
+}
+//#endregion
+exports.collectContainerVectors = collectContainerVectors;
+exports.collectSlideVectorGroups = collectSlideVectorGroups;
+exports.isVectorElementTag = isVectorElementTag;

package/dist/odf/vector/detect.d.cts

@@ -0,0 +1,12 @@
+import { ContentVector } from "document-schema.js";
+import { Package, XmlNode } from "odf.js";
+//#region src/odf/vector/detect.d.ts
+declare function isVectorElementTag(tag: string): boolean;
+declare function collectContainerVectors(children: readonly XmlNode[], pkg: Package): readonly ContentVector[];
+interface DetectedSlideVectorGroup {
+  readonly insertBeforeShapeIndex: number;
+  readonly vectors: readonly ContentVector[];
+}
+declare function collectSlideVectorGroups(pageChildren: readonly XmlNode[], pkg: Package): readonly DetectedSlideVectorGroup[];
+//#endregion
+export { DetectedSlideVectorGroup, collectContainerVectors, collectSlideVectorGroups, isVectorElementTag };