@tspro/web-music-score 5.4.0 → 5.4.1

package/dist/score/index.mjs

@@ -1,15 +1,15 @@
-/* WebMusicScore v5.4.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.4.1 | (c) 2023-2025 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   MusicError
-} from "../chunk-ZWUBO5EW.mjs";
+} from "../chunk-6P4ECBUH.mjs";
 import {
   NoteLengthProps,
   RhythmProps,
   validateNoteLength
-} from "../chunk-MHDBTCVG.mjs";
+} from "../chunk-A5SMODAT.mjs";
 import {
   __publicField
-} from "../chunk-AUT4C6TY.mjs";
+} from "../chunk-U2ACCEHX.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -588,6 +588,8 @@ var DebugSettings = {
 var DocumentSettings = {
   DocumentScale: 1,
   DocumentMinWidth: 75,
+  MinColumnsWidth: 10,
+  ColumnWidthScale: 1.7,
   PostMeasureBreakWidth: 10,
   NoteDotSpace: 0.5,
   NoteAccSpace: 0.5,
@@ -1209,10 +1211,10 @@ var RenderContext = class {
 
 // src/score/engine/obj-staff-and-tab.ts
 import { MusicError as MusicError15, MusicErrorType as MusicErrorType15 } from "@tspro/web-music-score/core";
-import { AnchoredRect as AnchoredRect23, Guard as Guard9, UniMap as UniMap7, Utils as Utils10 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect22, Guard as Guard9, UniMap as UniMap7, Utils as Utils10 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-measure.ts
-import { Guard as Guard8, IndexArray as IndexArray2, UniMap as UniMap5, TriMap as TriMap2, ValueSet, Utils as Utils9, asMulti, AnchoredRect as AnchoredRect21 } from "@tspro/ts-utils-lib";
+import { Guard as Guard8, IndexArray as IndexArray2, UniMap as UniMap5, TriMap as TriMap2, ValueSet, Utils as Utils9, asMulti, AnchoredRect as AnchoredRect20 } from "@tspro/ts-utils-lib";
 import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps5, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength as validateNoteLength2, NoteLengthProps as NoteLengthProps5 } from "@tspro/web-music-score/theory";
 import { getDefaultTempo, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
 
@@ -2948,23 +2950,6 @@ var ObjRhythmColumn = class extends MusicObject {
   addLyricsObject(lyricsObj) {
     this.lyricsObject.set(lyricsObj.verse, lyricsObj.line, lyricsObj.vpos, lyricsObj);
   }
-  getMinWidth() {
-    let maxNoteSize = Math.max(...this.voiceSymbol.mapToArray((s) => s.rhythmProps.noteSize));
-    let w = DocumentSettings.NoteHeadWidth;
-    switch (maxNoteSize) {
-      case 1:
-        return w * 5;
-      // whole note
-      case 2:
-        return w * 3;
-      // half note
-      case 4:
-        return w * 2;
-      // quarter note
-      default:
-        return w;
-    }
-  }
   updateNoteDisplacements() {
     let data = [];
     this.voiceSymbol.forEach((symbol) => {
@@ -3055,13 +3040,9 @@ var ObjRhythmColumn = class extends MusicObject {
     if (!this.needLayout) {
       return;
     }
-    this.requestRectUpdate();
-    this.rect = new AnchoredRect10();
     let { row } = this;
-    let { unitSize } = ctx;
-    let halfMinWidth = this.getMinWidth() * unitSize / 2;
-    let leftw = halfMinWidth;
-    let rightw = halfMinWidth;
+    let leftw = 0;
+    let rightw = 0;
     this.voiceSymbol.forEach((symbol) => {
       symbol.layout(ctx, accState);
       let r = symbol.getRect();
@@ -3069,31 +3050,28 @@ var ObjRhythmColumn = class extends MusicObject {
       rightw = Math.max(rightw, r.rightw);
     });
     if (this.arpeggioDir !== void 0) {
-      let arpeggioWidth = 0;
-      this.arpeggios = row.getNotationLines().map((line) => {
-        let arpeggio = new ObjArpeggio(this, line, this.getArpeggioDir());
-        arpeggio.layout(ctx);
-        arpeggio.offset(-leftw - arpeggio.getRect().right, line.getRect().anchorY - arpeggio.getRect().anchorY);
-        arpeggioWidth = Math.max(arpeggioWidth, arpeggio.getRect().width);
-        line.addObject(arpeggio);
-        this.measure.addStaticObject(line, arpeggio);
-        return arpeggio;
+      this.arpeggios = row.getNotationLines().map((line) => new ObjArpeggio(this, line, this.getArpeggioDir()));
+      this.arpeggios.forEach((a) => a.layout(ctx));
+      const arpeggioWidth = this.arpeggios.map((a) => a.getRect().width).reduce((accState2, cur) => Math.max(accState2, cur)) + ctx.unitSize;
+      this.arpeggios.forEach((a) => {
+        a.offset(-leftw - arpeggioWidth + a.getRect().leftw, a.line.getRect().anchorY - a.getRect().anchorY);
+        a.line.addObject(a);
+        this.measure.addStaticObject(a.line, a);
       });
       leftw += arpeggioWidth;
     } else {
       this.arpeggios = [];
     }
-    let widenColumnObjs = this.getAnchoredLayoutObjects().filter((layoutObj) => layoutObj.layoutGroup.widensColumn);
-    if (widenColumnObjs.length > 0) {
-      widenColumnObjs.forEach((layoutObj) => {
-        leftw = Math.max(leftw, layoutObj.musicObj.getRect().leftw);
-        rightw = Math.max(rightw, layoutObj.musicObj.getRect().rightw);
-      });
-    }
+    const noteSizes = this.voiceSymbol.mapToArray((s) => s.rhythmProps.noteSize);
+    const maxNoteSize = Math.min(8, Math.max(1, ...noteSizes));
+    const MinColumnWidth = Math.ceil(8 / maxNoteSize) * DocumentSettings.NoteHeadWidth * ctx.unitSize * 0.75;
+    leftw = Math.max(leftw, MinColumnWidth / 2);
+    rightw = Math.max(rightw, MinColumnWidth / 2);
+    leftw *= DocumentSettings.ColumnWidthScale;
+    rightw *= DocumentSettings.ColumnWidthScale;
+    this.rect = new AnchoredRect10(-leftw, 0, rightw, 0, 0, 0);
+    this.requestRectUpdate();
     this.voiceSymbol.forEach((symbol) => symbol.updateAccidentalState(accState));
-    this.rect.left = -leftw;
-    this.rect.anchorX = 0;
-    this.rect.right = rightw;
     this.row.getStaves().forEach((staff) => {
       let minDiatonicId = void 0;
       let maxDiatonicId = void 0;
@@ -3121,12 +3099,48 @@ var ObjRhythmColumn = class extends MusicObject {
       }
     });
   }
+  layoutReserveSpace(ctx) {
+    const columns = this.measure.getColumns();
+    const extraSpace = ctx.unitSize;
+    this.getAnchoredLayoutObjects().forEach((obj) => {
+      if (obj.layoutGroup.reserveSpace) {
+        const i = columns.indexOf(this);
+        if (i < 0) return;
+        const leftOverflow = obj.getRect().leftw - this.getRect().leftw;
+        if (leftOverflow > 0) {
+          const prevCol = columns[i - 1];
+          if (prevCol) {
+            prevCol.getAnchoredLayoutObjects().forEach((prevObj) => {
+              if (prevObj.layoutGroupId === obj.layoutGroupId) {
+                const rightOverflow2 = prevObj.getRect().rightw - prevCol.getRect().rightw;
+                this.rect.left -= Math.max(rightOverflow2 + leftOverflow, 0) + extraSpace;
+                this.requestRectUpdate();
+              }
+            });
+          }
+        }
+        const rightOverflow = obj.getRect().rightw - this.getRect().rightw;
+        if (rightOverflow > 0) {
+          const nextCol = columns[i + 1];
+          if (nextCol) {
+            nextCol.getAnchoredLayoutObjects().forEach((nextObj) => {
+              if (nextObj.layoutGroupId === obj.layoutGroupId) {
+                const leftOverflow2 = nextObj.getRect().leftw - nextCol.getRect().leftw;
+                this.rect.right += Math.max(rightOverflow + leftOverflow2, 0) + extraSpace;
+                this.requestRectUpdate();
+              }
+            });
+          }
+        }
+      }
+    });
+  }
   layoutDone() {
     this.needLayout = false;
   }
   updateRect() {
     this.shapeRects = [
-      ...this.voiceSymbol.filter((s) => !!s).mapToArray((s) => s.getRect().clone()),
+      ...this.voiceSymbol.filter((s) => s !== void 0).mapToArray((s) => s.getRect().clone()),
       ...this.arpeggios.map((a) => a.getRect().clone())
     ];
     this.rect.top = Math.min(...this.shapeRects.map((r) => r.top));
@@ -5076,7 +5090,7 @@ var ConnectiveProps = class {
 };
 
 // src/score/engine/obj-lyrics.ts
-import { AnchoredRect as AnchoredRect19, Guard as Guard7 } from "@tspro/ts-utils-lib";
+import { Guard as Guard7 } from "@tspro/ts-utils-lib";
 var ObjLyrics = class extends MusicObject {
   constructor(col, verse, line, vpos, lyricsLength, lyricsText, lyricsOptions) {
     super(col);
@@ -5094,7 +5108,7 @@ var ObjLyrics = class extends MusicObject {
     let halign = (lyricsOptions == null ? void 0 : lyricsOptions.align) === "left" /* Left */ ? 0 : (lyricsOptions == null ? void 0 : lyricsOptions.align) === "right" /* Right */ ? 1 : 0.5;
     this.hyphen = Guard7.isEnumValue(lyricsOptions == null ? void 0 : lyricsOptions.hyphen, LyricsHyphen) ? lyricsOptions == null ? void 0 : lyricsOptions.hyphen : void 0;
     this.text = new ObjText(this, { text: lyricsText, color: this.color, scale: 0.8 }, halign, 0);
