@k-l-lambda/lilylet 0.1.55 → 0.1.56

package/lib/lilylet/meiEncoder.js

@@ -140,7 +140,11 @@ const encodePitch = (pitch, keyFifths = 0, ottavaShift = 0, measureAccidentals)
     const prevMeasureAccid = measureAccidentals?.get(pitchKey);
     if (pitch.accidental) {
         const noteAccid = ACCIDENTALS[pitch.accidental];
-        if (prevMeasureAccid !== undefined && noteAccid !== prevMeasureAccid) {
+        if (pitch.courtesy) {
+            // Courtesy accidental (!) - always display
+            accid = noteAccid;
+        }
+        else if (prevMeasureAccid !== undefined && noteAccid !== prevMeasureAccid) {
             // Previous note in this measure had a different accidental - must re-assert
             accid = noteAccid;
         }
@@ -156,7 +160,11 @@ const encodePitch = (pitch, keyFifths = 0, ottavaShift = 0, measureAccidentals)
     }
     else if (keyAccid) {
         // Note has no accidental but key implies one - output natural
-        if (prevMeasureAccid === 'n') {
+        if (pitch.courtesy) {
+            // Courtesy accidental (!) - always display
+            accid = 'n';
+        }
+        else if (prevMeasureAccid === 'n') {
             // Already cancelled earlier in this measure - no need to show again
         }
         else {
@@ -166,6 +174,13 @@ const encodePitch = (pitch, keyFifths = 0, ottavaShift = 0, measureAccidentals)
         if (measureAccidentals)
             measureAccidentals.set(pitchKey, 'n');
     }
+    else if (pitch.courtesy && prevMeasureAccid && prevMeasureAccid !== 'n') {
+        // Courtesy accidental after an in-measure accidental - force natural display
+        accid = 'n';
+        accidGes = 'n';
+        if (measureAccidentals)
+            measureAccidentals.set(pitchKey, 'n');
+    }
     else if (measureAccidentals) {
         // No explicit accidental, no key accidental - check if earlier note in measure had one
         if (prevMeasureAccid && prevMeasureAccid !== 'n') {
@@ -483,11 +498,14 @@ const noteEventToMEI = (event, indent, layerStaff, tieEnd, contextStemDir, keyFi
     };
 };
 // Convert RestEvent to MEI
-const restEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0, measureAccidentals) => {
+const restEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0, measureAccidentals, crossStaff) => {
     const dur = DURATIONS[event.duration.division] || "4";
     let attrs = `xml:id="${generateId('rest')}" dur="${dur}"`;
     if (event.duration.dots > 0)
         attrs += ` dots="${event.duration.dots}"`;
+    // Cross-staff attribute
+    if (crossStaff)
+        attrs += ` staff="${crossStaff}"`;
     // Pitched rest (positioned at specific pitch)
     if (event.pitch) {
         const pitch = encodePitch(event.pitch, keyFifths, ottavaShift);
@@ -899,9 +917,12 @@ const encodeLayer = (voice, layerN, indent, initialTiePitches = [], keyFifths =
                 }
                 break;
             }
-            case 'rest':
-                xml += restEventToMEI(event, currentIndent, keyFifths, currentOttavaShift, measureAccidentals);
+            case 'rest': {
+                // For cross-staff notation: pass staff number if different from voice's home staff
+                const restCrossStaff = currentStaff !== (voice.staff || 1) ? currentStaff : undefined;
+                xml += restEventToMEI(event, currentIndent, keyFifths, currentOttavaShift, measureAccidentals, restCrossStaff);
                 break;
+            }
             case 'tuplet': {
                 // 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

package/lib/lilylet/types.d.ts

@@ -91,6 +91,7 @@ export interface Pitch {
     phonet: Phonet;
     accidental?: Accidental;
     octave: number;
+    courtesy?: boolean;
 }
 export interface Duration {
     division: number;

package/package.json

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