@real-music-packages/web-core 0.45.2 → 0.47.0

package/dist/notationPlayerVerovio.js

@@ -10,138 +10,14 @@ import {
   vstackAudioPlayheadLine
 } from "./chunk-DBFGX6OK.js";
 import "./chunk-PVZXLC23.js";
-
-// src/notationXml.ts
-function stampNoteIds(xml) {
-  const doc = new DOMParser().parseFromString(xml, "application/xml");
-  if (doc.querySelector("parsererror")) return xml;
-  const parts = Array.from(doc.querySelectorAll("score-partwise > part"));
-  parts.forEach((part, partIdx) => {
-    for (const measure of Array.from(part.querySelectorAll("measure"))) {
-      const number = measure.getAttribute("number") ?? "0";
-      const notes = Array.from(measure.children).filter((el) => el.tagName === "note");
-      notes.forEach((note, noteIdx) => {
-        note.setAttribute("id", `n-${partIdx}-${number}-${noteIdx}`);
-      });
-    }
-  });
-  return new XMLSerializer().serializeToString(doc);
-}
-function injectSystemBreaks(xml, breakBeforeBarIndexes) {
-  const doc = new DOMParser().parseFromString(xml, "application/xml");
-  if (doc.querySelector("parsererror")) return xml;
-  const root = doc.documentElement;
-  if (!root || root.tagName !== "score-partwise") return xml;
-  for (const part of childrenNamed(root, "part")) {
-    const measures = childrenNamed(part, "measure");
-    for (const pos of breakBeforeBarIndexes) {
-      if (!Number.isInteger(pos) || pos <= 0 || pos >= measures.length) continue;
-      const measure = measures[pos];
-      const existingPrint = firstChildNamed(measure, "print");
-      if (existingPrint) {
-        existingPrint.setAttribute("new-system", "yes");
-      } else {
-        const printEl = doc.createElement("print");
-        printEl.setAttribute("new-system", "yes");
-        measure.insertBefore(printEl, measure.firstChild);
-      }
-    }
-  }
-  return new XMLSerializer().serializeToString(doc);
-}
-function balancedSystemBreaks(totalMeasures, systems) {
-  if (systems <= 1 || totalMeasures <= 0) return [];
-  const per = Math.ceil(totalMeasures / systems);
-  if (per <= 0) return [];
-  const breaks = [];
-  for (let b = per; b < totalMeasures; b += per) breaks.push(b);
-  return breaks;
-}
-var STEP_SEMITONE = { C: 0, D: 2, E: 4, F: 5, G: 7, A: 9, B: 11 };
-function firstChildNamed(el, tag) {
-  for (const c of Array.from(el.children)) if (c.tagName === tag) return c;
-  return null;
-}
-function childrenNamed(el, tag) {
-  return Array.from(el.children).filter((c) => c.tagName === tag);
-}
-function textOf(el) {
-  return el && el.textContent != null ? el.textContent.trim() : null;
-}
-function pitchMidiFromElement(pitchEl) {
-  const step = textOf(firstChildNamed(pitchEl, "step")) ?? "C";
-  const octave = Number(textOf(firstChildNamed(pitchEl, "octave")) ?? "4");
-  const alter = Number(textOf(firstChildNamed(pitchEl, "alter")) ?? "0");
-  return 12 * (octave + 1) + (STEP_SEMITONE[step] ?? 0) + Math.trunc(alter);
-}
-function partStaffCount(part) {
-  let maxDeclared = 0;
-  for (const attrs of childrenNamed(part, "measure").flatMap((m) => childrenNamed(m, "attributes"))) {
-    const staves = Number(textOf(firstChildNamed(attrs, "staves")) ?? "0");
-    if (staves > maxDeclared) maxDeclared = staves;
-  }
-  if (maxDeclared > 0) return maxDeclared;
-  let maxStaff = 0;
-  for (const measure of childrenNamed(part, "measure")) {
-    for (const note of childrenNamed(measure, "note")) {
-      const staff = Number(textOf(firstChildNamed(note, "staff")) ?? "0");
-      if (staff > maxStaff) maxStaff = staff;
-    }
-  }
-  return Math.max(1, maxStaff);
-}
-function noteModelFromXml(stampedXml) {
-  const model = /* @__PURE__ */ new Map();
-  let doc;
-  try {
-    doc = new DOMParser().parseFromString(stampedXml, "application/xml");
-  } catch {
-    return model;
-  }
-  if (doc.querySelector("parsererror")) return model;
-  const root = doc.documentElement;
-  if (!root || root.tagName !== "score-partwise") return model;
-  const parts = childrenNamed(root, "part");
-  let staffOffset = 0;
-  for (const part of parts) {
-    const staffCount = partStaffCount(part);
-    let divisions = 1;
-    const measureEls = childrenNamed(part, "measure");
-    measureEls.forEach((measureEl, measureIndex) => {
-      for (const child of Array.from(measureEl.children)) {
-        if (child.tagName === "attributes") {
-          const divText = textOf(firstChildNamed(child, "divisions"));
-          if (divText) divisions = Number(divText) || divisions;
-          continue;
-        }
-        if (child.tagName !== "note") continue;
-        const note = child;
-        const id = note.getAttribute("id");
-        if (!id) continue;
-        const isGrace = !!firstChildNamed(note, "grace");
-        const isRest = !!firstChildNamed(note, "rest");
-        const pitchEl = firstChildNamed(note, "pitch");
-        const staffNumber = Number(textOf(firstChildNamed(note, "staff")) ?? "1") || 1;
-        const durationText = textOf(firstChildNamed(note, "duration"));
-        const durationReal = isGrace || !durationText ? 0 : Number(durationText) / divisions / 4;
-        const tieStopDirect = childrenNamed(note, "tie").some((t) => t.getAttribute("type") === "stop");
-        const notationsEl = firstChildNamed(note, "notations");
-        const tieStopNotated = notationsEl ? childrenNamed(notationsEl, "tied").some((t) => t.getAttribute("type") === "stop") : false;
-        model.set(id, {
-          midi: pitchEl ? pitchMidiFromElement(pitchEl) : null,
-          isRest,
-          tieContinuation: tieStopDirect || tieStopNotated,
-          staffIndex: staffOffset + Math.max(0, staffNumber - 1),
-          durationReal,
-          measureIndex,
-          hidden: note.getAttribute("print-object") === "no"
-        });
-      }
-    });
-    staffOffset += staffCount;
-  }
-  return model;
-}
+import {
+  balancedSystemBreaks,
+  injectSystemBreaks,
+  measureCount,
+  noteModelFromXml,
+  sectionAwareBreaks,
+  stampNoteIds
+} from "./chunk-JCDNEJBT.js";
 
 // src/notationPlayerVerovio.ts
 var MARKED_NOTE_CLASS = "rmp-note-marked";
