@k-l-lambda/lilylet 0.1.78 → 0.1.80

package/lib/lilylet/abcDecoder.js

@@ -720,6 +720,29 @@ const abcInstrumentsToLilylet = (stavesCode, voiceInstr) => {
     return Object.keys(result).length > 0 ? result : null;
 };
 // ============ Marks/Decorations Conversion ============
+const navTextToMark = (raw) => {
+    const body = raw.replace(/^[\^_<>@]/, "").trim().replace(/[.\s]+$/, "");
+    const t = body.toLowerCase().replace(/\s+/g, " ");
+    // glyph names → navigation marks
+    if (t === "coda")
+        return { markType: "navigation", type: NavigationMarkType.coda };
+    if (t === "segno")
+        return { markType: "navigation", type: NavigationMarkType.segno };
+    // textual jumps → markup with the canonical label used by the XML path
+    const isDC = /^d\.?\s*c\.?/.test(t) || /\bda\s*capo\b/.test(t);
+    const isDS = /^d\.?\s*s\.?/.test(t) || /\bdal\s*segno\b/.test(t);
+    const alFine = /\bal\s*fine\b/.test(t);
+    const alCoda = /\bal\s*coda\b/.test(t);
+    if (isDC)
+        return { markType: "markup", content: alFine ? "D.C. al Fine" : alCoda ? "D.C. al Coda" : "D.C.", placement: Placement.above };
+    if (isDS)
+        return { markType: "markup", content: alFine ? "D.S. al Fine" : alCoda ? "D.S. al Coda" : "D.S.", placement: Placement.above };
+    if (/\bto\s*coda\b/.test(t))
+        return { markType: "markup", content: "To Coda", placement: Placement.above };
+    if (t === "fine")
+        return { markType: "markup", content: "Fine", placement: Placement.above };
+    return undefined;
+};
 const convertArticulationMark = (artName) => {
     switch (artName) {
         case "accent":
@@ -1341,6 +1364,11 @@ const decodeTune = (tune, options = {}) => {
     // reference voice so we can derive metadata.measureLayout after the loop. ABC repeat
     // markup is voice-global by convention, so one voice suffices.
     const barInfos = [];
+    // Navigation marks (D.C./D.S./Fine/Coda/Segno) to render as VISIBLE marks on
+    // the first note of each measure that carries them, keyed by 0-based measure
+    // index. Built alongside barInfos' navTexts; attached after each measure's
+    // parts are assembled (mirrors the MusicXML path attaching nav to a note).
+    const navMarksByMeasure = new Map();
     for (let mi = 0; mi < measures.length; mi++) {
         const abcMeasure = measures[mi];
         // Group patches by voice number
@@ -1397,6 +1425,28 @@ const decodeTune = (tune, options = {}) => {
                 }
             }
             barInfos.push({ trailBar, leadVolta, navTexts: navTexts.length ? navTexts : undefined });
+            // Convert the navigation texts to VISIBLE marks (consistent with the
+            // MusicXML path). De-dup identical marks so a directive echoed on
+            // several voices yields one glyph/text. (Bare in-note `express` coda/segno
+            // are a separate ABC form handled in processExpressiveTerm; the !coda!/
+            // !segno!/!D.C.!/!fine! decorations gathered here parse to articulation/
+            // directive/text and have no per-note express, so they need attaching.)
+            if (navTexts.length) {
+                const seen = new Set();
+                const marks = [];
+                for (const raw of navTexts) {
+                    const mark = navTextToMark(raw);
+                    if (!mark)
+                        continue;
+                    const key = mark.markType === "markup" ? `m:${mark.content}` : `n:${mark.type}`;
+                    if (seen.has(key))
+                        continue;
+                    seen.add(key);
+                    marks.push(mark);
+                }
+                if (marks.length)
+                    navMarksByMeasure.set(mi, marks);
+            }
         }
         // Process each voice
         const partVoicesMap = new Map(); // partIndex → (staffNum → voices)
@@ -1491,6 +1541,26 @@ const decodeTune = (tune, options = {}) => {
             if (timeSig)
                 measure.timeSig = timeSig;
         }
+        // Attach this measure's navigation marks (D.C./D.S./Fine/Coda/Segno) to its
+        // first NoteEvent, scanning parts/voices in order (the reference staff). The
+        // MusicXML path likewise attaches navigation to a note; keeping it on a note
+        // means the serializer renders \coda/\segno or ^\markup "D.C. al Fine".
+        const navMarks = navMarksByMeasure.get(mi);
+        if (navMarks && navMarks.length) {
+            let attached = false;
+            for (const part of parts) {
+                for (const voice of part.voices) {
+                    const firstNote = voice.events.find(e => e.type === "note");
+                    if (firstNote) {
+                        firstNote.marks = [...(firstNote.marks || []), ...navMarks];
+                        attached = true;
+                        break;
+                    }
+                }
+                if (attached)
+                    break;
+            }
+        }
         lilyletMeasures.push(measure);
     }
     // Add tempo to first measure's first voice if present

package/lib/lilylet/measureLayoutFromXml.js

@@ -205,6 +205,54 @@ const renderRepeatSpan = (infos, lo, hi) => {
         parts.push(rangeCode(lastStop + 1, hi));
     return parts.join(", ");
 };
+// Render a span [lo..hi] that has one OR MORE plain repeat/volta sections in
+// sequence (no navigation). Real scores are usually multi-section (AABB minuets,
+// sonata exposition+recap), which the single-span renderRepeatSpan can't express
+// — it bails when it sees >1 repeat-end. Here we cut the span at section
+// boundaries (each cut ends a repeat section, voltas included) and render each
+// sub-span independently, joining with commas. Any non-repeated measures between
+// two sections are absorbed as the `pre` of the following span. Returns null if
+// any section isn't a clean single repeat/volta (caller then falls back to flat).
+// Used both for the whole piece (lo=1, hi=total) and recursively for the A / B
+// halves of a da-capo ABA.
+const renderRepeatSections = (infos, lo, hi) => {
+    const inSpan = (idx) => idx >= lo && idx <= hi;
+    const repeatEnds = infos.filter(i => i.repeatEnd && inSpan(i.index)).map(i => i.index).sort((a, b) => a - b);
+    const repeatStarts = infos.filter(i => i.repeatStart && inSpan(i.index)).map(i => i.index).sort((a, b) => a - b);
+    if (repeatEnds.length <= 1)
+        return renderRepeatSpan(infos, lo, hi);
+    const endingStops = infos.filter(i => i.endingStop !== undefined && inSpan(i.index)).map(i => i.index);
+    const parts = [];
+    let prevHi = lo - 1;
+    for (const e of repeatEnds) {
+        const sectionLo = prevHi + 1;
+        // The next section's repeat-start bounds this section's voltas (2nd/3rd
+        // endings sit AFTER the repeat-end but BEFORE the next section starts).
+        const nextStart = repeatStarts.find(s => s > e);
+        const sectionEndingStarts = infos
+            .filter(i => i.endingStart !== undefined && i.index >= sectionLo && (nextStart === undefined || i.index < nextStart) && inSpan(i.index))
+            .map(i => i.index)
+            .sort((a, b) => a - b);
+        let sectionHi;
+        if (sectionEndingStarts.length) {
+            const lastStart = sectionEndingStarts[sectionEndingStarts.length - 1];
+            // the last ending's stop closes the section; else the ending start itself
+            const stop = endingStops.filter(s => s >= lastStart).sort((a, b) => a - b)[0];
+            sectionHi = stop ?? lastStart;
+        }
+        else
+            sectionHi = e;
+        const code = renderRepeatSpan(infos, sectionLo, sectionHi);
+        if (code === null)
+            return null;
+        parts.push(code);
+        prevHi = sectionHi;
+    }
+    // trailing non-repeated tail
+    if (prevHi < hi)
+        parts.push(rangeCode(prevHi + 1, hi));
+    return parts.join(", ");
+};
 const tryStructured = (infos, total) => {
     const dacapo = infos.find(i => i.dacapo);
     const dalsegno = infos.some(i => i.dalsegno);
@@ -223,15 +271,46 @@ const tryStructured = (infos, total) => {
     }
     if (dalsegno || tocoda || infos.some(i => i.fine || i.segno || i.coda))
         return null;
-    // No navigation: a single plain repeat/volta over the whole piece.
-    return renderRepeatSpan(infos, 1, total);
+    // No navigation: one or more plain repeat/volta sections in sequence. Most
+    // real pieces (AABB minuets, sonata exposition+recap) have ≥2 repeat sections;
+    // render each independently and join with commas.
+    return renderRepeatSections(infos, 1, total);
 };
-// Construct the ABA form <main, rest> for a D.C. case. main = the volta/repeat
-// structure; rest = the post-volta tail before the D.C. measure. The Once
-// re-expansion of main supplies the da-capo replay (body + last ending), giving
-// the over-volta semantics. Returns null when the shape doesn't fit (no volta,
-// or no tail to form the ABA "rest") → caller uses the flat fallback.
+// Construct the ABA form <main, rest> for a D.C. case. The ABA expansion plays
+// A B A' where A = main (Full), B = rest (Full), A' = main (Once: volta bodies
+// once + last alternate, no inner repeat). For D.C. al Fine, A is the whole
+// pre-Fine span (1..fine) and B is the post-Fine span up to the D.C. (fine+1..dc);
+// the da-capo replay A' then plays main once more, stopping at Fine. Both A and B
+// can themselves contain repeat/volta sections, so each is structured recursively
+// via renderRepeatSections. Returns null when the shape doesn't fit (no Fine to
+// bound A, or no rest tail) → caller uses the flat fallback. The end-of-build
+// re-expand check still validates the result against the simulated order.
 const buildDaCapoABA = (infos, dcIdx) => {
+    const fineIdx = infos.find(i => i.fine)?.index;
+    if (fineIdx === undefined) {
+        // No explicit Fine: fall back to the legacy single-volta ABA shape, where
+        // A ends at the last pre-D.C. ending and B is the tail to the D.C. measure.
+        return buildDaCapoABALegacy(infos, dcIdx);
+    }
+    if (fineIdx >= dcIdx)
+        return null; // Fine must precede the D.C. tail
+    const restLo = fineIdx + 1;
+    if (restLo > dcIdx)
+        return null; // no B section
+    const mainCode = renderRepeatSections(infos, 1, fineIdx);
+    const restCode = renderRepeatSections(infos, restLo, dcIdx);
+    if (mainCode === null || restCode === null)
+        return null;
+    // main wraps in [..] only when it is a comma-separated sequence (so the ABA
+    // parser reads it as one block); a single token (e.g. "2*[..]") needs no bracket.
+    const main = /,/.test(mainCode) ? `[${mainCode}]` : mainCode;
+    const rest = /,/.test(restCode) ? `[${restCode}]` : restCode;
+    return `<${main}, ${rest}>`;
+};
+// Legacy ABA builder for D.C. WITHOUT an explicit Fine: main = the single
+// volta/repeat structure before the D.C., rest = the post-volta tail. Kept for
+// the original over-volta-without-Fine convention.
+const buildDaCapoABALegacy = (infos, dcIdx) => {
     const endingStarts = infos.filter(i => i.index <= dcIdx && i.endingStart !== undefined).map(i => i.index).sort((a, b) => a - b);
     if (endingStarts.length === 0)
         return null; // plain D.C. al Fine (no volta) → flat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.78",
+  "version": "0.1.80",
   "description": "Lilylet is a lilyopnd-like sheet music language designed for Markdown rendering and symbolic music representation in AIGC applications.",
   "type": "module",
   "main": "lib/index.js",

package/source/lilylet/abcDecoder.ts

@@ -839,6 +839,24 @@ const abcInstrumentsToLilylet = (
 
 // ============ Marks/Decorations Conversion ============
 
+const navTextToMark = (raw: string): Mark | undefined => {
+	const body = raw.replace(/^[\^_<>@]/, "").trim().replace(/[.\s]+$/, "");
+	const t = body.toLowerCase().replace(/\s+/g, " ");
+	// glyph names → navigation marks
+	if (t === "coda") return { markType: "navigation", type: NavigationMarkType.coda };
+	if (t === "segno") return { markType: "navigation", type: NavigationMarkType.segno };
+	// textual jumps → markup with the canonical label used by the XML path
+	const isDC = /^d\.?\s*c\.?/.test(t) || /\bda\s*capo\b/.test(t);
+	const isDS = /^d\.?\s*s\.?/.test(t) || /\bdal\s*segno\b/.test(t);
+	const alFine = /\bal\s*fine\b/.test(t);
+	const alCoda = /\bal\s*coda\b/.test(t);
+	if (isDC) return { markType: "markup", content: alFine ? "D.C. al Fine" : alCoda ? "D.C. al Coda" : "D.C.", placement: Placement.above };
+	if (isDS) return { markType: "markup", content: alFine ? "D.S. al Fine" : alCoda ? "D.S. al Coda" : "D.S.", placement: Placement.above };
+	if (/\bto\s*coda\b/.test(t)) return { markType: "markup", content: "To Coda", placement: Placement.above };
+	if (t === "fine") return { markType: "markup", content: "Fine", placement: Placement.above };
+	return undefined;
+};
+
 const convertArticulationMark = (artName: string): Mark | undefined => {
 	switch (artName) {
 		case "accent": case "L":
@@ -1495,6 +1513,12 @@ const decodeTune = (tune: ABC.Tune, options: DecodeOptions = {}): LilyletDoc =>
 	// markup is voice-global by convention, so one voice suffices.
 	const barInfos: AbcBarInfo[] = [];
 
+	// Navigation marks (D.C./D.S./Fine/Coda/Segno) to render as VISIBLE marks on
+	// the first note of each measure that carries them, keyed by 0-based measure
+	// index. Built alongside barInfos' navTexts; attached after each measure's
+	// parts are assembled (mirrors the MusicXML path attaching nav to a note).
+	const navMarksByMeasure = new Map<number, Mark[]>();
+
 	for (let mi = 0; mi < measures.length; mi++) {
 		const abcMeasure = measures[mi];
 
@@ -1550,6 +1574,26 @@ const decodeTune = (tune: ABC.Tune, options: DecodeOptions = {}): LilyletDoc =>
 				}
 			}
 			barInfos.push({ trailBar, leadVolta, navTexts: navTexts.length ? navTexts : undefined });
+
+			// Convert the navigation texts to VISIBLE marks (consistent with the
+			// MusicXML path). De-dup identical marks so a directive echoed on
+			// several voices yields one glyph/text. (Bare in-note `express` coda/segno
+			// are a separate ABC form handled in processExpressiveTerm; the !coda!/
+			// !segno!/!D.C.!/!fine! decorations gathered here parse to articulation/
+			// directive/text and have no per-note express, so they need attaching.)
+			if (navTexts.length) {
+				const seen = new Set<string>();
+				const marks: Mark[] = [];
+				for (const raw of navTexts) {
+					const mark = navTextToMark(raw);
+					if (!mark) continue;
+					const key = mark.markType === "markup" ? `m:${mark.content}` : `n:${(mark as any).type}`;
+					if (seen.has(key)) continue;
+					seen.add(key);
+					marks.push(mark);
+				}
+				if (marks.length) navMarksByMeasure.set(mi, marks);
+			}
 		}
 
 		// Process each voice
@@ -1662,6 +1706,26 @@ const decodeTune = (tune: ABC.Tune, options: DecodeOptions = {}): LilyletDoc =>
 			if (timeSig) measure.timeSig = timeSig;
 		}
 
+		// Attach this measure's navigation marks (D.C./D.S./Fine/Coda/Segno) to its
+		// first NoteEvent, scanning parts/voices in order (the reference staff). The
+		// MusicXML path likewise attaches navigation to a note; keeping it on a note
+		// means the serializer renders \coda/\segno or ^\markup "D.C. al Fine".
+		const navMarks = navMarksByMeasure.get(mi);
+		if (navMarks && navMarks.length) {
+			let attached = false;
+			for (const part of parts) {
+				for (const voice of part.voices) {
+					const firstNote = voice.events.find(e => e.type === "note") as NoteEvent | undefined;
+					if (firstNote) {
+						firstNote.marks = [...(firstNote.marks || []), ...navMarks];
+						attached = true;
+						break;
+					}
+				}
+				if (attached) break;
+			}
+		}
+
 		lilyletMeasures.push(measure);
 	}
 

package/source/lilylet/measureLayoutFromXml.ts

@@ -214,6 +214,55 @@ const renderRepeatSpan = (infos: MeasureRepeatInfo[], lo: number, hi: number): s
 	return parts.join(", ");
 };
 
