@rowsncolumns/toolkit 24.4.2 → 24.4.4

package/dist/cjs/excel-parser/plugins/ods/index.js

@@ -1,4 +1,4 @@
-import { __assign, __asyncGenerator, __await, __awaiter, __extends, __generator, __read, __spreadArray, __values } from "tslib";
+import { __assign, __asyncGenerator, __await, __awaiter, __extends, __generator, __read, __rest, __spreadArray, __values } from "tslib";
 import { addressToCell, cellToAddress, getCellXfsKey, uuid, } from "@rowsncolumns/utils";
 import { XMLParser } from "fast-xml-parser";
 import { get } from "lodash-es";
@@ -12,6 +12,7 @@ import { extractDataValidations } from "./data-validations";
 import { convertOdsFormulaToExcel } from "./formula";
 import { extractSparklines, extractSparklineData, } from "./sparklines";
 import { OdsStyles } from "./styles";
+import { compactPrintSettings } from "../../../print-settings";
 var ODS_XML_OPTIONS = {
     ignoreAttributes: false,
     attributeNamePrefix: "@_",
@@ -46,8 +47,159 @@ function getAttribute(node, attributeName) {
     }
     return undefined;
 }
-function fastMergeCellFormats() {
+var ROW_WRAPPER_TAGS = [
+    "table:table-row-group",
+    "table:table-header-rows",
+    "table:table-rows",
+    "table-row-group",
+    "table-header-rows",
+    "table-rows",
+];
+var COLUMN_WRAPPER_TAGS = [
+    "table:table-column-group",
+    "table:table-header-columns",
+    "table:table-columns",
+    "table-column-group",
+    "table-header-columns",
+    "table-columns",
+];
+/**
+ * Order-preserving `<table:table>` children → the `<table:table-row>` nodes in
+ * document order, descending into `<table:table-row-group>` (outline),
+ * `<table:table-header-rows>` (print titles) and `<table:table-rows>`
+ * wrappers. Rows inside a wrapper are ordinary rows for cell data, merges,
+ * metadata and positions.
+ */
+function flattenOrderedRows(children) {
     var e_1, _a;
+    var rows = [];
+    var _loop_1 = function (child) {
+        if (!child || typeof child !== "object")
+            return "continue";
+        if (child["table:table-row"] || child["table-row"]) {
+            rows.push(child);
+            return "continue";
+        }
+        var wrapper = ROW_WRAPPER_TAGS.find(function (tag) { return child[tag]; });
+        if (wrapper)
+            rows.push.apply(rows, __spreadArray([], __read(flattenOrderedRows(child[wrapper])), false));
+    };
+    try {
+        for (var _b = __values(children !== null && children !== void 0 ? children : []), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var child = _c.value;
+            _loop_1(child);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return rows;
+}
+/** Column counterpart of {@link flattenOrderedRows}. */
+function flattenOrderedColumns(children) {
+    var e_2, _a;
+    var columns = [];
+    var _loop_2 = function (child) {
+        if (!child || typeof child !== "object")
+            return "continue";
+        if (child["table:table-column"] || child["table-column"]) {
+            columns.push(child);
+            return "continue";
+        }
+        var wrapper = COLUMN_WRAPPER_TAGS.find(function (tag) { return child[tag]; });
+        if (wrapper)
+            columns.push.apply(columns, __spreadArray([], __read(flattenOrderedColumns(child[wrapper])), false));
+    };
+    try {
+        for (var _b = __values(children !== null && children !== void 0 ? children : []), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var child = _c.value;
+            _loop_2(child);
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return columns;
+}
+/**
+ * The 1-based band covered by the `<table:table-header-rows>` /
+ * `<table:table-header-columns>` wrappers (ODS print titles), or undefined.
+ * A band that straddles an outline-group edge is written as several
+ * wrappers (ODF forbids a group inside header rows; LibreOffice closes and
+ * re-opens the wrapper around the group), so the segments are unioned back
+ * into one band — the same rule LibreOffice applies on import.
+ */
+function findOrderedHeaderBand(children, axis) {
+    var itemTags = axis === "row"
+        ? ["table:table-row", "table-row"]
+        : ["table:table-column", "table-column"];
+    var headerTags = axis === "row"
+        ? ["table:table-header-rows", "table-header-rows"]
+        : ["table:table-header-columns", "table-header-columns"];
+    var wrapperTags = axis === "row" ? ROW_WRAPPER_TAGS : COLUMN_WRAPPER_TAGS;
+    var repeatAttr = axis === "row" ? "table:number-rows-repeated" : "table:number-columns-repeated";
+    var flatten = axis === "row" ? flattenOrderedRows : flattenOrderedColumns;
+    var countItems = function (nodes) {
+        return flatten(nodes).reduce(function (total, node) {
+            var _a;
+            var repeated = parseInt((_a = getAttribute(node, repeatAttr)) !== null && _a !== void 0 ? _a : "1", 10);
+            return total + (Number.isFinite(repeated) && repeated > 0 ? repeated : 1);
+        }, 0);
+    };
+    var position = 1;
+    var band;
+    var visit = function (nodes) {
+        var e_3, _a;
+        var _loop_3 = function (child) {
+            if (!child || typeof child !== "object")
+                return "continue";
+            if (itemTags.some(function (tag) { return child[tag]; })) {
+                position += countItems([child]);
+                return "continue";
+            }
+            var header = headerTags.find(function (tag) { return child[tag]; });
+            if (header) {
+                var count = countItems(child[header]);
+                if (count) {
+                    var end = position + count - 1;
+                    band = band
+                        ? { start: Math.min(band.start, position), end: Math.max(band.end, end) }
+                        : { start: position, end: end };
+                    position = end + 1;
+                }
+                return "continue";
+            }
+            var wrapper = wrapperTags.find(function (tag) { return child[tag]; });
+            if (wrapper)
+                visit(child[wrapper]);
+        };
+        try {
+            for (var _b = __values(nodes !== null && nodes !== void 0 ? nodes : []), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                _loop_3(child);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+    };
+    visit(children);
+    return band;
+}
+function fastMergeCellFormats() {
+    var e_4, _a;
     var formats = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         formats[_i] = arguments[_i];
@@ -97,12 +249,12 @@ function fastMergeCellFormats() {
             }
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (formats_1_1 && !formats_1_1.done && (_a = formats_1.return)) _a.call(formats_1);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     return result;
 }
@@ -182,10 +334,20 @@ var OdsPlugin = /** @class */ (function (_super) {
                             if (styles) {
                                 parsedStyles = this.xmlParser.parse(styles);
                                 this.odsStyles.parseStylesXml(parsedStyles);
+                                // Master pages carry mixed-content header/footer paragraphs
+                                // (`Page <text:page-number/> of …`), so they are read from an
+                                // order-preserving parse that also keeps the significant spaces
+                                // around the fields and leaves the text verbatim (a `+1` after the
+                                // page number is header text, not the number 1).
+                                this.odsStyles.parseMasterPagesOrdered(new XMLParser(__assign(__assign({}, ODS_ORDERED_XML_OPTIONS), { trimValues: false, parseTagValue: false })).parse(styles));
                             }
-                            settings = this.zipParser.Get("settings.xml");
-                            if (settings) {
-                                this.settingsXml = this.xmlParser.parse(settings);
+                            // settings.xml is optional in ODF (our own exporter omits it when no
+                            // sheet has view settings); `Get` throws on a missing part.
+                            if (this.zipParser.Has("settings.xml")) {
+                                settings = this.zipParser.Get("settings.xml");
+                                if (settings) {
+                                    this.settingsXml = this.xmlParser.parse(settings);
+                                }
                             }
                         }
                         catch (e) {
@@ -254,20 +416,32 @@ var OdsPlugin = /** @class */ (function (_super) {
         return cache;
     };
     OdsPlugin.prototype.buildSheetCache = function () {
-        var e_2, _a;
+        var e_5, _a;
         var _this = this;
         var _b, _c;
         var tables = this.getTables();
+        var orderedTables = this.getOrderedTableWrappers();
         var sheets = [];
         var sheetContexts = [];
+        // `table:print-ranges` per sheet, resolved once the sheet-name map exists.
+        var printRangesBySheetId = new Map();
         tables.forEach(function (table, index) {
-            var e_3, _a, e_4, _b;
-            var _c, _d, _e, _f;
+            var e_6, _a, e_7, _b;
+            var _c, _d, _e, _f, _g;
             var name = table["@_table:name"] ||
                 table["@_name"] ||
                 table["table:name"] ||
                 table["name"] ||
                 "Sheet".concat(index + 1);
+            // Order-preserving children of the same table: rows/columns nested in
+            // `<table:table-header-rows>` / `<table:table-row-group>` only appear in
+            // document order there.
+            var orderedTable = orderedTables[index];
+            var orderedTableChildren = orderedTable
+                ? orderedTable[orderedTable["table:table"] ? "table:table" : "table"]
+                : undefined;
+            var rowBreaks = [];
+            var columnBreaks = [];
             var sheet = {
                 sheetId: index + 1,
                 title: name,
@@ -278,13 +452,27 @@ var OdsPlugin = /** @class */ (function (_super) {
                 columnMetadata: [],
                 merges: [],
             };
+            // `table:protected="true"` is ODF's sheet-protection switch. The
+            // `table:protection-key` digest is not an OOXML hash, so only the master
+            // flag is modeled — the key itself cannot round-trip into `<sheetProtection>`.
+            var protectedAttr = (_e = table["@_table:protected"]) !== null && _e !== void 0 ? _e : table["table:protected"];
+            if (protectedAttr === "true" || protectedAttr === true) {
+                sheet.sheetProtection = { sheet: true };
+            }
+            // Right-to-left sheets live on the table style's `style:writing-mode`
+            // (the ODF counterpart of `<sheetView rightToLeft="1">`).
+            if (_this.odsStyles.isTableStyleRightToLeft(table["@_table:style-name"] || table["table:style-name"])) {
+                sheet.rightToLeft = true;
+            }
             // Column metadata from table-column elements
             var columnNodes = get(table, "table:table-column") || get(table, "table-column") || [];
-            var allColumns = Array.isArray(columnNodes)
-                ? columnNodes
-                : columnNodes
-                    ? [columnNodes]
-                    : [];
+            var allColumns = orderedTableChildren
+                ? flattenOrderedColumns(orderedTableChildren)
+                : Array.isArray(columnNodes)
+                    ? columnNodes
+                    : columnNodes
+                        ? [columnNodes]
+                        : [];
             var currentColumnIndex = 1;
             var detectedColumnCount = 0;
             var defaultColumnWidth;
@@ -309,6 +497,10 @@ var OdsPlugin = /** @class */ (function (_super) {
                         visibility === "hidden" ||
                         visibility === "none" ||
                         (columnStyle === null || columnStyle === void 0 ? void 0 : columnStyle.hidden);
+                    // `fo:break-before="page"` on column N = a manual break after N-1.
+                    if ((columnStyle === null || columnStyle === void 0 ? void 0 : columnStyle.breakBefore) && currentColumnIndex > 1) {
+                        columnBreaks.push(currentColumnIndex - 1);
+                    }
                     for (var c = 0; c < colsRepeated; c++) {
                         var props = {};
                         var shouldAssign = false;
@@ -341,16 +533,20 @@ var OdsPlugin = /** @class */ (function (_super) {
                     detectedColumnCount = Math.max(detectedColumnCount, currentColumnIndex - 1);
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (allColumns_1_1 && !allColumns_1_1.done && (_a = allColumns_1.return)) _a.call(allColumns_1);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             // Row metadata from table-row elements
             var rowNodes = get(table, "table:table-row") || get(table, "table-row") || [];
-            var allRows = Array.isArray(rowNodes) ? rowNodes : [rowNodes];
+            var allRows = orderedTableChildren
+                ? flattenOrderedRows(orderedTableChildren)
+                : Array.isArray(rowNodes)
+                    ? rowNodes
+                    : [rowNodes];
             // DO NOT DELETE
             // console.log("allRows", allRows);
             var currentRowIndex = 1;
@@ -378,6 +574,10 @@ var OdsPlugin = /** @class */ (function (_super) {
                         visibility === "none" ||
                         (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.hidden);
                     var effectiveRepeats = Math.min(rowsRepeated, 10000);
+                    // `fo:break-before="page"` on row N = a manual break after N-1.
+                    if ((rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.breakBefore) && currentRowIndex > 1) {
+                        rowBreaks.push(currentRowIndex - 1);
+                    }
                     var shouldProcessRowMetadata = typeof height === "number" || isHidden;
                     if (!shouldProcessRowMetadata) {
                         currentRowIndex += effectiveRepeats;
@@ -416,18 +616,57 @@ var OdsPlugin = /** @class */ (function (_super) {
                     detectedRowCount = Math.max(detectedRowCount, currentRowIndex - 1);
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (allRows_1_1 && !allRows_1_1.done && (_b = allRows_1.return)) _b.call(allRows_1);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_7) throw e_7.error; }
             }
             if (detectedRowCount > 0) {
-                sheet.rowCount = Math.max((_e = sheet.rowCount) !== null && _e !== void 0 ? _e : 0, detectedRowCount);
+                sheet.rowCount = Math.max((_f = sheet.rowCount) !== null && _f !== void 0 ? _f : 0, detectedRowCount);
             }
             if (detectedColumnCount > 0) {
-                sheet.columnCount = Math.max((_f = sheet.columnCount) !== null && _f !== void 0 ? _f : 0, detectedColumnCount);
+                sheet.columnCount = Math.max((_g = sheet.columnCount) !== null && _g !== void 0 ? _g : 0, detectedColumnCount);
+            }
+            // Print settings: the table style's master page (page layout +
+            // header/footer), manual breaks, and the header-rows/columns bands
+            // (print titles). `table:print-ranges` is resolved below.
+            var tableStyleName = table["@_table:style-name"] || table["table:style-name"];
+            var masterPageName = tableStyleName
+                ? _this.odsStyles.getTableMasterPageName(tableStyleName)
+                : undefined;
+            var masterPage = masterPageName
+                ? _this.odsStyles.getMasterPage(masterPageName)
+                : undefined;
+            var pageLayout = (masterPage === null || masterPage === void 0 ? void 0 : masterPage.pageLayoutName)
+                ? _this.odsStyles.getPageLayout(masterPage.pageLayoutName)
+                : undefined;
+            var headerRows = findOrderedHeaderBand(orderedTableChildren, "row");
+            var headerColumns = findOrderedHeaderBand(orderedTableChildren, "column");
+            var printSettings = compactPrintSettings({
+                pageSetup: pageLayout === null || pageLayout === void 0 ? void 0 : pageLayout.pageSetup,
+                pageMargins: pageLayout === null || pageLayout === void 0 ? void 0 : pageLayout.pageMargins,
+                printOptions: pageLayout === null || pageLayout === void 0 ? void 0 : pageLayout.printOptions,
+                headerFooter: (masterPage === null || masterPage === void 0 ? void 0 : masterPage.header) || (masterPage === null || masterPage === void 0 ? void 0 : masterPage.footer)
+                    ? __assign(__assign({}, (masterPage.header ? { oddHeader: masterPage.header } : {})), (masterPage.footer ? { oddFooter: masterPage.footer } : {})) : undefined,
+                printTitles: headerRows || headerColumns
+                    ? __assign(__assign({}, (headerRows
+                        ? { rowStart: headerRows.start, rowEnd: headerRows.end }
+                        : {})), (headerColumns
+                        ? {
+                            columnStart: headerColumns.start,
+                            columnEnd: headerColumns.end,
+                        }
+                        : {})) : undefined,
+                rowBreaks: rowBreaks,
+                columnBreaks: columnBreaks,
+            });
+            if (printSettings)
+                sheet.printSettings = printSettings;
+            var printRanges = table["@_table:print-ranges"] || table["table:print-ranges"];
+            if (typeof printRanges === "string" && printRanges.trim()) {
+                printRangesBySheetId.set(sheet.sheetId, printRanges);
             }
             sheets.push(sheet);
             sheetContexts.push({ node: table, sheetId: sheet.sheetId, name: name });
@@ -469,37 +708,54 @@ var OdsPlugin = /** @class */ (function (_super) {
         this.extractOutlineGroups(sheets);
         var sheetSettings = this.extractSheetSettings(sheetContexts);
         var basicFilters = this.extractBasicFilters(sheetContexts, sheetNameMap, spreadsheetNode);
+        var _loop_4 = function (sheet) {
+            sheet.merges = (_c = (_b = mergesMap.get(sheet.sheetId)) !== null && _b !== void 0 ? _b : sheet.merges) !== null && _c !== void 0 ? _c : [];
+            var printRanges = printRangesBySheetId.get(sheet.sheetId);
+            if (printRanges) {
+                var context = sheetContexts.find(function (c) { return c.sheetId === sheet.sheetId; });
+                var printArea = this_1.parseRangeList(printRanges, sheetNameMap, context)
+                    .filter(function (range) { return range.sheetId === sheet.sheetId; })
+                    .map(function (_a) {
+                    var _sheetId = _a.sheetId, range = __rest(_a, ["sheetId"]);
+                    return range;
+                });
+                if (printArea.length) {
+                    sheet.printSettings = __assign(__assign({}, sheet.printSettings), { printArea: printArea });
+                }
+            }
+            var settings = sheetSettings.get(sheet.sheetId);
+            if (settings) {
+                if (settings.frozenRowCount !== undefined) {
+                    sheet.frozenRowCount = settings.frozenRowCount;
+                }
+                if (settings.frozenColumnCount !== undefined) {
+                    sheet.frozenColumnCount = settings.frozenColumnCount;
+                }
+                if (settings.showGridLines !== undefined) {
+                    sheet.showGridLines = settings.showGridLines;
+                }
+                if (settings.tabColor) {
+                    sheet.tabColor = settings.tabColor;
+                }
+            }
+            var filter = basicFilters.get(sheet.sheetId);
+            if (filter) {
+                sheet.basicFilter = filter;
+            }
+        };
+        var this_1 = this;
         try {
             for (var sheets_1 = __values(sheets), sheets_1_1 = sheets_1.next(); !sheets_1_1.done; sheets_1_1 = sheets_1.next()) {
                 var sheet = sheets_1_1.value;
-                sheet.merges = (_c = (_b = mergesMap.get(sheet.sheetId)) !== null && _b !== void 0 ? _b : sheet.merges) !== null && _c !== void 0 ? _c : [];
-                var settings = sheetSettings.get(sheet.sheetId);
-                if (settings) {
-                    if (settings.frozenRowCount !== undefined) {
-                        sheet.frozenRowCount = settings.frozenRowCount;
-                    }
-                    if (settings.frozenColumnCount !== undefined) {
-                        sheet.frozenColumnCount = settings.frozenColumnCount;
-                    }
-                    if (settings.showGridLines !== undefined) {
-                        sheet.showGridLines = settings.showGridLines;
-                    }
-                    if (settings.tabColor) {
-                        sheet.tabColor = settings.tabColor;
-                    }
-                }
-                var filter = basicFilters.get(sheet.sheetId);
-                if (filter) {
-                    sheet.basicFilter = filter;
-                }
+                _loop_4(sheet);
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (sheets_1_1 && !sheets_1_1.done && (_a = sheets_1.return)) _a.call(sheets_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         return {
             sheets: sheets,
@@ -512,7 +768,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         };
     };
     OdsPlugin.prototype.extractTableViews = function (sheetContexts) {
-        var e_5, _a, e_6, _b, e_7, _c;
+        var e_8, _a, e_9, _b, e_10, _c;
         if (!sheetContexts.length)
             return [];
         var spreadsheet = this.getSpreadsheetNode();
@@ -531,12 +787,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (globalRanges_1_1 && !globalRanges_1_1.done && (_a = globalRanges_1.return)) _a.call(globalRanges_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         try {
             for (var sheetContexts_1 = __values(sheetContexts), sheetContexts_1_1 = sheetContexts_1.next(); !sheetContexts_1_1.done; sheetContexts_1_1 = sheetContexts_1.next()) {
@@ -544,7 +800,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                 var inlineRanges = this.toArray(get(context.node, "table:database-range") ||
                     get(context.node, "database-range"));
                 try {
-                    for (var inlineRanges_1 = (e_7 = void 0, __values(inlineRanges)), inlineRanges_1_1 = inlineRanges_1.next(); !inlineRanges_1_1.done; inlineRanges_1_1 = inlineRanges_1.next()) {
+                    for (var inlineRanges_1 = (e_10 = void 0, __values(inlineRanges)), inlineRanges_1_1 = inlineRanges_1.next(); !inlineRanges_1_1.done; inlineRanges_1_1 = inlineRanges_1.next()) {
                         var node = inlineRanges_1_1.value;
                         var tableView = this.convertDatabaseRangeNode(node, sheetNameMap, context, sheetContexts);
                         if (tableView) {
@@ -552,21 +808,21 @@ var OdsPlugin = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
                 finally {
                     try {
                         if (inlineRanges_1_1 && !inlineRanges_1_1.done && (_c = inlineRanges_1.return)) _c.call(inlineRanges_1);
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    finally { if (e_10) throw e_10.error; }
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (sheetContexts_1_1 && !sheetContexts_1_1.done && (_b = sheetContexts_1.return)) _b.call(sheetContexts_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         return tableViews;
     };
@@ -620,7 +876,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return tableView;
     };
     OdsPlugin.prototype.extractNamedRanges = function (sheetContexts) {
-        var e_8, _a, e_9, _b, e_10, _c;
+        var e_11, _a, e_12, _b, e_13, _c;
         var _this = this;
         var spreadsheet = this.getSpreadsheetNode();
         if (!spreadsheet)
@@ -628,7 +884,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         var sheetNameMap = this.buildSheetNameMap(sheetContexts);
         var namedRanges = [];
         var processContainer = function (container, context) {
-            var e_11, _a, e_12, _b, e_13, _c;
+            var e_14, _a, e_15, _b, e_16, _c;
             if (!container)
                 return;
             var rangeNodes = _this.toArray(get(container, "table:named-range") || get(container, "named-range"));
@@ -649,7 +905,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                         attrs["@_base-cell-address"];
                     var ranges = _this.parseRangeList(addressAttr, sheetNameMap, context);
                     try {
-                        for (var ranges_1 = (e_12 = void 0, __values(ranges)), ranges_1_1 = ranges_1.next(); !ranges_1_1.done; ranges_1_1 = ranges_1.next()) {
+                        for (var ranges_1 = (e_15 = void 0, __values(ranges)), ranges_1_1 = ranges_1.next(); !ranges_1_1.done; ranges_1_1 = ranges_1.next()) {
                             var range = ranges_1_1.value;
                             namedRanges.push({
                                 namedRangeId: uuid(),
@@ -658,21 +914,21 @@ var OdsPlugin = /** @class */ (function (_super) {
                             });
                         }
                     }
-                    catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                    catch (e_15_1) { e_15 = { error: e_15_1 }; }
                     finally {
                         try {
                             if (ranges_1_1 && !ranges_1_1.done && (_b = ranges_1.return)) _b.call(ranges_1);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_15) throw e_15.error; }
                     }
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_14_1) { e_14 = { error: e_14_1 }; }
             finally {
                 try {
                     if (rangeNodes_1_1 && !rangeNodes_1_1.done && (_a = rangeNodes_1.return)) _a.call(rangeNodes_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_14) throw e_14.error; }
             }
             var expressionNodes = _this.toArray(get(container, "table:named-expression") ||
                 get(container, "named-expression"));
@@ -698,12 +954,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_13_1) { e_13 = { error: e_13_1 }; }
+            catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
                     if (expressionNodes_1_1 && !expressionNodes_1_1.done && (_c = expressionNodes_1.return)) _c.call(expressionNodes_1);
                 }
-                finally { if (e_13) throw e_13.error; }
+                finally { if (e_16) throw e_16.error; }
             }
         };
         var globalContainers = this.toArray(get(spreadsheet, "table:named-expressions") ||
@@ -714,12 +970,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 processContainer(container);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (globalContainers_1_1 && !globalContainers_1_1.done && (_a = globalContainers_1.return)) _a.call(globalContainers_1);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         try {
             for (var sheetContexts_2 = __values(sheetContexts), sheetContexts_2_1 = sheetContexts_2.next(); !sheetContexts_2_1.done; sheetContexts_2_1 = sheetContexts_2.next()) {
@@ -727,31 +983,31 @@ var OdsPlugin = /** @class */ (function (_super) {
                 var containers = this.toArray(get(context.node, "table:named-expressions") ||
                     get(context.node, "named-expressions"));
                 try {
-                    for (var containers_1 = (e_10 = void 0, __values(containers)), containers_1_1 = containers_1.next(); !containers_1_1.done; containers_1_1 = containers_1.next()) {
+                    for (var containers_1 = (e_13 = void 0, __values(containers)), containers_1_1 = containers_1.next(); !containers_1_1.done; containers_1_1 = containers_1.next()) {
                         var container = containers_1_1.value;
                         processContainer(container, context);
                     }
                 }
-                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                catch (e_13_1) { e_13 = { error: e_13_1 }; }
                 finally {
                     try {
                         if (containers_1_1 && !containers_1_1.done && (_c = containers_1.return)) _c.call(containers_1);
                     }
-                    finally { if (e_10) throw e_10.error; }
+                    finally { if (e_13) throw e_13.error; }
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (sheetContexts_2_1 && !sheetContexts_2_1.done && (_b = sheetContexts_2.return)) _b.call(sheetContexts_2);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return namedRanges;
     };
     OdsPlugin.prototype.extractBasicFilters = function (sheetContexts, sheetNameMap, spreadsheetNode) {
-        var e_14, _a, e_15, _b, e_16, _c;
+        var e_17, _a, e_18, _b, e_19, _c;
         var _this = this;
         var filters = new Map();
         if (!sheetContexts.length) {
@@ -796,12 +1052,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     processNode(node);
                 }
             }
-            catch (e_14_1) { e_14 = { error: e_14_1 }; }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
             finally {
                 try {
                     if (globalRanges_2_1 && !globalRanges_2_1.done && (_a = globalRanges_2.return)) _a.call(globalRanges_2);
                 }
-                finally { if (e_14) throw e_14.error; }
+                finally { if (e_17) throw e_17.error; }
             }
         }
         try {
@@ -810,35 +1066,35 @@ var OdsPlugin = /** @class */ (function (_super) {
                 var inlineRanges = this.toArray(get(context.node, "table:database-range") ||
                     get(context.node, "database-range"));
                 try {
-                    for (var inlineRanges_2 = (e_16 = void 0, __values(inlineRanges)), inlineRanges_2_1 = inlineRanges_2.next(); !inlineRanges_2_1.done; inlineRanges_2_1 = inlineRanges_2.next()) {
+                    for (var inlineRanges_2 = (e_19 = void 0, __values(inlineRanges)), inlineRanges_2_1 = inlineRanges_2.next(); !inlineRanges_2_1.done; inlineRanges_2_1 = inlineRanges_2.next()) {
                         var node = inlineRanges_2_1.value;
                         processNode(node, context);
                     }
                 }
-                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_19_1) { e_19 = { error: e_19_1 }; }
                 finally {
                     try {
                         if (inlineRanges_2_1 && !inlineRanges_2_1.done && (_c = inlineRanges_2.return)) _c.call(inlineRanges_2);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_19) throw e_19.error; }
                 }
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (sheetContexts_3_1 && !sheetContexts_3_1.done && (_b = sheetContexts_3.return)) _b.call(sheetContexts_3);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         return filters;
     };
     OdsPlugin.prototype.convertFilterNodeToSpecs = function (filterNode) {
-        var e_17, _a, e_18, _b;
+        var e_20, _a, e_21, _b;
         var _this = this;
         var specMap = new Map();
         var addConditions = function (container) {
-            var e_19, _a;
+            var e_22, _a;
             var conditions = _this.toArray(get(container, "table:filter-condition") ||
                 get(container, "filter-condition"));
             try {
@@ -847,12 +1103,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     _this.applyFilterCondition(condition, specMap);
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+            catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
                     if (conditions_1_1 && !conditions_1_1.done && (_a = conditions_1.return)) _a.call(conditions_1);
                 }
-                finally { if (e_19) throw e_19.error; }
+                finally { if (e_22) throw e_22.error; }
             }
         };
         addConditions(filterNode);
@@ -863,12 +1119,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 addConditions(node);
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
                 if (andNodes_1_1 && !andNodes_1_1.done && (_a = andNodes_1.return)) _a.call(andNodes_1);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_20) throw e_20.error; }
         }
         var orNodes = this.toArray(get(filterNode, "table:filter-or") || get(filterNode, "filter-or"));
         try {
@@ -877,12 +1133,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 addConditions(node);
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (orNodes_1_1 && !orNodes_1_1.done && (_b = orNodes_1.return)) _b.call(orNodes_1);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         return Array.from(specMap.values()).sort(function (a, b) { return a.columnIndex - b.columnIndex; });
     };
@@ -991,7 +1247,7 @@ var OdsPlugin = /** @class */ (function (_super) {
             }
         };
         var walk = function (value, inherited) {
-            var e_20, _a;
+            var e_23, _a;
             var _b;
             if (value === null || value === undefined)
                 return;
@@ -1036,12 +1292,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                catch (e_23_1) { e_23 = { error: e_23_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                     }
-                    finally { if (e_20) throw e_20.error; }
+                    finally { if (e_23) throw e_23.error; }
                 }
             }
             if (value["text:a"]) {
@@ -1075,7 +1331,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return location;
     };
     OdsPlugin.prototype.extractHyperlinkValue = function (node) {
-        var e_21, _a, e_22, _b, e_23, _c;
+        var e_24, _a, e_25, _b, e_26, _c;
         if (node === null || node === undefined)
             return undefined;
         if (Array.isArray(node)) {
@@ -1087,12 +1343,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return result;
                 }
             }
-            catch (e_21_1) { e_21 = { error: e_21_1 }; }
+            catch (e_24_1) { e_24 = { error: e_24_1 }; }
             finally {
                 try {
                     if (node_1_1 && !node_1_1.done && (_a = node_1.return)) _a.call(node_1);
                 }
-                finally { if (e_21) throw e_21.error; }
+                finally { if (e_24) throw e_24.error; }
             }
             return undefined;
         }
@@ -1120,12 +1376,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     return __assign({ kind: "external", url: href }, (display ? { display: display } : {}));
                 }
             }
-            catch (e_22_1) { e_22 = { error: e_22_1 }; }
+            catch (e_25_1) { e_25 = { error: e_25_1 }; }
             finally {
                 try {
                     if (anchors_1_1 && !anchors_1_1.done && (_b = anchors_1.return)) _b.call(anchors_1);
                 }
-                finally { if (e_22) throw e_22.error; }
+                finally { if (e_25) throw e_25.error; }
             }
         }
         try {
@@ -1136,12 +1392,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     return result;
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_26) throw e_26.error; }
         }
         return undefined;
     };
@@ -1177,8 +1433,8 @@ var OdsPlugin = /** @class */ (function (_super) {
         return Math.max(1, count + 1);
     };
     OdsPlugin.prototype.extractEmbeddedObjects = function (sheetContexts, sheetNameMap) {
-        var e_24, _a, e_25, _b, e_26, _c;
-        var _d;
+        var e_27, _a, e_28, _b, e_29, _c, e_30, _d, e_31, _e;
+        var _f, _g, _h, _j;
         var tables = this.getOrderedTableWrappers();
         if (!tables.length || !sheetContexts.length) {
             return { drawings: [], charts: [] };
@@ -1196,12 +1452,62 @@ var OdsPlugin = /** @class */ (function (_super) {
             var tableChildren = tableWrapper[tableNameKey];
             if (!tableChildren)
                 continue;
-            var rows = tableChildren.filter(function (child) { return child["table:table-row"] || child["table-row"]; });
+            var rows = flattenOrderedRows(tableChildren);
             var currentRowIndex = 1;
             var sheetContext = sheetContexts[sheetIndex];
-            var sheetId = (_d = sheetContext === null || sheetContext === void 0 ? void 0 : sheetContext.sheetId) !== null && _d !== void 0 ? _d : sheetIndex + 1;
+            var sheetId = (_f = sheetContext === null || sheetContext === void 0 ? void 0 : sheetContext.sheetId) !== null && _f !== void 0 ? _f : sheetIndex + 1;
             try {
-                for (var rows_1 = (e_24 = void 0, __values(rows)), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
+                // Sheet-level `<table:shapes>` frames (what LibreOffice and our own
+                // ODS exporter write for charts/images floating over the grid). They
+                // anchor through `table:anchor-cell-address`; their `svg:x`/`svg:y`
+                // are sheet-absolute, so the cell anchor alone positions them.
+                for (var _k = (e_27 = void 0, __values(tableChildren.filter(function (child) { return child["table:shapes"] || child["shapes"]; }))), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var shapesWrapper = _l.value;
+                    var shapeChildren = shapesWrapper["table:shapes"] || shapesWrapper["shapes"];
+                    try {
+                        // `collectFrameNodes` yields each frame child (the `draw:object` /
+                        // `draw:image` wrapper) as `frame` and the `<draw:frame>` attributes
+                        // as `cellAttrs`.
+                        for (var _m = (e_28 = void 0, __values(this.collectFrameNodes(shapeChildren))), _o = _m.next(); !_o.done; _o = _m.next()) {
+                            var _p = _o.value, frame = _p.frame, frameAttrs = _p.cellAttrs;
+                            var anchorAddress = (frameAttrs === null || frameAttrs === void 0 ? void 0 : frameAttrs["@_table:anchor-cell-address"]) ||
+                                (frameAttrs === null || frameAttrs === void 0 ? void 0 : frameAttrs["@_anchor-cell-address"]);
+                            var anchor = typeof anchorAddress === "string"
+                                ? addressToCell((_g = anchorAddress.split(".").pop()) !== null && _g !== void 0 ? _g : anchorAddress)
+                                : null;
+                            var anchorRow = (_h = anchor === null || anchor === void 0 ? void 0 : anchor.rowIndex) !== null && _h !== void 0 ? _h : 1;
+                            var anchorColumn = (_j = anchor === null || anchor === void 0 ? void 0 : anchor.columnIndex) !== null && _j !== void 0 ? _j : 1;
+                            var placementAttrs = this.withoutAbsoluteOffsets(frameAttrs);
+                            var chart = this.convertFrameToEmbeddedChart(frame, sheetContext, sheetId, anchorRow, anchorColumn, sheetNameMap, placementAttrs);
+                            if (chart) {
+                                chartAnchors.add(this.buildAnchorKey(sheetId, anchorRow, anchorColumn));
+                                charts.push(chart);
+                                continue;
+                            }
+                            var embedded = this.convertFrameToEmbeddedObject(frame, sheetId, anchorRow, anchorColumn, imageCache, placementAttrs);
+                            if (embedded) {
+                                drawings.push(embedded);
+                            }
+                        }
+                    }
+                    catch (e_28_1) { e_28 = { error: e_28_1 }; }
+                    finally {
+                        try {
+                            if (_o && !_o.done && (_b = _m.return)) _b.call(_m);
+                        }
+                        finally { if (e_28) throw e_28.error; }
+                    }
+                }
+            }
+            catch (e_27_1) { e_27 = { error: e_27_1 }; }
+            finally {
+                try {
+                    if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+                }
+                finally { if (e_27) throw e_27.error; }
+            }
+            try {
+                for (var rows_1 = (e_29 = void 0, __values(rows)), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
                     var rowWrapper = rows_1_1.value;
                     var rowNameKey = rowWrapper["table:table-row"]
                         ? "table:table-row"
@@ -1219,7 +1525,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                             : null;
                         if (normalizedRowChildren) {
                             try {
-                                for (var normalizedRowChildren_1 = (e_25 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_1_1 = normalizedRowChildren_1.next(); !normalizedRowChildren_1_1.done; normalizedRowChildren_1_1 = normalizedRowChildren_1.next()) {
+                                for (var normalizedRowChildren_1 = (e_30 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_1_1 = normalizedRowChildren_1.next(); !normalizedRowChildren_1_1.done; normalizedRowChildren_1_1 = normalizedRowChildren_1.next()) {
                                     var cellWrapper = normalizedRowChildren_1_1.value;
                                     var isCell = !!cellWrapper["table:table-cell"];
                                     var isCovered = !!cellWrapper["table:covered-table-cell"];
@@ -1242,8 +1548,8 @@ var OdsPlugin = /** @class */ (function (_super) {
                                         for (var c = 0; c < colsRepeated; c++) {
                                             var anchorColumnIndex = columnIndex + c;
                                             try {
-                                                for (var frameNodes_1 = (e_26 = void 0, __values(frameNodes)), frameNodes_1_1 = frameNodes_1.next(); !frameNodes_1_1.done; frameNodes_1_1 = frameNodes_1.next()) {
-                                                    var _e = frameNodes_1_1.value, frame = _e.frame, frameCellAttrs = _e.cellAttrs;
+                                                for (var frameNodes_1 = (e_31 = void 0, __values(frameNodes)), frameNodes_1_1 = frameNodes_1.next(); !frameNodes_1_1.done; frameNodes_1_1 = frameNodes_1.next()) {
+                                                    var _q = frameNodes_1_1.value, frame = _q.frame, frameCellAttrs = _q.cellAttrs;
                                                     var chart = this.convertFrameToEmbeddedChart(frame, sheetContext, sheetId, currentRowIndex, anchorColumnIndex, sheetNameMap, frameCellAttrs);
                                                     if (chart) {
                                                         chartAnchors.add(this.buildAnchorKey(sheetId, currentRowIndex, anchorColumnIndex));
@@ -1260,36 +1566,36 @@ var OdsPlugin = /** @class */ (function (_super) {
                                                     }
                                                 }
                                             }
-                                            catch (e_26_1) { e_26 = { error: e_26_1 }; }
+                                            catch (e_31_1) { e_31 = { error: e_31_1 }; }
                                             finally {
                                                 try {
-                                                    if (frameNodes_1_1 && !frameNodes_1_1.done && (_c = frameNodes_1.return)) _c.call(frameNodes_1);
+                                                    if (frameNodes_1_1 && !frameNodes_1_1.done && (_e = frameNodes_1.return)) _e.call(frameNodes_1);
                                                 }
-                                                finally { if (e_26) throw e_26.error; }
+                                                finally { if (e_31) throw e_31.error; }
                                             }
                                         }
                                     }
                                     columnIndex += colsRepeated;
                                 }
                             }
-                            catch (e_25_1) { e_25 = { error: e_25_1 }; }
+                            catch (e_30_1) { e_30 = { error: e_30_1 }; }
                             finally {
                                 try {
-                                    if (normalizedRowChildren_1_1 && !normalizedRowChildren_1_1.done && (_b = normalizedRowChildren_1.return)) _b.call(normalizedRowChildren_1);
+                                    if (normalizedRowChildren_1_1 && !normalizedRowChildren_1_1.done && (_d = normalizedRowChildren_1.return)) _d.call(normalizedRowChildren_1);
                                 }
-                                finally { if (e_25) throw e_25.error; }
+                                finally { if (e_30) throw e_30.error; }
                             }
                         }
                         currentRowIndex++;
                     }
                 }
             }
-            catch (e_24_1) { e_24 = { error: e_24_1 }; }
+            catch (e_29_1) { e_29 = { error: e_29_1 }; }
             finally {
                 try {
-                    if (rows_1_1 && !rows_1_1.done && (_a = rows_1.return)) _a.call(rows_1);
+                    if (rows_1_1 && !rows_1_1.done && (_c = rows_1.return)) _c.call(rows_1);
                 }
-                finally { if (e_24) throw e_24.error; }
+                finally { if (e_29) throw e_29.error; }
             }
         }
         return { drawings: drawings, charts: charts };
@@ -1297,6 +1603,18 @@ var OdsPlugin = /** @class */ (function (_super) {
     OdsPlugin.prototype.buildAnchorKey = function (sheetId, rowIndex, columnIndex) {
         return "".concat(sheetId, ":").concat(rowIndex, ":").concat(columnIndex);
     };
+    /**
+     * Copy of a `<draw:frame>` attribute record without `svg:x` / `svg:y`.
+     * Frames in `<table:shapes>` carry sheet-absolute coordinates there,
+     * which `buildOverlayPlacement` would otherwise read as an offset inside
+     * the anchor cell.
+     */
+    OdsPlugin.prototype.withoutAbsoluteOffsets = function (frameAttrs) {
+        if (!frameAttrs || typeof frameAttrs !== "object")
+            return frameAttrs;
+        var _x = frameAttrs["@_svg:x"], _y = frameAttrs["@_svg:y"], _bareX = frameAttrs["@_x"], _bareY = frameAttrs["@_y"], rest = __rest(frameAttrs, ["@_svg:x", "@_svg:y", "@_x", "@_y"]);
+        return rest;
+    };
     /**
      * Walk the ordered content XML for each table and assign outline
      * level + collapsed/hiddenByGroup state on `rowMetadata` and
@@ -1324,7 +1642,7 @@ var OdsPlugin = /** @class */ (function (_super) {
             return;
         var tables = spreadsheet.filter(function (child) { return child["table:table"] || child["table"]; });
         var tableCount = Math.min(tables.length, sheets.length);
-        var _loop_1 = function (sheetIndex) {
+        var _loop_5 = function (sheetIndex) {
             var tableWrapper = tables[sheetIndex];
             var tableNameKey = tableWrapper["table:table"]
                 ? "table:table"
@@ -1344,100 +1662,112 @@ var OdsPlugin = /** @class */ (function (_super) {
                     meta[index] = {};
                 Object.assign(meta[index], patch);
             };
-            var walk = function (nodes, itemTag, groupTag, meta, repeatAttrs, summaryAfter) {
+            var walk = function (nodes, itemTag, groupTag, wrapperTags, meta, repeatAttrs, summaryAfter) {
                 var cursor = 1;
                 var openStack = [];
                 var collapsedDepth = function () { return openStack.some(function (g) { return g.collapsed; }); };
                 var currentLevel = function () { return openStack.length; };
                 var visit = function (children) {
-                    var e_27, _a, e_28, _b;
-                    var _c;
-                    try {
-                        for (var children_1 = (e_27 = void 0, __values(children)), children_1_1 = children_1.next(); !children_1_1.done; children_1_1 = children_1.next()) {
-                            var child = children_1_1.value;
-                            if (!child)
-                                continue;
-                            if (child[groupTag]) {
-                                var attrs = child[":@"] || {};
-                                var display = (_c = attrs["@_table:display"]) !== null && _c !== void 0 ? _c : attrs["@_display"];
-                                var collapsed = display === "false" || display === false;
-                                var startIndex = cursor;
-                                openStack.push({
-                                    level: openStack.length + 1,
-                                    startIndex: startIndex,
-                                    collapsed: collapsed,
-                                });
-                                visit(child[groupTag] || []);
-                                var closing = openStack.pop();
-                                if (closing.collapsed) {
-                                    var summaryIndex = summaryAfter
-                                        ? cursor
-                                        : closing.startIndex - 1;
-                                    if (summaryIndex >= 1) {
-                                        setMeta(meta, summaryIndex, { collapsed: true });
-                                    }
+                    var e_32, _a;
+                    var _b;
+                    var _loop_6 = function (child) {
+                        var e_33, _c;
+                        if (!child)
+                            return "continue";
+                        // `<table:table-header-rows>` / `<table:table-rows>` (and the
+                        // column twins) only group rows for printing; their rows keep
+                        // the surrounding outline level and still advance the cursor.
+                        var wrapper = wrapperTags.find(function (tag) { return tag !== groupTag && child[tag]; });
+                        if (wrapper) {
+                            visit(child[wrapper] || []);
+                            return "continue";
+                        }
+                        if (child[groupTag]) {
+                            var attrs = child[":@"] || {};
+                            var display = (_b = attrs["@_table:display"]) !== null && _b !== void 0 ? _b : attrs["@_display"];
+                            var collapsed = display === "false" || display === false;
+                            var startIndex = cursor;
+                            openStack.push({
+                                level: openStack.length + 1,
+                                startIndex: startIndex,
+                                collapsed: collapsed,
+                            });
+                            visit(child[groupTag] || []);
+                            var closing = openStack.pop();
+                            if (closing.collapsed) {
+                                var summaryIndex = summaryAfter
+                                    ? cursor
+                                    : closing.startIndex - 1;
+                                if (summaryIndex >= 1) {
+                                    setMeta(meta, summaryIndex, { collapsed: true });
                                 }
                             }
-                            else if (child[itemTag]) {
-                                var attrs = child[":@"] || {};
-                                var repeat = 1;
-                                try {
-                                    for (var repeatAttrs_1 = (e_28 = void 0, __values(repeatAttrs)), repeatAttrs_1_1 = repeatAttrs_1.next(); !repeatAttrs_1_1.done; repeatAttrs_1_1 = repeatAttrs_1.next()) {
-                                        var attrName = repeatAttrs_1_1.value;
-                                        var raw = attrs["@_".concat(attrName)];
-                                        if (raw !== undefined) {
-                                            repeat = Math.max(1, parseInt(String(raw), 10) || 1);
-                                            break;
-                                        }
+                        }
+                        else if (child[itemTag]) {
+                            var attrs = child[":@"] || {};
+                            var repeat = 1;
+                            try {
+                                for (var repeatAttrs_1 = (e_33 = void 0, __values(repeatAttrs)), repeatAttrs_1_1 = repeatAttrs_1.next(); !repeatAttrs_1_1.done; repeatAttrs_1_1 = repeatAttrs_1.next()) {
+                                    var attrName = repeatAttrs_1_1.value;
+                                    var raw = attrs["@_".concat(attrName)];
+                                    if (raw !== undefined) {
+                                        repeat = Math.max(1, parseInt(String(raw), 10) || 1);
+                                        break;
                                     }
                                 }
-                                catch (e_28_1) { e_28 = { error: e_28_1 }; }
-                                finally {
-                                    try {
-                                        if (repeatAttrs_1_1 && !repeatAttrs_1_1.done && (_b = repeatAttrs_1.return)) _b.call(repeatAttrs_1);
-                                    }
-                                    finally { if (e_28) throw e_28.error; }
+                            }
+                            catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                            finally {
+                                try {
+                                    if (repeatAttrs_1_1 && !repeatAttrs_1_1.done && (_c = repeatAttrs_1.return)) _c.call(repeatAttrs_1);
                                 }
-                                repeat = Math.min(repeat, 10000);
-                                var level = currentLevel();
-                                var hidden = collapsedDepth();
-                                if (level > 0 || hidden) {
-                                    for (var r = 0; r < repeat; r++) {
-                                        var patch = {};
-                                        if (level > 0)
-                                            patch.outlineLevel = level;
-                                        if (hidden)
-                                            patch.hiddenByGroup = true;
-                                        setMeta(meta, cursor + r, patch);
-                                    }
+                                finally { if (e_33) throw e_33.error; }
+                            }
+                            repeat = Math.min(repeat, 10000);
+                            var level = currentLevel();
+                            var hidden = collapsedDepth();
+                            if (level > 0 || hidden) {
+                                for (var r = 0; r < repeat; r++) {
+                                    var patch = {};
+                                    if (level > 0)
+                                        patch.outlineLevel = level;
+                                    if (hidden)
+                                        patch.hiddenByGroup = true;
+                                    setMeta(meta, cursor + r, patch);
                                 }
-                                cursor += repeat;
                             }
+                            cursor += repeat;
+                        }
+                    };
+                    try {
+                        for (var children_1 = (e_32 = void 0, __values(children)), children_1_1 = children_1.next(); !children_1_1.done; children_1_1 = children_1.next()) {
+                            var child = children_1_1.value;
+                            _loop_6(child);
                         }
                     }
-                    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+                    catch (e_32_1) { e_32 = { error: e_32_1 }; }
                     finally {
                         try {
                             if (children_1_1 && !children_1_1.done && (_a = children_1.return)) _a.call(children_1);
                         }
-                        finally { if (e_27) throw e_27.error; }
+                        finally { if (e_32) throw e_32.error; }
                     }
                 };
                 visit(nodes);
             };
-            walk(tableChildren, "table:table-column", "table:table-column-group", columnMetadata, ["table:number-columns-repeated", "number-columns-repeated"], summaryRight);
-            walk(tableChildren, "table:table-row", "table:table-row-group", rowMetadata, ["table:number-rows-repeated", "number-rows-repeated"], summaryBelow);
+            walk(tableChildren, "table:table-column", "table:table-column-group", COLUMN_WRAPPER_TAGS, columnMetadata, ["table:number-columns-repeated", "number-columns-repeated"], summaryRight);
+            walk(tableChildren, "table:table-row", "table:table-row-group", ROW_WRAPPER_TAGS, rowMetadata, ["table:number-rows-repeated", "number-rows-repeated"], summaryBelow);
             if (columnMetadata.length > 0)
                 sheet.columnMetadata = columnMetadata;
             if (rowMetadata.length > 0)
                 sheet.rowMetadata = rowMetadata;
         };
         for (var sheetIndex = 0; sheetIndex < tableCount; sheetIndex++) {
-            _loop_1(sheetIndex);
+            _loop_5(sheetIndex);
         }
     };
     OdsPlugin.prototype.extractMerges = function (sheetContexts) {
-        var e_29, _a, e_30, _b;
+        var e_34, _a, e_35, _b;
         var _c, _d, _e, _f;
         var merges = new Map();
         if (!this.contentXmlOrdered || !sheetContexts.length) {
@@ -1465,11 +1795,11 @@ var OdsPlugin = /** @class */ (function (_super) {
             var tableChildren = tableWrapper[tableNameKey];
             if (!tableChildren)
                 continue;
-            var rows = tableChildren.filter(function (child) { return child["table:table-row"] || child["table-row"]; });
+            var rows = flattenOrderedRows(tableChildren);
             var sheetId = (_f = (_e = sheetContexts[sheetIndex]) === null || _e === void 0 ? void 0 : _e.sheetId) !== null && _f !== void 0 ? _f : sheetIndex + 1;
             var currentRowIndex = 1;
             try {
-                for (var rows_2 = (e_29 = void 0, __values(rows)), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
+                for (var rows_2 = (e_34 = void 0, __values(rows)), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
                     var rowWrapper = rows_2_1.value;
                     var rowNameKey = rowWrapper["table:table-row"]
                         ? "table:table-row"
@@ -1484,7 +1814,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                         var columnIndex = 1;
                         if (rowChildren) {
                             try {
-                                for (var rowChildren_1 = (e_30 = void 0, __values(rowChildren)), rowChildren_1_1 = rowChildren_1.next(); !rowChildren_1_1.done; rowChildren_1_1 = rowChildren_1.next()) {
+                                for (var rowChildren_1 = (e_35 = void 0, __values(rowChildren)), rowChildren_1_1 = rowChildren_1.next(); !rowChildren_1_1.done; rowChildren_1_1 = rowChildren_1.next()) {
                                     var cellWrapper = rowChildren_1_1.value;
                                     var isCell = !!cellWrapper["table:table-cell"];
                                     var isCovered = !!cellWrapper["table:covered-table-cell"];
@@ -1532,24 +1862,24 @@ var OdsPlugin = /** @class */ (function (_super) {
                                     columnIndex += colsRepeated;
                                 }
                             }
-                            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+                            catch (e_35_1) { e_35 = { error: e_35_1 }; }
                             finally {
                                 try {
                                     if (rowChildren_1_1 && !rowChildren_1_1.done && (_b = rowChildren_1.return)) _b.call(rowChildren_1);
                                 }
-                                finally { if (e_30) throw e_30.error; }
+                                finally { if (e_35) throw e_35.error; }
                             }
                         }
                         currentRowIndex++;
                     }
                 }
             }
-            catch (e_29_1) { e_29 = { error: e_29_1 }; }
+            catch (e_34_1) { e_34 = { error: e_34_1 }; }
             finally {
                 try {
                     if (rows_2_1 && !rows_2_1.done && (_a = rows_2.return)) _a.call(rows_2);
                 }
-                finally { if (e_29) throw e_29.error; }
+                finally { if (e_34) throw e_34.error; }
             }
         }
         return merges;
@@ -1572,7 +1902,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return spreadsheet.filter(function (child) { return child["table:table"] || child["table"]; });
     };
     OdsPlugin.prototype.findOrderedTableWrapperForContext = function (sheetContext, sheetId) {
-        var e_31, _a;
+        var e_36, _a;
         var tables = this.getOrderedTableWrappers();
         if (!tables.length)
             return undefined;
@@ -1594,12 +1924,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_31_1) { e_31 = { error: e_31_1 }; }
+            catch (e_36_1) { e_36 = { error: e_36_1 }; }
             finally {
                 try {
                     if (tables_1_1 && !tables_1_1.done && (_a = tables_1.return)) _a.call(tables_1);
                 }
-                finally { if (e_31) throw e_31.error; }
+                finally { if (e_36) throw e_36.error; }
             }
         }
         if (sheetId && tables[sheetId - 1]) {
@@ -1608,7 +1938,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return tables[0];
     };
     OdsPlugin.prototype.extractTableColumnsFromHeader = function (range, sheetContext, useHeaderRow) {
-        var e_32, _a, e_33, _b;
+        var e_37, _a, e_38, _b;
         var _c, _d, _e;
         if (useHeaderRow === void 0) { useHeaderRow = true; }
         var startColumn = Math.max(1, (_c = range.startColumnIndex) !== null && _c !== void 0 ? _c : 1);
@@ -1631,7 +1961,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         if (!tableChildren) {
             return buildDefaultColumns();
         }
-        var rows = tableChildren.filter(function (child) { return child["table:table-row"] || child["table-row"]; });
+        var rows = flattenOrderedRows(tableChildren);
         if (!rows.length) {
             return buildDefaultColumns();
         }
@@ -1658,7 +1988,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                         var columnIndex = 1;
                         if (normalizedRowChildren) {
                             try {
-                                for (var normalizedRowChildren_2 = (e_33 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_2_1 = normalizedRowChildren_2.next(); !normalizedRowChildren_2_1.done; normalizedRowChildren_2_1 = normalizedRowChildren_2.next()) {
+                                for (var normalizedRowChildren_2 = (e_38 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_2_1 = normalizedRowChildren_2.next(); !normalizedRowChildren_2_1.done; normalizedRowChildren_2_1 = normalizedRowChildren_2.next()) {
                                     var cellWrapper = normalizedRowChildren_2_1.value;
                                     var isCell = !!cellWrapper["table:table-cell"];
                                     var isCovered = !!cellWrapper["table:covered-table-cell"];
@@ -1708,12 +2038,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                                     }
                                 }
                             }
-                            catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                            catch (e_38_1) { e_38 = { error: e_38_1 }; }
                             finally {
                                 try {
                                     if (normalizedRowChildren_2_1 && !normalizedRowChildren_2_1.done && (_b = normalizedRowChildren_2.return)) _b.call(normalizedRowChildren_2);
                                 }
-                                finally { if (e_33) throw e_33.error; }
+                                finally { if (e_38) throw e_38.error; }
                             }
                         }
                         break outer;
@@ -1725,12 +2055,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_32_1) { e_32 = { error: e_32_1 }; }
+        catch (e_37_1) { e_37 = { error: e_37_1 }; }
         finally {
             try {
                 if (rows_3_1 && !rows_3_1.done && (_a = rows_3.return)) _a.call(rows_3);
             }
-            finally { if (e_32) throw e_32.error; }
+            finally { if (e_37) throw e_37.error; }
         }
         if (!headerValues.length) {
             return buildDefaultColumns();
@@ -1745,7 +2075,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return columns;
     };
     OdsPlugin.prototype.collectFrameNodes = function (cellChildren, cellAttrs) {
-        var e_34, _a, e_35, _b;
+        var e_39, _a, e_40, _b;
         if (!cellChildren)
             return [];
         var children = Array.isArray(cellChildren)
@@ -1762,17 +2092,17 @@ var OdsPlugin = /** @class */ (function (_super) {
                     continue;
                 if (Array.isArray(frameNode)) {
                     try {
-                        for (var frameNode_1 = (e_35 = void 0, __values(frameNode)), frameNode_1_1 = frameNode_1.next(); !frameNode_1_1.done; frameNode_1_1 = frameNode_1.next()) {
+                        for (var frameNode_1 = (e_40 = void 0, __values(frameNode)), frameNode_1_1 = frameNode_1.next(); !frameNode_1_1.done; frameNode_1_1 = frameNode_1.next()) {
                             var node = frameNode_1_1.value;
                             frames.push({ frame: node, cellAttrs: child[":@"] || cellAttrs });
                         }
                     }
-                    catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                    catch (e_40_1) { e_40 = { error: e_40_1 }; }
                     finally {
                         try {
                             if (frameNode_1_1 && !frameNode_1_1.done && (_b = frameNode_1.return)) _b.call(frameNode_1);
                         }
-                        finally { if (e_35) throw e_35.error; }
+                        finally { if (e_40) throw e_40.error; }
                     }
                 }
                 else {
@@ -1780,17 +2110,17 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_34_1) { e_34 = { error: e_34_1 }; }
+        catch (e_39_1) { e_39 = { error: e_39_1 }; }
         finally {
             try {
                 if (children_2_1 && !children_2_1.done && (_a = children_2.return)) _a.call(children_2);
             }
-            finally { if (e_34) throw e_34.error; }
+            finally { if (e_39) throw e_39.error; }
         }
         return frames;
     };
     OdsPlugin.prototype.extractSheetSettings = function (sheetContexts) {
-        var e_36, _a, e_37, _b;
+        var e_41, _a, e_42, _b;
         var _this = this;
         var map = new Map();
         if (!this.settingsXml || !sheetContexts.length) {
@@ -1806,7 +2136,7 @@ var OdsPlugin = /** @class */ (function (_super) {
             return map;
         var nameMap = new Map();
         var traverse = function (node) {
-            var e_38, _a, e_39, _b;
+            var e_43, _a, e_44, _b;
             if (!node || typeof node !== "object")
                 return;
             var entries = _this.toArray(node["config:config-item-map-entry"] || node["config-item-map-entry"]);
@@ -1833,12 +2163,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     traverse(entry);
                 }
             }
-            catch (e_38_1) { e_38 = { error: e_38_1 }; }
+            catch (e_43_1) { e_43 = { error: e_43_1 }; }
             finally {
                 try {
                     if (entries_1_1 && !entries_1_1.done && (_a = entries_1.return)) _a.call(entries_1);
                 }
-                finally { if (e_38) throw e_38.error; }
+                finally { if (e_43) throw e_43.error; }
             }
             var namedMaps = _this.toArray(node["config:config-item-map-named"] || node["config-item-map-named"]);
             try {
@@ -1847,12 +2177,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                     traverse(named);
                 }
             }
-            catch (e_39_1) { e_39 = { error: e_39_1 }; }
+            catch (e_44_1) { e_44 = { error: e_44_1 }; }
             finally {
                 try {
                     if (namedMaps_1_1 && !namedMaps_1_1.done && (_b = namedMaps_1.return)) _b.call(namedMaps_1);
                 }
-                finally { if (e_39) throw e_39.error; }
+                finally { if (e_44) throw e_44.error; }
             }
         };
         var itemSets = this.toArray(get(settingsNode, "config:config-item-set") ||
@@ -1863,12 +2193,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 traverse(set);
             }
         }
-        catch (e_36_1) { e_36 = { error: e_36_1 }; }
+        catch (e_41_1) { e_41 = { error: e_41_1 }; }
         finally {
             try {
                 if (itemSets_1_1 && !itemSets_1_1.done && (_a = itemSets_1.return)) _a.call(itemSets_1);
             }
-            finally { if (e_36) throw e_36.error; }
+            finally { if (e_41) throw e_41.error; }
         }
         try {
             for (var sheetContexts_4 = __values(sheetContexts), sheetContexts_4_1 = sheetContexts_4.next(); !sheetContexts_4_1.done; sheetContexts_4_1 = sheetContexts_4.next()) {
@@ -1881,17 +2211,17 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_37_1) { e_37 = { error: e_37_1 }; }
+        catch (e_42_1) { e_42 = { error: e_42_1 }; }
         finally {
             try {
                 if (sheetContexts_4_1 && !sheetContexts_4_1.done && (_b = sheetContexts_4.return)) _b.call(sheetContexts_4);
             }
-            finally { if (e_37) throw e_37.error; }
+            finally { if (e_42) throw e_42.error; }
         }
         return map;
     };
     OdsPlugin.prototype.parseConfigItemEntry = function (entry) {
-        var e_40, _a;
+        var e_45, _a;
         var configItems = this.toArray(get(entry, "config:config-item") || get(entry, "config-item"));
         if (!configItems.length)
             return undefined;
@@ -1947,12 +2277,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_40_1) { e_40 = { error: e_40_1 }; }
+        catch (e_45_1) { e_45 = { error: e_45_1 }; }
         finally {
             try {
                 if (configItems_1_1 && !configItems_1_1.done && (_a = configItems_1.return)) _a.call(configItems_1);
             }
-            finally { if (e_40) throw e_40.error; }
+            finally { if (e_45) throw e_45.error; }
         }
         return Object.keys(settings).length ? settings : undefined;
     };
@@ -2003,14 +2333,24 @@ var OdsPlugin = /** @class */ (function (_super) {
         var frameAttrs = this.getAttributes(frameNode);
         var inlineChart = this.findInlineChartNode(frameNode);
         var chartNode = inlineChart;
+        // An inline chart's styles live in the workbook's content.xml, so the
+        // workbook-level table applies. An embedded object is its own ODF
+        // document with its own <office:automatic-styles>, and every object
+        // reuses the same automatic style names (LibreOffice: ch1/ch2…, our
+        // exporter: plot1/series0…), so its styles are scoped to the object —
+        // sharing one table would let the previous chart's
+        // `chart:three-dimensional` flag or series colours leak into this one.
+        var chartStyles = this.odsStyles;
         if (!chartNode) {
             var objectNode = this.findFrameObjectNode(frameNode);
-            var chartFromObject = this.loadChartNodeFromObject(objectNode, frameAttrs);
+            var objectStyles = new OdsStyles();
+            var chartFromObject = this.loadChartNodeFromObject(objectNode, frameAttrs, objectStyles);
             chartNode = chartFromObject;
+            chartStyles = objectStyles;
         }
         if (!chartNode)
             return undefined;
-        var spec = this.convertChartNodeToSpec(chartNode, sheetNameMap, sheetContext);
+        var spec = this.convertChartNodeToSpec(chartNode, sheetNameMap, sheetContext, chartStyles);
         if (!spec)
             return undefined;
         var overlayPosition = this.buildOverlayPlacement(frameAttrs, cellAttrs, rowIndex, columnIndex).overlayPosition;
@@ -2027,7 +2367,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         };
     };
     OdsPlugin.prototype.findInlineChartNode = function (frameNode) {
-        var e_41, _a;
+        var e_46, _a;
         if (!frameNode)
             return undefined;
         if (Array.isArray(frameNode)) {
@@ -2039,12 +2379,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return found;
                 }
             }
-            catch (e_41_1) { e_41 = { error: e_41_1 }; }
+            catch (e_46_1) { e_46 = { error: e_46_1 }; }
             finally {
                 try {
                     if (frameNode_2_1 && !frameNode_2_1.done && (_a = frameNode_2.return)) _a.call(frameNode_2);
                 }
-                finally { if (e_41) throw e_41.error; }
+                finally { if (e_46) throw e_46.error; }
             }
             return undefined;
         }
@@ -2055,7 +2395,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return undefined;
     };
     OdsPlugin.prototype.findFrameObjectNode = function (frameNode) {
-        var e_42, _a;
+        var e_47, _a;
         if (!frameNode)
             return undefined;
         if (Array.isArray(frameNode)) {
@@ -2067,12 +2407,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return found;
                 }
             }
-            catch (e_42_1) { e_42 = { error: e_42_1 }; }
+            catch (e_47_1) { e_47 = { error: e_47_1 }; }
             finally {
                 try {
                     if (frameNode_3_1 && !frameNode_3_1.done && (_a = frameNode_3.return)) _a.call(frameNode_3);
                 }
-                finally { if (e_42) throw e_42.error; }
+                finally { if (e_47) throw e_47.error; }
             }
             return undefined;
         }
@@ -2083,7 +2423,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return undefined;
     };
     OdsPlugin.prototype.findFrameImageNode = function (frameNode) {
-        var e_43, _a;
+        var e_48, _a;
         if (!frameNode)
             return undefined;
         if (Array.isArray(frameNode)) {
@@ -2095,12 +2435,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return found;
                 }
             }
-            catch (e_43_1) { e_43 = { error: e_43_1 }; }
+            catch (e_48_1) { e_48 = { error: e_48_1 }; }
             finally {
                 try {
                     if (frameNode_4_1 && !frameNode_4_1.done && (_a = frameNode_4.return)) _a.call(frameNode_4);
                 }
-                finally { if (e_43) throw e_43.error; }
+                finally { if (e_48) throw e_48.error; }
             }
             return undefined;
         }
@@ -2110,24 +2450,32 @@ var OdsPlugin = /** @class */ (function (_super) {
         }
         return undefined;
     };
-    OdsPlugin.prototype.loadChartNodeFromObject = function (objectNode, frameAttrs) {
-        if (!objectNode)
+    OdsPlugin.prototype.loadChartNodeFromObject = function (objectNode, frameAttrs, styles) {
+        // A self-closing `<draw:object xlink:href="…"/>` parses to an empty
+        // child list with its attributes on the wrapper (`frameAttrs` here), so
+        // the href must still be honoured when there is no object node.
+        if (!objectNode && !frameAttrs)
             return undefined;
         var objectAttrs = this.getAttributes(objectNode);
         var href = (objectAttrs === null || objectAttrs === void 0 ? void 0 : objectAttrs["@_xlink:href"]) ||
             (objectAttrs === null || objectAttrs === void 0 ? void 0 : objectAttrs["@_href"]) ||
             (frameAttrs === null || frameAttrs === void 0 ? void 0 : frameAttrs["@_xlink:href"]) ||
             (frameAttrs === null || frameAttrs === void 0 ? void 0 : frameAttrs["@_href"]);
-        return this.loadChartNodeFromHref(href);
+        return this.loadChartNodeFromHref(href, styles);
     };
-    OdsPlugin.prototype.loadChartNodeFromHref = function (href) {
+    /**
+     * Loads an embedded chart object's `content.xml` and registers its
+     * `<office:automatic-styles>` into `styles` — the per-object table the
+     * caller resolves plot-area / series styles against.
+     */
+    OdsPlugin.prototype.loadChartNodeFromHref = function (href, styles) {
         var path = this.resolveObjectPath(href);
         if (!path)
             return undefined;
         try {
             var content = this.zipParser.Get(path);
             var chartDoc = this.xmlParser.parse(content);
-            this.odsStyles.parseContentXml(chartDoc);
+            styles.parseContentXml(chartDoc);
             return this.findChartNodeInDocument(chartDoc);
         }
         catch (_a) {
@@ -2135,7 +2483,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         }
     };
     OdsPlugin.prototype.resolveObjectPath = function (href) {
-        var e_44, _a;
+        var e_49, _a;
         if (!href)
             return undefined;
         var normalized = href.trim();
@@ -2172,12 +2520,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_44_1) { e_44 = { error: e_44_1 }; }
+        catch (e_49_1) { e_49 = { error: e_49_1 }; }
         finally {
             try {
                 if (candidates_1_1 && !candidates_1_1.done && (_a = candidates_1.return)) _a.call(candidates_1);
             }
-            finally { if (e_44) throw e_44.error; }
+            finally { if (e_49) throw e_49.error; }
         }
         return undefined;
     };
@@ -2193,7 +2541,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return this.findNodeRecursive(doc, "chart:chart");
     };
     OdsPlugin.prototype.findNodeRecursive = function (node, key) {
-        var e_45, _a, e_46, _b;
+        var e_50, _a, e_51, _b;
         if (!node || typeof node !== "object")
             return undefined;
         if (node[key]) {
@@ -2204,19 +2552,19 @@ var OdsPlugin = /** @class */ (function (_super) {
                 var value = _d.value;
                 if (Array.isArray(value)) {
                     try {
-                        for (var value_1 = (e_46 = void 0, __values(value)), value_1_1 = value_1.next(); !value_1_1.done; value_1_1 = value_1.next()) {
+                        for (var value_1 = (e_51 = void 0, __values(value)), value_1_1 = value_1.next(); !value_1_1.done; value_1_1 = value_1.next()) {
                             var entry = value_1_1.value;
                             var found = this.findNodeRecursive(entry, key);
                             if (found)
                                 return found;
                         }
                     }
-                    catch (e_46_1) { e_46 = { error: e_46_1 }; }
+                    catch (e_51_1) { e_51 = { error: e_51_1 }; }
                     finally {
                         try {
                             if (value_1_1 && !value_1_1.done && (_b = value_1.return)) _b.call(value_1);
                         }
-                        finally { if (e_46) throw e_46.error; }
+                        finally { if (e_51) throw e_51.error; }
                     }
                 }
                 else if (typeof value === "object") {
@@ -2226,21 +2574,22 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_45_1) { e_45 = { error: e_45_1 }; }
+        catch (e_50_1) { e_50 = { error: e_50_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_45) throw e_45.error; }
+            finally { if (e_50) throw e_50.error; }
         }
         return undefined;
     };
-    OdsPlugin.prototype.convertChartNodeToSpec = function (chartNode, sheetNameMap, context) {
-        var e_47, _a;
+    OdsPlugin.prototype.convertChartNodeToSpec = function (chartNode, sheetNameMap, context, styles) {
+        var e_52, _a;
         if (!chartNode)
             return undefined;
         var chartAttrs = this.getAttributes(chartNode);
-        var chartType = this.mapOdsChartClassToType((chartAttrs === null || chartAttrs === void 0 ? void 0 : chartAttrs["@_chart:class"]) || (chartAttrs === null || chartAttrs === void 0 ? void 0 : chartAttrs["@_class"]));
+        var chartClass = (chartAttrs === null || chartAttrs === void 0 ? void 0 : chartAttrs["@_chart:class"]) || (chartAttrs === null || chartAttrs === void 0 ? void 0 : chartAttrs["@_class"]);
+        var chartType = this.mapOdsChartClassToType(chartClass);
         var titleNode = get(chartNode, "chart:title.chart:title-text") ||
             get(chartNode, "chart:title") ||
             get(chartNode, "title");
@@ -2249,6 +2598,8 @@ var OdsPlugin = /** @class */ (function (_super) {
         var plotArea = get(chartNode, "chart:plot-area") || get(chartNode, "plot-area");
         if (!plotArea)
             return undefined;
+        var plotAreaAttrs = this.getAttributes(plotArea);
+        var sourceChartType = this.resolveOdsSourceChartType(chartClass, chartType, (plotAreaAttrs === null || plotAreaAttrs === void 0 ? void 0 : plotAreaAttrs["@_chart:style-name"]) || (plotAreaAttrs === null || plotAreaAttrs === void 0 ? void 0 : plotAreaAttrs["@_style-name"]), styles);
         var seriesNodes = this.toArray(get(plotArea, "chart:series") ||
             get(plotArea, "chart:data-series") ||
             get(plotArea, "series"));
@@ -2278,7 +2629,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                     if (seriesData) {
                         var label = this.extractSeriesLabel(seriesNode);
                         seriesData.dataLabel = label || "Series ".concat(seriesIndex);
-                        var color = this.extractChartSeriesColor(seriesNode);
+                        var color = this.extractChartSeriesColor(seriesNode, styles);
                         if (color) {
                             seriesData.color = color;
                         }
@@ -2288,23 +2639,18 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_47_1) { e_47 = { error: e_47_1 }; }
+        catch (e_52_1) { e_52 = { error: e_52_1 }; }
         finally {
             try {
                 if (seriesNodes_1_1 && !seriesNodes_1_1.done && (_a = seriesNodes_1.return)) _a.call(seriesNodes_1);
             }
-            finally { if (e_47) throw e_47.error; }
+            finally { if (e_52) throw e_52.error; }
         }
         if (!series.length) {
             return undefined;
         }
         var finalizedDomains = domains.length ? domains : [series[0]];
-        return {
-            chartType: chartType,
-            title: title,
-            domains: finalizedDomains,
-            series: series,
-        };
+        return __assign({ chartType: chartType, title: title, domains: finalizedDomains, series: series }, (sourceChartType ? { sourceChartType: sourceChartType } : {}));
     };
     OdsPlugin.prototype.extractSeriesLabel = function (seriesNode) {
         if (!seriesNode)
@@ -2315,8 +2661,8 @@ var OdsPlugin = /** @class */ (function (_super) {
         var label = labelNode ? this.extractTextContent(labelNode) : undefined;
         return (label === null || label === void 0 ? void 0 : label.trim()) || undefined;
     };
-    OdsPlugin.prototype.extractChartSeriesColor = function (seriesNode) {
-        var e_48, _a, e_49, _b, e_50, _c;
+    OdsPlugin.prototype.extractChartSeriesColor = function (seriesNode, styles) {
+        var e_53, _a, e_54, _b, e_55, _c;
         if (!seriesNode)
             return undefined;
         var attrs = this.getAttributes(seriesNode);
@@ -2328,18 +2674,18 @@ var OdsPlugin = /** @class */ (function (_super) {
         try {
             for (var styleCandidates_1 = __values(styleCandidates), styleCandidates_1_1 = styleCandidates_1.next(); !styleCandidates_1_1.done; styleCandidates_1_1 = styleCandidates_1.next()) {
                 var candidate = styleCandidates_1_1.value;
-                var color = this.odsStyles.getChartStyleColor(candidate);
+                var color = styles.getChartStyleColor(candidate);
                 if (color) {
                     return typeof color === "string" ? color : undefined;
                 }
             }
         }
-        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+        catch (e_53_1) { e_53 = { error: e_53_1 }; }
         finally {
             try {
                 if (styleCandidates_1_1 && !styleCandidates_1_1.done && (_a = styleCandidates_1.return)) _a.call(styleCandidates_1);
             }
-            finally { if (e_48) throw e_48.error; }
+            finally { if (e_53) throw e_53.error; }
         }
         var seriesProps = get(seriesNode, "chart:data-point-properties") ||
             get(seriesNode, "chart:series-properties");
@@ -2360,31 +2706,31 @@ var OdsPlugin = /** @class */ (function (_super) {
                     pointAttrs === null || pointAttrs === void 0 ? void 0 : pointAttrs["@_style-name"],
                 ];
                 try {
-                    for (var pointStyleCandidates_1 = (e_50 = void 0, __values(pointStyleCandidates)), pointStyleCandidates_1_1 = pointStyleCandidates_1.next(); !pointStyleCandidates_1_1.done; pointStyleCandidates_1_1 = pointStyleCandidates_1.next()) {
+                    for (var pointStyleCandidates_1 = (e_55 = void 0, __values(pointStyleCandidates)), pointStyleCandidates_1_1 = pointStyleCandidates_1.next(); !pointStyleCandidates_1_1.done; pointStyleCandidates_1_1 = pointStyleCandidates_1.next()) {
                         var candidate = pointStyleCandidates_1_1.value;
-                        var color = this.odsStyles.getChartStyleColor(candidate);
+                        var color = styles.getChartStyleColor(candidate);
                         if (color)
                             return typeof color === "string" ? color : undefined;
                     }
                 }
-                catch (e_50_1) { e_50 = { error: e_50_1 }; }
+                catch (e_55_1) { e_55 = { error: e_55_1 }; }
                 finally {
                     try {
                         if (pointStyleCandidates_1_1 && !pointStyleCandidates_1_1.done && (_c = pointStyleCandidates_1.return)) _c.call(pointStyleCandidates_1);
                     }
-                    finally { if (e_50) throw e_50.error; }
+                    finally { if (e_55) throw e_55.error; }
                 }
                 var pointColor = this.extractColorFromChartProperties(get(dataPoint, "chart:data-point-properties") || dataPoint);
                 if (pointColor)
                     return pointColor;
             }
         }
-        catch (e_49_1) { e_49 = { error: e_49_1 }; }
+        catch (e_54_1) { e_54 = { error: e_54_1 }; }
         finally {
             try {
                 if (dataPoints_1_1 && !dataPoints_1_1.done && (_b = dataPoints_1.return)) _b.call(dataPoints_1);
             }
-            finally { if (e_49) throw e_49.error; }
+            finally { if (e_54) throw e_54.error; }
         }
         return undefined;
     };
@@ -2414,16 +2760,42 @@ var OdsPlugin = /** @class */ (function (_super) {
         if (normalized.includes("line") || normalized.includes("scatter")) {
             return "line";
         }
-        if (normalized.includes("pie")) {
+        if (normalized.includes("pie") || normalized.includes("circle")) {
             return "pie";
         }
-        if (normalized.includes("area")) {
+        // `chart:surface` degrades to area — the same 2-D base the OOXML
+        // surfaceChart / surface3DChart import uses (sourceChartType SURFACE).
+        if (normalized.includes("area") || normalized.includes("surface")) {
             return "area";
         }
         return "bar";
     };
+    /**
+     * The authored 3-D class token for an ODS chart: `chart:surface` is a
+     * surface, and any other class whose plot-area style declares
+     * `chart:three-dimensional="true"` maps to the OOXML 3-D variant of its
+     * 2-D base (`BAR_3D`, `LINE_3D`, `PIE_3D`, `AREA_3D`). Undefined for 2-D.
+     */
+    OdsPlugin.prototype.resolveOdsSourceChartType = function (chartClass, chartType, plotAreaStyleName, styles) {
+        var threeDimensional = styles.isChartStyleThreeDimensional(plotAreaStyleName);
+        if (((chartClass === null || chartClass === void 0 ? void 0 : chartClass.toLowerCase()) || "").includes("surface")) {
+            return threeDimensional ? "SURFACE_3D" : "SURFACE";
+        }
+        if (!threeDimensional)
+            return undefined;
+        switch (chartType) {
+            case "bar":
+                return "BAR_3D";
+            case "line":
+                return "LINE_3D";
+            case "pie":
+                return "PIE_3D";
+            case "area":
+                return "AREA_3D";
+        }
+    };
     OdsPlugin.prototype.findRangeString = function (node, skipKeys) {
-        var e_51, _a, e_52, _b;
+        var e_56, _a, e_57, _b;
         if (!node)
             return undefined;
         var stack = [node];
@@ -2444,7 +2816,7 @@ var OdsPlugin = /** @class */ (function (_super) {
             if (typeof current === "object") {
                 var attrs = current[":@"] || current;
                 try {
-                    for (var _c = (e_51 = void 0, __values(Object.entries(attrs))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    for (var _c = (e_56 = void 0, __values(Object.entries(attrs))), _d = _c.next(); !_d.done; _d = _c.next()) {
                         var _e = __read(_d.value, 2), key = _e[0], attrValue = _e[1];
                         if (key.startsWith("@_") &&
                             typeof attrValue === "string" &&
@@ -2453,15 +2825,15 @@ var OdsPlugin = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_51_1) { e_51 = { error: e_51_1 }; }
+                catch (e_56_1) { e_56 = { error: e_56_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                     }
-                    finally { if (e_51) throw e_51.error; }
+                    finally { if (e_56) throw e_56.error; }
                 }
                 try {
-                    for (var _f = (e_52 = void 0, __values(Object.entries(current))), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    for (var _f = (e_57 = void 0, __values(Object.entries(current))), _g = _f.next(); !_g.done; _g = _f.next()) {
                         var _h = __read(_g.value, 2), childKey = _h[0], childValue = _h[1];
                         if (childKey === ":@")
                             continue;
@@ -2470,12 +2842,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         stack.push(childValue);
                     }
                 }
-                catch (e_52_1) { e_52 = { error: e_52_1 }; }
+                catch (e_57_1) { e_57 = { error: e_57_1 }; }
                 finally {
                     try {
                         if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                     }
-                    finally { if (e_52) throw e_52.error; }
+                    finally { if (e_57) throw e_57.error; }
                 }
             }
         }
@@ -2679,7 +3051,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return undefined;
     };
     OdsPlugin.prototype.buildSheetNameMap = function (sheetContexts) {
-        var e_53, _a;
+        var e_58, _a;
         var map = new Map();
         try {
             for (var sheetContexts_5 = __values(sheetContexts), sheetContexts_5_1 = sheetContexts_5.next(); !sheetContexts_5_1.done; sheetContexts_5_1 = sheetContexts_5.next()) {
@@ -2687,12 +3059,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 this.registerSheetNameVariants(map, context.name, context.sheetId);
             }
         }
-        catch (e_53_1) { e_53 = { error: e_53_1 }; }
+        catch (e_58_1) { e_58 = { error: e_58_1 }; }
         finally {
             try {
                 if (sheetContexts_5_1 && !sheetContexts_5_1.done && (_a = sheetContexts_5.return)) _a.call(sheetContexts_5);
             }
-            finally { if (e_53) throw e_53.error; }
+            finally { if (e_58) throw e_58.error; }
         }
         return map;
     };
@@ -2718,7 +3090,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return normalized;
     };
     OdsPlugin.prototype.parseRangeList = function (addresses, sheetNameMap, context) {
-        var e_54, _a;
+        var e_59, _a;
         if (!addresses)
             return [];
         var segments = this.splitAddressSegments(addresses);
@@ -2732,12 +3104,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_54_1) { e_54 = { error: e_54_1 }; }
+        catch (e_59_1) { e_59 = { error: e_59_1 }; }
         finally {
             try {
                 if (segments_1_1 && !segments_1_1.done && (_a = segments_1.return)) _a.call(segments_1);
             }
-            finally { if (e_54) throw e_54.error; }
+            finally { if (e_59) throw e_59.error; }
         }
         return ranges;
     };
@@ -2878,7 +3250,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return Array.isArray(value) ? value : [value];
     };
     OdsPlugin.prototype.expandRowCells = function (rowChildren) {
-        var e_55, _a;
+        var e_60, _a;
         if (!rowChildren) {
             return [];
         }
@@ -2899,12 +3271,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_55_1) { e_55 = { error: e_55_1 }; }
+        catch (e_60_1) { e_60 = { error: e_60_1 }; }
         finally {
             try {
                 if (entries_2_1 && !entries_2_1.done && (_a = entries_2.return)) _a.call(entries_2);
             }
-            finally { if (e_55) throw e_55.error; }
+            finally { if (e_60) throw e_60.error; }
         }
         return normalized;
     };
@@ -2921,7 +3293,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return wrapper;
     };
     OdsPlugin.prototype.extractAttributesFromNode = function (node) {
-        var e_56, _a, _b;
+        var e_61, _a, _b;
         var attributes = {};
         var childNodes = [];
         if (node === undefined || node === null) {
@@ -2947,12 +3319,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                 childNodes.push((_b = {}, _b[key] = value, _b));
             }
         }
-        catch (e_56_1) { e_56 = { error: e_56_1 }; }
+        catch (e_61_1) { e_61 = { error: e_61_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_56) throw e_56.error; }
+            finally { if (e_61) throw e_61.error; }
         }
         return { attributes: attributes, childNodes: childNodes };
     };
@@ -3029,7 +3401,7 @@ var OdsPlugin = /** @class */ (function (_super) {
         return this.ensureSheetCache().namedRanges;
     };
     OdsPlugin.prototype.findCalculationSettings = function (node) {
-        var e_57, _a;
+        var e_62, _a;
         if (!node)
             return undefined;
         if (Array.isArray(node)) {
@@ -3041,12 +3413,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return found;
                 }
             }
-            catch (e_57_1) { e_57 = { error: e_57_1 }; }
+            catch (e_62_1) { e_62 = { error: e_62_1 }; }
             finally {
                 try {
                     if (node_2_1 && !node_2_1.done && (_a = node_2.return)) _a.call(node_2);
                 }
-                finally { if (e_57) throw e_57.error; }
+                finally { if (e_62) throw e_62.error; }
             }
             return undefined;
         }
@@ -3097,8 +3469,8 @@ var OdsPlugin = /** @class */ (function (_super) {
     };
     OdsPlugin.prototype.processSheetData = function () {
         return __asyncGenerator(this, arguments, function processSheetData_1(chunkSize, enableCellXfsRegistry, enableSharedStrings) {
-            var docContent, body, spreadsheet, tables, totalSheets, currentSheetIndex, tableWrapper, tableNameKey, tableChildren, tableAttrs, name_4, sheetId, tableStyleName, tableCellFormat, rows, columnWrappers, columnFormats, formattedColumnIndex, columnWrappers_1, columnWrappers_1_1, columnWrapper, columnAttrs, colsRepeated, columnStyleName, columnStyle, columnCellFormat, col, chunkIndex, currentChunk, currentChunkRowIndices, currentRowIndex, dvStamper, _a, rows_4, rows_4_1, rowWrapper, rowNameKey, rowChildren, rowAttrs, rowsRepeated, rowStyleName, rowStyle, rowCellFormat, rowBaseFormat, effectiveRepeats, r, rowData, columnIndex, normalizedRowChildren, normalizedRowChildren_3, normalizedRowChildren_3_1, cellWrapper, isCell, isCovered, cellNameKey, cellChildren, cellAttrs, colsRepeated, valueType, cellValue, displayValue, textFormatRuns, textPWrapper, textPKey, richText, hyperlinkValue, cellData, formula, isSharedString, excelFormula, matrixCols, matrixRows, cols, rows_5, start, end, cellStyleName, cellFormat, hasCellValue, c, targetColumnIndex, mergedFormat, alignment, needsDefaultRightAlign, displaySuggestsCurrency, currencySymbol, pattern, shouldInferNumberFormat, detectionSource, _b, detectedValueType, detectedNumberFormatType, detectedPattern, shouldOverrideExistingFormat, finalCellData, styleId, sheetSparklines, rowSparklines, _c, _d, _e, colIndex, sparkline, existingCell, sparklineData, sparklineOptions, cellData, isRowEmpty, e_58_1, _f, _g, trailing, e_59_1, error_1;
-            var e_60, _h, e_58, _j, e_61, _k, e_62, _l, e_59, _m;
+            var docContent, body, spreadsheet, tables, totalSheets, currentSheetIndex, tableWrapper, tableNameKey, tableChildren, tableAttrs, name_4, sheetId, tableStyleName, tableCellFormat, rows, columnWrappers, columnFormats, formattedColumnIndex, columnWrappers_1, columnWrappers_1_1, columnWrapper, columnAttrs, colsRepeated, columnStyleName, columnStyle, columnCellFormat, col, chunkIndex, currentChunk, currentChunkRowIndices, currentRowIndex, dvStamper, _a, rows_4, rows_4_1, rowWrapper, rowNameKey, rowChildren, rowAttrs, rowsRepeated, rowStyleName, rowStyle, rowCellFormat, rowBaseFormat, effectiveRepeats, r, rowData, columnIndex, normalizedRowChildren, normalizedRowChildren_3, normalizedRowChildren_3_1, cellWrapper, isCell, isCovered, cellNameKey, cellChildren, cellAttrs, colsRepeated, valueType, cellValue, displayValue, textFormatRuns, textPWrapper, textPKey, richText, hyperlinkValue, cellData, formula, isSharedString, excelFormula, matrixCols, matrixRows, cols, rows_5, start, end, cellStyleName, cellFormat, hasCellValue, c, targetColumnIndex, mergedFormat, alignment, needsDefaultRightAlign, displaySuggestsCurrency, currencySymbol, pattern, shouldInferNumberFormat, detectionSource, _b, detectedValueType, detectedNumberFormatType, detectedPattern, shouldOverrideExistingFormat, finalCellData, styleId, sheetSparklines, rowSparklines, _c, _d, _e, colIndex, sparkline, existingCell, sparklineData, sparklineOptions, cellData, isRowEmpty, e_63_1, _f, _g, trailing, e_64_1, error_1;
+            var e_65, _h, e_63, _j, e_66, _k, e_67, _l, e_64, _m;
             var _o, _p, _q, _r;
             if (chunkSize === void 0) { chunkSize = 100; }
             if (enableCellXfsRegistry === void 0) { enableCellXfsRegistry = false; }
@@ -3149,12 +3521,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                         tableCellFormat = tableStyleName
                             ? this.odsStyles.getTableCellFormat(tableStyleName)
                             : undefined;
-                        rows = tableChildren.filter(function (child) { return child["table:table-row"] || child["table-row"]; });
-                        columnWrappers = tableChildren.filter(function (child) { return child["table:table-column"] || child["table-column"]; });
+                        rows = flattenOrderedRows(tableChildren);
+                        columnWrappers = flattenOrderedColumns(tableChildren);
                         columnFormats = new Map();
                         formattedColumnIndex = 1;
                         try {
-                            for (columnWrappers_1 = (e_60 = void 0, __values(columnWrappers)), columnWrappers_1_1 = columnWrappers_1.next(); !columnWrappers_1_1.done; columnWrappers_1_1 = columnWrappers_1.next()) {
+                            for (columnWrappers_1 = (e_65 = void 0, __values(columnWrappers)), columnWrappers_1_1 = columnWrappers_1.next(); !columnWrappers_1_1.done; columnWrappers_1_1 = columnWrappers_1.next()) {
                                 columnWrapper = columnWrappers_1_1.value;
                                 columnAttrs = columnWrapper[":@"] || {};
                                 colsRepeated = parseInt(columnAttrs["@_table:number-columns-repeated"] ||
@@ -3173,12 +3545,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_60_1) { e_60 = { error: e_60_1 }; }
+                        catch (e_65_1) { e_65 = { error: e_65_1 }; }
                         finally {
                             try {
                                 if (columnWrappers_1_1 && !columnWrappers_1_1.done && (_h = columnWrappers_1.return)) _h.call(columnWrappers_1);
                             }
-                            finally { if (e_60) throw e_60.error; }
+                            finally { if (e_65) throw e_65.error; }
                         }
                         chunkIndex = 0;
                         currentChunk = [];
@@ -3191,7 +3563,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                         _s.label = 11;
                     case 11:
                         _s.trys.push([11, 19, 20, 21]);
-                        rows_4 = (e_58 = void 0, __values(rows)), rows_4_1 = rows_4.next();
+                        rows_4 = (e_63 = void 0, __values(rows)), rows_4_1 = rows_4.next();
                         _s.label = 12;
                     case 12:
                         if (!!rows_4_1.done) return [3 /*break*/, 18];
@@ -3224,7 +3596,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                             : null;
                         if (normalizedRowChildren) {
                             try {
-                                for (normalizedRowChildren_3 = (e_61 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_3_1 = normalizedRowChildren_3.next(); !normalizedRowChildren_3_1.done; normalizedRowChildren_3_1 = normalizedRowChildren_3.next()) {
+                                for (normalizedRowChildren_3 = (e_66 = void 0, __values(normalizedRowChildren)), normalizedRowChildren_3_1 = normalizedRowChildren_3.next(); !normalizedRowChildren_3_1.done; normalizedRowChildren_3_1 = normalizedRowChildren_3.next()) {
                                     cellWrapper = normalizedRowChildren_3_1.value;
                                     isCell = !!cellWrapper["table:table-cell"];
                                     isCovered = !!cellWrapper["table:covered-table-cell"];
@@ -3433,12 +3805,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                                     }
                                 }
                             }
-                            catch (e_61_1) { e_61 = { error: e_61_1 }; }
+                            catch (e_66_1) { e_66 = { error: e_66_1 }; }
                             finally {
                                 try {
                                     if (normalizedRowChildren_3_1 && !normalizedRowChildren_3_1.done && (_k = normalizedRowChildren_3.return)) _k.call(normalizedRowChildren_3);
                                 }
-                                finally { if (e_61) throw e_61.error; }
+                                finally { if (e_66) throw e_66.error; }
                             }
                         }
                         sheetSparklines = this.sparklinesBySheet.get(sheetId);
@@ -3446,7 +3818,7 @@ var OdsPlugin = /** @class */ (function (_super) {
                             rowSparklines = sheetSparklines.get(currentRowIndex);
                             if (rowSparklines) {
                                 try {
-                                    for (_c = (e_62 = void 0, __values(rowSparklines.entries())), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                    for (_c = (e_67 = void 0, __values(rowSparklines.entries())), _d = _c.next(); !_d.done; _d = _c.next()) {
                                         _e = __read(_d.value, 2), colIndex = _e[0], sparkline = _e[1];
                                         existingCell = rowData.values[colIndex];
                                         // Only set formula if cell doesn't already have one
@@ -3475,12 +3847,12 @@ var OdsPlugin = /** @class */ (function (_super) {
                                         rowData.values[colIndex] = cellData;
                                     }
                                 }
-                                catch (e_62_1) { e_62 = { error: e_62_1 }; }
+                                catch (e_67_1) { e_67 = { error: e_67_1 }; }
                                 finally {
                                     try {
                                         if (_d && !_d.done && (_l = _c.return)) _l.call(_c);
                                     }
-                                    finally { if (e_62) throw e_62.error; }
+                                    finally { if (e_67) throw e_67.error; }
                                 }
                                 // Clean up processed sparklines
                                 sheetSparklines.delete(currentRowIndex);
@@ -3529,18 +3901,18 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 12];
                     case 18: return [3 /*break*/, 21];
                     case 19:
-                        e_58_1 = _s.sent();
-                        e_58 = { error: e_58_1 };
+                        e_63_1 = _s.sent();
+                        e_63 = { error: e_63_1 };
                         return [3 /*break*/, 21];
                     case 20:
                         try {
                             if (rows_4_1 && !rows_4_1.done && (_j = rows_4.return)) _j.call(rows_4);
                         }
-                        finally { if (e_58) throw e_58.error; }
+                        finally { if (e_63) throw e_63.error; }
                         return [7 /*endfinally*/];
                     case 21:
                         _s.trys.push([21, 27, 28, 29]);
-                        _f = (e_59 = void 0, __values(dvStamper.trailingRows())), _g = _f.next();
+                        _f = (e_64 = void 0, __values(dvStamper.trailingRows())), _g = _f.next();
                         _s.label = 22;
                     case 22:
                         if (!!_g.done) return [3 /*break*/, 26];
@@ -3574,14 +3946,14 @@ var OdsPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 22];
                     case 26: return [3 /*break*/, 29];
                     case 27:
-                        e_59_1 = _s.sent();
-                        e_59 = { error: e_59_1 };
+                        e_64_1 = _s.sent();
+                        e_64 = { error: e_64_1 };
                         return [3 /*break*/, 29];
                     case 28:
                         try {
                             if (_g && !_g.done && (_m = _f.return)) _m.call(_f);
                         }
-                        finally { if (e_59) throw e_59.error; }
+                        finally { if (e_64) throw e_64.error; }
                         return [7 /*endfinally*/];
                     case 29:
                         if (!(currentChunk.length > 0)) return [3 /*break*/, 32];