@tspro/web-music-score 4.0.1 → 4.2.0

package/dist/score/index.mjs

@@ -1,7 +1,10 @@
-/* WebMusicScore v4.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+import {
+  RhythmProps
+} from "../chunk-7MNV5JN6.mjs";
 import {
   __publicField
-} from "../chunk-YFPLOHP2.mjs";
+} from "../chunk-5NWLGWHS.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -38,11 +41,11 @@ var DivRect = class _DivRect {
   /**
    * Create rect from basic left, top, width and height arguments.
    * 
-   * @param left -
-   * @param top -
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param left - Left coordinate.
+   * @param top - Top coordinate.
+   * @param width - With.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static create(left, top, width, height) {
     return new _DivRect(left, left + width, top, top + height);
@@ -52,9 +55,9 @@ var DivRect = class _DivRect {
    * 
    * @param centerX - Center x-coordinate.
    * @param centerY - Center y-coordinate.
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param width - Width.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static createCentered(centerX, centerY, width, height) {
     return new _DivRect(centerX - width / 2, centerX + width / 2, centerY - height / 2, centerY + height / 2);
@@ -66,43 +69,43 @@ var DivRect = class _DivRect {
    * @param rightw - Right section width.
    * @param toph - Top section height.
    * @param bottomh - Bottomsection height.
-   * @returns 
+   * @returns - DivRect.
    */
   static createSections(leftw, rightw, toph, bottomh) {
     return new _DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
   }
   /**
-   * Width.
+   * Width getter.
    */
   get width() {
     return this.right - this.left;
   }
   /**
-   * Height.
+   * Height getter.
    */
   get height() {
     return this.bottom - this.top;
   }
   /**
-   * Left section width.
+   * Left section width getter.
    */
   get leftw() {
     return this.centerX - this.left;
   }
   /**
-   * Right section width.
+   * Right section width getter.
    */
   get rightw() {
     return this.right - this.centerX;
   }
   /**
-   * Top section height.
+   * Top section height getter.
    */
   get toph() {
     return this.centerY - this.top;
   }
   /**
-   * Bottom section height.
+   * Bottom section height getter.
    */
   get bottomh() {
     return this.bottom - this.centerY;
@@ -110,9 +113,9 @@ var DivRect = class _DivRect {
   /**
    * Does this Rect contain given (x, y)-point?
    * 
-   * @param x -
-   * @param y -
-   * @returns 
+   * @param x - X-coordinate.
+   * @param y - Y-coordinate.
+   * @returns - True/false.
    */
   contains(x, y) {
     return x >= this.left && x <= this.right && y >= this.top && y <= this.bottom;
@@ -120,9 +123,9 @@ var DivRect = class _DivRect {
   /**
    * Do a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlap(a, b) {
     return a.right > b.left && a.left < b.right && a.bottom > b.top && a.top < b.bottom;
@@ -130,17 +133,18 @@ var DivRect = class _DivRect {
   /**
    * Do horizontal measures of a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlapX(a, b) {
     return a.right > b.left && a.left < b.right;
   }
   /**
    * Check if this Rect equals with given Rect.
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equals(a, b) {
     if (a == null && b == null) {
@@ -152,10 +156,11 @@ var DivRect = class _DivRect {
     }
   }
   /**
-   * Check if frame (ignoring centerX/Y) of this Rect equals with given Rect, ignoring centerX and centerY.
+   * Check if frame of this Rect equals with given Rect, ignoring center x- and center y-coordinates.
    * 
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equalsFrame(a, b) {
     if (a == null && b == null) {
@@ -169,7 +174,7 @@ var DivRect = class _DivRect {
   /**
    * Created duplicate of this Rect.
    * 
-   * @returns 
+   * @returns - Duplicate.
    */
   copy() {
     return new _DivRect(this.left, this.centerX, this.right, this.top, this.centerY, this.bottom);
@@ -177,9 +182,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Modifies this Rect.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - This DivRect instance.
    */
   offsetInPlace(dx, dy) {
     this.left += dx;
@@ -193,9 +198,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Immutable, returns modified copy.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - DivRect copy with applied offset.
    */
   offsetCopy(dx, dy) {
     return this.copy().offsetInPlace(dx, dy);
@@ -203,8 +208,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Modifies this Rect.
    * 
-   * @param rect - 
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - This DivRect instance.
    */
   expandInPlace(rect) {
     this.left = Math.min(this.left, rect.left);
@@ -216,8 +221,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Immutable, returns modified copy.
    * 
-   * @param rect -
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - Expanded copy of this DivRect.
    */
   expandCopy(rect) {
     return this.copy().expandInPlace(rect);
@@ -225,8 +230,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Mmodifies this Rect.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRect to clip this instance with.
+   * @returns - This DivRect instance.
    */
   clipInPlace(clipRect) {
     this.left = Math.max(this.left, clipRect.left);
@@ -240,8 +245,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Immutable, return modified copy.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRecto to clip this instance with.
+   * @returns - Clipped DivRect copy.
    */
   clipCopy(clipRect) {
     return this.copy().clipInPlace(clipRect);
@@ -249,9 +254,9 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Modifies this Rect.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns This DivRect instance.
    */
   scaleInPlace(scaleX, scaleY) {
     scaleY = scaleY != null ? scaleY : scaleX;
@@ -264,20 +269,24 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Immutable, returns modified copy.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns Scaled copy of this DivRect.
    */
   scaleCopy(scaleX, scaleY) {
     return this.copy().scaleInPlace(scaleX, scaleY);
   }
+  /**
+   * Get this DivRect instance.
+   * @returns - This DivRect instance.
+   */
   getRect() {
     return this;
   }
 };
 
 // src/score/pub/document-builder.ts
-import { Utils as Utils13 } from "@tspro/ts-utils-lib";
+import { Utils as Utils14 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/types.ts
 var StaffPreset = /* @__PURE__ */ ((StaffPreset3) => {
@@ -300,6 +309,9 @@ function getVoiceIds() {
 function getStringNumbers() {
   return [1, 2, 3, 4, 5, 6];
 }
+function getVerseNumbers() {
+  return [1, 2, 3];
+}
 var Stem = /* @__PURE__ */ ((Stem2) => {
   Stem2["Auto"] = "auto";
   Stem2["Up"] = "up";
@@ -337,6 +349,17 @@ var VerticalPosition = /* @__PURE__ */ ((VerticalPosition4) => {
   VerticalPosition4["Both"] = "both";
   return VerticalPosition4;
 })(VerticalPosition || {});
+var LyricsAlign = /* @__PURE__ */ ((LyricsAlign2) => {
+  LyricsAlign2["Left"] = "left";
+  LyricsAlign2["Center"] = "center";
+  LyricsAlign2["Right"] = "right";
+  return LyricsAlign2;
+})(LyricsAlign || {});
+var LyricsHyphen = /* @__PURE__ */ ((LyricsHyphen2) => {
+  LyricsHyphen2["Hyphen"] = "-";
+  LyricsHyphen2["Extender"] = "---";
+  return LyricsHyphen2;
+})(LyricsHyphen || {});
 var Fermata = /* @__PURE__ */ ((Fermata2) => {
   Fermata2["AtNote"] = "atNote";
   Fermata2["AtMeasureEnd"] = "atMeasureEnd";
@@ -891,12 +914,12 @@ var Renderer = class {
 
 // src/score/engine/obj-staff-and-tab.ts
 import { MusicError as MusicError15, MusicErrorType as MusicErrorType15 } from "@tspro/web-music-score/core";
-import { Utils as Utils11 } from "@tspro/ts-utils-lib";
+import { Utils as Utils12 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-measure.ts
-import { Utils as Utils10 } from "@tspro/ts-utils-lib";
-import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps4, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
-import { getDefaultTempo, TimeSignature, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
+import { Utils as Utils11 } from "@tspro/ts-utils-lib";
+import { getScale, Scale, validateScaleType, Note as Note7, RhythmProps as RhythmProps5, KeySignature as KeySignature2, getDefaultKeySignature, PitchNotation, SymbolSet, validateNoteLength as validateNoteLength2, NoteLengthProps as NoteLengthProps4 } from "@tspro/web-music-score/theory";
+import { getDefaultTempo, getDefaultTimeSignature } from "@tspro/web-music-score/theory";
 
 // src/score/engine/acc-state.ts
 import { Note } from "@tspro/web-music-score/theory";
@@ -1279,9 +1302,9 @@ var ObjSignature = class extends MusicObject {
     if (showTimeSignature) {
       let timeSignature = this.measure.getTimeSignature();
       let beatCount = timeSignature.beatCount.toString();
-      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0, 0.5);
+      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0.5, 0.5);
       let beatSize = timeSignature.beatSize.toString();
-      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0, 0.5);
+      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0.5, 0.5);
     } else {
       this.beatCountText = this.beatSizeText = void 0;
     }
@@ -1371,6 +1394,7 @@ var ObjSignature = class extends MusicObject {
     return [this];
   }
   layout(renderer) {
+    var _a, _b, _c, _d, _e, _f;
     let { unitSize } = renderer;
     let { staff } = this;
     let paddingX = unitSize;
@@ -1415,15 +1439,16 @@ var ObjSignature = class extends MusicObject {
       });
     }
     let right = x;
+    (_a = this.beatCountText) == null ? void 0 : _a.layout(renderer);
+    (_b = this.beatSizeText) == null ? void 0 : _b.layout(renderer);
+    let tsWidth = Math.max((_d = (_c = this.beatCountText) == null ? void 0 : _c.getRect().width) != null ? _d : 0, (_f = (_e = this.beatSizeText) == null ? void 0 : _e.getRect().width) != null ? _f : 0);
     if (this.beatCountText) {
-      this.beatCountText.layout(renderer);
-      this.beatCountText.offset(x + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
+      this.beatCountText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatCountText.getRect());
       right = Math.max(right, this.rect.right);
     }
     if (this.beatSizeText) {
-      this.beatSizeText.layout(renderer);
-      this.beatSizeText.offset(x + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
+      this.beatSizeText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatSizeText.getRect());
       right = Math.max(right, this.rect.right);
     }
@@ -1483,12 +1508,12 @@ var ObjSignature = class extends MusicObject {
 };
 
 // src/score/engine/player.ts
-import { Utils as Utils6 } from "@tspro/ts-utils-lib";
-import { NoteLength as NoteLength5, RhythmProps as RhythmProps3, alterTempoSpeed } from "@tspro/web-music-score/theory";
+import { Utils as Utils7 } from "@tspro/ts-utils-lib";
+import { NoteLength as NoteLength6, RhythmProps as RhythmProps4, alterTempoSpeed } from "@tspro/web-music-score/theory";
 import * as Audio from "@tspro/web-music-score/audio";
 
 // src/score/engine/obj-rhythm-column.ts
-import { Note as Note5 } from "@tspro/web-music-score/theory";
+import { Note as Note5, validateNoteLength } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-arpeggio.ts
 var ObjArpeggio = class extends MusicObject {
@@ -1561,7 +1586,7 @@ var ObjArpeggio = class extends MusicObject {
 };
 
 // src/score/engine/obj-rest.ts
-import { Note as Note3, NoteLength, NoteLengthProps, RhythmProps, Tuplet } from "@tspro/web-music-score/theory";
+import { Note as Note3, NoteLength, NoteLengthProps, RhythmProps as RhythmProps2, Tuplet } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError5, MusicErrorType as MusicErrorType5 } from "@tspro/web-music-score/core";
 function getDiatonicIdFromStaffPos(staffPos) {
   if (typeof staffPos === "number") {
@@ -1638,7 +1663,7 @@ var ObjRest = class extends MusicObject {
     this.hide = (_b = options == null ? void 0 : options.hide) != null ? _b : false;
     this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps.get(noteLength).isTriplet);
     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 = RhythmProps.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet.Triplet : void 0);
+    this.rhythmProps = RhythmProps2.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet.Triplet : void 0);
     this.mi = new MRest(this);
   }
   getMusicInterface() {
@@ -1879,7 +1904,7 @@ var ObjRest = class extends MusicObject {
 
 // src/score/engine/obj-note-group.ts
 import { Utils as Utils4 } from "@tspro/ts-utils-lib";
-import { Note as Note4, NoteLengthProps as NoteLengthProps3, RhythmProps as RhythmProps2, Tuplet as Tuplet3 } from "@tspro/web-music-score/theory";
+import { Note as Note4, NoteLengthProps as NoteLengthProps3, RhythmProps as RhythmProps3, Tuplet as Tuplet3 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-beam-group.ts
 import { Utils as Utils3 } from "@tspro/ts-utils-lib";
@@ -2419,7 +2444,7 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
     this.arpeggio = getArpeggio(options == null ? void 0 : options.arpeggio);
     this.oldStyleTriplet = tupletRatio === void 0 && ((options == null ? void 0 : options.triplet) === true || NoteLengthProps3.get(noteLength).isTriplet);
     let dotCount = typeof (options == null ? void 0 : options.dotted) === "number" ? options.dotted > 0 ? options.dotted : void 0 : (options == null ? void 0 : options.dotted) === true ? 1 : void 0;
-    this.rhythmProps = RhythmProps2.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet3.Triplet : void 0);
+    this.rhythmProps = RhythmProps3.get(noteLength, dotCount, (tupletRatio != null ? tupletRatio : this.oldStyleTriplet) ? Tuplet3.Triplet : void 0);
     this.mi = new MNoteGroup(this);
   }
   getMusicInterface() {
@@ -2812,11 +2837,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   }
   setStemTipY(staff, stemTipY) {
     let obj = this.staffObjects.find((obj2) => obj2.staff === staff);
-    if (!(obj == null ? void 0 : obj.stemTip) || stemTipY === obj.stemTip.centerY) {
-      return;
+    if (this.hasBeamCount() && (obj == null ? void 0 : obj.stemTip) && stemTipY !== obj.stemTip.centerY) {
+      obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
+      this.requestRectUpdate();
     }
-    obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
-    this.requestRectUpdate();
   }
   offset(dx, dy) {
     this.staffObjects.forEach((obj) => obj.offset(dx, 0));
@@ -2992,12 +3016,93 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
 
 // src/score/engine/obj-rhythm-column.ts
 import { MusicError as MusicError8, MusicErrorType as MusicErrorType8 } from "@tspro/web-music-score/core";
+
+// src/score/engine/obj-lyrics.ts
+import { Utils as Utils5 } from "@tspro/ts-utils-lib";
+var LyricsContainer = class {
+  constructor(col, lyricsLength) {
+    this.col = col;
+    __publicField(this, "lyricsObjects", []);
+    __publicField(this, "rhythmProps");
+    this.rhythmProps = RhythmProps.get(lyricsLength);
+  }
+  addLyricsObject(lyricsObj) {
+    var _a;
+    this.lyricsObjects.push(lyricsObj);
+    (_a = lyricsObj.measure.getPrevLyricsObject(lyricsObj)) == null ? void 0 : _a.setNextLyricsObject(lyricsObj);
+  }
+};
+var ObjLyrics = class extends MusicObject {
+  constructor(col, verse, line, vpos, lyricsText, lyricsOptions) {
+    super(col);
+    this.col = col;
+    this.verse = verse;
+    this.line = line;
+    this.vpos = vpos;
+    __publicField(this, "nextLyricsObject");
+    __publicField(this, "color", "black");
+    __publicField(this, "hyphen");
+    __publicField(this, "text");
+    __publicField(this, "mi");
+    let halign = (lyricsOptions == null ? void 0 : lyricsOptions.align) === "left" /* Left */ ? 0 : (lyricsOptions == null ? void 0 : lyricsOptions.align) === "right" /* Right */ ? 1 : 0.5;
+    this.hyphen = Utils5.Is.isEnumValue(lyricsOptions == null ? void 0 : lyricsOptions.hyphen, LyricsHyphen) ? lyricsOptions == null ? void 0 : lyricsOptions.hyphen : void 0;
+    this.text = new ObjText(this, { text: lyricsText, color: this.color, scale: 0.8 }, halign, 0);
+    this.rect = new DivRect();
+    this.mi = new MLyrics(this);
+  }
+  getMusicInterface() {
+    return this.mi;
+  }
+  get measure() {
+    return this.col.measure;
+  }
+  getText() {
+    return this.text.getText();
+  }
+  setNextLyricsObject(lyricsObj) {
+    this.nextLyricsObject = lyricsObj;
+  }
+  pick(x, y) {
+    return this.rect.contains(x, y) ? [this] : [];
+  }
+  layout(renderer) {
+    this.text.layout(renderer);
+    this.rect = this.text.getRect().copy();
+  }
+  offset(dx, dy) {
+    this.text.offset(dx, dy);
+    this.rect.offsetInPlace(dx, dy);
+  }
+  draw(renderer) {
+    var _a;
+    this.text.draw(renderer);
+    const ctx = renderer.getCanvasContext();
+    if (ctx && this.hyphen !== void 0) {
+      let l = this.getRect();
+      let r = (_a = this.nextLyricsObject) == null ? void 0 : _a.getRect();
+      let hyphenw = renderer.unitSize * 1.5;
+      let maxw = r ? (r.left - l.right) * 0.85 : hyphenw;
+      let w = this.hyphen === "-" /* Hyphen */ ? Math.min(hyphenw, maxw) : maxw;
+      if (w > 0) {
+        ctx.lineWidth = renderer.lineWidth;
+        ctx.strokeStyle = ctx.fillStyle = this.color;
+        let cx = r ? (r.left + l.right) / 2 : l.right + w / 0.85;
+        let cy = (l.top + l.bottom) / 2;
+        ctx.moveTo(cx - w / 2, cy);
+        ctx.lineTo(cx + w / 2, cy);
+        ctx.stroke();
+      }
+    }
+  }
+};
+
+// src/score/engine/obj-rhythm-column.ts
 var noteHeadDataCompareFunc = (a, b) => {
-  let cmp = Note5.compareFunc(a.note, b.note);
-  if (cmp === 0) {
-    cmp = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
+  let cmp2 = Note5.compareFunc(a.note, b.note);
+  if (cmp2 === 0) {
+    cmp2 = a.noteGroup.stemDir === b.noteGroup.stemDir ? 0 : a.noteGroup.stemDir === "up" /* Up */ ? 1 : -1;
   }
-  return cmp;
+  return cmp2;
 };
 var ObjRhythmColumn = class extends MusicObject {
   constructor(measure, positionTicks) {
@@ -3005,6 +3110,7 @@ var ObjRhythmColumn = class extends MusicObject {
     this.measure = measure;
     this.positionTicks = positionTicks;
     __publicField(this, "voiceSymbol", []);
+    __publicField(this, "lyricsContainers", []);
     __publicField(this, "minDiatonicId");
     __publicField(this, "maxDiatonicId");
     __publicField(this, "staffMinDiatonicId", /* @__PURE__ */ new Map());
@@ -3130,6 +3236,19 @@ var ObjRhythmColumn = class extends MusicObject {
   getVoiceSymbol(voiceId) {
     return this.voiceSymbol[voiceId];
   }
+  getLyricsContainerDatas() {
+    return this.lyricsContainers;
+  }
+  getLyricsContainer(verse, line, vpos, lyricsLength) {
+    let data = this.lyricsContainers.find((data2) => data2.verse === verse && data2.line === line && data2.vpos === vpos);
+    if (data === void 0 && lyricsLength !== void 0) {
+      data = { lyricsContainer: new LyricsContainer(this, validateNoteLength(lyricsLength)), verse, line, vpos };
+      this.lyricsContainers.push(data);
+      this.requestLayout();
+      this.requestRectUpdate();
+    }
+    return data == null ? void 0 : data.lyricsContainer;
+  }
   getMinWidth() {
     let maxNoteSize = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteSize));
     let w = DocumentSettings.NoteHeadWidth;
@@ -3349,7 +3468,7 @@ var ObjRhythmColumn = class extends MusicObject {
 import { MusicError as MusicError9, MusicErrorType as MusicErrorType9 } from "@tspro/web-music-score/core";
 
 // src/score/engine/element-data.ts
-import { Utils as Utils5 } from "@tspro/ts-utils-lib";
+import { Utils as Utils6 } from "@tspro/ts-utils-lib";
 
 // src/score/engine/obj-special-text.ts
 var _ObjSpecialText = class _ObjSpecialText extends MusicObject {
@@ -3471,23 +3590,23 @@ function getNavigationString(navigation) {
   }
 }
 function isDynamicsText(text) {
-  return Utils5.Is.isEnumValue(text, DynamicsAnnotation);
+  return Utils6.Is.isEnumValue(text, DynamicsAnnotation);
 }
 function getDynamicsVolume(text) {
   if (/^(p+|f+|m|mp|mf)$/.test(text)) {
-    let volume = 0.5 - Utils5.Str.charCount(text, "p") * 0.1 + Utils5.Str.charCount(text, "f") * 0.1;
-    return Utils5.Math.clamp(volume, 0, 1);
+    let volume = 0.5 - Utils6.Str.charCount(text, "p") * 0.1 + Utils6.Str.charCount(text, "f") * 0.1;
+    return Utils6.Math.clamp(volume, 0, 1);
   } else {
     return void 0;
   }
 }
 function isTempoText(text) {
-  return Utils5.Is.isEnumValue(text, TempoAnnotation);
+  return Utils6.Is.isEnumValue(text, TempoAnnotation);
 }
 function getAnnotation(text) {
-  if (Utils5.Is.isEnumValue(text, DynamicsAnnotation)) {
+  if (Utils6.Is.isEnumValue(text, DynamicsAnnotation)) {
     return "dynamics" /* Dynamics */;
-  } else if (Utils5.Is.isEnumValue(text, TempoAnnotation)) {
+  } else if (Utils6.Is.isEnumValue(text, TempoAnnotation)) {
     return "tempo" /* Tempo */;
   } else {
     return void 0;
@@ -3610,7 +3729,7 @@ var RitardandoSpeedDiv = 2;
 var CrescendoVolumeAdd = 0.5;
 var DiminuendoVolumeSub = 0.5;
 function calcTicksDuration(ticks, tempo) {
-  let beatTicks = RhythmProps3.get(tempo.options.beatLength, tempo.options.dotCount).ticks;
+  let beatTicks = RhythmProps4.get(tempo.options.beatLength, tempo.options.dotCount).ticks;
   let ticksPerMinute = tempo.beatsPerMinute * beatTicks;
   return 60 * ticks / ticksPerMinute;
 }
@@ -3643,7 +3762,7 @@ var PlayerColumnProps = class {
     return this.speed;
   }
   getTempo() {
-    let speed = Utils6.Math.clamp(this.getSpeed(), 0.1, 10);
+    let speed = Utils7.Math.clamp(this.getSpeed(), 0.1, 10);
     return alterTempoSpeed(this.measure.getTempo(), speed);
   }
   setVolume(volume) {
@@ -3668,7 +3787,7 @@ var PlayerColumnProps = class {
       if (symbolsTicks.length === 0) {
         return 0;
       } else {
-        return Utils6.Math.sum(symbolsTicks) / symbolsTicks.length;
+        return Utils7.Math.sum(symbolsTicks) / symbolsTicks.length;
       }
     }
   }
@@ -3817,7 +3936,7 @@ var Player = class _Player {
         } else if (layoutObj.musicObj.getLink() instanceof Extension) {
           let extension = layoutObj.musicObj.getLink();
           let { columnRange, extensionBreakText } = extension.getExtensionRangeInfo();
-          let totalTicks = Utils6.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
+          let totalTicks = Utils7.Math.sum(columnRange.map((c) => c.getTicksToNextColumn()));
           switch (text) {
             case "accel." /* accel */: {
               let startSpeed = curSpeed;
@@ -3871,11 +3990,11 @@ var Player = class _Player {
       });
       let speedArr = (_a = speedMap.get(col)) != null ? _a : [];
       if (speedArr.length > 0) {
-        curSpeed = Utils6.Math.sum(speedArr) / speedArr.length;
+        curSpeed = Utils7.Math.sum(speedArr) / speedArr.length;
       }
       let volumeArr = (_b = volumeMap.get(col)) != null ? _b : [];
       if (volumeArr.length > 0) {
-        curVolume = Utils6.Math.sum(volumeArr) / volumeArr.length;
+        curVolume = Utils7.Math.sum(volumeArr) / volumeArr.length;
       }
       col.getPlayerProps().setSpeed(curSpeed);
       col.getPlayerProps().setVolume(curVolume);
@@ -3913,11 +4032,11 @@ var Player = class _Player {
     } else {
       let playerNotes = col.getPlayerNotes();
       playerNotes.forEach((note, i) => {
-        let arpeggioDelayTicks = col.hasArpeggio() ? RhythmProps3.get(NoteLength5.ThirtySecond).ticks * i : 0;
+        let arpeggioDelayTicks = col.hasArpeggio() ? RhythmProps4.get(NoteLength6.ThirtySecond).ticks * i : 0;
         let noteSeconds = getDuration(note.ticks + fermataHoldTicks - arpeggioDelayTicks, tempo);
         if (noteSeconds > 0) {
           if (note.staccato) {
-            noteSeconds = Math.min(getDuration(RhythmProps3.get(NoteLength5.Eighth).ticks, tempo) / 2, noteSeconds / 2);
+            noteSeconds = Math.min(getDuration(RhythmProps4.get(NoteLength6.Eighth).ticks, tempo) / 2, noteSeconds / 2);
           }
           let volume = adjustVolume(col.getPlayerProps().getVolume());
           if (note.slur === "slurred") {
@@ -4205,7 +4324,7 @@ var ObjBarLineRight = class extends ObjBarLine {
 };
 
 // src/score/engine/obj-ending.ts
-import { Utils as Utils7 } from "@tspro/ts-utils-lib";
+import { Utils as Utils8 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError10, MusicErrorType as MusicErrorType10 } from "@tspro/web-music-score/core";
 var ObjEnding = class extends MusicObject {
   constructor(measure, passages) {
@@ -4216,9 +4335,9 @@ var ObjEnding = class extends MusicObject {
     __publicField(this, "shapeRects", []);
     __publicField(this, "mi");
     this.mi = new MEnding(this);
-    if (!Utils7.Is.isIntegerGte(passages.length, 1)) {
+    if (!Utils8.Is.isIntegerGte(passages.length, 1)) {
       throw new MusicError10(MusicErrorType10.Score, "Passages is empty.");
-    } else if (!this.passages.every((p) => Utils7.Is.isIntegerGte(p, 1))) {
+    } else if (!this.passages.every((p) => Utils8.Is.isIntegerGte(p, 1))) {
       throw new MusicError10(MusicErrorType10.Score, "Invalid passages: " + this.passages);
     }
     this.passages.sort((a, b) => a - b);
@@ -4433,7 +4552,7 @@ import { MusicError as MusicError13, MusicErrorType as MusicErrorType13 } from "
 import { Note as Note6 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-connective.ts
-import { Utils as Utils8 } from "@tspro/ts-utils-lib";
+import { Utils as Utils9 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError11, MusicErrorType as MusicErrorType11 } from "@tspro/web-music-score/core";
 var ObjConnective = class extends MusicObject {
   constructor(connectiveProps, line, measure, leftNoteGroup, leftNoteId, ...args) {
@@ -4462,7 +4581,7 @@ var ObjConnective = class extends MusicObject {
       this.rightNoteGroup = args[0];
       this.rightNoteId = args[1];
       this.tieType = void 0;
-    } else if (Utils8.Is.isEnumValue(args[0], TieType)) {
+    } else if (Utils9.Is.isEnumValue(args[0], TieType)) {
       this.rightNoteGroup = void 0;
       this.rightNoteId = void 0;
       this.tieType = args[0];
@@ -4532,7 +4651,7 @@ var ObjConnective = class extends MusicObject {
     this.rx = rx;
     this.ry = ry;
     this.arcHeight = this.connectiveProps.connective === "slide" /* Slide */ ? 0 : arcHeight;
-    let { nx, ny } = Utils8.Math.calcNormal(lx, ly, rx, ry);
+    let { nx, ny } = Utils9.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;
@@ -4593,7 +4712,7 @@ var ObjConnective = class extends MusicObject {
 
 // src/score/engine/connective-props.ts
 import { MusicError as MusicError12, MusicErrorType as MusicErrorType12 } from "@tspro/web-music-score/core";
-import { Utils as Utils9 } from "@tspro/ts-utils-lib";
+import { Utils as Utils10 } from "@tspro/ts-utils-lib";
 var ConnectiveProps = class {
   constructor(connective, span, noteAnchor, startNoteGroup) {
     this.connective = connective;
@@ -4663,7 +4782,7 @@ var ConnectiveProps = class {
     this.computeParams();
     let { connective, span } = this;
     if (connective === "tie" /* Tie */) {
-      if (Utils9.Is.isEnumValue(span, TieType)) {
+      if (Utils10.Is.isEnumValue(span, TieType)) {
         let leftNoteGroup = this.noteGroups[0];
         for (let noteId = 0; noteId < leftNoteGroup.notes.length; noteId++) {
           this.createObjConnectiveWithTieType(leftNoteGroup, noteId, span);
@@ -4734,8 +4853,9 @@ var ConnectiveProps = class {
 };
 
 // src/score/engine/obj-measure.ts
+var cmp = (a, b) => a === b ? 0 : a < b ? -1 : 1;
 function validateVoiceId(voiceId) {
-  if (getVoiceIds().indexOf(voiceId) < 0) {
+  if (typeof voiceId === "number" && getVoiceIds().indexOf(voiceId) < 0) {
     throw new MusicError13(MusicErrorType13.Score, "Invalid voiceId: " + voiceId);
   } else {
     return voiceId;
@@ -4745,14 +4865,14 @@ function getExtensionTicks(extensionLength) {
   if (typeof extensionLength === "string") {
     extensionLength = [extensionLength];
   }
-  if (Utils10.Is.isArray(extensionLength)) {
+  if (Utils11.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 = RhythmProps4.get(str).ticks;
+        let ticks = RhythmProps5.get(str).ticks;
         if (typeof num === "number") {
           i++;
           ticks *= num;
@@ -4767,6 +4887,18 @@ function getExtensionTicks(extensionLength) {
     return extensionLength;
   }
 }
+function getVerseLayoutGroupId(verse) {
+  switch (verse) {
+    case 1:
+      return 7 /* LyricsVerse1 */;
+    case 2:
+      return 8 /* LyricsVerse2 */;
+    case 3:
+      return 9 /* LyricsVerse3 */;
+    default:
+      throw new MusicError13(MusicErrorType13.Unknown, "VerseNumber is not 1, 2 or 3.");
+  }
+}
 var _ObjMeasure = class _ObjMeasure extends MusicObject {
   constructor(row) {
     super(row);
@@ -4811,6 +4943,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     // play twice.
     __publicField(this, "endRepeatPlayCountText");
     __publicField(this, "staticObjectsCache", /* @__PURE__ */ new Map());
+    __publicField(this, "lyricsObjectsCache", /* @__PURE__ */ new Map());
     __publicField(this, "mi");
     this.mi = new MMeasure(this);
     this.prevMeasure = row.doc.getLastMeasure();
@@ -4994,7 +5127,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       this.alterKeySignature = args[0];
     } else if (args[0] instanceof Scale) {
       this.alterKeySignature = args[0];
-    } else if (Utils10.Is.isNonEmptyString(args[0])) {
+    } else if (Utils11.Is.isNonEmptyString(args[0])) {
       if (args.length === 1) {
         this.alterKeySignature = getScale(args[0]);
       } else if (args.length === 2) {
@@ -5025,7 +5158,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   setTimeSignature(timeSignature) {
     var _a;
     (_a = this.getPrevMeasure()) == null ? void 0 : _a.endSection();
-    this.alterTimeSignature = timeSignature instanceof TimeSignature ? timeSignature : new TimeSignature(timeSignature);
+    this.alterTimeSignature = timeSignature;
     this.updateTimeSignature();
   }
   updateTimeSignature() {
@@ -5049,7 +5182,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     } else {
       let dotCount = typeof dotted === "number" && dotted > 0 ? dotted : dotted === true ? 1 : NoteLengthProps4.get(beatLength).dotCount;
       let options = {
-        beatLength: validateNoteLength(beatLength),
+        beatLength: validateNoteLength2(beatLength),
         dotCount: dotCount > 0 ? dotCount : void 0
       };
       this.alterTempo = { beatsPerMinute, options };
@@ -5105,7 +5238,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
           let grp = this.doc.getStaffGroup(staffTabOrGroup);
           if (grp && !prevGroups.includes(staffTabOrGroup)) {
             let curGroups = [...prevGroups, staffTabOrGroup];
-            (Utils10.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
+            (Utils11.Is.isArray(grp.staffsTabsAndGroups) ? grp.staffsTabsAndGroups : [grp.staffsTabsAndGroups]).forEach((staffTabOrGroup2) => {
               switch (grp.verticalPosition) {
                 case "above" /* Above */:
                   addToStaffTabOrGroup(staffTabOrGroup2, 0 /* Above */, curGroups);
@@ -5132,7 +5265,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       } else {
         addToStaffTabOrGroup(0, defaultVerticalPos);
       }
-    } else if (Utils10.Is.isArray(staffTabOrGroups)) {
+    } else if (Utils11.Is.isArray(staffTabOrGroups)) {
       staffTabOrGroups.forEach((staffTabOrGroup) => addToStaffTabOrGroup(staffTabOrGroup, defaultVerticalPos));
     } else {
       addToStaffTabOrGroup(staffTabOrGroups, defaultVerticalPos);
@@ -5216,7 +5349,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       case "endRepeat" /* EndRepeat */:
         if (args.length === 0) {
           this.endRepeatPlayCount = 2;
-        } else if (Utils10.Is.isIntegerGte(args[0], 2)) {
+        } else if (Utils11.Is.isIntegerGte(args[0], 2)) {
           this.endRepeatPlayCount = args[0];
         } else {
           throw new MusicError13(MusicErrorType13.Score, "Invalid end repeat play count (should be 2 or greater integer): " + args[0]);
@@ -5303,15 +5436,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
       throw new MusicError13(MusicErrorType13.Score, "Connective can be added to note group only.");
     }
     if (connective === "tie" /* Tie */) {
-      let tieSpan = Utils10.Is.isInteger(args[0]) || Utils10.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
-      let noteAnchor = Utils10.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let tieSpan = Utils11.Is.isInteger(args[0]) || Utils11.Is.isEnumValue(args[0], TieType) ? args[0] : 2;
+      let noteAnchor = Utils11.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("tie" /* Tie */, tieSpan, noteAnchor, anchor));
     } else if (connective === "slur" /* Slur */) {
-      let slurSpan = Utils10.Is.isInteger(args[0]) ? args[0] : 2;
-      let noteAnchor = Utils10.Is.isEnumValue(args[1], NoteAnchor) ? args[1] : "auto" /* Auto */;
+      let slurSpan = Utils11.Is.isInteger(args[0]) ? args[0] : 2;
+      let noteAnchor = Utils11.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 = Utils10.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
+      let noteAnchor = Utils11.Is.isEnumValue(args[0], NoteAnchor) ? args[0] : "auto" /* Auto */;
       anchor.startConnective(new ConnectiveProps("slide" /* Slide */, 2, noteAnchor, anchor));
     }
   }
@@ -5365,10 +5498,11 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     this.doc.requestNewRow();
     this.disableExtension();
   }
-  addRhythmSymbol(voiceId, symbol) {
-    let { col } = symbol;
+  addRhythmSymbol(symbol) {
+    var _a, _b;
+    let { col, voiceId } = symbol;
     col.setVoiceSymbol(voiceId, symbol);
-    this.getVoiceSymbols(voiceId);
+    (_b = (_a = this.voiceSymbols)[voiceId]) != null ? _b : _a[voiceId] = [];
     this.voiceSymbols[voiceId].push(symbol);
     if (symbol.oldStyleTriplet) {
       this.createOldStyleTriplets(voiceId);
@@ -5381,25 +5515,40 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     let realNotes = notes.map((note) => typeof note === "string" ? Note7.getNote(note) : note);
     let col = this.getRhythmColumn(voiceId);
     let noteGroup = new ObjNoteGroup(col, voiceId, realNotes, noteLength, options, tupletRatio);
-    this.addRhythmSymbol(voiceId, noteGroup);
+    this.addRhythmSymbol(noteGroup);
     return noteGroup;
   }
   addRest(voiceId, restLength, options, tupletRatio) {
     let col = this.getRhythmColumn(voiceId);
     let rest = new ObjRest(col, voiceId, restLength, options, tupletRatio);
-    this.addRhythmSymbol(voiceId, rest);
+    this.addRhythmSymbol(rest);
     return rest;
   }
+  addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+    this.forEachStaffGroup(staffTabOrGroups, 1 /* Below */, (line, vpos) => {
+      let col = this.getRhythmColumn({ verse, line, vpos });
+      let lyricsContainer = col.getLyricsContainer(verse, line, vpos, validateNoteLength2(lyricsLength));
+      if (lyricsContainer) {
+        let lyricsObj = new ObjLyrics(col, verse, line, vpos, lyricsText, lyricsOptions);
+        let lyricsArr = this.getLyricsObjects(lyricsObj.line, lyricsObj.vpos, lyricsObj.verse);
+        lyricsArr.push(lyricsObj);
+        lyricsArr.sort((a, b) => cmp(a.col.positionTicks, b.col.positionTicks));
+        lyricsContainer.addLyricsObject(lyricsObj);
+        this.addLayoutObject(lyricsObj, line, getVerseLayoutGroupId(verse), vpos);
+      }
+      this.lastAddedRhythmColumn = col;
+    });
+  }
   /**
    * 
    * @param positionTicks - get ObjRhythmColumn with positionTicks. Insert new if necessary.
    * @returns 
    */
-  getRhythmColumn(voiceId) {
+  getRhythmColumn(arg) {
     let positionTicks = 0;
     for (let i = this.columns.length - 1; i >= 0 && positionTicks === 0; i--) {
       let col = this.columns[i];
-      let symbol = col.getVoiceSymbol(voiceId);
+      let symbol = typeof arg === "number" ? col.getVoiceSymbol(arg) : col.getLyricsContainer(arg.verse, arg.line, arg.vpos);
       if (symbol) {
         positionTicks = col.positionTicks + symbol.rhythmProps.ticks;
       }
@@ -5466,6 +5615,38 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   getStaffLineRight() {
     return this.barLineRight.getRect().centerX;
   }
+  getLyricsObjects(line, vpos, verse) {
+    let vposMap = this.lyricsObjectsCache.get(line);
+    if (vposMap === void 0) {
+      vposMap = /* @__PURE__ */ new Map();
+      this.lyricsObjectsCache.set(line, vposMap);
+    }
+    let verseMap = vposMap.get(vpos);
+    if (verseMap === void 0) {
+      verseMap = /* @__PURE__ */ new Map();
+      vposMap.set(vpos, verseMap);
+    }
+    let lyricsArr = verseMap.get(verse);
+    if (lyricsArr === void 0) {
+      lyricsArr = [];
+      verseMap.set(verse, lyricsArr);
+    }
+    return lyricsArr;
+  }
+  getPrevLyricsObject(lyricsObj) {
+    var _a;
+    let lyricsArr = this.getLyricsObjects(lyricsObj.line, lyricsObj.vpos, lyricsObj.verse);
+    let i = lyricsArr.indexOf(lyricsObj);
+    if (i > 0) {
+      return lyricsArr[i - 1];
+    } else if (i === 0) {
+      let lyricsArr2 = (_a = lyricsObj.measure.getPrevMeasure()) == null ? void 0 : _a.getLyricsObjects(lyricsObj.line, lyricsObj.vpos, lyricsObj.verse);
+      if (lyricsArr2 && lyricsArr2.length > 0) {
+        return lyricsArr2[lyricsArr2.length - 1];
+      }
+    }
+    return void 0;
+  }
   getStaticObjects(line) {
     let staticObjects = this.staticObjectsCache.get(line);
     if (!staticObjects) {
@@ -5555,52 +5736,77 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         return false;
       }
     });
+    let ts = this.getTimeSignature();
+    if (!this.needBeamsUpdate || ts.beamGroupSizes.length === 0) {
+      return;
+    }
     getVoiceIds().forEach((voiceId) => {
-      let symbols = this.getVoiceSymbols(voiceId);
-      if (symbols.length <= 2) {
-        return;
-      }
-      if (!DebugSettings.DisableBeams) {
-        let groupSymbols = [];
+      let symbols = this.getVoiceSymbols(voiceId).slice();
+      if (symbols.length >= 2) {
+        let symbolsStartTicks = this.isUpBeat() ? Math.max(0, this.getMeasureTicks() - this.getConsumedTicks()) : 0;
         let groupStartTicks = 0;
-        let groupEndTicks = 0;
-        if (this.isUpBeat()) {
-          let startTicks = Math.max(0, this.getMeasureTicks() - this.getConsumedTicks());
-          groupStartTicks = groupEndTicks = startTicks;
-        }
-        let ts = this.getTimeSignature();
-        symbols.forEach((symbol) => {
-          groupSymbols.push(symbol);
-          groupEndTicks += symbol.rhythmProps.ticks;
-          if (groupStartTicks === 0 && groupEndTicks === ts.beamGroupLength) {
-            _ObjMeasure.setupBeamGroup(groupSymbols);
-          }
-          while (groupEndTicks >= ts.beamGroupLength) {
-            groupSymbols = [];
-            groupStartTicks = groupEndTicks = groupEndTicks - ts.beamGroupLength;
+        for (let groupId = 0; groupId < ts.beamGroupSizes.length; groupId++) {
+          let beamGroupSize = ts.beamGroupSizes[groupId];
+          let groupSizeSum = 0;
+          beamGroupSize.forEach((s) => groupSizeSum += s);
+          let groupLength = groupSizeSum * NoteLengthProps4.get("8n").ticks;
+          let groupSymbols = [];
+          let groupSymbolsLength = 0;
+          while (symbols.length > 0 && groupSymbolsLength < groupLength) {
+            let symbol = symbols[0];
+            if (symbol.col.positionTicks >= groupStartTicks) {
+              groupSymbols.push(symbol);
+              groupSymbolsLength += symbol.rhythmProps.ticks;
+              symbols.shift();
+            } else {
+              break;
+            }
           }
-        });
+          _ObjMeasure.setupBeamGroup(groupSymbols, beamGroupSize);
+          symbolsStartTicks += groupSymbolsLength;
+          groupStartTicks += groupLength;
+        }
       }
     });
     this.needBeamsUpdate = false;
     this.requestLayout();
   }
-  static setupBeamGroup(groupSymbols) {
+  static setupBeamGroup(groupSymbols, mainBeamGroupSizeArr) {
+    if (mainBeamGroupSizeArr.length === 0) {
+      return false;
+    }
     let groupNotes = groupSymbols.map((s) => {
       var _a;
       return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? s : void 0;
     });
     ObjNoteGroup.setBeamCounts(groupNotes);
-    let beamNotes = [];
-    groupNotes.forEach((noteGroup) => {
-      if (noteGroup && noteGroup.hasBeamCount()) {
-        beamNotes.push(noteGroup);
-      } else {
-        ObjBeamGroup.createBeam(beamNotes);
-        beamNotes = [];
-      }
-    });
-    ObjBeamGroup.createBeam(beamNotes);
+    let beamGroupSizeArrList = [mainBeamGroupSizeArr];
+    if (mainBeamGroupSizeArr.length > 1) {
+      let sum = 0;
+      mainBeamGroupSizeArr.forEach((s) => sum += s);
+      beamGroupSizeArrList.unshift([sum]);
+    }
+    let beamsCreated = false;
+    while (beamGroupSizeArrList.length > 0 && !beamsCreated) {
+      let beamGroupSizeArr = beamGroupSizeArrList.shift();
+      let groupSymbolsCopy = groupSymbols.slice();
+      beamGroupSizeArr.forEach((beamGroupSize) => {
+        var _a;
+        let beamGroupLength = beamGroupSize * NoteLengthProps4.get("8n").ticks;
+        let beamNotesLength = 0;
+        let beamNotes = [];
+        while (beamNotesLength < beamGroupLength && groupSymbolsCopy.length > 0) {
+          let symbol = groupSymbolsCopy.shift();
+          beamNotesLength += symbol.rhythmProps.ticks;
+          beamNotes.push(symbol instanceof ObjNoteGroup && ((_a = symbol.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? symbol : void 0);
+        }
+        if (beamNotesLength === beamGroupLength && beamNotes.every((n) => n !== void 0) && (beamNotes.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeArrList.length === 0)) {
+          ObjBeamGroup.createBeam(beamNotes);
+          beamsCreated = true;
+        }
+      });
+    }
+    return beamsCreated;
   }
   getBarLineLeft() {
     return this.barLineLeft;
@@ -5609,10 +5815,9 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
     return this.barLineRight;
   }
   getVoiceSymbols(voiceId) {
+    var _a, _b;
     validateVoiceId(voiceId);
-    if (this.voiceSymbols[voiceId] === void 0) {
-      this.voiceSymbols[voiceId] = [];
-    }
+    (_b = (_a = this.voiceSymbols)[voiceId]) != null ? _b : _a[voiceId] = [];
     return this.voiceSymbols[voiceId];
   }
   completeRests(voiceId) {
@@ -5623,7 +5828,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         this.completeRests(getVoiceIds().filter((id) => this.getConsumedTicks(id) > 0));
       }
       return;
-    } else if (Utils10.Is.isArray(voiceId)) {
+    } else if (Utils11.Is.isArray(voiceId)) {
       voiceId.forEach((id) => this.completeRests(id));
       return;
     } else {
@@ -5636,7 +5841,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         for (let noteSize = NoteLengthProps4.LongestNoteSize; noteSize <= NoteLengthProps4.ShortestNoteSize; noteSize *= 2) {
           let restLength = NoteLengthProps4.create(noteSize).noteLength;
           for (let dotCount = NoteLengthProps4.get(restLength).maxDotCount; dotCount >= 0; dotCount--) {
-            let restProps = RhythmProps4.get(restLength, dotCount);
+            let restProps = RhythmProps5.get(restLength, dotCount);
             while (restProps.ticks <= remainingTicks) {
               rests.push(restProps);
               remainingTicks -= restProps.ticks;
@@ -5738,7 +5943,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 = Utils10.Math.sum(this.columns.map((col) => col.getRect().width));
+    let columnsWidth = Utils11.Math.sum(this.columns.map((col) => col.getRect().width));
     let columnScale = columnsAreaWidth / columnsWidth;
     let columnLeft = columnsAreaLeft;
     this.columns.forEach((col) => {
@@ -5858,8 +6063,20 @@ var ObjMeasure2 = _ObjMeasure;
 
 // src/score/engine/layout-object.ts
 import { MusicError as MusicError14, MusicErrorType as MusicErrorType14 } from "@tspro/web-music-score/core";
-var WidenColumnList = [1 /* NoteLabel */, 6 /* ChordLabel */];
-var RowAlignList = [2 /* Navigation */, 3 /* Ending */, 4 /* TempoAnnotation */, 5 /* DynamicsAnnotation */, 6 /* ChordLabel */];
+var WidenColumnList = [
+  1 /* NoteLabel */,
+  6 /* ChordLabel */
+];
+var RowAlignList = [
+  2 /* Navigation */,
+  3 /* Ending */,
+  4 /* TempoAnnotation */,
+  5 /* DynamicsAnnotation */,
+  6 /* ChordLabel */,
+  7 /* LyricsVerse1 */,
+  8 /* LyricsVerse2 */,
+  9 /* LyricsVerse3 */
+];
 function requireParentMeasure(p) {
   while (p) {
     if (p instanceof ObjMeasure2) {
@@ -6219,7 +6436,7 @@ var ObjTab = class extends ObjNotationLine4 {
     __publicField(this, "tuningName");
     __publicField(this, "tuningStrings");
     __publicField(this, "mi");
-    if (Utils11.Is.isArray(tabConfig.tuning)) {
+    if (Utils12.Is.isArray(tabConfig.tuning)) {
       this.tuningName = void 0;
       this.tuningStrings = tabConfig.tuning.map((noteName) => Note8.getNote(noteName)).reverse();
     } else if (typeof tabConfig.tuning === "string") {
@@ -6674,7 +6891,7 @@ var ObjHeader = class extends MusicObject {
 };
 
 // src/score/engine/obj-document.ts
-import { Utils as Utils12 } from "@tspro/ts-utils-lib";
+import { Utils as Utils13 } from "@tspro/ts-utils-lib";
 var ObjDocument = class extends MusicObject {
   constructor() {
     super(void 0);
@@ -6695,7 +6912,7 @@ var ObjDocument = class extends MusicObject {
     return this.mi;
   }
   setScoreConfiguration(config) {
-    if (Utils12.Is.isEnumValue(config, StaffPreset)) {
+    if (Utils13.Is.isEnumValue(config, StaffPreset)) {
       switch (config) {
         default:
         case "treble" /* Treble */:
@@ -6723,7 +6940,7 @@ var ObjDocument = class extends MusicObject {
           ];
           break;
       }
-    } else if (Utils12.Is.isArray(config)) {
+    } else if (Utils13.Is.isArray(config)) {
       this.curScoreConfig = config;
     } else {
       this.curScoreConfig = [config];
@@ -6949,7 +7166,7 @@ var ObjDocument = class extends MusicObject {
 };
 
 // src/score/pub/document-builder.ts
-import { KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength7, RhythmProps as RhythmProps5, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TuningNameList, validateNoteLength as validateNoteLength2, validateTupletRatio } from "@tspro/web-music-score/theory";
+import { BeamGrouping, KeySignature as KeySignature3, Note as Note10, NoteLength as NoteLength8, RhythmProps as RhythmProps6, Scale as Scale2, ScaleType, SymbolSet as SymbolSet2, TimeSignature as TimeSignature2, TimeSignatures, TuningNameList, validateNoteLength as validateNoteLength3, validateTupletRatio } from "@tspro/web-music-score/theory";
 import { MusicError as MusicError17, MusicErrorType as MusicErrorType17 } from "@tspro/web-music-score/core";
 function assertArg(condition, argName, argValue) {
   if (!condition) {
@@ -6965,56 +7182,64 @@ function isNote(note) {
   }
 }
 function isVoiceId(value) {
-  return Utils13.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return Utils14.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function isStringNumber(value) {
-  return Utils13.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+  return Utils14.Is.isNumber(value) && getStringNumbers().indexOf(value) >= 0;
+}
+function isVerseNumber(value) {
+  return Utils14.Is.isNumber(value) && getVerseNumbers().indexOf(value) >= 0;
 }
 function assertStaffConfig(staffConfig) {
-  assertArg(Utils13.Is.isObject(staffConfig), "staffConfig", staffConfig);
+  assertArg(Utils14.Is.isObject(staffConfig), "staffConfig", staffConfig);
   assertArg(staffConfig.type === "staff", "staffConfig.type", staffConfig.type);
-  assertArg(Utils13.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
-  assertArg(Utils13.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
-  assertArg(Utils13.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
-  assertArg(Utils13.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
-  assertArg(Utils13.Is.isUndefined(staffConfig.voiceIds) || Utils13.Is.isArray(staffConfig.voiceIds) && staffConfig.voiceIds.every((voiceId) => Utils13.Is.isNumber(voiceId)), "staffConfig.voiceIds", staffConfig.voiceIds);
-  assertArg(Utils13.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
+  assertArg(Utils14.Is.isEnumValue(staffConfig.clef, Clef), "staffConfig.clef", staffConfig.clef);
+  assertArg(Utils14.Is.isBooleanOrUndefined(staffConfig.isOctaveDown), "staffConfig.isOctaveDown", staffConfig.isOctaveDown);
+  assertArg(Utils14.Is.isUndefined(staffConfig.minNote) || isNote(staffConfig.minNote), "staffConfig.minNote", staffConfig.minNote);
+  assertArg(Utils14.Is.isUndefined(staffConfig.maxNote) || isNote(staffConfig.maxNote), "staffConfig.maxNote", staffConfig.maxNote);
+  assertArg(Utils14.Is.isUndefined(staffConfig.voiceIds) || Utils14.Is.isArray(staffConfig.voiceIds) && staffConfig.voiceIds.every((voiceId) => Utils14.Is.isNumber(voiceId)), "staffConfig.voiceIds", staffConfig.voiceIds);
+  assertArg(Utils14.Is.isBooleanOrUndefined(staffConfig.isGrand), "staffConfig.isGrand", staffConfig.isGrand);
 }
 function assertTabConfig(tabConfig) {
-  assertArg(Utils13.Is.isObject(tabConfig), "tabConfig", tabConfig);
+  assertArg(Utils14.Is.isObject(tabConfig), "tabConfig", tabConfig);
   assertArg(tabConfig.type === "tab", "tabConfig.type", tabConfig.type);
   if (typeof tabConfig.tuning === "string") {
     assertArg(TuningNameList.includes(tabConfig.tuning), "tabConfig.tuning", tabConfig.tuning);
-  } else if (Utils13.Is.isArray(tabConfig.tuning)) {
+  } else if (Utils14.Is.isArray(tabConfig.tuning)) {
     assertArg(tabConfig.tuning.length === getStringNumbers().length && tabConfig.tuning.every((s) => isNote(s)), "tabConfig.tuning", tabConfig.tuning);
   }
-  assertArg(Utils13.Is.isUndefined(tabConfig.voiceIds) || Utils13.Is.isArray(tabConfig.voiceIds) && tabConfig.voiceIds.every((voiceId) => Utils13.Is.isNumber(voiceId)), "tabConfig.voiceIds", tabConfig.voiceIds);
+  assertArg(Utils14.Is.isUndefined(tabConfig.voiceIds) || Utils14.Is.isArray(tabConfig.voiceIds) && tabConfig.voiceIds.every((voiceId) => Utils14.Is.isNumber(voiceId)), "tabConfig.voiceIds", tabConfig.voiceIds);
+}
+function assertNoteOptions(noteOptions) {
+  assertArg(Utils14.Is.isObject(noteOptions), "noteOptions", noteOptions);
+  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.dotted) || Utils14.Is.isIntegerGte(noteOptions.dotted, 0), "noteOptions.dotted", noteOptions.dotted);
+  assertArg(Utils14.Is.isEnumValueOrUndefined(noteOptions.stem, Stem), "noteOptions.stem", noteOptions.stem);
+  assertArg(Utils14.Is.isStringOrUndefined(noteOptions.color), "noteOptions.color", noteOptions.color);
+  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.arpeggio) || Utils14.Is.isEnumValue(noteOptions.arpeggio, Arpeggio), "noteOptions.arpeggio", noteOptions.arpeggio);
+  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.staccato), "noteOptions.staccato", noteOptions.staccato);
+  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.diamond), "noteOptions.diamond", noteOptions.diamond);
+  assertArg(Utils14.Is.isBooleanOrUndefined(noteOptions.triplet), "noteOptions.triplet", noteOptions.triplet);
+  assertArg(Utils14.Is.isUndefined(noteOptions.string) || isStringNumber(noteOptions.string) || Utils14.Is.isNonEmptyArray(noteOptions.string) && noteOptions.string.every((string) => isStringNumber(string)), "noteOptions.string", noteOptions.string);
+  assertArg(Utils14.Is.isUndefined(noteOptions.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
+  assertArg(Utils14.Is.isUndefined(noteOptions.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
 }
-function assertNoteOptions(options) {
-  assertArg(Utils13.Is.isObject(options), "noteOptions", options);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.dotted) || Utils13.Is.isIntegerGte(options.dotted, 0), "noteOptions.dotted", options.dotted);
-  assertArg(Utils13.Is.isEnumValueOrUndefined(options.stem, Stem), "noteOptions.stem", options.stem);
-  assertArg(Utils13.Is.isStringOrUndefined(options.color), "noteOptions.color", options.color);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.arpeggio) || Utils13.Is.isEnumValue(options.arpeggio, Arpeggio), "noteOptions.arpeggio", options.arpeggio);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.staccato), "noteOptions.staccato", options.staccato);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.diamond), "noteOptions.diamond", options.diamond);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.triplet), "noteOptions.triplet", options.triplet);
-  assertArg(Utils13.Is.isUndefined(options.string) || isStringNumber(options.string) || Utils13.Is.isNonEmptyArray(options.string) && options.string.every((string) => isStringNumber(string)), "noteOptions.string", options.string);
-  assertArg(Utils13.Is.isUndefined(options.tieSpan), 'NoteOptions.tieSpan was removed. Use addConnective("tie", tieSpan)', "");
-  assertArg(Utils13.Is.isUndefined(options.slurSpan), 'NoteOptions.slurSpan was removed. Use addConnective("slur", slurSpan)', "");
+function assertRestOptions(restOptions) {
+  assertArg(Utils14.Is.isObject(restOptions), "restOptions", restOptions);
+  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.dotted) || Utils14.Is.isIntegerGte(restOptions.dotted, 0), "restOptions.dotted", restOptions.dotted);
+  assertArg(Utils14.Is.isStringOrUndefined(restOptions.staffPos) || Utils14.Is.isInteger(restOptions.staffPos) || restOptions.staffPos instanceof Note10, "restOptions.staffPos", restOptions.staffPos);
+  assertArg(Utils14.Is.isStringOrUndefined(restOptions.color), "restOptions.color", restOptions.color);
+  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.hide), "restOptions.hide", restOptions.hide);
+  assertArg(Utils14.Is.isBooleanOrUndefined(restOptions.triplet), "restOptions.triplet", restOptions.triplet);
 }
-function assertRestOptions(options) {
-  assertArg(Utils13.Is.isObject(options), "restOptions", options);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.dotted) || Utils13.Is.isIntegerGte(options.dotted, 0), "restOptions.dotted", options.dotted);
-  assertArg(Utils13.Is.isStringOrUndefined(options.staffPos) || Utils13.Is.isInteger(options.staffPos) || options.staffPos instanceof Note10, "restOptions.staffPos", options.staffPos);
-  assertArg(Utils13.Is.isStringOrUndefined(options.color), "restOptions.color", options.color);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.hide), "restOptions.hide", options.hide);
-  assertArg(Utils13.Is.isBooleanOrUndefined(options.triplet), "restOptions.triplet", options.triplet);
+function assertLyricsOptions(lyricsOptions) {
+  assertArg(Utils14.Is.isObject(lyricsOptions), "lyricsOptions", lyricsOptions);
+  assertArg(Utils14.Is.isEnumValueOrUndefined(lyricsOptions.align, LyricsAlign), "lyricsOptions.align", lyricsOptions.align);
+  assertArg(Utils14.Is.isEnumValueOrUndefined(lyricsOptions.hyphen, LyricsHyphen), "lyricsOptions.hyphen", lyricsOptions.hyphen);
 }
 function assertStaffTabOrGRoups(staffTabOrGroups) {
   assertArg(
-    Utils13.Is.isStringOrUndefined(staffTabOrGroups) || Utils13.Is.isIntegerGte(staffTabOrGroups, 0) || Utils13.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
-      (staffTabOrGroup) => Utils13.Is.isString(staffTabOrGroup) || Utils13.Is.isIntegerGte(staffTabOrGroup, 0)
+    Utils14.Is.isStringOrUndefined(staffTabOrGroups) || Utils14.Is.isIntegerGte(staffTabOrGroups, 0) || Utils14.Is.isNonEmptyArray(staffTabOrGroups) && staffTabOrGroups.every(
+      (staffTabOrGroup) => Utils14.Is.isString(staffTabOrGroup) || Utils14.Is.isIntegerGte(staffTabOrGroup, 0)
     ),
     "staffTabOrGroup",
     staffTabOrGroups
@@ -7022,7 +7247,7 @@ function assertStaffTabOrGRoups(staffTabOrGroups) {
 }
 function isNoteLength(noteLen) {
   try {
-    validateNoteLength2(noteLen);
+    validateNoteLength3(noteLen);
     return true;
   } catch (e) {
     return false;
@@ -7042,22 +7267,23 @@ var DocumentBuilder = class {
    */
   constructor() {
     __publicField(this, "doc");
+    __publicField(this, "currentLyricsAlign", "center" /* Center */);
     this.doc = new ObjDocument();
   }
   setScoreConfiguration(config) {
-    if (Utils13.Is.isEnumValue(config, StaffPreset)) {
+    if (Utils14.Is.isEnumValue(config, StaffPreset)) {
       this.doc.setScoreConfiguration(config);
-    } else if (Utils13.Is.isObject(config) && config.type === "staff") {
+    } else if (Utils14.Is.isObject(config) && config.type === "staff") {
       assertStaffConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils13.Is.isObject(config) && config.type === "tab") {
+    } else if (Utils14.Is.isObject(config) && config.type === "tab") {
       assertTabConfig(config);
       this.doc.setScoreConfiguration(config);
-    } else if (Utils13.Is.isNonEmptyArray(config)) {
+    } else if (Utils14.Is.isNonEmptyArray(config)) {
       config.forEach((c) => {
-        if (Utils13.Is.isObject(c) && c.type === "staff") {
+        if (Utils14.Is.isObject(c) && c.type === "staff") {
           assertStaffConfig(c);
-        } else if (Utils13.Is.isObject(c) && c.type === "tab") {
+        } else if (Utils14.Is.isObject(c) && c.type === "tab") {
           assertTabConfig(c);
         } else {
           assertArg(false, "config", config);
@@ -7088,9 +7314,9 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   setHeader(title, composer, arranger) {
-    assertArg(Utils13.Is.isStringOrUndefined(title), "title", title);
-    assertArg(Utils13.Is.isStringOrUndefined(composer), "composer", composer);
-    assertArg(Utils13.Is.isStringOrUndefined(arranger), "arranger", arranger);
+    assertArg(Utils14.Is.isStringOrUndefined(title), "title", title);
+    assertArg(Utils14.Is.isStringOrUndefined(composer), "composer", composer);
+    assertArg(Utils14.Is.isStringOrUndefined(arranger), "arranger", arranger);
     this.doc.setHeader(title, composer, arranger);
     return this;
   }
@@ -7100,7 +7326,7 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   setMeasuresPerRow(measuresPerRow) {
-    assertArg(Utils13.Is.isIntegerGte(measuresPerRow, 1) || Utils13.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
+    assertArg(Utils14.Is.isIntegerGte(measuresPerRow, 1) || Utils14.Is.isPosInfinity(measuresPerRow), "measuresPerRow", measuresPerRow);
     this.doc.setMeasuresPerRow(measuresPerRow);
     return this;
   }
@@ -7113,80 +7339,88 @@ var DocumentBuilder = class {
     return this;
   }
   setKeySignature(...args) {
-    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Utils13.Is.isNonEmptyString(args[0]) && (args.length === 1 || Utils13.Is.isEnumValue(args[1], ScaleType)), "keySignature", args);
+    assertArg(args[0] instanceof Scale2 || args[0] instanceof KeySignature3 || Utils14.Is.isNonEmptyString(args[0]) && (args.length === 1 || Utils14.Is.isEnumValue(args[1], ScaleType)), "keySignature", args);
     this.getMeasure().setKeySignature(...args);
     return this;
   }
-  /**
-   * Set time signature for current measure and forward.
-   * @param timeSignature - TimeSignature  object instance or string (e.g. "3/4").
-   * @returns - This document builder instance.
-   */
-  setTimeSignature(timeSignature) {
-    assertArg(timeSignature instanceof TimeSignature2 || Utils13.Is.isNonEmptyString(timeSignature), "timeSignature", timeSignature);
-    this.getMeasure().setTimeSignature(timeSignature);
+  setTimeSignature(...args) {
+    if (args[0] instanceof TimeSignature2) {
+      this.getMeasure().setTimeSignature(args[0]);
+    } else if (Utils14.Is.isEnumValue(args[0], TimeSignatures) && Utils14.Is.isEnumValueOrUndefined(args[1], BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1]));
+    } else if (Utils14.Is.isIntegerGte(args[0], 1) && Utils14.Is.isIntegerGte(args[1], 1) && Utils14.Is.isEnumValueOrUndefined(args[2], BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new TimeSignature2(args[0], args[1], args[2]));
+    } else {
+      assertArg(false, "timeSignature args", args);
+    }
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {
-    assertArg(Utils13.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
+    assertArg(Utils14.Is.isIntegerGte(beatsPerMinute, 1), "beatsPerMinute", beatsPerMinute);
     if (beatLength === void 0) {
-      assertArg(Utils13.Is.isUndefined(dotted), "dotted", dotted);
+      assertArg(Utils14.Is.isUndefined(dotted), "dotted", dotted);
     } else {
-      assertArg(Utils13.Is.isEnumValue(beatLength, NoteLength7) || isNoteLength(beatLength), "beatLength", beatLength);
-      assertArg(Utils13.Is.isBooleanOrUndefined(dotted) || Utils13.Is.isIntegerGte(dotted, 0), "dotted", dotted);
+      assertArg(Utils14.Is.isEnumValue(beatLength, NoteLength8) || isNoteLength(beatLength), "beatLength", beatLength);
+      assertArg(Utils14.Is.isBooleanOrUndefined(dotted) || Utils14.Is.isIntegerGte(dotted, 0), "dotted", dotted);
     }
     this.getMeasure().setTempo(beatsPerMinute, beatLength, dotted);
     return this;
   }
   /**
-   * Add note o current measure.
+   * Add note to current measure.
    * @param voiceId - Voice id to add note to.
-   * @param note - Note instance of Note or string (e.g. "D4").
+   * @param note - Instance of Note or string, single value (e.g. "C4") or array (e.g. ["C4", "E4", "G4"]).
    * @param noteLength - Note length (e.g. "4n").
-   * @param options - Note options.
+   * @param noteOptions - Note options.
    * @returns - This document builder instance.
    */
-  addNote(voiceId, note, noteLength, options) {
+  addNote(voiceId, note, noteLength, noteOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(note instanceof Note10 || Utils13.Is.isNonEmptyString(note), "note", note);
-    assertArg(Utils13.Is.isEnumValue(noteLength, NoteLength7) || isNoteLength(noteLength), "noteLength", noteLength);
-    if (options !== void 0) {
-      assertNoteOptions(options);
+    assertArg(
+      note instanceof Note10 || Utils14.Is.isNonEmptyString(note) || Utils14.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils14.Is.isNonEmptyString(note2)),
+      "note",
+      note
+    );
+    assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+    noteOptions != null ? noteOptions : noteOptions = {};
+    assertNoteOptions(noteOptions);
+    if (Utils14.Is.isArray(note)) {
+      note.forEach((note2) => this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions));
+    } else {
+      this.getMeasure().addNoteGroup(voiceId, [note], noteLength, noteOptions);
     }
-    this.getMeasure().addNoteGroup(voiceId, [note], noteLength, options);
     return this;
   }
   /**
+   * Add chord to current measure.
    * @param voiceId - Voice id to add chord to.
    * @param notes - Array of notes, each instance of Note or string (e.g. "D4"). 
    * @param noteLength - Note length (e.g. "4n"). 
-   * @param options - Note options. 
+   * @param noteOptions - Note options. 
    * @returns - This document builder instance.
    */
-  addChord(voiceId, notes, noteLength, options) {
+  addChord(voiceId, notes, noteLength, noteOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils13.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils13.Is.isNonEmptyString(note)), "notes", notes);
-    assertArg(Utils13.Is.isEnumValue(noteLength, NoteLength7) || isNoteLength(noteLength), "noteLength", noteLength);
-    if (options !== void 0) {
-      assertNoteOptions(options);
-    }
-    this.getMeasure().addNoteGroup(voiceId, notes, noteLength, options);
+    assertArg(Utils14.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils14.Is.isNonEmptyString(note)), "notes", notes);
+    assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+    noteOptions != null ? noteOptions : noteOptions = {};
+    assertNoteOptions(noteOptions);
+    this.getMeasure().addNoteGroup(voiceId, notes, noteLength, noteOptions);
     return this;
   }
   /**
-   * 
+   * Add rest to current measure.
    * @param voiceId - Voice id to add rest to.
    * @param restLength - Rest length (e.g. "4n").  
-   * @param options - Rest options.
+   * @param restOptions - Rest options.
    * @returns - This document builder instance.
    */
-  addRest(voiceId, restLength, options) {
+  addRest(voiceId, restLength, restOptions) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils13.Is.isEnumValue(restLength, NoteLength7) || isNoteLength(restLength), "restLength", restLength);
-    if (options !== void 0) {
-      assertRestOptions(options);
-    }
-    this.getMeasure().addRest(voiceId, restLength, options);
+    assertArg(Utils14.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+    restOptions != null ? restOptions : restOptions = {};
+    assertRestOptions(restOptions);
+    this.getMeasure().addRest(voiceId, restLength, restOptions);
     return this;
   }
   /**
@@ -7206,39 +7440,47 @@ var DocumentBuilder = class {
    */
   addTuplet(voiceId, tupletRatio, tupletBuilder) {
     assertArg(isVoiceId(voiceId), "voiceId", voiceId);
-    assertArg(Utils13.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
-    assertArg(isTupletRatio(tupletRatio) && Utils13.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
+    assertArg(Utils14.Is.isFunction(tupletBuilder), "tupletBuilder", tupletBuilder);
+    assertArg(isTupletRatio(tupletRatio) && Utils14.Is.isBooleanOrUndefined(tupletRatio.showRatio), "tupletRatio", tupletRatio);
     let tupletSymbols = [];
     const helper = {
-      addNote: (note, noteLength, options) => {
-        assertArg(note instanceof Note10 || Utils13.Is.isNonEmptyString(note), "note", note);
-        assertArg(Utils13.Is.isEnumValue(noteLength, NoteLength7) || isNoteLength(noteLength), "noteLength", noteLength);
-        if (options !== void 0) {
-          delete options.triplet;
-          assertNoteOptions(options);
+      addNote: (note, noteLength, noteOptions) => {
+        assertArg(
+          note instanceof Note10 || Utils14.Is.isNonEmptyString(note) || Utils14.Is.isArray(note) && note.every((note2) => note2 instanceof Note10 || Utils14.Is.isNonEmptyString(note2)),
+          "note",
+          note
+        );
+        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        noteOptions != null ? noteOptions : noteOptions = {};
+        delete noteOptions.triplet;
+        assertNoteOptions(noteOptions);
+        if (Utils14.Is.isArray(note)) {
+          note.forEach((note2) => {
+            let s = this.getMeasure().addNoteGroup(voiceId, [note2], noteLength, noteOptions, tupletRatio);
+            tupletSymbols.push(s);
+          });
+        } else {
+          let s = this.getMeasure().addNoteGroup(voiceId, [note], noteLength, noteOptions, tupletRatio);
+          tupletSymbols.push(s);
         }
-        let s = this.getMeasure().addNoteGroup(voiceId, [note], noteLength, options, tupletRatio);
-        tupletSymbols.push(s);
         return helper;
       },
-      addChord: (notes, noteLength, options) => {
-        assertArg(Utils13.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils13.Is.isNonEmptyString(note)), "notes", notes);
-        assertArg(Utils13.Is.isEnumValue(noteLength, NoteLength7) || isNoteLength(noteLength), "noteLength", noteLength);
-        if (options !== void 0) {
-          delete options.triplet;
-          assertNoteOptions(options);
-        }
-        let s = this.getMeasure().addNoteGroup(voiceId, notes, noteLength, options, tupletRatio);
+      addChord: (notes, noteLength, noteOptions) => {
+        assertArg(Utils14.Is.isNonEmptyArray(notes) && notes.every((note) => note instanceof Note10 || Utils14.Is.isNonEmptyString(note)), "notes", notes);
+        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        noteOptions != null ? noteOptions : noteOptions = {};
+        delete noteOptions.triplet;
+        assertNoteOptions(noteOptions);
+        let s = this.getMeasure().addNoteGroup(voiceId, notes, noteLength, noteOptions, tupletRatio);
         tupletSymbols.push(s);
         return helper;
       },
-      addRest: (restLength, options) => {
-        assertArg(Utils13.Is.isEnumValue(restLength, NoteLength7) || isNoteLength(restLength), "restLength", restLength);
-        if (options !== void 0) {
-          delete options.triplet;
-          assertRestOptions(options);
-        }
-        let s = this.getMeasure().addRest(voiceId, restLength, options, tupletRatio);
+      addRest: (restLength, restOptions) => {
+        assertArg(Utils14.Is.isEnumValue(restLength, NoteLength8) || isNoteLength(restLength), "restLength", restLength);
+        restOptions != null ? restOptions : restOptions = {};
+        delete restOptions.triplet;
+        assertRestOptions(restOptions);
+        let s = this.getMeasure().addRest(voiceId, restLength, restOptions, tupletRatio);
         tupletSymbols.push(s);
         return helper;
       }
@@ -7247,9 +7489,52 @@ var DocumentBuilder = class {
     ObjBeamGroup.createTuplet(tupletSymbols, tupletRatio);
     return this;
   }
+  addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+    var _a;
+    assertStaffTabOrGRoups(staffTabOrGroups);
+    assertArg(isVerseNumber(verse), "verse", verse);
+    assertArg(Utils14.Is.isEnumValue(lyricsLength, NoteLength8), "lyricsLength", lyricsLength);
+    assertArg(Utils14.Is.isString(lyricsText) || Utils14.Is.isArray(lyricsText) && lyricsText.every((text) => Utils14.Is.isString(text)), "lyricsText", lyricsText);
+    lyricsOptions != null ? lyricsOptions : lyricsOptions = {};
+    assertLyricsOptions(lyricsOptions);
+    if (lyricsOptions.align !== void 0) {
+      this.currentLyricsAlign = lyricsOptions.align;
+    } else {
+      (_a = lyricsOptions.align) != null ? _a : lyricsOptions.align = this.currentLyricsAlign;
+    }
+    if (Utils14.Is.isArray(lyricsText)) {
+      lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, text, lyricsOptions));
+    } else {
+      this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions);
+    }
+    return this;
+  }
+  /**
+   * Add lyrics to current measure.
+   * @param verse - Verse number (e.g. 1).
+   * @param lyricsLength - Lyrics text length (e.g. "2n").
+   * @param lyricsText - Lyrics text (empty space if omitted), single value or array.
+   * @param lyricsOptions - Lyrics options.
+   * @returns - This document builder instance.
+   */
+  addLyrics(verse, lyricsLength, lyricsText, lyricsOptions) {
+    return this.addLyricsInternal(void 0, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
+  }
+  /**
+   * Add lyrics to current measure to given staff/tab/group.
+   * @param staffTabOrGroups - staff/tab index (0=top), staff/tab name, or staff group name.
+   * @param verse - Verse number (e.g. 1).
+   * @param lyricsLength - Lyrics text length (e.g. "2n").
+   * @param lyricsText - Lyrics text (empty space if omitted), single value or array.
+   * @param lyricsOptions - Lyrics options.
+   * @returns - This document builder instance.
+   */
+  addLyricsTo(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+    return this.addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
+  }
   addFermataInternal(staffTabOrGroups, fermata) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils13.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
+    assertArg(Utils14.Is.isEnumValue(fermata, Fermata), "fermata", fermata);
     this.getMeasure().addFermata(staffTabOrGroups, fermata);
     return this;
   }
@@ -7272,11 +7557,11 @@ var DocumentBuilder = class {
   }
   addNavigationInternal(staffTabOrGroups, navigation, ...args) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils13.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
+    assertArg(Utils14.Is.isEnumValue(navigation, Navigation), "navigation", navigation);
     if (navigation === "endRepeat" /* EndRepeat */ && args.length > 0) {
-      assertArg(Utils13.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
+      assertArg(Utils14.Is.isIntegerGte(args[0], 1), "playCount", args[0]);
     } else if (navigation === "ending" /* Ending */ && args.length > 0) {
-      assertArg(args.every((passage) => Utils13.Is.isIntegerGte(passage, 1)), "passages", args);
+      assertArg(args.every((passage) => Utils14.Is.isIntegerGte(passage, 1)), "passages", args);
     }
     this.getMeasure().addNavigation(staffTabOrGroups, navigation, ...args);
     return this;
@@ -7293,8 +7578,8 @@ var DocumentBuilder = class {
       throw new MusicError17(MusicErrorType17.Score, `Annotation text "${text}" is not known annotation.`);
     }
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils13.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
-    assertArg(Utils13.Is.isNonEmptyString(text), "text", text);
+    assertArg(Utils14.Is.isEnumValue(annotation, Annotation), "annotation", annotation);
+    assertArg(Utils14.Is.isNonEmptyString(text), "text", text);
     this.getMeasure().addAnnotation(staffTabOrGroups, annotation, text);
     return this;
   }
@@ -7314,8 +7599,8 @@ var DocumentBuilder = class {
   }
   addLabelInternal(staffTabOrGroups, label, text) {
     assertStaffTabOrGRoups(staffTabOrGroups);
-    assertArg(Utils13.Is.isEnumValue(label, Label), "label", label);
-    assertArg(Utils13.Is.isNonEmptyString(text), "text", text);
+    assertArg(Utils14.Is.isEnumValue(label, Label), "label", label);
+    assertArg(Utils14.Is.isNonEmptyString(text), "text", text);
     this.getMeasure().addLabel(staffTabOrGroups, label, text);
     return this;
   }
@@ -7339,21 +7624,21 @@ var DocumentBuilder = class {
     return this.addLabelInternal(staffTabOrGroups, label, text);
   }
   addConnective(connective, ...args) {
-    assertArg(Utils13.Is.isEnumValue(connective, Connective), "connective", connective);
+    assertArg(Utils14.Is.isEnumValue(connective, Connective), "connective", connective);
     if (connective === "tie" /* Tie */) {
-      assertArg(Utils13.Is.isIntegerOrUndefined(args[0]) || Utils13.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
-      assertArg(Utils13.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Utils14.Is.isIntegerOrUndefined(args[0]) || Utils14.Is.isEnumValue(args[0], TieType), "tieSpan", args[0]);
+      assertArg(Utils14.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
       let tieSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, tieSpan, noteAnchor);
     } else if (connective === "slur" /* Slur */) {
-      assertArg(Utils13.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
-      assertArg(Utils13.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
+      assertArg(Utils14.Is.isIntegerOrUndefined(args[0]), "slurSpan", args[0]);
+      assertArg(Utils14.Is.isEnumValueOrUndefined(args[1], NoteAnchor), "noteAnchor", args[1]);
       let slurSpan = args[0];
       let noteAnchor = args[1];
       this.getMeasure().addConnective(connective, slurSpan, noteAnchor);
     } else if (connective === "slide" /* Slide */) {
-      assertArg(Utils13.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
+      assertArg(Utils14.Is.isEnumValueOrUndefined(args[0], NoteAnchor), "noteAnchor", args[0]);
       let noteAnchor = args[0];
       this.getMeasure().addConnective(connective, noteAnchor);
     }
@@ -7372,18 +7657,18 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addExtension(extensionBuilder) {
-    assertArg(Utils13.Is.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, for e.g. addExtension(ext => ext.measures(2)). Please refer to README or API Reference.", extensionBuilder);
+    assertArg(Utils14.Is.isFunctionOrUndefined(extensionBuilder), "addExtension() has new usage, for e.g. addExtension(ext => ext.measures(2)). Please refer to README or API Reference.", extensionBuilder);
     let ticks = 0;
     let visible = true;
     const helper = {
       notes: (noteLength, noteCount) => {
-        assertArg(Utils13.Is.isEnumValue(noteLength, NoteLength7) || isNoteLength(noteLength), "noteLength", noteLength);
-        assertArg(Utils13.Is.isUndefined(noteCount) || Utils13.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
-        ticks += RhythmProps5.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
+        assertArg(Utils14.Is.isEnumValue(noteLength, NoteLength8) || isNoteLength(noteLength), "noteLength", noteLength);
+        assertArg(Utils14.Is.isUndefined(noteCount) || Utils14.Is.isNumber(noteCount) && noteCount >= 0, "noteCount", noteCount);
+        ticks += RhythmProps6.get(noteLength).ticks * (noteCount != null ? noteCount : 1);
         return helper;
       },
       measures: (measureCount) => {
-        assertArg(Utils13.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
+        assertArg(Utils14.Is.isNumber(measureCount) && measureCount >= 1, "measureCount", measureCount);
         ticks += this.getMeasure().getMeasureTicks() * measureCount;
         return helper;
       },
@@ -7412,13 +7697,13 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition = "auto" /* Auto */) {
-    assertArg(Utils13.Is.isNonEmptyString(groupName), "groupName", groupName);
+    assertArg(Utils14.Is.isNonEmptyString(groupName), "groupName", groupName);
     assertArg(
-      Utils13.Is.isNonEmptyString(staffsTabsAndGroups) || Utils13.Is.isIntegerGte(staffsTabsAndGroups, 0) || Utils13.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Utils13.Is.isNonEmptyString(line) || Utils13.Is.isIntegerGte(line, 0)),
+      Utils14.Is.isNonEmptyString(staffsTabsAndGroups) || Utils14.Is.isIntegerGte(staffsTabsAndGroups, 0) || Utils14.Is.isNonEmptyArray(staffsTabsAndGroups) && staffsTabsAndGroups.every((line) => Utils14.Is.isNonEmptyString(line) || Utils14.Is.isIntegerGte(line, 0)),
       "staffsTabsAndGroups",
       staffsTabsAndGroups
     );
-    assertArg(Utils13.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
+    assertArg(Utils14.Is.isEnumValue(verticalPosition, VerticalPosition), "verticalPosition", verticalPosition);
     this.doc.addStaffGroup(groupName, staffsTabsAndGroups, verticalPosition);
     return this;
   }
@@ -7453,7 +7738,7 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   completeRests(voiceId) {
-    assertArg(Utils13.Is.isUndefined(voiceId) || isVoiceId(voiceId) || Utils13.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
+    assertArg(Utils14.Is.isUndefined(voiceId) || isVoiceId(voiceId) || Utils14.Is.isArray(voiceId) && voiceId.every((id) => isVoiceId(id)), "voiceId", voiceId);
     this.getMeasure().completeRests(voiceId);
     return this;
   }
@@ -7465,8 +7750,8 @@ var DocumentBuilder = class {
    * @returns - This document builder instance.
    */
   addScaleArpeggio(scale, bottomNote, numOctaves) {
-    assertArg(Utils13.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
-    assertArg(Utils13.Is.isIntegerGte(numOctaves, 1), "numOctaves", numOctaves);
+    assertArg(Utils14.Is.isNonEmptyString(bottomNote), "bottomNote", bottomNote);
+    assertArg(Utils14.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++) {
@@ -7538,10 +7823,10 @@ var ScoreObjectEvent = class extends ScoreEvent {
 
 // src/score/pub/music-interface.ts
 import * as Audio2 from "@tspro/web-music-score/audio";
-import { Utils as Utils15 } from "@tspro/ts-utils-lib";
+import { Utils as Utils16 } from "@tspro/ts-utils-lib";
 
 // src/score/pub/music-objects.ts
-import { Utils as Utils14 } from "@tspro/ts-utils-lib";
+import { Utils as Utils15 } from "@tspro/ts-utils-lib";
 import { MusicError as MusicError19, MusicErrorType as MusicErrorType19 } from "@tspro/web-music-score/core";
 function assertArg2(condition, argName, argValue) {
   if (!condition) {
@@ -7549,7 +7834,7 @@ function assertArg2(condition, argName, argValue) {
   }
 }
 function isVoiceId2(value) {
-  return Utils14.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
+  return Utils15.Is.isNumber(value) && getVoiceIds().indexOf(value) >= 0;
 }
 function getNotationLine(line) {
   if (line instanceof ObjStaff || line instanceof ObjTab) {
@@ -7725,7 +8010,7 @@ var _MDocument = class _MDocument extends MusicInterface6 {
    * @returns - Player instance.
    */
   play(playStateChangeListener) {
-    assertArg2(Utils14.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg2(Utils15.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     return new MPlayer(this, playStateChangeListener).play();
   }
 };
@@ -7755,7 +8040,7 @@ var _MEnding = class _MEnding extends MusicInterface6 {
    * @returns - Boolean whether this ending has asked passage number.
    */
   hasPassage(passage) {
-    assertArg2(Utils14.Is.isIntegerGte(passage, 1), "passage", passage);
+    assertArg2(Utils15.Is.isIntegerGte(passage, 1), "passage", passage);
     return this.obj.hasPassage(passage);
   }
 };
@@ -8334,6 +8619,27 @@ var _MText = class _MText extends MusicInterface6 {
 /** Object name. */
 __publicField(_MText, "Name", "Text");
 var MText = _MText;
+var _MLyrics = class _MLyrics extends MusicInterface6 {
+  /** @internal */
+  constructor(obj) {
+    super(_MLyrics.Name);
+    this.obj = obj;
+  }
+  /** @internal */
+  getMusicObject() {
+    return this.obj;
+  }
+  /**
+   * Get lyrics text.
+   * @returns - Lyrics text.
+   */
+  getText() {
+    return this.obj.getText();
+  }
+};
+/** Object name. */
+__publicField(_MLyrics, "Name", "Lyrics");
+var MLyrics = _MLyrics;
 var _MExtensionLine = class _MExtensionLine extends MusicInterface6 {
   /** @internal */
   constructor(obj) {
@@ -8372,7 +8678,7 @@ var _MPlayer = class _MPlayer {
   constructor(doc, playStateChangeListener) {
     __publicField(this, "player");
     assertArg3(doc instanceof MDocument2, "doc", doc);
-    assertArg3(Utils15.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
+    assertArg3(Utils16.Is.isFunctionOrUndefined(playStateChangeListener), "playStateChangeListener", playStateChangeListener);
     this.player = new Player();
     this.player.setDocument(doc.getMusicObject());
     this.player.setCursorPositionChangeListener((cursorRect) => doc.getMusicObject().updateCursorRect(cursorRect));
@@ -8430,7 +8736,7 @@ var MRenderer2 = class {
    * @returns - This renderer instance.
    */
   setDocument(doc) {
-    assertArg3(Utils15.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Utils16.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.renderer.setDocument(doc);
     return this;
   }
@@ -8440,7 +8746,7 @@ var MRenderer2 = class {
    * @returns - This renderer instance.
    */
   setCanvas(canvas) {
-    canvas = require_t(Utils15.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(Utils16.Dom.getCanvas(canvas), typeof canvas === "string" ? "Cannot set renderer canvas because invalid canvas id: " + canvas : "Cannot set renderer canvas because given canvas is undefined.");
     this.renderer.setCanvas(canvas);
     return this;
   }
@@ -8449,7 +8755,7 @@ var MRenderer2 = class {
    * @param scoreEventListener - Score event listener.
    */
   setScoreEventListener(scoreEventListener) {
-    assertArg3(Utils15.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
+    assertArg3(Utils16.Is.isFunctionOrUndefined(scoreEventListener), "scoreEventListener", scoreEventListener);
     this.renderer.setScoreEventListener(scoreEventListener);
   }
   /**
@@ -8523,7 +8829,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns 
    */
   setDocument(doc) {
-    assertArg3(Utils15.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
+    assertArg3(Utils16.Is.isUndefined(doc) || doc instanceof MDocument2, "doc", doc);
     this.onStop();
     if (doc) {
       this.player = new MPlayer(doc, (playState) => {
@@ -8567,9 +8873,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayButton(btn, btnLabel) {
-    assertArg3(Utils15.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playButton, this.onPlay);
-    this.playButton = require_t(Utils15.Dom.getButton(btn), "Play button required!");
+    this.playButton = require_t(Utils16.Dom.getButton(btn), "Play button required!");
     this.playLabel = btnLabel != null ? btnLabel : "Play";
     _MPlaybackButtons.removeOnClickListeners(this.playButton, "all");
     _MPlaybackButtons.addOnClickListener(this.playButton, this.onPlay);
@@ -8583,9 +8889,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setStopButton(btn, btnLabel) {
-    assertArg3(Utils15.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, this.onStop);
-    this.stopButton = require_t(Utils15.Dom.getButton(btn), "Stop button required!");
+    this.stopButton = require_t(Utils16.Dom.getButton(btn), "Stop button required!");
     this.stopLabel = btnLabel != null ? btnLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.stopButton, "all");
     _MPlaybackButtons.addOnClickListener(this.stopButton, this.onStop);
@@ -8600,10 +8906,10 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPlayStopButton(btn, playLabel, stopLabel) {
-    assertArg3(Utils15.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
-    assertArg3(Utils15.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
+    assertArg3(Utils16.Is.isStringOrUndefined(playLabel), "playLabel", playLabel);
+    assertArg3(Utils16.Is.isStringOrUndefined(stopLabel), "stopLabel", stopLabel);
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, this.onPlayStop);
-    this.playStopButton = require_t(Utils15.Dom.getButton(btn), "Play/stop button required!");
+    this.playStopButton = require_t(Utils16.Dom.getButton(btn), "Play/stop button required!");
     this.playLabel = playLabel != null ? playLabel : "Play";
     this.stopLabel = stopLabel != null ? stopLabel : "Stop";
     _MPlaybackButtons.removeOnClickListeners(this.playStopButton, "all");
@@ -8618,9 +8924,9 @@ var _MPlaybackButtons = class _MPlaybackButtons {
    * @returns - This playback buttons class instance.
    */
   setPauseButton(btn, btnLabel) {
-    assertArg3(Utils15.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
+    assertArg3(Utils16.Is.isStringOrUndefined(btnLabel), "btnLabel", btnLabel);
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, this.onPause);
-    this.pauseButton = require_t(Utils15.Dom.getButton(btn), "Pause button required!");
+    this.pauseButton = require_t(Utils16.Dom.getButton(btn), "Pause button required!");
     this.pauseLabel = btnLabel != null ? btnLabel : "Pause";
     _MPlaybackButtons.removeOnClickListeners(this.pauseButton, "all");
     _MPlaybackButtons.addOnClickListener(this.pauseButton, this.onPause);
@@ -8642,7 +8948,7 @@ var _MPlaybackButtons = class _MPlaybackButtons {
     }
   }
   static addOnClickListener(btn, onClick) {
-    assertArg3(Utils15.Is.isFunction(onClick), "onClick", onClick);
+    assertArg3(Utils16.Is.isFunction(onClick), "onClick", onClick);
     btn.addEventListener("click", onClick);
     let clickListeners = this.savedOnClickListeners.get(btn) || [];
     this.savedOnClickListeners.set(btn, [...clickListeners, onClick]);
@@ -8664,6 +8970,8 @@ export {
   DynamicsAnnotation,
   Fermata,
   Label,
+  LyricsAlign,
+  LyricsHyphen,
   MAccidental,
   MArpeggio,
   MBarLineLeft,
@@ -8676,6 +8984,7 @@ export {
   MFermata,
   MHeader,
   MImage,
+  MLyrics,
   MMeasure,
   MNoteGroup,
   MPlaybackButtons,
@@ -8707,6 +9016,7 @@ export {
   TieType,
   VerticalPosition,
   getStringNumbers,
+  getVerseNumbers,
   getVoiceIds
 };
 //# sourceMappingURL=index.mjs.map