@k-l-lambda/lilylet 0.1.57 → 0.1.59

package/lib/lilylet/lilypondDecoder.js

@@ -451,7 +451,8 @@ const parseLilyDocument = (lilyDocument) => {
                 // Update key/time from context on music events
                 if (term instanceof lilyParser.MusicEvent ||
                     term instanceof lilyParser.LilyTerms.StemDirection ||
-                    term instanceof lilyParser.LilyTerms.OctaveShift) {
+                    term instanceof lilyParser.LilyTerms.OctaveShift ||
+                    term instanceof lilyParser.LilyTerms.Change) {
                     if (context.key && measure.key === null) {
                         measure.key = context.key.key;
                     }
@@ -585,6 +586,7 @@ const parseLilyDocument = (lilyDocument) => {
                         const restEvent = {
                             type: 'rest',
                             duration: convertDuration(term.durationValue),
+                            fullMeasure: (term.name === 'R') || undefined,
                             invisible: term.isSpacer || undefined,
                         };
                         voice.events.push(restEvent);
@@ -625,10 +627,21 @@ const parseLilyDocument = (lilyDocument) => {
                         lastOttava = term.value;
                     }
                 }
-                // Handle staff change
+                // Handle staff change (\change Staff = "N")
+                // args[0] is Assignment { key: "Staff", value: { exp: '"N"' } }
                 else if (term instanceof lilyParser.LilyTerms.Change) {
-                    // Ignore \change Staff commands - staff is fixed per track
-                    // (Cross-staff notation is not supported in this decoder)
+                    const assignment = term.args?.[0];
+                    if (assignment?.key === 'Staff') {
+                        // exp is like '"2"' — strip surrounding quotes then parse strictly
+                        const exp = assignment?.value?.exp ?? '';
+                        const raw = exp.replace(/^"|"$/g, '');
+                        // Only accept pure integer staff names (e.g. "1", "2")
+                        // Reject compound names like "1_2", "RH", "LH"
+                        const staffNum = /^\d+$/.test(raw) ? parseInt(raw, 10) : NaN;
+                        if (!isNaN(staffNum)) {
+                            voice.events.push({ type: 'context', staff: staffNum });
+                        }
+                    }
                 }
                 // Handle tempo
                 else if (term instanceof lilyParser.LilyTerms.Tempo) {

package/lib/lilylet/serializer.js

@@ -439,10 +439,13 @@ const serializeEvent = (event, env, prevDuration) => {
 };
 // Find first clef in voice events
 const findVoiceClef = (voice) => {
+    let activeStaff = voice.staff;
     for (const event of voice.events) {
         if (event.type === 'context') {
             const ctx = event;
-            if (ctx.clef) {
+            if (ctx.staff)
+                activeStaff = ctx.staff;
+            if (ctx.clef && activeStaff === voice.staff) {
                 return ctx.clef;
             }
         }
@@ -500,10 +503,21 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
     for (const event of voice.events) {
         if (event.type === 'context') {
             const ctx = event;
-            // Skip context events that belong to a different staff (cross-staff clef/ottava)
-            if (ctx.staff && ctx.staff !== voice.staff) {
+            // Cross-staff context: update activeStaff and emit \staff directive
+            if (ctx.staff && ctx.staff !== activeStaff) {
+                activeStaff = ctx.staff;
+                parts.push('\\staff "' + activeStaff + '"');
+                // 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] + '"');
+                    if (emittedClefs)
+                        emittedClefs[activeStaff] = ctxClef;
+                }
                 continue;
             }
+            if (ctx.staff)
+                continue; // same staff, no-op for staff field; clef handled below
             // 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) {
                 continue;
@@ -511,8 +525,8 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
         }
         if (event.type === 'note') {
             const noteEvt = event;
-            // Cross-staff: emit \staff when note's effective staff differs from active
-            const effectiveStaff = noteEvt.staff || voice.staff;
+            // Cross-staff via explicit note.staff (lilylet native cross-staff)
+            const effectiveStaff = noteEvt.staff || activeStaff;
             if (effectiveStaff !== activeStaff) {
                 activeStaff = effectiveStaff;
                 parts.push('\\staff "' + activeStaff + '"');
@@ -679,12 +693,16 @@ export const serializeLilyletDoc = (doc) => {
         // 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' && event.clef) {
+                    if (event.type === 'context') {
                         const ctx = event;
-                        // Use the event's staff if specified (cross-staff), otherwise the voice's staff
-                        const clefStaff = ctx.staff || voice.staff;
-                        staffClefs[clefStaff] = ctx.clef;
+                        if (ctx.staff) {
+                            clefActiveStaff = ctx.staff;
+                        }
+                        if (ctx.clef) {
+                            staffClefs[clefActiveStaff] = ctx.clef;
+                        }
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.57",
+  "version": "0.1.59",
   "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/lilypondDecoder.ts

@@ -556,7 +556,8 @@ const parseLilyDocument = (lilyDocument: lilyParser.LilyDocument): ParsedMeasure
 				// Update key/time from context on music events
 				if (term instanceof lilyParser.MusicEvent ||
 					term instanceof lilyParser.LilyTerms.StemDirection ||
-					term instanceof lilyParser.LilyTerms.OctaveShift) {
+					term instanceof lilyParser.LilyTerms.OctaveShift ||
+					term instanceof lilyParser.LilyTerms.Change) {
 
 					if (context.key && measure.key === null) {
 						measure.key = context.key.key;
@@ -708,6 +709,7 @@ const parseLilyDocument = (lilyDocument: lilyParser.LilyDocument): ParsedMeasure
 						const restEvent: RestEvent = {
 							type: 'rest',
 							duration: convertDuration(term.durationValue),
+							fullMeasure: (term.name === 'R') || undefined,
 							invisible: term.isSpacer || undefined,
 						};
 
@@ -749,10 +751,21 @@ const parseLilyDocument = (lilyDocument: lilyParser.LilyDocument): ParsedMeasure
 						lastOttava = term.value;
 					}
 				}
-				// Handle staff change
+				// Handle staff change (\change Staff = "N")
+				// args[0] is Assignment { key: "Staff", value: { exp: '"N"' } }
 				else if (term instanceof lilyParser.LilyTerms.Change) {
-					// Ignore \change Staff commands - staff is fixed per track
-					// (Cross-staff notation is not supported in this decoder)
+					const assignment = (term as any).args?.[0];
+					if (assignment?.key === 'Staff') {
+						// exp is like '"2"' — strip surrounding quotes then parse strictly
+						const exp: string = assignment?.value?.exp ?? '';
+						const raw = exp.replace(/^"|"$/g, '');
+						// Only accept pure integer staff names (e.g. "1", "2")
+						// Reject compound names like "1_2", "RH", "LH"
+						const staffNum = /^\d+$/.test(raw) ? parseInt(raw, 10) : NaN;
+						if (!isNaN(staffNum)) {
+							voice.events.push({ type: 'context', staff: staffNum } as any);
+						}
+					}
 				}
 				// Handle tempo
 				else if (term instanceof lilyParser.LilyTerms.Tempo) {

package/source/lilylet/serializer.ts

@@ -574,10 +574,12 @@ interface MeasureContext {
 
 // Find first clef in voice events
 const findVoiceClef = (voice: Voice): Clef | undefined => {
+	let activeStaff = voice.staff;
 	for (const event of voice.events) {
 		if (event.type === 'context') {
 			const ctx = event as ContextChange;
-			if (ctx.clef) {
+			if (ctx.staff) activeStaff = ctx.staff;
+			if (ctx.clef && activeStaff === voice.staff) {
 				return ctx.clef;
 			}
 		}
@@ -648,10 +650,19 @@ const serializeVoice = (
 	for (const event of voice.events) {
 		if (event.type === 'context') {
 			const ctx = event as ContextChange;
-			// Skip context events that belong to a different staff (cross-staff clef/ottava)
-			if (ctx.staff && ctx.staff !== voice.staff) {
+			// Cross-staff context: update activeStaff and emit \staff directive
+			if (ctx.staff && ctx.staff !== activeStaff) {
+				activeStaff = ctx.staff;
+				parts.push('\\staff "' + activeStaff + '"');
+				// 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] + '"');
+					if (emittedClefs) emittedClefs[activeStaff] = ctxClef;
+				}
 				continue;
 			}
+			if (ctx.staff) continue;  // same staff, no-op for staff field; clef handled below
 			// 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) {
 				continue;
@@ -661,8 +672,8 @@ const serializeVoice = (
 		if (event.type === 'note') {
 			const noteEvt = event as NoteEvent;
 
-			// Cross-staff: emit \staff when note's effective staff differs from active
-			const effectiveStaff = noteEvt.staff || voice.staff;
+			// Cross-staff via explicit note.staff (lilylet native cross-staff)
+			const effectiveStaff = noteEvt.staff || activeStaff;
 			if (effectiveStaff !== activeStaff) {
 				activeStaff = effectiveStaff;
 				parts.push('\\staff "' + activeStaff + '"');
@@ -872,12 +883,16 @@ export const serializeLilyletDoc = (doc: LilyletDoc): string => {
 		// 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' && (event as ContextChange).clef) {
+					if (event.type === 'context') {
 						const ctx = event as ContextChange;
-						// Use the event's staff if specified (cross-staff), otherwise the voice's staff
-						const clefStaff = ctx.staff || voice.staff;
-						staffClefs[clefStaff] = ctx.clef!;
+						if (ctx.staff) {
+							clefActiveStaff = ctx.staff;
+						}
+						if (ctx.clef) {
+							staffClefs[clefActiveStaff] = ctx.clef;
+						}
 					}
 				}
 			}