@tspro/web-music-score 5.3.0 → 5.4.1

package/dist/score/index.mjs

@@ -1,43 +1,45 @@
-/* WebMusicScore v5.3.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-6P4ECBUH.mjs";
 import {
   NoteLengthProps,
   RhythmProps,
   validateNoteLength
-} from "../chunk-ZBA5XLYR.mjs";
+} from "../chunk-A5SMODAT.mjs";
 import {
   __publicField
-} from "../chunk-C6UQDKWU.mjs";
+} from "../chunk-U2ACCEHX.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
-import { MusicError, MusicErrorType } from "@tspro/web-music-score/core";
 var DivRect = class _DivRect {
   constructor(...args) {
     __publicField(this, "left");
-    __publicField(this, "centerX");
+    __publicField(this, "anchorX");
     __publicField(this, "right");
     __publicField(this, "top");
-    __publicField(this, "centerY");
+    __publicField(this, "anchorY");
     __publicField(this, "bottom");
     if (args.length === 6) {
       this.left = args[0];
-      this.centerX = args[1];
+      this.anchorX = args[1];
       this.right = args[2];
       this.top = args[3];
-      this.centerY = args[4];
+      this.anchorY = args[4];
       this.bottom = args[5];
     } else if (args.length === 4) {
       this.left = args[0];
       this.right = args[1];
-      this.centerX = (this.left + this.right) / 2;
+      this.anchorX = (this.left + this.right) / 2;
       this.top = args[2];
       this.bottom = args[3];
-      this.centerY = (this.top + this.bottom) / 2;
+      this.anchorY = (this.top + this.bottom) / 2;
     } else if (args.length === 0) {
-      this.left = this.centerX = this.right = 0;
-      this.top = this.centerY = this.bottom = 0;
+      this.left = this.anchorX = this.right = 0;
+      this.top = this.anchorY = this.bottom = 0;
     } else {
-      throw new MusicError(MusicErrorType.InvalidArg, `Invalid DivRect args: ${args}`);
+      throw new TypeError(`Invalid DivRect args: ${args}`);
     }
   }
   /**
@@ -45,7 +47,7 @@ var DivRect = class _DivRect {
    * 
    * @param left - Left coordinate.
    * @param top - Top coordinate.
-   * @param width - With.
+   * @param width - Width.
    * @param height - Height.
    * @returns - DivRect.
    */
@@ -53,7 +55,7 @@ var DivRect = class _DivRect {
     return new _DivRect(left, left + width, top, top + height);
   }
   /**
-   * Create rect from centerX, centerY, width, height arguments.
+   * Create rect from anchorX, anchorY, width, height arguments.
    * 
    * @param centerX - Center x-coordinate.
    * @param centerY - Center y-coordinate.
@@ -62,7 +64,14 @@ var DivRect = class _DivRect {
    * @returns - DivRect.
    */
   static createCentered(centerX, centerY, width, height) {
-    return new _DivRect(centerX - width / 2, centerX + width / 2, centerY - height / 2, centerY + height / 2);
+    return new _DivRect(
+      centerX - width / 2,
+      centerX,
+      centerX + width / 2,
+      centerY - height / 2,
+      centerY,
+      centerY + height / 2
+    );
   }
   /**
    * Create rect from sections.
@@ -76,6 +85,22 @@ var DivRect = class _DivRect {
   static createSections(leftw, rightw, toph, bottomh) {
     return new _DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
   }
+  /** @deprecated - Renamed to anchorX. */
+  get centerX() {
+    return this.anchorX;
+  }
+  /** @deprecated - Renamed to anchorX. */
+  set centerX(x) {
+    this.anchorX = x;
+  }
+  /** @deprecated - Renamed to anchorY. */
+  get centerY() {
+    return this.anchorY;
+  }
+  /** @deprecated - Renamed to anchorY. */
+  set centerY(y) {
+    this.anchorY = y;
+  }
   /**
    * Width getter.
    */
