@k-l-lambda/lilylet 0.1.76 → 0.1.78

package/lib/lilylet/meiEncoder.js

@@ -342,6 +342,8 @@ const extractMarkOptions = (marks) => {
         fingerings: [],
         navigation: undefined,
         markups: [],
+        breath: false,
+        glissando: false,
     };
     if (!marks)
         return result;
@@ -379,6 +381,9 @@ const extractMarkOptions = (marks) => {
                 else if (mark.type === OrnamentType.prall) {
                     result.mordent = 'upper';
                 }
+                else if (mark.type === OrnamentType.breath) {
+                    result.breath = true;
+                }
                 break;
             case 'dynamic': {
                 const dynStr = DYNAMIC_MAP[mark.type];
@@ -449,6 +454,9 @@ const extractMarkOptions = (marks) => {
                     placement: mark.placement,
                 });
                 break;
+            case 'glissando':
+                result.glissando = true;
+                break;
         }
         // Tremolo (special case - from parser internal mark)
         if ('tremolo' in mark && typeof mark.tremolo === 'number') {
@@ -514,6 +522,8 @@ const noteEventToMEI = (event, indent, layerStaff, tieEnd, contextStemDir, keyFi
             fingerings: markOptions.fingerings,
             navigation: markOptions.navigation,
             markups: markOptions.markups,
+            breath: markOptions.breath,
+            glissando: markOptions.glissando,
         };
     }
     // Chord
@@ -576,6 +586,8 @@ const noteEventToMEI = (event, indent, layerStaff, tieEnd, contextStemDir, keyFi
         fingerings: markOptions.fingerings,
         navigation: markOptions.navigation,
         markups: markOptions.markups,
+        breath: markOptions.breath,
+        glissando: markOptions.glissando,
     };
 };
 // Convert RestEvent to MEI
@@ -846,7 +858,7 @@ const getEventBeamMarks = (event) => {
     return { beamStart: false, beamEnd: false };
 };
 // Encode a layer (voice)
