@mlightcad/mtext-renderer 0.10.15 → 0.10.16

package/lib/font/shxFont.d.ts

@@ -32,31 +32,8 @@ export declare class ShxFont extends BaseFont {
     getSpaceAdvance(size: number): number;
     generateShapes(text: string, size: number): ShxTextShape[];
     /**
-     * Scale factor that converts AutoCAD's `TEXT.height` (cap-height in the SHX
-     * convention) into the em-box-scaled size expected by `generateShapes`.
-     *
-     * SHX glyphs are defined with `baseUp` units of cap-height (height of an
-     * uppercase letter above the baseline) and `height` units of total em-box
-     * (cap-height + descender + headroom for accents). AutoCAD's DXF group 40
-     * for TEXT/ATTRIB/MTEXT is the cap-height — the historical SHX convention
-     * since the format's introduction in AutoCAD R2 (1985), kept by AutoCAD
-     * when TrueType support was added in the early 1990s so that DWGs portable
-     * across font formats render at consistent visual sizes.
-     *
-     * Returning `1` (the previous behavior) meant SHX glyphs were rendered at
-     * `baseUp / height` of the expected size — typically ~0.75 for western
-     * fonts like `romans.shx`/`complex.shx` where `baseUp=21, height=28`.
-     * Multiplying by `height / baseUp` restores the cap-height interpretation.
-     *
-     * Mirrors the behavior already in place for mesh fonts (see
-     * `meshFontParser.ts` where `scaleFactor = unitsPerEm / glyph('A').yMax`),
-     * isolated to the glyph render path only — `mtextProcessor.currentLayoutFontSize`
-     * divides by this factor to keep layout metrics (line height, attachment
-     * offsets, blank width) on the original cap-height scale.
-     *
-     * @returns `height / baseUp` when both are populated and positive; `1`
-     *   otherwise (e.g. exotic BIGFONT/symbol fonts without standard metrics),
-     *   matching the prior behavior as a safe fallback.
+     * SHX font always has fixed scale factor 1.
+     * @returns Always return value 1
      */
     getScaleFactor(): number;
     /**

package/lib/renderer/colorUtils.d.ts

@@ -1,2 +1,10 @@
 import { ColorSettings } from './types';
 export declare function resolveMTextColor(colorSettings: ColorSettings): number;
+/**
+ * Rebuild ColorSettings for a worker-deserialized glyph material.
+ *
+ * Worker meshes already carry the final resolved RGB in their serialized
+ * material. When the entity base color is ByLayer, preserve that semantic only
+ * for glyphs that match the layer fallback color.
+ */
+export declare function buildWorkerMaterialColorSettings(base: ColorSettings, resolvedColor: number, baseByLayer: boolean): ColorSettings;

package/lib/renderer/index.d.ts

@@ -1,5 +1,6 @@
 export * from './colorUtils';
 export * from './constants';
 export * from './mtext';
+export * from './mtextDataUtils';
 export * from './styleManager';
 export * from './types';

package/lib/renderer/mtextDataUtils.d.ts

@@ -0,0 +1,27 @@
+import { MTextData } from './types';
+/**
+ * Minimum width-to-height ratio for a declared MTEXT wrap box to be treated as
+ * a real column width rather than a mistaken width factor or other bad DXF value.
+ */
+export declare const MIN_REASONABLE_MTEXT_WIDTH_HEIGHT_RATIO = 1.5;
+/**
+ * Conservative CJK full-width glyph advance as a fraction of cap height, used
+ * only when estimating a replacement wrap width from explicit line content.
+ */
+export declare const CJK_MTEXT_CHAR_WIDTH_HEIGHT_RATIO = 0.8;
+/**
+ * Estimates a usable MTEXT wrap width from the longest explicit line in the raw
+ * MTEXT string while preserving explicit line breaks such as `\P`.
+ */
+export declare function estimateMTextWrapWidth(text: string, height: number): number;
+/**
+ * Resolves the MTEXT wrap width used for layout and anchoring.
+ *
+ * Some CAD files contain MTEXT group-code 41 values that are smaller than a
+ * single glyph height, usually because the value came from a text width factor
+ * instead of an actual wrapping box width. Treating that tiny positive value as
+ * the word-wrap width forces CJK text to wrap one character per line. When the
+ * width is clearly impossible as a layout width, estimate a usable width from
+ * the longest explicit MTEXT line and preserve explicit line breaks such as `\P`.
+ */
+export declare function resolveMTextWrapWidth(mtextData: Pick<MTextData, 'text' | 'height' | 'width'>): number;

package/lib/renderer/mtextProcessor.d.ts

@@ -59,6 +59,7 @@ export declare class MTextProcessor {
     private _options;
     private _totalHeight;
     private _hOffset;
+    private _maxLineAdvance;
     private _vOffset;
     private _lineCount;
     private _currentLineObjects;
@@ -103,6 +104,13 @@ export declare class MTextProcessor {
      * The maximum width of one text line
      */
     get maxWidth(): number;
+    /**
+     * Maximum logical pen advance across processed visual lines.
+     *
+     * Unlike visible geometry bounds, this keeps the text insertion origin tied to
+     * the layout pen position even when glyphs have side bearings or overhangs.
+     */
+    get maxLineAdvance(): number;
     /**
      * The direction that the text string follows from its start to its finish.
      */
@@ -299,6 +307,7 @@ export declare class MTextProcessor {
      */
     private getCharShape;
     private advanceToNextLine;
+    private captureCurrentLineAdvance;
     private countFinalCharBoxes;
     private applyPendingEmptyLineYAdjust;
     private resolveCharBoxTarget;

package/lib/worker/webWorkerRenderer.d.ts

@@ -179,7 +179,6 @@ export declare class WebWorkerRenderer implements MTextBaseRenderer {
      * Reconstruct MText object from JSON serialized data
      */
     reconstructMText(serializedData: SerializedMText, colorSettings: ColorSettings): MTextObject;
-    private buildMaterialColorSettings;
     private deserializeCharBoxes;
     private collectLayout;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlightcad/mtext-renderer",
-  "version": "0.10.15",
+  "version": "0.10.16",
   "description": "AutoCAD MText renderer based on Three.js",
   "license": "MIT",
   "author": "MLight Lee <mlight.lee@outlook.com>",