@tspro/web-music-score 5.3.0 → 5.4.0

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v5.3.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.4.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -78,7 +78,7 @@ __export(score_exports, {
   MTabRhythm: () => MTabRhythm,
   MTabSignature: () => MTabSignature,
   MText: () => MText,
-  MusicInterface: () => MusicInterface6,
+  MusicInterface: () => MusicInterface5,
   Navigation: () => Navigation,
   NoteAnchor: () => NoteAnchor,
   PlayState: () => PlayState,
@@ -92,40 +92,45 @@ __export(score_exports, {
   VerticalPosition: () => VerticalPosition,
   getStringNumbers: () => getStringNumbers,
   getVerseNumbers: () => getVerseNumbers,
-  getVoiceIds: () => getVoiceIds
+  getVoiceIds: () => getVoiceIds,
+  isStringNumber: () => isStringNumber,
+  isVerseNumber: () => isVerseNumber,
+  isVoiceId: () => isVoiceId,
+  validateStringNumber: () => validateStringNumber,
+  validateVerseNumber: () => validateVerseNumber,
+  validateVoiceId: () => validateVoiceId
 });
 module.exports = __toCommonJS(score_exports);
 
 // src/score/pub/div-rect.ts
 var import_ts_utils_lib = require("@tspro/ts-utils-lib");
-var import_core = require("@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 import_core.MusicError(import_core.MusicErrorType.InvalidArg, `Invalid DivRect args: ${args}`);
+      throw new TypeError(`Invalid DivRect args: ${args}`);
     }
   }
   /**
@@ -133,7 +138,7 @@ var DivRect = class _DivRect {
    * 
    * @param left - Left coordinate.
    * @param top - Top coordinate.
-   * @param width - With.
+   * @param width - Width.
    * @param height - Height.
    * @returns - DivRect.
    */
@@ -141,7 +146,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.
@@ -150,7 +155,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.
@@ -164,6 +176,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.
    */
@@ -180,25 +208,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?
@@ -231,7 +259,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.
@@ -242,17 +270,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) {
@@ -261,13 +297,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.
@@ -278,10 +327,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;
   }
@@ -326,10 +375,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 = import_ts_utils_lib.Utils.Math.clamp(this.centerX, this.left, this.right);
+    this.anchorX = import_ts_utils_lib.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 = import_ts_utils_lib.Utils.Math.clamp(this.centerY, this.top, this.bottom);
+    this.anchorY = import_ts_utils_lib.Utils.Math.clamp(this.anchorY, this.top, this.bottom);
     return this;
   }
   /**
@@ -342,7 +391,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.
@@ -350,14 +399,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.
@@ -376,17 +425,47 @@ var DivRect = class _DivRect {
 };
 
 // src/score/pub/document-builder.ts
-var import_ts_utils_lib18 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib32 = require("@tspro/ts-utils-lib");
+
+// src/score/pub/types.ts
+var import_ts_utils_lib2 = require("@tspro/ts-utils-lib");
+
+// src/core/error.ts
+var MusicErrorType = /* @__PURE__ */ ((MusicErrorType23) => {
+  MusicErrorType23[MusicErrorType23["Unknown"] = 0] = "Unknown";
+  MusicErrorType23[MusicErrorType23["InvalidArg"] = 1] = "InvalidArg";
+  MusicErrorType23[MusicErrorType23["Note"] = 2] = "Note";
+  MusicErrorType23[MusicErrorType23["Scale"] = 3] = "Scale";
+  MusicErrorType23[MusicErrorType23["KeySignature"] = 4] = "KeySignature";
+  MusicErrorType23[MusicErrorType23["Timesignature"] = 5] = "Timesignature";
+  MusicErrorType23[MusicErrorType23["Score"] = 6] = "Score";
+  MusicErrorType23[MusicErrorType23["Audio"] = 7] = "Audio";
+  return MusicErrorType23;
+})(MusicErrorType || {});
+function formatType(type) {
+  return type === void 0 ? "" : `[${MusicErrorType[type]}] `;
+}
+var MusicError = class extends Error {
+  constructor(...args) {
+    const [type, msg] = args.length === 1 ? [0 /* Unknown */, args[0]] : args;
+    super(formatType(type) + msg);
+    /** Music error type. */
+    __publicField(this, "type");
+    Object.setPrototypeOf(this, new.target.prototype);
+    this.name = "MusicError";
+    this.type = type;
+  }
+};
 
 // 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;
