@rowsncolumns/toolkit 24.4.2 → 24.4.4

package/dist/cjs/exporter/xlsx/xlsx-export.js

@@ -3,17 +3,21 @@ import { cellRangeToAddress, cellToAddress, escapeCharacters, getCellEffectiveFo
 import { zipSync } from "fflate";
 import { omitInvalidDataValidationError } from "../invalid-data-validation";
 import { buildAutoFilterConditionXml } from "../../autofilter-condition";
+import { buildControlElementXml, buildControlsXml, buildCtrlPropXml, buildFormControlVmlShape, buildVmlDrawingXml, CTRL_PROP_CONTENT_TYPE, CTRL_PROP_REL_TYPE, FORM_CONTROL_VML_SHAPETYPE, } from "./form-controls-builder";
+import { buildChartExGraphicFrameXml, buildChartExXml, CHART_EX_CONTENT_TYPE, CHART_EX_REL_TYPE, isChartExType, } from "./chartex-builder";
 import { applyPowerQueryParts } from "./power-query-builder";
+import { encodeImplicitIntersection } from "../../helpers/implicit-intersection";
 import { qualifyFutureFunctions } from "./future-functions";
 import { PERSON_CONTENT_TYPE, PERSON_REL_TYPE, PersonRegistry, THREADED_COMMENT_REL_TYPE, THREADED_COMMENTS_CONTENT_TYPE, ThreadedCommentsCollector, } from "./threaded-comments-builder";
 import { CFBEncryptor } from "../../excel-parser/cfb-encryptor";
 import { columnPixelToChars, imageUrlToBase64 } from "../../helpers";
+import { buildPrintAreaFormula, buildPrintTitlesFormula, isBuiltinPrintName, isHeaderFooterEmpty, PRINT_AREA_NAME, PRINT_TITLES_NAME, } from "../../print-settings";
 import { generateThemeXml } from "../../helpers/theme-xml-generator";
 import theme1Xml from "../../theme1";
 import { tokenize as defaultTokenizer } from "@rowsncolumns/calculator";
 import { CellXfsRegistry, deriveEffectiveNumberFormatFromFormula, } from "@rowsncolumns/spreadsheet-state";
 import { buildChartXml } from "./chart-builder";
-import { buildPivotCacheDefinitionXml, buildPivotTableRelsXml, buildPivotTableXml, } from "./pivot-builder";
+import { buildPivotCacheDefinitionXml, buildPivotTableRelsXml, buildPivotTableXml, calculatedFieldReferences, } from "./pivot-builder";
 import { buildSlicerCacheXml, buildSlicerXml } from "./slicer-builder";
 import { buildSparklineGroupsXml } from "./sparkline-builder";
 import { StyleBuilder } from "./style-builder";
@@ -27,12 +31,12 @@ var pixelToPoints = function (px) {
     return Math.max(1, Number(((px * 72) / 96).toFixed(2)));
 };
 export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var sortedSheets, sharedStrings, personRegistry, styleBuilder, exportableTables, tableIdMap, preparedTables, embedsBySheet, textBoxesBySheet, shapesBySheet, chartsBySheet, remappedSlicers, slicersBySheet, workbookSheetNames, sheetNameById, dataValidationsById, globalSlicerIndex, slicerCacheEntries, slicerEntries, globalPivotIndex, pivotCacheEntries, pivotCacheRelsEntries, pivotTableEntries, pivotTableRelsEntries, pivotsByTargetSheet, pivotTables_1, pivotTables_1_1, p, sid, list, workbookPivotCacheRefs, worksheetEntries, _d, workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, workbookXml, sharedStringsXml, rootRelationshipsXml, appXml, coreXml, stylesXml, themeXml, files, worksheetEntries_1, worksheetEntries_1_1, entry, personsXml, preparedTables_1, preparedTables_1_1, table, rows, tableXml, globalImageIndex, globalChartIndex, drawingSheets, imageExtensions, chartEntries, worksheetEntries_2, worksheetEntries_2_1, entry, placements, textBoxesForSheet, shapesForSheet, chartsForSheet, slicersForSheet, drawingParts, _e, _f, media, _g, _h, chartEntry, e_1_1, chartEntries_1, chartEntries_1_1, chartEntry, slicerCacheEntries_1, slicerCacheEntries_1_1, slicerCacheEntry, slicerEntries_1, slicerEntries_1_1, slicerEntry, pivotCacheEntries_1, pivotCacheEntries_1_1, cacheEntry, pivotCacheRelsEntries_1, pivotCacheRelsEntries_1_1, cacheRels, pivotTableEntries_1, pivotTableEntries_1_1, tableEntry, pivotTableRelsEntries_1, pivotTableRelsEntries_1_1, tableRels, i, link, linkPath, relsPath, commentsSheets, threadedCommentsSheets, contentTypesXml, zipBytes;
-    var e_2, _j, e_3, _k, e_4, _l, e_1, _m, e_5, _o, e_6, _p, e_7, _q, e_8, _s, e_9, _t, e_10, _u, e_11, _v, e_12, _w, e_13, _x;
-    var _y, _z, _0, _1, _2, _3;
-    var _conditionalFormats = _b.conditionalFormats, _dataValidations = _b.dataValidations, sheets = _b.sheets, sheetData = _b.sheetData, sourceSharedStrings = _b.sharedStrings, _4 = _b.tables, _tables = _4 === void 0 ? [] : _4, cellXfs = _b.cellXfs, theme = _b.theme, defaultFont = _b.defaultFont, _5 = _b.embeds, embeds = _5 === void 0 ? [] : _5, _6 = _b.charts, charts = _6 === void 0 ? [] : _6, _7 = _b.slicers, slicers = _7 === void 0 ? [] : _7, _8 = _b.pivotTables, pivotTables = _8 === void 0 ? [] : _8, _9 = _b.externalLinks, externalLinks = _9 === void 0 ? [] : _9, _10 = _b.namedRanges, namedRanges = _10 === void 0 ? [] : _10, namedCellStyles = _b.namedCellStyles, customTableStyles = _b.customTableStyles, iterativeCalculationOptions = _b.iterativeCalculationOptions, ignoreFormulaPatterns = _b.ignoreFormulaPatterns, citations = _b.citations, comments = _b.comments, password = _b.password, locale = _b.locale, _11 = _b.use1904, use1904 = _11 === void 0 ? false : _11, properties = _b.properties, powerQuery = _b.powerQuery;
-    return __generator(this, function (_12) {
-        switch (_12.label) {
+    var sortedSheets, sharedStrings, personRegistry, styleBuilder, exportableTables, tableIdMap, preparedTables, embedsBySheet, textBoxesBySheet, shapesBySheet, formControlsBySheet, ctrlProps, chartsBySheet, remappedSlicers, slicersBySheet, workbookSheetNames, sheetNameById, dataValidationsById, globalSlicerIndex, slicerCacheEntries, slicerEntries, globalPivotIndex, pivotCacheEntries, pivotCacheRelsEntries, pivotTableEntries, pivotTableRelsEntries, pivotsByTargetSheet, pivotTables_1, pivotTables_1_1, p, sid, list, workbookPivotCacheRefs, worksheetEntries, _d, workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, workbookXml, sharedStringsXml, rootRelationshipsXml, appXml, coreXml, stylesXml, themeXml, files, worksheetEntries_1, worksheetEntries_1_1, entry, personsXml, preparedTables_1, preparedTables_1_1, table, rows, tableXml, globalImageIndex, globalChartIndex, drawingSheets, imageExtensions, chartEntries, chartExEntries, globalChartExIndex, worksheetEntries_2, worksheetEntries_2_1, entry, placements, textBoxesForSheet, shapesForSheet, chartsForSheet, slicersForSheet, drawingParts, _e, _f, media, _g, _h, chartEntry, _j, _k, chartExEntry, e_1_1, chartEntries_1, chartEntries_1_1, chartEntry, chartExEntries_1, chartExEntries_1_1, chartExEntry, slicerCacheEntries_1, slicerCacheEntries_1_1, slicerCacheEntry, slicerEntries_1, slicerEntries_1_1, slicerEntry, pivotCacheEntries_1, pivotCacheEntries_1_1, cacheEntry, pivotCacheRelsEntries_1, pivotCacheRelsEntries_1_1, cacheRels, pivotTableEntries_1, pivotTableEntries_1_1, tableEntry, pivotTableRelsEntries_1, pivotTableRelsEntries_1_1, tableRels, i, link, linkPath, relsPath, commentsSheets, hasVmlDrawings, _l, _m, part, threadedCommentsSheets, contentTypesXml, zipBytes;
+    var e_2, _o, e_3, _p, e_4, _q, e_1, _s, e_5, _t, e_6, _u, e_7, _v, e_8, _w, e_9, _x, e_10, _y, e_11, _z, e_12, _0, e_13, _1, e_14, _2, e_15, _3, e_16, _4;
+    var _5, _6, _7, _8, _9, _10;
+    var _conditionalFormats = _b.conditionalFormats, _dataValidations = _b.dataValidations, sheets = _b.sheets, sheetData = _b.sheetData, sourceSharedStrings = _b.sharedStrings, _11 = _b.tables, _tables = _11 === void 0 ? [] : _11, cellXfs = _b.cellXfs, theme = _b.theme, defaultFont = _b.defaultFont, _12 = _b.embeds, embeds = _12 === void 0 ? [] : _12, _13 = _b.charts, charts = _13 === void 0 ? [] : _13, _14 = _b.slicers, slicers = _14 === void 0 ? [] : _14, _15 = _b.pivotTables, pivotTables = _15 === void 0 ? [] : _15, _16 = _b.externalLinks, externalLinks = _16 === void 0 ? [] : _16, _17 = _b.namedRanges, namedRanges = _17 === void 0 ? [] : _17, _18 = _b.protectedRanges, protectedRanges = _18 === void 0 ? [] : _18, namedCellStyles = _b.namedCellStyles, customTableStyles = _b.customTableStyles, iterativeCalculationOptions = _b.iterativeCalculationOptions, ignoreFormulaPatterns = _b.ignoreFormulaPatterns, citations = _b.citations, comments = _b.comments, password = _b.password, locale = _b.locale, _19 = _b.use1904, use1904 = _19 === void 0 ? false : _19, properties = _b.properties, powerQuery = _b.powerQuery;
+    return __generator(this, function (_20) {
+        switch (_20.label) {
             case 0:
                 sortedSheets = sortSheetsByIndex(sheets, true);
                 sharedStrings = new SharedStrings();
@@ -57,6 +61,8 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 embedsBySheet = groupEmbedsBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
                 textBoxesBySheet = groupTextBoxesBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
                 shapesBySheet = groupShapesBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
+                formControlsBySheet = groupFormControlsBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
+                ctrlProps = { parts: [] };
                 chartsBySheet = groupChartsBySheet(charts !== null && charts !== void 0 ? charts : []);
                 remappedSlicers = slicers.map(function (slicer) {
                     if (slicer.spec.type !== "table")
@@ -74,10 +80,10 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     var _a;
                     sheetNameById.set((_a = sheet.sheetId) !== null && _a !== void 0 ? _a : index + 1, workbookSheetNames[index]);
                 });
-                dataValidationsById = (_y = _dataValidations === null || _dataValidations === void 0 ? void 0 : _dataValidations.reduce(function (acc, rule) {
+                dataValidationsById = (_5 = _dataValidations === null || _dataValidations === void 0 ? void 0 : _dataValidations.reduce(function (acc, rule) {
                     acc[rule.id] = rule;
                     return acc;
-                }, {})) !== null && _y !== void 0 ? _y : undefined;
+                }, {})) !== null && _5 !== void 0 ? _5 : undefined;
                 globalSlicerIndex = 1;
                 slicerCacheEntries = [];
                 slicerEntries = [];
@@ -90,7 +96,7 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 try {
                     for (pivotTables_1 = __values(pivotTables), pivotTables_1_1 = pivotTables_1.next(); !pivotTables_1_1.done; pivotTables_1_1 = pivotTables_1.next()) {
                         p = pivotTables_1_1.value;
-                        sid = (_z = p.targetPosition) === null || _z === void 0 ? void 0 : _z.sheetId;
+                        sid = (_6 = p.targetPosition) === null || _6 === void 0 ? void 0 : _6.sheetId;
                         if (sid == null)
                             continue;
                         list = pivotsByTargetSheet.get(sid);
@@ -103,22 +109,23 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (pivotTables_1_1 && !pivotTables_1_1.done && (_j = pivotTables_1.return)) _j.call(pivotTables_1);
+                        if (pivotTables_1_1 && !pivotTables_1_1.done && (_o = pivotTables_1.return)) _o.call(pivotTables_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
                 workbookPivotCacheRefs = [];
                 worksheetEntries = sortedSheets.map(function (sheet, index) {
-                    var e_14, _a, e_15, _b;
-                    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+                    var e_17, _a, e_18, _b;
+                    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _s, _t, _u;
                     var rows = getRowsForSheet(sheetData, sheet.sheetId);
                     var sheetRelationships = new RelationshipsBuilder();
                     var sheetTables = preparedTables.filter(function (table) { return table.sheetId === sheet.sheetId; });
                     var embedImages = (_d = embedsBySheet.get(sheet.sheetId)) !== null && _d !== void 0 ? _d : [];
                     var textBoxes = (_e = textBoxesBySheet.get(sheet.sheetId)) !== null && _e !== void 0 ? _e : [];
                     var sheetShapes = (_f = shapesBySheet.get(sheet.sheetId)) !== null && _f !== void 0 ? _f : [];
-                    var sheetCharts = (_g = chartsBySheet.get(sheet.sheetId)) !== null && _g !== void 0 ? _g : [];
-                    var sheetSlicers = (_h = slicersBySheet.get(sheet.sheetId)) !== null && _h !== void 0 ? _h : [];
+                    var sheetFormControls = (_g = formControlsBySheet.get(sheet.sheetId)) !== null && _g !== void 0 ? _g : [];
+                    var sheetCharts = (_h = chartsBySheet.get(sheet.sheetId)) !== null && _h !== void 0 ? _h : [];
+                    var sheetSlicers = (_j = slicersBySheet.get(sheet.sheetId)) !== null && _j !== void 0 ? _j : [];
                     var worksheetSlicerRelIds = [];
                     var drawingSlicers = [];
                     var sheetConditionalFormats = (_conditionalFormats !== null && _conditionalFormats !== void 0 ? _conditionalFormats : []).filter(function (rule) { var _a; return (_a = rule.ranges) === null || _a === void 0 ? void 0 : _a.some(function (range) { return range.sheetId === sheet.sheetId; }); });
@@ -166,24 +173,24 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                             }
                         }
                     }
-                    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
                     finally {
                         try {
                             if (sheetSlicers_1_1 && !sheetSlicers_1_1.done && (_a = sheetSlicers_1.return)) _a.call(sheetSlicers_1);
                         }
-                        finally { if (e_14) throw e_14.error; }
+                        finally { if (e_17) throw e_17.error; }
                     }
                     // Phase D2 — emit pivot table XMLs + relationships for this
                     // sheet. PivotTable lives on the rendering sheet; its cache
                     // definition is workbook-scoped (added to <pivotCaches> after
                     // this loop).
-                    var sheetPivots = (_j = pivotsByTargetSheet.get(sheet.sheetId)) !== null && _j !== void 0 ? _j : [];
+                    var sheetPivots = (_k = pivotsByTargetSheet.get(sheet.sheetId)) !== null && _k !== void 0 ? _k : [];
                     var _loop_1 = function (pivot) {
-                        var e_16, _q, e_17, _s, e_18, _t;
+                        var e_19, _v, e_20, _w, e_21, _x, e_22, _y, e_23, _z, e_24, _0;
                         var cacheIndex = globalPivotIndex;
                         var tableIndex = globalPivotIndex;
                         var sourceSheet = sortedSheets.find(function (s) { var _a; return s.sheetId === ((_a = pivot.source) === null || _a === void 0 ? void 0 : _a.sheetId); });
-                        var sourceSheetName = (_l = (_k = sourceSheet === null || sourceSheet === void 0 ? void 0 : sourceSheet.title) !== null && _k !== void 0 ? _k : sheet.title) !== null && _l !== void 0 ? _l : "Sheet".concat(sheet.sheetId);
+                        var sourceSheetName = (_m = (_l = sourceSheet === null || sourceSheet === void 0 ? void 0 : sourceSheet.title) !== null && _l !== void 0 ? _l : sheet.title) !== null && _m !== void 0 ? _m : "Sheet".concat(sheet.sheetId);
                         // Field universe: union of every field referenced by the
                         // pivot. PivotCacheDefinition requires one <cacheField>
                         // entry per field, and pivotTable.fld indices reference them.
@@ -195,44 +202,88 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                             fieldIndex.set(name, fieldNameList.length);
                             fieldNameList.push(name);
                         };
+                        var calculatedNames = new Set(((_o = pivot.calculatedFields) !== null && _o !== void 0 ? _o : []).map(function (c) { return c.name; }));
                         try {
-                            for (var _u = (e_16 = void 0, __values((_m = pivot.rows) !== null && _m !== void 0 ? _m : [])), _v = _u.next(); !_v.done; _v = _u.next()) {
-                                var r = _v.value;
+                            for (var _1 = (e_19 = void 0, __values((_p = pivot.rows) !== null && _p !== void 0 ? _p : [])), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+                                var r = _2.value;
                                 registerField(r.field);
                             }
                         }
-                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
                         finally {
                             try {
-                                if (_v && !_v.done && (_q = _u.return)) _q.call(_u);
+                                if (_2 && !_2.done && (_v = _1.return)) _v.call(_1);
                             }
-                            finally { if (e_16) throw e_16.error; }
+                            finally { if (e_19) throw e_19.error; }
                         }
                         try {
-                            for (var _w = (e_17 = void 0, __values((_o = pivot.columns) !== null && _o !== void 0 ? _o : [])), _x = _w.next(); !_x.done; _x = _w.next()) {
-                                var c = _x.value;
+                            for (var _3 = (e_20 = void 0, __values((_q = pivot.columns) !== null && _q !== void 0 ? _q : [])), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                                var c = _4.value;
                                 registerField(c.field);
                             }
                         }
-                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
                         finally {
                             try {
-                                if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
+                                if (_4 && !_4.done && (_w = _3.return)) _w.call(_3);
                             }
-                            finally { if (e_17) throw e_17.error; }
+                            finally { if (e_20) throw e_20.error; }
                         }
                         try {
-                            for (var _y = (e_18 = void 0, __values((_p = pivot.values) !== null && _p !== void 0 ? _p : [])), _z = _y.next(); !_z.done; _z = _y.next()) {
-                                var v = _z.value;
-                                registerField(v.field);
+                            for (var _5 = (e_21 = void 0, __values((_s = pivot.values) !== null && _s !== void 0 ? _s : [])), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+                                var v = _6.value;
+                                if (!calculatedNames.has(v.field))
+                                    registerField(v.field);
                             }
                         }
-                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                        catch (e_21_1) { e_21 = { error: e_21_1 }; }
                         finally {
                             try {
-                                if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
+                                if (_6 && !_6.done && (_x = _5.return)) _x.call(_5);
                             }
-                            finally { if (e_18) throw e_18.error; }
+                            finally { if (e_21) throw e_21.error; }
+                        }
+                        try {
+                            // Source fields a calculated field reads must exist in the cache
+                            // for Excel to evaluate the formula; the calculated fields
+                            // themselves come last, as Excel orders them.
+                            for (var _7 = (e_22 = void 0, __values((_t = pivot.calculatedFields) !== null && _t !== void 0 ? _t : [])), _8 = _7.next(); !_8.done; _8 = _7.next()) {
+                                var c = _8.value;
+                                try {
+                                    for (var _9 = (e_23 = void 0, __values(calculatedFieldReferences(c.formula))), _10 = _9.next(); !_10.done; _10 = _9.next()) {
+                                        var ref = _10.value;
+                                        if (!calculatedNames.has(ref))
+                                            registerField(ref);
+                                    }
+                                }
+                                catch (e_23_1) { e_23 = { error: e_23_1 }; }
+                                finally {
+                                    try {
+                                        if (_10 && !_10.done && (_z = _9.return)) _z.call(_9);
+                                    }
+                                    finally { if (e_23) throw e_23.error; }
+                                }
+                            }
+                        }
+                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                        finally {
+                            try {
+                                if (_8 && !_8.done && (_y = _7.return)) _y.call(_7);
+                            }
+                            finally { if (e_22) throw e_22.error; }
+                        }
+                        try {
+                            for (var _11 = (e_24 = void 0, __values((_u = pivot.calculatedFields) !== null && _u !== void 0 ? _u : [])), _12 = _11.next(); !_12.done; _12 = _11.next()) {
+                                var c = _12.value;
+                                registerField(c.name);
+                            }
+                        }
+                        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+                        finally {
+                            try {
+                                if (_12 && !_12.done && (_0 = _11.return)) _0.call(_11);
+                            }
+                            finally { if (e_24) throw e_24.error; }
                         }
                         var cacheXml = buildPivotCacheDefinitionXml(pivot, sourceSheetName, fieldNameList);
                         var tableXml = buildPivotTableXml(pivot, cacheIndex, fieldIndex);
@@ -263,12 +314,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                             _loop_1(pivot);
                         }
                     }
-                    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                    catch (e_18_1) { e_18 = { error: e_18_1 }; }
                     finally {
                         try {
                             if (sheetPivots_1_1 && !sheetPivots_1_1.done && (_b = sheetPivots_1.return)) _b.call(sheetPivots_1);
                         }
-                        finally { if (e_15) throw e_15.error; }
+                        finally { if (e_18) throw e_18.error; }
                     }
                     var result = buildWorksheetXml({
                         sheet: sheet,
@@ -291,6 +342,9 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         sheetData: sheetData,
                         sheets: sortedSheets,
                         locale: locale,
+                        protectedRanges: protectedRanges,
+                        formControls: sheetFormControls,
+                        ctrlProps: ctrlProps,
                     });
                     return {
                         index: index,
@@ -352,7 +406,7 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (worksheetEntries_1_1 && !worksheetEntries_1_1.done && (_k = worksheetEntries_1.return)) _k.call(worksheetEntries_1);
+                        if (worksheetEntries_1_1 && !worksheetEntries_1_1.done && (_p = worksheetEntries_1.return)) _p.call(worksheetEntries_1);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
@@ -373,7 +427,7 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
-                        if (preparedTables_1_1 && !preparedTables_1_1.done && (_l = preparedTables_1.return)) _l.call(preparedTables_1);
+                        if (preparedTables_1_1 && !preparedTables_1_1.done && (_q = preparedTables_1.return)) _q.call(preparedTables_1);
                     }
                     finally { if (e_4) throw e_4.error; }
                 }
@@ -382,19 +436,21 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 drawingSheets = [];
                 imageExtensions = new Set();
                 chartEntries = [];
-                _12.label = 1;
+                chartExEntries = [];
+                globalChartExIndex = 1;
+                _20.label = 1;
             case 1:
-                _12.trys.push([1, 6, 7, 8]);
+                _20.trys.push([1, 6, 7, 8]);
                 worksheetEntries_2 = __values(worksheetEntries), worksheetEntries_2_1 = worksheetEntries_2.next();
-                _12.label = 2;
+                _20.label = 2;
             case 2:
                 if (!!worksheetEntries_2_1.done) return [3 /*break*/, 5];
                 entry = worksheetEntries_2_1.value;
                 placements = __spreadArray(__spreadArray([], __read(entry.cellImages), false), __read(entry.embedImages), false);
-                textBoxesForSheet = (_0 = entry.textBoxes) !== null && _0 !== void 0 ? _0 : [];
-                shapesForSheet = (_1 = entry.shapes) !== null && _1 !== void 0 ? _1 : [];
-                chartsForSheet = (_2 = entry.charts) !== null && _2 !== void 0 ? _2 : [];
-                slicersForSheet = (_3 = entry.slicers) !== null && _3 !== void 0 ? _3 : [];
+                textBoxesForSheet = (_7 = entry.textBoxes) !== null && _7 !== void 0 ? _7 : [];
+                shapesForSheet = (_8 = entry.shapes) !== null && _8 !== void 0 ? _8 : [];
+                chartsForSheet = (_9 = entry.charts) !== null && _9 !== void 0 ? _9 : [];
+                slicersForSheet = (_10 = entry.slicers) !== null && _10 !== void 0 ? _10 : [];
                 if (!placements.length &&
                     !textBoxesForSheet.length &&
                     !shapesForSheet.length &&
@@ -408,12 +464,13 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         shapes: shapesForSheet,
                         startImageIndex: globalImageIndex,
                         startChartIndex: globalChartIndex,
+                        startChartExIndex: globalChartExIndex,
                         charts: chartsForSheet,
                         slicers: slicersForSheet,
                         sheetNameById: sheetNameById,
                     })];
             case 3:
-                drawingParts = _12.sent();
+                drawingParts = _20.sent();
                 if (!drawingParts)
                     return [3 /*break*/, 4];
                 files[entry.drawingPath] = encodeXml(drawingParts.xml);
@@ -430,7 +487,7 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
-                        if (_f && !_f.done && (_o = _e.return)) _o.call(_e);
+                        if (_f && !_f.done && (_t = _e.return)) _t.call(_e);
                     }
                     finally { if (e_5) throw e_5.error; }
                 }
@@ -443,25 +500,39 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_p = _g.return)) _p.call(_g);
+                        if (_h && !_h.done && (_u = _g.return)) _u.call(_g);
                     }
                     finally { if (e_6) throw e_6.error; }
                 }
+                try {
+                    for (_j = (e_7 = void 0, __values(drawingParts.chartExs)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        chartExEntry = _k.value;
+                        chartExEntries.push(chartExEntry);
+                    }
+                }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                finally {
+                    try {
+                        if (_k && !_k.done && (_v = _j.return)) _v.call(_j);
+                    }
+                    finally { if (e_7) throw e_7.error; }
+                }
                 globalImageIndex = drawingParts.nextImageIndex;
                 globalChartIndex = drawingParts.nextChartIndex;
+                globalChartExIndex = drawingParts.nextChartExIndex;
                 drawingSheets.push(entry.index + 1);
-                _12.label = 4;
+                _20.label = 4;
             case 4:
                 worksheetEntries_2_1 = worksheetEntries_2.next();
                 return [3 /*break*/, 2];
             case 5: return [3 /*break*/, 8];
             case 6:
-                e_1_1 = _12.sent();
+                e_1_1 = _20.sent();
                 e_1 = { error: e_1_1 };
                 return [3 /*break*/, 8];
             case 7:
                 try {
-                    if (worksheetEntries_2_1 && !worksheetEntries_2_1.done && (_m = worksheetEntries_2.return)) _m.call(worksheetEntries_2);
+                    if (worksheetEntries_2_1 && !worksheetEntries_2_1.done && (_s = worksheetEntries_2.return)) _s.call(worksheetEntries_2);
                 }
                 finally { if (e_1) throw e_1.error; }
                 return [7 /*endfinally*/];
@@ -472,12 +543,25 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[chartEntry.path] = encodeXml(chartEntry.xml);
                     }
                 }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
                 finally {
                     try {
-                        if (chartEntries_1_1 && !chartEntries_1_1.done && (_q = chartEntries_1.return)) _q.call(chartEntries_1);
+                        if (chartEntries_1_1 && !chartEntries_1_1.done && (_w = chartEntries_1.return)) _w.call(chartEntries_1);
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    finally { if (e_8) throw e_8.error; }
+                }
+                try {
+                    for (chartExEntries_1 = __values(chartExEntries), chartExEntries_1_1 = chartExEntries_1.next(); !chartExEntries_1_1.done; chartExEntries_1_1 = chartExEntries_1.next()) {
+                        chartExEntry = chartExEntries_1_1.value;
+                        files[chartExEntry.path] = encodeXml(chartExEntry.xml);
+                    }
+                }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                finally {
+                    try {
+                        if (chartExEntries_1_1 && !chartExEntries_1_1.done && (_x = chartExEntries_1.return)) _x.call(chartExEntries_1);
+                    }
+                    finally { if (e_9) throw e_9.error; }
                 }
                 try {
                     for (slicerCacheEntries_1 = __values(slicerCacheEntries), slicerCacheEntries_1_1 = slicerCacheEntries_1.next(); !slicerCacheEntries_1_1.done; slicerCacheEntries_1_1 = slicerCacheEntries_1.next()) {
@@ -485,12 +569,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[slicerCacheEntry.path] = encodeXml(slicerCacheEntry.xml);
                     }
                 }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
                 finally {
                     try {
-                        if (slicerCacheEntries_1_1 && !slicerCacheEntries_1_1.done && (_s = slicerCacheEntries_1.return)) _s.call(slicerCacheEntries_1);
+                        if (slicerCacheEntries_1_1 && !slicerCacheEntries_1_1.done && (_y = slicerCacheEntries_1.return)) _y.call(slicerCacheEntries_1);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_10) throw e_10.error; }
                 }
                 try {
                     for (slicerEntries_1 = __values(slicerEntries), slicerEntries_1_1 = slicerEntries_1.next(); !slicerEntries_1_1.done; slicerEntries_1_1 = slicerEntries_1.next()) {
@@ -498,12 +582,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[slicerEntry.path] = encodeXml(slicerEntry.xml);
                     }
                 }