+// Render a span [lo..hi] that has one OR MORE plain repeat/volta sections in
+// sequence (no navigation). Real scores are usually multi-section (AABB minuets,
+// sonata exposition+recap), which the single-span renderRepeatSpan can't express
+// — it bails when it sees >1 repeat-end. Here we cut the span at section
+// boundaries (each cut ends a repeat section, voltas included) and render each
+// sub-span independently, joining with commas. Any non-repeated measures between
+// two sections are absorbed as the `pre` of the following span. Returns null if
+// any section isn't a clean single repeat/volta (caller then falls back to flat).
+// Used both for the whole piece (lo=1, hi=total) and recursively for the A / B
+// halves of a da-capo ABA.
+const renderRepeatSections = (infos: MeasureRepeatInfo[], lo: number, hi: number): string | null => {
+	const inSpan = (idx: number) => idx >= lo && idx <= hi;
+	const repeatEnds = infos.filter(i => i.repeatEnd && inSpan(i.index)).map(i => i.index).sort((a, b) => a - b);
+	const repeatStarts = infos.filter(i => i.repeatStart && inSpan(i.index)).map(i => i.index).sort((a, b) => a - b);
+	if (repeatEnds.length <= 1) return renderRepeatSpan(infos, lo, hi);
+
+	const endingStops = infos.filter(i => i.endingStop !== undefined && inSpan(i.index)).map(i => i.index);
+
+	const parts: string[] = [];
+	let prevHi = lo - 1;
+	for (const e of repeatEnds) {
+		const sectionLo = prevHi + 1;
+		// The next section's repeat-start bounds this section's voltas (2nd/3rd
+		// endings sit AFTER the repeat-end but BEFORE the next section starts).
+		const nextStart = repeatStarts.find(s => s > e);
+		const sectionEndingStarts = infos
+			.filter(i => i.endingStart !== undefined && i.index >= sectionLo && (nextStart === undefined || i.index < nextStart) && inSpan(i.index))
+			.map(i => i.index)
+			.sort((a, b) => a - b);
+
+		let sectionHi: number;
+		if (sectionEndingStarts.length) {
+			const lastStart = sectionEndingStarts[sectionEndingStarts.length - 1];
+			// the last ending's stop closes the section; else the ending start itself
+			const stop = endingStops.filter(s => s >= lastStart).sort((a, b) => a - b)[0];
+			sectionHi = stop ?? lastStart;
+		}
+		else sectionHi = e;
+
+		const code = renderRepeatSpan(infos, sectionLo, sectionHi);
+		if (code === null) return null;
+		parts.push(code);
+		prevHi = sectionHi;
+	}
+	// trailing non-repeated tail
+	if (prevHi < hi) parts.push(rangeCode(prevHi + 1, hi));
+	return parts.join(", ");
+};
+
 const tryStructured = (infos: MeasureRepeatInfo[], total: number): string | null => {
 	const dacapo = infos.find(i => i.dacapo);
 	const dalsegno = infos.some(i => i.dalsegno);
@@ -233,16 +282,47 @@ const tryStructured = (infos: MeasureRepeatInfo[], total: number): string | null
 	}
 	if (dalsegno || tocoda || infos.some(i => i.fine || i.segno || i.coda)) return null;
 
