@tspro/web-music-score 3.2.0 → 4.0.0

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v3.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -361,16 +361,16 @@ var DivRect = class _DivRect {
 };
 
 // src/score/pub/document-builder.ts
-var import_ts_utils_lib11 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib13 = require("@tspro/ts-utils-lib");
 
 // src/score/pub/types.ts
 var StaffPreset = /* @__PURE__ */ ((StaffPreset3) => {
-  StaffPreset3[StaffPreset3["Treble"] = 1] = "Treble";
-  StaffPreset3[StaffPreset3["Bass"] = 2] = "Bass";
-  StaffPreset3[StaffPreset3["Grand"] = 3] = "Grand";
-  StaffPreset3[StaffPreset3["GuitarTreble"] = 4] = "GuitarTreble";
-  StaffPreset3[StaffPreset3["GuitarTab"] = 8] = "GuitarTab";
-  StaffPreset3[StaffPreset3["GuitarCombined"] = 12] = "GuitarCombined";
+  StaffPreset3["Treble"] = "treble";
+  StaffPreset3["Bass"] = "bass";
+  StaffPreset3["Grand"] = "grand";
+  StaffPreset3["GuitarTreble"] = "guitarTreble";
+  StaffPreset3["GuitarTab"] = "guitarTab";
+  StaffPreset3["GuitarCombined"] = "guitarCombined";
   return StaffPreset3;
 })(StaffPreset || {});
 var Clef = /* @__PURE__ */ ((Clef2) => {
@@ -385,77 +385,77 @@ function getStringNumbers() {
   return [1, 2, 3, 4, 5, 6];
 }
 var Stem = /* @__PURE__ */ ((Stem2) => {
-  Stem2[Stem2["Auto"] = 0] = "Auto";
-  Stem2[Stem2["Up"] = 1] = "Up";
-  Stem2[Stem2["Down"] = 2] = "Down";
+  Stem2["Auto"] = "auto";
+  Stem2["Up"] = "up";
+  Stem2["Down"] = "down";
   return Stem2;
 })(Stem || {});
 var Arpeggio = /* @__PURE__ */ ((Arpeggio2) => {
-  Arpeggio2[Arpeggio2["Up"] = 0] = "Up";
-  Arpeggio2[Arpeggio2["Down"] = 1] = "Down";
+  Arpeggio2["Up"] = "up";
+  Arpeggio2["Down"] = "down";
   return Arpeggio2;
 })(Arpeggio || {});
 var TieType = /* @__PURE__ */ ((TieType2) => {
-  TieType2[TieType2["Stub"] = -1] = "Stub";
-  TieType2[TieType2["ToMeasureEnd"] = -2] = "ToMeasureEnd";
+  TieType2["Stub"] = "stub";
+  TieType2["ToMeasureEnd"] = "toMeasureEnd";
   return TieType2;
 })(TieType || {});
 var NoteAnchor = /* @__PURE__ */ ((NoteAnchor2) => {
-  NoteAnchor2[NoteAnchor2["Auto"] = 0] = "Auto";
-  NoteAnchor2[NoteAnchor2["Above"] = 1] = "Above";
-  NoteAnchor2[NoteAnchor2["Center"] = 2] = "Center";
-  NoteAnchor2[NoteAnchor2["Below"] = 3] = "Below";
-  NoteAnchor2[NoteAnchor2["StemTip"] = 4] = "StemTip";
+  NoteAnchor2["Auto"] = "auto";
+  NoteAnchor2["Above"] = "above";
+  NoteAnchor2["Center"] = "center";
+  NoteAnchor2["Below"] = "below";
+  NoteAnchor2["StemTip"] = "stemTip";
   return NoteAnchor2;
 })(NoteAnchor || {});
 var Connective = /* @__PURE__ */ ((Connective2) => {
-  Connective2[Connective2["Tie"] = 0] = "Tie";
-  Connective2[Connective2["Slur"] = 1] = "Slur";
-  Connective2[Connective2["Slide"] = 2] = "Slide";
+  Connective2["Tie"] = "tie";
+  Connective2["Slur"] = "slur";
+  Connective2["Slide"] = "slide";
   return Connective2;
 })(Connective || {});
 var VerticalPosition = /* @__PURE__ */ ((VerticalPosition4) => {
-  VerticalPosition4[VerticalPosition4["Above"] = 0] = "Above";
-  VerticalPosition4[VerticalPosition4["Below"] = 1] = "Below";
-  VerticalPosition4[VerticalPosition4["Both"] = 2] = "Both";
-  VerticalPosition4[VerticalPosition4["Auto"] = 3] = "Auto";
+  VerticalPosition4["Auto"] = "auto";
+  VerticalPosition4["Above"] = "above";
+  VerticalPosition4["Below"] = "below";
+  VerticalPosition4["Both"] = "both";
   return VerticalPosition4;
 })(VerticalPosition || {});
-var PlayState = /* @__PURE__ */ ((PlayState2) => {
-  PlayState2[PlayState2["Playing"] = 0] = "Playing";
-  PlayState2[PlayState2["Paused"] = 1] = "Paused";
-  PlayState2[PlayState2["Stopped"] = 2] = "Stopped";
-  return PlayState2;
-})(PlayState || {});
 var Fermata = /* @__PURE__ */ ((Fermata2) => {
-  Fermata2[Fermata2["AtNote"] = 0] = "AtNote";
-  Fermata2[Fermata2["AtMeasureEnd"] = 1] = "AtMeasureEnd";
+  Fermata2["AtNote"] = "atNote";
+  Fermata2["AtMeasureEnd"] = "atMeasureEnd";
   return Fermata2;
 })(Fermata || {});
 var Navigation = /* @__PURE__ */ ((Navigation2) => {
-  Navigation2[Navigation2["DC_al_Fine"] = 0] = "DC_al_Fine";
-  Navigation2[Navigation2["DC_al_Coda"] = 1] = "DC_al_Coda";
-  Navigation2[Navigation2["DS_al_Fine"] = 2] = "DS_al_Fine";
-  Navigation2[Navigation2["DS_al_Coda"] = 3] = "DS_al_Coda";
-  Navigation2[Navigation2["Coda"] = 4] = "Coda";
-  Navigation2[Navigation2["toCoda"] = 5] = "toCoda";
-  Navigation2[Navigation2["Segno"] = 6] = "Segno";
-  Navigation2[Navigation2["Fine"] = 7] = "Fine";
-  Navigation2[Navigation2["StartRepeat"] = 8] = "StartRepeat";
-  Navigation2[Navigation2["EndRepeat"] = 9] = "EndRepeat";
-  Navigation2[Navigation2["Ending"] = 10] = "Ending";
+  Navigation2["DC_al_Fine"] = "D.C. al Fine";
+  Navigation2["DC_al_Coda"] = "D.C. al Coda";
+  Navigation2["DS_al_Fine"] = "D.S. al Fine";
+  Navigation2["DS_al_Coda"] = "D.S. al Coda";
+  Navigation2["Coda"] = "Coda";
+  Navigation2["toCoda"] = "toCoda";
+  Navigation2["Segno"] = "Segno";
+  Navigation2["Fine"] = "Fine";
+  Navigation2["StartRepeat"] = "startRepeat";
+  Navigation2["EndRepeat"] = "endRepeat";
+  Navigation2["Ending"] = "ending";
   return Navigation2;
 })(Navigation || {});
 var Annotation = /* @__PURE__ */ ((Annotation2) => {
-  Annotation2[Annotation2["Dynamics"] = 0] = "Dynamics";
-  Annotation2[Annotation2["Tempo"] = 1] = "Tempo";
+  Annotation2["Dynamics"] = "dynamics";
+  Annotation2["Tempo"] = "tempo";
   return Annotation2;
 })(Annotation || {});
 var Label = /* @__PURE__ */ ((Label2) => {
-  Label2[Label2["Note"] = 0] = "Note";
-  Label2[Label2["Chord"] = 1] = "Chord";
+  Label2["Note"] = "note";
+  Label2["Chord"] = "chord";
   return Label2;
 })(Label || {});
+var PlayState = /* @__PURE__ */ ((PlayState2) => {
+  PlayState2[PlayState2["Playing"] = 0] = "Playing";
+  PlayState2[PlayState2["Paused"] = 1] = "Paused";
+  PlayState2[PlayState2["Stopped"] = 2] = "Stopped";
+  return PlayState2;
+})(PlayState || {});
 
 // src/score/engine/music-object.ts
 var MusicObjectLink = class {
@@ -954,10 +954,10 @@ var Renderer = class {
 
 // src/score/engine/obj-staff-and-tab.ts
 var import_core15 = require("@tspro/web-music-score/core");
-var import_ts_utils_lib9 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib11 = require("@tspro/ts-utils-lib");
 
 // src/score/engine/obj-measure.ts
-var import_ts_utils_lib8 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib10 = require("@tspro/ts-utils-lib");
 var import_theory9 = require("@tspro/web-music-score/theory");
 var import_theory10 = require("@tspro/web-music-score/theory");
 
@@ -1546,7 +1546,7 @@ var ObjSignature = class extends MusicObject {
 };
 
 // src/score/engine/player.ts
-var import_ts_utils_lib5 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib6 = require("@tspro/ts-utils-lib");
 var import_theory7 = require("@tspro/web-music-score/theory");
 var Audio = __toESM(require("@tspro/web-music-score/audio"));
 
@@ -1576,8 +1576,8 @@ var ObjArpeggio = class extends MusicObject {
   }
   layout(renderer) {
     let { unitSize } = renderer;
-    this.topArrowHeight = this.arpeggioDir === 0 /* Up */ ? unitSize : 0;
-    this.bottomArrowHeight = this.arpeggioDir === 1 /* Down */ ? unitSize : 0;
+    this.topArrowHeight = this.arpeggioDir === "up" /* Up */ ? unitSize : 0;
+    this.bottomArrowHeight = this.arpeggioDir === "down" /* Down */ ? unitSize : 0;
     let top = this.line.getTopLineY();
     let bottom = this.line.getBottomLineY();
     this.cycleHeight = unitSize * 2;
@@ -1643,7 +1643,7 @@ var ObjStaffRest = class extends MusicObject {
     this.staff = staff;
     this.rest = rest;
     __publicField(this, "restRect", new DivRect());
-    __publicField(this, "dotRect");
+    __publicField(this, "dotRects", []);
     __publicField(this, "mi");
     staff.addObject(this);
     this.mi = new MStaffRest(this);
@@ -1655,21 +1655,18 @@ var ObjStaffRest = class extends MusicObject {
     return this.getRect().contains(x, y) ? [this] : [];
   }
   offset(dx, dy) {
-    var _a;
     this.restRect.offsetInPlace(dx, dy);
-    (_a = this.dotRect) == null ? void 0 : _a.offsetInPlace(dx, dy);
+    this.dotRects.forEach((r) => r.offsetInPlace(dx, dy));
     this.requestRectUpdate();
     this.rest.requestRectUpdate();
   }
   updateRect() {
     this.rect = this.restRect.copy();
-    if (this.dotRect) {
-      this.rect.expandInPlace(this.dotRect);
-    }
+    this.dotRects.forEach((r) => this.rect.expandInPlace(r));
   }
 };
 var ObjRest = class extends MusicObject {
-  constructor(col, voiceId, noteLength, options) {
+  constructor(col, voiceId, noteLength, options, tupletRatio) {
     var _a, _b;
     super(col);
     this.col = col;
@@ -1678,6 +1675,7 @@ var ObjRest = class extends MusicObject {
     __publicField(this, "ownDiatonicId");
     __publicField(this, "color");
     __publicField(this, "hide");
+    __publicField(this, "oldStyleTriplet");
     __publicField(this, "rhythmProps");
     __publicField(this, "beamGroup");
     __publicField(this, "staffObjects", []);
@@ -1701,7 +1699,9 @@ 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.rhythmProps = new import_theory3.RhythmProps(noteLength, options == null ? void 0 : options.dotted, options == null ? void 0 : options.triplet);
+    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || import_theory3.NoteLengthProps.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 = import_theory3.RhythmProps.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? import_theory3.Tuplet.Triplet : void 0);
     this.mi = new MRest(this);
   }
   getMusicInterface() {
@@ -1719,15 +1719,9 @@ var ObjRest = class extends MusicObject {
   get noteLength() {
     return this.rhythmProps.noteLength;
   }
-  get dotted() {
-    return this.rhythmProps.dotted;
-  }
   get stemDir() {
     return this.beamGroup ? this.beamGroup.stemDir : this.ownStemDir;
   }
-  get triplet() {
-    return this.rhythmProps.triplet;
-  }
   getStaticObjects(line) {
     let staticObjects = [];
     this.staffObjects.forEach((obj) => {
@@ -1752,8 +1746,8 @@ var ObjRest = class extends MusicObject {
   getBeamGroup() {
     return this.beamGroup;
   }
-  setBeamGroup(beam) {
-    this.beamGroup = beam;
+  setBeamGroup(beamGroup) {
+    this.beamGroup = beamGroup;
   }
   resetBeamGroup() {
     this.beamGroup = void 0;
@@ -1762,7 +1756,7 @@ var ObjRest = class extends MusicObject {
     return this.staffObjects.map((obj) => {
       let staff = obj.staff;
       let x = obj.getRect().centerX;
-      let y = this.stemDir === 1 /* Up */ ? obj.getRect().top : obj.getRect().bottom;
+      let y = this.stemDir === "up" /* Up */ ? obj.getRect().top : obj.getRect().bottom;
       let stemHeight = Math.abs(obj.getRect().centerY - y);
       return { staff, x, y, stemHeight };
     });
@@ -1803,7 +1797,7 @@ var ObjRest = class extends MusicObject {
     }
     let { unitSize } = renderer;
     let { ownDiatonicId } = this;
-    let { noteLength, dotted, flagCount } = this.rhythmProps;
+    let { noteLength, dotCount, flagCount } = this.rhythmProps;
     let leftw = 0;
     let rightw = 0;
     let toph = 0;
@@ -1836,11 +1830,11 @@ var ObjRest = class extends MusicObject {
       }
       let obj = new ObjStaffRest(staff, this);
       obj.restRect = new DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
-      if (dotted) {
+      for (let i = 0; i < dotCount; i++) {
         let dotWidth = DocumentSettings.DotSize * unitSize;
-        let dotX = rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize / 2) * unitSize;
+        let dotX = rightw + (DocumentSettings.RestDotSpace + DocumentSettings.DotSize * unitSize) + i * DocumentSettings.DotSize * unitSize * 1.5;
         let dotY = this.getRestDotVerticalDisplacement(noteLength) * unitSize;
-        obj.dotRect = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
+        obj.dotRects.push(DivRect.createCentered(dotX, dotY, dotWidth, dotWidth));
       }
       obj.offset(0, staff.getDiatonicIdY(ownDiatonicId));
       this.staffObjects.push(obj);
@@ -1874,7 +1868,7 @@ var ObjRest = class extends MusicObject {
     ctx.strokeStyle = ctx.fillStyle = color;
     ctx.lineWidth = lineWidth;
     this.staffObjects.forEach((obj) => {
-      let { dotRect, restRect } = obj;
+      let { dotRects, restRect } = obj;
       let x = restRect.centerX;
       let y = restRect.centerY;
       if (noteLength === import_theory3.NoteLength.Whole) {
@@ -1939,9 +1933,9 @@ var ObjRest = class extends MusicObject {
           ctx.fill();
         }
       }
-      if (dotRect) {
-        renderer.fillCircle(dotRect.centerX, dotRect.centerY, dotRect.width / 2);
-      }
+      dotRects.forEach((r) => {
+        renderer.fillCircle(r.centerX, r.centerY, r.width / 2);
+      });
     });
   }
 };
@@ -1989,8 +1983,8 @@ var ObjStaffBeamGroup = class extends MusicObject {
     super(staff);
     this.staff = staff;
     this.beamGroup = beamGroup;
-    __publicField(this, "tripletNumber");
-    __publicField(this, "tripletNumberOffsetY", 0);
+    __publicField(this, "tupletNumber");
+    __publicField(this, "tupletNumberOffsetY", 0);
     __publicField(this, "points", []);
     __publicField(this, "mi");
     staff.addObject(this);
@@ -2005,48 +1999,47 @@ var ObjStaffBeamGroup = class extends MusicObject {
   offset(dx, dy) {
     var _a;
     this.points.forEach((p) => p.offset(dx, 0));
-    (_a = this.tripletNumber) == null ? void 0 : _a.offset(dx, dy);
+    (_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.tripletNumber) {
-      this.rect = this.tripletNumber.getRect().copy();
+    } else if (this.tupletNumber) {
+      this.rect = this.tupletNumber.getRect().copy();
     }
     this.points.forEach((pt) => this.rect.expandInPlace(pt.getRect()));
-    if (this.tripletNumber) {
-      this.rect.expandInPlace(this.tripletNumber.getRect());
+    if (this.tupletNumber) {
+      this.rect.expandInPlace(this.tupletNumber.getRect());
     }
   }
 };
 var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
-  constructor(symbols, triplet) {
+  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 import_core6.MusicError(import_core6.MusicErrorType.Score, "All beam group symbols are not in same measure.");
+      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, `All ${beamGroupName} symbols are not in same measure.`);
     } else if (symbols.length < 2) {
-      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Beam group need minimum 2 symbols, but " + symbols.length + " given.");
+      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, `${beamGroupName} needs minimum 2 symbols, but ${symbols.length} given.`);
     }
-    if (triplet) {
-      if (!symbols.every((s) => s.triplet)) {
-        throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Not every symbol's triplet property is true.");
-      }
+    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) {
+      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) => s.rhythmProps.noteLength >= import_theory4.NoteLength.Quarter)) {
+      if (symbols.some((s) => import_theory4.NoteLengthProps.cmp(s.rhythmProps.noteLength, import_theory4.NoteLength.Quarter) >= 0)) {
         isGroup = true;
       }
-      this.type = isGroup ? 2 /* TripletGroup */ : 1 /* TripletBeam */;
-      ObjNoteGroup.setTripletBeamCounts(this);
+      this.type = isGroup ? 2 /* TupletGroup */ : 1 /* TupletBeam */;
+      ObjNoteGroup.setTupletBeamCounts(this);
     } else {
       this.type = 0 /* RegularBeam */;
     }
@@ -2054,29 +2047,35 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       symbols.forEach((s) => s.setBeamGroup(this));
       symbols[0].measure.addBeamGroup(this);
     } else {
-      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, "Cannot add beam group because some symbol already has one.");
+      throw new import_core6.MusicError(import_core6.MusicErrorType.Score, `Cannot add ${beamGroupName} because some symbol already has one.`);
     }
   }
+  get showTupletRatio() {
+    var _a;
+    return ((_a = this.tupletRatio) == null ? void 0 : _a.showRatio) === true;
+  }
   static createBeam(noteGroups) {
     if (noteGroups.length > 1) {
-      new _ObjBeamGroup(noteGroups, false);
+      new _ObjBeamGroup(noteGroups, void 0);
     }
   }
-  static createTriplet(symbols) {
-    let MaxTripletNoteLenght = import_theory4.NoteLength.Half;
-    let len = symbols.map((s) => s.rhythmProps.noteLength);
-    if (symbols.length == 2) {
-      if (len[0] <= MaxTripletNoteLenght && len[1] === len[0] / 2 && len[0] / 2 >= import_theory4.MinNoteLength || len[1] <= MaxTripletNoteLenght && len[0] === len[1] / 2 && len[1] / 2 >= import_theory4.MinNoteLength) {
-        new _ObjBeamGroup(symbols, true);
-        return true;
-      }
-    } else if (symbols.length === 3) {
-      if (len[0] <= MaxTripletNoteLenght && len.every((l) => l === len[0])) {
-        new _ObjBeamGroup(symbols, true);
-        return true;
-      }
+  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, import_theory4.Tuplet.Triplet);
+      return 2;
     }
-    return false;
+    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, import_theory4.Tuplet.Triplet);
+      return 3;
+    }
+    return 0;
+  }
+  static createTuplet(symbols, tupletRatio) {
+    new _ObjBeamGroup(symbols, tupletRatio);
   }
   getMusicInterface() {
     return this.mi;
@@ -2102,8 +2101,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   getType() {
     return this.type;
   }
-  isTriplet() {
-    return this.type === 1 /* TripletBeam */ || this.type === 2 /* TripletGroup */;
+  isTuplet() {
+    return this.type === 1 /* TupletBeam */ || this.type === 2 /* TupletGroup */;
   }
   getSymbols() {
     return this.symbols;
@@ -2165,10 +2164,10 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       }
       let leftStemHeight = (_a = symbolStemHeight[0]) != null ? _a : 0;
       let rightStemHeight = (_b = symbolStemHeight[symbolStemHeight.length - 1]) != null ? _b : 0;
-      if (this.type !== 2 /* TripletGroup */) {
+      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 === 1 /* Up */) {
+        if (stemDir === "up" /* Up */) {
           leftDy *= -1;
           rightDy *= -1;
         }
@@ -2181,7 +2180,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
           symbolY[symbolY.length - 1] += rightDy;
         }
       }
-      let groupLineDy = unitSize * 2 * (stemDir === 1 /* Up */ ? -1 : 1);
+      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;
@@ -2192,9 +2191,9 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         if (symX !== void 0 && symY !== void 0) {
           let beamY = import_ts_utils_lib3.Utils.Math.interpolateY(leftX, leftY, rightX, rightY, symX);
           let raiseY = symY - beamY;
-          if (stemDir === 1 /* Up */ && raiseY < 0) {
+          if (stemDir === "up" /* Up */ && raiseY < 0) {
             raiseBeamY = Math.min(raiseBeamY, raiseY);
-          } else if (stemDir === 2 /* Down */ && raiseY > 0) {
+          } else if (stemDir === "down" /* Down */ && raiseY > 0) {
             raiseBeamY = Math.max(raiseBeamY, raiseY);
           }
         }
@@ -2203,21 +2202,21 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       rightY += raiseBeamY;
       symbolY = symbolY.map((y) => y === void 0 ? void 0 : y + raiseBeamY);
       let obj = new ObjStaffBeamGroup(mainStaff, this);
-      if (this.type === 2 /* TripletGroup */) {
+      if (this.type === 2 /* TupletGroup */) {
         let ef = unitSize / (rightX - leftX);
         let l = import_ts_utils_lib3.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
         let r = import_ts_utils_lib3.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, 1 + ef);
         obj.points.push(new BeamPoint(leftStaff, this, leftSymbol, l.x, l.y));
         obj.points.push(new BeamPoint(rightStaff, this, rightSymbol, r.x, r.y));
-        obj.tripletNumberOffsetY = 0;
-      } else if (this.type === 0 /* RegularBeam */ || this.type === 1 /* TripletBeam */) {
+        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 === 1 /* Up */ ? beamCount - 1 : 0);
+            return DocumentSettings.BeamSeparation * unitSize * (this.stemDir === "up" /* Up */ ? beamCount - 1 : 0);
           } else {
             return 0;
           }
@@ -2228,17 +2227,18 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
           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 === 2 /* Down */ ? beamHeight(i) : 0);
-            pt.bottomBeamsHeight = beamThickness / 2 + (stemDir === 1 /* Up */ ? beamHeight(i) : 0);
+            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.tripletNumberOffsetY = groupLineDy;
+        obj.tupletNumberOffsetY = groupLineDy;
       }
-      if (this.isTriplet()) {
-        obj.tripletNumber = new ObjText(this, "3", 0.5, 0.5);
-        obj.tripletNumber.layout(renderer);
-        obj.tripletNumber.offset((leftX + rightX) / 2, (leftY + rightY) / 2 + obj.tripletNumberOffsetY);
+      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);
@@ -2260,7 +2260,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
     this.staffObjects.forEach((obj) => {
       let left = obj.points[0];
       let right = obj.points[obj.points.length - 1];
-      if (this.type !== 2 /* TripletGroup */) {
+      if (this.type !== 2 /* TupletGroup */) {
         obj.points.forEach((pt) => {
           if (pt.symbol instanceof ObjNoteGroup) {
             if (pt !== left && pt !== right) {
@@ -2270,9 +2270,9 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
           }
         });
       }
-      if (obj.tripletNumber) {
-        let y = (left.y + right.y) / 2 + obj.tripletNumberOffsetY;
-        obj.tripletNumber.offset(0, -obj.tripletNumber.getRect().centerY + y);
+      if (obj.tupletNumber) {
+        let y = (left.y + right.y) / 2 + obj.tupletNumberOffsetY;
+        obj.tupletNumber.offset(0, -obj.tupletNumber.getRect().centerY + y);
       }
     });
   }
@@ -2284,21 +2284,21 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
     let { unitSize, beamThickness, lineWidth } = renderer;
     let color = "black";
     this.staffObjects.forEach((obj) => {
-      if (this.type === 2 /* TripletGroup */) {
+      if (this.type === 2 /* TupletGroup */) {
         let l = obj.points[0];
         let r = obj.points[obj.points.length - 1];
         if (l && r) {
-          let tf = obj.tripletNumber ? obj.tripletNumber.getRect().width / (r.x - l.x) * 1.2 : 0;
+          let tf = obj.tupletNumber ? obj.tupletNumber.getRect().width / (r.x - l.x) * 1.2 : 0;
           let lc = import_ts_utils_lib3.Utils.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 - tf / 2);
           let rc = import_ts_utils_lib3.Utils.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 + tf / 2);
-          let tipH = this.stemDir === 1 /* Up */ ? unitSize : -unitSize;
+          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 /* TripletBeam */) {
-        let beamSeparation = DocumentSettings.BeamSeparation * unitSize * (this.stemDir === 1 /* Up */ ? 1 : -1);
+      } 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];
@@ -2325,8 +2325,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
           }
         }
       }
-      if (obj.tripletNumber) {
-        obj.tripletNumber.draw(renderer);
+      if (obj.tupletNumber) {
+        obj.tupletNumber.draw(renderer);
       }
     });
   }
@@ -2334,6 +2334,12 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
 
 // src/score/engine/obj-note-group.ts
 var import_core7 = require("@tspro/web-music-score/core");
+function getStem(stem) {
+  return import_ts_utils_lib4.Utils.Is.isEnumValue(stem, Stem) ? stem : void 0;
+}
+function getArpeggio(a) {
+  return import_ts_utils_lib4.Utils.Is.isEnumValue(a, Arpeggio) ? a : a === true ? "up" /* Up */ : void 0;
+}
 function sortNoteStringData(notes, strings) {
   let stringArr = import_ts_utils_lib4.Utils.Arr.isArray(strings) ? strings : strings !== void 0 ? [strings] : [];
   let noteStringData = notes.map((note, i) => {
@@ -2345,9 +2351,6 @@ function sortNoteStringData(notes, strings) {
     strings: noteStringData.every((e) => e.string === void 0) ? void 0 : noteStringData.map((e) => e.string)
   };
 }
-function solveArpeggio(a) {
-  return a === true || a === 0 /* Up */ ? 0 /* Up */ : a === 1 /* Down */ ? 1 /* Down */ : void 0;
-}
 var ObjStaffNoteGroup = class extends MusicObject {
   constructor(staff, noteGroup) {
     super(staff);
@@ -2437,7 +2440,7 @@ var ObjTabNoteGroup = class extends MusicObject {
   }
 };
 var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
-  constructor(col, voiceId, notes, noteLength, options) {
+  constructor(col, voiceId, notes, noteLength, options, tupletRatio) {
     var _a, _b, _c;
     super(col);
     this.col = col;
@@ -2453,6 +2456,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     __publicField(this, "staccato");
     __publicField(this, "diamond");
     __publicField(this, "arpeggio");
+    __publicField(this, "oldStyleTriplet");
     __publicField(this, "rhythmProps");
     __publicField(this, "startConnnectives", []);
     __publicField(this, "runningConnectives", []);
@@ -2470,13 +2474,15 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     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, options == null ? void 0 : options.stem);
+    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 = solveArpeggio(options == null ? void 0 : options.arpeggio);
-    this.rhythmProps = new import_theory5.RhythmProps(noteLength, options == null ? void 0 : options.dotted, options == null ? void 0 : options.triplet);
+    this.arpeggio = getArpeggio(options == null ? void 0 : options.arpeggio);
+    this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || import_theory5.NoteLengthProps.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 = import_theory5.RhythmProps.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? import_theory5.Tuplet.Triplet : void 0);
     this.mi = new MNoteGroup(this);
   }
   getMusicInterface() {
@@ -2494,16 +2500,13 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   get stemDir() {
     return this.beamGroup ? this.beamGroup.stemDir : this.ownStemDir;
   }
-  get triplet() {
-    return this.rhythmProps.triplet;
-  }
   enableConnective(line) {
     return line.containsVoiceId(this.voiceId) && (line instanceof ObjTab || line.containsDiatonicId(this.ownDiatonicId));
   }
   startConnective(connectiveProps) {
-    if (!this.row.hasStaff && connectiveProps.connective === 0 /* Tie */) {
+    if (!this.row.hasStaff && connectiveProps.connective === "tie" /* Tie */) {
       throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Ties not implemented for guitar tabs alone, staff is required!");
-    } else if (!this.row.hasStaff && connectiveProps.connective === 1 /* Slur */) {
+    } else if (!this.row.hasStaff && connectiveProps.connective === "slur" /* Slur */) {
       throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Slurs not implemented for guitar tabs alone, staff is required!");
     }
     this.startConnnectives.push(connectiveProps);
@@ -2562,7 +2565,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let stemTip = obj.stemTip;
       let stemDir = this.stemDir;
       let hasStem = stemTip !== void 0;
-      let stemSide = !hasStem ? void 0 : stemDir === 1 /* Up */ ? "right" : "left";
+      let stemSide = !hasStem ? void 0 : stemDir === "up" /* Up */ ? "right" : "left";
       let padding = noteHeadRect.height / 2;
       let centerX = noteHeadRect.centerX;
       let centerY = noteHeadRect.centerY;
@@ -2570,16 +2573,16 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let rightX = noteHeadRect.right + padding;
       let aboveY = noteHeadRect.top - padding;
       let belowY = noteHeadRect.bottom + padding;
-      if (noteAnchor === 0 /* Auto */) {
-        noteAnchor = 3 /* Below */;
-      } else if (noteAnchor === 4 /* StemTip */ && !hasStem) {
-        noteAnchor = stemDir === 1 /* Up */ ? 1 /* Above */ : 3 /* Below */;
+      if (noteAnchor === "auto" /* Auto */) {
+        noteAnchor = "below" /* Below */;
+      } else if (noteAnchor === "stemTip" /* StemTip */ && !hasStem) {
+        noteAnchor = stemDir === "up" /* Up */ ? "above" /* Above */ : "below" /* Below */;
       }
       switch (noteAnchor) {
-        case 2 /* Center */:
+        case "center" /* Center */:
           return side === "left" ? { x: rightX, y: centerY } : { x: leftX, y: centerY };
-        case 1 /* Above */:
-          if (!hasStem || stemDir === 2 /* Down */) {
+        case "above" /* Above */:
+          if (!hasStem || stemDir === "down" /* Down */) {
             return { x: centerX, y: aboveY };
           } else {
             return {
@@ -2587,8 +2590,8 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
               y: aboveY
             };
           }
-        case 3 /* Below */:
-          if (!hasStem || stemDir === 1 /* Up */) {
+        case "below" /* Below */:
+          if (!hasStem || stemDir === "up" /* Up */) {
             return { x: centerX, y: belowY };
           } else {
             return {
@@ -2596,8 +2599,8 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
               y: belowY
             };
           }
-        case 4 /* StemTip */:
-          return { x: centerX, y: stemTip.centerY + (stemDir === 1 /* Up */ ? -padding : padding) };
+        case "stemTip" /* StemTip */:
+          return { x: centerX, y: stemTip.centerY + (stemDir === "up" /* Up */ ? -padding : padding) };
         default:
           throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Invalid noteAnchor: " + noteAnchor);
       }
@@ -2612,7 +2615,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       let x = side === "right" ? r.left : r.right;
       let y;
       let s = 0.9;
-      if (connectiveProps.connective === 2 /* Slide */) {
+      if (connectiveProps.connective === "slide" /* Slide */) {
         let leftFretNumber = connectiveProps.noteGroups[0].getFretNumber(obj, 0);
         let rightFretNumber = connectiveProps.noteGroups[1].getFretNumber(obj, 0);
         let slideUp = leftFretNumber === void 0 || rightFretNumber === void 0 || leftFretNumber <= rightFretNumber;
@@ -2666,7 +2669,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     this.runningConnectives = [];
   }
   getPlaySlur() {
-    let slurs = this.runningConnectives.filter((c) => c.connective === 1 /* Slur */).map((c) => c.startsWith(this) ? "first" : "slurred");
+    let slurs = this.runningConnectives.filter((c) => c.connective === "slur" /* Slur */).map((c) => c.startsWith(this) ? "first" : "slurred");
     if (slurs.indexOf("first") >= 0) {
       return "first";
     } else if (slurs.indexOf("slurred") >= 0) {
@@ -2678,8 +2681,8 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   getBeamGroup() {
     return this.beamGroup;
   }
-  setBeamGroup(beam) {
-    this.beamGroup = beam;
+  setBeamGroup(beamGroup) {
+    this.beamGroup = beamGroup;
   }
   resetBeamGroup() {
     this.leftBeamCount = this.rightBeamCount = 0;
@@ -2690,19 +2693,19 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       var _a, _b, _c, _d;
       let staff = obj.staff;
       let x = (_b = (_a = obj.stemTip) == null ? void 0 : _a.centerX) != null ? _b : obj.noteHeadRects[0].centerX;
-      let y = (_d = (_c = obj.stemTip) == null ? void 0 : _c.centerY) != null ? _d : this.stemDir === 1 /* Up */ ? obj.getRect().top : obj.getRect().bottom;
-      let stemHeight = this.stemDir === 1 /* Up */ ? Math.abs(obj.noteHeadRects[0].centerY - y) : Math.abs(obj.noteHeadRects[obj.noteHeadRects.length - 1].centerY - y);
+      let y = (_d = (_c = obj.stemTip) == null ? void 0 : _c.centerY) != null ? _d : this.stemDir === "up" /* Up */ ? obj.getRect().top : obj.getRect().bottom;
+      let stemHeight = this.stemDir === "up" /* Up */ ? Math.abs(obj.noteHeadRects[0].centerY - y) : Math.abs(obj.noteHeadRects[obj.noteHeadRects.length - 1].centerY - y);
       return { staff, x, y, stemHeight };
     });
   }
   getStemHeight(renderer) {
     let { unitSize } = renderer;
-    let { noteLength, flagCount } = this.rhythmProps;
-    if (noteLength >= import_theory5.NoteLength.Whole) {
-      return 0;
-    } else {
+    let { flagCount, hasStem } = this.rhythmProps;
+    if (hasStem) {
       let addY = this.hasBeamCount() ? DocumentSettings.BeamSeparation : DocumentSettings.FlagSeparation;
       return (DocumentSettings.StemHeight + Math.max(0, flagCount - 1) * addY) * unitSize;
+    } else {
+      return 0;
     }
   }
   hasBeamCount() {
@@ -2721,13 +2724,13 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     return staff.containsVoiceId(this.voiceId) && this.staffObjects.some((obj) => obj instanceof ObjStaffNoteGroup && obj.staff === staff);
   }
   getPlayTicks(note) {
-    let tiedTicks = this.runningConnectives.filter((c) => c.connective === 0 /* Tie */).map((tie) => {
+    let tiedTicks = this.runningConnectives.filter((c) => c.connective === "tie" /* Tie */).map((tie) => {
       let tieNoteGroups = tie.noteGroups;
       let j = tieNoteGroups.indexOf(this);
       if (j < 0) {
         return 0;
       }
-      if (tie.span === -1 /* Stub */ || tie.span === -2 /* ToMeasureEnd */) {
+      if (tie.span === "stub" /* Stub */ || tie.span === "toMeasureEnd" /* ToMeasureEnd */) {
         return Math.max(this.rhythmProps.ticks, this.measure.getMeasureTicks() - this.col.positionTicks);
       }
       let prev = tieNoteGroups[j - 1];
@@ -2754,7 +2757,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     this.requestRectUpdate();
     let { unitSize } = renderer;
     let { row, stemDir } = this;
-    let { dotted, flagCount } = this.rhythmProps;
+    let { dotCount, flagCount, hasStem } = this.rhythmProps;
     let dotWidth = DocumentSettings.DotSize * unitSize;
     let noteHeadWidth = (this.diamond ? DocumentSettings.DiamondNoteHeadSize : DocumentSettings.NoteHeadWidth) * unitSize;
     let noteHeadHeight = (this.diamond ? DocumentSettings.DiamondNoteHeadSize : DocumentSettings.NoteHeadHeight) * unitSize;
@@ -2774,10 +2777,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let noteX = this.col.getNoteHeadDisplacement(this, note) * noteHeadWidth;
         let noteY = noteStaff.getDiatonicIdY(note.diatonicId);
         let isNoteOnLine = noteStaff.isLine(note.diatonicId);
-        if (isBottomNote && stemDir === 1 /* Up */) stemBaseStaff = noteStaff;
-        if (isTopNote && stemDir === 1 /* Up */) stemTipStaff = noteStaff;
-        if (isBottomNote && stemDir === 2 /* Down */) stemTipStaff = noteStaff;
-        if (isTopNote && stemDir === 2 /* Down */) stemBaseStaff = noteStaff;
+        if (isBottomNote && stemDir === "up" /* Up */) stemBaseStaff = noteStaff;
+        if (isTopNote && stemDir === "up" /* Up */) stemTipStaff = noteStaff;
+        if (isBottomNote && stemDir === "down" /* Down */) stemTipStaff = noteStaff;
+        if (isTopNote && stemDir === "down" /* Down */) stemBaseStaff = noteStaff;
         let noteHeadRect = obj.noteHeadRects[noteIndex] = DivRect.createCentered(noteX, noteY, noteHeadWidth, noteHeadHeight);
         noteStaff.addObject(noteHeadRect);
         if (accState.needAccidental(note)) {
@@ -2788,21 +2791,21 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
           }
           noteStaff.addObject(acc);
         }
-        if (dotted) {
-          let dotX = noteHeadRect.right + DocumentSettings.NoteDotSpace * unitSize + dotWidth / 2;
+        for (let i = 0; i < dotCount; i++) {
+          let dotX = noteHeadRect.right + DocumentSettings.NoteDotSpace * unitSize + dotWidth / 2 + i * dotWidth * 1.5;
           let dotY = noteY + this.getDotVerticalDisplacement(staff, note.diatonicId, stemDir) * unitSize;
           let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
           obj.dotRects.push(r);
           noteStaff.addObject(r);
         }
         if (this.staccato) {
-          if (stemDir === 1 /* Up */ && isBottomNote) {
+          if (stemDir === "up" /* Up */ && isBottomNote) {
             let dotX = noteX;
             let dotY = noteY + unitSize * (isNoteOnLine ? 3 : 2);
             let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
             obj.dotRects.push(r);
             stemBaseStaff.addObject(r);
-          } else if (stemDir === 2 /* Down */ && isTopNote) {
+          } else if (stemDir === "down" /* Down */ && isTopNote) {
             let dotX = noteX;
             let dotY = noteY - unitSize * (isNoteOnLine ? 3 : 2);
             let r = DivRect.createCentered(dotX, dotY, dotWidth, dotWidth);
@@ -2813,11 +2816,11 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       });
       let bottomNoteY = obj.noteHeadRects[0].centerY;
       let topNoteY = obj.noteHeadRects[obj.noteHeadRects.length - 1].centerY;
-      let stemX = stemDir === 1 /* Up */ ? noteHeadWidth / 2 : -noteHeadWidth / 2;
+      let stemX = stemDir === "up" /* Up */ ? noteHeadWidth / 2 : -noteHeadWidth / 2;
       let stemHeight = this.getStemHeight(renderer);
-      let stemTipY = stemDir === 1 /* Up */ ? topNoteY - stemHeight : bottomNoteY + stemHeight;
-      let stemBaseY = stemDir === 1 /* Up */ ? bottomNoteY : topNoteY;
-      if (this.rhythmProps.hasStem()) {
+      let stemTipY = stemDir === "up" /* Up */ ? topNoteY - stemHeight : bottomNoteY + stemHeight;
+      let stemBaseY = stemDir === "up" /* Up */ ? bottomNoteY : topNoteY;
+      if (hasStem) {
         obj.stemTip = new DivRect(stemX, stemX, stemTipY, stemTipY);
         obj.stemBase = new DivRect(stemX, stemX, stemBaseY, stemBaseY);
         stemTipStaff.addObject(obj.stemTip);
@@ -2828,7 +2831,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let flagHeight = flagCount === 0 ? 0 : DocumentSettings.FlagHeight * unitSize;
         for (let i = 0; i < flagCount; i++) {
           let flagAddY = i * unitSize * DocumentSettings.FlagSeparation;
-          let r = obj.flagRects[i] = stemDir === 1 /* Up */ ? new DivRect(stemX, stemX + flagWidth, stemTipY + flagAddY, stemTipY + flagHeight + flagAddY) : new DivRect(stemX, stemX + flagWidth, stemTipY - flagHeight - flagAddY, stemTipY - flagAddY);
+          let r = obj.flagRects[i] = stemDir === "up" /* Up */ ? new DivRect(stemX, stemX + flagWidth, stemTipY + flagAddY, stemTipY + flagHeight + flagAddY) : new DivRect(stemX, stemX + flagWidth, stemTipY - flagHeight - flagAddY, stemTipY - flagAddY);
           stemTipStaff.addObject(r);
         }
       }
@@ -2841,7 +2844,6 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       }
       let obj = new ObjTabNoteGroup(tab, this);
       this.notes.forEach((note, noteIndex) => {
-        var _a, _b;
         if (this.ownString[noteIndex] !== void 0) {
           let stringId = this.ownString[noteIndex] - 1;
           let fretId = note.chromaticId - tab.getTuningStrings()[stringId].chromaticId;
@@ -2849,9 +2851,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
           let fretNumber = new ObjText(this, { text: String(fretId), color, bgcolor: "white" }, 0.5, 0.5);
           obj.fretNumbers.push(fretNumber);
           fretNumber.layout(renderer);
-          let noteX = this.col.getNoteHeadDisplacement(this, note) * noteHeadWidth;
-          let stemX = (_b = (_a = this.staffObjects[0]) == null ? void 0 : _a.stemBase) == null ? void 0 : _b.centerX;
-          let x = stemX != null ? stemX : noteX;
+          let x = this.col.getRect().centerX;
           let y = tab.getStringY(stringId);
           fretNumber.offset(x, y);
         }
@@ -2894,15 +2894,22 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     renderer.drawDebugRect(this.getRect());
     let { lineWidth } = renderer;
     let { color, stemDir } = this;
-    let { noteLength } = this.rhythmProps;
+    let { isSolidNoteHead } = this.rhythmProps;
     this.staffObjects.forEach((obj) => {
       obj.accidentals.forEach((d) => d.draw(renderer));
       ctx.strokeStyle = ctx.fillStyle = color;
       ctx.lineWidth = lineWidth;
       obj.noteHeadRects.forEach((r) => {
-        let outlinedNoteHead = noteLength >= import_theory5.NoteLength.Half;
         if (this.diamond) {
-          if (outlinedNoteHead) {
+          if (isSolidNoteHead) {
+            ctx.beginPath();
+            ctx.moveTo(r.centerX, r.top);
+            ctx.lineTo(r.right, r.centerY);
+            ctx.lineTo(r.centerX, r.bottom);
+            ctx.lineTo(r.left, r.centerY);
+            ctx.lineTo(r.centerX, r.top);
+            ctx.fill();
+          } else {
             ctx.beginPath();
             ctx.lineWidth = lineWidth * 2.5;
             ctx.moveTo(r.centerX, r.top);
@@ -2917,22 +2924,14 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
             ctx.moveTo(r.centerX, r.top);
             ctx.lineTo(r.left, r.centerY);
             ctx.stroke();
-          } else {
-            ctx.beginPath();
-            ctx.moveTo(r.centerX, r.top);
-            ctx.lineTo(r.right, r.centerY);
-            ctx.lineTo(r.centerX, r.bottom);
-            ctx.lineTo(r.left, r.centerY);
-            ctx.lineTo(r.centerX, r.top);
-            ctx.fill();
           }
         } else {
           ctx.beginPath();
           ctx.ellipse(r.centerX, r.centerY, r.leftw, r.toph, -0.3, 0, Math.PI * 2);
-          if (outlinedNoteHead) {
-            ctx.stroke();
-          } else {
+          if (isSolidNoteHead) {
             ctx.fill();
+          } else {
+            ctx.stroke();
           }
         }
       });
@@ -2947,8 +2946,8 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         let left = rect.left;
         let right = rect.right;
         let width = right - left;
-        let top = stemDir === 1 /* Up */ ? rect.top : rect.bottom;
-        let bottom = stemDir === 1 /* Up */ ? rect.bottom : rect.top;
+        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(
@@ -2962,13 +2961,13 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
         ctx.stroke();
       });
     });
-    this.tabObjects.forEach((obj) => {
-      obj.fretNumbers.forEach((fn) => fn.draw(renderer));
-    });
+    this.tabObjects.forEach((obj) => obj.fretNumbers.forEach((fn) => fn.draw(renderer)));
   }
   static setBeamCounts(groupNotes) {
     const isADottedBHalf = (a, b) => {
-      return a.rhythmProps.noteLength === b.rhythmProps.noteLength * 2 && a.rhythmProps.dotted && !b.rhythmProps.dotted && a.rhythmProps.flagCount > 0 && b.rhythmProps.flagCount > 0;
+      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];
@@ -3014,29 +3013,27 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
       }
     } while (fixAgain);
   }
-  static setTripletBeamCounts(triplet) {
-    let type = triplet.getType();
-    let symbols = triplet.getSymbols();
-    if (type === 1 /* TripletBeam */) {
+  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 /* TripletGroup */) {
+    } else if (type === 2 /* TupletGroup */) {
       symbols.forEach((s) => {
         if (s instanceof _ObjNoteGroup) {
           s.leftBeamCount = s.rightBeamCount = 0;
         }
       });
-    } else {
-      throw new import_core7.MusicError(import_core7.MusicErrorType.Score, "Cannot set triplet beam count because triplet beam group type is invalid.");
     }
   }
   getDotVerticalDisplacement(staff, diatonicId, stemDir) {
     if (staff.isLine(diatonicId)) {
-      return stemDir === 1 /* Up */ ? -1 : 1;
+      return stemDir === "up" /* Up */ ? -1 : 1;
     } else {
       return 0;
     }
@@ -3061,7 +3058,7 @@ var import_core8 = require("@tspro/web-music-score/core");
 var noteHeadDataCompareFunc = (a, b) => {
   let cmp = import_theory6.Note.compareFunc(a.note, b.note);
   if (cmp === 0) {
-    cmp = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === 1 /* Up */ ? 1 : -1;
+    cmp = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
   }
   return cmp;
 };
@@ -3174,16 +3171,14 @@ var ObjRhythmColumn = class extends MusicObject {
   }
   getArpeggioDir() {
     var _a;
-    return (_a = this.arpeggioDir) != null ? _a : 0 /* Up */;
+    return (_a = this.arpeggioDir) != null ? _a : "up" /* Up */;
   }
   setVoiceSymbol(voiceId, symbol) {
     validateVoiceId(voiceId);
     this.voiceSymbol[voiceId] = symbol;
-    if (symbol instanceof ObjRest) {
-      if (!symbol.hide && symbol.noteLength >= import_theory6.NoteLength.Half) {
-        this.minDiatonicId = this.minDiatonicId === void 0 ? symbol.ownDiatonicId : Math.min(this.minDiatonicId, symbol.ownDiatonicId);
-        this.maxDiatonicId = this.maxDiatonicId === void 0 ? symbol.ownDiatonicId : Math.max(this.maxDiatonicId, symbol.ownDiatonicId);
-      }
+    if (symbol instanceof ObjRest && !symbol.hide) {
+      this.minDiatonicId = this.minDiatonicId === void 0 ? symbol.ownDiatonicId : Math.min(this.minDiatonicId, symbol.ownDiatonicId);
+      this.maxDiatonicId = this.maxDiatonicId === void 0 ? symbol.ownDiatonicId : Math.max(this.maxDiatonicId, symbol.ownDiatonicId);
     } else if (symbol instanceof ObjNoteGroup) {
       this.minDiatonicId = this.minDiatonicId === void 0 ? symbol.notes[0].diatonicId : Math.min(this.minDiatonicId, symbol.notes[0].diatonicId);
       this.maxDiatonicId = this.maxDiatonicId === void 0 ? symbol.notes[symbol.notes.length - 1].diatonicId : Math.max(this.maxDiatonicId, symbol.notes[symbol.notes.length - 1].diatonicId);
@@ -3199,15 +3194,18 @@ var ObjRhythmColumn = class extends MusicObject {
     return this.voiceSymbol[voiceId];
   }
   getMinWidth() {
-    let maxNoteLength = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteLength));
+    let maxNoteSize = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteSize));
     let w = DocumentSettings.NoteHeadWidth;
-    switch (maxNoteLength) {
-      case import_theory6.NoteLength.Whole:
+    switch (maxNoteSize) {
+      case 1:
         return w * 5;
-      case import_theory6.NoteLength.Half:
+      // whole note
+      case 2:
         return w * 3;
-      case import_theory6.NoteLength.Quarter:
+      // half note
+      case 4:
         return w * 2;
+      // quarter note
       default:
         return w;
     }
@@ -3239,7 +3237,7 @@ var ObjRhythmColumn = class extends MusicObject {
       if (cur.displacement !== void 0) {
         continue;
       }
-      let d = cur.noteGroup.stemDir === 2 /* Down */ ? -1 : 1;
+      let d = cur.noteGroup.stemDir === "down" /* Down */ ? -1 : 1;
       if (prev && cur.note.diatonicId - prev.note.diatonicId <= 1) {
         cur.displacement = prev.displacement === 0 ? d : 0;
       } else if (next && next.note.diatonicId - cur.note.diatonicId <= 1) {
@@ -3293,7 +3291,7 @@ var ObjRhythmColumn = class extends MusicObject {
       }
     });
     playerNotes.sort((a, b) => import_theory6.Note.compareFunc(a.note, b.note));
-    if (this.hasArpeggio() && this.getArpeggioDir() === 1 /* Down */) {
+    if (this.hasArpeggio() && this.getArpeggioDir() === "down" /* Down */) {
       playerNotes.reverse();
     }
     return playerNotes;
@@ -3410,6 +3408,9 @@ var ObjRhythmColumn = class extends MusicObject {
   }
 };
 
+// src/score/engine/element-data.ts
+var import_ts_utils_lib5 = require("@tspro/ts-utils-lib");
+
 // src/score/engine/obj-special-text.ts
 var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
   constructor(parent, text) {
@@ -3507,36 +3508,71 @@ __publicField(_ObjSpecialText, "Segno", "\u{1D10B}");
 var ObjSpecialText = _ObjSpecialText;
 
 // src/score/engine/element-data.ts
-function getNavigationString(n) {
-  switch (n) {
-    case 1 /* DC_al_Coda */:
+function getNavigationString(navigation) {
+  switch (navigation) {
+    case "D.C. al Coda" /* DC_al_Coda */:
       return "D.C. al Coda";
-    case 0 /* DC_al_Fine */:
+    case "D.C. al Fine" /* DC_al_Fine */:
       return "D.C. al Fine";
-    case 3 /* DS_al_Coda */:
+    case "D.S. al Coda" /* DS_al_Coda */:
       return "D.S. al Coda";
-    case 2 /* DS_al_Fine */:
+    case "D.S. al Fine" /* DS_al_Fine */:
       return "D.S. al Fine";
-    case 7 /* Fine */:
+    case "Fine" /* Fine */:
       return "Fine";
-    case 6 /* Segno */:
+    case "Segno" /* Segno */:
       return ObjSpecialText.Segno;
-    case 4 /* Coda */:
+    case "Coda" /* Coda */:
       return ObjSpecialText.Coda;
-    case 5 /* toCoda */:
+    case "toCoda" /* toCoda */:
       return ObjSpecialText.toCoda;
     default:
-      return Navigation[n];
+      return navigation[0].toUpperCase() + navigation.substring(1);
   }
 }
+var DynamicsAnnotations = /* @__PURE__ */ ((DynamicsAnnotations2) => {
+  DynamicsAnnotations2["cresc"] = "cresc.";
+  DynamicsAnnotations2["decresc"] = "decresc.";
+  DynamicsAnnotations2["dim"] = "dim.";
+  DynamicsAnnotations2["ppp"] = "ppp";
+  DynamicsAnnotations2["pp"] = "pp";
+  DynamicsAnnotations2["p"] = "p";
+  DynamicsAnnotations2["mp"] = "mp";
+  DynamicsAnnotations2["m"] = "m";
+  DynamicsAnnotations2["mf"] = "mf";
+  DynamicsAnnotations2["f"] = "f";
+  DynamicsAnnotations2["ff"] = "ff";
+  DynamicsAnnotations2["fff"] = "fff";
+  return DynamicsAnnotations2;
+})(DynamicsAnnotations || {});
+var TempoAnnotations = /* @__PURE__ */ ((TempoAnnotations2) => {
+  TempoAnnotations2["accel"] = "accel.";
+  TempoAnnotations2["rit"] = "rit.";
+  TempoAnnotations2["a_tempo"] = "a tempo";
+  return TempoAnnotations2;
+})(TempoAnnotations || {});
 function isDynamicsText(text) {
-  return ["ppp", "pp", "p", "mp", "m", "mf", "f", "ff", "fff", "cresc.", "decresc.", "dim."].indexOf(text) >= 0;
+  return import_ts_utils_lib5.Utils.Is.isEnumValue(text, DynamicsAnnotations);
 }
-function isDynamicsLevelText(text) {
-  return ["ppp", "pp", "p", "mp", "m", "mf", "f", "ff", "fff"].indexOf(text) >= 0;
+function getDynamicsVolume(text) {
+  if (/^(p+|f+|m|mp|mf)$/.test(text)) {
+    let volume = 0.5 - import_ts_utils_lib5.Utils.Str.charCount(text, "p") * 0.1 + import_ts_utils_lib5.Utils.Str.charCount(text, "f") * 0.1;
+    return import_ts_utils_lib5.Utils.Math.clamp(volume, 0, 1);
+  } else {
+    return void 0;
+  }
 }
 function isTempoText(text) {
-  return ["accel.", "rit.", "a tempo"].indexOf(text) >= 0;
+  return import_ts_utils_lib5.Utils.Is.isEnumValue(text, TempoAnnotations);
+}
+function getAnnotation(text) {
+  if (import_ts_utils_lib5.Utils.Is.isEnumValue(text, DynamicsAnnotations)) {
+    return "dynamics" /* Dynamics */;
+  } else if (import_ts_utils_lib5.Utils.Is.isEnumValue(text, TempoAnnotations)) {
+    return "tempo" /* Tempo */;
+  } else {
+    return void 0;
+  }
 }
 
 // src/score/engine/extension.ts
@@ -3595,7 +3631,7 @@ var Extension = class extends MusicObjectLink {
         if (prevMeasure.hasEndSection() || prevMeasure.hasEndSong()) {
           return "section-break";
         }
-        let elemArr = [9 /* EndRepeat */, 10 /* Ending */];
+        let elemArr = ["endRepeat" /* EndRepeat */, "ending" /* Ending */];
         for (let i = 0; i < elemArr.length; i++) {
           if (prevMeasure.hasNavigation(elemArr[i])) {
             return "section-break";
@@ -3656,35 +3692,12 @@ var RitardandoSpeedDiv = 2;
 var CrescendoVolumeAdd = 0.5;
 var DiminuendoVolumeSub = 0.5;
 function calcTicksDuration(ticks, tempo) {
-  let beatTicks = new import_theory7.RhythmProps(tempo.options.beatLength, tempo.options.dotted).ticks;
+  let beatTicks = import_theory7.RhythmProps.get(tempo.options.beatLength, tempo.options.dotCount).ticks;
   let ticksPerMinute = tempo.beatsPerMinute * beatTicks;
   return 60 * ticks / ticksPerMinute;
 }
-function getVolume(dynamicsLevelText) {
-  switch (dynamicsLevelText) {
-    case "fff":
-      return 0.9;
-    case "ff":
-      return 0.8;
-    case "f":
-      return 0.7;
-    case "mf":
-      return 0.6;
-    default:
-    case "m":
-      return 0.5;
-    case "mp":
-      return 0.4;
-    case "p":
-      return 0.3;
-    case "pp":
-      return 0.2;
-    case "ppp":
-      return 0.1;
-  }
-}
 function getDefaultVolume() {
-  return getVolume("m");
+  return getDynamicsVolume("m");
 }
 function adjustVolume(linearVolume) {
   return linearVolume * 1.25;
@@ -3712,7 +3725,7 @@ var PlayerColumnProps = class {
     return this.speed;
   }
   getTempo() {
-    let speed = import_ts_utils_lib5.Utils.Math.clamp(this.getSpeed(), 0.1, 10);
+    let speed = import_ts_utils_lib6.Utils.Math.clamp(this.getSpeed(), 0.1, 10);
     return (0, import_theory7.alterTempoSpeed)(this.measure.getTempo(), speed);
   }
   setVolume(volume) {
@@ -3737,7 +3750,7 @@ var PlayerColumnProps = class {
       if (symbolsTicks.length === 0) {
         return 0;
       } else {
-        return import_ts_utils_lib5.Utils.Math.sum(symbolsTicks) / symbolsTicks.length;
+        return import_ts_utils_lib6.Utils.Math.sum(symbolsTicks) / symbolsTicks.length;
       }
     }
   }
@@ -3800,34 +3813,34 @@ var Player = class _Player {
         continue;
       }
       measureSequence.push(curMeasure);
-      if (curMeasure.hasNavigation(8 /* StartRepeat */)) {
+      if (curMeasure.hasNavigation("startRepeat" /* StartRepeat */)) {
         startRepeatMeasure = curMeasure;
       }
-      if (curMeasure.hasNavigation(6 /* Segno */)) {
+      if (curMeasure.hasNavigation("Segno" /* Segno */)) {
         segnoMeasure = curMeasure;
       }
-      if (alCoda && curMeasure.hasNavigation(5 /* toCoda */)) {
-        while (curMeasure && !curMeasure.hasNavigation(4 /* Coda */)) {
+      if (alCoda && curMeasure.hasNavigation("toCoda" /* toCoda */)) {
+        while (curMeasure && !curMeasure.hasNavigation("Coda" /* Coda */)) {
           curMeasure = curMeasure.getNextMeasure();
         }
-      } else if (alFine && curMeasure.hasNavigation(7 /* Fine */)) {
+      } else if (alFine && curMeasure.hasNavigation("Fine" /* Fine */)) {
         curMeasure = void 0;
-      } else if (curMeasure.hasNavigation(1 /* DC_al_Coda */)) {
+      } else if (curMeasure.hasNavigation("D.C. al Coda" /* DC_al_Coda */)) {
         alCoda = true;
         curMeasure = this.doc.getFirstMeasure();
-      } else if (curMeasure.hasNavigation(0 /* DC_al_Fine */)) {
+      } else if (curMeasure.hasNavigation("D.C. al Fine" /* DC_al_Fine */)) {
         alFine = true;
         curMeasure = this.doc.getFirstMeasure();
-      } else if (curMeasure.hasNavigation(3 /* DS_al_Coda */)) {
+      } else if (curMeasure.hasNavigation("D.S. al Coda" /* DS_al_Coda */)) {
         alCoda = true;
         curMeasure = segnoMeasure;
-      } else if (curMeasure.hasNavigation(2 /* DS_al_Fine */)) {
+      } else if (curMeasure.hasNavigation("D.S. al Fine" /* DS_al_Fine */)) {
         alFine = true;
         curMeasure = segnoMeasure;
-      } else if (curMeasure.hasNavigation(9 /* EndRepeat */)) {
+      } else if (curMeasure.hasNavigation("endRepeat" /* EndRepeat */)) {
         let passage = curMeasure.getPassCount();
         let repeatCount = curMeasure.getEndRepeatPlayCount() - 1;
-        let cannotPassThrough = ((_a = curMeasure.getNextMeasure()) == null ? void 0 : _a.hasNavigation(10 /* Ending */)) === true;
+        let cannotPassThrough = ((_a = curMeasure.getNextMeasure()) == null ? void 0 : _a.hasNavigation("ending" /* Ending */)) === true;
         if (passage <= repeatCount || cannotPassThrough) {
           curMeasure = startRepeatMeasure;
         } else {
@@ -3878,14 +3891,15 @@ var Player = class _Player {
       col.getAnchoredLayoutObjects().forEach((layoutObj) => {
         var _a2;
         let text = (_a2 = layoutObj.getTextContent()) != null ? _a2 : "";
-        if (text === "a tempo") {
+        let vol;
+        if (text === "a tempo" /* a_tempo */) {
           curSpeed = 1;
-        } else if (isDynamicsLevelText(text)) {
-          curVolume = getVolume(text);
+        } else if ((vol = getDynamicsVolume(text)) !== void 0) {
+          curVolume = vol;
         } else if (layoutObj.musicObj.getLink() instanceof Extension) {
           let extension = layoutObj.musicObj.getLink();
           let { columnRange, extensionBreakText } = extension.getExtensionRangeInfo();
-          let totalTicks = import_ts_utils_lib5.Utils.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
+          let totalTicks = import_ts_utils_lib6.Utils.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
           switch (text) {
             case "accel." /* accel */: {
               let startSpeed = curSpeed;
@@ -3910,8 +3924,8 @@ var Player = class _Player {
             case "cresc." /* cresc */: {
               let startVol = curVolume;
               let endVol = startVol + CrescendoVolumeAdd;
-              if (extensionBreakText && isDynamicsLevelText(extensionBreakText) && getVolume(extensionBreakText) > startVol) {
-                endVol = getVolume(extensionBreakText);
+              if (extensionBreakText && (vol = getDynamicsVolume(extensionBreakText)) !== void 0 && vol > startVol) {
+                endVol = vol;
               }
               let accuTicks = 0;
               columnRange.forEach((c) => {
@@ -3924,8 +3938,8 @@ var Player = class _Player {
             case "dim." /* dim */: {
               let startVol = curVolume;
               let endVol = startVol - DiminuendoVolumeSub;
-              if (extensionBreakText && isDynamicsLevelText(extensionBreakText) && getVolume(extensionBreakText) < startVol) {
-                endVol = getVolume(extensionBreakText);
+              if (extensionBreakText && (vol = getDynamicsVolume(extensionBreakText)) !== void 0 && vol < startVol) {
+                endVol = vol;
               }
               let accuTicks = 0;
               columnRange.forEach((c) => {
@@ -3939,11 +3953,11 @@ var Player = class _Player {
       });
       let speedArr = (_a = speedMap.get(col)) != null ? _a : [];
       if (speedArr.length > 0) {
-        curSpeed = import_ts_utils_lib5.Utils.Math.sum(speedArr) / speedArr.length;
+        curSpeed = import_ts_utils_lib6.Utils.Math.sum(speedArr) / speedArr.length;
       }
       let volumeArr = (_b = volumeMap.get(col)) != null ? _b : [];
       if (volumeArr.length > 0) {
-        curVolume = import_ts_utils_lib5.Utils.Math.sum(volumeArr) / volumeArr.length;
+        curVolume = import_ts_utils_lib6.Utils.Math.sum(volumeArr) / volumeArr.length;
       }
       col.getPlayerProps().setSpeed(curSpeed);
       col.getPlayerProps().setVolume(curVolume);
@@ -3956,7 +3970,7 @@ var Player = class _Player {
         return m;
       }
       let next = m == null ? void 0 : m.getNextMeasure();
-      if (!m || m.hasEndSong() || m.hasEndSection() || !next || next.hasNavigation(8 /* StartRepeat */)) {
+      if (!m || m.hasEndSong() || m.hasEndSection() || !next || next.hasNavigation("startRepeat" /* StartRepeat */)) {
         return void 0;
       }
     }
@@ -3981,11 +3995,11 @@ var Player = class _Player {
     } else {
       let playerNotes = col.getPlayerNotes();
       playerNotes.forEach((note, i) => {
-        let arpeggioDelayTicks = col.hasArpeggio() ? import_theory7.NoteLength.ThirtySecond * i : 0;
+        let arpeggioDelayTicks = col.hasArpeggio() ? import_theory7.RhythmProps.get(import_theory7.NoteLength.ThirtySecond).ticks * i : 0;
         let noteSeconds = getDuration(note.ticks + fermataHoldTicks - arpeggioDelayTicks, tempo);
         if (noteSeconds > 0) {
           if (note.staccato) {
-            noteSeconds = Math.min(getDuration(import_theory7.NoteLength.Eighth, tempo) / 2, noteSeconds / 2);
+            noteSeconds = Math.min(getDuration(import_theory7.RhythmProps.get(import_theory7.NoteLength.Eighth).ticks, tempo) / 2, noteSeconds / 2);
           }
           let volume = adjustVolume(col.getPlayerProps().getVolume());
           if (note.slur === "slurred") {
@@ -4223,8 +4237,8 @@ var ObjBarLineLeft = class extends ObjBarLine {
   solveBarLineType() {
     let m = this.measure;
     let prev = m.getPrevMeasure();
-    if (m.hasNavigation(8 /* StartRepeat */)) {
-      if (prev && prev.row === m.row && prev.hasNavigation(9 /* EndRepeat */)) {
+    if (m.hasNavigation("startRepeat" /* StartRepeat */)) {
+      if (prev && prev.row === m.row && prev.hasNavigation("endRepeat" /* EndRepeat */)) {
         return 0 /* None */;
       } else {
         return 4 /* StartRepeat */;
@@ -4251,8 +4265,8 @@ var ObjBarLineRight = class extends ObjBarLine {
   solveBarLineType() {
     let m = this.measure;
     let next = m.getNextMeasure();
-    if (m.hasNavigation(9 /* EndRepeat */)) {
-      if (next && next.row === m.row && next.hasNavigation(8 /* StartRepeat */)) {
+    if (m.hasNavigation("endRepeat" /* EndRepeat */)) {
+      if (next && next.row === m.row && next.hasNavigation("startRepeat" /* StartRepeat */)) {
         return 6 /* EndStartRepeat */;
       } else {
         return 5 /* EndRepeat */;
@@ -4262,10 +4276,10 @@ var ObjBarLineRight = class extends ObjBarLine {
     } else if (m.hasEndSection()) {
       return 2 /* Double */;
     }
-    if (m === m.row.getLastMeasure() && next && next.row === m.row.getNextRow() && next.hasNavigation(8 /* StartRepeat */)) {
+    if (m === m.row.getLastMeasure() && next && next.row === m.row.getNextRow() && next.hasNavigation("startRepeat" /* StartRepeat */)) {
       return 2 /* Double */;
     }
-    if (next && next.hasNavigation(8 /* StartRepeat */)) {
+    if (next && next.hasNavigation("startRepeat" /* StartRepeat */)) {
       return 0 /* None */;
     }
     return 1 /* Single */;
@@ -4273,7 +4287,7 @@ var ObjBarLineRight = class extends ObjBarLine {
 };
 
 // src/score/engine/obj-ending.ts
-var import_ts_utils_lib6 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib7 = require("@tspro/ts-utils-lib");
 var import_core10 = require("@tspro/web-music-score/core");
 var ObjEnding = class extends MusicObject {
   constructor(measure, passages) {
@@ -4284,9 +4298,9 @@ var ObjEnding = class extends MusicObject {
     __publicField(this, "shapeRects", []);
     __publicField(this, "mi");
     this.mi = new MEnding(this);
-    if (!import_ts_utils_lib6.Utils.Is.isIntegerGte(passages.length, 1)) {
+    if (!import_ts_utils_lib7.Utils.Is.isIntegerGte(passages.length, 1)) {
       throw new import_core10.MusicError(import_core10.MusicErrorType.Score, "Passages is empty.");
-    } else if (!this.passages.every((p) => import_ts_utils_lib6.Utils.Is.isIntegerGte(p, 1))) {
+    } else if (!this.passages.every((p) => import_ts_utils_lib7.Utils.Is.isIntegerGte(p, 1))) {
       throw new import_core10.MusicError(import_core10.MusicErrorType.Score, "Invalid passages: " + this.passages);
     }
     this.passages.sort((a, b) => a - b);
@@ -4302,7 +4316,7 @@ var ObjEnding = class extends MusicObject {
   isSingleMeasureEnding() {
     let { measure } = this;
     let next = measure.getNextMeasure();
-    return (next == null ? void 0 : next.hasNavigation(10 /* Ending */)) === true || measure.hasNavigation(9 /* EndRepeat */) || measure.isLastMeasure();
+    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);
@@ -4501,7 +4515,7 @@ var import_core13 = require("@tspro/web-music-score/core");
 var import_theory8 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/obj-connective.ts
-var import_ts_utils_lib7 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib8 = require("@tspro/ts-utils-lib");
 var import_core11 = require("@tspro/web-music-score/core");
 var ObjConnective = class extends MusicObject {
   constructor(connectiveProps, line, measure, leftNoteGroup, leftNoteId, ...args) {
@@ -4530,7 +4544,7 @@ var ObjConnective = class extends MusicObject {
       this.rightNoteGroup = args[0];
       this.rightNoteId = args[1];
       this.tieType = void 0;
-    } else if (import_ts_utils_lib7.Utils.Is.isEnumValue(args[0], TieType)) {
+    } else if (import_ts_utils_lib8.Utils.Is.isEnumValue(args[0], TieType)) {
       this.rightNoteGroup = void 0;
       this.rightNoteId = void 0;
       this.tieType = args[0];
@@ -4561,7 +4575,7 @@ var ObjConnective = class extends MusicObject {
     if (rightNoteGroup !== void 0 && rightNoteId !== void 0) {
       rightPos = rightNoteGroup.getConnectiveAnchorPoint(connectiveProps, line, rightNoteId, noteAnchor, "right");
     } else {
-      rightPos = this.tieType === -2 /* ToMeasureEnd */ ? { x: measure.getColumnsContentRect().right, y: leftPos.y } : { x: leftPos.x + unitSize * DocumentSettings.StubTieLength, y: leftPos.y };
+      rightPos = this.tieType === "toMeasureEnd" /* ToMeasureEnd */ ? { x: measure.getColumnsContentRect().right, y: leftPos.y } : { x: leftPos.x + unitSize * DocumentSettings.StubTieLength, y: leftPos.y };
     }
     let lx, ly, rx, ry;
     if (rightNoteGroup === void 0) {
@@ -4599,8 +4613,8 @@ var ObjConnective = class extends MusicObject {
     this.ly = ly;
     this.rx = rx;
     this.ry = ry;
-    this.arcHeight = this.connectiveProps.connective === 2 /* Slide */ ? 0 : arcHeight;
-    let { nx, ny } = import_ts_utils_lib7.Utils.Math.calcNormal(lx, ly, rx, ry);
+    this.arcHeight = this.connectiveProps.connective === "slide" /* Slide */ ? 0 : arcHeight;
+    let { nx, ny } = import_ts_utils_lib8.Utils.Math.calcNormal(lx, ly, rx, ry);
     this.cp1x = lx * 0.7 + rx * 0.3 + nx * this.arcHeight;
     this.cp1y = ly * 0.7 + ry * 0.3 + ny * this.arcHeight;
     this.cp2x = lx * 0.3 + rx * 0.7 + nx * this.arcHeight;
@@ -4661,6 +4675,7 @@ var ObjConnective = class extends MusicObject {
 
 // src/score/engine/connective-props.ts
 var import_core12 = require("@tspro/web-music-score/core");
+var import_ts_utils_lib9 = require("@tspro/ts-utils-lib");
 var ConnectiveProps = class {
   constructor(connective, span, noteAnchor, startNoteGroup) {
     this.connective = connective;
@@ -4682,7 +4697,7 @@ var ConnectiveProps = class {
    * @returns true if noteGroup was added, false if not.
    */
   addNoteGroup(noteGroup) {
-    if (this.span === -1 /* Stub */ || this.span === -2 /* ToMeasureEnd */) {
+    if (this.span === "stub" /* Stub */ || this.span === "toMeasureEnd" /* ToMeasureEnd */) {
       return false;
     } else if (this.span > this.noteGroups.length) {
       this.noteGroups.push(noteGroup);
@@ -4692,29 +4707,29 @@ var ConnectiveProps = class {
     }
   }
   computeParams() {
-    let stemDir = this.noteGroups[0].stemDir;
-    let hasStem = this.noteGroups[0].rhythmProps.hasStem;
-    if (this.noteAnchor === 4 /* StemTip */) {
-      this.arcDir = stemDir === 1 /* Up */ ? "up" : "down";
-    } else if (this.noteAnchor === 0 /* Auto */) {
-      this.arcDir = stemDir === 1 /* Up */ || !hasStem ? "down" : "up";
+    let { stemDir } = this.noteGroups[0];
+    let { hasStem } = this.noteGroups[0].rhythmProps;
+    if (this.noteAnchor === "stemTip" /* StemTip */) {
+      this.arcDir = stemDir === "up" /* Up */ ? "up" : "down";
+    } else if (this.noteAnchor === "auto" /* Auto */) {
+      this.arcDir = stemDir === "up" /* Up */ || !hasStem ? "down" : "up";
       if (this.noteGroups[0].notes.length > 1) {
-        this.noteAnchor = 2 /* Center */;
-      } else if (this.connective === 2 /* Slide */) {
-        this.noteAnchor = 2 /* Center */;
+        this.noteAnchor = "center" /* Center */;
+      } else if (this.connective === "slide" /* Slide */) {
+        this.noteAnchor = "center" /* Center */;
       } else if (this.arcDir === "up") {
-        this.noteAnchor = 1 /* Above */;
+        this.noteAnchor = "above" /* Above */;
       } else {
-        this.noteAnchor = 3 /* Below */;
+        this.noteAnchor = "below" /* Below */;
       }
-    } else if (this.noteAnchor === 2 /* Center */) {
+    } else if (this.noteAnchor === "center" /* Center */) {
       let { row } = this.noteGroups[0].measure;
       let diatonicId = this.noteGroups[0].ownDiatonicId;
       let staff = row.getStaff(diatonicId);
       this.arcDir = !staff || diatonicId < staff.middleLineDiatonicId ? "down" : "up";
-    } else if (this.noteAnchor === 1 /* Above */) {
+    } else if (this.noteAnchor === "above" /* Above */) {
       this.arcDir = "up";
-    } else if (this.noteAnchor === 3 /* Below */) {
+    } else if (this.noteAnchor === "below" /* Below */) {
       this.arcDir = "down";
     }
   }
@@ -4729,8 +4744,8 @@ var ConnectiveProps = class {
     this.getStartNoteGroup().collectConnectiveProps();
     this.computeParams();
     let { connective, span } = this;
-    if (connective === 0 /* Tie */) {
-      if (span === -1 /* Stub */ || span === -2 /* ToMeasureEnd */) {
+    if (connective === "tie" /* Tie */) {
+      if (import_ts_utils_lib9.Utils.Is.isEnumValue(span, TieType)) {
         let leftNoteGroup = this.noteGroups[0];
         for (let noteId = 0; noteId < leftNoteGroup.notes.length; noteId++) {
           this.createObjConnectiveWithTieType(leftNoteGroup, noteId, span);
@@ -4747,13 +4762,13 @@ var ConnectiveProps = class {
           });
         }
       }
-    } else if (connective === 1 /* Slur */) {
+    } else if (connective === "slur" /* Slur */) {
       if (typeof span === "number" && span >= 2 && this.noteGroups.length === span) {
         let leftNoteGroup = this.noteGroups[0];
         let rightNoteGroup = this.noteGroups[this.noteGroups.length - 1];
         this.createObjConnective(leftNoteGroup, 0, rightNoteGroup, 0);
       }
-    } else if (connective === 2 /* Slide */) {
+    } else if (connective === "slide" /* Slide */) {
       if (this.noteGroups.length >= 2) {
         for (let i = 0; i < this.noteGroups.length - 1; i++) {
           let leftNoteGroup = this.noteGroups[i];
@@ -4783,7 +4798,7 @@ var ConnectiveProps = class {
         } else {
           let leftString = leftNoteGroup2.getFretNumberString(leftNoteId2);
           let rightString = rightNoteGroup2.getFretNumberString(rightNoteId2);
-          if (leftString !== void 0 && rightString !== void 0 && (leftString === rightString || this.connective === 1 /* Slur */)) {
+          if (leftString !== void 0 && rightString !== void 0 && (leftString === rightString || this.connective === "slur" /* Slur */)) {
             new ObjConnective(this, line, measure, leftNoteGroup2, leftNoteId2, rightNoteGroup2, rightNoteId2);
           }
         }
@@ -4808,6 +4823,32 @@ function validateVoiceId(voiceId) {
     return voiceId;
   }
 }
+function getExtensionTicks(extensionLength) {
+  if (typeof extensionLength === "string") {
+    extensionLength = [extensionLength];
+  }
+  if (import_ts_utils_lib10.Utils.Is.isArray(extensionLength)) {
+    let totalTicks = 0;
+    for (let i = 0; i < extensionLength.length; ) {
+      let str = extensionLength[i];
+      let num = extensionLength[i + 1];
+      if (typeof str === "string") {
+        i++;
+        let ticks = import_theory9.RhythmProps.get(str).ticks;
+        if (typeof num === "number") {
+          i++;
+          ticks *= num;
+        }
+        totalTicks += ticks;
+      } else {
+        i++;
+      }
+    }
+    return totalTicks;
+  } else {
+    return extensionLength;
+  }
+}
 var _ObjMeasure = class _ObjMeasure extends MusicObject {
   constructor(row) {
     super(row);
@@ -4911,15 +4952,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     if (setStemDir !== void 0) {
       this.useStemDir[voiceId] = setStemDir;
     } else if (this.useStemDir[voiceId] === void 0) {
-      this.useStemDir[voiceId] = (_b = (_a = this.getPrevMeasure()) == null ? void 0 : _a.useStemDir[voiceId]) != null ? _b : 0 /* Auto */;
+      this.useStemDir[voiceId] = (_b = (_a = this.getPrevMeasure()) == null ? void 0 : _a.useStemDir[voiceId]) != null ? _b : "auto" /* Auto */;
     }
     let stemDir = this.useStemDir[voiceId];
-    if (stemDir === 0 /* Auto */ || stemDir === void 0) {
+    if (stemDir === "auto" /* Auto */ || stemDir === void 0) {
       let staff = this.row.getStaff(symbol.ownDiatonicId);
       if (staff) {
-        return symbol.ownDiatonicId > staff.middleLineDiatonicId ? 2 /* Down */ : 1 /* Up */;
+        return symbol.ownDiatonicId > staff.middleLineDiatonicId ? "down" /* Down */ : "up" /* Up */;
       } else {
-        return 1 /* Up */;
+        return "up" /* Up */;
       }
     } else {
       return stemDir;
@@ -5026,6 +5067,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   // See MMeasure interface
   //setKeySignature(tonic: string, scaleType: ScaleType): void;
   //setKeySignature(keySignature: KeySignature): void;
+  //setKeySignature(keySignature: string): void;
   //setKeySignature(scale: Scale): void;
   setKeySignature(...args) {
     var _a;
@@ -5034,13 +5076,17 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       this.alterKeySignature = args[0];
     } else if (args[0] instanceof import_theory9.Scale) {
       this.alterKeySignature = args[0];
-    } else {
-      try {
-        let tonic = "" + args[0];
-        let scaleType = (0, import_theory9.validateScaleType)("" + args[1]);
-        this.alterKeySignature = (0, import_theory9.getScale)(tonic, scaleType);
-      } catch (e) {
-        throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot set key signature because invalid args: " + args);
+    } else if (import_ts_utils_lib10.Utils.Is.isNonEmptyString(args[0])) {
+      if (args.length === 1) {
+        this.alterKeySignature = (0, import_theory9.getScale)(args[0]);
+      } else if (args.length === 2) {
+        try {
+          let tonic = "" + args[0];
+          let scaleType = (0, import_theory9.validateScaleType)("" + args[1]);
+          this.alterKeySignature = (0, import_theory9.getScale)(tonic, scaleType);
+        } catch (e) {
+          throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot set key signature because invalid args: " + args);
+        }
       }
     }
     this.updateKeySignature();
@@ -5080,8 +5126,16 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   setTempo(beatsPerMinute, beatLength, dotted) {
     var _a;
     (_a = this.getPrevMeasure()) == null ? void 0 : _a.endSection();
-    let options = beatLength !== void 0 ? { beatLength, dotted } : void 0;
-    this.alterTempo = { beatsPerMinute, options };
+    if (beatLength === void 0) {
+      this.alterTempo = { beatsPerMinute };
+    } else {
+      let dotCount = typeof dotted === "number" && dotted > 0 ? dotted : dotted === true ? 1 : import_theory9.NoteLengthProps.get(beatLength).dotCount;
+      let options = {
+        beatLength: (0, import_theory9.validateNoteLength)(beatLength),
+        dotCount: dotCount > 0 ? dotCount : void 0
+      };
+      this.alterTempo = { beatsPerMinute, options };
+    }
     this.updateTempo();
   }
   updateTempo() {
@@ -5090,18 +5144,18 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     if (this.alterTempo) {
       let beatsPerMinute = this.alterTempo.beatsPerMinute;
       let beatLength;
-      let dotted;
+      let dotCount;
       if (this.alterTempo.options) {
         beatLength = this.alterTempo.options.beatLength;
-        dotted = (_a = this.alterTempo.options.dotted) != null ? _a : false;
+        dotCount = (_a = this.alterTempo.options.dotCount) != null ? _a : 0;
       } else if (this.alterTimeSignature) {
         beatLength = this.alterTimeSignature.beatLength;
-        dotted = false;
+        dotCount = 0;
       } else {
         beatLength = this.tempo.options.beatLength;
-        dotted = this.tempo.options.dotted;
+        dotCount = this.tempo.options.dotCount;
       }
-      this.tempo = { beatsPerMinute, options: { beatLength, dotted } };
+      this.tempo = { beatsPerMinute, options: { beatLength, dotCount } };
     }
     if (this.nextMeasure) {
       this.nextMeasure.updateTempo();
@@ -5133,19 +5187,19 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let grp = this.doc.getStaffGroup(staffTabOrGroup);
           if (grp && !prevGroups.includes(staffTabOrGroup)) {
             let curGroups = [...prevGroups, staffTabOrGroup];
-            (import_ts_utils_lib8.Utils.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
+            (import_ts_utils_lib10.Utils.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
               switch (grp.verticalPosition) {
-                case 0 /* Above */:
+                case "above" /* Above */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
                   break;
-                case 1 /* Below */:
+                case "below" /* Below */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 1 /* Below */, curGroups);
                   break;
-                case 2 /* Both */:
+                case "both" /* Both */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
                   addToStaffTabOrGroup(staffTabOrGroup2, 1 /* Below */, curGroups);
                   break;
-                case 3 /* Auto */:
+                case "auto" /* Auto */:
                   addToStaffTabOrGroup(staffTabOrGroup2, defaultVerticalPos, curGroups);
                   break;
               }
@@ -5160,14 +5214,14 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       } else {
         addToStaffTabOrGroup(0, defaultVerticalPos);
       }
-    } else if (import_ts_utils_lib8.Utils.Is.isArray(staffTabOrGroups)) {
+    } else if (import_ts_utils_lib10.Utils.Is.isArray(staffTabOrGroups)) {
       staffTabOrGroups.forEach((staffTabOrGroup) => addToStaffTabOrGroup(staffTabOrGroup, defaultVerticalPos));
     } else {
       addToStaffTabOrGroup(staffTabOrGroups, defaultVerticalPos);
     }
   }
   addFermata(staffTabOrGroups, fermata) {
-    let anchor = fermata === 1 /* AtMeasureEnd */ ? this.barLineRight : this.lastAddedRhythmColumn;
+    let anchor = fermata === "atMeasureEnd" /* AtMeasureEnd */ ? this.barLineRight : this.lastAddedRhythmColumn;
     if (!anchor) {
       throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add Fermata because anchor is undefined.");
     }
@@ -5183,7 +5237,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   addNavigation(staffTabOrGroups, navigation, ...args) {
     let addLayoutObjectProps = void 0;
     switch (navigation) {
-      case 10 /* Ending */:
+      case "ending" /* Ending */:
         if (this.navigationSet.has(navigation)) {
           throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add ending beasure measure already has one.");
         }
@@ -5195,10 +5249,10 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           defaultVerticalPos: 0 /* Above */
         };
         break;
-      case 1 /* DC_al_Coda */:
-      case 0 /* DC_al_Fine */:
-      case 3 /* DS_al_Coda */:
-      case 2 /* DS_al_Fine */: {
+      case "D.C. al Coda" /* DC_al_Coda */:
+      case "D.C. al Fine" /* DC_al_Fine */:
+      case "D.S. al Coda" /* DS_al_Coda */:
+      case "D.S. al Fine" /* DS_al_Fine */: {
         let anchor2 = this.barLineRight;
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
@@ -5206,11 +5260,11 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           layoutGroupId: 2 /* Navigation */,
           defaultVerticalPos: 0 /* Above */
         };
-        this.addNavigation(staffTabOrGroups, 9 /* EndRepeat */);
+        this.addNavigation(staffTabOrGroups, "endRepeat" /* EndRepeat */);
         this.endSong();
         break;
       }
-      case 7 /* Fine */: {
+      case "Fine" /* Fine */: {
         let anchor2 = this.barLineRight;
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
@@ -5220,8 +5274,8 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         };
         break;
       }
-      case 6 /* Segno */:
-      case 4 /* Coda */: {
+      case "Segno" /* Segno */:
+      case "Coda" /* Coda */: {
         let anchor2 = this.barLineLeft;
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
@@ -5231,7 +5285,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         };
         break;
       }
-      case 5 /* toCoda */: {
+      case "toCoda" /* toCoda */: {
         let anchor2 = this.barLineRight;
         let text = getNavigationString(navigation);
         addLayoutObjectProps = {
@@ -5241,10 +5295,10 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         };
         break;
       }
-      case 9 /* EndRepeat */:
+      case "endRepeat" /* EndRepeat */:
         if (args.length === 0) {
           this.endRepeatPlayCount = 2;
-        } else if (import_ts_utils_lib8.Utils.Is.isIntegerGte(args[0], 2)) {
+        } else if (import_ts_utils_lib10.Utils.Is.isIntegerGte(args[0], 2)) {
           this.endRepeatPlayCount = args[0];
         } else {
           throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
@@ -5280,17 +5334,18 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let layoutGroupId;
     let defaultVerticalPos;
     switch (annotation) {
-      case 0 /* Dynamics */:
+      case "dynamics" /* Dynamics */:
         layoutGroupId = 5 /* DynamicsAnnotation */;
         defaultVerticalPos = 0 /* Above */;
         textProps.italic = true;
         break;
-      case 1 /* Tempo */:
+      case "tempo" /* Tempo */:
         layoutGroupId = 4 /* TempoAnnotation */;
         defaultVerticalPos = 0 /* Above */;
         textProps.italic = true;
         break;
     }
+    this.disableExtension();
     this.forEachStaffGroup(staffTabOrGroups, defaultVerticalPos, (line, vpos) => {
       let textObj = new ObjText(anchor, textProps, 0.5, 1);
       this.addLayoutObject(textObj, line, layoutGroupId, vpos);
@@ -5308,15 +5363,16 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let layoutGroupId;
     let defaultVerticalPos;
     switch (label) {
-      case 0 /* Note */:
+      case "note" /* Note */:
         layoutGroupId = 1 /* NoteLabel */;
         defaultVerticalPos = 1 /* Below */;
         break;
-      case 1 /* Chord */:
+      case "chord" /* Chord */:
         layoutGroupId = 6 /* ChordLabel */;
         defaultVerticalPos = 0 /* Above */;
         break;
     }
+    this.disableExtension();
     this.forEachStaffGroup(staffTabOrGroups, defaultVerticalPos, (line, vpos) => {
       let textObj = new ObjText(anchor, textProps, 0.5, 1);
       this.addLayoutObject(textObj, line, layoutGroupId, vpos);
@@ -5328,17 +5384,17 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     if (!(anchor instanceof ObjNoteGroup)) {
       throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Connective can be added to note group only.");
     }
-    if (connective === 0 /* Tie */) {
-      let tieSpan = import_ts_utils_lib8.Utils.Is.isInteger(args[0]) || import_ts_utils_lib8.Utils.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
-      let noteAnchor = import_ts_utils_lib8.Utils.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : 0 /* Auto */;
-      anchor.startConnective(new ConnectiveProps(0 /* Tie */, tieSpan, noteAnchor, anchor));
-    } else if (connective === 1 /* Slur */) {
-      let slurSpan = import_ts_utils_lib8.Utils.Is.isInteger(args[0]) ? args[0] : 2;
-      let noteAnchor = import_ts_utils_lib8.Utils.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : 0 /* Auto */;
-      anchor.startConnective(new ConnectiveProps(1 /* Slur */, slurSpan, noteAnchor, anchor));
-    } else if (connective === 2 /* Slide */) {
-      let noteAnchor = import_ts_utils_lib8.Utils.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : 0 /* Auto */;
-      anchor.startConnective(new ConnectiveProps(2 /* Slide */, 2, noteAnchor, anchor));
+    if (connective === "tie" /* Tie */) {
+      let tieSpan = import_ts_utils_lib10.Utils.Is.isInteger(args[0]) || import_ts_utils_lib10.Utils.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
+      let noteAnchor = import_ts_utils_lib10.Utils.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 = import_ts_utils_lib10.Utils.Is.isInteger(args[0]) ? args[0] : 2;
+      let noteAnchor = import_ts_utils_lib10.Utils.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 = import_ts_utils_lib10.Utils.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
+      anchor.startConnective(new ConnectiveProps("slide" /* Slide */, 2, noteAnchor, anchor));
     }
   }
   addExtension(extensionLength, extensionVisible) {
@@ -5347,7 +5403,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       if (musicObj instanceof ObjText && anchor instanceof ObjRhythmColumn) {
         let lineStyle = "dashed";
         let linePos = "bottom";
-        let extension = new Extension(musicObj, anchor, extensionLength, extensionVisible, lineStyle, linePos);
+        let extension = new Extension(musicObj, anchor, getExtensionTicks(extensionLength), extensionVisible, lineStyle, linePos);
         musicObj.setLink(extension);
       } else {
         throw new import_core13.MusicError(import_core13.MusicErrorType.Score, "Cannot add extension becaue no compatible music object to attach it to.");
@@ -5396,21 +5452,25 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     col.setVoiceSymbol(voiceId, symbol);
     this.getVoiceSymbols(voiceId);
     this.voiceSymbols[voiceId].push(symbol);
-    if (symbol.triplet) {
+    if (symbol.oldStyleTriplet) {
       this.createOldStyleTriplets(voiceId);
     }
     this.requestBeamsUpdate();
     this.lastAddedRhythmColumn = col;
     this.lastAddedRhythmSymbol = symbol;
   }
-  addNoteGroup(voiceId, notes, noteLength, options) {
-    let notes2 = notes.map((note) => typeof note === "string" ? import_theory9.Note.getNote(note) : note);
+  addNoteGroup(voiceId, notes, noteLength, options, tupletRatio) {
+    let realNotes = notes.map((note) => typeof note === "string" ? import_theory9.Note.getNote(note) : note);
     let col = this.getRhythmColumn(voiceId);
-    this.addRhythmSymbol(voiceId, new ObjNoteGroup(col, voiceId, notes2, noteLength, options));
+    let noteGroup = new ObjNoteGroup(col, voiceId, realNotes, noteLength, options, tupletRatio);
+    this.addRhythmSymbol(voiceId, noteGroup);
+    return noteGroup;
   }
-  addRest(voiceId, restLength, options) {
+  addRest(voiceId, restLength, options, tupletRatio) {
     let col = this.getRhythmColumn(voiceId);
-    this.addRhythmSymbol(voiceId, new ObjRest(col, voiceId, restLength, options));
+    let rest = new ObjRest(col, voiceId, restLength, options, tupletRatio);
+    this.addRhythmSymbol(voiceId, rest);
+    return rest;
   }
   /**
    * 
@@ -5552,18 +5612,13 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   requestBeamsUpdate() {
     this.needBeamsUpdate = true;
   }
+  // Create triplets by triplet property of NoteOptions/RestOptions.
   createOldStyleTriplets(voiceId) {
     let symbols = this.getVoiceSymbols(voiceId);
-    if (symbols.length <= 2) {
-      return;
-    }
     for (let i = 0; i < symbols.length; ) {
-      let s2 = symbols.slice(i, i + 2);
-      let s3 = symbols.slice(i, i + 3);
-      if (s2.length === 2 && s2.every((s) => s.triplet) && s2.every((s) => s.getBeamGroup() === void 0) && ObjBeamGroup.createTriplet(s2)) {
-        i += 2;
-      } else if (s3.length === 3 && s3.every((s) => s.triplet) && s3.every((s) => s.getBeamGroup() === void 0) && ObjBeamGroup.createTriplet(s3)) {
-        i += 3;
+      if (symbols[i].oldStyleTriplet) {
+        let n = ObjBeamGroup.createOldStyleTriplet(symbols.slice(i, i + 3));
+        i += n === 0 ? 1 : n;
       } else {
         i++;
       }
@@ -5575,11 +5630,11 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       return;
     }
     this.beamGroups = this.beamGroups.filter((beamGroup) => {
-      if (beamGroup.getType() === 0 /* RegularBeam */) {
+      if (beamGroup.isTuplet()) {
+        return true;
+      } else {
         beamGroup.detach();
         return false;
-      } else {
-        return true;
       }
     });
     getVoiceIds().forEach((voiceId) => {
@@ -5615,7 +5670,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   static setupBeamGroup(groupSymbols) {
     let groupNotes = groupSymbols.map((s) => {
       var _a;
-      return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTriplet()) !== true ? s : void 0;
+      return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? s : void 0;
     });
     ObjNoteGroup.setBeamCounts(groupNotes);
     let beamNotes = [];
@@ -5647,36 +5702,32 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       if (this.getConsumedTicks() === 0) {
         this.completeRests(0);
       } else {
-        getVoiceIds().forEach((voiceId2) => {
-          if (this.getConsumedTicks(voiceId2) > 0) {
-            this.completeRests(voiceId2);
-          }
-        });
+        this.completeRests(getVoiceIds().filter((id) => this.getConsumedTicks(id) > 0));
       }
       return;
-    }
-    let measureTicks = this.getMeasureTicks();
-    let consumedTicks = this.getConsumedTicks(voiceId);
-    let remainingTicks = measureTicks - consumedTicks;
-    let rests = [];
-    let noteLengthValues = import_ts_utils_lib8.Utils.Enum.getEnumValues(import_theory9.NoteLength);
-    while (remainingTicks > 0) {
-      noteLengthValues.forEach((restLength) => {
-        let restValue = new import_theory9.RhythmProps(restLength, false);
-        if (restValue.canDot()) {
-          let dottedRestValue = new import_theory9.RhythmProps(restLength, true);
-          while (dottedRestValue.ticks <= remainingTicks) {
-            rests.push(dottedRestValue);
-            remainingTicks -= dottedRestValue.ticks;
+    } else if (import_ts_utils_lib10.Utils.Is.isArray(voiceId)) {
+      voiceId.forEach((id) => this.completeRests(id));
+      return;
+    } else {
+      validateVoiceId(voiceId);
+      let measureTicks = this.getMeasureTicks();
+      let consumedTicks = this.getConsumedTicks(voiceId);
+      let remainingTicks = measureTicks - consumedTicks;
+      let rests = [];
+      while (remainingTicks > 0) {
+        for (let noteSize = import_theory9.NoteLengthProps.LongestNoteSize; noteSize <= import_theory9.NoteLengthProps.ShortestNoteSize; noteSize *= 2) {
+          let restLength = import_theory9.NoteLengthProps.create(noteSize).noteLength;
+          for (let dotCount = import_theory9.NoteLengthProps.get(restLength).maxDotCount; dotCount >= 0; dotCount--) {
+            let restProps = import_theory9.RhythmProps.get(restLength, dotCount);
+            while (restProps.ticks <= remainingTicks) {
+              rests.push(restProps);
+              remainingTicks -= restProps.ticks;
+            }
           }
         }
-        while (restValue.ticks <= remainingTicks) {
-          rests.push(restValue);
-          remainingTicks -= restValue.ticks;
-        }
-      });
+      }
+      rests.reverse().forEach((rest) => this.addRest(voiceId, rest.noteLength, { dotted: rest.dotCount }));
     }
-    rests.reverse().forEach((rest) => this.addRest(voiceId, rest.noteLength, { dotted: rest.dotted }));
   }
   requestLayout() {
     if (!this.needLayout) {
@@ -5769,7 +5820,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 = import_ts_utils_lib8.Utils.Math.sum(this.columns.map((col) => col.getRect().width));
+    let columnsWidth = import_ts_utils_lib10.Utils.Math.sum(this.columns.map((col) => col.getRect().width));
     let columnScale = columnsAreaWidth / columnsWidth;
     let columnLeft = columnsAreaLeft;
     this.columns.forEach((col) => {
@@ -6109,10 +6160,12 @@ var ObjStaff = class extends ObjNotationLine4 {
       this.clefImageAsset = 0 /* TrebleClefPng */;
       this.clefLineDiatonicId = getDiatonicId("G4", staffConfig.isOctaveDown === true);
       this.middleLineDiatonicId = this.clefLineDiatonicId + 2;
-    } else {
+    } else if (staffConfig.clef === "F" /* F */) {
       this.clefImageAsset = 1 /* BassClefPng */;
       this.clefLineDiatonicId = getDiatonicId("F3", staffConfig.isOctaveDown === true);
       this.middleLineDiatonicId = this.clefLineDiatonicId - 2;
+    } else {
+      throw new import_core15.MusicError(import_core15.MusicErrorType.Score, `Invalid staffConfig.clef ${staffConfig.clef}.`);
     }
     this.topLineDiatonicId = this.middleLineDiatonicId + 4;
     this.bottomLineDiatonicId = this.middleLineDiatonicId - 4;
@@ -6248,7 +6301,7 @@ var ObjTab = class extends ObjNotationLine4 {
     __publicField(this, "tuningName");
     __publicField(this, "tuningStrings");
     __publicField(this, "mi");
-    if (import_ts_utils_lib9.Utils.Is.isArray(tabConfig.tuning)) {
+    if (import_ts_utils_lib11.Utils.Is.isArray(tabConfig.tuning)) {
       this.tuningName = void 0;
       this.tuningStrings = tabConfig.tuning.map((noteName) => import_theory11.Note.getNote(noteName)).reverse();
     } else if (typeof tabConfig.tuning === "string") {
@@ -6703,7 +6756,7 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-var import_ts_utils_lib10 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib12 = require("@tspro/ts-utils-lib");
 var ObjDocument = class extends MusicObject {
   constructor() {
     super(void 0);
@@ -6724,35 +6777,35 @@ var ObjDocument = class extends MusicObject {
     return this.mi;
   }
   setScoreConfiguration(config) {
-    if (import_ts_utils_lib10.Utils.Is.isEnumValue(config, StaffPreset)) {
+    if (import_ts_utils_lib12.Utils.Is.isEnumValue(config, StaffPreset)) {
       switch (config) {
         default:
-        case 1 /* Treble */:
+        case "treble" /* Treble */:
           this.curScoreConfig = [{ type: "staff", clef: "G" /* G */ }];
           break;
-        case 2 /* Bass */:
+        case "bass" /* Bass */:
           this.curScoreConfig = [{ type: "staff", clef: "F" /* F */ }];
           break;
-        case 3 /* Grand */:
+        case "grand" /* Grand */:
           this.curScoreConfig = [
             { type: "staff", clef: "G" /* G */, isGrand: true },
             { type: "staff", clef: "F" /* F */, isGrand: true }
           ];
           break;
-        case 4 /* GuitarTreble */:
+        case "guitarTreble" /* GuitarTreble */:
           this.curScoreConfig = [{ type: "staff", clef: "G" /* G */, isOctaveDown: true }];
           break;
-        case 8 /* GuitarTab */:
+        case "guitarTab" /* GuitarTab */:
           this.curScoreConfig = [{ type: "tab", tuning: "Standard" }];
           break;
-        case 12 /* GuitarCombined */:
+        case "guitarCombined" /* GuitarCombined */:
           this.curScoreConfig = [
             { type: "staff", clef: "G" /* G */, isOctaveDown: true },
             { type: "tab", tuning: "Standard" }
           ];
           break;
       }
-    } else if (import_ts_utils_lib10.Utils.Is.isArray(config)) {
+    } else if (import_ts_utils_lib12.Utils.Is.isArray(config)) {
       this.curScoreConfig = config;
     } else {
       this.curScoreConfig = [config];
@@ -6994,85 +7047,105 @@ function isNote(note) {
   }
 }
 function isVoiceId(value) {
-  return import_ts_utils_lib11.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return import_ts_utils_lib13.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function isStringNumber(value) {
-  return import_ts_utils_lib11.Utils.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+  return import_ts_utils_lib13.Utils.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
 }
 function assertStaffConfig(staffConfig) {
-  assertArg(import_ts_utils_lib11.Utils.Is.isObject(staffConfig), "staffConfig", staffConfig);
+  assertArg(import_ts_utils_lib13.Utils.Is.isObject(staffConfig), "staffConfig", staffConfig);
   assertArg(staffConfig.type === "staff", "staffConfig.type", staffConfig.type);
-  assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
-  assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
-  assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
-  assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(staffConfig.voiceIds) || import_ts_utils_lib11.Utils.Is.isArray(staffConfig.voiceIds) && staffConfig.voiceIds.every((voiceId) => import_ts_utils_lib11.Utils.Is.isNumber(voiceId)), "staffConfig.voiceIds", staffConfig.voiceIds);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
+  assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(staffConfig.voiceIds) || import_ts_utils_lib13.Utils.Is.isArray(staffConfig.voiceIds) && staffConfig.voiceIds.every((voiceId) => import_ts_utils_lib13.Utils.Is.isNumber(voiceId)), "staffConfig.voiceIds", staffConfig.voiceIds);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
 }
 function assertTabConfig(tabConfig) {
-  assertArg(import_ts_utils_lib11.Utils.Is.isObject(tabConfig), "tabConfig", tabConfig);
+  assertArg(import_ts_utils_lib13.Utils.Is.isObject(tabConfig), "tabConfig", tabConfig);
   assertArg(tabConfig.type === "tab", "tabConfig.type", tabConfig.type);
   if (typeof tabConfig.tuning === "string") {
     assertArg(import_theory13.TuningNameList.includes(tabConfig.tuning), "tabConfig.tuning", tabConfig.tuning);
-  } else if (import_ts_utils_lib11.Utils.Is.isArray(tabConfig.tuning)) {
-    assertArg(tabConfig.tuning.length === 6 && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
+  } else if (import_ts_utils_lib13.Utils.Is.isArray(tabConfig.tuning)) {
+    assertArg(tabConfig.tuning.length === getStringNumbers().length && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
   }
-  assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(tabConfig.voiceIds) || import_ts_utils_lib11.Utils.Is.isArray(tabConfig.voiceIds) && tabConfig.voiceIds.every((voiceId) => import_ts_utils_lib11.Utils.Is.isNumber(voiceId)), "tabConfig.voiceIds", tabConfig.voiceIds);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(tabConfig.voiceIds) || import_ts_utils_lib13.Utils.Is.isArray(tabConfig.voiceIds) && tabConfig.voiceIds.every((voiceId) => import_ts_utils_lib13.Utils.Is.isNumber(voiceId)), "tabConfig.voiceIds", tabConfig.voiceIds);
 }
 function assertNoteOptions(options) {
-  assertArg(import_ts_utils_lib11.Utils.Is.isObject(options), "noteOptions", options);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.dotted), "noteOptions.dotted", options.dotted);
-  assertArg(import_ts_utils_lib11.Utils.Is.isEnumValueOrUndefined(options.stem, Stem), "noteOptions.stem", options.stem);
-  assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(options.color), "noteOptions.color", options.color);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.arpeggio) || import_ts_utils_lib11.Utils.Is.isEnumValue(options.arpeggio, Arpeggio), "noteOptions.arpeggio", options.arpeggio);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.staccato), "noteOptions.staccato", options.staccato);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.diamond), "noteOptions.diamond", options.diamond);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.triplet), "noteOptions.triplet", options.triplet);
-  assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(options.string) || isStringNumber(options.string) || import_ts_utils_lib11.Utils.Is.isArray(options.string) && options.string.length > 0 && options.string.every((string) => isStringNumber(string)), "noteOptions.string", options.string);
+  assertArg(import_ts_utils_lib13.Utils.Is.isObject(options), "noteOptions", options);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.dotted) || import_ts_utils_lib13.Utils.Is.isIntegerGte(options.dotted, 0), "noteOptions.dotted", options.dotted);
+  assertArg(import_ts_utils_lib13.Utils.Is.isEnumValueOrUndefined(options.stem, Stem), "noteOptions.stem", options.stem);
+  assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(options.color), "noteOptions.color", options.color);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.arpeggio) || import_ts_utils_lib13.Utils.Is.isEnumValue(options.arpeggio, Arpeggio), "noteOptions.arpeggio", options.arpeggio);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.staccato), "noteOptions.staccato", options.staccato);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.diamond), "noteOptions.diamond", options.diamond);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.triplet), "noteOptions.triplet", options.triplet);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(options.string) || isStringNumber(options.string) || import_ts_utils_lib13.Utils.Is.isNonEmptyArray(options.string) && options.string.every((string) => isStringNumber(string)), "noteOptions.string", options.string);
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(options.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
+  assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(options.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
 }
 function assertRestOptions(options) {
-  assertArg(import_ts_utils_lib11.Utils.Is.isObject(options), "restOptions", options);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.dotted), "restOptions.dotted", options.dotted);
-  assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(options.staffPos) || import_ts_utils_lib11.Utils.Is.isInteger(options.staffPos) || options.staffPos instanceof import_theory13.Note, "restOptions.staffPos", options.staffPos);
-  assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(options.color), "restOptions.color", options.color);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.hide), "restOptions.hide", options.hide);
-  assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(options.triplet), "restOptions.triplet", options.triplet);
+  assertArg(import_ts_utils_lib13.Utils.Is.isObject(options), "restOptions", options);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.dotted) || import_ts_utils_lib13.Utils.Is.isIntegerGte(options.dotted, 0), "restOptions.dotted", options.dotted);
+  assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(options.staffPos) || import_ts_utils_lib13.Utils.Is.isInteger(options.staffPos) || options.staffPos instanceof import_theory13.Note, "restOptions.staffPos", options.staffPos);
+  assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(options.color), "restOptions.color", options.color);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.hide), "restOptions.hide", options.hide);
+  assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(options.triplet), "restOptions.triplet", options.triplet);
 }
 function assertStaffTabOrGRoups(staffTabOrGroups) {
   assertArg(
-    import_ts_utils_lib11.Utils.Is.isStringOrUndefined(staffTabOrGroups) || import_ts_utils_lib11.Utils.Is.isIntegerGte(staffTabOrGroups, 0) || import_ts_utils_lib11.Utils.Is.isArray(staffTabOrGroups) && staffTabOrGroups.every(
-      (staffTabOrGroup) => import_ts_utils_lib11.Utils.Is.isString(staffTabOrGroup) || import_ts_utils_lib11.Utils.Is.isIntegerGte(staffTabOrGroup, 0)
+    import_ts_utils_lib13.Utils.Is.isStringOrUndefined(staffTabOrGroups) || import_ts_utils_lib13.Utils.Is.isIntegerGte(staffTabOrGroups, 0) || import_ts_utils_lib13.Utils.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
+      (staffTabOrGroup) => import_ts_utils_lib13.Utils.Is.isString(staffTabOrGroup) || import_ts_utils_lib13.Utils.Is.isIntegerGte(staffTabOrGroup, 0)
     ),
     "staffTabOrGroup",
     staffTabOrGroups
   );
 }
+function isNoteLength(noteLen) {
+  try {
+    (0, import_theory13.validateNoteLength)(noteLen);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+function isTupletRatio(tupletRatio) {
+  try {
+    (0, import_theory13.validateTupletRatio)(tupletRatio);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
 var DocumentBuilder = class {
   constructor() {
     __publicField(this, "doc");
     this.doc = new ObjDocument();
   }
   setScoreConfiguration(config) {
-    if (import_ts_utils_lib11.Utils.Is.isEnumValue(config, StaffPreset)) {
-    } else if (import_ts_utils_lib11.Utils.Is.isObject(config) && config.type === "staff") {
+    if (import_ts_utils_lib13.Utils.Is.isEnumValue(config, StaffPreset)) {
+      this.doc.setScoreConfiguration(config);
+    } else if (import_ts_utils_lib13.Utils.Is.isObject(config) && config.type === "staff") {
       assertStaffConfig(config);
-    } else if (import_ts_utils_lib11.Utils.Is.isObject(config) && config.type === "tab") {
+      this.doc.setScoreConfiguration(config);
+    } else if (import_ts_utils_lib13.Utils.Is.isObject(config) && config.type === "tab") {
       assertTabConfig(config);
-    } else if (import_ts_utils_lib11.Utils.Is.isArray(config)) {
-      assertArg(config.length > 0, "config", config);
+      this.doc.setScoreConfiguration(config);
+    } else if (import_ts_utils_lib13.Utils.Is.isNonEmptyArray(config)) {
       config.forEach((c) => {
-        if (import_ts_utils_lib11.Utils.Is.isObject(c) && c.type === "staff") {
+        if (import_ts_utils_lib13.Utils.Is.isObject(c) && c.type === "staff") {
           assertStaffConfig(c);
-        } else if (import_ts_utils_lib11.Utils.Is.isObject(c) && c.type === "tab") {
+        } else if (import_ts_utils_lib13.Utils.Is.isObject(c) && c.type === "tab") {
           assertTabConfig(c);
         } else {
           assertArg(false, "config", config);
         }
       });
+      this.doc.setScoreConfiguration(config);
     } else {
       assertArg(false, "config", config);
     }
-    this.doc.setScoreConfiguration(config);
     return this;
   }
   getMeasure() {
@@ -7083,14 +7156,14 @@ var DocumentBuilder = class {
     return this.doc.getMusicInterface();
   }
   setHeader(title, composer, arranger) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(title), "title", title);
-    assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(composer), "composer", composer);
-    assertArg(import_ts_utils_lib11.Utils.Is.isStringOrUndefined(arranger), "arranger", arranger);
+    assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(title), "title", title);
+    assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(composer), "composer", composer);
+    assertArg(import_ts_utils_lib13.Utils.Is.isStringOrUndefined(arranger), "arranger", arranger);
     this.doc.setHeader(title, composer, arranger);
     return this;
   }
   setMeasuresPerRow(measuresPerRow) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isIntegerGte(measuresPerRow, 1) || measuresPerRow === Infinity, "measuresPerRow", measuresPerRow);
+    assertArg(import_ts_utils_lib13.Utils.Is.isIntegerGte(measuresPerRow, 1) || import_ts_utils_lib13.Utils.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
     this.doc.setMeasuresPerRow(measuresPerRow);
     return this;
   }
@@ -7099,30 +7172,30 @@ var DocumentBuilder = class {
     return this;
   }
   setKeySignature(...args) {
-    assertArg(args[0] instanceof import_theory13.Scale || args[0] instanceof import_theory13.KeySignature || import_ts_utils_lib11.Utils.Is.isString(args[0]) && import_ts_utils_lib11.Utils.Is.isEnumValue(args[1], import_theory13.ScaleType), "keySignature", args);
+    assertArg(args[0] instanceof import_theory13.Scale || args[0] instanceof import_theory13.KeySignature || import_ts_utils_lib13.Utils.Is.isNonEmptyString(args[0]) && (args.length === 1 || import_ts_utils_lib13.Utils.Is.isEnumValue(args[1], import_theory13.ScaleType)), "keySignature", args);
     this.getMeasure().setKeySignature(...args);
     return this;
   }
   setTimeSignature(timeSignature) {
-    assertArg(timeSignature instanceof import_theory13.TimeSignature || import_ts_utils_lib11.Utils.Is.isString(timeSignature), "timeSignature", timeSignature);
+    assertArg(timeSignature instanceof import_theory13.TimeSignature || import_ts_utils_lib13.Utils.Is.isNonEmptyString(timeSignature), "timeSignature", timeSignature);
     this.getMeasure().setTimeSignature(timeSignature);
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
+    assertArg(import_ts_utils_lib13.Utils.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
     if (beatLength === void 0) {
-      assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(dotted), "dotted", dotted);
+      assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(dotted), "dotted", dotted);
     } else {
-      assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(beatLength, import_theory13.NoteLength), "beatLength", beatLength);
-      assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(dotted), "dotted", dotted);
+      assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(beatLength, import_theory13.NoteLength) || isNoteLength(beatLength), "beatLength", beatLength);
+      assertArg(import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(dotted) || import_ts_utils_lib13.Utils.Is.isIntegerGte(dotted, 0), "dotted", dotted);
     }
     this.getMeasure().setTempo(beatsPerMinute, beatLength, dotted);
     return this;
   }
   addNote(voiceId, note, noteLength, options) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(note instanceof import_theory13.Note || import_ts_utils_lib11.Utils.Is.isString(note), "note", note);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength), "noteLength", noteLength);
+    assertArg(note instanceof import_theory13.Note || import_ts_utils_lib13.Utils.Is.isNonEmptyString(note), "note", note);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
     if (options !== void 0) {
       assertNoteOptions(options);
     }
@@ -7131,8 +7204,8 @@ var DocumentBuilder = class {
   }
   addChord(voiceId, notes, noteLength, options) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(import_ts_utils_lib11.Utils.Is.isArray(notes) && notes.length >= 1 && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib11.Utils.Is.isString(note)), "notes", notes);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength), "noteLength", noteLength);
+    assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib13.Utils.Is.isNonEmptyString(note)), "notes", notes);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
     if (options !== void 0) {
       assertNoteOptions(options);
     }
@@ -7141,33 +7214,91 @@ var DocumentBuilder = class {
   }
   addRest(voiceId, restLength, options) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(restLength, import_theory13.NoteLength), "restLength", restLength);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(restLength, import_theory13.NoteLength) || isNoteLength(restLength), "restLength", restLength);
     if (options !== void 0) {
       assertRestOptions(options);
     }
     this.getMeasure().addRest(voiceId, restLength, options);
     return this;
   }
+  /**
+   * Usage:
+   * <pre>
+   * addTuplet(0, Theory.Tuplet.Triplet, notes => {
+   *     notes.addNote("G3", Theory.NoteLength.Eighth);
+   *     notes.addNote("B3", Theory.NoteLength.Eighth);
+   *     notes.addNote("D4", Theory.NoteLength.Eighth);
+   * });
+   * </pre>
+   * 
+   * @param voiceId 
+   * @param tupletRatio - You can also use Theory.Tuplet presets (e.g. Theory.Tuplet.Triplet).
+   * @param tupletBuilder 
+   * @returns 
+   */
+  addTuplet(voiceId, tupletRatio, tupletBuilder) {
+    assertArg(isVoiceId(voiceId), "voiceId", voiceId);
+    assertArg(import_ts_utils_lib13.Utils.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
+    assertArg(isTupletRatio(tupletRatio) && import_ts_utils_lib13.Utils.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
+    let tupletSymbols = [];
+    const helper = {
+      addNote: (note, noteLength, options) => {
+        assertArg(note instanceof import_theory13.Note || import_ts_utils_lib13.Utils.Is.isNonEmptyString(note), "note", note);
+        assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
+        if (options !== void 0) {
+          delete options.triplet;
+          assertNoteOptions(options);
+        }
+        let s = this.getMeasure().addNoteGroup(voiceId, [note], noteLength, options, tupletRatio);
+        tupletSymbols.push(s);
+        return helper;
+      },
+      addChord: (notes, noteLength, options) => {
+        assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof import_theory13.Note || import_ts_utils_lib13.Utils.Is.isNonEmptyString(note)), "notes", notes);
+        assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
+        if (options !== void 0) {
+          delete options.triplet;
+          assertNoteOptions(options);
+        }
+        let s = this.getMeasure().addNoteGroup(voiceId, notes, noteLength, options, tupletRatio);
+        tupletSymbols.push(s);
+        return helper;
+      },
+      addRest: (restLength, options) => {
+        assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(restLength, import_theory13.NoteLength) || isNoteLength(restLength), "restLength", restLength);
+        if (options !== void 0) {
+          delete options.triplet;
+          assertRestOptions(options);
+        }
+        let s = this.getMeasure().addRest(voiceId, restLength, options, tupletRatio);
+        tupletSymbols.push(s);
+        return helper;
+      }
+    };
+    tupletBuilder(helper);
+    ObjBeamGroup.createTuplet(tupletSymbols, tupletRatio);
+    return this;
+  }
   addFermataInternal(staffTabOrGroups, fermata) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
     this.getMeasure().addFermata(staffTabOrGroups, fermata);
     return this;
   }
-  addFermata(fermata = 0 /* AtNote */) {
+  addFermata(fermata = "atNote" /* AtNote */) {
     return this.addFermataInternal(void 0, fermata);
   }
   /** @param staffTabOrGroups  - staff/tab index (0=top), staff/tab name, or staff group name. */
-  addFermataTo(staffTabOrGroups, fermata = 0 /* AtNote */) {
+  addFermataTo(staffTabOrGroups, fermata = "atNote" /* AtNote */) {
     return this.addFermataInternal(staffTabOrGroups, fermata);
   }
   addNavigationInternal(staffTabOrGroups, navigation, ...args) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
-    if (navigation === 9 /* EndRepeat */ && args.length > 0) {
-      assertArg(import_ts_utils_lib11.Utils.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
-    } else if (navigation === 10 /* Ending */ && args.length > 0) {
-      assertArg(args.every((passage) => import_ts_utils_lib11.Utils.Is.isIntegerGte(passage, 1)), "passages", args);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
+    if (navigation === "endRepeat" /* EndRepeat */ && args.length > 0) {
+      assertArg(import_ts_utils_lib13.Utils.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
+    } else if (navigation === "ending" /* Ending */ && args.length > 0) {
+      assertArg(args.every((passage) => import_ts_utils_lib13.Utils.Is.isIntegerGte(passage, 1)), "passages", args);
     }
     this.getMeasure().addNavigation(staffTabOrGroups, navigation, ...args);
     return this;
@@ -7178,10 +7309,35 @@ var DocumentBuilder = class {
   addNavigationTo(staffTabOrGroups, navigation, ...args) {
     return this.addNavigationInternal(staffTabOrGroups, navigation, ...args);
   }
+  addAnnotationInternal(staffTabOrGroups, annotation, text) {
+    annotation != null ? annotation : annotation = getAnnotation(text);
+    if (annotation === void 0) {
+      throw new import_core17.MusicError(import_core17.MusicErrorType.Score, `Annotation text "${text}" is not known annotation.`);
+    }
+    assertStaffTabOrGRoups(staffTabOrGroups);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
+    assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyString(text), "text", text);
+    this.getMeasure().addAnnotation(staffTabOrGroups, annotation, text);
+    return this;
+  }
+  addAnnotation(...args) {
+    if (args.length === 1) {
+      return this.addAnnotationInternal(void 0, void 0, args[0]);
+    } else {
+      return this.addAnnotationInternal(void 0, args[0], args[1]);
+    }
+  }
+  addAnnotationTo(staffTabOrGroups, ...args) {
+    if (args.length === 1) {
+      return this.addAnnotationInternal(staffTabOrGroups, void 0, args[0]);
+    } else {
+      return this.addAnnotationInternal(staffTabOrGroups, args[0], args[1]);
+    }
+  }
   addLabelInternal(staffTabOrGroups, label, text) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(label, Label), "label", label);
-    assertArg(import_ts_utils_lib11.Utils.Is.isString(text), "text", text);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(label, Label), "label", label);
+    assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyString(text), "text", text);
     this.getMeasure().addLabel(staffTabOrGroups, label, text);
     return this;
   }
@@ -7192,45 +7348,70 @@ var DocumentBuilder = class {
   addLabelTo(staffTabOrGroups, label, text) {
     return this.addLabelInternal(staffTabOrGroups, label, text);
   }
-  addAnnotationInternal(staffTabOrGroups, annotation, text) {
-    assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
-    assertArg(import_ts_utils_lib11.Utils.Is.isString(text), "text", text);
-    this.getMeasure().addAnnotation(staffTabOrGroups, annotation, text);
-    return this;
-  }
-  addAnnotation(annotation, text) {
-    return this.addAnnotationInternal(void 0, annotation, text);
-  }
-  /** @param staffTabOrGroups  - staff/tab index (0=top), staff/tab name, or staff group name. */
-  addAnnotationTo(staffTabOrGroups, annotation, text) {
-    return this.addAnnotationInternal(staffTabOrGroups, annotation, text);
-  }
   addConnective(connective, ...args) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(connective, Connective), "connective", connective);
-    if (connective === 0 /* Tie */) {
-      assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(args[0]) || import_ts_utils_lib11.Utils.Is.isInteger(args[0]) || import_ts_utils_lib11.Utils.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
-      assertArg(import_ts_utils_lib11.Utils.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(connective, Connective), "connective", connective);
+    if (connective === "tie" /* Tie */) {
+      assertArg(import_ts_utils_lib13.Utils.Is.isIntegerOrUndefined(args[0]) || import_ts_utils_lib13.Utils.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
+      assertArg(import_ts_utils_lib13.Utils.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 === 1 /* Slur */) {
-      assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(args[0]) || import_ts_utils_lib11.Utils.Is.isInteger(args[0]), "slurSpan", args[0]);
-      assertArg(import_ts_utils_lib11.Utils.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+    } else if (connective === "slur" /* Slur */) {
+      assertArg(import_ts_utils_lib13.Utils.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
+      assertArg(import_ts_utils_lib13.Utils.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 === 2 /* Slide */) {
-      assertArg(import_ts_utils_lib11.Utils.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
+    } else if (connective === "slide" /* Slide */) {
+      assertArg(import_ts_utils_lib13.Utils.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
       let noteAnchor = args[0];
       this.getMeasure().addConnective(connective, noteAnchor);
     }
     return this;
   }
-  addExtension(extensionLength, extensionVisible) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isIntegerGte(extensionLength, 0) || extensionLength === Infinity || import_ts_utils_lib11.Utils.Is.isEnumValue(extensionLength, import_theory13.NoteLength), "extendionLength", extensionLength);
-    assertArg(import_ts_utils_lib11.Utils.Is.isBooleanOrUndefined(extensionVisible), "extensionVisible", extensionVisible);
-    this.getMeasure().addExtension(extensionLength, extensionVisible != null ? extensionVisible : true);
+  /**
+   * Extension length example:
+   * <pre>
+   *     addExtension(ext => ext.notes("1n", 2))          // length is 2 whole notes
+   *     addExtension(ext => ext.measures(3).hide())      // length is 3 measures, hidden
+   *     addExtension(ext => ext.measures(1).notes("8n")) // length is 1 measure + 1 eigth note
+   *     addExtension(ext => ext.infinity())              // length is as long as possible
+   * </pre>
+   * @param extensionLength
+   * @param extensionVisible
+   * @returns 
+   */
+  addExtension(extensionBuilder) {
+    assertArg(import_ts_utils_lib13.Utils.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(import_ts_utils_lib13.Utils.Is.isEnumValue(noteLength, import_theory13.NoteLength) || isNoteLength(noteLength), "noteLength", noteLength);
+        assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(noteCount) || import_ts_utils_lib13.Utils.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
+        ticks += import_theory13.RhythmProps.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
+        return helper;
+      },
+      measures: (measureCount) => {
+        assertArg(import_ts_utils_lib13.Utils.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
+        ticks += this.getMeasure().getMeasureTicks() * measureCount;
+        return helper;
+      },
+      infinity: () => {
+        ticks = Infinity;
+        return helper;
+      },
+      hide: () => {
+        visible = false;
+        return helper;
+      }
+    };
+    if (extensionBuilder) {
+      extensionBuilder(helper);
+    } else {
+      ticks = Infinity;
+    }
+    this.getMeasure().addExtension(ticks, visible);
     return this;
   }
   /**
@@ -7240,14 +7421,14 @@ var DocumentBuilder = class {
    * @param verticalPosition - Vertical position, are elements added above, below or both.
    * @returns 
    */
-  addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = 3 /* Auto */) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isString(groupName) && groupName.length > 0, "groupName", groupName);
+  addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = "auto" /* Auto */) {
+    assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyString(groupName), "groupName", groupName);
     assertArg(
-      import_ts_utils_lib11.Utils.Is.isString(staffsTabsAndGroups) && staffsTabsAndGroups.length > 0 || import_ts_utils_lib11.Utils.Is.isIntegerGte(staffsTabsAndGroups, 0) || import_ts_utils_lib11.Utils.Is.isArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => import_ts_utils_lib11.Utils.Is.isString(line) && line.length > 0 || import_ts_utils_lib11.Utils.Is.isIntegerGte(line, 0)),
+      import_ts_utils_lib13.Utils.Is.isNonEmptyString(staffsTabsAndGroups) || import_ts_utils_lib13.Utils.Is.isIntegerGte(staffsTabsAndGroups, 0) || import_ts_utils_lib13.Utils.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => import_ts_utils_lib13.Utils.Is.isNonEmptyString(line) || import_ts_utils_lib13.Utils.Is.isIntegerGte(line, 0)),
       "staffsTabsAndGroups",
       staffsTabsAndGroups
     );
-    assertArg(import_ts_utils_lib11.Utils.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
+    assertArg(import_ts_utils_lib13.Utils.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
     this.doc.addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition);
     return this;
   }
@@ -7265,13 +7446,13 @@ var DocumentBuilder = class {
     return this;
   }
   completeRests(voiceId) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isUndefined(voiceId) || isVoiceId(voiceId), "voiceId", voiceId);
+    assertArg(import_ts_utils_lib13.Utils.Is.isUndefined(voiceId) || isVoiceId(voiceId) || import_ts_utils_lib13.Utils.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
     this.getMeasure().completeRests(voiceId);
     return this;
   }
   addScaleArpeggio(scale, bottomNote, numOctaves) {
-    assertArg(import_ts_utils_lib11.Utils.Is.isString(bottomNote), "bottomNote", bottomNote);
-    assertArg(import_ts_utils_lib11.Utils.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
+    assertArg(import_ts_utils_lib13.Utils.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
+    assertArg(import_ts_utils_lib13.Utils.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++) {
@@ -7280,7 +7461,7 @@ var DocumentBuilder = class {
       }
       let note = notes[i];
       this.addNote(0, note, ts.beatLength);
-      this.addLabel(0 /* Note */, note.formatOmitOctave(import_theory13.SymbolSet.Unicode));
+      this.addLabel("note" /* Note */, note.formatOmitOctave(import_theory13.SymbolSet.Unicode));
     }
     return this;
   }
@@ -7320,7 +7501,7 @@ var ScoreObjectEvent = class extends ScoreEvent {
 
 // src/score/pub/interface.ts
 var Audio2 = __toESM(require("@tspro/web-music-score/audio"));
-var import_ts_utils_lib12 = require("@tspro/ts-utils-lib");
+var import_ts_utils_lib14 = require("@tspro/ts-utils-lib");
 var import_core19 = require("@tspro/web-music-score/core");
 function assertArg2(condition, argName, argValue) {
   if (!condition) {
@@ -7335,7 +7516,7 @@ function require_t(t, message) {
   }
 }
 function isVoiceId2(value) {
-  return import_ts_utils_lib12.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return import_ts_utils_lib14.Utils.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function getNotationLine(line) {
   if (line instanceof ObjStaff || line instanceof ObjTab) {
@@ -7457,7 +7638,7 @@ var _MDocument = class _MDocument extends MusicInterface6 {
     return this.obj.getMeasures().map((m) => m.getMusicInterface());
   }
   play(fn) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isFunctionOrUndefined(fn), "playStateChangeListener", fn);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isFunctionOrUndefined(fn), "playStateChangeListener", fn);
     return new MPlayer(this, fn).play();
   }
 };
@@ -7477,7 +7658,7 @@ var _MEnding = class _MEnding extends MusicInterface6 {
     return this.obj.passages;
   }
   hasPassage(passage) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isIntegerGte(passage, 1), "passage", passage);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isIntegerGte(passage, 1), "passage", passage);
     return this.obj.hasPassage(passage);
   }
 };
@@ -7881,7 +8062,7 @@ var _MPlayer = class _MPlayer {
   constructor(doc, fn) {
     __publicField(this, "player");
     assertArg2(doc instanceof MDocument2, "doc", doc);
-    assertArg2(import_ts_utils_lib12.Utils.Is.isFunctionOrUndefined(fn), "playStateChangeListener", fn);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isFunctionOrUndefined(fn), "playStateChangeListener", fn);
     this.player = new Player();
     this.player.setDocument(doc.getMusicObject());
     this.player.setCursorPositionChangeListener((cursorRect) => doc.getMusicObject().updateCursorRect(cursorRect));
@@ -7916,17 +8097,17 @@ var MRenderer2 = class {
     this.renderer = new Renderer(this);
   }
   setDocument(doc) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.renderer.setDocument(doc);
     return this;
   }
   setCanvas(canvas) {
-    canvas = require_t(import_ts_utils_lib12.Utils.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(import_ts_utils_lib14.Utils.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;
   }
   setScoreEventListener(fn) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isFunctionOrUndefined(fn), "scoreEventListener", fn);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isFunctionOrUndefined(fn), "scoreEventListener", fn);
     this.renderer.setScoreEventListener(fn);
   }
   hilightObject(obj) {
@@ -7981,7 +8162,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     this.updateButtons();
   }
   setDocument(doc) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.onStop();
     if (doc) {
       this.player = new MPlayer(doc, (playState) => {
@@ -8016,9 +8197,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     }
   }
   setPlayButton(btn, btnLabel) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playButton, this.onPlay);
-    this.playButton = require_t(import_ts_utils_lib12.Utils.Dom.getButton(btn), "Play button required!");
+    this.playButton = require_t(import_ts_utils_lib14.Utils.Dom.getButton(btn), "Play button required!");
     this.playLabel = btnLabel != null ? btnLabel : "Play";
     _MPlaybackButtons.removeOnClickListeners(this.playButton, "all");
     _MPlaybackButtons.addOnClickListener(this.playButton, this.onPlay);
@@ -8026,9 +8207,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     return this;
   }
   setStopButton(btn, btnLabel) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, this.onStop);
-    this.stopButton = require_t(import_ts_utils_lib12.Utils.Dom.getButton(btn), "Stop button required!");
+    this.stopButton = require_t(import_ts_utils_lib14.Utils.Dom.getButton(btn), "Stop button required!");
     this.stopLabel = btnLabel != null ? btnLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, "all");
     _MPlaybackButtons.addOnClickListener(this.stopButton, this.onStop);
@@ -8036,10 +8217,10 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     return this;
   }
   setPlayStopButton(btn, playLabel, stopLabel) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
-    assertArg2(import_ts_utils_lib12.Utils.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, this.onPlayStop);
-    this.playStopButton = require_t(import_ts_utils_lib12.Utils.Dom.getButton(btn), "Play/stop button required!");
+    this.playStopButton = require_t(import_ts_utils_lib14.Utils.Dom.getButton(btn), "Play/stop button required!");
     this.playLabel = playLabel != null ? playLabel : "Play";
     this.stopLabel = stopLabel != null ? stopLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, "all");
@@ -8048,9 +8229,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     return this;
   }
   setPauseButton(btn, btnLabel) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, this.onPause);
-    this.pauseButton = require_t(import_ts_utils_lib12.Utils.Dom.getButton(btn), "Pause button required!");
+    this.pauseButton = require_t(import_ts_utils_lib14.Utils.Dom.getButton(btn), "Pause button required!");
     this.pauseLabel = btnLabel != null ? btnLabel : "Pause";
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, "all");
     _MPlaybackButtons.addOnClickListener(this.pauseButton, this.onPause);
@@ -8072,7 +8253,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     }
   }
   static addOnClickListener(btn, onClick) {
-    assertArg2(import_ts_utils_lib12.Utils.Is.isFunction(onClick), "onClick", onClick);
+    assertArg2(import_ts_utils_lib14.Utils.Is.isFunction(onClick), "onClick", onClick);
     btn.addEventListener("click", onClick);
     let clickListeners = this.savedOnClickListeners.get(btn) || [];
     this.savedOnClickListeners.set(btn, [...clickListeners, onClick]);