three-text 0.4.1 → 0.4.2

package/dist/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * three-text v0.4.1
+ * three-text v0.4.2
  * Copyright (C) 2025 Countertype LLC
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -218,6 +218,9 @@ class ActiveNodeList {
                 existing.previous = node.previous;
                 existing.hyphenated = node.hyphenated;
                 existing.line = node.line;
+                existing.cumWidth = node.cumWidth;
+                existing.cumStretch = node.cumStretch;
+                existing.cumShrink = node.cumShrink;
                 return true;
             }
             return false;
@@ -294,27 +297,6 @@ class LineBreak {
             return FitnessClass.LOOSE; // stretching 0.5-1.0
         return FitnessClass.VERY_LOOSE; // stretching > 1.0
     }
-    // Build prefix sums so we can quickly compute the width/stretch/shrink
-    // of any range [a, b] as cumulative[b] - cumulative[a]
-    static computeCumulativeWidths(items) {
-        const n = items.length + 1;
-        const width = new Float64Array(n);
-        const stretch = new Float64Array(n);
-        const shrink = new Float64Array(n);
-        for (let i = 0; i < items.length; i++) {
-            const item = items[i];
-            width[i + 1] = width[i] + item.width;
-            if (item.type === ItemType.GLUE) {
-                stretch[i + 1] = stretch[i] + item.stretch;
-                shrink[i + 1] = shrink[i] + item.shrink;
-            }
-            else {
-                stretch[i + 1] = stretch[i];
-                shrink[i + 1] = shrink[i];
-            }
-        }
-        return { width, stretch, shrink };
-    }
     static findHyphenationPoints(word, language = 'en-us', availablePatterns, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN) {
         let patternTrie;
         if (availablePatterns && availablePatterns[language]) {
@@ -734,9 +716,8 @@ class LineBreak {
     // TeX: line_break inner loop (tex.web lines 16169-17256)
     // Finds optimal breakpoints using Knuth-Plass algorithm
     static lineBreak(items, lineWidth, threshold, emergencyStretch, context) {
-        const cumulative = this.computeCumulativeWidths(items);
         const activeNodes = new ActiveNodeList();
-        // Start node
+        // Start node with zero cumulative width
         activeNodes.insert({
             position: 0,
             line: 0,
@@ -745,8 +726,15 @@ class LineBreak {
             previous: null,
             hyphenated: false,
             active: true,
-            activeIndex: 0
+            activeIndex: 0,
+            cumWidth: 0,
+            cumStretch: 0,
+            cumShrink: 0
         });
+        // Cumulative width from paragraph start, representing items[0..i-1]
+        let cumWidth = 0;
+        let cumStretch = 0;
+        let cumShrink = 0;
         // Process each item
         for (let i = 0; i < items.length; i++) {
             const item = items[i];
@@ -757,8 +745,22 @@ class LineBreak {
                 (item.type === ItemType.GLUE &&
                     i > 0 &&
                     items[i - 1].type === ItemType.BOX);
-            if (!isBreakpoint)
+            if (!isBreakpoint) {
+                // Accumulate width for non-breakpoint items
+                if (item.type === ItemType.BOX) {
+                    cumWidth += item.width;
+                }
+                else if (item.type === ItemType.GLUE) {
+                    const glue = item;
+                    cumWidth += glue.width;
+                    cumStretch += glue.stretch;
+                    cumShrink += glue.shrink;
+                }
+                else if (item.type === ItemType.DISCRETIONARY) {
+                    cumWidth += item.width;
+                }
                 continue;
+            }
             // Get penalty and flagged status
             let pi = 0;
             let flagged = false;
@@ -780,18 +782,14 @@ class LineBreak {
             const bestDemerits = [Infinity, Infinity, Infinity, Infinity];
             // Nodes to deactivate
             const toDeactivate = [];
-            // Current cumulative values at position i
-            const curWidth = cumulative.width[i];
-            const curStretch = cumulative.stretch[i];
-            const curShrink = cumulative.shrink[i];
             // Try each active node as predecessor
             const active = activeNodes.getActive();
             for (let j = 0; j < active.length; j++) {
                 const a = active[j];
-                // Line width from a to i using cumulative arrays
-                const lineW = curWidth - cumulative.width[a.position] + breakWidth;
-                const lineStretch = curStretch - cumulative.stretch[a.position];
-                const lineShrink = curShrink - cumulative.shrink[a.position];
+                // Line width from a to i
+                const lineW = cumWidth - a.cumWidth + breakWidth;
+                const lineStretch = cumStretch - a.cumStretch;
+                const lineShrink = cumShrink - a.cumShrink;
                 const shortfall = lineWidth - lineW;
                 let ratio;
                 if (shortfall > 0) {
@@ -847,7 +845,10 @@ class LineBreak {
                         previous: a,
                         hyphenated: flagged,
                         active: true,
-                        activeIndex: -1
+                        activeIndex: -1,
+                        cumWidth: cumWidth,
+                        cumStretch: cumStretch,
+                        cumShrink: cumShrink
                     };
                 }
             }
@@ -864,6 +865,19 @@ class LineBreak {
             if (activeNodes.size() === 0 && pi !== EJECT_PENALTY) {
                 return null;
             }
+            // Accumulate width after evaluating this breakpoint
+            if (item.type === ItemType.BOX) {
+                cumWidth += item.width;
+            }
+            else if (item.type === ItemType.GLUE) {
+                const glue = item;
+                cumWidth += glue.width;
+                cumStretch += glue.stretch;
+                cumShrink += glue.shrink;
+            }
+            else if (item.type === ItemType.DISCRETIONARY) {
+                cumWidth += item.width;
+            }
         }
         // Find best solution
         let best = null;

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * three-text v0.4.1
+ * three-text v0.4.2
  * Copyright (C) 2025 Countertype LLC
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -215,6 +215,9 @@ class ActiveNodeList {
                 existing.previous = node.previous;
                 existing.hyphenated = node.hyphenated;
                 existing.line = node.line;
+                existing.cumWidth = node.cumWidth;
+                existing.cumStretch = node.cumStretch;
+                existing.cumShrink = node.cumShrink;
                 return true;
             }
             return false;
@@ -291,27 +294,6 @@ class LineBreak {
             return FitnessClass.LOOSE; // stretching 0.5-1.0
         return FitnessClass.VERY_LOOSE; // stretching > 1.0
     }
-    // Build prefix sums so we can quickly compute the width/stretch/shrink
-    // of any range [a, b] as cumulative[b] - cumulative[a]
-    static computeCumulativeWidths(items) {
-        const n = items.length + 1;
-        const width = new Float64Array(n);
-        const stretch = new Float64Array(n);
-        const shrink = new Float64Array(n);
-        for (let i = 0; i < items.length; i++) {
-            const item = items[i];
-            width[i + 1] = width[i] + item.width;
-            if (item.type === ItemType.GLUE) {
-                stretch[i + 1] = stretch[i] + item.stretch;
-                shrink[i + 1] = shrink[i] + item.shrink;
-            }
-            else {
-                stretch[i + 1] = stretch[i];
-                shrink[i + 1] = shrink[i];
-            }
-        }
-        return { width, stretch, shrink };
-    }
     static findHyphenationPoints(word, language = 'en-us', availablePatterns, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN) {
         let patternTrie;
         if (availablePatterns && availablePatterns[language]) {
@@ -731,9 +713,8 @@ class LineBreak {
     // TeX: line_break inner loop (tex.web lines 16169-17256)
     // Finds optimal breakpoints using Knuth-Plass algorithm
     static lineBreak(items, lineWidth, threshold, emergencyStretch, context) {
-        const cumulative = this.computeCumulativeWidths(items);
         const activeNodes = new ActiveNodeList();
-        // Start node
+        // Start node with zero cumulative width
         activeNodes.insert({
             position: 0,
             line: 0,
@@ -742,8 +723,15 @@ class LineBreak {
             previous: null,
             hyphenated: false,
             active: true,
-            activeIndex: 0
+            activeIndex: 0,
+            cumWidth: 0,
+            cumStretch: 0,
+            cumShrink: 0
         });
+        // Cumulative width from paragraph start, representing items[0..i-1]
+        let cumWidth = 0;
+        let cumStretch = 0;
+        let cumShrink = 0;
         // Process each item
         for (let i = 0; i < items.length; i++) {
             const item = items[i];
@@ -754,8 +742,22 @@ class LineBreak {
                 (item.type === ItemType.GLUE &&
                     i > 0 &&
                     items[i - 1].type === ItemType.BOX);
-            if (!isBreakpoint)
+            if (!isBreakpoint) {
+                // Accumulate width for non-breakpoint items
+                if (item.type === ItemType.BOX) {
+                    cumWidth += item.width;
+                }
+                else if (item.type === ItemType.GLUE) {
+                    const glue = item;
+                    cumWidth += glue.width;
+                    cumStretch += glue.stretch;
+                    cumShrink += glue.shrink;
+                }
+                else if (item.type === ItemType.DISCRETIONARY) {
+                    cumWidth += item.width;
+                }
                 continue;
+            }
             // Get penalty and flagged status
             let pi = 0;
             let flagged = false;
@@ -777,18 +779,14 @@ class LineBreak {
             const bestDemerits = [Infinity, Infinity, Infinity, Infinity];
             // Nodes to deactivate
             const toDeactivate = [];
-            // Current cumulative values at position i
-            const curWidth = cumulative.width[i];
-            const curStretch = cumulative.stretch[i];
-            const curShrink = cumulative.shrink[i];
             // Try each active node as predecessor
             const active = activeNodes.getActive();
             for (let j = 0; j < active.length; j++) {
                 const a = active[j];
-                // Line width from a to i using cumulative arrays
-                const lineW = curWidth - cumulative.width[a.position] + breakWidth;
-                const lineStretch = curStretch - cumulative.stretch[a.position];
-                const lineShrink = curShrink - cumulative.shrink[a.position];
+                // Line width from a to i
+                const lineW = cumWidth - a.cumWidth + breakWidth;
+                const lineStretch = cumStretch - a.cumStretch;
+                const lineShrink = cumShrink - a.cumShrink;
                 const shortfall = lineWidth - lineW;
                 let ratio;
                 if (shortfall > 0) {
@@ -844,7 +842,10 @@ class LineBreak {
                         previous: a,
                         hyphenated: flagged,
                         active: true,
-                        activeIndex: -1
+                        activeIndex: -1,
+                        cumWidth: cumWidth,
+                        cumStretch: cumStretch,
+                        cumShrink: cumShrink
                     };
                 }
             }
@@ -861,6 +862,19 @@ class LineBreak {
             if (activeNodes.size() === 0 && pi !== EJECT_PENALTY) {
                 return null;
             }
+            // Accumulate width after evaluating this breakpoint
+            if (item.type === ItemType.BOX) {
+                cumWidth += item.width;
+            }
+            else if (item.type === ItemType.GLUE) {
+                const glue = item;
+                cumWidth += glue.width;
+                cumStretch += glue.stretch;
+                cumShrink += glue.shrink;
+            }
+            else if (item.type === ItemType.DISCRETIONARY) {
+                cumWidth += item.width;
+            }
         }
         // Find best solution
         let best = null;