@@ -92,25 +117,25 @@ var DivRect = class _DivRect {
    * Left section width getter.
    */
   get leftw() {
-    return this.centerX - this.left;
+    return this.anchorX - this.left;
   }
   /**
    * Right section width getter.
    */
   get rightw() {
-    return this.right - this.centerX;
+    return this.right - this.anchorX;
   }
   /**
    * Top section height getter.
    */
   get toph() {
-    return this.centerY - this.top;
+    return this.anchorY - this.top;
   }
   /**
    * Bottom section height getter.
    */
   get bottomh() {
-    return this.bottom - this.centerY;
+    return this.bottom - this.anchorY;
   }
   /**
    * Does this Rect contain given (x, y)-point?
@@ -143,7 +168,7 @@ var DivRect = class _DivRect {
     return a.right > b.left && a.left < b.right;
   }
   /**
-   * Check if this Rect equals with given Rect.
+   * Check if given rects are equal.
    * @param a - DivRect a.
    * @param b - DivRect b.
    * @returns - True/false.
@@ -154,17 +179,25 @@ var DivRect = class _DivRect {
     } else if (a == null || b == null) {
       return false;
     } else {
-      return a === b || a.left === b.left && a.centerX === b.centerX && a.right === b.right && a.top === b.top && a.centerY === b.centerY && a.bottom === b.bottom;
+      return a === b || a.left === b.left && a.anchorX === b.anchorX && a.right === b.right && a.top === b.top && a.anchorY === b.anchorY && a.bottom === b.bottom;
     }
   }
   /**
-   * Check if frame of this Rect equals with given Rect, ignoring center x- and center y-coordinates.
+   * Check if this rect equals with another rect.
+   * @param other - The other rect.
+   * @returns - True/false.
+   */
+  equals(other) {
+    return _DivRect.equals(this, other);
+  }
+  /**
+   * Check if edges of given rects are equal, ignoring anchorX and anchorY.
    * 
    * @param a - DivRect a.
    * @param b - DivRect b.
    * @returns - True/false.
    */
-  static equalsFrame(a, b) {
+  static equalsEdges(a, b) {
     if (a == null && b == null) {
       return true;
     } else if (a == null || b == null) {
@@ -173,13 +206,26 @@ var DivRect = class _DivRect {
       return a === b || a.left === b.left && a.right === b.right && a.top === b.top && a.bottom === b.bottom;
     }
   }
+  /**
+   * Check if edges of this Rect equals with given Rect, ignoring anchorX and anchorY.
+   * 
+   * @param other - The other DivRect.
+   * @returns - True/false.
+   */
+  equalsEdges(other) {
+    return _DivRect.equalsEdges(this, other);
+  }
+  /** @deprecated - Use `DivRect.equalsEdges()` instead. */
+  static equalsFrame(a, b) {
+    return _DivRect.equalsEdges(a, b);
+  }
   /**
    * Created duplicate of this Rect.
    * 
    * @returns - Duplicate.
    */
   copy() {
-    return new _DivRect(this.left, this.centerX, this.right, this.top, this.centerY, this.bottom);
+    return new _DivRect(this.left, this.anchorX, this.right, this.top, this.anchorY, this.bottom);
   }
   /**
    * Move this rect by (dx, dy). Modifies this Rect.
@@ -190,10 +236,10 @@ var DivRect = class _DivRect {
    */
   offsetInPlace(dx, dy) {
     this.left += dx;
-    this.centerX += dx;
+    this.anchorX += dx;
     this.right += dx;
     this.top += dy;
-    this.centerY += dy;
+    this.anchorY += dy;
     this.bottom += dy;
     return this;
   }
@@ -238,10 +284,10 @@ var DivRect = class _DivRect {
   clipInPlace(clipRect) {
     this.left = Math.max(this.left, clipRect.left);
     this.right = Math.min(this.right, clipRect.right);
-    this.centerX = Utils.Math.clamp(this.centerX, this.left, this.right);
+    this.anchorX = Utils.Math.clamp(this.anchorX, this.left, this.right);
     this.top = Math.max(this.top, clipRect.top);
     this.bottom = Math.min(this.bottom, clipRect.bottom);
-    this.centerY = Utils.Math.clamp(this.centerY, this.top, this.bottom);
+    this.anchorY = Utils.Math.clamp(this.anchorY, this.top, this.bottom);
     return this;
   }
   /**
@@ -254,7 +300,7 @@ var DivRect = class _DivRect {
     return this.copy().clipInPlace(clipRect);
   }
   /**
-   * Scale Rect. Anchor pos is (centerX, centerY). Modifies this Rect.
+   * Scale Rect. Anchor pos is (anchorX, anchorY). Modifies this Rect.
    * 
    * @param scaleX - Scale x-amount.
    * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
@@ -262,14 +308,14 @@ var DivRect = class _DivRect {
    */
   scaleInPlace(scaleX, scaleY) {
     scaleY = scaleY != null ? scaleY : scaleX;
-    this.left = this.centerX - this.leftw * scaleX;
-    this.right = this.centerX + this.rightw * scaleX;
-    this.top = this.centerY - this.toph * scaleY;
-    this.bottom = this.centerY + this.bottomh * scaleY;
+    this.left = this.anchorX - this.leftw * scaleX;
+    this.right = this.anchorX + this.rightw * scaleX;
+    this.top = this.anchorY - this.toph * scaleY;
+    this.bottom = this.anchorY + this.bottomh * scaleY;
     return this;
   }
   /**
-   * Scale Rect. Anchor pos is (centerX, centerY). Immutable, returns modified copy.
+   * Scale Rect. Anchor pos is (anchorX, anchorY). Immutable, returns modified copy.
    * 
    * @param scaleX - Scale x-amount.
    * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
@@ -288,17 +334,18 @@ var DivRect = class _DivRect {
 };
 
 // src/score/pub/document-builder.ts
-import { Utils as Utils16 } from "@tspro/ts-utils-lib";
+import { Guard as Guard12, Utils as Utils12 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/types.ts
-var StaffPreset = /* @__PURE__ */ ((StaffPreset3) => {
-  StaffPreset3["Treble"] = "treble";
-  StaffPreset3["Bass"] = "bass";
-  StaffPreset3["Grand"] = "grand";
-  StaffPreset3["GuitarTreble"] = "guitarTreble";
-  StaffPreset3["GuitarTab"] = "guitarTab";
-  StaffPreset3["GuitarCombined"] = "guitarCombined";
-  return StaffPreset3;
+import { Guard } from "@tspro/ts-utils-lib";
+var StaffPreset = /* @__PURE__ */ ((StaffPreset2) => {
+  StaffPreset2["Treble"] = "treble";
+  StaffPreset2["Bass"] = "bass";
+  StaffPreset2["Grand"] = "grand";
+  StaffPreset2["GuitarTreble"] = "guitarTreble";
+  StaffPreset2["GuitarTab"] = "guitarTab";
+  StaffPreset2["GuitarCombined"] = "guitarCombined";
+  return StaffPreset2;
 })(StaffPreset || {});
 var Clef = /* @__PURE__ */ ((Clef2) => {
   Clef2["G"] = "G";
@@ -308,12 +355,42 @@ var Clef = /* @__PURE__ */ ((Clef2) => {
 function getVoiceIds() {
   return [0, 1, 2, 3];
 }
+function isVoiceId(voiceId) {
+  return Guard.isIncluded(voiceId, getVoiceIds());
+}
+function validateVoiceId(voiceId) {
+  if (isVoiceId(voiceId)) {
+    return voiceId;
+  } else {
+    throw new MusicError(6 /* Score */, `Voice id ${voiceId} is invalid!`);
+  }
+}
 function getStringNumbers() {
   return [1, 2, 3, 4, 5, 6];
 }
+function isStringNumber(stringNum) {
+  return Guard.isIncluded(stringNum, getStringNumbers());
+}
+function validateStringNumber(stringNum) {
+  if (isStringNumber(stringNum)) {
+    return stringNum;
+  } else {
+    throw new MusicError(6 /* Score */, `String number ${stringNum} is invalid!`);
+  }
+}
 function getVerseNumbers() {
   return [1, 2, 3];
 }
+function isVerseNumber(verse) {
+  return Guard.isIncluded(verse, getVerseNumbers());
+}
+function validateVerseNumber(verseNum) {
+  if (isVerseNumber(verseNum)) {
+    return verseNum;
+  } else {
+    throw new MusicError(6 /* Score */, `Verse number ${verseNum} is invalid!`);
+  }
+}
 var Stem = /* @__PURE__ */ ((Stem2) => {
   Stem2["Auto"] = "auto";
   Stem2["Up"] = "up";
@@ -344,12 +421,12 @@ var Connective = /* @__PURE__ */ ((Connective2) => {
   Connective2["Slide"] = "slide";
   return Connective2;
 })(Connective || {});
-var VerticalPosition = /* @__PURE__ */ ((VerticalPosition4) => {
-  VerticalPosition4["Auto"] = "auto";
-  VerticalPosition4["Above"] = "above";
-  VerticalPosition4["Below"] = "below";
-  VerticalPosition4["Both"] = "both";
-  return VerticalPosition4;
+var VerticalPosition = /* @__PURE__ */ ((VerticalPosition3) => {
+  VerticalPosition3["Auto"] = "auto";
+  VerticalPosition3["Above"] = "above";
+  VerticalPosition3["Below"] = "below";
+  VerticalPosition3["Both"] = "both";
+  return VerticalPosition3;
 })(VerticalPosition || {});
 var LyricsAlign = /* @__PURE__ */ ((LyricsAlign2) => {
   LyricsAlign2["Left"] = "left";
@@ -420,6 +497,7 @@ var PlayState = /* @__PURE__ */ ((PlayState2) => {
 })(PlayState || {});
 
 // src/score/engine/music-object.ts
+import { AnchoredRect } from "@tspro/ts-utils-lib";
 var MusicObjectLink = class {
   constructor(head) {
     __publicField(this, "head");
@@ -448,7 +526,7 @@ var MusicObject = class {
     this.parent = parent;
     __publicField(this, "anchoredLayoutObjects", []);
     __publicField(this, "link");
-    __publicField(this, "rect", new DivRect());
+    __publicField(this, "rect", new AnchoredRect());
     __publicField(this, "needRectUpdate", true);
   }
   getParent() {
@@ -500,7 +578,7 @@ import { Note as Note9 } from "@tspro/web-music-score/theory";
 import { getTuningStrings, Note as Note8, validateTuningName } from "@tspro/web-music-score/theory";
 
 // src/score/engine/render-context.ts
-import { Utils as Utils2, Vec2, Device } from "@tspro/ts-utils-lib";
+import { Utils as Utils2, Vec, Device, UniMap, AnchoredRect as AnchoredRect2 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/settings.ts
 var DebugSettings = {
@@ -510,6 +588,8 @@ var DebugSettings = {
 var DocumentSettings = {
   DocumentScale: 1,
   DocumentMinWidth: 75,
+  MinColumnsWidth: 10,
+  ColumnWidthScale: 1.7,
   PostMeasureBreakWidth: 10,
   NoteDotSpace: 0.5,
   NoteAccSpace: 0.5,
@@ -545,7 +625,7 @@ var G_clef_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAACWCAYA
 var HilightStaffPosRectColor = "#55cc55";
 var HilightObjectRectColor = "#55cc55";
 var PlayPosIndicatorColor = "#44aa44";
-var ImageAssets = /* @__PURE__ */ new Map([
+var ImageAssets = new UniMap([
   [0 /* G_Clef */, { src: G_clef_default }],
   [1 /* F_Clef */, { src: F_clef_default }]
 ]);
@@ -614,7 +694,7 @@ var RenderContext = class {
   }
   finishImageAsset(asset) {
     asset.finished = true;
-    let allFinished = Array.from(ImageAssets).every((asset2) => asset2[1].finished === true);
+    let allFinished = ImageAssets.every((asset2) => asset2.finished === true);
     if (allFinished) {
       this.onLoad();
     }
@@ -662,7 +742,7 @@ var RenderContext = class {
     return this.scoreEventListener !== void 0;
   }
   getMousePos(e) {
-    return new Vec2(e.offsetX, e.offsetY);
+    return new Vec(e.offsetX, e.offsetY);
   }
   updateCurStaffPos(staffPos, click) {
     let changed = !staffPosEquals(staffPos, this.curStaffPos);
@@ -879,7 +959,7 @@ var RenderContext = class {
       toph = unitSize * (0.5 + flagCount - adj);
       bottomh = unitSize * (1 + flagCount + adj);
     }
-    return new DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
+    return new AnchoredRect2(-leftw, 0, rightw, -toph, 0, bottomh);
   }
   drawRest(restSize, x, y) {
     let { unitSize } = this;
@@ -1101,7 +1181,7 @@ var RenderContext = class {
   }
   drawBrace(rect, side) {
     if (this.ctx) {
-      let { left, right, width, top, bottom, centerY } = rect;
+      let { left, right, width, top, bottom, anchorY } = rect;
       if (side === "right") {
         [left, right, width] = [right, left, -width];
       }
@@ -1111,18 +1191,18 @@ var RenderContext = class {
         left + width * 0.1,
         top,
         left + width * 0.8,
-        centerY,
+        anchorY,
         left,
-        centerY
+        anchorY
       );
       this.ctx.moveTo(right, bottom);
       this.ctx.bezierCurveTo(
         left + width * 0.1,
         bottom,
         left + width * 0.8,
-        centerY,
+        anchorY,
         left,
-        centerY
+        anchorY
       );
       this.ctx.stroke();
     }
@@ -1131,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 { Utils as Utils13 } 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 { Map3 as Map32, Utils as Utils12 } 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";
 
@@ -1164,6 +1244,7 @@ var AccidentalState = class {
 import { Note as Note2, getTempoString, KeySignature } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-image.ts
+import { AnchoredRect as AnchoredRect3 } from "@tspro/ts-utils-lib";
 var ObjImage = class extends MusicObject {
   constructor(parent, image, anchorX, anchorY, imageScale) {
     super(parent);
@@ -1186,9 +1267,9 @@ var ObjImage = class extends MusicObject {
     try {
       let w = image.naturalWidth * imageScale * unitSize;
       let h = image.naturalHeight * imageScale * unitSize;
-      this.rect = DivRect.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
+      this.rect = AnchoredRect3.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
     } catch (err) {
-      this.rect = new DivRect();
+      this.rect = new AnchoredRect3();
     }
   }
   offset(dx, dy) {
@@ -1197,12 +1278,13 @@ var ObjImage = class extends MusicObject {
   draw(ctx) {
     let r = this.rect;
     ctx.drawDebugRect(r);
-    ctx.drawImage(this.image, r.centerX - r.leftw, r.centerY - r.toph, r.width, r.height);
+    ctx.drawImage(this.image, r.anchorX - r.leftw, r.anchorY - r.toph, r.width, r.height);
   }
 };
 
 // src/score/engine/obj-accidental.ts
 import { MusicError as MusicError3, MusicErrorType as MusicErrorType3 } from "@tspro/web-music-score/core";
+import { AnchoredRect as AnchoredRect4 } from "@tspro/ts-utils-lib";
 var ObjAccidental = class extends MusicObject {
   constructor(parent, diatonicId, accidental, color = "black") {
     super(parent);
@@ -1222,19 +1304,19 @@ var ObjAccidental = class extends MusicObject {
     let { unitSize } = ctx;
     switch (this.accidental) {
       case -2:
-        this.rect = DivRect.createSections(unitSize * 1.25, unitSize * 1.25, unitSize * 4, unitSize * 1.2);
+        this.rect = AnchoredRect4.createSections(unitSize * 1.25, unitSize * 1.25, unitSize * 4, unitSize * 1.2);
         break;
       case -1:
-        this.rect = DivRect.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 4, unitSize * 1.2);
+        this.rect = AnchoredRect4.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 4, unitSize * 1.2);
         break;
       case 0:
-        this.rect = DivRect.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 2.2, unitSize * 2.2);
+        this.rect = AnchoredRect4.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 2.2, unitSize * 2.2);
         break;
       case 1:
-        this.rect = DivRect.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 2, unitSize * 2);
+        this.rect = AnchoredRect4.createSections(unitSize * 0.75, unitSize * 0.75, unitSize * 2, unitSize * 2);
         break;
       case 2:
-        this.rect = DivRect.createSections(unitSize * 1, unitSize * 1, unitSize * 1, unitSize * 1);
+        this.rect = AnchoredRect4.createSections(unitSize * 1, unitSize * 1, unitSize * 1, unitSize * 1);
         break;
       default:
         throw new MusicError3(MusicErrorType3.Score, "Invalid accidental value: " + this.accidental);
@@ -1247,8 +1329,8 @@ var ObjAccidental = class extends MusicObject {
     ctx.drawDebugRect(this.rect);
     let { unitSize } = ctx;
     let { accidental } = this;
-    let x = this.rect.centerX;
-    let y = this.rect.centerY;
+    let x = this.rect.anchorX;
+    let y = this.rect.anchorY;
     ctx.color(this.color);
     const draw_b = (x2, y2) => {
       ctx.lineWidth(1).beginPath().moveTo(x2 - unitSize * 0.75, y2 - unitSize * 4).lineTo(x2 - unitSize * 0.75, y2 + unitSize * 1.1).bezierCurveTo(
@@ -1277,6 +1359,7 @@ var ObjAccidental = class extends MusicObject {
 };
 
 // src/score/engine/obj-text.ts
+import { AnchoredRect as AnchoredRect5 } from "@tspro/ts-utils-lib";
 var DefaultBoxedPadding = 0.5;
 var ObjText = class extends MusicObject {
   constructor(parent, text, anchorX, anchorY) {
@@ -1313,7 +1396,7 @@ var ObjText = class extends MusicObject {
     if (this.textLines.length === 0) {
       this.textLines = [""];
     }
-    this.rect = new DivRect();
+    this.rect = new AnchoredRect5();
     this.mi = new MText(this);
   }
   getMusicInterface() {
@@ -1325,14 +1408,14 @@ var ObjText = class extends MusicObject {
   updateAnchorX(anchorX) {
     this.anchorX = anchorX;
     let { width } = this.rect;
-    this.rect.left = this.rect.centerX - width * anchorX;
-    this.rect.right = this.rect.centerX + width * (1 - anchorX);
+    this.rect.left = this.rect.anchorX - width * anchorX;
+    this.rect.right = this.rect.anchorX + width * (1 - anchorX);
   }
   updateAnchorY(anchorY) {
     this.anchorY = anchorY;
     let { height } = this.rect;
-    this.rect.top = this.rect.centerY - height * anchorY;
-    this.rect.bottom = this.rect.centerY + height * (1 - anchorY);
+    this.rect.top = this.rect.anchorY - height * anchorY;
+    this.rect.bottom = this.rect.anchorY + height * (1 - anchorY);
   }
   pick(x, y) {
     return this.rect.contains(x, y) ? [this] : [];
@@ -1349,7 +1432,7 @@ var ObjText = class extends MusicObject {
     if (this.boxed === "square" || this.boxed === "circle") {
       h = w = Math.max(h, w);
     }
-    this.rect = DivRect.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
+    this.rect = AnchoredRect5.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -1371,12 +1454,12 @@ var ObjText = class extends MusicObject {
     let textHeight = lineCount * lineHeight;
     let fixY = -lineHeight * (italic ? 0.25 : 0.2);
     let p = padding * ctx.unitSize;
-    let centerX = (rect.left + p) * (1 - anchorX) + (rect.right - p) * anchorX;
-    let centerY = (rect.top + p) * (1 - anchorY) + (rect.bottom - p) * anchorY;
+    let aX = (rect.left + p) * (1 - anchorX) + (rect.right - p) * anchorX;
+    let aY = (rect.top + p) * (1 - anchorY) + (rect.bottom - p) * anchorY;
     ctx.color(this.color);
     this.textLines.forEach((textLine, i) => {
-      let x = centerX - lineWidths[i] * anchorX;
-      let y = centerY - textHeight * anchorY + lineHeight * (i + 1) + fixY;
+      let x = aX - lineWidths[i] * anchorX;
+      let y = aY - textHeight * anchorY + lineHeight * (i + 1) + fixY;
       ctx.fillText(textLine, x, y);
     });
     switch (this.boxed) {
@@ -1386,12 +1469,8 @@ var ObjText = class extends MusicObject {
         break;
       case "circle":
       case "ellipse":
-        let x = (rect.left + rect.right) / 2;
-        let y = (rect.top + rect.bottom) / 2;
-        let rx = (rect.right - rect.left) / 2;
-        let ry = (rect.bottom - rect.top) / 2;
         ctx.beginPath();
-        ctx.ellipse(x, y, rx, ry, 0, 0, 2 * Math.PI);
+        ctx.ellipse(rect.centerX, rect.centerY, rect.width / 2, rect.height / 2, 0, 0, 2 * Math.PI);
         ctx.stroke();
         break;
     }
@@ -1400,6 +1479,7 @@ var ObjText = class extends MusicObject {
 
 // src/score/engine/obj-signature.ts
 import { MusicError as MusicError4, MusicErrorType as MusicErrorType4 } from "@tspro/web-music-score/core";
+import { AnchoredRect as AnchoredRect6 } from "@tspro/ts-utils-lib";
 var ObjStaffSignature = class extends MusicObject {
   constructor(measure, staff) {
     super(measure);
@@ -1558,7 +1638,7 @@ var ObjStaffSignature = class extends MusicObject {
     let { staff } = this;
     let paddingX = unitSize;
     let x = 0;
-    this.rect = new DivRect();
+    this.rect = new AnchoredRect6();
     if (this.clefImage) {
       x += paddingX;
       this.clefImage.layout(ctx);
@@ -1568,7 +1648,7 @@ var ObjStaffSignature = class extends MusicObject {
       if (this.eightBelowClef) {
         let r = this.clefImage.getRect();
         this.eightBelowClef.layout(ctx);
-        this.eightBelowClef.offset(r.left + r.width / 2, Math.max(r.centerY + r.height * 0.3, staff.getBottomLineY()));
+        this.eightBelowClef.offset(r.centerX, Math.max(r.anchorY + r.height * 0.3, staff.getBottomLineY()));
         this.rect.expandInPlace(this.eightBelowClef.getRect());
       }
     }
@@ -1727,7 +1807,7 @@ var ObjTabSignature = class extends MusicObject {
     let paddingX = unitSize;
     let x = 0;
     let topLineY = tab.getTopLineY();
-    this.rect = new DivRect();
+    this.rect = new AnchoredRect6();
     if (this.measureNumber) {
       this.measureNumber.layout(ctx);
       this.measureNumber.offset(0, topLineY);
@@ -1738,11 +1818,11 @@ var ObjTabSignature = class extends MusicObject {
     (_b = this.beatSizeText) == null ? void 0 : _b.layout(ctx);
     let tsWidth = Math.max((_d = (_c = this.beatCountText) == null ? void 0 : _c.getRect().width) != null ? _d : 0, (_f = (_e = this.beatSizeText) == null ? void 0 : _e.getRect().width) != null ? _f : 0);
     if (this.beatCountText) {
-      this.beatCountText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().centerY - this.beatCountText.getRect().bottomh);
+      this.beatCountText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().anchorY - this.beatCountText.getRect().bottomh);
       this.rect.expandInPlace(this.beatCountText.getRect());
     }
     if (this.beatSizeText) {
-      this.beatSizeText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().centerY + this.beatSizeText.getRect().toph);
+      this.beatSizeText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().anchorY + this.beatSizeText.getRect().toph);
       this.rect.expandInPlace(this.beatSizeText.getRect());
     }
     if (this.tempoText) {
@@ -1770,7 +1850,7 @@ var ObjTabSignature = class extends MusicObject {
 };
 
 // src/score/engine/player.ts
-import { Utils as Utils5 } from "@tspro/ts-utils-lib";
+import { Rect as Rect2, UniMap as UniMap3, Utils as Utils5 } from "@tspro/ts-utils-lib";
 import { NoteLength as NoteLength4, RhythmProps as RhythmProps4, alterTempoSpeed } from "@tspro/web-music-score/theory";
 import * as Audio from "@tspro/web-music-score/audio";
 
@@ -1778,6 +1858,7 @@ import * as Audio from "@tspro/web-music-score/audio";
 import { Note as Note5 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-arpeggio.ts
+import { AnchoredRect as AnchoredRect7 } from "@tspro/ts-utils-lib";
 var ObjArpeggio = class extends MusicObject {
   constructor(col, line, arpeggioDir) {
     super(col);
@@ -1808,7 +1889,7 @@ var ObjArpeggio = class extends MusicObject {
     this.numCycles = Math.ceil((bottom - top) / this.cycleHeight) + 2;
     let width = unitSize * 2;
     let height = this.numCycles * this.cycleHeight;
-    this.rect = new DivRect(-width / 2, width / 2, -height / 2 - this.topArrowHeight, height / 2 + this.bottomArrowHeight);
+    this.rect = new AnchoredRect7(-width / 2, width / 2, -height / 2 - this.topArrowHeight, height / 2 + this.bottomArrowHeight);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -1820,21 +1901,21 @@ var ObjArpeggio = class extends MusicObject {
     ctx.lineWidth(2);
     ctx.beginPath();
     for (let i = 0, y = rect.top + topArrowHeight; i < this.numCycles; i++, y += this.cycleHeight) {
-      ctx.moveTo(rect.centerX, y);
-      ctx.quadraticCurveTo(rect.left, y + this.cycleHeight / 4, rect.centerX, y + this.cycleHeight / 2);
-      ctx.quadraticCurveTo(rect.right, y + this.cycleHeight * 3 / 4, rect.centerX, y + this.cycleHeight);
+      ctx.moveTo(rect.anchorX, y);
+      ctx.quadraticCurveTo(rect.left, y + this.cycleHeight / 4, rect.anchorX, y + this.cycleHeight / 2);
+      ctx.quadraticCurveTo(rect.right, y + this.cycleHeight * 3 / 4, rect.anchorX, y + this.cycleHeight);
     }
     ctx.stroke();
     if (topArrowHeight > 0) {
       ctx.beginPath();
-      ctx.moveTo(rect.centerX, rect.top);
+      ctx.moveTo(rect.anchorX, rect.top);
       ctx.lineTo(rect.right, rect.top + topArrowHeight);
       ctx.lineTo(rect.left, rect.top + topArrowHeight);
       ctx.fill();
     }
     if (bottomArrowHeight > 0) {
       ctx.beginPath();
-      ctx.moveTo(rect.centerX, rect.bottom);
+      ctx.moveTo(rect.anchorX, rect.bottom);
       ctx.lineTo(rect.left, rect.bottom - bottomArrowHeight);
       ctx.lineTo(rect.right, rect.bottom - bottomArrowHeight);
       ctx.fill();
@@ -1845,6 +1926,7 @@ var ObjArpeggio = class extends MusicObject {
 // src/score/engine/obj-rest.ts
 import { Note as Note3, NoteLengthProps as NoteLengthProps2, RhythmProps as RhythmProps2, Tuplet } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError5, MusicErrorType as MusicErrorType5 } from "@tspro/web-music-score/core";
+import { AnchoredRect as AnchoredRect8 } from "@tspro/ts-utils-lib";
 function getDiatonicIdFromStaffPos(staffPos) {
   if (typeof staffPos === "number") {
     return Note3.getChromaticNote(staffPos).diatonicId;
@@ -1861,7 +1943,7 @@ var ObjStaffRest = class extends MusicObject {
     super(staff);
     this.staff = staff;
     this.rest = rest;
-    __publicField(this, "restRect", new DivRect());
+    __publicField(this, "restRect", new AnchoredRect8());
     __publicField(this, "dotRects", []);
     __publicField(this, "mi");
     staff.addObject(this);
@@ -1880,7 +1962,7 @@ var ObjStaffRest = class extends MusicObject {
     this.rest.requestRectUpdate();
   }
   updateRect() {
-    this.rect = this.restRect.copy();
+    this.rect = this.restRect.clone();
     this.dotRects.forEach((r) => this.rect.expandInPlace(r));
   }
 };
@@ -1986,9 +2068,9 @@ var _ObjRest = class _ObjRest extends MusicObject {
   getBeamCoords() {
     return this.staffObjects.map((obj) => {
       let staff = obj.staff;
-      let x = obj.getRect().centerX;
+      let x = obj.getRect().anchorX;
       let y = this.stemDir === "up" /* Up */ ? obj.getRect().top : obj.getRect().bottom;
-      let stemHeight = Math.abs(obj.getRect().centerY - y);
+      let stemHeight = Math.abs(obj.getRect().anchorY - y);
       return { staff, x, y, stemHeight };
     });
   }
@@ -2042,17 +2124,18 @@ var _ObjRest = class _ObjRest extends MusicObject {
         let dotWidth = DocumentSettings.DotSize * unitSize;
         let dotX = obj.restRect.rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize * unitSize) + i * DocumentSettings.DotSize * unitSize * 1.5;
         let dotY = this.getRestDotVerticalDisplacement(noteSize) * unitSize;
-        obj.dotRects.push(DivRect.createCentered(dotX, dotY, dotWidth, dotWidth));
+        obj.dotRects.push(AnchoredRect8.createCentered(dotX, dotY, dotWidth, dotWidth));
       }
       obj.offset(0, staff.getDiatonicIdY(diatonicId));
       this.staffObjects.push(obj);
+      this.measure.addStaticObject(staff, obj);
     });
   }
   updateRect() {
     if (this.staffObjects.length === 0) {
-      this.rect = new DivRect();
+      this.rect = new AnchoredRect8();
     } else {
-      this.rect = this.staffObjects[0].getRect().copy();
+      this.rect = this.staffObjects[0].getRect().clone();
       if (this.staffObjects.length > 1) {
         for (let i = 1; i < this.staffObjects.length; i++) {
           this.rect.expandInPlace(this.staffObjects[i].getRect());
@@ -2073,10 +2156,8 @@ var _ObjRest = class _ObjRest extends MusicObject {
     ctx.color(this.color).lineWidth(1);
     this.staffObjects.forEach((obj) => {
       let { dotRects, restRect } = obj;
-      let x = restRect.centerX;
-      let y = restRect.centerY;
-      ctx.drawRest(noteSize, x, y);
-      dotRects.forEach((r) => ctx.fillCircle(r.centerX, r.centerY, r.width / 2));
+      ctx.drawRest(noteSize, restRect.anchorX, restRect.anchorY);
+      dotRects.forEach((r) => ctx.fillCircle(r.anchorX, r.anchorY, r.width / 2));
     });
   }
 };
@@ -2084,18 +2165,18 @@ __publicField(_ObjRest, "UndefinedDiatonicId", Infinity);
 var ObjRest = _ObjRest;
 
 // src/score/engine/obj-note-group.ts
-import { Utils as Utils3 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect9, Guard as Guard2, Utils as Utils3 } from "@tspro/ts-utils-lib";
 import { Note as Note4, NoteLengthProps as NoteLengthProps3, RhythmProps as RhythmProps3, Tuplet as Tuplet2 } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError6, MusicErrorType as MusicErrorType6 } from "@tspro/web-music-score/core";
 function getArpeggio(a) {
-  return Utils3.Is.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
+  return Guard2.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
 }
 function sortNotesAndStrings(notes, strings) {
   let stringArr = Utils3.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
   let noteStringData = notes.map((note, i) => {
     return { note, string: stringArr[i] };
   });
-  noteStringData = Utils3.Arr.removeDuplicatesCmp(noteStringData, (a, b) => Note4.equals(a.note, b.note)).sort((a, b) => Note4.compareFunc(a.note, b.note));
+  noteStringData = Utils3.Arr.removeDuplicates(noteStringData, (a, b) => Note4.equals(a.note, b.note)).sort((a, b) => Note4.compareFunc(a.note, b.note));
   return {
     sortedNotes: noteStringData.map((e) => e.note),
     sortedStrings: noteStringData.every((e) => e.string === void 0) ? void 0 : noteStringData.map((e) => e.string)
@@ -2133,7 +2214,7 @@ var ObjStaffNoteGroup = class extends MusicObject {
     return [this];
   }
   updateRect() {
-    this.rect = this.noteHeadRects[0].copy();
+    this.rect = this.noteHeadRects[0].clone();
     this.noteHeadRects.forEach((r) => this.rect.expandInPlace(r));
     if (this.stemTip) this.rect.expandInPlace(this.stemTip);
     if (this.stemBase) this.rect.expandInPlace(this.stemBase);
@@ -2144,9 +2225,9 @@ var ObjStaffNoteGroup = class extends MusicObject {
   getRect() {
     let bottomNoteRect = this.noteHeadRects[0];
     let topNoteRect = this.noteHeadRects[this.noteHeadRects.length - 1];
-    if (this.prevTopNoteY !== topNoteRect.centerY || this.prevBottomNoteY !== bottomNoteRect.centerY) {
-      this.prevTopNoteY = topNoteRect.centerY;
-      this.prevBottomNoteY = bottomNoteRect.centerY;
+    if (this.prevTopNoteY !== topNoteRect.anchorY || this.prevBottomNoteY !== bottomNoteRect.anchorY) {
+      this.prevTopNoteY = topNoteRect.anchorY;
+      this.prevBottomNoteY = bottomNoteRect.anchorY;
       this.requestRectUpdate();
     }
     return super.getRect();
@@ -2179,7 +2260,7 @@ var ObjTabNoteGroup = class extends MusicObject {
     return this.getRect().contains(x, y) ? [this] : [];
   }
   updateRect() {
-    this.rect = this.fretNumbers[0].getRect().copy();
+    this.rect = this.fretNumbers[0].getRect().clone();
     this.fretNumbers.forEach((fn) => this.rect.expandInPlace(fn.getRect()));
   }
   offset(dx, dy) {
@@ -2215,13 +2296,15 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     __publicField(this, "beamGroup");
     __publicField(this, "staffObjects", []);
     __publicField(this, "tabObjects", []);
+    __publicField(this, "isNoteDisplaced");
     __publicField(this, "mi");
-    if (!Utils3.Is.isIntegerGte(notes.length, 1)) {
+    if (!Guard2.isIntegerGte(notes.length, 1)) {
       throw new MusicError6(MusicErrorType6.Score, "Cannot create note group object because notes array is empty.");
     }
     let { sortedNotes, sortedStrings } = sortNotesAndStrings(notes, options == null ? void 0 : options.string);
     this.notes = sortedNotes;
     this.setStringsNumbers = sortedStrings;
+    this.isNoteDisplaced = this.notes.map(() => false);
     this.setDiatonicId = Math.round((this.minDiatonicId + this.maxDiatonicId) / 2);
     this.runningDiatonicId = this.setDiatonicId;
     this.runningStemDir = "up" /* Up */;
@@ -2259,6 +2342,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   get stemDir() {
     return this.runningStemDir;
   }
+  setNoteDisplacement(note, isDisplaced) {
+    let i = this.notes.indexOf(note);
+    if (i >= 0) this.isNoteDisplaced[i] = isDisplaced;
+  }
   enableConnective(line) {
     return line.containsVoiceId(this.voiceId) && (line instanceof ObjTab || line.containsDiatonicId(this.runningDiatonicId));
   }
@@ -2276,20 +2363,6 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     this.runningStemDir = stemDir;
     this.runningStringNumbers = stringNumbers;
   }
-  getStaticObjects(line) {
-    let staticObjects = [];
-    this.staffObjects.forEach((obj) => {
-      if (obj.staff === line) {
-        staticObjects.push(obj);
-      }
-    });
-    this.tabObjects.forEach((obj) => {
-      if (obj.tab === line) {
-        staticObjects.push(obj);
-      }
-    });
-    return staticObjects;
-  }
   pick(x, y) {
     if (!this.getRect().contains(x, y)) {
       return [];
@@ -2323,7 +2396,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let obj = this.staffObjects.find((obj2) => obj2.staff === line);
       if (!obj || noteIndex < 0 || noteIndex >= obj.noteHeadRects.length) {
         let r = this.getRect();
-        return { x: r.centerX, y: r.bottom };
+        return { x: r.anchorX, y: r.bottom };
       }
       let noteHeadRect = obj.noteHeadRects[noteIndex];
       let stemTip = obj.stemTip;
@@ -2331,8 +2404,8 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let hasStem = stemTip !== void 0;
       let stemSide = !hasStem ? void 0 : stemDir === "up" /* Up */ ? "right" : "left";
       let padding = noteHeadRect.height / 2;
-      let centerX = noteHeadRect.centerX;
-      let centerY = noteHeadRect.centerY;
+      let anchorX = noteHeadRect.anchorX;
+      let anchorY = noteHeadRect.anchorY;
       let leftX = noteHeadRect.left - padding;
       let rightX = noteHeadRect.right + padding;
       let aboveY = noteHeadRect.top - padding;
@@ -2344,27 +2417,27 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       }
       switch (noteAnchor) {
         case "center" /* Center */:
-          return side === "left" ? { x: rightX, y: centerY } : { x: leftX, y: centerY };
+          return side === "left" ? { x: rightX, y: anchorY } : { x: leftX, y: anchorY };
         case "above" /* Above */:
           if (!hasStem || stemDir === "down" /* Down */) {
-            return { x: centerX, y: aboveY };
+            return { x: anchorX, y: aboveY };
           } else {
             return {
-              x: side === "left" && stemSide === "right" ? rightX : side === "right" && stemSide === "left" ? leftX : centerX,
+              x: side === "left" && stemSide === "right" ? rightX : side === "right" && stemSide === "left" ? leftX : anchorX,
               y: aboveY
             };
           }
         case "below" /* Below */:
           if (!hasStem || stemDir === "up" /* Up */) {
-            return { x: centerX, y: belowY };
+            return { x: anchorX, y: belowY };
           } else {
             return {
-              x: side === "left" && stemSide === "right" ? rightX : side === "right" && stemSide === "left" ? leftX : centerX,
+              x: side === "left" && stemSide === "right" ? rightX : side === "right" && stemSide === "left" ? leftX : anchorX,
               y: belowY
             };
           }
         case "stemTip" /* StemTip */:
-          return { x: centerX, y: stemTip.centerY + (stemDir === "up" /* Up */ ? -padding : padding) };
+          return { x: anchorX, y: stemTip.anchorY + (stemDir === "up" /* Up */ ? -padding : padding) };
         default:
           throw new MusicError6(MusicErrorType6.Score, "Invalid noteAnchor: " + noteAnchor);
       }
@@ -2382,12 +2455,12 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let rightFretNumber = connectiveProps.noteGroups[1].getFretNumber(line, 0);
         let slideUp = leftFretNumber === void 0 || rightFretNumber === void 0 || leftFretNumber <= rightFretNumber;
         if (side === "left") {
-          y = (slideUp ? r.centerY + r.bottomh : r.centerY - r.toph) * s;
+          y = (slideUp ? r.anchorY + r.bottomh : r.anchorY - r.toph) * s;
         } else {
-          y = (slideUp ? r.centerY - r.toph : r.centerY + r.bottomh) * s;
+          y = (slideUp ? r.anchorY - r.toph : r.anchorY + r.bottomh) * s;
         }
       } else {
-        y = r.centerY + r.bottomh * s;
+        y = r.anchorY + r.bottomh * s;
       }
       return { x, y };
     } else {
@@ -2457,9 +2530,9 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     return this.staffObjects.map((obj) => {
       var _a, _b, _c, _d;
       let staff = obj.staff;
-      let x = (_b = (_a = obj.stemTip) == null ? void 0 : _a.centerX) != null ? _b : obj.noteHeadRects[0].centerX;
-      let y = (_d = (_c = obj.stemTip) == null ? void 0 : _c.centerY) != null ? _d : this.stemDir === "up" /* Up */ ? obj.getRect().top : obj.getRect().bottom;
-      let stemHeight = this.stemDir === "up" /* Up */ ? Math.abs(obj.noteHeadRects[0].centerY - y) : Math.abs(obj.noteHeadRects[obj.noteHeadRects.length - 1].centerY - y);
+      let x = (_b = (_a = obj.stemTip) == null ? void 0 : _a.anchorX) != null ? _b : obj.noteHeadRects[0].anchorX;
+      let y = (_d = (_c = obj.stemTip) == null ? void 0 : _c.anchorY) != null ? _d : this.stemDir === "up" /* Up */ ? obj.getRect().top : obj.getRect().bottom;
+      let stemHeight = this.stemDir === "up" /* Up */ ? Math.abs(obj.noteHeadRects[0].anchorY - y) : Math.abs(obj.noteHeadRects[obj.noteHeadRects.length - 1].anchorY - y);
       return { staff, x, y, stemHeight };
     });
   }
@@ -2548,14 +2621,14 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let isBottomNote = noteIndex === 0;
         let isTopNote = noteIndex === this.notes.length - 1;
         let noteStaff = (_a = staff.getActualStaff(note.diatonicId)) != null ? _a : staff;
-        let noteX = this.col.getNoteHeadDisplacement(this, note) * noteHeadWidth;
+        let noteX = this.isNoteDisplaced[noteIndex] ? noteHeadWidth * (stemDir === "down" /* Down */ ? -1 : 1) : 0;
         let noteY = noteStaff.getDiatonicIdY(note.diatonicId);
         let isNoteOnLine = noteStaff.isLine(note.diatonicId);
         if (isBottomNote && stemDir === "up" /* Up */) stemBaseStaff = noteStaff;
         if (isTopNote && stemDir === "up" /* Up */) stemTipStaff = noteStaff;
         if (isBottomNote && stemDir === "down" /* Down */) stemTipStaff = noteStaff;
         if (isTopNote && stemDir === "down" /* Down */) stemBaseStaff = noteStaff;
-        let noteHeadRect = obj.noteHeadRects[noteIndex] = DivRect.createCentered(noteX, noteY, noteHeadWidth, noteHeadHeight);
+        let noteHeadRect = obj.noteHeadRects[noteIndex] = AnchoredRect9.createCentered(noteX, noteY, noteHeadWidth, noteHeadHeight);
         noteStaff.addObject(noteHeadRect);
         if (accState.needAccidental(note)) {
           let acc = obj.accidentals[noteIndex] = new ObjAccidental(this, note.diatonicId, note.accidental, this.color);
@@ -2568,7 +2641,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         for (let i = 0; i < dotCount; i++) {
           let dotX = noteHeadRect.right + DocumentSettings.NoteDotSpace * unitSize + dotWidth / 2 + i * dotWidth * 1.5;
           let dotY = noteY + this.getDotVerticalDisplacement(staff, note.diatonicId, stemDir) * unitSize;
-          let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
+          let r = AnchoredRect9.createCentered(dotX, dotY, dotWidth, dotWidth);
           obj.dotRects.push(r);
           noteStaff.addObject(r);
         }
@@ -2576,27 +2649,27 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
           if (stemDir === "up" /* Up */ && isBottomNote) {
             let dotX = noteX;
             let dotY = noteY + unitSize * (isNoteOnLine ? 3 : 2);
-            let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
+            let r = AnchoredRect9.createCentered(dotX, dotY, dotWidth, dotWidth);
             obj.dotRects.push(r);
             stemBaseStaff.addObject(r);
           } else if (stemDir === "down" /* Down */ && isTopNote) {
             let dotX = noteX;
             let dotY = noteY - unitSize * (isNoteOnLine ? 3 : 2);
-            let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
+            let r = AnchoredRect9.createCentered(dotX, dotY, dotWidth, dotWidth);
             obj.dotRects.push(r);
             stemBaseStaff.addObject(r);
           }
         }
       });
-      let bottomNoteY = obj.noteHeadRects[0].centerY;
-      let topNoteY = obj.noteHeadRects[obj.noteHeadRects.length - 1].centerY;
+      let bottomNoteY = obj.noteHeadRects[0].anchorY;
+      let topNoteY = obj.noteHeadRects[obj.noteHeadRects.length - 1].anchorY;
       let stemX = stemDir === "up" /* Up */ ? noteHeadWidth / 2 : -noteHeadWidth / 2;
       let stemHeight = this.getStemHeight(ctx);
       let stemTipY = stemDir === "up" /* Up */ ? topNoteY - stemHeight : bottomNoteY + stemHeight;
       let stemBaseY = stemDir === "up" /* Up */ ? bottomNoteY : topNoteY;
       if (hasStem) {
-        obj.stemTip = new DivRect(stemX, stemX, stemTipY, stemTipY);
-        obj.stemBase = new DivRect(stemX, stemX, stemBaseY, stemBaseY);
+        obj.stemTip = new AnchoredRect9(stemX, stemX, stemTipY, stemTipY);
+        obj.stemBase = new AnchoredRect9(stemX, stemX, stemBaseY, stemBaseY);
         stemTipStaff.addObject(obj.stemTip);
         stemBaseStaff.addObject(obj.stemBase);
       }
@@ -2605,11 +2678,12 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let flagHeight = flagCount === 0 ? 0 : DocumentSettings.FlagHeight * unitSize;
         for (let i = 0; i < flagCount; i++) {
           let flagAddY = i * unitSize * DocumentSettings.FlagSeparation;
-          let r = obj.flagRects[i] = stemDir === "up" /* Up */ ? new DivRect(stemX, stemX + flagWidth, stemTipY + flagAddY, stemTipY + flagHeight + flagAddY) : new DivRect(stemX, stemX + flagWidth, stemTipY - flagHeight - flagAddY, stemTipY - flagAddY);
+          let r = obj.flagRects[i] = stemDir === "up" /* Up */ ? new AnchoredRect9(stemX, stemX + flagWidth, stemTipY + flagAddY, stemTipY + flagHeight + flagAddY) : new AnchoredRect9(stemX, stemX + flagWidth, stemTipY - flagHeight - flagAddY, stemTipY - flagAddY);
           stemTipStaff.addObject(r);
         }
       }
       this.staffObjects.push(obj);
+      this.measure.addStaticObject(staff, obj);
     });
     this.tabObjects.length = 0;
     row.getTabs().forEach((tab) => {
@@ -2619,12 +2693,12 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let obj = new ObjTabNoteGroup(tab, this);
       this.notes.forEach((note, noteIndex) => {
         let stringNumber = this.runningStringNumbers[noteIndex];
-        if (Utils3.Is.isIntegerBetween(stringNumber, 1, 6)) {
+        if (Guard2.isIntegerBetween(stringNumber, 1, 6)) {
           let fretId = note.chromaticId - tab.getTuningStrings()[stringNumber - 1].chromaticId;
           let color = fretId < 0 ? "red" : "black";
           let fretNumber = new ObjText(this, { text: String(fretId), color, bgcolor: "white" }, 0.5, 0.5);
           fretNumber.layout(ctx);
-          let x = this.col.getRect().centerX;
+          let x = this.col.getRect().anchorX;
           let y = tab.getStringY(stringNumber - 1);
           fretNumber.offset(x, y);
           obj.fretNumbers.push(fretNumber);
@@ -2633,16 +2707,17 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       if (obj.fretNumbers.length > 0) {
         this.tabObjects.push(obj);
         tab.addObject(obj);
+        this.measure.addStaticObject(tab, obj);
       }
     });
   }
   updateRect() {
     if (this.staffObjects.length > 0) {
-      this.rect = this.staffObjects[0].noteHeadRects[0].copy();
+      this.rect = this.staffObjects[0].noteHeadRects[0].clone();
     } else if (this.tabObjects.length > 0 && this.tabObjects[0].fretNumbers.length > 0) {
-      this.rect = this.tabObjects[0].fretNumbers[0].getRect().copy();
+      this.rect = this.tabObjects[0].fretNumbers[0].getRect().clone();
     } else {
-      this.rect = new DivRect();
+      this.rect = new AnchoredRect9();
       return;
     }
     this.staffObjects.forEach((obj) => this.rect.expandInPlace(obj.getRect()));
@@ -2650,9 +2725,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   }
   setStemTipY(staff, stemTipY) {
     let obj = this.staffObjects.find((obj2) => obj2.staff === staff);
-    if (this.hasBeamCount() && (obj == null ? void 0 : obj.stemTip) && stemTipY !== obj.stemTip.centerY) {
-      obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
+    if (this.hasBeamCount() && (obj == null ? void 0 : obj.stemTip) && stemTipY !== obj.stemTip.anchorY) {
+      obj.stemTip.top = obj.stemTip.anchorY = obj.stemTip.bottom = stemTipY;
       this.requestRectUpdate();
+      this.col.requestRectUpdate();
     }
   }
   offset(dx, dy) {
@@ -2672,31 +2748,31 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         if (this.diamond) {
           if (isSolidNoteHead) {
             ctx.beginPath();
-            ctx.moveTo(r.centerX, r.top);
-            ctx.lineTo(r.right, r.centerY);
-            ctx.lineTo(r.centerX, r.bottom);
-            ctx.lineTo(r.left, r.centerY);
-            ctx.lineTo(r.centerX, r.top);
+            ctx.moveTo(r.anchorX, r.top);
+            ctx.lineTo(r.right, r.anchorY);
+            ctx.lineTo(r.anchorX, r.bottom);
+            ctx.lineTo(r.left, r.anchorY);
+            ctx.lineTo(r.anchorX, r.top);
             ctx.fill();
           } else {
             ctx.beginPath();
             ctx.lineWidth(2.5);
-            ctx.moveTo(r.centerX, r.top);
-            ctx.lineTo(r.right, r.centerY);
-            ctx.moveTo(r.left, r.centerY);
-            ctx.lineTo(r.centerX, r.bottom);
+            ctx.moveTo(r.anchorX, r.top);
+            ctx.lineTo(r.right, r.anchorY);
+            ctx.moveTo(r.left, r.anchorY);
+            ctx.lineTo(r.anchorX, r.bottom);
             ctx.stroke();
             ctx.beginPath();
             ctx.lineWidth(1);
-            ctx.moveTo(r.right, r.centerY);
-            ctx.lineTo(r.centerX, r.bottom);
-            ctx.moveTo(r.centerX, r.top);
-            ctx.lineTo(r.left, r.centerY);
+            ctx.moveTo(r.right, r.anchorY);
+            ctx.lineTo(r.anchorX, r.bottom);
+            ctx.moveTo(r.anchorX, r.top);
+            ctx.lineTo(r.left, r.anchorY);
             ctx.stroke();
           }
         } else {
           ctx.beginPath();
-          ctx.ellipse(r.centerX, r.centerY, r.leftw, r.toph, -0.3, 0, Math.PI * 2);
+          ctx.ellipse(r.anchorX, r.anchorY, r.leftw, r.toph, -0.3, 0, Math.PI * 2);
           if (isSolidNoteHead) {
             ctx.fill();
           } else {
@@ -2704,11 +2780,11 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
           }
         }
       });
-      obj.dotRects.forEach((r) => ctx.fillCircle(r.centerX, r.centerY, r.width / 2));
+      obj.dotRects.forEach((r) => ctx.fillCircle(r.anchorX, r.anchorY, r.width / 2));
       if (obj.stemTip && obj.stemBase) {
         ctx.beginPath();
-        ctx.moveTo(obj.stemBase.centerX, obj.stemBase.centerY);
-        ctx.lineTo(obj.stemTip.centerX, obj.stemTip.centerY);
+        ctx.moveTo(obj.stemBase.anchorX, obj.stemBase.anchorY);
+        ctx.lineTo(obj.stemTip.anchorX, obj.stemTip.anchorY);
         ctx.stroke();
       }
       obj.flagRects.forEach((rect) => ctx.drawFlag(rect, stemDir === "up" /* Up */ ? "up" : "down"));
@@ -2739,28 +2815,20 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
 
 // src/score/engine/obj-rhythm-column.ts
 import { MusicError as MusicError7, MusicErrorType as MusicErrorType7 } from "@tspro/web-music-score/core";
-import { Map3 } from "@tspro/ts-utils-lib";
-var noteHeadDataCompareFunc = (a, b) => {
-  let cmp = Note5.compareFunc(a.note, b.note);
-  if (cmp === 0) {
-    cmp = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
-  }
-  return cmp;
-};
+import { IndexArray, UniMap as UniMap2, TriMap, AnchoredRect as AnchoredRect10 } from "@tspro/ts-utils-lib";
 var ObjRhythmColumn = class extends MusicObject {
   constructor(measure, positionTicks) {
     super(measure);
     this.measure = measure;
     this.positionTicks = positionTicks;
-    __publicField(this, "voiceSymbol", []);
-    __publicField(this, "lyricsObject", new Map3());
+    __publicField(this, "voiceSymbol", new IndexArray());
+    __publicField(this, "lyricsObject", new TriMap());
     __publicField(this, "minDiatonicId");
     __publicField(this, "maxDiatonicId");
-    __publicField(this, "staffMinDiatonicId", /* @__PURE__ */ new Map());
-    __publicField(this, "staffMaxDiatonicId", /* @__PURE__ */ new Map());
+    __publicField(this, "staffMinDiatonicId", new UniMap2());
+    __publicField(this, "staffMaxDiatonicId", new UniMap2());
     __publicField(this, "arpeggioDir");
     __publicField(this, "arpeggios", []);
-    __publicField(this, "noteHeadDisplacements", []);
     __publicField(this, "playerProps");
     __publicField(this, "needLayout", true);
     __publicField(this, "shapeRects", []);
@@ -2810,22 +2878,6 @@ var ObjRhythmColumn = class extends MusicObject {
     this.getRect();
     return this.shapeRects;
   }
-  getStaticObjects(line) {
-    let staticObjects = [];
-    this.voiceSymbol.forEach((symbol) => {
-      if (symbol) {
-        symbol.getRect();
-        symbol.getStaticObjects(line).forEach((obj) => staticObjects.push(obj));
-      }
-    });
-    this.arpeggios.forEach((arpeggio) => {
-      if (arpeggio.line === line) {
-        arpeggio.getRect();
-        staticObjects.push(arpeggio);
-      }
-    });
-    return staticObjects;
-  }
   get doc() {
     return this.measure.doc;
   }
@@ -2833,12 +2885,22 @@ var ObjRhythmColumn = class extends MusicObject {
     return this.measure.row;
   }
   pick(x, y) {
-    if (!this.getRect().contains(x, y)) {
-      return [];
+    const thisContainsXY = this.getRect().contains(x, y);
+    for (let i = 0; i < this.voiceSymbol.length; i++) {
+      let sym = this.voiceSymbol.get(i);
+      if (sym instanceof ObjRest) {
+        let arr = sym.pick(x, y);
+        if (arr.length > 0) {
+          return thisContainsXY ? [this, ...arr] : arr;
+        }
+      }
     }
+    if (!thisContainsXY)
+      return [];
     for (let i = 0; i < this.voiceSymbol.length; i++) {
-      if (this.voiceSymbol[i]) {
-        let arr = this.voiceSymbol[i].pick(x, y);
+      let sym = this.voiceSymbol.get(i);
+      if (sym instanceof ObjNoteGroup) {
+        let arr = sym.pick(x, y);
         if (arr.length > 0) {
           return [this, ...arr];
         }
@@ -2861,7 +2923,7 @@ var ObjRhythmColumn = class extends MusicObject {
   }
   setVoiceSymbol(voiceId, symbol) {
     validateVoiceId(voiceId);
-    this.voiceSymbol[voiceId] = symbol;
+    this.voiceSymbol.set(voiceId, symbol);
     if (symbol instanceof ObjRest && !symbol.hide) {
       this.row.getStaves().forEach((staff) => {
         let diatonicId = symbol.getDiatonicId(staff);
@@ -2874,13 +2936,13 @@ var ObjRhythmColumn = class extends MusicObject {
       if (symbol.arpeggio !== void 0) {
         this.arpeggioDir = symbol.arpeggio;
       }
-      this.setupNoteHeadDisplacements();
+      this.updateNoteDisplacements();
     }
     this.requestLayout();
     this.requestRectUpdate();
   }
   getVoiceSymbol(voiceId) {
-    return this.voiceSymbol[voiceId];
+    return this.voiceSymbol.get(voiceId);
   }
   getLyricsObject(verse, line, vpos) {
     return this.lyricsObject.get(verse, line, vpos);
@@ -2888,73 +2950,50 @@ var ObjRhythmColumn = class extends MusicObject {
   addLyricsObject(lyricsObj) {
     this.lyricsObject.set(lyricsObj.verse, lyricsObj.line, lyricsObj.vpos, lyricsObj);
   }
-  getMinWidth() {
-    let maxNoteSize = Math.max(...this.voiceSymbol.map((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;
-    }
-  }
-  setupNoteHeadDisplacements() {
-    this.noteHeadDisplacements = [];
+  updateNoteDisplacements() {
+    let data = [];
     this.voiceSymbol.forEach((symbol) => {
       if (symbol instanceof ObjNoteGroup) {
         symbol.notes.forEach((note) => {
-          this.noteHeadDisplacements.push({ noteGroup: symbol, note });
+          symbol.setNoteDisplacement(note, false);
+          data.push({ noteGroup: symbol, note });
         });
       }
     });
-    this.noteHeadDisplacements.sort(noteHeadDataCompareFunc);
-    if (this.noteHeadDisplacements.length < 2) {
+    const noteHeadDataCompareFunc = (a, b) => {
+      let cmp = Note5.compareFunc(a.note, b.note);
+      return cmp === 0 ? a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1 : cmp;
+    };
+    data.sort(noteHeadDataCompareFunc);
+    if (data.length < 2) {
       return;
     }
-    for (let i = 0; i < this.noteHeadDisplacements.length; i++) {
-      let cur = this.noteHeadDisplacements[i];
-      let next = this.noteHeadDisplacements[i + 1];
+    for (let i = 0; i < data.length; i++) {
+      let cur = data[i];
+      let next = data[i + 1];
       if (next && cur.note.diatonicId === next.note.diatonicId) {
-        cur.displacement = next.displacement = 0;
-      }
-    }
-    for (let i = 0; i < this.noteHeadDisplacements.length; i++) {
-      let prev = this.noteHeadDisplacements[i - 1];
-      let cur = this.noteHeadDisplacements[i];
-      let next = this.noteHeadDisplacements[i + 1];
-      if (cur.displacement !== void 0) {
-        continue;
-      }
-      let d = cur.noteGroup.stemDir === "down" /* Down */ ? -1 : 1;
-      if (prev && cur.note.diatonicId - prev.note.diatonicId <= 1) {
-        cur.displacement = prev.displacement === 0 ? d : 0;
-      } else if (next && next.note.diatonicId - cur.note.diatonicId <= 1) {
-        cur.displacement = next.displacement === 0 ? d : 0;
+        cur.isDisplaced = next.isDisplaced = false;
+      }
+    }
+    for (let i = 0; i < data.length; i++) {
+      let prev = data[i - 1];
+      let cur = data[i];
+      let next = data[i + 1];
+      if (cur.isDisplaced === void 0) {
+        if (prev && cur.note.diatonicId - prev.note.diatonicId <= 1) {
+          cur.isDisplaced = !prev.isDisplaced;
+        } else if (next && next.note.diatonicId - cur.note.diatonicId <= 1) {
+          cur.isDisplaced = !next.isDisplaced;
+        }
       }
     }
-  }
-  getNoteHeadDisplacement(noteGroup, note) {
-    let data = this.noteHeadDisplacements.find((d) => d.noteGroup === noteGroup && Note5.equals(d.note, note));
-    if ((data == null ? void 0 : data.displacement) !== void 0) {
-      return data.displacement;
-    } else {
-      return 0;
-    }
+    data.forEach((el) => {
+      var _a;
+      return el.noteGroup.setNoteDisplacement(el.note, (_a = el.isDisplaced) != null ? _a : false);
+    });
   }
   isEmpty() {
-    for (let i = 0; i < this.voiceSymbol.length; i++) {
-      if (this.voiceSymbol[i] !== void 0 && !this.voiceSymbol[i].isEmpty()) {
-        return false;
-      }
-    }
-    return true;
+    return this.voiceSymbol.size === 0 || this.voiceSymbol.every((symbol) => symbol.isEmpty());
   }
   getPlayerNotes() {
     let playerNotes = [];
@@ -3001,13 +3040,9 @@ var ObjRhythmColumn = class extends MusicObject {
     if (!this.needLayout) {
       return;
     }
-    this.requestRectUpdate();
-    this.rect = new DivRect();
     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();
@@ -3015,30 +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().centerY - arpeggio.getRect().centerY);
-        arpeggioWidth = Math.max(arpeggioWidth, arpeggio.getRect().width);
-        line.addObject(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.centerX = 0;
-    this.rect.right = rightw;
     this.row.getStaves().forEach((staff) => {
       let minDiatonicId = void 0;
       let maxDiatonicId = void 0;
@@ -3066,20 +3099,56 @@ 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).map((s) => s.getRect().copy()),
-      ...this.arpeggios.map((a) => a.getRect().copy())
+      ...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));
     this.rect.bottom = Math.max(...this.shapeRects.map((r) => r.bottom));
-    this.rect.centerY = (this.rect.top + this.rect.bottom) / 2;
+    this.rect.anchorY = (this.rect.top + this.rect.bottom) / 2;
   }
   offset(dx, dy) {
-    this.voiceSymbol.forEach((symbol) => symbol == null ? void 0 : symbol.offset(dx, 0));
+    this.voiceSymbol.forEach((symbol) => symbol.offset(dx, 0));
     this.arpeggios.forEach((arpeggio) => arpeggio.offset(dx, 0));
     this.shapeRects.forEach((r) => r.offsetInPlace(dx, dy));
     this.rect.offsetInPlace(dx, dy);
@@ -3089,17 +3158,13 @@ var ObjRhythmColumn = class extends MusicObject {
       let minDiatonicId = this.staffMinDiatonicId.get(staff);
       let maxDiatonicId = this.staffMaxDiatonicId.get(staff);
       if (minDiatonicId !== void 0) {
-        ctx.drawLedgerLines(staff, minDiatonicId, this.getRect().centerX);
+        ctx.drawLedgerLines(staff, minDiatonicId, this.getRect().anchorX);
       }
       if (maxDiatonicId !== void 0) {
-        ctx.drawLedgerLines(staff, maxDiatonicId, this.getRect().centerX);
-      }
-    });
-    this.voiceSymbol.forEach((symbol) => {
-      if (symbol) {
-        symbol.draw(ctx);
+        ctx.drawLedgerLines(staff, maxDiatonicId, this.getRect().anchorX);
       }
     });
+    this.voiceSymbol.forEach((symbol) => symbol.draw(ctx));
     this.arpeggios.forEach((arpeggio) => arpeggio.draw(ctx));
   }
 };
@@ -3108,9 +3173,10 @@ var ObjRhythmColumn = class extends MusicObject {
 import { MusicError as MusicError8, MusicErrorType as MusicErrorType8 } from "@tspro/web-music-score/core";
 
 // src/score/engine/element-data.ts
-import { Utils as Utils4 } from "@tspro/ts-utils-lib";
+import { Guard as Guard3, Utils as Utils4 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-special-text.ts
+import { AnchoredRect as AnchoredRect11 } from "@tspro/ts-utils-lib";
 var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
   constructor(parent, text) {
     super(parent);
@@ -3155,14 +3221,14 @@ var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
         let codaText = this.components[1];
         codaSym.layout(ctx);
         codaText.layout(ctx);
-        codaSym.offset(0, (codaText.getRect().top + codaText.getRect().bottom) / 2);
+        codaSym.offset(0, codaText.getRect().centerY);
         codaText.offset(codaSym.getRect().right, 0);
-        this.rect = new DivRect(
+        this.rect = new AnchoredRect11(
           codaSym.getRect().left,
-          codaSym.getRect().centerX,
+          codaSym.getRect().anchorX,
           codaText.getRect().right,
           codaText.getRect().top,
-          codaText.getRect().centerY,
+          codaText.getRect().anchorY,
           codaText.getRect().bottom
         );
         break;
@@ -3172,14 +3238,14 @@ var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
         let codaSym = this.components[1];
         toCodaText.layout(ctx);
         codaSym.layout(ctx);
-        codaSym.offset(0, (toCodaText.getRect().top + toCodaText.getRect().bottom) / 2);
+        codaSym.offset(0, toCodaText.getRect().centerY);
         toCodaText.offset(codaSym.getRect().left, 0);
-        this.rect = new DivRect(
+        this.rect = new AnchoredRect11(
           toCodaText.getRect().left,
-          codaSym.getRect().centerX,
+          codaSym.getRect().anchorX,
           codaSym.getRect().right,
           toCodaText.getRect().top,
-          toCodaText.getRect().centerY,
+          toCodaText.getRect().anchorY,
           toCodaText.getRect().bottom
         );
         break;
@@ -3187,7 +3253,7 @@ var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
       default: {
         let text = this.components[0];
         text.layout(ctx);
-        this.rect = text.getRect().copy();
+        this.rect = text.getRect().clone();
         break;
       }
     }
@@ -3230,7 +3296,7 @@ function getNavigationString(navigation) {
   }
 }
 function isDynamicsText(text) {
-  return Utils4.Is.isEnumValue(text, DynamicsAnnotation);
+  return Guard3.isEnumValue(text, DynamicsAnnotation);
 }
 function getDynamicsVolume(text) {
   if (/^(p+|f+|m|mp|mf)$/.test(text)) {
@@ -3241,12 +3307,12 @@ function getDynamicsVolume(text) {
   }
 }
 function isTempoText(text) {
-  return Utils4.Is.isEnumValue(text, TempoAnnotation);
+  return Guard3.isEnumValue(text, TempoAnnotation);
 }
 function getAnnotation(text) {
-  if (Utils4.Is.isEnumValue(text, DynamicsAnnotation)) {
+  if (Guard3.isEnumValue(text, DynamicsAnnotation)) {
     return "dynamics" /* Dynamics */;
-  } else if (Utils4.Is.isEnumValue(text, TempoAnnotation)) {
+  } else if (Guard3.isEnumValue(text, TempoAnnotation)) {
     return "tempo" /* Tempo */;
   } else {
     return void 0;
@@ -3550,24 +3616,17 @@ var Player = class _Player {
     }
     let curSpeed = 1;
     let curVolume = getDefaultVolume();
-    let speedMap = /* @__PURE__ */ new Map();
-    let volumeMap = /* @__PURE__ */ new Map();
-    const pushSpeed = (col, speed) => {
-      var _a;
-      return speedMap.set(col, [...(_a = speedMap.get(col)) != null ? _a : [], speed]);
-    };
-    const pushVolume = (col, volume) => {
-      var _a;
-      return volumeMap.set(col, [...(_a = volumeMap.get(col)) != null ? _a : [], volume]);
-    };
+    let speedMap = new UniMap3();
+    let volumeMap = new UniMap3();
+    const pushSpeed = (col, speed) => speedMap.getOrCreate(col, []).push(speed);
+    const pushVolume = (col, volume) => volumeMap.getOrCreate(col, []).push(volume);
     this.playerColumnSequence.forEach((col) => {
-      var _a, _b;
       if (!(col instanceof ObjRhythmColumn)) {
         return;
       }
       col.getAnchoredLayoutObjects().forEach((layoutObj) => {
-        var _a2;
-        let text = (_a2 = layoutObj.getTextContent()) != null ? _a2 : "";
+        var _a;
+        let text = (_a = layoutObj.getTextContent()) != null ? _a : "";
         let vol;
         if (text === "a tempo" /* a_tempo */) {
           curSpeed = 1;
@@ -3628,11 +3687,11 @@ var Player = class _Player {
           }
         }
       });
-      let speedArr = (_a = speedMap.get(col)) != null ? _a : [];
+      let speedArr = speedMap.getOrDefault(col, []);
       if (speedArr.length > 0) {
         curSpeed = Utils5.Math.sum(speedArr) / speedArr.length;
       }
-      let volumeArr = (_b = volumeMap.get(col)) != null ? _b : [];
+      let volumeArr = volumeMap.getOrDefault(col, []);
       if (volumeArr.length > 0) {
         curVolume = Utils5.Math.sum(volumeArr) / volumeArr.length;
       }
@@ -3752,14 +3811,14 @@ var Player = class _Player {
       return void 0;
     }
     let measure = col.measure;
-    let x = col.getRect().centerX;
-    let top = measure.row.getRect().top;
-    let bottom = measure.row.getRect().bottom;
-    return new DivRect(x, x, top, bottom);
+    let x = col.getRect().anchorX;
+    let { top, height } = measure.row.getRect();
+    return new Rect2(x, top, 0, height);
   }
 };
 
 // src/score/engine/obj-bar-line.ts
+import { AnchoredRect as AnchoredRect13 } from "@tspro/ts-utils-lib";
 var ObjStaffTabBarLine = class extends MusicObject {
   constructor(barLine, line) {
     super(line);
@@ -3846,36 +3905,36 @@ var ObjBarLine = class extends MusicObject {
       bottom = line.getBottomLineY();
       switch (barLineType) {
         case 0 /* None */:
-          obj.setRect(new DivRect(0, 0, 0, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(0, 0, 0, top, 0, bottom));
           break;
         case 1 /* Single */:
-          obj.setRect(new DivRect(-thinW, 0, 0, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(-thinW, 0, 0, top, 0, bottom));
           addVerticalLine(-thinW, thinW);
           break;
         case 2 /* Double */:
-          obj.setRect(new DivRect(-thinW - spaceW - thinW, 0, 0, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(-thinW - spaceW - thinW, 0, 0, top, 0, bottom));
           addVerticalLine(-thinW - spaceW - thinW, thinW);
           addVerticalLine(-thinW, thinW);
           break;
         case 3 /* EndSong */:
-          obj.setRect(new DivRect(-thicW - spaceW - thinW, 0, 0, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(-thicW - spaceW - thinW, 0, 0, top, 0, bottom));
           addVerticalLine(-thinW - spaceW - thicW, thinW);
           addVerticalLine(-thicW, thicW);
           break;
         case 4 /* StartRepeat */:
-          obj.setRect(new DivRect(0, 0, thicW + spaceW + thinW + spaceW + dotW, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(0, 0, thicW + spaceW + thinW + spaceW + dotW, top, 0, bottom));
           addVerticalLine(0, thicW);
           addVerticalLine(thicW + spaceW, thinW);
           addDotPair(thicW + spaceW + thinW + spaceW + dotRadius);
           break;
         case 5 /* EndRepeat */:
-          obj.setRect(new DivRect(-thicW - spaceW - thinW - spaceW - dotW, 0, 0, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(-thicW - spaceW - thinW - spaceW - dotW, 0, 0, top, 0, bottom));
           addVerticalLine(-thinW - spaceW - thicW, thinW);
           addVerticalLine(-thicW, thicW);
           addDotPair(-thinW - spaceW - thicW - spaceW - dotRadius);
           break;
         case 6 /* EndStartRepeat */:
-          obj.setRect(new DivRect(-dotW - spaceW - thinW - spaceW - thicW / 2, 0, thicW / 2 + spaceW + thinW + spaceW + dotW, top, 0, bottom));
+          obj.setRect(new AnchoredRect13(-dotW - spaceW - thinW - spaceW - thicW / 2, 0, thicW / 2 + spaceW + thinW + spaceW + dotW, top, 0, bottom));
           addVerticalLine(-thicW / 2, thicW);
           addVerticalLine(-thicW / 2 - spaceW - thinW, thinW);
           addVerticalLine(thicW / 2 + spaceW, thinW);
@@ -3891,12 +3950,12 @@ var ObjBarLine = class extends MusicObject {
   }
   updateRect() {
     if (this.staffTabObjects.length > 0) {
-      this.rect = this.staffTabObjects[0].getRect().copy();
+      this.rect = this.staffTabObjects[0].getRect().clone();
       for (let i = 1; i < this.staffTabObjects.length; i++) {
         this.rect.expandInPlace(this.staffTabObjects[i].getRect());
       }
     } else {
-      this.rect = new DivRect();
+      this.rect = new AnchoredRect13();
     }
   }
   offset(dx, dy) {
@@ -3981,7 +4040,7 @@ var ObjBarLineRight = class extends ObjBarLine {
 };
 
 // src/score/engine/obj-ending.ts
-import { Utils as Utils6 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect14, Guard as Guard4 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError9, MusicErrorType as MusicErrorType9 } from "@tspro/web-music-score/core";
 var ObjEnding = class extends MusicObject {
   constructor(measure, passages) {
@@ -3992,9 +4051,9 @@ var ObjEnding = class extends MusicObject {
     __publicField(this, "shapeRects", []);
     __publicField(this, "mi");
     this.mi = new MEnding(this);
-    if (!Utils6.Is.isIntegerGte(passages.length, 1)) {
+    if (!Guard4.isIntegerGte(passages.length, 1)) {
       throw new MusicError9(MusicErrorType9.Score, "Passages is empty.");
-    } else if (!this.passages.every((p) => Utils6.Is.isIntegerGte(p, 1))) {
+    } else if (!this.passages.every((p) => Guard4.isIntegerGte(p, 1))) {
       throw new MusicError9(MusicErrorType9.Score, "Invalid passages: " + this.passages);
     }
     this.passages.sort((a, b) => a - b);
@@ -4022,8 +4081,8 @@ var ObjEnding = class extends MusicObject {
     return this.rect.contains(x, y) ? [this] : [];
   }
   layout(ctx) {
-    this.rect = new DivRect();
-    this.shapeRects = [this.rect.copy()];
+    this.rect = new AnchoredRect14();
+    this.shapeRects = [this.rect.clone()];
   }
   layoutFitToMeasure(ctx) {
     let { unitSize } = ctx;
@@ -4032,13 +4091,13 @@ var ObjEnding = class extends MusicObject {
     let textRect = this.endingText.getRect();
     let measureContent = measure.getColumnsContentRect();
     let endingHeight = textRect.height;
-    this.rect = new DivRect(measureContent.left + unitSize, measureContent.right - unitSize, -endingHeight, 0);
+    this.rect = new AnchoredRect14(measureContent.left + unitSize, measureContent.right - unitSize, -endingHeight, 0);
     this.endingText.offset(this.rect.left + unitSize / 2, this.rect.bottom);
     this.shapeRects = [
-      new DivRect(this.rect.left, this.rect.left + 1, this.rect.top, this.rect.bottom),
-      new DivRect(this.rect.left, this.rect.right, this.rect.top, this.rect.top + 1),
-      new DivRect(this.rect.right - 1, this.rect.right, this.rect.top, this.rect.bottom),
-      this.endingText.getRect().copy()
+      new AnchoredRect14(this.rect.left, this.rect.left + 1, this.rect.top, this.rect.bottom),
+      new AnchoredRect14(this.rect.left, this.rect.right, this.rect.top, this.rect.top + 1),
+      new AnchoredRect14(this.rect.right - 1, this.rect.right, this.rect.top, this.rect.bottom),
+      this.endingText.getRect().clone()
     ];
   }
   offset(dx, dy) {
@@ -4063,7 +4122,7 @@ var ObjEnding = class extends MusicObject {
 };
 
 // src/score/engine/obj-beam-group.ts
-import { Utils as Utils7 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect15, Utils as Utils6 } from "@tspro/ts-utils-lib";
 import { NoteLength as NoteLength5, Tuplet as Tuplet3, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError10, MusicErrorType as MusicErrorType10 } from "@tspro/web-music-score/core";
 var adjustBeamAngle = (dx, dy) => {
@@ -4093,7 +4152,7 @@ var BeamPoint = class {
     this.beamGroup.requestRectUpdate();
   }
   getRect() {
-    return new DivRect(this.x, this.x, this.x, this.y - this.topBeamsHeight, this.y, this.y + this.bottomBeamsHeight);
+    return new AnchoredRect15(this.x, this.x, this.x, this.y - this.topBeamsHeight, this.y, this.y + this.bottomBeamsHeight);
   }
 };
 var ObjStaffBeamGroup = class extends MusicObject {
@@ -4123,9 +4182,9 @@ var ObjStaffBeamGroup = class extends MusicObject {
   }
   updateRect() {
     if (this.points.length > 0) {
-      this.rect = this.points[0].getRect().copy();
+      this.rect = this.points[0].getRect().clone();
     } else if (this.tupletNumber) {
-      this.rect = this.tupletNumber.getRect().copy();
+      this.rect = this.tupletNumber.getRect().clone();
     }
     this.points.forEach((pt) => this.rect.expandInPlace(pt.getRect()));
     if (this.tupletNumber) {
@@ -4371,7 +4430,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       symbolY.forEach((symY, i) => {
         let symX = symbolX[i];
         if (symX !== void 0 && symY !== void 0) {
-          let beamY = Utils7.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
+          let beamY = Utils6.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
           let raiseY = symY - beamY;
           if (stemDir === "up" /* Up */ && raiseY < 0) {
             raiseBeamY = Math.min(raiseBeamY, raiseY);
@@ -4386,8 +4445,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       let obj = new ObjStaffBeamGroup(mainStaff, this);
       if (type === 2 /* TupletGroup */) {
         let ef = unitSize / (rightX - leftX);
-        let l = Utils7.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
-        let r = Utils7.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, 1 + ef);
+        let l = Utils6.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
+        let r = Utils6.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, 1 + ef);
         obj.points.push(new BeamPoint(leftStaff, this, leftSymbol, l.x, l.y));
         obj.points.push(new BeamPoint(rightStaff, this, rightSymbol, r.x, r.y));
         obj.tupletNumberOffsetY = 0;
@@ -4436,10 +4495,10 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   }
   updateRect() {
     if (this.staffObjects.length === 0) {
-      this.rect = new DivRect();
+      this.rect = new AnchoredRect15();
     } else {
       this.staffObjects.forEach((obj) => obj.updateRect());
-      this.rect = this.staffObjects[0].getRect().copy();
+      this.rect = this.staffObjects[0].getRect().clone();
       for (let i = 1; i < this.staffObjects.length; i++) {
         this.rect.expandInPlace(this.staffObjects[i].getRect());
       }
@@ -4453,7 +4512,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         obj.points.forEach((pt) => {
           if (pt.symbol instanceof ObjNoteGroup) {
             if (pt !== left && pt !== right) {
-              pt.y = Utils7.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
+              pt.y = Utils6.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
             }
             pt.symbol.setStemTipY(pt.staff, pt.y);
           }
@@ -4461,7 +4520,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       }
       if (obj.tupletNumber) {
         let y = (left.y + right.y) / 2 + obj.tupletNumberOffsetY;
-        obj.tupletNumber.offset(0, -obj.tupletNumber.getRect().centerY + y);
+        obj.tupletNumber.offset(0, -obj.tupletNumber.getRect().anchorY + y);
       }
     });
   }
@@ -4480,8 +4539,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         let { x: rx, y: ry } = obj.points[obj.points.length - 1];
         if (obj.tupletNumber) {
           let tf = obj.tupletNumber.getRect().width / (rx - lx) * 1.2;
-          let lc = Utils7.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
-          let rc = Utils7.Math.interpolateCoord(lx, ly, rx, ry, 0.5 + tf / 2);
+          let lc = Utils6.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
+          let rc = Utils6.Math.interpolateCoord(lx, ly, rx, ry, 0.5 + tf / 2);
           ctx.strokeLine(lx, ly, lc.x, lc.y);
           ctx.strokeLine(rc.x, rc.y, rx, ry);
         } else {
@@ -4595,6 +4654,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
 };
 
 // src/score/engine/obj-fermata.ts
+import { AnchoredRect as AnchoredRect16 } from "@tspro/ts-utils-lib";
 var ObjFermata = class extends MusicObject {
   constructor(parent, pos) {
     super(parent);
@@ -4622,7 +4682,7 @@ var ObjFermata = class extends MusicObject {
     let { unitSize } = ctx;
     let width = unitSize * 4;
     let height = unitSize * 3;
-    this.rect = new DivRect(-width / 2, width / 2, -height, 0);
+    this.rect = new AnchoredRect16(-width / 2, width / 2, -height, 0);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -4650,6 +4710,7 @@ var ObjFermata = class extends MusicObject {
 };
 
 // src/score/engine/obj-extension-line.ts
+import { AnchoredRect as AnchoredRect17 } from "@tspro/ts-utils-lib";
 var ObjExtensionLine = class extends MusicObject {
   constructor(measure, line, extension, leftObj, rightObj) {
     super(measure);
@@ -4670,7 +4731,7 @@ var ObjExtensionLine = class extends MusicObject {
   }
   getLineLeft() {
     if (this.leftObj instanceof ObjBarLineLeft) {
-      return this.leftObj.getRect().centerX;
+      return this.leftObj.getRect().anchorX;
     } else {
       return this.leftObj.getRect().right;
     }
@@ -4685,7 +4746,7 @@ var ObjExtensionLine = class extends MusicObject {
         return (col.getRect().right + col.measure.getBarLineRight().getRect().left) / 2;
       }
     } else {
-      return this.rightObj.getRect().centerX;
+      return this.rightObj.getRect().anchorX;
     }
   }
   layoutFitToMeasure(ctx) {
@@ -4693,13 +4754,13 @@ var ObjExtensionLine = class extends MusicObject {
     let lineLeft = this.getLineLeft();
     let lineRight = this.getLineRight();
     let lineRectH = unitSize;
-    this.rect = new DivRect(lineLeft, lineRight, -lineRectH / 2, lineRectH / 2);
+    this.rect = new AnchoredRect17(lineLeft, lineRight, -lineRectH / 2, lineRectH / 2);
   }
   pick(x, y) {
     return this.rect.contains(x, y) ? [this] : [];
   }
   layout(ctx) {
-    this.rect = new DivRect();
+    this.rect = new AnchoredRect17();
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -4710,12 +4771,12 @@ var ObjExtensionLine = class extends MusicObject {
       ctx.setLineDash([7, 3]);
     }
     ctx.color("black").lineWidth(1);
-    ctx.strokeLine(rect.left, rect.centerY, rect.right, rect.centerY);
+    ctx.strokeLine(rect.left, rect.anchorY, rect.right, rect.anchorY);
     ctx.setLineDash([]);
     let tails = this.extension.getTails();
     if (tails.length > 0 && this === tails[tails.length - 1]) {
-      let tipH = rect.centerY > this.line.getRect().centerY ? -ctx.unitSize : ctx.unitSize;
-      ctx.strokeLine(rect.right, rect.centerY, rect.right, rect.centerY + tipH);
+      let tipH = rect.anchorY > this.line.getRect().anchorY ? -ctx.unitSize : ctx.unitSize;
+      ctx.strokeLine(rect.right, rect.anchorY, rect.right, rect.anchorY + tipH);
     }
   }
 };
@@ -4727,7 +4788,7 @@ import { MusicError as MusicError13, MusicErrorType as MusicErrorType13 } from "
 import { Note as Note6 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-connective.ts
-import { Utils as Utils8 } from "@tspro/ts-utils-lib";
+import { AnchoredRect as AnchoredRect18, Guard as Guard5, Utils as Utils7 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError11, MusicErrorType as MusicErrorType11 } from "@tspro/web-music-score/core";
 var ObjConnective = class extends MusicObject {
   constructor(connectiveProps, line, measure, leftNoteGroup, leftNoteId, ...args) {
@@ -4758,7 +4819,7 @@ var ObjConnective = class extends MusicObject {
       this.rightNoteGroup = args[0];
       this.rightNoteId = args[1];
       this.tieType = void 0;
-    } else if (Utils8.Is.isEnumValue(args[0], TieType)) {
+    } else if (Guard5.isEnumValue(args[0], TieType)) {
       this.rightNoteGroup = void 0;
       this.rightNoteId = void 0;
       this.tieType = args[0];
@@ -4828,12 +4889,12 @@ var ObjConnective = class extends MusicObject {
     this.rx = rx;
     this.ry = ry;
     this.arcHeight = this.connectiveProps.connective === "slide" /* Slide */ ? 0 : arcHeight;
-    let { nx, ny } = Utils8.Math.calcNormal(lx, ly, rx, ry);
+    let { nx, ny } = Utils7.Math.calcNormal(lx, ly, rx, ry);
     this.cp1x = lx * 0.7 + rx * 0.3 + nx * this.arcHeight;
     this.cp1y = ly * 0.7 + ry * 0.3 + ny * this.arcHeight;
     this.cp2x = lx * 0.3 + rx * 0.7 + nx * this.arcHeight;
     this.cp2y = ly * 0.3 + ry * 0.7 + ny * this.arcHeight;
-    this.rect = new DivRect(
+    this.rect = new AnchoredRect18(
       Math.min(this.lx, this.cp1x, this.cp2x, this.rx),
       Math.max(this.lx, this.cp1x, this.cp2x, this.rx),
       Math.min(this.ly, this.cp1y, this.cp2y, this.ry),
@@ -4884,7 +4945,7 @@ var ObjConnective = class extends MusicObject {
 
 // src/score/engine/connective-props.ts
 import { MusicError as MusicError12, MusicErrorType as MusicErrorType12 } from "@tspro/web-music-score/core";
-import { Utils as Utils9 } from "@tspro/ts-utils-lib";
+import { Guard as Guard6 } from "@tspro/ts-utils-lib";
 var ConnectiveProps = class {
   constructor(connective, span, noteAnchor, startNoteGroup) {
     this.connective = connective;
@@ -4957,7 +5018,7 @@ var ConnectiveProps = class {
     this.noteGroups[0].row.getNotationLines().forEach((line) => {
       this.computeParams(line);
       if (connective === "tie" /* Tie */) {
-        if (Utils9.Is.isEnumValue(span, TieType)) {
+        if (Guard6.isEnumValue(span, TieType)) {
           let leftNoteGroup = this.noteGroups[0];
           for (let noteId = 0; noteId < leftNoteGroup.notes.length; noteId++) {
             this.createObjConnectiveWithTieType(line, leftNoteGroup, noteId, span);
@@ -5029,7 +5090,7 @@ var ConnectiveProps = class {
 };
 
 // src/score/engine/obj-lyrics.ts
-import { Utils as Utils10 } 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);
@@ -5045,9 +5106,9 @@ var ObjLyrics = class extends MusicObject {
     __publicField(this, "mi");
     this.rhythmProps = RhythmProps.get(lyricsLength);
     let halign = (lyricsOptions == null ? void 0 : lyricsOptions.align) === "left" /* Left */ ? 0 : (lyricsOptions == null ? void 0 : lyricsOptions.align) === "right" /* Right */ ? 1 : 0.5;
-    this.hyphen = Utils10.Is.isEnumValue(lyricsOptions == null ? void 0 : lyricsOptions.hyphen, LyricsHyphen) ? lyricsOptions == null ? void 0 : lyricsOptions.hyphen : void 0;
+    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 DivRect();
+    this.rect = this.text.getRect().clone();
     this.mi = new MLyrics(this);
   }
   getMusicInterface() {
@@ -5063,11 +5124,11 @@ 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);
-    this.rect = this.text.getRect().copy();
+    this.rect = this.text.getRect().clone();
   }
   offset(dx, dy) {
     this.text.offset(dx, dy);
@@ -5084,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.top + l.bottom) / 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();
@@ -5095,7 +5156,7 @@ var ObjLyrics = class extends MusicObject {
 };
 
 // src/score/engine/obj-tab-rhythm.ts
-import { Utils as Utils11 } 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);
@@ -5104,9 +5165,9 @@ var ObjTabRhythm = class extends MusicObject {
     __publicField(this, "voiceId");
     __publicField(this, "mi");
     // Keep non-static
-    __publicField(this, "tupletPartsTextObjMap", /* @__PURE__ */ new Map());
+    __publicField(this, "tupletPartsTextObjMap", new UniMap4());
     this.voiceId = getVoiceIds().filter((voiceId) => tab.containsVoiceId(voiceId));
-    this.rect = new DivRect();
+    this.rect = new AnchoredRect19();
     this.mi = new MTabRhythm(this);
   }
   getMusicInterface() {
@@ -5117,9 +5178,9 @@ var ObjTabRhythm = class extends MusicObject {
   }
   layout(ctx) {
     let columns = this.measure.getColumns();
-    let numColsInVoiceId = getVoiceIds().map((voiceId) => Utils11.Math.sum(columns.map((col) => col.getVoiceSymbol(voiceId) ? 1 : 0)));
-    this.voiceId.sort((a, b) => Utils11.Math.cmp(numColsInVoiceId[a], numColsInVoiceId[b]));
-    this.rect = new DivRect();
+    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 AnchoredRect19();
   }
   hasTuplets() {
     return this.measure.getBeamGroups().some((beamGroup) => beamGroup.isTuplet());
@@ -5127,13 +5188,13 @@ var ObjTabRhythm = class extends MusicObject {
   layoutFitToMeasure(ctx) {
     let { unitSize, fontSize } = ctx;
     let { measure } = this;
-    let { left, right } = measure.getColumnsContentRect();
+    let cr = measure.getColumnsContentRect();
     let stemHeight = unitSize * 5;
-    this.rect.left = left;
-    this.rect.centerX = (left + right) / 2;
-    this.rect.right = right;
+    this.rect.left = cr.left;
+    this.rect.anchorX = cr.centerX;
+    this.rect.right = cr.right;
     this.rect.top = this.hasTuplets() ? -fontSize : 0;
-    this.rect.centerY = 0;
+    this.rect.anchorY = 0;
     this.rect.bottom = stemHeight;
   }
   offset(dx, dy) {
@@ -5146,8 +5207,8 @@ var ObjTabRhythm = class extends MusicObject {
     let flagSize = unitSize;
     let dotSpace = unitSize;
     let dotWidth = unitSize * 0.25;
-    let { bottom, centerY } = this.getRect();
-    let stemTop = centerY;
+    let { bottom, anchorY } = this.getRect();
+    let stemTop = anchorY;
     let stemBottom = bottom;
     let columns = this.measure.getColumns();
     for (let colId = 0; colId < columns.length; colId++) {
@@ -5161,7 +5222,7 @@ var ObjTabRhythm = class extends MusicObject {
       for (let j = 0; j < symbols.length; j++) {
         let sym = symbols[j];
         let nextSym = symbols[j + 1];
-        let colX = sym.col.getRect().centerX;
+        let colX = sym.col.getRect().anchorX;
         if (sym instanceof ObjNoteGroup) {
           if (sym.rhythmProps.noteSize >= 2) {
             ctx.lineWidth(sym.rhythmProps.noteSize === 4 ? 2 : 1);
@@ -5170,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 DivRect(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++) {
@@ -5192,8 +5253,8 @@ var ObjTabRhythm = class extends MusicObject {
         if (nextSym) {
           let left = sym;
           let right = nextSym;
-          let leftX = left.col.getRect().centerX;
-          let rightX = right.col.getRect().centerX;
+          let leftX = left.col.getRect().anchorX;
+          let rightX = right.col.getRect().anchorX;
           let leftBeamCount = left.hasTuplet() ? 1 : left instanceof ObjNoteGroup ? left.getRightBeamCount() : 1;
           let rightBeamCount = right.hasTuplet() ? 1 : right instanceof ObjNoteGroup ? right.getLeftBeamCount() : 1;
           let maxBeamCount = Math.max(leftBeamCount, rightBeamCount);
@@ -5212,14 +5273,14 @@ var ObjTabRhythm = class extends MusicObject {
           }
         }
         if (beamGroup && beamGroup.isTuplet()) {
-          let cx = (symbols[0].col.getRect().centerX + symbols[symbols.length - 1].col.getRect().centerX) / 2;
+          let cx = (symbols[0].col.getRect().anchorX + symbols[symbols.length - 1].col.getRect().anchorX) / 2;
           let text = beamGroup.getTupletRatioText();
           let textObj = this.tupletPartsTextObjMap.get(text);
           if (!textObj) {
             this.tupletPartsTextObjMap.set(text, textObj = new ObjText(this, { text, scale: 0.75 }, 0.5, 0.5));
             textObj.layout(ctx);
           }
-          textObj.offset(-textObj.getRect().centerX, -textObj.getRect().centerY);
+          textObj.offset(-textObj.getRect().anchorX, -textObj.getRect().anchorY);
           textObj.offset(cx, stemTop - fontSize / 2);
           textObj.draw(ctx);
         }
@@ -5235,18 +5296,11 @@ var ObjTabRhythm = class extends MusicObject {
 };
 
 // src/score/engine/obj-measure.ts
-function validateVoiceId(voiceId) {
-  if (typeof voiceId === "number" && getVoiceIds().indexOf(voiceId) < 0) {
-    throw new MusicError13(MusicErrorType13.Score, "Invalid voiceId: " + voiceId);
-  } else {
-    return voiceId;
-  }
-}
 function getExtensionTicks(extensionLength) {
   if (typeof extensionLength === "string") {
     extensionLength = [extensionLength];
   }
-  if (Utils12.Is.isArray(extensionLength)) {
+  if (Guard8.isArray(extensionLength)) {
     let totalTicks = 0;
     for (let i = 0; i < extensionLength.length; ) {
       let str = extensionLength[i];
@@ -5280,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;
@@ -5300,13 +5374,10 @@ 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", []);
+    __publicField(this, "voiceSymbols", asMulti(new IndexArray2()));
     __publicField(this, "lastAddedRhythmColumn");
     __publicField(this, "lastAddedRhythmSymbol");
     __publicField(this, "addExtensionToMusicObjects", []);
@@ -5315,14 +5386,14 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     __publicField(this, "passCount", 0);
     // How many times player has passed this measure.
     __publicField(this, "needBeamsUpdate", true);
-    __publicField(this, "navigationSet", /* @__PURE__ */ new Set());
+    __publicField(this, "navigationSet", new ValueSet());
     __publicField(this, "isEndSong", false);
     __publicField(this, "isEndSection", false);
     __publicField(this, "endRepeatPlayCount", 2);
     // play twice.
     __publicField(this, "endRepeatPlayCountText");
-    __publicField(this, "staticObjectsCache", /* @__PURE__ */ new Map());
-    __publicField(this, "lyricsObjectsCache", new Map32());
+    __publicField(this, "staticObjectsCache", new UniMap5());
+    __publicField(this, "lyricsObjectsCache", new TriMap2());
     __publicField(this, "mi");
     this.mi = new MMeasure(this);
     this.prevMeasure = row.doc.getLastMeasure();
@@ -5363,7 +5434,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   updateRunningArguments(runningArgs) {
     var _a;
     runningArgs != null ? runningArgs : runningArgs = [];
-    let numVoices = Utils12.Math.sum(getVoiceIds().map((voiceId) => this.getVoiceSymbols(voiceId).length > 0 ? 1 : 0));
+    let numVoices = Utils9.Math.sum(getVoiceIds().map((voiceId) => this.getVoiceSymbols(voiceId).length > 0 ? 1 : 0));
     getVoiceIds().forEach((voiceId) => {
       var _a2;
       const getDefaultDiatonicId = () => {
@@ -5522,7 +5593,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       this.alterKeySignature = args[0];
     } else if (args[0] instanceof Scale) {
       this.alterKeySignature = args[0];
-    } else if (Utils12.Is.isNonEmptyString(args[0])) {
+    } else if (Guard8.isNonEmptyString(args[0])) {
       if (args.length === 1) {
         this.alterKeySignature = getScale(args[0]);
       } else if (args.length === 2) {
@@ -5633,7 +5704,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let grp = this.doc.getStaffGroup(staffTabOrGroup);
           if (grp && !prevGroups.includes(staffTabOrGroup)) {
             let curGroups = [...prevGroups, staffTabOrGroup];
-            (Utils12.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
+            (Guard8.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
               switch (grp.verticalPosition) {
                 case "above" /* Above */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
@@ -5660,7 +5731,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       } else {
         addToStaffTabOrGroup(0, defaultVerticalPos);
       }
-    } else if (Utils12.Is.isArray(staffTabOrGroups)) {
+    } else if (Guard8.isArray(staffTabOrGroups)) {
       staffTabOrGroups.forEach((staffTabOrGroup) => addToStaffTabOrGroup(staffTabOrGroup, defaultVerticalPos));
     } else {
       addToStaffTabOrGroup(staffTabOrGroups, defaultVerticalPos);
@@ -5744,7 +5815,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       case "endRepeat" /* EndRepeat */:
         if (args.length === 0) {
           this.endRepeatPlayCount = 2;
-        } else if (Utils12.Is.isIntegerGte(args[0], 2)) {
+        } else if (Guard8.isIntegerGte(args[0], 2)) {
           this.endRepeatPlayCount = args[0];
         } else {
           throw new MusicError13(MusicErrorType13.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
@@ -5831,15 +5902,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       throw new MusicError13(MusicErrorType13.Score, "Connective can be added to note group only.");
     }
     if (connective === "tie" /* Tie */) {
-      let tieSpan = Utils12.Is.isInteger(args[0]) || Utils12.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
-      let noteAnchor = Utils12.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let tieSpan = Guard8.isInteger(args[0]) || Guard8.isEnumValue(args[0], TieType) ? args[0] : 2;
+      let noteAnchor = Guard8.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("tie" /* Tie */, tieSpan, noteAnchor, anchor));
     } else if (connective === "slur" /* Slur */) {
-      let slurSpan = Utils12.Is.isInteger(args[0]) ? args[0] : 2;
-      let noteAnchor = Utils12.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let slurSpan = Guard8.isInteger(args[0]) ? args[0] : 2;
+      let noteAnchor = Guard8.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slur" /* Slur */, slurSpan, noteAnchor, anchor));
     } else if (connective === "slide" /* Slide */) {
-      let noteAnchor = Utils12.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
+      let noteAnchor = Guard8.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slide" /* Slide */, 2, noteAnchor, anchor));
     }
   }
@@ -5894,11 +5965,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.disableExtension();
   }
   addRhythmSymbol(symbol) {
-    var _a, _b;
     let { col, voiceId } = symbol;
     col.setVoiceSymbol(voiceId, symbol);
-    (_b = (_a = this.voiceSymbols)[voiceId]) != null ? _b : _a[voiceId] = [];
-    this.voiceSymbols[voiceId].push(symbol);
+    this.voiceSymbols.add(voiceId, symbol);
     if (symbol.oldStyleTriplet) {
       this.createOldStyleTriplets(voiceId);
     }
@@ -5925,9 +5994,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       let col = this.getRhythmColumn({ verse, line, vpos });
       let lyricsObj = new ObjLyrics(col, verse, line, vpos, validateNoteLength2(lyricsLength), lyricsText, lyricsOptions);
       col.addLyricsObject(lyricsObj);
-      let lyricsArr = this.getLyricsObjects(line, vpos, verse);
+      let lyricsArr = this.lyricsObjectsCache.getOrCreate(line, vpos, verse, []);
       lyricsArr.push(lyricsObj);
-      lyricsArr.sort((a, b) => Utils12.Math.cmp(a.col.positionTicks, b.col.positionTicks));
+      lyricsArr.sort((a, b) => Utils9.Math.cmp(a.col.positionTicks, b.col.positionTicks));
       (_a = lyricsObj.measure.getPrevLyricsObject(lyricsObj)) == null ? void 0 : _a.setNextLyricsObject(lyricsObj);
       this.addLayoutObject(lyricsObj, line, getVerseLayoutGroupId(verse), vpos);
       this.lastAddedRhythmColumn = col;
@@ -5976,55 +6045,48 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   }
   // Get content rect excluding signature
   getColumnsContentRect() {
-    return new DivRect(
-      this.barLineLeft.getRect().centerX,
-      this.barLineRight.getRect().centerX,
+    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() {
-    return this.barLineRight.getRect().centerX;
-  }
-  getLyricsObjects(line, vpos, verse) {
-    let lyricsObjs = this.lyricsObjectsCache.get(line, vpos, verse);
-    if (!lyricsObjs) {
-      this.lyricsObjectsCache.set(line, vpos, verse, lyricsObjs = []);
-    }
-    return lyricsObjs;
+    return this.barLineRight.getRect().anchorX;
   }
   getPrevLyricsObject(lyricsObj) {
     var _a;
     let { line, verse, vpos } = lyricsObj;
-    let lyricsArr = this.getLyricsObjects(line, vpos, verse);
+    let lyricsArr = this.lyricsObjectsCache.getOrDefault(line, vpos, verse, []);
     let i = lyricsArr.indexOf(lyricsObj);
     if (i > 0) {
       return lyricsArr[i - 1];
     } else if (i === 0) {
-      let lyricsArr2 = (_a = lyricsObj.measure.getPrevMeasure()) == null ? void 0 : _a.getLyricsObjects(line, vpos, verse);
+      let lyricsArr2 = (_a = lyricsObj.measure.getPrevMeasure()) == null ? void 0 : _a.lyricsObjectsCache.get(line, vpos, verse);
       if (lyricsArr2 && lyricsArr2.length > 0) {
         return lyricsArr2[lyricsArr2.length - 1];
       }
@@ -6032,14 +6094,13 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     return void 0;
   }
   getStaticObjects(line) {
-    let staticObjects = this.staticObjectsCache.get(line);
-    if (!staticObjects) {
-      staticObjects = [];
-      this.getColumns().forEach((col) => col.getStaticObjects(line).forEach((obj) => staticObjects == null ? void 0 : staticObjects.push(obj)));
-      this.staticObjectsCache.set(line, staticObjects);
-    }
     let layoutObjects = this.layoutObjects.filter((layoutObj) => layoutObj.line === line && layoutObj.isPositionResolved()).map((layoutObj) => layoutObj.musicObj);
-    return layoutObjects.length > 0 ? [...staticObjects, ...layoutObjects] : staticObjects;
+    let staticObjects = layoutObjects.length > 0 ? [...this.staticObjectsCache.getOrDefault(line, []), ...layoutObjects] : this.staticObjectsCache.getOrDefault(line, []);
+    staticObjects.forEach((obj) => obj.getRect());
+    return staticObjects;
+  }
+  addStaticObject(line, staticObj) {
+    this.staticObjectsCache.getOrCreate(line, []).push(staticObj);
   }
   removeLayoutObjects(musicObj) {
     this.layoutObjects = this.layoutObjects.filter((layoutObj) => {
@@ -6138,7 +6199,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let beamGroupSize = ts.beamGroupSizes[groupId];
         let beamGroupSizeList = [beamGroupSize];
         if (beamGroupSize.length > 1) {
-          beamGroupSizeList.unshift([Utils12.Math.sum(beamGroupSize)]);
+          beamGroupSizeList.unshift([Utils9.Math.sum(beamGroupSize)]);
         }
         let beamCreated = false;
         let groupStartTicksSave = groupStartTicks;
@@ -6153,7 +6214,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
               let symbolEndTicks = symbolStartTicks + symbol.rhythmProps.ticks;
               return symbolStartTicks >= groupStartTicks && symbolEndTicks <= groupEndTicks;
             });
-            let groupSymbolsTicks = Utils12.Math.sum(groupSymbols.map((sym) => sym.rhythmProps.ticks));
+            let groupSymbolsTicks = Utils9.Math.sum(groupSymbols.map((sym) => sym.rhythmProps.ticks));
             if (groupSymbolsTicks === beamGroupTicks && groupSymbols.every((n) => n instanceof ObjNoteGroup) && (groupSymbols.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeList.length === 0)) {
               if (ObjBeamGroup.createBeam(groupSymbols)) {
                 beamCreated = true;
@@ -6174,10 +6235,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     return this.barLineRight;
   }
   getVoiceSymbols(voiceId) {
-    var _a, _b;
-    validateVoiceId(voiceId);
-    (_b = (_a = this.voiceSymbols)[voiceId]) != null ? _b : _a[voiceId] = [];
-    return this.voiceSymbols[voiceId];
+    return this.voiceSymbols.getAll(voiceId);
   }
   completeRests(voiceId) {
     if (voiceId === void 0) {
@@ -6187,7 +6245,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         this.completeRests(getVoiceIds().filter((id) => this.getConsumedTicks(id) > 0));
       }
       return;
-    } else if (Utils12.Is.isArray(voiceId)) {
+    } else if (Guard8.isArray(voiceId)) {
       voiceId.forEach((id) => this.completeRests(id));
       return;
     } else {
@@ -6228,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;
@@ -6265,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);
         }
@@ -6274,50 +6332,62 @@ 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 DivRect();
-    this.rect.centerX = this.rect.left + width / 2;
+    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.centerY);
+      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.centerY);
+    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.centerY);
-    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 = Utils12.Math.sum(this.columns.map((col) => col.getRect().width));
-    let columnScale = columnsAreaWidth / columnsWidth;
-    let columnLeft = columnsAreaLeft;
+    this.barLineRight.offset(this.rect.right - rect.right, -rect.anchorY);
+    (_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 columnCenterX = columnLeft + rect.leftw * columnScale;
-      col.offset(columnCenterX - rect.centerX, -rect.centerY);
-      columnLeft += rect.width * columnScale;
+      let columnAnchorX = curColumnLeft + rect.leftw * columnScale;
+      col.offset(columnAnchorX - rect.anchorX, -rect.anchorY);
+      curColumnLeft += rect.width * columnScale;
+    });
+    getVoiceIds().forEach((voiceId) => {
+      const symbols = this.getVoiceSymbols(voiceId);
+      const onlyRest = symbols.length === 1 && symbols[0] instanceof ObjRest ? symbols[0] : void 0;
+      if (!onlyRest) return;
+      const isOnlySymbolInCol = getVoiceIds().map((voiceId2) => onlyRest.col.getVoiceSymbol(voiceId2)).filter((sym) => sym !== void 0 && sym !== onlyRest).length === 0;
+      if (isOnlySymbolInCol) return;
+      const r = this.getColumnsContentRect();
+      onlyRest.offset(r.centerX - onlyRest.getRect().anchorX, 0);
     });
   }
   layoutConnectives(ctx) {
@@ -6425,29 +6495,40 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.beamGroups.forEach((beam) => beam.draw(ctx));
   }
 };
-__publicField(_ObjMeasure, "MinFlexContentWidth", 10);
-var ObjMeasure2 = _ObjMeasure;
 
 // src/score/engine/layout-object.ts
 import { MusicError as MusicError14, MusicErrorType as MusicErrorType14 } from "@tspro/web-music-score/core";
-var WidenColumnList = [
-  2 /* NoteLabel */,
-  7 /* ChordLabel */
-];
-var RowAlignList = [
-  0 /* TabRhythm */,
-  3 /* Navigation */,
-  4 /* Ending */,
-  5 /* TempoAnnotation */,
-  6 /* DynamicsAnnotation */,
-  7 /* ChordLabel */,
-  8 /* LyricsVerse1 */,
-  9 /* LyricsVerse2 */,
-  10 /* LyricsVerse3 */
-];
+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";
+  LayoutGroupId2[LayoutGroupId2["NoteLabel"] = 2] = "NoteLabel";
+  LayoutGroupId2[LayoutGroupId2["Navigation"] = 3] = "Navigation";
+  LayoutGroupId2[LayoutGroupId2["Ending"] = 4] = "Ending";
+  LayoutGroupId2[LayoutGroupId2["TempoAnnotation"] = 5] = "TempoAnnotation";
+  LayoutGroupId2[LayoutGroupId2["DynamicsAnnotation"] = 6] = "DynamicsAnnotation";
+  LayoutGroupId2[LayoutGroupId2["ChordLabel"] = 7] = "ChordLabel";
+  LayoutGroupId2[LayoutGroupId2["LyricsVerse1"] = 8] = "LyricsVerse1";
+  LayoutGroupId2[LayoutGroupId2["LyricsVerse2"] = 9] = "LyricsVerse2";
+  LayoutGroupId2[LayoutGroupId2["LyricsVerse3"] = 10] = "LyricsVerse3";
+  return LayoutGroupId2;
+})(LayoutGroupId || {});
+var LayoutGroupIdAttrs = new UniMap6([
+  [0 /* TabRhythm */, { rowAlign: 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 */, { 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) {
-    if (p instanceof ObjMeasure2) {
+    if (p instanceof ObjMeasure) {
       return p;
     }
     p = p.getParent();
@@ -6483,7 +6564,7 @@ var LayoutObjectWrapper = class {
     this.layoutGroup = this.line.getLayoutGroup(layoutGroupId);
     this.layoutGroup.add(this);
   }
-  clearPositionResolved() {
+  resetPositionResolved() {
     this.positionResolved = false;
   }
   setPositionResolved() {
@@ -6504,8 +6585,8 @@ var LayoutObjectWrapper = class {
       let staticShapeRects = staticObj.getShapeRects();
       objShapeRects.forEach((objR) => {
         staticShapeRects.forEach((staticR) => {
-          if (DivRect.overlapX(objR, staticR)) {
-            y = verticalPos === 1 /* Below */ ? Math.max(y, staticR.bottom + objR.toph + objR.centerY) : Math.min(y, staticR.top - objR.bottomh - objR.centerY);
+          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);
           }
         });
       });
@@ -6532,35 +6613,33 @@ var LayoutObjectWrapper = class {
 var LayoutGroup = class {
   constructor(layoutGroupId) {
     this.layoutGroupId = layoutGroupId;
-    __publicField(this, "layoutObjectTable", []);
+    // key = VerticalPos
+    __publicField(this, "layoutObject", asMulti2(new IndexArray3()));
     __publicField(this, "rowAlign");
-    __publicField(this, "widensColumn");
-    this.layoutObjectTable[0 /* Above */] = [];
-    this.layoutObjectTable[1 /* Below */] = [];
-    this.rowAlign = RowAlignList.indexOf(layoutGroupId) >= 0;
-    this.widensColumn = WidenColumnList.indexOf(layoutGroupId) >= 0;
+    __publicField(this, "reserveSpace");
+    __publicField(this, "padding");
+    var _a, _b, _c, _d;
+    this.rowAlign = ((_a = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _a.rowAlign) === 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) {
-    return this.layoutObjectTable[verticalPos];
+    return this.layoutObject.getAll(verticalPos);
   }
   add(layoutObj) {
-    this.layoutObjectTable[layoutObj.verticalPos].push(layoutObj);
+    this.layoutObject.add(layoutObj.verticalPos, layoutObj);
   }
   remove(layoutObj) {
-    this.layoutObjectTable.forEach((layoutObjects) => {
-      let i = layoutObjects.indexOf(layoutObj);
-      if (i >= 0) {
-        layoutObjects.splice(i, 1);
-      }
-    });
+    this.layoutObject.remove(layoutObj.verticalPos, layoutObj);
   }
-  clearPositionAndLayout(ctx) {
-    this.layoutObjectTable.forEach((layoutObjects) => {
-      layoutObjects.forEach((layoutObj) => {
-        layoutObj.clearPositionResolved();
-        layoutObj.musicObj.layout(ctx);
-      });
-    });
+  layout(ctx) {
+    for (const w of this.layoutObject.values()) {
+      w.resetPositionResolved();
+      w.musicObj.layout(ctx);
+    }
+  }
+  getPadding(ctx) {
+    return this.padding * ctx.unitSize;
   }
 };
 
@@ -6570,7 +6649,7 @@ var ObjNotationLine5 = class extends MusicObject {
     super(row);
     this.row = row;
     __publicField(this, "objects", []);
-    __publicField(this, "layoutGroups", []);
+    __publicField(this, "layoutGroups", new UniMap7());
   }
   addObject(o) {
     this.objects.push(o);
@@ -6579,41 +6658,36 @@ var ObjNotationLine5 = class extends MusicObject {
     this.objects.length = 0;
   }
   getLayoutGroup(lauoutGroupId) {
-    let layoutGroup = this.layoutGroups[lauoutGroupId];
-    if (!layoutGroup) {
-      layoutGroup = this.layoutGroups[lauoutGroupId] = new LayoutGroup(lauoutGroupId);
-    }
-    return layoutGroup;
+    return this.layoutGroups.getOrCreate(lauoutGroupId, () => new LayoutGroup(lauoutGroupId));
   }
   resetLayoutGroups(ctx) {
-    this.layoutGroups.forEach((layoutGroup) => {
-      if (layoutGroup) {
-        layoutGroup.clearPositionAndLayout(ctx);
-      }
-    });
+    this.layoutGroups.forEach((layoutGroup) => layoutGroup.layout(ctx));
   }
   layoutLayoutGroups(ctx) {
-    this.layoutGroups.forEach((layoutGroup) => {
+    for (const groupId of Utils10.Enum.getEnumValues(LayoutGroupId)) {
+      const layoutGroup = this.getLayoutGroup(groupId);
       if (layoutGroup) {
         this.layoutLayoutGroup(ctx, layoutGroup, 0 /* Above */);
         this.layoutLayoutGroup(ctx, layoutGroup, 1 /* Below */);
       }
-    });
+    }
   }
   setObjectY(layoutObj, y) {
     if (y === void 0) {
       return;
     }
-    layoutObj.offset(0, y - layoutObj.getRect().centerY);
+    layoutObj.offset(0, y - layoutObj.getRect().anchorY);
     layoutObj.setPositionResolved();
   }
-  alignObjectsY(ctx, layoutObjArr) {
-    layoutObjArr = layoutObjArr.filter((layoutObj) => !layoutObj.isPositionResolved());
-    let rowY;
-    layoutObjArr.forEach((layoutObj) => {
-      let y = layoutObj.resolveClosestToStaffY(ctx);
-      rowY = layoutObj.verticalPos === 1 /* Below */ ? Math.max(y, rowY != null ? rowY : y) : Math.min(y, rowY != null ? rowY : y);
+  alignObjectsY(ctx, layoutObjects, verticalPos) {
+    const layoutObjArr = layoutObjects.filter((obj) => !obj.isPositionResolved() && obj.verticalPos === verticalPos);
+    if (layoutObjArr.length === 0)
+      return;
+    const vdir = verticalPos === 1 /* Below */ ? 1 : -1;
+    let yArr = layoutObjArr.map((layoutObj) => {
+      return layoutObj.resolveClosestToStaffY(ctx) + layoutObj.layoutGroup.getPadding(ctx) * vdir;
     });
+    const rowY = verticalPos === 1 /* Below */ ? Math.max(...yArr) : Math.min(...yArr);
     layoutObjArr.forEach((layoutObj) => this.setObjectY(layoutObj, rowY));
   }
   layoutLayoutGroup(ctx, layoutGroup, verticalPos) {
@@ -6623,20 +6697,20 @@ var ObjNotationLine5 = class extends MusicObject {
       if (musicObj instanceof ObjEnding || musicObj instanceof ObjExtensionLine || musicObj instanceof ObjTabRhythm) {
         musicObj.layoutFitToMeasure(ctx);
       } else {
-        musicObj.offset(anchor.getRect().centerX - musicObj.getRect().centerX, 0);
+        musicObj.offset(anchor.getRect().anchorX - musicObj.getRect().anchorX, 0);
       }
     });
     if (layoutGroup.rowAlign) {
-      this.alignObjectsY(ctx, rowLayoutObjs);
+      this.alignObjectsY(ctx, rowLayoutObjs, verticalPos);
     } else {
       rowLayoutObjs.forEach((layoutObj) => {
         let link = layoutObj.musicObj.getLink();
         if (link && link.getHead() === layoutObj.musicObj) {
           let objectParts = [link.getHead(), ...link.getTails()];
           let layoutObjs = rowLayoutObjs.filter((layoutObj2) => objectParts.some((o) => o === layoutObj2.musicObj));
-          this.alignObjectsY(ctx, layoutObjs);
+          this.alignObjectsY(ctx, layoutObjs, verticalPos);
         } else {
-          this.alignObjectsY(ctx, [layoutObj]);
+          this.alignObjectsY(ctx, [layoutObj], verticalPos);
         }
       });
     }
@@ -6743,7 +6817,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     return diatonicId % 2 !== this.middleLineDiatonicId % 2;
   }
   containsVoiceId(voiceId) {
-    return Utils13.Is.isUndefined(this.staffConfig.voiceId) || Utils13.Arr.toArray(this.staffConfig.voiceId).includes(voiceId);
+    return Guard9.isUndefined(this.staffConfig.voiceId) || Utils10.Arr.toArray(this.staffConfig.voiceId).includes(voiceId);
   }
   calcTop() {
     let top = this.topLineY;
@@ -6773,7 +6847,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     let h = unitSize * DocumentSettings.StaffHeight;
     this.topLineY = -h / 2;
     this.bottomLineY = h / 2;
-    this.rect = new DivRect(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;
@@ -6805,7 +6879,7 @@ var ObjTab = class extends ObjNotationLine5 {
     __publicField(this, "tuningName");
     __publicField(this, "tuningStrings");
     __publicField(this, "mi");
-    if (Utils13.Is.isArray(tabConfig.tuning)) {
+    if (Guard9.isArray(tabConfig.tuning)) {
       this.tuningName = void 0;
       this.tuningStrings = tabConfig.tuning.map((noteName) => Note8.getNote(noteName)).reverse();
     } else if (typeof tabConfig.tuning === "string") {
@@ -6856,7 +6930,7 @@ var ObjTab = class extends ObjNotationLine5 {
     return this.bottom;
   }
   containsVoiceId(voiceId) {
-    return Utils13.Is.isUndefined(this.tabConfig.voiceId) || Utils13.Arr.toArray(this.tabConfig.voiceId).includes(voiceId);
+    return Guard9.isUndefined(this.tabConfig.voiceId) || Utils10.Arr.toArray(this.tabConfig.voiceId).includes(voiceId);
   }
   containsDiatonicId(diatonicId) {
     return true;
@@ -6879,7 +6953,7 @@ var ObjTab = class extends ObjNotationLine5 {
     let h = unitSize * DocumentSettings.TabHeight;
     this.top = -h / 2;
     this.bottom = h / 2;
-    this.rect = new DivRect(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;
@@ -6903,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 { Utils as Utils14 } 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);
@@ -6935,7 +7009,7 @@ var ObjScoreRow = class extends MusicObject {
     }
     this.instrumentLineGroups = lineGroups;
     this.instrumentNames = this.instrumentLineGroups.map((lines) => {
-      return lines.length > 0 && Utils14.Is.isNonEmptyString(lines[0].getConfig().instrument) ? new ObjText(this, String(lines[0].getConfig().instrument), 0, 0.5) : void 0;
+      return lines.length > 0 && Guard10.isNonEmptyString(lines[0].getConfig().instrument) ? new ObjText(this, String(lines[0].getConfig().instrument), 0, 0.5) : void 0;
     });
     if (this.prevRow) {
       this.prevRow.nextRow = this;
@@ -6965,7 +7039,7 @@ var ObjScoreRow = class extends MusicObject {
   }
   findMatchingLine(line) {
     return line.row === this ? line : this.notationLines.find(
-      (curLine) => Utils14.Obj.deepEqual(line.row.scoreConfig, curLine.row.scoreConfig) && line.id === curLine.id || Utils14.Is.isNonEmptyString(line.getConfig().name) && line.getConfig().name === curLine.getConfig().name && line.getConfig().type === curLine.getConfig().type
+      (curLine) => Utils11.Obj.deepEqual(line.row.scoreConfig, curLine.row.scoreConfig) && line.id === curLine.id || Guard10.isNonEmptyString(line.getConfig().name) && line.getConfig().name === curLine.getConfig().name && line.getConfig().type === curLine.getConfig().type
     );
   }
   getStaves() {
@@ -7041,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 DivRect(left, (left + r.right) / 2, r.right, r.top, r.centerY, 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++) {
@@ -7091,7 +7165,7 @@ var ObjScoreRow = class extends MusicObject {
         return "up" /* Up */;
       }
       let diatonicIds = noteGroupDiatonicIds.length > 0 ? noteGroupDiatonicIds : restDiatonicIds;
-      let avgDiatonicId = Math.floor(Utils14.Math.avg(...diatonicIds));
+      let avgDiatonicId = Math.floor(Utils11.Math.avg(...diatonicIds));
       let staves = this.getStaves().filter((staff) => staff.containsVoiceId(voiceId) && staff.containsDiatonicId(avgDiatonicId));
       return staves.length > 0 ? avgDiatonicId >= staves[0].middleLineDiatonicId ? "down" /* Down */ : "up" /* Up */ : "up" /* Up */;
     }
@@ -7126,21 +7200,21 @@ var ObjScoreRow = class extends MusicObject {
     if (!this.needLayout) {
       return;
     }
-    this.rect = new DivRect(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.centerY);
+      m.offset(x - r.left, -r.anchorY);
       x += r.width;
       x += m.getPostMeasureBreakWidth();
     });
@@ -7154,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 DivRect(left, right, top, bottom);
+    this.rect = new AnchoredRect23(left, right, top, bottom);
   }
   alignStemsToBeams() {
     this.measures.forEach((m) => m.alignStemsToBeams());
@@ -7189,7 +7263,7 @@ var ObjScoreRow = class extends MusicObject {
       if (obj && grp.length > 0) {
         obj.offset(
           -obj.getRect().left,
-          -obj.getRect().centerY + (grp[0].getRect().top + grp[grp.length - 1].getRect().bottom) / 2
+          -obj.getRect().anchorY + (grp[0].getRect().top + grp[grp.length - 1].getRect().bottom) / 2
         );
       }
     });
@@ -7228,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 DivRect(
+        let r = new AnchoredRect23(
           grpSize.braceLeft,
           grpSize.braceRight,
           grp[0].getTopLineY(),
@@ -7249,6 +7323,7 @@ var ObjScoreRow = class extends MusicObject {
 };
 
 // src/score/engine/obj-header.ts
+import { AnchoredRect as AnchoredRect24 } from "@tspro/ts-utils-lib";
 var ObjHeader = class extends MusicObject {
   constructor(doc, title, composer, arranger) {
     super(doc);
@@ -7293,7 +7368,7 @@ var ObjHeader = class extends MusicObject {
   }
   layoutWidth(ctx, left, right) {
     let top = 0;
-    this.rect = new DivRect(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);
@@ -7339,8 +7414,25 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-import { Utils as Utils15 } 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);
@@ -7353,7 +7445,8 @@ var ObjDocument = class extends MusicObject {
     __publicField(this, "header");
     __publicField(this, "newRowRequested", false);
     __publicField(this, "allConnectiveProps", []);
-    __publicField(this, "staffGroups", /* @__PURE__ */ new Map());
+    __publicField(this, "staffGroups", new UniMap8());
+    __publicField(this, "instrumentGroupRegions", new InstrumentGroupRegions());
     __publicField(this, "mi");
     this.mi = new MDocument2(this);
   }
@@ -7361,7 +7454,7 @@ var ObjDocument = class extends MusicObject {
     return this.mi;
   }
   setScoreConfiguration(config) {
-    if (Utils15.Is.isEnumValue(config, StaffPreset)) {
+    if (Guard11.isEnumValue(config, StaffPreset)) {
       switch (config) {
         default:
         case "treble" /* Treble */:
@@ -7389,7 +7482,7 @@ var ObjDocument = class extends MusicObject {
           ];
           break;
       }
-    } else if (Utils15.Is.isArray(config)) {
+    } else if (Guard11.isArray(config)) {
       this.curScoreConfig = config;
     } else {
       this.curScoreConfig = [config];
@@ -7515,7 +7608,7 @@ var ObjDocument = class extends MusicObject {
       lastRow = this.addNewRow(lastRow);
       this.newRowRequested = false;
     }
-    let measure = new ObjMeasure2(lastRow, measureOptions);
+    let measure = new ObjMeasure(lastRow, measureOptions);
     this.measures.push(measure);
     lastRow.addMeasure(measure);
     this.requestLayout();
@@ -7550,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;
@@ -7590,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 DivRect();
+    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) => {
@@ -7661,126 +7753,106 @@ var ObjDocument = class extends MusicObject {
 };
 
 // src/score/pub/document-builder.ts
-import { BeamGrouping, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength8, RhythmProps as RhythmProps6, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList, validateNoteLength as validateNoteLength3, validateTupletRatio } from "@tspro/web-music-score/theory";
+import { BeamGrouping, isNoteLength, isTupletRatio, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength8, RhythmProps as RhythmProps6, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError18, MusicErrorType as MusicErrorType18 } from "@tspro/web-music-score/core";
-function assertArg(condition, argName, argValue) {
-  if (!condition) {
-    throw new MusicError18(MusicErrorType18.Score, `Invalid arg: ${argName} = ${argValue}`);
-  }
+var assertingFunction = "";
+function setAssertFunction(fnName, ...fnArgs) {
+  let argsStr = fnArgs.map((arg) => JSON.stringify(arg)).join(", ");
+  assertingFunction = `DocumentBuilder.${fnName}(${argsStr})`;
 }
-function isNote(note) {
-  if (typeof note !== "string") {
-    return false;
-  } else {
-    let p = Note10.parseNote(note);
-    return p !== void 0 && p.octave !== void 0;
-  }
-}
-function isVoiceId(value) {
-  return Utils16.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
-}
-function isStringNumber(value) {
-  return Utils16.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+function assertArg(...conditions) {
+  conditions.forEach((condition) => {
+    if (!condition) throw new MusicError18(MusicErrorType18.Score, assertingFunction);
+  });
 }
-function isVerseNumber(value) {
-  return Utils16.Is.isNumber(value) && getVerseNumbers().indexOf(value) >= 0;
+function assertArgMsg(condition, msg) {
+  if (!condition) throw new MusicError18(MusicErrorType18.Score, msg);
 }
 function assertBaseConfig(baseConfig) {
   var _a;
-  assertArg(Utils16.Is.isObject(baseConfig), "baseConfig", baseConfig);
-  assertArg(Utils16.Is.isStringOrUndefined(baseConfig.name), "baseConfig.name", baseConfig.name);
-  assertArg(Utils16.Is.isUndefined(baseConfig.voiceId) || isVoiceId(baseConfig.voiceId) || Utils16.Is.isArray(baseConfig.voiceId) && baseConfig.voiceId.every((voiceId) => isVoiceId(voiceId)), "baseConfig.voiceId", baseConfig.voiceId);
-  if (!Utils16.Is.isUndefined(baseConfig.voiceIds)) {
-    assertArg(isVoiceId(baseConfig.voiceIds) || Utils16.Is.isArray(baseConfig.voiceIds) && baseConfig.voiceIds.every((voiceId) => isVoiceId(voiceId)), "baseConfig.voiceIds", baseConfig.voiceIds);
+  assertArg(
+    Guard12.isObject(baseConfig),
+    Guard12.isStringOrUndefined(baseConfig.name),
+    Guard12.isUndefined(baseConfig.voiceId) || isVoiceId(baseConfig.voiceId) || Guard12.isArray(baseConfig.voiceId) && baseConfig.voiceId.every((voiceId) => isVoiceId(voiceId))
+  );
+  if (!Guard12.isUndefined(baseConfig.voiceIds)) {
+    assertArg(isVoiceId(baseConfig.voiceIds) || Guard12.isArray(baseConfig.voiceIds) && baseConfig.voiceIds.every((voiceId) => isVoiceId(voiceId)));
     console.warn(`Staff/tab config property 'voiceIds' is deprecated, use 'voiceId' instead.`);
-    let arr = Utils16.Arr.toArray((_a = baseConfig.voiceId) != null ? _a : []);
-    Utils16.Arr.toArray(baseConfig.voiceIds).forEach((voiceId) => arr.push(voiceId));
+    let arr = Utils12.Arr.toArray((_a = baseConfig.voiceId) != null ? _a : []);
+    Utils12.Arr.toArray(baseConfig.voiceIds).forEach((voiceId) => arr.push(voiceId));
     baseConfig.voiceId = arr;
   }
-  if (Utils16.Is.isArray(baseConfig.voiceId)) {
-    baseConfig.voiceId = Utils16.Arr.removeDuplicates(baseConfig.voiceId);
+  if (Guard12.isArray(baseConfig.voiceId)) {
+    baseConfig.voiceId = Utils12.Arr.removeDuplicates(baseConfig.voiceId);
   }
-  assertArg(Utils16.Is.isStringOrUndefined(baseConfig.instrument), "baseConfig.instrument", baseConfig.instrument);
+  assertArg(Guard12.isStringOrUndefined(baseConfig.instrument));
 }
 function assertStaffConfig(staffConfig) {
   assertBaseConfig(staffConfig);
-  assertArg(Utils16.Is.isObject(staffConfig), "staffConfig", staffConfig);
-  assertArg(staffConfig.type === "staff", "staffConfig.type", staffConfig.type);
-  assertArg(Utils16.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
-  assertArg(Utils16.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
-  assertArg(Utils16.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
-  assertArg(Utils16.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
-  assertArg(Utils16.Is.isStringOrUndefined(staffConfig.grandId), "staffConfig.grandId", staffConfig.grandId);
-  assertArg(Utils16.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
-  if (!Utils16.Is.isUndefined(staffConfig.isGrand)) {
+  assertArg(
+    Guard12.isObject(staffConfig),
+    Guard12.isStrictEqual(staffConfig.type, "staff"),
+    Guard12.isEnumValue(staffConfig.clef, Clef),
+    Guard12.isBooleanOrUndefined(staffConfig.isOctaveDown),
+    Guard12.isUndefined(staffConfig.minNote) || Note10.isNote(staffConfig.minNote),
+    Guard12.isUndefined(staffConfig.maxNote) || Note10.isNote(staffConfig.maxNote),
+    Guard12.isStringOrUndefined(staffConfig.grandId),
+    Guard12.isBooleanOrUndefined(staffConfig.isGrand)
+  );
+  if (!Guard12.isUndefined(staffConfig.isGrand))
     console.warn(`Staff config property 'isGrand' is deprecated, use 'grandId' instead.`);
-  }
 }
 function assertTabConfig(tabConfig) {
   assertBaseConfig(tabConfig);
-  assertArg(Utils16.Is.isObject(tabConfig), "tabConfig", tabConfig);
-  assertArg(tabConfig.type === "tab", "tabConfig.type", tabConfig.type);
-  if (Utils16.Is.isString(tabConfig.tuning)) {
-    assertArg(TuningNameList.includes(tabConfig.tuning), "tabConfig.tuning", tabConfig.tuning);
-  } else if (Utils16.Is.isArray(tabConfig.tuning)) {
-    assertArg(tabConfig.tuning.length === getStringNumbers().length && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
-  }
+  assertArg(
+    Guard12.isObject(tabConfig),
+    Guard12.isStrictEqual(tabConfig.type, "tab"),
+    Guard12.isUndefined(tabConfig.tuning) || Guard12.isString(tabConfig.tuning) && Guard12.isIncluded(tabConfig.tuning, TuningNameList) || Guard12.isArray(tabConfig.tuning) && Guard12.isStrictEqual(tabConfig.tuning.length, getStringNumbers().length && tabConfig.tuning.every((s) => Note10.isNote(s)))
+  );
 }
 function assertNoteOptions(noteOptions) {
-  assertArg(Utils16.Is.isObject(noteOptions), "noteOptions", noteOptions);
-  assertArg(Utils16.Is.isBooleanOrUndefined(noteOptions.dotted) || Utils16.Is.isIntegerGte(noteOptions.dotted, 0), "noteOptions.dotted", noteOptions.dotted);
-  assertArg(Utils16.Is.isEnumValueOrUndefined(noteOptions.stem, Stem), "noteOptions.stem", noteOptions.stem);
-  assertArg(Utils16.Is.isStringOrUndefined(noteOptions.color), "noteOptions.color", noteOptions.color);
-  assertArg(Utils16.Is.isBooleanOrUndefined(noteOptions.arpeggio) || Utils16.Is.isEnumValue(noteOptions.arpeggio, Arpeggio), "noteOptions.arpeggio", noteOptions.arpeggio);
-  assertArg(Utils16.Is.isBooleanOrUndefined(noteOptions.staccato), "noteOptions.staccato", noteOptions.staccato);
-  assertArg(Utils16.Is.isBooleanOrUndefined(noteOptions.diamond), "noteOptions.diamond", noteOptions.diamond);
-  assertArg(Utils16.Is.isBooleanOrUndefined(noteOptions.triplet), "noteOptions.triplet", noteOptions.triplet);
-  assertArg(Utils16.Is.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || Utils16.Is.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string)), "noteOptions.string", noteOptions.string);
-  assertArg(Utils16.Is.isUndefined(noteOptions.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
-  assertArg(Utils16.Is.isUndefined(noteOptions.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
+  assertArg(
+    Guard12.isObject(noteOptions),
+    Guard12.isBooleanOrUndefined(noteOptions.dotted) || Guard12.isIntegerGte(noteOptions.dotted, 0),
+    Guard12.isEnumValueOrUndefined(noteOptions.stem, Stem),
+    Guard12.isStringOrUndefined(noteOptions.color),
+    Guard12.isBooleanOrUndefined(noteOptions.arpeggio) || Guard12.isEnumValue(noteOptions.arpeggio, Arpeggio),
+    Guard12.isBooleanOrUndefined(noteOptions.staccato),
+    Guard12.isBooleanOrUndefined(noteOptions.diamond),
+    Guard12.isBooleanOrUndefined(noteOptions.triplet),
+    Guard12.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || Guard12.isEmptyArray(noteOptions.string) || Guard12.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string))
+  );
+  assertArgMsg(Guard12.isUndefined(noteOptions.tieSpan), `NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)`);
+  assertArgMsg(Guard12.isUndefined(noteOptions.slurSpan), `NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)`);
 }
 function assertRestOptions(restOptions) {
-  assertArg(Utils16.Is.isObject(restOptions), "restOptions", restOptions);
-  assertArg(Utils16.Is.isBooleanOrUndefined(restOptions.dotted) || Utils16.Is.isIntegerGte(restOptions.dotted, 0), "restOptions.dotted", restOptions.dotted);
-  assertArg(Utils16.Is.isStringOrUndefined(restOptions.staffPos) || Utils16.Is.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof Note10, "restOptions.staffPos", restOptions.staffPos);
-  assertArg(Utils16.Is.isStringOrUndefined(restOptions.color), "restOptions.color", restOptions.color);
-  assertArg(Utils16.Is.isBooleanOrUndefined(restOptions.hide), "restOptions.hide", restOptions.hide);
-  assertArg(Utils16.Is.isBooleanOrUndefined(restOptions.triplet), "restOptions.triplet", restOptions.triplet);
+  assertArg(
+    Guard12.isObject(restOptions),
+    Guard12.isBooleanOrUndefined(restOptions.dotted) || Guard12.isIntegerGte(restOptions.dotted, 0),
+    Guard12.isStringOrUndefined(restOptions.staffPos) || Guard12.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof Note10,
+    Guard12.isStringOrUndefined(restOptions.color),
+    Guard12.isBooleanOrUndefined(restOptions.hide),
+    Guard12.isBooleanOrUndefined(restOptions.triplet)
+  );
 }
 function assertLyricsOptions(lyricsOptions) {
-  assertArg(Utils16.Is.isObject(lyricsOptions), "lyricsOptions", lyricsOptions);
-  assertArg(Utils16.Is.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign), "lyricsOptions.align", lyricsOptions.align);
-  assertArg(Utils16.Is.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen), "lyricsOptions.hyphen", lyricsOptions.hyphen);
+  assertArg(
+    Guard12.isObject(lyricsOptions),
+    Guard12.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign),
+    Guard12.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen)
+  );
 }
 function assertMeasureOptions(measureOptions) {
-  assertArg(Utils16.Is.isObject(measureOptions), "measureOptions", measureOptions);
-  assertArg(Utils16.Is.isBooleanOrUndefined(measureOptions.showNumber), "measureOptions.showNumber", measureOptions.showNumber);
+  assertArg(
+    Guard12.isObject(measureOptions),
+    Guard12.isBooleanOrUndefined(measureOptions.showNumber)
+  );
 }
 function assertStaffTabOrGRoups(staffTabOrGroups) {
   assertArg(
-    Utils16.Is.isStringOrUndefined(staffTabOrGroups) || Utils16.Is.isIntegerGte(staffTabOrGroups, 0) || Utils16.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
-      (staffTabOrGroup) => Utils16.Is.isString(staffTabOrGroup) || Utils16.Is.isIntegerGte(staffTabOrGroup, 0)
-    ),
-    "staffTabOrGroup",
-    staffTabOrGroups
+    Guard12.isStringOrUndefined(staffTabOrGroups) || Guard12.isIntegerGte(staffTabOrGroups, 0) || Guard12.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every((staffTabOrGroup) => Guard12.isString(staffTabOrGroup) || Guard12.isIntegerGte(staffTabOrGroup, 0))
   );
 }
-function isNoteLength(noteLen) {
-  try {
-    validateNoteLength3(noteLen);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-function isTupletRatio(tupletRatio) {
-  try {
-    validateTupletRatio(tupletRatio);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
 var _DocumentBuilder = class _DocumentBuilder {
   /**
    * Create new document builder instance.
@@ -7791,27 +7863,28 @@ var _DocumentBuilder = class _DocumentBuilder {
     this.doc = new ObjDocument();
   }
   setScoreConfiguration(config) {
-    if (Utils16.Is.isEnumValue(config, StaffPreset)) {
+    setAssertFunction("setScoreConfiguration", config);
+    if (Guard12.isEnumValue(config, StaffPreset)) {
       this.doc.setScoreConfiguration(config);
-    } else if (Utils16.Is.isObject(config) && config.type === "staff") {
+    } else if (Guard12.isObject(config) && config.type === "staff") {
       assertStaffConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils16.Is.isObject(config) && config.type === "tab") {
+    } else if (Guard12.isObject(config) && config.type === "tab") {
       assertTabConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils16.Is.isNonEmptyArray(config)) {
+    } else if (Guard12.isNonEmptyArray(config)) {
       config.forEach((c) => {
-        if (Utils16.Is.isObject(c) && c.type === "staff") {
+        if (Guard12.isObject(c) && c.type === "staff") {
           assertStaffConfig(c);
-        } else if (Utils16.Is.isObject(c) && c.type === "tab") {
+        } else if (Guard12.isObject(c) && c.type === "tab") {
           assertTabConfig(c);
         } else {
-          assertArg(false, "config", config);
+          assertArg(false);
         }
       });
       this.doc.setScoreConfiguration(config);
     } else {
-      assertArg(false, "config", config);
+      assertArg(false);
     }
     return this;
   }
@@ -7834,9 +7907,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   setHeader(title, composer, arranger) {
-    assertArg(Utils16.Is.isStringOrUndefined(title), "title", title);
-    assertArg(Utils16.Is.isStringOrUndefined(composer), "composer", composer);
-    assertArg(Utils16.Is.isStringOrUndefined(arranger), "arranger", arranger);
+    setAssertFunction("setHeader", title, composer, arranger);
+    assertArg(
+      Guard12.isStringOrUndefined(title),
+      Guard12.isStringOrUndefined(composer),
+      Guard12.isStringOrUndefined(arranger)
+    );
     this.doc.setHeader(title, composer, arranger);
     return this;
   }
@@ -7846,7 +7922,8 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   setMeasuresPerRow(measuresPerRow) {
-    assertArg(Utils16.Is.isIntegerGte(measuresPerRow, 1) || Utils16.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
+    setAssertFunction("setMeasuresPerRow", measuresPerRow);
+    assertArg(Guard12.isIntegerGte(measuresPerRow, 1) || Guard12.isPosInfinity(measuresPerRow));
     this.doc.setMeasuresPerRow(measuresPerRow);
     return this;
   }
@@ -7856,36 +7933,37 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addMeasure(measureOptions) {
+    setAssertFunction("addMeasure", measureOptions);
     measureOptions != null ? measureOptions : measureOptions = {};
     assertMeasureOptions(measureOptions);
     this.doc.addMeasure(measureOptions);
     return this;
   }
   setKeySignature(...args) {
-    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Utils16.Is.isNonEmptyString(args[0]) && (args.length === 1 || Utils16.Is.isEnumValue(args[1], ScaleType)), "keySignature", args);
+    setAssertFunction("setKeySignature", ...args);
+    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Guard12.isNonEmptyString(args[0]) && Guard12.isEnumValueOrUndefined(args[1], ScaleType));
     this.getMeasure().setKeySignature(...args);
     return this;
   }
   setTimeSignature(...args) {
+    setAssertFunction("setTimeSignature", ...args);
     if (args[0] instanceof TimeSignature2) {
       this.getMeasure().setTimeSignature(args[0]);
-    } else if (Utils16.Is.isEnumValue(args[0], TimeSignatures) && Utils16.Is.isEnumValueOrUndefined(args[1], BeamGrouping)) {
+    } else if (Guard12.isEnumValue(args[0], TimeSignatures) && Guard12.isEnumValueOrUndefined(args[1], BeamGrouping)) {
       this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1]));
-    } else if (Utils16.Is.isIntegerGte(args[0], 1) && Utils16.Is.isIntegerGte(args[1], 1) && Utils16.Is.isEnumValueOrUndefined(args[2], BeamGrouping)) {
+    } else if (Guard12.isIntegerGte(args[0], 1) && Guard12.isIntegerGte(args[1], 1) && Guard12.isEnumValueOrUndefined(args[2], BeamGrouping)) {
       this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1], args[2]));
     } else {
-      assertArg(false, "timeSignature args", args);
+      assertArg(false);
     }
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {
-    assertArg(Utils16.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
-    if (beatLength === void 0) {
-      assertArg(Utils16.Is.isUndefined(dotted), "dotted", dotted);
-    } else {
-      assertArg(Utils16.Is.isEnumValue(beatLength, NoteLength8) || isNoteLength(beatLength), "beatLength", beatLength);
-      assertArg(Utils16.Is.isBooleanOrUndefined(dotted) || Utils16.Is.isIntegerGte(dotted, 0), "dotted", dotted);
-    }
+    setAssertFunction("setTempo", beatsPerMinute, beatLength, dotted);
+    assertArg(
+      Guard12.isIntegerGte(beatsPerMinute, 1),
+      Guard12.isUndefined(beatLength) && Guard12.isUndefined(dotted) || isNoteLength(beatLength) && (Guard12.isBooleanOrUndefined(dotted) || Guard12.isIntegerGte(dotted, 0))
+    );
     this.getMeasure().setTempo(beatsPerMinute, beatLength, dotted);
     return this;
   }
@@ -7898,19 +7976,18 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addNote(voiceId, note, noteLength, noteOptions) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
+    setAssertFunction("addNote", voiceId, note, noteLength, noteOptions);
     assertArg(
-      note instanceof Note10 || Utils16.Is.isNonEmptyString(note) || Utils16.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils16.Is.isNonEmptyString(note2)),
-      "note",
-      note
+      isVoiceId(voiceId),
+      note instanceof Note10 || Guard12.isNonEmptyString(note) || Guard12.isArray(note) && note.every((note2) => note2 instanceof Note10 || Guard12.isNonEmptyString(note2)),
+      isNoteLength(noteLength)
     );
-    assertArg(Utils16.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
-    if (Utils16.Is.isArray(note)) {
+    if (Guard12.isArray(note)) {
       let string = noteOptions.string;
       note.forEach((note2, noteId) => {
-        noteOptions.string = Utils16.Is.isArray(string) ? string[noteId] : string;
+        noteOptions.string = Guard12.isArray(string) ? string[noteId] : string;
         this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions);
       });
     } else {
@@ -7927,9 +8004,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addChord(voiceId, notes, noteLength, noteOptions) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils16.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils16.Is.isNonEmptyString(note)), "notes", notes);
-    assertArg(Utils16.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+    setAssertFunction("addChord", voiceId, notes, noteLength, noteOptions);
+    assertArg(
+      isVoiceId(voiceId),
+      Guard12.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Guard12.isNonEmptyString(note)),
+      isNoteLength(noteLength)
+    );
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
     this.getMeasure().addNoteGroup(voiceId, notes, noteLength, noteOptions);
@@ -7943,8 +8023,11 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addRest(voiceId, restLength, restOptions) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils16.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+    setAssertFunction("addRest", voiceId, restLength, restOptions);
+    assertArg(
+      isVoiceId(voiceId),
+      isNoteLength(restLength)
+    );
     restOptions != null ? restOptions : restOptions = {};
     assertRestOptions(restOptions);
     this.getMeasure().addRest(voiceId, restLength, restOptions);
@@ -7966,25 +8049,27 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addTuplet(voiceId, tupletRatio, tupletBuilder) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils16.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
-    assertArg(isTupletRatio(tupletRatio) && Utils16.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
+    setAssertFunction("addTuplet", voiceId, tupletRatio);
+    assertArg(
+      isVoiceId(voiceId),
+      Guard12.isFunction(tupletBuilder),
+      isTupletRatio(tupletRatio) && Guard12.isBooleanOrUndefined(tupletRatio.showRatio)
+    );
     let tupletSymbols = [];
     const helper = {
       addNote: (note, noteLength, noteOptions) => {
+        setAssertFunction("addTuplet => addNote", note, noteLength, noteOptions);
         assertArg(
-          note instanceof Note10 || Utils16.Is.isNonEmptyString(note) || Utils16.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils16.Is.isNonEmptyString(note2)),
-          "note",
-          note
+          note instanceof Note10 || Guard12.isNonEmptyString(note) || Guard12.isArray(note) && note.every((note2) => note2 instanceof Note10 || Guard12.isNonEmptyString(note2)),
+          isNoteLength(noteLength)
         );
-        assertArg(Utils16.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
-        if (Utils16.Is.isArray(note)) {
+        if (Guard12.isArray(note)) {
           let string = noteOptions.string;
           note.forEach((note2, noteId) => {
-            noteOptions.string = Utils16.Is.isArray(string) ? string[noteId] : string;
+            noteOptions.string = Guard12.isArray(string) ? string[noteId] : string;
             let s = this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions, tupletRatio);
             tupletSymbols.push(s);
           });
@@ -7995,8 +8080,11 @@ var _DocumentBuilder = class _DocumentBuilder {
         return helper;
       },
       addChord: (notes, noteLength, noteOptions) => {
-        assertArg(Utils16.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils16.Is.isNonEmptyString(note)), "notes", notes);
-        assertArg(Utils16.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        setAssertFunction("addTuplet => addChord", notes, noteLength, noteOptions);
+        assertArg(
+          Guard12.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Guard12.isNonEmptyString(note)),
+          isNoteLength(noteLength)
+        );
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
@@ -8005,7 +8093,8 @@ var _DocumentBuilder = class _DocumentBuilder {
         return helper;
       },
       addRest: (restLength, restOptions) => {
-        assertArg(Utils16.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+        setAssertFunction("addTuplet => addRest", restLength, restOptions);
+        assertArg(isNoteLength(restLength));
         restOptions != null ? restOptions : restOptions = {};
         delete restOptions.triplet;
         assertRestOptions(restOptions);
@@ -8021,9 +8110,11 @@ var _DocumentBuilder = class _DocumentBuilder {
   addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
     var _a;
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(isVerseNumber(verse), "verse", verse);
-    assertArg(Utils16.Is.isEnumValue(lyricsLength, NoteLength8), "lyricsLength", lyricsLength);
-    assertArg(Utils16.Is.isString(lyricsText) || Utils16.Is.isArray(lyricsText) && lyricsText.every((text) => Utils16.Is.isString(text)), "lyricsText", lyricsText);
+    assertArg(
+      isVerseNumber(verse),
+      Guard12.isEnumValue(lyricsLength, NoteLength8),
+      Guard12.isString(lyricsText) || Guard12.isArray(lyricsText) && lyricsText.every((text) => Guard12.isString(text))
+    );
     lyricsOptions != null ? lyricsOptions : lyricsOptions = {};
     assertLyricsOptions(lyricsOptions);
     if (lyricsOptions.align !== void 0) {
@@ -8031,7 +8122,7 @@ var _DocumentBuilder = class _DocumentBuilder {
     } else {
       (_a = lyricsOptions.align) != null ? _a : lyricsOptions.align = this.currentLyricsAlign;
     }
-    if (Utils16.Is.isArray(lyricsText)) {
+    if (Guard12.isArray(lyricsText)) {
       lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, text, lyricsOptions));
     } else {
       this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions);
@@ -8047,6 +8138,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addLyrics(verse, lyricsLength, lyricsText, lyricsOptions) {
+    setAssertFunction("addLyrics", verse, lyricsLength, lyricsText, lyricsOptions);
     return this.addLyricsInternal(void 0, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
   }
   /**
@@ -8059,11 +8151,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addLyricsTo(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+    setAssertFunction("addLyricsTo", verse, lyricsLength, lyricsText, lyricsOptions);
     return this.addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
   }
   addFermataInternal(staffTabOrGroups, fermata) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils16.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
+    assertArg(Guard12.isEnumValue(fermata, Fermata));
     this.getMeasure().addFermata(staffTabOrGroups, fermata);
     return this;
   }
@@ -8073,6 +8166,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addFermata(fermata = "atNote" /* AtNote */) {
+    setAssertFunction("addFermata", fermata);
     return this.addFermataInternal(void 0, fermata);
   }
   /**
@@ -8082,23 +8176,23 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addFermataTo(staffTabOrGroups, fermata = "atNote" /* AtNote */) {
+    setAssertFunction("addFermataTo", staffTabOrGroups, fermata);
     return this.addFermataInternal(staffTabOrGroups, fermata);
   }
   addNavigationInternal(staffTabOrGroups, navigation, ...args) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils16.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
-    if (navigation === "endRepeat" /* EndRepeat */ && args.length > 0) {
-      assertArg(Utils16.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
-    } else if (navigation === "ending" /* Ending */ && args.length > 0) {
-      assertArg(args.every((passage) => Utils16.Is.isIntegerGte(passage, 1)), "passages", args);
-    }
+    assertArg(
+      Guard12.isStrictEqual(navigation, "endRepeat" /* EndRepeat */) && Guard12.isStrictEqual(args.length, 1) || Guard12.isStrictEqual(navigation, "ending" /* Ending */) && Guard12.isIntegerGte(args.length, 1) && args.every((passage) => Guard12.isIntegerGte(passage, 1)) || Guard12.isEnumValue(navigation, Navigation) && Guard12.isEmptyArray(args)
+    );
     this.getMeasure().addNavigation(staffTabOrGroups, navigation, ...args);
     return this;
   }
   addNavigation(navigation, ...args) {
+    setAssertFunction("addNavigation", navigation, ...args);
     return this.addNavigationInternal(void 0, navigation, ...args);
   }
   addNavigationTo(staffTabOrGroups, navigation, ...args) {
+    setAssertFunction("addNavigationTo", staffTabOrGroups, navigation, ...args);
     return this.addNavigationInternal(staffTabOrGroups, navigation, ...args);
   }
   addAnnotationInternal(staffTabOrGroups, annotation, text) {
@@ -8107,12 +8201,15 @@ var _DocumentBuilder = class _DocumentBuilder {
       throw new MusicError18(MusicErrorType18.Score, `Annotation text "${text}" is not known annotation.`);
     }
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils16.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
-    assertArg(Utils16.Is.isNonEmptyString(text), "text", text);
+    assertArg(
+      Guard12.isEnumValue(annotation, Annotation),
+      Guard12.isNonEmptyString(text)
+    );
     this.getMeasure().addAnnotation(staffTabOrGroups, annotation, text);
     return this;
   }
   addAnnotation(...args) {
+    setAssertFunction("addAnnotation", ...args);
     if (args.length === 1) {
       return this.addAnnotationInternal(void 0, void 0, args[0]);
     } else {
@@ -8120,6 +8217,7 @@ var _DocumentBuilder = class _DocumentBuilder {
     }
   }
   addAnnotationTo(staffTabOrGroups, ...args) {
+    setAssertFunction("addAnnotationTo", staffTabOrGroups, ...args);
     if (args.length === 1) {
       return this.addAnnotationInternal(staffTabOrGroups, void 0, args[0]);
     } else {
@@ -8128,8 +8226,10 @@ var _DocumentBuilder = class _DocumentBuilder {
   }
   addLabelInternal(staffTabOrGroups, label, text) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils16.Is.isEnumValue(label, Label), "label", label);
-    assertArg(Utils16.Is.isNonEmptyString(text), "text", text);
+    assertArg(
+      Guard12.isEnumValue(label, Label),
+      Guard12.isNonEmptyString(text)
+    );
     this.getMeasure().addLabel(staffTabOrGroups, label, text);
     return this;
   }
@@ -8140,6 +8240,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addLabel(label, text) {
+    setAssertFunction("addLabel", label, text);
     return this.addLabelInternal(void 0, label, text);
   }
   /**
@@ -8150,24 +8251,26 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addLabelTo(staffTabOrGroups, label, text) {
+    setAssertFunction("addLabelTo", staffTabOrGroups, label, text);
     return this.addLabelInternal(staffTabOrGroups, label, text);
   }
   addConnective(connective, ...args) {
-    assertArg(Utils16.Is.isEnumValue(connective, Connective), "connective", connective);
+    setAssertFunction("addConnective", connective, ...args);
+    assertArg(Guard12.isEnumValue(connective, Connective));
     if (connective === "tie" /* Tie */) {
-      assertArg(Utils16.Is.isIntegerOrUndefined(args[0]) || Utils16.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
-      assertArg(Utils16.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Guard12.isIntegerOrUndefined(args[0]) || Guard12.isEnumValue(args[0], TieType));
+      assertArg(Guard12.isEnumValueOrUndefined(args[1], NoteAnchor));
       let tieSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, tieSpan, noteAnchor);
     } else if (connective === "slur" /* Slur */) {
-      assertArg(Utils16.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
-      assertArg(Utils16.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Guard12.isIntegerOrUndefined(args[0]));
+      assertArg(Guard12.isEnumValueOrUndefined(args[1], NoteAnchor));
       let slurSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, slurSpan, noteAnchor);
     } else if (connective === "slide" /* Slide */) {
-      assertArg(Utils16.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
+      assertArg(Guard12.isEnumValueOrUndefined(args[0], NoteAnchor));
       let noteAnchor = args[0];
       this.getMeasure().addConnective(connective, noteAnchor);
     }
@@ -8186,26 +8289,31 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addExtension(extensionBuilder) {
-    assertArg(Utils16.Is.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, for e.g. addExtension(ext => ext.measures(2)). Please refer to README or API Reference.", extensionBuilder);
+    setAssertFunction("addExtension");
+    assertArgMsg(Guard12.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, e.g. addExtension(ext => ext.measures(2)).");
     let ticks = 0;
     let visible = true;
     const helper = {
       notes: (noteLength, noteCount) => {
-        assertArg(Utils16.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
-        assertArg(Utils16.Is.isUndefined(noteCount) || Utils16.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
+        setAssertFunction("addExtension.notes", noteLength, noteCount);
+        assertArg(isNoteLength(noteLength));
+        assertArg(Guard12.isUndefined(noteCount) || Guard12.isNumber(noteCount) && noteCount >= 0);
         ticks += RhythmProps6.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
         return helper;
       },
       measures: (measureCount) => {
-        assertArg(Utils16.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
+        setAssertFunction("addExtension.measures", measureCount);
+        assertArg(Guard12.isNumber(measureCount) && measureCount >= 1);
         ticks += this.getMeasure().getMeasureTicks() * measureCount;
         return helper;
       },
       infinity: () => {
+        setAssertFunction("addExtension.infinity");
         ticks = Infinity;
         return helper;
       },
       hide: () => {
+        setAssertFunction("addExtension.hide");
         visible = false;
         return helper;
       }
@@ -8226,13 +8334,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = "auto" /* Auto */) {
-    assertArg(Utils16.Is.isNonEmptyString(groupName), "groupName", groupName);
+    setAssertFunction("addStaffGroup", groupName, staffsTabsAndGroups, verticalPosition);
     assertArg(
-      Utils16.Is.isNonEmptyString(staffsTabsAndGroups) || Utils16.Is.isIntegerGte(staffsTabsAndGroups, 0) || Utils16.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Utils16.Is.isNonEmptyString(line) || Utils16.Is.isIntegerGte(line, 0)),
-      "staffsTabsAndGroups",
-      staffsTabsAndGroups
+      Guard12.isNonEmptyString(groupName),
+      Guard12.isNonEmptyString(staffsTabsAndGroups) || Guard12.isIntegerGte(staffsTabsAndGroups, 0) || Guard12.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Guard12.isNonEmptyString(line) || Guard12.isIntegerGte(line, 0)),
+      Guard12.isEnumValue(verticalPosition, VerticalPosition)
     );
-    assertArg(Utils16.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
     this.doc.addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition);
     return this;
   }
@@ -8241,6 +8348,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   endSong() {
+    setAssertFunction("endSong");
     this.getMeasure().endSong();
     return this;
   }
@@ -8249,6 +8357,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   endSection() {
+    setAssertFunction("endSection");
     this.getMeasure().endSection();
     return this;
   }
@@ -8258,6 +8367,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    */
   endRow() {
     var _a;
+    setAssertFunction("endRow");
     (_a = this.doc.getLastMeasure()) == null ? void 0 : _a.endRow();
     return this;
   }
@@ -8267,7 +8377,8 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   completeRests(voiceId) {
-    assertArg(Utils16.Is.isUndefined(voiceId) || isVoiceId(voiceId) || Utils16.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
+    setAssertFunction("completeRests", voiceId);
+    assertArg(Guard12.isUndefined(voiceId) || isVoiceId(voiceId) || Guard12.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)));
     this.getMeasure().completeRests(voiceId);
     return this;
   }
@@ -8279,8 +8390,11 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addScaleArpeggio(scale, bottomNote, numOctaves) {
-    assertArg(Utils16.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
-    assertArg(Utils16.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
+    setAssertFunction("addScaleArpeggio", scale, bottomNote, numOctaves);
+    assertArg(
+      Guard12.isNonEmptyString(bottomNote),
+      Guard12.isIntegerGte(numOctaves, 1)
+    );
     let ts = this.getMeasure().getTimeSignature();
     let notes = scale.getScaleNotes(bottomNote, numOctaves);
     for (let i = 0; i < notes.length; i++) {
@@ -8366,19 +8480,16 @@ var ScoreObjectEvent = class extends ScoreEvent {
 
 // src/score/pub/music-interface.ts
 import * as Audio2 from "@tspro/web-music-score/audio";
-import { Utils as Utils18 } from "@tspro/ts-utils-lib";
+import { Guard as Guard14, UniMap as UniMap9, ValueSet as ValueSet2, Utils as Utils13 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/music-objects.ts
-import { Utils as Utils17 } from "@tspro/ts-utils-lib";
+import { Guard as Guard13 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError20, MusicErrorType as MusicErrorType20 } from "@tspro/web-music-score/core";
 function assertArg2(condition, argName, argValue) {
   if (!condition) {
     throw new MusicError20(MusicErrorType20.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
-function isVoiceId2(value) {
-  return Utils17.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
-}
 function getNotationLine(line) {
   if (line instanceof ObjStaff || line instanceof ObjTab) {
     return line.getMusicInterface();
@@ -8386,7 +8497,7 @@ function getNotationLine(line) {
     throw new MusicError20(MusicErrorType20.Score, `Notation line not staff nor tab.`);
   }
 }
-var MusicInterface6 = class {
+var MusicInterface5 = class {
   /**
    * Create new music interface object.
    * @param name - OBject name.
@@ -8403,7 +8514,7 @@ var MusicInterface6 = class {
     return (_a = this.getMusicObject().getParent()) == null ? void 0 : _a.getMusicInterface();
   }
 };
-var _MAccidental = class _MAccidental extends MusicInterface6 {
+var _MAccidental = class _MAccidental extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MAccidental.Name);
@@ -8424,7 +8535,7 @@ var _MAccidental = class _MAccidental extends MusicInterface6 {
 /** Object name. */
 __publicField(_MAccidental, "Name", "Accidental");
 var MAccidental = _MAccidental;
-var _MConnective = class _MConnective extends MusicInterface6 {
+var _MConnective = class _MConnective extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MConnective.Name);
@@ -8438,7 +8549,7 @@ var _MConnective = class _MConnective extends MusicInterface6 {
 /** Object name. */
 __publicField(_MConnective, "Name", "Connective");
 var MConnective = _MConnective;
-var _MArpeggio = class _MArpeggio extends MusicInterface6 {
+var _MArpeggio = class _MArpeggio extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MArpeggio.Name);
@@ -8466,7 +8577,7 @@ var _MArpeggio = class _MArpeggio extends MusicInterface6 {
 /** Object name. */
 __publicField(_MArpeggio, "Name", "Arpeggio");
 var MArpeggio = _MArpeggio;
-var _MBeamGroup = class _MBeamGroup extends MusicInterface6 {
+var _MBeamGroup = class _MBeamGroup extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MBeamGroup.Name);
@@ -8480,7 +8591,7 @@ var _MBeamGroup = class _MBeamGroup extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MBeamGroup, "Name", "BeamGroup");
 var MBeamGroup = _MBeamGroup;
-var _MStaffBeamGroup = class _MStaffBeamGroup extends MusicInterface6 {
+var _MStaffBeamGroup = class _MStaffBeamGroup extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaffBeamGroup.Name);
@@ -8501,7 +8612,7 @@ var _MStaffBeamGroup = class _MStaffBeamGroup extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaffBeamGroup, "Name", "StaffBeamGroup");
 var MStaffBeamGroup = _MStaffBeamGroup;
-var _MDocument = class _MDocument extends MusicInterface6 {
+var _MDocument = class _MDocument extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MDocument.Name);
@@ -8553,14 +8664,14 @@ var _MDocument = class _MDocument extends MusicInterface6 {
    * @returns - Player instance.
    */
   play(playStateChangeListener) {
-    assertArg2(Utils17.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg2(Guard13.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     return new MPlayer(this, playStateChangeListener).play();
   }
 };
 /** Object name. */
 __publicField(_MDocument, "Name", "Document");
 var MDocument2 = _MDocument;
-var _MEnding = class _MEnding extends MusicInterface6 {
+var _MEnding = class _MEnding extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MEnding.Name);
@@ -8583,14 +8694,14 @@ var _MEnding = class _MEnding extends MusicInterface6 {
    * @returns - Boolean whether this ending has asked passage number.
    */
   hasPassage(passage) {
-    assertArg2(Utils17.Is.isIntegerGte(passage, 1), "passage", passage);
+    assertArg2(Guard13.isIntegerGte(passage, 1), "passage", passage);
     return this.obj.hasPassage(passage);
   }
 };
 /** Object name. */
 __publicField(_MEnding, "Name", "Ending");
 var MEnding = _MEnding;
-var _MFermata = class _MFermata extends MusicInterface6 {
+var _MFermata = class _MFermata extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MFermata.Name);
@@ -8604,7 +8715,7 @@ var _MFermata = class _MFermata extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MFermata, "Name", "Fermata");
 var MFermata = _MFermata;
-var _MHeader = class _MHeader extends MusicInterface6 {
+var _MHeader = class _MHeader extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MHeader.Name);
@@ -8639,7 +8750,7 @@ var _MHeader = class _MHeader extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MHeader, "Name", "Header");
 var MHeader = _MHeader;
-var _MImage = class _MImage extends MusicInterface6 {
+var _MImage = class _MImage extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MImage.Name);
@@ -8653,7 +8764,7 @@ var _MImage = class _MImage extends MusicInterface6 {
 /** Object name. */
 __publicField(_MImage, "Name", "Image");
 var MImage = _MImage;
-var _MMeasure = class _MMeasure extends MusicInterface6 {
+var _MMeasure = class _MMeasure extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MMeasure.Name);
@@ -8688,7 +8799,7 @@ var _MMeasure = class _MMeasure extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MMeasure, "Name", "Measure");
 var MMeasure = _MMeasure;
-var _MBarLineRight = class _MBarLineRight extends MusicInterface6 {
+var _MBarLineRight = class _MBarLineRight extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MBarLineRight.Name);
@@ -8702,7 +8813,7 @@ var _MBarLineRight = class _MBarLineRight extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MBarLineRight, "Name", "BarLineRight");
 var MBarLineRight = _MBarLineRight;
-var _MBarLineLeft = class _MBarLineLeft extends MusicInterface6 {
+var _MBarLineLeft = class _MBarLineLeft extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MBarLineLeft.Name);
@@ -8716,7 +8827,7 @@ var _MBarLineLeft = class _MBarLineLeft extends MusicInterface6 {
 /** Object name. */
 __publicField(_MBarLineLeft, "Name", "BarLineLeft");
 var MBarLineLeft = _MBarLineLeft;
-var _MStaffTabBarLine = class _MStaffTabBarLine extends MusicInterface6 {
+var _MStaffTabBarLine = class _MStaffTabBarLine extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaffTabBarLine.Name);
@@ -8749,7 +8860,7 @@ var _MStaffTabBarLine = class _MStaffTabBarLine extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaffTabBarLine, "Name", "StaffTabBarLine");
 var MStaffTabBarLine = _MStaffTabBarLine;
-var _MNoteGroup = class _MNoteGroup extends MusicInterface6 {
+var _MNoteGroup = class _MNoteGroup extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MNoteGroup.Name);
@@ -8791,7 +8902,7 @@ var _MNoteGroup = class _MNoteGroup extends MusicInterface6 {
 /** Object name. */
 __publicField(_MNoteGroup, "Name", "NoteGroup");
 var MNoteGroup = _MNoteGroup;
-var _MStaffNoteGroup = class _MStaffNoteGroup extends MusicInterface6 {
+var _MStaffNoteGroup = class _MStaffNoteGroup extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaffNoteGroup.Name);
@@ -8833,7 +8944,7 @@ var _MStaffNoteGroup = class _MStaffNoteGroup extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaffNoteGroup, "Name", "StaffNoteGroup");
 var MStaffNoteGroup = _MStaffNoteGroup;
-var _MTabNoteGroup = class _MTabNoteGroup extends MusicInterface6 {
+var _MTabNoteGroup = class _MTabNoteGroup extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MTabNoteGroup.Name);
@@ -8875,7 +8986,7 @@ var _MTabNoteGroup = class _MTabNoteGroup extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MTabNoteGroup, "Name", "TabNoteGroup");
 var MTabNoteGroup = _MTabNoteGroup;
-var _MRest = class _MRest extends MusicInterface6 {
+var _MRest = class _MRest extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MRest.Name);
@@ -8910,7 +9021,7 @@ var _MRest = class _MRest extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MRest, "Name", "Rest");
 var MRest = _MRest;
-var _MStaffRest = class _MStaffRest extends MusicInterface6 {
+var _MStaffRest = class _MStaffRest extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaffRest.Name);
@@ -8952,7 +9063,7 @@ var _MStaffRest = class _MStaffRest extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaffRest, "Name", "StaffRest");
 var MStaffRest = _MStaffRest;
-var _MRhythmColumn = class _MRhythmColumn extends MusicInterface6 {
+var _MRhythmColumn = class _MRhythmColumn extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MRhythmColumn.Name);
@@ -8969,7 +9080,7 @@ var _MRhythmColumn = class _MRhythmColumn extends MusicInterface6 {
    */
   getRhythmSymbol(voiceId) {
     var _a;
-    assertArg2(isVoiceId2(voiceId), "voiceId", voiceId);
+    assertArg2(isVoiceId(voiceId), "voiceId", voiceId);
     return (_a = this.obj.getVoiceSymbol(voiceId)) == null ? void 0 : _a.getMusicInterface();
   }
   /**
@@ -8980,7 +9091,7 @@ var _MRhythmColumn = class _MRhythmColumn extends MusicInterface6 {
    */
   getVoiceSymbol(voiceId) {
     var _a;
-    assertArg2(isVoiceId2(voiceId), "voiceId", voiceId);
+    assertArg2(isVoiceId(voiceId), "voiceId", voiceId);
     return (_a = this.obj.getVoiceSymbol(voiceId)) == null ? void 0 : _a.getMusicInterface();
   }
   /**
@@ -8994,7 +9105,7 @@ var _MRhythmColumn = class _MRhythmColumn extends MusicInterface6 {
 /** OBject name. */
 __publicField(_MRhythmColumn, "Name", "RhythmColumn");
 var MRhythmColumn = _MRhythmColumn;
-var _MScoreRow = class _MScoreRow extends MusicInterface6 {
+var _MScoreRow = class _MScoreRow extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MScoreRow.Name);
@@ -9029,7 +9140,7 @@ var _MScoreRow = class _MScoreRow extends MusicInterface6 {
 /** Object name. */
 __publicField(_MScoreRow, "Name", "ScoreRow");
 var MScoreRow = _MScoreRow;
-var _MStaff = class _MStaff extends MusicInterface6 {
+var _MStaff = class _MStaff extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaff.Name);
@@ -9064,7 +9175,7 @@ var _MStaff = class _MStaff extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaff, "Name", "Staff");
 var MStaff = _MStaff;
-var _MTab = class _MTab extends MusicInterface6 {
+var _MTab = class _MTab extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MTab.Name);
@@ -9099,7 +9210,7 @@ var _MTab = class _MTab extends MusicInterface6 {
 /** Object name. */
 __publicField(_MTab, "Name", "Tab");
 var MTab = _MTab;
-var _MStaffSignature = class _MStaffSignature extends MusicInterface6 {
+var _MStaffSignature = class _MStaffSignature extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MStaffSignature.Name);
@@ -9120,7 +9231,7 @@ var _MStaffSignature = class _MStaffSignature extends MusicInterface6 {
 /** Object name. */
 __publicField(_MStaffSignature, "Name", "StaffSignature");
 var MStaffSignature = _MStaffSignature;
-var _MTabSignature = class _MTabSignature extends MusicInterface6 {
+var _MTabSignature = class _MTabSignature extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MTabSignature.Name);
@@ -9141,7 +9252,7 @@ var _MTabSignature = class _MTabSignature extends MusicInterface6 {
 /** Object name. */
 __publicField(_MTabSignature, "Name", "TabSignature");
 var MTabSignature = _MTabSignature;
-var _MTabRhythm = class _MTabRhythm extends MusicInterface6 {
+var _MTabRhythm = class _MTabRhythm extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MTabRhythm.Name);
@@ -9169,7 +9280,7 @@ var _MTabRhythm = class _MTabRhythm extends MusicInterface6 {
 /** Object name. */
 __publicField(_MTabRhythm, "Name", "TabRhythm");
 var MTabRhythm = _MTabRhythm;
-var _MSpecialText = class _MSpecialText extends MusicInterface6 {
+var _MSpecialText = class _MSpecialText extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MSpecialText.Name);
@@ -9190,7 +9301,7 @@ var _MSpecialText = class _MSpecialText extends MusicInterface6 {
 /** Object name. */
 __publicField(_MSpecialText, "Name", "SpecialText");
 var MSpecialText = _MSpecialText;
-var _MText = class _MText extends MusicInterface6 {
+var _MText = class _MText extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MText.Name);
@@ -9211,7 +9322,7 @@ var _MText = class _MText extends MusicInterface6 {
 /** Object name. */
 __publicField(_MText, "Name", "Text");
 var MText = _MText;
-var _MLyrics = class _MLyrics extends MusicInterface6 {
+var _MLyrics = class _MLyrics extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MLyrics.Name);
@@ -9232,7 +9343,7 @@ var _MLyrics = class _MLyrics extends MusicInterface6 {
 /** Object name. */
 __publicField(_MLyrics, "Name", "Lyrics");
 var MLyrics = _MLyrics;
-var _MExtensionLine = class _MExtensionLine extends MusicInterface6 {
+var _MExtensionLine = class _MExtensionLine extends MusicInterface5 {
   /** @internal */
   constructor(obj) {
     super(_MExtensionLine.Name);
@@ -9270,10 +9381,12 @@ var _MPlayer = class _MPlayer {
   constructor(doc, playStateChangeListener) {
     __publicField(this, "player");
     assertArg3(doc instanceof MDocument2, "doc", doc);
-    assertArg3(Utils18.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg3(Guard14.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     this.player = new Player();
     this.player.setDocument(doc.getMusicObject());
-    this.player.setCursorPositionChangeListener((cursorRect) => doc.getMusicObject().updateCursorRect(cursorRect));
+    this.player.setCursorPositionChangeListener((cursorRect) => {
+      doc.getMusicObject().updateCursorRect(cursorRect);
+    });
     if (playStateChangeListener) {
       this.player.setPlayStateChnageListener(playStateChangeListener);
     }
@@ -9312,7 +9425,7 @@ var _MPlayer = class _MPlayer {
     return this;
   }
 };
-__publicField(_MPlayer, "currentlyPlaying", /* @__PURE__ */ new Set());
+__publicField(_MPlayer, "currentlyPlaying", new ValueSet2());
 var MPlayer = _MPlayer;
 var MRenderContext2 = class {
   /**
@@ -9328,7 +9441,7 @@ var MRenderContext2 = class {
    * @returns - This render context instance.
    */
   setDocument(doc) {
-    assertArg3(Utils18.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Guard14.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.ctx.setDocument(doc);
     return this;
   }
@@ -9338,7 +9451,7 @@ var MRenderContext2 = class {
    * @returns - This render context instance.
    */
   setCanvas(canvas) {
-    canvas = require_t(Utils18.Dom.getCanvas(canvas), typeof canvas === "string" ? "Cannot set render canvas because invalid canvas id: " + canvas : "Cannot set render canvas because given canvas is undefined.");
+    canvas = require_t(Utils13.Dom.getCanvas(canvas), typeof canvas === "string" ? "Cannot set render canvas because invalid canvas id: " + canvas : "Cannot set render canvas because given canvas is undefined.");
     this.ctx.setCanvas(canvas);
     return this;
   }
@@ -9347,7 +9460,7 @@ var MRenderContext2 = class {
    * @param scoreEventListener - Score event listener.
    */
   setScoreEventListener(scoreEventListener) {
-    assertArg3(Utils18.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
+    assertArg3(Guard14.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
     this.ctx.setScoreEventListener(scoreEventListener);
   }
   /**
@@ -9422,7 +9535,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns 
    */
   setDocument(doc) {
-    assertArg3(Utils18.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Guard14.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.onStop();
     if (doc) {
       this.player = new MPlayer(doc, (playState) => {
@@ -9466,9 +9579,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayButton(btn, btnLabel) {
-    assertArg3(Utils18.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Guard14.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playButton, this.onPlay);
-    this.playButton = require_t(Utils18.Dom.getButton(btn), "Play button required!");
+    this.playButton = require_t(Utils13.Dom.getButton(btn), "Play button required!");
     this.playLabel = btnLabel != null ? btnLabel : "Play";
     _MPlaybackButtons.removeOnClickListeners(this.playButton, "all");
     _MPlaybackButtons.addOnClickListener(this.playButton, this.onPlay);
@@ -9482,9 +9595,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setStopButton(btn, btnLabel) {
-    assertArg3(Utils18.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Guard14.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, this.onStop);
-    this.stopButton = require_t(Utils18.Dom.getButton(btn), "Stop button required!");
+    this.stopButton = require_t(Utils13.Dom.getButton(btn), "Stop button required!");
     this.stopLabel = btnLabel != null ? btnLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, "all");
     _MPlaybackButtons.addOnClickListener(this.stopButton, this.onStop);
@@ -9499,10 +9612,10 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayStopButton(btn, playLabel, stopLabel) {
-    assertArg3(Utils18.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
-    assertArg3(Utils18.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
+    assertArg3(Guard14.isStringOrUndefined(playLabel), "playLabel", playLabel);
+    assertArg3(Guard14.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, this.onPlayStop);
-    this.playStopButton = require_t(Utils18.Dom.getButton(btn), "Play/stop button required!");
+    this.playStopButton = require_t(Utils13.Dom.getButton(btn), "Play/stop button required!");
     this.playLabel = playLabel != null ? playLabel : "Play";
     this.stopLabel = stopLabel != null ? stopLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, "all");
@@ -9517,37 +9630,35 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPauseButton(btn, btnLabel) {
-    assertArg3(Utils18.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Guard14.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, this.onPause);
-    this.pauseButton = require_t(Utils18.Dom.getButton(btn), "Pause button required!");
+    this.pauseButton = require_t(Utils13.Dom.getButton(btn), "Pause button required!");
     this.pauseLabel = btnLabel != null ? btnLabel : "Pause";
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, "all");
     _MPlaybackButtons.addOnClickListener(this.pauseButton, this.onPause);
     this.updateButtons();
     return this;
   }
-  static removeOnClickListeners(btn, onClick) {
-    if (btn) {
-      let savedListeners = this.savedOnClickListeners.get(btn) || [];
-      let remainingListeners = [];
-      savedListeners.forEach((l) => {
-        if (onClick === l || onClick === "all") {
-          btn.removeEventListener("click", l);
-        } else {
-          remainingListeners.push(l);
-        }
-      });
-      this.savedOnClickListeners.set(btn, remainingListeners);
-    }
+  static removeOnClickListeners(btn, onClickListener) {
+    if (!btn) return;
+    let curListeners = this.savedOnClickListeners.getOrDefault(btn, []);
+    curListeners = curListeners.filter((listener) => {
+      if (onClickListener === listener || onClickListener === "all") {
+        btn.removeEventListener("click", listener);
+        return false;
+      } else {
+        return true;
+      }
+    });
+    this.savedOnClickListeners.set(btn, curListeners);
   }
-  static addOnClickListener(btn, onClick) {
-    assertArg3(Utils18.Is.isFunction(onClick), "onClick", onClick);
-    btn.addEventListener("click", onClick);
-    let clickListeners = this.savedOnClickListeners.get(btn) || [];
-    this.savedOnClickListeners.set(btn, [...clickListeners, onClick]);
+  static addOnClickListener(btn, onClickListener) {
+    assertArg3(Guard14.isFunction(onClickListener), "onClick", onClickListener);
+    btn.addEventListener("click", onClickListener);
+    this.savedOnClickListeners.getOrCreate(btn, []).push(onClickListener);
   }
 };
-__publicField(_MPlaybackButtons, "savedOnClickListeners", /* @__PURE__ */ new Map());
+__publicField(_MPlaybackButtons, "savedOnClickListeners", new UniMap9());
 var MPlaybackButtons = _MPlaybackButtons;
 
 // src/score/index.ts
@@ -9599,7 +9710,7 @@ export {
   MTabRhythm,
   MTabSignature,
   MText,
-  MusicInterface6 as MusicInterface,
+  MusicInterface5 as MusicInterface,
   Navigation,
   NoteAnchor,
   PlayState,
@@ -9613,6 +9724,12 @@ export {
   VerticalPosition,
   getStringNumbers,
   getVerseNumbers,
-  getVoiceIds
+  getVoiceIds,
+  isStringNumber,
+  isVerseNumber,
+  isVoiceId,
+  validateStringNumber,
+  validateVerseNumber,
+  validateVoiceId
 };
 //# sourceMappingURL=index.mjs.map