superdoc-dev
diff --git a/‎packages/layout-engine/layout-bridge/src/remeasure.ts‎
Lines changed: 58 additions & 11 deletions b/‎packages/layout-engine/layout-bridge/src/remeasure.ts‎
Lines changed: 58 additions & 11 deletions
@@ -789,14 +789,49 @@ const applyTabLayoutToLines = (
   const alignmentTabStopsPx = tabStops
     .map((stop, index) => ({ stop, index }))
     .filter(({ stop }) => stop.val === 'end' || stop.val === 'center' || stop.val === 'decimal');
+
+  // Per-line-segment tab counts. Segments are delimited by explicit <w:br/> because
+  // pPr/tabs apply per line, not per paragraph. sd-1480: "Page\t2<br/>Page\t5" must
+  // bind the trailing tab of EACH segment to the alignment stop, not just the
+  // paragraph-final tab.
+  const tabSegmentInfo = new Map<number, { localOrdinal: number; segmentTotal: number }>();
+  {
+    let segmentTabRunIndices: number[] = [];
+    const closeSegment = () => {
+      const total = segmentTabRunIndices.length;
+      segmentTabRunIndices.forEach((runIdx, ord) => {
+        tabSegmentInfo.set(runIdx, { localOrdinal: ord, segmentTotal: total });
+      });
+      segmentTabRunIndices = [];
+    };
+    for (let i = 0; i < runs.length; i++) {
+      const r = runs[i];
+      if (r.kind === 'lineBreak' || (r.kind === 'break' && (r as { breakType?: string }).breakType === 'line')) {
+        closeSegment();
+      } else if (r.kind === 'tab') {
+        segmentTabRunIndices.push(i);
+      }
+    }
+    closeSegment();
+  }
+
   // Word-compat heuristic (not ECMA-376 17.3.3.32): the last N tab characters in a
-  // paragraph bind to the last N explicit end/center/decimal stops. Needed for TOC
+  // line bind to the last N explicit end/center/decimal stops. Needed for TOC
   // entries where a right-aligned dot-leader stop coexists with default grid stops.
   // Mirrored in measuring/dom/src/index.ts.
-  const getAlignmentStopForOrdinal = (ordinal: number): { stop: TabStopPx; index: number } | null => {
+  const getAlignmentStopForOrdinal = (ordinal: number, runIdx?: number): { stop: TabStopPx; index: number } | null => {
     if (alignmentTabStopsPx.length === 0 || totalTabRuns === 0 || !Number.isFinite(ordinal)) return null;
-    if (ordinal < 0 || ordinal >= totalTabRuns) return null;
-    const remainingTabs = totalTabRuns - ordinal - 1;
+    let scopeOrdinal = ordinal;
+    let scopeTotal = totalTabRuns;
+    if (runIdx !== undefined) {
+      const info = tabSegmentInfo.get(runIdx);
+      if (info) {
+        scopeOrdinal = info.localOrdinal;
+        scopeTotal = info.segmentTotal;
+      }
+    }
+    if (scopeOrdinal < 0 || scopeOrdinal >= scopeTotal) return null;
+    const remainingTabs = scopeTotal - scopeOrdinal - 1;
     const targetIndex = alignmentTabStopsPx.length - 1 - remainingTabs;
     if (targetIndex < 0 || targetIndex >= alignmentTabStopsPx.length) return null;
     return alignmentTabStopsPx[targetIndex];
@@ -828,22 +863,34 @@ const applyTabLayoutToLines = (
     /**
      * Processes a tab character, calculating position and handling alignment.
      */
-    const applyTab = (startRunIndex: number, startChar: number, run?: Run, tabOrdinal?: number): void => {
+    const applyTab = (
+      startRunIndex: number,
+      startChar: number,
+      run?: Run,
+      tabOrdinal?: number,
+      tabRunIdx?: number,
+    ): void => {
       const originX = cursorX;
       const absCurrentX = cursorX + effectiveIndent;
       let stop: TabStopPx | undefined;
       let target: number;
+      // Mirror of measuring/dom: only force the SD-2447 heuristic when greedy
+      // would land on a `source:default` stop (synthetic 0.5" grid). Explicit
+      // start stops should win greedy.
+      const greedy = getNextTabStopPx(absCurrentX, tabStops, tabStopCursor);
+      const greedyOnDefault = greedy.stop?.source === 'default';
       const forcedAlignment =
-        typeof tabOrdinal === 'number' && Number.isFinite(tabOrdinal) ? getAlignmentStopForOrdinal(tabOrdinal) : null;
+        greedyOnDefault && typeof tabOrdinal === 'number' && Number.isFinite(tabOrdinal)
+          ? getAlignmentStopForOrdinal(tabOrdinal, tabRunIdx)
+          : null;
       if (forcedAlignment && forcedAlignment.stop.pos > absCurrentX + TAB_EPSILON) {
         stop = forcedAlignment.stop;
         target = forcedAlignment.stop.pos;
         tabStopCursor = forcedAlignment.index + 1;
       } else {
-        const next = getNextTabStopPx(absCurrentX, tabStops, tabStopCursor);
-        stop = next.stop;
-        target = next.target;
-        tabStopCursor = next.nextIndex;
+        stop = greedy.stop;
+        target = greedy.target;
+        tabStopCursor = greedy.nextIndex;
       }
       const clampedTarget = Number.isFinite(maxAbsWidth) ? Math.min(target, maxAbsWidth) : target;
       const relativeTarget = clampedTarget - effectiveIndent;
@@ -901,7 +948,7 @@ const applyTabLayoutToLines = (
       if (run.kind === 'tab') {
         const tabRun = run as TabRun;
         const ordinal = consumeTabOrdinal(tabRun.tabIndex);
-        applyTab(runIndex + 1, 0, run, ordinal);
+        applyTab(runIndex + 1, 0, run, ordinal, runIndex);
         continue;
       }