@metamesh/modeling 0.7.0 → 0.8.0

package/dist/text/vector-text-layout.js

@@ -22,13 +22,33 @@ function checkText(text) {
     return lines;
 }
 function normalizeControls(options, staticWeight) {
+    const baseline = options.baseline;
+    if (baseline !== undefined) {
+        if (typeof baseline !== "object" || baseline === null || baseline.kind !== "arc")
+            fail("Invalid text baseline; use an arc or omit baseline for horizontal text.");
+        if (!Number.isFinite(baseline.radius) || baseline.radius <= 0 || baseline.radius > 10000)
+            fail("Arc baseline radius must be positive and at most 10000 mm.");
+        if (baseline.centerAngleDegrees !== undefined && !Number.isFinite(baseline.centerAngleDegrees))
+            fail("Arc baseline centerAngleDegrees must be finite.");
+        if (baseline.direction !== undefined &&
+            baseline.direction !== "clockwise" &&
+            baseline.direction !== "counterclockwise")
+            fail("Invalid arc baseline direction.");
+    }
     const controls = {
         fontSize: options.fontSize,
         fontWeight: options.fontWeight ?? staticWeight,
         letterSpacing: options.letterSpacing ?? 0,
-        align: options.align ?? "left",
+        align: options.align ?? (baseline === undefined ? "left" : "center"),
         verticalAlign: options.verticalAlign ?? "baseline",
         lineHeight: options.lineHeight,
+        baseline: baseline === undefined
+            ? undefined
+            : {
+                radius: baseline.radius,
+                centerAngleDegrees: (((baseline.centerAngleDegrees ?? 90) % 360) + 360) % 360,
+                direction: baseline.direction ?? "clockwise",
+            },
     };
     if (!Number.isFinite(controls.fontSize) || controls.fontSize <= 0 || controls.fontSize > 10000)
         fail("fontSize must be positive and at most 10000 mm.");
@@ -45,6 +65,8 @@ function normalizeControls(options, staticWeight) {
         controls.verticalAlign !== "center" &&
         controls.verticalAlign !== "bottom")
         fail("Invalid vertical text alignment.");
+    if (controls.baseline !== undefined && controls.verticalAlign !== "baseline")
+        fail("Arc text requires baseline vertical alignment.");
     if (controls.lineHeight !== undefined &&
         (!Number.isFinite(controls.lineHeight) || controls.lineHeight < 0.5 || controls.lineHeight > 5))
         fail("lineHeight must be between 0.5 and 5.");
@@ -189,6 +211,8 @@ function buildLayout(font, fontMetrics, lines, controls) {
     let commands = 0;
     for (let lineIndex = 0; lineIndex < shaped.length; lineIndex++) {
         const { run, advanceWidth } = shaped[lineIndex];
+        if (controls.baseline !== undefined && advanceWidth / controls.baseline.radius >= Math.PI * 2)
+            fail("Arc text must span less than one full revolution. Increase radius or reduce text size or spacing.");
         const lineX = controls.align === "center"
             ? -advanceWidth / 2
             : controls.align === "right"
@@ -197,11 +221,16 @@ function buildLayout(font, fontMetrics, lines, controls) {
         let x = 0;
         let y = 0;
         let spacingSteps = -1;
+        let groupCenter = 0;
         for (let index = 0; index < run.glyphs.length; index++) {
             const position = run.positions[index];
             // Zero-advance marks retain their base glyph's tracking offset.
-            if (index === 0 || position.xAdvance !== 0)
+            if (index === 0 || position.xAdvance !== 0) {
                 spacingSteps++;
+                // Keep zero-advance marks on the same rigid frame as their advancing base glyph.
+                groupCenter =
+                    (x + position.xAdvance / 2) * scale + spacingSteps * controls.letterSpacing + lineX;
+            }
             const source = run.glyphs[index].path.commands;
             commands += source.length;
             if (commands > MAX_TEXT_COMMANDS)
@@ -209,9 +238,21 @@ function buildLayout(font, fontMetrics, lines, controls) {
             if (source.length > 0) {
                 // Preserve full precision: fontkit's toSVG() rounds before scaling and reparsing it wastes work.
                 const path = new SVGPathData(source.map(convertCommand)).transform(SVGPathDataTransformer.MATRIX(scale, 0, 0, scale, (x + position.xOffset) * scale + spacingSteps * controls.letterSpacing + lineX, (y + position.yOffset) * scale - lineIndex * lineHeight));
-                const bounds = path.getBounds();
+                let bounds = path.getBounds();
                 if (![bounds.minX, bounds.minY, bounds.maxX, bounds.maxY].every(Number.isFinite))
                     fail("The font returned invalid glyph outline bounds.");
+                if (controls.baseline !== undefined) {
+                    const { radius, centerAngleDegrees, direction } = controls.baseline;
+                    const clockwise = direction === "clockwise";
+                    if (clockwise ? radius + bounds.minY <= 0 : radius - bounds.maxY <= 0)
+                        fail("Arc glyph outlines cross the circle's center axis. Increase the radius or reduce text size.");
+                    const angle = (centerAngleDegrees * Math.PI) / 180 + ((clockwise ? -1 : 1) * groupCenter) / radius;
+                    const rotation = angle + (clockwise ? -Math.PI / 2 : Math.PI / 2);
+                    const cosine = Math.cos(rotation);
+                    const sine = Math.sin(rotation);
+                    path.transform(SVGPathDataTransformer.MATRIX(cosine, sine, -sine, cosine, radius * Math.cos(angle) - cosine * groupCenter, radius * Math.sin(angle) - sine * groupCenter));
+                    bounds = path.getBounds();
+                }
                 minX = Math.min(minX, bounds.minX);
                 minY = Math.min(minY, bounds.minY);
                 maxX = Math.max(maxX, bounds.maxX);
@@ -261,6 +302,8 @@ export function createVectorTextLayout(font, staticWeight) {
     return (text, options) => {
         const lines = checkText(text);
         const controls = normalizeControls(options, staticWeight);
+        if (controls.baseline !== undefined && lines.length !== 1)
+            fail("Arc text supports exactly one line.");
         const key = JSON.stringify([lines, controls]);
         if (previous?.key === key)
             return previous.layout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamesh/modeling",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Scoped solid modeling and pure geometry foundations for Node and browsers.",
   "license": "Apache-2.0",
   "repository": {