-                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
-                        if (slicerEntries_1_1 && !slicerEntries_1_1.done && (_t = slicerEntries_1.return)) _t.call(slicerEntries_1);
+                        if (slicerEntries_1_1 && !slicerEntries_1_1.done && (_z = slicerEntries_1.return)) _z.call(slicerEntries_1);
                     }
-                    finally { if (e_9) throw e_9.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
                 try {
                     // Phase D2 — emit pivot files.
@@ -512,12 +596,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[cacheEntry.path] = encodeXml(cacheEntry.xml);
                     }
                 }
-                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
                 finally {
                     try {
-                        if (pivotCacheEntries_1_1 && !pivotCacheEntries_1_1.done && (_u = pivotCacheEntries_1.return)) _u.call(pivotCacheEntries_1);
+                        if (pivotCacheEntries_1_1 && !pivotCacheEntries_1_1.done && (_0 = pivotCacheEntries_1.return)) _0.call(pivotCacheEntries_1);
                     }
-                    finally { if (e_10) throw e_10.error; }
+                    finally { if (e_12) throw e_12.error; }
                 }
                 try {
                     for (pivotCacheRelsEntries_1 = __values(pivotCacheRelsEntries), pivotCacheRelsEntries_1_1 = pivotCacheRelsEntries_1.next(); !pivotCacheRelsEntries_1_1.done; pivotCacheRelsEntries_1_1 = pivotCacheRelsEntries_1.next()) {
@@ -525,12 +609,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[cacheRels.path] = encodeXml(cacheRels.xml);
                     }
                 }
