@k-l-lambda/lilylet 0.1.68 → 0.1.69

package/lib/lilylet/abcDecoder.js

@@ -681,7 +681,7 @@ const processBarPatch = (patch, unitLength, slurDepth, pitchCtx) => {
         }
         // Grace notes
         if (term.grace) {
-            const graceEvents = convertGraceEvents(term, unitLength);
+            const graceEvents = convertGraceEvents(term, unitLength, pitchCtx);
             events.push(...graceEvents);
             i++;
             continue;
@@ -852,7 +852,7 @@ const convertEventTerm = (eventTerm, unitLength, pendingMarks, pendingContextCha
 /**
  * Convert grace notes to NoteEvents with grace flag
  */
-const convertGraceEvents = (graceTerm, unitLength) => {
+const convertGraceEvents = (graceTerm, unitLength, pitchCtx) => {
     const events = [];
     if (!graceTerm.events)
         return events;
@@ -862,7 +862,7 @@ const convertGraceEvents = (graceTerm, unitLength) => {
             const chord = eventData.chord;
             if (!chord || !chord.pitches)
                 continue;
-            const pitches = chord.pitches.filter((p) => p.phonet !== "z" && p.phonet !== "Z" && p.phonet !== "x").map(convertPitch);
+            const pitches = chord.pitches.filter((p) => p.phonet !== "z" && p.phonet !== "Z" && p.phonet !== "x").map((p) => convertPitch(p, pitchCtx));
             if (pitches.length === 0)
                 continue;
             const duration = convertDuration(eventData.duration, unitLength);

package/lib/lilylet/serializer.js

@@ -199,11 +199,12 @@ const serializeMarks = (marks) => {
     return parts.join('');
 };
 // Serialize a note event with pitch environment tracking
-const serializeNoteEvent = (event, env, prevDuration) => {
+const serializeNoteEvent = (event, env, prevDuration, suppressGracePrefix = false) => {
     const parts = [];
     let currentEnv = env;
-    // Grace note prefix
-    if (event.grace) {
+    // Grace note prefix. When the caller groups consecutive grace notes into a single
+    // scoped \grace { ... }, it suppresses the per-note prefix and emits the wrapper.
+    if (event.grace && !suppressGracePrefix) {
         parts.push('\\grace ');
     }
     // Single note or chord
@@ -440,10 +441,10 @@ const serializeBarlineEvent = (event) => {
     return '';
 };
 // Serialize a single event with pitch environment tracking
-const serializeEvent = (event, env, prevDuration) => {
+const serializeEvent = (event, env, prevDuration, suppressGracePrefix = false) => {
     switch (event.type) {
         case 'note':
-            return serializeNoteEvent(event, env, prevDuration);
+            return serializeNoteEvent(event, env, prevDuration, suppressGracePrefix);
         case 'rest':
             return serializeRestEvent(event, env, prevDuration);
         case 'context':
@@ -576,6 +577,7 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
     }
     let activeStaff = effectiveInitialStaff;
     let activeStemDir;
+    let graceGroupOpen = false; // whether a scoped \grace { ... } is currently open
     for (let eventIdx = 0; eventIdx < voice.events.length; eventIdx++) {
         const event = voice.events[eventIdx];
         // Skip leading context-staff events already absorbed into effectiveInitialStaff
@@ -639,7 +641,18 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
                 activeStemDir = stemDir;
             }
         }
-        const { str: eventStr, newEnv } = serializeEvent(event, pitchEnv, prevDuration);
+        const isGraceNote = event.type === 'note' && !!event.grace;
+        // Group consecutive grace notes into one scoped \grace { ... } instead of
+        // emitting a separate \grace prefix per note.
+        if (isGraceNote && !graceGroupOpen) {
+            parts.push('\\grace {');
+            graceGroupOpen = true;
+        }
+        else if (!isGraceNote && graceGroupOpen) {
+            parts.push('}');
+            graceGroupOpen = false;
+        }
+        const { str: eventStr, newEnv } = serializeEvent(event, pitchEnv, prevDuration, graceGroupOpen);
         pitchEnv = newEnv;
         if (eventStr) {
             parts.push(eventStr);
@@ -663,6 +676,10 @@ const serializeVoice = (voice, currentStaff, isGrandStaff = false, measureContex
             emittedClefs[ctx.staff || activeStaff] = ctx.clef;
         }
     }
+    // Close a grace group left open at the end of the voice (unusual but possible).
+    if (graceGroupOpen) {
+        parts.push('}');
+    }
     return { str: parts.join(' '), newStaff: voice.staff };
 };
 // Serialize a part, tracking staff state across voices

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "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/abc/abc.jison

@@ -37,14 +37,14 @@
 
 	const patch = (terms, bar) => {
 		const control = {};
-		terms.forEach(term => {
+		(terms || []).forEach(term => {
 			if (term.control)
 				control[term.control.name] = term.control.value;
 		});
 
 		return {
 			control,
-			terms,
+			terms: terms || [],
 			bar,
 		};
 	};
@@ -195,10 +195,10 @@ Am									\b[A-G](?=[m][a][j]|[m][i][n]\b)
 a									\b[a-g](?=[\W\d\sA-Ga-g_yzHJLMOPRSTuv]*\b)
 z									\b[z]
 Z									\b[Z]
-x									\b[x](?=[\W\d\s])
+x									\b[x](?=[\W\d\s]|[_^=]*[A-Ga-g])
 y									\b[y]
 N									[0-9]
-P									\b[HJLMOPRSTuv](?=[A-Ga-g][A-Ga-g0-9]*\b)
+P									\b[HJLMOPRSTuv](?=[_^=]*[A-Ga-g][A-Ga-g0-9_^=,']*)
 PP									\b[HJLMOPRSTuv](?=[xz!\[^_=\s"])
 
 SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
@@ -211,8 +211,8 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <string>\\\"						return 'STR_CONTENT'
 <string>[^"]+						return 'STR_CONTENT'
 
-^[T][:][\s]*						{ this.pushState('title_string'); return 'T:'; }
-^[C][:][\s]*						{ this.pushState('title_string'); return 'C:'; }
+^[T][:][\s]*						{ var pre = this.matched.slice(0, this.matched.length - yytext.length); if (pre === '' || pre.slice(-1) === '\n') { this.pushState('title_string'); return 'T:'; } this.unput(yytext.slice(1)); yytext = 'T'; return 'T'; }
+^[C][:][\s]*						{ var pre = this.matched.slice(0, this.matched.length - yytext.length); if (pre === '' || pre.slice(-1) === '\n') { this.pushState('title_string'); return 'C:'; } this.unput(yytext.slice(1)); yytext = 'C'; return 'A'; }
 <title_string>\n					{ this.popState(); }
 <title_string>[^\n]+				return 'STR_CONTENT'
 
@@ -226,10 +226,10 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <voice_header>[ \t]+				{}
 <voice_header>\n					{ this.popState(); }
 <voice_header>\]					{ this.popState(); return ']'; }
-<key_signature>"treble"				return 'TREBLE';
-<key_signature>"bass"				return 'BASS';
-<key_signature>"tenor"				return 'TENOR';
-<key_signature>"alto"				return 'ALTO';
+<key_signature>"treble"[0-9]*		return 'TREBLE';
+<key_signature>"bass"[0-9]*			return 'BASS';
+<key_signature>"tenor"[0-9]*		return 'TENOR';
+<key_signature>"alto"[0-9]*			return 'ALTO';
 <key_signature>"none"				return 'NAME';
 <key_signature>"Dor"				return 'NAME';
 <key_signature>"Phr"				return 'NAME';
@@ -262,9 +262,10 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 <spec_comment_name>[\w]+			{ this.popState(); this.pushState('spec_comment_skip'); }
 <spec_comment_name>\n				{ this.popState(); this.popState(); }
 <spec_comment>[ \t]+				{}
-<spec_comment>[([{]				{ this._scoreDepth = (this._scoreDepth || 0) + 1; 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>[A-Z][:]				{ this.popState(); this.popState(); this.unput(yytext); return 'LAYOUT_END'; }
 <spec_comment>[\w]+					return 'NN'
 <spec_comment>\n					{ if (this._scoreDepth > 0) { /* layout continues on next line */ } else { this.popState(); this.popState(); return 'LAYOUT_END'; } }
 <spec_comment_skip>[^\n]+			{}
@@ -467,6 +468,7 @@ numeric_tempo
 
 voice_exp
 	: number							-> voice($1)
+	| number assigns					-> voice($1, null, $2)
 	| 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))
@@ -539,10 +541,18 @@ bar
 	| '|' ']' ':'						-> '|]'
 	| ':' '|' ']'						-> ':|]'
 	| '|' N								-> '|' + $2
+	| '|' N volta_rest					-> '|' + $2 + $3
 	| ':' '|' N							-> ':|' + $2
+	| ':' '|' N volta_rest				-> ':|' + $2 + $3
 	| '&'								-> '&'
 	;
 
+// Additional volta endings after the first number, comma-separated: "1,2", "1,2,3".
+volta_rest
+	: ',' N								-> ',' + $2
+	| volta_rest ',' N					-> $1 + ',' + $3
+	;
+
 music
 	: %empty							-> []
 	| music expressive_mark				-> $1 ? [...$1, $2] : [$2]
@@ -555,9 +565,17 @@ music
 	| music N							-> $1
 	| music NAME						-> $1
 	| music '^' NAME					-> $1
+	| music '^' articulation_letter		-> $1
 	| music '[' N						-> $1
 	;
 
+// Articulation-class letters (P macro: HJLMOPRSTuv). After a stray '^' inside a
+// text annotation, a word like "Menuetto"/"Largo" starts with one of these and the
+// lexer emits it as the articulation token, not NAME — swallow it like '^' NAME.
+articulation_letter
+	: 'P' | 'T' | 'H' | 'J' | 'L' | 'M' | 'R' | 'O' | 'S' | 'u' | 'v'
+	;
+
 control
 	: '[' H ':' header_value ']'		-> ({control: header($2, $4)})
 	| '[' 'K:' header_value ']'			-> ({control: header("K", $3)})
@@ -756,7 +774,14 @@ duration
 	: number '/' number					-> frac(Number($1), Number($3))
 	| '/' number						-> frac(1, Number($2))
 	| number							-> frac(Number($1))
-	| '/'								-> frac(1, 2)
+	| slashes							-> frac(1, Math.pow(2, $1))
+	| number slashes					-> frac(Number($1), Math.pow(2, $2))
+	;
+
+// One or more '/' halve the unit length each: '/'=1/2, '//'=1/4, '///'=1/8.
+slashes
+	: '/'								-> 1
+	| slashes '/'						-> $1 + 1
 	;
 
 broken_rhythm