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

package/dist/score/index.mjs

@@ -1,12 +1,12 @@
-/* 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 {
   MusicError
-} from "../chunk-U2D4H5TI.mjs";
+} from "../chunk-IUXO5M6R.mjs";
 import {
   NoteLengthProps,
   RhythmProps,
   validateNoteLength
-} from "../chunk-DQFQEO6F.mjs";
+} from "../chunk-VTNNVMRE.mjs";
 import {
   AnchoredRect,
   BiMap,
@@ -20,12 +20,12 @@ import {
   device_exports,
   guard_exports,
   utils_exports
-} from "../chunk-JP3PJICN.mjs";
+} from "../chunk-EDHJ4ZRB.mjs";
 import {
   __publicField,
   __spreadProps,
   __spreadValues
-} from "../chunk-G3HIPFVF.mjs";
+} from "../chunk-OM25LPIN.mjs";
 
 // src/score/pub/types.ts
 var StaffPreset = /* @__PURE__ */ ((StaffPreset2) => {
@@ -1746,17 +1746,6 @@ var ObjArpeggio = class extends MusicObject {
 // src/score/engine/obj-rest.ts
 import { Note as Note3, NoteLengthProps as NoteLengthProps2, RhythmProps as RhythmProps2, Tuplet } from "web-music-score/theory";
 import { MusicError as MusicError4, MusicErrorType as MusicErrorType4 } from "web-music-score/core";
-function getDiatonicIdFromStaffPos(staffPos) {
-  if (typeof staffPos === "number") {
-    return Note3.getChromaticNote(staffPos).diatonicId;
-  } else if (typeof staffPos === "string") {
-    return Note3.getNote(staffPos).diatonicId;
-  } else if (staffPos instanceof Note3) {
-    return staffPos.diatonicId;
-  } else {
-    return void 0;
-  }
-}
 var ObjStaffRest = class extends MusicObject {
   constructor(staff, rest) {
     super(staff);
@@ -1803,11 +1792,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");
@@ -1831,6 +1817,25 @@ var _ObjRest = class _ObjRest extends MusicObject {
   get noteLength() {
     return this.rhythmProps.noteLength;
   }
+  getDiatonicIdFromStaffPos(staffPos) {
+    if (typeof staffPos === "number") {
+      return Note3.getChromaticNote(staffPos).diatonicId;
+    } else if (typeof staffPos === "string") {
+      return Note3.getNote(staffPos).diatonicId;
+    } else if (staffPos instanceof Note3) {
+      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) {
@@ -3149,17 +3154,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);
     }
   }
 };
@@ -3189,6 +3192,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;
@@ -3197,6 +3203,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 */;
@@ -3405,7 +3414,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;
       }
@@ -3416,8 +3425,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()));
@@ -4287,7 +4296,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];
@@ -4491,6 +4500,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;
 }
@@ -4514,8 +4534,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)
@@ -4527,8 +4550,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) {
@@ -4568,7 +4601,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);
     }
