@k-l-lambda/lilylet 0.1.62 → 0.1.63

package/lib/lilylet/abcDecoder.js

@@ -695,13 +695,13 @@ const convertEventTerm = (eventTerm, unitLength, pendingMarks, pendingContextCha
         return undefined;
     const firstPitch = chord.pitches[0];
     // Check if rest
-    if (firstPitch.phonet === "z" || firstPitch.phonet === "Z" || firstPitch.phonet === "x") {
+    if (firstPitch.phonet === "z" || firstPitch.phonet === "Z" || firstPitch.phonet === "x" || firstPitch.phonet === "y") {
         const duration = convertDuration(eventData.duration, unitLength);
         const rest = {
             type: "rest",
             duration,
         };
-        if (firstPitch.phonet === "x") {
+        if (firstPitch.phonet === "x" || firstPitch.phonet === "y") {
             rest.invisible = true;
         }
         if (firstPitch.phonet === "Z") {
@@ -712,7 +712,7 @@ const convertEventTerm = (eventTerm, unitLength, pendingMarks, pendingContextCha
         return rest;
     }
     // Note or chord
-    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" && p.phonet !== "y").map(convertPitch);
     if (pitches.length === 0)
         return undefined;
     const duration = convertDuration(eventData.duration, unitLength);
@@ -781,6 +781,14 @@ const decodeTune = (tune) => {
     let tempo;
     const voiceConfigs = new Map();
     const voiceClefs = new Map();
+    // Pre-scan for unit length (needed for bare Q: tempo)
+    for (const h of headers) {
+        const hdr = h;
+        if (hdr.name === "L" && hdr.value?.numerator && hdr.value?.denominator) {
+            unitLength = hdr.value;
+            break;
+        }
+    }
     for (const h of headers) {
         if (h.comment)
             continue;
@@ -822,25 +830,45 @@ const decodeTune = (tune) => {
                     tempo = { beat: beatDuration, bpm: header.value.bpm };
                 }
                 else if (typeof header.value === "number") {
-                    tempo = { bpm: header.value };
+                    const beat = convertDuration({ numerator: 1, denominator: 1 }, unitLength);
+                    tempo = { beat, bpm: header.value };
                 }
                 break;
             case "V": {
                 const voiceValue = header.value;
                 if (voiceValue) {
-                    const voiceNum = typeof voiceValue === "number" ? voiceValue :
-                        (voiceValue.name || 1);
-                    const clefStr = typeof voiceValue === "string" ? voiceValue :
-                        (voiceValue.clef || undefined);
-                    voiceConfigs.set(voiceNum, {
-                        name: voiceNum,
+                    let voiceId;
+                    let clefStr;
+                    if (typeof voiceValue === "number") {
+                        voiceId = voiceValue;
+                    }
+                    else if (typeof voiceValue === "string") {
+                        voiceId = voiceValue;
+                    }
+                    else {
+                        const rawClef = (voiceValue.clef || "").replace(/,+$/, "").trim();
+                        const isKnownClef = !!convertClef(rawClef);
+                        if (isKnownClef) {
+                            // V:1 treble  → voiceId=number, clef=treble
+                            voiceId = voiceValue.name || 1;
+                            clefStr = rawClef;
+                        }
+                        else {
+                            // V:S clef=treble  → voiceId=voiceName, clef from properties
+                            voiceId = rawClef || voiceValue.name || 1;
+                            const propClef = (voiceValue.properties?.clef || "").replace(/,+$/, "").trim();
+                            clefStr = propClef || undefined;
+                        }
+                    }
+                    voiceConfigs.set(voiceId, {
+                        name: typeof voiceId === "number" ? voiceId : 1,
                         clef: clefStr,
-                        properties: voiceValue.properties,
+                        properties: voiceValue?.properties,
                     });
                     if (clefStr) {
                         const clef = convertClef(clefStr);
                         if (clef)
-                            voiceClefs.set(voiceNum, clef);
+                            voiceClefs.set(voiceId, clef);
                     }
                 }
                 break;

package/lib/lilylet/lilypondEncoder.js

@@ -469,6 +469,9 @@ const encodeTupletEvent = (event, env, lastDuration) => {
             newEnv = ne;
             newDuration = nd;
         }
+        else if (subEvent.type === 'context') {
+            result += encodeContextChange(subEvent) + ' ';
+        }
     }
     result += '}';
     return { str: result, newEnv, newDuration };

package/lib/lilylet/meiEncoder.js

@@ -538,7 +538,7 @@ const tupletHasInternalBeams = (event) => {
     return starts > 0 && starts === ends;
 };
 // Convert TupletEvent to MEI
-const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff, ottavaShift = 0, inParentBeam = false, measureAccidentals) => {
+const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff, ottavaShift = 0, inParentBeam = false, measureAccidentals, currentClef) => {
     // LilyPond \times 2/3 means "multiply duration by 2/3"
     // So 3 notes × 2/3 = 2 beats worth (3 in time of 2)
     // MEI: num = number of notes written, numbase = normal equivalent
@@ -561,6 +561,8 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
     // Handle internal beam groups: if notes have manual beam marks, respect them
     const hasInternalBeams = !inParentBeam && tupletHasInternalBeams(event);
     let beamOpen = false;
+    let activeClef = currentClef;
+    let endingClef;
     for (const e of event.events) {
         if (e.type === 'note') {
             const noteEvent = e;
@@ -607,13 +609,27 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
             const restIndent = beamOpen ? baseIndent + '    ' : baseIndent;
             xml += restEventToMEI(e, restIndent, keyFifths, ottavaShift, measureAccidentals);
         }
+        else if (e.type === 'context') {
+            const ctx = e;
+            if (ctx.clef && ctx.clef !== activeClef) {
+                const layerStaffNum = layerStaff || 1;
+                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`;
+                }
+                activeClef = ctx.clef;
+                endingClef = ctx.clef;
+            }
+        }
     }
     // Close any unclosed beam
     if (beamOpen) {
         xml += `${baseIndent}</beam>\n`;
     }
     xml += `${indent}</tuplet>\n`;
-    return { xml, firstNoteId, slurStarts, slurEnds, dynamics, fermatas, trills, mordents, turns, arpeggios };
+    return { xml, firstNoteId, slurStarts, slurEnds, dynamics, fermatas, trills, mordents, turns, arpeggios, endingClef };
 };
 // Convert TremoloEvent to MEI (fingered tremolo - alternating between two notes)
 const tremoloEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0, measureAccidentals) => {
@@ -688,7 +704,7 @@ const getEventBeamMarks = (event) => {
         const markOptions = extractMarkOptions(event.marks);
         return { beamStart: markOptions.beamStart, beamEnd: markOptions.beamEnd };
     }
-    if (event.type === 'tuplet') {
+    if (event.type === 'tuplet' || event.type === 'times') {
         const tuplet = event;
         // If the tuplet has internal beam groups, don't report beam marks to the parent
         // so the parent won't wrap the tuplet in an external <beam>
@@ -923,11 +939,16 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 xml += restEventToMEI(event, currentIndent, keyFifths, currentOttavaShift, measureAccidentals, restCrossStaff);
                 break;
             }
-            case 'tuplet': {
+            case 'tuplet':
+            case 'times': {
                 // Tuplet can be nested inside beam in MEI: <beam><tuplet>...</tuplet></beam>
                 // Pass beamElementOpen to tuplet so it knows not to create its own beam
-                const tupletResult = tupletEventToMEI(event, currentIndent, voice.staff, keyFifths, currentStaff, currentOttavaShift, beamElementOpen, measureAccidentals);
+                const tupletResult = tupletEventToMEI(event, currentIndent, voice.staff, keyFifths, currentStaff, currentOttavaShift, beamElementOpen, measureAccidentals, currentClef);
                 xml += tupletResult.xml;
+                // Propagate clef change from inside the tuplet to the parent tracker
+                if (tupletResult.endingClef) {
+                    currentClef = tupletResult.endingClef;
+                }
                 // Flush any pending markups onto the first note of the tuplet
                 if (tupletResult.firstNoteId) {
                     flushPendingMarkups(tupletResult.firstNoteId);
@@ -1566,7 +1587,7 @@ const docHasBeamMarks = (doc) => {
                             }
                         }
                     }
-                    else if (event.type === 'tuplet') {
+                    else if (event.type === 'tuplet' || event.type === 'times') {
                         const tuplet = event;
                         for (const e of tuplet.events) {
                             if (e.type === 'note') {
@@ -1729,7 +1750,7 @@ const applyAutoBeamToVoice = (events, beamGroups) => {
             flushRun();
             position += dur;
         }
-        else if (event.type === 'tuplet') {
+        else if (event.type === 'tuplet' || event.type === 'times') {
             const tuplet = event;
             const ratio = tuplet.ratio; // LilyPond ratio: num/den
             // Check if all inner notes are beamable (division >= 8)
@@ -1907,7 +1928,7 @@ const encode = (doc, options = {}) => {
                 for (const event of voice.events) {
                     // Check for actual musical content (not just context changes or pitch resets)
                     if (event.type === 'note' || event.type === 'rest' ||
-                        event.type === 'tuplet' || event.type === 'tremolo') {
+                        event.type === 'tuplet' || event.type === 'times' || event.type === 'tremolo') {
                         return true;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.62",
+  "version": "0.1.63",
   "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",
@@ -29,11 +29,13 @@
     "prepublishOnly": "npm run build:grammar && npm run build",
     "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",
     "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"
@@ -51,14 +53,15 @@
   "devDependencies": {
     "@types/node": "^20.11.20",
     "@types/yargs": "^17.0.32",
+    "abcjs": "^6.6.2",
     "formidable": "^3.5.4",
     "jison": "^0.4.18",
+    "jsdom": "^29.0.2",
     "sha1": "^1.1.1",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "typescript": "^5.3.3",
     "verovio": "^5.7.0",
-    "xmldom": "^0.6.0",
     "yargs": "^17.7.2"
   },
   "dependencies": {

package/source/abc/abc.jison

@@ -82,18 +82,24 @@
 		const {patches} = body;
 		const measures = [];
 		let measure = null;
-		let lastVoice = 1;
+		const seenVoices = new Set();
+
 		patches.forEach(patch => {
 			const voice = patch.control.V || 1;
-			if (voice <= lastVoice) {
+			if (seenVoices.has(voice)) {
 				if (measure)
 					measures.push(measure);
 				measure = {voices: []};
+				seenVoices.clear();
 			}
+			if (!measure)
+				measure = {voices: []};
+			seenVoices.add(voice);
 			measure.voices.push(patch);
 		});
 
-		measures.push(measure);
+		if (measure)
+			measures.push(measure);
 
 		measures.forEach((measure, index) => measure.index = index + 1);
 
@@ -151,6 +157,21 @@
 
 
 	const octaveShift = shift => ({octaveShift: shift});
+
+
+	const parseMode = (name) => {
+		const n = name.toLowerCase();
+		if (n.startsWith("ma")) return "major";
+		if (n === "m" || n.startsWith("mi")) return "minor";
+		if (n.startsWith("dor")) return "dorian";
+		if (n.startsWith("phr")) return "phrygian";
+		if (n.startsWith("lyd")) return "lydian";
+		if (n.startsWith("mix")) return "mixolydian";
+		if (n.startsWith("aeo")) return "aeolian";
+		if (n.startsWith("loc")) return "locrian";
+		if (n === "hp") return "highland";
+		return n;
+	};
 %}
 
 
@@ -160,24 +181,27 @@
 
 %x string
 %x comment
+%x spec_comment_name
 %x spec_comment
+%x spec_comment_skip
 %x title_string
 %x key_signature
+%x voice_header
 %x exclamation_exp
 
-
 H									\b[A-Z](?=\:[^|])
-A									\b[A-G](?=[\W\d\sA-Ga-g_zHJLMOPRSTuv]*\b)
+A									\b[A-G](?=[\W\d\sA-Ga-g_yzHJLMOPRSTuv]*\b)
 Am									\b[A-G](?=[m][a][j]|[m][i][n]\b)
-a									\b[a-g](?=[\W\d\sA-Ga-g_zHJLMOPRSTuv]*\b)
+a									\b[a-g](?=[\W\d\sA-Ga-g_yzHJLMOPRSTuv]*\b)
 z									\b[z]
 Z									\b[Z]
 x									\b[x](?=[\W\d\s])
+y									\b[y]
 N									[0-9]
 P									\b[HJLMOPRSTuv](?=[A-Ga-g][A-Ga-g0-9]*\b)
 PP									\b[HJLMOPRSTuv](?=[xz!\[^_=\s"])
 
-SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~]
+SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~&]
 
 
 %%
@@ -193,10 +217,30 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~]
 <title_string>[^\n]+				return 'STR_CONTENT'
 
 ^[K][:][\s]*						{ this.pushState('key_signature'); return 'K:'; }
+^[V][:][ \t]*						{ this.pushState('voice_header'); return 'V:'; }
+<voice_header>\"					{ this.pushState('string'); return 'STR_START'; }
+<voice_header>[a-zA-Z][a-zA-Z0-9,]*	return 'NAME';
+<voice_header>[0-9]+				return 'N';
+<voice_header>[=]					return '=';
+<voice_header>[+\-]					return yytext;
+<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>"none"				return 'NAME';
+<key_signature>"Dor"				return 'NAME';
+<key_signature>"Phr"				return 'NAME';
+<key_signature>"Lyd"				return 'NAME';
+<key_signature>"Mix"				return 'NAME';
+<key_signature>"Aeo"				return 'NAME';
+<key_signature>"Loc"				return 'NAME';
+<key_signature>"HP"					return 'NAME';
+<key_signature>"Hp"					return 'NAME';
+<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';
 <key_signature>[#]					return 'SHARP';
 <key_signature>[m][a-z]*			return 'NAME';
@@ -208,14 +252,20 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~]
 <key_signature>\]					{ this.popState(); return ']'; }
 
 ^[%]								{ this.pushState('comment'); }
-<comment>[%]						{ this.pushState('spec_comment'); }
+<comment>[%]						{ this.pushState('spec_comment_name'); }
 <comment>[^\n]+						{ return 'COMMENT'; }
-<spec_comment>\n					{ this.popState(); this.popState(); }
 <comment>\n							{ this.popState(); }
-<spec_comment>\s					{}
-<spec_comment>"score"				return 'SCORE'
-<spec_comment>[\w]+					return 'NN'
+<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>[\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>[\w]+					return 'NN'
+<spec_comment>\n					{ this.popState(); this.popState(); return 'LAYOUT_END'; }
+<spec_comment_skip>[^\n]+			{}
+<spec_comment_skip>\n				{ this.popState(); this.popState(); }
 
 [!]									{ this.pushState('exclamation_exp'); return '!'; }
 <exclamation_exp>[!]				{ this.popState(); return '!'; }
@@ -231,6 +281,7 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~]
 <exclamation_exp>{N}				return 'N'
 <exclamation_exp>[a-zA-Z][\w-]*		return 'NAME'
 
+\\\n								{}
 \s+									{}
 
 {SPECIAL}							return yytext
@@ -250,6 +301,7 @@ SPECIAL								[:!^_,'/<>={}()\[\]|.\-+~]
 "staff"								return 'STAFF'
 "maj"								return 'MAJ'
 "min"								return 'MIN'
+{y}									return 'y'
 [a-zA-Z][\w-]*						return 'NAME'
 
 <<EOF>>								return 'EOF'
@@ -284,6 +336,7 @@ head_lines
 	| head_lines head_line				-> [...$1, $2]
 	| head_lines comment				-> [...$1, $2]
 	| head_lines staff_layout_statement	-> [...$1, $2]
+	| head_lines 'LAYOUT_END'			-> $1
 	| head_lines ']'					-> $1
 	| head_lines '}'					-> $1
 	| head_lines ')'					-> $1
@@ -294,7 +347,7 @@ comment
 	;
 
 staff_layout_statement
-	: 'SCORE' staff_layout				-> $2
+	: 'SCORE' staff_layout 'LAYOUT_END'	-> $2
 	;
 
 staff_layout
@@ -320,6 +373,7 @@ head_line
 	: 'T:' string_content				-> header('T', $2)
 	| 'C:' string_content				-> header('C', $2)
 	| 'K:' key_signature				-> header('K', $2)
+	| 'V:' header_value					-> header('V', $2)
 	| H ':' header_value				-> header($1, $3)
 	;
 
@@ -328,6 +382,7 @@ header_value
 	| number
 	| frac
 	| numeric_tempo
+	| string frac '=' number			-> ({text: $1, note: $2, bpm: $4})
 	| upper_phonet
 	| voice_exp
 	| staff_shift
@@ -342,6 +397,11 @@ staff_shift
 	;
 
 key_signature
+	: key_root							-> $1
+	| NAME								-> key(null, $1)
+	;
+
+key_root
 	: A									-> key($1, null)
 	| A sharp_or_flat					-> key($1 + $2, null)
 	| A key_mode						-> key($1, $2)
@@ -362,7 +422,7 @@ sharp_or_flat
 key_mode
 	: MAJ								-> 'major'
 	| MIN								-> 'minor'
-	| NAME								-> $1.startsWith("ma") ? "major" : "minor"
+	| NAME								-> parseMode($1)
 	;
 
 plus_minus_number
@@ -402,6 +462,10 @@ voice_exp
 	| number NAME assigns				-> voice($1, $2, $3)
 	| NAME								-> voice(1, $1)
 	| NAME assigns						-> voice(1, $1, $2)
+	| 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))
+	| upper_phonet number NAME assigns	-> voice(1, $1 + String($2), $4)
 	;
 
 assigns
@@ -418,6 +482,7 @@ assign_value
 	| number
 	| plus_minus_number
 	| NAME
+	| upper_phonet
 	;
 
 upper_phonet
@@ -437,6 +502,9 @@ patches
 	| patches tailless_patch			-> [...$1, $2]
 	| patches ']'						-> $1
 	| patches '}'						-> $1
+	| patches head_line					-> $1
+	| patches 'LAYOUT_END'				-> $1
+	| patches '&' patch					-> $1
 	;
 
 patch
@@ -459,10 +527,11 @@ bar
 	| ':' '|' ']'						-> ':|]'
 	| '|' N								-> '|' + $2
 	| ':' '|' N							-> ':|' + $2
+	| '&'								-> '&'
 	;
 
 music
-	: %empty
+	: %empty							-> []
 	| music expressive_mark				-> $1 ? [...$1, $2] : [$2]
 	| music text						-> $1 ? [...$1, $2] : [$2]
 	| music event						-> $1 ? [...$1, $2] : [$2]
@@ -474,11 +543,13 @@ music
 	| music NAME						-> $1
 	| music '^' NAME					-> $1
 	| music '^'							-> $1
+	| music '[' N						-> $1
 	;
 
 control
 	: '[' H ':' header_value ']'		-> ({control: header($2, $4)})
 	| '[' 'K:' header_value ']'			-> ({control: header("K", $3)})
+	| '[' 'V:' header_value ']'			-> ({control: header("V", $3)})
 	| '[' NAME ':' header_value ']'		-> ({control: header($2, $4)})
 	;
 
@@ -510,6 +581,7 @@ articulation
 articulation_content
 	: scope_articulation				-> articulation($1)
 	| scope_articulation parenthese		-> articulation($1, $2)
+	| scope_articulation '=' assign_value	-> articulation($1 + '=' + String($3))
 	| DYNAMIC							-> articulation($1)
 	| a									-> articulation($1)
 	| "^"								-> articulation($1)
@@ -613,6 +685,8 @@ accidentals
 	| '^' '^'							-> 2
 	| '_' '_'							-> -2
 	| '=' '='							-> 0
+	| '^' '/'							-> 0.5
+	| '_' '/'							-> -0.5
 	;
 
 pitch
@@ -637,6 +711,7 @@ rest_phonet
 	: z
 	| Z
 	| x
+	| y
 	;
 
 event