+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";
@@ -396,12 +475,42 @@ var Clef = /* @__PURE__ */ ((Clef2) => {
 function getVoiceIds() {
   return [0, 1, 2, 3];
 }
+function isVoiceId(voiceId) {
+  return import_ts_utils_lib2.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 import_ts_utils_lib2.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 import_ts_utils_lib2.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";
@@ -432,12 +541,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";
@@ -508,6 +617,7 @@ var PlayState = /* @__PURE__ */ ((PlayState2) => {
 })(PlayState || {});
 
 // src/score/engine/music-object.ts
+var import_ts_utils_lib3 = require("@tspro/ts-utils-lib");
 var MusicObjectLink = class {
   constructor(head) {
     __publicField(this, "head");
@@ -536,7 +646,7 @@ var MusicObject = class {
     this.parent = parent;
     __publicField(this, "anchoredLayoutObjects", []);
     __publicField(this, "link");
-    __publicField(this, "rect", new DivRect());
+    __publicField(this, "rect", new import_ts_utils_lib3.AnchoredRect());
     __publicField(this, "needRectUpdate", true);
   }
   getParent() {
@@ -588,7 +698,7 @@ var import_theory12 = require("@tspro/web-music-score/theory");
 var import_theory11 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/render-context.ts
-var import_ts_utils_lib3 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib5 = require("@tspro/ts-utils-lib");
 
 // src/score/engine/settings.ts
 var DebugSettings = {
@@ -621,7 +731,7 @@ var DocumentSettings = {
 };
 
 // src/score/engine/render-context.ts
-var import_core3 = require("@tspro/web-music-score/core");
+var import_core2 = require("@tspro/web-music-score/core");
 
 // src/score/engine/assets/F-clef.png
 var F_clef_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYAAACQRffVAAADInpUWHRSYXcgcHJvZmlsZSB0eXBlIGV4aWYAAHja7VdbktwgDPznFDkCkgCJ4/AwVblBjp8GY+/OZFPZPD7yMVADWIiWUEt2jTu+fR3uCxplTi5EtZRT8mghh8wFC/Nnq2skH9a4mrS9R49yF9LeYIhkap6Pmbf8gBxr2s95G6FL/wK6FlSwim8bpWx5fZTXDcj2DLQ3hE7Lvu8DG0h4exTO57Y9Stn04Wp93xmKp8jefkGUU0ykAWNgr5oy1sY+KOLZp6PcznP31S7B9XypMnziQ0g8RpFweinzJ1IwJ4wk4qA4hUXiGlmWGTiUEG4Fbj6BR/F3MN/H5i1GP2mfuZaHkXFM5XdXu+envOn147y5VzsN3JU3lvaGPNLq0z1/KKd4AV0bctvh95at3ZYf5ENWdt3Nvad7jG5jXRq3KCEhFmlf6rrKWkGvziiuUwldfXLANSxmz+jmi2/Iqe4bKq1inYnB/aBAnQoNOtbcqMHFwAcrZubmWJbQQFLmhlQgCbPTYJUsXQwp0c4cEr59oWU2L3ONzHfnO0GVCWCEI3/c3WcVx5i1ROTtjBM8g188qxNeeAL9c4IaGKGxgxpXgK/+3CavAgbjCrPhgsVXd0LUSG/JJYvoSW/EfFY9ad8ACBFMRzhDAgZ8IomU4JEyKxECaSCowHWWwBUMUIzc4SQHkQRyUB2wjTNKS5Ujn2K8VSU4FGsSBTdZCsgKISJ/NBhyqESJIcaYokaLOZYkaVZeSprm67moaNCoSVXNadZiYsGiJVMzy1YyZ8HrO2bUabaccykwWoBccLpAoZTKVWqosaaq1Wp2tTSkTwstttS0WcutdO7SUeA9de3Wcy8HHUilIxzxSIceduSjDKTakBFGHGmoGzbyKDdrtMv2uf8Ga7RZ48XUVNSbNUhVLwiar5M4OQNjHAiEK1gDY0jsyZk3CoEnc5MzfI9QFZHhZJzkdJqMgcFwEMdBN3ebOcfl3/Dm1BZv/LfMuUndJ5n7kbePWOvzK9EWY2cZzqB6QfVh/7DCVubn9aez+5XCZ+cX0AvoBfQCegG9gP57oIEPJ/4Bue+bLIaQwqExNwAAAYVpQ0NQSUNDIHByb2ZpbGUAAHicfZE9SMNAHMVfU7UiFQeLijhkqE4WREUcSxWLYKG0FVp1MLn0Q2jSkKS4OAquBQc/FqsOLs66OrgKguAHiKuLk6KLlPi/pNAixoPjfry797h7Bwj1MlPNjiigapaRisfEbG5FDLyiC0EMYgIDEjP1RHohA8/xdQ8fX+8iPMv73J+jV8mbDPCJxFGmGxbxOvHMpqVz3icOsZKkEJ8Tjxt0QeJHrssuv3EuOizwzJCRSc0Rh4jFYhvLbcxKhko8TRxWVI3yhazLCuctzmq5ypr35C8M5rXlNNdpjiCORSSQhAgZVWygDAsRWjVSTKRoP+bhH3b8SXLJ5NoAI8c8KlAhOX7wP/jdrVmYmnSTgjGg88W2P0aBwC7QqNn297FtN04A/zNwpbX8lTow+0l6raWFj4C+beDiuqXJe8DlDjD0pEuG5Eh+mkKhALyf0TflgP5boGfV7a25j9MHIENdLd0AB4fAWJGy1zze3d3e279nmv39ANCccsygwwDVAAAQE2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAtRXhpdjIiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6R0lNUD0iaHR0cDovL3d3dy5naW1wLm9yZy94bXAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgIHhtcE1NOkRvY3VtZW50SUQ9ImdpbXA6ZG9jaWQ6Z2ltcDo0MDc4NWMzNi00MDFkLTRhNmUtOTE4Ny0wNDU1MjgyYzRkZjYiCiAgIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Nzg3YjYxN2YtMjg1MS00YzhlLTg2MTYtZWM3NGMwYzYwMWVlIgogICB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZTdhYTQxY2EtM2JiMy00ZTliLTk0NDEtOWU1M2ZlMmJmMzlmIgogICBkYzpGb3JtYXQ9ImltYWdlL3BuZyIKICAgR0lNUDpBUEk9IjIuMCIKICAgR0lNUDpQbGF0Zm9ybT0iV2luZG93cyIKICAgR0lNUDpUaW1lU3RhbXA9IjE2ODY2MTM5NDcxOTU2ODAiCiAgIEdJTVA6VmVyc2lvbj0iMi4xMC4zNCIKICAgdGlmZjpPcmllbnRhdGlvbj0iMSIKICAgeG1wOkNyZWF0b3JUb29sPSJHSU1QIDIuMTAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjM6MDY6MTNUMDI6NTI6MjUrMDM6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIzOjA2OjEzVDAyOjUyOjI1KzAzOjAwIj4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MjczNjZiZjQtZWRkMy00MTk4LTk2MmEtZTllMzkxMGU1OGJlIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJHaW1wIDIuMTAgKFdpbmRvd3MpIgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTA4LTIyVDAyOjU1OjM2Ii8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjk2NWUxMzc5LTBkOWYtNDk4Mi1hZDcwLTkzOGM5YzM5YTRmMyIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iR2ltcCAyLjEwIChXaW5kb3dzKSIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMi0wOS0xMVQxNjozNTowMCIvPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJzYXZlZCIKICAgICAgc3RFdnQ6Y2hhbmdlZD0iLyIKICAgICAgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDoxMGZiYTBhMy05MjliLTQ1NGUtOGM0Yy04ZWQ4YzhhYmFkZGMiCiAgICAgIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkdpbXAgMi4xMCAoV2luZG93cykiCiAgICAgIHN0RXZ0OndoZW49IjIwMjMtMDYtMTBUMTc6NTA6MDkiLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDBmYjM4YTMtZjZiMi00NjQ1LTliMTYtMjlhNWE0ODZlMjhhIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJHaW1wIDIuMTAgKFdpbmRvd3MpIgogICAgICBzdEV2dDp3aGVuPSIyMDIzLTA2LTEzVDAyOjUyOjI3Ii8+CiAgICA8L3JkZjpTZXE+CiAgIDwveG1wTU06SGlzdG9yeT4KICA8L3JkZjpEZXNjcmlwdGlvbj4KIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PsIRrtIAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfnBgwXNBsqJURsAAAAGXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBHSU1QV4EOFwAABF9JREFUeNrtmluIF1Ucxz9/E8P1VnnJ9dJWC4Frmq2JJmqolGEILoQvK2gZeXlRCSm1Fx9UEsJQERWsXhRftECs0Gq70EK9ZHlbFyHbds3VVXFX91+7664P81tYhpnfmft//st84TzMzDm/8/vOnPO7nYEMGTJkyJAhQ4YMGSJBLkJZw4FyYAIwDHgU+A9oAxqBv4C7xfyySoBlwKfAFaAb6DG0euAzoAoYXCxEnwH2A60eCGrtFrALGJNWokNEwY6QRO2tFXgPGJAmss8DlyImam/fASPTQHaeGJueBFod8FQhrfSLwM+ynDX8L1/oV+BP4LZY58eBUUAlMB94ycPSvQTMERmJ4jGgwYPh2Qg84VFmGbAP6DTI/aoQS/lzg1JfA2MDyn4ZuGaQvyZJspUGv3oKGBhyjmeBJmWOmxLMJIITiiIXIgwaZgFdylxbDeNHANXAZmAVUBpEiScNe2xRxC/3Y2WuRmUlLRHD1rd/HljvV4F3FAVqYlhNo4B7Pl/wdPEMbmOq/ShwRBH0Vkxb6LAy536fW64HuOpn8vOKoLKYCC9Q5rzs0L/JQxDjyYPkgHYXAW0xGslByrLuFuPUFw0eCI92mmiAQ4LgZoEbYyTcAZxVPsJk271ag7x6cWueCLvhfsyu8LzybKLtersUF9ywxe2BnXBnAZOUJuXZeNv1OSki3LLdzwPrgONuguw+7g7wAHjEoW+vEagAXgeelr1yUSZoCUn4hvJsqMO9byRaWyLGtFkiwOtBJnYzBKcVg/ZuSMIrlHl3RrWMnFK1OqX/q8oXOAisDqFLVxL7xonw9yHk7Q5RoxpuyLdjI3wmhLzBwMqAY0ck4SGcCNeKIQqKOTF84RtxEu4BPgohc2QM467HSRjgqBL5mBDUPU1Rnl1JwqBNUuJqrW0M+OLdYuk8Cdas38Rf4b3FR0HP/nLdZNYaioKbxSVuA6ZGQfoNvNWlO6VvEKxW5O5yGbNc4ml7ZrUtCtLjgGMSdjop9Q+wMIT8GoXwKw79ZxrKUG9r+a8flMoyr5AA4ybwo1QgggYHpZJ6Ou3Ta5IpddvufwEsVWQ2xFisCI1Nypf6RMmsIql4JI0S8bFuSs9UvmCgikeh8b6i8C/KuKOYD+VShzGSwLsprRnByYYYoSqNhE8qCv/kYfxrYjT7jmuPIC+PBWsVsl1YRzBeE45qqWGtwjo1SR0WoZ8a7KAfYa5h7/2OVaPuF1gqtS83srclpi565IAP0c+b7wOz+wPZckOc3Jt0LC52oiXABx7y6VasGnfRYgiwwRAu9raGqPLXQmAGcADvvyN+m9bgXnP4i4E9wN8+KiJ5WQG5QilumnioJP9lwHPANKw/fF7A+fxJw2ms/y9SFdiPBf4Vn9hJNL8T/iFxbyoxgej+m6zBOtnLpXlvhiXcDOyVJV8UCEL4KnBI/OnAtBP0q+ADMTq/SfshrdUFr4TzwJdY9d57WIdYzRIk1GMdeXSQIUOGDBmSwUMtd8u2ArdcUAAAAABJRU5ErkJggg==";
@@ -630,8 +740,8 @@ var F_clef_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYA
 var G_clef_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAACWCAYAAACCe+v6AAADHXpUWHRSYXcgcHJvZmlsZSB0eXBlIGV4aWYAAHja7ZZRcu0mDIbfWUWXgCSExHIwmJnu4C6/Pxg7J2kyTdv7GJhjsJCF0CfZJ5y//hzhDzRK5iGpeS45R7RUUuGKicerHetKMa3ratL2Gr2Xh5L3AkMkU/O6LbzlJ+SY074vexO69W9D94QqZvq2UOuWH+/lxzbI/tHQ9kDo2jn2/cA2JLw9Std92x7l4vbuaH2fGYqXyN9+SYyzZrKEa+JolgvmzjEZ4tmno6NxWYb0CugjuO9vVYZPfApJxFUkXV7K/IlUjBlXrAYokhhuFMK5UFbgI1DCBXha9kY1PsF8jc1bjL5o3zlWxCbjnMov1J7xQ97k/HnePLOdBg81z3tB3mON+Rk/lZPehu4Fefbh1529PTu/k4vE9BqK8Ip7jO5jHRqnqCkjFnkf6j7KmkHvmFFcT2V0izkgax2T2Qu6xxobcqrHhko7MC/EoDsoUadKg841NmpwMfHJhpG5BZYldEAq3GQmQ5qdBpsU6eLImHblkPDjC61ty9qukcceYieoMsEY4ZH/3MN3FceYtUQU/YoT0gJ+8axOeBEJ+OcANTCgsYOqK8B3/9gm18lMV5gdB6zxCJeJQ+ktuWSBFigqxgsyWd8GECJsrXCGBARiJlHK8MiYjQiBdACqcJ0l8QECpModTnISyYCD6sDeeMZoqbLyJcZbVVJAsWYUrYNQBayUFPljyZFDVUWTqmY1dS1as+RZeTlbnq/namLJ1LIZ3tlWrLp4cvXs5u7Fa+EieH1rQZ0WL6XUik0rLFc8XaFQ68GHHOnQIx92+FHCURvSp6WmLTdr3kqrnbt0FHjP3br30utJJ1LpTKee+bTTz3LWgVQbMtLQkYeF4aOM+lCjXbYf+7+gRpsaL1JT0R5qkJrdJmi+TnQyAzFOBOAGaiCGxJ7MolNKPMlNZvgeoSqU4aROOJ0mMRBMJ7EOethtcoHr7+EWzBc3/r/kwkT3TXJ/5/YZtT6/Em0Ru8pwBjUKqg/rp1f2Oj+vX47hnxS+O/4Y+jH0Y+jrcYwROv51hb8AKbCqdGIdCl0AAAGFaUNDUElDQyBwcm9maWxlAAB4nH2RPUjDQBzFX1O1UqoOdhBxyFCd7OAH0rFUsQgWSluhVQeTS7+gSUOS4uIouBYc/FisOrg46+rgKgiCHyCuLk6KLlLi/5JCi1gPjvvx7t7j7h0gNCpMNXuigKpZRioeE7O5VdH3ij74MYgpRCRm6on0YgZdx9c9PHy9C/Os7uf+HANK3mSARySOMt2wiDeI5zYtnfM+cZCVJIX4nHjSoAsSP3JddvmNc9FhgWcGjUxqnjhILBY7WO5gVjJU4lnikKJqlC9kXVY4b3FWKzXWuid/YSCvraS5TnMMcSwhgSREyKihjAoshGnVSDGRov1YF/+o40+SSyZXGYwcC6hCheT4wf/gd7dmYWbaTQrEgN4X2/4YB3y7QLNu29/Htt08AbzPwJXW9lcbQOST9HpbCx0BQ9vAxXVbk/eAyx1g5EmXDMmRvDSFQgF4P6NvygHDt4B/ze2ttY/TByBDXS3fAAeHwESRste7vLu/s7d/z7T6+wEMNXLkxtwRywAADzRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDQuNC4wLUV4aXYyIj4KIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgIHhtbG5zOkdJTVA9Imh0dHA6Ly93d3cuZ2ltcC5vcmcveG1wLyIKICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICB4bXBNTTpEb2N1bWVudElEPSJnaW1wOmRvY2lkOmdpbXA6NDA3ODVjMzYtNDAxZC00YTZlLTkxODctMDQ1NTI4MmM0ZGY2IgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhiZTJkYzc1LTVlYjQtNDk0Yy1iNWRlLWQ2MzZkNzZhNjI2YiIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOmU3YWE0MWNhLTNiYjMtNGU5Yi05NDQxLTllNTNmZTJiZjM5ZiIKICAgZGM6Rm9ybWF0PSJpbWFnZS9wbmciCiAgIEdJTVA6QVBJPSIyLjAiCiAgIEdJTVA6UGxhdGZvcm09IldpbmRvd3MiCiAgIEdJTVA6VGltZVN0YW1wPSIxNjg2NDA4NjA5MzE2NDM4IgogICBHSU1QOlZlcnNpb249IjIuMTAuMzQiCiAgIHRpZmY6T3JpZW50YXRpb249IjEiCiAgIHhtcDpDcmVhdG9yVG9vbD0iR0lNUCAyLjEwIgogICB4bXA6TWV0YWRhdGFEYXRlPSIyMDIzOjA2OjEwVDE3OjUwOjA5KzAzOjAwIgogICB4bXA6TW9kaWZ5RGF0ZT0iMjAyMzowNjoxMFQxNzo1MDowOSswMzowMCI+CiAgIDx4bXBNTTpIaXN0b3J5PgogICAgPHJkZjpTZXE+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjI3MzY2YmY0LWVkZDMtNDE5OC05NjJhLWU5ZTM5MTBlNThiZSIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iR2ltcCAyLjEwIChXaW5kb3dzKSIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMi0wOC0yMlQwMjo1NTozNiIvPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJzYXZlZCIKICAgICAgc3RFdnQ6Y2hhbmdlZD0iLyIKICAgICAgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo5NjVlMTM3OS0wZDlmLTQ5ODItYWQ3MC05MzhjOWMzOWE0ZjMiCiAgICAgIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkdpbXAgMi4xMCAoV2luZG93cykiCiAgICAgIHN0RXZ0OndoZW49IjIwMjItMDktMTFUMTY6MzU6MDAiLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MTBmYmEwYTMtOTI5Yi00NTRlLThjNGMtOGVkOGM4YWJhZGRjIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJHaW1wIDIuMTAgKFdpbmRvd3MpIgogICAgICBzdEV2dDp3aGVuPSIyMDIzLTA2LTEwVDE3OjUwOjA5Ii8+CiAgICA8L3JkZjpTZXE+CiAgIDwveG1wTU06SGlzdG9yeT4KICA8L3JkZjpEZXNjcmlwdGlvbj4KIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Ppn4NIQAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfnBgoOMgm5WlWBAAAAGXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBHSU1QV4EOFwAACHtJREFUeNrtnXuQVmMcxz+77cauTWUpbGSVu2w3BpnUEBq3chkmBjGayG1GBuNWLtUgw5SJkBkjl4QKg1wyQyarK0lRSlstU20bWam9+OM8O3P6vc8553nOe97tnO18Z84f57zP7XvOc/ndnueFfQx5e6neUmAI0B3oDPwD/AJ8Dvzcml5we+Al4D+gyeOaB1S0BrLHAut9iLqvf4ERSSZbBmwwJOu+RieV8JwQZJuARjXWE4WBIck2X38AByaJ8MwsCTcBTyWFbCFQFwHhv4DiKBqUn2PCPYEin9+bgI3AUuBPn3TtgMuT8IWv8vlq7wLdRPrTgPke6d9JAuFbPBo/3UfKK1TCh8yzIQmEb/cYjx0C8pUDuzV5D477GN6mefY+UBuQby0wV/O8U9wJr9E8W2iY92vNs45xJ6zTfKoN827UPNsdd8K1SlJyo8Awb7XhEIkVYYAVmjXVBPtr1uyqJBBeLu5LDPMdppkPdiaRcHvDfKeJ+++SIFoCLBP3R1toWW58lhQFogiodwkPlYZf1y1w/AcclCQVcYWQtILwqiA8M2lGgDcFgSN90nbXiJUXRdWQ/BYiLMdxH5+0k8VavRb4JGmEl4j7vh7pRgDni2fj1RyQKBwiuqjui/Un015dBbQloXCbaTdrZuUajTp4IwnGbEHmKPX8QmCHhuwC9p4rKBI8IghdB0zCsT1Lsg0+4zwxuEiQqqcVmGWDlAETk+zSJE9Ublyjuqof2TrgxKQT7anMNSZfd1iSiZYCUwy+avP1dJLJXglsxdyV8hHQJolEDwBewc5v9J3Klzj0xYnTsCG7W4mdicMdwC7CeQaPTBLRAjUxZeMKvSwpZPcDPghBUGpE45JAthjH92NLdiUwSDz7NO5k24YkuwTHGZYvtKMtcSabD7wVguy37OkilU7v8rgSfjoE2c816+wkkebKOJK9NgTZ2Wpykxgu0k2IG9lTcMIBbchOx9tTWKHpBbFBoZpwbMi+iL9FtEC8wG1xIvyQJdlJhuVWinzd4kD2cJxYZlOyky3KfkHkvSoOhF+2IPu8Zdk3x82O1QV96JDumhJSu5KB4XsVEwzJziCcy2Z/8UK3K5G1PZnhDi2iBW02IDvPY501xY8BuvJ6JcY+AQzAPCDGGucZkF2GefiCxFk4AWoN2K0AG4HHiSBATWJqQMXr1Qxui3Jlv8o2nHiHIl4UFeF1+G/ACOMGuZVoYqfd12qgX7ZkuwZUMjyEoWBaxETd1y5gVDaEr/YpfGqIyW9ODsm6r7FhCY/z6T625tTpLUS2+bo3DOHZHoVdYFnOqBYmG3rbz1JNQbZ2p2MsZfAor604G8OMsUVTyEBLwjMsv4r7vkapl28AH+PEWNqu1++ZNjRPk3mFJdnjDBu4HBipVoUGsewVaGb6fjgRPSsMSQ8wNb/KjA9bEp5osIzcLUitEml6BNQxxGPoWVtROmoynmFJ+CefRvytxFaJt0W6GwwtqE8GkA56cZSSGVxiI74FhTUM9ch3f0irCerleNU3wbZL2xrJzwhp+hks0s6PaBitMsnsXk7WWlY8xKPi7fjvOZI94x/sHOQFPobGw+U4kHBvrrDVRrw2RE4L6C3V7Ln3sBg43qLeeuAxj996BxHeJCYxm2i4Gh8RMwjL/BpqgA/VpKgTgnwJuzdXtbWUWpZpntUCiwwlPDf6WBLeBSzWPO8URFjuHOthUWm1ptJFaizZErb9wvJjNaMkiLDck2CrYD8n7k13hUrCvUIYB3Vdui6I8FI1qzbjUstKXwe+EV3aBKtE40pwjsKwwQEeuoEv4d3ALNf9ycCpFpU24ngRVrvkYNN8y7Ps1rqlb3MQYXCc3m7YytOb1FCYa2lhzHbiqjAoU4s2GoG+D+Fg85VGijq/ssh7qEboqLGZB6QDvBLHdZpLnK6R0EzlgNs0hGfZVJ6v1lV3ARNzTLhYo0sfY5h3sYWy4ole7Blh16ismrnEStFok/ou05BdR8iA1QfJDN2/PoeEZZTQkwZL0RoN4bvCNiCPzONlGpVJNBe7Tu4TdX1h2bbmmLCCbMfWAvTew6iDQy/QzLReZJ/RtKk+pFiagXZqmdCdyzGG8J5Eic6aOuSe4yK8A+RGRfn2/SqqwdmbVBZBPX/gHbh2MfAbEbtbTAQEr7itehyX6DDCn6zyCZlhUHcoTc7Ltj2WHKNcLexBRvaFaqxdr0Q/k2OixmNudN9uo+BEMcsOAB4AzrXIU6vUxlrVU3YqJaMEOELZoUzW0PeBezz04JyjN07o0mZy7zD7EjiTmKAQOAfHJlyJ/xmWtsHlo1UPCI28FnoBJym9urtaYspwdrOUKkmprerC/6pl7lel/HdxlTORBB/7aIJnLSQuK40orlisUWRaNXpoxnHX1ky4DZlhTkNbc5duwAlNjLRb58f8Ky/e1wgv2dcmrr6aiSur3agFOWxsL6XM91a6crUSCWfi+H9NoDtEsIKY7YI52sNQ4D5uZpBFeTKMamScyJqeFL4L8yOjfhB5x8Rp0ppoaPEoBF4j86A/HerEfUlcCB8GXGGRvqPSZYPQIeAF7DXC/bE3fJsY2eWsvCEuhMtC9oouAROgPPxveVwIN4TM53f08tnifgfmh/nmnPC6kPk2+fx2k7ifpWb4WKAT9mG+foFvMqqvkRj+pYntFp0HPMrZj8wg1VieEd8Tc6NdFXr3TCFOgLc77TZifE7AaAOyv+MY9iS64pxBK7vyJXHWcLy8eu4T0dybo9vhBMBMJvMwwEbgzqSodnfhvxOtDieQzOv3ncRkE7UNytV4tJ295+LsnUgsugKPAt/jvQm7DmcX2+Bcj7eWRjFwAo4rtYOa1avUMrSTFClSpEiRIkWKFClSpEiRIkWKFClSpEiRIkWKFClSpEiRIgL8D6ed2EKeJMaTAAAAAElFTkSuQmCC";
 
 // src/theory/rhythm.ts
-var import_ts_utils_lib2 = require("@tspro/ts-utils-lib");
-var import_core2 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib4 = require("@tspro/ts-utils-lib");
+var import_core = require("@tspro/web-music-score/core");
 var MaxTupletRatioValue = 12;
 var TicksMultiplier = 12 * 11 * 9 * 7 * 5;
 var NoteLength = /* @__PURE__ */ ((NoteLength9) => {
@@ -673,11 +783,14 @@ var NoteLength = /* @__PURE__ */ ((NoteLength9) => {
   NoteLength9["SixtyFourthTriplet"] = "64t";
   return NoteLength9;
 })(NoteLength || {});
+function isNoteLength(noteLength) {
+  return import_ts_utils_lib4.Guard.isEnumValue(noteLength, NoteLength);
+}
 function validateNoteLength(noteLength) {
-  if (import_ts_utils_lib2.Utils.Is.isEnumValue(noteLength, NoteLength)) {
+  if (isNoteLength(noteLength)) {
     return noteLength;
   } else {
-    throw new import_core2.MusicError(import_core2.MusicErrorType.InvalidArg, `Invalid noteLength: ${noteLength}`);
+    throw new import_core.MusicError(import_core.MusicErrorType.InvalidArg, `Invalid noteLength: ${noteLength}`);
   }
 }
 var _NoteLengthProps = class _NoteLengthProps {
@@ -704,15 +817,15 @@ var _NoteLengthProps = class _NoteLengthProps {
     this.noteSize = parseInt(noteLength);
     this.isTriplet = noteLength.endsWith("t");
     this.maxDotCount = this.isTriplet ? 0 : Math.floor(Math.log2(_NoteLengthProps.ShortestNoteSize / this.noteSize));
-    this.dotCount = import_ts_utils_lib2.Utils.Str.charCount(noteLength, ".");
+    this.dotCount = import_ts_utils_lib4.Utils.Str.charCount(noteLength, ".");
     this.flagCount = this.noteSize > 4 ? Math.floor(Math.log2(this.noteSize / 4)) : 0;
     this.ticks = TicksMultiplier * _NoteLengthProps.ShortestNoteSize / this.noteSize;
     this.hasStem = this.noteSize > 1;
     this.isSolid = this.noteSize > 2;
     if (this.dotCount > this.maxDotCount) {
-      throw new import_core2.MusicError(import_core2.MusicErrorType.Note, `dotCount ${this.dotCount} > maxDotCount ${this.maxDotCount}, for noteLength "${this.noteLength}".`);
+      throw new import_core.MusicError(import_core.MusicErrorType.Note, `dotCount ${this.dotCount} > maxDotCount ${this.maxDotCount}, for noteLength "${this.noteLength}".`);
     } else if (this.isTriplet && this.dotCount > 0) {
-      throw new import_core2.MusicError(import_core2.MusicErrorType.Note, `noteLength "${this.noteLength}" is both triplet and dotted!`);
+      throw new import_core.MusicError(import_core.MusicErrorType.Note, `noteLength "${this.noteLength}" is both triplet and dotted!`);
     }
   }
   /**
@@ -721,11 +834,7 @@ var _NoteLengthProps = class _NoteLengthProps {
    * @returns - Note length props.
    */
   static get(noteLength) {
-    let p = this.cache.get(noteLength);
-    if (!p) {
-      this.cache.set(noteLength, p = new _NoteLengthProps(noteLength));
-    }
-    return p;
+    return this.cache.getOrCreate(noteLength, () => new _NoteLengthProps(noteLength));
   }
   /**
    * Create note length props.
@@ -735,7 +844,7 @@ var _NoteLengthProps = class _NoteLengthProps {
    */
   static create(noteLength, dotCount = 0) {
     let noteSize = typeof noteLength === "number" ? noteLength : this.get(noteLength).noteSize;
-    return this.get(noteSize + (import_ts_utils_lib2.Utils.Is.isIntegerGte(dotCount, 1) ? ".".repeat(dotCount) : "n"));
+    return this.get(noteSize + (import_ts_utils_lib4.Guard.isIntegerGte(dotCount, 1) ? ".".repeat(dotCount) : "n"));
   }
   /**
    * Compare note lengths/sizes. Whole (1) > half (2) > quarter (4), etc.
@@ -747,7 +856,7 @@ var _NoteLengthProps = class _NoteLengthProps {
   static cmp(a, b) {
     let aNoteSize = a instanceof _NoteLengthProps ? a.noteSize : typeof a === "number" ? a : _NoteLengthProps.get(a).noteSize;
     let bNoteSize = b instanceof _NoteLengthProps ? b.noteSize : typeof b === "number" ? b : _NoteLengthProps.get(b).noteSize;
-    return import_ts_utils_lib2.Utils.Math.cmp(bNoteSize, aNoteSize);
+    return import_ts_utils_lib4.Utils.Math.cmp(bNoteSize, aNoteSize);
   }
   /**
    * Compare note lengths/sizes for equality.
@@ -763,16 +872,19 @@ var _NoteLengthProps = class _NoteLengthProps {
   }
 };
 /** Longest note size (e.g. 1 = whole note). */
-__publicField(_NoteLengthProps, "LongestNoteSize", Math.min(...import_ts_utils_lib2.Utils.Enum.getEnumValues(NoteLength).map((noteLength) => parseInt(noteLength))));
+__publicField(_NoteLengthProps, "LongestNoteSize", Math.min(...import_ts_utils_lib4.Utils.Enum.getEnumValues(NoteLength).map((noteLength) => parseInt(noteLength))));
 /** Shortest note size (e.g. 64 = sixtyfourth note). */
-__publicField(_NoteLengthProps, "ShortestNoteSize", Math.max(...import_ts_utils_lib2.Utils.Enum.getEnumValues(NoteLength).map((noteLength) => parseInt(noteLength))));
-__publicField(_NoteLengthProps, "cache", /* @__PURE__ */ new Map());
+__publicField(_NoteLengthProps, "ShortestNoteSize", Math.max(...import_ts_utils_lib4.Utils.Enum.getEnumValues(NoteLength).map((noteLength) => parseInt(noteLength))));
+__publicField(_NoteLengthProps, "cache", new import_ts_utils_lib4.UniMap());
 var NoteLengthProps = _NoteLengthProps;
+function isTupletRatio(tupletRatio) {
+  return import_ts_utils_lib4.Guard.isObject(tupletRatio) && import_ts_utils_lib4.Guard.isIntegerBetween(tupletRatio.parts, 2, MaxTupletRatioValue) && import_ts_utils_lib4.Guard.isIntegerBetween(tupletRatio.inTimeOf, 2, MaxTupletRatioValue);
+}
 function validateTupletRatio(tupletRatio) {
-  if (import_ts_utils_lib2.Utils.Is.isObject(tupletRatio) && import_ts_utils_lib2.Utils.Is.isIntegerBetween(tupletRatio.parts, 2, MaxTupletRatioValue) && import_ts_utils_lib2.Utils.Is.isIntegerBetween(tupletRatio.inTimeOf, 2, MaxTupletRatioValue)) {
+  if (isTupletRatio(tupletRatio)) {
     return tupletRatio;
   } else {
-    throw new import_core2.MusicError(import_core2.MusicErrorType.Note, `Invalid tupletRatio ${JSON.stringify(tupletRatio)}`);
+    throw new import_core.MusicError(import_core.MusicErrorType.Note, `Invalid tupletRatio ${JSON.stringify(tupletRatio)}`);
   }
 }
 var Tuplet = {
@@ -809,7 +921,7 @@ var _RhythmProps = class _RhythmProps {
     this.dotCount = dotCount != null ? dotCount : p.dotCount;
     this.hasStem = p.hasStem;
     this.isSolidNoteHead = p.isSolid;
-    if (import_ts_utils_lib2.Utils.Is.isObject(tupletRatio)) {
+    if (import_ts_utils_lib4.Guard.isObject(tupletRatio)) {
       this.tupletRatio = validateTupletRatio(tupletRatio);
     } else if (p.isTriplet) {
       this.tupletRatio = Tuplet.Triplet;
@@ -817,9 +929,9 @@ var _RhythmProps = class _RhythmProps {
       this.tupletRatio = void 0;
     }
     if (this.dotCount > 0 && this.tupletRatio !== void 0) {
-      throw new import_core2.MusicError(import_core2.MusicErrorType.Note, `Note cannot be both dotted and tuplet!`);
+      throw new import_core.MusicError(import_core.MusicErrorType.Note, `Note cannot be both dotted and tuplet!`);
     } else if (this.dotCount > p.maxDotCount) {
-      throw new import_core2.MusicError(import_core2.MusicErrorType.Note, `Too big dot count ${this.dotCount} for note length ${this.noteLength}.`);
+      throw new import_core.MusicError(import_core.MusicErrorType.Note, `Too big dot count ${this.dotCount} for note length ${this.noteLength}.`);
     }
     for (let add = this.ticks / 2, i = 1; i <= this.dotCount; i++, add /= 2) {
       this.ticks += add;
@@ -848,11 +960,7 @@ var _RhythmProps = class _RhythmProps {
     if (dotCount !== void 0 || tupletRatio !== void 0) {
       return new _RhythmProps(noteLength, dotCount, tupletRatio);
     } else {
-      let rhythmProps = this.cache.get(noteLength);
-      if (!rhythmProps) {
-        this.cache.set(noteLength, rhythmProps = new _RhythmProps(noteLength));
-      }
-      return rhythmProps;
+      return this.cache.getOrCreate(noteLength, () => new _RhythmProps(noteLength));
     }
   }
   /**
@@ -862,7 +970,7 @@ var _RhythmProps = class _RhythmProps {
    * @returns - -1: a < b, 0: a === b, +1: a > b (duration comparisons)
    */
   static cmp(a, b) {
-    return import_ts_utils_lib2.Utils.Math.cmp(a.ticks, b.ticks);
+    return import_ts_utils_lib4.Utils.Math.cmp(a.ticks, b.ticks);
   }
   /**
    * Compare duration equality of rhythm props.
@@ -874,15 +982,15 @@ var _RhythmProps = class _RhythmProps {
     return a.ticks === b.ticks;
   }
 };
-__publicField(_RhythmProps, "NoteSymbolMap", /* @__PURE__ */ new Map([[1, "\u{1D15D}"], [2, "\u{1D15E}"], [4, "\u{1D15F}"], [8, "\u{1D160}"], [16, "\u{1D161}"], [32, "\u{1D162}"], [64, "\u{1D163}"], [128, "\u{1D164}"]]));
-__publicField(_RhythmProps, "cache", /* @__PURE__ */ new Map());
+__publicField(_RhythmProps, "NoteSymbolMap", new import_ts_utils_lib4.IndexArray([[1, "\u{1D15D}"], [2, "\u{1D15E}"], [4, "\u{1D15F}"], [8, "\u{1D160}"], [16, "\u{1D161}"], [32, "\u{1D162}"], [64, "\u{1D163}"], [128, "\u{1D164}"]]));
+__publicField(_RhythmProps, "cache", new import_ts_utils_lib4.UniMap());
 var RhythmProps = _RhythmProps;
 
 // src/score/engine/render-context.ts
 var HilightStaffPosRectColor = "#55cc55";
 var HilightObjectRectColor = "#55cc55";
 var PlayPosIndicatorColor = "#44aa44";
-var ImageAssets = /* @__PURE__ */ new Map([
+var ImageAssets = new import_ts_utils_lib5.UniMap([
   [0 /* G_Clef */, { src: G_clef_default }],
   [1 /* F_Clef */, { src: F_clef_default }]
 ]);
@@ -920,7 +1028,7 @@ var RenderContext = class {
     __publicField(this, "onMouseLeaveFn");
     __publicField(this, "onTouchEndFn");
     this.devicePixelRatio = window.devicePixelRatio;
-    this.fontSize = import_ts_utils_lib3.Device.FontSize * DocumentSettings.DocumentScale * this.devicePixelRatio;
+    this.fontSize = import_ts_utils_lib5.Device.FontSize * DocumentSettings.DocumentScale * this.devicePixelRatio;
     this.unitSize = this.fontSize * 0.3;
     this._lineWidth = this.unitSize * 0.2;
     ImageAssets.forEach((asset) => {
@@ -933,7 +1041,7 @@ var RenderContext = class {
         };
         img.onerror = () => {
           this.finishImageAsset(asset);
-          throw new import_core3.MusicError(import_core3.MusicErrorType.Score, "Failed to load image: " + asset.src);
+          throw new import_core2.MusicError(import_core2.MusicErrorType.Score, "Failed to load image: " + asset.src);
         };
       }
     });
@@ -951,7 +1059,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();
     }
@@ -999,7 +1107,7 @@ var RenderContext = class {
     return this.scoreEventListener !== void 0;
   }
   getMousePos(e) {
-    return new import_ts_utils_lib3.Vec2(e.offsetX, e.offsetY);
+    return new import_ts_utils_lib5.Vec(e.offsetX, e.offsetY);
   }
   updateCurStaffPos(staffPos, click) {
     let changed = !staffPosEquals(staffPos, this.curStaffPos);
@@ -1216,7 +1324,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 import_ts_utils_lib5.AnchoredRect(-leftw, 0, rightw, -toph, 0, bottomh);
   }
   drawRest(restSize, x, y) {
     let { unitSize } = this;
@@ -1402,7 +1510,7 @@ var RenderContext = class {
       this.ctx.font = savedFont;
       return metrics.width;
     } else {
-      return import_ts_utils_lib3.Utils.Dom.getCanvasTextWidth(text, font);
+      return import_ts_utils_lib5.Utils.Dom.getCanvasTextWidth(text, font);
     }
   }
   arc(x, y, radius, startRadians, endRadians) {
@@ -1438,7 +1546,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];
       }
@@ -1448,18 +1556,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();
     }
@@ -1467,11 +1575,11 @@ var RenderContext = class {
 };
 
 // src/score/engine/obj-staff-and-tab.ts
-var import_core16 = require("@tspro/web-music-score/core");
-var import_ts_utils_lib15 = require("@tspro/ts-utils-lib");
+var import_core15 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib28 = require("@tspro/ts-utils-lib");
 
 // src/score/engine/obj-measure.ts
-var import_ts_utils_lib14 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib26 = require("@tspro/ts-utils-lib");
 var import_theory9 = require("@tspro/web-music-score/theory");
 var import_theory10 = require("@tspro/web-music-score/theory");
 
@@ -1501,6 +1609,7 @@ var AccidentalState = class {
 var import_theory2 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/obj-image.ts
+var import_ts_utils_lib6 = require("@tspro/ts-utils-lib");
 var ObjImage = class extends MusicObject {
   constructor(parent, image, anchorX, anchorY, imageScale) {
     super(parent);
@@ -1523,9 +1632,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 = import_ts_utils_lib6.AnchoredRect.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
     } catch (err) {
-      this.rect = new DivRect();
+      this.rect = new import_ts_utils_lib6.AnchoredRect();
     }
   }
   offset(dx, dy) {
@@ -1534,12 +1643,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
-var import_core4 = require("@tspro/web-music-score/core");
+var import_core3 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib7 = require("@tspro/ts-utils-lib");
 var ObjAccidental = class extends MusicObject {
   constructor(parent, diatonicId, accidental, color = "black") {
     super(parent);
@@ -1559,22 +1669,22 @@ 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 = import_ts_utils_lib7.AnchoredRect.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 = import_ts_utils_lib7.AnchoredRect.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 = import_ts_utils_lib7.AnchoredRect.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 = import_ts_utils_lib7.AnchoredRect.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 = import_ts_utils_lib7.AnchoredRect.createSections(unitSize * 1, unitSize * 1, unitSize * 1, unitSize * 1);
         break;
       default:
-        throw new import_core4.MusicError(import_core4.MusicErrorType.Score, "Invalid accidental value: " + this.accidental);
+        throw new import_core3.MusicError(import_core3.MusicErrorType.Score, "Invalid accidental value: " + this.accidental);
     }
   }
   offset(dx, dy) {
@@ -1584,8 +1694,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(
@@ -1614,6 +1724,7 @@ var ObjAccidental = class extends MusicObject {
 };
 
 // src/score/engine/obj-text.ts
+var import_ts_utils_lib8 = require("@tspro/ts-utils-lib");
 var DefaultBoxedPadding = 0.5;
 var ObjText = class extends MusicObject {
   constructor(parent, text, anchorX, anchorY) {
@@ -1650,7 +1761,7 @@ var ObjText = class extends MusicObject {
     if (this.textLines.length === 0) {
       this.textLines = [""];
     }
-    this.rect = new DivRect();
+    this.rect = new import_ts_utils_lib8.AnchoredRect();
     this.mi = new MText(this);
   }
   getMusicInterface() {
@@ -1662,14 +1773,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] : [];
@@ -1686,7 +1797,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 = import_ts_utils_lib8.AnchoredRect.createSections(w * anchorX, w * (1 - anchorX), h * anchorY, h * (1 - anchorY));
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -1708,12 +1819,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) {
@@ -1723,12 +1834,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;
     }
@@ -1736,7 +1843,8 @@ var ObjText = class extends MusicObject {
 };
 
 // src/score/engine/obj-signature.ts
-var import_core5 = require("@tspro/web-music-score/core");
+var import_core4 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib9 = require("@tspro/ts-utils-lib");
 var ObjStaffSignature = class extends MusicObject {
   constructor(measure, staff) {
     super(measure);
@@ -1832,7 +1940,7 @@ var ObjStaffSignature = class extends MusicObject {
     if (bottomAccidentalDiatonicId !== void 0) {
       return import_theory2.Note.findNextDiatonicIdAbove(accNote.diatonicId, bottomAccidentalDiatonicId, false);
     } else {
-      throw new import_core5.MusicError(import_core5.MusicErrorType.Score, "Cannot get accidental diatonicId because note has no accidental.");
+      throw new import_core4.MusicError(import_core4.MusicErrorType.Score, "Cannot get accidental diatonicId because note has no accidental.");
     }
   }
   pick(x, y) {
@@ -1895,7 +2003,7 @@ var ObjStaffSignature = class extends MusicObject {
     let { staff } = this;
     let paddingX = unitSize;
     let x = 0;
-    this.rect = new DivRect();
+    this.rect = new import_ts_utils_lib9.AnchoredRect();
     if (this.clefImage) {
       x += paddingX;
       this.clefImage.layout(ctx);
@@ -1905,7 +2013,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());
       }
     }
@@ -2064,7 +2172,7 @@ var ObjTabSignature = class extends MusicObject {
     let paddingX = unitSize;
     let x = 0;
     let topLineY = tab.getTopLineY();
-    this.rect = new DivRect();
+    this.rect = new import_ts_utils_lib9.AnchoredRect();
     if (this.measureNumber) {
       this.measureNumber.layout(ctx);
       this.measureNumber.offset(0, topLineY);
@@ -2075,11 +2183,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) {
@@ -2107,7 +2215,7 @@ var ObjTabSignature = class extends MusicObject {
 };
 
 // src/score/engine/player.ts
-var import_ts_utils_lib7 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib16 = require("@tspro/ts-utils-lib");
 var import_theory6 = require("@tspro/web-music-score/theory");
 var Audio = __toESM(require("@tspro/web-music-score/audio"));
 
@@ -2115,6 +2223,7 @@ var Audio = __toESM(require("@tspro/web-music-score/audio"));
 var import_theory5 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/obj-arpeggio.ts
+var import_ts_utils_lib10 = require("@tspro/ts-utils-lib");
 var ObjArpeggio = class extends MusicObject {
   constructor(col, line, arpeggioDir) {
     super(col);
@@ -2145,7 +2254,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 import_ts_utils_lib10.AnchoredRect(-width / 2, width / 2, -height / 2 - this.topArrowHeight, height / 2 + this.bottomArrowHeight);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -2157,21 +2266,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();
@@ -2181,7 +2290,8 @@ var ObjArpeggio = class extends MusicObject {
 
 // src/score/engine/obj-rest.ts
 var import_theory3 = require("@tspro/web-music-score/theory");
-var import_core6 = require("@tspro/web-music-score/core");
+var import_core5 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib11 = require("@tspro/ts-utils-lib");
 function getDiatonicIdFromStaffPos(staffPos) {
   if (typeof staffPos === "number") {
     return import_theory3.Note.getChromaticNote(staffPos).diatonicId;
@@ -2198,7 +2308,7 @@ var ObjStaffRest = class extends MusicObject {
     super(staff);
     this.staff = staff;
     this.rest = rest;
-    __publicField(this, "restRect", new DivRect());
+    __publicField(this, "restRect", new import_ts_utils_lib11.AnchoredRect());
     __publicField(this, "dotRects", []);
     __publicField(this, "mi");
     staff.addObject(this);
@@ -2217,7 +2327,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));
   }
 };
@@ -2323,9 +2433,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 };
     });
   }
@@ -2355,7 +2465,7 @@ var _ObjRest = class _ObjRest extends MusicObject {
       case 64:
         return -3;
       default:
-        throw new import_core6.MusicError(import_core6.MusicErrorType.Score, `Get rest dot vertical displacement: Invalid note size: ${noteSize}`);
+        throw new import_core5.MusicError(import_core5.MusicErrorType.Score, `Get rest dot vertical displacement: Invalid note size: ${noteSize}`);
     }
   }
   updateAccidentalState(accState) {
@@ -2379,17 +2489,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(import_ts_utils_lib11.AnchoredRect.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 import_ts_utils_lib11.AnchoredRect();
     } 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());
@@ -2410,10 +2521,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));
     });
   }
 };
@@ -2421,18 +2530,18 @@ __publicField(_ObjRest, "UndefinedDiatonicId", Infinity);
 var ObjRest = _ObjRest;
 
 // src/score/engine/obj-note-group.ts
-var import_ts_utils_lib4 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib12 = require("@tspro/ts-utils-lib");
 var import_theory4 = require("@tspro/web-music-score/theory");
-var import_core7 = require("@tspro/web-music-score/core");
+var import_core6 = require("@tspro/web-music-score/core");
 function getArpeggio(a) {
-  return import_ts_utils_lib4.Utils.Is.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
+  return import_ts_utils_lib12.Guard.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
 }
 function sortNotesAndStrings(notes, strings) {
-  let stringArr = import_ts_utils_lib4.Utils.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
+  let stringArr = import_ts_utils_lib12.Utils.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
   let noteStringData = notes.map((note, i) => {
     return { note, string: stringArr[i] };
   });
-  noteStringData = import_ts_utils_lib4.Utils.Arr.removeDuplicatesCmp(noteStringData, (a, b) => import_theory4.Note.equals(a.note, b.note)).sort((a, b) => import_theory4.Note.compareFunc(a.note, b.note));
+  noteStringData = import_ts_utils_lib12.Utils.Arr.removeDuplicates(noteStringData, (a, b) => import_theory4.Note.equals(a.note, b.note)).sort((a, b) => import_theory4.Note.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)
@@ -2470,7 +2579,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);
@@ -2481,9 +2590,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();
@@ -2516,7 +2625,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) {
@@ -2552,13 +2661,15 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     __publicField(this, "beamGroup");
     __publicField(this, "staffObjects", []);
     __publicField(this, "tabObjects", []);
+    __publicField(this, "isNoteDisplaced");
     __publicField(this, "mi");
-    if (!import_ts_utils_lib4.Utils.Is.isIntegerGte(notes.length, 1)) {
-      throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Cannot create note group object because notes array is empty.");
+    if (!import_ts_utils_lib12.Guard.isIntegerGte(notes.length, 1)) {
+      throw new import_core6.MusicError(import_core6.MusicErrorType.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 */;
@@ -2596,14 +2707,18 @@ 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));
   }
   startConnective(connectiveProps) {
     if (!this.row.hasStaff && connectiveProps.connective === "tie" /* Tie */) {
-      throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Ties not implemented for guitar tabs alone, staff is required!");
+      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Ties not implemented for guitar tabs alone, staff is required!");
     } else if (!this.row.hasStaff && connectiveProps.connective === "slur" /* Slur */) {
-      throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Slurs not implemented for guitar tabs alone, staff is required!");
+      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Slurs not implemented for guitar tabs alone, staff is required!");
     }
     this.startConnnectives.push(connectiveProps);
     this.doc.addConnectiveProps(connectiveProps);
@@ -2613,20 +2728,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 [];
@@ -2655,12 +2756,12 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     var _a;
     if (line instanceof ObjStaff) {
       if (noteIndex < 0 || noteIndex >= this.notes.length) {
-        throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Invalid noteIndex: " + noteIndex);
+        throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Invalid noteIndex: " + noteIndex);
       }
       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;
@@ -2668,8 +2769,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;
@@ -2681,29 +2782,29 @@ 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 import_core7.MusicError(import_core7.MusicErrorType.Score, "Invalid noteAnchor: " + noteAnchor);
+          throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Invalid noteAnchor: " + noteAnchor);
       }
     } else if (line instanceof ObjTab) {
       let fretNumber = (_a = this.tabObjects.find((obj) => obj.tab === line)) == null ? void 0 : _a.fretNumbers[noteIndex];
@@ -2719,12 +2820,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 {
@@ -2794,9 +2895,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 };
     });
   }
@@ -2853,7 +2954,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       if (j >= 0) {
         tieNoteGroups = tieNoteGroups.slice(0, j);
       }
-      return import_ts_utils_lib4.Utils.Math.sum(tieNoteGroups.map((ng) => ng.rhythmProps.ticks));
+      return import_ts_utils_lib12.Utils.Math.sum(tieNoteGroups.map((ng) => ng.rhythmProps.ticks));
     });
     return tiedTicks.length === 0 ? this.rhythmProps.ticks : Math.max(...tiedTicks);
   }
@@ -2885,14 +2986,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] = import_ts_utils_lib12.AnchoredRect.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);
@@ -2905,7 +3006,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 = import_ts_utils_lib12.AnchoredRect.createCentered(dotX, dotY, dotWidth, dotWidth);
           obj.dotRects.push(r);
           noteStaff.addObject(r);
         }
@@ -2913,27 +3014,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 = import_ts_utils_lib12.AnchoredRect.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 = import_ts_utils_lib12.AnchoredRect.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 import_ts_utils_lib12.AnchoredRect(stemX, stemX, stemTipY, stemTipY);
+        obj.stemBase = new import_ts_utils_lib12.AnchoredRect(stemX, stemX, stemBaseY, stemBaseY);
         stemTipStaff.addObject(obj.stemTip);
         stemBaseStaff.addObject(obj.stemBase);
       }
@@ -2942,11 +3043,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 import_ts_utils_lib12.AnchoredRect(stemX, stemX + flagWidth, stemTipY + flagAddY, stemTipY + flagHeight + flagAddY) : new import_ts_utils_lib12.AnchoredRect(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) => {
@@ -2956,12 +3058,12 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let obj = new ObjTabNoteGroup(tab, this);
       this.notes.forEach((note, noteIndex) => {
         let stringNumber = this.runningStringNumbers[noteIndex];
-        if (import_ts_utils_lib4.Utils.Is.isIntegerBetween(stringNumber, 1, 6)) {
+        if (import_ts_utils_lib12.Guard.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);
@@ -2970,16 +3072,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 import_ts_utils_lib12.AnchoredRect();
       return;
     }
     this.staffObjects.forEach((obj) => this.rect.expandInPlace(obj.getRect()));
@@ -2987,9 +3090,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) {
@@ -3009,31 +3113,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 {
@@ -3041,11 +3145,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"));
@@ -3075,29 +3179,21 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
 };
 
 // src/score/engine/obj-rhythm-column.ts
-var import_core8 = require("@tspro/web-music-score/core");
-var import_ts_utils_lib5 = require("@tspro/ts-utils-lib");
-var noteHeadDataCompareFunc = (a, b) => {
-  let cmp = import_theory5.Note.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;
-};
+var import_core7 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib13 = require("@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 import_ts_utils_lib5.Map3());
+    __publicField(this, "voiceSymbol", new import_ts_utils_lib13.IndexArray());
+    __publicField(this, "lyricsObject", new import_ts_utils_lib13.TriMap());
     __publicField(this, "minDiatonicId");
     __publicField(this, "maxDiatonicId");
-    __publicField(this, "staffMinDiatonicId", /* @__PURE__ */ new Map());
-    __publicField(this, "staffMaxDiatonicId", /* @__PURE__ */ new Map());
+    __publicField(this, "staffMinDiatonicId", new import_ts_utils_lib13.UniMap());
+    __publicField(this, "staffMaxDiatonicId", new import_ts_utils_lib13.UniMap());
     __publicField(this, "arpeggioDir");
     __publicField(this, "arpeggios", []);
-    __publicField(this, "noteHeadDisplacements", []);
     __publicField(this, "playerProps");
     __publicField(this, "needLayout", true);
     __publicField(this, "shapeRects", []);
@@ -3120,7 +3216,7 @@ var ObjRhythmColumn = class extends MusicObject {
     if (colId >= 0 && colId < this.measure.getColumnCount()) {
       return this.measure.getColumn(colId + 1);
     } else {
-      throw new import_core8.MusicError(import_core8.MusicErrorType.Score, "Cannot get next column in measure because current column's id in mesure is invalid.");
+      throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Cannot get next column in measure because current column's id in mesure is invalid.");
     }
   }
   /**
@@ -3147,22 +3243,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;
   }
@@ -3170,12 +3250,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];
         }
@@ -3198,7 +3288,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);
@@ -3211,13 +3301,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);
@@ -3226,7 +3316,7 @@ var ObjRhythmColumn = class extends MusicObject {
     this.lyricsObject.set(lyricsObj.verse, lyricsObj.line, lyricsObj.vpos, lyricsObj);
   }
   getMinWidth() {
-    let maxNoteSize = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteSize));
+    let maxNoteSize = Math.max(...this.voiceSymbol.mapToArray((s) => s.rhythmProps.noteSize));
     let w = DocumentSettings.NoteHeadWidth;
     switch (maxNoteSize) {
       case 1:
@@ -3242,56 +3332,50 @@ var ObjRhythmColumn = class extends MusicObject {
         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 = import_theory5.Note.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 && import_theory5.Note.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 = [];
@@ -3339,7 +3423,7 @@ var ObjRhythmColumn = class extends MusicObject {
       return;
     }
     this.requestRectUpdate();
-    this.rect = new DivRect();
+    this.rect = new import_ts_utils_lib13.AnchoredRect();
     let { row } = this;
     let { unitSize } = ctx;
     let halfMinWidth = this.getMinWidth() * unitSize / 2;
@@ -3356,9 +3440,10 @@ var ObjRhythmColumn = class extends MusicObject {
       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);
+        arpeggio.offset(-leftw - arpeggio.getRect().right, line.getRect().anchorY - arpeggio.getRect().anchorY);
         arpeggioWidth = Math.max(arpeggioWidth, arpeggio.getRect().width);
         line.addObject(arpeggio);
+        this.measure.addStaticObject(line, arpeggio);
         return arpeggio;
       });
       leftw += arpeggioWidth;
@@ -3374,7 +3459,7 @@ var ObjRhythmColumn = class extends MusicObject {
     }
     this.voiceSymbol.forEach((symbol) => symbol.updateAccidentalState(accState));
     this.rect.left = -leftw;
-    this.rect.centerX = 0;
+    this.rect.anchorX = 0;
     this.rect.right = rightw;
     this.row.getStaves().forEach((staff) => {
       let minDiatonicId = void 0;
@@ -3408,15 +3493,15 @@ var ObjRhythmColumn = class extends MusicObject {
   }
   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).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);
@@ -3426,28 +3511,25 @@ 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));
   }
 };
 
 // src/score/engine/extension.ts
-var import_core9 = require("@tspro/web-music-score/core");
+var import_core8 = require("@tspro/web-music-score/core");
 
 // src/score/engine/element-data.ts
-var import_ts_utils_lib6 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib15 = require("@tspro/ts-utils-lib");
 
 // src/score/engine/obj-special-text.ts
+var import_ts_utils_lib14 = require("@tspro/ts-utils-lib");
 var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
   constructor(parent, text) {
     super(parent);
@@ -3492,14 +3574,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 import_ts_utils_lib14.AnchoredRect(
           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;
@@ -3509,14 +3591,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 import_ts_utils_lib14.AnchoredRect(
           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;
@@ -3524,7 +3606,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;
       }
     }
@@ -3567,23 +3649,23 @@ function getNavigationString(navigation) {
   }
 }
 function isDynamicsText(text) {
-  return import_ts_utils_lib6.Utils.Is.isEnumValue(text, DynamicsAnnotation);
+  return import_ts_utils_lib15.Guard.isEnumValue(text, DynamicsAnnotation);
 }
 function getDynamicsVolume(text) {
   if (/^(p+|f+|m|mp|mf)$/.test(text)) {
-    let volume = 0.5 - import_ts_utils_lib6.Utils.Str.charCount(text, "p") * 0.1 + import_ts_utils_lib6.Utils.Str.charCount(text, "f") * 0.1;
-    return import_ts_utils_lib6.Utils.Math.clamp(volume, 0, 1);
+    let volume = 0.5 - import_ts_utils_lib15.Utils.Str.charCount(text, "p") * 0.1 + import_ts_utils_lib15.Utils.Str.charCount(text, "f") * 0.1;
+    return import_ts_utils_lib15.Utils.Math.clamp(volume, 0, 1);
   } else {
     return void 0;
   }
 }
 function isTempoText(text) {
-  return import_ts_utils_lib6.Utils.Is.isEnumValue(text, TempoAnnotation);
+  return import_ts_utils_lib15.Guard.isEnumValue(text, TempoAnnotation);
 }
 function getAnnotation(text) {
-  if (import_ts_utils_lib6.Utils.Is.isEnumValue(text, DynamicsAnnotation)) {
+  if (import_ts_utils_lib15.Guard.isEnumValue(text, DynamicsAnnotation)) {
     return "dynamics" /* Dynamics */;
-  } else if (import_ts_utils_lib6.Utils.Is.isEnumValue(text, TempoAnnotation)) {
+  } else if (import_ts_utils_lib15.Guard.isEnumValue(text, TempoAnnotation)) {
     return "tempo" /* Tempo */;
   } else {
     return void 0;
@@ -3626,7 +3708,7 @@ var Extension = class extends MusicObjectLink {
     if (head instanceof ObjText) {
       head.updateAnchorY(getTextAnchorY(linePos));
     } else {
-      throw new import_core9.MusicError(import_core9.MusicErrorType.Score, "Update anchor's y-coordinate is only implemented for text objects.");
+      throw new import_core8.MusicError(import_core8.MusicErrorType.Score, "Update anchor's y-coordinate is only implemented for text objects.");
     }
   }
   isVisible() {
@@ -3739,7 +3821,7 @@ var PlayerColumnProps = class {
     return this.speed;
   }
   getTempo() {
-    let speed = import_ts_utils_lib7.Utils.Math.clamp(this.getSpeed(), 0.1, 10);
+    let speed = import_ts_utils_lib16.Utils.Math.clamp(this.getSpeed(), 0.1, 10);
     return (0, import_theory6.alterTempoSpeed)(this.measure.getTempo(), speed);
   }
   setVolume(volume) {
@@ -3764,7 +3846,7 @@ var PlayerColumnProps = class {
       if (symbolsTicks.length === 0) {
         return 0;
       } else {
-        return import_ts_utils_lib7.Utils.Math.sum(symbolsTicks) / symbolsTicks.length;
+        return import_ts_utils_lib16.Utils.Math.sum(symbolsTicks) / symbolsTicks.length;
       }
     }
   }
@@ -3887,24 +3969,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 import_ts_utils_lib16.UniMap();
+    let volumeMap = new import_ts_utils_lib16.UniMap();
+    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;
@@ -3913,7 +3988,7 @@ var Player = class _Player {
         } else if (layoutObj.musicObj.getLink() instanceof Extension) {
           let extension = layoutObj.musicObj.getLink();
           let { columnRange, extensionBreakText } = extension.getExtensionRangeInfo();
-          let totalTicks = import_ts_utils_lib7.Utils.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
+          let totalTicks = import_ts_utils_lib16.Utils.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
           switch (text) {
             case "accel." /* accel */: {
               let startSpeed = curSpeed;
@@ -3965,13 +4040,13 @@ var Player = class _Player {
           }
         }
       });
-      let speedArr = (_a = speedMap.get(col)) != null ? _a : [];
+      let speedArr = speedMap.getOrDefault(col, []);
       if (speedArr.length > 0) {
-        curSpeed = import_ts_utils_lib7.Utils.Math.sum(speedArr) / speedArr.length;
+        curSpeed = import_ts_utils_lib16.Utils.Math.sum(speedArr) / speedArr.length;
       }
-      let volumeArr = (_b = volumeMap.get(col)) != null ? _b : [];
+      let volumeArr = volumeMap.getOrDefault(col, []);
       if (volumeArr.length > 0) {
-        curVolume = import_ts_utils_lib7.Utils.Math.sum(volumeArr) / volumeArr.length;
+        curVolume = import_ts_utils_lib16.Utils.Math.sum(volumeArr) / volumeArr.length;
       }
       col.getPlayerProps().setSpeed(curSpeed);
       col.getPlayerProps().setVolume(curVolume);
@@ -4089,14 +4164,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 import_ts_utils_lib16.Rect(x, top, 0, height);
   }
 };
 
 // src/score/engine/obj-bar-line.ts
+var import_ts_utils_lib17 = require("@tspro/ts-utils-lib");
 var ObjStaffTabBarLine = class extends MusicObject {
   constructor(barLine, line) {
     super(line);
@@ -4183,36 +4258,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 import_ts_utils_lib17.AnchoredRect(0, 0, 0, top, 0, bottom));
           break;
         case 1 /* Single */:
-          obj.setRect(new DivRect(-thinW, 0, 0, top, 0, bottom));
+          obj.setRect(new import_ts_utils_lib17.AnchoredRect(-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 import_ts_utils_lib17.AnchoredRect(-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 import_ts_utils_lib17.AnchoredRect(-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 import_ts_utils_lib17.AnchoredRect(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 import_ts_utils_lib17.AnchoredRect(-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 import_ts_utils_lib17.AnchoredRect(-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);
@@ -4228,12 +4303,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 import_ts_utils_lib17.AnchoredRect();
     }
   }
   offset(dx, dy) {
@@ -4318,8 +4393,8 @@ var ObjBarLineRight = class extends ObjBarLine {
 };
 
 // src/score/engine/obj-ending.ts
-var import_ts_utils_lib8 = require("@tspro/ts-utils-lib");
-var import_core10 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib18 = require("@tspro/ts-utils-lib");
+var import_core9 = require("@tspro/web-music-score/core");
 var ObjEnding = class extends MusicObject {
   constructor(measure, passages) {
     super(measure);
@@ -4329,10 +4404,10 @@ var ObjEnding = class extends MusicObject {
     __publicField(this, "shapeRects", []);
     __publicField(this, "mi");
     this.mi = new MEnding(this);
-    if (!import_ts_utils_lib8.Utils.Is.isIntegerGte(passages.length, 1)) {
-      throw new import_core10.MusicError(import_core10.MusicErrorType.Score, "Passages is empty.");
-    } else if (!this.passages.every((p) => import_ts_utils_lib8.Utils.Is.isIntegerGte(p, 1))) {
-      throw new import_core10.MusicError(import_core10.MusicErrorType.Score, "Invalid passages: " + this.passages);
+    if (!import_ts_utils_lib18.Guard.isIntegerGte(passages.length, 1)) {
+      throw new import_core9.MusicError(import_core9.MusicErrorType.Score, "Passages is empty.");
+    } else if (!this.passages.every((p) => import_ts_utils_lib18.Guard.isIntegerGte(p, 1))) {
+      throw new import_core9.MusicError(import_core9.MusicErrorType.Score, "Invalid passages: " + this.passages);
     }
     this.passages.sort((a, b) => a - b);
     let text = this.passages.map((p) => p + ".").join("");
@@ -4359,8 +4434,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 import_ts_utils_lib18.AnchoredRect();
+    this.shapeRects = [this.rect.clone()];
   }
   layoutFitToMeasure(ctx) {
     let { unitSize } = ctx;
@@ -4369,13 +4444,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 import_ts_utils_lib18.AnchoredRect(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 import_ts_utils_lib18.AnchoredRect(this.rect.left, this.rect.left + 1, this.rect.top, this.rect.bottom),
+      new import_ts_utils_lib18.AnchoredRect(this.rect.left, this.rect.right, this.rect.top, this.rect.top + 1),
+      new import_ts_utils_lib18.AnchoredRect(this.rect.right - 1, this.rect.right, this.rect.top, this.rect.bottom),
+      this.endingText.getRect().clone()
     ];
   }
   offset(dx, dy) {
@@ -4400,9 +4475,9 @@ var ObjEnding = class extends MusicObject {
 };
 
 // src/score/engine/obj-beam-group.ts
-var import_ts_utils_lib9 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib19 = require("@tspro/ts-utils-lib");
 var import_theory7 = require("@tspro/web-music-score/theory");
-var import_core11 = require("@tspro/web-music-score/core");
+var import_core10 = require("@tspro/web-music-score/core");
 var adjustBeamAngle = (dx, dy) => {
   let T = DocumentSettings.BeamAngleFactor;
   if (!Number.isFinite(T) || T === 0) {
@@ -4430,7 +4505,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 import_ts_utils_lib19.AnchoredRect(this.x, this.x, this.x, this.y - this.topBeamsHeight, this.y, this.y + this.bottomBeamsHeight);
   }
 };
 var ObjStaffBeamGroup = class extends MusicObject {
@@ -4460,9 +4535,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) {
@@ -4487,9 +4562,9 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
     this.mi = new MBeamGroup(this);
     let beamGroupName = tupletRatio ? "Tuplet" : "BeamGroup";
     if (!symbols.every((s) => s.measure === symbols[0].measure)) {
-      throw new import_core11.MusicError(import_core11.MusicErrorType.Score, `All ${beamGroupName} symbols are not in same measure.`);
+      throw new import_core10.MusicError(import_core10.MusicErrorType.Score, `All ${beamGroupName} symbols are not in same measure.`);
     } else if (symbols.length < 2) {
-      throw new import_core11.MusicError(import_core11.MusicErrorType.Score, `${beamGroupName} needs minimum 2 symbols, but ${symbols.length} given.`);
+      throw new import_core10.MusicError(import_core10.MusicErrorType.Score, `${beamGroupName} needs minimum 2 symbols, but ${symbols.length} given.`);
     }
     if (tupletRatio !== void 0) {
       let isGroup = symbols.length < 3 || symbols.some((s) => !(s instanceof ObjNoteGroup)) || symbols.some((s) => s.rhythmProps.flagCount !== symbols[0].rhythmProps.flagCount);
@@ -4509,7 +4584,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       symbols.forEach((s) => s.setBeamGroup(this));
       symbols[0].measure.addBeamGroup(this);
     } else {
-      throw new import_core11.MusicError(import_core11.MusicErrorType.Score, `Cannot add ${beamGroupName} because some symbol already has one.`);
+      throw new import_core10.MusicError(import_core10.MusicErrorType.Score, `Cannot add ${beamGroupName} because some symbol already has one.`);
     }
     if (this.type === 0 /* RegularBeam */) {
       this.symbols.filter((sym) => sym instanceof ObjNoteGroup).some((sym, i) => {
@@ -4524,7 +4599,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       if (this.type === 0 /* RegularBeam */) {
         throw new InvalidBeamGroup(this, "Beam symbols have different voiceId.");
       } else {
-        throw new import_core11.MusicError(import_core11.MusicErrorType.Score, `Tuplet symbols have different voiceId.`);
+        throw new import_core10.MusicError(import_core10.MusicErrorType.Score, `Tuplet symbols have different voiceId.`);
       }
     }
     symbols[0].row.getStaves().forEach((staff) => {
@@ -4708,7 +4783,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       symbolY.forEach((symY, i) => {
         let symX = symbolX[i];
         if (symX !== void 0 && symY !== void 0) {
-          let beamY = import_ts_utils_lib9.Utils.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
+          let beamY = import_ts_utils_lib19.Utils.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
           let raiseY = symY - beamY;
           if (stemDir === "up" /* Up */ && raiseY < 0) {
             raiseBeamY = Math.min(raiseBeamY, raiseY);
@@ -4723,8 +4798,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       let obj = new ObjStaffBeamGroup(mainStaff, this);
       if (type === 2 /* TupletGroup */) {
         let ef = unitSize / (rightX - leftX);
-        let l = import_ts_utils_lib9.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
-        let r = import_ts_utils_lib9.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, 1 + ef);
+        let l = import_ts_utils_lib19.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
+        let r = import_ts_utils_lib19.Utils.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;
@@ -4773,10 +4848,10 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   }
   updateRect() {
     if (this.staffObjects.length === 0) {
-      this.rect = new DivRect();
+      this.rect = new import_ts_utils_lib19.AnchoredRect();
     } 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());
       }
@@ -4790,7 +4865,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         obj.points.forEach((pt) => {
           if (pt.symbol instanceof ObjNoteGroup) {
             if (pt !== left && pt !== right) {
-              pt.y = import_ts_utils_lib9.Utils.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
+              pt.y = import_ts_utils_lib19.Utils.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
             }
             pt.symbol.setStemTipY(pt.staff, pt.y);
           }
@@ -4798,7 +4873,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);
       }
     });
   }
@@ -4817,8 +4892,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 = import_ts_utils_lib9.Utils.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
-          let rc = import_ts_utils_lib9.Utils.Math.interpolateCoord(lx, ly, rx, ry, 0.5 + tf / 2);
+          let lc = import_ts_utils_lib19.Utils.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
+          let rc = import_ts_utils_lib19.Utils.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 {
@@ -4932,6 +5007,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
 };
 
 // src/score/engine/obj-fermata.ts
+var import_ts_utils_lib20 = require("@tspro/ts-utils-lib");
 var ObjFermata = class extends MusicObject {
   constructor(parent, pos) {
     super(parent);
@@ -4959,7 +5035,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 import_ts_utils_lib20.AnchoredRect(-width / 2, width / 2, -height, 0);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -4987,6 +5063,7 @@ var ObjFermata = class extends MusicObject {
 };
 
 // src/score/engine/obj-extension-line.ts
+var import_ts_utils_lib21 = require("@tspro/ts-utils-lib");
 var ObjExtensionLine = class extends MusicObject {
   constructor(measure, line, extension, leftObj, rightObj) {
     super(measure);
@@ -5007,7 +5084,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;
     }
@@ -5022,7 +5099,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) {
@@ -5030,13 +5107,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 import_ts_utils_lib21.AnchoredRect(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 import_ts_utils_lib21.AnchoredRect();
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -5047,25 +5124,25 @@ 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);
     }
   }
 };
 
 // src/score/engine/obj-measure.ts
-var import_core14 = require("@tspro/web-music-score/core");
+var import_core13 = require("@tspro/web-music-score/core");
 
 // src/score/engine/connective-props.ts
 var import_theory8 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/obj-connective.ts
-var import_ts_utils_lib10 = require("@tspro/ts-utils-lib");
-var import_core12 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib22 = require("@tspro/ts-utils-lib");
+var import_core11 = require("@tspro/web-music-score/core");
 var ObjConnective = class extends MusicObject {
   constructor(connectiveProps, line, measure, leftNoteGroup, leftNoteId, ...args) {
     var _a;
@@ -5095,7 +5172,7 @@ var ObjConnective = class extends MusicObject {
       this.rightNoteGroup = args[0];
       this.rightNoteId = args[1];
       this.tieType = void 0;
-    } else if (import_ts_utils_lib10.Utils.Is.isEnumValue(args[0], TieType)) {
+    } else if (import_ts_utils_lib22.Guard.isEnumValue(args[0], TieType)) {
       this.rightNoteGroup = void 0;
       this.rightNoteId = void 0;
       this.tieType = args[0];
@@ -5156,7 +5233,7 @@ var ObjConnective = class extends MusicObject {
       rx = contentRect.right;
       ry = leftPos.y + (rightPos.y - leftPos.y) * tLeft / (tLeft + tRight);
     } else {
-      throw new import_core12.MusicError(import_core12.MusicErrorType.Score, "Cannot layout connective object because no valid left and right note groups.");
+      throw new import_core11.MusicError(import_core11.MusicErrorType.Score, "Cannot layout connective object because no valid left and right note groups.");
     }
     let spanDy = arcDir === "up" ? -1 : 1;
     let arcHeight = spanDy * unitSize * Math.log2(rx - lx) / 3;
@@ -5165,12 +5242,12 @@ var ObjConnective = class extends MusicObject {
     this.rx = rx;
     this.ry = ry;
     this.arcHeight = this.connectiveProps.connective === "slide" /* Slide */ ? 0 : arcHeight;
-    let { nx, ny } = import_ts_utils_lib10.Utils.Math.calcNormal(lx, ly, rx, ry);
+    let { nx, ny } = import_ts_utils_lib22.Utils.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 import_ts_utils_lib22.AnchoredRect(
       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),
@@ -5220,8 +5297,8 @@ var ObjConnective = class extends MusicObject {
 };
 
 // src/score/engine/connective-props.ts
-var import_core13 = require("@tspro/web-music-score/core");
-var import_ts_utils_lib11 = require("@tspro/ts-utils-lib");
+var import_core12 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib23 = require("@tspro/ts-utils-lib");
 var ConnectiveProps = class {
   constructor(connective, span, noteAnchor, startNoteGroup) {
     this.connective = connective;
@@ -5294,7 +5371,7 @@ var ConnectiveProps = class {
     this.noteGroups[0].row.getNotationLines().forEach((line) => {
       this.computeParams(line);
       if (connective === "tie" /* Tie */) {
-        if (import_ts_utils_lib11.Utils.Is.isEnumValue(span, TieType)) {
+        if (import_ts_utils_lib23.Guard.isEnumValue(span, TieType)) {
           let leftNoteGroup = this.noteGroups[0];
           for (let noteId = 0; noteId < leftNoteGroup.notes.length; noteId++) {
             this.createObjConnectiveWithTieType(line, leftNoteGroup, noteId, span);
@@ -5360,13 +5437,13 @@ var ConnectiveProps = class {
       addConnective(leftNoteGroup.measure, leftNoteGroup, leftNoteId, rightNoteGroup, rightNoteId);
       addConnective(rightNoteGroup.measure, leftNoteGroup, leftNoteId, rightNoteGroup, rightNoteId);
     } else {
-      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot create connective because it is jumping measures.");
+      throw new import_core12.MusicError(import_core12.MusicErrorType.Score, "Cannot create connective because it is jumping measures.");
     }
   }
 };
 
 // src/score/engine/obj-lyrics.ts
-var import_ts_utils_lib12 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib24 = require("@tspro/ts-utils-lib");
 var ObjLyrics = class extends MusicObject {
   constructor(col, verse, line, vpos, lyricsLength, lyricsText, lyricsOptions) {
     super(col);
@@ -5382,9 +5459,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 = import_ts_utils_lib12.Utils.Is.isEnumValue(lyricsOptions == null ? void 0 : lyricsOptions.hyphen, LyricsHyphen) ? lyricsOptions == null ? void 0 : lyricsOptions.hyphen : void 0;
+    this.hyphen = import_ts_utils_lib24.Guard.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 = new import_ts_utils_lib24.AnchoredRect();
     this.mi = new MLyrics(this);
   }
   getMusicInterface() {
@@ -5404,7 +5481,7 @@ var ObjLyrics = class extends MusicObject {
   }
   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);
@@ -5422,7 +5499,7 @@ var ObjLyrics = class extends MusicObject {
       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 cy = l.centerY / 2;
         ctx.moveTo(cx - w / 2, cy);
         ctx.lineTo(cx + w / 2, cy);
         ctx.stroke();
@@ -5432,7 +5509,7 @@ var ObjLyrics = class extends MusicObject {
 };
 
 // src/score/engine/obj-tab-rhythm.ts
-var import_ts_utils_lib13 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib25 = require("@tspro/ts-utils-lib");
 var ObjTabRhythm = class extends MusicObject {
   constructor(measure, tab) {
     super(measure);
@@ -5441,9 +5518,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 import_ts_utils_lib25.UniMap());
     this.voiceId = getVoiceIds().filter((voiceId) => tab.containsVoiceId(voiceId));
-    this.rect = new DivRect();
+    this.rect = new import_ts_utils_lib25.AnchoredRect();
     this.mi = new MTabRhythm(this);
   }
   getMusicInterface() {
@@ -5454,9 +5531,9 @@ var ObjTabRhythm = class extends MusicObject {
   }
   layout(ctx) {
     let columns = this.measure.getColumns();
-    let numColsInVoiceId = getVoiceIds().map((voiceId) => import_ts_utils_lib13.Utils.Math.sum(columns.map((col) => col.getVoiceSymbol(voiceId) ? 1 : 0)));
-    this.voiceId.sort((a, b) => import_ts_utils_lib13.Utils.Math.cmp(numColsInVoiceId[a], numColsInVoiceId[b]));
-    this.rect = new DivRect();
+    let numColsInVoiceId = getVoiceIds().map((voiceId) => import_ts_utils_lib25.Utils.Math.sum(columns.map((col) => col.getVoiceSymbol(voiceId) ? 1 : 0)));
+    this.voiceId.sort((a, b) => import_ts_utils_lib25.Utils.Math.cmp(numColsInVoiceId[a], numColsInVoiceId[b]));
+    this.rect = new import_ts_utils_lib25.AnchoredRect();
   }
   hasTuplets() {
     return this.measure.getBeamGroups().some((beamGroup) => beamGroup.isTuplet());
@@ -5464,13 +5541,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) {
@@ -5483,8 +5560,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++) {
@@ -5498,7 +5575,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);
@@ -5507,7 +5584,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 import_ts_utils_lib25.AnchoredRect(colX, colX + flagSize, stemTop + i * flagSize, stemTop + (i + 2) * flagSize), "up");
             }
           }
           for (let i = 0; i < sym.rhythmProps.dotCount; i++) {
@@ -5529,8 +5606,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);
@@ -5549,14 +5626,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);
         }
@@ -5572,18 +5649,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 import_core14.MusicError(import_core14.MusicErrorType.Score, "Invalid voiceId: " + voiceId);
-  } else {
-    return voiceId;
-  }
-}
 function getExtensionTicks(extensionLength) {
   if (typeof extensionLength === "string") {
     extensionLength = [extensionLength];
   }
-  if (import_ts_utils_lib14.Utils.Is.isArray(extensionLength)) {
+  if (import_ts_utils_lib26.Guard.isArray(extensionLength)) {
     let totalTicks = 0;
     for (let i = 0; i < extensionLength.length; ) {
       let str = extensionLength[i];
@@ -5614,7 +5684,7 @@ function getVerseLayoutGroupId(verse) {
     case 3:
       return 10 /* LyricsVerse3 */;
     default:
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Unknown, "VerseNumber is not 1, 2 or 3.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Unknown, "VerseNumber is not 1, 2 or 3.");
   }
 }
 var _ObjMeasure = class _ObjMeasure extends MusicObject {
@@ -5643,7 +5713,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     __publicField(this, "leftSolidAreaWidth", 0);
     __publicField(this, "minColumnsAreaWidth", 0);
     __publicField(this, "rightSolidAreaWidth", 0);
-    __publicField(this, "voiceSymbols", []);
+    __publicField(this, "voiceSymbols", (0, import_ts_utils_lib26.asMulti)(new import_ts_utils_lib26.IndexArray()));
     __publicField(this, "lastAddedRhythmColumn");
     __publicField(this, "lastAddedRhythmSymbol");
     __publicField(this, "addExtensionToMusicObjects", []);
@@ -5652,14 +5722,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 import_ts_utils_lib26.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 import_ts_utils_lib14.Map3());
+    __publicField(this, "staticObjectsCache", new import_ts_utils_lib26.UniMap());
+    __publicField(this, "lyricsObjectsCache", new import_ts_utils_lib26.TriMap());
     __publicField(this, "mi");
     this.mi = new MMeasure(this);
     this.prevMeasure = row.doc.getLastMeasure();
@@ -5700,7 +5770,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   updateRunningArguments(runningArgs) {
     var _a;
     runningArgs != null ? runningArgs : runningArgs = [];
-    let numVoices = import_ts_utils_lib14.Utils.Math.sum(getVoiceIds().map((voiceId) => this.getVoiceSymbols(voiceId).length > 0 ? 1 : 0));
+    let numVoices = import_ts_utils_lib26.Utils.Math.sum(getVoiceIds().map((voiceId) => this.getVoiceSymbols(voiceId).length > 0 ? 1 : 0));
     getVoiceIds().forEach((voiceId) => {
       var _a2;
       const getDefaultDiatonicId = () => {
@@ -5859,7 +5929,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       this.alterKeySignature = args[0];
     } else if (args[0] instanceof import_theory9.Scale) {
       this.alterKeySignature = args[0];
-    } else if (import_ts_utils_lib14.Utils.Is.isNonEmptyString(args[0])) {
+    } else if (import_ts_utils_lib26.Guard.isNonEmptyString(args[0])) {
       if (args.length === 1) {
         this.alterKeySignature = (0, import_theory9.getScale)(args[0]);
       } else if (args.length === 2) {
@@ -5868,7 +5938,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let scaleType = (0, import_theory9.validateScaleType)("" + args[1]);
           this.alterKeySignature = (0, import_theory9.getScale)(tonic, scaleType);
         } catch (e) {
-          throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot set key signature because invalid args: " + args);
+          throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot set key signature because invalid args: " + args);
         }
       }
     }
@@ -5970,7 +6040,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let grp = this.doc.getStaffGroup(staffTabOrGroup);
           if (grp && !prevGroups.includes(staffTabOrGroup)) {
             let curGroups = [...prevGroups, staffTabOrGroup];
-            (import_ts_utils_lib14.Utils.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
+            (import_ts_utils_lib26.Guard.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
               switch (grp.verticalPosition) {
                 case "above" /* Above */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
@@ -5997,7 +6067,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       } else {
         addToStaffTabOrGroup(0, defaultVerticalPos);
       }
-    } else if (import_ts_utils_lib14.Utils.Is.isArray(staffTabOrGroups)) {
+    } else if (import_ts_utils_lib26.Guard.isArray(staffTabOrGroups)) {
       staffTabOrGroups.forEach((staffTabOrGroup) => addToStaffTabOrGroup(staffTabOrGroup, defaultVerticalPos));
     } else {
       addToStaffTabOrGroup(staffTabOrGroups, defaultVerticalPos);
@@ -6006,7 +6076,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addFermata(staffTabOrGroups, fermata) {
     let anchor = fermata === "atMeasureEnd" /* AtMeasureEnd */ ? this.barLineRight : this.lastAddedRhythmColumn;
     if (!anchor) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add Fermata because anchor is undefined.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add Fermata because anchor is undefined.");
     }
     this.forEachStaffGroup(staffTabOrGroups, 0 /* Above */, (line, vpos) => {
       this.addLayoutObject(new ObjFermata(anchor, vpos), line, 1 /* Fermata */, vpos);
@@ -6022,7 +6092,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     switch (navigation) {
       case "ending" /* Ending */:
         if (this.navigationSet.has(navigation)) {
-          throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add ending beasure measure already has one.");
+          throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add ending beasure measure already has one.");
         }
         let anchor = this;
         let passages = args;
@@ -6081,10 +6151,10 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       case "endRepeat" /* EndRepeat */:
         if (args.length === 0) {
           this.endRepeatPlayCount = 2;
-        } else if (import_ts_utils_lib14.Utils.Is.isIntegerGte(args[0], 2)) {
+        } else if (import_ts_utils_lib26.Guard.isIntegerGte(args[0], 2)) {
           this.endRepeatPlayCount = args[0];
         } else {
-          throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
+          throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
         }
         if (this.endRepeatPlayCount !== 2) {
           let textProps = {
@@ -6109,9 +6179,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addAnnotation(staffTabOrGroups, annotation, text) {
     let anchor = this.lastAddedRhythmColumn;
     if (!anchor) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add annotation because anchor is undefined.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add annotation because anchor is undefined.");
     } else if (text.length === 0) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add annotation because annotation text is empty.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add annotation because annotation text is empty.");
     }
     let textProps = { text };
     let layoutGroupId;
@@ -6138,9 +6208,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addLabel(staffTabOrGroups, label, text) {
     let anchor = this.lastAddedRhythmColumn;
     if (!anchor) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add label because anchor is undefined.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add label because anchor is undefined.");
     } else if (text.length === 0) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add label because label text is empty.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add label because label text is empty.");
     }
     let textProps = { text };
     let layoutGroupId;
@@ -6165,18 +6235,18 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addConnective(connective, ...args) {
     let anchor = this.lastAddedRhythmSymbol;
     if (!(anchor instanceof ObjNoteGroup)) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Connective can be added to note group only.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Connective can be added to note group only.");
     }
     if (connective === "tie" /* Tie */) {
-      let tieSpan = import_ts_utils_lib14.Utils.Is.isInteger(args[0]) || import_ts_utils_lib14.Utils.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
-      let noteAnchor = import_ts_utils_lib14.Utils.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let tieSpan = import_ts_utils_lib26.Guard.isInteger(args[0]) || import_ts_utils_lib26.Guard.isEnumValue(args[0], TieType) ? args[0] : 2;
+      let noteAnchor = import_ts_utils_lib26.Guard.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("tie" /* Tie */, tieSpan, noteAnchor, anchor));
     } else if (connective === "slur" /* Slur */) {
-      let slurSpan = import_ts_utils_lib14.Utils.Is.isInteger(args[0]) ? args[0] : 2;
-      let noteAnchor = import_ts_utils_lib14.Utils.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let slurSpan = import_ts_utils_lib26.Guard.isInteger(args[0]) ? args[0] : 2;
+      let noteAnchor = import_ts_utils_lib26.Guard.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slur" /* Slur */, slurSpan, noteAnchor, anchor));
     } else if (connective === "slide" /* Slide */) {
-      let noteAnchor = import_ts_utils_lib14.Utils.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
+      let noteAnchor = import_ts_utils_lib26.Guard.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slide" /* Slide */, 2, noteAnchor, anchor));
     }
   }
@@ -6189,11 +6259,11 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let extension = new Extension(musicObj, anchor, getExtensionTicks(extensionLength), extensionVisible, lineStyle, linePos);
         musicObj.setLink(extension);
       } else {
-        throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add extension becaue no compatible music object to attach it to.");
+        throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add extension becaue no compatible music object to attach it to.");
       }
     });
     if (this.addExtensionToMusicObjects.length === 0) {
-      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Cannot add extension because music object to attach it to is undefined.");
+      throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add extension because music object to attach it to is undefined.");
     }
     this.disableExtension();
     this.requestLayout();
@@ -6231,11 +6301,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);
     }
@@ -6262,9 +6330,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       let col = this.getRhythmColumn({ verse, line, vpos });
       let lyricsObj = new ObjLyrics(col, verse, line, vpos, (0, import_theory9.validateNoteLength)(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) => import_ts_utils_lib14.Utils.Math.cmp(a.col.positionTicks, b.col.positionTicks));
+      lyricsArr.sort((a, b) => import_ts_utils_lib26.Utils.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;
@@ -6294,7 +6362,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         return col2;
       }
     }
-    throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Error in rhythm column. Should never get here.");
+    throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Error in rhythm column. Should never get here.");
   }
   getMeasureTicks() {
     return this.getTimeSignature().measureTicks;
@@ -6313,9 +6381,9 @@ 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 import_ts_utils_lib26.AnchoredRect(
+      this.barLineLeft.getRect().anchorX,
+      this.barLineRight.getRect().anchorX,
       this.getRect().top,
       this.getRect().bottom
     );
@@ -6344,24 +6412,17 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     }
   }
   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];
       }
@@ -6369,14 +6430,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) => {
@@ -6475,7 +6535,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let beamGroupSize = ts.beamGroupSizes[groupId];
         let beamGroupSizeList = [beamGroupSize];
         if (beamGroupSize.length > 1) {
-          beamGroupSizeList.unshift([import_ts_utils_lib14.Utils.Math.sum(beamGroupSize)]);
+          beamGroupSizeList.unshift([import_ts_utils_lib26.Utils.Math.sum(beamGroupSize)]);
         }
         let beamCreated = false;
         let groupStartTicksSave = groupStartTicks;
@@ -6490,7 +6550,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
               let symbolEndTicks = symbolStartTicks + symbol.rhythmProps.ticks;
               return symbolStartTicks >= groupStartTicks && symbolEndTicks <= groupEndTicks;
             });
-            let groupSymbolsTicks = import_ts_utils_lib14.Utils.Math.sum(groupSymbols.map((sym) => sym.rhythmProps.ticks));
+            let groupSymbolsTicks = import_ts_utils_lib26.Utils.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;
@@ -6511,10 +6571,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) {
@@ -6524,7 +6581,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         this.completeRests(getVoiceIds().filter((id) => this.getConsumedTicks(id) > 0));
       }
       return;
-    } else if (import_ts_utils_lib14.Utils.Is.isArray(voiceId)) {
+    } else if (import_ts_utils_lib26.Guard.isArray(voiceId)) {
       voiceId.forEach((id) => this.completeRests(id));
       return;
     } else {
@@ -6628,34 +6685,43 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       return;
     }
     width = Math.max(width, this.getMinWidth());
-    this.rect = new DivRect();
-    this.rect.centerX = this.rect.left + width / 2;
+    this.rect = new import_ts_utils_lib26.AnchoredRect();
+    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.tabStringNotesWidth - 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.tabStringNotesWidth + signaturesWidth - rect.left, -rect.anchorY);
     rect = this.barLineRight.getRect();
-    this.barLineRight.offset(this.rect.right - rect.right, -rect.centerY);
+    this.barLineRight.offset(this.rect.right - rect.right, -rect.anchorY);
     if (this.endRepeatPlayCountText) {
       this.endRepeatPlayCountText.offset(this.barLineRight.getRect().left, this.barLineRight.getRect().top);
     }
     let columnsAreaLeft = this.rect.left + this.leftSolidAreaWidth;
     let columnsAreaRight = this.rect.right - this.rightSolidAreaWidth;
     let columnsAreaWidth = columnsAreaRight - columnsAreaLeft;
-    let columnsWidth = import_ts_utils_lib14.Utils.Math.sum(this.columns.map((col) => col.getRect().width));
+    let columnsWidth = import_ts_utils_lib26.Utils.Math.sum(this.columns.map((col) => col.getRect().width));
     let columnScale = columnsAreaWidth / columnsWidth;
     let columnLeft = columnsAreaLeft;
     this.columns.forEach((col) => {
       rect = col.getRect();
-      let columnCenterX = columnLeft + rect.leftw * columnScale;
-      col.offset(columnCenterX - rect.centerX, -rect.centerY);
+      let columnAnchorX = columnLeft + rect.leftw * columnScale;
+      col.offset(columnAnchorX - rect.anchorX, -rect.anchorY);
       columnLeft += 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) {
     if (!this.needLayout) {
@@ -6763,33 +6829,46 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   }
 };
 __publicField(_ObjMeasure, "MinFlexContentWidth", 10);
-var ObjMeasure2 = _ObjMeasure;
+var ObjMeasure = _ObjMeasure;
 
 // src/score/engine/layout-object.ts
-var import_core15 = require("@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 */
-];
+var import_core14 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib27 = require("@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 import_ts_utils_lib27.UniMap([
+  [0 /* TabRhythm */, { rowAlign: true }],
+  [1 /* Fermata */, {}],
+  [2 /* NoteLabel */, { widen: true }],
+  [3 /* Navigation */, { rowAlign: true }],
+  [4 /* Ending */, { rowAlign: true, padding: 2 }],
+  [5 /* TempoAnnotation */, { rowAlign: true, padding: 2 }],
+  [6 /* DynamicsAnnotation */, { rowAlign: true, padding: 2 }],
+  [7 /* ChordLabel */, { widen: true, rowAlign: true }],
+  [8 /* LyricsVerse1 */, { rowAlign: true }],
+  [9 /* LyricsVerse2 */, { rowAlign: true }],
+  [10 /* LyricsVerse3 */, { rowAlign: true }]
+]);
 function requireParentMeasure(p) {
   while (p) {
-    if (p instanceof ObjMeasure2) {
+    if (p instanceof ObjMeasure) {
       return p;
     }
     p = p.getParent();
   }
-  throw new import_core15.MusicError(import_core15.MusicErrorType.Score, "Parent measure is required but not found!");
+  throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Parent measure is required but not found!");
 }
 var StaffGroup = class {
   constructor(groupName, staffsTabsAndGroups, verticalPosition) {
@@ -6813,14 +6892,14 @@ var LayoutObjectWrapper = class {
     this.row = this.measure.row;
     let anchor = this.musicObj.getParent();
     if (!anchor) {
-      throw new import_core15.MusicError(import_core15.MusicErrorType.Score, "Parent music object is required as an anchor.");
+      throw new import_core14.MusicError(import_core14.MusicErrorType.Score, "Parent music object is required as an anchor.");
     }
     this.anchor = anchor;
     this.anchor.addAnchoredLayoutObject(this);
     this.layoutGroup = this.line.getLayoutGroup(layoutGroupId);
     this.layoutGroup.add(this);
   }
-  clearPositionResolved() {
+  resetPositionResolved() {
     this.positionResolved = false;
   }
   setPositionResolved() {
@@ -6841,8 +6920,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 (import_ts_utils_lib27.AnchoredRect.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);
           }
         });
       });
@@ -6869,35 +6948,33 @@ var LayoutObjectWrapper = class {
 var LayoutGroup = class {
   constructor(layoutGroupId) {
     this.layoutGroupId = layoutGroupId;
-    __publicField(this, "layoutObjectTable", []);
+    // key = VerticalPos
+    __publicField(this, "layoutObject", (0, import_ts_utils_lib27.asMulti)(new import_ts_utils_lib27.IndexArray()));
     __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, "padding");
+    var _a, _b, _c, _d;
+    this.rowAlign = ((_a = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _a.rowAlign) === true;
+    this.widensColumn = ((_b = LayoutGroupIdAttrs.get(layoutGroupId)) == null ? void 0 : _b.widen) === true;
+    this.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;
   }
 };
 
@@ -6907,7 +6984,7 @@ var ObjNotationLine5 = class extends MusicObject {
     super(row);
     this.row = row;
     __publicField(this, "objects", []);
-    __publicField(this, "layoutGroups", []);
+    __publicField(this, "layoutGroups", new import_ts_utils_lib28.UniMap());
   }
   addObject(o) {
     this.objects.push(o);
@@ -6916,41 +6993,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 import_ts_utils_lib28.Utils.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) {
@@ -6960,20 +7032,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);
         }
       });
     }
@@ -7006,7 +7078,7 @@ var ObjStaff = class extends ObjNotationLine5 {
       this.clefLineDiatonicId = getDiatonicId("F3", staffConfig.isOctaveDown === true);
       this.middleLineDiatonicId = this.clefLineDiatonicId - 2;
     } else {
-      throw new import_core16.MusicError(import_core16.MusicErrorType.Score, `Invalid staffConfig.clef ${staffConfig.clef}.`);
+      throw new import_core15.MusicError(import_core15.MusicErrorType.Score, `Invalid staffConfig.clef ${staffConfig.clef}.`);
     }
     this.topLineDiatonicId = this.middleLineDiatonicId + 4;
     this.bottomLineDiatonicId = this.middleLineDiatonicId - 4;
@@ -7057,7 +7129,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     } else if (this.joinedGrandStaff && this.joinedGrandStaff.containsDiatonicId(diatonicId)) {
       return this.joinedGrandStaff.getDiatonicIdY(diatonicId);
     } else {
-      throw new import_core16.MusicError(import_core16.MusicErrorType.Score, "Staff does not contain diatonicId " + diatonicId);
+      throw new import_core15.MusicError(import_core15.MusicErrorType.Score, "Staff does not contain diatonicId " + diatonicId);
     }
   }
   getActualStaff(diatonicId) {
@@ -7066,7 +7138,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     } else if (this.joinedGrandStaff && this.joinedGrandStaff.containsDiatonicId(diatonicId)) {
       return this.joinedGrandStaff;
     } else {
-      throw new import_core16.MusicError(import_core16.MusicErrorType.Score, "Staff does not contain diatonicId " + diatonicId);
+      throw new import_core15.MusicError(import_core15.MusicErrorType.Score, "Staff does not contain diatonicId " + diatonicId);
     }
   }
   getDiatonicIdAt(y) {
@@ -7080,7 +7152,7 @@ var ObjStaff = class extends ObjNotationLine5 {
     return diatonicId % 2 !== this.middleLineDiatonicId % 2;
   }
   containsVoiceId(voiceId) {
-    return import_ts_utils_lib15.Utils.Is.isUndefined(this.staffConfig.voiceId) || import_ts_utils_lib15.Utils.Arr.toArray(this.staffConfig.voiceId).includes(voiceId);
+    return import_ts_utils_lib28.Guard.isUndefined(this.staffConfig.voiceId) || import_ts_utils_lib28.Utils.Arr.toArray(this.staffConfig.voiceId).includes(voiceId);
   }
   calcTop() {
     let top = this.topLineY;
@@ -7110,7 +7182,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 import_ts_utils_lib28.AnchoredRect(0, 0, this.topLineY, this.bottomLineY);
   }
   layoutWidth(ctx) {
     this.rect.left = this.row.getRect().left;
@@ -7142,7 +7214,7 @@ var ObjTab = class extends ObjNotationLine5 {
     __publicField(this, "tuningName");
     __publicField(this, "tuningStrings");
     __publicField(this, "mi");
-    if (import_ts_utils_lib15.Utils.Is.isArray(tabConfig.tuning)) {
+    if (import_ts_utils_lib28.Guard.isArray(tabConfig.tuning)) {
       this.tuningName = void 0;
       this.tuningStrings = tabConfig.tuning.map((noteName) => import_theory11.Note.getNote(noteName)).reverse();
     } else if (typeof tabConfig.tuning === "string") {
@@ -7193,7 +7265,7 @@ var ObjTab = class extends ObjNotationLine5 {
     return this.bottom;
   }
   containsVoiceId(voiceId) {
-    return import_ts_utils_lib15.Utils.Is.isUndefined(this.tabConfig.voiceId) || import_ts_utils_lib15.Utils.Arr.toArray(this.tabConfig.voiceId).includes(voiceId);
+    return import_ts_utils_lib28.Guard.isUndefined(this.tabConfig.voiceId) || import_ts_utils_lib28.Utils.Arr.toArray(this.tabConfig.voiceId).includes(voiceId);
   }
   containsDiatonicId(diatonicId) {
     return true;
@@ -7216,7 +7288,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 import_ts_utils_lib28.AnchoredRect(0, 0, this.top, this.bottom);
   }
   layoutWidth(ctx) {
     this.rect.left = this.row.getRect().left;
@@ -7239,8 +7311,8 @@ var ObjTab = class extends ObjNotationLine5 {
 };
 
 // src/score/engine/obj-score-row.ts
-var import_core17 = require("@tspro/web-music-score/core");
-var import_ts_utils_lib16 = require("@tspro/ts-utils-lib");
+var import_core16 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib29 = require("@tspro/ts-utils-lib");
 var ObjScoreRow = class extends MusicObject {
   constructor(doc, prevRow, scoreConfig) {
     super(doc);
@@ -7272,7 +7344,7 @@ var ObjScoreRow = class extends MusicObject {
     }
     this.instrumentLineGroups = lineGroups;
     this.instrumentNames = this.instrumentLineGroups.map((lines) => {
-      return lines.length > 0 && import_ts_utils_lib16.Utils.Is.isNonEmptyString(lines[0].getConfig().instrument) ? new ObjText(this, String(lines[0].getConfig().instrument), 0, 0.5) : void 0;
+      return lines.length > 0 && import_ts_utils_lib29.Guard.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;
@@ -7302,7 +7374,7 @@ var ObjScoreRow = class extends MusicObject {
   }
   findMatchingLine(line) {
     return line.row === this ? line : this.notationLines.find(
-      (curLine) => import_ts_utils_lib16.Utils.Obj.deepEqual(line.row.scoreConfig, curLine.row.scoreConfig) && line.id === curLine.id || import_ts_utils_lib16.Utils.Is.isNonEmptyString(line.getConfig().name) && line.getConfig().name === curLine.getConfig().name && line.getConfig().type === curLine.getConfig().type
+      (curLine) => import_ts_utils_lib29.Utils.Obj.deepEqual(line.row.scoreConfig, curLine.row.scoreConfig) && line.id === curLine.id || import_ts_utils_lib29.Guard.isNonEmptyString(line.getConfig().name) && line.getConfig().name === curLine.getConfig().name && line.getConfig().type === curLine.getConfig().type
     );
   }
   getStaves() {
@@ -7322,7 +7394,7 @@ var ObjScoreRow = class extends MusicObject {
     if (topStaff) {
       return topStaff;
     } else {
-      throw new import_core17.MusicError(import_core17.MusicErrorType.Score, "Top staff is required!");
+      throw new import_core16.MusicError(import_core16.MusicErrorType.Score, "Top staff is required!");
     }
   }
   getBottomStaff() {
@@ -7330,7 +7402,7 @@ var ObjScoreRow = class extends MusicObject {
     if (bottomStaff) {
       return bottomStaff;
     } else {
-      throw new import_core17.MusicError(import_core17.MusicErrorType.Score, "Bottom staff is required!");
+      throw new import_core16.MusicError(import_core16.MusicErrorType.Score, "Bottom staff is required!");
     }
   }
   getStaff(diatonicId) {
@@ -7378,7 +7450,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 import_ts_utils_lib29.AnchoredRect(left, (left + r.right) / 2, r.right, r.top, r.anchorY, r.bottom);
   }
   getDiatonicIdAt(y) {
     for (let i = 0; i < this.notationLines.length; i++) {
@@ -7428,7 +7500,7 @@ var ObjScoreRow = class extends MusicObject {
         return "up" /* Up */;
       }
       let diatonicIds = noteGroupDiatonicIds.length > 0 ? noteGroupDiatonicIds : restDiatonicIds;
-      let avgDiatonicId = Math.floor(import_ts_utils_lib16.Utils.Math.avg(...diatonicIds));
+      let avgDiatonicId = Math.floor(import_ts_utils_lib29.Utils.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 */;
     }
@@ -7463,7 +7535,7 @@ var ObjScoreRow = class extends MusicObject {
     if (!this.needLayout) {
       return;
     }
-    this.rect = new DivRect(0, right, 0, 0);
+    this.rect = new import_ts_utils_lib29.AnchoredRect(0, right, 0, 0);
     this.notationLines.forEach((line) => line.layoutWidth(ctx));
     let targetColumnsAreaWidth = right - left;
     let minColumnsAreaWidth = 0;
@@ -7477,7 +7549,7 @@ var ObjScoreRow = class extends MusicObject {
       let newMeasureWidth = m.getSolidAreaWidth() + m.getMinColumnsAreaWidth() * 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();
     });
@@ -7491,7 +7563,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 import_ts_utils_lib29.AnchoredRect(left, right, top, bottom);
   }
   alignStemsToBeams() {
     this.measures.forEach((m) => m.alignStemsToBeams());
@@ -7526,7 +7598,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
         );
       }
     });
@@ -7569,7 +7641,7 @@ var ObjScoreRow = class extends MusicObject {
     this.instrumentNames.forEach((obj, i) => {
       let grp = this.instrumentLineGroups[i];
       if (grp.length > 1) {
-        let r = new DivRect(
+        let r = new import_ts_utils_lib29.AnchoredRect(
           grpSize.braceLeft,
           grpSize.braceRight,
           grp[0].getTopLineY(),
@@ -7586,6 +7658,7 @@ var ObjScoreRow = class extends MusicObject {
 };
 
 // src/score/engine/obj-header.ts
+var import_ts_utils_lib30 = require("@tspro/ts-utils-lib");
 var ObjHeader = class extends MusicObject {
   constructor(doc, title, composer, arranger) {
     super(doc);
@@ -7630,7 +7703,7 @@ var ObjHeader = class extends MusicObject {
   }
   layoutWidth(ctx, left, right) {
     let top = 0;
-    this.rect = new DivRect(left, right, 0, 0);
+    this.rect = new import_ts_utils_lib30.AnchoredRect(left, right, 0, 0);
     if (this.titleText) {
       this.titleText.layout(ctx);
       this.titleText.offset((left + right) / 2, top);
@@ -7676,8 +7749,8 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-var import_ts_utils_lib17 = require("@tspro/ts-utils-lib");
-var import_core18 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib31 = require("@tspro/ts-utils-lib");
+var import_core17 = require("@tspro/web-music-score/core");
 var ObjDocument = class extends MusicObject {
   constructor() {
     super(void 0);
@@ -7690,7 +7763,7 @@ 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 import_ts_utils_lib31.UniMap());
     __publicField(this, "mi");
     this.mi = new MDocument2(this);
   }
@@ -7698,7 +7771,7 @@ var ObjDocument = class extends MusicObject {
     return this.mi;
   }
   setScoreConfiguration(config) {
-    if (import_ts_utils_lib17.Utils.Is.isEnumValue(config, StaffPreset)) {
+    if (import_ts_utils_lib31.Guard.isEnumValue(config, StaffPreset)) {
       switch (config) {
         default:
         case "treble" /* Treble */:
@@ -7726,7 +7799,7 @@ var ObjDocument = class extends MusicObject {
           ];
           break;
       }
-    } else if (import_ts_utils_lib17.Utils.Is.isArray(config)) {
+    } else if (import_ts_utils_lib31.Guard.isArray(config)) {
       this.curScoreConfig = config;
     } else {
       this.curScoreConfig = [config];
@@ -7739,10 +7812,10 @@ var ObjDocument = class extends MusicObject {
       }
       if (treble && treble.type === "staff" && treble.isGrand) {
         if (treble.grandId !== void 0) {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: mixing isGrand and grandId!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: mixing isGrand and grandId!`);
         } else if (bass && bass.type === "staff" && bass.isGrand) {
           if (bass.grandId !== void 0) {
-            throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: mixing isGrand and grandId!`);
+            throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: mixing isGrand and grandId!`);
           } else {
             treble.grandId = grandId;
             bass.grandId = grandId;
@@ -7750,7 +7823,7 @@ var ObjDocument = class extends MusicObject {
             cfgId += 2;
           }
         } else {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: invalid use of isGrand!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: invalid use of isGrand!`);
         }
       } else {
         cfgId++;
@@ -7761,20 +7834,20 @@ var ObjDocument = class extends MusicObject {
       let bass = this.curScoreConfig[cfgId + 1];
       if (treble && bass && treble.type === "staff" && bass.type === "staff" && treble.grandId !== void 0 && treble.grandId === bass.grandId) {
         if (usedGrandIdes.includes(treble.grandId)) {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: grandId "${treble.grandId}" already used!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: grandId "${treble.grandId}" already used!`);
         } else if (treble.clef !== "G" /* G */) {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
         } else if (bass.clef !== "F" /* F */) {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
         } else if (treble.isOctaveDown || bass.isOctaveDown) {
-          throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: cannot use isOctaveDown option!`);
+          throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: cannot use isOctaveDown option!`);
         }
         usedGrandIdes.push(treble.grandId);
         treble.minNote = "C4";
         bass.maxNote = "B3";
         cfgId += 2;
       } else if (treble && treble.type === "staff" && treble.grandId !== void 0) {
-        throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Grand staff error: invalid use of grandId "${treble.grandId}"!`);
+        throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Grand staff error: invalid use of grandId "${treble.grandId}"!`);
       } else {
         cfgId++;
       }
@@ -7852,7 +7925,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();
@@ -7936,7 +8009,7 @@ var ObjDocument = class extends MusicObject {
     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 import_ts_utils_lib31.AnchoredRect();
     if (this.header) {
       this.header.layoutWidth(ctx, left, right);
       this.rect.expandInPlace(this.header.getRect());
@@ -7999,125 +8072,105 @@ var ObjDocument = class extends MusicObject {
 
 // src/score/pub/document-builder.ts
 var import_theory13 = require("@tspro/web-music-score/theory");
-var import_core19 = require("@tspro/web-music-score/core");
-function assertArg(condition, argName, argValue) {
-  if (!condition) {
-    throw new import_core19.MusicError(import_core19.MusicErrorType.Score, `Invalid arg: ${argName} = ${argValue}`);
-  }
-}
-function isNote(note) {
-  if (typeof note !== "string") {
-    return false;
-  } else {
-    let p = import_theory13.Note.parseNote(note);
-    return p !== void 0 && p.octave !== void 0;
-  }
-}
-function isVoiceId(value) {
-  return import_ts_utils_lib18.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+var import_core18 = require("@tspro/web-music-score/core");
+var assertingFunction = "";
+function setAssertFunction(fnName, ...fnArgs) {
+  let argsStr = fnArgs.map((arg) => JSON.stringify(arg)).join(", ");
+  assertingFunction = `DocumentBuilder.${fnName}(${argsStr})`;
 }
-function isStringNumber(value) {
-  return import_ts_utils_lib18.Utils.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+function assertArg(...conditions) {
+  conditions.forEach((condition) => {
+    if (!condition) throw new import_core18.MusicError(import_core18.MusicErrorType.Score, assertingFunction);
+  });
 }
-function isVerseNumber(value) {
-  return import_ts_utils_lib18.Utils.Is.isNumber(value) && getVerseNumbers().indexOf(value) >= 0;
+function assertArgMsg(condition, msg) {
+  if (!condition) throw new import_core18.MusicError(import_core18.MusicErrorType.Score, msg);
 }
 function assertBaseConfig(baseConfig) {
   var _a;
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(baseConfig), "baseConfig", baseConfig);
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(baseConfig.name), "baseConfig.name", baseConfig.name);
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(baseConfig.voiceId) || isVoiceId(baseConfig.voiceId) || import_ts_utils_lib18.Utils.Is.isArray(baseConfig.voiceId) && baseConfig.voiceId.every((voiceId) => isVoiceId(voiceId)), "baseConfig.voiceId", baseConfig.voiceId);
-  if (!import_ts_utils_lib18.Utils.Is.isUndefined(baseConfig.voiceIds)) {
-    assertArg(isVoiceId(baseConfig.voiceIds) || import_ts_utils_lib18.Utils.Is.isArray(baseConfig.voiceIds) && baseConfig.voiceIds.every((voiceId) => isVoiceId(voiceId)), "baseConfig.voiceIds", baseConfig.voiceIds);
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(baseConfig),
+    import_ts_utils_lib32.Guard.isStringOrUndefined(baseConfig.name),
+    import_ts_utils_lib32.Guard.isUndefined(baseConfig.voiceId) || isVoiceId(baseConfig.voiceId) || import_ts_utils_lib32.Guard.isArray(baseConfig.voiceId) && baseConfig.voiceId.every((voiceId) => isVoiceId(voiceId))
+  );
+  if (!import_ts_utils_lib32.Guard.isUndefined(baseConfig.voiceIds)) {
+    assertArg(isVoiceId(baseConfig.voiceIds) || import_ts_utils_lib32.Guard.isArray(baseConfig.voiceIds) && baseConfig.voiceIds.every((voiceId) => isVoiceId(voiceId)));
     console.warn(`Staff/tab config property 'voiceIds' is deprecated, use 'voiceId' instead.`);
-    let arr = import_ts_utils_lib18.Utils.Arr.toArray((_a = baseConfig.voiceId) != null ? _a : []);
-    import_ts_utils_lib18.Utils.Arr.toArray(baseConfig.voiceIds).forEach((voiceId) => arr.push(voiceId));
+    let arr = import_ts_utils_lib32.Utils.Arr.toArray((_a = baseConfig.voiceId) != null ? _a : []);
+    import_ts_utils_lib32.Utils.Arr.toArray(baseConfig.voiceIds).forEach((voiceId) => arr.push(voiceId));
     baseConfig.voiceId = arr;
   }
-  if (import_ts_utils_lib18.Utils.Is.isArray(baseConfig.voiceId)) {
-    baseConfig.voiceId = import_ts_utils_lib18.Utils.Arr.removeDuplicates(baseConfig.voiceId);
+  if (import_ts_utils_lib32.Guard.isArray(baseConfig.voiceId)) {
+    baseConfig.voiceId = import_ts_utils_lib32.Utils.Arr.removeDuplicates(baseConfig.voiceId);
   }
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(baseConfig.instrument), "baseConfig.instrument", baseConfig.instrument);
+  assertArg(import_ts_utils_lib32.Guard.isStringOrUndefined(baseConfig.instrument));
 }
 function assertStaffConfig(staffConfig) {
   assertBaseConfig(staffConfig);
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(staffConfig), "staffConfig", staffConfig);
-  assertArg(staffConfig.type === "staff", "staffConfig.type", staffConfig.type);
-  assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(staffConfig.grandId), "staffConfig.grandId", staffConfig.grandId);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
-  if (!import_ts_utils_lib18.Utils.Is.isUndefined(staffConfig.isGrand)) {
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(staffConfig),
+    import_ts_utils_lib32.Guard.isStrictEqual(staffConfig.type, "staff"),
+    import_ts_utils_lib32.Guard.isEnumValue(staffConfig.clef, Clef),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(staffConfig.isOctaveDown),
+    import_ts_utils_lib32.Guard.isUndefined(staffConfig.minNote) || import_theory13.Note.isNote(staffConfig.minNote),
+    import_ts_utils_lib32.Guard.isUndefined(staffConfig.maxNote) || import_theory13.Note.isNote(staffConfig.maxNote),
+    import_ts_utils_lib32.Guard.isStringOrUndefined(staffConfig.grandId),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(staffConfig.isGrand)
+  );
+  if (!import_ts_utils_lib32.Guard.isUndefined(staffConfig.isGrand))
     console.warn(`Staff config property 'isGrand' is deprecated, use 'grandId' instead.`);
-  }
 }
 function assertTabConfig(tabConfig) {
   assertBaseConfig(tabConfig);
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(tabConfig), "tabConfig", tabConfig);
-  assertArg(tabConfig.type === "tab", "tabConfig.type", tabConfig.type);
-  if (import_ts_utils_lib18.Utils.Is.isString(tabConfig.tuning)) {
-    assertArg(import_theory13.TuningNameList.includes(tabConfig.tuning), "tabConfig.tuning", tabConfig.tuning);
-  } else if (import_ts_utils_lib18.Utils.Is.isArray(tabConfig.tuning)) {
-    assertArg(tabConfig.tuning.length === getStringNumbers().length && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
-  }
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(tabConfig),
+    import_ts_utils_lib32.Guard.isStrictEqual(tabConfig.type, "tab"),
+    import_ts_utils_lib32.Guard.isUndefined(tabConfig.tuning) || import_ts_utils_lib32.Guard.isString(tabConfig.tuning) && import_ts_utils_lib32.Guard.isIncluded(tabConfig.tuning, import_theory13.TuningNameList) || import_ts_utils_lib32.Guard.isArray(tabConfig.tuning) && import_ts_utils_lib32.Guard.isStrictEqual(tabConfig.tuning.length, getStringNumbers().length && tabConfig.tuning.every((s) => import_theory13.Note.isNote(s)))
+  );
 }
 function assertNoteOptions(noteOptions) {
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(noteOptions), "noteOptions", noteOptions);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(noteOptions.dotted) || import_ts_utils_lib18.Utils.Is.isIntegerGte(noteOptions.dotted, 0), "noteOptions.dotted", noteOptions.dotted);
-  assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(noteOptions.stem, Stem), "noteOptions.stem", noteOptions.stem);
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(noteOptions.color), "noteOptions.color", noteOptions.color);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(noteOptions.arpeggio) || import_ts_utils_lib18.Utils.Is.isEnumValue(noteOptions.arpeggio, Arpeggio), "noteOptions.arpeggio", noteOptions.arpeggio);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(noteOptions.staccato), "noteOptions.staccato", noteOptions.staccato);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(noteOptions.diamond), "noteOptions.diamond", noteOptions.diamond);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(noteOptions.triplet), "noteOptions.triplet", noteOptions.triplet);
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || import_ts_utils_lib18.Utils.Is.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string)), "noteOptions.string", noteOptions.string);
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(noteOptions.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
-  assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(noteOptions.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(noteOptions),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(noteOptions.dotted) || import_ts_utils_lib32.Guard.isIntegerGte(noteOptions.dotted, 0),
+    import_ts_utils_lib32.Guard.isEnumValueOrUndefined(noteOptions.stem, Stem),
+    import_ts_utils_lib32.Guard.isStringOrUndefined(noteOptions.color),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(noteOptions.arpeggio) || import_ts_utils_lib32.Guard.isEnumValue(noteOptions.arpeggio, Arpeggio),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(noteOptions.staccato),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(noteOptions.diamond),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(noteOptions.triplet),
+    import_ts_utils_lib32.Guard.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || import_ts_utils_lib32.Guard.isEmptyArray(noteOptions.string) || import_ts_utils_lib32.Guard.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string))
+  );
+  assertArgMsg(import_ts_utils_lib32.Guard.isUndefined(noteOptions.tieSpan), `NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)`);
+  assertArgMsg(import_ts_utils_lib32.Guard.isUndefined(noteOptions.slurSpan), `NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)`);
 }
 function assertRestOptions(restOptions) {
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(restOptions), "restOptions", restOptions);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(restOptions.dotted) || import_ts_utils_lib18.Utils.Is.isIntegerGte(restOptions.dotted, 0), "restOptions.dotted", restOptions.dotted);
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(restOptions.staffPos) || import_ts_utils_lib18.Utils.Is.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof import_theory13.Note, "restOptions.staffPos", restOptions.staffPos);
-  assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(restOptions.color), "restOptions.color", restOptions.color);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(restOptions.hide), "restOptions.hide", restOptions.hide);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(restOptions.triplet), "restOptions.triplet", restOptions.triplet);
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(restOptions),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(restOptions.dotted) || import_ts_utils_lib32.Guard.isIntegerGte(restOptions.dotted, 0),
+    import_ts_utils_lib32.Guard.isStringOrUndefined(restOptions.staffPos) || import_ts_utils_lib32.Guard.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof import_theory13.Note,
+    import_ts_utils_lib32.Guard.isStringOrUndefined(restOptions.color),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(restOptions.hide),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(restOptions.triplet)
+  );
 }
 function assertLyricsOptions(lyricsOptions) {
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(lyricsOptions), "lyricsOptions", lyricsOptions);
-  assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign), "lyricsOptions.align", lyricsOptions.align);
-  assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen), "lyricsOptions.hyphen", lyricsOptions.hyphen);
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(lyricsOptions),
+    import_ts_utils_lib32.Guard.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign),
+    import_ts_utils_lib32.Guard.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen)
+  );
 }
 function assertMeasureOptions(measureOptions) {
-  assertArg(import_ts_utils_lib18.Utils.Is.isObject(measureOptions), "measureOptions", measureOptions);
-  assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(measureOptions.showNumber), "measureOptions.showNumber", measureOptions.showNumber);
+  assertArg(
+    import_ts_utils_lib32.Guard.isObject(measureOptions),
+    import_ts_utils_lib32.Guard.isBooleanOrUndefined(measureOptions.showNumber)
+  );
 }
 function assertStaffTabOrGRoups(staffTabOrGroups) {
   assertArg(
-    import_ts_utils_lib18.Utils.Is.isStringOrUndefined(staffTabOrGroups) || import_ts_utils_lib18.Utils.Is.isIntegerGte(staffTabOrGroups, 0) || import_ts_utils_lib18.Utils.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
-      (staffTabOrGroup) => import_ts_utils_lib18.Utils.Is.isString(staffTabOrGroup) || import_ts_utils_lib18.Utils.Is.isIntegerGte(staffTabOrGroup, 0)
-    ),
-    "staffTabOrGroup",
-    staffTabOrGroups
+    import_ts_utils_lib32.Guard.isStringOrUndefined(staffTabOrGroups) || import_ts_utils_lib32.Guard.isIntegerGte(staffTabOrGroups, 0) || import_ts_utils_lib32.Guard.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every((staffTabOrGroup) => import_ts_utils_lib32.Guard.isString(staffTabOrGroup) || import_ts_utils_lib32.Guard.isIntegerGte(staffTabOrGroup, 0))
   );
 }
-function isNoteLength(noteLen) {
-  try {
-    (0, import_theory13.validateNoteLength)(noteLen);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-function isTupletRatio(tupletRatio) {
-  try {
-    (0, import_theory13.validateTupletRatio)(tupletRatio);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
 var _DocumentBuilder = class _DocumentBuilder {
   /**
    * Create new document builder instance.
@@ -8128,27 +8181,28 @@ var _DocumentBuilder = class _DocumentBuilder {
     this.doc = new ObjDocument();
   }
   setScoreConfiguration(config) {
-    if (import_ts_utils_lib18.Utils.Is.isEnumValue(config, StaffPreset)) {
+    setAssertFunction("setScoreConfiguration", config);
+    if (import_ts_utils_lib32.Guard.isEnumValue(config, StaffPreset)) {
       this.doc.setScoreConfiguration(config);
-    } else if (import_ts_utils_lib18.Utils.Is.isObject(config) && config.type === "staff") {
+    } else if (import_ts_utils_lib32.Guard.isObject(config) && config.type === "staff") {
       assertStaffConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (import_ts_utils_lib18.Utils.Is.isObject(config) && config.type === "tab") {
+    } else if (import_ts_utils_lib32.Guard.isObject(config) && config.type === "tab") {
       assertTabConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (import_ts_utils_lib18.Utils.Is.isNonEmptyArray(config)) {
+    } else if (import_ts_utils_lib32.Guard.isNonEmptyArray(config)) {
       config.forEach((c) => {
-        if (import_ts_utils_lib18.Utils.Is.isObject(c) && c.type === "staff") {
+        if (import_ts_utils_lib32.Guard.isObject(c) && c.type === "staff") {
           assertStaffConfig(c);
-        } else if (import_ts_utils_lib18.Utils.Is.isObject(c) && c.type === "tab") {
+        } else if (import_ts_utils_lib32.Guard.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;
   }
@@ -8171,9 +8225,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   setHeader(title, composer, arranger) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(title), "title", title);
-    assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(composer), "composer", composer);
-    assertArg(import_ts_utils_lib18.Utils.Is.isStringOrUndefined(arranger), "arranger", arranger);
+    setAssertFunction("setHeader", title, composer, arranger);
+    assertArg(
+      import_ts_utils_lib32.Guard.isStringOrUndefined(title),
+      import_ts_utils_lib32.Guard.isStringOrUndefined(composer),
+      import_ts_utils_lib32.Guard.isStringOrUndefined(arranger)
+    );
     this.doc.setHeader(title, composer, arranger);
     return this;
   }
@@ -8183,7 +8240,8 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   setMeasuresPerRow(measuresPerRow) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isIntegerGte(measuresPerRow, 1) || import_ts_utils_lib18.Utils.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
+    setAssertFunction("setMeasuresPerRow", measuresPerRow);
+    assertArg(import_ts_utils_lib32.Guard.isIntegerGte(measuresPerRow, 1) || import_ts_utils_lib32.Guard.isPosInfinity(measuresPerRow));
     this.doc.setMeasuresPerRow(measuresPerRow);
     return this;
   }
@@ -8193,36 +8251,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 import_theory13.Scale || args[0] instanceof import_theory13.KeySignature || import_ts_utils_lib18.Utils.Is.isNonEmptyString(args[0]) && (args.length === 1 || import_ts_utils_lib18.Utils.Is.isEnumValue(args[1], import_theory13.ScaleType)), "keySignature", args);
+    setAssertFunction("setKeySignature", ...args);
+    assertArg(args[0] instanceof import_theory13.Scale || args[0] instanceof import_theory13.KeySignature || import_ts_utils_lib32.Guard.isNonEmptyString(args[0]) && import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[1], import_theory13.ScaleType));
     this.getMeasure().setKeySignature(...args);
     return this;
   }
   setTimeSignature(...args) {
+    setAssertFunction("setTimeSignature", ...args);
     if (args[0] instanceof import_theory13.TimeSignature) {
       this.getMeasure().setTimeSignature(args[0]);
-    } else if (import_ts_utils_lib18.Utils.Is.isEnumValue(args[0], import_theory13.TimeSignatures) && import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(args[1], import_theory13.BeamGrouping)) {
+    } else if (import_ts_utils_lib32.Guard.isEnumValue(args[0], import_theory13.TimeSignatures) && import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[1], import_theory13.BeamGrouping)) {
       this.getMeasure().setTimeSignature(new import_theory13.TimeSignature(args[0], args[1]));
-    } else if (import_ts_utils_lib18.Utils.Is.isIntegerGte(args[0], 1) && import_ts_utils_lib18.Utils.Is.isIntegerGte(args[1], 1) && import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(args[2], import_theory13.BeamGrouping)) {
+    } else if (import_ts_utils_lib32.Guard.isIntegerGte(args[0], 1) && import_ts_utils_lib32.Guard.isIntegerGte(args[1], 1) && import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[2], import_theory13.BeamGrouping)) {
       this.getMeasure().setTimeSignature(new import_theory13.TimeSignature(args[0], args[1], args[2]));
     } else {
-      assertArg(false, "timeSignature args", args);
+      assertArg(false);
     }
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
-    if (beatLength === void 0) {
-      assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(dotted), "dotted", dotted);
-    } else {
-      assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(beatLength, import_theory13.NoteLength) || isNoteLength(beatLength), "beatLength", beatLength);
-      assertArg(import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(dotted) || import_ts_utils_lib18.Utils.Is.isIntegerGte(dotted, 0), "dotted", dotted);
-    }
+    setAssertFunction("setTempo", beatsPerMinute, beatLength, dotted);
+    assertArg(
+      import_ts_utils_lib32.Guard.isIntegerGte(beatsPerMinute, 1),
+      import_ts_utils_lib32.Guard.isUndefined(beatLength) && import_ts_utils_lib32.Guard.isUndefined(dotted) || (0, import_theory13.isNoteLength)(beatLength) && (import_ts_utils_lib32.Guard.isBooleanOrUndefined(dotted) || import_ts_utils_lib32.Guard.isIntegerGte(dotted, 0))
+    );
     this.getMeasure().setTempo(beatsPerMinute, beatLength, dotted);
     return this;
   }
@@ -8235,19 +8294,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 import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note) || import_ts_utils_lib18.Utils.Is.isArray(note) && note.every((note2) => note2 instanceof import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note2)),
-      "note",
-      note
+      isVoiceId(voiceId),
+      note instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note) || import_ts_utils_lib32.Guard.isArray(note) && note.every((note2) => note2 instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note2)),
+      (0, import_theory13.isNoteLength)(noteLength)
     );
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
-    if (import_ts_utils_lib18.Utils.Is.isArray(note)) {
+    if (import_ts_utils_lib32.Guard.isArray(note)) {
       let string = noteOptions.string;
       note.forEach((note2, noteId) => {
-        noteOptions.string = import_ts_utils_lib18.Utils.Is.isArray(string) ? string[noteId] : string;
+        noteOptions.string = import_ts_utils_lib32.Guard.isArray(string) ? string[noteId] : string;
         this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions);
       });
     } else {
@@ -8264,9 +8322,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addChord(voiceId, notes, noteLength, noteOptions) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note)), "notes", notes);
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
+    setAssertFunction("addChord", voiceId, notes, noteLength, noteOptions);
+    assertArg(
+      isVoiceId(voiceId),
+      import_ts_utils_lib32.Guard.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note)),
+      (0, import_theory13.isNoteLength)(noteLength)
+    );
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
     this.getMeasure().addNoteGroup(voiceId, notes, noteLength, noteOptions);
@@ -8280,8 +8341,11 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addRest(voiceId, restLength, restOptions) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(restLength, import_theory13.NoteLength) || isNoteLength(restLength), "restLength", restLength);
+    setAssertFunction("addRest", voiceId, restLength, restOptions);
+    assertArg(
+      isVoiceId(voiceId),
+      (0, import_theory13.isNoteLength)(restLength)
+    );
     restOptions != null ? restOptions : restOptions = {};
     assertRestOptions(restOptions);
     this.getMeasure().addRest(voiceId, restLength, restOptions);
@@ -8303,25 +8367,27 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addTuplet(voiceId, tupletRatio, tupletBuilder) {
-    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(import_ts_utils_lib18.Utils.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
-    assertArg(isTupletRatio(tupletRatio) && import_ts_utils_lib18.Utils.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
+    setAssertFunction("addTuplet", voiceId, tupletRatio);
+    assertArg(
+      isVoiceId(voiceId),
+      import_ts_utils_lib32.Guard.isFunction(tupletBuilder),
+      (0, import_theory13.isTupletRatio)(tupletRatio) && import_ts_utils_lib32.Guard.isBooleanOrUndefined(tupletRatio.showRatio)
+    );
     let tupletSymbols = [];
     const helper = {
       addNote: (note, noteLength, noteOptions) => {
+        setAssertFunction("addTuplet => addNote", note, noteLength, noteOptions);
         assertArg(
-          note instanceof import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note) || import_ts_utils_lib18.Utils.Is.isArray(note) && note.every((note2) => note2 instanceof import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note2)),
-          "note",
-          note
+          note instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note) || import_ts_utils_lib32.Guard.isArray(note) && note.every((note2) => note2 instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note2)),
+          (0, import_theory13.isNoteLength)(noteLength)
         );
-        assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
-        if (import_ts_utils_lib18.Utils.Is.isArray(note)) {
+        if (import_ts_utils_lib32.Guard.isArray(note)) {
           let string = noteOptions.string;
           note.forEach((note2, noteId) => {
-            noteOptions.string = import_ts_utils_lib18.Utils.Is.isArray(string) ? string[noteId] : string;
+            noteOptions.string = import_ts_utils_lib32.Guard.isArray(string) ? string[noteId] : string;
             let s = this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions, tupletRatio);
             tupletSymbols.push(s);
           });
@@ -8332,8 +8398,11 @@ var _DocumentBuilder = class _DocumentBuilder {
         return helper;
       },
       addChord: (notes, noteLength, noteOptions) => {
-        assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib18.Utils.Is.isNonEmptyString(note)), "notes", notes);
-        assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
+        setAssertFunction("addTuplet => addChord", notes, noteLength, noteOptions);
+        assertArg(
+          import_ts_utils_lib32.Guard.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib32.Guard.isNonEmptyString(note)),
+          (0, import_theory13.isNoteLength)(noteLength)
+        );
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
@@ -8342,7 +8411,8 @@ var _DocumentBuilder = class _DocumentBuilder {
         return helper;
       },
       addRest: (restLength, restOptions) => {
-        assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(restLength, import_theory13.NoteLength) || isNoteLength(restLength), "restLength", restLength);
+        setAssertFunction("addTuplet => addRest", restLength, restOptions);
+        assertArg((0, import_theory13.isNoteLength)(restLength));
         restOptions != null ? restOptions : restOptions = {};
         delete restOptions.triplet;
         assertRestOptions(restOptions);
@@ -8358,9 +8428,11 @@ var _DocumentBuilder = class _DocumentBuilder {
   addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
     var _a;
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(isVerseNumber(verse), "verse", verse);
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(lyricsLength, import_theory13.NoteLength), "lyricsLength", lyricsLength);
-    assertArg(import_ts_utils_lib18.Utils.Is.isString(lyricsText) || import_ts_utils_lib18.Utils.Is.isArray(lyricsText) && lyricsText.every((text) => import_ts_utils_lib18.Utils.Is.isString(text)), "lyricsText", lyricsText);
+    assertArg(
+      isVerseNumber(verse),
+      import_ts_utils_lib32.Guard.isEnumValue(lyricsLength, import_theory13.NoteLength),
+      import_ts_utils_lib32.Guard.isString(lyricsText) || import_ts_utils_lib32.Guard.isArray(lyricsText) && lyricsText.every((text) => import_ts_utils_lib32.Guard.isString(text))
+    );
     lyricsOptions != null ? lyricsOptions : lyricsOptions = {};
     assertLyricsOptions(lyricsOptions);
     if (lyricsOptions.align !== void 0) {
@@ -8368,7 +8440,7 @@ var _DocumentBuilder = class _DocumentBuilder {
     } else {
       (_a = lyricsOptions.align) != null ? _a : lyricsOptions.align = this.currentLyricsAlign;
     }
-    if (import_ts_utils_lib18.Utils.Is.isArray(lyricsText)) {
+    if (import_ts_utils_lib32.Guard.isArray(lyricsText)) {
       lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, text, lyricsOptions));
     } else {
       this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions);
@@ -8384,6 +8456,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);
   }
   /**
@@ -8396,11 +8469,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(import_ts_utils_lib18.Utils.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
+    assertArg(import_ts_utils_lib32.Guard.isEnumValue(fermata, Fermata));
     this.getMeasure().addFermata(staffTabOrGroups, fermata);
     return this;
   }
@@ -8410,6 +8484,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addFermata(fermata = "atNote" /* AtNote */) {
+    setAssertFunction("addFermata", fermata);
     return this.addFermataInternal(void 0, fermata);
   }
   /**
@@ -8419,37 +8494,40 @@ 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(import_ts_utils_lib18.Utils.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
-    if (navigation === "endRepeat" /* EndRepeat */ && args.length > 0) {
-      assertArg(import_ts_utils_lib18.Utils.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
-    } else if (navigation === "ending" /* Ending */ && args.length > 0) {
-      assertArg(args.every((passage) => import_ts_utils_lib18.Utils.Is.isIntegerGte(passage, 1)), "passages", args);
-    }
+    assertArg(
+      import_ts_utils_lib32.Guard.isStrictEqual(navigation, "endRepeat" /* EndRepeat */) && import_ts_utils_lib32.Guard.isStrictEqual(args.length, 1) || import_ts_utils_lib32.Guard.isStrictEqual(navigation, "ending" /* Ending */) && import_ts_utils_lib32.Guard.isIntegerGte(args.length, 1) && args.every((passage) => import_ts_utils_lib32.Guard.isIntegerGte(passage, 1)) || import_ts_utils_lib32.Guard.isEnumValue(navigation, Navigation) && import_ts_utils_lib32.Guard.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) {
     annotation != null ? annotation : annotation = getAnnotation(text);
     if (annotation === void 0) {
-      throw new import_core19.MusicError(import_core19.MusicErrorType.Score, `Annotation text "${text}" is not known annotation.`);
+      throw new import_core18.MusicError(import_core18.MusicErrorType.Score, `Annotation text "${text}" is not known annotation.`);
     }
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
-    assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyString(text), "text", text);
+    assertArg(
+      import_ts_utils_lib32.Guard.isEnumValue(annotation, Annotation),
+      import_ts_utils_lib32.Guard.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 {
@@ -8457,6 +8535,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 {
@@ -8465,8 +8544,10 @@ var _DocumentBuilder = class _DocumentBuilder {
   }
   addLabelInternal(staffTabOrGroups, label, text) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(label, Label), "label", label);
-    assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyString(text), "text", text);
+    assertArg(
+      import_ts_utils_lib32.Guard.isEnumValue(label, Label),
+      import_ts_utils_lib32.Guard.isNonEmptyString(text)
+    );
     this.getMeasure().addLabel(staffTabOrGroups, label, text);
     return this;
   }
@@ -8477,6 +8558,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addLabel(label, text) {
+    setAssertFunction("addLabel", label, text);
     return this.addLabelInternal(void 0, label, text);
   }
   /**
@@ -8487,24 +8569,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(import_ts_utils_lib18.Utils.Is.isEnumValue(connective, Connective), "connective", connective);
+    setAssertFunction("addConnective", connective, ...args);
+    assertArg(import_ts_utils_lib32.Guard.isEnumValue(connective, Connective));
     if (connective === "tie" /* Tie */) {
-      assertArg(import_ts_utils_lib18.Utils.Is.isIntegerOrUndefined(args[0]) || import_ts_utils_lib18.Utils.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
-      assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(import_ts_utils_lib32.Guard.isIntegerOrUndefined(args[0]) || import_ts_utils_lib32.Guard.isEnumValue(args[0], TieType));
+      assertArg(import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[1], NoteAnchor));
       let tieSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, tieSpan, noteAnchor);
     } else if (connective === "slur" /* Slur */) {
-      assertArg(import_ts_utils_lib18.Utils.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
-      assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(import_ts_utils_lib32.Guard.isIntegerOrUndefined(args[0]));
+      assertArg(import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[1], NoteAnchor));
       let slurSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, slurSpan, noteAnchor);
     } else if (connective === "slide" /* Slide */) {
-      assertArg(import_ts_utils_lib18.Utils.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
+      assertArg(import_ts_utils_lib32.Guard.isEnumValueOrUndefined(args[0], NoteAnchor));
       let noteAnchor = args[0];
       this.getMeasure().addConnective(connective, noteAnchor);
     }
@@ -8523,26 +8607,31 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addExtension(extensionBuilder) {
-    assertArg(import_ts_utils_lib18.Utils.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(import_ts_utils_lib32.Guard.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(import_ts_utils_lib18.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
-        assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(noteCount) || import_ts_utils_lib18.Utils.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
+        setAssertFunction("addExtension.notes", noteLength, noteCount);
+        assertArg((0, import_theory13.isNoteLength)(noteLength));
+        assertArg(import_ts_utils_lib32.Guard.isUndefined(noteCount) || import_ts_utils_lib32.Guard.isNumber(noteCount) && noteCount >= 0);
         ticks += import_theory13.RhythmProps.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
         return helper;
       },
       measures: (measureCount) => {
-        assertArg(import_ts_utils_lib18.Utils.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
+        setAssertFunction("addExtension.measures", measureCount);
+        assertArg(import_ts_utils_lib32.Guard.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;
       }
@@ -8563,13 +8652,12 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = "auto" /* Auto */) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyString(groupName), "groupName", groupName);
+    setAssertFunction("addStaffGroup", groupName, staffsTabsAndGroups, verticalPosition);
     assertArg(
-      import_ts_utils_lib18.Utils.Is.isNonEmptyString(staffsTabsAndGroups) || import_ts_utils_lib18.Utils.Is.isIntegerGte(staffsTabsAndGroups, 0) || import_ts_utils_lib18.Utils.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => import_ts_utils_lib18.Utils.Is.isNonEmptyString(line) || import_ts_utils_lib18.Utils.Is.isIntegerGte(line, 0)),
-      "staffsTabsAndGroups",
-      staffsTabsAndGroups
+      import_ts_utils_lib32.Guard.isNonEmptyString(groupName),
+      import_ts_utils_lib32.Guard.isNonEmptyString(staffsTabsAndGroups) || import_ts_utils_lib32.Guard.isIntegerGte(staffsTabsAndGroups, 0) || import_ts_utils_lib32.Guard.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => import_ts_utils_lib32.Guard.isNonEmptyString(line) || import_ts_utils_lib32.Guard.isIntegerGte(line, 0)),
+      import_ts_utils_lib32.Guard.isEnumValue(verticalPosition, VerticalPosition)
     );
-    assertArg(import_ts_utils_lib18.Utils.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
     this.doc.addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition);
     return this;
   }
@@ -8578,6 +8666,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   endSong() {
+    setAssertFunction("endSong");
     this.getMeasure().endSong();
     return this;
   }
@@ -8586,6 +8675,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   endSection() {
+    setAssertFunction("endSection");
     this.getMeasure().endSection();
     return this;
   }
@@ -8595,6 +8685,7 @@ var _DocumentBuilder = class _DocumentBuilder {
    */
   endRow() {
     var _a;
+    setAssertFunction("endRow");
     (_a = this.doc.getLastMeasure()) == null ? void 0 : _a.endRow();
     return this;
   }
@@ -8604,7 +8695,8 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   completeRests(voiceId) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isUndefined(voiceId) || isVoiceId(voiceId) || import_ts_utils_lib18.Utils.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
+    setAssertFunction("completeRests", voiceId);
+    assertArg(import_ts_utils_lib32.Guard.isUndefined(voiceId) || isVoiceId(voiceId) || import_ts_utils_lib32.Guard.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)));
     this.getMeasure().completeRests(voiceId);
     return this;
   }
@@ -8616,8 +8708,11 @@ var _DocumentBuilder = class _DocumentBuilder {
    * @returns - This document builder instance.
    */
   addScaleArpeggio(scale, bottomNote, numOctaves) {
-    assertArg(import_ts_utils_lib18.Utils.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
-    assertArg(import_ts_utils_lib18.Utils.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
+    setAssertFunction("addScaleArpeggio", scale, bottomNote, numOctaves);
+    assertArg(
+      import_ts_utils_lib32.Guard.isNonEmptyString(bottomNote),
+      import_ts_utils_lib32.Guard.isIntegerGte(numOctaves, 1)
+    );
     let ts = this.getMeasure().getTimeSignature();
     let notes = scale.getScaleNotes(bottomNote, numOctaves);
     for (let i = 0; i < notes.length; i++) {
@@ -8635,7 +8730,7 @@ __publicField(_DocumentBuilder, "DefaultMeasureOptions", {});
 var DocumentBuilder = _DocumentBuilder;
 
 // src/score/pub/event.ts
-var import_core20 = require("@tspro/web-music-score/core");
+var import_core19 = require("@tspro/web-music-score/core");
 var ScoreEvent = class {
   /**
    * Create new score event instance.
@@ -8678,7 +8773,7 @@ var ScoreObjectEvent = class extends ScoreEvent {
     this.renderContext = renderContext;
     this.objects = objects;
     if (arguments.length === 0) {
-      throw new import_core20.MusicError(import_core20.MusicErrorType.Score, "Empty array in score object event!");
+      throw new import_core19.MusicError(import_core19.MusicErrorType.Score, "Empty array in score object event!");
     }
   }
   /**
@@ -8703,27 +8798,24 @@ var ScoreObjectEvent = class extends ScoreEvent {
 
 // src/score/pub/music-interface.ts
 var Audio2 = __toESM(require("@tspro/web-music-score/audio"));
-var import_ts_utils_lib20 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib34 = require("@tspro/ts-utils-lib");
 
 // src/score/pub/music-objects.ts
-var import_ts_utils_lib19 = require("@tspro/ts-utils-lib");
-var import_core21 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib33 = require("@tspro/ts-utils-lib");
+var import_core20 = require("@tspro/web-music-score/core");
 function assertArg2(condition, argName, argValue) {
   if (!condition) {
-    throw new import_core21.MusicError(import_core21.MusicErrorType.Score, `Invalid arg: ${argName} = ${argValue}`);
+    throw new import_core20.MusicError(import_core20.MusicErrorType.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
-function isVoiceId2(value) {
-  return import_ts_utils_lib19.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
-}
 function getNotationLine(line) {
   if (line instanceof ObjStaff || line instanceof ObjTab) {
     return line.getMusicInterface();
   } else {
-    throw new import_core21.MusicError(import_core21.MusicErrorType.Score, `Notation line not staff nor tab.`);
+    throw new import_core20.MusicError(import_core20.MusicErrorType.Score, `Notation line not staff nor tab.`);
   }
 }
-var MusicInterface6 = class {
+var MusicInterface5 = class {
   /**
    * Create new music interface object.
    * @param name - OBject name.
@@ -8740,7 +8832,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);
@@ -8761,7 +8853,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);
@@ -8775,7 +8867,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);
@@ -8803,7 +8895,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);
@@ -8817,7 +8909,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);
@@ -8838,7 +8930,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);
@@ -8890,14 +8982,14 @@ var _MDocument = class _MDocument extends MusicInterface6 {
    * @returns - Player instance.
    */
   play(playStateChangeListener) {
-    assertArg2(import_ts_utils_lib19.Utils.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg2(import_ts_utils_lib33.Guard.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);
@@ -8920,14 +9012,14 @@ var _MEnding = class _MEnding extends MusicInterface6 {
    * @returns - Boolean whether this ending has asked passage number.
    */
   hasPassage(passage) {
-    assertArg2(import_ts_utils_lib19.Utils.Is.isIntegerGte(passage, 1), "passage", passage);
+    assertArg2(import_ts_utils_lib33.Guard.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);
@@ -8941,7 +9033,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);
@@ -8976,7 +9068,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);
@@ -8990,7 +9082,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);
@@ -9025,7 +9117,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);
@@ -9039,7 +9131,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);
@@ -9053,7 +9145,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);
@@ -9072,7 +9164,7 @@ var _MStaffTabBarLine = class _MStaffTabBarLine extends MusicInterface6 {
     if (barLine instanceof ObjBarLineLeft || barLine instanceof ObjBarLineRight) {
       return barLine.getMusicInterface();
     } else {
-      throw new import_core21.MusicError(import_core21.MusicErrorType.Score, `Bar line not let nor right.`);
+      throw new import_core20.MusicError(import_core20.MusicErrorType.Score, `Bar line not let nor right.`);
     }
   }
   /**
@@ -9086,7 +9178,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);
@@ -9128,7 +9220,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);
@@ -9170,7 +9262,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);
@@ -9212,7 +9304,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);
@@ -9247,7 +9339,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);
@@ -9289,7 +9381,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);
@@ -9306,7 +9398,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();
   }
   /**
@@ -9317,7 +9409,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();
   }
   /**
@@ -9331,7 +9423,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);
@@ -9366,7 +9458,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);
@@ -9401,7 +9493,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);
@@ -9436,7 +9528,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);
@@ -9457,7 +9549,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);
@@ -9478,7 +9570,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);
@@ -9506,7 +9598,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);
@@ -9527,7 +9619,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);
@@ -9548,7 +9640,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);
@@ -9569,7 +9661,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);
@@ -9585,10 +9677,10 @@ __publicField(_MExtensionLine, "Name", "ExtensionLine");
 var MExtensionLine = _MExtensionLine;
 
 // src/score/pub/music-interface.ts
-var import_core22 = require("@tspro/web-music-score/core");
+var import_core21 = require("@tspro/web-music-score/core");
 function assertArg3(condition, argName, argValue) {
   if (!condition) {
-    throw new import_core22.MusicError(import_core22.MusicErrorType.Score, `Invalid arg: ${argName} = ${argValue}`);
+    throw new import_core21.MusicError(import_core21.MusicErrorType.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
 function require_t(t, message) {
@@ -9607,10 +9699,12 @@ var _MPlayer = class _MPlayer {
   constructor(doc, playStateChangeListener) {
     __publicField(this, "player");
     assertArg3(doc instanceof MDocument2, "doc", doc);
-    assertArg3(import_ts_utils_lib20.Utils.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg3(import_ts_utils_lib34.Guard.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);
     }
@@ -9649,7 +9743,7 @@ var _MPlayer = class _MPlayer {
     return this;
   }
 };
-__publicField(_MPlayer, "currentlyPlaying", /* @__PURE__ */ new Set());
+__publicField(_MPlayer, "currentlyPlaying", new import_ts_utils_lib34.ValueSet());
 var MPlayer = _MPlayer;
 var MRenderContext2 = class {
   /**
@@ -9665,7 +9759,7 @@ var MRenderContext2 = class {
    * @returns - This render context instance.
    */
   setDocument(doc) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(import_ts_utils_lib34.Guard.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.ctx.setDocument(doc);
     return this;
   }
@@ -9675,7 +9769,7 @@ var MRenderContext2 = class {
    * @returns - This render context instance.
    */
   setCanvas(canvas) {
-    canvas = require_t(import_ts_utils_lib20.Utils.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(import_ts_utils_lib34.Utils.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;
   }
@@ -9684,7 +9778,7 @@ var MRenderContext2 = class {
    * @param scoreEventListener - Score event listener.
    */
   setScoreEventListener(scoreEventListener) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
+    assertArg3(import_ts_utils_lib34.Guard.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
     this.ctx.setScoreEventListener(scoreEventListener);
   }
   /**
@@ -9759,7 +9853,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns 
    */
   setDocument(doc) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(import_ts_utils_lib34.Guard.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.onStop();
     if (doc) {
       this.player = new MPlayer(doc, (playState) => {
@@ -9803,9 +9897,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayButton(btn, btnLabel) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(import_ts_utils_lib34.Guard.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playButton, this.onPlay);
-    this.playButton = require_t(import_ts_utils_lib20.Utils.Dom.getButton(btn), "Play button required!");
+    this.playButton = require_t(import_ts_utils_lib34.Utils.Dom.getButton(btn), "Play button required!");
     this.playLabel = btnLabel != null ? btnLabel : "Play";
     _MPlaybackButtons.removeOnClickListeners(this.playButton, "all");
     _MPlaybackButtons.addOnClickListener(this.playButton, this.onPlay);
@@ -9819,9 +9913,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setStopButton(btn, btnLabel) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(import_ts_utils_lib34.Guard.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, this.onStop);
-    this.stopButton = require_t(import_ts_utils_lib20.Utils.Dom.getButton(btn), "Stop button required!");
+    this.stopButton = require_t(import_ts_utils_lib34.Utils.Dom.getButton(btn), "Stop button required!");
     this.stopLabel = btnLabel != null ? btnLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, "all");
     _MPlaybackButtons.addOnClickListener(this.stopButton, this.onStop);
@@ -9836,10 +9930,10 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayStopButton(btn, playLabel, stopLabel) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
-    assertArg3(import_ts_utils_lib20.Utils.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
+    assertArg3(import_ts_utils_lib34.Guard.isStringOrUndefined(playLabel), "playLabel", playLabel);
+    assertArg3(import_ts_utils_lib34.Guard.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, this.onPlayStop);
-    this.playStopButton = require_t(import_ts_utils_lib20.Utils.Dom.getButton(btn), "Play/stop button required!");
+    this.playStopButton = require_t(import_ts_utils_lib34.Utils.Dom.getButton(btn), "Play/stop button required!");
     this.playLabel = playLabel != null ? playLabel : "Play";
     this.stopLabel = stopLabel != null ? stopLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, "all");
@@ -9854,42 +9948,40 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPauseButton(btn, btnLabel) {
-    assertArg3(import_ts_utils_lib20.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(import_ts_utils_lib34.Guard.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, this.onPause);
-    this.pauseButton = require_t(import_ts_utils_lib20.Utils.Dom.getButton(btn), "Pause button required!");
+    this.pauseButton = require_t(import_ts_utils_lib34.Utils.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(import_ts_utils_lib20.Utils.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(import_ts_utils_lib34.Guard.isFunction(onClickListener), "onClick", onClickListener);
+    btn.addEventListener("click", onClickListener);
+    this.savedOnClickListeners.getOrCreate(btn, []).push(onClickListener);
   }
 };
-__publicField(_MPlaybackButtons, "savedOnClickListeners", /* @__PURE__ */ new Map());
+__publicField(_MPlaybackButtons, "savedOnClickListeners", new import_ts_utils_lib34.UniMap());
 var MPlaybackButtons = _MPlaybackButtons;
 
 // src/score/index.ts
-var import_core23 = require("@tspro/web-music-score/core");
-(0, import_core23.init)();
+var import_core22 = require("@tspro/web-music-score/core");
+(0, import_core22.init)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Annotation,
@@ -9951,6 +10043,12 @@ var import_core23 = require("@tspro/web-music-score/core");
   VerticalPosition,
   getStringNumbers,
   getVerseNumbers,
-  getVoiceIds
+  getVoiceIds,
+  isStringNumber,
+  isVerseNumber,
+  isVoiceId,
+  validateStringNumber,
+  validateVerseNumber,
+  validateVoiceId
 });
 //# sourceMappingURL=index.js.map