@mlightcad/mtext-renderer 0.10.14 → 0.10.16

package/lib/font/shxFont.d.ts

@@ -24,6 +24,12 @@ export declare class ShxFont extends BaseFont {
      * @returns True if this font contains glyph of the specified character code. Otherwise, return false.
      */
     hasCode(code: number): boolean;
+    /**
+     * Horizontal advance for the space character (ASCII 32) at the given size.
+     * Uses the SHX glyph pen advance when defined; otherwise falls back to half the
+     * text height (common for AutoCAD SHX fonts).
+     */
+    getSpaceAdvance(size: number): number;
     generateShapes(text: string, size: number): ShxTextShape[];
     /**
      * SHX font always has fixed scale factor 1.

package/lib/font/shxTextShape.d.ts

@@ -19,6 +19,16 @@ export declare class ShxTextShape extends BaseTextShape {
      * @param shape - The shape data for this character
      */
     constructor(code: number, fontSize: number, shape: ShxShape, font: ShxFont);
+    /**
+     * Resolves horizontal advance for SHX glyphs.
+     *
+     * - Unicode / shapes fonts: prefer the pen-down end X (lastPoint), which matches
+     *   AutoCAD's advance for single-byte SHX.
+     * - Big fonts (CJK): advance is the scaled font cell width (content.width /
+     *   content.height * fontSize). Glyph bbox or lastPoint can be narrower than the
+     *   cell; using only bbox caused successive Han characters to overlap visually.
+     */
+    private resolveAdvanceWidth;
     protected calcWidth(): number;
     offset(offset: Point): ShxTextShape;
     /**

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.
      */
@@ -166,6 +174,8 @@ export declare class MTextProcessor {
      * The current scale factor of character width
      */
     get currentWidthFactor(): number;
+    /** Horizontal advance for one space, including tracking and width factor. */
+    get currentBlankAdvance(): number;
     /**
      * All of THREE.js objects in current line. It contains objects in all of sections of this line.
      */
@@ -297,6 +307,7 @@ export declare class MTextProcessor {
      */
     private getCharShape;
     private advanceToNextLine;
+    private captureCurrentLineAdvance;
     private countFinalCharBoxes;
     private applyPendingEmptyLineYAdjust;
     private resolveCharBoxTarget;
@@ -305,14 +316,11 @@ export declare class MTextProcessor {
      */
     private processAlignment;
     /**
-     * In AutoCAD, the width of a regular space character (ASCII 32, the space key on the keyboard) in MText
-     * depends on the current font and text height, and is not a fixed value.
-     * Specifically:
-     * - Space width ≈ Text height × space width ratio defined by the font
-     * - For common TrueType fonts (like Arial), the space width is typically about 1/4 to 1/3 of the text height.
-     * For example, if the text height is 10 (units), the space width would be approximately 2.5 to 3.3 units.
-     * - For SHX fonts (AutoCAD's built-in vector fonts, such as txt.shx), the space width is often half the text height.
-     * So if the text height is 10, the space width is typically 5 units.
+     * Resolves horizontal advance for an ASCII space in the active font.
+     *
+     * AutoCAD uses each font's own space glyph metrics (SHX pen advance or TrueType
+     * horizontal advance). A fixed fraction of text height (e.g. 50% for SHX) is only
+     * a rough fallback when the font has no space definition.
      */
     private calculateBlankWidthForFont;
     /**

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.14",
+  "version": "0.10.16",
   "description": "AutoCAD MText renderer based on Three.js",
   "license": "MIT",
   "author": "MLight Lee <mlight.lee@outlook.com>",