-                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                catch (e_13_1) { e_13 = { error: e_13_1 }; }
                 finally {
                     try {
-                        if (pivotCacheRelsEntries_1_1 && !pivotCacheRelsEntries_1_1.done && (_v = pivotCacheRelsEntries_1.return)) _v.call(pivotCacheRelsEntries_1);
+                        if (pivotCacheRelsEntries_1_1 && !pivotCacheRelsEntries_1_1.done && (_1 = pivotCacheRelsEntries_1.return)) _1.call(pivotCacheRelsEntries_1);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_13) throw e_13.error; }
                 }
                 try {
                     for (pivotTableEntries_1 = __values(pivotTableEntries), pivotTableEntries_1_1 = pivotTableEntries_1.next(); !pivotTableEntries_1_1.done; pivotTableEntries_1_1 = pivotTableEntries_1.next()) {
@@ -538,12 +622,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[tableEntry.path] = encodeXml(tableEntry.xml);
                     }
                 }
-                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                catch (e_14_1) { e_14 = { error: e_14_1 }; }
                 finally {
                     try {
-                        if (pivotTableEntries_1_1 && !pivotTableEntries_1_1.done && (_w = pivotTableEntries_1.return)) _w.call(pivotTableEntries_1);
+                        if (pivotTableEntries_1_1 && !pivotTableEntries_1_1.done && (_2 = pivotTableEntries_1.return)) _2.call(pivotTableEntries_1);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_14) throw e_14.error; }
                 }
                 try {
                     for (pivotTableRelsEntries_1 = __values(pivotTableRelsEntries), pivotTableRelsEntries_1_1 = pivotTableRelsEntries_1.next(); !pivotTableRelsEntries_1_1.done; pivotTableRelsEntries_1_1 = pivotTableRelsEntries_1.next()) {
@@ -551,12 +635,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[tableRels.path] = encodeXml(tableRels.xml);
                     }
                 }
-                catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                catch (e_15_1) { e_15 = { error: e_15_1 }; }
                 finally {
                     try {
-                        if (pivotTableRelsEntries_1_1 && !pivotTableRelsEntries_1_1.done && (_x = pivotTableRelsEntries_1.return)) _x.call(pivotTableRelsEntries_1);
+                        if (pivotTableRelsEntries_1_1 && !pivotTableRelsEntries_1_1.done && (_3 = pivotTableRelsEntries_1.return)) _3.call(pivotTableRelsEntries_1);
                     }
-                    finally { if (e_13) throw e_13.error; }
+                    finally { if (e_15) throw e_15.error; }
                 }
                 // Add external link files (for formulas referencing other workbooks)
                 for (i = 0; i < externalLinks.length; i++) {
@@ -572,6 +656,20 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 commentsSheets = worksheetEntries
                     .filter(function (entry) { return entry.commentsXml; })
                     .map(function (entry) { var _a; return (_a = entry.sheet.sheetId) !== null && _a !== void 0 ? _a : entry.index + 1; });
+                hasVmlDrawings = worksheetEntries.some(function (entry) { return entry.vmlDrawingXml; });
+                try {
+                    for (_l = __values(ctrlProps.parts), _m = _l.next(); !_m.done; _m = _l.next()) {
+                        part = _m.value;
+                        files[part.path] = encodeXml(part.xml);
+                    }
+                }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                finally {
+                    try {
+                        if (_m && !_m.done && (_4 = _l.return)) _4.call(_l);
+                    }
+                    finally { if (e_16) throw e_16.error; }
+                }
                 threadedCommentsSheets = worksheetEntries
                     .filter(function (entry) { return entry.threadedCommentsXml; })
                     .map(function (entry) { var _a; return (_a = entry.sheet.sheetId) !== null && _a !== void 0 ? _a : entry.index + 1; });
@@ -581,6 +679,7 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     drawingSheets: drawingSheets,
                     mediaExtensions: Array.from(imageExtensions),
                     chartCount: chartEntries.length,
+                    chartExCount: chartExEntries.length,
                     slicerCount: slicerEntries.length,
                     slicerCacheCount: slicerCacheEntries.length,
                     pivotTableCount: pivotTableEntries.length,
@@ -589,6 +688,8 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     threadedCommentsSheets: threadedCommentsSheets,
                     hasPersons: !personRegistry.isEmpty(),
                     externalLinkCount: externalLinks.length,
+                    hasVmlDrawings: hasVmlDrawings,
+                    ctrlPropCount: ctrlProps.parts.length,
                 });
                 files["[Content_Types].xml"] = encodeXml(contentTypesXml);
                 // Preserved Power Query machinery (DataMashup customXml, connections.xml, queryTable parts) is
@@ -756,6 +857,8 @@ var DataValidationCollector = /** @class */ (function () {
     };
     return DataValidationCollector;
 }());
