js.documents 14.1.1 → 14.3.0

package/dist/edit/odt/table.js

@@ -298,10 +298,7 @@ function placedCells(row, pkg) {
 function resolveOdtGrid(table, pkg) {
 	const placedRows = [];
 	let declaredColumns = 0;
-	for (const child of table.children) {
-		if (child.type !== "element") continue;
-		if (child.tag === "table:table-column") declaredColumns += readRunRepeatCount(child, COLUMN_REPEAT_ATTR);
-	}
+	for (const column of tableColumnElements(table)) declaredColumns += readRunRepeatCount(column, COLUMN_REPEAT_ATTR);
 	for (const row of tableRowElements(table)) placedRows.push(placedCells(row, pkg));
 	return resolveLiveTableGrid(placedRows, declaredColumns);
 }
@@ -402,6 +399,26 @@ function tableRowEntries(parent, insideHeader = false) {
 	}
 	return entries;
 }
+const COLUMN_WRAPPER_TAGS = /* @__PURE__ */ new Set([
+	"table:table-columns",
+	"table:table-header-columns",
+	"table:table-column-group"
+]);
+function tableColumnEntries(parent, insideHeader = false) {
+	const entries = [];
+	for (const child of parent.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "table:table-column") entries.push({
+			element: child,
+			insideHeader
+		});
+		else if (COLUMN_WRAPPER_TAGS.has(child.tag)) entries.push(...tableColumnEntries(child, insideHeader || child.tag === "table:table-header-columns"));
+	}
+	return entries;
+}
+function tableColumnElements(table) {
+	return tableColumnEntries(table).map((entry) => entry.element);
+}
 var OdtTableRow = class {
 	node;
 	pkg;
@@ -528,6 +545,44 @@ var OdtTable = class {
 		if (!placed) rest.push(...regrouped);
 		table.children = rest;
 	}
+	headerColumns() {
+		return tableColumnEntries(this.live()).map((entry) => entry.insideHeader);
+	}
+	setHeaderColumns(flags) {
+		const table = this.live();
+		const columns = tableColumnElements(table);
+		const regrouped = [];
+		let run = [];
+		const closeRun = () => {
+			if (run.length > 0) {
+				regrouped.push(el("table:table-header-columns", {}, run));
+				run = [];
+			}
+		};
+		columns.forEach((column, index) => {
+			if (flags[index] === true) {
+				run.push(column);
+				return;
+			}
+			closeRun();
+			regrouped.push(column);
+		});
+		closeRun();
+		const rest = [];
+		let placed = false;
+		for (const child of table.children) {
+			if (!(child.type === "element" && (child.tag === "table:table-column" || COLUMN_WRAPPER_TAGS.has(child.tag)))) {
+				rest.push(child);
+				continue;
+			}
+			if (!placed) {
+				rest.push(...regrouped);
+				placed = true;
+			}
+		}
+		if (!placed) rest.push(...regrouped);
+		table.children = rest;
+	}
 	gridRows() {
 		return this.grid().rows;
 	}

package/dist/edit/pptx/content.cjs

@@ -64,7 +64,8 @@ function appendShape(slide, shape, options) {
 			table: {
 				rows: onlyBlock.rows.length,
 				columns: (0, document_schema_js.tableGridColumnCount)(onlyBlock),
-				columnWidthsPt: onlyBlock.columnWidthsPt
+				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt),
+				rowHeightsPt: onlyBlock.rows.map((r) => r.heightPt)
 			}
 		}), onlyBlock, options?.onDiagnostic ?? require_edit_pptx_diagnostics.NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, (url) => slide.registerHyperlink(url));
 		return;
@@ -115,8 +116,18 @@ function populateCellParagraphs(cell, blocks, resolveHyperlinkRId) {
 	}
 	cell.setParagraphs(paragraphs);
 }
