@k-l-lambda/lilylet 0.1.66 → 0.1.68

package/lib/lilylet/meiEncoder.js

@@ -44,6 +44,40 @@ const CLEF_SHAPES = {
     F: { shape: "F", line: 4 },
     C: { shape: "C", line: 3 },
 };
+// Resolve a clef string into MEI shape/line plus optional octave displacement.
+// Octave transposition follows the LilyPond convention: a "_8"/"_15" suffix lowers
+// the sounding pitch by one/two octaves (the small 8/15 is drawn below the clef),
+// and "^8"/"^15" raises it (drawn above). MEI encodes this as dis ("8" | "15")
+// and dis.place ("below" | "above").
+const resolveClef = (clefStr) => {
+    const match = clefStr.match(/^(.*?)([_^])(8|15)$/);
+    const base = match ? match[1] : clefStr;
+    const clefInfo = CLEF_SHAPES[base] || CLEF_SHAPES.treble;
+    if (!match)
+        return { shape: clefInfo.shape, line: clefInfo.line };
+    return {
+        shape: clefInfo.shape,
+        line: clefInfo.line,
+        dis: match[3],
+        disPlace: match[2] === "^" ? "above" : "below",
+    };
+};
+// Attributes for a standalone <clef> element (mid-measure clef change).
+const clefElementAttrs = (clefStr) => {
+    const c = resolveClef(clefStr);
+    let attrs = `shape="${c.shape}" line="${c.line}"`;
+    if (c.dis)
+        attrs += ` dis="${c.dis}" dis.place="${c.disPlace}"`;
+    return attrs;
+};
+// Attributes for a <staffDef> clef (clef.* namespace).
+const staffDefClefAttrs = (clefStr) => {
+    const c = resolveClef(clefStr);
+    let attrs = `clef.shape="${c.shape}" clef.line="${c.line}"`;
+    if (c.dis)
+        attrs += ` clef.dis="${c.dis}" clef.dis.place="${c.disPlace}"`;
+    return attrs;
+};
 // Lilylet duration division to MEI dur
 // division: 1=whole, 2=half, 4=quarter, 8=eighth, etc.
 const DURATIONS = {
@@ -504,7 +538,8 @@ const noteEventToMEI = (event, indent, layerStaff, tieEnd, contextStemDir, keyFi
 // Convert RestEvent to MEI
 const restEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0, measureAccidentals, crossStaff) => {
     const dur = DURATIONS[event.duration.division] || "4";
-    let attrs = `xml:id="${generateId('rest')}" dur="${dur}"`;
+    const restId = generateId('rest');
+    let attrs = `xml:id="${restId}" dur="${dur}"`;
     if (event.duration.dots > 0)
         attrs += ` dots="${event.duration.dots}"`;
     // Cross-staff attribute
@@ -517,13 +552,14 @@ const restEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0, measureAc
     }
     // Space rest (invisible)
     if (event.invisible) {
-        return `${indent}<space ${attrs} />\n`;
+        return { xml: `${indent}<space ${attrs} />\n`, elementId: restId };
     }
     // Full measure rest
     if (event.fullMeasure) {
-        return `${indent}<mRest xml:id="${generateId('mrest')}" />\n`;
+        const mRestId = generateId('mrest');
+        return { xml: `${indent}<mRest xml:id="${mRestId}" />\n`, elementId: mRestId };
     }
-    return `${indent}<rest ${attrs} />\n`;
+    return { xml: `${indent}<rest ${attrs} />\n`, elementId: restId };
 };
 // Check if a tuplet has balanced internal beam groups (both [ and ] inside the same tuplet)
 // Returns false for cross-tuplet beams where [ is in one tuplet and ] in another
