@k-l-lambda/lilylet 0.1.31 → 0.1.33

package/lib/meiEncoder.js

@@ -128,20 +128,24 @@ const encodePitch = (pitch, keyFifths = 0, ottavaShift = 0) => {
     // Get the accidental implied by the key signature for this note
     const keyAccidentals = getKeyAccidentals(keyFifths);
     const keyAccid = keyAccidentals[pitch.phonet];
-    // Determine if we need to output an accid attribute
+    // Determine accid (written/displayed) and accid.ges (gestural/sounding)
     let accid;
+    let accidGes;
     if (pitch.accidental) {
         const noteAccid = ACCIDENTALS[pitch.accidental];
-        // Only output accid if it's different from what the key implies
         if (noteAccid !== keyAccid) {
+            // Accidental differs from key signature - display it
             accid = noteAccid;
         }
+        // Always set gestural accidental for MIDI generation
+        accidGes = noteAccid;
     }
     else if (keyAccid) {
         // Note has no accidental but key implies one - output natural
         accid = 'n';
+        accidGes = 'n';
     }
-    return { pname: pitch.phonet, oct, accid };
+    return { pname: pitch.phonet, oct, accid, accidGes };
 };
 // Convert tremolo division to stem.mod value
 const tremoloToStemMod = (division) => {
@@ -161,6 +165,8 @@ const buildNoteElement = (pitch, dur, dots, indent, inChord, options = {}, noteI
     }
     if (pitch.accid)
         attrs += ` accid="${pitch.accid}"`;
+    if (pitch.accidGes)
+        attrs += ` accid.ges="${pitch.accidGes}"`;
     if (!inChord && dots > 0)
         attrs += ` dots="${dots}"`;
     if (!inChord && options.grace)
@@ -566,6 +572,8 @@ const tremoloEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0) => {
         let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}" dur="${noteDur}"`;
         if (pitch.accid)
             attrs += ` accid="${pitch.accid}"`;
+        if (pitch.accidGes)
+            attrs += ` accid.ges="${pitch.accidGes}"`;
         result += `${indent}    <note ${attrs} />\n`;
     }
     else if (event.pitchA.length > 1) {
@@ -575,6 +583,8 @@ const tremoloEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0) => {
             let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}"`;
             if (pitch.accid)
                 attrs += ` accid="${pitch.accid}"`;
+            if (pitch.accidGes)
+                attrs += ` accid.ges="${pitch.accidGes}"`;
             result += `${indent}        <note ${attrs} />\n`;
         }
         result += `${indent}    </chord>\n`;
@@ -585,6 +595,8 @@ const tremoloEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0) => {
         let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}" dur="${noteDur}"`;
         if (pitch.accid)
             attrs += ` accid="${pitch.accid}"`;
+        if (pitch.accidGes)
+            attrs += ` accid.ges="${pitch.accidGes}"`;
         result += `${indent}    <note ${attrs} />\n`;
     }
     else if (event.pitchB.length > 1) {
@@ -594,6 +606,8 @@ const tremoloEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0) => {
             let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}"`;
             if (pitch.accid)
                 attrs += ` accid="${pitch.accid}"`;
+            if (pitch.accidGes)
+                attrs += ` accid.ges="${pitch.accidGes}"`;
             result += `${indent}        <note ${attrs} />\n`;
         }
         result += `${indent}    </chord>\n`;
@@ -1360,9 +1374,15 @@ const encode = (doc, options = {}) => {
     }
     // Encode measures
     measures.forEach((measure, mi) => {
-        // Update key signature if measure has one
+        // Check for key signature change and output scoreDef if needed
         if (measure.key) {
-            currentKey = keyToFifths(measure.key);
+            const newKey = keyToFifths(measure.key);
+            if (newKey !== currentKey) {
+                currentKey = newKey;
+                const newKeySig = KEY_SIGS[currentKey] || "0";
+                // Output a scoreDef with the new key signature
+                mei += `${indent}${indent}${indent}${indent}${indent}${indent}<scoreDef xml:id="${generateId('scoredef')}" key.sig="${newKeySig}" />\n`;
+            }
         }
         mei += encodeMeasure(measure, mi + 1, `${indent}${indent}${indent}${indent}${indent}${indent}`, totalStaves, tieState, slurState, hairpinState, currentKey, partInfos, clefState);
     });

package/package.json

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

