@k-l-lambda/lilylet 0.1.57 → 0.1.58

package/lib/lilylet/lilypondDecoder.js

@@ -585,6 +585,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);

package/lib/lilylet/serializer.js

@@ -500,10 +500,14 @@ 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 + '"');
                 continue;
             }
+            if (ctx.staff)
+                continue; // same staff, no-op
             // 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 +515,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 +683,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.58",
   "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

@@ -708,6 +708,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,
 						};
 

package/source/lilylet/serializer.ts

@@ -648,10 +648,13 @@ 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 + '"');
 				continue;
 			}
+			if (ctx.staff) continue;  // same staff, no-op
 			// 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 +664,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 +875,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;
+						}
 					}
 				}
 			}