@k-l-lambda/lilylet 0.1.55 → 0.1.56

package/source/lilylet/lilylet.jison

@@ -396,7 +396,9 @@ pitches
 	;
 
 pitch
-	: PITCH octave								-> parsePitch($1, $2)
+	: PITCH octave '!'							-> { ...parsePitch($1, $2), courtesy: true }
+	| PITCH '!'								-> { ...parsePitch($1, 0), courtesy: true }
+	| PITCH octave								-> parsePitch($1, $2)
 	| PITCH										-> parsePitch($1, 0)
 	;
 
@@ -564,7 +566,6 @@ articulation_mark
 	| '>'										-> articulation('accent')
 	| '.'										-> articulation('staccato')
 	| '-'										-> articulation('tenuto')
-	| '!'										-> articulation('staccatissimo')
 	| '^'										-> articulation('marcato')
 	| '_'										-> articulation('portato')
 	;

package/source/lilylet/meiEncoder.ts

@@ -198,7 +198,10 @@ const encodePitch = (pitch: Pitch, keyFifths: number = 0, ottavaShift: number =
 
 	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;
 		} else if (noteAccid !== keyAccid) {
@@ -211,13 +214,21 @@ const encodePitch = (pitch: Pitch, keyFifths: number = 0, ottavaShift: number =
 		if (measureAccidentals) measureAccidentals.set(pitchKey, noteAccid);
 	} 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 {
 			accid = 'n';
 		}
 		accidGes = 'n';
 		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') {
@@ -603,11 +614,14 @@ const noteEventToMEI = (
 
 
 // Convert RestEvent to MEI
-const restEventToMEI = (event: RestEvent, indent: string, keyFifths: number = 0, ottavaShift: number = 0, measureAccidentals?: Map<string, string>): string => {
+const restEventToMEI = (event: RestEvent, indent: string, keyFifths: number = 0, ottavaShift: number = 0, measureAccidentals?: Map<string, string>, crossStaff?: number): string => {
 	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);
@@ -1189,9 +1203,12 @@ const encodeLayer = (voice: Voice, layerN: number, indent: string, initialTiePit
 				}
 				break;
 			}
-			case 'rest':
-				xml += restEventToMEI(event as RestEvent, 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 as RestEvent, 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/source/lilylet/types.ts

@@ -110,6 +110,7 @@ export interface Pitch {
 	phonet: Phonet;
 	accidental?: Accidental;
 	octave: number; // 0 = middle C octave, positive = higher, negative = lower
+	courtesy?: boolean; // force display of accidental (! in LilyPond)
 }
 
 export interface Duration {