reamkit 1.31.0 → 1.32.0

package/dist/esm/excel/xls/biff-reader.js

@@ -195,6 +195,8 @@ function readSheet(wb, view, start, blips, resources, sharedStrings, chartData,
 	const hyperlinks = [];
 	const rowHeights = [];
 	let frozen = false;
+	let showGrid = true;
+	let rightToLeft = false;
 	let paneSplit;
 	let maxRow = -1;
 	let maxColumn = -1;
@@ -300,7 +302,11 @@ function readSheet(wb, view, start, blips, resources, sharedStrings, chartData,
 				}
 				break;
 			case REC.WINDOW2:
-				if (d.length >= 2) frozen = (readU16(d, 0) & 8) !== 0;
+				if (d.length >= 2) {
+					frozen = (readU16(d, 0) & 8) !== 0;
+					showGrid = (readU16(d, 0) & 2) !== 0;
+					rightToLeft = (readU16(d, 0) & 64) !== 0;
+				}
 				break;
 			case REC.PANE:
 				if (d.length >= 4) paneSplit = {
@@ -331,7 +337,9 @@ function readSheet(wb, view, start, blips, resources, sharedStrings, chartData,
 		...parsePrintModel(records),
 		...dataValidations.length > 0 ? { dataValidations } : {},
 		...conditionalFormats.length > 0 ? { conditionalFormats } : {},
-		...pane ? { pane } : {}
+		...pane ? { pane } : {},
+		...showGrid ? {} : { showGridLines: false },
+		...rightToLeft ? { rightToLeft: true } : {}
 	};
 	const drawing = gatherDrawing(records, REC.MSODRAWING);
 	const place = anchorPlacer(grid);

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

@@ -1,22 +1,24 @@
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
 import { detectImageFormat } from "../core/images.js";
+import { INDEXED_COLORS } from "../core/indexed-colors.js";
 import { bytesInclude, packageHasPart } from "../core/bytes.js";
-import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
+import { OFFICE_2023_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
 import { parseTheme, parseThemeEffectStyles, parseThemeFillStyles, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
+import { parseCellRef } from "./cell-reference.js";
 import { parseAreaRef } from "./defined-name-ref.js";
 import { parseSharedStrings } from "./shared-strings-parser.js";
 import { parseWorkbook } from "./workbook-parser.js";
 import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
 import { parseWorksheet } from "./worksheet-parser.js";
 import "./index.js";
-import { resolveCellText } from "./print-model.js";
-import { parseSheetDrawing } from "./sheet-drawing.js";
+import { columnUnitTwips, resolveCellText } from "./print-model.js";
+import { makeColWidthPt, makeRowHeightPt, parseSheetDrawing } from "./sheet-drawing.js";
 import { parseTablePartFull } from "./table-parser.js";
 import { parsePivotTablePart } from "./pivot-table-parser.js";
 import { parseSlicerCachePart, parseSlicerPart } from "./slicer-parser.js";
@@ -28,6 +30,7 @@ import { parseRichValueText } from "./rich-value.js";
 import { activeXBinRelId, activeXType, activeXTypeFromPart, parseActiveX, parseActiveXBin } from "./activex-parser.js";
 import { parseDiagramFrames, parseDiagramShapes, parseSheetShapes } from "./sheet-shape-parser.js";
 import { projectSheetDoc } from "./sheet-to-flow.js";
+import { resolveTableStyleFormat } from "./table-style.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
 var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
@@ -92,6 +95,7 @@ function readXlsxToSheetDoc(xlsx) {
 	const richValueText = parseRichValueText(pkg.getPart(METADATA_PART), pkg.getPart(RICH_VALUE_STRUCTURE_PART), pkg.getPart(RICH_VALUE_PART));
 	const stylesData = pkg.getPart(STYLES_PART);
 	const styles = stylesData ? parseXlsxStyles(stylesData, themePalette) : EMPTY_XLSX_STYLES;
+	const colUnit = columnUnitTwips(styles);
 	const persons = /* @__PURE__ */ new Map();
 	for (const rel of workbookRels) {
 		if (!rel.type.endsWith(PERSON_REL_TAIL)) continue;
@@ -118,15 +122,23 @@ function readXlsxToSheetDoc(xlsx) {
 		if (!resolved) continue;
 		let worksheet = parseWorksheet(resolved.data, themePalette);
 		worksheet = withPrinterPageSetup(worksheet, pkg, resolved.path, pkg.getPartRelationships(resolved.path));
+		if (worksheet.chartSheet && worksheet.pageSetup?.orientation === void 0) worksheet = {
+			...worksheet,
+			pageSetup: {
+				...worksheet.pageSetup,
+				orientation: "landscape"
+			}
+		};
 		worksheet = withRichValues(worksheet, richValueText);
 		const charts = [];
 		const images = [];
 		let shapes;
+		const screenOnlyShapes = /* @__PURE__ */ new Set();
 		if (worksheet.drawingRelId) {
 			const drawingRel = pkg.getPartRelationships(resolved.path).find((r) => r.id === worksheet.drawingRelId);
 			const drawing = drawingRel ? pkg.resolveRelatedPart(resolved.path, drawingRel) : void 0;
 			if (drawing) {
-				const { charts: chartRefs, pictures } = parseSheetDrawing(drawing.data, drawing.path, pkg, worksheet);
+				const { charts: chartRefs, pictures } = parseSheetDrawing(drawing.data, drawing.path, pkg, worksheet, colUnit);
 				for (const ref of chartRefs) {
 					if (!chartData.has(ref.chartPartPath)) {
 						const chartXml = pkg.getPart(ref.chartPartPath);
@@ -139,7 +151,8 @@ function readXlsxToSheetDoc(xlsx) {
 						widthPt: ref.widthPt,
 						heightPt: ref.heightPt,
 						xPt: ref.xPt,
-						yPt: ref.yPt
+						yPt: ref.yPt,
+						...ref.screenOnly ? { screenOnly: true } : {}
 					});
 				}
 				for (const pic of pictures) {
@@ -151,14 +164,15 @@ function readXlsxToSheetDoc(xlsx) {
 						widthPt: pic.widthPt,
 						heightPt: pic.heightPt,
 						xPt: pic.xPt,
-						yPt: pic.yPt
+						yPt: pic.yPt,
+						...pic.screenOnly ? { screenOnly: true } : {}
 					});
 				}
 				if (bytesInclude(drawing.data, ":sp>") || bytesInclude(drawing.data, ":sp ")) {
-					const parsed = parseSheetShapes(drawing.data, worksheet, resolveColor, themeLineWidths, themeFillStyles, themeEffectStyles);
+					const parsed = parseSheetShapes(drawing.data, worksheet, resolveColor, themeLineWidths, themeFillStyles, themeEffectStyles, screenOnlyShapes, colUnit);
 					if (parsed.length > 0) shapes = parsed;
 				}
-				const frames = parseDiagramFrames(drawing.data, worksheet);
+				const frames = parseDiagramFrames(drawing.data, worksheet, colUnit);
 				if (frames.length > 0) {
 					const dsp = pkg.getPartRelationships(drawing.path).filter((r) => r.type.endsWith("/diagramDrawing"));
 					const fromDiagrams = [];
@@ -181,7 +195,7 @@ function readXlsxToSheetDoc(xlsx) {
 				const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
 				const full = part ? parseTablePartFull(part.data) : void 0;
 				if (!full) continue;
-				resolvedTables.push(resolveTableStyle(full.table, palette));
+				resolvedTables.push(withTableStyle(resolveTableStyle(full.table, palette), styles, themePalette));
 				if (full.id !== void 0) tableIndex.set(full.id, {
 					cells: worksheet.cells,
 					ref: full.table.ref,
@@ -266,7 +280,8 @@ function readXlsxToSheetDoc(xlsx) {
 				...props
 			};
 		};
-		const legacyVml = readLegacyVml(pkg, resolved.path, wsRels, worksheet);
+		const legacyVml = readLegacyVml(pkg, resolved.path, wsRels, worksheet, colUnit);
+		if (comments && legacyVml.notes.length > 0) comments = withShownNotes(comments, legacyVml.notes, worksheet, colUnit);
 		let formControls;
 		if (worksheet.formControls && worksheet.formControls.length > 0) {
 			const resolvedControls = [];
@@ -275,7 +290,7 @@ function readXlsxToSheetDoc(xlsx) {
 				if (fc.shapeId !== void 0 && legacyVml.nonPrinting.has(fc.shapeId)) continue;
 				const rel = wsRels.find((r) => r.id === fc.relId);
 				const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
-				const box = fc.shapeId !== void 0 ? legacyVml.boxes.get(fc.shapeId) : void 0;
+				const box = fc.shapeId !== void 0 ? legacyVml.anchoredBoxes.get(fc.shapeId) ?? legacyVml.boxes.get(fc.shapeId) : void 0;
 				if (part && ACTIVEX_PART.test(part.path)) {
 					resolvedAx.push({
 						...activeXState(part),
@@ -320,6 +335,7 @@ function readXlsxToSheetDoc(xlsx) {
 			...charts.length > 0 ? { charts } : {},
 			...images.length > 0 ? { images } : {},
 			...shapes ? { shapes } : {},
+			...shapes && screenOnlyShapes.size > 0 ? { screenOnlyShapes: new Set(shapes.flatMap((shape, i) => screenOnlyShapes.has(shape) ? [i] : [])) } : {},
 			...hyperlinks ? { hyperlinks } : {},
 			...comments ? { comments } : {},
 			...formControls ? { formControls } : {},
@@ -488,10 +504,12 @@ function withPrinterPageSetup(worksheet, pkg, sheetPath, wsRels) {
 * through the activeX part. What is left is the Forms-toolbar kind, whose
 * caption and checked state exist nowhere else in the package.
 */
-function readLegacyVml(pkg, sheetPath, wsRels, worksheet) {
+function readLegacyVml(pkg, sheetPath, wsRels, worksheet, colUnitTwips) {
 	const empty = {
 		controls: [],
+		notes: [],
 		boxes: /* @__PURE__ */ new Map(),
+		anchoredBoxes: /* @__PURE__ */ new Map(),
 		nonPrinting: /* @__PURE__ */ new Set()
 	};
 	const relId = worksheet.legacyDrawingRelId;
@@ -501,9 +519,25 @@ function readLegacyVml(pkg, sheetPath, wsRels, worksheet) {
 	if (!part) return empty;
 	const activeXShapeIds = new Set((worksheet.formControls ?? []).map((fc) => fc.shapeId).filter((id) => id !== void 0));
 	const drawing = parseVmlDrawing(part.data);
+	const colWidthPt = makeColWidthPt(worksheet, colUnitTwips);
+	const rowHeightPt = makeRowHeightPt(worksheet);
+	const anchoredBoxes = /* @__PURE__ */ new Map();
+	for (const [id, anchor] of drawing.anchors) {
+		const box = anchoredBox(anchor, colWidthPt, rowHeightPt);
+		if (box) anchoredBoxes.set(id, box);
+	}
+	const colOnce = memoTrack(colWidthPt);
+	const rowOnce = memoTrack(rowHeightPt);
+	const onGrid = (box) => anchoredBox(pixelAnchor(box, colOnce, rowOnce), colOnce, rowOnce);
+	for (const [id, box] of drawing.boxes) {
+		if (anchoredBoxes.has(id)) continue;
+		const placed = onGrid(box);
+		if (placed) anchoredBoxes.set(id, placed);
+	}
 	const out = [];
 	for (const shape of drawing.controls) {
 		if (shape.shapeId !== void 0 && activeXShapeIds.has(shape.shapeId)) continue;
+		const box = (shape.anchor && anchoredBox(shape.anchor, colWidthPt, rowHeightPt)) ?? (shape.box && onGrid(shape.box)) ?? shape.box;
 		out.push({
 			objectType: shape.objectType,
 			...shape.caption ? {
@@ -511,18 +545,154 @@ function readLegacyVml(pkg, sheetPath, wsRels, worksheet) {
 				caption: shape.caption
 			} : {},
 			...shape.checked ? { checked: true } : {},
-			...shape.box ? { box: shape.box } : {},
+			...box ? { box } : {},
 			...shape.fontSizePt !== void 0 ? { fontSizePt: shape.fontSizePt } : {}
 		});
 	}
 	return {
 		controls: out,
+		notes: drawing.notes,
 		boxes: drawing.boxes,
+		anchoredBoxes,
 		nonPrinting: drawing.nonPrinting
 	};
 }
+/**
+* A legacy VML shape's box by the cells its `<x:Anchor>` names — on the grid
+* we draw, whatever measure of the columns the producer wrote its `style` in.
+*
+* @param anchor      The anchor: cells and pixels into them.
+* @param colWidthPt  The sheet's column widths.
+* @param rowHeightPt The sheet's row heights.
+* @returns The box, or undefined for an anchor that names no box on the sheet.
+*/
+function anchoredBox(anchor, colWidthPt, rowHeightPt) {
+	if (anchor[0] < 0 || anchor[2] < 0) return void 0;
+	const x0 = trackPt(anchor[0], anchor[1], colWidthPt);
+	const x1 = trackPt(anchor[4], anchor[5], colWidthPt);
+	const y0 = trackPt(anchor[2], anchor[3], rowHeightPt);
+	const y1 = trackPt(anchor[6], anchor[7], rowHeightPt);
+	return x1 > x0 && y1 > y0 ? {
+		xPt: x0,
+		yPt: y0,
+		widthPt: x1 - x0,
+		heightPt: y1 - y0
+	} : void 0;
+}
+/**
+* The cells a box placed by points alone stands on, as a `<x:Anchor>` would
+* name them — counted the way Excel counts its own sheet when it writes such a
+* box: columns in whole pixels, which ours are, and rows in whole pixels too,
+* a row's points truncated (20.1pt is 26px). 45540_form_Footer.xlsx says so
+* itself: a check box anchored at row 7 + 9px stands at `margin-top:184.5pt`,
+* and its seven rows above come to the 237px that leaves only truncated.
+* Taken as points on our grid, whose rows keep their fractions, a box placed
+* that way stood the more rows above its cells the further down it was.
+*
+* @param box         The box, in the producer's points.
+* @param colWidthPt  The sheet's column widths.
+* @param rowHeightPt The sheet's row heights.
+* @returns The anchor: cells, 0-based, and pixels into them.
+*/
+function pixelAnchor(box, colWidthPt, rowHeightPt) {
+	const colPx = (i) => Math.round(colWidthPt(i) / PT_PER_PX);
+	const rowPx = (i) => Math.trunc(rowHeightPt(i) / PT_PER_PX + 1e-6);
+	const locate = (pt, track, limit) => {
+		let i = 0;
+		let rest = pt / PT_PER_PX;
+		while (i < limit && rest >= track(i)) {
+			rest -= track(i);
+			i++;
+		}
+		return [i, rest];
+	};
+	const [c0, dx0] = locate(box.xPt, colPx, MAX_COLUMNS);
+	const [r0, dy0] = locate(box.yPt, rowPx, MAX_ROWS);
+	const [c1, dx1] = locate(box.xPt + box.widthPt, colPx, MAX_COLUMNS);
+	const [r1, dy1] = locate(box.yPt + box.heightPt, rowPx, MAX_ROWS);
+	return [
+		c0,
+		dx0,
+		r0,
+		dy0,
+		c1,
+		dx1,
+		r1,
+		dy1
+	];
+}
+/** A track accessor that answers each index once. */
+function memoTrack(track) {
+	const seen = /* @__PURE__ */ new Map();
+	return (i) => {
+		let v = seen.get(i);
+		if (v === void 0) seen.set(i, v = track(i));
+		return v;
+	};
+}
+/** SpreadsheetML's grid: 16 384 columns, 1 048 576 rows. */
+var MAX_COLUMNS = 16384;
+var MAX_ROWS = 1048576;
+/** Where `offsetPx` pixels into track `index` stands, in points from the first track. */
+function trackPt(index, offsetPx, track) {
+	let total = 0;
+	for (let i = 0; i < index; i++) total += track(i);
+	return total + offsetPx * PT_PER_PX;
+}
+var PT_PER_PX = .75;
+/**
+* §18.7 + the legacy VML drawing — a comment's box, where its shape SHOWS it.
+* The comments part holds what a note says; the VML shape says whether it is
+* shown and where, and the two meet at the cell (`<x:Row>`/`<x:Column>`
+* against the comment's `ref`).
+*
+* The box is placed by its `<x:Anchor>` — cells plus pixels — so it lands on
+* the grid we draw, whatever widths the producer measured with; the shape's
+* `style` is the fallback for an anchor that is missing or unusable
+* (LibreOffice writes negative columns on a sheet that reads from the right).
+*
+* @param comments The sheet's comments, legacy and threaded.
+* @param notes    The note shapes of the sheet's legacy VML drawing.
+* @param worksheet The sheet, for its column widths, row heights and merges.
+* @returns The comments, a shown one carrying its box.
+*/
+function withShownNotes(comments, notes, worksheet, colUnitTwips) {
+	const shown = /* @__PURE__ */ new Map();
+	for (const n of notes) if (n.visible) shown.set(`${n.row}:${n.column}`, n);
+	if (shown.size === 0) return [...comments];
+	const colWidthPt = makeColWidthPt(worksheet, colUnitTwips);
+	const rowHeightPt = makeRowHeightPt(worksheet);
+	const along = trackPt;
+	return comments.map((c) => {
+		if (c.threaded) return c;
+		let cell;
+		try {
+			cell = parseCellRef(c.ref);
+		} catch {
+			return c;
+		}
+		const note = shown.get(`${cell.row}:${cell.column}`);
+		if (!note) return c;
+		let box = note.anchor ? anchoredBox(note.anchor, colWidthPt, rowHeightPt) : void 0;
+		if (!box && note.box && note.box.xPt >= 0 && note.box.yPt >= 0) box = note.box;
+		if (!box) return c;
+		const merge = worksheet.merges.find((m) => m.startRow === cell.row && m.startColumn === cell.column);
+		return {
+			...c,
+			shown: {
+				...box,
+				cornerXPt: along((merge?.endColumn ?? cell.column) + 1, 0, colWidthPt),
+				cornerYPt: along(cell.row, 0, rowHeightPt),
+				fillHex: note.fillHex,
+				lineHex: note.lineHex,
+				shadow: note.shadow,
+				...note.textAlign ? { textAlign: note.textAlign } : {}
+			}
+		};
+	});
+}
 function buildThemePalette(pkg, workbookRels) {
-	const palette = new Map(DEFAULT_THEME_PALETTE);
+	const palette = new Map(OFFICE_2023_THEME_PALETTE);
 	for (const rel of workbookRels) {
 		if (!isOoxmlRel(rel.type, "theme")) continue;
 		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
@@ -574,6 +744,17 @@ function resolveTableStyle(t, palette) {
 		headerTextHex: "FFFFFF"
 	};
 }
+function withTableStyle(t, styles, theme) {
+	if (t.styleName === void 0) return t;
+	const style = resolveTableStyleFormat(t.styleName, styles, {
+		...theme ? { theme } : {},
+		indexed: INDEXED_COLORS
+	});
+	return style ? {
+		...t,
+		style
+	} : t;
+}
 function resolvePivotStyle(p, palette) {
 	const m = p.styleName ? /PivotStyle(Light|Medium|Dark)(\d+)/i.exec(p.styleName) : null;
 	if (!m) return p;

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

@@ -213,22 +213,23 @@ function worksheetXml(grid, tableRelIds = [], drawingRelId) {
 		return `<row r="${r + 1}"${heightAttrs}>${cells.map(cellXml).join("")}</row>`;
 	}).join("");
 	const mergesXml = grid.merges.length > 0 ? `<mergeCells count="${grid.merges.length}">${grid.merges.map((m) => `<mergeCell ref="${cellRef(m.startRow, m.startColumn)}:${cellRef(m.endRow, m.endColumn)}"/>`).join("")}</mergeCells>` : "";
-	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + dataValidationsXml(grid.dataValidations) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (drawingRelId ? `<drawing r:id="${drawingRelId}"/>` : "") + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
+	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane, grid.showGridLines, grid.rightToLeft) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + dataValidationsXml(grid.dataValidations) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (drawingRelId ? `<drawing r:id="${drawingRelId}"/>` : "") + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
 }
-function sheetViewsXml(pane) {
-	if (!pane || pane.frozenRows <= 0 && pane.frozenCols <= 0) return "";
+function sheetViewsXml(pane, showGridLines, rightToLeft) {
+	const grid = (showGridLines === false ? " showGridLines=\"0\"" : "") + (rightToLeft ? " rightToLeft=\"1\"" : "");
+	if (!pane || pane.frozenRows <= 0 && pane.frozenCols <= 0) return grid ? `<sheetViews><sheetView${grid} workbookViewId="0"/></sheetViews>` : "";
 	const { frozenRows, frozenCols } = pane;
 	const topLeftCell = cellRef(frozenRows, frozenCols);
 	const activePane = frozenRows > 0 && frozenCols > 0 ? "bottomRight" : frozenRows > 0 ? "bottomLeft" : "topRight";
-	return `<sheetViews><sheetView workbookViewId="0"><pane${(frozenCols > 0 ? ` xSplit="${frozenCols}"` : "") + (frozenRows > 0 ? ` ySplit="${frozenRows}"` : "") + ` topLeftCell="${topLeftCell}" activePane="${activePane}" state="frozen"`}/></sheetView></sheetViews>`;
+	return `<sheetViews><sheetView${grid} workbookViewId="0"><pane${(frozenCols > 0 ? ` xSplit="${frozenCols}"` : "") + (frozenRows > 0 ? ` ySplit="${frozenRows}"` : "") + ` topLeftCell="${topLeftCell}" activePane="${activePane}" state="frozen"`}/></sheetView></sheetViews>`;
 }
 function tableXml(t, id) {
 	const ref = rangeRef(t.ref);
 	const name = t.name ?? `Table${id}`;
 	const ncols = t.ref.endColumn - t.ref.startColumn + 1;
-	const columns = Array.from({ length: ncols }, (_, c) => `<tableColumn id="${c + 1}" name="Column${c + 1}"/>`).join("");
+	const columns = Array.from({ length: ncols }, (_, c) => `<tableColumn id="${c + 1}" name="${escapeAttr(t.columns?.[c] ?? `Column${c + 1}`)}"/>`).join("");
 	const styleInfo = t.styleName ? `<tableStyleInfo name="${escapeAttr(t.styleName)}" showFirstColumn="${t.showFirstColumn ? 1 : 0}" showLastColumn="${t.showLastColumn ? 1 : 0}" showRowStripes="${t.showRowStripes ? 1 : 0}" showColumnStripes="${t.showColumnStripes ? 1 : 0}"/>` : "";
-	return XML_DECL + `<table xmlns="${MAIN_NS}" id="${id}" name="${escapeAttr(name)}" displayName="${escapeAttr(name)}" ref="${ref}"${t.headerRowCount !== 1 ? ` headerRowCount="${t.headerRowCount}"` : ""} totalsRowShown="0">` + (t.autoFilter ? `<autoFilter ref="${ref}"/>` : "") + `<tableColumns count="${ncols}">${columns}</tableColumns>` + styleInfo + "</table>";
+	return XML_DECL + `<table xmlns="${MAIN_NS}" id="${id}" name="${escapeAttr(name)}" displayName="${escapeAttr(name)}" ref="${ref}"${t.headerRowCount !== 1 ? ` headerRowCount="${t.headerRowCount}"` : ""}${t.totalsRowCount ? ` totalsRowCount="${t.totalsRowCount}"` : " totalsRowShown=\"0\""}>` + (t.autoFilter ? `<autoFilter ref="${ref}"/>` : "") + `<tableColumns count="${ncols}">${columns}</tableColumns>` + styleInfo + "</table>";
 }
 function conditionalFormattingXml(cfs) {
 	if (!cfs || cfs.length === 0) return "";
@@ -346,7 +347,7 @@ function edgeXml(name, edge) {
 function cellXfXml(xf) {
 	const apply = applyAttr("applyNumberFormat", xf.applyNumberFormat) + applyAttr("applyFont", xf.applyFont) + applyAttr("applyFill", xf.applyFill) + applyAttr("applyBorder", xf.applyBorder) + applyAttr("applyAlignment", xf.applyAlignment);
 	const a = xf.alignment;
-	const alignment = a ? `<alignment${a.horizontal ? ` horizontal="${a.horizontal}"` : ""}${a.vertical ? ` vertical="${a.vertical}"` : ""}${a.wrapText ? " wrapText=\"1\"" : ""}${a.textRotation !== void 0 ? ` textRotation="${a.textRotation}"` : ""}${a.indent !== void 0 ? ` indent="${a.indent}"` : ""}${a.shrinkToFit ? " shrinkToFit=\"1\"" : ""}/>` : "";
+	const alignment = a ? `<alignment${a.horizontal ? ` horizontal="${a.horizontal}"` : ""}${a.vertical ? ` vertical="${a.vertical}"` : ""}${a.wrapText ? " wrapText=\"1\"" : ""}${a.textRotation !== void 0 ? ` textRotation="${a.textRotation}"` : ""}${a.indent !== void 0 ? ` indent="${a.indent}"` : ""}${a.shrinkToFit ? " shrinkToFit=\"1\"" : ""}${a.readingOrder ? ` readingOrder="${a.readingOrder === "rtl" ? 2 : 1}"` : ""}/>` : "";
 	return `<xf numFmtId="${xf.numFmtId}" fontId="${xf.fontId}" fillId="${xf.fillId}" borderId="${xf.borderId}"${apply}>` + alignment + "</xf>";
 }
 function applyAttr(name, value) {