@k-l-lambda/lilylet 0.1.53 → 0.1.55

package/lib/lilylet/grammar.jison.js

@@ -329,7 +329,7 @@ case 92:
 this.$ = 'auto';
 break;
 case 93:
-this.$ = ($$[$0-1].filter(e => e.type === 'note' || e.type === 'rest').map(e => ({ ...e, grace: true })));
+this.$ = ($$[$0-1].map(e => (e.type === 'note' || e.type === 'rest') ? { ...e, grace: true } : e));
 break;
 case 94: case 95:
 this.$ = ({ ...$$[$0], grace: true });

package/lib/lilylet/meiEncoder.js

@@ -754,15 +754,35 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
         }
         return true;
     };
+    let graceBeamOpen = false; // Whether a grace note <beam> is open (independent of main beam)
     for (const event of voice.events) {
         // Check for beam start/end in this event (including inside tuplets)
         const { beamStart, beamEnd } = getEventBeamMarks(event);
-        // Open beam element if beam starts
-        if (beamStart && !beamElementOpen) {
-            xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
-            beamElementOpen = true;
+        // Grace notes have independent beam groups - don't interfere with main beam
+        const isGraceNote = event.type === 'note' && event.grace;
+        if (isGraceNote) {
+            // Grace beam: open/close independently, nested inside parent beam if open
+            const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+            if (beamStart && !graceBeamOpen) {
+                xml += `${graceBaseIndent}<beam xml:id="${generateId('beam')}">\n`;
+                graceBeamOpen = true;
+            }
+        }
+        else {
+            // Close any open grace beam before processing a non-grace event
+            if (graceBeamOpen) {
+                const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+                xml += `${graceBaseIndent}</beam>\n`;
+                graceBeamOpen = false;
+            }
+            // Open main beam element if beam starts
+            if (beamStart && !beamElementOpen) {
+                xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
+                beamElementOpen = true;
+            }
         }
-        const currentIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+        const graceIndentBase = beamElementOpen ? baseIndent + '    ' : baseIndent;
+        const currentIndent = graceBeamOpen ? graceIndentBase + '    ' : (beamElementOpen ? baseIndent + '    ' : baseIndent);
         switch (event.type) {
             case 'note': {
                 const noteEvent = event;
@@ -921,9 +941,13 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
             case 'context': {
                 const ctx = event;
                 // Check for clef changes - emit <clef> element only if different from current
+                // and only when on the home staff (don't emit cross-staff clefs into this layer)
                 if (ctx.clef && ctx.clef !== currentClef) {
-                    const clefInfo = CLEF_SHAPES[ctx.clef] || CLEF_SHAPES.treble;
-                    xml += `${currentIndent}<clef xml:id="${generateId('clef')}" shape="${clefInfo.shape}" line="${clefInfo.line}" />\n`;
+                    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`;
+                    }
                     currentClef = ctx.clef;
                 }
                 // Check for ottava changes
@@ -1002,11 +1026,25 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 break;
         }
         // Close beam element if beam ends
-        if (beamEnd && beamElementOpen) {
-            xml += `${baseIndent}</beam>\n`;
-            beamElementOpen = false;
+        if (beamEnd) {
+            if (isGraceNote && graceBeamOpen) {
+                // Close grace beam
+                const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+                xml += `${graceBaseIndent}</beam>\n`;
+                graceBeamOpen = false;
+            }
+            else if (!isGraceNote && beamElementOpen) {
+                // Close main beam
+                xml += `${baseIndent}</beam>\n`;
+                beamElementOpen = false;
+            }
         }
     }
+    // Close any unclosed grace beam
+    if (graceBeamOpen) {
+        const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+        xml += `${graceBaseIndent}</beam>\n`;
+    }
     // Close any unclosed beam
     if (beamElementOpen) {
         xml += `${baseIndent}</beam>\n`;
@@ -1432,15 +1470,19 @@ const analyzePartStructure = (doc) => {
         for (let pi = 0; pi < measure.parts.length; pi++) {
             const part = measure.parts[pi];
             for (const voice of part.voices) {
-                const localStaff = voice.staff || 1;
-                partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, localStaff);
-                // Get FIRST clef from context changes (for initial staffDef)
+                let currentStaff = voice.staff || 1;
+                partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, currentStaff);
+                // Scan context changes for staff switches and clefs
                 for (const event of voice.events) {
                     if (event.type === 'context') {
                         const ctx = event;
-                        if (ctx.clef && !partInfos[pi].clefs[localStaff]) {
-                            // Only set if not already set - take the FIRST clef
-                            partInfos[pi].clefs[localStaff] = ctx.clef;
+                        if (ctx.staff !== undefined) {
+                            currentStaff = ctx.staff;
+                            partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, currentStaff);
+                        }
+                        if (ctx.clef && !partInfos[pi].clefs[currentStaff]) {
+                            // Only set if not already set - take the FIRST clef per staff
+                            partInfos[pi].clefs[currentStaff] = ctx.clef;
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "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/grammar.jison.js

@@ -329,7 +329,7 @@ case 92:
 this.$ = 'auto';
 break;
 case 93:
-this.$ = ($$[$0-1].filter(e => e.type === 'note' || e.type === 'rest').map(e => ({ ...e, grace: true })));
+this.$ = ($$[$0-1].map(e => (e.type === 'note' || e.type === 'rest') ? { ...e, grace: true } : e));
 break;
 case 94: case 95:
 this.$ = ({ ...$$[$0], grace: true });

package/source/lilylet/lilylet.jison

@@ -501,7 +501,7 @@ stem_cmd
 	;
 
 grace_event
-	: CMD_GRACE '{' voice_events '}'			-> ($3.filter(e => e.type === 'note' || e.type === 'rest').map(e => ({ ...e, grace: true })))
+	: CMD_GRACE '{' voice_events '}'			-> ($3.map(e => (e.type === 'note' || e.type === 'rest') ? { ...e, grace: true } : e))
 	| CMD_GRACE note_event						-> ({ ...$2, grace: true })
 	| CMD_GRACE rest_event						-> ({ ...$2, grace: true })
 	;

package/source/lilylet/meiEncoder.ts

@@ -1031,17 +1031,39 @@ const encodeLayer = (voice: Voice, layerN: number, indent: string, initialTiePit
 		return true;
 	};
 
+	let graceBeamOpen = false;  // Whether a grace note <beam> is open (independent of main beam)
+
 	for (const event of voice.events) {
 		// Check for beam start/end in this event (including inside tuplets)
 		const { beamStart, beamEnd } = getEventBeamMarks(event);
 
-		// Open beam element if beam starts
-		if (beamStart && !beamElementOpen) {
-			xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
-			beamElementOpen = true;
+		// Grace notes have independent beam groups - don't interfere with main beam
+		const isGraceNote = event.type === 'note' && (event as NoteEvent).grace;
+
+		if (isGraceNote) {
+			// Grace beam: open/close independently, nested inside parent beam if open
+			const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+			if (beamStart && !graceBeamOpen) {
+				xml += `${graceBaseIndent}<beam xml:id="${generateId('beam')}">\n`;
+				graceBeamOpen = true;
+			}
+		} else {
+			// Close any open grace beam before processing a non-grace event
+			if (graceBeamOpen) {
+				const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+				xml += `${graceBaseIndent}</beam>\n`;
+				graceBeamOpen = false;
+			}
+
+			// Open main beam element if beam starts
+			if (beamStart && !beamElementOpen) {
+				xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
+				beamElementOpen = true;
+			}
 		}
 
-		const currentIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+		const graceIndentBase = beamElementOpen ? baseIndent + '    ' : baseIndent;
+		const currentIndent = graceBeamOpen ? graceIndentBase + '    ' : (beamElementOpen ? baseIndent + '    ' : baseIndent);
 
 		switch (event.type) {
 			case 'note': {
@@ -1214,9 +1236,13 @@ const encodeLayer = (voice: Voice, layerN: number, indent: string, initialTiePit
 			case 'context': {
 				const ctx = event as ContextChange;
 				// Check for clef changes - emit <clef> element only if different from current
+				// and only when on the home staff (don't emit cross-staff clefs into this layer)
 				if (ctx.clef && ctx.clef !== currentClef) {
-					const clefInfo = CLEF_SHAPES[ctx.clef] || CLEF_SHAPES.treble;
-					xml += `${currentIndent}<clef xml:id="${generateId('clef')}" shape="${clefInfo.shape}" line="${clefInfo.line}" />\n`;
+					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`;
+					}
 					currentClef = ctx.clef;
 				}
 				// Check for ottava changes
@@ -1292,12 +1318,26 @@ const encodeLayer = (voice: Voice, layerN: number, indent: string, initialTiePit
 		}
 
 		// Close beam element if beam ends
-		if (beamEnd && beamElementOpen) {
-			xml += `${baseIndent}</beam>\n`;
-			beamElementOpen = false;
+		if (beamEnd) {
+			if (isGraceNote && graceBeamOpen) {
+				// Close grace beam
+				const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+				xml += `${graceBaseIndent}</beam>\n`;
+				graceBeamOpen = false;
+			} else if (!isGraceNote && beamElementOpen) {
+				// Close main beam
+				xml += `${baseIndent}</beam>\n`;
+				beamElementOpen = false;
+			}
 		}
 	}
 
+	// Close any unclosed grace beam
+	if (graceBeamOpen) {
+		const graceBaseIndent = beamElementOpen ? baseIndent + '    ' : baseIndent;
+		xml += `${graceBaseIndent}</beam>\n`;
+	}
+
 	// Close any unclosed beam
 	if (beamElementOpen) {
 		xml += `${baseIndent}</beam>\n`;
@@ -1796,16 +1836,20 @@ const analyzePartStructure = (doc: LilyletDoc): PartInfo[] => {
 		for (let pi = 0; pi < measure.parts.length; pi++) {
 			const part = measure.parts[pi];
 			for (const voice of part.voices) {
-				const localStaff = voice.staff || 1;
-				partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, localStaff);
+				let currentStaff = voice.staff || 1;
+				partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, currentStaff);
 
-				// Get FIRST clef from context changes (for initial staffDef)
+				// Scan context changes for staff switches and clefs
 				for (const event of voice.events) {
 					if (event.type === 'context') {
 						const ctx = event as ContextChange;
-						if (ctx.clef && !partInfos[pi].clefs[localStaff]) {
-							// Only set if not already set - take the FIRST clef
-							partInfos[pi].clefs[localStaff] = ctx.clef;
+						if (ctx.staff !== undefined) {
+							currentStaff = ctx.staff;
+							partInfos[pi].maxStaff = Math.max(partInfos[pi].maxStaff, currentStaff);
+						}
+						if (ctx.clef && !partInfos[pi].clefs[currentStaff]) {
+							// Only set if not already set - take the FIRST clef per staff
+							partInfos[pi].clefs[currentStaff] = ctx.clef;
 						}
 					}
 				}