-    this.rect = new AnchoredRect19();
+    this.rect = this.text.getRect().clone();
     this.mi = new MLyrics(this);
   }
   getMusicInterface() {
@@ -5110,7 +5124,7 @@ var ObjLyrics = class extends MusicObject {
     this.nextLyricsObject = lyricsObj;
   }
   pick(x, y) {
-    return this.rect.contains(x, y) ? [this] : [];
+    return this.getRect().contains(x, y) ? [this] : [];
   }
   layout(ctx) {
     this.text.layout(ctx);
@@ -5131,8 +5145,8 @@ var ObjLyrics = class extends MusicObject {
       let maxw = r ? (r.left - l.right) * 0.85 : hyphenw;
       let w = this.hyphen === "-" /* Hyphen */ ? Math.min(hyphenw, maxw) : maxw;
       if (w > 0) {
-        let cx = r ? (r.left + l.right) / 2 : l.right + w / 0.85;
-        let cy = l.centerY / 2;
+        let cx = r ? (l.right + r.left) / 2 : l.right + w / 0.85;
+        let cy = l.centerY;
         ctx.moveTo(cx - w / 2, cy);
         ctx.lineTo(cx + w / 2, cy);
         ctx.stroke();
@@ -5142,7 +5156,7 @@ var ObjLyrics = class extends MusicObject {
 };
 
 // src/score/engine/obj-tab-rhythm.ts
-import { AnchoredRect as AnchoredRect20, UniMap as UniMap4, Utils as Utils8 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect19, UniMap as UniMap4, Utils as Utils8 } from "@tspro/ts-utils-lib";
 var ObjTabRhythm = class extends MusicObject {
   constructor(measure, tab) {
     super(measure);
@@ -5153,7 +5167,7 @@ var ObjTabRhythm = class extends MusicObject {
     // Keep non-static
     __publicField(this, "tupletPartsTextObjMap", new UniMap4());
     this.voiceId = getVoiceIds().filter((voiceId) => tab.containsVoiceId(voiceId));
-    this.rect = new AnchoredRect20();
+    this.rect = new AnchoredRect19();
     this.mi = new MTabRhythm(this);
   }
   getMusicInterface() {
@@ -5166,7 +5180,7 @@ var ObjTabRhythm = class extends MusicObject {
     let columns = this.measure.getColumns();
     let numColsInVoiceId = getVoiceIds().map((voiceId) => Utils8.Math.sum(columns.map((col) => col.getVoiceSymbol(voiceId) ? 1 : 0)));
     this.voiceId.sort((a, b) => Utils8.Math.cmp(numColsInVoiceId[a], numColsInVoiceId[b]));
-    this.rect = new AnchoredRect20();
+    this.rect = new AnchoredRect19();
   }
   hasTuplets() {
     return this.measure.getBeamGroups().some((beamGroup) => beamGroup.isTuplet());
@@ -5217,7 +5231,7 @@ var ObjTabRhythm = class extends MusicObject {
           ctx.lineWidth(1);
           if (symbols.length === 1) {
             for (let i = 0; i < sym.rhythmProps.flagCount; i++) {
-              ctx.drawFlag(new AnchoredRect20(colX, colX + flagSize, stemTop + i * flagSize, stemTop + (i + 2) * flagSize), "up");
+              ctx.drawFlag(new AnchoredRect19(colX, colX + flagSize, stemTop + i * flagSize, stemTop + (i + 2) * flagSize), "up");
             }
           }
           for (let i = 0; i < sym.rhythmProps.dotCount; i++) {
@@ -5320,7 +5334,27 @@ function getVerseLayoutGroupId(verse) {
       throw new MusicError13(MusicErrorType13.Unknown, "VerseNumber is not 1, 2 or 3.");
   }
 }
-var _ObjMeasure = class _ObjMeasure extends MusicObject {
+var MeasureRegions = class {
+  constructor() {
+    __publicField(this, "tabTuning_0", 0);
+    __publicField(this, "signature_1", 0);
+    __publicField(this, "leftBarLine_2", 0);
+    __publicField(this, "padding_3", 0);
+    __publicField(this, "columnsMin_4", 0);
+    __publicField(this, "padding_5", 0);
+    __publicField(this, "rightBarLine_6", 0);
+  }
+  get leftSolid() {
+    return this.tabTuning_0 + this.signature_1 + this.leftBarLine_2 + this.padding_3;
+  }
+  get columnsMin() {
+    return this.columnsMin_4;
+  }
+  get rightSolid() {
+    return this.padding_5 + this.rightBarLine_6;
+  }
+};
+var ObjMeasure = class extends MusicObject {
   constructor(row, options) {
     super(row);
     this.row = row;
@@ -5340,12 +5374,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     __publicField(this, "barLineRight");
     __publicField(this, "connectives", []);
     __publicField(this, "beamGroups", []);
-    __publicField(this, "tabStringNotesWidth", 0);
     __publicField(this, "measureId");
+    __publicField(this, "regions", new MeasureRegions());
     __publicField(this, "needLayout", true);
-    __publicField(this, "leftSolidAreaWidth", 0);
-    __publicField(this, "minColumnsAreaWidth", 0);
-    __publicField(this, "rightSolidAreaWidth", 0);
     __publicField(this, "voiceSymbols", asMulti(new IndexArray2()));
     __publicField(this, "lastAddedRhythmColumn");
     __publicField(this, "lastAddedRhythmSymbol");
@@ -6014,34 +6045,34 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   }
   // Get content rect excluding signature
   getColumnsContentRect() {
-    return new AnchoredRect21(
+    return new AnchoredRect20(
       this.barLineLeft.getRect().anchorX,
       this.barLineRight.getRect().anchorX,
       this.getRect().top,
       this.getRect().bottom
     );
   }
-  getLeftSolidAreaWidth() {
-    return this.leftSolidAreaWidth;
+  getLeftSolidWidth() {
+    return this.regions.leftSolid;
   }
-  getMinColumnsAreaWidth() {
-    return this.minColumnsAreaWidth;
+  getMinColumnsWidth() {
+    return this.regions.columnsMin;
   }
-  getRightSolidAreaWidth() {
-    return this.rightSolidAreaWidth;
+  getRightSolidWidth() {
+    return this.regions.rightSolid;
   }
-  getSolidAreaWidth() {
-    return this.leftSolidAreaWidth + this.rightSolidAreaWidth;
+  getTotalSolidWidth() {
+    return this.getLeftSolidWidth() + this.getRightSolidWidth();
   }
   getMinWidth() {
-    return this.leftSolidAreaWidth + this.minColumnsAreaWidth + this.rightSolidAreaWidth;
+    return this.getLeftSolidWidth() + this.getMinColumnsWidth() + this.getRightSolidWidth();
   }
   getStaffLineLeft() {
     let prev = this.getPrevMeasure();
     if (prev && prev.row === this.row && !prev.hasPostMeasureBreak()) {
       return prev.getStaffLineRight();
     } else {
-      return this.getRect().left + this.tabStringNotesWidth;
+      return this.getRect().left + this.regions.tabTuning_0;
     }
   }
   getStaffLineRight() {
@@ -6255,7 +6286,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.postMeasureBreakWidth = this.hasPostMeasureBreak() ? DocumentSettings.PostMeasureBreakWidth * unitSize : 0;
     let isFirstMeasureInRow = this === this.row.getFirstMeasure();
     let isAfterMeasureBreak = ((_a = this.getPrevMeasure()) == null ? void 0 : _a.hasPostMeasureBreak()) === true;
-    this.tabStringNotesWidth = isFirstMeasureInRow && this.row.hasTab ? unitSize * 4 : 0;
+    this.regions.tabTuning_0 = isFirstMeasureInRow && this.row.hasTab ? unitSize * 4 : 0;
     let showClef = isFirstMeasureInRow || isAfterMeasureBreak;
     let showMeasureNumber = this.options.showNumber === false ? false : this.options.showNumber === true || isFirstMeasureInRow && !this.row.isFirstRow();
     let showKeySignature = isFirstMeasureInRow || isAfterMeasureBreak || !!this.alterKeySignature;
@@ -6292,7 +6323,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let note = tab.getTuningStrings()[stringId].format(PitchNotation.Helmholtz, SymbolSet.Unicode);
           let obj = new ObjText(this, { text: note, scale: 0.8 }, 1, 0.5);
           obj.layout(ctx);
-          obj.offset(this.tabStringNotesWidth * 0.8, tab.getStringY(stringId));
+          obj.offset(this.regions.tabTuning_0 * 0.8, tab.getStringY(stringId));
           this.tabStringNotes.push(obj);
           tab.addObject(obj);
         }
@@ -6301,50 +6332,53 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.barLineLeft.layout(ctx);
     const accState = new AccidentalState(this);
     this.columns.forEach((col) => col.layout(ctx, accState));
+    this.columns.forEach((col) => col.layoutReserveSpace(ctx));
     this.barLineRight.layout(ctx);
-    if (this.endRepeatPlayCountText) {
+    if (this.endRepeatPlayCountText)
       this.endRepeatPlayCountText.layout(ctx);
-    }
-    this.layoutObjects.forEach((layoutObj) => layoutObj.layout(ctx));
+    this.layoutObjects.forEach((obj) => obj.layout(ctx));
     let padding = ctx.unitSize;
-    this.leftSolidAreaWidth = this.tabStringNotesWidth + Math.max(0, ...this.signatures.map((signature) => signature.getRect().width)) + this.barLineLeft.getRect().width + padding;
-    this.rightSolidAreaWidth = padding + this.barLineRight.getRect().width;
-    this.minColumnsAreaWidth = 0;
-    this.columns.forEach((col) => this.minColumnsAreaWidth += col.getRect().width);
-    this.minColumnsAreaWidth = Math.max(this.minColumnsAreaWidth, _ObjMeasure.MinFlexContentWidth * unitSize);
+    this.regions.signature_1 = Math.max(0, ...this.signatures.map((signature) => signature.getRect().width));
+    this.regions.leftBarLine_2 = this.barLineLeft.getRect().width;
+    this.regions.padding_3 = padding;
+    this.regions.columnsMin_4 = Math.max(
+      DocumentSettings.MinColumnsWidth * unitSize,
+      this.columns.map((col) => col.getRect().width).reduce((acc, cur) => acc + cur)
+    );
+    this.regions.padding_5 = padding;
+    this.regions.rightBarLine_6 = this.barLineRight.getRect().width;
   }
   layoutWidth(ctx, width) {
+    var _a;
     if (!this.needLayout) {
       return;
     }
     width = Math.max(width, this.getMinWidth());
-    this.rect = new AnchoredRect21();
+    this.rect = new AnchoredRect20();
     this.rect.anchorX = this.rect.left + width / 2;
     this.rect.right = this.rect.left + width;
     let rect;
     this.signatures.forEach((signature) => {
       rect = signature.getRect();
-      signature.offset(this.rect.left + this.tabStringNotesWidth - rect.left, -rect.anchorY);
+      signature.offset(this.rect.left + this.regions.tabTuning_0 - rect.left, -rect.anchorY);
     });
     let signaturesWidth = Math.max(0, ...this.signatures.map((signature) => signature.getRect().width));
     rect = this.barLineLeft.getRect();
-    this.barLineLeft.offset(this.rect.left + this.tabStringNotesWidth + signaturesWidth - rect.left, -rect.anchorY);
+    this.barLineLeft.offset(this.rect.left + this.regions.tabTuning_0 + signaturesWidth - rect.left, -rect.anchorY);
     rect = this.barLineRight.getRect();
     this.barLineRight.offset(this.rect.right - rect.right, -rect.anchorY);
-    if (this.endRepeatPlayCountText) {
-      this.endRepeatPlayCountText.offset(this.barLineRight.getRect().left, this.barLineRight.getRect().top);
-    }
-    let columnsAreaLeft = this.rect.left + this.leftSolidAreaWidth;
-    let columnsAreaRight = this.rect.right - this.rightSolidAreaWidth;
-    let columnsAreaWidth = columnsAreaRight - columnsAreaLeft;
-    let columnsWidth = Utils9.Math.sum(this.columns.map((col) => col.getRect().width));
-    let columnScale = columnsAreaWidth / columnsWidth;
-    let columnLeft = columnsAreaLeft;
+    (_a = this.endRepeatPlayCountText) == null ? void 0 : _a.offset(this.barLineRight.getRect().left, this.barLineRight.getRect().top);
+    let columnsLeft = this.rect.left + this.regions.leftSolid;
+    let columnsRight = this.rect.right - this.regions.rightSolid;
+    let columnsWidth = columnsRight - columnsLeft;
+    let columnsMinWidth = this.regions.columnsMin;
+    let columnScale = columnsWidth / columnsMinWidth;
+    let curColumnLeft = columnsLeft;
     this.columns.forEach((col) => {
       rect = col.getRect();
-      let columnAnchorX = columnLeft + rect.leftw * columnScale;
+      let columnAnchorX = curColumnLeft + rect.leftw * columnScale;
       col.offset(columnAnchorX - rect.anchorX, -rect.anchorY);
-      columnLeft += rect.width * columnScale;
+      curColumnLeft += rect.width * columnScale;
     });
     getVoiceIds().forEach((voiceId) => {
       const symbols = this.getVoiceSymbols(voiceId);
@@ -6461,12 +6495,10 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.beamGroups.forEach((beam) => beam.draw(ctx));
   }
 };
-__publicField(_ObjMeasure, "MinFlexContentWidth", 10);
-var ObjMeasure = _ObjMeasure;
 
 // src/score/engine/layout-object.ts
 import { MusicError as MusicError14, MusicErrorType as MusicErrorType14 } from "@tspro/web-music-score/core";
-import { AnchoredRect as AnchoredRect22, asMulti as asMulti2, IndexArray as IndexArray3, UniMap as UniMap6 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect21, asMulti as asMulti2, IndexArray as IndexArray3, UniMap as UniMap6 } from "@tspro/ts-utils-lib";
 var LayoutGroupId = /* @__PURE__ */ ((LayoutGroupId2) => {
   LayoutGroupId2[LayoutGroupId2["TabRhythm"] = 0] = "TabRhythm";
   LayoutGroupId2[LayoutGroupId2["Fermata"] = 1] = "Fermata";
@@ -6483,16 +6515,16 @@ var LayoutGroupId = /* @__PURE__ */ ((LayoutGroupId2) => {
 })(LayoutGroupId || {});
 var LayoutGroupIdAttrs = new UniMap6([
   [0 /* TabRhythm */, { rowAlign: true }],
-  [1 /* Fermata */, {}],
-  [2 /* NoteLabel */, { widen: true }],
+  [1 /* Fermata */, { reserveSpace: true }],
+  [2 /* NoteLabel */, { reserveSpace: true }],
   [3 /* Navigation */, { rowAlign: true }],
   [4 /* Ending */, { rowAlign: true, padding: 2 }],
   [5 /* TempoAnnotation */, { rowAlign: true, padding: 2 }],
   [6 /* DynamicsAnnotation */, { rowAlign: true, padding: 2 }],
-  [7 /* ChordLabel */, { widen: true, rowAlign: true }],
-  [8 /* LyricsVerse1 */, { rowAlign: true }],
-  [9 /* LyricsVerse2 */, { rowAlign: true }],
-  [10 /* LyricsVerse3 */, { rowAlign: true }]
+  [7 /* ChordLabel */, { reserveSpace: true, rowAlign: true }],
+  [8 /* LyricsVerse1 */, { reserveSpace: true, rowAlign: true }],
+  [9 /* LyricsVerse2 */, { reserveSpace: true, rowAlign: true }],
+  [10 /* LyricsVerse3 */, { reserveSpace: true, rowAlign: true }]
 ]);
 function requireParentMeasure(p) {
   while (p) {
@@ -6553,7 +6585,7 @@ var LayoutObjectWrapper = class {
       let staticShapeRects = staticObj.getShapeRects();
       objShapeRects.forEach((objR) => {
         staticShapeRects.forEach((staticR) => {
-          if (AnchoredRect22.overlapX(objR, staticR)) {
+          if (AnchoredRect21.overlapX(objR, staticR)) {
             y = verticalPos === 1 /* Below */ ? Math.max(y, staticR.bottom + objR.toph + objR.anchorY) : Math.min(y, staticR.top - objR.bottomh - objR.anchorY);
           }
         });
@@ -6584,11 +6616,11 @@ var LayoutGroup = class {
     // key = VerticalPos
     __publicField(this, "layoutObject", asMulti2(new IndexArray3()));
     __publicField(this, "rowAlign");
-    __publicField(this, "widensColumn");
+    __publicField(this, "reserveSpace");
     __publicField(this, "padding");
     var _a, _b, _c, _d;
     this.rowAlign = ((_a = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _a.rowAlign) === true;
-    this.widensColumn = ((_b = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _b.widen) === true;
+    this.reserveSpace = ((_b = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _b.reserveSpace) === true;
     this.padding = (_d = (_c = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _c.padding) != null ? _d : 0;
   }
   getLayoutObjects(verticalPos) {
@@ -6815,7 +6847,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     let h = unitSize * DocumentSettings.StaffHeight;
     this.topLineY = -h / 2;
     this.bottomLineY = h / 2;
-    this.rect = new AnchoredRect23(0, 0, this.topLineY, this.bottomLineY);
+    this.rect = new AnchoredRect22(0, 0, this.topLineY, this.bottomLineY);
   }
   layoutWidth(ctx) {
     this.rect.left = this.row.getRect().left;
@@ -6921,7 +6953,7 @@ var ObjTab = class extends ObjNotationLine5 {
     let h = unitSize * DocumentSettings.TabHeight;
     this.top = -h / 2;
     this.bottom = h / 2;
-    this.rect = new AnchoredRect23(0, 0, this.top, this.bottom);
+    this.rect = new AnchoredRect22(0, 0, this.top, this.bottom);
   }
   layoutWidth(ctx) {
     this.rect.left = this.row.getRect().left;
@@ -6945,7 +6977,7 @@ var ObjTab = class extends ObjNotationLine5 {
 
 // src/score/engine/obj-score-row.ts
 import { MusicError as MusicError16, MusicErrorType as MusicErrorType16 } from "@tspro/web-music-score/core";
-import { AnchoredRect as AnchoredRect24, Guard as Guard10, Utils as Utils11 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect23, Guard as Guard10, Utils as Utils11 } from "@tspro/ts-utils-lib";
 var ObjScoreRow = class extends MusicObject {
   constructor(doc, prevRow, scoreConfig) {
     super(doc);
@@ -7083,7 +7115,7 @@ var ObjScoreRow = class extends MusicObject {
     let r = this.getRect();
     let firstMeasure = this.getFirstMeasure();
     let left = firstMeasure ? firstMeasure.getColumnsContentRect().left : r.left;
-    return new AnchoredRect24(left, (left + r.right) / 2, r.right, r.top, r.anchorY, r.bottom);
+    return new AnchoredRect23(left, (left + r.right) / 2, r.right, r.top, r.anchorY, r.bottom);
   }
   getDiatonicIdAt(y) {
     for (let i = 0; i < this.notationLines.length; i++) {
@@ -7168,18 +7200,18 @@ var ObjScoreRow = class extends MusicObject {
     if (!this.needLayout) {
       return;
     }
-    this.rect = new AnchoredRect24(0, right, 0, 0);
+    this.rect = new AnchoredRect23(0, right, 0, 0);
     this.notationLines.forEach((line) => line.layoutWidth(ctx));
     let targetColumnsAreaWidth = right - left;
     let minColumnsAreaWidth = 0;
     this.measures.forEach((m) => {
-      targetColumnsAreaWidth -= m.getSolidAreaWidth() + m.getPostMeasureBreakWidth();
-      minColumnsAreaWidth += m.getMinColumnsAreaWidth();
+      targetColumnsAreaWidth -= m.getTotalSolidWidth() + m.getPostMeasureBreakWidth();
+      minColumnsAreaWidth += m.getMinColumnsWidth();
     });
     let columnsAreaScale = targetColumnsAreaWidth / minColumnsAreaWidth;
-    let x = this.doc.getInstrumentGroupSize(ctx).braceRight;
+    let x = this.doc.getInstrumentGroupRegions(ctx).braceRight;
     this.measures.forEach((m) => {
-      let newMeasureWidth = m.getSolidAreaWidth() + m.getMinColumnsAreaWidth() * columnsAreaScale;
+      let newMeasureWidth = m.getTotalSolidWidth() + m.getMinColumnsWidth() * columnsAreaScale;
       m.layoutWidth(ctx, newMeasureWidth);
       let r = m.getRect();
       m.offset(x - r.left, -r.anchorY);
@@ -7196,7 +7228,7 @@ var ObjScoreRow = class extends MusicObject {
     let right = this.measures.length > 0 ? this.measures[this.measures.length - 1].getRect().right : left;
     let top = this.measures.length > 0 ? Math.min(...this.measures.map((m) => m.getRect().top)) : 0;
     let bottom = this.measures.length > 0 ? Math.max(...this.measures.map((m) => m.getRect().bottom)) : 0;
-    this.rect = new AnchoredRect24(left, right, top, bottom);
+    this.rect = new AnchoredRect23(left, right, top, bottom);
   }
   alignStemsToBeams() {
     this.measures.forEach((m) => m.alignStemsToBeams());
@@ -7270,11 +7302,11 @@ var ObjScoreRow = class extends MusicObject {
     }
     this.measures.forEach((m) => m.draw(ctx));
     this.notationLines.forEach((m) => m.draw(ctx));
-    let grpSize = this.doc.getInstrumentGroupSize(ctx);
+    let grpSize = this.doc.getInstrumentGroupRegions(ctx);
     this.instrumentNames.forEach((obj, i) => {
       let grp = this.instrumentLineGroups[i];
       if (grp.length > 1) {
-        let r = new AnchoredRect24(
+        let r = new AnchoredRect23(
           grpSize.braceLeft,
           grpSize.braceRight,
           grp[0].getTopLineY(),
@@ -7291,7 +7323,7 @@ var ObjScoreRow = class extends MusicObject {
 };
 
 // src/score/engine/obj-header.ts
-import { AnchoredRect as AnchoredRect25 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect24 } from "@tspro/ts-utils-lib";
 var ObjHeader = class extends MusicObject {
   constructor(doc, title, composer, arranger) {
     super(doc);
@@ -7336,7 +7368,7 @@ var ObjHeader = class extends MusicObject {
   }
   layoutWidth(ctx, left, right) {
     let top = 0;
-    this.rect = new AnchoredRect25(left, right, 0, 0);
+    this.rect = new AnchoredRect24(left, right, 0, 0);
     if (this.titleText) {
       this.titleText.layout(ctx);
       this.titleText.offset((left + right) / 2, top);
@@ -7382,8 +7414,25 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-import { AnchoredRect as AnchoredRect26, Guard as Guard11, UniMap as UniMap8 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect25, Guard as Guard11, UniMap as UniMap8 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError17, MusicErrorType as MusicErrorType17 } from "@tspro/web-music-score/core";
+var InstrumentGroupRegions = class {
+  constructor() {
+    __publicField(this, "nameLeft", 0);
+    __publicField(this, "nameRight", 0);
+    __publicField(this, "braceLeft", 0);
+    __publicField(this, "braceRight", 0);
+  }
+  get left() {
+    return this.nameLeft;
+  }
+  get right() {
+    return this.braceRight;
+  }
+  get width() {
+    return this.right - this.left;
+  }
+};
 var ObjDocument = class extends MusicObject {
   constructor() {
     super(void 0);
@@ -7397,6 +7446,7 @@ var ObjDocument = class extends MusicObject {
     __publicField(this, "newRowRequested", false);
     __publicField(this, "allConnectiveProps", []);
     __publicField(this, "staffGroups", new UniMap8());
+    __publicField(this, "instrumentGroupRegions", new InstrumentGroupRegions());
     __publicField(this, "mi");
     this.mi = new MDocument2(this);
   }
@@ -7593,17 +7643,16 @@ var ObjDocument = class extends MusicObject {
       this.ctx.updateCursorRect(cursorRect);
     }
   }
-  getInstrumentGroupSize(ctx) {
+  getInstrumentGroupRegions(ctx) {
     let nameWidth = Math.max(0, ...this.rows.map((row) => row.getInstrumentNameWidth(ctx)));
     let hasName = nameWidth > 0;
     let padding = hasName ? ctx.unitSize : 0;
     let braceWidth = hasName ? ctx.unitSize * 5 : 0;
-    return {
-      nameLeft: 0,
-      nameRight: nameWidth,
-      braceLeft: nameWidth + padding,
-      braceRight: nameWidth + padding + braceWidth + padding
-    };
+    this.instrumentGroupRegions.nameLeft = 0;
+    this.instrumentGroupRegions.nameRight = nameWidth;
+    this.instrumentGroupRegions.braceLeft = nameWidth + padding;
+    this.instrumentGroupRegions.braceRight = nameWidth + padding + braceWidth + padding;
+    return this.instrumentGroupRegions;
   }
   requestLayout() {
     this.needLayout = true;
@@ -7633,18 +7682,18 @@ var ObjDocument = class extends MusicObject {
     this.allConnectiveProps.forEach((props) => props.createConnectives());
     this.rows.forEach((row) => row.resetLayoutGroups(ctx));
     this.rows.forEach((row) => row.layout(ctx));
-    let left = this.getInstrumentGroupSize(ctx).braceRight;
-    let right = Math.max(
+    let rowLeft = this.getInstrumentGroupRegions(ctx).right;
+    let rowRight = rowLeft + Math.max(
       DocumentSettings.DocumentMinWidth * unitSize,
-      ...this.rows.map((row) => 1.4 * row.getMinWidth())
+      ...this.rows.map((row) => row.getMinWidth())
     );
-    this.rows.forEach((row) => row.layoutWidth(ctx, left, right));
+    this.rows.forEach((row) => row.layoutWidth(ctx, rowLeft, rowRight));
     this.rows.forEach((row) => row.layoutLayoutGroups(ctx));
     this.rows.forEach((row) => row.layoutSetNotationLines(ctx));
     this.rows.forEach((row) => row.layoutPadding(ctx));
-    this.rect = new AnchoredRect26();
+    this.rect = new AnchoredRect25();
     if (this.header) {
-      this.header.layoutWidth(ctx, left, right);
+      this.header.layoutWidth(ctx, rowLeft, rowRight);
       this.rect.expandInPlace(this.header.getRect());
     }
     this.rows.forEach((row) => {