+/** First VML shape id the note shapes take (`_x0000_s1026`, `_x0000_s1027`, …). */
+var NOTE_VML_SHAPE_ID_BASE = 1026;
 var CommentsCollector = /** @class */ (function () {
     function CommentsCollector() {
         this.entries = [];
@@ -783,13 +886,18 @@ var CommentsCollector = /** @class */ (function () {
             .join("");
         return "".concat(XML_DECLARATION, "<comments xmlns=\"").concat(WORKSHEET_NS, "\"><authors>").concat(authorsXml, "</authors><commentList>").concat(commentsXml, "</commentList></comments>");
     };
-    CommentsCollector.prototype.toVmlXml = function () {
-        if (!this.entries.length) {
-            return undefined;
-        }
-        var shapes = this.entries
-            .map(function (entry, index) {
-            var shapeId = "_x0000_s".concat(1026 + index);
+    /**
+     * VML shape ids the note shapes occupy. Excel allocates notes and form
+     * controls from one per-sheet counter, so the form-control allocator must
+     * never hand these out again.
+     */
+    CommentsCollector.prototype.vmlShapeIds = function () {
+        return this.entries.map(function (_, index) { return NOTE_VML_SHAPE_ID_BASE + index; });
+    };
+    /** One `<v:shape>` per note (Excel's hidden `Note` object). */
+    CommentsCollector.prototype.toVmlShapes = function () {
+        return this.entries.map(function (entry, index) {
+            var shapeId = "_x0000_s".concat(NOTE_VML_SHAPE_ID_BASE + index);
             // Parse cell address to get row and column
             var match = entry.address.match(/^([A-Z]+)(\d+)$/);
             if (!match)
@@ -800,12 +908,12 @@ var CommentsCollector = /** @class */ (function () {
                 .split("")
                 .reduce(function (acc, char) { return acc * 26 + (char.charCodeAt(0) - 64); }, 0) - 1;
             return "<v:shape id=\"".concat(shapeId, "\" type=\"#_x0000_t202\" style='position:absolute;margin-left:59.25pt;margin-top:1.5pt;width:108pt;height:59.25pt;z-index:").concat(index + 1, ";visibility:hidden' fillcolor=\"#ffffe1\" o:insetmode=\"auto\"><v:fill color2=\"#ffffe1\"/><v:shadow on=\"t\" color=\"black\" obscured=\"t\"/><v:path o:connecttype=\"none\"/><v:textbox style='mso-direction-alt:auto'><div style='text-align:left'></div></v:textbox><x:ClientData ObjectType=\"Note\"><x:MoveWithCells/><x:SizeWithCells/><x:Anchor>1, 15, 0, 2, 3, 15, 3, 16</x:Anchor><x:AutoFill>False</x:AutoFill><x:Row>").concat(row - 1, "</x:Row><x:Column>").concat(colIndex, "</x:Column></x:ClientData></v:shape>");
-        })
-            .join("");
-        return "<xml xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\"><o:shapelayout v:ext=\"edit\"><o:idmap v:ext=\"edit\" data=\"1\"/></o:shapelayout><v:shapetype id=\"_x0000_t202\" coordsize=\"21600,21600\" o:spt=\"202\" path=\"m,l,21600r21600,l21600,xe\"><v:stroke joinstyle=\"miter\"/><v:path gradientshapeok=\"t\" o:connecttype=\"rect\"/></v:shapetype>".concat(shapes, "</xml>");
+        }).filter(Boolean);
     };
     return CommentsCollector;
 }());
+/** VML `<v:shapetype>` for legacy notes (`#_x0000_t202`). */
+var NOTE_VML_SHAPETYPE = "<v:shapetype id=\"_x0000_t202\" coordsize=\"21600,21600\" o:spt=\"202\" path=\"m,l,21600r21600,l21600,xe\"><v:stroke joinstyle=\"miter\"/><v:path gradientshapeok=\"t\" o:connecttype=\"rect\"/></v:shapetype>";
 var INVALID_XML_CHAR_REGEX = /[\u0000-\u0008\u000B\u000C\u000E-\u001F]/g;
 var sanitizeXmlText = function (value) {
     if (!value)
@@ -863,9 +971,9 @@ var getRowsForSheet = function (sheetData, sheetId) {
     return ((_d = (_b = (_a = sheetData[sheetId]) !== null && _a !== void 0 ? _a : sheetData[String(sheetId)]) !== null && _b !== void 0 ? _b : sheetData[Number(sheetId)]) !== null && _d !== void 0 ? _d : []);
 };
 var buildWorksheetXml = function (_a) {
-    var e_19, _b, e_20, _d, e_21, _e, e_22, _f, e_23, _g, e_24, _h;
+    var e_25, _b, e_26, _d, e_27, _e, e_28, _f, e_29, _g, e_30, _h;
     var _j, _k;
-    var sheet = _a.sheet, rows = _a.rows, sharedStrings = _a.sharedStrings, sourceSharedStrings = _a.sourceSharedStrings, cellXfs = _a.cellXfs, styleBuilder = _a.styleBuilder, tables = _a.tables, relationships = _a.relationships, drawingContext = _a.drawingContext, conditionalFormats = _a.conditionalFormats, dataValidationsById = _a.dataValidationsById, dataValidations = _a.dataValidations, ignoreFormulaPatterns = _a.ignoreFormulaPatterns, citations = _a.citations, comments = _a.comments, personRegistry = _a.personRegistry, slicerRelIds = _a.slicerRelIds, sheetData = _a.sheetData, sheets = _a.sheets, locale = _a.locale;
+    var sheet = _a.sheet, rows = _a.rows, sharedStrings = _a.sharedStrings, sourceSharedStrings = _a.sourceSharedStrings, cellXfs = _a.cellXfs, styleBuilder = _a.styleBuilder, tables = _a.tables, relationships = _a.relationships, drawingContext = _a.drawingContext, conditionalFormats = _a.conditionalFormats, dataValidationsById = _a.dataValidationsById, dataValidations = _a.dataValidations, ignoreFormulaPatterns = _a.ignoreFormulaPatterns, citations = _a.citations, comments = _a.comments, personRegistry = _a.personRegistry, slicerRelIds = _a.slicerRelIds, sheetData = _a.sheetData, sheets = _a.sheets, locale = _a.locale, protectedRanges = _a.protectedRanges, _l = _a.formControls, formControls = _l === void 0 ? [] : _l, _m = _a.ctrlProps, ctrlProps = _m === void 0 ? { parts: [] } : _m;
     var tableNameMap = buildTableNameMap(tables);
     var bounds = {
         minRow: Number.POSITIVE_INFINITY,
@@ -900,12 +1008,12 @@ var buildWorksheetXml = function (_a) {
                 }
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (citations_1_1 && !citations_1_1.done && (_b = citations_1.return)) _b.call(citations_1);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_25) throw e_25.error; }
         }
     }
     if (dataValidations) {
@@ -915,8 +1023,8 @@ var buildWorksheetXml = function (_a) {
                 if (!rule.ranges)
                     continue;
                 try {
-                    for (var _l = (e_21 = void 0, __values(rule.ranges)), _m = _l.next(); !_m.done; _m = _l.next()) {
-                        var range = _m.value;
+                    for (var _o = (e_27 = void 0, __values(rule.ranges)), _p = _o.next(); !_p.done; _p = _o.next()) {
+                        var range = _p.value;
                         if (range.sheetId !== sheet.sheetId)
                             continue;
                         // Ranges from the DV import are already 1-indexed (addressToSelection
@@ -929,21 +1037,21 @@ var buildWorksheetXml = function (_a) {
                         }
                     }
                 }
-                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                catch (e_27_1) { e_27 = { error: e_27_1 }; }
                 finally {
                     try {
-                        if (_m && !_m.done && (_e = _l.return)) _e.call(_l);
+                        if (_p && !_p.done && (_e = _o.return)) _e.call(_o);
                     }
-                    finally { if (e_21) throw e_21.error; }
+                    finally { if (e_27) throw e_27.error; }
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (dataValidations_1_1 && !dataValidations_1_1.done && (_d = dataValidations_1.return)) _d.call(dataValidations_1);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_26) throw e_26.error; }
         }
     }
     // Pre-scan for valid shared-formula leaders in this sheet. The cell-emit
@@ -963,7 +1071,7 @@ var buildWorksheetXml = function (_a) {
         if (!Array.isArray(rowValues))
             continue;
         try {
-            for (var rowValues_1 = (e_22 = void 0, __values(rowValues)), rowValues_1_1 = rowValues_1.next(); !rowValues_1_1.done; rowValues_1_1 = rowValues_1.next()) {
+            for (var rowValues_1 = (e_28 = void 0, __values(rowValues)), rowValues_1_1 = rowValues_1.next(); !rowValues_1_1.done; rowValues_1_1 = rowValues_1.next()) {
                 var cell = rowValues_1_1.value;
                 var sf = cell === null || cell === void 0 ? void 0 : cell.sf;
                 if (sf && sf.ref && Number.isFinite(sf.si)) {
@@ -971,12 +1079,12 @@ var buildWorksheetXml = function (_a) {
                 }
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
                 if (rowValues_1_1 && !rowValues_1_1.done && (_f = rowValues_1.return)) _f.call(rowValues_1);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_28) throw e_28.error; }
         }
     }
     for (var rowIndex = 1; rowIndex < maxRows; rowIndex++) {
@@ -1062,30 +1170,49 @@ var buildWorksheetXml = function (_a) {
     var threadedCommentsXml = threadedCommentsCollector.toXml();
     if (threadedCommentsXml) {
         try {
-            for (var _o = __values(threadedCommentsCollector.legacyEntries()), _p = _o.next(); !_p.done; _p = _o.next()) {
-                var entry = _p.value;
+            for (var _q = __values(threadedCommentsCollector.legacyEntries()), _s = _q.next(); !_s.done; _s = _q.next()) {
+                var entry = _s.value;
                 commentsCollector.add(entry.address, entry.text, entry.author);
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_29_1) { e_29 = { error: e_29_1 }; }
         finally {
             try {
-                if (_p && !_p.done && (_g = _o.return)) _g.call(_o);
+                if (_s && !_s.done && (_g = _q.return)) _g.call(_q);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_29) throw e_29.error; }
         }
         relationships.add(THREADED_COMMENT_REL_TYPE, "../threadedComments/threadedComment".concat(sheet.sheetId, ".xml"));
     }
     // Generate comments XML (notes) and add relationships if there are comments
     var commentsXml = commentsCollector.toXml();
-    var legacyDrawingXml = "";
     if (commentsXml) {
         relationships.add(COMMENTS_REL_TYPE, "../comments".concat(sheet.sheetId, ".xml"));
+    }
+    // Notes and form controls share the sheet's one legacy VML part
+    // (`<legacyDrawing>`); a control without its VML shape is dropped by Excel.
+    var noteVmlShapes = commentsCollector.toVmlShapes();
+    var formControlBuild = buildSheetFormControls({
+        sheet: sheet,
+        controls: formControls,
+        relationships: relationships,
+        ctrlProps: ctrlProps,
+        zIndexStart: noteVmlShapes.length,
+        reservedShapeIds: commentsCollector.vmlShapeIds(),
+    });
+    var vmlDrawingXml = buildVmlDrawingXml({
+        shapeTypes: __spreadArray(__spreadArray([], __read((noteVmlShapes.length ? [NOTE_VML_SHAPETYPE] : [])), false), __read((formControlBuild.vmlShapes.length ? [FORM_CONTROL_VML_SHAPETYPE] : [])), false),
+        shapes: __spreadArray(__spreadArray([], __read(noteVmlShapes), false), __read(formControlBuild.vmlShapes), false),
+    });
+    var legacyDrawingXml = "";
+    if (vmlDrawingXml) {
         var legacyDrawingRelId = relationships.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing", "../drawings/vmlDrawing".concat(sheet.sheetId, ".vml"));
         legacyDrawingXml = "<legacyDrawing r:id=\"".concat(legacyDrawingRelId, "\"/>");
     }
+    var controlsXml = formControlBuild.controlsXml;
     var sheetDataXml = "<sheetData>".concat(rowXmlChunks.join(""), "</sheetData>");
-    var pageMargins = DEFAULT_PAGE_MARGINS;
+    var protectionXml = buildSheetProtectionXml(sheet, protectedRanges);
+    var printSettingsXml = buildPrintSettingsXml(sheet.printSettings);
     // Build row data map for sparkline detection
     var rowDataMap = {};
     for (var rowIndex = 1; rowIndex < maxRows; rowIndex++) {
@@ -1093,19 +1220,19 @@ var buildWorksheetXml = function (_a) {
         if (row === null || row === void 0 ? void 0 : row.values) {
             var rowValues = {};
             try {
-                for (var _q = (e_24 = void 0, __values(Object.entries(row.values))), _s = _q.next(); !_s.done; _s = _q.next()) {
-                    var _t = __read(_s.value, 2), colIndex = _t[0], cell = _t[1];
+                for (var _t = (e_30 = void 0, __values(Object.entries(row.values))), _u = _t.next(); !_u.done; _u = _t.next()) {
+                    var _v = __read(_u.value, 2), colIndex = _v[0], cell = _v[1];
                     if (cell) {
                         rowValues[parseInt(colIndex, 10)] = cell;
                     }
                 }
             }
-            catch (e_24_1) { e_24 = { error: e_24_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
-                    if (_s && !_s.done && (_h = _q.return)) _h.call(_q);
+                    if (_u && !_u.done && (_h = _t.return)) _h.call(_t);
                 }
-                finally { if (e_24) throw e_24.error; }
+                finally { if (e_30) throw e_30.error; }
             }
             if (Object.keys(rowValues).length > 0) {
                 rowDataMap[rowIndex] = rowValues;
@@ -1128,13 +1255,13 @@ var buildWorksheetXml = function (_a) {
         explicitDefaultColumnWidthPx > 0) {
         sheetFormatPrAttrs.push("defaultColWidth=\"".concat(columnPixelToChars(explicitDefaultColumnWidthPx).toFixed(2), "\""));
     }
-    var worksheetXml = "".concat(XML_DECLARATION, "<worksheet xmlns=\"").concat(WORKSHEET_NS, "\" xmlns:r=\"").concat(REL_NS, "\">").concat(sheetPrXml, "<dimension ref=\"").concat(dimension, "\"/>").concat(sheetViews, "<sheetFormatPr ").concat(sheetFormatPrAttrs.join(" "), "/>").concat(columnXml).concat(sheetDataXml).concat(basicFilterXml).concat(mergeXml).concat(conditionalFormattingXml).concat(dataValidationsXml).concat(hyperlinksXml).concat(pageMargins).concat(drawingXml).concat(legacyDrawingXml).concat(tablePartsXml).concat(extLstXml, "</worksheet>");
+    var worksheetXml = "".concat(XML_DECLARATION, "<worksheet xmlns=\"").concat(WORKSHEET_NS, "\" xmlns:r=\"").concat(REL_NS, "\">").concat(sheetPrXml, "<dimension ref=\"").concat(dimension, "\"/>").concat(sheetViews, "<sheetFormatPr ").concat(sheetFormatPrAttrs.join(" "), "/>").concat(columnXml).concat(sheetDataXml).concat(protectionXml).concat(basicFilterXml).concat(mergeXml).concat(conditionalFormattingXml).concat(dataValidationsXml).concat(hyperlinksXml).concat(printSettingsXml).concat(drawingXml).concat(legacyDrawingXml).concat(controlsXml).concat(tablePartsXml).concat(extLstXml, "</worksheet>");
     return {
         xml: worksheetXml,
         relationshipsXml: relationships.toXml(),
         images: collectedImages,
         commentsXml: commentsXml,
-        vmlDrawingXml: commentsCollector.toVmlXml(),
+        vmlDrawingXml: vmlDrawingXml,
         threadedCommentsXml: threadedCommentsXml,
     };
 };
@@ -1189,7 +1316,7 @@ var sanitizeIndex = function (value) {
     return Math.max(1, Math.floor(value));
 };
 var normalizeMergeRanges = function (ranges) {
-    var e_25, _a;
+    var e_31, _a;
     if (!(ranges === null || ranges === void 0 ? void 0 : ranges.length))
         return [];
     var sanitized = ranges
@@ -1231,12 +1358,12 @@ var normalizeMergeRanges = function (ranges) {
             _loop_3(merge);
         }
     }
-    catch (e_25_1) { e_25 = { error: e_25_1 }; }
+    catch (e_31_1) { e_31 = { error: e_31_1 }; }
     finally {
         try {
             if (sorted_1_1 && !sorted_1_1.done && (_a = sorted_1.return)) _a.call(sorted_1);
         }
-        finally { if (e_25) throw e_25.error; }
+        finally { if (e_31) throw e_31.error; }
     }
     return valid;
 };
@@ -1603,7 +1730,7 @@ var buildWorksheetRow = function (_a) {
     };
 };
 var buildCellXml = function (_a) {
-    var e_26, _b;
+    var e_32, _b;
     var _d, _e, _f, _g, _h, _j, _k, _l;
     var rowNumber = _a.rowNumber, columnIndex = _a.columnIndex, cell = _a.cell, sharedStrings = _a.sharedStrings, sourceSharedStrings = _a.sourceSharedStrings, cellXfs = _a.cellXfs, styleBuilder = _a.styleBuilder, onImage = _a.onImage, onHyperlink = _a.onHyperlink, dataValidationsById = _a.dataValidationsById, onDataValidation = _a.onDataValidation, tableNameMap = _a.tableNameMap, tables = _a.tables, ignoreFormulaPatterns = _a.ignoreFormulaPatterns, commentsCollector = _a.commentsCollector, onCommentThread = _a.onCommentThread, sheetId = _a.sheetId, sheetData = _a.sheetData, sheets = _a.sheets, locale = _a.locale, validSharedFormulaLeaders = _a.validSharedFormulaLeaders;
     var normalizedCell = cell;
@@ -1700,12 +1827,12 @@ var buildCellXml = function (_a) {
                     sheetIdByName_1.set(s.title, s.sheetId);
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_32_1) { e_32 = { error: e_32_1 }; }
         finally {
             try {
                 if (sheets_1_1 && !sheets_1_1.done && (_b = sheets_1.return)) _b.call(sheets_1);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_32) throw e_32.error; }
         }
         // A real CellXfsRegistry so `SheetCell.assign` inside the derive
         // helper can resolve precedent cells whose `uf` is a `{ sid }` style
@@ -1942,7 +2069,7 @@ function isValidExcelDateSerial(value) {
     return value >= MIN_EXCEL_DATE_SERIAL && value <= MAX_EXCEL_DATE_SERIAL;
 }
 function rewriteTableNamesInFormula(formula, tableNameMap) {
-    var e_27, _a;
+    var e_33, _a;
     if (!(tableNameMap === null || tableNameMap === void 0 ? void 0 : tableNameMap.size))
         return formula;
     var normalized = formula;
@@ -1957,12 +2084,12 @@ function rewriteTableNamesInFormula(formula, tableNameMap) {
             normalized = normalized.replace(new RegExp("".concat(escaped, "(?=\\[)"), "g"), exportedName);
         }
     }
-    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+    catch (e_33_1) { e_33 = { error: e_33_1 }; }
     finally {
         try {
             if (tableNameMap_1_1 && !tableNameMap_1_1.done && (_a = tableNameMap_1.return)) _a.call(tableNameMap_1);
         }
-        finally { if (e_27) throw e_27.error; }
+        finally { if (e_33) throw e_33.error; }
     }
     return normalized;
 }
@@ -2060,7 +2187,9 @@ function rewriteStructuredReferenceFormula(formula, tableNameMap, tables, rowNum
 }
 function sanitizeFormulaText(formula) {
     var normalized = sanitizeXmlText(formula);
-    return qualifyFutureFunctions(normalized.replace(/\r\n|\r|\n/g, " "));
+    // `@x` is persisted as `_xlfn.SINGLE(x)`; encoding first lets the
+    // future-function pass add the prefix.
+    return qualifyFutureFunctions(encodeImplicitIntersection(normalized.replace(/\r\n|\r|\n/g, " ")));
 }
 function escapeXmlBase(value) {
     return sanitizeXmlText(value)
@@ -2224,6 +2353,11 @@ var buildSheetViewsXml = function (sheet) {
         zoomScale !== 100) {
         attrs.push("zoomScale=\"".concat(zoomScale, "\""));
     }
+    // `rightToLeft` — only an explicit true is written (Excel's default is
+    // LTR and the attribute is omitted), mirroring the Rust exporter.
+    if (sheet.rightToLeft) {
+        attrs.push("rightToLeft=\"1\"");
+    }
     var panes = [];
     var frozenRows = (_e = sheet.frozenRowCount) !== null && _e !== void 0 ? _e : 0;
     var frozenColumns = (_f = sheet.frozenColumnCount) !== null && _f !== void 0 ? _f : 0;
@@ -2355,7 +2489,7 @@ var buildRichRunProperties = function (format) {
  * style flag, but that's a cell-style concern, not a sharedString one.
  */
 var buildRichTextRuns = function (text, runs) {
-    var e_28, _a;
+    var e_34, _a;
     var sorted = __spreadArray([], __read(runs), false).sort(function (a, b) { return a.startIndex - b.startIndex; });
     var out = [];
     var cursor = 0;
@@ -2388,12 +2522,12 @@ var buildRichTextRuns = function (text, runs) {
                 cursor = end;
         }
     }
-    catch (e_28_1) { e_28 = { error: e_28_1 }; }
+    catch (e_34_1) { e_34 = { error: e_34_1 }; }
     finally {
         try {
             if (sorted_2_1 && !sorted_2_1.done && (_a = sorted_2.return)) _a.call(sorted_2);
         }
-        finally { if (e_28) throw e_28.error; }
+        finally { if (e_34) throw e_34.error; }
     }
     if (cursor < text.length) {
         emit(text.slice(cursor), "");
@@ -2414,7 +2548,7 @@ var buildSharedStringsXml = function (sharedStrings) {
     return "".concat(XML_DECLARATION, "<sst xmlns=\"").concat(WORKSHEET_NS, "\" count=\"").concat(sharedStrings.totalCount, "\" uniqueCount=\"").concat(sharedStrings.entries.length, "\">").concat(entries, "</sst>");
 };
 var buildTableNameMap = function (tables) {
-    var e_29, _a;
+    var e_35, _a;
     var _b;
     var map = new Map();
     try {
@@ -2426,12 +2560,12 @@ var buildTableNameMap = function (tables) {
             map.set(tableTitle, table.name);
         }
     }
-    catch (e_29_1) { e_29 = { error: e_29_1 }; }
+    catch (e_35_1) { e_35 = { error: e_35_1 }; }
     finally {
         try {
             if (tables_1_1 && !tables_1_1.done && (_a = tables_1.return)) _a.call(tables_1);
         }
-        finally { if (e_29) throw e_29.error; }
+        finally { if (e_35) throw e_35.error; }
     }
     return map;
 };
@@ -2439,7 +2573,7 @@ var buildTableNameMap = function (tables) {
 // whose box intersects another table on the same sheet. Drop both before
 // emitting so the workbook opens without "We found a problem" recovery prompts.
 var filterExportableTables = function (tables) {
-    var e_30, _a;
+    var e_36, _a;
     var _b;
     var isValidBox = function (range) {
         if (!range)
@@ -2482,12 +2616,12 @@ var filterExportableTables = function (tables) {
             _loop_4(table);
         }
     }
-    catch (e_30_1) { e_30 = { error: e_30_1 }; }
+    catch (e_36_1) { e_36 = { error: e_36_1 }; }
     finally {
         try {
             if (tables_2_1 && !tables_2_1.done && (_a = tables_2.return)) _a.call(tables_2);
         }
-        finally { if (e_30) throw e_30.error; }
+        finally { if (e_36) throw e_36.error; }
     }
     return result;
 };
@@ -2511,6 +2645,58 @@ var sanitizeTableName = function (name) {
     }
     return cleaned;
 };
+/**
+ * `SUBTOTAL()` function numbers (the 101+ "ignore hidden rows" family Excel
+ * writes into totals-row cells) → `totalsRowFunction`.
+ */
+var SUBTOTAL_TOTALS_ROW_FUNCTIONS = {
+    "101": "average",
+    "102": "countNums",
+    "103": "count",
+    "104": "max",
+    "105": "min",
+    "107": "stdDev",
+    "109": "sum",
+    "110": "var",
+};
+/**
+ * Totals-row metadata for one `<tableColumn>`. Explicit column metadata
+ * (imported from Excel, or set by the host) wins — an explicit `none` means
+ * "no totals function" and is not second-guessed from the cell (the Rust
+ * exporter's `totals_for_column` agrees). Otherwise it is derived from the
+ * totals-row cell so tables whose totals row was added in-app (a "Total"
+ * label + `=SUBTOTAL(109,[Col])` per numeric column) open in Excel with the
+ * matching function selected in the totals dropdown. A formula that is not
+ * a plain `SUBTOTAL(n, ref)` is left to the cell.
+ */
+var resolveTableColumnTotals = function (column, totalsCell) {
+    var _a;
+    if (column === null || column === void 0 ? void 0 : column.totalsRowLabel) {
+        return { totalsRowLabel: column.totalsRowLabel };
+    }
+    if (column === null || column === void 0 ? void 0 : column.totalsRowFunction) {
+        if (column.totalsRowFunction === "none") {
+            return undefined;
+        }
+        if (column.totalsRowFunction === "custom" && !column.totalsRowFormula) {
+            return undefined;
+        }
+        return {
+            totalsRowFunction: column.totalsRowFunction,
+            totalsRowFormula: (_a = column.totalsRowFormula) !== null && _a !== void 0 ? _a : undefined,
+        };
+    }
+    if (!totalsCell)
+        return undefined;
+    var formula = getExtendedValueFormula(getCellUserEnteredValue(totalsCell));
+    if (formula) {
+        var match = /^=?\s*SUBTOTAL\(\s*(\d{3})\s*,[^,]*\)\s*$/i.exec(formula);
+        var fn = match ? SUBTOTAL_TOTALS_ROW_FUNCTIONS[match[1]] : undefined;
+        return fn ? { totalsRowFunction: fn } : undefined;
+    }
+    var label = getExtendedValueString(getCellUserEnteredValue(totalsCell));
+    return label && label.trim() !== "" ? { totalsRowLabel: label } : undefined;
+};
 var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder) {
     var _a, _b, _d;
     var rangeRef = table.ref;
@@ -2558,9 +2744,10 @@ var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder) {
         // Fallback to table.columns name or generic name
         return (_f = (_e = (_d = table.columns) === null || _d === void 0 ? void 0 : _d[index]) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : "Column".concat(index + 1);
     });
+    var totalsRowIndex = table.range.endRowIndex;
     var tableColumns = "<tableColumns count=\"".concat(columnCount, "\">").concat(columnNames
         .map(function (name, idx) {
-        var _a, _b;
+        var _a, _b, _d, _e, _f;
         var columnFormula = (_b = (_a = table.columns) === null || _a === void 0 ? void 0 : _a[idx]) === null || _b === void 0 ? void 0 : _b.formula;
         var normalizedFormula = columnFormula
             ? normalizeCalculatedColumnFormula(columnFormula, table)
@@ -2568,7 +2755,22 @@ var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder) {
         var formulaXml = normalizedFormula
             ? "<calculatedColumnFormula>".concat(escapeXmlText(stripFormula(normalizedFormula)), "</calculatedColumnFormula>")
             : "";
-        return "<tableColumn id=\"".concat(idx + 1, "\" name=\"").concat(escapeXmlAttr(name), "\">").concat(formulaXml, "</tableColumn>");
+        // Explicit per-column totals metadata exports whether or not the totals
+        // row is shown: Excel keeps it on a table whose totals row is toggled
+        // off so re-enabling restores each column's choice. Deriving it from
+        // the last row only applies when that row IS the totals row.
+        var totals = resolveTableColumnTotals((_d = table.columns) === null || _d === void 0 ? void 0 : _d[idx], totalsRowCount > 0
+            ? (_f = (_e = rows[totalsRowIndex]) === null || _e === void 0 ? void 0 : _e.values) === null || _f === void 0 ? void 0 : _f[table.range.startColumnIndex + idx]
+            : undefined);
+        var totalsAttrs = (totals === null || totals === void 0 ? void 0 : totals.totalsRowLabel)
+            ? " totalsRowLabel=\"".concat(escapeXmlAttr(totals.totalsRowLabel), "\"")
+            : (totals === null || totals === void 0 ? void 0 : totals.totalsRowFunction)
+                ? " totalsRowFunction=\"".concat(totals.totalsRowFunction, "\"")
+                : "";
+        var totalsFormulaXml = (totals === null || totals === void 0 ? void 0 : totals.totalsRowFunction) === "custom" && totals.totalsRowFormula
+            ? "<totalsRowFormula>".concat(escapeXmlText(stripFormula(normalizeCalculatedColumnFormula(totals.totalsRowFormula, table))), "</totalsRowFormula>")
+            : "";
+        return "<tableColumn id=\"".concat(idx + 1, "\" name=\"").concat(escapeXmlAttr(name), "\"").concat(totalsAttrs, ">").concat(formulaXml).concat(totalsFormulaXml, "</tableColumn>");
     })
         .join(""), "</tableColumns>");
     var isBuiltInStyle = table.theme && /^TableStyle(Light|Medium|Dark)\d+$/.test(table.theme);
@@ -2618,8 +2820,130 @@ var buildWorksheetAutoFilterXml = function (sheet, rows, styleBuilder) {
     }
     return "<autoFilter ref=\"".concat(ref, "\"/>");
 };
+/** `CT_SheetProtection` boolean attributes in Excel's attribute order. */
+var SHEET_PROTECTION_FLAG_ATTRS = [
+    "sheet",
+    "objects",
+    "scenarios",
+    "formatCells",
+    "formatColumns",
+    "formatRows",
+    "insertColumns",
+    "insertRows",
+    "insertHyperlinks",
+    "deleteColumns",
+    "deleteRows",
+    "selectLockedCells",
+    "sort",
+    "autoFilter",
+    "pivotTables",
+    "selectUnlockedCells",
+];
+/**
+ * `<sheetProtection …/>` from `Sheet.sheetProtection`: the password hash first
+ * (legacy `password` or the agile quartet, verbatim), then only the action
+ * flags the model carries (`true` → `"1"`, `false` → `"0"`, absent → omitted so
+ * Excel's schema default applies). Mirrors `rnc-export`'s `sheet_protection_xml`.
+ */
+var buildSheetProtectionElementXml = function (protection) {
+    var e_37, _a;
+    var attrs = [];
+    if (protection.algorithmName) {
+        attrs.push("algorithmName=\"".concat(escapeXmlAttr(protection.algorithmName), "\""));
+    }
+    if (protection.hashValue) {
+        attrs.push("hashValue=\"".concat(escapeXmlAttr(protection.hashValue), "\""));
+    }
+    if (protection.saltValue) {
+        attrs.push("saltValue=\"".concat(escapeXmlAttr(protection.saltValue), "\""));
+    }
+    if (protection.spinCount != null) {
+        attrs.push("spinCount=\"".concat(protection.spinCount, "\""));
+    }
+    if (protection.password) {
+        attrs.push("password=\"".concat(escapeXmlAttr(protection.password), "\""));
+    }
+    try {
+        for (var SHEET_PROTECTION_FLAG_ATTRS_1 = __values(SHEET_PROTECTION_FLAG_ATTRS), SHEET_PROTECTION_FLAG_ATTRS_1_1 = SHEET_PROTECTION_FLAG_ATTRS_1.next(); !SHEET_PROTECTION_FLAG_ATTRS_1_1.done; SHEET_PROTECTION_FLAG_ATTRS_1_1 = SHEET_PROTECTION_FLAG_ATTRS_1.next()) {
+            var flag = SHEET_PROTECTION_FLAG_ATTRS_1_1.value;
+            var value = protection[flag];
+            if (typeof value === "boolean") {
+                attrs.push("".concat(flag, "=\"").concat(value ? 1 : 0, "\""));
+            }
+        }
+    }
+    catch (e_37_1) { e_37 = { error: e_37_1 }; }
+    finally {
+        try {
+            if (SHEET_PROTECTION_FLAG_ATTRS_1_1 && !SHEET_PROTECTION_FLAG_ATTRS_1_1.done && (_a = SHEET_PROTECTION_FLAG_ATTRS_1.return)) _a.call(SHEET_PROTECTION_FLAG_ATTRS_1);
+        }
+        finally { if (e_37) throw e_37.error; }
+    }
+    return attrs.length ? "<sheetProtection ".concat(attrs.join(" "), "/>") : "";
+};
+/**
+ * The sheet's protection block — `<sheetProtection>` followed by
+ * `<protectedRanges>` — or `""` when the sheet is unprotected and has no
+ * allow-edit ranges. Ranges missing a bound (a sheet-wide `protect-sheet`
+ * entry only carries `sheetId`) have no `sqref` and are skipped; the `name`
+ * is the range's id, synthesized as `Range{n}` when absent (schema requires it).
+ */
+var buildSheetProtectionXml = function (sheet, protectedRanges) {
+    var e_38, _a;
+    var protectionXml = sheet.sheetProtection
+        ? buildSheetProtectionElementXml(sheet.sheetProtection)
+        : "";
+    var rangeItems = [];
+    try {
+        for (var _b = __values(protectedRanges !== null && protectedRanges !== void 0 ? protectedRanges : []), _d = _b.next(); !_d.done; _d = _b.next()) {
+            var protectedRange = _d.value;
+            var range = protectedRange.range;
+            if (range.sheetId !== sheet.sheetId)
+                continue;
+            if (range.startRowIndex == null ||
+                range.endRowIndex == null ||
+                range.startColumnIndex == null ||
+                range.endColumnIndex == null) {
+                continue;
+            }
+            // Excel writes a single cell as `D10`, a block as `A2:C5`.
+            var isSingleCell = range.startRowIndex === range.endRowIndex &&
+                range.startColumnIndex === range.endColumnIndex;
+            var sqref = isSingleCell
+                ? cellToAddress({
+                    rowIndex: range.startRowIndex,
+                    columnIndex: range.startColumnIndex,
+                })
+                : cellRangeToAddress(undefined, {
+                    startRowIndex: range.startRowIndex,
+                    endRowIndex: range.endRowIndex,
+                    startColumnIndex: range.startColumnIndex,
+                    endColumnIndex: range.endColumnIndex,
+                });
+            if (!sqref)
+                continue;
+            var id = protectedRange.protectedRangeId;
+            var name_1 = id != null && String(id) !== "" ? String(id) : "Range".concat(rangeItems.length + 1);
+            var securityDescriptor = protectedRange.securityDescriptor
+                ? " securityDescriptor=\"".concat(escapeXmlAttr(protectedRange.securityDescriptor), "\"")
+                : "";
+            rangeItems.push("<protectedRange sqref=\"".concat(escapeXmlAttr(sqref), "\" name=\"").concat(escapeXmlAttr(name_1), "\"").concat(securityDescriptor, "/>"));
+        }
+    }
+    catch (e_38_1) { e_38 = { error: e_38_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_38) throw e_38.error; }
+    }
+    var rangesXml = rangeItems.length
+        ? "<protectedRanges>".concat(rangeItems.join(""), "</protectedRanges>")
+        : "";
+    return "".concat(protectionXml).concat(rangesXml);
+};
 var buildSheetPropertiesXml = function (sheet) {
-    var _a;
+    var _a, _b, _d;
     var tabColor = serializeColorXml((_a = sheet.tabColor) !== null && _a !== void 0 ? _a : undefined);
     // <outlinePr> mirrors the sheet's `outlinePr` setting; both attrs
     // default to true in Excel, so only emit when explicitly false. If
@@ -2635,11 +2959,110 @@ var buildSheetPropertiesXml = function (sheet) {
     var outlineXml = outlineAttrs.length
         ? "<outlinePr ".concat(outlineAttrs.join(" "), "/>")
         : "";
-    if (!tabColor && !outlineXml)
+    // `<pageSetUpPr fitToPage="1">` is what makes Excel honour
+    // `<pageSetup fitToWidth/fitToHeight>` instead of `scale`.
+    var pageSetUpPrXml = ((_d = (_b = sheet.printSettings) === null || _b === void 0 ? void 0 : _b.pageSetup) === null || _d === void 0 ? void 0 : _d.fitToPage)
+        ? "<pageSetUpPr fitToPage=\"1\"/>"
+        : "";
+    if (!tabColor && !outlineXml && !pageSetUpPrXml)
         return "";
-    var inner = "".concat(tabColor ? "<tabColor ".concat(tabColor, "/>") : "").concat(outlineXml);
+    var inner = "".concat(tabColor ? "<tabColor ".concat(tabColor, "/>") : "").concat(outlineXml).concat(pageSetUpPrXml);
     return "<sheetPr>".concat(inner, "</sheetPr>");
 };
+var xmlBoolAttr = function (name, value) {
+    return value == null ? "" : " ".concat(name, "=\"").concat(value ? "1" : "0", "\"");
+};
+var xmlNumAttr = function (name, value) {
+    return typeof value === "number" && Number.isFinite(value)
+        ? " ".concat(name, "=\"").concat(value, "\"")
+        : "";
+};
+/**
+ * The `CT_Worksheet` print tail — `<printOptions>`, `<pageMargins>`,
+ * `<pageSetup>`, `<headerFooter>`, `<rowBreaks>`, `<colBreaks>` — in schema
+ * order (after `<hyperlinks>`, before `<drawing>`). `<pageMargins>` is
+ * mandatory in practice (Excel always writes it), so the default margins go
+ * out when the sheet has none of its own.
+ */
+var buildPrintSettingsXml = function (print) {
+    var _a, _b, _d, _e, _f, _g;
+    var parts = [];
+    var options = print === null || print === void 0 ? void 0 : print.printOptions;
+    var optionAttrs = xmlBoolAttr("horizontalCentered", options === null || options === void 0 ? void 0 : options.horizontalCentered) +
+        xmlBoolAttr("verticalCentered", options === null || options === void 0 ? void 0 : options.verticalCentered) +
+        xmlBoolAttr("headings", options === null || options === void 0 ? void 0 : options.headings) +
+        xmlBoolAttr("gridLines", options === null || options === void 0 ? void 0 : options.gridLines);
+    if (optionAttrs)
+        parts.push("<printOptions".concat(optionAttrs, "/>"));
+    var margins = print === null || print === void 0 ? void 0 : print.pageMargins;
+    parts.push(margins &&
+        Object.values(margins).some(function (v) { return typeof v === "number"; })
+        ? "<pageMargins left=\"".concat((_a = margins.left) !== null && _a !== void 0 ? _a : 0.7, "\" right=\"").concat((_b = margins.right) !== null && _b !== void 0 ? _b : 0.7, "\" top=\"").concat((_d = margins.top) !== null && _d !== void 0 ? _d : 0.75, "\" bottom=\"").concat((_e = margins.bottom) !== null && _e !== void 0 ? _e : 0.75, "\" header=\"").concat((_f = margins.header) !== null && _f !== void 0 ? _f : 0.3, "\" footer=\"").concat((_g = margins.footer) !== null && _g !== void 0 ? _g : 0.3, "\"/>")
+        : DEFAULT_PAGE_MARGINS);
+    var setup = print === null || print === void 0 ? void 0 : print.pageSetup;
+    if (setup) {
+        // Excel keeps `firstPageNumber` as a dormant value until the user picks
+        // a first page number (`useFirstPageNumber="1"`); a bare number means
+        // "Auto", so the flag is written only when the model has it on.
+        var useFirst = setup.useFirstPageNumber === true ? true : undefined;
+        var setupAttrs = xmlNumAttr("paperSize", setup.paperSize) +
+            xmlNumAttr("scale", setup.scale) +
+            xmlNumAttr("firstPageNumber", setup.firstPageNumber) +
+            xmlNumAttr("fitToWidth", setup.fitToWidth) +
+            xmlNumAttr("fitToHeight", setup.fitToHeight) +
+            (setup.pageOrder ? " pageOrder=\"".concat(setup.pageOrder, "\"") : "") +
+            (setup.orientation ? " orientation=\"".concat(setup.orientation, "\"") : "") +
+            xmlBoolAttr("blackAndWhite", setup.blackAndWhite) +
+            xmlBoolAttr("draft", setup.draft) +
+            xmlBoolAttr("useFirstPageNumber", useFirst);
+        if (setupAttrs)
+            parts.push("<pageSetup".concat(setupAttrs, "/>"));
+    }
+    var hf = print === null || print === void 0 ? void 0 : print.headerFooter;
+    if (hf && !isHeaderFooterEmpty(hf)) {
+        var hfAttrs = xmlBoolAttr("differentOddEven", hf.differentOddEven) +
+            xmlBoolAttr("differentFirst", hf.differentFirst) +
+            xmlBoolAttr("scaleWithDoc", hf.scaleWithDoc) +
+            xmlBoolAttr("alignWithMargins", hf.alignWithMargins);
+        var children = [
+            "oddHeader",
+            "oddFooter",
+            "evenHeader",
+            "evenFooter",
+            "firstHeader",
+            "firstFooter",
+        ]
+            .map(function (key) {
+            var text = hf[key];
+            return typeof text === "string" && text
+                ? "<".concat(key, ">").concat(escapeXmlText(text), "</").concat(key, ">")
+                : "";
+        })
+            .join("");
+        parts.push(children
+            ? "<headerFooter".concat(hfAttrs, ">").concat(children, "</headerFooter>")
+            : "<headerFooter".concat(hfAttrs, "/>"));
+    }
+    var breaks = function (ids, max) {
+        var valid = Array.from(new Set((ids !== null && ids !== void 0 ? ids : []).filter(function (id) { return Number.isInteger(id) && id > 0; }))).sort(function (a, b) { return a - b; });
+        if (!valid.length)
+            return "";
+        return valid
+            .map(function (id) { return "<brk id=\"".concat(id, "\" max=\"").concat(max, "\" man=\"1\"/>"); })
+            .join("");
+    };
+    var rowBrks = breaks(print === null || print === void 0 ? void 0 : print.rowBreaks, 16383);
+    if (rowBrks) {
+        var count = rowBrks.split("<brk ").length - 1;
+        parts.push("<rowBreaks count=\"".concat(count, "\" manualBreakCount=\"").concat(count, "\">").concat(rowBrks, "</rowBreaks>"));
+    }
+    var colBrks = breaks(print === null || print === void 0 ? void 0 : print.columnBreaks, 1048575);
+    if (colBrks) {
+        var count = colBrks.split("<brk ").length - 1;
+        parts.push("<colBreaks count=\"".concat(count, "\" manualBreakCount=\"").concat(count, "\">").concat(colBrks, "</colBreaks>"));
+    }
+    return parts.join("");
+};
 var buildFilterColumnsXml = function (filterSpecs, range, rows, headerRow, totalRow, styleBuilder) {
     if (headerRow === void 0) { headerRow = true; }
     if (totalRow === void 0) { totalRow = false; }
@@ -2712,113 +3135,220 @@ var gridRangeToRef = function (range) {
     }
 };
 var groupEmbedsBySheet = function (embeds) {
-    var e_31, _a;
-    var _b, _d, _e, _f, _g, _h, _j;
     var result = new Map();
-    try {
-        for (var _k = __values(embeds !== null && embeds !== void 0 ? embeds : []), _l = _k.next(); !_l.done; _l = _k.next()) {
-            var embed = _l.value;
-            if (!((_b = embed.position) === null || _b === void 0 ? void 0 : _b.overlayPosition))
-                continue;
-            if (((_d = embed.spec) === null || _d === void 0 ? void 0 : _d.type) !== "image")
-                continue;
-            var overlay = embed.position.overlayPosition;
-            var placement = {
-                kind: "embed",
-                imageUrl: embed.spec.imageUrl,
-                rowIndex: overlay.anchorCell.rowIndex,
-                columnIndex: overlay.anchorCell.columnIndex,
-                offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
-                offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
-                width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
-                height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 120,
-            };
-            var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
-            list.push(placement);
-            result.set(embed.position.sheetId, list);
-        }
-    }
-    catch (e_31_1) { e_31 = { error: e_31_1 }; }
-    finally {
-        try {
-            if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
-        }
-        finally { if (e_31) throw e_31.error; }
-    }
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
+        var _a, _b, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
+            return;
+        if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "image")
+            return;
+        var overlay = embed.position.overlayPosition;
+        var imageSpec = embed.spec;
+        var adjustments = {
+            crop: (_d = imageSpec.crop) !== null && _d !== void 0 ? _d : undefined,
+            brightness: (_e = imageSpec.brightness) !== null && _e !== void 0 ? _e : undefined,
+            contrast: (_f = imageSpec.contrast) !== null && _f !== void 0 ? _f : undefined,
+            transparency: (_g = imageSpec.transparency) !== null && _g !== void 0 ? _g : undefined,
+        };
+        var placement = {
+            kind: "embed",
+            imageUrl: imageSpec.imageUrl,
+            adjustments: Object.values(adjustments).some(function (v) { return v !== undefined; })
+                ? adjustments
+                : undefined,
+            order: order,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: (_h = overlay.offsetXPixels) !== null && _h !== void 0 ? _h : 0,
+            offsetY: (_j = overlay.offsetYPixels) !== null && _j !== void 0 ? _j : 0,
+            width: (_k = overlay.widthPixels) !== null && _k !== void 0 ? _k : 120,
+            height: (_l = overlay.heightPixels) !== null && _l !== void 0 ? _l : 120,
+        };
+        var list = (_m = result.get(embed.position.sheetId)) !== null && _m !== void 0 ? _m : [];
+        list.push(placement);
+        result.set(embed.position.sheetId, list);
+    });
     return result;
 };
 var groupTextBoxesBySheet = function (embeds) {
-    var e_32, _a;
-    var _b, _d, _e, _f, _g, _h, _j;
     var result = new Map();
-    try {
-        for (var _k = __values(embeds !== null && embeds !== void 0 ? embeds : []), _l = _k.next(); !_l.done; _l = _k.next()) {
-            var embed = _l.value;
-            if (!((_b = embed.position) === null || _b === void 0 ? void 0 : _b.overlayPosition))
-                continue;
-            if (((_d = embed.spec) === null || _d === void 0 ? void 0 : _d.type) !== "textbox")
-                continue;
-            var overlay = embed.position.overlayPosition;
-            var placement = {
-                textBox: embed,
-                rowIndex: overlay.anchorCell.rowIndex,
-                columnIndex: overlay.anchorCell.columnIndex,
-                offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
-                offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
-                width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
-                height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 60,
-            };
-            var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
-            list.push(placement);
-            result.set(embed.position.sheetId, list);
-        }
-    }
-    catch (e_32_1) { e_32 = { error: e_32_1 }; }
-    finally {
-        try {
-            if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
-        }
-        finally { if (e_32) throw e_32.error; }
-    }
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
+        var _a, _b, _d, _e, _f, _g, _h;
+        if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
+            return;
+        if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "textbox")
+            return;
+        var overlay = embed.position.overlayPosition;
+        var placement = {
+            textBox: embed,
+            order: order,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
+            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
+            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
+            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 60,
+        };
+        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        list.push(placement);
+        result.set(embed.position.sheetId, list);
+    });
     return result;
 };
-var groupShapesBySheet = function (embeds) {
-    var e_33, _a;
-    var _b, _d, _e, _f, _g, _h, _j;
+/** Form-control embeds (`spec.type === "formControl"`) by sheet, in host order. */
+var groupFormControlsBySheet = function (embeds) {
     var result = new Map();
-    try {
-        for (var _k = __values(embeds !== null && embeds !== void 0 ? embeds : []), _l = _k.next(); !_l.done; _l = _k.next()) {
-            var embed = _l.value;
-            if (!((_b = embed.position) === null || _b === void 0 ? void 0 : _b.overlayPosition))
-                continue;
-            if (((_d = embed.spec) === null || _d === void 0 ? void 0 : _d.type) !== "shape")
-                continue;
-            var overlay = embed.position.overlayPosition;
-            var placement = {
-                shape: embed,
-                rowIndex: overlay.anchorCell.rowIndex,
-                columnIndex: overlay.anchorCell.columnIndex,
-                offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
-                offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
-                width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
-                height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 60,
-            };
-            var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
-            list.push(placement);
-            result.set(embed.position.sheetId, list);
-        }
-    }
-    catch (e_33_1) { e_33 = { error: e_33_1 }; }
-    finally {
-        try {
-            if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
+        var _a, _b, _d, _e, _f, _g, _h;
+        if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
+            return;
+        if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "formControl")
+            return;
+        var overlay = embed.position.overlayPosition;
+        var placement = {
+            shape: embed,
+            order: order,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
+            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
+            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
+            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 20,
+        };
+        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        list.push(placement);
+        result.set(embed.position.sheetId, list);
+    });
+    return result;
+};
+/**
+ * Write a sheet's form controls: one ctrlProp part + sheet relationship per
+ * control, the `<controls>` worksheet element, and the VML shapes Excel
+ * draws them with (merged into the sheet's `vmlDrawing` alongside notes).
+ */
+var buildSheetFormControls = function (_a) {
+    var sheet = _a.sheet, controls = _a.controls, relationships = _a.relationships, ctrlProps = _a.ctrlProps, zIndexStart = _a.zIndexStart, reservedShapeIds = _a.reservedShapeIds;
+    if (!controls.length)
+        return { controlsXml: "", vmlShapes: [] };
+    var controlElements = [];
+    var vmlShapes = [];
+    // Excel numbers notes and form-control shapes from one per-sheet counter
+    // (1025 upward); a control that arrived with its own id keeps it unless it
+    // collides with a note shape or another control.
+    var usedShapeIds = new Set(reservedShapeIds);
+    var nextShapeId = 1025;
+    var allocateShapeId = function (wanted) {
+        if (wanted && Number.isInteger(wanted) && !usedShapeIds.has(wanted)) {
+            usedShapeIds.add(wanted);
+            return wanted;
         }
-        finally { if (e_33) throw e_33.error; }
-    }
+        while (usedShapeIds.has(nextShapeId))
+            nextShapeId += 1;
+        usedShapeIds.add(nextShapeId);
+        return nextShapeId++;
+    };
+    var sumSizes = function (count, getSize) {
+        var total = 0;
+        for (var index = 0; index < count; index++)
+            total += getSize(index);
+        return total;
+    };
+    controls.forEach(function (placement, position) {
+        var _a, _b, _d, _e;
+        var spec = placement.shape.spec;
+        var fromRow = Math.max(0, placement.rowIndex - 1);
+        var fromColumn = Math.max(0, placement.columnIndex - 1);
+        var offsetX = Math.max(0, (_a = placement.offsetX) !== null && _a !== void 0 ? _a : 0);
+        var offsetY = Math.max(0, (_b = placement.offsetY) !== null && _b !== void 0 ? _b : 0);
+        var widthPx = Math.max(5, (_d = placement.width) !== null && _d !== void 0 ? _d : 120);
+        var heightPx = Math.max(5, (_e = placement.height) !== null && _e !== void 0 ? _e : 20);
+        var columnSize = function (index) { return getColumnWidthPx(sheet, index, true); };
+        var rowSize = function (index) { return getRowHeightPx(sheet, index, true); };
+        var toColumn = resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: columnSize,
+        });
+        var toRow = resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: rowSize,
+        });
+        var partIndex = ctrlProps.parts.length + 1;
+        var path = "xl/ctrlProps/ctrlProp".concat(partIndex, ".xml");
+        ctrlProps.parts.push({ path: path, xml: buildCtrlPropXml(spec) });
+        var relId = relationships.add(CTRL_PROP_REL_TYPE, "../ctrlProps/ctrlProp".concat(partIndex, ".xml"));
+        var shapeId = allocateShapeId(spec.shapeId);
+        controlElements.push(buildControlElementXml({
+            spec: spec,
+            relId: relId,
+            shapeId: shapeId,
+            from: {
+                col: fromColumn,
+                colOff: offsetX * EMUS_PER_PIXEL,
+                row: fromRow,
+                rowOff: offsetY * EMUS_PER_PIXEL,
+            },
+            to: {
+                col: toColumn.index,
+                colOff: toColumn.offset * EMUS_PER_PIXEL,
+                row: toRow.index,
+                rowOff: toRow.offset * EMUS_PER_PIXEL,
+            },
+        }));
+        vmlShapes.push(buildFormControlVmlShape({
+            spec: spec,
+            shapeId: shapeId,
+            zIndex: zIndexStart + position + 1,
+            geometry: {
+                leftPx: sumSizes(fromColumn, columnSize) + offsetX,
+                topPx: sumSizes(fromRow, rowSize) + offsetY,
+                widthPx: widthPx,
+                heightPx: heightPx,
+                anchor: [
+                    fromColumn,
+                    Math.round(offsetX),
+                    fromRow,
+                    Math.round(offsetY),
+                    toColumn.index,
+                    Math.round(toColumn.offset),
+                    toRow.index,
+                    Math.round(toRow.offset),
+                ],
+            },
+        }));
+    });
+    return { controlsXml: buildControlsXml(controlElements), vmlShapes: vmlShapes };
+};
+var groupShapesBySheet = function (embeds) {
+    var result = new Map();
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
+        var _a, _b, _d, _e, _f, _g, _h;
+        if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
+            return;
+        if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "shape")
+            return;
+        var overlay = embed.position.overlayPosition;
+        var placement = {
+            shape: embed,
+            order: order,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
+            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
+            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
+            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 60,
+        };
+        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        list.push(placement);
+        result.set(embed.position.sheetId, list);
+    });
     return result;
 };
 var groupChartsBySheet = function (charts) {
-    var e_34, _a;
+    var e_39, _a;
     var _b, _d, _e, _f, _g, _h;
     var result = new Map();
     try {
@@ -2841,17 +3371,17 @@ var groupChartsBySheet = function (charts) {
             result.set(chart.position.sheetId, list);
         }
     }
-    catch (e_34_1) { e_34 = { error: e_34_1 }; }
+    catch (e_39_1) { e_39 = { error: e_39_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
         }
-        finally { if (e_34) throw e_34.error; }
+        finally { if (e_39) throw e_39.error; }
     }
     return result;
 };
 var groupSlicersBySheet = function (slicers) {
-    var e_35, _a;
+    var e_40, _a;
     var _b, _d, _e, _f, _g, _h;
     var result = new Map();
     try {
@@ -2874,17 +3404,17 @@ var groupSlicersBySheet = function (slicers) {
             result.set(slicer.position.sheetId, list);
         }
     }
-    catch (e_35_1) { e_35 = { error: e_35_1 }; }
+    catch (e_40_1) { e_40 = { error: e_40_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
         }
-        finally { if (e_35) throw e_35.error; }
+        finally { if (e_40) throw e_40.error; }
     }
     return result;
 };
 var buildConditionalFormattingXml = function (_a) {
-    var e_36, _b;
+    var e_41, _b;
     var _d, _e, _f;
     var conditionalFormats = _a.conditionalFormats, sheetId = _a.sheetId, styleBuilder = _a.styleBuilder;
     if (!(conditionalFormats === null || conditionalFormats === void 0 ? void 0 : conditionalFormats.length)) {
@@ -2948,12 +3478,12 @@ var buildConditionalFormattingXml = function (_a) {
             parts.push("<conditionalFormatting sqref=\"".concat(sqrefParts.join(" "), "\">").concat(ruleXmlEntries.join(""), "</conditionalFormatting>"));
         }
     }
-    catch (e_36_1) { e_36 = { error: e_36_1 }; }
+    catch (e_41_1) { e_41 = { error: e_41_1 }; }
     finally {
         try {
             if (orderedRules_1_1 && !orderedRules_1_1.done && (_b = orderedRules_1.return)) _b.call(orderedRules_1);
         }
-        finally { if (e_36) throw e_36.error; }
+        finally { if (e_41) throw e_41.error; }
     }
     return parts.join("");
 };