@@ -611,7 +647,7 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
         }
         else if (e.type === 'rest') {
             const restIndent = beamOpen ? baseIndent + '    ' : baseIndent;
-            xml += restEventToMEI(e, restIndent, keyFifths, ottavaShift, measureAccidentals);
+            xml += restEventToMEI(e, restIndent, keyFifths, ottavaShift, measureAccidentals).xml;
         }
         else if (e.type === 'context') {
             const ctx = e;
@@ -620,8 +656,7 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
                 const effectiveStaffNum = effectiveStaff ?? layerStaffNum;
                 if (effectiveStaffNum === layerStaffNum) {
                     const clefIndent = beamOpen ? baseIndent + '    ' : baseIndent;
-                    const clefInfo = CLEF_SHAPES[ctx.clef] || CLEF_SHAPES.treble;
-                    xml += `${clefIndent}<clef xml:id="${generateId('clef')}" shape="${clefInfo.shape}" line="${clefInfo.line}" />\n`;
+                    xml += `${clefIndent}<clef xml:id="${generateId('clef')}" ${clefElementAttrs(ctx.clef)} />\n`;
                 }
                 activeClef = ctx.clef;
                 endingClef = ctx.clef;
@@ -776,6 +811,7 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
     const barlines = [];
     const markups = [];
     const pendingMarkups = [];
+    const pendingDynamics = [];
     // Track current stem direction from context changes
     let currentStemDirection = undefined;
     // Track current staff for cross-staff notation
@@ -791,6 +827,13 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
         }
         pendingMarkups.length = 0;
     };
+    // Helper to flush pending leading dynamics onto a note ID
+    const flushPendingDynamics = (noteId) => {
+        for (const label of pendingDynamics) {
+            dynamics.push({ startid: noteId, label });
+        }
+        pendingDynamics.length = 0;
+    };
     // Helper to check if pitches match for tie continuation
     const pitchesMatch = (p1, p2) => {
         if (p1.length !== p2.length)
@@ -851,6 +894,8 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 }
                 // Flush any pending markups onto this note
                 flushPendingMarkups(result.elementId);
+                // Flush any pending leading dynamics onto this note
+                flushPendingDynamics(result.elementId);
                 // If there's a pending ottava, start the span on this note
                 if (pendingOttava !== null && pendingOttava !== 0) {
                     const dis = Math.abs(pendingOttava) === 2 ? 15 : 8;
@@ -963,7 +1008,12 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
             case 'rest': {
                 // For cross-staff notation: pass staff number if different from voice's home staff
                 const restCrossStaff = currentStaff !== (voice.staff || 1) ? currentStaff : undefined;
-                xml += restEventToMEI(event, currentIndent, keyFifths, currentOttavaShift, measureAccidentals, restCrossStaff);
+                const restResult = restEventToMEI(event, currentIndent, keyFifths, currentOttavaShift, measureAccidentals, restCrossStaff);
+                xml += restResult.xml;
+                // A leading dynamic/markup attaches to the next event, which may be this rest
+                flushPendingMarkups(restResult.elementId);
+                flushPendingDynamics(restResult.elementId);
+                lastNoteId = restResult.elementId;
                 break;
             }
             case 'tuplet':
@@ -979,6 +1029,7 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 // Flush any pending markups onto the first note of the tuplet
                 if (tupletResult.firstNoteId) {
                     flushPendingMarkups(tupletResult.firstNoteId);
+                    flushPendingDynamics(tupletResult.firstNoteId);
                     lastNoteId = tupletResult.firstNoteId;
                 }
                 // Process slur ends first (to close any pending slurs from before this tuplet)
@@ -1014,8 +1065,7 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 if (ctx.clef && ctx.clef !== currentClef) {
                     const layerStaff = voice.staff || 1;
                     if (currentStaff === layerStaff) {
-                        const clefInfo = CLEF_SHAPES[ctx.clef] || CLEF_SHAPES.treble;
-                        xml += `${currentIndent}<clef xml:id="${generateId('clef')}" shape="${clefInfo.shape}" line="${clefInfo.line}" />\n`;
+                        xml += `${currentIndent}<clef xml:id="${generateId('clef')}" ${clefElementAttrs(ctx.clef)} />\n`;
                     }
                     currentClef = ctx.clef;
                 }
@@ -1095,6 +1145,13 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                     }
                 }
                 break;
