web-music-score 6.0.0-pre.5 → 6.0.1

package/dist/{music-objects-D-xO1oti.d.ts → music-objects-Bef-fs1f.d.ts}

@@ -1,5 +1,5 @@
-import { N as Note, A as Accidental } from './note-CJuq5aBy.js';
-import { R as RhythmProps, N as NoteLength, h as NoteLengthStr, k as TupletRatio, c as Tempo, K as KeySignature, a as TimeSignature } from './tempo-pCAa6qgo.js';
+import { N as Note, A as Accidental } from './note-RVXvpfyV.js';
+import { R as RhythmProps, N as NoteLength, h as NoteLengthStr, k as TupletRatio, c as Tempo, K as KeySignature, a as TimeSignature } from './tempo-D-JF-8b_.js';
 import { AnchoredRect, UniMap, Rect, Vec } from '@tspro/ts-utils-lib';
 
 /** Staff preset values for score configuration. */
@@ -657,7 +657,7 @@ declare class ObjBeamGroup extends MusicObject {
     private get color();
     layout(ctx: RenderContext): void;
     updateRect(): void;
-    updateStemTips(): void;
+    updateNoteStemTips(): void;
     offset(dx: number, dy: number): void;
     draw(ctx: RenderContext): void;
     private setBeamCounts;
@@ -697,6 +697,8 @@ declare class ObjRest extends MusicObject {
     get measure(): ObjMeasure;
     get row(): ObjScoreRow;
     get noteLength(): NoteLength;
+    private getDiatonicIdFromStaffPos;
+    getDiatonicIdOnLine(diatonicId: number): number;
     getDiatonicId(staff?: ObjStaff): number;
     get stemDir(): Stem.Up | Stem.Down;
     updateRunningArguments(diatonicId: number, stemDir: Stem.Up | Stem.Down, stringNumbers: StringNumber[]): void;
@@ -940,7 +942,9 @@ declare class ObjExtensionLine extends MusicObject {
     constructor(measure: ObjMeasure, line: ObjNotationLine, extension: Extension, cols: ExtensionObjectAll[]);
     get row(): ObjScoreRow;
     getMusicInterface(): MExtensionLine;
+    private getLeftObj;
     private getLineLeft;
+    private getRightObj;
     private getLineRight;
     layoutFitToMeasure(ctx: RenderContext): void;
     pick(x: number, y: number): MusicObject[];
@@ -1072,7 +1076,7 @@ declare class ObjMeasure extends MusicObject {
     private addRhythmSymbol;
     addNoteGroup(voiceId: VoiceId, notes: (Note | string)[], noteLength: NoteLength | NoteLengthStr, options?: NoteOptions, tupletRatio?: TupletRatio): ObjNoteGroup;
     addRest(voiceId: VoiceId, restLength: NoteLength | NoteLengthStr, options?: RestOptions, tupletRatio?: TupletRatio): ObjRest;
-    addLyrics(staffTabOrGroups: StaffTabOrGroups | undefined, verse: VerseNumber, lyricsLength: NoteLength | NoteLengthStr, lyricsText: string, lyricsOptions: LyricsOptions): void;
+    addLyrics(staffTabOrGroups: StaffTabOrGroups | undefined, verse: VerseNumber, lyricsText: string, lyricsLength: NoteLength | NoteLengthStr, lyricsOptions: LyricsOptions): void;
     /**
      *
      * @param positionTicks - get ObjRhythmColumn with positionTicks. Insert new if necessary.

package/dist/{note-CJuq5aBy.d.ts → note-RVXvpfyV.d.ts}

@@ -300,7 +300,7 @@ declare class Note {
      * @param b - Note b.
      * @returns - -1, 0 or 1.
      */
-    static compareFunc(a: Note, b: Note): 1 | -1 | 0;
+    static compareFunc(a: Note, b: Note): 1 | 0 | -1;
 }
 
 export { type Accidental as A, DefaultPitchNotation as D, GuitarNoteLabel as G, Note as N, type ParsedNote as P, SymbolSet as S, type NoteLetter as a, PitchNotation as b, PitchNotationList as c, DefaultGuitarNoteLabel as d, GuitarNoteLabelList as e, validateGuitarNoteLabel as f, getPitchNotationName as g, validatePitchNotation as v };

package/dist/pieces/index.d.ts

@@ -1,6 +1,6 @@
-import { M as MDocument } from '../music-objects-D-xO1oti.js';
-import '../note-CJuq5aBy.js';
-import '../tempo-pCAa6qgo.js';
+import { M as MDocument } from '../music-objects-Bef-fs1f.js';
+import '../note-RVXvpfyV.js';
+import '../tempo-D-JF-8b_.js';
 import '@tspro/ts-utils-lib';
 
 /**

package/dist/pieces/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v6.0.0-pre.5 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
+/* WebMusicScore v6.0.1 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -50,7 +50,7 @@ function createFrereJacques() {
   return new import_score3.DocumentBuilder().setHeader("Fr\xE8re Jacques", "Traditional").setScoreConfiguration([
     { type: "staff", clef: "G", voiceId: 0, instrument: "!{Piano" },
     { type: "staff", clef: "F", voiceId: 1, instrument: "!{Piano" }
-  ]).setMeasuresPerRow(2).addMeasure().setKeySignature("D Major").setTimeSignature("4/4").addNote(0, "D4", "4n", { stem: "up" }).addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNavigation("startRepeat").addNote(0, "F#4", "4n").addLyrics(1, "4n", "Bro", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "4n", "ther").addNote(0, "A4", "2n").addLyrics(1, "4n", "John?").addNote(1, "D3", "4n", { stem: "down" }).addLyricsTo(1, 1, "4n", "Are").addNote(1, "E3", "4n").addLyricsTo(1, 1, "4n", "you").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "sleep", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing?").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "4n", "Bro", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "4n", "ther").addNote(0, "A4", "2n").addLyrics(1, "4n", "John?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Are").addNote(1, "E3", "4n").addLyricsTo(1, 1, "4n", "you").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "sleep", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing?").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "8n", "Morn", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "8n", "ing").addNote(0, "A4", "8n").addLyrics(1, "8n", "bells").addNote(0, "G4", "8n").addLyrics(1, "8n", "are").addNote(0, "F#4", "4n").addLyrics(1, "4n", "ring", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing!").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "Bro", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "4n", "ther").addNote(1, "A3", "2n").addLyricsTo(1, 1, "2n", "John?").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "8n", "Morn", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "8n", "ing").addNote(0, "A4", "8n").addLyrics(1, "8n", "bells").addNote(0, "G4", "8n").addLyrics(1, "8n", "are").addNote(0, "F#4", "4n").addLyrics(1, "4n", "ring", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing!").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "Bro", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "4n", "ther").addNote(1, "A3", "2n").addLyricsTo(1, 1, "2n", "John?").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Ding").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "4n", "ding").addNote(0, "D4", "4n").addLyrics(1, "4n", "dong!").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "Morn", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "8n", "ing").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "bells").addNote(1, "G3", "8n").addLyricsTo(1, 1, "8n", "are").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "ring", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing!").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Ding").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "4n", "ding").addNote(0, "D4", "4n").addLyrics(1, "4n", "dong!").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "Morn", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "8n", "ing").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "bells").addNote(1, "G3", "8n").addLyricsTo(1, 1, "8n", "are").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "ring", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing!").addMeasure().setMeasuresPerRow(4).addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Ding").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "4n", "ding").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "dong!").addRest(1, "4n").addMeasure().addNavigation("endRepeat").addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Ding").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "4n", "ding").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "dong!").addRest(1, "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "4n", "YES").addNote(0, "D4", "4n").addLyrics(1, "4n", "I'm").addNote(0, "F#4", "4n").addLyrics(1, "4n", "SLEEP", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ING").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addMeasure().addNote(0, "A3", "4n").addLyrics(1, "4n", "Please").addNote(0, "C#4", "8n").addLyrics(1, "8n", "GO").addNote(0, "C#4", "8n").addLyrics(1, "8n", "A", { hyphen: "-" }).addNote(0, "D4", "2n").addLyrics(1, "4n", "WAY!").addNote(1, "D3", "4n").addNote(1, "E3", "4n").addNote(1, "F#3", "2n").getDocument();
+  ]).setMeasuresPerRow(2).addMeasure().setKeySignature("D Major").setTimeSignature("4/4").addNote(0, "D4", "4n", { stem: "up" }).addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNavigation("startRepeat").addNote(0, "F#4", "4n").addLyrics(1, "Bro", "4n", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "ther", "4n").addNote(0, "A4", "2n").addLyrics(1, "John?", "4n").addNote(1, "D3", "4n", { stem: "down" }).addLyricsTo(1, 1, "Are", "4n").addNote(1, "E3", "4n").addLyricsTo(1, 1, "you", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "sleep", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing?", "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "Bro", "4n", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "ther", "4n").addNote(0, "A4", "2n").addLyrics(1, "John?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Are", "4n").addNote(1, "E3", "4n").addLyricsTo(1, 1, "you", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "sleep", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing?", "4n").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "Morn", "8n", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "ing", "8n").addNote(0, "A4", "8n").addLyrics(1, "bells", "8n").addNote(0, "G4", "8n").addLyrics(1, "are", "8n").addNote(0, "F#4", "4n").addLyrics(1, "ring", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing!", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "Bro", "4n", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "ther", "4n").addNote(1, "A3", "2n").addLyricsTo(1, 1, "John?", "2n").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "Morn", "8n", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "ing", "8n").addNote(0, "A4", "8n").addLyrics(1, "bells", "8n").addNote(0, "G4", "8n").addLyrics(1, "are", "8n").addNote(0, "F#4", "4n").addLyrics(1, "ring", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing!", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "Bro", "4n", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "ther", "4n").addNote(1, "A3", "2n").addLyricsTo(1, 1, "John?", "2n").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Ding", "4n").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "ding", "4n").addNote(0, "D4", "4n").addLyrics(1, "dong!", "4n").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "Morn", "8n", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "ing", "8n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "bells", "8n").addNote(1, "G3", "8n").addLyricsTo(1, 1, "are", "8n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "ring", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing!", "4n").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Ding", "4n").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "ding", "4n").addNote(0, "D4", "4n").addLyrics(1, "dong!", "4n").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "Morn", "8n", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "ing", "8n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "bells", "8n").addNote(1, "G3", "8n").addLyricsTo(1, 1, "are", "8n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "ring", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing!", "4n").addMeasure().setMeasuresPerRow(4).addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Ding", "4n").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "ding", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "dong!", "4n").addRest(1, "4n").addMeasure().addNavigation("endRepeat").addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Ding", "4n").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "ding", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "dong!", "4n").addRest(1, "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "YES", "4n").addNote(0, "D4", "4n").addLyrics(1, "I'm", "4n").addNote(0, "F#4", "4n").addLyrics(1, "SLEEP", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ING", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addMeasure().addNote(0, "A3", "4n").addLyrics(1, "Please", "4n").addNote(0, "C#4", "8n").addLyrics(1, "GO", "8n").addNote(0, "C#4", "8n").addLyrics(1, "A", "8n", { hyphen: "-" }).addNote(0, "D4", "2n").addLyrics(1, "WAY!", "4n").addNote(1, "D3", "4n").addNote(1, "E3", "4n").addNote(1, "F#3", "2n").getDocument();
 }
 
 // src/pieces/greensleeves.ts

package/dist/pieces/index.mjs

@@ -1,5 +1,5 @@
-/* WebMusicScore v6.0.0-pre.5 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
-import "../chunk-G3HIPFVF.mjs";
+/* WebMusicScore v6.0.1 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
+import "../chunk-OM25LPIN.mjs";
 
 // src/pieces/andante-diabelli.ts
 import { DocumentBuilder } from "web-music-score/score";
@@ -22,7 +22,7 @@ function createFrereJacques() {
   return new DocumentBuilder3().setHeader("Fr\xE8re Jacques", "Traditional").setScoreConfiguration([
     { type: "staff", clef: "G", voiceId: 0, instrument: "!{Piano" },
     { type: "staff", clef: "F", voiceId: 1, instrument: "!{Piano" }
-  ]).setMeasuresPerRow(2).addMeasure().setKeySignature("D Major").setTimeSignature("4/4").addNote(0, "D4", "4n", { stem: "up" }).addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNavigation("startRepeat").addNote(0, "F#4", "4n").addLyrics(1, "4n", "Bro", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "4n", "ther").addNote(0, "A4", "2n").addLyrics(1, "4n", "John?").addNote(1, "D3", "4n", { stem: "down" }).addLyricsTo(1, 1, "4n", "Are").addNote(1, "E3", "4n").addLyricsTo(1, 1, "4n", "you").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "sleep", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing?").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "4n", "Bro", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "4n", "ther").addNote(0, "A4", "2n").addLyrics(1, "4n", "John?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Are").addNote(1, "E3", "4n").addLyricsTo(1, 1, "4n", "you").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "sleep", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing?").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "8n", "Morn", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "8n", "ing").addNote(0, "A4", "8n").addLyrics(1, "8n", "bells").addNote(0, "G4", "8n").addLyrics(1, "8n", "are").addNote(0, "F#4", "4n").addLyrics(1, "4n", "ring", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing!").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "Bro", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "4n", "ther").addNote(1, "A3", "2n").addLyricsTo(1, 1, "2n", "John?").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "8n", "Morn", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "8n", "ing").addNote(0, "A4", "8n").addLyrics(1, "8n", "bells").addNote(0, "G4", "8n").addLyrics(1, "8n", "are").addNote(0, "F#4", "4n").addLyrics(1, "4n", "ring", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing!").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "Bro", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "4n", "ther").addNote(1, "A3", "2n").addLyricsTo(1, 1, "2n", "John?").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Ding").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "4n", "ding").addNote(0, "D4", "4n").addLyrics(1, "4n", "dong!").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "Morn", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "8n", "ing").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "bells").addNote(1, "G3", "8n").addLyricsTo(1, 1, "8n", "are").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "ring", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing!").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "4n", "Ding").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "4n", "ding").addNote(0, "D4", "4n").addLyrics(1, "4n", "dong!").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "Morn", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "8n", "ing").addNote(1, "A3", "8n").addLyricsTo(1, 1, "8n", "bells").addNote(1, "G3", "8n").addLyricsTo(1, 1, "8n", "are").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "4n", "ring", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "ing!").addMeasure().setMeasuresPerRow(4).addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Ding").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "4n", "ding").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "dong!").addRest(1, "4n").addMeasure().addNavigation("endRepeat").addNote(0, "D4", "4n").addLyrics(1, "4n", "Are").addNote(0, "E4", "4n").addLyrics(1, "4n", "you").addNote(0, "F#4", "4n").addLyrics(1, "4n", "sleep", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ing?").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "Ding").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "4n", "ding").addNote(1, "D3", "4n").addLyricsTo(1, 1, "4n", "dong!").addRest(1, "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "4n", "YES").addNote(0, "D4", "4n").addLyrics(1, "4n", "I'm").addNote(0, "F#4", "4n").addLyrics(1, "4n", "SLEEP", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "4n", "ING").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addMeasure().addNote(0, "A3", "4n").addLyrics(1, "4n", "Please").addNote(0, "C#4", "8n").addLyrics(1, "8n", "GO").addNote(0, "C#4", "8n").addLyrics(1, "8n", "A", { hyphen: "-" }).addNote(0, "D4", "2n").addLyrics(1, "4n", "WAY!").addNote(1, "D3", "4n").addNote(1, "E3", "4n").addNote(1, "F#3", "2n").getDocument();
+  ]).setMeasuresPerRow(2).addMeasure().setKeySignature("D Major").setTimeSignature("4/4").addNote(0, "D4", "4n", { stem: "up" }).addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addRest(1, "1n", { staffPos: "F3" }).addMeasure().addNavigation("startRepeat").addNote(0, "F#4", "4n").addLyrics(1, "Bro", "4n", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "ther", "4n").addNote(0, "A4", "2n").addLyrics(1, "John?", "4n").addNote(1, "D3", "4n", { stem: "down" }).addLyricsTo(1, 1, "Are", "4n").addNote(1, "E3", "4n").addLyricsTo(1, 1, "you", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "sleep", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing?", "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "Bro", "4n", { hyphen: "-" }).addNote(0, "G4", "4n").addLyrics(1, "ther", "4n").addNote(0, "A4", "2n").addLyrics(1, "John?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Are", "4n").addNote(1, "E3", "4n").addLyricsTo(1, 1, "you", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "sleep", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing?", "4n").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "Morn", "8n", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "ing", "8n").addNote(0, "A4", "8n").addLyrics(1, "bells", "8n").addNote(0, "G4", "8n").addLyrics(1, "are", "8n").addNote(0, "F#4", "4n").addLyrics(1, "ring", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing!", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "Bro", "4n", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "ther", "4n").addNote(1, "A3", "2n").addLyricsTo(1, 1, "John?", "2n").addMeasure().addNote(0, "A4", "8n").addLyrics(1, "Morn", "8n", { hyphen: "-" }).addNote(0, "B4", "8n").addLyrics(1, "ing", "8n").addNote(0, "A4", "8n").addLyrics(1, "bells", "8n").addNote(0, "G4", "8n").addLyrics(1, "are", "8n").addNote(0, "F#4", "4n").addLyrics(1, "ring", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing!", "4n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "Bro", "4n", { hyphen: "-" }).addNote(1, "G3", "4n").addLyricsTo(1, 1, "ther", "4n").addNote(1, "A3", "2n").addLyricsTo(1, 1, "John?", "2n").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Ding", "4n").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "ding", "4n").addNote(0, "D4", "4n").addLyrics(1, "dong!", "4n").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "Morn", "8n", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "ing", "8n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "bells", "8n").addNote(1, "G3", "8n").addLyricsTo(1, 1, "are", "8n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "ring", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing!", "4n").addMeasure().addNote(0, "D4", "4n").addLyrics(1, "Ding", "4n").addChord(0, ["C#4", "A4"], "4n").addLyrics(1, "ding", "4n").addNote(0, "D4", "4n").addLyrics(1, "dong!", "4n").addRest(0, "4n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "Morn", "8n", { hyphen: "-" }).addNote(1, "B3", "8n").addLyricsTo(1, 1, "ing", "8n").addNote(1, "A3", "8n").addLyricsTo(1, 1, "bells", "8n").addNote(1, "G3", "8n").addLyricsTo(1, 1, "are", "8n").addNote(1, "F#3", "4n").addLyricsTo(1, 1, "ring", "4n", { hyphen: "-" }).addNote(1, "D3", "4n").addLyricsTo(1, 1, "ing!", "4n").addMeasure().setMeasuresPerRow(4).addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Ding", "4n").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "ding", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "dong!", "4n").addRest(1, "4n").addMeasure().addNavigation("endRepeat").addNote(0, "D4", "4n").addLyrics(1, "Are", "4n").addNote(0, "E4", "4n").addLyrics(1, "you", "4n").addNote(0, "F#4", "4n").addLyrics(1, "sleep", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ing?", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "Ding", "4n").addChord(1, ["C#3", "A3"], "4n").addLyricsTo(1, 1, "ding", "4n").addNote(1, "D3", "4n").addLyricsTo(1, 1, "dong!", "4n").addRest(1, "4n").addMeasure().addNote(0, "F#4", "4n").addLyrics(1, "YES", "4n").addNote(0, "D4", "4n").addLyrics(1, "I'm", "4n").addNote(0, "F#4", "4n").addLyrics(1, "SLEEP", "4n", { hyphen: "-" }).addNote(0, "D4", "4n").addLyrics(1, "ING", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addNote(1, "A3", "4n").addNote(1, "F#3", "4n").addMeasure().addNote(0, "A3", "4n").addLyrics(1, "Please", "4n").addNote(0, "C#4", "8n").addLyrics(1, "GO", "8n").addNote(0, "C#4", "8n").addLyrics(1, "A", "8n", { hyphen: "-" }).addNote(0, "D4", "2n").addLyrics(1, "WAY!", "4n").addNote(1, "D3", "4n").addNote(1, "E3", "4n").addNote(1, "F#3", "2n").getDocument();
 }
 
 // src/pieces/greensleeves.ts

package/dist/react-ui/index.d.ts

@@ -1,8 +1,8 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as React from 'react';
-import { M as MDocument, a8 as Paint, o as ScoreEventListener, r as MPlaybackButtons } from '../music-objects-D-xO1oti.js';
-import '../note-CJuq5aBy.js';
-import '../tempo-pCAa6qgo.js';
+import { M as MDocument, a8 as Paint, o as ScoreEventListener, r as MPlaybackButtons } from '../music-objects-Bef-fs1f.js';
+import '../note-RVXvpfyV.js';
+import '../tempo-D-JF-8b_.js';
 import '@tspro/ts-utils-lib';
 
 interface MusicScoreViewProps {

package/dist/react-ui/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v6.0.0-pre.5 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
+/* WebMusicScore v6.0.1 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;

package/dist/react-ui/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v6.0.0-pre.5 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
+/* WebMusicScore v6.0.1 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
 import {
   __publicField
-} from "../chunk-G3HIPFVF.mjs";
+} from "../chunk-OM25LPIN.mjs";
 
 // src/react-ui/music-score-view.tsx
 import * as React from "react";

package/dist/{scale-DxGqFxlv.d.ts → scale-B1M10_fu.d.ts}

@@ -1,5 +1,5 @@
-import { N as Note, S as SymbolSet } from './note-CJuq5aBy.js';
-import { K as KeySignature } from './tempo-pCAa6qgo.js';
+import { N as Note, S as SymbolSet } from './note-RVXvpfyV.js';
+import { K as KeySignature } from './tempo-D-JF-8b_.js';
 
 /** Interval direction type. */
 type IntervalDirection = "Unison" | "Ascending" | "Descending";

package/dist/score/index.d.ts

@@ -1,8 +1,8 @@
-import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, b as MeasureOptions, V as VoiceId, T as TupletOptions, c as VerseNumber, L as LyricsOptions, d as StaffTabOrGroups, F as Fermata, e as Navigation, A as AnnotationText, f as Annotation, g as Label, C as Connective, h as TieType, i as NoteAnchor, j as VerticalPosition } from '../music-objects-D-xO1oti.js';
-export { ao as Arpeggio, aa as BaseConfig, a9 as Clef, a5 as ColorKey, a7 as ColorKeyPart, as as DynamicsAnnotation, aq as LyricsAlign, ar as LyricsHyphen, t as MAccidental, v as MArpeggio, H as MBarLineLeft, G as MBarLineRight, w as MBeamGroup, u as MConnective, y as MEnding, a4 as MExtensionLine, z as MFermata, B as MHeader, D as MImage, a3 as MLyrics, E as MMeasure, J as MNoteGroup, r as MPlaybackButtons, p as MPlayer, q as MRenderContext, P as MRest, U as MRhythmColumn, W as MScoreRow, X as MScoreRowGroup, a1 as MSpecialText, Y as MStaff, I as MStaffBarLine, x as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, _ as MStaffSignature, Z as MTab, O as MTabNoteGroup, a0 as MTabRhythm, $ as MTabSignature, a2 as MText, s as MusicInterface, a8 as Paint, au as PlayState, av as PlayStateChangeListener, l as ScoreEvent, o as ScoreEventListener, k as ScoreEventType, n as ScoreObjectEvent, m as ScoreStaffPosEvent, ab as StaffConfig, ap as StaffTabOrGroup, an as Stem, ag as StringNumber, ac as TabConfig, at as TempoAnnotation, a6 as colorKey, ah as getStringNumbers, ak as getVerseNumbers, ad as getVoiceIds, ai as isStringNumber, al as isVerseNumber, ae as isVoiceId, aj as validateStringNumber, am as validateVerseNumber, af as validateVoiceId } from '../music-objects-D-xO1oti.js';
-import { N as Note } from '../note-CJuq5aBy.js';
-import { S as ScaleType, c as Scale } from '../scale-DxGqFxlv.js';
-import { N as NoteLength, h as NoteLengthStr, K as KeySignature, a as TimeSignature, T as TimeSignatures, B as BeamGrouping, k as TupletRatio } from '../tempo-pCAa6qgo.js';
+import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, b as MeasureOptions, V as VoiceId, T as TupletOptions, c as VerseNumber, L as LyricsOptions, d as StaffTabOrGroups, F as Fermata, e as Navigation, A as AnnotationText, f as Annotation, g as Label, C as Connective, h as TieType, i as NoteAnchor, j as VerticalPosition } from '../music-objects-Bef-fs1f.js';
+export { ao as Arpeggio, aa as BaseConfig, a9 as Clef, a5 as ColorKey, a7 as ColorKeyPart, as as DynamicsAnnotation, aq as LyricsAlign, ar as LyricsHyphen, t as MAccidental, v as MArpeggio, H as MBarLineLeft, G as MBarLineRight, w as MBeamGroup, u as MConnective, y as MEnding, a4 as MExtensionLine, z as MFermata, B as MHeader, D as MImage, a3 as MLyrics, E as MMeasure, J as MNoteGroup, r as MPlaybackButtons, p as MPlayer, q as MRenderContext, P as MRest, U as MRhythmColumn, W as MScoreRow, X as MScoreRowGroup, a1 as MSpecialText, Y as MStaff, I as MStaffBarLine, x as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, _ as MStaffSignature, Z as MTab, O as MTabNoteGroup, a0 as MTabRhythm, $ as MTabSignature, a2 as MText, s as MusicInterface, a8 as Paint, au as PlayState, av as PlayStateChangeListener, l as ScoreEvent, o as ScoreEventListener, k as ScoreEventType, n as ScoreObjectEvent, m as ScoreStaffPosEvent, ab as StaffConfig, ap as StaffTabOrGroup, an as Stem, ag as StringNumber, ac as TabConfig, at as TempoAnnotation, a6 as colorKey, ah as getStringNumbers, ak as getVerseNumbers, ad as getVoiceIds, ai as isStringNumber, al as isVerseNumber, ae as isVoiceId, aj as validateStringNumber, am as validateVerseNumber, af as validateVoiceId } from '../music-objects-Bef-fs1f.js';
+import { N as Note } from '../note-RVXvpfyV.js';
+import { S as ScaleType, c as Scale } from '../scale-B1M10_fu.js';
+import { N as NoteLength, h as NoteLengthStr, K as KeySignature, a as TimeSignature, T as TimeSignatures, B as BeamGrouping, k as TupletRatio } from '../tempo-D-JF-8b_.js';
 import '@tspro/ts-utils-lib';
 
 /** Tuplet builder type. */
@@ -221,22 +221,22 @@ declare class DocumentBuilder {
     /**
      * 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 lyricsLength - Lyrics text length (e.g. "2n").
      * @param lyricsOptions - Lyrics options.
      * @returns - This document builder instance.
      */
-    addLyrics(verse: VerseNumber, lyricsLength: NoteLength | NoteLengthStr, lyricsText?: string | string[], lyricsOptions?: LyricsOptions): DocumentBuilder;
+    addLyrics(verse: VerseNumber, lyricsText: string | string[], lyricsLength: NoteLength | NoteLengthStr, lyricsOptions?: LyricsOptions): DocumentBuilder;
     /**
      * 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 lyricsLength - Lyrics text length (e.g. "2n").
      * @param lyricsOptions - Lyrics options.
      * @returns - This document builder instance.
      */
-    addLyricsTo(staffTabOrGroups: StaffTabOrGroups, verse: VerseNumber, lyricsLength: NoteLength | NoteLengthStr, lyricsText?: string | string[], lyricsOptions?: LyricsOptions): DocumentBuilder;
+    addLyricsTo(staffTabOrGroups: StaffTabOrGroups, verse: VerseNumber, lyricsText: string | string[], lyricsLength: NoteLength | NoteLengthStr, lyricsOptions?: LyricsOptions): DocumentBuilder;
     private addFermataInternal;
     /**
      * Add fermata to current measure.

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v6.0.0-pre.5 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
+/* WebMusicScore v6.0.1 | (c) 2023-2025 Stefan Brockmann | MIT License | Includes: Tone.js (MIT License), Color Name to Code (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -5619,17 +5619,6 @@ var ObjArpeggio = class extends MusicObject {
 // src/score/engine/obj-rest.ts
 var import_theory3 = require("web-music-score/theory");
 var import_core4 = require("web-music-score/core");
-function getDiatonicIdFromStaffPos(staffPos) {
-  if (typeof staffPos === "number") {
-    return import_theory3.Note.getChromaticNote(staffPos).diatonicId;
-  } else if (typeof staffPos === "string") {
-    return import_theory3.Note.getNote(staffPos).diatonicId;
-  } else if (staffPos instanceof import_theory3.Note) {
-    return staffPos.diatonicId;
-  } else {
-    return void 0;
-  }
-}
 var ObjStaffRest = class extends MusicObject {
   constructor(staff, rest) {
     super(staff);
@@ -5676,11 +5665,8 @@ var _ObjRest = class _ObjRest extends MusicObject {
     __publicField(this, "beamGroup");
     __publicField(this, "staffObjects", []);
     __publicField(this, "mi");
-    this.setDiatonicId = (_b = getDiatonicIdFromStaffPos((_a = this.options) == null ? void 0 : _a.staffPos)) != null ? _b : _ObjRest.UndefinedDiatonicId;
-    let staves = this.row.getStaves().filter((staff) => staff.containsVoiceId(this.voiceId));
-    if (this.setDiatonicId !== _ObjRest.UndefinedDiatonicId && staves.length > 0 && staves[0].isSpace(this.setDiatonicId)) {
-      this.setDiatonicId += this.setDiatonicId >= staves[0].middleLineDiatonicId ? 1 : -1;
-    }
+    this.setDiatonicId = (_b = this.getDiatonicIdFromStaffPos((_a = this.options) == null ? void 0 : _a.staffPos)) != null ? _b : _ObjRest.UndefinedDiatonicId;
+    this.setDiatonicId = this.getDiatonicIdOnLine(this.setDiatonicId);
     this.runningDiatonicId = this.setDiatonicId;
     this.runningStemDir = "up" /* Up */;
     this.color = (_c = options == null ? void 0 : options.color) != null ? _c : colorKey("staff.rest");
@@ -5704,6 +5690,25 @@ var _ObjRest = class _ObjRest extends MusicObject {
   get noteLength() {
     return this.rhythmProps.noteLength;
   }
+  getDiatonicIdFromStaffPos(staffPos) {
+    if (typeof staffPos === "number") {
+      return import_theory3.Note.getChromaticNote(staffPos).diatonicId;
+    } else if (typeof staffPos === "string") {
+      return import_theory3.Note.getNote(staffPos).diatonicId;
+    } else if (staffPos instanceof import_theory3.Note) {
+      return staffPos.diatonicId;
+    } else {
+      return void 0;
+    }
+  }
+  getDiatonicIdOnLine(diatonicId) {
+    let staves = this.row.getStaves().filter((staff) => staff.containsVoiceId(this.voiceId));
+    if (diatonicId !== _ObjRest.UndefinedDiatonicId && staves.length > 0 && staves[0].isSpace(diatonicId)) {
+      return diatonicId += diatonicId >= staves[0].middleLineDiatonicId ? 1 : -1;
+    } else {
+      return diatonicId;
+    }
+  }
   getDiatonicId(staff) {
     if (this.runningDiatonicId === _ObjRest.UndefinedDiatonicId) {
       if (staff) {
@@ -7022,17 +7027,15 @@ var _Extension = class _Extension extends MusicObjectLink {
     let range = new ExtensionRange(curColumn);
     let ticksLeft = length;
     while (true) {
-      if (ticksLeft <= 0) return range;
+      if (!curColumn || ticksLeft <= 0) return range;
       const stopObject = this.whatStopped(curColumn);
       if (stopObject !== void 0) {
         range.setStopObject(stopObject);
         return range;
       }
+      range.addColumn(curColumn);
       ticksLeft -= curColumn.getTicksToNextColumn();
       curColumn = curColumn.getNextColumn();
-      if (!curColumn) return range;
-      if (ticksLeft > 0)
-        range.addColumn(curColumn);
     }
   }
 };
@@ -7062,6 +7065,9 @@ function getNavigationString(navigation) {
       return navigation[0].toUpperCase() + navigation.substring(1);
   }
 }
+function isDynamicsText(text) {
+  return guard_exports.isEnumValue(text, DynamicsAnnotation);
+}
 function getDynamicsVolume(text) {
   if (/^(p+|f+|m|mp|mf)$/.test(text)) {
     let volume = 0.5 - utils_exports.Str.charCount(text, "p") * 0.1 + utils_exports.Str.charCount(text, "f") * 0.1;
@@ -7070,6 +7076,9 @@ function getDynamicsVolume(text) {
     return void 0;
   }
 }
+function isTempoText(text) {
+  return guard_exports.isEnumValue(text, TempoAnnotation);
+}
 function getAnnotation(text) {
   if (guard_exports.isEnumValue(text, DynamicsAnnotation)) {
     return "dynamics" /* Dynamics */;
@@ -7278,7 +7287,7 @@ var Player = class _Player {
     let volumeMap = new UniMap();
     const pushSpeed = (col, speed) => speedMap.getOrCreate(col, []).push(speed);
     const pushVolume = (col, volume) => volumeMap.getOrCreate(col, []).push(volume);
-    this.playerColumnSequence.forEach((col) => {
+    this.playerColumnSequence.forEach((col, colId) => {
       if (!(col instanceof ObjRhythmColumn)) {
         return;
       }
@@ -7289,8 +7298,8 @@ var Player = class _Player {
           curSpeed = 1;
         } else if ((vol = getDynamicsVolume(text)) !== void 0) {
           curVolume = vol;
-        } else if (layoutObj.musicObj.getLink() instanceof Extension) {
-          let extension = layoutObj.musicObj.getLink();
+        } else if (isTempoText(text) || isDynamicsText(text)) {
+          let extension = layoutObj.musicObj.getLink() instanceof Extension ? layoutObj.musicObj.getLink() : new Extension(layoutObj, col, Infinity, false, "solid", "bottom");
           const range = extension.getRange();
           const stopText = range.stopObject ? getTextContent(range.stopObject) : "";
           let totalTicks = utils_exports.Math.sum(range.columnRange.map((c) => c.getTicksToNextColumn()));
@@ -8160,7 +8169,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       }
     }
   }
-  updateStemTips() {
+  updateNoteStemTips() {
     this.staffObjects.forEach((obj) => {
       let left = obj.points[0];
       let right = obj.points[obj.points.length - 1];
@@ -8364,6 +8373,17 @@ var ObjFermata = class extends MusicObject {
 };
 
 // src/score/engine/obj-extension-line.ts
+function getRow(obj) {
+  let o = obj;
+  while (o) {
+    if (o.row instanceof ObjScoreRow)
+      return o.row;
+    if (o.measure instanceof ObjMeasure)
+      return o.measure.row;
+    o = o.getParent();
+  }
+  return void 0;
+}
 function isExtensionStartObject(obj) {
   return obj instanceof ObjText || obj instanceof ObjSpecialText;
 }
@@ -8387,8 +8407,11 @@ var ObjExtensionLine = class extends MusicObject {
   getMusicInterface() {
     return this.mi;
   }
+  getLeftObj() {
+    return this.cols[0];
+  }
   getLineLeft(ctx) {
-    let obj = this.cols[0];
+    let obj = this.getLeftObj();
     if (isExtensionStartObject(obj))
       return obj.getRect().right + ctx.unitSize;
     if (obj instanceof ObjBarLineLeft)
@@ -8400,8 +8423,18 @@ var ObjExtensionLine = class extends MusicObject {
     }
     return obj.getRect().right;
   }
+  getRightObj() {
+    const obj = this.cols[this.cols.length - 1];
+    if (isExtensionStopObject(obj)) {
+      const objRow = getRow(obj);
+      const prevObj = this.cols[this.cols.length - 2];
+      const prevObjRow = getRow(prevObj);
+      return objRow && prevObjRow && objRow !== prevObjRow ? prevObj : obj;
+    }
+    return obj;
+  }
   getLineRight(ctx) {
-    let obj = this.cols[this.cols.length - 1];
+    let obj = this.getRightObj();
     if (isExtensionStopObject(obj))
       return obj.getRect().left - ctx.unitSize;
     if (obj instanceof ObjRhythmColumn) {
@@ -8441,7 +8474,7 @@ var ObjExtensionLine = class extends MusicObject {
     ctx.setLineDash([]);
     let tails = this.extension.getTails();
     let last = tails[tails.length - 1];
-    if (this === last && !isExtensionStopObject(this.cols[this.cols.length - 1])) {
+    if (this === last && !isExtensionStopObject(this.getRightObj())) {
       let tipH = rect.anchorY > this.line.getRect().anchorY ? -ctx.unitSize : ctx.unitSize;
       ctx.strokeLine(rect.right, rect.anchorY, rect.right, rect.anchorY + tipH);
     }
@@ -9708,7 +9741,7 @@ var ObjMeasure = class extends MusicObject {
     this.addRhythmSymbol(rest);
     return rest;
   }
-  addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+  addLyrics(staffTabOrGroups, verse, lyricsText, lyricsLength, lyricsOptions) {
     this.forEachStaffGroup(staffTabOrGroups, 1 /* Below */, (line, vpos) => {
       var _a;
       let col = this.getRhythmColumn({ verse, line, vpos });
@@ -10048,6 +10081,34 @@ var ObjMeasure = class extends MusicObject {
         this.signatures.push(signature);
       }
     });
+    getVoiceIds().forEach((voiceId) => {
+      const staff = this.row.getStaves()[0];
+      if (!staff || !staff.containsVoiceId(voiceId))
+        return;
+      this.beamGroups.forEach((b) => {
+        const symbols = b.getSymbols();
+        symbols.forEach((sym, restId) => {
+          if (!(sym instanceof ObjRest && sym.setDiatonicId === ObjRest.UndefinedDiatonicId))
+            return;
+          let leftNoteId = restId;
+          let rightNoteId = restId;
+          while (symbols[leftNoteId] instanceof ObjRest) leftNoteId--;
+          while (symbols[rightNoteId] instanceof ObjRest) rightNoteId++;
+          let newRestDiatonicId;
+          if (leftNoteId < 0 && rightNoteId <= symbols.length - 1) {
+            newRestDiatonicId = symbols[rightNoteId].getDiatonicId(staff);
+          } else if (leftNoteId >= 0 && rightNoteId > symbols.length - 1) {
+            newRestDiatonicId = symbols[leftNoteId].getDiatonicId(staff);
+          } else if (leftNoteId >= 0 && rightNoteId <= symbols.length - 1) {
+            newRestDiatonicId = Math.round(
+              (symbols[leftNoteId].getDiatonicId(staff) + symbols[rightNoteId].getDiatonicId(staff)) / 2
+            );
+          }
+          if (newRestDiatonicId !== void 0)
+            sym.updateRunningArguments(newRestDiatonicId, b.stemDir, []);
+        });
+      });
+    });
     this.tabStringNotes.length = 0;
     if (this.isFirstMeasureInRow()) {
       this.row.getTabs().forEach((tab) => {
@@ -10144,7 +10205,7 @@ var ObjMeasure = class extends MusicObject {
     });
   }
   alignStemsToBeams() {
-    this.beamGroups.forEach((b) => b.updateStemTips());
+    this.beamGroups.forEach((b) => b.updateNoteStemTips());
   }
   layoutDone() {
     this.columns.forEach((col) => col.layoutDone());
@@ -11551,7 +11612,7 @@ var import_theory13 = require("web-music-score/theory");
 var import_core16 = require("web-music-score/core");
 var assertingFunction = "";
 function setAssertFunction(fnName, ...fnArgs) {
-  let argsStr = fnArgs.map((arg) => JSON.stringify(arg)).join(", ");
+  let argsStr = fnArgs.map((arg) => utils_exports.Str.stringify(arg)).join(", ");
   assertingFunction = `DocumentBuilder.${fnName}(${argsStr})`;
 }
 function assertArg(...conditions) {
@@ -11893,7 +11954,7 @@ var _DocumentBuilder = class _DocumentBuilder {
     ObjBeamGroup.createTuplet(tupletSymbols, tupletRatio);
     return this;
   }
-  addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+  addLyricsInternal(staffTabOrGroups, verse, lyricsText, lyricsLength, lyricsOptions) {
     var _a;
     assertStaffTabOrGRoups(staffTabOrGroups);
     assertArg(
@@ -11909,36 +11970,36 @@ var _DocumentBuilder = class _DocumentBuilder {
       (_a = lyricsOptions.align) != null ? _a : lyricsOptions.align = this.currentLyricsAlign;
     }
     if (guard_exports.isArray(lyricsText)) {
-      lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, text, lyricsOptions));
+      lyricsText.forEach((text) => this.getMeasure().addLyrics(staffTabOrGroups, verse, text, lyricsLength, lyricsOptions));
     } else {
-      this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions);
+      this.getMeasure().addLyrics(staffTabOrGroups, verse, lyricsText, lyricsLength, 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 lyricsLength - Lyrics text length (e.g. "2n").
    * @param lyricsOptions - Lyrics options.
    * @returns - This document builder instance.
    */
-  addLyrics(verse, lyricsLength, lyricsText, lyricsOptions) {
+  addLyrics(verse, lyricsText, lyricsLength, lyricsOptions) {
     setAssertFunction("addLyrics", verse, lyricsLength, lyricsText, lyricsOptions);
-    return this.addLyricsInternal(void 0, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
+    return this.addLyricsInternal(void 0, verse, lyricsText, lyricsLength, 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 lyricsLength - Lyrics text length (e.g. "2n").
    * @param lyricsOptions - Lyrics options.
    * @returns - This document builder instance.
    */
-  addLyricsTo(staffTabOrGroups, verse, lyricsLength, lyricsText, lyricsOptions) {
+  addLyricsTo(staffTabOrGroups, verse, lyricsText, lyricsLength, lyricsOptions) {
     setAssertFunction("addLyricsTo", verse, lyricsLength, lyricsText, lyricsOptions);
-    return this.addLyricsInternal(staffTabOrGroups, verse, lyricsLength, lyricsText != null ? lyricsText : "", lyricsOptions);
+    return this.addLyricsInternal(staffTabOrGroups, verse, lyricsText, lyricsLength, lyricsOptions);
   }
   addFermataInternal(staffTabOrGroups, fermata) {
     assertStaffTabOrGRoups(staffTabOrGroups);