@@ -3449,11 +3979,11 @@ var buildConditionalFormattingRuleXml = function (_a) {
     return rules.length ? rules : undefined;
 };
 var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var anchors, relationships, media, imageIndex, chartIndex, pictureId, frameId, chartEntries, charts_1, charts_1_1, placement, chartXml, relId, slicers_1, slicers_1_1, placement, textBoxes_1, textBoxes_1_1, placement, shapes_1, shapes_1_1, placement, placements_1, placements_1_1, placement, dataUrl, buffer, mediaPath, relId, e_37_1, drawingXml;
-    var e_38, _d, e_39, _e, e_40, _f, e_41, _g, e_37, _h;
-    var placements = _b.placements, textBoxes = _b.textBoxes, _j = _b.shapes, shapes = _j === void 0 ? [] : _j, startImageIndex = _b.startImageIndex, startChartIndex = _b.startChartIndex, charts = _b.charts, slicers = _b.slicers, sheet = _b.sheet, sheetNameById = _b.sheetNameById;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var anchors, relationships, media, imageIndex, chartIndex, chartExIndex, pictureId, frameId, chartEntries, chartExEntries, charts_1, charts_1_1, placement, chartExXml, relId_1, chartXml, relId, slicers_1, slicers_1_1, placement, embedAnchors, orderOf, textBoxes_1, textBoxes_1_1, placement, shapes_1, shapes_1_1, placement, placements_1, placements_1_1, placement, dataUrl, buffer, mediaPath, relId, e_42_1, embedAnchors_1, embedAnchors_1_1, entry, drawingXml;
+    var e_43, _d, e_44, _e, e_45, _f, e_46, _g, e_42, _h, e_47, _j;
+    var placements = _b.placements, textBoxes = _b.textBoxes, _k = _b.shapes, shapes = _k === void 0 ? [] : _k, startImageIndex = _b.startImageIndex, startChartIndex = _b.startChartIndex, _l = _b.startChartExIndex, startChartExIndex = _l === void 0 ? 1 : _l, charts = _b.charts, slicers = _b.slicers, sheet = _b.sheet, sheetNameById = _b.sheetNameById;
+    return __generator(this, function (_m) {
+        switch (_m.label) {
             case 0:
                 if (!placements.length &&
                     !textBoxes.length &&
@@ -3466,12 +3996,28 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                 media = [];
                 imageIndex = startImageIndex;
                 chartIndex = startChartIndex;
+                chartExIndex = startChartExIndex;
                 pictureId = 1;
                 frameId = 1;
                 chartEntries = [];
+                chartExEntries = [];
                 try {
                     for (charts_1 = __values(charts), charts_1_1 = charts_1.next(); !charts_1_1.done; charts_1_1 = charts_1.next()) {
                         placement = charts_1_1.value;
+                        if (isChartExType(placement.chart.spec.chartType)) {
+                            chartExXml = buildChartExXml(placement.chart, sheetNameById);
+                            if (!chartExXml)
+                                continue;
+                            relId_1 = relationships.add(CHART_EX_REL_TYPE, "../charts/chartEx".concat(chartExIndex, ".xml"));
+                            anchors.push(createChartAnchor({ sheet: sheet, placement: placement, relId: relId_1, frameId: frameId, chartEx: true }));
+                            chartExEntries.push({
+                                path: "xl/charts/chartEx".concat(chartExIndex, ".xml"),
+                                xml: chartExXml,
+                            });
+                            chartExIndex += 1;
+                            frameId += 1;
+                            continue;
+                        }
                         chartXml = buildChartXml(placement.chart, sheetNameById);
                         if (!chartXml)
                             continue;
@@ -3490,12 +4036,12 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_38_1) { e_38 = { error: e_38_1 }; }
+                catch (e_43_1) { e_43 = { error: e_43_1 }; }
                 finally {
                     try {
                         if (charts_1_1 && !charts_1_1.done && (_d = charts_1.return)) _d.call(charts_1);
                     }
-                    finally { if (e_38) throw e_38.error; }
+                    finally { if (e_43) throw e_43.error; }
                 }
                 try {
                     for (slicers_1 = __values(slicers), slicers_1_1 = slicers_1.next(); !slicers_1_1.done; slicers_1_1 = slicers_1.next()) {
@@ -3508,60 +4054,70 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_39_1) { e_39 = { error: e_39_1 }; }
+                catch (e_44_1) { e_44 = { error: e_44_1 }; }
                 finally {
                     try {
                         if (slicers_1_1 && !slicers_1_1.done && (_e = slicers_1.return)) _e.call(slicers_1);
                     }
-                    finally { if (e_39) throw e_39.error; }
+                    finally { if (e_44) throw e_44.error; }
                 }
+                embedAnchors = [];
+                orderOf = function (order) {
+                    return order !== null && order !== void 0 ? order : Number.MAX_SAFE_INTEGER;
+                };
                 try {
                     for (textBoxes_1 = __values(textBoxes), textBoxes_1_1 = textBoxes_1.next(); !textBoxes_1_1.done; textBoxes_1_1 = textBoxes_1.next()) {
                         placement = textBoxes_1_1.value;
-                        anchors.push(createTextBoxAnchor({
-                            sheet: sheet,
-                            placement: placement,
-                            frameId: frameId,
-                        }));
+                        embedAnchors.push({
+                            order: orderOf(placement.order),
+                            xml: createTextBoxAnchor({
+                                sheet: sheet,
+                                placement: placement,
+                                frameId: frameId,
+                            }),
+                        });
                         frameId += 1;
                     }
                 }
-                catch (e_40_1) { e_40 = { error: e_40_1 }; }
+                catch (e_45_1) { e_45 = { error: e_45_1 }; }
                 finally {
                     try {
                         if (textBoxes_1_1 && !textBoxes_1_1.done && (_f = textBoxes_1.return)) _f.call(textBoxes_1);
                     }
-                    finally { if (e_40) throw e_40.error; }
+                    finally { if (e_45) throw e_45.error; }
                 }
                 try {
                     for (shapes_1 = __values(shapes), shapes_1_1 = shapes_1.next(); !shapes_1_1.done; shapes_1_1 = shapes_1.next()) {
                         placement = shapes_1_1.value;
-                        anchors.push(createShapeAnchor({
-                            sheet: sheet,
-                            placement: placement,
-                            frameId: frameId,
-                        }));
+                        embedAnchors.push({
+                            order: orderOf(placement.order),
+                            xml: createShapeAnchor({
+                                sheet: sheet,
+                                placement: placement,
+                                frameId: frameId,
+                            }),
+                        });
                         frameId += 1;
                     }
                 }
-                catch (e_41_1) { e_41 = { error: e_41_1 }; }
+                catch (e_46_1) { e_46 = { error: e_46_1 }; }
                 finally {
                     try {
                         if (shapes_1_1 && !shapes_1_1.done && (_g = shapes_1.return)) _g.call(shapes_1);
                     }
-                    finally { if (e_41) throw e_41.error; }
+                    finally { if (e_46) throw e_46.error; }
                 }
-                _k.label = 1;
+                _m.label = 1;
             case 1:
-                _k.trys.push([1, 6, 7, 8]);
+                _m.trys.push([1, 6, 7, 8]);
                 placements_1 = __values(placements), placements_1_1 = placements_1.next();
-                _k.label = 2;
+                _m.label = 2;
             case 2:
                 if (!!placements_1_1.done) return [3 /*break*/, 5];
                 placement = placements_1_1.value;
                 return [4 /*yield*/, resolveImageDataUrl(placement.imageUrl)];
             case 3:
-                dataUrl = _k.sent();
+                dataUrl = _m.sent();
                 if (!dataUrl)
                     return [3 /*break*/, 4];
                 buffer = dataUriToBuffer(dataUrl, placement.imageUrl);
@@ -3574,38 +4130,57 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                     extension: buffer.extension,
                 });
                 relId = relationships.add(IMAGE_REL_TYPE, "../media/image".concat(imageIndex, ".").concat(buffer.extension));
-                anchors.push(createTwoCellAnchor({
-                    sheet: sheet,
-                    placement: placement,
-                    relId: relId,
-                    pictureId: pictureId,
-                }));
+                embedAnchors.push({
+                    order: orderOf(placement.order),
+                    xml: createTwoCellAnchor({
+                        sheet: sheet,
+                        placement: placement,
+                        relId: relId,
+                        pictureId: pictureId,
+                    }),
+                });
                 imageIndex += 1;
                 pictureId += 1;
-                _k.label = 4;
+                _m.label = 4;
             case 4:
                 placements_1_1 = placements_1.next();
                 return [3 /*break*/, 2];
             case 5: return [3 /*break*/, 8];
             case 6:
-                e_37_1 = _k.sent();
-                e_37 = { error: e_37_1 };
+                e_42_1 = _m.sent();
+                e_42 = { error: e_42_1 };
                 return [3 /*break*/, 8];
             case 7:
                 try {
                     if (placements_1_1 && !placements_1_1.done && (_h = placements_1.return)) _h.call(placements_1);
                 }
-                finally { if (e_37) throw e_37.error; }
+                finally { if (e_42) throw e_42.error; }
                 return [7 /*endfinally*/];
             case 8:
+                embedAnchors.sort(function (a, b) { return a.order - b.order; });
+                try {
+                    for (embedAnchors_1 = __values(embedAnchors), embedAnchors_1_1 = embedAnchors_1.next(); !embedAnchors_1_1.done; embedAnchors_1_1 = embedAnchors_1.next()) {
+                        entry = embedAnchors_1_1.value;
+                        anchors.push(entry.xml);
+                    }
+                }
+                catch (e_47_1) { e_47 = { error: e_47_1 }; }
+                finally {
+                    try {
+                        if (embedAnchors_1_1 && !embedAnchors_1_1.done && (_j = embedAnchors_1.return)) _j.call(embedAnchors_1);
+                    }
+                    finally { if (e_47) throw e_47.error; }
+                }
                 drawingXml = "".concat(XML_DECLARATION, "<xdr:wsDr xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:r=\"").concat(REL_NS, "\">").concat(anchors.join(""), "</xdr:wsDr>");
                 return [2 /*return*/, {
                         xml: drawingXml,
                         relsXml: relationships.toXml(),
                         media: media,
                         charts: chartEntries,
+                        chartExs: chartExEntries,
                         nextImageIndex: imageIndex,
                         nextChartIndex: chartIndex,
+                        nextChartExIndex: chartExIndex,
                     }];
         }
     });
@@ -3635,11 +4210,59 @@ var createTwoCellAnchor = function (_a) {
     });
     var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
     var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
