@mlightcad/data-model 1.11.3 → 1.12.1

package/lib/entity/AcDbMLeader.js

@@ -63,8 +63,10 @@ var __values = (this && this.__values) || function(o) {
 import { AcGeArea2d, AcGeBox3d, AcGeMatrix3d, AcGePoint3d, AcGePolyline2d, AcGeVector3d } from '@mlightcad/geometry-engine';
 import { AcGiMTextAttachmentPoint, AcGiMTextFlowDirection } from '@mlightcad/graphic-interface';
 import { DEFAULT_MLEADER_STYLE } from '../misc/AcDbConstants';
+import { acdbDecodeMLeaderStyleRawColor } from '../misc/AcDbMLeaderStyleColorCodec';
 import { AcDbOsnapMode } from '../misc/AcDbOsnapMode';
 import { AcDbRenderingCache } from '../misc/AcDbRenderingCache';
+import { AcDbMLeaderStyle } from '../object/AcDbMLeaderStyle';
 import { AcDbEntity } from './AcDbEntity';
 import { acdbForEachGripIndex } from './AcDbGripHelpers';
 import { acdbCollectLineSegmentOsnapPoints, acdbPickNearestOsnapPoint } from './AcDbOsnapHelpers';
@@ -1747,8 +1749,11 @@ var AcDbMLeader = /** @class */ (function (_super) {
             });
         }
         var mtextContent = this.getRenderableMTextContent();
