cvdl-ts 1.0.26 → 1.0.27

package/dist/Elem.js

@@ -354,12 +354,13 @@ function bind(t, bindings) {
     return result;
 }
 function instantiate(e, section, fields, bindings) {
+    var _a;
     e = bind(e, bindings);
     if (!e.is_ref) {
         return e;
     }
     const itemType = fields.find((f) => f.name === e.item);
-    if ((itemType === null || itemType === void 0 ? void 0 : itemType.type.tag) === "MarkdownString") {
+    if (((_a = itemType === null || itemType === void 0 ? void 0 : itemType.type) === null || _a === void 0 ? void 0 : _a.tag) === "MarkdownString") {
         e.is_markdown = true;
     }
     const text = section.fields[e.item];

package/dist/Layout.js

@@ -261,25 +261,27 @@ function computeTextboxPositions(l, top_left, font_dict) {
             top_left = top_left.move_y_by(row.margin.top).move_x_by(row.margin.left);
             const originalTopLeft = top_left;
             let per_elem_space = 0.0;
+            const rowElementsWidth = Row.elementsWidth(row);
             switch (row.alignment) {
                 case "Center":
-                    top_left = top_left.move_x_by((Width.get_fixed_unchecked(row.width) - Row.elementsWidth(row)) /
-                        2.0);
+                    top_left = top_left.move_x_by((Width.get_fixed_unchecked(row.width) - rowElementsWidth) / 2.0);
                     break;
                 case "Right":
-                    top_left = top_left.move_x_by(Width.get_fixed_unchecked(row.width) - Row.elementsWidth(row));
+                    top_left = top_left.move_x_by(Width.get_fixed_unchecked(row.width) - rowElementsWidth);
                     break;
                 case "Justified":
-                    per_elem_space =
-                        (Width.get_fixed_unchecked(row.width) - Row.elementsWidth(row)) /
-                            (row.elements.length - 1);
+                    if (row.elements.length > 1) {
+                        per_elem_space =
+                            (Width.get_fixed_unchecked(row.width) - rowElementsWidth) /
+                                (row.elements.length - 1);
+                    }
                     break;
             }
             const renderedElements = [];
             for (const element of row.elements) {
                 const result = computeTextboxPositions(element, top_left, font_dict);
                 depth = Math.max(depth, result.depth);
-                top_left = top_left.move_x_by(Width.get_fixed_unchecked(element.width) + per_elem_space);
+                top_left = top_left.move_x_by(Row.elementOuterWidth(element) + per_elem_space);
                 renderedElements.push(result.renderedLayout);
             }
             depth += row.margin.bottom;
@@ -304,15 +306,16 @@ function computeTextboxPositions(l, top_left, font_dict) {
                 .move_y_by(elem.margin.top)
                 .move_x_by(elem.margin.left);
             let line = 1;
-            let cursor = top_left.x;
+            let cursor = 0;
+            const maxLineWidth = Width.get_fixed_unchecked(elem.width) - elem.margin.right;
+            const wrapTolerance = 1e-6;
             elem.spans.forEach((span) => {
-                if (cursor - top_left.x + span.width >
-                    Width.get_fixed_unchecked(elem.width) - elem.margin.right ||
+                if (cursor + span.width > maxLineWidth + wrapTolerance ||
                     span.text === "\n\n") {
-                    cursor = top_left.x;
+                    cursor = 0;
                     line += 1;
                 }
-                span.bbox = new Box_1.Box(new Point_1.Point(cursor - top_left.x, (line - 1) * height), new Point_1.Point(cursor + span.width, line * height));
+                span.bbox = new Box_1.Box(new Point_1.Point(cursor, (line - 1) * height), new Point_1.Point(cursor + span.width, line * height));
                 span.line = line;
                 cursor += span.width;
             });

package/dist/Row.d.ts

@@ -17,6 +17,7 @@ export declare function from(w: Optional<Row>): Row;
 export declare function row(elements: Layout.t[], margin: Margin.t, alignment: Alignment.t, width: Width.t, is_frozen: boolean, is_fill: boolean): Row;
 export declare function default_(): Row;
 export declare function elementsWidth(r: Row): number;
+export declare function elementOuterWidth(e: Layout.t): number;
 export declare function boundWidth(r: Row, width: number): Row;
 export declare function scaleWidth(r: Row, w: number): Row;
 export {};

package/dist/Row.js

@@ -27,6 +27,7 @@ exports.from = from;
 exports.row = row;
 exports.default_ = default_;
 exports.elementsWidth = elementsWidth;
+exports.elementOuterWidth = elementOuterWidth;
 exports.boundWidth = boundWidth;
 exports.scaleWidth = scaleWidth;
 const Margin = __importStar(require("./Margin"));
@@ -60,9 +61,10 @@ function default_() {
     };
 }
 function elementsWidth(r) {
-    return r.elements
-        .map((e) => Width.get_fixed_unchecked(e.width))
-        .reduce((a, b) => a + b, 0.0);
+    return r.elements.map(elementOuterWidth).reduce((a, b) => a + b, 0.0);
+}
+function elementOuterWidth(e) {
+    return e.margin.left + Width.get_fixed_unchecked(e.width) + e.margin.right;
 }
 function boundWidth(r, width) {
     const bound = r.width.tag === "Absolute"
@@ -73,7 +75,32 @@ function boundWidth(r, width) {
     if (bound === null) {
         throw new Error("Cannot bound width of non-unitized widths!");
     }
-    return row(r.elements.map((e) => Layout.boundWidth(e, bound)), r.margin, r.alignment, Width.absolute(bound), r.is_frozen, Width.is_fill(r.width));
+    const fixedWidths = r.elements.map((e) => {
+        switch (e.width.tag) {
+            case "Fill":
+                return null;
+            case "Absolute":
+                return Math.min(e.width.value, bound);
+            case "Percent":
+                // Row children are usually scaled before bounding, but this keeps
+                // direct boundWidth() calls stable if Percent widths appear.
+                return Math.min((e.width.value * bound) / 100.0, bound);
+        }
+    });
+    const totalFixedOuterWidth = fixedWidths.reduce((acc, next, index) => next === null
+        ? acc
+        : acc + r.elements[index].margin.left + next + r.elements[index].margin.right, 0);
+    const fillElementCount = fixedWidths.filter((next) => next === null).length;
+    const totalFillMargins = fixedWidths.reduce((acc, next, index) => next === null
+        ? acc +
+            r.elements[index].margin.left +
+            r.elements[index].margin.right
+        : acc, 0);
+    const fillWidth = fillElementCount > 0
+        ? Math.max(0, bound - totalFixedOuterWidth - totalFillMargins) /
+            fillElementCount
+        : 0;
+    return row(r.elements.map((e, index) => { var _a; return Layout.boundWidth(e, (_a = fixedWidths[index]) !== null && _a !== void 0 ? _a : fillWidth); }), r.margin, r.alignment, Width.absolute(bound), r.is_frozen, Width.is_fill(r.width));
 }
 function scaleWidth(r, w) {
     return (0, Utils_1.with_)(r, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cvdl-ts",
-	"version": "1.0.26",
+	"version": "1.0.27",
 	"description": "Typescript Implementation of CVDL Compiler",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",