-    return "<xdr:twoCellAnchor editAs=\"oneCell\">".concat(fromXml).concat(toXml, "<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"").concat(pictureId, "\" name=\"Picture ").concat(pictureId, "\"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill><a:blip r:embed=\"").concat(relId, "\"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(Math.round(heightPx * EMUS_PER_PIXEL), "\"/></a:xfrm><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:twoCellAnchor>");
+    var _g = buildPictureAdjustmentsXml(placement.adjustments), blipChildren = _g.blipChildren, srcRectXml = _g.srcRectXml;
+    var blipXml = blipChildren
+        ? "<a:blip r:embed=\"".concat(relId, "\">").concat(blipChildren, "</a:blip>")
+        : "<a:blip r:embed=\"".concat(relId, "\"/>");
+    return "<xdr:twoCellAnchor editAs=\"oneCell\">".concat(fromXml).concat(toXml, "<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"").concat(pictureId, "\" name=\"Picture ").concat(pictureId, "\"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill>").concat(blipXml).concat(srcRectXml, "<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(Math.round(heightPx * EMUS_PER_PIXEL), "\"/></a:xfrm><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:twoCellAnchor>");
+};
+/** Fraction (0…1) → DrawingML per-mille percent (100000 = 100%). */
+var fractionToPct = function (value) {
+    return Math.round(Math.max(-1, Math.min(1, value)) * 100000);
+};
+/**
+ * `<a:blip>` children (`<a:alphaModFix>`, `<a:lum>`) and the `<a:srcRect>`
+ * sibling for an image's picture-format adjustments; both empty when the
+ * spec carries none.
+ */
+var buildPictureAdjustmentsXml = function (adjustments) {
+    if (!adjustments)
+        return { blipChildren: "", srcRectXml: "" };
+    var blipChildren = "";
+    var transparency = adjustments.transparency, brightness = adjustments.brightness, contrast = adjustments.contrast, crop = adjustments.crop;
+    if (typeof transparency === "number" && transparency > 0) {
+        blipChildren += "<a:alphaModFix amt=\"".concat(fractionToPct(1 - Math.min(1, transparency)), "\"/>");
+    }
+    var hasBrightness = typeof brightness === "number" && brightness !== 0;
+    var hasContrast = typeof contrast === "number" && contrast !== 0;
+    if (hasBrightness || hasContrast) {
+        blipChildren += "<a:lum".concat(hasBrightness ? " bright=\"".concat(fractionToPct(brightness), "\"") : "").concat(hasContrast ? " contrast=\"".concat(fractionToPct(contrast), "\"") : "", "/>");
+    }
+    var srcRectXml = "";
+    if (crop) {
+        var edges = ["l", "t", "r", "b"]
+            .map(function (edge) {
+            var value = {
+                l: crop.left,
+                t: crop.top,
+                r: crop.right,
+                b: crop.bottom,
+            }[edge];
+            // Negative edges are Excel's "out-crop" (padding around the
+            // bitmap) and round-trip like positive ones.
+            return typeof value === "number" && Number.isFinite(value) && value !== 0
+                ? " ".concat(edge, "=\"").concat(fractionToPct(value), "\"")
+                : "";
+        })
+            .join("");
+        if (edges)
+            srcRectXml = "<a:srcRect".concat(edges, "/>");
+    }
+    return { blipChildren: blipChildren, srcRectXml: srcRectXml };
 };
 var createChartAnchor = function (_a) {
     var _b, _d, _e, _f;
-    var placement = _a.placement, relId = _a.relId, frameId = _a.frameId, sheet = _a.sheet;
+    var placement = _a.placement, relId = _a.relId, frameId = _a.frameId, sheet = _a.sheet, _g = _a.chartEx, chartEx = _g === void 0 ? false : _g;
     var fromRow = Math.max(0, placement.rowIndex - 1);
     var fromColumn = Math.max(0, placement.columnIndex - 1);
     var offsetX = Math.max(0, (_b = placement.offsetX) !== null && _b !== void 0 ? _b : 0);
@@ -3660,6 +4283,14 @@ var createChartAnchor = function (_a) {
     });
     var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
     var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