-	// No navigation: a single plain repeat/volta over the whole piece.
-	return renderRepeatSpan(infos, 1, total);
+	// No navigation: one or more plain repeat/volta sections in sequence. Most
+	// real pieces (AABB minuets, sonata exposition+recap) have ≥2 repeat sections;
+	// render each independently and join with commas.
+	return renderRepeatSections(infos, 1, total);
 };
 
-// Construct the ABA form <main, rest> for a D.C. case. main = the volta/repeat
-// structure; rest = the post-volta tail before the D.C. measure. The Once
-// re-expansion of main supplies the da-capo replay (body + last ending), giving
-// the over-volta semantics. Returns null when the shape doesn't fit (no volta,
-// or no tail to form the ABA "rest") → caller uses the flat fallback.
+// Construct the ABA form <main, rest> for a D.C. case. The ABA expansion plays
+// A B A' where A = main (Full), B = rest (Full), A' = main (Once: volta bodies
+// once + last alternate, no inner repeat). For D.C. al Fine, A is the whole
+// pre-Fine span (1..fine) and B is the post-Fine span up to the D.C. (fine+1..dc);
+// the da-capo replay A' then plays main once more, stopping at Fine. Both A and B
+// can themselves contain repeat/volta sections, so each is structured recursively
+// via renderRepeatSections. Returns null when the shape doesn't fit (no Fine to
+// bound A, or no rest tail) → caller uses the flat fallback. The end-of-build
+// re-expand check still validates the result against the simulated order.
 const buildDaCapoABA = (infos: MeasureRepeatInfo[], dcIdx: number): string | null => {
+	const fineIdx = infos.find(i => i.fine)?.index;
+	if (fineIdx === undefined) {
+		// No explicit Fine: fall back to the legacy single-volta ABA shape, where
+		// A ends at the last pre-D.C. ending and B is the tail to the D.C. measure.
+		return buildDaCapoABALegacy(infos, dcIdx);
+	}
+	if (fineIdx >= dcIdx) return null;          // Fine must precede the D.C. tail
+	const restLo = fineIdx + 1;
+	if (restLo > dcIdx) return null;            // no B section
+
+	const mainCode = renderRepeatSections(infos, 1, fineIdx);
+	const restCode = renderRepeatSections(infos, restLo, dcIdx);
+	if (mainCode === null || restCode === null) return null;
+
+	// main wraps in [..] only when it is a comma-separated sequence (so the ABA
+	// parser reads it as one block); a single token (e.g. "2*[..]") needs no bracket.
+	const main = /,/.test(mainCode) ? `[${mainCode}]` : mainCode;
+	const rest = /,/.test(restCode) ? `[${restCode}]` : restCode;
+	return `<${main}, ${rest}>`;
+};
+
+// Legacy ABA builder for D.C. WITHOUT an explicit Fine: main = the single
+// volta/repeat structure before the D.C., rest = the post-volta tail. Kept for
+// the original over-volta-without-Fine convention.
+const buildDaCapoABALegacy = (infos: MeasureRepeatInfo[], dcIdx: number): string | null => {
 	const endingStarts = infos.filter(i => i.index <= dcIdx && i.endingStart !== undefined).map(i => i.index).sort((a, b) => a - b);
 	if (endingStarts.length === 0) return null;   // plain D.C. al Fine (no volta) → flat
 	// body+endings up to the last ending stop; the rest (tail) runs to dcIdx.