@@ -396,7 +272,13 @@ var VEROVIO_LAYOUT_DEFAULTS = {
 };
 function verovioRenderOptions(hostWidthPx, zoom, layout) {
   const { scale, pageWidth } = verovioZoomOptions(hostWidthPx, zoom);
-  const { avoidWidows: _avoidWidows, minFitFactor: _minFitFactor, ...verovioLayout } = layout ?? {};
+  const {
+    avoidWidows: _avoidWidows,
+    minFitFactor: _minFitFactor,
+    barsPerLine: _barsPerLine,
+    sectionStarts: _sectionStarts,
+    ...verovioLayout
+  } = layout ?? {};
   return {
     ...VEROVIO_LAYOUT_DEFAULTS,
     ...verovioLayout,
@@ -470,6 +352,14 @@ function createVerovioNotationPlayer(opts) {
   }
   const stampedXml = opts.rendered ? musicXml : stampNoteIds(musicXml);
   const noteModel = opts.rendered ? /* @__PURE__ */ new Map() : noteModelFromXml(stampedXml);
+  const breakPlan = (() => {
+    const layout = opts.verovioOptions;
+    const starts = layout?.sectionStarts ?? [];
+    const every = layout?.barsPerLine ?? 0;
+    if (!starts.length && !(every > 0)) return [];
+    return sectionAwareBreaks(measureCount(stampedXml), starts, every);
+  })();
+  const plannedXml = breakPlan.length ? injectSystemBreaks(stampedXml, breakPlan) : stampedXml;
   const root = document.createElement("div");
   root.style.position = "relative";
   root.style.width = "100%";
@@ -581,11 +471,12 @@ function createVerovioNotationPlayer(opts) {
   }
   function engraveOnce(toolkit, widthPx, zoom) {
     const layoutOpts = opts.verovioOptions;
-    const effectiveBreaks = layoutOpts?.breaks ?? VEROVIO_LAYOUT_DEFAULTS.breaks;
+    const planLayoutOpts = breakPlan.length ? { ...layoutOpts, breaks: "line" } : layoutOpts;
+    const effectiveBreaks = planLayoutOpts?.breaks ?? VEROVIO_LAYOUT_DEFAULTS.breaks;
     const minFitFactor = layoutOpts?.minFitFactor ?? DEFAULT_MIN_FIT_FACTOR;
     const avoidWidows = layoutOpts?.avoidWidows !== false;
-    let xmlToRender = stampedXml;
-    let renderLayoutOpts = layoutOpts;
+    let xmlToRender = plannedXml;
+    let renderLayoutOpts = planLayoutOpts;
     toolkit.setOptions(verovioRenderOptions(widthPx, zoom, renderLayoutOpts));
     const ok = !!toolkit.loadData(xmlToRender);
     if (ok) renderAllPages(toolkit);