+    if (chartEx) {
+        return "<xdr:twoCellAnchor>".concat(fromXml).concat(toXml).concat(buildChartExGraphicFrameXml({
+            relId: relId,
+            frameId: frameId,
+            widthEmu: Math.round(widthPx * EMUS_PER_PIXEL),
+            heightEmu: Math.round(heightPx * EMUS_PER_PIXEL),
+        }), "<xdr:clientData/></xdr:twoCellAnchor>");
+    }
     return "<xdr:twoCellAnchor>".concat(fromXml).concat(toXml, "<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id=\"").concat(frameId, "\" name=\"Chart ").concat(frameId, "\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(Math.round(heightPx * EMUS_PER_PIXEL), "\"/></xdr:xfrm><a:graphic><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:r=\"").concat(REL_NS, "\" r:id=\"").concat(relId, "\"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>");
 };
 var createSlicerAnchor = function (_a) {
@@ -3900,7 +4531,7 @@ var buildTextWithTabs = function (text, rPrXml) {
         .join("");
 };
 var buildTextBodyXml = function (spec) {
-    var e_42, _a;
+    var e_48, _a;
     var richText = spec.richText || [];
     var plainText = spec.text || "";
     // Build vertical alignment and wrap attributes
@@ -3941,12 +4572,12 @@ var buildTextBodyXml = function (spec) {
                 }
             }
         }
