@superdoc-dev/cli 0.7.0-next.34 → 0.7.0-next.36

package/dist/index.js

@@ -205830,7 +205830,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BXskIPkt.es.js
+// ../../packages/superdoc/dist/chunks/src-nnj-4GhR.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -245468,7 +245468,7 @@ function toCssFontFamily(fontName, options = {}) {
   if (trimmed.includes(";"))
     trimmed = splitOutsideQuotes(trimmed, ";").join(", ");
   const { fallback, wordFamily } = options;
-  const fallbackParts = normalizeParts(fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : undefined) ?? "sans-serif");
+  const fallbackParts = normalizeParts(fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : undefined) ?? inferGenericFallbackFromFontName(trimmed));
   if (fallbackParts.length === 0)
     return trimmed;
   const normalizedName = trimmed.toLowerCase();
@@ -253786,6 +253786,25 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
           const maxReserve = computeMaxFootnoteReserve(layoutForPages, pageIndex, baseReserve);
           const columns = pageColumns$1.get(pageIndex);
           const columnCount = Math.max(1, Math.floor(columns?.count ?? 1));
+          let demand = 0;
+          for (let columnIndex = 0;columnIndex < columnCount; columnIndex += 1) {
+            const ids = idsByColumn$1.get(pageIndex)?.get(columnIndex) ?? [];
+            let columnDemand = 0;
+            ids.forEach((id2, idx) => {
+              const ranges = rangesByFootnoteId.get(id2) ?? [];
+              let rangesHeight = 0;
+              ranges.forEach((range) => {
+                const spacingAfter = "spacingAfter" in range ? range.spacingAfter ?? 0 : 0;
+                rangesHeight += range.height + spacingAfter;
+              });
+              columnDemand += rangesHeight + (idx > 0 ? safeGap : 0);
+            });
+            if (columnDemand > 0)
+              columnDemand += safeSeparatorSpacingBefore + safeDividerHeight + safeTopPadding;
+            if (columnDemand > demand)
+              demand = columnDemand;
+          }
+          const placementCeiling = demand > 0 ? Math.min(Math.ceil(demand), maxReserve) : maxReserve;
           const pendingForPage = /* @__PURE__ */ new Map;
           pendingByColumn.forEach((entries2, columnIndex) => {
             const targetIndex = columnIndex < columnCount ? columnIndex : Math.max(0, columnCount - 1);
@@ -253811,7 +253830,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
               const isFirstSlice = columnSlices.length === 0;
               const overhead = isFirstSlice ? (isFirstSlice ? safeSeparatorSpacingBefore : 0) + (isFirstSlice ? isContinuation ? continuationDividerHeight : safeDividerHeight : 0) + safeTopPadding : 0;
               const gapBefore = !isFirstSlice ? safeGap : 0;
-              const { slice: slice2, remainingRanges } = fitFootnoteContent(id2, ranges, Math.max(0, maxReserve - usedHeight - overhead - gapBefore), pageIndex, columnIndex, isContinuation, measuresById$1, isFirstSlice && maxReserve > 0);
+              const { slice: slice2, remainingRanges } = fitFootnoteContent(id2, ranges, Math.max(0, placementCeiling - usedHeight - overhead - gapBefore), pageIndex, columnIndex, isContinuation, measuresById$1, isFirstSlice && placementCeiling > 0);
               if (slice2.ranges.length === 0)
                 return {
                   placed: false,
@@ -254162,7 +254181,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       let reserves = plan.reserves;
       if (reserves.some((h$2) => h$2 > 0)) {
         let reservesStabilized = false;
-        const seenReserveKeys = new Set([reserves.join(",")]);
+        const seenReserveVectors = [reserves.slice()];
         for (let pass = 0;pass < MAX_FOOTNOTE_LAYOUT_PASSES; pass += 1) {
           layout = relayout(reserves);
           ({ columns: pageColumns, idsByColumn } = resolveFootnoteAssignments(layout));
@@ -254175,9 +254194,22 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
             break;
           }
           const nextKey = nextReserves.join(",");
-          if (seenReserveKeys.has(nextKey))
+          if (seenReserveVectors.some((v) => v.join(",") === nextKey)) {
+            const allVectors = [...seenReserveVectors, nextReserves];
+            const mergedLength = Math.max(...allVectors.map((v) => v.length));
+            const merged = new Array(mergedLength).fill(0);
+            for (const vec of allVectors)
+              for (let i4 = 0;i4 < mergedLength; i4 += 1)
+                if ((vec[i4] ?? 0) > merged[i4])
+                  merged[i4] = vec[i4];
+            reserves = merged;
+            layout = relayout(reserves);
+            ({ columns: pageColumns, idsByColumn } = resolveFootnoteAssignments(layout));
+            ({ measuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(idsByColumn)));
+            plan = computeFootnoteLayoutPlan(layout, idsByColumn, measuresById, reserves, pageColumns);
             break;
-          seenReserveKeys.add(nextKey);
+          }
+          seenReserveVectors.push(nextReserves.slice());
           if (pass < MAX_FOOTNOTE_LAYOUT_PASSES - 1)
             reserves = nextReserves;
         }
@@ -254186,11 +254218,25 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
         let { columns: finalPageColumns, idsByColumn: finalIdsByColumn } = resolveFootnoteAssignments(layout);
         let { blocks: finalBlocks, measuresById: finalMeasuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(finalIdsByColumn));
         let finalPlan = computeFootnoteLayoutPlan(layout, finalIdsByColumn, finalMeasuresById, reserves, finalPageColumns);
-        const finalReserves = finalPlan.reserves;
         let reservesAppliedToLayout = reserves;
-        if (finalReserves.length !== reserves.length || finalReserves.some((h$2, i4) => (reserves[i4] ?? 0) !== h$2) || reserves.some((h$2, i4) => (finalReserves[i4] ?? 0) !== h$2)) {
-          layout = relayout(finalReserves);
-          reservesAppliedToLayout = finalReserves;
+        const MAX_POST_PASSES = 3;
+        for (let postPass = 0;postPass < MAX_POST_PASSES; postPass += 1) {
+          const target = reservesAppliedToLayout.slice();
+          const planReserves = finalPlan.reserves;
+          const len3 = Math.max(target.length, planReserves.length);
+          let needsRelayout = false;
+          for (let i4 = 0;i4 < len3; i4 += 1) {
+            const applied = target[i4] ?? 0;
+            const needed = planReserves[i4] ?? 0;
+            if (needed > applied) {
+              target[i4] = needed;
+              needsRelayout = true;
+            }
+          }
+          if (!needsRelayout)
+            break;
+          layout = relayout(target);
+          reservesAppliedToLayout = target;
           ({ columns: finalPageColumns, idsByColumn: finalIdsByColumn } = resolveFootnoteAssignments(layout));
           ({ blocks: finalBlocks, measuresById: finalMeasuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(finalIdsByColumn)));
           finalPlan = computeFootnoteLayoutPlan(layout, finalIdsByColumn, finalMeasuresById, reservesAppliedToLayout, finalPageColumns);
@@ -277348,7 +277394,11 @@ var Node$13 = class Node$14 {
       this.#config.onStatusChange?.(status);
     }
   }
-}, FONT_FAMILY_FALLBACKS2, DEFAULT_GENERIC_FALLBACK2 = "sans-serif", normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean), splitOutsideQuotes = (str, delimiter) => {
+}, FONT_FAMILY_FALLBACKS2, DEFAULT_GENERIC_FALLBACK2 = "sans-serif", SERIF_LIKE_FONTS, normalizeFontNameForLookup = (fontName) => {
+  if (!fontName || typeof fontName !== "string")
+    return "";
+  return fontName.trim().replace(/^["']|["']$/g, "").toLowerCase();
+}, inferGenericFallbackFromFontName = (fontName) => SERIF_LIKE_FONTS.has(normalizeFontNameForLookup(fontName)) ? "serif" : DEFAULT_GENERIC_FALLBACK2, normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean), splitOutsideQuotes = (str, delimiter) => {
   if (!str.includes('"') && !str.includes("'"))
     return str.split(delimiter).map((p$12) => p$12.trim()).filter(Boolean);
   const parts = [];
@@ -290303,7 +290353,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_BXskIPkt_es = __esm(() => {
+var init_src_nnj_4GhR_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
@@ -315675,6 +315725,24 @@ function print() { __p += __j.call(arguments, '') }
     system: "system-ui",
     auto: "sans-serif"
   });
+  SERIF_LIKE_FONTS = new Set([
+    "cambria",
+    "cambria math",
+    "times",
+    "times new roman",
+    "georgia",
+    "garamond",
+    "palatino",
+    "palatino linotype",
+    "book antiqua",
+    "baskerville",
+    "cochin",
+    "hoefler text",
+    "minion pro",
+    "didot",
+    "bodoni mt",
+    "constantia"
+  ]);
   SERIES_COLORS = [
     "#4472C4",
     "#ED7D31",
@@ -325159,7 +325227,7 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BXskIPkt_es();
+  init_src_nnj_4GhR_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.7.0-next.34",
+  "version": "0.7.0-next.36",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.34",
-    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.34",
-    "@superdoc-dev/cli-linux-x64": "0.7.0-next.34",
-    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.34",
-    "@superdoc-dev/cli-windows-x64": "0.7.0-next.34"
+    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.36",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.36",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.36",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.36",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.36"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",