documents.js 1.61.0 → 1.63.0

package/dist/edit/docx/content.js

@@ -1,16 +1,44 @@
 import { ptToTwips } from "../../model/units.js";
 import { createDocx } from "./editor.js";
+import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { base64ToBytes } from "ooxml.js";
 //#region src/edit/docx/content.ts
-function buildDocxPackage(content) {
+function buildDocxPackage(content, options) {
 	if (content.kind !== "wordprocessing") throw new Error("buildDocxPackage requires a wordprocessing ContentDocument");
 	const editor = createDocx();
 	content.sections.forEach((section, sectionIndex) => {
 		if (sectionIndex > 0) editor.body.appendPageBreak();
-		for (const block of section.blocks) appendBlock(editor.body, block);
+		appendBlocks(editor.body, section.blocks, options);
 	});
 	return editor.toPackage();
 }
+function isMergeableImageParagraph(block) {
+	return block.kind === "paragraph" && block.runs.every((run) => run.text === "");
+}
+function appendBlocks(body, blocks, options) {
+	let index = 0;
+	while (index < blocks.length) {
+		const block = blocks[index];
+		const next = blocks[index + 1];
+		if (block !== void 0 && isMergeableImageParagraph(block) && next?.kind === "image") {
+			const paragraph = body.appendParagraph();
+			paragraph.styleId = block.styleId;
+			paragraph.alignment = block.alignment;
+			paragraph.list = block.list;
+			paragraph.insertImageAfter({
+				format: next.format,
+				bytes: base64ToBytes(next.base64),
+				widthPt: next.widthPt,
+				heightPt: next.heightPt,
+				altText: next.altText
+			});
+			index += 2;
+			continue;
+		}
+		if (block !== void 0) appendBlock(body, block, options);
+		index += 1;
+	}
+}
 function populateParagraph(paragraph, block) {
 	paragraph.styleId = block.styleId;
 	paragraph.alignment = block.alignment;
@@ -29,32 +57,57 @@ function populateParagraph(paragraph, block) {
 		if (run.color !== void 0) docxRun.color = run.color;
 	}
 }
+function populateCellBlocks(cell, blocks) {
+	const [firstBlock, ...restBlocks] = blocks;
+	const firstParagraph = cell.paragraphs()[0];
+	if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
+	else if (firstBlock !== void 0) appendCellBlock(cell, firstBlock);
+	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
 	const table = body.appendTable({
-		rows: block.rows.length,
+		rows: 0,
 		columns,
 		columnWidthsTwips: block.columnWidthsPt.map(ptToTwips)
 	});
-	block.rows.forEach((row, rowIndex) => {
-		const tableRow = table.rows()[rowIndex];
-		if (tableRow === void 0) return;
+	const verticalMerges = /* @__PURE__ */ new Map();
+	block.rows.forEach((row) => {
+		const domCells = table.appendRow(row.cells.length).cells();
+		let colIndex = 0;
 		row.cells.forEach((cell, cellIndex) => {
-			const tableCell = tableRow.cells()[cellIndex];
+			const tableCell = domCells[cellIndex];
 			if (tableCell === void 0) return;
-			const [firstBlock, ...restBlocks] = cell.blocks;
-			const firstParagraph = tableCell.paragraphs()[0];
-			if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
-			else if (firstBlock !== void 0) appendCellBlock(tableCell, firstBlock);
-			for (const remaining of restBlocks) appendCellBlock(tableCell, remaining);
+			const active = verticalMerges.get(colIndex);
+			if (active !== void 0 && active.rowsRemaining > 0) {
+				if (active.gridSpan > 1) tableCell.colSpan = active.gridSpan;
+				tableCell.verticalMerge = "continue";
+				verticalMerges.set(colIndex, {
+					rowsRemaining: active.rowsRemaining - 1,
+					gridSpan: active.gridSpan
+				});
+				colIndex += active.gridSpan;
+				return;
+			}
+			const span = cell.colSpan ?? 1;
+			if (span > 1) tableCell.colSpan = span;
+			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
+				tableCell.verticalMerge = "restart";
+				verticalMerges.set(colIndex, {
+					rowsRemaining: cell.rowSpan - 1,
+					gridSpan: span
+				});
+			}
+			populateCellBlocks(tableCell, cell.blocks);
+			colIndex += span;
 		});
 	});
 }
 function appendCellBlock(cell, block) {
 	if (block.kind === "paragraph") populateParagraph(cell.appendParagraph(), block);
 }
-function appendBlock(body, block) {
+function appendBlock(body, block, options) {
 	if (block.kind === "paragraph") populateParagraph(body.appendParagraph(), block);
 	else if (block.kind === "image") body.appendParagraph().insertImageAfter({
 		format: block.format,
@@ -65,6 +118,15 @@ function appendBlock(body, block) {
 	});
 	else if (block.kind === "pageBreak") body.appendPageBreak();
 	else if (block.kind === "table") appendTable(body, block);
+	else if (block.kind === "embeddedObject") appendEmbeddedObject(body, block, options);
+}
+function appendEmbeddedObject(body, block, options) {
+	const formula = formulaOfBlock(block);
+	if (formula === void 0) return;
+	const paragraph = body.appendParagraph();
+	const { written, diagnostics } = paragraph.appendOfficeMath(formula.mathml);
+	for (const diagnostic of diagnostics) options?.onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+	if (!written) paragraph.appendRun({ text: formulaPlaceholderText(formula) });
 }
 //#endregion
 export { buildDocxPackage };

package/dist/edit/docx/paragraph.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_omml_write = require("../../omml/write.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_docx_image = require("./image.cjs");
 const require_edit_docx_props = require("./props.cjs");
@@ -104,6 +105,19 @@ var DocxParagraph = class {
 		const numPr = require_xml_edit.getOrCreateChildElement(pPr, "w:numPr", require_edit_docx_props.PPR_ORDER, () => require_xml_fragment.el("w:numPr"));
 		numPr.children = [require_xml_fragment.el("w:ilvl", { "w:val": String(value.level) }), require_xml_fragment.el("w:numId", { "w:val": value.numId })];
 	}
+	appendOfficeMath(mathml) {
+		const node = this.live();
+		const result = require_omml_write.buildOfficeMathParagraph(mathml);
+		if (result.element === void 0) return {
+			...result,
+			written: false
+		};
+		node.children.push(result.element);
+		return {
+			...result,
+			written: true
+		};
+	}
 	insertImageAfter(image) {
 		const node = this.live();
 		if (this.imageContext === void 0) throw new Error("insertImageAfter requires a paragraph opened through a DocxEditor");

package/dist/edit/docx/paragraph.d.cts

@@ -1,3 +1,5 @@
+import { r as MathMlNode } from "../../nodes-pArN9ilm.cjs";
+import { r as OmmlWriteResult } from "../../write-DuyfnbL_.cjs";
 import { n as MediaContext, t as ImageInit } from "../../image-BfRLAD9B.cjs";
 import { n as RunInit, t as DocxRun } from "../../run-B3GNScJH.cjs";
 import { ContentListMembership } from "document-schema.js";
@@ -32,6 +34,9 @@ declare class DocxParagraph {
   set alignment(value: 'left' | 'center' | 'right' | 'justify' | undefined);
   get list(): ContentListMembership | undefined;
   set list(value: ContentListMembership | undefined);
+  appendOfficeMath(mathml: readonly MathMlNode[]): OmmlWriteResult & {
+    readonly written: boolean;
+  };
   insertImageAfter(image: ImageInit): void;
   remove(): void;
 }

package/dist/edit/docx/paragraph.d.ts

@@ -1,3 +1,5 @@
+import { r as MathMlNode } from "../../nodes-pArN9ilm.js";
+import { r as OmmlWriteResult } from "../../write-Zqwx6pka.js";
 import { n as MediaContext, t as ImageInit } from "../../image-BfRLAD9B.js";
 import { n as RunInit, t as DocxRun } from "../../run-D2rTWHbt.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
@@ -32,6 +34,9 @@ declare class DocxParagraph {
   set alignment(value: 'left' | 'center' | 'right' | 'justify' | undefined);
   get list(): ContentListMembership | undefined;
   set list(value: ContentListMembership | undefined);
+  appendOfficeMath(mathml: readonly MathMlNode[]): OmmlWriteResult & {
+    readonly written: boolean;
+  };
   insertImageAfter(image: ImageInit): void;
   remove(): void;
 }

package/dist/edit/docx/paragraph.js

@@ -1,4 +1,5 @@
 import { el } from "../../xml/fragment.js";
+import { buildOfficeMathParagraph } from "../../omml/write.js";
 import { getOrCreateChildElement, removeChild } from "../../xml/edit.js";
 import { insertImageMedia } from "./image.js";
 import { PPR_ORDER, ensureFirstChild, getAlignment, getStyleId, setAlignment, setStyleId } from "./props.js";
@@ -103,6 +104,19 @@ var DocxParagraph = class {
 		const numPr = getOrCreateChildElement(pPr, "w:numPr", PPR_ORDER, () => el("w:numPr"));
 		numPr.children = [el("w:ilvl", { "w:val": String(value.level) }), el("w:numId", { "w:val": value.numId })];
 	}
+	appendOfficeMath(mathml) {
+		const node = this.live();
+		const result = buildOfficeMathParagraph(mathml);
+		if (result.element === void 0) return {
+			...result,
+			written: false
+		};
+		node.children.push(result.element);
+		return {
+			...result,
+			written: true
+		};
+	}
 	insertImageAfter(image) {
 		const node = this.live();
 		if (this.imageContext === void 0) throw new Error("insertImageAfter requires a paragraph opened through a DocxEditor");

package/dist/edit/docx/run.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_xml_entities = require("../../xml/entities.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_docx_props = require("./props.cjs");
-const require_xml_entities = require("../../xml/entities.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 //#region src/edit/docx/run.ts

package/dist/edit/docx/run.js

@@ -1,8 +1,8 @@
 import { colorToRgbHex } from "../../model/color.js";
 import { el, txt } from "../../xml/fragment.js";
+import { encodeXmlText, needsSpacePreserve } from "../../xml/entities.js";
 import { removeChild, setAttr } from "../../xml/edit.js";
 import { RPR_ORDER, ensureFirstChild, getColor, getFontFamily, getSizePt, getToggle, setColor, setFontFamily, setSizePt, setToggle } from "./props.js";
-import { encodeXmlText, needsSpacePreserve } from "../../xml/entities.js";
 import { textContent } from "ooxml.js";
 //#region src/edit/docx/run.ts
 function directChild(parent, tag) {

package/dist/edit/docx/table.cjs

@@ -2,13 +2,54 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_docx_paragraph = require("./paragraph.cjs");
+let ooxml_js = require("ooxml.js");
 //#region src/edit/docx/table.ts
 const DEFAULT_TABLE_WIDTH_TWIPS = 9360;
+const TC_PR_CHILD_ORDER = ["w:gridSpan", "w:vMerge"];
 var DocxTableCell = class {
 	node;
 	constructor(node) {
 		this.node = node;
 	}
+	tcPrElement(create) {
+		const existing = require_xml_edit.directChildElement(this.node, "w:tcPr");
+		if (existing !== void 0 || !create) return existing;
+		const created = require_xml_fragment.el("w:tcPr");
+		this.node.children.unshift(created);
+		return created;
+	}
+	get colSpan() {
+		const tcPr = this.tcPrElement(false);
+		const gridSpan = tcPr === void 0 ? void 0 : require_xml_edit.directChildElement(tcPr, "w:gridSpan");
+		const val = gridSpan === void 0 ? void 0 : (0, ooxml_js.attr)(gridSpan, "w:val");
+		return val === void 0 ? void 0 : Number(val);
+	}
+	set colSpan(value) {
+		if (value === void 0) {
+			const tcPr = this.tcPrElement(false);
+			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
+			return;
+		}
+		const tcPr = this.tcPrElement(true);
+		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
+		require_xml_edit.insertInSchemaOrder(tcPr, require_xml_fragment.el("w:gridSpan", { "w:val": String(value) }), TC_PR_CHILD_ORDER);
+	}
+	get verticalMerge() {
+		const tcPr = this.tcPrElement(false);
+		const vMerge = tcPr === void 0 ? void 0 : require_xml_edit.directChildElement(tcPr, "w:vMerge");
+		if (vMerge === void 0) return;
+		return (0, ooxml_js.attr)(vMerge, "w:val") === "restart" ? "restart" : "continue";
+	}
+	set verticalMerge(value) {
+		if (value === void 0) {
+			const tcPr = this.tcPrElement(false);
+			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));
+			return;
+		}
+		const tcPr = this.tcPrElement(true);
+		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));
+		require_xml_edit.insertInSchemaOrder(tcPr, value === "restart" ? require_xml_fragment.el("w:vMerge", { "w:val": "restart" }) : require_xml_fragment.el("w:vMerge"), TC_PR_CHILD_ORDER);
+	}
 	paragraphs() {
 		const out = [];
 		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:p") out.push(new require_edit_docx_paragraph.DocxParagraph(this.node.children, child));

package/dist/edit/docx/table.d.cts

@@ -6,9 +6,15 @@ interface TableInit {
   readonly columns: number;
   readonly columnWidthsTwips?: readonly number[];
 }
+type DocxVerticalMerge = 'restart' | 'continue';
 declare class DocxTableCell {
   private readonly node;
   constructor(node: XmlElement);
+  private tcPrElement;
+  get colSpan(): number | undefined;
+  set colSpan(value: number | undefined);
+  get verticalMerge(): DocxVerticalMerge | undefined;
+  set verticalMerge(value: DocxVerticalMerge | undefined);
   paragraphs(): DocxParagraph[];
   appendParagraph(init?: ParagraphInit): DocxParagraph;
   get text(): string;
@@ -31,4 +37,4 @@ declare class DocxTable {
 }
 declare function buildTable(init: TableInit): XmlElement;
 //#endregion
-export { DocxTable, DocxTableCell, DocxTableRow, TableInit, buildTable };
+export { DocxTable, DocxTableCell, DocxTableRow, DocxVerticalMerge, TableInit, buildTable };

package/dist/edit/docx/table.d.ts

@@ -6,9 +6,15 @@ interface TableInit {
   readonly columns: number;
   readonly columnWidthsTwips?: readonly number[];
 }
+type DocxVerticalMerge = 'restart' | 'continue';
 declare class DocxTableCell {
   private readonly node;
   constructor(node: XmlElement);
+  private tcPrElement;
+  get colSpan(): number | undefined;
+  set colSpan(value: number | undefined);
+  get verticalMerge(): DocxVerticalMerge | undefined;
+  set verticalMerge(value: DocxVerticalMerge | undefined);
   paragraphs(): DocxParagraph[];
   appendParagraph(init?: ParagraphInit): DocxParagraph;
   get text(): string;
@@ -31,4 +37,4 @@ declare class DocxTable {
 }
 declare function buildTable(init: TableInit): XmlElement;
 //#endregion
-export { DocxTable, DocxTableCell, DocxTableRow, TableInit, buildTable };
+export { DocxTable, DocxTableCell, DocxTableRow, DocxVerticalMerge, TableInit, buildTable };

package/dist/edit/docx/table.js

@@ -1,13 +1,54 @@
 import { el } from "../../xml/fragment.js";
-import { removeChild } from "../../xml/edit.js";
+import { directChildElement, insertInSchemaOrder, removeChild } from "../../xml/edit.js";
 import { DocxParagraph, buildParagraph } from "./paragraph.js";
+import { attr } from "ooxml.js";
 //#region src/edit/docx/table.ts
 const DEFAULT_TABLE_WIDTH_TWIPS = 9360;
+const TC_PR_CHILD_ORDER = ["w:gridSpan", "w:vMerge"];
 var DocxTableCell = class {
 	node;
 	constructor(node) {
 		this.node = node;
 	}
+	tcPrElement(create) {
+		const existing = directChildElement(this.node, "w:tcPr");
+		if (existing !== void 0 || !create) return existing;
+		const created = el("w:tcPr");
+		this.node.children.unshift(created);
+		return created;
+	}
+	get colSpan() {
+		const tcPr = this.tcPrElement(false);
+		const gridSpan = tcPr === void 0 ? void 0 : directChildElement(tcPr, "w:gridSpan");
+		const val = gridSpan === void 0 ? void 0 : attr(gridSpan, "w:val");
+		return val === void 0 ? void 0 : Number(val);
+	}
+	set colSpan(value) {
+		if (value === void 0) {
+			const tcPr = this.tcPrElement(false);
+			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
+			return;
+		}
+		const tcPr = this.tcPrElement(true);
+		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
+		insertInSchemaOrder(tcPr, el("w:gridSpan", { "w:val": String(value) }), TC_PR_CHILD_ORDER);
+	}
+	get verticalMerge() {
+		const tcPr = this.tcPrElement(false);
+		const vMerge = tcPr === void 0 ? void 0 : directChildElement(tcPr, "w:vMerge");
+		if (vMerge === void 0) return;
+		return attr(vMerge, "w:val") === "restart" ? "restart" : "continue";
+	}
+	set verticalMerge(value) {
+		if (value === void 0) {
+			const tcPr = this.tcPrElement(false);
+			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));
+			return;
+		}
+		const tcPr = this.tcPrElement(true);
+		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));
+		insertInSchemaOrder(tcPr, value === "restart" ? el("w:vMerge", { "w:val": "restart" }) : el("w:vMerge"), TC_PR_CHILD_ORDER);
+	}
 	paragraphs() {
 		const out = [];
 		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:p") out.push(new DocxParagraph(this.node.children, child));

package/dist/edit/geometry.cjs

@@ -0,0 +1,38 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_edit = require("../xml/edit.cjs");
+let odf_js = require("odf.js");
+//#region src/edit/geometry.ts
+function buildTransformAttr(frame, rotationDeg) {
+	const angleRad = -rotationDeg * Math.PI / 180;
+	const localCenter = {
+		xPt: frame.widthPt / 2,
+		yPt: frame.heightPt / 2
+	};
+	const rotatedCenter = (0, odf_js.applyOdfTransform)([{
+		kind: "rotate",
+		angleRad
+	}], localCenter);
+	const desiredCenter = {
+		xPt: frame.xPt + frame.widthPt / 2,
+		yPt: frame.yPt + frame.heightPt / 2
+	};
+	const txPt = desiredCenter.xPt - rotatedCenter.xPt;
+	const tyPt = desiredCenter.yPt - rotatedCenter.yPt;
+	return `rotate(${angleRad}) translate(${(0, odf_js.formatOdfLength)(txPt)} ${(0, odf_js.formatOdfLength)(tyPt)})`;
+}
+function applyOdfGeometry(node, frame, rotationDeg) {
+	require_xml_edit.setAttr(node, "svg:width", (0, odf_js.formatOdfLength)(frame.widthPt));
+	require_xml_edit.setAttr(node, "svg:height", (0, odf_js.formatOdfLength)(frame.heightPt));
+	if (rotationDeg === void 0 || rotationDeg === 0) {
+		require_xml_edit.removeAttr(node, "draw:transform");
+		require_xml_edit.setAttr(node, "svg:x", (0, odf_js.formatOdfLength)(frame.xPt));
+		require_xml_edit.setAttr(node, "svg:y", (0, odf_js.formatOdfLength)(frame.yPt));
+		return;
+	}
+	require_xml_edit.removeAttr(node, "svg:x");
+	require_xml_edit.removeAttr(node, "svg:y");
+	require_xml_edit.setAttr(node, "draw:transform", buildTransformAttr(frame, rotationDeg));
+}
+//#endregion
+exports.applyOdfGeometry = applyOdfGeometry;
+exports.buildTransformAttr = buildTransformAttr;

package/dist/edit/geometry.d.cts

@@ -0,0 +1,7 @@
+import { t as Box } from "../geometry-DaJr8yQW.cjs";
+import { XmlElement } from "odf.js";
+//#region src/edit/geometry.d.ts
+declare function buildTransformAttr(frame: Box, rotationDeg: number): string;
+declare function applyOdfGeometry(node: XmlElement, frame: Box, rotationDeg: number | undefined): void;
+//#endregion
+export { applyOdfGeometry, buildTransformAttr };

package/dist/edit/geometry.d.ts

@@ -0,0 +1,7 @@
+import { t as Box } from "../geometry-DaJr8yQW.js";
+import { XmlElement } from "odf.js";
+//#region src/edit/geometry.d.ts
+declare function buildTransformAttr(frame: Box, rotationDeg: number): string;
+declare function applyOdfGeometry(node: XmlElement, frame: Box, rotationDeg: number | undefined): void;
+//#endregion
+export { applyOdfGeometry, buildTransformAttr };

package/dist/edit/geometry.js

@@ -0,0 +1,36 @@
+import { removeAttr, setAttr } from "../xml/edit.js";
+import { applyOdfTransform, formatOdfLength } from "odf.js";
+//#region src/edit/geometry.ts
+function buildTransformAttr(frame, rotationDeg) {
+	const angleRad = -rotationDeg * Math.PI / 180;
+	const localCenter = {
+		xPt: frame.widthPt / 2,
+		yPt: frame.heightPt / 2
+	};
+	const rotatedCenter = applyOdfTransform([{
+		kind: "rotate",
+		angleRad
+	}], localCenter);
+	const desiredCenter = {
+		xPt: frame.xPt + frame.widthPt / 2,
+		yPt: frame.yPt + frame.heightPt / 2
+	};
+	const txPt = desiredCenter.xPt - rotatedCenter.xPt;
+	const tyPt = desiredCenter.yPt - rotatedCenter.yPt;
+	return `rotate(${angleRad}) translate(${formatOdfLength(txPt)} ${formatOdfLength(tyPt)})`;
+}
+function applyOdfGeometry(node, frame, rotationDeg) {
+	setAttr(node, "svg:width", formatOdfLength(frame.widthPt));
+	setAttr(node, "svg:height", formatOdfLength(frame.heightPt));
+	if (rotationDeg === void 0 || rotationDeg === 0) {
+		removeAttr(node, "draw:transform");
+		setAttr(node, "svg:x", formatOdfLength(frame.xPt));
+		setAttr(node, "svg:y", formatOdfLength(frame.yPt));
+		return;
+	}
+	removeAttr(node, "svg:x");
+	removeAttr(node, "svg:y");
+	setAttr(node, "draw:transform", buildTransformAttr(frame, rotationDeg));
+}
+//#endregion
+export { applyOdfGeometry, buildTransformAttr };

package/dist/edit/odg/content.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_edit_odt_content = require("../odt/content.cjs");
 const require_edit_odg_editor = require("./editor.cjs");
+const require_model_paint_order = require("../../model/paint-order.cjs");
 let odf_js = require("odf.js");
 //#region src/edit/odg/content.ts
 function buildOdgPackage(content) {
@@ -10,33 +11,35 @@ function buildOdgPackage(content) {
 	if (firstPage !== void 0) editor.pageSize = firstPage.size;
 	for (const page of content.pages) {
 		const odgPage = editor.addPage();
-		for (const vector of page.vectors) appendVector(odgPage, vector);
-		for (const shape of page.shapes) appendShape(odgPage, shape);
+		for (const entry of require_model_paint_order.mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") appendVector(odgPage, entry.value);
+		else appendShape(odgPage, entry.value);
 	}
 	return editor.toPackage();
 }
 function appendVector(page, vector) {
-	if (vector.kind === "rect") page.addRect({
+	if (vector.kind === "line") {
+		page.addLine({
+			from: vector.from,
+			to: vector.to,
+			stroke: vector.stroke
+		});
+		return;
+	}
+	const built = vector.kind === "rect" ? page.addRect({
 		frame: vector.frame,
 		fill: vector.fill,
 		stroke: vector.stroke
-	});
-	else if (vector.kind === "ellipse") page.addEllipse({
+	}) : vector.kind === "ellipse" ? page.addEllipse({
 		frame: vector.frame,
 		fill: vector.fill,
 		stroke: vector.stroke
-	});
-	else if (vector.kind === "line") page.addLine({
-		from: vector.from,
-		to: vector.to,
-		stroke: vector.stroke
-	});
-	else page.addPath({
+	}) : page.addPath({
 		frame: vector.frame,
 		subpaths: vector.subpaths,
 		fill: vector.fill,
 		stroke: vector.stroke
 	});
+	if (vector.rotationDeg !== void 0) built.rotationDeg = vector.rotationDeg;
 }
 function appendShape(page, shape) {
 	const [onlyBlock] = shape.blocks;

package/dist/edit/odg/content.js

@@ -1,5 +1,6 @@
 import { populateParagraph } from "../odt/content.js";
 import { createOdg } from "./editor.js";
+import { mergeByPaintOrder } from "../../model/paint-order.js";
 import { base64ToBytes } from "odf.js";
 //#region src/edit/odg/content.ts
 function buildOdgPackage(content) {
@@ -9,33 +10,35 @@ function buildOdgPackage(content) {
 	if (firstPage !== void 0) editor.pageSize = firstPage.size;
 	for (const page of content.pages) {
 		const odgPage = editor.addPage();
-		for (const vector of page.vectors) appendVector(odgPage, vector);
-		for (const shape of page.shapes) appendShape(odgPage, shape);
+		for (const entry of mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") appendVector(odgPage, entry.value);
+		else appendShape(odgPage, entry.value);
 	}
 	return editor.toPackage();
 }
 function appendVector(page, vector) {
-	if (vector.kind === "rect") page.addRect({
+	if (vector.kind === "line") {
+		page.addLine({
+			from: vector.from,
+			to: vector.to,
+			stroke: vector.stroke
+		});
+		return;
+	}
+	const built = vector.kind === "rect" ? page.addRect({
 		frame: vector.frame,
 		fill: vector.fill,
 		stroke: vector.stroke
-	});
-	else if (vector.kind === "ellipse") page.addEllipse({
+	}) : vector.kind === "ellipse" ? page.addEllipse({
 		frame: vector.frame,
 		fill: vector.fill,
 		stroke: vector.stroke
-	});
-	else if (vector.kind === "line") page.addLine({
-		from: vector.from,
-		to: vector.to,
-		stroke: vector.stroke
-	});
-	else page.addPath({
+	}) : page.addPath({
 		frame: vector.frame,
 		subpaths: vector.subpaths,
 		fill: vector.fill,
 		stroke: vector.stroke
 	});
+	if (vector.rotationDeg !== void 0) built.rotationDeg = vector.rotationDeg;
 }
 function appendShape(page, shape) {
 	const [onlyBlock] = shape.blocks;

package/dist/edit/odg/editor.d.cts

@@ -1,4 +1,4 @@
-import { s as PageSize } from "../../geometry-DvwdrIij.cjs";
+import { s as PageSize } from "../../geometry-DaJr8yQW.cjs";
 import { OdgPage } from "./page.cjs";
 import { Package } from "odf.js";
 //#region src/edit/odg/editor.d.ts

package/dist/edit/odg/editor.d.ts

@@ -1,4 +1,4 @@
-import { s as PageSize } from "../../geometry-DvwdrIij.js";
+import { s as PageSize } from "../../geometry-DaJr8yQW.js";
 import { OdgPage } from "./page.js";
 import { Package } from "odf.js";
 //#region src/edit/odg/editor.d.ts

package/dist/edit/odg/page.d.cts

@@ -1,6 +1,6 @@
-import { t as ImageInit } from "../../image-DWX6cNOD.cjs";
-import { t as OdpShape } from "../../shape-CN2ycxOo.cjs";
-import { a as OdgLineVector, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit } from "../../vector-ClohqsOe.cjs";
+import { t as ImageInit } from "../../image-M5SezZVI.cjs";
+import { t as OdpShape } from "../../shape-CXZ6fejV.cjs";
+import { a as OdgLineVector, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit } from "../../vector-Puuqu_IT.cjs";
 import { Box } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odg/page.d.ts

package/dist/edit/odg/page.d.ts

@@ -1,6 +1,6 @@
-import { t as ImageInit } from "../../image-CeqwL-Qs.js";
-import { t as OdpShape } from "../../shape-BfN3m52m.js";
-import { a as OdgLineVector, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit } from "../../vector-ClohqsOe.js";
+import { t as ImageInit } from "../../image-DHcA9kaK.js";
+import { t as OdpShape } from "../../shape-CVXedeL7.js";
+import { a as OdgLineVector, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit } from "../../vector-Puuqu_IT.js";
 import { Box } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odg/page.d.ts