@@ -5835,7 +5868,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 });
@@ -6175,6 +6208,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) => {
@@ -6271,7 +6332,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());
@@ -7678,7 +7739,7 @@ import { BeamGrouping, isNoteLength, isTupletRatio, KeySignature as KeySignature
 import { MusicError as MusicError16, MusicErrorType as MusicErrorType16 } from "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) {
@@ -8020,7 +8081,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(
@@ -8036,36 +8097,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);

package/dist/{tempo-pCAa6qgo.d.ts → tempo-D-JF-8b_.d.ts}

@@ -1,4 +1,4 @@
-import { N as Note, A as Accidental } from './note-CJuq5aBy.js';
+import { N as Note, A as Accidental } from './note-RVXvpfyV.js';
 
 /** Mode enum. */
 declare enum Mode {

package/dist/theory/index.d.ts

@@ -1,8 +1,8 @@
-import { N as Note } from '../note-CJuq5aBy.js';
-export { A as Accidental, d as DefaultGuitarNoteLabel, D as DefaultPitchNotation, G as GuitarNoteLabel, e as GuitarNoteLabelList, a as NoteLetter, P as ParsedNote, b as PitchNotation, c as PitchNotationList, S as SymbolSet, g as getPitchNotationName, f as validateGuitarNoteLabel, v as validatePitchNotation } from '../note-CJuq5aBy.js';
-import { D as Degree } from '../scale-DxGqFxlv.js';
-export { b as Interval, I as IntervalDirection, a as IntervalQuality, c as Scale, d as ScaleFactory, S as ScaleType, i as getDefaultScale, h as getScale, e as getScaleFactory, g as getScaleFactoryList, v as validateIntervalQuality, f as validateScaleType } from '../scale-DxGqFxlv.js';
-export { A as AccidentalType, B as BeamGrouping, K as KeySignature, M as Mode, N as NoteLength, j as NoteLengthProps, h as NoteLengthStr, R as RhythmProps, c as Tempo, a as TimeSignature, T as TimeSignatures, n as Tuplet, k as TupletRatio, f as alterTempoSpeed, g as getDefaultKeySignature, d as getDefaultTempo, b as getDefaultTimeSignature, e as getTempoString, i as isNoteLength, l as isTupletRatio, v as validateNoteLength, m as validateTupletRatio } from '../tempo-pCAa6qgo.js';
+import { N as Note } from '../note-RVXvpfyV.js';
+export { A as Accidental, d as DefaultGuitarNoteLabel, D as DefaultPitchNotation, G as GuitarNoteLabel, e as GuitarNoteLabelList, a as NoteLetter, P as ParsedNote, b as PitchNotation, c as PitchNotationList, S as SymbolSet, g as getPitchNotationName, f as validateGuitarNoteLabel, v as validatePitchNotation } from '../note-RVXvpfyV.js';
+import { D as Degree } from '../scale-B1M10_fu.js';
+export { b as Interval, I as IntervalDirection, a as IntervalQuality, c as Scale, d as ScaleFactory, S as ScaleType, i as getDefaultScale, h as getScale, e as getScaleFactory, g as getScaleFactoryList, v as validateIntervalQuality, f as validateScaleType } from '../scale-B1M10_fu.js';
+export { A as AccidentalType, B as BeamGrouping, K as KeySignature, M as Mode, N as NoteLength, j as NoteLengthProps, h as NoteLengthStr, R as RhythmProps, c as Tempo, a as TimeSignature, T as TimeSignatures, n as Tuplet, k as TupletRatio, f as alterTempoSpeed, g as getDefaultKeySignature, d as getDefaultTempo, b as getDefaultTimeSignature, e as getTempoString, i as isNoteLength, l as isTupletRatio, v as validateNoteLength, m as validateTupletRatio } from '../tempo-D-JF-8b_.js';
 
 /** Chord info type. */
 type ChordInfo = {

package/dist/theory/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;

package/dist/theory/index.mjs

@@ -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) */
 import {
   NoteLength,
   NoteLengthProps,
@@ -8,7 +8,7 @@ import {
   isTupletRatio,
   validateNoteLength,
   validateTupletRatio
-} from "../chunk-DQFQEO6F.mjs";
+} from "../chunk-VTNNVMRE.mjs";
 import {
   IndexArray,
   LRUCache,
@@ -16,10 +16,10 @@ import {
   UniMap,
   guard_exports,
   utils_exports
-} from "../chunk-JP3PJICN.mjs";
+} from "../chunk-EDHJ4ZRB.mjs";
 import {
   __publicField
-} from "../chunk-G3HIPFVF.mjs";
+} from "../chunk-OM25LPIN.mjs";
 
 // src/theory/types.ts
 import { MusicError, MusicErrorType } from "web-music-score/core";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web-music-score",
-    "version": "6.0.0-pre.5",
+    "version": "6.0.1",
     "author": "Stefan Brockmann",
     "license": "MIT",
     "private": false,