+            case 'dynamic':
+                {
+                    // Standalone (leading) dynamic - attaches to the following note
+                    const dynEvent = event;
+                    pendingDynamics.push(dynEvent.dynamicType);
+                }
+                break;
         }
         // Close beam element if beam ends
         if (beamEnd) {
@@ -1580,8 +1637,7 @@ const encodeScoreDef = (keySig, timeNum, timeDen, partInfos, indent, meterSymbol
             for (let ls = 1; ls <= info.maxStaff; ls++) {
                 const globalStaff = info.staffOffset + ls;
                 const clef = info.clefs[ls] || Clef.treble;
-                const clefInfo = CLEF_SHAPES[clef] || CLEF_SHAPES.treble;
-                xml += `${indent}            <staffDef xml:id="${generateId('staffdef')}" n="${globalStaff}" lines="5" clef.shape="${clefInfo.shape}" clef.line="${clefInfo.line}" />\n`;
+                xml += `${indent}            <staffDef xml:id="${generateId('staffdef')}" n="${globalStaff}" lines="5" ${staffDefClefAttrs(clef)} />\n`;
             }
             xml += `${indent}        </staffGrp>\n`;
         }
@@ -1589,8 +1645,7 @@ const encodeScoreDef = (keySig, timeNum, timeDen, partInfos, indent, meterSymbol
             // Single staff part
             const globalStaff = info.staffOffset + 1;
             const clef = info.clefs[1] || Clef.treble;
-            const clefInfo = CLEF_SHAPES[clef] || CLEF_SHAPES.treble;
-            xml += `${indent}        <staffDef xml:id="${generateId('staffdef')}" n="${globalStaff}" lines="5" clef.shape="${clefInfo.shape}" clef.line="${clefInfo.line}" />\n`;
+            xml += `${indent}        <staffDef xml:id="${generateId('staffdef')}" n="${globalStaff}" lines="5" ${staffDefClefAttrs(clef)} />\n`;
         }
     }
     xml += `${indent}    </staffGrp>\n`;

package/lib/lilylet/serializer.js

@@ -286,7 +286,7 @@ const serializeContextChange = (event) => {
     const parts = [];
     // Clef
     if (event.clef) {
-        parts.push('\\clef "' + CLEF_MAP[event.clef] + '"');
+        parts.push('\\clef "' + (CLEF_MAP[event.clef] ?? event.clef) + '"');
     }
     // Key signature
     if (event.key) {
@@ -455,12 +455,25 @@ const serializeEvent = (event, env, prevDuration) => {
             return serializeTremoloEvent(event, env);
         case 'barline':
             return { str: serializeBarlineEvent(event), newEnv: env };
+        case 'markup': {
+            const mk = event;
+            const prefix = mk.placement === 'above' ? '^' : mk.placement === 'below' ? '_' : '';
+            return { str: `${prefix}\\markup "${mk.content}"`, newEnv: env };
+        }
+        case 'dynamic': {
+            const dynStr = DYNAMIC_MAP[event.dynamicType];
+            return { str: dynStr || '', newEnv: env };
+        }
         default:
             return { str: '', newEnv: env };
     }
 };
-// Find first clef in voice events
+// Find the voice's leading clef: the clef in effect at the START of the voice, i.e.
+// a clef context event that appears before any musical event on the home staff.
+// A clef that first appears AFTER a note is a mid-voice change and must be emitted
+// inline where it occurs, not hoisted to the front — so it is not returned here.
 const findVoiceClef = (voice) => {
+    const MUSICAL = new Set(['note', 'rest', 'tuplet', 'times', 'tremolo']);
     let activeStaff = voice.staff;
     for (const event of voice.events) {
         if (event.type === 'context') {
@@ -471,6 +484,11 @@ const findVoiceClef = (voice) => {
                 return ctx.clef;
             }
         }
+        else if (MUSICAL.has(event.type)) {
+            // Reached music on the home staff before any clef — no leading clef.
+            if (activeStaff === voice.staff)
+                return undefined;
+        }
     }
     return undefined;
 };
@@ -490,7 +508,6 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
     // before any music collapse to the last one (earlier ones are no-ops).
     // leadStaffScanEnd is the index of the first event that ends this scan —
     // context{staff} events before this index are skipped in the main loop.
-    const MUSICAL_TYPES = new Set(['note', 'rest', 'tuplet', 'times', 'tremolo']);
     let effectiveInitialStaff = voice.staff;
     let leadStaffScanEnd = 0;
     for (let i = 0; i < voice.events.length; i++) {
@@ -516,8 +533,9 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
             leadStaffScanEnd = i + 1; // time/key/stemDir — continue scan
             continue;
         }
-        if (MUSICAL_TYPES.has(e.type))
-            break;
+        // Any other event (note/rest/tuplet/markup/dynamic/harmony/barline/…) has a
+        // visible position; a staff switch after it must not be hoisted ahead of it.
+        break;
     }
     // Output staff command if voice staff differs from current parser staff,
     // or always output if it's a grand staff score for clarity.