-        catch (e_42_1) { e_42 = { error: e_42_1 }; }
+        catch (e_48_1) { e_48 = { error: e_48_1 }; }
         finally {
             try {
                 if (richText_1_1 && !richText_1_1.done && (_a = richText_1.return)) _a.call(richText_1);
             }
-            finally { if (e_42) throw e_42.error; }
+            finally { if (e_48) throw e_48.error; }
         }
         paragraphsXml = paragraphs
             .filter(function (runs) { return runs.length > 0; })
@@ -4352,7 +4983,13 @@ var buildWorkbookXml = function (sheets, sheetRelIds, sheetNames, namedRanges, i
         var _a;
         sheetNameById.set((_a = sheet.sheetId) !== null && _a !== void 0 ? _a : index + 1, sheetNames[index]);
     });
-    var definedNamesXml = buildDefinedNamesXml(namedRanges, sheetNameById);
+    var definedNamesXml = buildDefinedNamesXml(namedRanges, sheetNameById, sheets.map(function (sheet, index) {
+        var _a;
+        return ({
+            sheetName: (_a = sheetNames[index]) !== null && _a !== void 0 ? _a : "Sheet".concat(index + 1),
+            printSettings: sheet.printSettings,
+        });
+    }));
     var calcPrXml = buildCalcPrXml(iterativeCalculationOptions);
     var slicerCachesXml = buildWorkbookSlicerCachesXml(slicerCacheRelIds);
     // Phase D2 — <pivotCaches> element. Each <pivotCache> pairs a
@@ -4383,19 +5020,70 @@ var buildWorkbookXml = function (sheets, sheetRelIds, sheetNames, namedRanges, i
         : "<workbookPr/>";
     return "".concat(XML_DECLARATION, "<workbook xmlns=\"").concat(WORKSHEET_NS, "\" xmlns:r=\"").concat(REL_NS, "\">").concat(workbookPrXml).concat(calcPrXml, "<bookViews><workbookView activeTab=\"0\" firstSheet=\"0\"/></bookViews><sheets>").concat(sheetEntries, "</sheets>").concat(definedNamesXml).concat(externalReferencesXml).concat(pivotCachesXml).concat(slicerCachesXml, "</workbook>");
 };
-var buildDefinedNamesXml = function (namedRanges, sheetNameById) {
-    var e_43, _a;
-    var _b;
-    if (!(namedRanges === null || namedRanges === void 0 ? void 0 : namedRanges.length))
-        return "";
+var buildDefinedNamesXml = function (namedRanges, sheetNameById, printScopes) {
+    var e_49, _a, e_50, _b;
+    var _d, _e, _f;
+    if (printScopes === void 0) { printScopes = []; }
     var entries = [];
+    // The builtin print names are sheet-scoped (`localSheetId` = position in
+    // `<sheets>`); they come from `sheet.printSettings`, never from
+    // `namedRanges` (a global `_xlnm.Print_Area` makes Excel repair the file).
+    // Documents imported before `printSettings` existed still carry the print
+    // area as a `_xlnm.Print_Area` named range on the sheet; it is converted
+    // to the sheet-scoped name here unless the sheet already has a print area.
+    var sheetIndexByName = new Map(printScopes.map(function (_a, index) {
+        var sheetName = _a.sheetName;
+        return [sheetName, index];
+    }));
+    var legacyPrintAreas = new Map();
     try {
-        for (var namedRanges_1 = __values(namedRanges), namedRanges_1_1 = namedRanges_1.next(); !namedRanges_1_1.done; namedRanges_1_1 = namedRanges_1.next()) {
-            var namedRange = namedRanges_1_1.value;
-            if (!(namedRange === null || namedRange === void 0 ? void 0 : namedRange.name))
+        for (var _g = __values(namedRanges !== null && namedRanges !== void 0 ? namedRanges : []), _h = _g.next(); !_h.done; _h = _g.next()) {
+            var namedRange = _h.value;
+            if ((namedRange === null || namedRange === void 0 ? void 0 : namedRange.name) !== PRINT_AREA_NAME || !((_d = namedRange.range) === null || _d === void 0 ? void 0 : _d.sheetId)) {
+                continue;
+            }
+            var sheetName = sheetNameById.get(namedRange.range.sheetId);
+            var index = sheetName ? sheetIndexByName.get(sheetName) : undefined;
+            if (index == null)
+                continue;
+            legacyPrintAreas.set(index, __spreadArray(__spreadArray([], __read(((_e = legacyPrintAreas.get(index)) !== null && _e !== void 0 ? _e : [])), false), [
+                namedRange.range,
+            ], false));
+        }
+    }
+    catch (e_49_1) { e_49 = { error: e_49_1 }; }
+    finally {
+        try {
+            if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
+        }
+        finally { if (e_49) throw e_49.error; }
+    }
+    printScopes.forEach(function (_a, index) {
+        var _b;
+        var sheetName = _a.sheetName, printSettings = _a.printSettings;
+        var printArea = ((_b = printSettings === null || printSettings === void 0 ? void 0 : printSettings.printArea) === null || _b === void 0 ? void 0 : _b.length)
+            ? printSettings.printArea
+            : legacyPrintAreas.get(index);
+        var area = (printArea === null || printArea === void 0 ? void 0 : printArea.length)
+            ? buildPrintAreaFormula(sheetName, printArea)
+            : undefined;
+        if (area) {
+            entries.push("<definedName name=\"".concat(PRINT_AREA_NAME, "\" localSheetId=\"").concat(index, "\">").concat(escapeXmlText(area), "</definedName>"));
+        }
+        var titles = (printSettings === null || printSettings === void 0 ? void 0 : printSettings.printTitles)
+            ? buildPrintTitlesFormula(sheetName, printSettings.printTitles)
+            : undefined;
+        if (titles) {
+            entries.push("<definedName name=\"".concat(PRINT_TITLES_NAME, "\" localSheetId=\"").concat(index, "\">").concat(escapeXmlText(titles), "</definedName>"));
+        }
+    });
+    try {
+        for (var _j = __values(namedRanges !== null && namedRanges !== void 0 ? namedRanges : []), _k = _j.next(); !_k.done; _k = _j.next()) {
+            var namedRange = _k.value;
+            if (!(namedRange === null || namedRange === void 0 ? void 0 : namedRange.name) || isBuiltinPrintName(namedRange.name))
                 continue;
             var hiddenAttr = namedRange.hidden ? " hidden=\"1\"" : "";
-            if ((_b = namedRange.range) === null || _b === void 0 ? void 0 : _b.sheetId) {
+            if ((_f = namedRange.range) === null || _f === void 0 ? void 0 : _f.sheetId) {
                 var sheetName = sheetNameById.get(namedRange.range.sheetId);
                 if (!sheetName)
                     continue;
@@ -4416,12 +5104,12 @@ var buildDefinedNamesXml = function (namedRanges, sheetNameById) {
             entries.push("<definedName name=\"".concat(escapeXmlAttr(namedRange.name), "\"").concat(hiddenAttr, ">").concat(escapeXmlText(expression), "</definedName>"));
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_50_1) { e_50 = { error: e_50_1 }; }
     finally {
         try {
-            if (namedRanges_1_1 && !namedRanges_1_1.done && (_a = namedRanges_1.return)) _a.call(namedRanges_1);
+            if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_50) throw e_50.error; }
     }
     if (!entries.length)
         return "";
@@ -4511,7 +5199,7 @@ var buildWorkbookRelationships = function (sheetCount, slicerCacheCount, externa
     };
 };
 var buildContentTypesXml = function (_a) {
-    var sheetCount = _a.sheetCount, tableCount = _a.tableCount, drawingSheets = _a.drawingSheets, mediaExtensions = _a.mediaExtensions, chartCount = _a.chartCount, _b = _a.slicerCount, slicerCount = _b === void 0 ? 0 : _b, _d = _a.slicerCacheCount, slicerCacheCount = _d === void 0 ? 0 : _d, _e = _a.pivotTableCount, pivotTableCount = _e === void 0 ? 0 : _e, _f = _a.pivotCacheCount, pivotCacheCount = _f === void 0 ? 0 : _f, _g = _a.commentsSheets, commentsSheets = _g === void 0 ? [] : _g, _h = _a.threadedCommentsSheets, threadedCommentsSheets = _h === void 0 ? [] : _h, _j = _a.hasPersons, hasPersons = _j === void 0 ? false : _j, _k = _a.externalLinkCount, externalLinkCount = _k === void 0 ? 0 : _k;
+    var sheetCount = _a.sheetCount, tableCount = _a.tableCount, drawingSheets = _a.drawingSheets, mediaExtensions = _a.mediaExtensions, chartCount = _a.chartCount, _b = _a.chartExCount, chartExCount = _b === void 0 ? 0 : _b, _d = _a.slicerCount, slicerCount = _d === void 0 ? 0 : _d, _e = _a.slicerCacheCount, slicerCacheCount = _e === void 0 ? 0 : _e, _f = _a.pivotTableCount, pivotTableCount = _f === void 0 ? 0 : _f, _g = _a.pivotCacheCount, pivotCacheCount = _g === void 0 ? 0 : _g, _h = _a.commentsSheets, commentsSheets = _h === void 0 ? [] : _h, _j = _a.threadedCommentsSheets, threadedCommentsSheets = _j === void 0 ? [] : _j, _k = _a.hasPersons, hasPersons = _k === void 0 ? false : _k, _l = _a.externalLinkCount, externalLinkCount = _l === void 0 ? 0 : _l, _m = _a.hasVmlDrawings, hasVmlDrawings = _m === void 0 ? false : _m, _o = _a.ctrlPropCount, ctrlPropCount = _o === void 0 ? 0 : _o;
     var sheetOverrides = Array.from({ length: sheetCount }, function (_, index) {
         return "<Override PartName=\"/xl/worksheets/sheet".concat(index + 1, ".xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/>");
     }).join("");
@@ -4526,6 +5214,9 @@ var buildContentTypesXml = function (_a) {
     var chartOverrides = Array.from({ length: chartCount }, function (_, index) {
         return "<Override PartName=\"/xl/charts/chart".concat(index + 1, ".xml\" ContentType=\"application/vnd.openxmlformats-officedocument.drawingml.chart+xml\"/>");
     }).join("");
+    var chartExOverrides = Array.from({ length: chartExCount }, function (_, index) {
+        return "<Override PartName=\"/xl/charts/chartEx".concat(index + 1, ".xml\" ContentType=\"").concat(CHART_EX_CONTENT_TYPE, "\"/>");
+    }).join("");
     var slicerOverrides = Array.from({ length: slicerCount }, function (_, index) {
         return "<Override PartName=\"/xl/slicers/slicer".concat(index + 1, ".xml\" ContentType=\"application/vnd.ms-excel.slicer+xml\"/>");
     }).join("");
@@ -4560,10 +5251,13 @@ var buildContentTypesXml = function (_a) {
         return "<Default Extension=\"".concat(extension, "\" ContentType=\"image/").concat(extension, "\"/>");
     })
         .join("");
-    var vmlDefault = commentsSheets.length
+    var vmlDefault = hasVmlDrawings || commentsSheets.length
         ? "<Default Extension=\"vml\" ContentType=\"application/vnd.openxmlformats-officedocument.vmlDrawing\"/>"
         : "";
-    return "".concat(XML_DECLARATION, "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/>").concat(vmlDefault).concat(mediaDefaults, "<Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>").concat(sheetOverrides).concat(tableOverrides).concat(drawingOverrides).concat(chartOverrides).concat(slicerOverrides).concat(slicerCacheOverrides).concat(pivotTableOverrides).concat(pivotCacheOverrides).concat(externalLinkOverrides).concat(commentsOverrides).concat(threadedCommentsOverrides).concat(personOverride, "<Override PartName=\"/xl/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/><Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/><Override PartName=\"/xl/sharedStrings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml\"/><Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/><Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/></Types>");
+    var ctrlPropOverrides = Array.from({ length: ctrlPropCount }, function (_, index) {
+        return "<Override PartName=\"/xl/ctrlProps/ctrlProp".concat(index + 1, ".xml\" ContentType=\"").concat(CTRL_PROP_CONTENT_TYPE, "\"/>");
+    }).join("");
+    return "".concat(XML_DECLARATION, "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/>").concat(vmlDefault).concat(mediaDefaults, "<Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>").concat(sheetOverrides).concat(tableOverrides).concat(drawingOverrides).concat(chartOverrides).concat(chartExOverrides).concat(slicerOverrides).concat(slicerCacheOverrides).concat(pivotTableOverrides).concat(pivotCacheOverrides).concat(externalLinkOverrides).concat(ctrlPropOverrides).concat(commentsOverrides).concat(threadedCommentsOverrides).concat(personOverride, "<Override PartName=\"/xl/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/><Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/><Override PartName=\"/xl/sharedStrings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml\"/><Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/><Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/></Types>");
 };
 var buildRootRelationshipsXml = function () {
     return "".concat(XML_DECLARATION, "<Relationships xmlns=\"").concat(PACKAGE_REL_NS, "\"><Relationship Id=\"rId1\" Type=\"").concat(REL_NS, "/officeDocument\" Target=\"xl/workbook.xml\"/><Relationship Id=\"rId2\" Type=\"").concat(REL_NS, "/extended-properties\" Target=\"docProps/app.xml\"/><Relationship Id=\"rId3\" Type=\"").concat(REL_NS, "/core-properties\" Target=\"docProps/core.xml\"/></Relationships>");