+function reportDroppedHeaderColumns(block, onDiagnostic) {
+	block.columns.forEach((column, columnIndex) => {
+		if (column.isHeader === true) onDiagnostic({
+			code: require_edit_pptx_diagnostics.PptxWriteDiagnosticCodes.TABLE_HEADER_COLUMN_DROPPED,
+			severity: "warning",
+			message: `buildPptxPackage: table column ${String(columnIndex)} is a header column, and that is dropped; DrawingML has no header-column marker, so the column is written exactly as any other`
+		}, { sourcePath: block.sourcePath });
+	});
+}
 function populatePptxTable(table, block, onDiagnostic, resolveHyperlinkRId) {
 	require_edit_table_grid.assertTableObeysGridRule(block, "buildPptxPackage");
+	reportDroppedHeaderColumns(block, onDiagnostic);
 	(0, document_schema_js.walkTableGrid)(block).forEach((positions, rowIndex) => {
 		if (block.rows[rowIndex]?.isHeader === true) onDiagnostic({
 			code: require_edit_pptx_diagnostics.PptxWriteDiagnosticCodes.TABLE_HEADER_ROW_DROPPED,

package/dist/edit/pptx/content.d.cts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.cjs";
 import { t as OmmlDiagnosticSink } from "../../formula-BH1FBblm.cjs";
-import { o as PptxWriteDiagnosticSink } from "../../diagnostics-9twvwLNY.cjs";
+import { o as PptxWriteDiagnosticSink } from "../../diagnostics-CGWySzd-.cjs";
 import { ContentDocument } from "document-schema.js";
 import { EmbeddedPresentationSerialiser, Package } from "ooxml.js";
 //#region src/edit/pptx/content.d.ts

package/dist/edit/pptx/content.d.ts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.js";
 import { t as OmmlDiagnosticSink } from "../../formula-DF4R1QEJ.js";
-import { o as PptxWriteDiagnosticSink } from "../../diagnostics-9twvwLNY.js";
+import { o as PptxWriteDiagnosticSink } from "../../diagnostics-CGWySzd-.js";
 import { EmbeddedPresentationSerialiser, Package } from "ooxml.js";
 import { ContentDocument } from "document-schema.js";
 //#region src/edit/pptx/content.d.ts

package/dist/edit/pptx/content.js

@@ -63,7 +63,8 @@ function appendShape(slide, shape, options) {
 			table: {
 				rows: onlyBlock.rows.length,
 				columns: tableGridColumnCount(onlyBlock),
-				columnWidthsPt: onlyBlock.columnWidthsPt
+				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt),
+				rowHeightsPt: onlyBlock.rows.map((r) => r.heightPt)
 			}
 		}), onlyBlock, options?.onDiagnostic ?? NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, (url) => slide.registerHyperlink(url));
 		return;
@@ -114,8 +115,18 @@ function populateCellParagraphs(cell, blocks, resolveHyperlinkRId) {
 	}
 	cell.setParagraphs(paragraphs);
 }
+function reportDroppedHeaderColumns(block, onDiagnostic) {
+	block.columns.forEach((column, columnIndex) => {
+		if (column.isHeader === true) onDiagnostic({
+			code: PptxWriteDiagnosticCodes.TABLE_HEADER_COLUMN_DROPPED,
+			severity: "warning",
+			message: `buildPptxPackage: table column ${String(columnIndex)} is a header column, and that is dropped; DrawingML has no header-column marker, so the column is written exactly as any other`
+		}, { sourcePath: block.sourcePath });
+	});
+}
 function populatePptxTable(table, block, onDiagnostic, resolveHyperlinkRId) {
 	assertTableObeysGridRule(block, "buildPptxPackage");
+	reportDroppedHeaderColumns(block, onDiagnostic);
 	walkTableGrid(block).forEach((positions, rowIndex) => {
 		if (block.rows[rowIndex]?.isHeader === true) onDiagnostic({
 			code: PptxWriteDiagnosticCodes.TABLE_HEADER_ROW_DROPPED,

package/dist/edit/pptx/diagnostics.cjs

@@ -1,6 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/edit/pptx/diagnostics.ts
-const PptxWriteDiagnosticCodes = { TABLE_HEADER_ROW_DROPPED: "pptx-write/table-header-row-dropped" };
+const PptxWriteDiagnosticCodes = {
+	TABLE_HEADER_ROW_DROPPED: "pptx-write/table-header-row-dropped",
+	TABLE_HEADER_COLUMN_DROPPED: "pptx-write/table-header-column-dropped"
+};
 const NOOP_PPTX_WRITE_DIAGNOSTIC_SINK = () => {};
 //#endregion
 exports.NOOP_PPTX_WRITE_DIAGNOSTIC_SINK = NOOP_PPTX_WRITE_DIAGNOSTIC_SINK;

package/dist/edit/pptx/diagnostics.d.cts

@@ -1,2 +1,2 @@
-import { a as PptxWriteDiagnosticSeverity, i as PptxWriteDiagnosticCodes, n as PptxWriteDiagnostic, o as PptxWriteDiagnosticSink, r as PptxWriteDiagnosticCode, t as NOOP_PPTX_WRITE_DIAGNOSTIC_SINK } from "../../diagnostics-9twvwLNY.cjs";
+import { a as PptxWriteDiagnosticSeverity, i as PptxWriteDiagnosticCodes, n as PptxWriteDiagnostic, o as PptxWriteDiagnosticSink, r as PptxWriteDiagnosticCode, t as NOOP_PPTX_WRITE_DIAGNOSTIC_SINK } from "../../diagnostics-CGWySzd-.cjs";
 export { NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, PptxWriteDiagnostic, PptxWriteDiagnosticCode, PptxWriteDiagnosticCodes, PptxWriteDiagnosticSeverity, PptxWriteDiagnosticSink };

package/dist/edit/pptx/diagnostics.d.ts

@@ -1,2 +1,2 @@
-import { a as PptxWriteDiagnosticSeverity, i as PptxWriteDiagnosticCodes, n as PptxWriteDiagnostic, o as PptxWriteDiagnosticSink, r as PptxWriteDiagnosticCode, t as NOOP_PPTX_WRITE_DIAGNOSTIC_SINK } from "../../diagnostics-9twvwLNY.js";
+import { a as PptxWriteDiagnosticSeverity, i as PptxWriteDiagnosticCodes, n as PptxWriteDiagnostic, o as PptxWriteDiagnosticSink, r as PptxWriteDiagnosticCode, t as NOOP_PPTX_WRITE_DIAGNOSTIC_SINK } from "../../diagnostics-CGWySzd-.js";
 export { NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, PptxWriteDiagnostic, PptxWriteDiagnosticCode, PptxWriteDiagnosticCodes, PptxWriteDiagnosticSeverity, PptxWriteDiagnosticSink };

package/dist/edit/pptx/diagnostics.js

@@ -1,5 +1,8 @@
 //#region src/edit/pptx/diagnostics.ts
-const PptxWriteDiagnosticCodes = { TABLE_HEADER_ROW_DROPPED: "pptx-write/table-header-row-dropped" };
+const PptxWriteDiagnosticCodes = {
+	TABLE_HEADER_ROW_DROPPED: "pptx-write/table-header-row-dropped",
+	TABLE_HEADER_COLUMN_DROPPED: "pptx-write/table-header-column-dropped"
+};
 const NOOP_PPTX_WRITE_DIAGNOSTIC_SINK = () => {};
 //#endregion
 export { NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, PptxWriteDiagnosticCodes };

package/dist/edit/pptx/slide.d.cts

@@ -1,6 +1,6 @@
 import { t as ImageInit } from "../../image-C3L2cCLQ.cjs";
 import { r as PptxShape } from "../../shape-C2ef6uwC.cjs";
-import { r as PptxTableInit, t as PptxTable } from "../../table-ukpjK2hS.cjs";
+import { r as PptxTableInit, t as PptxTable } from "../../table-CxLN4l90.cjs";
 import { Box, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 //#region src/edit/pptx/slide.d.ts

package/dist/edit/pptx/slide.d.ts

@@ -1,6 +1,6 @@
 import { t as ImageInit } from "../../image-CAeD6ZbR.js";
 import { r as PptxShape } from "../../shape-DwZouh8R.js";
-import { r as PptxTableInit, t as PptxTable } from "../../table-BuNLtwgL.js";
+import { r as PptxTableInit, t as PptxTable } from "../../table-B1uKqI0r.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 import { Box, ContentVector } from "document-schema.js";
 //#region src/edit/pptx/slide.d.ts

package/dist/edit/pptx/table.cjs

@@ -15,6 +15,17 @@ const PPTX_TABLE_CELL_VERTICAL_ALIGN_ANCHOR = {
 	center: "ctr",
 	bottom: "b"
 };
+const PPTX_BORDER_STYLE_TO_DASH_VAL = {
+	solid: "solid",
+	dashed: "dash",
+	dotted: "sysDot"
+};
+const DASH_VAL_TO_PPTX_BORDER_STYLE = /* @__PURE__ */ new Map([
+	["solid", "solid"],
+	["dash", "dashed"],
+	["sysDot", "dotted"]
+]);
+const PPTX_BORDER_CMPD_DOUBLE = "dbl";
 const ANCHOR_TABLE_CELL_VERTICAL_ALIGN = /* @__PURE__ */ new Map([
 	["t", "top"],
 	["ctr", "center"],
@@ -115,7 +126,12 @@ var PptxTableCell = class {
 		]) {
 			const border = value[key];
 			if (border === void 0) continue;
-			tcPr.children.push(require_xml_fragment.el(tag, { w: String(require_model_units.ptToEmu(border.widthPt)) }, [require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: require_edit_drawingml_vector.drawingMlColorHex(border.color) })])]));
+			const lineChildren = [require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: require_edit_drawingml_vector.drawingMlColorHex(border.color) })])];
+			const dashVal = border.style === void 0 ? void 0 : PPTX_BORDER_STYLE_TO_DASH_VAL[border.style];
+			if (dashVal !== void 0) lineChildren.push(require_xml_fragment.el("a:prstDash", { val: dashVal }));
+			const lineAttrs = { w: String(require_model_units.ptToEmu(border.widthPt)) };
+			if (border.style === "double") lineAttrs.cmpd = PPTX_BORDER_CMPD_DOUBLE;
+			tcPr.children.push(require_xml_fragment.el(tag, lineAttrs, lineChildren));
 		}
 	}
 	get verticalAlign() {
@@ -143,11 +159,20 @@ var PptxTableCell = class {
 		const srgbClr = solidFill === void 0 ? void 0 : require_xml_edit.directChildElement(solidFill, "a:srgbClr");
 		const hex = srgbClr === void 0 ? void 0 : (0, ooxml_js.attr)(srgbClr, "val");
 		if (hex === void 0) return;
+		const style = this.readBorderStyle(lnElement);
 		return {
 			color: (0, document_schema_js.rgbHexToColor)(hex),
-			widthPt
+			widthPt,
+			...style === void 0 ? {} : { style }
 		};
 	}
+	readBorderStyle(lnElement) {
+		if ((0, ooxml_js.attr)(lnElement, "cmpd") === PPTX_BORDER_CMPD_DOUBLE) return "double";
+		const prstDash = require_xml_edit.directChildElement(lnElement, "a:prstDash");
+		const dashVal = prstDash === void 0 ? void 0 : (0, ooxml_js.attr)(prstDash, "val");
+		if (dashVal === void 0) return;
+		return DASH_VAL_TO_PPTX_BORDER_STYLE.get(dashVal) ?? "solid";
+	}
 	setParagraphs(paragraphs) {
 		const txBody = require_xml_edit.directChildElement(this.node, "a:txBody");
 		if (txBody === void 0) return;
@@ -204,7 +229,8 @@ function buildDrawingTable(init) {
 	for (let r = 0; r < init.rows; r++) {
 		const cells = [];
 		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
-		rows.push(require_xml_fragment.el("a:tr", { h: String(require_model_units.ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+		const heightPt = init.rowHeightsPt?.[r] ?? DEFAULT_ROW_HEIGHT_PT;
+		rows.push(require_xml_fragment.el("a:tr", { h: String(require_model_units.ptToEmu(heightPt)) }, cells));
 	}
 	return require_xml_fragment.el("a:tbl", {}, [
 		require_xml_fragment.el("a:tblPr"),

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

@@ -1,2 +1,2 @@
-import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-ukpjK2hS.cjs";
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-CxLN4l90.cjs";
 export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame, findGraphicFrameTable };

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

@@ -1,2 +1,2 @@
-import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-BuNLtwgL.js";
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-B1uKqI0r.js";
 export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame, findGraphicFrameTable };

package/dist/edit/pptx/table.js

@@ -14,6 +14,17 @@ const PPTX_TABLE_CELL_VERTICAL_ALIGN_ANCHOR = {
 	center: "ctr",
 	bottom: "b"
 };
+const PPTX_BORDER_STYLE_TO_DASH_VAL = {
+	solid: "solid",
+	dashed: "dash",
+	dotted: "sysDot"
+};
+const DASH_VAL_TO_PPTX_BORDER_STYLE = /* @__PURE__ */ new Map([
+	["solid", "solid"],
+	["dash", "dashed"],
+	["sysDot", "dotted"]
+]);
+const PPTX_BORDER_CMPD_DOUBLE = "dbl";
 const ANCHOR_TABLE_CELL_VERTICAL_ALIGN = /* @__PURE__ */ new Map([
 	["t", "top"],
 	["ctr", "center"],
@@ -114,7 +125,12 @@ var PptxTableCell = class {
 		]) {
 			const border = value[key];
 			if (border === void 0) continue;
-			tcPr.children.push(el(tag, { w: String(ptToEmu(border.widthPt)) }, [el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(border.color) })])]));
+			const lineChildren = [el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(border.color) })])];
+			const dashVal = border.style === void 0 ? void 0 : PPTX_BORDER_STYLE_TO_DASH_VAL[border.style];
+			if (dashVal !== void 0) lineChildren.push(el("a:prstDash", { val: dashVal }));
+			const lineAttrs = { w: String(ptToEmu(border.widthPt)) };
+			if (border.style === "double") lineAttrs.cmpd = PPTX_BORDER_CMPD_DOUBLE;
+			tcPr.children.push(el(tag, lineAttrs, lineChildren));
 		}
 	}
 	get verticalAlign() {
@@ -142,11 +158,20 @@ var PptxTableCell = class {
 		const srgbClr = solidFill === void 0 ? void 0 : directChildElement(solidFill, "a:srgbClr");
 		const hex = srgbClr === void 0 ? void 0 : attr(srgbClr, "val");
 		if (hex === void 0) return;
+		const style = this.readBorderStyle(lnElement);
 		return {
 			color: rgbHexToColor(hex),
-			widthPt
+			widthPt,
+			...style === void 0 ? {} : { style }
 		};
 	}
+	readBorderStyle(lnElement) {
+		if (attr(lnElement, "cmpd") === PPTX_BORDER_CMPD_DOUBLE) return "double";
+		const prstDash = directChildElement(lnElement, "a:prstDash");
+		const dashVal = prstDash === void 0 ? void 0 : attr(prstDash, "val");
+		if (dashVal === void 0) return;
+		return DASH_VAL_TO_PPTX_BORDER_STYLE.get(dashVal) ?? "solid";
+	}
 	setParagraphs(paragraphs) {
 		const txBody = directChildElement(this.node, "a:txBody");
 		if (txBody === void 0) return;
@@ -203,7 +228,8 @@ function buildDrawingTable(init) {
 	for (let r = 0; r < init.rows; r++) {
 		const cells = [];
 		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
-		rows.push(el("a:tr", { h: String(ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+		const heightPt = init.rowHeightsPt?.[r] ?? DEFAULT_ROW_HEIGHT_PT;
+		rows.push(el("a:tr", { h: String(ptToEmu(heightPt)) }, cells));
 	}
 	return el("a:tbl", {}, [
 		el("a:tblPr"),

package/dist/edit/table-grid.cjs

@@ -22,7 +22,7 @@ function resolveLiveTableGrid(rows, declaredColumnCount) {
 	})) }));
 	const skeleton = {
 		kind: "table",
-		columnWidthsPt: [],
+		columns: [],
 		rows: (0, document_schema_js.denseTableRows)(positioned, declaredColumnCount)
 	};
 	const liveCells = /* @__PURE__ */ new Map();
@@ -51,7 +51,7 @@ function resolvePivotTableGrid(table, wrap) {
 		cell: wrap(cell),
 		colSpan: cell.colSpan,
 		rowSpan: cell.rowSpan
-	}))), table.columnWidthsPt.length);
+	}))), table.columns.length);
 }
 /**
 * Throws when `table` breaks the grid rule (ContentTableCell in document-schema.js), naming `entryPoint` and the fault. The edit layer's builders write a covered position as a marker with no content of its own (a docx vertical-merge continuation, an ODF `table:covered-table-cell`, a pptx `hMerge`/`vMerge` cell), so a table whose covered positions carry blocks or spans, whose rows disagree about the grid, or whose regions run past the grid or into each other has no faithful spelling: the builder would drop what a covered position held, or guess which of two regions a position belongs to.

package/dist/edit/table-grid.js

@@ -21,7 +21,7 @@ function resolveLiveTableGrid(rows, declaredColumnCount) {
 	})) }));
 	const skeleton = {
 		kind: "table",
-		columnWidthsPt: [],
+		columns: [],
 		rows: denseTableRows(positioned, declaredColumnCount)
 	};
 	const liveCells = /* @__PURE__ */ new Map();
