@k-l-lambda/lilylet 0.1.30 → 0.1.32

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`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-l-lambda/lilylet",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "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/grammar.jison.js

@@ -72,12 +72,12 @@
   }
 */
 Object.defineProperty(globalThis, "__lilyletGrammar__", { value: (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1=[2,29],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,16],$Va=[1,26],$Vb=[1,27],$Vc=[5,9,11,14,15,16,17,18,19,20,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Vd=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Ve=[5,22],$Vf=[5,22,25],$Vg=[1,37],$Vh=[5,22,25,28],$Vi=[1,63],$Vj=[1,64],$Vk=[1,65],$Vl=[1,66],$Vm=[1,67],$Vn=[1,68],$Vo=[1,51],$Vp=[1,52],$Vq=[1,69],$Vr=[1,70],$Vs=[1,71],$Vt=[1,72],$Vu=[1,73],$Vv=[1,74],$Vw=[1,75],$Vx=[1,76],$Vy=[1,77],$Vz=[1,60],$VA=[1,61],$VB=[1,62],$VC=[2,22],$VD=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VE=[5,9,13,22,25,28,40,41,42,47,49,50,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143],$VF=[2,95],$VG=[1,93],$VH=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143],$VI=[5,9,22,25,28,40,41,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VJ=[1,177],$VK=[1,182],$VL=[1,145],$VM=[1,146],$VN=[1,144],$VO=[1,179],$VP=[1,138],$VQ=[1,139],$VR=[1,140],$VS=[1,141],$VT=[1,142],$VU=[1,143],$VV=[1,149],$VW=[1,148],$VX=[1,147],$VY=[1,150],$VZ=[1,151],$V_=[1,152],$V$=[1,153],$V01=[1,154],$V11=[1,155],$V21=[1,156],$V31=[1,157],$V41=[1,158],$V51=[1,159],$V61=[1,160],$V71=[1,161],$V81=[1,162],$V91=[1,163],$Va1=[1,164],$Vb1=[1,165],$Vc1=[1,166],$Vd1=[1,167],$Ve1=[1,168],$Vf1=[1,169],$Vg1=[1,170],$Vh1=[1,171],$Vi1=[1,172],$Vj1=[1,173],$Vk1=[1,174],$Vl1=[1,175],$Vm1=[1,176],$Vn1=[1,178],$Vo1=[1,180],$Vp1=[1,181],$Vq1=[5,9,13,22,25,28,40,41,42,47,49,50,56,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143],$Vr1=[9,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$Vs1=[49,50],$Vt1=[5,9,13,22,25,28,40,41,42,47,49,50,52,53,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1=[2,29],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,16],$Va=[1,26],$Vb=[1,27],$Vc=[5,9,11,14,15,16,17,18,19,20,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Vd=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Ve=[5,22],$Vf=[5,22,25],$Vg=[1,37],$Vh=[5,22,25,28],$Vi=[1,63],$Vj=[1,64],$Vk=[1,65],$Vl=[1,66],$Vm=[1,67],$Vn=[1,68],$Vo=[1,51],$Vp=[1,52],$Vq=[1,69],$Vr=[1,70],$Vs=[1,71],$Vt=[1,72],$Vu=[1,73],$Vv=[1,74],$Vw=[1,75],$Vx=[1,76],$Vy=[1,77],$Vz=[1,60],$VA=[1,61],$VB=[1,62],$VC=[2,22],$VD=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VE=[5,9,13,22,25,28,40,41,42,47,49,50,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$VF=[2,95],$VG=[1,93],$VH=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$VI=[5,9,22,25,28,40,41,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VJ=[1,178],$VK=[1,184],$VL=[1,146],$VM=[1,181],$VN=[1,147],$VO=[1,145],$VP=[1,180],$VQ=[1,139],$VR=[1,140],$VS=[1,141],$VT=[1,142],$VU=[1,143],$VV=[1,144],$VW=[1,150],$VX=[1,149],$VY=[1,148],$VZ=[1,151],$V_=[1,152],$V$=[1,153],$V01=[1,154],$V11=[1,155],$V21=[1,156],$V31=[1,157],$V41=[1,158],$V51=[1,159],$V61=[1,160],$V71=[1,161],$V81=[1,162],$V91=[1,163],$Va1=[1,164],$Vb1=[1,165],$Vc1=[1,166],$Vd1=[1,167],$Ve1=[1,168],$Vf1=[1,169],$Vg1=[1,170],$Vh1=[1,171],$Vi1=[1,172],$Vj1=[1,173],$Vk1=[1,174],$Vl1=[1,175],$Vm1=[1,176],$Vn1=[1,177],$Vo1=[1,179],$Vp1=[1,182],$Vq1=[1,183],$Vr1=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$Vs1=[9,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$Vt1=[49,50],$Vu1=[5,9,13,22,25,28,40,41,42,47,49,50,52,53,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144];
 var parser = {trace: function trace () { },
 yy: {},
-symbols_: {"error":2,"document":3,"content":4,"EOF":5,"headers":6,"measures":7,"newlines":8,"NEWLINE":9,"header":10,"HEADER_TITLE":11,"STRING":12,"]":13,"HEADER_SUBTITLE":14,"HEADER_COMPOSER":15,"HEADER_ARRANGER":16,"HEADER_LYRICIST":17,"HEADER_OPUS":18,"HEADER_INSTRUMENT":19,"HEADER_GENRE":20,"measure_content":21,"|":22,"parts":23,"part_voices":24,"PART_SEP":25,"part_start":26,"voice_events":27,"VOICE_SEP":28,"event":29,"note_event":30,"rest_event":31,"context_event":32,"grace_event":33,"tuplet_event":34,"tremolo_event":35,"pitch_reset_event":36,"barline_event":37,"harmony_event":38,"markup_event":39,"CMD_BAR":40,"CMD_CHORDS":41,"CMD_MARKUP":42,"chord":43,"duration":44,"post_events":45,"pitch":46,"<":47,"pitches":48,">":49,"PITCH":50,"octave":51,"OCT_UP":52,"OCT_DOWN":53,"NUMBER":54,"dots":55,".":56,"REST_CHAR":57,"SPACE_CHAR":58,"clef_cmd":59,"key_cmd":60,"time_cmd":61,"tempo_cmd":62,"staff_cmd":63,"ottava_cmd":64,"stem_cmd":65,"CMD_CLEF":66,"CMD_KEY":67,"pitch_name":68,"mode":69,"MODE_MAJOR":70,"MODE_MINOR":71,"CMD_TIME":72,"/":73,"CMD_TEMPO":74,"=":75,"CMD_STAFF":76,"CMD_OTTAVA":77,"#":78,"-":79,"CMD_STEMUP":80,"CMD_STEMDOWN":81,"CMD_STEMNEUTRAL":82,"CMD_GRACE":83,"{":84,"}":85,"CMD_TIMES":86,"CMD_REPEAT":87,"TREMOLO":88,"post_event":89,"articulation_mark":90,"ornament_mark":91,"dynamic_mark":92,"hairpin_mark":93,"pedal_mark":94,"tie_mark":95,"slur_mark":96,"beam_mark":97,"tremolo_mark":98,"direction_mark":99,"rest_mark":100,"fingering_mark":101,"navigation_mark":102,"markup_mark":103,"CMD_REST":104,"ART_STACCATO":105,"ART_STACCATISSIMO":106,"ART_TENUTO":107,"ART_MARCATO":108,"ART_ACCENT":109,"ART_PORTATO":110,"_":111,"^":112,"!":113,"ORN_TRILL":114,"ORN_TURN":115,"ORN_MORDENT":116,"ORN_PRALL":117,"ORN_FERMATA":118,"ORN_SHORTFERMATA":119,"ORN_ARPEGGIO":120,"DYN_PPP":121,"DYN_PP":122,"DYN_P":123,"DYN_MP":124,"DYN_MF":125,"DYN_F":126,"DYN_FF":127,"DYN_FFF":128,"DYN_SFZ":129,"DYN_RFZ":130,"DYN_SF":131,"CMD_CRESC_BEGIN":132,"CMD_DIM_BEGIN":133,"CMD_DYNAMICS_END":134,"CMD_SUSTAINON":135,"CMD_SUSTAINOFF":136,"~":137,"(":138,")":139,"[":140,":":141,"CMD_CODA":142,"CMD_SEGNO":143,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",9:"NEWLINE",11:"HEADER_TITLE",12:"STRING",13:"]",14:"HEADER_SUBTITLE",15:"HEADER_COMPOSER",16:"HEADER_ARRANGER",17:"HEADER_LYRICIST",18:"HEADER_OPUS",19:"HEADER_INSTRUMENT",20:"HEADER_GENRE",22:"|",25:"PART_SEP",28:"VOICE_SEP",40:"CMD_BAR",41:"CMD_CHORDS",42:"CMD_MARKUP",47:"<",49:">",50:"PITCH",52:"OCT_UP",53:"OCT_DOWN",54:"NUMBER",56:".",57:"REST_CHAR",58:"SPACE_CHAR",66:"CMD_CLEF",67:"CMD_KEY",70:"MODE_MAJOR",71:"MODE_MINOR",72:"CMD_TIME",73:"/",74:"CMD_TEMPO",75:"=",76:"CMD_STAFF",77:"CMD_OTTAVA",78:"#",79:"-",80:"CMD_STEMUP",81:"CMD_STEMDOWN",82:"CMD_STEMNEUTRAL",83:"CMD_GRACE",84:"{",85:"}",86:"CMD_TIMES",87:"CMD_REPEAT",88:"TREMOLO",104:"CMD_REST",105:"ART_STACCATO",106:"ART_STACCATISSIMO",107:"ART_TENUTO",108:"ART_MARCATO",109:"ART_ACCENT",110:"ART_PORTATO",111:"_",112:"^",113:"!",114:"ORN_TRILL",115:"ORN_TURN",116:"ORN_MORDENT",117:"ORN_PRALL",118:"ORN_FERMATA",119:"ORN_SHORTFERMATA",120:"ORN_ARPEGGIO",121:"DYN_PPP",122:"DYN_PP",123:"DYN_P",124:"DYN_MP",125:"DYN_MF",126:"DYN_F",127:"DYN_FF",128:"DYN_FFF",129:"DYN_SFZ",130:"DYN_RFZ",131:"DYN_SF",132:"CMD_CRESC_BEGIN",133:"CMD_DIM_BEGIN",134:"CMD_DYNAMICS_END",135:"CMD_SUSTAINON",136:"CMD_SUSTAINOFF",137:"~",138:"(",139:")",140:"[",141:":",142:"CMD_CODA",143:"CMD_SEGNO"},
-productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[8,1],[8,2],[6,1],[6,2],[6,2],[6,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[7,1],[7,3],[7,2],[21,1],[23,1],[23,4],[26,0],[24,1],[24,3],[27,0],[27,2],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[37,2],[38,2],[39,2],[36,1],[30,3],[30,3],[30,2],[30,2],[43,3],[48,1],[48,2],[46,2],[46,1],[51,1],[51,1],[51,2],[51,2],[44,2],[55,0],[55,2],[31,3],[31,3],[31,2],[31,2],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[59,2],[60,3],[68,1],[69,1],[69,1],[61,4],[62,5],[62,2],[62,4],[63,2],[64,3],[64,4],[64,1],[65,1],[65,1],[65,1],[33,4],[33,2],[33,2],[34,7],[35,9],[35,8],[35,7],[45,0],[45,2],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[100,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,2],[90,2],[90,2],[90,2],[90,2],[90,2],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[93,1],[93,1],[93,1],[94,1],[94,1],[95,1],[96,1],[96,1],[97,1],[97,1],[98,2],[99,2],[99,2],[101,2],[102,1],[102,1],[103,2]],
+symbols_: {"error":2,"document":3,"content":4,"EOF":5,"headers":6,"measures":7,"newlines":8,"NEWLINE":9,"header":10,"HEADER_TITLE":11,"STRING":12,"]":13,"HEADER_SUBTITLE":14,"HEADER_COMPOSER":15,"HEADER_ARRANGER":16,"HEADER_LYRICIST":17,"HEADER_OPUS":18,"HEADER_INSTRUMENT":19,"HEADER_GENRE":20,"measure_content":21,"|":22,"parts":23,"part_voices":24,"PART_SEP":25,"part_start":26,"voice_events":27,"VOICE_SEP":28,"event":29,"note_event":30,"rest_event":31,"context_event":32,"grace_event":33,"tuplet_event":34,"tremolo_event":35,"pitch_reset_event":36,"barline_event":37,"harmony_event":38,"markup_event":39,"CMD_BAR":40,"CMD_CHORDS":41,"CMD_MARKUP":42,"chord":43,"duration":44,"post_events":45,"pitch":46,"<":47,"pitches":48,">":49,"PITCH":50,"octave":51,"OCT_UP":52,"OCT_DOWN":53,"NUMBER":54,"dots":55,".":56,"REST_CHAR":57,"SPACE_CHAR":58,"clef_cmd":59,"key_cmd":60,"time_cmd":61,"tempo_cmd":62,"staff_cmd":63,"ottava_cmd":64,"stem_cmd":65,"CMD_CLEF":66,"CMD_KEY":67,"pitch_name":68,"mode":69,"MODE_MAJOR":70,"MODE_MINOR":71,"CMD_TIME":72,"/":73,"CMD_TEMPO":74,"=":75,"CMD_STAFF":76,"CMD_OTTAVA":77,"#":78,"-":79,"CMD_STEMUP":80,"CMD_STEMDOWN":81,"CMD_STEMNEUTRAL":82,"CMD_GRACE":83,"{":84,"}":85,"CMD_TIMES":86,"CMD_REPEAT":87,"TREMOLO":88,"post_event":89,"articulation_mark":90,"ornament_mark":91,"dynamic_mark":92,"hairpin_mark":93,"pedal_mark":94,"tie_mark":95,"slur_mark":96,"beam_mark":97,"tremolo_mark":98,"direction_mark":99,"rest_mark":100,"fingering_mark":101,"fingering_number":102,"navigation_mark":103,"markup_mark":104,"CMD_REST":105,"ART_STACCATO":106,"ART_STACCATISSIMO":107,"ART_TENUTO":108,"ART_MARCATO":109,"ART_ACCENT":110,"ART_PORTATO":111,"_":112,"^":113,"!":114,"ORN_TRILL":115,"ORN_TURN":116,"ORN_MORDENT":117,"ORN_PRALL":118,"ORN_FERMATA":119,"ORN_SHORTFERMATA":120,"ORN_ARPEGGIO":121,"DYN_PPP":122,"DYN_PP":123,"DYN_P":124,"DYN_MP":125,"DYN_MF":126,"DYN_F":127,"DYN_FF":128,"DYN_FFF":129,"DYN_SFZ":130,"DYN_RFZ":131,"DYN_SF":132,"CMD_CRESC_BEGIN":133,"CMD_DIM_BEGIN":134,"CMD_DYNAMICS_END":135,"CMD_SUSTAINON":136,"CMD_SUSTAINOFF":137,"~":138,"(":139,")":140,"[":141,":":142,"CMD_CODA":143,"CMD_SEGNO":144,"$accept":0,"$end":1},
+terminals_: {2:"error",5:"EOF",9:"NEWLINE",11:"HEADER_TITLE",12:"STRING",13:"]",14:"HEADER_SUBTITLE",15:"HEADER_COMPOSER",16:"HEADER_ARRANGER",17:"HEADER_LYRICIST",18:"HEADER_OPUS",19:"HEADER_INSTRUMENT",20:"HEADER_GENRE",22:"|",25:"PART_SEP",28:"VOICE_SEP",40:"CMD_BAR",41:"CMD_CHORDS",42:"CMD_MARKUP",47:"<",49:">",50:"PITCH",52:"OCT_UP",53:"OCT_DOWN",54:"NUMBER",56:".",57:"REST_CHAR",58:"SPACE_CHAR",66:"CMD_CLEF",67:"CMD_KEY",70:"MODE_MAJOR",71:"MODE_MINOR",72:"CMD_TIME",73:"/",74:"CMD_TEMPO",75:"=",76:"CMD_STAFF",77:"CMD_OTTAVA",78:"#",79:"-",80:"CMD_STEMUP",81:"CMD_STEMDOWN",82:"CMD_STEMNEUTRAL",83:"CMD_GRACE",84:"{",85:"}",86:"CMD_TIMES",87:"CMD_REPEAT",88:"TREMOLO",105:"CMD_REST",106:"ART_STACCATO",107:"ART_STACCATISSIMO",108:"ART_TENUTO",109:"ART_MARCATO",110:"ART_ACCENT",111:"ART_PORTATO",112:"_",113:"^",114:"!",115:"ORN_TRILL",116:"ORN_TURN",117:"ORN_MORDENT",118:"ORN_PRALL",119:"ORN_FERMATA",120:"ORN_SHORTFERMATA",121:"ORN_ARPEGGIO",122:"DYN_PPP",123:"DYN_PP",124:"DYN_P",125:"DYN_MP",126:"DYN_MF",127:"DYN_F",128:"DYN_FF",129:"DYN_FFF",130:"DYN_SFZ",131:"DYN_RFZ",132:"DYN_SF",133:"CMD_CRESC_BEGIN",134:"CMD_DIM_BEGIN",135:"CMD_DYNAMICS_END",136:"CMD_SUSTAINON",137:"CMD_SUSTAINOFF",138:"~",139:"(",140:")",141:"[",142:":",143:"CMD_CODA",144:"CMD_SEGNO"},
+productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[8,1],[8,2],[6,1],[6,2],[6,2],[6,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[10,3],[7,1],[7,3],[7,2],[21,1],[23,1],[23,4],[26,0],[24,1],[24,3],[27,0],[27,2],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[37,2],[38,2],[39,2],[36,1],[30,3],[30,3],[30,2],[30,2],[43,3],[48,1],[48,2],[46,2],[46,1],[51,1],[51,1],[51,2],[51,2],[44,2],[55,0],[55,2],[31,3],[31,3],[31,2],[31,2],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[59,2],[60,3],[68,1],[69,1],[69,1],[61,4],[62,5],[62,2],[62,4],[63,2],[64,3],[64,4],[64,1],[65,1],[65,1],[65,1],[33,4],[33,2],[33,2],[34,7],[35,9],[35,8],[35,7],[45,0],[45,2],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[100,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,2],[90,2],[90,2],[90,2],[90,2],[90,2],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[93,1],[93,1],[93,1],[94,1],[94,1],[95,1],[96,1],[96,1],[97,1],[97,1],[98,2],[99,2],[99,2],[101,2],[102,1],[103,1],[103,1],[104,2]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */
 
@@ -311,132 +311,132 @@ break;
 case 94:
 this.$ = tremoloEvent([$$[$0-2]], [$$[$0-1]], Number($$[$0-4]), currentDuration.division);
 break;
-case 111:
+case 112:
 this.$ = ({ pitchedRest: true });
 break;
-case 112: case 118: case 125:
+case 113: case 119: case 126:
 this.$ = articulation('staccato');
 break;
-case 113: case 122: case 127:
+case 114: case 123: case 128:
 this.$ = articulation('staccatissimo');
 break;
-case 114: case 123: case 126:
+case 115: case 124: case 127:
 this.$ = articulation('tenuto');
 break;
-case 115: case 120: case 128:
+case 116: case 121: case 129:
 this.$ = articulation('marcato');
 break;
-case 116: case 121: case 124:
+case 117: case 122: case 125:
 this.$ = articulation('accent');
 break;
-case 117: case 119: case 129:
+case 118: case 120: case 130:
 this.$ = articulation('portato');
 break;
-case 130:
+case 131:
 this.$ = ornament('trill');
 break;
-case 131:
+case 132:
 this.$ = ornament('turn');
 break;
-case 132:
+case 133:
 this.$ = ornament('mordent');
 break;
-case 133:
+case 134:
 this.$ = ornament('prall');
 break;
-case 134:
+case 135:
 this.$ = ornament('fermata');
 break;
-case 135:
+case 136:
 this.$ = ornament('shortFermata');
 break;
-case 136:
+case 137:
 this.$ = ornament('arpeggio');
 break;
-case 137:
+case 138:
 this.$ = dynamic('ppp');
 break;
-case 138:
+case 139:
 this.$ = dynamic('pp');
 break;
-case 139:
+case 140:
 this.$ = dynamic('p');
 break;
-case 140:
+case 141:
 this.$ = dynamic('mp');
 break;
-case 141:
+case 142:
 this.$ = dynamic('mf');
 break;
-case 142:
+case 143:
 this.$ = dynamic('f');
 break;
-case 143:
+case 144:
 this.$ = dynamic('ff');
 break;
-case 144:
+case 145:
 this.$ = dynamic('fff');
 break;
-case 145: case 147:
+case 146: case 148:
 this.$ = dynamic('sfz');
 break;
-case 146:
+case 147:
 this.$ = dynamic('rfz');
 break;
-case 148:
+case 149:
 this.$ = hairpin('crescendoStart');
 break;
-case 149:
+case 150:
 this.$ = hairpin('diminuendoStart');
 break;
-case 150:
+case 151:
 this.$ = hairpin('crescendoEnd');
 break;
-case 151:
+case 152:
 this.$ = pedal('sustainOn');
 break;
-case 152:
+case 153:
 this.$ = pedal('sustainOff');
 break;
-case 153:
+case 154:
 this.$ = tie(true);
 break;
-case 154:
+case 155:
 this.$ = slur(true);
 break;
-case 155:
+case 156:
 this.$ = slur(false);
 break;
-case 156:
+case 157:
 this.$ = beam(true);
 break;
-case 157:
+case 158:
 this.$ = beam(false);
 break;
-case 158:
+case 159:
 this.$ = ({ tremolo: Number($$[$0]) });
 break;
-case 159:
+case 160:
 this.$ = ({ ...$$[$0], placement: 'above' });
 break;
-case 160:
+case 161:
 this.$ = ({ ...$$[$0], placement: 'below' });
 break;
-case 161:
+case 162: case 163:
  const n = Number($$[$0]); if (n >= 1 && n <= 5) this.$ = fingering(n); else this.$ = null; 
 break;
-case 162:
+case 164:
 this.$ = navigation('coda');
 break;
-case 163:
+case 165:
 this.$ = navigation('segno');
 break;
-case 164:
+case 166:
 this.$ = markupMark($$[$0].slice(1, -1));
 break;
 }
 },
-table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,21:8,23:17,24:18,27:19,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{1:[3]},{5:[1,20]},o($V0,$V1,{21:8,23:17,24:18,27:19,7:21,8:22,10:23,9:[1,24],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),o($V0,$V1,{21:8,23:17,24:18,27:19,7:25,9:$Va}),{5:[2,5],22:$Vb},o($Vc,[2,8]),o($Vd,[2,6]),o($Ve,[2,20]),{12:[1,28]},{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},o($Ve,[2,23],{25:[1,36]}),o($Vf,[2,24],{28:$Vg}),o($Vh,[2,27],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),{1:[2,1]},{5:[2,2],22:$Vb},o($V0,$V1,{21:8,23:17,24:18,27:19,7:78,9:$Va}),o($Vc,[2,9]),o($Vd,[2,10],{10:79,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{5:[2,4],22:$Vb},o($Vd,[2,7]),o([9,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1,{23:17,24:18,27:19,21:80,5:$VC,22:$VC}),{13:[1,81]},{13:[1,82]},{13:[1,83]},{13:[1,84]},{13:[1,85]},{13:[1,86]},{13:[1,87]},{13:[1,88]},o($Vd,[2,26],{26:89}),o($Vd,$V1,{27:90}),o($VD,[2,30]),o($VD,[2,31]),o($VD,[2,32]),o($VD,[2,33]),o($VD,[2,34]),o($VD,[2,35]),o($VD,[2,36]),o($VD,[2,37]),o($VD,[2,38]),o($VD,[2,39]),o($VD,[2,40]),o($VE,$VF,{44:91,45:92,54:$VG}),o($VE,$VF,{44:94,45:95,54:$VG}),o($VE,$VF,{44:96,45:97,54:$VG}),o($VE,$VF,{44:98,45:99,54:$VG}),o($VD,[2,65]),o($VD,[2,66]),o($VD,[2,67]),o($VD,[2,68]),o($VD,[2,69]),o($VD,[2,70]),o($VD,[2,71]),{30:101,31:102,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,84:[1,100]},{54:[1,103]},{88:[1,104]},o($VD,[2,44]),{12:[1,105]},{12:[1,106]},{12:[1,107]},{46:109,48:108,50:$Vn},o($VH,[2,53],{51:110,52:[1,111],53:[1,112]}),{12:[1,113]},{50:[1,115],68:114},{54:[1,116]},{12:[1,117],44:118,54:$VG},{12:[1,119]},o($VD,[2,84],{78:[1,120]}),o($VD,[2,85]),o($VD,[2,86]),o($VD,[2,87]),{5:[2,3],22:$Vb},o($Vc,[2,11]),o($Ve,[2,21]),o($Vc,[2,12]),o($Vc,[2,13]),o($Vc,[2,14]),o($Vc,[2,15]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,18]),o($Vc,[2,19]),o($Vd,$V1,{27:19,24:121}),o($Vh,[2,28],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),o($VE,$VF,{45:122}),o($VI,[2,47],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($Vq1,[2,59],{55:183}),o($VE,$VF,{45:184}),o($VI,[2,48],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VE,$VF,{45:185}),o($VI,[2,63],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VE,$VF,{45:186}),o($VI,[2,64],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($Vr1,$V1,{27:187}),o($VD,[2,89]),o($VD,[2,90]),{73:[1,188]},{54:[1,189]},o($VD,[2,41]),o($VD,[2,42]),o($VD,[2,43]),{46:191,49:[1,190],50:$Vn},o($Vs1,[2,50]),o($VH,[2,52],{52:[1,192],53:[1,193]}),o($Vt1,[2,54]),o($Vt1,[2,55]),o($VD,[2,72]),{69:194,70:[1,195],71:[1,196]},o([70,71],[2,74]),{73:[1,197]},o($VD,[2,79],{44:198,54:$VG}),{75:[1,199]},o($VD,[2,81]),{54:[1,200],79:[1,201]},o($Vf,[2,25],{28:$Vg}),o($VI,[2,45],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VE,[2,96]),o($VE,[2,97]),o($VE,[2,98]),o($VE,[2,99]),o($VE,[2,100]),o($VE,[2,101]),o($VE,[2,102]),o($VE,[2,103]),o($VE,[2,104]),o($VE,[2,105]),o($VE,[2,106]),o($VE,[2,107]),o($VE,[2,108]),o($VE,[2,109]),o($VE,[2,110]),o($VE,[2,112]),o($VE,[2,113]),o($VE,[2,114]),o($VE,[2,115]),o($VE,[2,116]),o($VE,[2,117]),o([5,9,13,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87,104,105,106,107,108,109,110,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143],[2,126],{49:[1,205],54:[1,208],56:[1,202],79:[1,207],111:[1,203],112:[1,204],113:[1,206]}),o($VE,[2,124]),o($VE,[2,125]),o($VE,[2,127]),o($VI,[2,128],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,89:209,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VI,[2,129],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,89:210,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VE,[2,130]),o($VE,[2,131]),o($VE,[2,132]),o($VE,[2,133]),o($VE,[2,134]),o($VE,[2,135]),o($VE,[2,136]),o($VE,[2,137]),o($VE,[2,138]),o($VE,[2,139]),o($VE,[2,140]),o($VE,[2,141]),o($VE,[2,142]),o($VE,[2,143]),o($VE,[2,144]),o($VE,[2,145]),o($VE,[2,146]),o($VE,[2,147]),o($VE,[2,148]),o($VE,[2,149]),o($VE,[2,150]),o($VE,[2,151]),o($VE,[2,152]),o($VE,[2,153]),o($VE,[2,154]),o($VE,[2,155]),o($VE,[2,156]),o($VE,[2,157]),{54:[1,211]},o($VE,[2,111]),o($VE,[2,162]),o($VE,[2,163]),{12:[1,212]},o([5,9,13,22,25,28,40,41,42,47,49,50,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143],[2,58],{56:[1,213]}),o($VI,[2,46],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VI,[2,61],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),o($VI,[2,62],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,13:$VJ,42:$VK,49:$VL,56:$VM,79:$VN,104:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1}),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,214],86:$VA,87:$VB},{54:[1,215]},{84:[1,216]},o($VH,[2,49]),o($Vs1,[2,51]),o($Vt1,[2,56]),o($Vt1,[2,57]),o($VD,[2,73]),o($VD,[2,75]),o($VD,[2,76]),{54:[1,217]},{75:[1,218]},{54:[1,219]},o($VD,[2,82]),{54:[1,220]},o($VE,[2,118]),o($VE,[2,119]),o($VE,[2,120]),o($VE,[2,121]),o($VE,[2,122]),o($VE,[2,123]),o($VE,[2,161]),o($VE,[2,159]),o($VE,[2,160]),o($VE,[2,158]),o($VE,[2,164]),o($Vq1,[2,60]),o($VD,[2,88]),{84:[1,221]},{46:222,50:$Vn},o($VD,[2,77]),{54:[1,223]},o($VD,[2,80]),o($VD,[2,83]),o($Vr1,$V1,{27:224}),{44:225,46:226,50:$Vn,54:$VG},o($VD,[2,78]),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,227],86:$VA,87:$VB},{46:228,50:$Vn},{85:[1,229]},o($VD,[2,91]),{44:230,54:$VG,85:[1,231]},o($VD,[2,94]),{85:[1,232]},o($VD,[2,93]),o($VD,[2,92])],
+table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,21:8,23:17,24:18,27:19,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{1:[3]},{5:[1,20]},o($V0,$V1,{21:8,23:17,24:18,27:19,7:21,8:22,10:23,9:[1,24],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),o($V0,$V1,{21:8,23:17,24:18,27:19,7:25,9:$Va}),{5:[2,5],22:$Vb},o($Vc,[2,8]),o($Vd,[2,6]),o($Ve,[2,20]),{12:[1,28]},{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},o($Ve,[2,23],{25:[1,36]}),o($Vf,[2,24],{28:$Vg}),o($Vh,[2,27],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),{1:[2,1]},{5:[2,2],22:$Vb},o($V0,$V1,{21:8,23:17,24:18,27:19,7:78,9:$Va}),o($Vc,[2,9]),o($Vd,[2,10],{10:79,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{5:[2,4],22:$Vb},o($Vd,[2,7]),o([9,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1,{23:17,24:18,27:19,21:80,5:$VC,22:$VC}),{13:[1,81]},{13:[1,82]},{13:[1,83]},{13:[1,84]},{13:[1,85]},{13:[1,86]},{13:[1,87]},{13:[1,88]},o($Vd,[2,26],{26:89}),o($Vd,$V1,{27:90}),o($VD,[2,30]),o($VD,[2,31]),o($VD,[2,32]),o($VD,[2,33]),o($VD,[2,34]),o($VD,[2,35]),o($VD,[2,36]),o($VD,[2,37]),o($VD,[2,38]),o($VD,[2,39]),o($VD,[2,40]),o($VE,$VF,{44:91,45:92,54:$VG}),o($VE,$VF,{44:94,45:95,54:$VG}),o($VE,$VF,{44:96,45:97,54:$VG}),o($VE,$VF,{44:98,45:99,54:$VG}),o($VD,[2,65]),o($VD,[2,66]),o($VD,[2,67]),o($VD,[2,68]),o($VD,[2,69]),o($VD,[2,70]),o($VD,[2,71]),{30:101,31:102,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,84:[1,100]},{54:[1,103]},{88:[1,104]},o($VD,[2,44]),{12:[1,105]},{12:[1,106]},{12:[1,107]},{46:109,48:108,50:$Vn},o($VH,[2,53],{51:110,52:[1,111],53:[1,112]}),{12:[1,113]},{50:[1,115],68:114},{54:[1,116]},{12:[1,117],44:118,54:$VG},{12:[1,119]},o($VD,[2,84],{78:[1,120]}),o($VD,[2,85]),o($VD,[2,86]),o($VD,[2,87]),{5:[2,3],22:$Vb},o($Vc,[2,11]),o($Ve,[2,21]),o($Vc,[2,12]),o($Vc,[2,13]),o($Vc,[2,14]),o($Vc,[2,15]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,18]),o($Vc,[2,19]),o($Vd,$V1,{27:19,24:121}),o($Vh,[2,28],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),o($VH,$VF,{45:122}),o($VI,[2,47],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($Vr1,[2,59],{55:185}),o($VH,$VF,{45:186}),o($VI,[2,48],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,$VF,{45:187}),o($VI,[2,63],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,$VF,{45:188}),o($VI,[2,64],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($Vs1,$V1,{27:189}),o($VD,[2,89]),o($VD,[2,90]),{73:[1,190]},{54:[1,191]},o($VD,[2,41]),o($VD,[2,42]),o($VD,[2,43]),{46:193,49:[1,192],50:$Vn},o($Vt1,[2,50]),o($VH,[2,52],{52:[1,194],53:[1,195]}),o($Vu1,[2,54]),o($Vu1,[2,55]),o($VD,[2,72]),{69:196,70:[1,197],71:[1,198]},o([70,71],[2,74]),{73:[1,199]},o($VD,[2,79],{44:200,54:$VG}),{75:[1,201]},o($VD,[2,81]),{54:[1,202],79:[1,203]},o($Vf,[2,25],{28:$Vg}),o($VI,[2,45],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,[2,96]),o($VH,[2,97]),o($VH,[2,98]),o($VH,[2,99]),o($VH,[2,100]),o($VH,[2,101]),o($VH,[2,102]),o($VH,[2,103]),o($VH,[2,104]),o($VH,[2,105]),o($VH,[2,106]),o($VH,[2,107]),o($VH,[2,108]),o($VH,[2,109]),o($VH,[2,110]),o($VH,[2,111]),o($VH,[2,113]),o($VH,[2,114]),o($VH,[2,115]),o($VH,[2,116]),o($VH,[2,117]),o($VH,[2,118]),o([5,9,13,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87,105,106,107,108,109,110,111,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],[2,127],{49:[1,207],54:[1,210],56:[1,204],79:[1,209],112:[1,205],113:[1,206],114:[1,208]}),o($VH,[2,125]),o($VH,[2,126]),o($VH,[2,128]),o($VI,[2,129],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,89:211,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,130],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,89:212,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,[2,131]),o($VH,[2,132]),o($VH,[2,133]),o($VH,[2,134]),o($VH,[2,135]),o($VH,[2,136]),o($VH,[2,137]),o($VH,[2,138]),o($VH,[2,139]),o($VH,[2,140]),o($VH,[2,141]),o($VH,[2,142]),o($VH,[2,143]),o($VH,[2,144]),o($VH,[2,145]),o($VH,[2,146]),o($VH,[2,147]),o($VH,[2,148]),o($VH,[2,149]),o($VH,[2,150]),o($VH,[2,151]),o($VH,[2,152]),o($VH,[2,153]),o($VH,[2,154]),o($VH,[2,155]),o($VH,[2,156]),o($VH,[2,157]),o($VH,[2,158]),{54:[1,213]},o($VH,[2,112]),o($VH,[2,163]),o($VH,[2,164]),o($VH,[2,165]),{12:[1,214]},o([5,9,13,22,25,28,40,41,42,47,49,50,54,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],[2,58],{56:[1,215]}),o($VI,[2,46],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,61],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,62],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,216],86:$VA,87:$VB},{54:[1,217]},{84:[1,218]},o($VH,[2,49]),o($Vt1,[2,51]),o($Vu1,[2,56]),o($Vu1,[2,57]),o($VD,[2,73]),o($VD,[2,75]),o($VD,[2,76]),{54:[1,219]},{75:[1,220]},{54:[1,221]},o($VD,[2,82]),{54:[1,222]},o($VH,[2,119]),o($VH,[2,120]),o($VH,[2,121]),o($VH,[2,122]),o($VH,[2,123]),o($VH,[2,124]),o($VH,[2,162]),o($VH,[2,160]),o($VH,[2,161]),o($VH,[2,159]),o($VH,[2,166]),o($Vr1,[2,60]),o($VD,[2,88]),{84:[1,223]},{46:224,50:$Vn},o($VD,[2,77]),{54:[1,225]},o($VD,[2,80]),o($VD,[2,83]),o($Vs1,$V1,{27:226}),{44:227,46:228,50:$Vn,54:$VG},o($VD,[2,78]),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,229],86:$VA,87:$VB},{46:230,50:$Vn},{85:[1,231]},o($VD,[2,91]),{44:232,54:$VG,85:[1,233]},o($VD,[2,94]),{85:[1,234]},o($VD,[2,93]),o($VD,[2,92])],
 defaultActions: {20:[2,1]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
@@ -1106,75 +1106,75 @@ case 25:return 70
 break;
 case 26:return 71
 break;
-case 27:return 135
+case 27:return 136
 break;
-case 28:return 136
+case 28:return 137
 break;
 case 29:return 40
 break;
-case 30:return 142
+case 30:return 143
 break;
-case 31:return 143
+case 31:return 144
 break;
 case 32:return 41
 break;
 case 33:return 42
 break;
-case 34:return 132
+case 34:return 133
 break;
-case 35:return 133
+case 35:return 134
 break;
-case 36:return 134
+case 36:return 135
 break;
-case 37:return 105
+case 37:return 106
 break;
-case 38:return 106
+case 38:return 107
 break;
-case 39:return 107
+case 39:return 108
 break;
-case 40:return 108
+case 40:return 109
 break;
-case 41:return 109
+case 41:return 110
 break;
-case 42:return 110
+case 42:return 111
 break;
-case 43:return 114
+case 43:return 115
 break;
-case 44:return 115
+case 44:return 116
 break;
-case 45:return 116
+case 45:return 117
 break;
-case 46:return 117
+case 46:return 118
 break;
-case 47:return 118
+case 47:return 119
 break;
-case 48:return 119
+case 48:return 120
 break;
-case 49:return 120
+case 49:return 121
 break;
-case 50:return 121
+case 50:return 122
 break;
-case 51:return 122
+case 51:return 123
 break;
-case 52:return 124
+case 52:return 125
 break;
-case 53:return 125
+case 53:return 126
 break;
-case 54:return 128
+case 54:return 129
 break;
-case 55:return 127
+case 55:return 128
 break;
-case 56:return 129
+case 56:return 130
 break;
-case 57:return 130
+case 57:return 131
 break;
-case 58:return 131
+case 58:return 132
 break;
-case 59:return 123
+case 59:return 124
 break;
-case 60:return 126
+case 60:return 127
 break;
-case 61:return 104
+case 61:return 105
 break;
 case 62:return 25
 break;
@@ -1204,27 +1204,27 @@ case 74:return 49
 break;
 case 75:return 22
 break;
-case 76:return 140
+case 76:return 141
 break;
 case 77:return 13
 break;
-case 78:return 138
+case 78:return 139
 break;
-case 79:return 139
+case 79:return 140
 break;
-case 80:return 137
+case 80:return 138
 break;
 case 81:return 56
 break;
 case 82:return 79
 break;
-case 83:return 111
+case 83:return 112
 break;
-case 84:return 112
+case 84:return 113
 break;
-case 85:return 113
+case 85:return 114
 break;
-case 86:return 141
+case 86:return 142
 break;
 case 87:return 75
 break;
@@ -1238,7 +1238,7 @@ case 91:
 break;
 }
 },
-rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\tempo\b)/,/^(?:\\staff\b)/,/^(?:\\grace\b)/,/^(?:\\times\b)/,/^(?:\\repeat\b)/,/^(?:\\ottava\b)/,/^(?:\\stemUp\b)/,/^(?:\\stemDown\b)/,/^(?:\\stemNeutral\b)/,/^(?:\\major\b)/,/^(?:\\minor\b)/,/^(?:\\sustainOn\b)/,/^(?:\\sustainOff\b)/,/^(?:\\bar\b)/,/^(?:\\coda\b)/,/^(?:\\segno\b)/,/^(?:\\chords\b)/,/^(?:\\markup\b)/,/^(?:\\<)/,/^(?:\\>)/,/^(?:\\!)/,/^(?:\\staccato\b)/,/^(?:\\staccatissimo\b)/,/^(?:\\tenuto\b)/,/^(?:\\marcato\b)/,/^(?:\\accent\b)/,/^(?:\\portato\b)/,/^(?:\\trill\b)/,/^(?:\\turn\b)/,/^(?:\\mordent\b)/,/^(?:\\prall\b)/,/^(?:\\fermata\b)/,/^(?:\\shortfermata\b)/,/^(?:\\arpeggio\b)/,/^(?:\\ppp\b)/,/^(?:\\pp\b)/,/^(?:\\mp\b)/,/^(?:\\mf\b)/,/^(?:\\fff\b)/,/^(?:\\ff\b)/,/^(?:\\sfz\b)/,/^(?:\\rfz\b)/,/^(?:\\sf\b)/,/^(?:\\p\b)/,/^(?:\\f)/,/^(?:\\rest\b)/,/^(?:\\\\\\)/,/^(?:\\\\)/,/^(?:tremolo\b)/,/^(?:[a-g](ss|ff|s|f)?)/,/^(?:')/,/^(?:,)/,/^(?:[0-9]+)/,/^(?:\/)/,/^(?:#)/,/^(?:\{)/,/^(?:\})/,/^(?:<)/,/^(?:>)/,/^(?:\|)/,/^(?:\[)/,/^(?:\])/,/^(?:\()/,/^(?:\))/,/^(?:~)/,/^(?:\.)/,/^(?:-)/,/^(?:_\b)/,/^(?:\^)/,/^(?:!)/,/^(?::)/,/^(?:=)/,/^(?:[rR])/,/^(?:[sS])/,/^(?:$)/,/^(?:.)/],
+rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\tempo\b)/,/^(?:\\staff\b)/,/^(?:\\grace\b)/,/^(?:\\times\b)/,/^(?:\\repeat\b)/,/^(?:\\ottava\b)/,/^(?:\\stemUp\b)/,/^(?:\\stemDown\b)/,/^(?:\\stemNeutral\b)/,/^(?:\\major\b)/,/^(?:\\minor\b)/,/^(?:\\sustainOn\b)/,/^(?:\\sustainOff\b)/,/^(?:\\bar\b)/,/^(?:\\coda\b)/,/^(?:\\segno\b)/,/^(?:\\chords\b)/,/^(?:\\markup\b)/,/^(?:\\<)/,/^(?:\\>)/,/^(?:\\!)/,/^(?:\\staccato\b)/,/^(?:\\staccatissimo\b)/,/^(?:\\tenuto\b)/,/^(?:\\marcato\b)/,/^(?:\\accent\b)/,/^(?:\\portato\b)/,/^(?:\\trill\b)/,/^(?:\\turn\b)/,/^(?:\\mordent\b)/,/^(?:\\prall\b)/,/^(?:\\fermata\b)/,/^(?:\\shortfermata\b)/,/^(?:\\arpeggio\b)/,/^(?:\\ppp\b)/,/^(?:\\pp\b)/,/^(?:\\mp\b)/,/^(?:\\mf\b)/,/^(?:\\fff\b)/,/^(?:\\ff\b)/,/^(?:\\sfz\b)/,/^(?:\\rfz\b)/,/^(?:\\sf\b)/,/^(?:\\p\b)/,/^(?:\\f)/,/^(?:\\rest\b)/,/^(?:\\\\\\)/,/^(?:\\\\)/,/^(?:tremolo\b)/,/^(?:[a-g](ss|ff|s|f)?)/,/^(?:')/,/^(?:,)/,/^(?:[0-9]+)/,/^(?:\/)/,/^(?:#)/,/^(?:\{)/,/^(?:\})/,/^(?:<)/,/^(?:>)/,/^(?:\|)/,/^(?:\[)/,/^(?:\])/,/^(?:\()/,/^(?:\))/,/^(?:~)/,/^(?:\.)/,/^(?:-)/,/^(?:[_])/,/^(?:\^)/,/^(?:!)/,/^(?::)/,/^(?:=)/,/^(?:[rR])/,/^(?:[sS])/,/^(?:$)/,/^(?:.)/],
 conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91],"inclusive":true}}
 });
 return lexer;

package/source/lilylet/lilylet.jison

@@ -249,7 +249,7 @@
 "~"								return '~'
 "."								return '.'
 "-"								return '-'
-"_"								return '_'
+[_]								return '_'
 "^"								return '^'
 "!"								return '!'
 ":"								return ':'
@@ -492,6 +492,7 @@ post_event
 	| direction_mark
 	| rest_mark
 	| fingering_mark
+	| fingering_number
 	| navigation_mark
 	| markup_mark
 	;
@@ -583,6 +584,10 @@ fingering_mark
 	: '-' NUMBER								%{ const n = Number($2); if (n >= 1 && n <= 5) $$ = fingering(n); else $$ = null; %}
 	;
 
+fingering_number
+	: NUMBER									%{ const n = Number($1); if (n >= 1 && n <= 5) $$ = fingering(n); else $$ = null; %}
+	;
+
 navigation_mark
 	: CMD_CODA									-> navigation('coda')
 	| CMD_SEGNO									-> navigation('segno')

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`;