@@ -545,16 +563,17 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
             parts.push('\\time ' + numerator + '/' + denominator);
         }
     }
-    // Output clef only if not yet emitted or changed for this staff
-    const voiceClef = allStaffClefs?.[voice.staff] || findVoiceClef(voice);
+    // Output clef only if not yet emitted or changed for this staff.
+    // Prefer this voice's leading clef (a clef before any music); fall back to the
+    // carry-in clef from previous measures. A clef that first appears mid-voice is NOT
+    // hoisted here — it is emitted inline at its position.
+    const voiceClef = findVoiceClef(voice) ?? allStaffClefs?.[voice.staff];
     const clefAlreadyEmitted = voiceClef && emittedClefs?.[voice.staff] === voiceClef;
     if (voiceClef && !clefAlreadyEmitted) {
-        parts.push('\\clef "' + CLEF_MAP[voiceClef] + '"');
+        parts.push('\\clef "' + (CLEF_MAP[voiceClef] ?? voiceClef) + '"');
         if (emittedClefs)
             emittedClefs[voice.staff] = voiceClef;
     }
-    // Skip redundant clef context events if this staff's clef is already established
-    const clefOutputted = !!voiceClef && !!emittedClefs?.[voice.staff];
     let activeStaff = effectiveInitialStaff;
     let activeStemDir;
     for (let eventIdx = 0; eventIdx < voice.events.length; eventIdx++) {
@@ -572,7 +591,7 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
                 // Emit target staff clef if the event carries one or allStaffClefs knows it
                 const ctxClef = ctx.clef || allStaffClefs?.[activeStaff];
                 if (ctxClef && emittedClefs?.[activeStaff] !== ctxClef) {
-                    parts.push('\\clef "' + CLEF_MAP[ctxClef] + '"');
+                    parts.push('\\clef "' + (CLEF_MAP[ctxClef] ?? ctxClef) + '"');
                     if (emittedClefs)
                         emittedClefs[activeStaff] = ctxClef;
                 }
@@ -581,8 +600,11 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
             if (ctx.staff && !ctx.clef && !ctx.ottava)
                 continue; // same staff, pure no-op
             if (ctx.staff) { /* same staff but has clef/ottava — fall through to emit them */ }
-            // Skip clef-only context events if clef already established for this staff
-            if (clefOutputted && ctx.clef && !ctx.key && !ctx.time && !ctx.ottava && !ctx.stemDirection && !ctx.tempo) {
+            // Skip a clef-only context event only if it is REDUNDANT — i.e. it restates the
+            // clef already active for this staff. A clef that differs is a genuine change and
+            // must be emitted inline at its position.
+            if (ctx.clef && !ctx.key && !ctx.time && !ctx.ottava && !ctx.stemDirection && !ctx.tempo &&
+                emittedClefs?.[ctx.staff || activeStaff] === ctx.clef) {
                 continue;
             }
         }
@@ -596,7 +618,7 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
                 // Emit the target staff's clef if it differs from what was last emitted for this staff
                 const targetClef = allStaffClefs?.[activeStaff];
                 if (targetClef && emittedClefs?.[activeStaff] !== targetClef) {
-                    parts.push('\\clef "' + CLEF_MAP[targetClef] + '"');
+                    parts.push('\\clef "' + (CLEF_MAP[targetClef] ?? targetClef) + '"');
                     if (emittedClefs)
                         emittedClefs[activeStaff] = targetClef;
                 }
@@ -651,11 +673,15 @@ const serializePart = (part, currentStaff, isGrandStaff = false, measureContext,
     }
     const voiceStrs = [];
     let staff = currentStaff;
+    // A part is a grand staff only if its voices span more than one staff.
+    // Only then do we force \staff on every voice; single-staff parts emit \staff
+    // solely when the staff actually changes (e.g. resetting after a prior grand staff).
+    const partIsGrandStaff = new Set(part.voices.map(v => v.staff)).size > 1;
     for (let i = 0; i < part.voices.length; i++) {
         const voice = part.voices[i];
         // Pass measureContext to all voices, isFirstVoice for key/time
         const isFirstVoice = isFirstPart && i === 0;
-        const { str, newStaff } = serializeVoice(voice, staff, isGrandStaff, measureContext, isFirstVoice, clefsByStaff, emittedClefs);
+        const { str, newStaff } = serializeVoice(voice, staff, partIsGrandStaff, measureContext, isFirstVoice, clefsByStaff, emittedClefs);
         voiceStrs.push(str);
         staff = newStaff;
     }
@@ -664,7 +690,7 @@ const serializePart = (part, currentStaff, isGrandStaff = false, measureContext,
 };
 // Serialize a measure, tracking staff state across parts
 // Always output key/time at start of each measure
-const serializeMeasure = (measure, _isFirst, currentStaff, isGrandStaff = false, currentKey, currentTime, staffClefs, emittedClefs) => {
+const serializeMeasure = (measure, _isFirst, currentStaff, isGrandStaff = false, currentKey, currentTime, partStaffClefs, partEmittedClefs) => {
     const parts = [];
     // Build measure context for all voices (key/time)
     // Key and time are written to first voice, clef to all voices based on staff
@@ -673,12 +699,14 @@ const serializeMeasure = (measure, _isFirst, currentStaff, isGrandStaff = false,
         key: currentKey,
         time: currentTime,
     };
-    // Pass staffClefs to parts for per-voice clef lookup
-    const clefsByStaff = staffClefs || {};
+    // Per-part clef state: each part has its own staff→clef maps so that distinct
+    // parts sharing staff number 1 do not clobber each other's clefs.
+    const clefsFor = (pi) => partStaffClefs?.[pi] || {};
+    const emittedFor = (pi) => partEmittedClefs?.[pi] || (partEmittedClefs ? (partEmittedClefs[pi] = {}) : {});
     // Parts
     let staff = currentStaff;
     if (measure.parts.length === 1) {
-        const { str: partStr, newStaff } = serializePart(measure.parts[0], staff, isGrandStaff, measureContext, true, clefsByStaff, emittedClefs);
+        const { str: partStr, newStaff } = serializePart(measure.parts[0], staff, isGrandStaff, measureContext, true, clefsFor(0), emittedFor(0));
         if (partStr) {
             parts.push(partStr);
         }
@@ -690,7 +718,7 @@ const serializeMeasure = (measure, _isFirst, currentStaff, isGrandStaff = false,
         for (let i = 0; i < measure.parts.length; i++) {
             const part = measure.parts[i];
             // Pass measureContext to all parts, isFirstPart to first part only
-            const { str, newStaff } = serializePart(part, staff, isGrandStaff, measureContext, i === 0, clefsByStaff, emittedClefs);
+            const { str, newStaff } = serializePart(part, staff, isGrandStaff, measureContext, i === 0, clefsFor(i), emittedFor(i));
             if (str) {
                 partStrs.push(str);
             }
@@ -722,6 +750,12 @@ const serializeMetadata = (metadata) => {
     if (metadata.lyricist) {
         lines.push('[lyricist "' + escapeString(metadata.lyricist) + '"]');
     }
+    if (metadata.genre) {
+        lines.push('[genre "' + escapeString(metadata.genre) + '"]');
+    }
+    if (metadata.instrument) {
+        lines.push('[instrument "' + escapeString(metadata.instrument) + '"]');
+    }
     if (metadata.autoBeam) {
         lines.push('[auto-beam "' + escapeString(metadata.autoBeam) + '"]');
     }
@@ -749,8 +783,11 @@ export const serializeLilyletDoc = (doc) => {
     let currentStaff = 1; // Parser starts at staff 1
     let currentKey;
     let currentTime;
-    const staffClefs = {}; // Track clef per staff
-    const emittedClefs = {}; // Track which clefs have been output
+    // Clefs are tracked per part (each part is an independent instrument). Voice `staff`
+    // numbers are staff-within-part, so distinct parts may both use staff 1 — keying clef
+    // state by staff alone would conflate them. Outer key = part index, inner key = staff.
+    const partStaffClefs = {};
+    const partEmittedClefs = {};
     for (let i = 0; i < doc.measures.length; i++) {
         const measure = doc.measures[i];
         // Update current key/time if measure has them
@@ -760,24 +797,31 @@ export const serializeLilyletDoc = (doc) => {
         if (measure.timeSig) {
             currentTime = measure.timeSig;
         }
-        // Collect clefs from this measure's voices
-        for (const part of measure.parts) {
-            for (const voice of part.voices) {
-                let clefActiveStaff = voice.staff;
-                for (const event of voice.events) {
-                    if (event.type === 'context') {
-                        const ctx = event;
-                        if (ctx.staff) {
-                            clefActiveStaff = ctx.staff;
-                        }
-                        if (ctx.clef) {
-                            staffClefs[clefActiveStaff] = ctx.clef;
+        // Collect clefs from this measure's voices, per part — but only AFTER serializing
+        // the measure, so that during serialization allStaffClefs reflects the clef state
+        // CARRIED IN from previous measures (a mid-measure clef change must not be hoisted
+        // to the measure's front; it is emitted inline at its position).
+        const collectClefs = () => {
+            measure.parts.forEach((part, pi) => {
+                const staffClefs = partStaffClefs[pi] || (partStaffClefs[pi] = {});
+                for (const voice of part.voices) {
+                    let clefActiveStaff = voice.staff;
+                    for (const event of voice.events) {
+                        if (event.type === 'context') {
+                            const ctx = event;
+                            if (ctx.staff) {
+                                clefActiveStaff = ctx.staff;
+                            }
+                            if (ctx.clef) {
+                                staffClefs[clefActiveStaff] = ctx.clef;
+                            }
                         }
                     }
                 }
-            }
-        }
-        const { str: measureStr, newStaff } = serializeMeasure(measure, i === 0, currentStaff, isGrandStaff, currentKey, currentTime, staffClefs, emittedClefs);
+            });
+        };
+        const { str: measureStr, newStaff } = serializeMeasure(measure, i === 0, currentStaff, isGrandStaff, currentKey, currentTime, partStaffClefs, partEmittedClefs);
+        collectClefs();
         // Always include measure, even if empty (use space rest for empty measures)
         measureStrs.push(measureStr || 's1');
         currentStaff = newStaff;

package/lib/lilylet/types.d.ts

@@ -221,7 +221,11 @@ export interface MarkupEvent {
     content: string;
     placement?: Placement;
 }
-export type Event = NoteEvent | RestEvent | ContextChange | TremoloEvent | TupletEvent | TimesEvent | PitchResetEvent | BarlineEvent | HarmonyEvent | MarkupEvent;
+export interface DynamicEvent {
+    type: 'dynamic';
+    dynamicType: DynamicType;
+}
+export type Event = NoteEvent | RestEvent | ContextChange | TremoloEvent | TupletEvent | TimesEvent | PitchResetEvent | BarlineEvent | HarmonyEvent | MarkupEvent | DynamicEvent;
 export interface Voice {
     staff: number;
     events: Event[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "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",
@@ -30,12 +30,14 @@
     "test": "tsx ./tests/parser.ts",
     "test:mei": "tsx ./tests/mei.ts",
     "test:mei-hashes": "tsx ./tests/computeMeiHashes.ts",
-    "test:unit": "tsx ./tests/unit/encodePitch.test.ts",
     "test:partial": "tsx ./tests/unit/partialWarning.test.ts",
     "test:decoder": "tsx ./tests/lilypondDecoder.ts",
     "test:abc": "tsx ./tests/abc-decoder.ts",
     "test:roundtrip": "tsx ./tests/lilypond-roundtrip.ts",
     "test:abc-svg": "tsx ./tests/abc-abcjs-svg.ts",
+    "train:bpe": "tsx ./tools/trainBpeTokenizer.ts",
+    "build:manual-tokenizer": "tsx ./tools/buildManualTokenizer.ts",
+    "test:bpe": "tsx ./tests/unit/bpeTokenizer.test.ts",
     "build:tests": "tsc -p tsconfig.tests.json; cp source/lilylet/grammar.jison.js lib-tests/source/lilylet/ && cp source/abc/grammar.jison.js lib-tests/source/abc/ && node tools/fixEsmExtensions.cjs lib-tests && ln -sfn ../../tests/assets lib-tests/tests/assets",
     "test:roundtrip:compiled": "node lib-tests/tests/lilypond-roundtrip.js",
     "ts": "tsx"

package/source/abc/abc.jison

@@ -229,6 +229,7 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <key_signature>"treble"				return 'TREBLE';
 <key_signature>"bass"				return 'BASS';
 <key_signature>"tenor"				return 'TENOR';
+<key_signature>"alto"				return 'ALTO';
 <key_signature>"none"				return 'NAME';
 <key_signature>"Dor"				return 'NAME';
 <key_signature>"Phr"				return 'NAME';
@@ -238,7 +239,7 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <key_signature>"Loc"				return 'NAME';
 <key_signature>"HP"					return 'NAME';
 <key_signature>"Hp"					return 'NAME';
-<key_signature>[a-z]+[ \t]*=[^\n\]]*	{}
+<key_signature>[a-z]+[ \t]*[=][^\n\]]*	{}
 <key_signature>[A-G]				return 'A';
 <key_signature>[A-Z][a-z]+			return 'NAME';
 <key_signature>[b]					return 'FLAT';
@@ -256,14 +257,16 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <comment>[^\n]+						{ return 'COMMENT'; }
 <comment>\n							{ this.popState(); }
 <spec_comment_name>[ \t]+			{}
-<spec_comment_name>"score"			{ this.popState(); this.pushState('spec_comment'); return 'SCORE'; }
-<spec_comment_name>"staves"			{ this.popState(); this.pushState('spec_comment'); return 'SCORE'; }
+<spec_comment_name>"score"			{ this.popState(); this.pushState('spec_comment'); this._scoreDepth = 0; return 'SCORE'; }
+<spec_comment_name>"staves"			{ this.popState(); this.pushState('spec_comment'); this._scoreDepth = 0; return 'SCORE'; }
 <spec_comment_name>[\w]+			{ this.popState(); this.pushState('spec_comment_skip'); }
 <spec_comment_name>\n				{ this.popState(); this.popState(); }
 <spec_comment>[ \t]+				{}
-<spec_comment>[(){}\[\]|]			return yytext
+<spec_comment>[([{]				{ this._scoreDepth = (this._scoreDepth || 0) + 1; return yytext; }
+<spec_comment>[)\]}]				{ this._scoreDepth = (this._scoreDepth || 0) - 1; return yytext; }
+<spec_comment>[|]					return yytext
 <spec_comment>[\w]+					return 'NN'
-<spec_comment>\n					{ this.popState(); this.popState(); return 'LAYOUT_END'; }
+<spec_comment>\n					{ if (this._scoreDepth > 0) { /* layout continues on next line */ } else { this.popState(); this.popState(); return 'LAYOUT_END'; } }
 <spec_comment_skip>[^\n]+			{}
 <spec_comment_skip>\n				{ this.popState(); this.popState(); }
 
@@ -399,6 +402,7 @@ staff_shift
 key_signature
 	: key_root							-> $1
 	| NAME								-> key(null, $1)
+	| clef								-> $1
 	;
 
 key_root
@@ -412,6 +416,11 @@ clef
 	: TREBLE							-> clef($1)
 	| BASS								-> clef($1)
 	| TENOR								-> clef($1)
+	| ALTO								-> clef($1)
+	| TREBLE plus_minus_number			-> clef($1 + ($2 < 0 ? '-' : '+') + Math.abs($2))
+	| BASS plus_minus_number			-> clef($1 + ($2 < 0 ? '-' : '+') + Math.abs($2))
+	| TENOR plus_minus_number			-> clef($1 + ($2 < 0 ? '-' : '+') + Math.abs($2))
+	| ALTO plus_minus_number			-> clef($1 + ($2 < 0 ? '-' : '+') + Math.abs($2))
 	;
 
 sharp_or_flat
@@ -460,8 +469,11 @@ voice_exp
 	: number							-> voice($1)
 	| number NAME						-> voice($1, $2)
 	| number NAME assigns				-> voice($1, $2, $3)
+	| number NAME plus_minus_number		-> voice($1, $2 + ($3 < 0 ? '-' : '+') + Math.abs($3))
+	| number NAME plus_minus_number assigns	-> voice($1, $2 + ($3 < 0 ? '-' : '+') + Math.abs($3), $4)
 	| NAME								-> voice(1, $1)
 	| NAME assigns						-> voice(1, $1, $2)
+	| NAME plus_minus_number assigns	-> voice(1, $1, $3)
 	| upper_phonet number				-> voice(1, $1 + String($2))
 	| upper_phonet number assigns		-> voice(1, $1 + String($2), $3)
 	| upper_phonet number NAME			-> voice(1, $1 + String($2))
@@ -524,6 +536,7 @@ bar
 	| ':' '|' '|' ':'					-> ':|:'
 	| '|' '|'							-> '||'
 	| '|' ']'							-> '|]'
+	| '|' ']' ':'						-> '|]'
 	| ':' '|' ']'						-> ':|]'
 	| '|' N								-> '|' + $2
 	| ':' '|' N							-> ':|' + $2
@@ -542,7 +555,6 @@ music
 	| music N							-> $1
 	| music NAME						-> $1
 	| music '^' NAME					-> $1
-	| music '^'							-> $1
 	| music '[' N						-> $1
 	;
 
@@ -586,6 +598,8 @@ articulation_content
 	| a									-> articulation($1)
 	| "^"								-> articulation($1)
 	| fingering_numbers					-> ({fingering: Number($1)})
+	| '(' fingering_numbers ')'			-> ({fingering: Number($2)})
+	| '(' fingering_numbers				-> ({fingering: Number($2)})
 	| tremolo							-> ({tremolo: $1})
 	| tremolo '-'						-> ({tremolo: $1})	// unknown meaning of '-'?
 	;