@@ -50,7 +50,7 @@ function resolvePivotTableGrid(table, wrap) {
 		cell: wrap(cell),
 		colSpan: cell.colSpan,
 		rowSpan: cell.rowSpan
-	}))), table.columnWidthsPt.length);
+	}))), table.columns.length);
 }
 /**
 * Throws when `table` breaks the grid rule (ContentTableCell in document-schema.js), naming `entryPoint` and the fault. The edit layer's builders write a covered position as a marker with no content of its own (a docx vertical-merge continuation, an ODF `table:covered-table-cell`, a pptx `hMerge`/`vMerge` cell), so a table whose covered positions carry blocks or spans, whose rows disagree about the grid, or whose regions run past the grid or into each other has no faithful spelling: the builder would drop what a covered position held, or guess which of two regions a position belongs to.

package/dist/index.d.cts

@@ -47,7 +47,7 @@ import { OdgPage, PageImageInit, TextBoxInit } from "./edit/odg/page.cjs";
 import { CreateOdgOptions, OdgEditor, createOdg, openOdg } from "./edit/odg/editor.cjs";
 import { CreateEmptyOdgPackageOptions } from "./edit/odg/scaffold.cjs";
 import { BuildOdpPackageOptions, buildOdpPackage } from "./edit/odp/content.cjs";
-import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-Bt9ahRyh.cjs";
+import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-DrE6jEWv.cjs";
 import { OdpSlide, SlideImageInit, SlideTableInit, TextBoxInit as TextBoxInit$1 } from "./edit/odp/slide.cjs";
 import { CreateOdpOptions, OdpEditor, createOdp, openOdp } from "./edit/odp/editor.cjs";
 import { CreateEmptyOdpPackageOptions } from "./edit/odp/scaffold.cjs";
@@ -66,7 +66,7 @@ import { PptShape, PptSlide } from "./edit/ppt/slide.cjs";
 import { CreatePptOptions, PptEditor, createPpt, openPpt } from "./edit/ppt/editor.cjs";
 import { BuildPptxPackageOptions, buildPptxPackage, embeddedPresentationSerialiser } from "./edit/pptx/content.cjs";
 import { n as DrawingRunInit, r as PptxShape, t as DrawingParagraphInit } from "./shape-C2ef6uwC.cjs";
-import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-ukpjK2hS.cjs";
+import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-CxLN4l90.cjs";
 import { PptxSlide, SlideImageInit as SlideImageInit$1, SlideTableInit as SlideTableInit$1, TextBoxInit as TextBoxInit$2 } from "./edit/pptx/slide.cjs";
 import { CreatePptxOptions, PptxEditor, createPptx, openPptx } from "./edit/pptx/editor.cjs";
 import { CreateEmptyPptxPackageOptions } from "./edit/pptx/scaffold.cjs";

package/dist/index.d.ts

@@ -47,7 +47,7 @@ import { OdgPage, PageImageInit, TextBoxInit } from "./edit/odg/page.js";
 import { CreateOdgOptions, OdgEditor, createOdg, openOdg } from "./edit/odg/editor.js";
 import { CreateEmptyOdgPackageOptions } from "./edit/odg/scaffold.js";
 import { BuildOdpPackageOptions, buildOdpPackage } from "./edit/odp/content.js";
-import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-Cou5rKOo.js";
+import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-B5htMG3g.js";
 import { OdpSlide, SlideImageInit, SlideTableInit, TextBoxInit as TextBoxInit$1 } from "./edit/odp/slide.js";
 import { CreateOdpOptions, OdpEditor, createOdp, openOdp } from "./edit/odp/editor.js";
 import { CreateEmptyOdpPackageOptions } from "./edit/odp/scaffold.js";
@@ -66,7 +66,7 @@ import { PptShape, PptSlide } from "./edit/ppt/slide.js";
 import { CreatePptOptions, PptEditor, createPpt, openPpt } from "./edit/ppt/editor.js";
 import { BuildPptxPackageOptions, buildPptxPackage, embeddedPresentationSerialiser } from "./edit/pptx/content.js";
 import { n as DrawingRunInit, r as PptxShape, t as DrawingParagraphInit } from "./shape-DwZouh8R.js";
-import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-BuNLtwgL.js";
+import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-B1uKqI0r.js";
 import { PptxSlide, SlideImageInit as SlideImageInit$1, SlideTableInit as SlideTableInit$1, TextBoxInit as TextBoxInit$2 } from "./edit/pptx/slide.js";
 import { CreatePptxOptions, PptxEditor, createPptx, openPptx } from "./edit/pptx/editor.js";
 import { CreateEmptyPptxPackageOptions } from "./edit/pptx/scaffold.js";

package/dist/layout/engine.cjs

@@ -157,7 +157,7 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	return cursorYDown + (paragraph.spacingAfterPt ?? 0);
 }
 function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
-	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
+	const gridWidthPt = table.columns.reduce((sum, c) => sum + c.widthPt, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const { row, anchors } of require_layout_shared.tableAnchorBoxes(table, scale)) {
 		const rowHeightPt = row.heightPt ?? require_layout_shared.estimateRowHeightPt(anchors, measurer);

package/dist/layout/engine.js

@@ -156,7 +156,7 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	return cursorYDown + (paragraph.spacingAfterPt ?? 0);
 }
 function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
-	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
+	const gridWidthPt = table.columns.reduce((sum, c) => sum + c.widthPt, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const { row, anchors } of tableAnchorBoxes(table, scale)) {
 		const rowHeightPt = row.heightPt ?? estimateRowHeightPt(anchors, measurer);

package/dist/layout/reconstruct.cjs

@@ -1187,7 +1187,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 		const rows = [...rowsById.values()].sort((a, b) => a.row.order - b.row.order);
 		for (const row of rows) row.cells.sort((a, b) => a.cell.order - b.cell.order);
 		const columnCount = Math.max(...rows.map((row) => row.cells.length));
-		const columnWidthsPt = [];
+		const columns = [];
 		for (let j = 0; j < columnCount; j++) {
 			let minX = Number.POSITIVE_INFINITY;
 			let maxX = Number.NEGATIVE_INFINITY;
@@ -1200,7 +1200,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 				}
 			}
 			const width = maxX - minX;
-			columnWidthsPt.push(width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT);
+			columns.push({ widthPt: width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT });
 		}
 		const allItems = cells.flatMap((cellEntry) => cellEntry.items);
 		const contentRows = rows.map((row) => {
@@ -1217,7 +1217,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 		const table = {
 			kind: "table",
 			rows: contentRows,
-			columnWidthsPt
+			columns
 		};
 		require_layout_shared.stampFrame(table, pageIndex, box);
 		recovered.push({
@@ -1277,8 +1277,8 @@ function recoverTable(page, pageIndex) {
 		consumedText.add(item);
 	}
 	if (consumedText.size === 0) return;
-	const columnWidthsPt = [];
-	for (let j = 0; j < columnCount; j++) columnWidthsPt.push(lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j]);
+	const columns = [];
+	for (let j = 0; j < columnCount; j++) columns.push({ widthPt: lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j] });
 	const positionedRows = [];
 	for (let i = 0; i < rowCount; i++) {
 		const positioned = [];
@@ -1327,7 +1327,7 @@ function recoverTable(page, pageIndex) {
 	const table = {
 		kind: "table",
 		rows,
-		columnWidthsPt
+		columns
 	};
 	require_layout_shared.stampFrame(table, pageIndex, pdfBox);
 	return {

package/dist/layout/reconstruct.js

@@ -1186,7 +1186,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 		const rows = [...rowsById.values()].sort((a, b) => a.row.order - b.row.order);
 		for (const row of rows) row.cells.sort((a, b) => a.cell.order - b.cell.order);
 		const columnCount = Math.max(...rows.map((row) => row.cells.length));
-		const columnWidthsPt = [];
+		const columns = [];
 		for (let j = 0; j < columnCount; j++) {
 			let minX = Number.POSITIVE_INFINITY;
 			let maxX = Number.NEGATIVE_INFINITY;
@@ -1199,7 +1199,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 				}
 			}
 			const width = maxX - minX;
-			columnWidthsPt.push(width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT);
+			columns.push({ widthPt: width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT });
 		}
 		const allItems = cells.flatMap((cellEntry) => cellEntry.items);
 		const contentRows = rows.map((row) => {
@@ -1216,7 +1216,7 @@ function recoverTaggedTables(page, pageIndex, structure) {
 		const table = {
 			kind: "table",
 			rows: contentRows,
-			columnWidthsPt
+			columns
 		};
 		stampFrame(table, pageIndex, box);
 		recovered.push({
@@ -1276,8 +1276,8 @@ function recoverTable(page, pageIndex) {
 		consumedText.add(item);
 	}
 	if (consumedText.size === 0) return;
-	const columnWidthsPt = [];
-	for (let j = 0; j < columnCount; j++) columnWidthsPt.push(lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j]);
+	const columns = [];
+	for (let j = 0; j < columnCount; j++) columns.push({ widthPt: lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j] });
 	const positionedRows = [];
 	for (let i = 0; i < rowCount; i++) {
 		const positioned = [];
@@ -1326,7 +1326,7 @@ function recoverTable(page, pageIndex) {
 	const table = {
 		kind: "table",
 		rows,
-		columnWidthsPt
+		columns
 	};
 	stampFrame(table, pageIndex, pdfBox);
 	return {

package/dist/layout/shared.cjs

@@ -221,12 +221,13 @@ function sumColumnWidthsPt(columnWidthsPt, startIndex, span) {
 */
 function tableAnchorBoxes(table, scale) {
 	const positionsByRow = (0, document_schema_js.walkTableGrid)(table);
+	const columnWidthsPt = table.columns.map((column) => column.widthPt);
 	return table.rows.map((row, rowIndex) => ({
 		row,
 		anchors: positionsByRow[rowIndex].flatMap((position) => position.anchorRowIndex === void 0 ? [{
 			cell: position.cell,
-			xOffsetPt: sumColumnWidthsPt(table.columnWidthsPt, 0, position.columnIndex) * scale,
-			widthPt: sumColumnWidthsPt(table.columnWidthsPt, position.columnIndex, (0, document_schema_js.tableCellColumnSpan)(position.cell)) * scale
+			xOffsetPt: sumColumnWidthsPt(columnWidthsPt, 0, position.columnIndex) * scale,
+			widthPt: sumColumnWidthsPt(columnWidthsPt, position.columnIndex, (0, document_schema_js.tableCellColumnSpan)(position.cell)) * scale
 		}] : [])
 	}));
 }