-const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths = 0, initialClef, initialSlurs = [], initialHairpin = null, initialOctave = null) => {
+const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths = 0, initialClef, initialSlurs = [], initialHairpin = null, initialOctave = null, initialGliss = null) => {
     const layerId = generateId("layer");
     let xml = `${indent}<layer xml:id="${layerId}" n="${layerN}">\n`;
     let beamElementOpen = false; // Whether actual <beam> element is open (passed to tuplets)
@@ -921,6 +933,12 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
     // Track ornament refs
     const fermatas = [];
     const trills = [];
+    const breaths = [];
+    // Glissando: a note-to-note slide. Record the start note id and close it on the
+    // NEXT encoded note (endid), mirroring slur start→end pairing. A trailing
+    // glissando with no following note in the layer is dropped (no target).
+    const glissandos = [];
+    let pendingGlissStart = initialGliss;
     const mordents = [];
     const turns = [];
     const dynamics = [];
@@ -1082,6 +1100,19 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 if (result.trill) {
                     trills.push({ startid: result.elementId });
                 }
+                // Breath mark follows this note.
+                if (result.breath) {
+                    breaths.push({ startid: result.elementId });
+                }
+                // Glissando: close a pending start onto this note, then open a new one
+                // if this note itself carries a glissando.
+                if (pendingGlissStart) {
+                    glissandos.push({ startid: pendingGlissStart, endid: result.elementId });
+                    pendingGlissStart = null;
+                }
+                if (result.glissando) {
+                    pendingGlissStart = result.elementId;
+                }
                 if (result.mordent) {
                     mordents.push({
                         startid: result.elementId,
@@ -1350,10 +1381,10 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
         }
     }
     xml += `${indent}</layer>\n`;
-    return { xml, hairpins, pedals, octaves, slurs, arpeggios, fermatas, trills, mordents, turns, dynamics, fingerings, navigations, harmonies, barlines, markups, pendingTiePitches, pendingSlur: openSlurs.map(s => s.startId), pendingHairpin, pendingOctave, ottavaExplicitlyClosed, endingClef: currentClef, lastNoteId, currentOttavaShift, octaveEndReplacements };
+    return { xml, hairpins, pedals, octaves, slurs, arpeggios, fermatas, trills, breaths, glissandos, mordents, turns, dynamics, fingerings, navigations, harmonies, barlines, markups, pendingTiePitches, pendingSlur: openSlurs.map(s => s.startId), pendingGliss: pendingGlissStart, pendingHairpin, pendingOctave, ottavaExplicitlyClosed, endingClef: currentClef, lastNoteId, currentOttavaShift, octaveEndReplacements };
 };
 // Encode a staff
-const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hairpinState = {}, ottavaState = {}, keyFifths = 0, initialClef) => {
+const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hairpinState = {}, ottavaState = {}, keyFifths = 0, initialClef, glissState = {}) => {
     const staffId = generateId("staff");
     let xml = `${indent}<staff xml:id="${staffId}" n="${staffN}">\n`;
     const allHairpins = [];
@@ -1363,6 +1394,8 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
     const allArpeggios = [];
     const allFermatas = [];
     const allTrills = [];
+    const allBreaths = [];
+    const allGlissandos = [];
     const allMordents = [];
     const allTurns = [];
     const allDynamics = [];
@@ -1373,6 +1406,7 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
     const allMarkups = [];
     const pendingTies = {};
     const pendingSlurs = {};
+    const pendingGlisses = {};
     const pendingHairpins = {};
     const pendingOctaves = {};
     const ottavaExplicitlyClosed = {};
@@ -1390,7 +1424,8 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
             const initialSlur = slurState[tieKey] || [];
             const initialHairpin = hairpinState[tieKey] || null;
             const initialOctave = ottavaState[tieKey] || null;
-            const result = encodeLayer(voice, layerN, indent + '    ', initialTies, keyFifths, endingClef, initialSlur, initialHairpin, initialOctave);
+            const initialGliss = glissState[tieKey] || null;
+            const result = encodeLayer(voice, layerN, indent + '    ', initialTies, keyFifths, endingClef, initialSlur, initialHairpin, initialOctave, initialGliss);
             xml += result.xml;
             allHairpins.push(...result.hairpins);
             allPedals.push(...result.pedals);
@@ -1399,6 +1434,8 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
             allArpeggios.push(...result.arpeggios);
             allFermatas.push(...result.fermatas);
             allTrills.push(...result.trills);
+            allBreaths.push(...result.breaths);
+            allGlissandos.push(...result.glissandos);
             allMordents.push(...result.mordents);
             allTurns.push(...result.turns);
             allDynamics.push(...result.dynamics);
@@ -1416,6 +1453,7 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
             // Always record (even empty) so a measure that closed all its slurs
             // clears the carried stack rather than leaving a stale open slur.
             pendingSlurs[tieKey] = result.pendingSlur;
+            pendingGlisses[tieKey] = result.pendingGliss;
             // Track pending hairpins for this layer
             if (result.pendingHairpin) {
                 pendingHairpins[tieKey] = result.pendingHairpin;
@@ -1446,6 +1484,8 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
         arpeggios: allArpeggios,
         fermatas: allFermatas,
         trills: allTrills,
+        breaths: allBreaths,
+        glissandos: allGlissandos,
         mordents: allMordents,
         turns: allTurns,
         dynamics: allDynamics,
@@ -1456,6 +1496,7 @@ const encodeStaff = (voices, staffN, indent, tieState = {}, slurState = {}, hair
         markups: allMarkups,
         pendingTies,
         pendingSlurs,
+        pendingGlisses,
         pendingHairpins,
         pendingOctaves,
         ottavaExplicitlyClosed,
@@ -1566,7 +1607,7 @@ const BARLINE_TO_MEI = {
 };
 // Encode a measure
 // encodeMeasure accepts mutable tieState, slurState, hairpinState, ottavaState and clefState that persist across measures
-const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurState, hairpinState, ottavaState, keyFifths = 0, partInfos = [], clefState = {}, octaveEndReplacements = {}, measureIds) => {
+const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurState, hairpinState, ottavaState, keyFifths = 0, partInfos = [], clefState = {}, octaveEndReplacements = {}, measureIds, glissState = {}) => {
     const measureId = generateId("measure");
     if (measureIds)
         measureIds.push(measureId);
@@ -1578,6 +1619,8 @@ const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurSta
     const allArpeggios = [];
     const allFermatas = [];
     const allTrills = [];
+    const allBreaths = [];
+    const allGlissandos = [];
     const allMordents = [];
     const allTurns = [];
     const allDynamics = [];
@@ -1624,7 +1667,7 @@ const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurSta
     for (let si = 1; si <= totalStaves; si++) {
         const voices = voicesByStaff[si] || [];
         const initialClef = clefState[si];
-        const result = encodeStaff(voices, si, indent + '    ', tieState, slurState, hairpinState, ottavaState, keyFifths, initialClef);
+        const result = encodeStaff(voices, si, indent + '    ', tieState, slurState, hairpinState, ottavaState, keyFifths, initialClef, glissState);
         staffContent += result.xml;
         allHairpins.push(...result.hairpins);
         allPedals.push(...result.pedals);
@@ -1633,6 +1676,8 @@ const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurSta
         allArpeggios.push(...result.arpeggios);
         allFermatas.push(...result.fermatas);
         allTrills.push(...result.trills);
+        allBreaths.push(...result.breaths);
+        allGlissandos.push(...result.glissandos);
         allMordents.push(...result.mordents);
         allTurns.push(...result.turns);
         allDynamics.push(...result.dynamics);
@@ -1646,6 +1691,7 @@ const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurSta
         Object.assign(tieState, result.pendingTies);
         // Update slur state with pending slurs from this staff
         Object.assign(slurState, result.pendingSlurs);
+        Object.assign(glissState, result.pendingGlisses);
         // Update hairpin state with pending hairpins from this staff
         Object.assign(hairpinState, result.pendingHairpins);
         // Update ottava state with pending octaves from this staff.
@@ -1718,6 +1764,14 @@ const encodeMeasure = (measure, measureN, indent, totalStaves, tieState, slurSta
     for (const tr of allTrills) {
         staffContent += `${indent}    <trill xml:id="${generateId('trill')}" startid="#${tr.startid}" />\n`;
     }
+    // Generate breath marks (the breath follows its startid note)
+    for (const br of allBreaths) {
+        staffContent += `${indent}    <breath xml:id="${generateId('breath')}" startid="#${br.startid}" />\n`;
+    }
+    // Generate glissando spans (note-to-note slide)
+    for (const gl of allGlissandos) {
+        staffContent += `${indent}    <gliss xml:id="${generateId('gliss')}" startid="#${gl.startid}" endid="#${gl.endid}" />\n`;
+    }
     // Generate mordent control events
     for (const mord of allMordents) {
         const formAttr = mord.form ? ` form="${mord.form}"` : '';
@@ -2362,6 +2416,7 @@ const encode = (doc, options = {}) => {
     const tieState = {};
     // Track slur state across measures for cross-measure slurs
     const slurState = {};
+    const glissState = {};
     // Track hairpin state across measures for cross-measure hairpins
     const hairpinState = {};
     // Track ottava state across measures for cross-measure ottava spans
@@ -2452,7 +2507,7 @@ const encode = (doc, options = {}) => {
         if (openTag)
             mei += openTag;
         const measureIndent = segDecomp ? `${mIndent}${indent}` : mIndent;
-        mei += encodeMeasure(measure, mIndex, measureIndent, totalStaves, tieState, slurState, hairpinState, ottavaState, currentKey, partInfos, clefState, octaveEndReplacements, measureIds);
+        mei += encodeMeasure(measure, mIndex, measureIndent, totalStaves, tieState, slurState, hairpinState, ottavaState, currentKey, partInfos, clefState, octaveEndReplacements, measureIds, glissState);
         const closeTag = segCloseAt.get(mIndex);
         if (closeTag)
             mei += closeTag;

package/lib/lilylet/musicXmlDecoder.js

@@ -5,7 +5,7 @@
  * Improves upon musicxml2ly by properly tracking spanners (slurs, ties, wedges) by number attribute.
  */
 import { DOMParser } from '@xmldom/xmldom';
-import { HairpinType, NavigationMarkType, Placement, } from "./types.js";
+import { HairpinType, NavigationMarkType, OrnamentType, Placement, } from "./types.js";
 import { getElementText, getElementInt, getElements, getDirectChildren, getChildElements, getAttribute, getAttributeNumber, hasElement, convertPitch, convertDuration, convertKeySignature, convertClef, convertStemDirection, convertArticulation, convertOrnament, convertDynamic, convertPedal, convertBarlineStyle, convertHarmonyToText, createFraction, TYPE_TO_DIVISION, } from "./musicXmlUtils.js";
 import { measureLayoutFromPart } from "./measureLayoutFromXml.js";
 // ============ Spanner Tracker ============
@@ -197,12 +197,13 @@ class VoiceTracker {
             });
             this.currentStaff.set(voiceNum, staff);
         }
-        const voice = this.voices.get(voiceNum);
-        // Update staff if specified
-        if (staff > 0) {
-            voice.staff = staff;
-        }
-        return voice;
+        // NOTE: do NOT overwrite voice.staff on later notes. voice.staff is the voice's
+        // HOME staff — the staff of its first note — matching the parser, which fixes
+        // voice.staff to the first leading \staff (so `\staff "1" … \staff "2" …` gives
+        // voice.staff=1, with the switch carried by an inline ctx(staff=2) event). The
+        // previous code clobbered it to every note's staff, so a voice that ended on a
+        // different staff round-tripped with the wrong home staff.
+        return this.voices.get(voiceNum);
     }
     addEvent(voiceNum, event, duration, staff = 1) {
         const voice = this.getOrCreateVoice(voiceNum, staff);
@@ -303,9 +304,11 @@ const parseNotations = (notationsEl) => {
             result.ornaments = ornaments;
         }
     }
-    // Fermata
-    if (hasElement(notationsEl, 'fermata')) {
-        result.fermata = true;
+    // Fermata. The "angled" shape is LilyPond's \shortfermata; everything else
+    // (normal/square/unset) is the ordinary \fermata.
+    const fermataEl = getElements(notationsEl, 'fermata')[0];
+    if (fermataEl) {
+        result.fermata = (fermataEl.textContent || '').trim() === 'angled' ? 'short' : 'normal';
     }
     // Arpeggiate
     if (hasElement(notationsEl, 'arpeggiate')) {
@@ -326,6 +329,13 @@ const parseNotations = (notationsEl) => {
             number: getAttributeNumber(tupletEl, 'number') || 1,
         };
     }
+    // Glissando / slide — both are note-to-note slide lines. Only the START note
+    // carries the mark (LilyPond \glissando auto-connects to the next note), so we
+    // record presence of any start; stops are ignored.
+    const slideEls = [...getElements(notationsEl, 'glissando'), ...getElements(notationsEl, 'slide')];
+    if (slideEls.some(el => getAttribute(el, 'type') === 'start')) {
+        result.glissando = true;
+    }
     return result;
 };
 /**
@@ -570,6 +580,17 @@ const parseDirection = (dirEl) => {
     if (hasElement(dirTypeEl, 'segno')) {
         result.segno = true;
     }
+    // Rehearsal mark (<direction-type><rehearsal>A</rehearsal>). May be split into
+    // multiple <rehearsal> (e.g. "A" + a Chinese gloss "段"); join them. Collected
+    // from the whole direction so it is found regardless of which direction-type it
+    // sits in. Surfaced as text → markup by directionToMarks (per the text-as-markup
+    // convention; LilyPond's musicxml2ly emits \mark \markup { \box { … } }).
+    const rehearsalEls = Array.from(dirEl.getElementsByTagName('rehearsal'));
+    if (rehearsalEls.length > 0) {
+        const text = rehearsalEls.map(el => el.textContent?.trim() || '').filter(Boolean).join(' ');
+        if (text)
+            result.rehearsal = text;
+    }
     return result;
 };
 /**
@@ -640,6 +661,23 @@ const parseMetadata = (doc) => {
     if (movementTitleEl?.textContent && !metadata.title) {
         metadata.title = movementTitleEl.textContent.trim();
     }
+    // Subtitle: MusicXML has no <subtitle> element — it lives in a page <credit>
+    // tagged <credit-type>subtitle</credit-type>, with the text in <credit-words>.
+    const creditEls = doc.getElementsByTagName('credit');
+    for (let i = 0; i < creditEls.length; i++) {
+        const credit = creditEls[i];
+        const typeEl = credit.getElementsByTagName('credit-type')[0];
+        if (typeEl?.textContent?.trim().toLowerCase() === 'subtitle') {
+            const words = Array.from(credit.getElementsByTagName('credit-words'))
+                .map(w => w.textContent?.trim() || '')
+                .filter(Boolean)
+                .join(' ');
+            if (words) {
+                metadata.subtitle = words;
+                break;
+            }
+        }
+    }
     // Identification (composer, arranger, lyricist)
     const identificationEl = doc.getElementsByTagName('identification')[0];
     if (identificationEl) {
@@ -711,6 +749,12 @@ const notationsToMarks = (notations, spannerTracker, pitches) => {
     // Articulations
     if (notations.articulations) {
         for (const artName of notations.articulations) {
+            // breath-mark is a NoDirection articulation in MusicXML but maps to
+            // LilyPond's \breathe — model it as the breath ornament.
+            if (artName === 'breath-mark') {
+                marks.push({ markType: 'ornament', type: OrnamentType.breath });
+                continue;
+            }
             const artType = convertArticulation(artName);
             if (artType) {
                 marks.push({ markType: 'articulation', type: artType });
@@ -728,12 +772,16 @@ const notationsToMarks = (notations, spannerTracker, pitches) => {
     }
     // Fermata
     if (notations.fermata) {
-        marks.push({ markType: 'ornament', type: 'fermata' });
+        marks.push({ markType: 'ornament', type: (notations.fermata === 'short' ? 'shortFermata' : 'fermata') });
     }
     // Arpeggiate
     if (notations.arpeggiate) {
         marks.push({ markType: 'ornament', type: 'arpeggio' });
     }
+    // Glissando / slide (start note only)
+    if (notations.glissando) {
+        marks.push({ markType: 'glissando' });
+    }
     return marks;
 };
 // Common tempo words that should be converted to \tempo
@@ -887,16 +935,30 @@ const directionToMarks = (direction, spannerTracker) => {
     if (direction.segno) {
         marks.push({ markType: 'navigation', type: NavigationMarkType.segno });
     }
+    // Rehearsal mark → markup (text-as-markup convention; LilyPond uses \mark).
+    if (direction.rehearsal) {
+        const placement = direction.placement === 'above' ? Placement.above
+            : direction.placement === 'below' ? Placement.below
+                : undefined;
+        marks.push({ markType: 'markup', content: direction.rehearsal, placement });
+    }
     // Words (text directions: "dolce", "espr.", "cresc.", "con forza", ...).
     // Tempo words ("Allegro", "a tempo", ...) are consumed separately as a tempo
-    // ContextChange by directionToContextChange, so skip those here to avoid
-    // double-emitting; everything else becomes a markup mark → MEI <dir>. Metronome
-    // directions are tempo too, never markup. Navigation text ("D.C. al Fine",
-    // "To Coda", "Fine", "D.S. al Coda") is NOT a tempo word, so it flows here as a
-    // markup glyph — the jump SEMANTICS are captured separately as measure-layout.
+    // ContextChange by directionToContextChange (which takes words[0]), so skip that
+    // one here to avoid double-emitting; the REST become a markup mark → MEI <dir>.
+    // A single <direction> often carries a tempo word AND an expressive/translation
+    // word together (e.g. <words>Moderato</words><words>中板</words>) — only the tempo
+    // word is consumed; the rest must still surface as markup. Metronome directions
+    // are tempo too, never markup. Navigation text ("D.C. al Fine", "To Coda",
+    // "Fine", "D.S. al Coda") is NOT a tempo word, so it flows here as a markup glyph
+    // — the jump SEMANTICS are captured separately as measure-layout.
     let emittedWords = false;
     if (direction.words && direction.words.length > 0 && !direction.metronome) {
-        const text = direction.words.map(w => w.text).join('').trim();
+        // If words[0] was consumed as the tempo text, drop it and keep the remainder;
+        // otherwise the whole run is one expressive phrase, joined as today.
+        const firstIsTempo = isTempoWord(direction.words[0].text.trim());
+        const rest = firstIsTempo ? direction.words.slice(1) : direction.words;
+        const text = rest.map(w => w.text).join('').trim();
         if (text && !isTempoWord(text)) {
             const placement = direction.placement === 'above' ? Placement.above
                 : direction.placement === 'below' ? Placement.below
@@ -1107,8 +1169,16 @@ const convertMeasure = (measureEl, voiceTracker, spannerTracker, ottavaTracker,
             // hairpin stop that lands just before a rest (common in piano scores:
             // `<pedal stop/>` followed by rests filling the voice) is silently dropped.
             const marks = note.isRest ? [] : (pendingMarks.get(voiceNum) || []);
-            if (!note.isRest)
+            if (!note.isRest) {
                 pendingMarks.delete(voiceNum);
+                // Drain directions that named this note's staff but had no known voice
+                // yet (queued under the -staff placeholder key by the <direction> handler).
+                const staffPending = pendingMarks.get(-staffNum);
+                if (staffPending && staffPending.length > 0) {
+                    marks.push(...staffPending);
+                    pendingMarks.delete(-staffNum);
+                }
+            }
             if (note.isRest) {
                 // Rest event
                 const duration = convertDuration(voiceTracker.getDivisions(), note.duration.divisions, note.duration.type, note.duration.dots, note.duration.timeModification);
@@ -1126,7 +1196,7 @@ const convertMeasure = (measureEl, voiceTracker, spannerTracker, ottavaTracker,
                 // so the encoder can emit <fermata startid="#rest">; without this the
                 // 3-of-4 fermatas that sit on rests in typical piano scores are lost.
                 if (note.notations?.fermata) {
-                    restEvent.marks = [{ markType: 'ornament', type: 'fermata' }];
+                    restEvent.marks = [{ markType: 'ornament', type: (note.notations.fermata === 'short' ? 'shortFermata' : 'fermata') }];
                 }
                 // Grace notes don't advance time
                 const advanceDuration = note.isGrace ? 0 : note.duration.divisions;
@@ -1225,9 +1295,17 @@ const convertMeasure = (measureEl, voiceTracker, spannerTracker, ottavaTracker,
             // Handle marks (dynamics, hairpins, etc.)
             const marks = directionToMarks(direction, spannerTracker);
             if (marks.length > 0) {
-                // Store marks to attach to next note in current voice
-                const existing = pendingMarks.get(currentVoice) || [];
-                pendingMarks.set(currentVoice, [...existing, ...marks]);
+                // Route to the voice the marks belong to. A <direction> in a grand-staff
+                // part names its <staff>; the matching note is the NEXT note on that staff
+                // — NOT currentVoice, which after a <backup> still points at the voice that
+                // just ended (so a staff-2 direction emitted after the backup would wrongly
+                // land on staff 1). Queue under a -staff placeholder key; the next note on
+                // that staff drains it, and the end-of-measure flush falls back to that
+                // staff's last note if no further note appears. Without a staff (single-
+                // staff parts), fall back to currentVoice as before.
+                const targetKey = direction.staff ? -direction.staff : currentVoice;
+                const existing = pendingMarks.get(targetKey) || [];
+                pendingMarks.set(targetKey, [...existing, ...marks]);
             }
         }
         else if (tagName === 'backup') {
@@ -1303,11 +1381,28 @@ const convertMeasure = (measureEl, voiceTracker, spannerTracker, ottavaTracker,
             }
             return undefined;
         };
+        // A staff-keyed leftover (negative key = -staffNum, queued for a "next note on
+        // this staff" that never came): resolve to the last note on any voice that lives
+        // on that staff.
+        const findLastNoteOnStaff = (staff) => {
+            let best;
+            for (const [, vs] of allVoices) {
+                if ((vs.staff || 1) !== staff)
+                    continue;
+                for (let i = vs.events.length - 1; i >= 0; i--) {
+                    if (vs.events[i].type === 'note') {
+                        best = vs.events[i];
+                        break;
+                    }
+                }
+            }
+            return best;
+        };
         for (const [voiceNum, marks] of pendingMarks) {
             if (marks.length === 0)
                 continue;
-            let target = findLastNote(voiceNum);
-            // Voice had no note (e.g. direction-only or rest-only): attach to the
+            let target = voiceNum < 0 ? findLastNoteOnStaff(-voiceNum) : findLastNote(voiceNum);
+            // Voice/staff had no note (e.g. direction-only or rest-only): attach to the
             // last note of any voice so the marking is not silently dropped.
             if (!target) {
                 for (const vn of allVoices.keys()) {