-        if (this.contentType === AcDbMLeaderContentType.MTextContent &&
-            mtextContent) {
+        var shouldDrawMText = !!mtextContent &&
+            (this.contentType === AcDbMLeaderContentType.MTextContent ||
+                this.contentType === AcDbMLeaderContentType.NoneContent ||
+                this.hasMText === true);
+        if (shouldDrawMText && mtextContent) {
             this.applyColorTraits(traits, textColor, originalColor);
             var textHeight = this.getResolvedTextHeight();
             var mtextData = {
@@ -1822,6 +1827,834 @@ var AcDbMLeader = /** @class */ (function (_super) {
         });
         return this;
     };
+    AcDbMLeader.prototype.dxfInFields = function (filer) {
+        var _this = this;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        _super.prototype.dxfInFields.call(this, filer);
+        filer.atSubclassData('AcDbMLeader');
+        // Rebuild leaders from either native CONTEXT_DATA or legacy flat codes.
+        this._leaders.length = 0;
+        var textContent = (_a = this._mtextContent) === null || _a === void 0 ? void 0 : _a.text;
+        var textAnchor = (_c = (_b = this._mtextContent) === null || _b === void 0 ? void 0 : _b.anchorPoint) === null || _c === void 0 ? void 0 : _c.clone();
+        var hasMTextContent = !!this._mtextContent;
+        var blockId = (_d = this._blockContent) === null || _d === void 0 ? void 0 : _d.blockContentId;
+        var blockPos = (_f = (_e = this._blockContent) === null || _e === void 0 ? void 0 : _e.position) === null || _f === void 0 ? void 0 : _f.clone();
+        var blockScale = (_h = (_g = this._blockContent) === null || _g === void 0 ? void 0 : _g.scale) === null || _h === void 0 ? void 0 : _h.clone();
+        var blockRotation = (_j = this._blockContent) === null || _j === void 0 ? void 0 : _j.rotation;
+        var blockNormal = (_l = (_k = this._blockContent) === null || _k === void 0 ? void 0 : _k.normal) === null || _l === void 0 ? void 0 : _l.clone();
+        var blockColor = (_o = (_m = this._blockContent) === null || _m === void 0 ? void 0 : _m.color) === null || _o === void 0 ? void 0 : _o.clone();
+        var blockMatrix = ((_p = this._blockContent) === null || _p === void 0 ? void 0 : _p.transformationMatrix)
+            ? __spreadArray([], __read(this._blockContent.transformationMatrix), false) : [];
+        var hasBlockContent = !!this._blockContent;
+        var contentTypeSet = false;
+        // Native AutoCAD MULTILEADER uses CONTEXT_DATA / version (270). Older
+        // dxfOutFields used a flat layout without those markers.
+        var nativeFormat = false;
+        // Legacy flat-format accumulators (written by older dxfOutFields).
+        var legacyLanding = (_q = this._landingPoint) === null || _q === void 0 ? void 0 : _q.clone();
+        var legacyDogleg = this._doglegVector.clone();
+        var legacyLeader = null;
+        var legacyLine = null;
+        var legacyInLeaders = false;
+        var legacyTextRotDeg;
+        var flushLegacyLine = function () {
+            if (legacyLine && legacyLeader) {
+                legacyLeader.leaderLines.push(legacyLine);
+            }
+            legacyLine = null;
+        };
+        var flushLegacyLeader = function () {
+            flushLegacyLine();
+            if (legacyLeader)
+                _this.addLeader(legacyLeader);
+            legacyLeader = null;
+        };
+        while (!filer.atEndOfObject && !filer.atEof && !filer.atExtendedData) {
+            var item = filer.readItem();
+            if (!item)
+                break;
+            var code = Number(item.code);
+            var n = Number(item.value);
+            var s = String((_r = item.value) !== null && _r !== void 0 ? _r : '');
+            switch (code) {
+                case 100:
+                    filer.pushBackItem(item);
+                    flushLegacyLeader();
+                    this.finishMLeaderDxfIn(textContent, textAnchor, hasMTextContent, blockId, blockPos, blockScale, blockRotation, blockNormal, blockColor, blockMatrix, hasBlockContent, contentTypeSet, legacyLanding, legacyDogleg, legacyTextRotDeg);
+                    return this;
+                case 300:
+                    if (s === 'CONTEXT_DATA{') {
+                        nativeFormat = true;
+                        var ctx = this.dxfInContextData(filer);
+                        if (ctx.textContent != null) {
+                            textContent = ctx.textContent;
+                            hasMTextContent = true;
+                        }
+                        if (ctx.textAnchor) {
+                            textAnchor = ctx.textAnchor;
+                            hasMTextContent = true;
+                        }
+                        if (ctx.hasMText != null)
+                            this.hasMText = ctx.hasMText;
+                        if (ctx.hasBlock != null)
+                            this.hasBlock = ctx.hasBlock;
+                        if (ctx.blockContentId) {
+                            blockId = ctx.blockContentId;
+                            hasBlockContent = this.isValidMLeaderHandle(ctx.blockContentId);
+                        }
+                        if (ctx.blockPosition) {
+                            blockPos = ctx.blockPosition;
+                            hasBlockContent = true;
+                        }
+                        if (ctx.blockScale) {
+                            blockScale = ctx.blockScale;
+                            hasBlockContent = true;
+                        }
+                        if (ctx.blockRotation != null) {
+                            blockRotation = ctx.blockRotation;
+                            hasBlockContent = true;
+                        }
+                        if (ctx.blockNormal) {
+                            blockNormal = ctx.blockNormal;
+                            hasBlockContent = true;
+                        }
+                        if (ctx.blockColor) {
+                            blockColor = ctx.blockColor;
+                            hasBlockContent = true;
+                        }
+                        if (ctx.blockMatrix.length > 0) {
+                            blockMatrix = ctx.blockMatrix;
+                            hasBlockContent = true;
+                        }
+                        if (hasMTextContent && !contentTypeSet) {
+                            this.contentType = AcDbMLeaderContentType.MTextContent;
+                            contentTypeSet = true;
+                        }
+                    }
+                    break;
+                case 270:
+                    nativeFormat = true;
+                    this.version = n;
+                    break;
+                case 340:
+                    this.leaderStyleId = s;
+                    this.mleaderStyleId = s;
+                    break;
+                case 90:
+                    if (!legacyInLeaders)
+                        this.propertyOverrideFlag = n;
+                    else {
+                        flushLegacyLine();
+                        legacyLine = {
+                            vertices: [],
+                            breakPointIndexes: [],
+                            breaks: []
+                        };
+                    }
+                    break;
+                case 170:
+                    this.leaderLineType = n;
+                    break;
+                case 91:
+                    this.leaderLineColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 341:
+                    if (nativeFormat) {
+                        this.leaderLineTypeId = s;
+                    }
+                    else if (this.isValidMLeaderHandle(s)) {
+                        // Legacy dxfOutFields wrote block content id as group 341.
+                        blockId = s;
+                        hasBlockContent = true;
+                    }
+                    else {
+                        this.leaderLineTypeId = s;
+                    }
+                    break;
+                case 171:
+                    if (!legacyInLeaders)
+                        this.leaderLineWeight = n;
+                    break;
+                case 290:
+                    if (nativeFormat)
+                        this.landingEnabled = this.readDxfBoolean(item);
+                    else
+                        this.doglegEnabled = this.readDxfBoolean(item);
+                    break;
+                case 291:
+                    this.doglegEnabled = this.readDxfBoolean(item);
+                    break;
+                case 40:
+                    if (nativeFormat)
+                        this.doglegLength = n;
+                    else
+                        this.textHeight = n;
+                    break;
+                case 41:
+                    this.doglegLength = n;
+                    break;
+                case 342:
+                    this.arrowheadId = s;
+                    break;
+                case 42:
+                    if (nativeFormat)
+                        this.arrowheadSize = n;
+                    else
+                        this.textWidth = n;
+                    break;
+                case 172:
+                    this.contentType = n;
+                    contentTypeSet = true;
+                    break;
+                case 343:
+                    this.textStyleId = s;
+                    break;
+                case 173:
+                    this.textLeftAttachmentType = n;
+                    break;
+                case 95:
+                    this.textRightAttachmentType = n;
+                    break;
+                case 174:
+                    this.textAngleType = n;
+                    break;
+                case 175:
+                    this.textAlignmentType = n;
+                    break;
+                case 92:
+                    this.textColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 292:
+                    this.textFrameEnabled = this.readDxfBoolean(item);
+                    break;
+                case 344:
+                    if (this.isValidMLeaderHandle(s)) {
+                        blockId = s;
+                        this.blockContentId = s;
+                        hasBlockContent = true;
+                    }
+                    break;
+                case 93:
+                    this.blockContentColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 10:
+                    if (legacyInLeaders) {
+                        filer.pushBackItem(item);
+                        var vertex = filer.readPoint3d(10);
+                        if (vertex && legacyLine)
+                            legacyLine.vertices.push(vertex);
+                    }
+                    else {
+                        filer.pushBackItem(item);
+                        var pt = filer.readPoint3d(10);
+                        if (!pt)
+                            break;
+                        if (nativeFormat) {
+                            this.blockContentScale = new AcGeVector3d(pt);
+                            blockScale = new AcGeVector3d(pt);
+                            hasBlockContent = true;
+                        }
+                        else {
+                            legacyLanding = pt;
+                        }
+                    }
+                    break;
+                case 43:
+                    this.blockContentRotation = n;
+                    blockRotation = n;
+                    hasBlockContent = true;
+                    break;
+                case 176:
+                    this.blockContentConnectionType = n;
+                    break;
+                case 293:
+                    this.annotativeScaleEnabled = this.readDxfBoolean(item);
+                    break;
+                case 94: {
+                    this.arrowheadOverrides.push({ index: n });
+                    break;
+                }
+                case 345: {
+                    var last = this.arrowheadOverrides[this.arrowheadOverrides.length - 1];
+                    if (last)
+                        last.handle = s;
+                    else
+                        this.arrowheadOverrides.push({ index: 0, handle: s });
+                    break;
+                }
+                case 330:
+                    this.blockAttributes.push({ id: s });
+                    break;
+                case 177: {
+                    var attr = this.blockAttributes[this.blockAttributes.length - 1];
+                    if (attr)
+                        attr.index = n;
+                    break;
+                }
+                case 44: {
+                    var attr = this.blockAttributes[this.blockAttributes.length - 1];
+                    if (attr)
+                        attr.width = n;
+                    break;
+                }
+                case 302: {
+                    var attr = this.blockAttributes[this.blockAttributes.length - 1];
+                    if (attr)
+                        attr.text = s;
+                    break;
+                }
+                case 294:
+                    this.textDirectionNegative = this.readDxfBoolean(item);
+                    break;
+                case 178:
+                    this.textAlignInIPE = n;
+                    break;
+                case 179:
+                    if (n !== 0) {
+                        this.textAttachmentPoint = n;
+                    }
+                    break;
+                case 271:
+                    this.textAttachmentDirection =
+                        n;
+                    break;
+                case 272:
+                    this.bottomTextAttachmentDirection = n;
+                    break;
+                case 273:
+                    this.topTextAttachmentDirection = n;
+                    break;
+                // ---- Legacy flat format (older dxfOutFields) ----
+                case 210:
+                    filer.pushBackItem(item);
+                    {
+                        var normal = filer.readVector3d(210);
+                        if (normal)
+                            this.normal = normal;
+                    }
+                    break;
+                case 110:
+                    flushLegacyLeader();
+                    legacyInLeaders = true;
+                    filer.pushBackItem(item);
+                    {
+                        var landing = filer.readPoint3d(110);
+                        legacyLeader = {
+                            landingPoint: landing,
+                            doglegVector: new AcGeVector3d(1, 0, 0),
+                            doglegLength: 0,
+                            breaks: [],
+                            leaderLines: []
+                        };
+                    }
+                    break;
+                case 111:
+                    if (legacyLeader) {
+                        filer.pushBackItem(item);
+                        var dogleg = filer.readVector3d(111);
+                        if (dogleg)
+                            legacyLeader.doglegVector = dogleg;
+                    }
+                    break;
+                case 140:
+                    if (legacyLeader)
+                        legacyLeader.doglegLength = n;
+                    else
+                        this.arrowheadSize = n;
+                    break;
+                case 1:
+                    textContent = s;
+                    hasMTextContent = true;
+                    break;
+                case 12:
+                    filer.pushBackItem(item);
+                    {
+                        var anchor = filer.readPoint3d(12);
+                        if (anchor) {
+                            textAnchor = anchor;
+                            hasMTextContent = true;
+                        }
+                    }
+                    break;
+                case 7:
+                    this.textStyleName = s;
+                    break;
+                case 50:
+                    legacyTextRotDeg = n;
+                    break;
+                case 15:
+                    filer.pushBackItem(item);
+                    {
+                        var pos = filer.readPoint3d(15);
+                        if (pos) {
+                            blockPos = pos;
+                            hasBlockContent = true;
+                        }
+                    }
+                    break;
+                case 16:
+                    filer.pushBackItem(item);
+                    {
+                        var scale = filer.readVector3d(16);
+                        if (scale) {
+                            blockScale = scale;
+                            hasBlockContent = true;
+                        }
+                    }
+                    break;
+                case 52:
+                    blockRotation = (n * Math.PI) / 180;
+                    hasBlockContent = true;
+                    break;
+                case 11:
+                    if (!legacyInLeaders && !nativeFormat) {
+                        filer.pushBackItem(item);
+                        var dogleg = filer.readVector3d(11);
+                        if (dogleg)
+                            legacyDogleg = dogleg;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        flushLegacyLeader();
+        this.finishMLeaderDxfIn(textContent, textAnchor, hasMTextContent, blockId, blockPos, blockScale, blockRotation, blockNormal, blockColor, blockMatrix, hasBlockContent, contentTypeSet, legacyLanding, legacyDogleg, legacyTextRotDeg);
+        return this;
+    };
+    /**
+     * Finalizes MLEADER fields after DXF group codes are consumed.
+     */
+    AcDbMLeader.prototype.finishMLeaderDxfIn = function (textContent, textAnchor, hasMTextContent, blockId, blockPos, blockScale, blockRotation, blockNormal, blockColor, blockMatrix, hasBlockContent, contentTypeSet, legacyLanding, legacyDogleg, legacyTextRotDeg) {
+        var _a, _b;
+        if (legacyLanding)
+            this.landingPoint = legacyLanding;
+        this.doglegVector = legacyDogleg;
+        if (legacyTextRotDeg != null) {
+            this.textRotation = (legacyTextRotDeg * Math.PI) / 180;
+        }
+        // Resolve text style handle → name so font collection / renderer can find it.
+        if (!this.textStyleName && this.textStyleId) {
+            var record = this.database.tables.textStyleTable.getIdAt(this.textStyleId);
+            if (record === null || record === void 0 ? void 0 : record.name)
+                this.textStyleName = record.name;
+        }
+        var anchor = (_b = (_a = textAnchor !== null && textAnchor !== void 0 ? textAnchor : this.textAnchor) !== null && _a !== void 0 ? _a : this.contentBasePosition) !== null && _b !== void 0 ? _b : legacyLanding;
+        if ((hasMTextContent || this.hasMText) && textContent != null && anchor) {
+            this.mtextContent = {
+                text: textContent,
+                anchorPoint: anchor.clone()
+            };
+            if (!this.textAnchor)
+                this.textAnchor = anchor.clone();
+            if (!contentTypeSet) {
+                this.contentType = AcDbMLeaderContentType.MTextContent;
+            }
+        }
+        else if ((hasMTextContent || this.hasMText) && textContent != null && !anchor) {
+            if (!contentTypeSet) {
+                this.contentType = AcDbMLeaderContentType.MTextContent;
+            }
+        }
+        // Prefer MText when both content types appear (AutoCAD writes block-scale
+        // fields even for MText leaders; blockContentId "0" must be ignored).
+        if (hasBlockContent &&
+            this.isValidMLeaderHandle(blockId) &&
+            this.contentType !== AcDbMLeaderContentType.MTextContent &&
+            !this.mtextContent) {
+            this.blockContent = {
+                blockContentId: blockId,
+                position: blockPos,
+                scale: blockScale !== null && blockScale !== void 0 ? blockScale : new AcGeVector3d(1, 1, 1),
+                rotation: blockRotation !== null && blockRotation !== void 0 ? blockRotation : 0,
+                normal: blockNormal,
+                color: blockColor,
+                transformationMatrix: blockMatrix
+            };
+            if (!contentTypeSet &&
+                this.contentType === AcDbMLeaderContentType.NoneContent) {
+                this.contentType = AcDbMLeaderContentType.BlockContent;
+            }
+        }
+    };
+    /**
+     * Parses the native AutoCAD `CONTEXT_DATA{ ... }` block (group 300/301).
+     *
+     * Mirrors dxf-json `parseContextData` so built-in DXF reading matches the
+     * converter path used by `@mlightcad/dxf-json`.
+     */
+    AcDbMLeader.prototype.dxfInContextData = function (filer) {
+        var _a;
+        var result = { blockMatrix: [] };
+        while (!filer.atEof) {
+            var item = filer.readItem();
+            if (!item)
+                break;
+            var code = Number(item.code);
+            var n = Number(item.value);
+            var s = String((_a = item.value) !== null && _a !== void 0 ? _a : '');
+            if (code === 301)
+                break;
+            if (code === 0) {
+                filer.pushBackItem(item);
+                break;
+            }
+            switch (code) {
+                case 10:
+                    filer.pushBackItem(item);
+                    this.contentBasePosition = filer.readPoint3d(10);
+                    break;
+                case 11:
+                    filer.pushBackItem(item);
+                    {
+                        var normal = filer.readVector3d(11);
+                        if (normal)
+                            this.normal = normal;
+                    }
+                    break;
+                case 12:
+                    filer.pushBackItem(item);
+                    {
+                        var anchor = filer.readPoint3d(12);
+                        if (anchor) {
+                            result.textAnchor = anchor;
+                            this.textAnchor = anchor.clone();
+                        }
+                    }
+                    break;
+                case 13:
+                    filer.pushBackItem(item);
+                    {
+                        var direction = filer.readVector3d(13);
+                        if (direction)
+                            this.textDirection = direction;
+                    }
+                    break;
+                case 14:
+                    filer.pushBackItem(item);
+                    result.blockNormal = filer.readVector3d(14);
+                    break;
+                case 15:
+                    filer.pushBackItem(item);
+                    result.blockPosition = filer.readPoint3d(15);
+                    break;
+                case 16:
+                    filer.pushBackItem(item);
+                    result.blockScale = filer.readVector3d(16);
+                    break;
+                case 40:
+                    this.contentScale = n;
+                    break;
+                case 41:
+                    // Primary text height. Keep the first positive value; later code 44
+                    // is often written as 0.0 by AutoCAD and must not wipe this.
+                    if (n > 0)
+                        this.textHeight = n;
+                    break;
+                case 42:
+                    // CONTEXT_DATA stores text rotation in radians.
+                    this.textRotation = n;
+                    break;
+                case 43:
+                    // Width 0 means "auto" in AutoCAD — keep prior positive width.
+                    if (n > 0)
+                        this.textWidth = n;
+                    break;
+                case 44:
+                    if (n > 0)
+                        this.textHeight = n;
+                    break;
+                case 45:
+                    this.textLineSpacingFactor = n;
+                    break;
+                case 46:
+                    result.blockRotation = n;
+                    break;
+                case 47:
+                    result.blockMatrix.push(n);
+                    break;
+                case 90:
+                    this.textColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 91:
+                    this.textBackgroundColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 92:
+                    this.textBackgroundTransparency = n;
+                    break;
+                case 93:
+                    result.blockColor = acdbDecodeMLeaderStyleRawColor(n);
+                    break;
+                case 110:
+                    filer.pushBackItem(item);
+                    this.planeOrigin = filer.readPoint3d(110);
+                    break;
+                case 111:
+                    filer.pushBackItem(item);
+                    this.planeXAxisDirection = filer.readVector3d(111);
+                    break;
+                case 112:
+                    filer.pushBackItem(item);
+                    this.planeYAxisDirection = filer.readVector3d(112);
+                    break;
+                case 140:
+                    this.arrowheadSize = n;
+                    break;
+                case 141:
+                    this.textBackgroundScaleFactor = n;
+                    break;
+                case 142:
+                    this.textColumnWidth = n;
+                    break;
+                case 143:
+                    this.textColumnGutterWidth = n;
+                    break;
+                case 144:
+                    this.textColumnHeight = n;
+                    break;
+                case 145:
+                    this.landingGap = n;
+                    break;
+                case 170:
+                    this.textLineSpacingStyle = n;
+                    break;
+                case 171:
+                    this.textAttachment = n;
+                    break;
+                case 172:
+                    this.textFlowDirection = n;
+                    break;
+                case 173:
+                    this.textColumnType = n;
+                    break;
+                case 290:
+                    result.hasMText = this.readDxfBoolean(item);
+                    this.hasMText = result.hasMText;
+                    break;
+                case 291:
+                    this.textBackgroundColorOn = this.readDxfBoolean(item);
+                    break;
+                case 292:
+                    this.textFillOn = this.readDxfBoolean(item);
+                    break;
+                case 293:
+                    this.textUseAutoHeight = this.readDxfBoolean(item);
+                    break;
+                case 294:
+                    this.textColumnFlowReversed = this.readDxfBoolean(item);
+                    break;
+                case 295:
+                    this.textUseWordBreak = this.readDxfBoolean(item);
+                    break;
+                case 296:
+                    result.hasBlock = this.readDxfBoolean(item);
+                    this.hasBlock = result.hasBlock;
+                    break;
+                case 297:
+                    this.planeNormalReversed = this.readDxfBoolean(item);
+                    break;
+                case 302:
+                    if (s === 'LEADER{') {
+                        var leader = this.dxfInLeaderSection(filer);
+                        this.addLeader(leader);
+                    }
+                    break;
+                case 304:
+                    if (s !== 'LEADER_LINE{') {
+                        result.textContent = s;
+                        this.hasMText = true;
+                    }
+                    break;
+                case 340:
+                    this.textStyleId = s;
+                    break;
+                case 341:
+                    result.blockContentId = s;
+                    if (this.isValidMLeaderHandle(s))
+                        this.blockContentId = s;
+                    break;
+                default:
+                    break;
+            }
+        }
+        return result;
+    };
+    /**
+     * Parses one `LEADER{ ... }` section (group 302/303) inside CONTEXT_DATA.
+     */
+    AcDbMLeader.prototype.dxfInLeaderSection = function (filer) {
+        var _a;
+        var leader = {
+            breaks: [],
+            leaderLines: []
+        };
+        var currentBreak;
+        var pushBreak = function () {
+            if (!currentBreak)
+                return;
+            leader.breaks.push(currentBreak);
+            currentBreak = undefined;
+        };
+        while (!filer.atEof) {
+            var item = filer.readItem();
+            if (!item)
+                break;
+            var code = Number(item.code);
+            var n = Number(item.value);
+            var s = String((_a = item.value) !== null && _a !== void 0 ? _a : '');
+            if (code === 303) {
+                pushBreak();
+                break;
+            }
+            if (code === 0 || code === 301) {
+                filer.pushBackItem(item);
+                pushBreak();
+                break;
+            }
+            switch (code) {
+                case 290:
+                    leader.lastLeaderLinePointSet = this.readDxfBoolean(item);
+                    break;
+                case 291:
+                    leader.doglegVectorSet = this.readDxfBoolean(item);
+                    break;
+                case 10:
+                    filer.pushBackItem(item);
+                    leader.lastLeaderLinePoint = filer.readPoint3d(10);
+                    break;
+                case 11:
+                    filer.pushBackItem(item);
+                    leader.doglegVector = filer.readVector3d(11);
+                    break;
+                case 12:
+                    filer.pushBackItem(item);
+                    {
+                        var start = filer.readPoint3d(12);
+                        if (start)
+                            currentBreak = { start: start, end: start.clone() };
+                    }
+                    break;
+                case 13:
+                    filer.pushBackItem(item);
+                    {
+                        var end = filer.readPoint3d(13);
+                        if (currentBreak && end) {
+                            currentBreak.end = end;
+                            pushBreak();
+                        }
+                    }
+                    break;
+                case 90:
+                    leader.leaderBranchIndex = n;
+                    break;
+                case 40:
+                    leader.doglegLength = n;
+                    break;
+                case 304:
+                    if (s === 'LEADER_LINE{') {
+                        leader.leaderLines.push(this.dxfInLeaderLine(filer));
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return leader;
+    };
+    /**
+     * Parses one `LEADER_LINE{ ... }` block (group 304/305) inside a LEADER section.
+     */
+    AcDbMLeader.prototype.dxfInLeaderLine = function (filer) {
+        var _a, _b;
+        var line = {
+            vertices: [],
+            breakPointIndexes: [],
+            breaks: []
+        };
+        var currentBreak;
+        var pushBreak = function () {
+            if (!currentBreak)
+                return;
+            line.breaks.push(currentBreak);
+            currentBreak = undefined;
+        };
+        while (!filer.atEof) {
+            var item = filer.readItem();
+            if (!item)
+                break;
+            var code = Number(item.code);
+            var n = Number(item.value);
+            if (code === 305) {
+                pushBreak();
+                break;
+            }
+            if (code === 0 || code === 303 || code === 301) {
+                filer.pushBackItem(item);
+                pushBreak();
+                break;
+            }
+            switch (code) {
+                case 10:
+                    filer.pushBackItem(item);
+                    {
+                        var vertex = filer.readPoint3d(10);
+                        if (vertex)
+                            line.vertices.push(vertex);
+                    }
+                    break;
+                case 11:
+                    filer.pushBackItem(item);
+                    {
+                        var start = filer.readPoint3d(11);
+                        if (start) {
+                            currentBreak = {
+                                index: currentBreak === null || currentBreak === void 0 ? void 0 : currentBreak.index,
+                                start: start,
+                                end: start.clone()
+                            };
+                        }
+                    }
+                    break;
+                case 12:
+                    filer.pushBackItem(item);
+                    {
+                        var end = filer.readPoint3d(12);
+                        if (currentBreak && end) {
+                            currentBreak.end = end;
+                            pushBreak();
+                        }
+                    }
+                    break;
+                case 90:
+                    line.breakPointIndexes.push(n);
+                    currentBreak = {
+                        index: n,
+                        start: (_a = currentBreak === null || currentBreak === void 0 ? void 0 : currentBreak.start) !== null && _a !== void 0 ? _a : new AcGePoint3d(),
+                        end: (_b = currentBreak === null || currentBreak === void 0 ? void 0 : currentBreak.end) !== null && _b !== void 0 ? _b : new AcGePoint3d()
+                    };
+                    break;
+                case 91:
+                    line.leaderLineIndex = n;
+                    break;
+                default:
+                    break;
+            }
+        }
+        return line;
+    };
+    AcDbMLeader.prototype.readDxfBoolean = function (item) {
+        var _a;
+        if (typeof item.value === 'boolean')
+            return item.value;
+        var n = Number(item.value);
+        if (Number.isFinite(n))
+            return n !== 0;
+        var s = String((_a = item.value) !== null && _a !== void 0 ? _a : '');
+        return s !== '' && s !== '0';
+    };
+    AcDbMLeader.prototype.isValidMLeaderHandle = function (id) {
+        return id != null && id !== '' && id !== '0';
+    };
     /**
      * Creates a concrete point from point-like input.
      *
@@ -2398,12 +3231,35 @@ var AcDbMLeader = /** @class */ (function (_super) {
      * @returns Resolved style object or `undefined` when not available.
      */
     AcDbMLeader.prototype.getMLeaderStyle = function () {
+        var e_2, _a;
+        var _b, _c;
         var dictionary = this.database.objects.mleaderStyle;
-        var styleId = this.mleaderStyleId || this.leaderStyleId;
+        var styleId = (_b = (this.mleaderStyleId || this.leaderStyleId)) === null || _b === void 0 ? void 0 : _b.trim();
         if (styleId) {
             var style = dictionary.getIdAt(styleId);
             if (style)
                 return style;
+            // Fallback: native DXF may key styles by handle before the named
+            // dictionary rewires ownerId, so getIdAt can miss. Scan entries by id.
+            var normalized = styleId.toUpperCase();
+            try {
+                for (var _d = __values(dictionary.entries()), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var _f = __read(_e.value, 2), candidate = _f[1];
+                    if (((_c = candidate.objectId) === null || _c === void 0 ? void 0 : _c.toUpperCase()) === normalized) {
+                        return candidate;
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            var byDb = this.database.getObjectById(styleId);
+            if (byDb instanceof AcDbMLeaderStyle)
+                return byDb;
         }
         return this.getDefaultMLeaderStyle();
     };
@@ -2425,7 +3281,7 @@ var AcDbMLeader = /** @class */ (function (_super) {
      * @returns Matching style object, or `undefined` when not found.
      */
     AcDbMLeader.prototype.resolveMLeaderStyleByName = function (styleName) {
-        var e_2, _a;
+        var e_3, _a;
         var rawName = styleName === null || styleName === void 0 ? void 0 : styleName.trim();
         if (!rawName)
             return undefined;
@@ -2445,12 +3301,12 @@ var AcDbMLeader = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return undefined;
     };
@@ -2601,16 +3457,20 @@ var AcDbMLeader = /** @class */ (function (_super) {
     AcDbMLeader.prototype.getResolvedComponentColor = function (entityColor, styleColor, overrideFlagMask) {
         if (!entityColor)
             return styleColor;
+        // Explicit ACI / true-color on the MULTILEADER entity is authoritative.
+        // AutoCAD writes context/common raw colors even when the matching
+        // property-override bit is clear, and those flags are unreliable
+        // (ezdxf ignores them for rendering). Prefer the entity color so yellow /
+        // green MText is not replaced by a ByBlock style fallback (white).
+        if (!entityColor.isByBlock && !entityColor.isByLayer) {
+            return entityColor;
+        }
         var overrideEnabled = this.isPropertyOverrideEnabled(overrideFlagMask);
         if (overrideEnabled === true)
             return entityColor;
         if (overrideEnabled === false)
             return styleColor !== null && styleColor !== void 0 ? styleColor : entityColor;
-        // Some DXF producers always write entity color fields as ByBlock/ByLayer even
-        // when no override flag is enabled. Prefer style color in that ambiguous case.
-        if (!entityColor.isByBlock && !entityColor.isByLayer) {
-            return entityColor;
-        }
+        // Entity is ByBlock/ByLayer and override flag is absent: prefer style.
         return styleColor !== null && styleColor !== void 0 ? styleColor : entityColor;
     };
     /**