package/dist/layout/shared.js

@@ -220,12 +220,13 @@ function sumColumnWidthsPt(columnWidthsPt, startIndex, span) {
 */
 function tableAnchorBoxes(table, scale) {
 	const positionsByRow = walkTableGrid(table);
+	const columnWidthsPt = table.columns.map((column) => column.widthPt);
 	return table.rows.map((row, rowIndex) => ({
 		row,
 		anchors: positionsByRow[rowIndex].flatMap((position) => position.anchorRowIndex === void 0 ? [{
 			cell: position.cell,
-			xOffsetPt: sumColumnWidthsPt(table.columnWidthsPt, 0, position.columnIndex) * scale,
-			widthPt: sumColumnWidthsPt(table.columnWidthsPt, position.columnIndex, tableCellColumnSpan(position.cell)) * scale
+			xOffsetPt: sumColumnWidthsPt(columnWidthsPt, 0, position.columnIndex) * scale,
+			widthPt: sumColumnWidthsPt(columnWidthsPt, position.columnIndex, tableCellColumnSpan(position.cell)) * scale
 		}] : [])
 	}));
 }

package/dist/layout/slides.cjs

@@ -79,7 +79,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 }
 function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, measurer, out) {
 	let cursorYDown = startYDown;
-	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
+	const gridWidthPt = table.columns.reduce((sum, c) => sum + c.widthPt, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const { row, anchors } of require_layout_shared.tableAnchorBoxes(table, scale)) {
 		const rowHeightPt = row.heightPt ?? require_layout_shared.estimateRowHeightPt(anchors, measurer);

package/dist/layout/slides.js

@@ -78,7 +78,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 }
 function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, measurer, out) {
 	let cursorYDown = startYDown;
-	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
+	const gridWidthPt = table.columns.reduce((sum, c) => sum + c.widthPt, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const { row, anchors } of tableAnchorBoxes(table, scale)) {
 		const rowHeightPt = row.heightPt ?? estimateRowHeightPt(anchors, measurer);

package/dist/markdown/render.cjs

@@ -115,17 +115,17 @@ function sheetToTable(sheet, sink) {
 	const visibleColumns = [];
 	for (let column = 0; column <= maxColumn; column += 1) if (!hiddenColumns.has(column)) visibleColumns.push(column);
 	const columnWidthByIndex = new Map(sheet.columns.map((column) => [column.index, column.widthPt]));
-	const columnWidthsPt = visibleColumns.map((column) => columnWidthByIndex.get(column) ?? DEFAULT_COLUMN_WIDTH_PT);
+	const columns = visibleColumns.map((column) => ({ widthPt: columnWidthByIndex.get(column) ?? DEFAULT_COLUMN_WIDTH_PT }));
 	const rows = visibleRows.map((row) => ({ cells: visibleColumns.map((column) => spreadsheetCellToTableCell(cellByPosition.get(`${String(row)}:${String(column)}`))) }));
 	sink({
 		severity: "info",
 		code: MarkdownRenderDiagnosticCodes.SPREADSHEET_SHEET_AS_TABLE,
-		message: `sheet "${sheet.name}" flattened to a ${String(rows.length)}x${String(columnWidthsPt.length)} GFM table; its first row is rendered as the table header (a GFM table always has one, and a spreadsheet has no header/body distinction of its own)`
+		message: `sheet "${sheet.name}" flattened to a ${String(rows.length)}x${String(columns.length)} GFM table; its first row is rendered as the table header (a GFM table always has one, and a spreadsheet has no header/body distinction of its own)`
 	});
 	return {
 		kind: "table",
 		rows,
-		columnWidthsPt
+		columns
 	};
 }
 function spreadsheetBlocks(document, sink) {