@@ -171,7 +171,7 @@ const getKeyAccidentals = (fifths: number): Record<string, string> => {
 // Convert Pitch to MEI attributes, checking against key signature
 // ottavaShift: current ottava level (1 = 8va up, -1 = 8vb down, 2 = 15ma up, etc.)
 // The written pitch should be adjusted by subtracting the ottava shift
-const encodePitch = (pitch: Pitch, keyFifths: number = 0, ottavaShift: number = 0): { pname: string; oct: number; accid?: string } => {
+const encodePitch = (pitch: Pitch, keyFifths: number = 0, ottavaShift: number = 0): { pname: string; oct: number; accid?: string; accidGes?: string } => {
 	// Lilylet octave: 0 = middle C octave (C4), positive = higher, negative = lower
 	// When ottava is active, the source pitch is the sounding pitch, but we need to output the written pitch
 	// For 8va up (ottavaShift=1), written pitch is one octave lower than sounding
@@ -181,20 +181,25 @@ const encodePitch = (pitch: Pitch, keyFifths: number = 0, ottavaShift: number =
 	const keyAccidentals = getKeyAccidentals(keyFifths);
 	const keyAccid = keyAccidentals[pitch.phonet];
 
-	// Determine if we need to output an accid attribute
+	// Determine accid (written/displayed) and accid.ges (gestural/sounding)
 	let accid: string | undefined;
+	let accidGes: string | undefined;
+
 	if (pitch.accidental) {
 		const noteAccid = ACCIDENTALS[pitch.accidental];
-		// Only output accid if it's different from what the key implies
 		if (noteAccid !== keyAccid) {
+			// Accidental differs from key signature - display it
 			accid = noteAccid;
 		}
+		// Always set gestural accidental for MIDI generation
+		accidGes = noteAccid;
 	} else if (keyAccid) {
 		// Note has no accidental but key implies one - output natural
 		accid = 'n';
+		accidGes = 'n';
 	}
 
-	return { pname: pitch.phonet, oct, accid };
+	return { pname: pitch.phonet, oct, accid, accidGes };
 };
 
 
@@ -210,7 +215,7 @@ const tremoloToStemMod = (division: number): string | undefined => {
 
 // Build note element
 const buildNoteElement = (
-	pitch: { pname: string; oct: number; accid?: string },
+	pitch: { pname: string; oct: number; accid?: string; accidGes?: string },
 	dur: string,
 	dots: number,
 	indent: string,
@@ -233,6 +238,7 @@ const buildNoteElement = (
 		attrs += ` dur="${dur}"`;
 	}
 	if (pitch.accid) attrs += ` accid="${pitch.accid}"`;
+	if (pitch.accidGes) attrs += ` accid.ges="${pitch.accidGes}"`;
 	if (!inChord && dots > 0) attrs += ` dots="${dots}"`;
 	if (!inChord && options.grace) attrs += ` grace="unacc"`;
 	if (!inChord && options.tie) attrs += ` tie="${options.tie}"`;
@@ -715,6 +721,7 @@ const tremoloEventToMEI = (event: TremoloEvent, indent: string, keyFifths: numbe
 		const pitch = encodePitch(event.pitchA[0], keyFifths, ottavaShift);
 		let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}" dur="${noteDur}"`;
 		if (pitch.accid) attrs += ` accid="${pitch.accid}"`;
+		if (pitch.accidGes) attrs += ` accid.ges="${pitch.accidGes}"`;
 		result += `${indent}    <note ${attrs} />\n`;
 	} else if (event.pitchA.length > 1) {
 		result += `${indent}    <chord xml:id="${generateId('chord')}" dur="${noteDur}">\n`;
@@ -722,6 +729,7 @@ const tremoloEventToMEI = (event: TremoloEvent, indent: string, keyFifths: numbe
 			const pitch = encodePitch(p, keyFifths, ottavaShift);
 			let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}"`;
 			if (pitch.accid) attrs += ` accid="${pitch.accid}"`;
+			if (pitch.accidGes) attrs += ` accid.ges="${pitch.accidGes}"`;
 			result += `${indent}        <note ${attrs} />\n`;
 		}
 		result += `${indent}    </chord>\n`;
@@ -732,6 +740,7 @@ const tremoloEventToMEI = (event: TremoloEvent, indent: string, keyFifths: numbe
 		const pitch = encodePitch(event.pitchB[0], keyFifths, ottavaShift);
 		let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}" dur="${noteDur}"`;
 		if (pitch.accid) attrs += ` accid="${pitch.accid}"`;
+		if (pitch.accidGes) attrs += ` accid.ges="${pitch.accidGes}"`;
 		result += `${indent}    <note ${attrs} />\n`;
 	} else if (event.pitchB.length > 1) {
 		result += `${indent}    <chord xml:id="${generateId('chord')}" dur="${noteDur}">\n`;
@@ -739,6 +748,7 @@ const tremoloEventToMEI = (event: TremoloEvent, indent: string, keyFifths: numbe
 			const pitch = encodePitch(p, keyFifths, ottavaShift);
 			let attrs = `xml:id="${generateId('note')}" pname="${pitch.pname}" oct="${pitch.oct}"`;
 			if (pitch.accid) attrs += ` accid="${pitch.accid}"`;
+			if (pitch.accidGes) attrs += ` accid.ges="${pitch.accidGes}"`;
 			result += `${indent}        <note ${attrs} />\n`;
 		}
 		result += `${indent}    </chord>\n`;
@@ -1744,9 +1754,15 @@ const encode = (doc: LilyletDoc, options: MEIEncoderOptions = {}): string => {
 
 	// Encode measures
 	measures.forEach((measure, mi) => {
-		// Update key signature if measure has one
+		// Check for key signature change and output scoreDef if needed
 		if (measure.key) {
-			currentKey = keyToFifths(measure.key);
+			const newKey = keyToFifths(measure.key);
+			if (newKey !== currentKey) {
+				currentKey = newKey;
+				const newKeySig = KEY_SIGS[currentKey] || "0";
+				// Output a scoreDef with the new key signature
+				mei += `${indent}${indent}${indent}${indent}${indent}${indent}<scoreDef xml:id="${generateId('scoredef')}" key.sig="${newKeySig}" />\n`;
+			}
 		}
 		mei += encodeMeasure(measure, mi + 1, `${indent}${indent}${indent}${indent}${indent}${indent}`, totalStaves, tieState, slurState, hairpinState, currentKey, partInfos, clefState);
 	});