@tspro/web-music-score 5.0.0 → 5.2.0

package/dist/score/index.mjs

@@ -1,10 +1,12 @@
-/* WebMusicScore v5.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
-  RhythmProps
-} from "../chunk-EYFT3RWB.mjs";
+  NoteLengthProps,
+  RhythmProps,
+  validateNoteLength
+} from "../chunk-XUGM7SCC.mjs";
 import {
   __publicField
-} from "../chunk-J3KU3U4W.mjs";
+} from "../chunk-LC5JMIVF.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -286,7 +288,7 @@ var DivRect = class _DivRect {
 };
 
 // src/score/pub/document-builder.ts
-import { Utils as Utils14 } from "@tspro/ts-utils-lib";
+import { Utils as Utils15 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/types.ts
 var StaffPreset = /* @__PURE__ */ ((StaffPreset3) => {
@@ -298,10 +300,10 @@ var StaffPreset = /* @__PURE__ */ ((StaffPreset3) => {
   StaffPreset3["GuitarCombined"] = "guitarCombined";
   return StaffPreset3;
 })(StaffPreset || {});
-var Clef = /* @__PURE__ */ ((Clef2) => {
-  Clef2["G"] = "G";
-  Clef2["F"] = "F";
-  return Clef2;
+var Clef = /* @__PURE__ */ ((Clef4) => {
+  Clef4["G"] = "G";
+  Clef4["F"] = "F";
+  return Clef4;
 })(Clef || {});
 function getVoiceIds() {
   return [0, 1, 2, 3];
@@ -910,15 +912,140 @@ var Renderer = class {
       }
     }
   }
+  getRestRect(restSize) {
+    let { unitSize } = this;
+    let { flagCount } = NoteLengthProps.get(validateNoteLength(restSize + "n"));
+    let leftw = 0;
+    let rightw = 0;
+    let toph = 0;
+    let bottomh = 0;
+    if (NoteLengthProps.equals(restSize, "1n" /* Whole */)) {
+      leftw = unitSize;
+      rightw = unitSize;
+      toph = 0;
+      bottomh = unitSize;
+    } else if (NoteLengthProps.equals(restSize, "2n" /* Half */)) {
+      leftw = unitSize;
+      rightw = unitSize;
+      toph = unitSize;
+      bottomh = 0;
+    } else if (NoteLengthProps.equals(restSize, "4n" /* Quarter */)) {
+      leftw = unitSize * 1;
+      rightw = unitSize * 1;
+      toph = unitSize * 3.2;
+      bottomh = unitSize * 3;
+    } else {
+      let adj = 1 - flagCount % 2;
+      leftw = unitSize * (1 + flagCount * 0.25);
+      rightw = unitSize * (1 + flagCount * 0.125);
+      toph = unitSize * (0.5 + flagCount - adj);
+      bottomh = unitSize * (1 + flagCount + adj);
+    }
+    return new DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
+  }
+  drawRest(restSize, x, y, color) {
+    let ctx = this.getCanvasContext();
+    if (!ctx) {
+      return;
+    }
+    let { unitSize, lineWidth } = this;
+    let { flagCount } = NoteLengthProps.get(validateNoteLength(restSize + "n"));
+    ctx.strokeStyle = ctx.fillStyle = color;
+    ctx.lineWidth = lineWidth;
+    if (NoteLengthProps.equals(restSize, "1n" /* Whole */)) {
+      ctx.fillRect(x - unitSize, y, unitSize * 2, unitSize);
+    } else if (NoteLengthProps.equals(restSize, "2n" /* Half */)) {
+      ctx.fillRect(x - unitSize, y - unitSize, unitSize * 2, unitSize);
+    } else if (NoteLengthProps.equals(restSize, "4n" /* Quarter */)) {
+      ctx.beginPath();
+      ctx.moveTo(x - unitSize * 0.6, y - unitSize * 3.2);
+      ctx.lineTo(x + unitSize * 0.7, y - unitSize * 1.5);
+      ctx.quadraticCurveTo(
+        x - unitSize * 0.8,
+        y - unitSize * 0.5,
+        x + unitSize * 1,
+        y + unitSize * 1.5
+      );
+      ctx.lineTo(x - unitSize * 1, y - unitSize * 0.75);
+      ctx.quadraticCurveTo(
+        x + unitSize * 0.2,
+        y - unitSize * 1.5,
+        x - unitSize * 0.6,
+        y - unitSize * 3.2
+      );
+      ctx.moveTo(x + unitSize * 1, y + unitSize * 1.5);
+      ctx.quadraticCurveTo(
+        x - unitSize * 0.8,
+        y + unitSize * 1,
+        x - unitSize * 0.2,
+        y + unitSize * 2.8
+      );
+      ctx.bezierCurveTo(
+        x - unitSize * 1.8,
+        y + unitSize * 1.5,
+        x - unitSize * 0.6,
+        y - unitSize * 0.2,
+        x + unitSize * 0.9,
+        y + unitSize * 1.5
+      );
+      ctx.fill();
+      ctx.stroke();
+    } else if (flagCount > 0) {
+      let adj = 1 - flagCount % 2;
+      let fx = (p) => x + (-p * 0.25 + 0.5) * unitSize;
+      let fy = (p) => y + (p + adj) * unitSize;
+      ctx.beginPath();
+      ctx.moveTo(fx(1 + flagCount), fy(1 + flagCount));
+      ctx.lineTo(fx(-0.5 - flagCount), fy(-0.5 - flagCount));
+      ctx.stroke();
+      for (let i = 0; i < flagCount; i++) {
+        let t = flagCount - i * 2;
+        ctx.beginPath();
+        ctx.moveTo(fx(t - 2.5), fy(t - 2.5));
+        ctx.quadraticCurveTo(
+          fx(t - 0.5) + unitSize * 0.25,
+          fy(t - 1.5),
+          fx(t - 1.5) - unitSize * 1.5,
+          fy(t - 1.5)
+        );
+        ctx.stroke();
+        ctx.beginPath();
+        ctx.arc(fx(t - 2) - unitSize * 1.5, fy(t - 2), unitSize * 0.5, 0, Math.PI * 2);
+        ctx.fill();
+      }
+    }
+  }
+  drawFlag(rect, dir) {
+    let ctx = this.getCanvasContext();
+    if (!ctx) {
+      return;
+    }
+    let left = rect.left;
+    let right = rect.right;
+    let width = right - left;
+    let top = dir === "up" ? rect.top : rect.bottom;
+    let bottom = dir === "up" ? rect.bottom : rect.top;
+    ctx.beginPath();
+    ctx.moveTo(left, top);
+    ctx.bezierCurveTo(
+      left,
+      top * 0.75 + bottom * 0.25,
+      left + width * 1.5,
+      top * 0.5 + bottom * 0.5,
+      left + width * 0.5,
+      bottom
+    );
+    ctx.stroke();
+  }
 };
 
 // src/score/engine/obj-staff-and-tab.ts
 import { MusicError as MusicError15, MusicErrorType as MusicErrorType15 } from "@tspro/web-music-score/core";
-import { Utils as Utils12 } from "@tspro/ts-utils-lib";
+import { Utils as Utils13 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-measure.ts
-import { Utils as Utils11 } from "@tspro/ts-utils-lib";
-import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps5, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength as validateNoteLength2, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
+import { Utils as Utils12 } from "@tspro/ts-utils-lib";
+import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps5, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength as validateNoteLength3, NoteLengthProps as NoteLengthProps5 } from "@tspro/web-music-score/theory";
 import { getDefaultTempo, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
 
 // src/score/engine/acc-state.ts
@@ -1241,7 +1368,7 @@ var ObjText = class extends MusicObject {
 
 // src/score/engine/obj-signature.ts
 import { MusicError as MusicError4, MusicErrorType as MusicErrorType4 } from "@tspro/web-music-score/core";
-var ObjSignature = class extends MusicObject {
+var ObjStaffSignature = class extends MusicObject {
   constructor(measure, staff) {
     super(measure);
     this.measure = measure;
@@ -1255,7 +1382,7 @@ var ObjSignature = class extends MusicObject {
     __publicField(this, "beatSizeText");
     __publicField(this, "tempoText");
     __publicField(this, "mi");
-    this.mi = new MSignature(this);
+    this.mi = new MStaffSignature(this);
   }
   getMusicInterface() {
     return this.mi;
@@ -1454,66 +1581,169 @@ var ObjSignature = class extends MusicObject {
     }
     x = right;
     if (this.tempoText) {
+      let tempoBottom = Math.min(
+        this.clefImage ? this.clefImage.getRect().top : staff.getTopLineY(),
+        ...this.ksNeutralizeAccidentals.map((o) => o.getRect().top),
+        ...this.ksNewAccidentals.map((o) => o.getRect().top)
+      );
       this.tempoText.layout(renderer);
-      this.tempoText.offset(x, Math.min(this.rect.top, staff.getTopLineY()));
+      this.tempoText.offset(x, tempoBottom);
       this.rect.expandInPlace(this.tempoText.getRect());
     }
     this.rect.right += paddingX;
   }
   offset(dx, dy) {
-    if (this.clefImage) {
-      this.clefImage.offset(dx, dy);
+    var _a, _b, _c, _d, _e, _f;
+    (_a = this.clefImage) == null ? void 0 : _a.offset(dx, dy);
+    (_b = this.eightBelowClef) == null ? void 0 : _b.offset(dx, dy);
+    (_c = this.measureNumber) == null ? void 0 : _c.offset(dx, dy);
+    this.ksNeutralizeAccidentals.forEach((acc) => acc.offset(dx, dy));
+    this.ksNewAccidentals.forEach((acc) => acc.offset(dx, dy));
+    (_d = this.beatCountText) == null ? void 0 : _d.offset(dx, dy);
+    (_e = this.beatSizeText) == null ? void 0 : _e.offset(dx, dy);
+    (_f = this.tempoText) == null ? void 0 : _f.offset(dx, dy);
+    this.rect.offsetInPlace(dx, dy);
+  }
+  draw(renderer) {
+    var _a, _b, _c, _d, _e, _f;
+    (_a = this.clefImage) == null ? void 0 : _a.draw(renderer);
+    (_b = this.eightBelowClef) == null ? void 0 : _b.draw(renderer);
+    (_c = this.measureNumber) == null ? void 0 : _c.draw(renderer);
+    this.ksNeutralizeAccidentals.forEach((acc) => acc.draw(renderer));
+    this.ksNewAccidentals.forEach((acc) => acc.draw(renderer));
+    (_d = this.beatCountText) == null ? void 0 : _d.draw(renderer);
+    (_e = this.beatSizeText) == null ? void 0 : _e.draw(renderer);
+    (_f = this.tempoText) == null ? void 0 : _f.draw(renderer);
+  }
+};
+var ObjTabSignature = class extends MusicObject {
+  constructor(measure, tab) {
+    super(measure);
+    this.measure = measure;
+    this.tab = tab;
+    __publicField(this, "measureNumber");
+    __publicField(this, "beatCountText");
+    __publicField(this, "beatSizeText");
+    __publicField(this, "tempoText");
+    __publicField(this, "mi");
+    this.mi = new MTabSignature(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  updateMeasureNumber(showMeasureNumber) {
+    if (showMeasureNumber) {
+      let text = this.measure.getMeasureNumber().toString();
+      this.measureNumber = new ObjText(this, text, 0, 1);
+    } else {
+      this.measureNumber = void 0;
     }
-    if (this.eightBelowClef) {
-      this.eightBelowClef.offset(dx, dy);
+  }
+  updateTimeSignature(showTimeSignature) {
+    if (showTimeSignature) {
+      let timeSignature = this.measure.getTimeSignature();
+      let beatCount = timeSignature.beatCount.toString();
+      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0.5, 0.5);
+      let beatSize = timeSignature.beatSize.toString();
+      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0.5, 0.5);
+    } else {
+      this.beatCountText = this.beatSizeText = void 0;
     }
-    if (this.measureNumber) {
-      this.measureNumber.offset(dx, dy);
+  }
+  updateTempo(showTempo) {
+    if (showTempo) {
+      let tempoStr = getTempoString(this.measure.getTempo());
+      this.tempoText = new ObjText(this, tempoStr, 0, 1);
+    } else {
+      this.tempoText = void 0;
+    }
+  }
+  pick(x, y) {
+    if (!this.rect.contains(x, y)) {
+      return [];
     }
-    this.ksNeutralizeAccidentals.forEach((acc) => acc.offset(dx, dy));
-    this.ksNewAccidentals.forEach((acc) => acc.offset(dx, dy));
     if (this.beatCountText) {
-      this.beatCountText.offset(dx, dy);
+      let arr = this.beatCountText.pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
     }
     if (this.beatSizeText) {
-      this.beatSizeText.offset(dx, dy);
+      let arr = this.beatSizeText.pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
     }
     if (this.tempoText) {
-      this.tempoText.offset(dx, dy);
-    }
-    this.rect.offsetInPlace(dx, dy);
-  }
-  draw(renderer) {
-    if (this.clefImage) {
-      this.clefImage.draw(renderer);
+      let arr = this.tempoText.pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
     }
-    if (this.eightBelowClef) {
-      this.eightBelowClef.draw(renderer);
+    if (this.measureNumber) {
+      let arr = this.measureNumber.pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
     }
+    return [this];
+  }
+  layout(renderer) {
+    var _a, _b, _c, _d, _e, _f;
+    let { unitSize } = renderer;
+    let { tab } = this;
+    let paddingX = unitSize;
+    let x = 0;
+    let topLineY = tab.getTopLineY();
+    this.rect = new DivRect();
     if (this.measureNumber) {
-      this.measureNumber.draw(renderer);
+      this.measureNumber.layout(renderer);
+      this.measureNumber.offset(0, topLineY);
+      this.rect.expandInPlace(this.measureNumber.getRect());
+      x = Math.max(x, this.rect.right);
     }
-    this.ksNeutralizeAccidentals.forEach((acc) => acc.draw(renderer));
-    this.ksNewAccidentals.forEach((acc) => acc.draw(renderer));
+    (_a = this.beatCountText) == null ? void 0 : _a.layout(renderer);
+    (_b = this.beatSizeText) == null ? void 0 : _b.layout(renderer);
+    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.draw(renderer);
+      this.beatCountText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().centerY - this.beatCountText.getRect().bottomh);
+      this.rect.expandInPlace(this.beatCountText.getRect());
     }
     if (this.beatSizeText) {
-      this.beatSizeText.draw(renderer);
+      this.beatSizeText.offset(0 + tsWidth / 2 + paddingX, tab.getRect().centerY + this.beatSizeText.getRect().toph);
+      this.rect.expandInPlace(this.beatSizeText.getRect());
     }
     if (this.tempoText) {
-      this.tempoText.draw(renderer);
+      this.tempoText.layout(renderer);
+      this.tempoText.offset(x + unitSize * 2, topLineY);
+      this.rect.expandInPlace(this.tempoText.getRect());
     }
+    this.rect.right += paddingX;
+  }
+  offset(dx, dy) {
+    var _a, _b, _c, _d;
+    (_a = this.measureNumber) == null ? void 0 : _a.offset(dx, dy);
+    (_b = this.beatCountText) == null ? void 0 : _b.offset(dx, dy);
+    (_c = this.beatSizeText) == null ? void 0 : _c.offset(dx, dy);
+    (_d = this.tempoText) == null ? void 0 : _d.offset(dx, dy);
+    this.rect.offsetInPlace(dx, dy);
+  }
+  draw(renderer) {
+    var _a, _b, _c, _d;
+    (_a = this.measureNumber) == null ? void 0 : _a.draw(renderer);
+    (_b = this.beatCountText) == null ? void 0 : _b.draw(renderer);
+    (_c = this.beatSizeText) == null ? void 0 : _c.draw(renderer);
+    (_d = this.tempoText) == null ? void 0 : _d.draw(renderer);
   }
 };
 
 // src/score/engine/player.ts
-import { Utils as Utils7 } from "@tspro/ts-utils-lib";
+import { Utils as Utils6 } from "@tspro/ts-utils-lib";
 import { NoteLength as NoteLength6, RhythmProps as RhythmProps4, alterTempoSpeed } from "@tspro/web-music-score/theory";
 import * as Audio from "@tspro/web-music-score/audio";
 
 // src/score/engine/obj-rhythm-column.ts
-import { Note as Note5, validateNoteLength } from "@tspro/web-music-score/theory";
+import { Note as Note5, validateNoteLength as validateNoteLength2 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-arpeggio.ts
 var ObjArpeggio = class extends MusicObject {
@@ -1586,7 +1816,7 @@ var ObjArpeggio = class extends MusicObject {
 };
 
 // src/score/engine/obj-rest.ts
-import { Note as Note3, NoteLength, NoteLengthProps, RhythmProps as RhythmProps2, Tuplet } from "@tspro/web-music-score/theory";
+import { Note as Note3, NoteLengthProps as NoteLengthProps2, RhythmProps as RhythmProps2, Tuplet } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError5, MusicErrorType as MusicErrorType5 } from "@tspro/web-music-score/core";
 function getDiatonicIdFromStaffPos(staffPos) {
   if (typeof staffPos === "number") {
@@ -1661,7 +1891,7 @@ var ObjRest = class extends MusicObject {
     }
     this.color = (_a = options == null ? void 0 : options.color) != null ? _a : "black";
     this.hide = (_b = options == null ? void 0 : options.hide) != null ? _b : false;
-    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps.get(noteLength).isTriplet);
+    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps2.get(noteLength).isTriplet);
     let dotCount = typeof (options == null ? void 0 : options.dotted) === "number" ? options.dotted > 0 ? options.dotted : void 0 : (options == null ? void 0 : options.dotted) === true ? 1 : void 0;
     this.rhythmProps = RhythmProps2.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet.Triplet : void 0);
     this.mi = new MRest(this);
@@ -1723,6 +1953,9 @@ var ObjRest = class extends MusicObject {
       return { staff, x, y, stemHeight };
     });
   }
+  hasTuplet() {
+    return this.rhythmProps.tupletRatio !== void 0;
+  }
   isEmpty() {
     return this.staffObjects.length === 0;
   }
@@ -1759,42 +1992,16 @@ var ObjRest = class extends MusicObject {
     }
     let { unitSize } = renderer;
     let { ownDiatonicId } = this;
-    let { noteSize, dotCount, flagCount } = this.rhythmProps;
-    let leftw = 0;
-    let rightw = 0;
-    let toph = 0;
-    let bottomh = 0;
-    if (NoteLengthProps.equals(noteSize, NoteLength.Whole)) {
-      leftw = unitSize;
-      rightw = unitSize;
-      toph = 0;
-      bottomh = unitSize;
-    } else if (NoteLengthProps.equals(noteSize, NoteLength.Half)) {
-      leftw = unitSize;
-      rightw = unitSize;
-      toph = unitSize;
-      bottomh = 0;
-    } else if (NoteLengthProps.equals(noteSize, NoteLength.Quarter)) {
-      leftw = unitSize * 1;
-      rightw = unitSize * 1;
-      toph = unitSize * 3.2;
-      bottomh = unitSize * 3;
-    } else {
-      let adj = 1 - flagCount % 2;
-      leftw = unitSize * (1 + flagCount * 0.25);
-      rightw = unitSize * (1 + flagCount * 0.125);
-      toph = unitSize * (0.5 + flagCount - adj);
-      bottomh = unitSize * (1 + flagCount + adj);
-    }
+    let { noteSize, dotCount } = this.rhythmProps;
     this.row.getStaves().forEach((staff) => {
       if (!staff.containsDiatonicId(ownDiatonicId) || !staff.containsVoiceId(this.voiceId)) {
         return;
       }
       let obj = new ObjStaffRest(staff, this);
-      obj.restRect = new DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
+      obj.restRect = renderer.getRestRect(noteSize);
       for (let i = 0; i < dotCount; i++) {
         let dotWidth = DocumentSettings.DotSize * unitSize;
-        let dotX = rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize * unitSize) + i * DocumentSettings.DotSize * unitSize * 1.5;
+        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));
       }
@@ -1824,77 +2031,16 @@ var ObjRest = class extends MusicObject {
       return;
     }
     renderer.drawDebugRect(this.getRect());
-    let { unitSize, lineWidth } = renderer;
+    let { lineWidth } = renderer;
     let { color } = this;
-    let { noteSize, flagCount } = this.rhythmProps;
+    let { noteSize } = this.rhythmProps;
     ctx.strokeStyle = ctx.fillStyle = color;
     ctx.lineWidth = lineWidth;
     this.staffObjects.forEach((obj) => {
       let { dotRects, restRect } = obj;
       let x = restRect.centerX;
       let y = restRect.centerY;
-      if (NoteLengthProps.equals(noteSize, NoteLength.Whole)) {
-        ctx.fillRect(x - unitSize, y, unitSize * 2, unitSize);
-      } else if (NoteLengthProps.equals(noteSize, NoteLength.Half)) {
-        ctx.fillRect(x - unitSize, y - unitSize, unitSize * 2, unitSize);
-      } else if (NoteLengthProps.equals(noteSize, NoteLength.Quarter)) {
-        ctx.beginPath();
-        ctx.moveTo(x - unitSize * 0.6, y - unitSize * 3.2);
-        ctx.lineTo(x + unitSize * 0.7, y - unitSize * 1.5);
-        ctx.quadraticCurveTo(
-          x - unitSize * 0.8,
-          y - unitSize * 0.5,
-          x + unitSize * 1,
-          y + unitSize * 1.5
-        );
-        ctx.lineTo(x - unitSize * 1, y - unitSize * 0.75);
-        ctx.quadraticCurveTo(
-          x + unitSize * 0.2,
-          y - unitSize * 1.5,
-          x - unitSize * 0.6,
-          y - unitSize * 3.2
-        );
-        ctx.moveTo(x + unitSize * 1, y + unitSize * 1.5);
-        ctx.quadraticCurveTo(
-          x - unitSize * 0.8,
-          y + unitSize * 1,
-          x - unitSize * 0.2,
-          y + unitSize * 2.8
-        );
-        ctx.bezierCurveTo(
-          x - unitSize * 1.8,
-          y + unitSize * 1.5,
-          x - unitSize * 0.6,
-          y - unitSize * 0.2,
-          x + unitSize * 0.9,
-          y + unitSize * 1.5
-        );
-        ctx.fill();
-        ctx.stroke();
-      } else if (flagCount > 0) {
-        let adj = 1 - flagCount % 2;
-        let fx = (p) => x + (-p * 0.25 + 0.5) * unitSize;
-        let fy = (p) => y + (p + adj) * unitSize;
-        ctx.beginPath();
-        ctx.moveTo(fx(1 + flagCount), fy(1 + flagCount));
-        ctx.lineTo(fx(-0.5 - flagCount), fy(-0.5 - flagCount));
-        ctx.stroke();
-        for (let i = 0; i < flagCount; i++) {
-          let t = flagCount - i * 2;
-          ctx.beginPath();
-          ctx.moveTo(fx(t - 2.5), fy(t - 2.5));
-          ctx.quadraticCurveTo(
-            fx(t - 0.5) + unitSize * 0.25,
-            fy(t - 1.5),
-            fx(t - 1.5) - unitSize * 1.5,
-            fy(t - 1.5)
-          );
-          ctx.stroke();
-          ctx.beginPath();
-          ctx.arc(fx(t - 2) - unitSize * 1.5, fy(t - 2), unitSize * 0.5, 0, Math.PI * 2);
-          ctx.fill();
-        }
-      }
+      renderer.drawRest(noteSize, x, y, color);
       dotRects.forEach((r) => {
         renderer.fillCircle(r.centerX, r.centerY, r.width / 2);
       });
@@ -1903,54 +2049,97 @@ var ObjRest = class extends MusicObject {
 };
 
 // src/score/engine/obj-note-group.ts
-import { Utils as Utils4 } from "@tspro/ts-utils-lib";
-import { Note as Note4, NoteLengthProps as NoteLengthProps3, RhythmProps as RhythmProps3, Tuplet as Tuplet3 } from "@tspro/web-music-score/theory";
-
-// src/score/engine/obj-beam-group.ts
 import { Utils as Utils3 } from "@tspro/ts-utils-lib";
-import { NoteLength as NoteLength2, Tuplet as Tuplet2, NoteLengthProps as NoteLengthProps2 } from "@tspro/web-music-score/theory";
+import { Note as Note4, NoteLengthProps as NoteLengthProps3, RhythmProps as RhythmProps3, Tuplet as Tuplet2 } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError6, MusicErrorType as MusicErrorType6 } from "@tspro/web-music-score/core";
-var adjustBeamAngle = (dx, dy) => {
-  let T = DocumentSettings.BeamAngleFactor;
-  if (!Number.isFinite(T) || T === 0) {
-    return dy;
-  } else {
-    let k = dx / dy / T;
-    k = Math.sign(k) * Math.sqrt(Math.abs(k));
-    return dx / k * T;
-  }
-};
-var BeamPoint = class {
-  constructor(staff, beamGroup, symbol, x, y) {
+function getStem(stem) {
+  return Utils3.Is.isEnumValue(stem, Stem) ? stem : void 0;
+}
+function getArpeggio(a) {
+  return Utils3.Is.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
+}
+function sortNoteStringData(notes, strings) {
+  let stringArr = Utils3.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
+  let noteStringData = notes.map((note, i) => {
+    return { note, string: stringArr[i] };
+  });
+  noteStringData = Utils3.Arr.removeDuplicatesCmp(noteStringData, (a, b) => Note4.equals(a.note, b.note)).sort((a, b) => Note4.compareFunc(a.note, b.note));
+  return {
+    notes: noteStringData.map((e) => e.note),
+    strings: noteStringData.every((e) => e.string === void 0) ? void 0 : noteStringData.map((e) => e.string)
+  };
+}
+var ObjStaffNoteGroup = class extends MusicObject {
+  constructor(staff, noteGroup) {
+    super(staff);
     this.staff = staff;
-    this.beamGroup = beamGroup;
-    this.symbol = symbol;
-    this.x = x;
-    this.y = y;
-    __publicField(this, "topBeamsHeight", 0);
-    __publicField(this, "bottomBeamsHeight", 0);
-    staff.addObject(this);
-  }
-  offset(dx, dy) {
-    this.x += dx;
-    this.y += dy;
-    this.beamGroup.requestRectUpdate();
+    this.noteGroup = noteGroup;
+    __publicField(this, "noteHeadRects", []);
+    __publicField(this, "dotRects", []);
+    __publicField(this, "accidentals", []);
+    __publicField(this, "stemTip");
+    __publicField(this, "stemBase");
+    __publicField(this, "flagRects", []);
+    __publicField(this, "prevTopNoteY", 0);
+    __publicField(this, "prevBottomNoteY", 0);
+    __publicField(this, "mi");
+    this.mi = new MStaffNoteGroup(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  pick(x, y) {
+    if (!this.getRect().contains(x, y)) {
+      return [];
+    }
+    for (let i = 0; i < this.accidentals.length; i++) {
+      let arr = this.accidentals[i].pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
+    }
+    return [this];
+  }
+  updateRect() {
+    this.rect = this.noteHeadRects[0].copy();
+    this.noteHeadRects.forEach((r) => this.rect.expandInPlace(r));
+    if (this.stemTip) this.rect.expandInPlace(this.stemTip);
+    if (this.stemBase) this.rect.expandInPlace(this.stemBase);
+    this.dotRects.forEach((r) => this.rect.expandInPlace(r));
+    this.flagRects.forEach((r) => this.rect.expandInPlace(r));
+    this.accidentals.forEach((a) => this.rect.expandInPlace(a.getRect()));
   }
   getRect() {
-    return new DivRect(this.x, this.x, this.x, this.y - this.topBeamsHeight, this.y, this.y + this.bottomBeamsHeight);
+    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;
+      this.requestRectUpdate();
+    }
+    return super.getRect();
+  }
+  offset(dx, dy) {
+    var _a, _b;
+    this.noteHeadRects.forEach((n) => n.offsetInPlace(dx, dy));
+    this.dotRects.forEach((n) => n.offsetInPlace(dx, dy));
+    this.accidentals.forEach((n) => n.offset(dx, dy));
+    (_a = this.stemTip) == null ? void 0 : _a.offsetInPlace(dx, dy);
+    (_b = this.stemBase) == null ? void 0 : _b.offsetInPlace(dx, dy);
+    this.flagRects.forEach((n) => n.offsetInPlace(dx, dy));
+    this.requestRectUpdate();
+    this.noteGroup.requestRectUpdate();
   }
 };
-var ObjStaffBeamGroup = class extends MusicObject {
-  constructor(staff, beamGroup) {
-    super(staff);
-    this.staff = staff;
-    this.beamGroup = beamGroup;
-    __publicField(this, "tupletNumber");
-    __publicField(this, "tupletNumberOffsetY", 0);
-    __publicField(this, "points", []);
+var ObjTabNoteGroup = class extends MusicObject {
+  constructor(tab, noteGroup) {
+    super(tab);
+    this.tab = tab;
+    this.noteGroup = noteGroup;
+    __publicField(this, "fretNumbers", []);
     __publicField(this, "mi");
-    staff.addObject(this);
-    this.mi = new MStaffBeamGroup(this);
+    tab.addObject(this);
+    this.mi = new MTabNoteGroup(this);
   }
   getMusicInterface() {
     return this.mi;
@@ -1958,95 +2147,102 @@ var ObjStaffBeamGroup = class extends MusicObject {
   pick(x, y) {
     return this.getRect().contains(x, y) ? [this] : [];
   }
+  updateRect() {
+    this.rect = this.fretNumbers[0].getRect().copy();
+    this.fretNumbers.forEach((fn) => this.rect.expandInPlace(fn.getRect()));
+  }
   offset(dx, dy) {
-    var _a;
-    this.points.forEach((p) => p.offset(dx, 0));
-    (_a = this.tupletNumber) == null ? void 0 : _a.offset(dx, dy);
+    this.fretNumbers.forEach((f) => f.offset(dx, dy));
     this.requestRectUpdate();
-    this.beamGroup.requestRectUpdate();
-  }
-  updateRect() {
-    if (this.points.length > 0) {
-      this.rect = this.points[0].getRect().copy();
-    } else if (this.tupletNumber) {
-      this.rect = this.tupletNumber.getRect().copy();
-    }
-    this.points.forEach((pt) => this.rect.expandInPlace(pt.getRect()));
-    if (this.tupletNumber) {
-      this.rect.expandInPlace(this.tupletNumber.getRect());
-    }
+    this.noteGroup.requestRectUpdate();
   }
 };
-var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
-  constructor(symbols, tupletRatio) {
-    super(symbols[0].measure);
-    this.symbols = symbols;
-    this.tupletRatio = tupletRatio;
-    __publicField(this, "mi");
-    __publicField(this, "type");
+var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
+  constructor(col, voiceId, notes, noteLength, options, tupletRatio) {
+    var _a, _b, _c;
+    super(col);
+    this.col = col;
+    this.voiceId = voiceId;
+    this.notes = notes;
+    __publicField(this, "minDiatonicId");
+    __publicField(this, "maxDiatonicId");
+    __publicField(this, "ownDiatonicId");
+    // Average diatonicId of notes.
+    __publicField(this, "ownStemDir");
+    __publicField(this, "ownString");
+    __publicField(this, "color");
+    __publicField(this, "staccato");
+    __publicField(this, "diamond");
+    __publicField(this, "arpeggio");
+    __publicField(this, "oldStyleTriplet");
+    __publicField(this, "rhythmProps");
+    __publicField(this, "startConnnectives", []);
+    __publicField(this, "runningConnectives", []);
+    __publicField(this, "leftBeamCount", 0);
+    __publicField(this, "rightBeamCount", 0);
+    __publicField(this, "beamGroup");
     __publicField(this, "staffObjects", []);
-    this.mi = new MBeamGroup(this);
-    let beamGroupName = tupletRatio ? "Tuplet" : "BeamGroup";
-    if (!symbols.every((s) => s.measure === symbols[0].measure)) {
-      throw new MusicError6(MusicErrorType6.Score, `All ${beamGroupName} symbols are not in same measure.`);
-    } else if (symbols.length < 2) {
-      throw new MusicError6(MusicErrorType6.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);
-      if (symbols.length >= 3 && symbols[0] instanceof ObjNoteGroup && symbols[symbols.length - 1] instanceof ObjNoteGroup && symbols[0].rhythmProps.flagCount === symbols[symbols.length - 1].rhythmProps.flagCount) {
-        isGroup = false;
-      }
-      if (symbols.some((s) => NoteLengthProps2.cmp(s.rhythmProps.noteLength, NoteLength2.Quarter) >= 0)) {
-        isGroup = true;
-      }
-      this.type = isGroup ? 2 /* TupletGroup */ : 1 /* TupletBeam */;
-      ObjNoteGroup.setTupletBeamCounts(this);
-    } else {
-      this.type = 0 /* RegularBeam */;
-    }
-    if (symbols.every((s) => s.getBeamGroup() === void 0)) {
-      symbols.forEach((s) => s.setBeamGroup(this));
-      symbols[0].measure.addBeamGroup(this);
-    } else {
-      throw new MusicError6(MusicErrorType6.Score, `Cannot add ${beamGroupName} because some symbol already has one.`);
+    __publicField(this, "tabObjects", []);
+    __publicField(this, "mi");
+    if (!Utils3.Is.isIntegerGte(notes.length, 1)) {
+      throw new MusicError6(MusicErrorType6.Score, "Cannot create note group object because notes array is empty.");
     }
+    let noteStringData = sortNoteStringData(notes, options == null ? void 0 : options.string);
+    this.notes = noteStringData.notes;
+    this.minDiatonicId = this.notes[0].diatonicId;
+    this.maxDiatonicId = this.notes[this.notes.length - 1].diatonicId;
+    this.ownDiatonicId = this.measure.updateOwnDiatonicId(voiceId, Math.round((this.minDiatonicId + this.maxDiatonicId) / 2));
+    this.ownStemDir = this.measure.updateOwnStemDir(this, getStem(options == null ? void 0 : options.stem));
+    this.ownString = this.measure.updateOwnString(this, noteStringData.strings);
+    this.color = (_a = options == null ? void 0 : options.color) != null ? _a : "black";
+    this.staccato = (_b = options == null ? void 0 : options.staccato) != null ? _b : false;
+    this.diamond = (_c = options == null ? void 0 : options.diamond) != null ? _c : false;
+    this.arpeggio = getArpeggio(options == null ? void 0 : options.arpeggio);
+    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps3.get(noteLength).isTriplet);
+    let dotCount = typeof (options == null ? void 0 : options.dotted) === "number" ? options.dotted > 0 ? options.dotted : void 0 : (options == null ? void 0 : options.dotted) === true ? 1 : void 0;
+    this.rhythmProps = RhythmProps3.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet2.Triplet : void 0);
+    this.mi = new MNoteGroup(this);
   }
-  get showTupletRatio() {
-    var _a;
-    return ((_a = this.tupletRatio) == null ? void 0 : _a.showRatio) === true;
+  getMusicInterface() {
+    return this.mi;
   }
-  static createBeam(noteGroups) {
-    if (noteGroups.length > 1) {
-      new _ObjBeamGroup(noteGroups, void 0);
-    }
+  get doc() {
+    return this.col.doc;
   }
-  static createOldStyleTriplet(symbols) {
-    let s2 = symbols.slice(0, 2);
-    let n2 = s2.map((s) => s.rhythmProps.noteSize);
-    if (s2.length === 2 && s2.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && (n2[0] * 2 === n2[1] || n2[1] * 2 === n2[0])) {
-      new _ObjBeamGroup(s2, Tuplet2.Triplet);
-      return 2;
-    }
-    let s3 = symbols.slice(0, 3);
-    let n3 = s3.map((s) => s.rhythmProps.noteSize);
-    if (s3.length === 3 && s3.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && n3.every((n) => n === n3[0])) {
-      new _ObjBeamGroup(s3, Tuplet2.Triplet);
-      return 3;
-    }
-    return 0;
+  get measure() {
+    return this.col.measure;
   }
-  static createTuplet(symbols, tupletRatio) {
-    new _ObjBeamGroup(symbols, tupletRatio);
+  get row() {
+    return this.col.row;
   }
-  getMusicInterface() {
-    return this.mi;
+  get stemDir() {
+    return this.beamGroup ? this.beamGroup.stemDir : this.ownStemDir;
   }
-  detach() {
-    this.getSymbols().forEach((s) => s.resetBeamGroup());
+  enableConnective(line) {
+    return line.containsVoiceId(this.voiceId) && (line instanceof ObjTab || line.containsDiatonicId(this.ownDiatonicId));
   }
-  isEmpty() {
-    return this.staffObjects.length === 0;
+  startConnective(connectiveProps) {
+    if (!this.row.hasStaff && connectiveProps.connective === "tie" /* Tie */) {
+      throw new MusicError6(MusicErrorType6.Score, "Ties not implemented for guitar tabs alone, staff is required!");
+    } else if (!this.row.hasStaff && connectiveProps.connective === "slur" /* Slur */) {
+      throw new MusicError6(MusicErrorType6.Score, "Slurs not implemented for guitar tabs alone, staff is required!");
+    }
+    this.startConnnectives.push(connectiveProps);
+    this.doc.addConnectiveProps(connectiveProps);
+  }
+  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)) {
@@ -2058,465 +2254,25 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         return [this, ...arr];
       }
     }
-    return [this];
-  }
-  getType() {
-    return this.type;
-  }
-  isTuplet() {
-    return this.type === 1 /* TupletBeam */ || this.type === 2 /* TupletGroup */;
-  }
-  getSymbols() {
-    return this.symbols;
-  }
-  getFirstSymbol() {
-    return this.symbols[0];
+    for (let i = 0; i < this.tabObjects.length; i++) {
+      let arr = this.tabObjects[i].pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
+    }
+    return [];
   }
-  getLastSymbol() {
-    return this.symbols[this.symbols.length - 1];
+  getTopNote() {
+    return this.notes[this.notes.length - 1];
   }
-  get stemDir() {
-    return this.symbols[0].ownStemDir;
-  }
-  layout(renderer) {
-    this.requestRectUpdate();
-    this.staffObjects.length = 0;
-    let symbols = this.getSymbols();
-    if (symbols.length === 0) {
-      return;
-    }
-    let voiceId = symbols[0].voiceId;
-    if (symbols.some((symbol) => symbol.voiceId !== voiceId)) {
-      return;
-    }
-    let { unitSize } = renderer;
-    let { stemDir } = this;
-    let symbolsBeamCoords = symbols.map((s) => s.getBeamCoords());
-    symbolsBeamCoords[0].map((s) => s == null ? void 0 : s.staff).forEach((mainStaff, index) => {
-      var _a, _b;
-      if (!mainStaff) {
-        return;
-      }
-      let symbolX = symbolsBeamCoords.map((s) => {
-        var _a2;
-        return (_a2 = s[index]) == null ? void 0 : _a2.x;
-      });
-      let symbolY = symbolsBeamCoords.map((s) => {
-        var _a2;
-        return (_a2 = s[index]) == null ? void 0 : _a2.y;
-      });
-      let symbolStaff = symbolsBeamCoords.map((s) => {
-        var _a2;
-        return (_a2 = s[index]) == null ? void 0 : _a2.staff;
-      });
-      let symbolStemHeight = symbolsBeamCoords.map((s) => {
-        var _a2;
-        return (_a2 = s[index]) == null ? void 0 : _a2.stemHeight;
-      });
-      let leftSymbol = symbols[0];
-      let leftX = symbolX[0];
-      let leftY = symbolY[0];
-      let leftStaff = symbolStaff[0];
-      let rightSymbol = symbols[symbols.length - 1];
-      let rightX = symbolX[symbolX.length - 1];
-      let rightY = symbolY[symbolY.length - 1];
-      let rightStaff = symbolStaff[symbolY.length - 1];
-      if (leftX === void 0 || leftY === void 0 || leftStaff === void 0 || rightX === void 0 || rightY === void 0 || rightStaff === void 0) {
-        return;
-      }
-      let leftStemHeight = (_a = symbolStemHeight[0]) != null ? _a : 0;
-      let rightStemHeight = (_b = symbolStemHeight[symbolStemHeight.length - 1]) != null ? _b : 0;
-      if (this.type !== 2 /* TupletGroup */) {
-        let leftDy = leftStemHeight < rightStemHeight ? Math.sqrt(rightStemHeight - leftStemHeight) : 0;
-        let rightDy = rightStemHeight < leftStemHeight ? Math.sqrt(leftStemHeight - rightStemHeight) : 0;
-        if (stemDir === "up" /* Up */) {
-          leftDy *= -1;
-          rightDy *= -1;
-        }
-        if (leftDy !== 0) {
-          leftY += leftDy;
-          symbolY[0] += leftDy;
-        }
-        if (rightDy !== 0) {
-          rightY += rightDy;
-          symbolY[symbolY.length - 1] += rightDy;
-        }
-      }
-      let groupLineDy = unitSize * 2 * (stemDir === "up" /* Up */ ? -1 : 1);
-      let centerY = (rightY + leftY) / 2;
-      let halfDy = adjustBeamAngle(rightX - leftX, rightY - leftY) / 2;
-      leftY = centerY - halfDy;
-      rightY = centerY + halfDy;
-      let raiseBeamY = 0;
-      symbolY.forEach((symY, i) => {
-        let symX = symbolX[i];
-        if (symX !== void 0 && symY !== void 0) {
-          let beamY = Utils3.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
-          let raiseY = symY - beamY;
-          if (stemDir === "up" /* Up */ && raiseY < 0) {
-            raiseBeamY = Math.min(raiseBeamY, raiseY);
-          } else if (stemDir === "down" /* Down */ && raiseY > 0) {
-            raiseBeamY = Math.max(raiseBeamY, raiseY);
-          }
-        }
-      });
-      leftY += raiseBeamY;
-      rightY += raiseBeamY;
-      symbolY = symbolY.map((y) => y === void 0 ? void 0 : y + raiseBeamY);
-      let obj = new ObjStaffBeamGroup(mainStaff, this);
-      if (this.type === 2 /* TupletGroup */) {
-        let ef = unitSize / (rightX - leftX);
-        let l = Utils3.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
-        let r = Utils3.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;
-      } else if (this.type === 0 /* RegularBeam */ || this.type === 1 /* TupletBeam */) {
-        raiseBeamY *= 0.5;
-        let { beamThickness } = renderer;
-        const beamHeight = (i) => {
-          let sym = symbols[i];
-          if (sym instanceof ObjNoteGroup) {
-            let beamCount = sym instanceof ObjNoteGroup ? Math.max(sym.getLeftBeamCount(), sym.getRightBeamCount()) : 0;
-            return DocumentSettings.BeamSeparation * unitSize * (this.stemDir === "up" /* Up */ ? beamCount - 1 : 0);
-          } else {
-            return 0;
-          }
-        };
-        symbols.forEach((sym, i) => {
-          let symStaff = symbolStaff[i];
-          let symX = symbolX[i];
-          let symY = symbolY[i];
-          if (symStaff && symX !== void 0 && symY !== void 0) {
-            let pt = new BeamPoint(symStaff, this, sym, symX, symY);
-            pt.topBeamsHeight = beamThickness / 2 + (stemDir === "down" /* Down */ ? beamHeight(i) : 0);
-            pt.bottomBeamsHeight = beamThickness / 2 + (stemDir === "up" /* Up */ ? beamHeight(i) : 0);
-            obj.points.push(pt);
-          }
-        });
-        obj.tupletNumberOffsetY = groupLineDy;
-      }
-      if (this.isTuplet() && this.tupletRatio) {
-        let txt = this.showTupletRatio ? String(this.tupletRatio.parts) + ":" + String(this.tupletRatio.inTimeOf) : String(this.tupletRatio.parts);
-        obj.tupletNumber = new ObjText(this, txt, 0.5, 0.5);
-        obj.tupletNumber.layout(renderer);
-        obj.tupletNumber.offset((leftX + rightX) / 2, (leftY + rightY) / 2 + obj.tupletNumberOffsetY);
-      }
-      if (obj.points.length >= 2) {
-        this.staffObjects.push(obj);
-      }
-    });
-  }
-  updateRect() {
-    if (this.staffObjects.length === 0) {
-      this.rect = new DivRect();
-    } else {
-      this.staffObjects.forEach((obj) => obj.updateRect());
-      this.rect = this.staffObjects[0].getRect().copy();
-      for (let i = 1; i < this.staffObjects.length; i++) {
-        this.rect.expandInPlace(this.staffObjects[i].getRect());
-      }
-    }
-  }
-  updateStemTips() {
-    this.staffObjects.forEach((obj) => {
-      let left = obj.points[0];
-      let right = obj.points[obj.points.length - 1];
-      if (this.type !== 2 /* TupletGroup */) {
-        obj.points.forEach((pt) => {
-          if (pt.symbol instanceof ObjNoteGroup) {
-            if (pt !== left && pt !== right) {
-              pt.y = Utils3.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
-            }
-            pt.symbol.setStemTipY(pt.staff, pt.y);
-          }
-        });
-      }
-      if (obj.tupletNumber) {
-        let y = (left.y + right.y) / 2 + obj.tupletNumberOffsetY;
-        obj.tupletNumber.offset(0, -obj.tupletNumber.getRect().centerY + y);
-      }
-    });
-  }
-  offset(dx, dy) {
-    this.staffObjects.forEach((obj) => obj.offset(dx, 0));
-    this.requestRectUpdate();
-  }
-  draw(renderer) {
-    let { unitSize, beamThickness, lineWidth } = renderer;
-    let color = "black";
-    this.staffObjects.forEach((obj) => {
-      if (this.type === 2 /* TupletGroup */) {
-        let l = obj.points[0];
-        let r = obj.points[obj.points.length - 1];
-        if (l && r) {
-          let tf = obj.tupletNumber ? obj.tupletNumber.getRect().width / (r.x - l.x) * 1.2 : 0;
-          let lc = Utils3.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 - tf / 2);
-          let rc = Utils3.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 + tf / 2);
-          let tipH = this.stemDir === "up" /* Up */ ? unitSize : -unitSize;
-          renderer.drawLine(l.x, l.y, lc.x, lc.y, color, lineWidth);
-          renderer.drawLine(rc.x, rc.y, r.x, r.y, color, lineWidth);
-          renderer.drawLine(l.x, l.y, l.x, l.y + tipH, color, lineWidth);
-          renderer.drawLine(r.x, r.y, r.x, r.y + tipH, color, lineWidth);
-        }
-      } else if (this.type === 0 /* RegularBeam */ || this.type === 1 /* TupletBeam */) {
-        let beamSeparation = DocumentSettings.BeamSeparation * unitSize * (this.stemDir === "up" /* Up */ ? 1 : -1);
-        let noteGroupPoints = obj.points.filter((p) => p.symbol instanceof ObjNoteGroup);
-        for (let i = 0; i < noteGroupPoints.length - 1; i++) {
-          let left = noteGroupPoints[i];
-          let right = noteGroupPoints[i + 1];
-          if (!(left.symbol instanceof ObjNoteGroup && right.symbol instanceof ObjNoteGroup)) {
-            continue;
-          }
-          let leftBeamCount = left.symbol.getRightBeamCount();
-          let rightBeamCount = right.symbol.getLeftBeamCount();
-          let lx = left.x;
-          let ly = left.y;
-          let rx = right.x;
-          let ry = right.y;
-          for (let beamId = 0; beamId < Math.max(leftBeamCount, rightBeamCount); beamId++) {
-            if (beamId < leftBeamCount && beamId < rightBeamCount) {
-              renderer.drawLine(lx, ly, rx, ry, color, beamThickness);
-            } else if (leftBeamCount > rightBeamCount) {
-              renderer.drawPartialLine(lx, ly, rx, ry, 0, 0.25, color, beamThickness);
-            } else if (rightBeamCount > leftBeamCount) {
-              renderer.drawPartialLine(lx, ly, rx, ry, 0.75, 1, color, beamThickness);
-            }
-            ly += beamSeparation;
-            ry += beamSeparation;
-          }
-        }
-      }
-      if (obj.tupletNumber) {
-        obj.tupletNumber.draw(renderer);
-      }
-    });
-  }
-};
-
-// src/score/engine/obj-note-group.ts
-import { MusicError as MusicError7, MusicErrorType as MusicErrorType7 } from "@tspro/web-music-score/core";
-function getStem(stem) {
-  return Utils4.Is.isEnumValue(stem, Stem) ? stem : void 0;
-}
-function getArpeggio(a) {
-  return Utils4.Is.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
-}
-function sortNoteStringData(notes, strings) {
-  let stringArr = Utils4.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
-  let noteStringData = notes.map((note, i) => {
-    return { note, string: stringArr[i] };
-  });
-  noteStringData = Utils4.Arr.removeDuplicatesCmp(noteStringData, (a, b) => Note4.equals(a.note, b.note)).sort((a, b) => Note4.compareFunc(a.note, b.note));
-  return {
-    notes: noteStringData.map((e) => e.note),
-    strings: noteStringData.every((e) => e.string === void 0) ? void 0 : noteStringData.map((e) => e.string)
-  };
-}
-var ObjStaffNoteGroup = class extends MusicObject {
-  constructor(staff, noteGroup) {
-    super(staff);
-    this.staff = staff;
-    this.noteGroup = noteGroup;
-    __publicField(this, "noteHeadRects", []);
-    __publicField(this, "dotRects", []);
-    __publicField(this, "accidentals", []);
-    __publicField(this, "stemTip");
-    __publicField(this, "stemBase");
-    __publicField(this, "flagRects", []);
-    __publicField(this, "prevTopNoteY", 0);
-    __publicField(this, "prevBottomNoteY", 0);
-    __publicField(this, "mi");
-    this.mi = new MStaffNoteGroup(this);
-  }
-  getMusicInterface() {
-    return this.mi;
-  }
-  pick(x, y) {
-    if (!this.getRect().contains(x, y)) {
-      return [];
-    }
-    for (let i = 0; i < this.accidentals.length; i++) {
-      let arr = this.accidentals[i].pick(x, y);
-      if (arr.length > 0) {
-        return [this, ...arr];
-      }
-    }
-    return [this];
-  }
-  updateRect() {
-    this.rect = this.noteHeadRects[0].copy();
-    this.noteHeadRects.forEach((r) => this.rect.expandInPlace(r));
-    if (this.stemTip) this.rect.expandInPlace(this.stemTip);
-    if (this.stemBase) this.rect.expandInPlace(this.stemBase);
-    this.dotRects.forEach((r) => this.rect.expandInPlace(r));
-    this.flagRects.forEach((r) => this.rect.expandInPlace(r));
-    this.accidentals.forEach((a) => this.rect.expandInPlace(a.getRect()));
-  }
-  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;
-      this.requestRectUpdate();
-    }
-    return super.getRect();
-  }
-  offset(dx, dy) {
-    var _a, _b;
-    this.noteHeadRects.forEach((n) => n.offsetInPlace(dx, dy));
-    this.dotRects.forEach((n) => n.offsetInPlace(dx, dy));
-    this.accidentals.forEach((n) => n.offset(dx, dy));
-    (_a = this.stemTip) == null ? void 0 : _a.offsetInPlace(dx, dy);
-    (_b = this.stemBase) == null ? void 0 : _b.offsetInPlace(dx, dy);
-    this.flagRects.forEach((n) => n.offsetInPlace(dx, dy));
-    this.requestRectUpdate();
-    this.noteGroup.requestRectUpdate();
-  }
-};
-var ObjTabNoteGroup = class extends MusicObject {
-  constructor(tab, noteGroup) {
-    super(tab);
-    this.tab = tab;
-    this.noteGroup = noteGroup;
-    __publicField(this, "fretNumbers", []);
-    __publicField(this, "mi");
-    tab.addObject(this);
-    this.mi = new MTabNoteGroup(this);
-  }
-  getMusicInterface() {
-    return this.mi;
-  }
-  pick(x, y) {
-    return this.getRect().contains(x, y) ? [this] : [];
-  }
-  updateRect() {
-    this.rect = this.fretNumbers[0].getRect().copy();
-    this.fretNumbers.forEach((fn) => this.rect.expandInPlace(fn.getRect()));
-  }
-  offset(dx, dy) {
-    this.fretNumbers.forEach((f) => f.offset(dx, dy));
-    this.requestRectUpdate();
-    this.noteGroup.requestRectUpdate();
-  }
-};
-var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
-  constructor(col, voiceId, notes, noteLength, options, tupletRatio) {
-    var _a, _b, _c;
-    super(col);
-    this.col = col;
-    this.voiceId = voiceId;
-    this.notes = notes;
-    __publicField(this, "minDiatonicId");
-    __publicField(this, "maxDiatonicId");
-    __publicField(this, "ownDiatonicId");
-    // Average diatonicId of notes.
-    __publicField(this, "ownStemDir");
-    __publicField(this, "ownString");
-    __publicField(this, "color");
-    __publicField(this, "staccato");
-    __publicField(this, "diamond");
-    __publicField(this, "arpeggio");
-    __publicField(this, "oldStyleTriplet");
-    __publicField(this, "rhythmProps");
-    __publicField(this, "startConnnectives", []);
-    __publicField(this, "runningConnectives", []);
-    __publicField(this, "leftBeamCount", 0);
-    __publicField(this, "rightBeamCount", 0);
-    __publicField(this, "beamGroup");
-    __publicField(this, "staffObjects", []);
-    __publicField(this, "tabObjects", []);
-    __publicField(this, "mi");
-    if (!Utils4.Is.isIntegerGte(notes.length, 1)) {
-      throw new MusicError7(MusicErrorType7.Score, "Cannot create note group object because notes array is empty.");
-    }
-    let noteStringData = sortNoteStringData(notes, options == null ? void 0 : options.string);
-    this.notes = noteStringData.notes;
-    this.minDiatonicId = this.notes[0].diatonicId;
-    this.maxDiatonicId = this.notes[this.notes.length - 1].diatonicId;
-    this.ownDiatonicId = this.measure.updateOwnDiatonicId(voiceId, Math.round((this.minDiatonicId + this.maxDiatonicId) / 2));
-    this.ownStemDir = this.measure.updateOwnStemDir(this, getStem(options == null ? void 0 : options.stem));
-    this.ownString = this.measure.updateOwnString(this, noteStringData.strings);
-    this.color = (_a = options == null ? void 0 : options.color) != null ? _a : "black";
-    this.staccato = (_b = options == null ? void 0 : options.staccato) != null ? _b : false;
-    this.diamond = (_c = options == null ? void 0 : options.diamond) != null ? _c : false;
-    this.arpeggio = getArpeggio(options == null ? void 0 : options.arpeggio);
-    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps3.get(noteLength).isTriplet);
-    let dotCount = typeof (options == null ? void 0 : options.dotted) === "number" ? options.dotted > 0 ? options.dotted : void 0 : (options == null ? void 0 : options.dotted) === true ? 1 : void 0;
-    this.rhythmProps = RhythmProps3.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet3.Triplet : void 0);
-    this.mi = new MNoteGroup(this);
-  }
-  getMusicInterface() {
-    return this.mi;
-  }
-  get doc() {
-    return this.col.doc;
-  }
-  get measure() {
-    return this.col.measure;
-  }
-  get row() {
-    return this.col.row;
-  }
-  get stemDir() {
-    return this.beamGroup ? this.beamGroup.stemDir : this.ownStemDir;
-  }
-  enableConnective(line) {
-    return line.containsVoiceId(this.voiceId) && (line instanceof ObjTab || line.containsDiatonicId(this.ownDiatonicId));
-  }
-  startConnective(connectiveProps) {
-    if (!this.row.hasStaff && connectiveProps.connective === "tie" /* Tie */) {
-      throw new MusicError7(MusicErrorType7.Score, "Ties not implemented for guitar tabs alone, staff is required!");
-    } else if (!this.row.hasStaff && connectiveProps.connective === "slur" /* Slur */) {
-      throw new MusicError7(MusicErrorType7.Score, "Slurs not implemented for guitar tabs alone, staff is required!");
-    }
-    this.startConnnectives.push(connectiveProps);
-    this.doc.addConnectiveProps(connectiveProps);
-  }
-  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 [];
-    }
-    for (let i = 0; i < this.staffObjects.length; i++) {
-      let arr = this.staffObjects[i].pick(x, y);
-      if (arr.length > 0) {
-        return [this, ...arr];
-      }
-    }
-    for (let i = 0; i < this.tabObjects.length; i++) {
-      let arr = this.tabObjects[i].pick(x, y);
-      if (arr.length > 0) {
-        return [this, ...arr];
-      }
-    }
-    return [];
-  }
-  getTopNote() {
-    return this.notes[this.notes.length - 1];
-  }
-  getBottomNote() {
-    return this.notes[0];
+  getBottomNote() {
+    return this.notes[0];
   }
   getConnectiveAnchorPoint(connectiveProps, line, noteIndex, noteAnchor, side) {
     if (line instanceof ObjStaff) {
       let staff = line;
       if (noteIndex < 0 || noteIndex >= this.notes.length) {
-        throw new MusicError7(MusicErrorType7.Score, "Invalid noteIndex: " + noteIndex);
+        throw new MusicError6(MusicErrorType6.Score, "Invalid noteIndex: " + noteIndex);
       }
       let obj = this.staffObjects.find((obj2) => obj2.staff === staff);
       if (!obj || noteIndex < 0 || noteIndex >= obj.noteHeadRects.length) {
@@ -2564,7 +2320,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         case "stemTip" /* StemTip */:
           return { x: centerX, y: stemTip.centerY + (stemDir === "up" /* Up */ ? -padding : padding) };
         default:
-          throw new MusicError7(MusicErrorType7.Score, "Invalid noteAnchor: " + noteAnchor);
+          throw new MusicError6(MusicErrorType6.Score, "Invalid noteAnchor: " + noteAnchor);
       }
     } else {
       let tab = line;
@@ -2679,6 +2435,15 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   getRightBeamCount() {
     return this.rightBeamCount;
   }
+  setLeftBeamCount(count) {
+    this.leftBeamCount = count;
+  }
+  setRightBeamCount(count) {
+    this.rightBeamCount = count;
+  }
+  hasTuplet() {
+    return this.rhythmProps.tupletRatio !== void 0;
+  }
   isEmpty() {
     return this.staffObjects.length === 0 && this.tabObjects.length === 0;
   }
@@ -2704,7 +2469,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       if (j >= 0) {
         tieNoteGroups = tieNoteGroups.slice(0, j);
       }
-      return Utils4.Math.sum(tieNoteGroups.map((ng) => ng.rhythmProps.ticks));
+      return Utils3.Math.sum(tieNoteGroups.map((ng) => ng.rhythmProps.ticks));
     });
     return tiedTicks.length === 0 ? this.rhythmProps.ticks : Math.max(...tiedTicks);
   }
@@ -2903,95 +2668,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         ctx.lineTo(obj.stemTip.centerX, obj.stemTip.centerY);
         ctx.stroke();
       }
-      obj.flagRects.forEach((rect) => {
-        let left = rect.left;
-        let right = rect.right;
-        let width = right - left;
-        let top = stemDir === "up" /* Up */ ? rect.top : rect.bottom;
-        let bottom = stemDir === "up" /* Up */ ? rect.bottom : rect.top;
-        ctx.beginPath();
-        ctx.moveTo(left, top);
-        ctx.bezierCurveTo(
-          left,
-          top * 0.75 + bottom * 0.25,
-          left + width * 1.5,
-          top * 0.5 + bottom * 0.5,
-          left + width * 0.5,
-          bottom
-        );
-        ctx.stroke();
-      });
+      obj.flagRects.forEach((rect) => renderer.drawFlag(rect, stemDir === "up" /* Up */ ? "up" : "down"));
     });
     this.tabObjects.forEach((obj) => obj.fretNumbers.forEach((fn) => fn.draw(renderer)));
   }
-  static setBeamCounts(groupNotes) {
-    const isADottedBHalf = (a, b) => {
-      let { flagCount: aFlagCount, noteSize: aNoteSize, dotCount: aDotCount } = a.rhythmProps;
-      let { flagCount: bFlagCount, noteSize: bNoteSize, dotCount: bDotCount } = b.rhythmProps;
-      return aFlagCount > 0 && bFlagCount > 0 && aDotCount > 0 && bDotCount === 0 && aNoteSize * Math.pow(2, aDotCount) === bNoteSize;
-    };
-    for (let i = 0; i < groupNotes.length; i++) {
-      let center = groupNotes[i];
-      let left = groupNotes[i - 1];
-      let right = groupNotes[i + 1];
-      if (center) {
-        center.leftBeamCount = 0;
-        center.rightBeamCount = 0;
-        if (left) {
-          if (left.rhythmProps.flagCount === center.rhythmProps.flagCount || isADottedBHalf(left, center) || isADottedBHalf(center, left)) {
-            center.leftBeamCount = center.rhythmProps.flagCount;
-          } else {
-            center.leftBeamCount = Math.min(left.rhythmProps.flagCount, center.rhythmProps.flagCount);
-          }
-        }
-        if (right) {
-          if (right.rhythmProps.flagCount === center.rhythmProps.flagCount || isADottedBHalf(right, center) || isADottedBHalf(center, right)) {
-            center.rightBeamCount = center.rhythmProps.flagCount;
-          } else {
-            center.rightBeamCount = Math.min(right.rhythmProps.flagCount, center.rhythmProps.flagCount);
-          }
-        }
-      }
-    }
-    let fixAgain;
-    do {
-      fixAgain = false;
-      for (let i = 0; i < groupNotes.length; i++) {
-        let center = groupNotes[i];
-        let left = groupNotes[i - 1];
-        let right = groupNotes[i + 1];
-        if (center && center.leftBeamCount !== center.rhythmProps.flagCount && center.rightBeamCount !== center.rhythmProps.flagCount) {
-          center.leftBeamCount = center.rightBeamCount = 0;
-          if (left && left.rightBeamCount > 0) {
-            left.rightBeamCount = 0;
-            fixAgain = true;
-          }
-          if (right && right.leftBeamCount > 0) {
-            right.leftBeamCount = 0;
-            fixAgain = true;
-          }
-        }
-      }
-    } while (fixAgain);
-  }
-  static setTupletBeamCounts(tuplet) {
-    let type = tuplet.getType();
-    let symbols = tuplet.getSymbols();
-    if (type === 1 /* TupletBeam */) {
-      symbols.forEach((s, i) => {
-        if (s instanceof _ObjNoteGroup) {
-          s.leftBeamCount = i === 0 ? 0 : s.rhythmProps.flagCount;
-          s.rightBeamCount = i === symbols.length - 1 ? 0 : s.rhythmProps.flagCount;
-        }
-      });
-    } else if (type === 2 /* TupletGroup */) {
-      symbols.forEach((s) => {
-        if (s instanceof _ObjNoteGroup) {
-          s.leftBeamCount = s.rightBeamCount = 0;
-        }
-      });
-    }
-  }
   getDotVerticalDisplacement(staff, diatonicId, stemDir) {
     if (staff.isLine(diatonicId)) {
       return stemDir === "up" /* Up */ ? -1 : 1;
@@ -3015,10 +2695,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
 };
 
 // src/score/engine/obj-rhythm-column.ts
-import { MusicError as MusicError8, MusicErrorType as MusicErrorType8 } from "@tspro/web-music-score/core";
+import { MusicError as MusicError7, MusicErrorType as MusicErrorType7 } from "@tspro/web-music-score/core";
 
 // src/score/engine/obj-lyrics.ts
-import { Utils as Utils5 } from "@tspro/ts-utils-lib";
+import { Utils as Utils4 } from "@tspro/ts-utils-lib";
 var LyricsContainer = class {
   constructor(col, lyricsLength) {
     this.col = col;
@@ -3045,7 +2725,7 @@ var ObjLyrics = class extends MusicObject {
     __publicField(this, "text");
     __publicField(this, "mi");
     let halign = (lyricsOptions == null ? void 0 : lyricsOptions.align) === "left" /* Left */ ? 0 : (lyricsOptions == null ? void 0 : lyricsOptions.align) === "right" /* Right */ ? 1 : 0.5;
-    this.hyphen = Utils5.Is.isEnumValue(lyricsOptions == null ? void 0 : lyricsOptions.hyphen, LyricsHyphen) ? lyricsOptions == null ? void 0 : lyricsOptions.hyphen : void 0;
+    this.hyphen = Utils4.Is.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.mi = new MLyrics(this);
@@ -3098,11 +2778,11 @@ var ObjLyrics = class extends MusicObject {
 
 // src/score/engine/obj-rhythm-column.ts
 var noteHeadDataCompareFunc = (a, b) => {
-  let cmp2 = Note5.compareFunc(a.note, b.note);
-  if (cmp2 === 0) {
-    cmp2 = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
+  let cmp = Note5.compareFunc(a.note, b.note);
+  if (cmp === 0) {
+    cmp = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
   }
-  return cmp2;
+  return cmp;
 };
 var ObjRhythmColumn = class extends MusicObject {
   constructor(measure, positionTicks) {
@@ -3110,7 +2790,7 @@ var ObjRhythmColumn = class extends MusicObject {
     this.measure = measure;
     this.positionTicks = positionTicks;
     __publicField(this, "voiceSymbol", []);
-    __publicField(this, "lyricsContainers", []);
+    __publicField(this, "lyricsContainerCache", /* @__PURE__ */ new Map());
     __publicField(this, "minDiatonicId");
     __publicField(this, "maxDiatonicId");
     __publicField(this, "staffMinDiatonicId", /* @__PURE__ */ new Map());
@@ -3140,7 +2820,7 @@ var ObjRhythmColumn = class extends MusicObject {
     if (colId >= 0 && colId < this.measure.getColumnCount()) {
       return this.measure.getColumn(colId + 1);
     } else {
-      throw new MusicError8(MusicErrorType8.Score, "Cannot get next column in measure because current column's id in mesure is invalid.");
+      throw new MusicError7(MusicErrorType7.Score, "Cannot get next column in measure because current column's id in mesure is invalid.");
     }
   }
   /**
@@ -3236,18 +2916,20 @@ var ObjRhythmColumn = class extends MusicObject {
   getVoiceSymbol(voiceId) {
     return this.voiceSymbol[voiceId];
   }
-  getLyricsContainerDatas() {
-    return this.lyricsContainers;
-  }
   getLyricsContainer(verse, line, vpos, lyricsLength) {
-    let data = this.lyricsContainers.find((data2) => data2.verse === verse && data2.line === line && data2.vpos === vpos);
-    if (data === void 0 && lyricsLength !== void 0) {
-      data = { lyricsContainer: new LyricsContainer(this, validateNoteLength(lyricsLength)), verse, line, vpos };
-      this.lyricsContainers.push(data);
-      this.requestLayout();
-      this.requestRectUpdate();
+    let vposMap = this.lyricsContainerCache.get(line);
+    if (vposMap === void 0) {
+      this.lyricsContainerCache.set(line, vposMap = /* @__PURE__ */ new Map());
     }
-    return data == null ? void 0 : data.lyricsContainer;
+    let verseMap = vposMap.get(vpos);
+    if (verseMap === void 0) {
+      vposMap.set(vpos, verseMap = /* @__PURE__ */ new Map());
+    }
+    let lyricsContainer = verseMap.get(verse);
+    if (lyricsContainer === void 0 && lyricsLength !== void 0) {
+      verseMap.set(verse, lyricsContainer = new LyricsContainer(this, validateNoteLength2(lyricsLength)));
+    }
+    return lyricsContainer;
   }
   getMinWidth() {
     let maxNoteSize = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteSize));
@@ -3465,10 +3147,10 @@ var ObjRhythmColumn = class extends MusicObject {
 };
 
 // src/score/engine/extension.ts
-import { MusicError as MusicError9, MusicErrorType as MusicErrorType9 } from "@tspro/web-music-score/core";
+import { MusicError as MusicError8, MusicErrorType as MusicErrorType8 } from "@tspro/web-music-score/core";
 
 // src/score/engine/element-data.ts
-import { Utils as Utils6 } from "@tspro/ts-utils-lib";
+import { Utils as Utils5 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-special-text.ts
 var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
@@ -3590,23 +3272,23 @@ function getNavigationString(navigation) {
   }
 }
 function isDynamicsText(text) {
-  return Utils6.Is.isEnumValue(text, DynamicsAnnotation);
+  return Utils5.Is.isEnumValue(text, DynamicsAnnotation);
 }
 function getDynamicsVolume(text) {
   if (/^(p+|f+|m|mp|mf)$/.test(text)) {
-    let volume = 0.5 - Utils6.Str.charCount(text, "p") * 0.1 + Utils6.Str.charCount(text, "f") * 0.1;
-    return Utils6.Math.clamp(volume, 0, 1);
+    let volume = 0.5 - Utils5.Str.charCount(text, "p") * 0.1 + Utils5.Str.charCount(text, "f") * 0.1;
+    return Utils5.Math.clamp(volume, 0, 1);
   } else {
     return void 0;
   }
 }
 function isTempoText(text) {
-  return Utils6.Is.isEnumValue(text, TempoAnnotation);
+  return Utils5.Is.isEnumValue(text, TempoAnnotation);
 }
 function getAnnotation(text) {
-  if (Utils6.Is.isEnumValue(text, DynamicsAnnotation)) {
+  if (Utils5.Is.isEnumValue(text, DynamicsAnnotation)) {
     return "dynamics" /* Dynamics */;
-  } else if (Utils6.Is.isEnumValue(text, TempoAnnotation)) {
+  } else if (Utils5.Is.isEnumValue(text, TempoAnnotation)) {
     return "tempo" /* Tempo */;
   } else {
     return void 0;
@@ -3649,7 +3331,7 @@ var Extension = class extends MusicObjectLink {
     if (head instanceof ObjText) {
       head.updateAnchorY(getTextAnchorY(linePos));
     } else {
-      throw new MusicError9(MusicErrorType9.Score, "Update anchor's y-coordinate is only implemented for text objects.");
+      throw new MusicError8(MusicErrorType8.Score, "Update anchor's y-coordinate is only implemented for text objects.");
     }
   }
   isVisible() {
@@ -3762,7 +3444,7 @@ var PlayerColumnProps = class {
     return this.speed;
   }
   getTempo() {
-    let speed = Utils7.Math.clamp(this.getSpeed(), 0.1, 10);
+    let speed = Utils6.Math.clamp(this.getSpeed(), 0.1, 10);
     return alterTempoSpeed(this.measure.getTempo(), speed);
   }
   setVolume(volume) {
@@ -3787,7 +3469,7 @@ var PlayerColumnProps = class {
       if (symbolsTicks.length === 0) {
         return 0;
       } else {
-        return Utils7.Math.sum(symbolsTicks) / symbolsTicks.length;
+        return Utils6.Math.sum(symbolsTicks) / symbolsTicks.length;
       }
     }
   }
@@ -3936,7 +3618,7 @@ var Player = class _Player {
         } else if (layoutObj.musicObj.getLink() instanceof Extension) {
           let extension = layoutObj.musicObj.getLink();
           let { columnRange, extensionBreakText } = extension.getExtensionRangeInfo();
-          let totalTicks = Utils7.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
+          let totalTicks = Utils6.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
           switch (text) {
             case "accel." /* accel */: {
               let startSpeed = curSpeed;
@@ -3990,11 +3672,11 @@ var Player = class _Player {
       });
       let speedArr = (_a = speedMap.get(col)) != null ? _a : [];
       if (speedArr.length > 0) {
-        curSpeed = Utils7.Math.sum(speedArr) / speedArr.length;
+        curSpeed = Utils6.Math.sum(speedArr) / speedArr.length;
       }
       let volumeArr = (_b = volumeMap.get(col)) != null ? _b : [];
       if (volumeArr.length > 0) {
-        curVolume = Utils7.Math.sum(volumeArr) / volumeArr.length;
+        curVolume = Utils6.Math.sum(volumeArr) / volumeArr.length;
       }
       col.getPlayerProps().setSpeed(curSpeed);
       col.getPlayerProps().setVolume(curVolume);
@@ -4020,6 +3702,10 @@ var Player = class _Player {
       return;
     }
     const col = this.playerColumnSequence[this.playPos];
+    if (!col) {
+      this.stop();
+      return;
+    }
     const getDuration = (ticks, tempo2) => {
       let seconds = calcTicksDuration(ticks, tempo2);
       return Math.max(0, seconds);
@@ -4104,6 +3790,9 @@ var Player = class _Player {
       return void 0;
     }
     let col = this.playerColumnSequence[this.playPos];
+    if (!col) {
+      return void 0;
+    }
     let measure = col.measure;
     let x = col.getRect().centerX;
     let top = measure.row.getRect().top;
@@ -4268,146 +3957,676 @@ var ObjBarLineLeft = class extends ObjBarLine {
     __publicField(this, "mi");
     this.mi = new MBarLineLeft(this);
   }
-  getMusicInterface() {
-    return this.mi;
+  getMusicInterface() {
+    return this.mi;
+  }
+  solveBarLineType() {
+    let m = this.measure;
+    let prev = m.getPrevMeasure();
+    if (m.hasNavigation("startRepeat" /* StartRepeat */)) {
+      if (prev && prev.row === m.row && prev.hasNavigation("endRepeat" /* EndRepeat */)) {
+        return 0 /* None */;
+      } else {
+        return 4 /* StartRepeat */;
+      }
+    } else {
+      return 0 /* None */;
+    }
+  }
+};
+var ObjBarLineRight = class extends ObjBarLine {
+  constructor(measure) {
+    super(measure);
+    __publicField(this, "playerProps");
+    __publicField(this, "mi");
+    this.playerProps = new PlayerColumnProps(this);
+    this.mi = new MBarLineRight(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  getPlayerProps() {
+    return this.playerProps;
+  }
+  solveBarLineType() {
+    let m = this.measure;
+    let next = m.getNextMeasure();
+    if (m.hasNavigation("endRepeat" /* EndRepeat */)) {
+      if (next && next.row === m.row && next.hasNavigation("startRepeat" /* StartRepeat */)) {
+        return 6 /* EndStartRepeat */;
+      } else {
+        return 5 /* EndRepeat */;
+      }
+    } else if (!m.doc.hasSingleMeasure() && (m.hasEndSong() || !m.getNextMeasure())) {
+      return 3 /* EndSong */;
+    } else if (m.hasEndSection()) {
+      return 2 /* Double */;
+    }
+    if (m === m.row.getLastMeasure() && next && next.row === m.row.getNextRow() && next.hasNavigation("startRepeat" /* StartRepeat */)) {
+      return 2 /* Double */;
+    }
+    if (next && next.hasNavigation("startRepeat" /* StartRepeat */)) {
+      return 0 /* None */;
+    }
+    return 1 /* Single */;
+  }
+};
+
+// src/score/engine/obj-ending.ts
+import { Utils as Utils7 } from "@tspro/ts-utils-lib";
+import { MusicError as MusicError9, MusicErrorType as MusicErrorType9 } from "@tspro/web-music-score/core";
+var ObjEnding = class extends MusicObject {
+  constructor(measure, passages) {
+    super(measure);
+    this.measure = measure;
+    this.passages = passages;
+    __publicField(this, "endingText");
+    __publicField(this, "shapeRects", []);
+    __publicField(this, "mi");
+    this.mi = new MEnding(this);
+    if (!Utils7.Is.isIntegerGte(passages.length, 1)) {
+      throw new MusicError9(MusicErrorType9.Score, "Passages is empty.");
+    } else if (!this.passages.every((p) => Utils7.Is.isIntegerGte(p, 1))) {
+      throw new MusicError9(MusicErrorType9.Score, "Invalid passages: " + this.passages);
+    }
+    this.passages.sort((a, b) => a - b);
+    let text = this.passages.map((p) => p + ".").join("");
+    this.endingText = new ObjText(this, text, 0, 1);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  getShapeRects() {
+    return this.shapeRects;
+  }
+  isSingleMeasureEnding() {
+    let { measure } = this;
+    let next = measure.getNextMeasure();
+    return (next == null ? void 0 : next.hasNavigation("ending" /* Ending */)) === true || measure.hasNavigation("endRepeat" /* EndRepeat */) || measure.isLastMeasure();
+  }
+  hasPassage(pass) {
+    return this.passages.some((p) => p === pass);
+  }
+  getHighestPassage() {
+    return Math.max(0, ...this.passages);
+  }
+  pick(x, y) {
+    return this.rect.contains(x, y) ? [this] : [];
+  }
+  layout(renderer) {
+    this.rect = new DivRect();
+    this.shapeRects = [this.rect.copy()];
+  }
+  layoutFitToMeasure(renderer) {
+    let { unitSize } = renderer;
+    let { measure } = this;
+    this.endingText.layout(renderer);
+    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.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()
+    ];
+  }
+  offset(dx, dy) {
+    this.endingText.offset(dx, dy);
+    this.shapeRects.forEach((r) => r.offsetInPlace(dx, dy));
+    this.rect.offsetInPlace(dx, dy);
+  }
+  draw(renderer) {
+    let ctx = renderer.getCanvasContext();
+    if (!ctx) {
+      return;
+    }
+    let { lineWidth } = renderer;
+    let { rect } = this;
+    renderer.drawDebugRect(this.rect);
+    ctx.strokeStyle = ctx.fillStyle = "black";
+    ctx.lineWidth = lineWidth;
+    ctx.beginPath();
+    ctx.moveTo(rect.left, rect.bottom);
+    ctx.lineTo(rect.left, rect.top);
+    ctx.lineTo(rect.right, rect.top);
+    if (this.isSingleMeasureEnding()) {
+      ctx.lineTo(rect.right, rect.bottom);
+    }
+    ctx.stroke();
+    this.endingText.draw(renderer);
+  }
+};
+
+// src/score/engine/obj-beam-group.ts
+import { Utils as Utils8 } from "@tspro/ts-utils-lib";
+import { NoteLength as NoteLength7, Tuplet as Tuplet3, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
+import { MusicError as MusicError10, MusicErrorType as MusicErrorType10 } from "@tspro/web-music-score/core";
+var adjustBeamAngle = (dx, dy) => {
+  let T = DocumentSettings.BeamAngleFactor;
+  if (!Number.isFinite(T) || T === 0) {
+    return dy;
+  } else {
+    let k = dx / dy / T;
+    k = Math.sign(k) * Math.sqrt(Math.abs(k));
+    return dx / k * T;
+  }
+};
+var BeamPoint = class {
+  constructor(staff, beamGroup, symbol, x, y) {
+    this.staff = staff;
+    this.beamGroup = beamGroup;
+    this.symbol = symbol;
+    this.x = x;
+    this.y = y;
+    __publicField(this, "topBeamsHeight", 0);
+    __publicField(this, "bottomBeamsHeight", 0);
+    staff.addObject(this);
+  }
+  offset(dx, dy) {
+    this.x += dx;
+    this.y += dy;
+    this.beamGroup.requestRectUpdate();
+  }
+  getRect() {
+    return new DivRect(this.x, this.x, this.x, this.y - this.topBeamsHeight, this.y, this.y + this.bottomBeamsHeight);
+  }
+};
+var ObjStaffBeamGroup = class extends MusicObject {
+  constructor(staff, beamGroup) {
+    super(staff);
+    this.staff = staff;
+    this.beamGroup = beamGroup;
+    __publicField(this, "tupletNumber");
+    __publicField(this, "tupletNumberOffsetY", 0);
+    __publicField(this, "points", []);
+    __publicField(this, "mi");
+    staff.addObject(this);
+    this.mi = new MStaffBeamGroup(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  pick(x, y) {
+    return this.getRect().contains(x, y) ? [this] : [];
+  }
+  offset(dx, dy) {
+    var _a;
+    this.points.forEach((p) => p.offset(dx, 0));
+    (_a = this.tupletNumber) == null ? void 0 : _a.offset(dx, dy);
+    this.requestRectUpdate();
+    this.beamGroup.requestRectUpdate();
+  }
+  updateRect() {
+    if (this.points.length > 0) {
+      this.rect = this.points[0].getRect().copy();
+    } else if (this.tupletNumber) {
+      this.rect = this.tupletNumber.getRect().copy();
+    }
+    this.points.forEach((pt) => this.rect.expandInPlace(pt.getRect()));
+    if (this.tupletNumber) {
+      this.rect.expandInPlace(this.tupletNumber.getRect());
+    }
+  }
+};
+var InvalidBeamGroup = class {
+  constructor(beamGroup, message) {
+    this.beamGroup = beamGroup;
+    this.message = message;
+  }
+};
+var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
+  constructor(symbols, tupletRatio) {
+    super(symbols[0].measure);
+    this.symbols = symbols;
+    this.tupletRatio = tupletRatio;
+    __publicField(this, "mi");
+    __publicField(this, "type");
+    __publicField(this, "staffObjects", []);
+    this.mi = new MBeamGroup(this);
+    let beamGroupName = tupletRatio ? "Tuplet" : "BeamGroup";
+    if (!symbols.every((s) => s.measure === symbols[0].measure)) {
+      throw new MusicError10(MusicErrorType10.Score, `All ${beamGroupName} symbols are not in same measure.`);
+    } else if (symbols.length < 2) {
+      throw new MusicError10(MusicErrorType10.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);
+      if (symbols.length >= 3 && symbols[0] instanceof ObjNoteGroup && symbols[symbols.length - 1] instanceof ObjNoteGroup && symbols[0].rhythmProps.flagCount === symbols[symbols.length - 1].rhythmProps.flagCount) {
+        isGroup = false;
+      }
+      if (symbols.some((s) => NoteLengthProps4.cmp(s.rhythmProps.noteLength, NoteLength7.Quarter) >= 0)) {
+        isGroup = true;
+      }
+      this.type = isGroup ? 2 /* TupletGroup */ : 1 /* TupletBeam */;
+      this.setTupletBeamCounts();
+    } else {
+      this.type = 0 /* RegularBeam */;
+      this.setBeamCounts();
+    }
+    if (symbols.every((s) => s.getBeamGroup() === void 0)) {
+      symbols.forEach((s) => s.setBeamGroup(this));
+      symbols[0].measure.addBeamGroup(this);
+    } else {
+      throw new MusicError10(MusicErrorType10.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) => {
+        let first = i === 0;
+        let last = i === this.symbols.length - 1;
+        if (first && sym.getRightBeamCount() === 0 || last && sym.getLeftBeamCount() === 0 || !first && !last && (sym.getLeftBeamCount() === 0 || sym.getRightBeamCount() === 0)) {
+          throw new InvalidBeamGroup(this, "Beam has zero left or right beam count!");
+        }
+      });
+    }
+    if (symbols.some((symbol) => symbol.voiceId !== symbols[0].voiceId)) {
+      if (this.type === 0 /* RegularBeam */) {
+        throw new InvalidBeamGroup(this, "Beam symbols have different voiceId.");
+      } else {
+        throw new MusicError10(MusicErrorType10.Score, `Tuplet symbols have different voiceId.`);
+      }
+    }
+    symbols[0].row.getStaves().forEach((staff) => {
+      if (staff.getActualStaff(symbols[0].ownDiatonicId) && staff.containsVoiceId(symbols[0].voiceId)) {
+        symbols.forEach((sym) => {
+          let actualStaff = staff.getActualStaff(sym.ownDiatonicId);
+          if (!actualStaff || !actualStaff.containsVoiceId(sym.voiceId)) {
+            throw new InvalidBeamGroup(this, "Some of beam or tuplet symbols are not visible!");
+          }
+        });
+      }
+    });
+  }
+  get showTupletRatio() {
+    var _a;
+    return ((_a = this.tupletRatio) == null ? void 0 : _a.showRatio) === true;
   }
-  solveBarLineType() {
-    let m = this.measure;
-    let prev = m.getPrevMeasure();
-    if (m.hasNavigation("startRepeat" /* StartRepeat */)) {
-      if (prev && prev.row === m.row && prev.hasNavigation("endRepeat" /* EndRepeat */)) {
-        return 0 /* None */;
+  static createBeam(noteGroups) {
+    if (noteGroups.length > 1 && noteGroups.every((ng) => !ng.hasTuplet())) {
+      try {
+        new _ObjBeamGroup(noteGroups, void 0);
+        return true;
+      } catch (err) {
+        if (err instanceof InvalidBeamGroup) {
+          err.beamGroup.detach();
+        } else {
+          throw err;
+        }
+      }
+    }
+    return false;
+  }
+  static createOldStyleTriplet(symbols) {
+    try {
+      let s2 = symbols.slice(0, 2);
+      let n2 = s2.map((s) => s.rhythmProps.noteSize);
+      if (s2.length === 2 && s2.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && (n2[0] * 2 === n2[1] || n2[1] * 2 === n2[0])) {
+        new _ObjBeamGroup(s2, Tuplet3.Triplet);
+        return 2;
+      }
+      let s3 = symbols.slice(0, 3);
+      let n3 = s3.map((s) => s.rhythmProps.noteSize);
+      if (s3.length === 3 && s3.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && n3.every((n) => n === n3[0])) {
+        new _ObjBeamGroup(s3, Tuplet3.Triplet);
+        return 3;
+      }
+    } catch (err) {
+      if (err instanceof InvalidBeamGroup) {
+        console.error(err.message);
+        err.beamGroup.detach();
       } else {
-        return 4 /* StartRepeat */;
+        throw err;
       }
-    } else {
-      return 0 /* None */;
     }
+    return 0;
   }
-};
-var ObjBarLineRight = class extends ObjBarLine {
-  constructor(measure) {
-    super(measure);
-    __publicField(this, "playerProps");
-    __publicField(this, "mi");
-    this.playerProps = new PlayerColumnProps(this);
-    this.mi = new MBarLineRight(this);
+  static createTuplet(symbols, tupletRatio) {
+    try {
+      new _ObjBeamGroup(symbols, tupletRatio);
+    } catch (err) {
+      if (err instanceof InvalidBeamGroup) {
+        console.error(err.message);
+        err.beamGroup.detach();
+      } else {
+        throw err;
+      }
+    }
   }
   getMusicInterface() {
     return this.mi;
   }
-  getPlayerProps() {
-    return this.playerProps;
+  detach() {
+    this.getSymbols().forEach((s) => s.resetBeamGroup());
   }
-  solveBarLineType() {
-    let m = this.measure;
-    let next = m.getNextMeasure();
-    if (m.hasNavigation("endRepeat" /* EndRepeat */)) {
-      if (next && next.row === m.row && next.hasNavigation("startRepeat" /* StartRepeat */)) {
-        return 6 /* EndStartRepeat */;
-      } else {
-        return 5 /* EndRepeat */;
-      }
-    } else if (!m.doc.hasSingleMeasure() && (m.hasEndSong() || !m.getNextMeasure())) {
-      return 3 /* EndSong */;
-    } else if (m.hasEndSection()) {
-      return 2 /* Double */;
-    }
-    if (m === m.row.getLastMeasure() && next && next.row === m.row.getNextRow() && next.hasNavigation("startRepeat" /* StartRepeat */)) {
-      return 2 /* Double */;
+  isEmpty() {
+    return this.staffObjects.length === 0;
+  }
+  pick(x, y) {
+    if (!this.getRect().contains(x, y)) {
+      return [];
     }
-    if (next && next.hasNavigation("startRepeat" /* StartRepeat */)) {
-      return 0 /* None */;
+    for (let i = 0; i < this.staffObjects.length; i++) {
+      let arr = this.staffObjects[i].pick(x, y);
+      if (arr.length > 0) {
+        return [this, ...arr];
+      }
     }
-    return 1 /* Single */;
+    return [this];
   }
-};
-
-// src/score/engine/obj-ending.ts
-import { Utils as Utils8 } from "@tspro/ts-utils-lib";
-import { MusicError as MusicError10, MusicErrorType as MusicErrorType10 } from "@tspro/web-music-score/core";
-var ObjEnding = class extends MusicObject {
-  constructor(measure, passages) {
-    super(measure);
-    this.measure = measure;
-    this.passages = passages;
-    __publicField(this, "endingText");
-    __publicField(this, "shapeRects", []);
-    __publicField(this, "mi");
-    this.mi = new MEnding(this);
-    if (!Utils8.Is.isIntegerGte(passages.length, 1)) {
-      throw new MusicError10(MusicErrorType10.Score, "Passages is empty.");
-    } else if (!this.passages.every((p) => Utils8.Is.isIntegerGte(p, 1))) {
-      throw new MusicError10(MusicErrorType10.Score, "Invalid passages: " + this.passages);
-    }
-    this.passages.sort((a, b) => a - b);
-    let text = this.passages.map((p) => p + ".").join("");
-    this.endingText = new ObjText(this, text, 0, 1);
+  getType() {
+    return this.type;
   }
-  getMusicInterface() {
-    return this.mi;
+  isTuplet() {
+    return this.type === 1 /* TupletBeam */ || this.type === 2 /* TupletGroup */;
   }
-  getShapeRects() {
-    return this.shapeRects;
+  getTupletRatioText() {
+    var _a, _b, _c;
+    return this.showTupletRatio ? String((_a = this.tupletRatio) == null ? void 0 : _a.parts) + ":" + String((_b = this.tupletRatio) == null ? void 0 : _b.inTimeOf) : String((_c = this.tupletRatio) == null ? void 0 : _c.parts);
   }
-  isSingleMeasureEnding() {
-    let { measure } = this;
-    let next = measure.getNextMeasure();
-    return (next == null ? void 0 : next.hasNavigation("ending" /* Ending */)) === true || measure.hasNavigation("endRepeat" /* EndRepeat */) || measure.isLastMeasure();
+  getSymbols() {
+    return this.symbols;
   }
-  hasPassage(pass) {
-    return this.passages.some((p) => p === pass);
+  getFirstSymbol() {
+    return this.symbols[0];
   }
-  getHighestPassage() {
-    return Math.max(0, ...this.passages);
+  getLastSymbol() {
+    return this.symbols[this.symbols.length - 1];
   }
-  pick(x, y) {
-    return this.rect.contains(x, y) ? [this] : [];
+  get stemDir() {
+    return this.symbols[0].ownStemDir;
   }
-  layout(renderer) {
-    this.rect = new DivRect();
-    this.shapeRects = [this.rect.copy()];
+  get color() {
+    return this.symbols[0].color;
   }
-  layoutFitToMeasure(renderer) {
+  layout(renderer) {
+    this.requestRectUpdate();
+    this.staffObjects.length = 0;
+    let symbols = this.getSymbols();
+    if (symbols.length === 0) {
+      return;
+    }
     let { unitSize } = renderer;
-    let { measure } = this;
-    this.endingText.layout(renderer);
-    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.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()
-    ];
+    let { stemDir, type } = this;
+    let symbolsBeamCoords = symbols.map((s) => s.getBeamCoords());
+    symbolsBeamCoords[0].map((s) => s == null ? void 0 : s.staff).forEach((mainStaff, index) => {
+      var _a, _b;
+      if (!mainStaff) {
+        return;
+      }
+      let symbolX = symbolsBeamCoords.map((s) => {
+        var _a2;
+        return (_a2 = s[index]) == null ? void 0 : _a2.x;
+      });
+      let symbolY = symbolsBeamCoords.map((s) => {
+        var _a2;
+        return (_a2 = s[index]) == null ? void 0 : _a2.y;
+      });
+      let symbolStaff = symbolsBeamCoords.map((s) => {
+        var _a2;
+        return (_a2 = s[index]) == null ? void 0 : _a2.staff;
+      });
+      let symbolStemHeight = symbolsBeamCoords.map((s) => {
+        var _a2;
+        return (_a2 = s[index]) == null ? void 0 : _a2.stemHeight;
+      });
+      let leftSymbol = symbols[0];
+      let leftX = symbolX[0];
+      let leftY = symbolY[0];
+      let leftStaff = symbolStaff[0];
+      let rightSymbol = symbols[symbols.length - 1];
+      let rightX = symbolX[symbolX.length - 1];
+      let rightY = symbolY[symbolY.length - 1];
+      let rightStaff = symbolStaff[symbolY.length - 1];
+      if (leftX === void 0 || leftY === void 0 || leftStaff === void 0 || rightX === void 0 || rightY === void 0 || rightStaff === void 0) {
+        return;
+      }
+      let leftStemHeight = (_a = symbolStemHeight[0]) != null ? _a : 0;
+      let rightStemHeight = (_b = symbolStemHeight[symbolStemHeight.length - 1]) != null ? _b : 0;
+      if (type !== 2 /* TupletGroup */) {
+        let leftDy = leftStemHeight < rightStemHeight ? Math.sqrt(rightStemHeight - leftStemHeight) : 0;
+        let rightDy = rightStemHeight < leftStemHeight ? Math.sqrt(leftStemHeight - rightStemHeight) : 0;
+        if (stemDir === "up" /* Up */) {
+          leftDy *= -1;
+          rightDy *= -1;
+        }
+        if (leftDy !== 0) {
+          leftY += leftDy;
+          symbolY[0] += leftDy;
+        }
+        if (rightDy !== 0) {
+          rightY += rightDy;
+          symbolY[symbolY.length - 1] += rightDy;
+        }
+      }
+      let groupLineDy = unitSize * 2 * (stemDir === "up" /* Up */ ? -1 : 1);
+      let centerY = (rightY + leftY) / 2;
+      let halfDy = adjustBeamAngle(rightX - leftX, rightY - leftY) / 2;
+      leftY = centerY - halfDy;
+      rightY = centerY + halfDy;
+      let raiseBeamY = 0;
+      symbolY.forEach((symY, i) => {
+        let symX = symbolX[i];
+        if (symX !== void 0 && symY !== void 0) {
+          let beamY = Utils8.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
+          let raiseY = symY - beamY;
+          if (stemDir === "up" /* Up */ && raiseY < 0) {
+            raiseBeamY = Math.min(raiseBeamY, raiseY);
+          } else if (stemDir === "down" /* Down */ && raiseY > 0) {
+            raiseBeamY = Math.max(raiseBeamY, raiseY);
+          }
+        }
+      });
+      leftY += raiseBeamY;
+      rightY += raiseBeamY;
+      symbolY = symbolY.map((y) => y === void 0 ? void 0 : y + raiseBeamY);
+      let obj = new ObjStaffBeamGroup(mainStaff, this);
+      if (type === 2 /* TupletGroup */) {
+        let ef = unitSize / (rightX - leftX);
+        let l = Utils8.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
+        let r = Utils8.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;
+      } else if (type === 0 /* RegularBeam */ || type === 1 /* TupletBeam */) {
+        raiseBeamY *= 0.5;
+        let { beamThickness } = renderer;
+        const beamHeight = (i) => {
+          let sym = symbols[i];
+          if (sym instanceof ObjNoteGroup) {
+            let beamCount = sym instanceof ObjNoteGroup ? Math.max(sym.getLeftBeamCount(), sym.getRightBeamCount()) : 0;
+            return DocumentSettings.BeamSeparation * unitSize * (stemDir === "up" /* Up */ ? beamCount - 1 : 0);
+          } else {
+            return 0;
+          }
+        };
+        symbols.forEach((sym, i) => {
+          let symStaff = symbolStaff[i];
+          let symX = symbolX[i];
+          let symY = symbolY[i];
+          if (symStaff && symX !== void 0 && symY !== void 0) {
+            let pt = new BeamPoint(symStaff, this, sym, symX, symY);
+            switch (stemDir) {
+              case "up" /* Up */:
+                pt.topBeamsHeight = beamThickness / 2;
+                pt.bottomBeamsHeight = beamThickness / 2 + beamHeight(i);
+                break;
+              case "down" /* Down */:
+                pt.topBeamsHeight = beamThickness / 2 + beamHeight(i);
+                pt.bottomBeamsHeight = beamThickness / 2;
+                break;
+            }
+            obj.points.push(pt);
+          }
+        });
+        obj.tupletNumberOffsetY = groupLineDy;
+      }
+      if (this.isTuplet()) {
+        obj.tupletNumber = new ObjText(this, this.getTupletRatioText(), 0.5, 0.5);
+        obj.tupletNumber.layout(renderer);
+        obj.tupletNumber.offset((leftX + rightX) / 2, (leftY + rightY) / 2 + obj.tupletNumberOffsetY);
+      }
+      if (obj.points.length >= 2) {
+        this.staffObjects.push(obj);
+      }
+    });
+  }
+  updateRect() {
+    if (this.staffObjects.length === 0) {
+      this.rect = new DivRect();
+    } else {
+      this.staffObjects.forEach((obj) => obj.updateRect());
+      this.rect = this.staffObjects[0].getRect().copy();
+      for (let i = 1; i < this.staffObjects.length; i++) {
+        this.rect.expandInPlace(this.staffObjects[i].getRect());
+      }
+    }
+  }
+  updateStemTips() {
+    this.staffObjects.forEach((obj) => {
+      let left = obj.points[0];
+      let right = obj.points[obj.points.length - 1];
+      if (this.type !== 2 /* TupletGroup */) {
+        obj.points.forEach((pt) => {
+          if (pt.symbol instanceof ObjNoteGroup) {
+            if (pt !== left && pt !== right) {
+              pt.y = Utils8.Math.interpolateY(left.x, left.y, right.x, right.y, pt.x);
+            }
+            pt.symbol.setStemTipY(pt.staff, pt.y);
+          }
+        });
+      }
+      if (obj.tupletNumber) {
+        let y = (left.y + right.y) / 2 + obj.tupletNumberOffsetY;
+        obj.tupletNumber.offset(0, -obj.tupletNumber.getRect().centerY + y);
+      }
+    });
   }
   offset(dx, dy) {
-    this.endingText.offset(dx, dy);
-    this.shapeRects.forEach((r) => r.offsetInPlace(dx, dy));
-    this.rect.offsetInPlace(dx, dy);
+    this.staffObjects.forEach((obj) => obj.offset(dx, 0));
+    this.requestRectUpdate();
   }
   draw(renderer) {
-    let ctx = renderer.getCanvasContext();
-    if (!ctx) {
-      return;
+    let { unitSize, beamThickness, lineWidth } = renderer;
+    let { stemDir, color, type } = this;
+    if (type === 2 /* TupletGroup */) {
+      let tipHeight = (stemDir === "up" /* Up */ ? 1 : -1) * unitSize;
+      this.staffObjects.forEach((obj) => {
+        let { x: lx, y: ly } = obj.points[0];
+        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 = Utils8.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
+          let rc = Utils8.Math.interpolateCoord(lx, ly, rx, ry, 0.5 + tf / 2);
+          renderer.drawLine(lx, ly, lc.x, lc.y, color, lineWidth);
+          renderer.drawLine(rc.x, rc.y, rx, ry, color, lineWidth);
+        } else {
+          renderer.drawLine(lx, ly, rx, ry, color, lineWidth);
+        }
+        renderer.drawLine(lx, ly, lx, ly + tipHeight, color, lineWidth);
+        renderer.drawLine(rx, ry, rx, ry + tipHeight, color, lineWidth);
+      });
+    } else if (type === 0 /* RegularBeam */ || type === 1 /* TupletBeam */) {
+      this.staffObjects.forEach((obj) => {
+        let noteGroupPoints = obj.points.filter((p) => p.symbol instanceof ObjNoteGroup);
+        let { x: lx, y: ly } = noteGroupPoints[0];
+        let { x: rx, y: ry } = noteGroupPoints[noteGroupPoints.length - 1];
+        let beamSeparation = DocumentSettings.BeamSeparation * unitSize * (stemDir === "up" /* Up */ ? 1 : -1) * (1 + 0.5 * Math.abs(Math.atan2(ry - ly, rx - lx)));
+        for (let i = 0; i < noteGroupPoints.length - 1; i++) {
+          let { x: lx2, y: ly2, symbol: lsymbol } = noteGroupPoints[i];
+          let { x: rx2, y: ry2, symbol: rsymbol } = noteGroupPoints[i + 1];
+          let leftBeamCount = lsymbol.getRightBeamCount();
+          let rightBeamCount = rsymbol.getLeftBeamCount();
+          for (let beamId = 0; beamId < Math.max(leftBeamCount, rightBeamCount); beamId++) {
+            if (beamId < leftBeamCount && beamId < rightBeamCount) {
+              renderer.drawLine(lx2, ly2, rx2, ry2, color, beamThickness);
+            } else if (leftBeamCount > rightBeamCount) {
+              renderer.drawPartialLine(lx2, ly2, rx2, ry2, 0, 0.25, color, beamThickness);
+            } else if (rightBeamCount > leftBeamCount) {
+              renderer.drawPartialLine(lx2, ly2, rx2, ry2, 0.75, 1, color, beamThickness);
+            }
+            ly2 += beamSeparation;
+            ry2 += beamSeparation;
+          }
+        }
+      });
     }
-    let { lineWidth } = renderer;
-    let { rect } = this;
-    renderer.drawDebugRect(this.rect);
-    ctx.strokeStyle = ctx.fillStyle = "black";
-    ctx.lineWidth = lineWidth;
-    ctx.beginPath();
-    ctx.moveTo(rect.left, rect.bottom);
-    ctx.lineTo(rect.left, rect.top);
-    ctx.lineTo(rect.right, rect.top);
-    if (this.isSingleMeasureEnding()) {
-      ctx.lineTo(rect.right, rect.bottom);
+    this.staffObjects.forEach((obj) => {
+      var _a;
+      return (_a = obj.tupletNumber) == null ? void 0 : _a.draw(renderer);
+    });
+  }
+  setBeamCounts() {
+    const isADottedBHalf = (a, b) => {
+      let { flagCount: aFlagCount, noteSize: aNoteSize, dotCount: aDotCount } = a.rhythmProps;
+      let { flagCount: bFlagCount, noteSize: bNoteSize, dotCount: bDotCount } = b.rhythmProps;
+      return aFlagCount > 0 && bFlagCount > 0 && aDotCount > 0 && bDotCount === 0 && aNoteSize * Math.pow(2, aDotCount) === bNoteSize;
+    };
+    let groupNotes = this.symbols.filter((s) => s instanceof ObjNoteGroup);
+    for (let i = 0; i < groupNotes.length; i++) {
+      let center = groupNotes[i];
+      let left = groupNotes[i - 1];
+      let right = groupNotes[i + 1];
+      if (center) {
+        center.setLeftBeamCount(0);
+        center.setRightBeamCount(0);
+        if (left) {
+          if (left.rhythmProps.flagCount === center.rhythmProps.flagCount || isADottedBHalf(left, center) || isADottedBHalf(center, left)) {
+            center.setLeftBeamCount(center.rhythmProps.flagCount);
+          } else {
+            center.setLeftBeamCount(Math.min(left.rhythmProps.flagCount, center.rhythmProps.flagCount));
+          }
+        }
+        if (right) {
+          if (right.rhythmProps.flagCount === center.rhythmProps.flagCount || isADottedBHalf(right, center) || isADottedBHalf(center, right)) {
+            center.setRightBeamCount(center.rhythmProps.flagCount);
+          } else {
+            center.setRightBeamCount(Math.min(right.rhythmProps.flagCount, center.rhythmProps.flagCount));
+          }
+        }
+      }
+    }
+    let fixAgain;
+    do {
+      fixAgain = false;
+      for (let i = 0; i < groupNotes.length; i++) {
+        let center = groupNotes[i];
+        let left = groupNotes[i - 1];
+        let right = groupNotes[i + 1];
+        if (center && center.getLeftBeamCount() !== center.rhythmProps.flagCount && center.getRightBeamCount() !== center.rhythmProps.flagCount) {
+          center.setLeftBeamCount(0);
+          center.setRightBeamCount(0);
+          if (left && left.getRightBeamCount() > 0) {
+            left.setRightBeamCount(0);
+            fixAgain = true;
+          }
+          if (right && right.getLeftBeamCount() > 0) {
+            right.setLeftBeamCount(0);
+            fixAgain = true;
+          }
+        }
+      }
+    } while (fixAgain);
+  }
+  setTupletBeamCounts() {
+    let type = this.getType();
+    let symbols = this.getSymbols();
+    if (type === 1 /* TupletBeam */) {
+      symbols.forEach((s, i) => {
+        if (s instanceof ObjNoteGroup) {
+          s.setLeftBeamCount(i === 0 ? 0 : s.rhythmProps.flagCount);
+          s.setRightBeamCount(i === symbols.length - 1 ? 0 : s.rhythmProps.flagCount);
+        }
+      });
+    } else if (type === 2 /* TupletGroup */) {
+      symbols.forEach((s) => {
+        if (s instanceof ObjNoteGroup) {
+          s.setLeftBeamCount(0);
+          s.setRightBeamCount(0);
+        }
+      });
     }
-    ctx.stroke();
-    this.endingText.draw(renderer);
   }
 };
 
@@ -4852,8 +5071,147 @@ var ConnectiveProps = class {
   }
 };
 
+// src/score/engine/obj-tab-rhythm.ts
+import { Utils as Utils11 } from "@tspro/ts-utils-lib";
+var ObjTabRhythm = class extends MusicObject {
+  constructor(measure, tab) {
+    super(measure);
+    this.measure = measure;
+    this.tab = tab;
+    __publicField(this, "voiceIds");
+    __publicField(this, "mi");
+    // Keep non-static
+    __publicField(this, "tupletPartsTextObjMap", /* @__PURE__ */ new Map());
+    this.voiceIds = getVoiceIds().filter((voiceId) => tab.containsVoiceId(voiceId));
+    this.rect = new DivRect();
+    this.mi = new MTabRhythm(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  pick(x, y) {
+    return this.rect.contains(x, y) ? [this] : [];
+  }
+  layout(renderer) {
+    let columns = this.measure.getColumns();
+    let numColsInVoiceId = getVoiceIds().map((voiceId) => Utils11.Math.sum(columns.map((col) => col.getVoiceSymbol(voiceId) ? 1 : 0)));
+    this.voiceIds.sort((a, b) => Utils11.Math.cmp(numColsInVoiceId[a], numColsInVoiceId[b]));
+    this.rect = new DivRect();
+  }
+  hasTuplets() {
+    return this.measure.getBeamGroups().some((beamGroup) => beamGroup.isTuplet());
+  }
+  layoutFitToMeasure(renderer) {
+    let { unitSize, fontSize } = renderer;
+    let { measure } = this;
+    let { left, right } = measure.getColumnsContentRect();
+    let stemHeight = unitSize * 5;
+    this.rect.left = left;
+    this.rect.centerX = (left + right) / 2;
+    this.rect.right = right;
+    this.rect.top = this.hasTuplets() ? -fontSize : 0;
+    this.rect.centerY = 0;
+    this.rect.bottom = stemHeight;
+  }
+  offset(dx, dy) {
+    this.rect.offsetInPlace(dx, dy);
+  }
+  draw(renderer) {
+    const ctx = renderer.getCanvasContext();
+    if (!ctx) {
+      return;
+    }
+    renderer.drawDebugRect(this.rect);
+    let { unitSize, lineWidth, fontSize } = renderer;
+    let flagSize = unitSize;
+    let dotSpace = unitSize;
+    let dotWidth = unitSize * 0.25;
+    let { bottom, centerY } = this.getRect();
+    let stemTop = centerY;
+    let stemBottom = bottom;
+    let columns = this.measure.getColumns();
+    for (let colId = 0; colId < columns.length; colId++) {
+      let cur = columns[colId];
+      let curVoiceSymbol = this.voiceIds.map((voiceId) => cur.getVoiceSymbol(voiceId)).find((sym) => sym !== void 0);
+      if (!curVoiceSymbol) {
+        continue;
+      }
+      let beamGroup = curVoiceSymbol.getBeamGroup();
+      let symbols = beamGroup ? beamGroup.getSymbols() : [curVoiceSymbol];
+      for (let j = 0; j < symbols.length; j++) {
+        let sym = symbols[j];
+        let nextSym = symbols[j + 1];
+        let colX = sym.col.getRect().centerX;
+        if (sym instanceof ObjNoteGroup) {
+          if (sym.rhythmProps.noteSize >= 2) {
+            let stemThickness = sym.rhythmProps.noteSize === 4 ? lineWidth * 2 : lineWidth;
+            renderer.drawLine(colX, stemBottom, colX, stemTop, "black", stemThickness);
+          }
+          if (symbols.length === 1) {
+            for (let i = 0; i < sym.rhythmProps.flagCount; i++) {
+              renderer.drawFlag(new DivRect(colX, colX + flagSize, stemTop + i * flagSize, stemTop + (i + 2) * flagSize), "up");
+            }
+          }
+          for (let i = 0; i < sym.rhythmProps.dotCount; i++) {
+            renderer.fillCircle(colX + dotSpace * (i + 1), stemBottom - dotWidth, dotWidth);
+          }
+        } else if (sym instanceof ObjRest) {
+          let cx = colX;
+          let cy = (stemTop + stemBottom) / 2;
+          let scale = 0.65;
+          ctx.save();
+          ctx.scale(scale, scale);
+          renderer.drawRest(sym.rhythmProps.noteSize, cx / scale, cy / scale, "black");
+          ctx.restore();
+          for (let i = 0; i < sym.rhythmProps.dotCount; i++) {
+            cx += dotSpace * 1.5;
+            renderer.fillCircle(cx, cy + dotSpace, dotWidth);
+          }
+        }
+        if (nextSym) {
+          let left = sym;
+          let right = nextSym;
+          let leftX = left.col.getRect().centerX;
+          let rightX = right.col.getRect().centerX;
+          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);
+          for (let i = 0; i < maxBeamCount; i++) {
+            let leftT = rightBeamCount > leftBeamCount && i >= leftBeamCount ? 0.75 : 0;
+            let rightT = leftBeamCount > rightBeamCount && i >= rightBeamCount ? 0.25 : 1;
+            renderer.drawPartialLine(leftX, stemTop + i * flagSize, rightX, stemTop + i * flagSize, leftT, rightT, "black", lineWidth * 2);
+          }
+          for (let i = 0; i < left.rhythmProps.dotCount; i++) {
+            renderer.fillCircle(leftX + dotSpace * (i + 1), stemBottom - dotWidth, dotWidth);
+          }
+          for (let i = 0; i < right.rhythmProps.dotCount; i++) {
+            renderer.fillCircle(rightX + dotSpace * (i + 1), stemBottom - dotWidth, dotWidth);
+          }
+        }
+        if (beamGroup && beamGroup.isTuplet()) {
+          let cx = (symbols[0].col.getRect().centerX + symbols[symbols.length - 1].col.getRect().centerX) / 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(renderer);
+          }
+          textObj.offset(-textObj.getRect().centerX, -textObj.getRect().centerY);
+          textObj.offset(cx, stemTop - fontSize / 2);
+          textObj.draw(renderer);
+        }
+        if (symbols.length > 1) {
+          colId = columns.indexOf(symbols[symbols.length - 1].col);
+          if (colId < 0) {
+            colId = columns.length;
+          }
+        }
+      }
+    }
+  }
+};
+
 // src/score/engine/obj-measure.ts
-var cmp = (a, b) => a === b ? 0 : a < b ? -1 : 1;
 function validateVoiceId(voiceId) {
   if (typeof voiceId === "number" && getVoiceIds().indexOf(voiceId) < 0) {
     throw new MusicError13(MusicErrorType13.Score, "Invalid voiceId: " + voiceId);
@@ -4865,7 +5223,7 @@ function getExtensionTicks(extensionLength) {
   if (typeof extensionLength === "string") {
     extensionLength = [extensionLength];
   }
-  if (Utils11.Is.isArray(extensionLength)) {
+  if (Utils12.Is.isArray(extensionLength)) {
     let totalTicks = 0;
     for (let i = 0; i < extensionLength.length; ) {
       let str = extensionLength[i];
@@ -4890,11 +5248,11 @@ function getExtensionTicks(extensionLength) {
 function getVerseLayoutGroupId(verse) {
   switch (verse) {
     case 1:
-      return 7 /* LyricsVerse1 */;
+      return 8 /* LyricsVerse1 */;
     case 2:
-      return 8 /* LyricsVerse2 */;
+      return 9 /* LyricsVerse2 */;
     case 3:
-      return 9 /* LyricsVerse3 */;
+      return 10 /* LyricsVerse3 */;
     default:
       throw new MusicError13(MusicErrorType13.Unknown, "VerseNumber is not 1, 2 or 3.");
   }
@@ -4956,6 +5314,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.updateKeySignature();
     this.updateTimeSignature();
     this.updateTempo();
+    this.row.getTabs().forEach((tab) => {
+      this.addLayoutObject(new ObjTabRhythm(this, tab), tab, 0 /* TabRhythm */, 0 /* Above */);
+    });
   }
   getMusicInterface() {
     return this.mi;
@@ -5127,7 +5488,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       this.alterKeySignature = args[0];
     } else if (args[0] instanceof Scale) {
       this.alterKeySignature = args[0];
-    } else if (Utils11.Is.isNonEmptyString(args[0])) {
+    } else if (Utils12.Is.isNonEmptyString(args[0])) {
       if (args.length === 1) {
         this.alterKeySignature = getScale(args[0]);
       } else if (args.length === 2) {
@@ -5180,9 +5541,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     if (beatLength === void 0) {
       this.alterTempo = { beatsPerMinute };
     } else {
-      let dotCount = typeof dotted === "number" && dotted > 0 ? dotted : dotted === true ? 1 : NoteLengthProps4.get(beatLength).dotCount;
+      let dotCount = typeof dotted === "number" && dotted > 0 ? dotted : dotted === true ? 1 : NoteLengthProps5.get(beatLength).dotCount;
       let options = {
-        beatLength: validateNoteLength2(beatLength),
+        beatLength: validateNoteLength3(beatLength),
         dotCount: dotCount > 0 ? dotCount : void 0
       };
       this.alterTempo = { beatsPerMinute, options };
@@ -5238,7 +5599,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let grp = this.doc.getStaffGroup(staffTabOrGroup);
           if (grp && !prevGroups.includes(staffTabOrGroup)) {
             let curGroups = [...prevGroups, staffTabOrGroup];
-            (Utils11.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
+            (Utils12.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
               switch (grp.verticalPosition) {
                 case "above" /* Above */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
@@ -5260,12 +5621,12 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       }
     };
     if (staffTabOrGroups === void 0) {
-      if (lines.length >= 2 && lines[0] instanceof ObjStaff && lines[0].staffConfig.clef === "G" /* G */ && lines[0].isGrand() && lines[1] instanceof ObjStaff && lines[1].staffConfig.clef === "F" /* F */ && lines[1].isGrand()) {
+      if (lines.length >= 2 && lines[0] instanceof ObjStaff && lines[1] instanceof ObjStaff && lines[0].staffConfig.grandId !== void 0 && lines[0].staffConfig.grandId === lines[1].staffConfig.grandId) {
         addToStaffTabOrGroup(defaultVerticalPos === 1 /* Below */ ? 1 : 0, defaultVerticalPos);
       } else {
         addToStaffTabOrGroup(0, defaultVerticalPos);
       }
-    } else if (Utils11.Is.isArray(staffTabOrGroups)) {
+    } else if (Utils12.Is.isArray(staffTabOrGroups)) {
       staffTabOrGroups.forEach((staffTabOrGroup) => addToStaffTabOrGroup(staffTabOrGroup, defaultVerticalPos));
     } else {
       addToStaffTabOrGroup(staffTabOrGroups, defaultVerticalPos);
@@ -5277,7 +5638,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       throw new MusicError13(MusicErrorType13.Score, "Cannot add Fermata because anchor is undefined.");
     }
     this.forEachStaffGroup(staffTabOrGroups, 0 /* Above */, (line, vpos) => {
-      this.addLayoutObject(new ObjFermata(anchor, vpos), line, 0 /* Fermata */, vpos);
+      this.addLayoutObject(new ObjFermata(anchor, vpos), line, 1 /* Fermata */, vpos);
     });
     this.disableExtension();
     this.requestLayout();
@@ -5296,7 +5657,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let passages = args;
         addLayoutObjectProps = {
           createObj: () => new ObjEnding(anchor, passages),
-          layoutGroupId: 3 /* Ending */,
+          layoutGroupId: 4 /* Ending */,
           defaultVerticalPos: 0 /* Above */
         };
         break;
@@ -5308,7 +5669,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
           createObj: () => new ObjText(anchor2, text, 1, 1),
-          layoutGroupId: 2 /* Navigation */,
+          layoutGroupId: 3 /* Navigation */,
           defaultVerticalPos: 0 /* Above */
         };
         this.addNavigation(staffTabOrGroups, "endRepeat" /* EndRepeat */);
@@ -5320,7 +5681,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
           createObj: () => new ObjText(anchor2, text, 1, 1),
-          layoutGroupId: 2 /* Navigation */,
+          layoutGroupId: 3 /* Navigation */,
           defaultVerticalPos: 0 /* Above */
         };
         break;
@@ -5331,7 +5692,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
           createObj: () => new ObjSpecialText(anchor2, text),
-          layoutGroupId: 2 /* Navigation */,
+          layoutGroupId: 3 /* Navigation */,
           defaultVerticalPos: 0 /* Above */
         };
         break;
@@ -5341,7 +5702,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
           createObj: () => new ObjSpecialText(anchor2, text),
-          layoutGroupId: 2 /* Navigation */,
+          layoutGroupId: 3 /* Navigation */,
           defaultVerticalPos: 0 /* Above */
         };
         break;
@@ -5349,7 +5710,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       case "endRepeat" /* EndRepeat */:
         if (args.length === 0) {
           this.endRepeatPlayCount = 2;
-        } else if (Utils11.Is.isIntegerGte(args[0], 2)) {
+        } else if (Utils12.Is.isIntegerGte(args[0], 2)) {
           this.endRepeatPlayCount = args[0];
         } else {
           throw new MusicError13(MusicErrorType13.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
@@ -5386,12 +5747,12 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let defaultVerticalPos;
     switch (annotation) {
       case "dynamics" /* Dynamics */:
-        layoutGroupId = 5 /* DynamicsAnnotation */;
+        layoutGroupId = 6 /* DynamicsAnnotation */;
         defaultVerticalPos = 0 /* Above */;
         textProps.italic = true;
         break;
       case "tempo" /* Tempo */:
-        layoutGroupId = 4 /* TempoAnnotation */;
+        layoutGroupId = 5 /* TempoAnnotation */;
         defaultVerticalPos = 0 /* Above */;
         textProps.italic = true;
         break;
@@ -5415,11 +5776,11 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let defaultVerticalPos;
     switch (label) {
       case "note" /* Note */:
-        layoutGroupId = 1 /* NoteLabel */;
+        layoutGroupId = 2 /* NoteLabel */;
         defaultVerticalPos = 1 /* Below */;
         break;
       case "chord" /* Chord */:
-        layoutGroupId = 6 /* ChordLabel */;
+        layoutGroupId = 7 /* ChordLabel */;
         defaultVerticalPos = 0 /* Above */;
         break;
     }
@@ -5436,15 +5797,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       throw new MusicError13(MusicErrorType13.Score, "Connective can be added to note group only.");
     }
     if (connective === "tie" /* Tie */) {
-      let tieSpan = Utils11.Is.isInteger(args[0]) || Utils11.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
-      let noteAnchor = Utils11.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let tieSpan = Utils12.Is.isInteger(args[0]) || Utils12.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
+      let noteAnchor = Utils12.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("tie" /* Tie */, tieSpan, noteAnchor, anchor));
     } else if (connective === "slur" /* Slur */) {
-      let slurSpan = Utils11.Is.isInteger(args[0]) ? args[0] : 2;
-      let noteAnchor = Utils11.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let slurSpan = Utils12.Is.isInteger(args[0]) ? args[0] : 2;
+      let noteAnchor = Utils12.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slur" /* Slur */, slurSpan, noteAnchor, anchor));
     } else if (connective === "slide" /* Slide */) {
-      let noteAnchor = Utils11.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
+      let noteAnchor = Utils12.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slide" /* Slide */, 2, noteAnchor, anchor));
     }
   }
@@ -5527,12 +5888,12 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
     this.forEachStaffGroup(staffTabOrGroups, 1 /* Below */, (line, vpos) => {
       let col = this.getRhythmColumn({ verse, line, vpos });
-      let lyricsContainer = col.getLyricsContainer(verse, line, vpos, validateNoteLength2(lyricsLength));
+      let lyricsContainer = col.getLyricsContainer(verse, line, vpos, validateNoteLength3(lyricsLength));
       if (lyricsContainer) {
         let lyricsObj = new ObjLyrics(col, verse, line, vpos, lyricsText, lyricsOptions);
         let lyricsArr = this.getLyricsObjects(lyricsObj.line, lyricsObj.vpos, lyricsObj.verse);
         lyricsArr.push(lyricsObj);
-        lyricsArr.sort((a, b) => cmp(a.col.positionTicks, b.col.positionTicks));
+        lyricsArr.sort((a, b) => Utils12.Math.cmp(a.col.positionTicks, b.col.positionTicks));
         lyricsContainer.addLyricsObject(lyricsObj);
         this.addLayoutObject(lyricsObj, line, getVerseLayoutGroupId(verse), vpos);
       }
@@ -5618,18 +5979,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   getLyricsObjects(line, vpos, verse) {
     let vposMap = this.lyricsObjectsCache.get(line);
     if (vposMap === void 0) {
-      vposMap = /* @__PURE__ */ new Map();
-      this.lyricsObjectsCache.set(line, vposMap);
+      this.lyricsObjectsCache.set(line, vposMap = /* @__PURE__ */ new Map());
     }
     let verseMap = vposMap.get(vpos);
     if (verseMap === void 0) {
-      verseMap = /* @__PURE__ */ new Map();
-      vposMap.set(vpos, verseMap);
+      vposMap.set(vpos, verseMap = /* @__PURE__ */ new Map());
     }
     let lyricsArr = verseMap.get(verse);
     if (lyricsArr === void 0) {
-      lyricsArr = [];
-      verseMap.set(verse, lyricsArr);
+      verseMap.set(verse, lyricsArr = []);
     }
     return lyricsArr;
   }
@@ -5724,6 +6082,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     }
     this.requestLayout();
   }
+  getBeamGroups() {
+    return this.beamGroups;
+  }
   createBeams() {
     if (!this.needBeamsUpdate) {
       return;
@@ -5742,72 +6103,44 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     }
     getVoiceIds().forEach((voiceId) => {
       let symbols = this.getVoiceSymbols(voiceId).slice();
-      if (symbols.length >= 2) {
-        let symbolsStartTicks = this.isUpBeat() ? Math.max(0, this.getMeasureTicks() - this.getConsumedTicks()) : 0;
-        let groupStartTicks = 0;
-        for (let groupId = 0; groupId < ts.beamGroupSizes.length; groupId++) {
-          let beamGroupSize = ts.beamGroupSizes[groupId];
-          let groupSizeSum = 0;
-          beamGroupSize.forEach((s) => groupSizeSum += s);
-          let groupLength = groupSizeSum * NoteLengthProps4.get("8n").ticks;
-          let groupSymbols = [];
-          let groupSymbolsLength = 0;
-          while (symbols.length > 0 && groupSymbolsLength < groupLength) {
-            let symbol = symbols[0];
-            if (symbol.col.positionTicks >= groupStartTicks) {
-              groupSymbols.push(symbol);
-              groupSymbolsLength += symbol.rhythmProps.ticks;
-              symbols.shift();
-            } else {
-              break;
+      if (symbols.length < 2) {
+        return;
+      }
+      let upBeatStartTicks = this.isUpBeat() ? Math.max(0, this.getMeasureTicks() - this.getConsumedTicks()) : 0;
+      let groupStartTicks = 0;
+      for (let groupId = 0; groupId < ts.beamGroupSizes.length; groupId++) {
+        let beamGroupSize = ts.beamGroupSizes[groupId];
+        let beamGroupSizeList = [beamGroupSize];
+        if (beamGroupSize.length > 1) {
+          beamGroupSizeList.unshift([Utils12.Math.sum(beamGroupSize)]);
+        }
+        let beamCreated = false;
+        let groupStartTicksSave = groupStartTicks;
+        while (beamGroupSizeList.length > 0 && !beamCreated) {
+          let beamGroupSize2 = beamGroupSizeList.shift();
+          groupStartTicks = groupStartTicksSave;
+          beamGroupSize2.forEach((beamGroupSize3) => {
+            let beamGroupTicks = beamGroupSize3 * NoteLengthProps5.get("8n").ticks;
+            let groupEndTicks = groupStartTicks + beamGroupTicks;
+            let groupSymbols = symbols.filter((symbol) => {
+              let symbolStartTicks = upBeatStartTicks + symbol.col.positionTicks;
+              let symbolEndTicks = symbolStartTicks + symbol.rhythmProps.ticks;
+              return symbolStartTicks >= groupStartTicks && symbolEndTicks <= groupEndTicks;
+            });
+            let groupSymbolsTicks = Utils12.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;
+              }
             }
-          }
-          _ObjMeasure.setupBeamGroup(groupSymbols, beamGroupSize);
-          symbolsStartTicks += groupSymbolsLength;
-          groupStartTicks += groupLength;
+            groupStartTicks += beamGroupTicks;
+          });
         }
       }
     });
     this.needBeamsUpdate = false;
     this.requestLayout();
   }
-  static setupBeamGroup(groupSymbols, mainBeamGroupSizeArr) {
-    if (mainBeamGroupSizeArr.length === 0) {
-      return false;
-    }
-    let groupNotes = groupSymbols.map((s) => {
-      var _a;
-      return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? s : void 0;
-    });
-    ObjNoteGroup.setBeamCounts(groupNotes);
-    let beamGroupSizeArrList = [mainBeamGroupSizeArr];
-    if (mainBeamGroupSizeArr.length > 1) {
-      let sum = 0;
-      mainBeamGroupSizeArr.forEach((s) => sum += s);
-      beamGroupSizeArrList.unshift([sum]);
-    }
-    let beamsCreated = false;
-    while (beamGroupSizeArrList.length > 0 && !beamsCreated) {
-      let beamGroupSizeArr = beamGroupSizeArrList.shift();
-      let groupSymbolsCopy = groupSymbols.slice();
-      beamGroupSizeArr.forEach((beamGroupSize) => {
-        var _a;
-        let beamGroupLength = beamGroupSize * NoteLengthProps4.get("8n").ticks;
-        let beamNotesLength = 0;
-        let beamNotes = [];
-        while (beamNotesLength < beamGroupLength && groupSymbolsCopy.length > 0) {
-          let symbol = groupSymbolsCopy.shift();
-          beamNotesLength += symbol.rhythmProps.ticks;
-          beamNotes.push(symbol instanceof ObjNoteGroup && ((_a = symbol.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? symbol : void 0);
-        }
-        if (beamNotesLength === beamGroupLength && beamNotes.every((n) => n !== void 0) && (beamNotes.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeArrList.length === 0)) {
-          ObjBeamGroup.createBeam(beamNotes);
-          beamsCreated = true;
-        }
-      });
-    }
-    return beamsCreated;
-  }
   getBarLineLeft() {
     return this.barLineLeft;
   }
@@ -5828,7 +6161,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         this.completeRests(getVoiceIds().filter((id) => this.getConsumedTicks(id) > 0));
       }
       return;
-    } else if (Utils11.Is.isArray(voiceId)) {
+    } else if (Utils12.Is.isArray(voiceId)) {
       voiceId.forEach((id) => this.completeRests(id));
       return;
     } else {
@@ -5838,9 +6171,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       let remainingTicks = measureTicks - consumedTicks;
       let rests = [];
       while (remainingTicks > 0) {
-        for (let noteSize = NoteLengthProps4.LongestNoteSize; noteSize <= NoteLengthProps4.ShortestNoteSize; noteSize *= 2) {
-          let restLength = NoteLengthProps4.create(noteSize).noteLength;
-          for (let dotCount = NoteLengthProps4.get(restLength).maxDotCount; dotCount >= 0; dotCount--) {
+        for (let noteSize = NoteLengthProps5.LongestNoteSize; noteSize <= NoteLengthProps5.ShortestNoteSize; noteSize *= 2) {
+          let restLength = NoteLengthProps5.create(noteSize).noteLength;
+          for (let dotCount = NoteLengthProps5.get(restLength).maxDotCount; dotCount >= 0; dotCount--) {
             let restProps = RhythmProps5.get(restLength, dotCount);
             while (restProps.ticks <= remainingTicks) {
               rests.push(restProps);
@@ -5875,22 +6208,30 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let showKeySignature = isFirstMeasureInRow || isAfterMeasureBreak || !!this.alterKeySignature;
     let showTimeSignature = !!this.alterTimeSignature;
     let showTempo = !!this.alterTempo;
-    if (showClef || showMeasureNumber || showKeySignature || showTimeSignature || showTempo) {
-      this.signatures = this.row.getStaves().map((staff, staffId) => {
-        let oldSignature = this.signatures.find((s) => s.staff === staff);
-        let signature = oldSignature != null ? oldSignature : new ObjSignature(this, staff);
+    this.signatures = [];
+    this.row.getNotationLines().forEach((line, lineId) => {
+      if (line instanceof ObjStaff && (showClef || showMeasureNumber || showKeySignature || showTimeSignature || showTempo)) {
+        let oldSignature = this.signatures.filter((s) => s instanceof ObjStaffSignature).find((s) => s.staff === line);
+        let signature = oldSignature != null ? oldSignature : new ObjStaffSignature(this, line);
         signature.staff.addObject(signature);
         signature.updateClefImage(renderer, showClef);
-        signature.updateMeasureNumber(showMeasureNumber && staffId === 0);
+        signature.updateMeasureNumber(showMeasureNumber && lineId === 0);
         signature.updateKeySignature(showKeySignature);
         signature.updateTimeSignature(showTimeSignature);
-        signature.updateTempo(showTempo && staffId === 0);
-        return signature;
-      });
-    } else {
-      this.signatures = [];
-    }
-    this.signatures.forEach((signature) => signature.layout(renderer));
+        signature.updateTempo(showTempo && lineId === 0);
+        signature.layout(renderer);
+        this.signatures.push(signature);
+      } else if (line instanceof ObjTab && (showMeasureNumber || showTimeSignature || showTempo)) {
+        let oldSignature = this.signatures.filter((s) => s instanceof ObjTabSignature).find((s) => s.tab === line);
+        let signature = oldSignature != null ? oldSignature : new ObjTabSignature(this, line);
+        signature.tab.addObject(signature);
+        signature.updateMeasureNumber(showMeasureNumber && lineId === 0);
+        signature.updateTimeSignature(showTimeSignature);
+        signature.updateTempo(showTempo && lineId === 0);
+        signature.layout(renderer);
+        this.signatures.push(signature);
+      }
+    });
     this.tabStringNotes.length = 0;
     if (this === this.row.getFirstMeasure()) {
       this.row.getTabs().forEach((tab) => {
@@ -5943,7 +6284,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let columnsAreaLeft = this.rect.left + this.leftSolidAreaWidth;
     let columnsAreaRight = this.rect.right - this.rightSolidAreaWidth;
     let columnsAreaWidth = columnsAreaRight - columnsAreaLeft;
-    let columnsWidth = Utils11.Math.sum(this.columns.map((col) => col.getRect().width));
+    let columnsWidth = Utils12.Math.sum(this.columns.map((col) => col.getRect().width));
     let columnScale = columnsAreaWidth / columnsWidth;
     let columnLeft = columnsAreaLeft;
     this.columns.forEach((col) => {
@@ -6064,18 +6405,19 @@ var ObjMeasure2 = _ObjMeasure;
 // src/score/engine/layout-object.ts
 import { MusicError as MusicError14, MusicErrorType as MusicErrorType14 } from "@tspro/web-music-score/core";
 var WidenColumnList = [
-  1 /* NoteLabel */,
-  6 /* ChordLabel */
+  2 /* NoteLabel */,
+  7 /* ChordLabel */
 ];
 var RowAlignList = [
-  2 /* Navigation */,
-  3 /* Ending */,
-  4 /* TempoAnnotation */,
-  5 /* DynamicsAnnotation */,
-  6 /* ChordLabel */,
-  7 /* LyricsVerse1 */,
-  8 /* LyricsVerse2 */,
-  9 /* LyricsVerse3 */
+  0 /* TabRhythm */,
+  3 /* Navigation */,
+  4 /* Ending */,
+  5 /* TempoAnnotation */,
+  6 /* DynamicsAnnotation */,
+  7 /* ChordLabel */,
+  8 /* LyricsVerse1 */,
+  9 /* LyricsVerse2 */,
+  10 /* LyricsVerse3 */
 ];
 function requireParentMeasure(p) {
   while (p) {
@@ -6251,7 +6593,7 @@ var ObjNotationLine4 = class extends MusicObject {
     let rowLayoutObjs = layoutGroup.getLayoutObjects(verticalPos).filter((layoutObj) => !layoutObj.isPositionResolved());
     rowLayoutObjs.forEach((layoutObj) => {
       let { musicObj, anchor } = layoutObj;
-      if (musicObj instanceof ObjEnding || musicObj instanceof ObjExtensionLine) {
+      if (musicObj instanceof ObjEnding || musicObj instanceof ObjExtensionLine || musicObj instanceof ObjTabRhythm) {
         musicObj.layoutFitToMeasure(renderer);
       } else {
         musicObj.offset(anchor.getRect().centerX - musicObj.getRect().centerX, 0);
@@ -6373,9 +6715,6 @@ var ObjStaff = class extends ObjNotationLine4 {
   containsVoiceId(voiceId) {
     return !this.staffConfig.voiceIds || this.staffConfig.voiceIds.includes(voiceId);
   }
-  isGrand() {
-    return this.staffConfig.isGrand === true;
-  }
   calcTop() {
     let top = this.topLineY;
     this.objects.forEach((o) => top = Math.min(top, o.getRect().top));
@@ -6436,7 +6775,7 @@ var ObjTab = class extends ObjNotationLine4 {
     __publicField(this, "tuningName");
     __publicField(this, "tuningStrings");
     __publicField(this, "mi");
-    if (Utils12.Is.isArray(tabConfig.tuning)) {
+    if (Utils13.Is.isArray(tabConfig.tuning)) {
       this.tuningName = void 0;
       this.tuningStrings = tabConfig.tuning.map((noteName) => Note8.getNote(noteName)).reverse();
     } else if (typeof tabConfig.tuning === "string") {
@@ -6490,10 +6829,14 @@ var ObjTab = class extends ObjNotationLine4 {
     return true;
   }
   calcTop() {
-    return this.top;
+    let { top } = this;
+    this.objects.forEach((o) => top = Math.min(top, o.getRect().top));
+    return top;
   }
   calcBottom() {
-    return this.bottom;
+    let { bottom } = this;
+    this.objects.forEach((o) => bottom = Math.max(bottom, o.getRect().bottom));
+    return bottom;
   }
   pick(x, y) {
     return [this];
@@ -6557,7 +6900,7 @@ var ObjScoreRow = class extends MusicObject {
     for (let i = 0; i < notationLines.length - 1; i++) {
       let treble = notationLines[i];
       let bass = notationLines[i + 1];
-      if (treble instanceof ObjStaff && treble.isGrand() && treble.staffConfig.clef === "G" /* G */ && bass instanceof ObjStaff && bass.isGrand() && bass.staffConfig.clef === "F" /* F */) {
+      if (treble instanceof ObjStaff && bass instanceof ObjStaff && treble.staffConfig.grandId !== void 0 && treble.staffConfig.grandId === bass.staffConfig.grandId) {
         treble.joinGrandStaff(bass);
         bass.joinGrandStaff(treble);
       }
@@ -6734,17 +7077,17 @@ var ObjScoreRow = class extends MusicObject {
   alignStemsToBeams() {
     this.measures.forEach((m) => m.alignStemsToBeams());
   }
-  layoutPositionLines(renderer) {
+  layoutSetNotationLines(renderer) {
     let { unitSize } = renderer;
     for (let i = 1; i < this.notationLines.length; i++) {
       let prev = this.notationLines[i - 1];
       let cur = this.notationLines[i];
-      if (prev instanceof ObjStaff && prev.isGrand() && prev.staffConfig.clef === "G" /* G */ && cur instanceof ObjStaff && cur.isGrand() && cur.staffConfig.clef === "F" /* F */) {
-        let sep = unitSize * 6;
-        cur.offset(0, prev.getBottomLineY() - cur.getTopLineY() + sep);
+      if (prev instanceof ObjStaff && cur instanceof ObjStaff && prev.staffConfig.grandId !== void 0 && prev.staffConfig.grandId === cur.staffConfig.grandId) {
+        let dy = prev.getBottomLineY() - cur.getTopLineY() + unitSize * 6;
+        cur.offset(0, dy);
       } else {
-        let sep = unitSize * 3;
-        cur.offset(0, prev.calcBottom() - cur.calcTop() + sep);
+        let dy = prev.calcBottom() - cur.calcTop() + unitSize * 3;
+        cur.offset(0, dy);
       }
     }
     this.measures.forEach((m) => {
@@ -6891,7 +7234,8 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-import { Utils as Utils13 } from "@tspro/ts-utils-lib";
+import { Utils as Utils14 } from "@tspro/ts-utils-lib";
+import { MusicError as MusicError17, MusicErrorType as MusicErrorType17 } from "@tspro/web-music-score/core";
 var ObjDocument = class extends MusicObject {
   constructor() {
     super(void 0);
@@ -6912,7 +7256,7 @@ var ObjDocument = class extends MusicObject {
     return this.mi;
   }
   setScoreConfiguration(config) {
-    if (Utils13.Is.isEnumValue(config, StaffPreset)) {
+    if (Utils14.Is.isEnumValue(config, StaffPreset)) {
       switch (config) {
         default:
         case "treble" /* Treble */:
@@ -6923,8 +7267,8 @@ var ObjDocument = class extends MusicObject {
           break;
         case "grand" /* Grand */:
           this.curScoreConfig = [
-            { type: "staff", clef: "G" /* G */, isGrand: true },
-            { type: "staff", clef: "F" /* F */, isGrand: true }
+            { type: "staff", clef: "G" /* G */, grandId: "grand1" },
+            { type: "staff", clef: "F" /* F */, grandId: "grand1" }
           ];
           break;
         case "guitarTreble" /* GuitarTreble */:
@@ -6940,26 +7284,57 @@ var ObjDocument = class extends MusicObject {
           ];
           break;
       }
-    } else if (Utils13.Is.isArray(config)) {
+    } else if (Utils14.Is.isArray(config)) {
       this.curScoreConfig = config;
     } else {
       this.curScoreConfig = [config];
     }
-    for (let i = 0; i < this.curScoreConfig.length - 1; i++) {
-      let treble = this.curScoreConfig[i];
-      let bass = this.curScoreConfig[i + 1];
-      if (treble.type === "staff" && bass.type === "staff") {
-        if (treble.clef === "G" /* G */ && treble.isGrand && bass.clef === "F" /* F */ && bass.isGrand) {
-          treble.minNote = "C4";
-          bass.maxNote = "B3";
-          treble.isOctaveDown = bass.isOctaveDown = false;
+    for (let cfgId = 0, grandId = "grand"; cfgId < this.curScoreConfig.length; ) {
+      let treble = this.curScoreConfig[cfgId];
+      let bass = this.curScoreConfig[cfgId + 1];
+      while (this.curScoreConfig.filter((cfg) => cfg.type === "staff").findIndex((cfg) => cfg.grandId === grandId) >= 0) {
+        grandId += "A";
+      }
+      if (treble && treble.type === "staff" && treble.isGrand) {
+        if (treble.grandId !== void 0) {
+          throw new MusicError17(MusicErrorType17.Score, `Grand staff error: mixing isGrand and grandId!`);
+        } else if (bass && bass.type === "staff" && bass.isGrand) {
+          if (bass.grandId !== void 0) {
+            throw new MusicError17(MusicErrorType17.Score, `Grand staff error: mixing isGrand and grandId!`);
+          } else {
+            treble.grandId = grandId;
+            bass.grandId = grandId;
+            treble.isGrand = bass.isGrand = false;
+            cfgId += 2;
+          }
         } else {
-          treble.isGrand = bass.isGrand = false;
+          throw new MusicError17(MusicErrorType17.Score, `Grand staff error: invalid use of isGrand!`);
+        }
+      } else {
+        cfgId++;
+      }
+    }
+    for (let cfgId = 0, usedGrandIdes = []; cfgId < this.curScoreConfig.length; ) {
+      let treble = this.curScoreConfig[cfgId];
+      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 MusicError17(MusicErrorType17.Score, `Grand staff error: grandId "${treble.grandId}" already used!`);
+        } else if (treble.clef !== "G" /* G */) {
+          throw new MusicError17(MusicErrorType17.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
+        } else if (bass.clef !== "F" /* F */) {
+          throw new MusicError17(MusicErrorType17.Score, `Grand staff error: Invalid treble clef "${treble.clef}"!`);
+        } else if (treble.isOctaveDown || bass.isOctaveDown) {
+          throw new MusicError17(MusicErrorType17.Score, `Grand staff error: cannot use isOctaveDown option!`);
         }
-      } else if (treble.type === "staff") {
-        treble.isGrand = false;
-      } else if (bass.type === "staff") {
-        bass.isGrand = false;
+        usedGrandIdes.push(treble.grandId);
+        treble.minNote = "C4";
+        bass.maxNote = "B3";
+        cfgId += 2;
+      } else if (treble && treble.type === "staff" && treble.grandId !== void 0) {
+        throw new MusicError17(MusicErrorType17.Score, `Grand staff error: invalid use of grandId "${treble.grandId}"!`);
+      } else {
+        cfgId++;
       }
     }
     this.requestNewRow();
@@ -7102,7 +7477,7 @@ var ObjDocument = class extends MusicObject {
     );
     this.rows.forEach((row) => row.layoutWidth(renderer, rowWidth));
     this.rows.forEach((row) => row.layoutLayoutGroups(renderer));
-    this.rows.forEach((row) => row.layoutPositionLines(renderer));
+    this.rows.forEach((row) => row.layoutSetNotationLines(renderer));
     this.rows.forEach((row) => row.layoutPadding(renderer));
     this.rect = new DivRect();
     if (this.header) {
@@ -7166,11 +7541,11 @@ var ObjDocument = class extends MusicObject {
 };
 
 // src/score/pub/document-builder.ts
-import { BeamGrouping, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength8, RhythmProps as RhythmProps6, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList, validateNoteLength as validateNoteLength3, validateTupletRatio } from "@tspro/web-music-score/theory";
-import { MusicError as MusicError17, MusicErrorType as MusicErrorType17 } from "@tspro/web-music-score/core";
+import { BeamGrouping, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength9, RhythmProps as RhythmProps6, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList, validateNoteLength as validateNoteLength4, validateTupletRatio } from "@tspro/web-music-score/theory";
+import { MusicError as MusicError18, MusicErrorType as MusicErrorType18 } from "@tspro/web-music-score/core";
 function assertArg(condition, argName, argValue) {
   if (!condition) {
-    throw new MusicError17(MusicErrorType17.Score, `Invalid arg: ${argName} = ${argValue}`);
+    throw new MusicError18(MusicErrorType18.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
 function isNote(note) {
@@ -7182,64 +7557,70 @@ function isNote(note) {
   }
 }
 function isVoiceId(value) {
-  return Utils14.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return Utils15.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function isStringNumber(value) {
-  return Utils14.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+  return Utils15.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
 }
 function isVerseNumber(value) {
-  return Utils14.Is.isNumber(value) && getVerseNumbers().indexOf(value) >= 0;
+  return Utils15.Is.isNumber(value) && getVerseNumbers().indexOf(value) >= 0;
+}
+function assertBaseConfig(baseConfig) {
+  assertArg(Utils15.Is.isObject(baseConfig), "baseConfig", baseConfig);
+  assertArg(Utils15.Is.isStringOrUndefined(baseConfig.name), "baseConfig.name", baseConfig.name);
+  assertArg(Utils15.Is.isUndefined(baseConfig.voiceIds) || Utils15.Is.isArray(baseConfig.voiceIds) && baseConfig.voiceIds.every((voiceId) => Utils15.Is.isNumber(voiceId)), "baseConfig.voiceIds", baseConfig.voiceIds);
 }
 function assertStaffConfig(staffConfig) {
-  assertArg(Utils14.Is.isObject(staffConfig), "staffConfig", staffConfig);
+  assertBaseConfig(staffConfig);
+  assertArg(Utils15.Is.isObject(staffConfig), "staffConfig", staffConfig);
   assertArg(staffConfig.type === "staff", "staffConfig.type", staffConfig.type);
-  assertArg(Utils14.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
-  assertArg(Utils14.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
-  assertArg(Utils14.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
-  assertArg(Utils14.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
-  assertArg(Utils14.Is.isUndefined(staffConfig.voiceIds) || Utils14.Is.isArray(staffConfig.voiceIds) && staffConfig.voiceIds.every((voiceId) => Utils14.Is.isNumber(voiceId)), "staffConfig.voiceIds", staffConfig.voiceIds);
-  assertArg(Utils14.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
+  assertArg(Utils15.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
+  assertArg(Utils15.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
+  assertArg(Utils15.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
+  assertArg(Utils15.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
+  assertArg(Utils15.Is.isStringOrUndefined(staffConfig.grandId), "staffConfig.grandId", staffConfig.grandId);
+  assertArg(Utils15.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
 }
 function assertTabConfig(tabConfig) {
-  assertArg(Utils14.Is.isObject(tabConfig), "tabConfig", tabConfig);
+  assertBaseConfig(tabConfig);
+  assertArg(Utils15.Is.isObject(tabConfig), "tabConfig", tabConfig);
   assertArg(tabConfig.type === "tab", "tabConfig.type", tabConfig.type);
-  if (typeof tabConfig.tuning === "string") {
+  if (Utils15.Is.isString(tabConfig.tuning)) {
     assertArg(TuningNameList.includes(tabConfig.tuning), "tabConfig.tuning", tabConfig.tuning);
-  } else if (Utils14.Is.isArray(tabConfig.tuning)) {
+  } else if (Utils15.Is.isArray(tabConfig.tuning)) {
     assertArg(tabConfig.tuning.length === getStringNumbers().length && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
   }
-  assertArg(Utils14.Is.isUndefined(tabConfig.voiceIds) || Utils14.Is.isArray(tabConfig.voiceIds) && tabConfig.voiceIds.every((voiceId) => Utils14.Is.isNumber(voiceId)), "tabConfig.voiceIds", tabConfig.voiceIds);
 }
 function assertNoteOptions(noteOptions) {
-  assertArg(Utils14.Is.isObject(noteOptions), "noteOptions", noteOptions);
-  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.dotted) || Utils14.Is.isIntegerGte(noteOptions.dotted, 0), "noteOptions.dotted", noteOptions.dotted);
-  assertArg(Utils14.Is.isEnumValueOrUndefined(noteOptions.stem, Stem), "noteOptions.stem", noteOptions.stem);
-  assertArg(Utils14.Is.isStringOrUndefined(noteOptions.color), "noteOptions.color", noteOptions.color);
-  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.arpeggio) || Utils14.Is.isEnumValue(noteOptions.arpeggio, Arpeggio), "noteOptions.arpeggio", noteOptions.arpeggio);
-  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.staccato), "noteOptions.staccato", noteOptions.staccato);
-  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.diamond), "noteOptions.diamond", noteOptions.diamond);
-  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.triplet), "noteOptions.triplet", noteOptions.triplet);
-  assertArg(Utils14.Is.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || Utils14.Is.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string)), "noteOptions.string", noteOptions.string);
-  assertArg(Utils14.Is.isUndefined(noteOptions.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
-  assertArg(Utils14.Is.isUndefined(noteOptions.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
+  assertArg(Utils15.Is.isObject(noteOptions), "noteOptions", noteOptions);
+  assertArg(Utils15.Is.isBooleanOrUndefined(noteOptions.dotted) || Utils15.Is.isIntegerGte(noteOptions.dotted, 0), "noteOptions.dotted", noteOptions.dotted);
+  assertArg(Utils15.Is.isEnumValueOrUndefined(noteOptions.stem, Stem), "noteOptions.stem", noteOptions.stem);
+  assertArg(Utils15.Is.isStringOrUndefined(noteOptions.color), "noteOptions.color", noteOptions.color);
+  assertArg(Utils15.Is.isBooleanOrUndefined(noteOptions.arpeggio) || Utils15.Is.isEnumValue(noteOptions.arpeggio, Arpeggio), "noteOptions.arpeggio", noteOptions.arpeggio);
+  assertArg(Utils15.Is.isBooleanOrUndefined(noteOptions.staccato), "noteOptions.staccato", noteOptions.staccato);
+  assertArg(Utils15.Is.isBooleanOrUndefined(noteOptions.diamond), "noteOptions.diamond", noteOptions.diamond);
+  assertArg(Utils15.Is.isBooleanOrUndefined(noteOptions.triplet), "noteOptions.triplet", noteOptions.triplet);
+  assertArg(Utils15.Is.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || Utils15.Is.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string)), "noteOptions.string", noteOptions.string);
+  assertArg(Utils15.Is.isUndefined(noteOptions.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
+  assertArg(Utils15.Is.isUndefined(noteOptions.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
 }
 function assertRestOptions(restOptions) {
-  assertArg(Utils14.Is.isObject(restOptions), "restOptions", restOptions);
-  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.dotted) || Utils14.Is.isIntegerGte(restOptions.dotted, 0), "restOptions.dotted", restOptions.dotted);
-  assertArg(Utils14.Is.isStringOrUndefined(restOptions.staffPos) || Utils14.Is.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof Note10, "restOptions.staffPos", restOptions.staffPos);
-  assertArg(Utils14.Is.isStringOrUndefined(restOptions.color), "restOptions.color", restOptions.color);
-  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.hide), "restOptions.hide", restOptions.hide);
-  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.triplet), "restOptions.triplet", restOptions.triplet);
+  assertArg(Utils15.Is.isObject(restOptions), "restOptions", restOptions);
+  assertArg(Utils15.Is.isBooleanOrUndefined(restOptions.dotted) || Utils15.Is.isIntegerGte(restOptions.dotted, 0), "restOptions.dotted", restOptions.dotted);
+  assertArg(Utils15.Is.isStringOrUndefined(restOptions.staffPos) || Utils15.Is.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof Note10, "restOptions.staffPos", restOptions.staffPos);
+  assertArg(Utils15.Is.isStringOrUndefined(restOptions.color), "restOptions.color", restOptions.color);
+  assertArg(Utils15.Is.isBooleanOrUndefined(restOptions.hide), "restOptions.hide", restOptions.hide);
+  assertArg(Utils15.Is.isBooleanOrUndefined(restOptions.triplet), "restOptions.triplet", restOptions.triplet);
 }
 function assertLyricsOptions(lyricsOptions) {
-  assertArg(Utils14.Is.isObject(lyricsOptions), "lyricsOptions", lyricsOptions);
-  assertArg(Utils14.Is.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign), "lyricsOptions.align", lyricsOptions.align);
-  assertArg(Utils14.Is.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen), "lyricsOptions.hyphen", lyricsOptions.hyphen);
+  assertArg(Utils15.Is.isObject(lyricsOptions), "lyricsOptions", lyricsOptions);
+  assertArg(Utils15.Is.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign), "lyricsOptions.align", lyricsOptions.align);
+  assertArg(Utils15.Is.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen), "lyricsOptions.hyphen", lyricsOptions.hyphen);
 }
 function assertStaffTabOrGRoups(staffTabOrGroups) {
   assertArg(
-    Utils14.Is.isStringOrUndefined(staffTabOrGroups) || Utils14.Is.isIntegerGte(staffTabOrGroups, 0) || Utils14.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
-      (staffTabOrGroup) => Utils14.Is.isString(staffTabOrGroup) || Utils14.Is.isIntegerGte(staffTabOrGroup, 0)
+    Utils15.Is.isStringOrUndefined(staffTabOrGroups) || Utils15.Is.isIntegerGte(staffTabOrGroups, 0) || Utils15.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
+      (staffTabOrGroup) => Utils15.Is.isString(staffTabOrGroup) || Utils15.Is.isIntegerGte(staffTabOrGroup, 0)
     ),
     "staffTabOrGroup",
     staffTabOrGroups
@@ -7247,7 +7628,7 @@ function assertStaffTabOrGRoups(staffTabOrGroups) {
 }
 function isNoteLength(noteLen) {
   try {
-    validateNoteLength3(noteLen);
+    validateNoteLength4(noteLen);
     return true;
   } catch (e) {
     return false;
@@ -7271,19 +7652,19 @@ var DocumentBuilder = class {
     this.doc = new ObjDocument();
   }
   setScoreConfiguration(config) {
-    if (Utils14.Is.isEnumValue(config, StaffPreset)) {
+    if (Utils15.Is.isEnumValue(config, StaffPreset)) {
       this.doc.setScoreConfiguration(config);
-    } else if (Utils14.Is.isObject(config) && config.type === "staff") {
+    } else if (Utils15.Is.isObject(config) && config.type === "staff") {
       assertStaffConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils14.Is.isObject(config) && config.type === "tab") {
+    } else if (Utils15.Is.isObject(config) && config.type === "tab") {
       assertTabConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils14.Is.isNonEmptyArray(config)) {
+    } else if (Utils15.Is.isNonEmptyArray(config)) {
       config.forEach((c) => {
-        if (Utils14.Is.isObject(c) && c.type === "staff") {
+        if (Utils15.Is.isObject(c) && c.type === "staff") {
           assertStaffConfig(c);
-        } else if (Utils14.Is.isObject(c) && c.type === "tab") {
+        } else if (Utils15.Is.isObject(c) && c.type === "tab") {
           assertTabConfig(c);
         } else {
           assertArg(false, "config", config);
@@ -7314,9 +7695,9 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   setHeader(title, composer, arranger) {
-    assertArg(Utils14.Is.isStringOrUndefined(title), "title", title);
-    assertArg(Utils14.Is.isStringOrUndefined(composer), "composer", composer);
-    assertArg(Utils14.Is.isStringOrUndefined(arranger), "arranger", arranger);
+    assertArg(Utils15.Is.isStringOrUndefined(title), "title", title);
+    assertArg(Utils15.Is.isStringOrUndefined(composer), "composer", composer);
+    assertArg(Utils15.Is.isStringOrUndefined(arranger), "arranger", arranger);
     this.doc.setHeader(title, composer, arranger);
     return this;
   }
@@ -7326,7 +7707,7 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   setMeasuresPerRow(measuresPerRow) {
-    assertArg(Utils14.Is.isIntegerGte(measuresPerRow, 1) || Utils14.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
+    assertArg(Utils15.Is.isIntegerGte(measuresPerRow, 1) || Utils15.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
     this.doc.setMeasuresPerRow(measuresPerRow);
     return this;
   }
@@ -7339,16 +7720,16 @@ var DocumentBuilder = class {
     return this;
   }
   setKeySignature(...args) {
-    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Utils14.Is.isNonEmptyString(args[0]) && (args.length === 1 || Utils14.Is.isEnumValue(args[1], ScaleType)), "keySignature", args);
+    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Utils15.Is.isNonEmptyString(args[0]) && (args.length === 1 || Utils15.Is.isEnumValue(args[1], ScaleType)), "keySignature", args);
     this.getMeasure().setKeySignature(...args);
     return this;
   }
   setTimeSignature(...args) {
     if (args[0] instanceof TimeSignature2) {
       this.getMeasure().setTimeSignature(args[0]);
-    } else if (Utils14.Is.isEnumValue(args[0], TimeSignatures) && Utils14.Is.isEnumValueOrUndefined(args[1], BeamGrouping)) {
+    } else if (Utils15.Is.isEnumValue(args[0], TimeSignatures) && Utils15.Is.isEnumValueOrUndefined(args[1], BeamGrouping)) {
       this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1]));
-    } else if (Utils14.Is.isIntegerGte(args[0], 1) && Utils14.Is.isIntegerGte(args[1], 1) && Utils14.Is.isEnumValueOrUndefined(args[2], BeamGrouping)) {
+    } else if (Utils15.Is.isIntegerGte(args[0], 1) && Utils15.Is.isIntegerGte(args[1], 1) && Utils15.Is.isEnumValueOrUndefined(args[2], BeamGrouping)) {
       this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1], args[2]));
     } else {
       assertArg(false, "timeSignature args", args);
@@ -7356,12 +7737,12 @@ var DocumentBuilder = class {
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {
-    assertArg(Utils14.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
+    assertArg(Utils15.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
     if (beatLength === void 0) {
-      assertArg(Utils14.Is.isUndefined(dotted), "dotted", dotted);
+      assertArg(Utils15.Is.isUndefined(dotted), "dotted", dotted);
     } else {
-      assertArg(Utils14.Is.isEnumValue(beatLength, NoteLength8) || isNoteLength(beatLength), "beatLength", beatLength);
-      assertArg(Utils14.Is.isBooleanOrUndefined(dotted) || Utils14.Is.isIntegerGte(dotted, 0), "dotted", dotted);
+      assertArg(Utils15.Is.isEnumValue(beatLength, NoteLength9) || isNoteLength(beatLength), "beatLength", beatLength);
+      assertArg(Utils15.Is.isBooleanOrUndefined(dotted) || Utils15.Is.isIntegerGte(dotted, 0), "dotted", dotted);
     }
     this.getMeasure().setTempo(beatsPerMinute, beatLength, dotted);
     return this;
@@ -7377,15 +7758,19 @@ var DocumentBuilder = class {
   addNote(voiceId, note, noteLength, noteOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
     assertArg(
-      note instanceof Note10 || Utils14.Is.isNonEmptyString(note) || Utils14.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils14.Is.isNonEmptyString(note2)),
+      note instanceof Note10 || Utils15.Is.isNonEmptyString(note) || Utils15.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils15.Is.isNonEmptyString(note2)),
       "note",
       note
     );
-    assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+    assertArg(Utils15.Is.isEnumValue(noteLength, NoteLength9) || isNoteLength(noteLength), "noteLength", noteLength);
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
-    if (Utils14.Is.isArray(note)) {
-      note.forEach((note2) => this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions));
+    if (Utils15.Is.isArray(note)) {
+      let string = noteOptions.string;
+      note.forEach((note2, noteId) => {
+        noteOptions.string = Utils15.Is.isArray(string) ? string[noteId] : string;
+        this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions);
+      });
     } else {
       this.getMeasure().addNoteGroup(voiceId, [note], noteLength, noteOptions);
     }
@@ -7401,8 +7786,8 @@ var DocumentBuilder = class {
    */
   addChord(voiceId, notes, noteLength, noteOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils14.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils14.Is.isNonEmptyString(note)), "notes", notes);
-    assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+    assertArg(Utils15.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils15.Is.isNonEmptyString(note)), "notes", notes);
+    assertArg(Utils15.Is.isEnumValue(noteLength, NoteLength9) || isNoteLength(noteLength), "noteLength", noteLength);
     noteOptions != null ? noteOptions : noteOptions = {};
     assertNoteOptions(noteOptions);
     this.getMeasure().addNoteGroup(voiceId, notes, noteLength, noteOptions);
@@ -7417,7 +7802,7 @@ var DocumentBuilder = class {
    */
   addRest(voiceId, restLength, restOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils14.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+    assertArg(Utils15.Is.isEnumValue(restLength, NoteLength9) || isNoteLength(restLength), "restLength", restLength);
     restOptions != null ? restOptions : restOptions = {};
     assertRestOptions(restOptions);
     this.getMeasure().addRest(voiceId, restLength, restOptions);
@@ -7440,22 +7825,24 @@ var DocumentBuilder = class {
    */
   addTuplet(voiceId, tupletRatio, tupletBuilder) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils14.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
-    assertArg(isTupletRatio(tupletRatio) && Utils14.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
+    assertArg(Utils15.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
+    assertArg(isTupletRatio(tupletRatio) && Utils15.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
     let tupletSymbols = [];
     const helper = {
       addNote: (note, noteLength, noteOptions) => {
         assertArg(
-          note instanceof Note10 || Utils14.Is.isNonEmptyString(note) || Utils14.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils14.Is.isNonEmptyString(note2)),
+          note instanceof Note10 || Utils15.Is.isNonEmptyString(note) || Utils15.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils15.Is.isNonEmptyString(note2)),
           "note",
           note
         );
-        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        assertArg(Utils15.Is.isEnumValue(noteLength, NoteLength9) || isNoteLength(noteLength), "noteLength", noteLength);
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
-        if (Utils14.Is.isArray(note)) {
-          note.forEach((note2) => {
+        if (Utils15.Is.isArray(note)) {
+          let string = noteOptions.string;
+          note.forEach((note2, noteId) => {
+            noteOptions.string = Utils15.Is.isArray(string) ? string[noteId] : string;
             let s = this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions, tupletRatio);
             tupletSymbols.push(s);
           });
@@ -7466,8 +7853,8 @@ var DocumentBuilder = class {
         return helper;
       },
       addChord: (notes, noteLength, noteOptions) => {
-        assertArg(Utils14.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils14.Is.isNonEmptyString(note)), "notes", notes);
-        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        assertArg(Utils15.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils15.Is.isNonEmptyString(note)), "notes", notes);
+        assertArg(Utils15.Is.isEnumValue(noteLength, NoteLength9) || isNoteLength(noteLength), "noteLength", noteLength);
         noteOptions != null ? noteOptions : noteOptions = {};
         delete noteOptions.triplet;
         assertNoteOptions(noteOptions);
@@ -7476,7 +7863,7 @@ var DocumentBuilder = class {
         return helper;
       },
       addRest: (restLength, restOptions) => {
-        assertArg(Utils14.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+        assertArg(Utils15.Is.isEnumValue(restLength, NoteLength9) || isNoteLength(restLength), "restLength", restLength);
         restOptions != null ? restOptions : restOptions = {};
         delete restOptions.triplet;
         assertRestOptions(restOptions);
@@ -7493,8 +7880,8 @@ var DocumentBuilder = class {
     var _a;
     assertStaffTabOrGRoups(staffTabOrGroups);
     assertArg(isVerseNumber(verse), "verse", verse);
-    assertArg(Utils14.Is.isEnumValue(lyricsLength, NoteLength8), "lyricsLength", lyricsLength);
-    assertArg(Utils14.Is.isString(lyricsText) || Utils14.Is.isArray(lyricsText) && lyricsText.every((text) => Utils14.Is.isString(text)), "lyricsText", lyricsText);
+    assertArg(Utils15.Is.isEnumValue(lyricsLength, NoteLength9), "lyricsLength", lyricsLength);
+    assertArg(Utils15.Is.isString(lyricsText) || Utils15.Is.isArray(lyricsText) && lyricsText.every((text) => Utils15.Is.isString(text)), "lyricsText", lyricsText);
     lyricsOptions != null ? lyricsOptions : lyricsOptions = {};
     assertLyricsOptions(lyricsOptions);
     if (lyricsOptions.align !== void 0) {
@@ -7502,7 +7889,7 @@ var DocumentBuilder = class {
     } else {
       (_a = lyricsOptions.align) != null ? _a : lyricsOptions.align = this.currentLyricsAlign;
     }
-    if (Utils14.Is.isArray(lyricsText)) {
+    if (Utils15.Is.isArray(lyricsText)) {
       lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, text, lyricsOptions));
     } else {
       this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions);
@@ -7534,7 +7921,7 @@ var DocumentBuilder = class {
   }
   addFermataInternal(staffTabOrGroups, fermata) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils14.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
+    assertArg(Utils15.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
     this.getMeasure().addFermata(staffTabOrGroups, fermata);
     return this;
   }
@@ -7557,11 +7944,11 @@ var DocumentBuilder = class {
   }
   addNavigationInternal(staffTabOrGroups, navigation, ...args) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils14.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
+    assertArg(Utils15.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
     if (navigation === "endRepeat" /* EndRepeat */ && args.length > 0) {
-      assertArg(Utils14.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
+      assertArg(Utils15.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
     } else if (navigation === "ending" /* Ending */ && args.length > 0) {
-      assertArg(args.every((passage) => Utils14.Is.isIntegerGte(passage, 1)), "passages", args);
+      assertArg(args.every((passage) => Utils15.Is.isIntegerGte(passage, 1)), "passages", args);
     }
     this.getMeasure().addNavigation(staffTabOrGroups, navigation, ...args);
     return this;
@@ -7575,11 +7962,11 @@ var DocumentBuilder = class {
   addAnnotationInternal(staffTabOrGroups, annotation, text) {
     annotation != null ? annotation : annotation = getAnnotation(text);
     if (annotation === void 0) {
-      throw new MusicError17(MusicErrorType17.Score, `Annotation text "${text}" is not known annotation.`);
+      throw new MusicError18(MusicErrorType18.Score, `Annotation text "${text}" is not known annotation.`);
     }
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils14.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
-    assertArg(Utils14.Is.isNonEmptyString(text), "text", text);
+    assertArg(Utils15.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
+    assertArg(Utils15.Is.isNonEmptyString(text), "text", text);
     this.getMeasure().addAnnotation(staffTabOrGroups, annotation, text);
     return this;
   }
@@ -7599,8 +7986,8 @@ var DocumentBuilder = class {
   }
   addLabelInternal(staffTabOrGroups, label, text) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils14.Is.isEnumValue(label, Label), "label", label);
-    assertArg(Utils14.Is.isNonEmptyString(text), "text", text);
+    assertArg(Utils15.Is.isEnumValue(label, Label), "label", label);
+    assertArg(Utils15.Is.isNonEmptyString(text), "text", text);
     this.getMeasure().addLabel(staffTabOrGroups, label, text);
     return this;
   }
@@ -7624,21 +8011,21 @@ var DocumentBuilder = class {
     return this.addLabelInternal(staffTabOrGroups, label, text);
   }
   addConnective(connective, ...args) {
-    assertArg(Utils14.Is.isEnumValue(connective, Connective), "connective", connective);
+    assertArg(Utils15.Is.isEnumValue(connective, Connective), "connective", connective);
     if (connective === "tie" /* Tie */) {
-      assertArg(Utils14.Is.isIntegerOrUndefined(args[0]) || Utils14.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
-      assertArg(Utils14.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Utils15.Is.isIntegerOrUndefined(args[0]) || Utils15.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
+      assertArg(Utils15.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
       let tieSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, tieSpan, noteAnchor);
     } else if (connective === "slur" /* Slur */) {
-      assertArg(Utils14.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
-      assertArg(Utils14.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Utils15.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
+      assertArg(Utils15.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
       let slurSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, slurSpan, noteAnchor);
     } else if (connective === "slide" /* Slide */) {
-      assertArg(Utils14.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
+      assertArg(Utils15.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
       let noteAnchor = args[0];
       this.getMeasure().addConnective(connective, noteAnchor);
     }
@@ -7657,18 +8044,18 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addExtension(extensionBuilder) {
-    assertArg(Utils14.Is.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, for e.g. addExtension(ext => ext.measures(2)). Please refer to README or API Reference.", extensionBuilder);
+    assertArg(Utils15.Is.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, for e.g. addExtension(ext => ext.measures(2)). Please refer to README or API Reference.", extensionBuilder);
     let ticks = 0;
     let visible = true;
     const helper = {
       notes: (noteLength, noteCount) => {
-        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
-        assertArg(Utils14.Is.isUndefined(noteCount) || Utils14.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
+        assertArg(Utils15.Is.isEnumValue(noteLength, NoteLength9) || isNoteLength(noteLength), "noteLength", noteLength);
+        assertArg(Utils15.Is.isUndefined(noteCount) || Utils15.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
         ticks += RhythmProps6.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
         return helper;
       },
       measures: (measureCount) => {
-        assertArg(Utils14.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
+        assertArg(Utils15.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
         ticks += this.getMeasure().getMeasureTicks() * measureCount;
         return helper;
       },
@@ -7697,13 +8084,13 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = "auto" /* Auto */) {
-    assertArg(Utils14.Is.isNonEmptyString(groupName), "groupName", groupName);
+    assertArg(Utils15.Is.isNonEmptyString(groupName), "groupName", groupName);
     assertArg(
-      Utils14.Is.isNonEmptyString(staffsTabsAndGroups) || Utils14.Is.isIntegerGte(staffsTabsAndGroups, 0) || Utils14.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Utils14.Is.isNonEmptyString(line) || Utils14.Is.isIntegerGte(line, 0)),
+      Utils15.Is.isNonEmptyString(staffsTabsAndGroups) || Utils15.Is.isIntegerGte(staffsTabsAndGroups, 0) || Utils15.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Utils15.Is.isNonEmptyString(line) || Utils15.Is.isIntegerGte(line, 0)),
       "staffsTabsAndGroups",
       staffsTabsAndGroups
     );
-    assertArg(Utils14.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
+    assertArg(Utils15.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
     this.doc.addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition);
     return this;
   }
@@ -7738,7 +8125,7 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   completeRests(voiceId) {
-    assertArg(Utils14.Is.isUndefined(voiceId) || isVoiceId(voiceId) || Utils14.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
+    assertArg(Utils15.Is.isUndefined(voiceId) || isVoiceId(voiceId) || Utils15.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
     this.getMeasure().completeRests(voiceId);
     return this;
   }
@@ -7750,8 +8137,8 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addScaleArpeggio(scale, bottomNote, numOctaves) {
-    assertArg(Utils14.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
-    assertArg(Utils14.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
+    assertArg(Utils15.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
+    assertArg(Utils15.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
     let ts = this.getMeasure().getTimeSignature();
     let notes = scale.getScaleNotes(bottomNote, numOctaves);
     for (let i = 0; i < notes.length; i++) {
@@ -7767,7 +8154,7 @@ var DocumentBuilder = class {
 };
 
 // src/score/pub/event.ts
-import { MusicError as MusicError18, MusicErrorType as MusicErrorType18 } from "@tspro/web-music-score/core";
+import { MusicError as MusicError19, MusicErrorType as MusicErrorType19 } from "@tspro/web-music-score/core";
 var ScoreEvent = class {
   /**
    * Create new score event instance.
@@ -7804,7 +8191,7 @@ var ScoreObjectEvent = class extends ScoreEvent {
     this.renderer = renderer;
     this.objects = objects;
     if (arguments.length === 0) {
-      throw new MusicError18(MusicErrorType18.Score, "Empty array in score object event!");
+      throw new MusicError19(MusicErrorType19.Score, "Empty array in score object event!");
     }
   }
   /** Top object getter. */
@@ -7823,24 +8210,24 @@ var ScoreObjectEvent = class extends ScoreEvent {
 
 // src/score/pub/music-interface.ts
 import * as Audio2 from "@tspro/web-music-score/audio";
-import { Utils as Utils16 } from "@tspro/ts-utils-lib";
+import { Utils as Utils17 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/music-objects.ts
-import { Utils as Utils15 } from "@tspro/ts-utils-lib";
-import { MusicError as MusicError19, MusicErrorType as MusicErrorType19 } from "@tspro/web-music-score/core";
+import { Utils as Utils16 } from "@tspro/ts-utils-lib";
+import { MusicError as MusicError20, MusicErrorType as MusicErrorType20 } from "@tspro/web-music-score/core";
 function assertArg2(condition, argName, argValue) {
   if (!condition) {
-    throw new MusicError19(MusicErrorType19.Score, `Invalid arg: ${argName} = ${argValue}`);
+    throw new MusicError20(MusicErrorType20.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
 function isVoiceId2(value) {
-  return Utils15.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return Utils16.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function getNotationLine(line) {
   if (line instanceof ObjStaff || line instanceof ObjTab) {
     return line.getMusicInterface();
   } else {
-    throw new MusicError19(MusicErrorType19.Score, `Notation line not staff nor tab.`);
+    throw new MusicError20(MusicErrorType20.Score, `Notation line not staff nor tab.`);
   }
 }
 var MusicInterface6 = class {
@@ -8010,7 +8397,7 @@ var _MDocument = class _MDocument extends MusicInterface6 {
    * @returns - Player instance.
    */
   play(playStateChangeListener) {
-    assertArg2(Utils15.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg2(Utils16.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     return new MPlayer(this, playStateChangeListener).play();
   }
 };
@@ -8040,7 +8427,7 @@ var _MEnding = class _MEnding extends MusicInterface6 {
    * @returns - Boolean whether this ending has asked passage number.
    */
   hasPassage(passage) {
-    assertArg2(Utils15.Is.isIntegerGte(passage, 1), "passage", passage);
+    assertArg2(Utils16.Is.isIntegerGte(passage, 1), "passage", passage);
     return this.obj.hasPassage(passage);
   }
 };
@@ -8192,7 +8579,7 @@ var _MStaffTabBarLine = class _MStaffTabBarLine extends MusicInterface6 {
     if (barLine instanceof ObjBarLineLeft || barLine instanceof ObjBarLineRight) {
       return barLine.getMusicInterface();
     } else {
-      throw new MusicError19(MusicErrorType19.Score, `Bar line not let nor right.`);
+      throw new MusicError20(MusicErrorType20.Score, `Bar line not let nor right.`);
     }
   }
   /**
@@ -8556,10 +8943,10 @@ var _MTab = class _MTab extends MusicInterface6 {
 /** Object name. */
 __publicField(_MTab, "Name", "Tab");
 var MTab = _MTab;
-var _MSignature = class _MSignature extends MusicInterface6 {
+var _MStaffSignature = class _MStaffSignature extends MusicInterface6 {
   /** @internal */
   constructor(obj) {
-    super(_MSignature.Name);
+    super(_MStaffSignature.Name);
     this.obj = obj;
   }
   /** @internal */
@@ -8575,8 +8962,57 @@ var _MSignature = class _MSignature extends MusicInterface6 {
   }
 };
 /** Object name. */
-__publicField(_MSignature, "Name", "Signature");
-var MSignature = _MSignature;
+__publicField(_MStaffSignature, "Name", "StaffSignature");
+var MStaffSignature = _MStaffSignature;
+var _MTabSignature = class _MTabSignature extends MusicInterface6 {
+  /** @internal */
+  constructor(obj) {
+    super(_MTabSignature.Name);
+    this.obj = obj;
+  }
+  /** @internal */
+  getMusicObject() {
+    return this.obj;
+  }
+  /**
+   * Get tab notation line this signature is in.
+   * @returns - Tab object.
+   */
+  getTab() {
+    return this.obj.tab.getMusicInterface();
+  }
+};
+/** Object name. */
+__publicField(_MTabSignature, "Name", "TabSignature");
+var MTabSignature = _MTabSignature;
+var _MTabRhythm = class _MTabRhythm extends MusicInterface6 {
+  /** @internal */
+  constructor(obj) {
+    super(_MTabRhythm.Name);
+    this.obj = obj;
+  }
+  /** @internal */
+  getMusicObject() {
+    return this.obj;
+  }
+  /**
+   * Get measure.
+   * @returns - Measure.
+   */
+  getMeasure() {
+    return this.obj.measure.getMusicInterface();
+  }
+  /**
+   * Get tab.
+   * @returns - Tab.
+   */
+  getTab() {
+    return this.obj.tab.getMusicInterface();
+  }
+};
+/** Object name. */
+__publicField(_MTabRhythm, "Name", "TabRhythm");
+var MTabRhythm = _MTabRhythm;
 var _MSpecialText = class _MSpecialText extends MusicInterface6 {
   /** @internal */
   constructor(obj) {
@@ -8656,10 +9092,10 @@ __publicField(_MExtensionLine, "Name", "ExtensionLine");
 var MExtensionLine = _MExtensionLine;
 
 // src/score/pub/music-interface.ts
-import { MusicError as MusicError20, MusicErrorType as MusicErrorType20 } from "@tspro/web-music-score/core";
+import { MusicError as MusicError21, MusicErrorType as MusicErrorType21 } from "@tspro/web-music-score/core";
 function assertArg3(condition, argName, argValue) {
   if (!condition) {
-    throw new MusicError20(MusicErrorType20.Score, `Invalid arg: ${argName} = ${argValue}`);
+    throw new MusicError21(MusicErrorType21.Score, `Invalid arg: ${argName} = ${argValue}`);
   }
 }
 function require_t(t, message) {
@@ -8678,7 +9114,7 @@ var _MPlayer = class _MPlayer {
   constructor(doc, playStateChangeListener) {
     __publicField(this, "player");
     assertArg3(doc instanceof MDocument2, "doc", doc);
-    assertArg3(Utils16.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg3(Utils17.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     this.player = new Player();
     this.player.setDocument(doc.getMusicObject());
     this.player.setCursorPositionChangeListener((cursorRect) => doc.getMusicObject().updateCursorRect(cursorRect));
@@ -8736,7 +9172,7 @@ var MRenderer2 = class {
    * @returns - This renderer instance.
    */
   setDocument(doc) {
-    assertArg3(Utils16.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Utils17.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.renderer.setDocument(doc);
     return this;
   }
@@ -8746,7 +9182,7 @@ var MRenderer2 = class {
    * @returns - This renderer instance.
    */
   setCanvas(canvas) {
-    canvas = require_t(Utils16.Dom.getCanvas(canvas), typeof canvas === "string" ? "Cannot set renderer canvas because invalid canvas id: " + canvas : "Cannot set renderer canvas because given canvas is undefined.");
+    canvas = require_t(Utils17.Dom.getCanvas(canvas), typeof canvas === "string" ? "Cannot set renderer canvas because invalid canvas id: " + canvas : "Cannot set renderer canvas because given canvas is undefined.");
     this.renderer.setCanvas(canvas);
     return this;
   }
@@ -8755,7 +9191,7 @@ var MRenderer2 = class {
    * @param scoreEventListener - Score event listener.
    */
   setScoreEventListener(scoreEventListener) {
-    assertArg3(Utils16.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
+    assertArg3(Utils17.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
     this.renderer.setScoreEventListener(scoreEventListener);
   }
   /**
@@ -8829,7 +9265,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns 
    */
   setDocument(doc) {
-    assertArg3(Utils16.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Utils17.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.onStop();
     if (doc) {
       this.player = new MPlayer(doc, (playState) => {
@@ -8873,9 +9309,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayButton(btn, btnLabel) {
-    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils17.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playButton, this.onPlay);
-    this.playButton = require_t(Utils16.Dom.getButton(btn), "Play button required!");
+    this.playButton = require_t(Utils17.Dom.getButton(btn), "Play button required!");
     this.playLabel = btnLabel != null ? btnLabel : "Play";
     _MPlaybackButtons.removeOnClickListeners(this.playButton, "all");
     _MPlaybackButtons.addOnClickListener(this.playButton, this.onPlay);
@@ -8889,9 +9325,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setStopButton(btn, btnLabel) {
-    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils17.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, this.onStop);
-    this.stopButton = require_t(Utils16.Dom.getButton(btn), "Stop button required!");
+    this.stopButton = require_t(Utils17.Dom.getButton(btn), "Stop button required!");
     this.stopLabel = btnLabel != null ? btnLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, "all");
     _MPlaybackButtons.addOnClickListener(this.stopButton, this.onStop);
@@ -8906,10 +9342,10 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayStopButton(btn, playLabel, stopLabel) {
-    assertArg3(Utils16.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
-    assertArg3(Utils16.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
+    assertArg3(Utils17.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
+    assertArg3(Utils17.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, this.onPlayStop);
-    this.playStopButton = require_t(Utils16.Dom.getButton(btn), "Play/stop button required!");
+    this.playStopButton = require_t(Utils17.Dom.getButton(btn), "Play/stop button required!");
     this.playLabel = playLabel != null ? playLabel : "Play";
     this.stopLabel = stopLabel != null ? stopLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, "all");
@@ -8924,9 +9360,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPauseButton(btn, btnLabel) {
-    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils17.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, this.onPause);
-    this.pauseButton = require_t(Utils16.Dom.getButton(btn), "Pause button required!");
+    this.pauseButton = require_t(Utils17.Dom.getButton(btn), "Pause button required!");
     this.pauseLabel = btnLabel != null ? btnLabel : "Pause";
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, "all");
     _MPlaybackButtons.addOnClickListener(this.pauseButton, this.onPause);
@@ -8948,7 +9384,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     }
   }
   static addOnClickListener(btn, onClick) {
-    assertArg3(Utils16.Is.isFunction(onClick), "onClick", onClick);
+    assertArg3(Utils17.Is.isFunction(onClick), "onClick", onClick);
     btn.addEventListener("click", onClick);
     let clickListeners = this.savedOnClickListeners.get(btn) || [];
     this.savedOnClickListeners.set(btn, [...clickListeners, onClick]);
@@ -8993,15 +9429,17 @@ export {
   MRest,
   MRhythmColumn,
   MScoreRow,
-  MSignature,
   MSpecialText,
   MStaff,
   MStaffBeamGroup,
   MStaffNoteGroup,
   MStaffRest,
+  MStaffSignature,
   MStaffTabBarLine,
   MTab,
   MTabNoteGroup,
+  MTabRhythm,
+  MTabSignature,
   MText,
   MusicInterface6 as MusicInterface,
   Navigation,