@k-l-lambda/lilylet 0.1.51 → 0.1.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/lib/lilylet/grammar.jison.js +67 -62
  2. package/lib/lilylet/meiEncoder.js +45 -6
  3. package/lib/lilylet/serializer.js +1 -0
  4. package/lib/lilylet/types.d.ts +2 -1
  5. package/lib/lilylet/types.js +1 -0
  6. package/package.json +1 -1
  7. package/source/lilylet/grammar.jison.js +67 -62
  8. package/source/lilylet/lilylet.jison +2 -0
  9. package/source/lilylet/meiEncoder.ts +49 -6
  10. package/source/lilylet/serializer.ts +1 -0
  11. package/source/lilylet/types.ts +1 -0
package/lib/lilylet/grammar.jison.js CHANGED
@@ -72,12 +72,12 @@
72
72
  }
73
73
  */
74
74
  Object.defineProperty(globalThis, "__lilyletGrammar__", { value: (function(){
75
- var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1=[2,30],$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,17],$Vb=[1,27],$Vc=[1,28],$Vd=[5,9,11,14,15,16,17,18,19,20,21,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Ve=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Vf=[5,23],$Vg=[5,23,26],$Vh=[1,39],$Vi=[5,23,26,29],$Vj=[1,67],$Vk=[1,68],$Vl=[1,69],$Vm=[1,70],$Vn=[1,71],$Vo=[1,72],$Vp=[1,53],$Vq=[1,54],$Vr=[1,73],$Vs=[1,74],$Vt=[1,75],$Vu=[1,82],$Vv=[1,83],$Vw=[1,76],$Vx=[1,77],$Vy=[1,78],$Vz=[1,79],$VA=[1,80],$VB=[1,81],$VC=[1,64],$VD=[1,65],$VE=[1,66],$VF=[2,23],$VG=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VH=[5,9,13,23,26,29,41,42,43,48,50,51,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$VI=[2,102],$VJ=[1,100],$VK=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$VL=[5,9,23,26,29,41,42,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VM=[1,185],$VN=[1,191],$VO=[1,153],$VP=[1,188],$VQ=[1,154],$VR=[1,152],$VS=[1,187],$VT=[1,146],$VU=[1,147],$VV=[1,148],$VW=[1,149],$VX=[1,150],$VY=[1,151],$VZ=[1,157],$V_=[1,156],$V$=[1,155],$V01=[1,158],$V11=[1,159],$V21=[1,160],$V31=[1,161],$V41=[1,162],$V51=[1,163],$V61=[1,164],$V71=[1,165],$V81=[1,166],$V91=[1,167],$Va1=[1,168],$Vb1=[1,169],$Vc1=[1,170],$Vd1=[1,171],$Ve1=[1,172],$Vf1=[1,173],$Vg1=[1,174],$Vh1=[1,175],$Vi1=[1,176],$Vj1=[1,177],$Vk1=[1,178],$Vl1=[1,179],$Vm1=[1,180],$Vn1=[1,181],$Vo1=[1,182],$Vp1=[1,183],$Vq1=[1,184],$Vr1=[1,186],$Vs1=[1,189],$Vt1=[1,190],$Vu1=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$Vv1=[9,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$Vw1=[50,51],$Vx1=[5,9,13,23,26,29,41,42,43,48,50,51,53,54,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$Vy1=[48,51,55,90];
75
+ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1=[2,30],$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,17],$Vb=[1,27],$Vc=[1,28],$Vd=[5,9,11,14,15,16,17,18,19,20,21,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Ve=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Vf=[5,23],$Vg=[5,23,26],$Vh=[1,39],$Vi=[5,23,26,29],$Vj=[1,67],$Vk=[1,68],$Vl=[1,69],$Vm=[1,70],$Vn=[1,71],$Vo=[1,72],$Vp=[1,53],$Vq=[1,54],$Vr=[1,73],$Vs=[1,74],$Vt=[1,75],$Vu=[1,82],$Vv=[1,83],$Vw=[1,76],$Vx=[1,77],$Vy=[1,78],$Vz=[1,79],$VA=[1,80],$VB=[1,81],$VC=[1,64],$VD=[1,65],$VE=[1,66],$VF=[2,23],$VG=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VH=[5,9,13,23,26,29,41,42,43,48,50,51,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$VI=[2,102],$VJ=[1,100],$VK=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$VL=[5,9,23,26,29,41,42,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VM=[1,186],$VN=[1,192],$VO=[1,153],$VP=[1,189],$VQ=[1,154],$VR=[1,152],$VS=[1,188],$VT=[1,146],$VU=[1,147],$VV=[1,148],$VW=[1,149],$VX=[1,150],$VY=[1,151],$VZ=[1,157],$V_=[1,156],$V$=[1,155],$V01=[1,158],$V11=[1,159],$V21=[1,160],$V31=[1,161],$V41=[1,162],$V51=[1,163],$V61=[1,164],$V71=[1,165],$V81=[1,166],$V91=[1,167],$Va1=[1,168],$Vb1=[1,169],$Vc1=[1,170],$Vd1=[1,171],$Ve1=[1,172],$Vf1=[1,173],$Vg1=[1,174],$Vh1=[1,175],$Vi1=[1,176],$Vj1=[1,177],$Vk1=[1,178],$Vl1=[1,179],$Vm1=[1,180],$Vn1=[1,181],$Vo1=[1,182],$Vp1=[1,183],$Vq1=[1,184],$Vr1=[1,185],$Vs1=[1,187],$Vt1=[1,190],$Vu1=[1,191],$Vv1=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$Vw1=[9,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$Vx1=[50,51],$Vy1=[5,9,13,23,26,29,41,42,43,48,50,51,53,54,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$Vz1=[48,51,55,90];
76
76
  var parser = {trace: function trace () { },
77
77
  yy: {},
78
- 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,"HEADER_AUTOBEAM":21,"measure_content":22,"|":23,"parts":24,"part_voices":25,"PART_SEP":26,"part_start":27,"voice_events":28,"VOICE_SEP":29,"event":30,"note_event":31,"rest_event":32,"context_event":33,"grace_event":34,"tuplet_event":35,"tremolo_event":36,"pitch_reset_event":37,"barline_event":38,"harmony_event":39,"markup_event":40,"CMD_BAR":41,"CMD_CHORDS":42,"CMD_MARKUP":43,"chord":44,"duration":45,"post_events":46,"pitch":47,"<":48,"pitches":49,">":50,"PITCH":51,"octave":52,"OCT_UP":53,"OCT_DOWN":54,"NUMBER":55,"dots":56,".":57,"REST_CHAR":58,"SPACE_CHAR":59,"clef_cmd":60,"key_cmd":61,"time_cmd":62,"tempo_cmd":63,"staff_cmd":64,"ottava_cmd":65,"stem_cmd":66,"numeric_time_sig_cmd":67,"default_time_sig_cmd":68,"CMD_CLEF":69,"CMD_KEY":70,"pitch_name":71,"mode":72,"MODE_MAJOR":73,"MODE_MINOR":74,"CMD_TIME":75,"/":76,"CMD_NUMERIC_TIME_SIG":77,"CMD_DEFAULT_TIME_SIG":78,"CMD_TEMPO":79,"=":80,"CMD_STAFF":81,"CMD_OTTAVA":82,"#":83,"-":84,"CMD_STEMUP":85,"CMD_STEMDOWN":86,"CMD_STEMNEUTRAL":87,"CMD_GRACE":88,"{":89,"}":90,"CMD_TIMES":91,"tremolo_pitches":92,"CMD_REPEAT":93,"TREMOLO":94,"post_event":95,"articulation_mark":96,"ornament_mark":97,"dynamic_mark":98,"hairpin_mark":99,"pedal_mark":100,"tie_mark":101,"slur_mark":102,"beam_mark":103,"tremolo_mark":104,"direction_mark":105,"rest_mark":106,"fingering_mark":107,"fingering_number":108,"navigation_mark":109,"markup_mark":110,"CMD_REST":111,"ART_STACCATO":112,"ART_STACCATISSIMO":113,"ART_TENUTO":114,"ART_MARCATO":115,"ART_ACCENT":116,"ART_PORTATO":117,"_":118,"^":119,"!":120,"ORN_TRILL":121,"ORN_TURN":122,"ORN_MORDENT":123,"ORN_PRALL":124,"ORN_FERMATA":125,"ORN_SHORTFERMATA":126,"ORN_ARPEGGIO":127,"DYN_PPP":128,"DYN_PP":129,"DYN_P":130,"DYN_MP":131,"DYN_MF":132,"DYN_F":133,"DYN_FF":134,"DYN_FFF":135,"DYN_SFZ":136,"DYN_RFZ":137,"DYN_SF":138,"CMD_CRESC_BEGIN":139,"CMD_DIM_BEGIN":140,"CMD_DYNAMICS_END":141,"CMD_SUSTAINON":142,"CMD_SUSTAINOFF":143,"~":144,"(":145,")":146,"[":147,":":148,"CMD_CODA":149,"CMD_SEGNO":150,"$accept":0,"$end":1},
79
- 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",21:"HEADER_AUTOBEAM",23:"|",26:"PART_SEP",29:"VOICE_SEP",41:"CMD_BAR",42:"CMD_CHORDS",43:"CMD_MARKUP",48:"<",50:">",51:"PITCH",53:"OCT_UP",54:"OCT_DOWN",55:"NUMBER",57:".",58:"REST_CHAR",59:"SPACE_CHAR",69:"CMD_CLEF",70:"CMD_KEY",73:"MODE_MAJOR",74:"MODE_MINOR",75:"CMD_TIME",76:"/",77:"CMD_NUMERIC_TIME_SIG",78:"CMD_DEFAULT_TIME_SIG",79:"CMD_TEMPO",80:"=",81:"CMD_STAFF",82:"CMD_OTTAVA",83:"#",84:"-",85:"CMD_STEMUP",86:"CMD_STEMDOWN",87:"CMD_STEMNEUTRAL",88:"CMD_GRACE",89:"{",90:"}",91:"CMD_TIMES",93:"CMD_REPEAT",94:"TREMOLO",111:"CMD_REST",112:"ART_STACCATO",113:"ART_STACCATISSIMO",114:"ART_TENUTO",115:"ART_MARCATO",116:"ART_ACCENT",117:"ART_PORTATO",118:"_",119:"^",120:"!",121:"ORN_TRILL",122:"ORN_TURN",123:"ORN_MORDENT",124:"ORN_PRALL",125:"ORN_FERMATA",126:"ORN_SHORTFERMATA",127:"ORN_ARPEGGIO",128:"DYN_PPP",129:"DYN_PP",130:"DYN_P",131:"DYN_MP",132:"DYN_MF",133:"DYN_F",134:"DYN_FF",135:"DYN_FFF",136:"DYN_SFZ",137:"DYN_RFZ",138:"DYN_SF",139:"CMD_CRESC_BEGIN",140:"CMD_DIM_BEGIN",141:"CMD_DYNAMICS_END",142:"CMD_SUSTAINON",143:"CMD_SUSTAINOFF",144:"~",145:"(",146:")",147:"[",148:":",149:"CMD_CODA",150:"CMD_SEGNO"},
80
- 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],[10,3],[7,1],[7,3],[7,2],[22,1],[24,1],[24,4],[27,0],[25,1],[25,3],[28,0],[28,2],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[38,2],[39,2],[40,2],[37,1],[31,3],[31,3],[31,2],[31,2],[44,3],[49,1],[49,2],[47,2],[47,1],[52,1],[52,1],[52,2],[52,2],[45,2],[56,0],[56,2],[32,3],[32,3],[32,2],[32,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[60,2],[61,3],[71,1],[72,1],[72,1],[62,4],[67,1],[68,1],[63,5],[63,2],[63,4],[64,2],[65,3],[65,4],[65,1],[66,1],[66,1],[66,1],[34,4],[34,2],[34,2],[35,7],[92,1],[92,1],[36,9],[36,8],[36,7],[46,0],[46,2],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[106,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,2],[96,2],[96,2],[96,2],[96,2],[96,2],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[99,1],[99,1],[99,1],[100,1],[100,1],[101,1],[102,1],[102,1],[103,1],[103,1],[104,2],[105,2],[105,2],[107,2],[108,1],[109,1],[109,1],[110,2]],
78
+ 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,"HEADER_AUTOBEAM":21,"measure_content":22,"|":23,"parts":24,"part_voices":25,"PART_SEP":26,"part_start":27,"voice_events":28,"VOICE_SEP":29,"event":30,"note_event":31,"rest_event":32,"context_event":33,"grace_event":34,"tuplet_event":35,"tremolo_event":36,"pitch_reset_event":37,"barline_event":38,"harmony_event":39,"markup_event":40,"CMD_BAR":41,"CMD_CHORDS":42,"CMD_MARKUP":43,"chord":44,"duration":45,"post_events":46,"pitch":47,"<":48,"pitches":49,">":50,"PITCH":51,"octave":52,"OCT_UP":53,"OCT_DOWN":54,"NUMBER":55,"dots":56,".":57,"REST_CHAR":58,"SPACE_CHAR":59,"clef_cmd":60,"key_cmd":61,"time_cmd":62,"tempo_cmd":63,"staff_cmd":64,"ottava_cmd":65,"stem_cmd":66,"numeric_time_sig_cmd":67,"default_time_sig_cmd":68,"CMD_CLEF":69,"CMD_KEY":70,"pitch_name":71,"mode":72,"MODE_MAJOR":73,"MODE_MINOR":74,"CMD_TIME":75,"/":76,"CMD_NUMERIC_TIME_SIG":77,"CMD_DEFAULT_TIME_SIG":78,"CMD_TEMPO":79,"=":80,"CMD_STAFF":81,"CMD_OTTAVA":82,"#":83,"-":84,"CMD_STEMUP":85,"CMD_STEMDOWN":86,"CMD_STEMNEUTRAL":87,"CMD_GRACE":88,"{":89,"}":90,"CMD_TIMES":91,"tremolo_pitches":92,"CMD_REPEAT":93,"TREMOLO":94,"post_event":95,"articulation_mark":96,"ornament_mark":97,"dynamic_mark":98,"hairpin_mark":99,"pedal_mark":100,"tie_mark":101,"slur_mark":102,"beam_mark":103,"tremolo_mark":104,"direction_mark":105,"rest_mark":106,"fingering_mark":107,"fingering_number":108,"navigation_mark":109,"markup_mark":110,"CMD_REST":111,"ART_STACCATO":112,"ART_STACCATISSIMO":113,"ART_TENUTO":114,"ART_MARCATO":115,"ART_ACCENT":116,"ART_PORTATO":117,"_":118,"^":119,"!":120,"ORN_TRILL":121,"ORN_TURN":122,"ORN_MORDENT":123,"ORN_PRALL":124,"ORN_FERMATA":125,"ORN_SHORTFERMATA":126,"ORN_ARPEGGIO":127,"DYN_PPP":128,"DYN_PP":129,"DYN_P":130,"DYN_MP":131,"DYN_MF":132,"DYN_F":133,"DYN_FF":134,"DYN_FFF":135,"DYN_SFZ":136,"DYN_RFZ":137,"DYN_SF":138,"DYN_FP":139,"CMD_CRESC_BEGIN":140,"CMD_DIM_BEGIN":141,"CMD_DYNAMICS_END":142,"CMD_SUSTAINON":143,"CMD_SUSTAINOFF":144,"~":145,"(":146,")":147,"[":148,":":149,"CMD_CODA":150,"CMD_SEGNO":151,"$accept":0,"$end":1},
79
+ 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",21:"HEADER_AUTOBEAM",23:"|",26:"PART_SEP",29:"VOICE_SEP",41:"CMD_BAR",42:"CMD_CHORDS",43:"CMD_MARKUP",48:"<",50:">",51:"PITCH",53:"OCT_UP",54:"OCT_DOWN",55:"NUMBER",57:".",58:"REST_CHAR",59:"SPACE_CHAR",69:"CMD_CLEF",70:"CMD_KEY",73:"MODE_MAJOR",74:"MODE_MINOR",75:"CMD_TIME",76:"/",77:"CMD_NUMERIC_TIME_SIG",78:"CMD_DEFAULT_TIME_SIG",79:"CMD_TEMPO",80:"=",81:"CMD_STAFF",82:"CMD_OTTAVA",83:"#",84:"-",85:"CMD_STEMUP",86:"CMD_STEMDOWN",87:"CMD_STEMNEUTRAL",88:"CMD_GRACE",89:"{",90:"}",91:"CMD_TIMES",93:"CMD_REPEAT",94:"TREMOLO",111:"CMD_REST",112:"ART_STACCATO",113:"ART_STACCATISSIMO",114:"ART_TENUTO",115:"ART_MARCATO",116:"ART_ACCENT",117:"ART_PORTATO",118:"_",119:"^",120:"!",121:"ORN_TRILL",122:"ORN_TURN",123:"ORN_MORDENT",124:"ORN_PRALL",125:"ORN_FERMATA",126:"ORN_SHORTFERMATA",127:"ORN_ARPEGGIO",128:"DYN_PPP",129:"DYN_PP",130:"DYN_P",131:"DYN_MP",132:"DYN_MF",133:"DYN_F",134:"DYN_FF",135:"DYN_FFF",136:"DYN_SFZ",137:"DYN_RFZ",138:"DYN_SF",139:"DYN_FP",140:"CMD_CRESC_BEGIN",141:"CMD_DIM_BEGIN",142:"CMD_DYNAMICS_END",143:"CMD_SUSTAINON",144:"CMD_SUSTAINOFF",145:"~",146:"(",147:")",148:"[",149:":",150:"CMD_CODA",151:"CMD_SEGNO"},
80
+ 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],[10,3],[7,1],[7,3],[7,2],[22,1],[24,1],[24,4],[27,0],[25,1],[25,3],[28,0],[28,2],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[38,2],[39,2],[40,2],[37,1],[31,3],[31,3],[31,2],[31,2],[44,3],[49,1],[49,2],[47,2],[47,1],[52,1],[52,1],[52,2],[52,2],[45,2],[56,0],[56,2],[32,3],[32,3],[32,2],[32,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[60,2],[61,3],[71,1],[72,1],[72,1],[62,4],[67,1],[68,1],[63,5],[63,2],[63,4],[64,2],[65,3],[65,4],[65,1],[66,1],[66,1],[66,1],[34,4],[34,2],[34,2],[35,7],[92,1],[92,1],[36,9],[36,8],[36,7],[46,0],[46,2],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[106,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,2],[96,2],[96,2],[96,2],[96,2],[96,2],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[99,1],[99,1],[99,1],[100,1],[100,1],[101,1],[102,1],[102,1],[103,1],[103,1],[104,2],[105,2],[105,2],[107,2],[108,1],[109,1],[109,1],[110,2]],
81
81
  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
82
82
  /* this == yyval */
83
83
 
@@ -419,59 +419,62 @@ case 154:
419
419
  this.$ = dynamic('rfz');
420
420
  break;
421
421
  case 156:
422
- this.$ = hairpin('crescendoStart');
422
+ this.$ = dynamic('fp');
423
423
  break;
424
424
  case 157:
425
- this.$ = hairpin('diminuendoStart');
425
+ this.$ = hairpin('crescendoStart');
426
426
  break;
427
427
  case 158:
428
- this.$ = hairpin('crescendoEnd');
428
+ this.$ = hairpin('diminuendoStart');
429
429
  break;
430
430
  case 159:
431
- this.$ = pedal('sustainOn');
431
+ this.$ = hairpin('crescendoEnd');
432
432
  break;
433
433
  case 160:
434
- this.$ = pedal('sustainOff');
434
+ this.$ = pedal('sustainOn');
435
435
  break;
436
436
  case 161:
437
- this.$ = tie(true);
437
+ this.$ = pedal('sustainOff');
438
438
  break;
439
439
  case 162:
440
- this.$ = slur(true);
440
+ this.$ = tie(true);
441
441
  break;
442
442
  case 163:
443
- this.$ = slur(false);
443
+ this.$ = slur(true);
444
444
  break;
445
445
  case 164:
446
- this.$ = beam(true);
446
+ this.$ = slur(false);
447
447
  break;
448
448
  case 165:
449
- this.$ = beam(false);
449
+ this.$ = beam(true);
450
450
  break;
451
451
  case 166:
452
- this.$ = ({ tremolo: Number($$[$0]) });
452
+ this.$ = beam(false);
453
453
  break;
454
454
  case 167:
455
- this.$ = ({ ...$$[$0], placement: 'above' });
455
+ this.$ = ({ tremolo: Number($$[$0]) });
456
456
  break;
457
457
  case 168:
458
+ this.$ = ({ ...$$[$0], placement: 'above' });
459
+ break;
460
+ case 169:
458
461
  this.$ = ({ ...$$[$0], placement: 'below' });
459
462
  break;
460
- case 169: case 170:
463
+ case 170: case 171:
461
464
  const n = Number($$[$0]); if (n >= 1 && n <= 5) this.$ = fingering(n); else this.$ = null;
462
465
  break;
463
- case 171:
466
+ case 172:
464
467
  this.$ = navigation('coda');
465
468
  break;
466
- case 172:
469
+ case 173:
467
470
  this.$ = navigation('segno');
468
471
  break;
469
- case 173:
472
+ case 174:
470
473
  this.$ = markupMark($$[$0].slice(1, -1));
471
474
  break;
472
475
  }
473
476
  },
474
- table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,22:8,24:18,25:19,28:20,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{1:[3]},{5:[1,21]},o($V0,$V1,{22:8,24:18,25:19,28:20,7:22,8:23,10:24,9:[1,25],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),o($V0,$V1,{22:8,24:18,25:19,28:20,7:26,9:$Vb}),{5:[2,5],23:$Vc},o($Vd,[2,8]),o($Ve,[2,6]),o($Vf,[2,21]),{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},o($Vf,[2,24],{26:[1,38]}),o($Vg,[2,25],{29:$Vh}),o($Vi,[2,28],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),{1:[2,1]},{5:[2,2],23:$Vc},o($V0,$V1,{22:8,24:18,25:19,28:20,7:84,9:$Vb}),o($Vd,[2,9]),o($Ve,[2,10],{10:85,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{5:[2,4],23:$Vc},o($Ve,[2,7]),o([9,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1,{24:18,25:19,28:20,22:86,5:$VF,23:$VF}),{13:[1,87]},{13:[1,88]},{13:[1,89]},{13:[1,90]},{13:[1,91]},{13:[1,92]},{13:[1,93]},{13:[1,94]},{13:[1,95]},o($Ve,[2,27],{27:96}),o($Ve,$V1,{28:97}),o($VG,[2,31]),o($VG,[2,32]),o($VG,[2,33]),o($VG,[2,34]),o($VG,[2,35]),o($VG,[2,36]),o($VG,[2,37]),o($VG,[2,38]),o($VG,[2,39]),o($VG,[2,40]),o($VG,[2,41]),o($VH,$VI,{45:98,46:99,55:$VJ}),o($VH,$VI,{45:101,46:102,55:$VJ}),o($VH,$VI,{45:103,46:104,55:$VJ}),o($VH,$VI,{45:105,46:106,55:$VJ}),o($VG,[2,66]),o($VG,[2,67]),o($VG,[2,68]),o($VG,[2,69]),o($VG,[2,70]),o($VG,[2,71]),o($VG,[2,72]),o($VG,[2,73]),o($VG,[2,74]),{31:108,32:109,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,89:[1,107]},{55:[1,110]},{94:[1,111]},o($VG,[2,45]),{12:[1,112]},{12:[1,113]},{12:[1,114]},{47:116,49:115,51:$Vo},o($VK,[2,54],{52:117,53:[1,118],54:[1,119]}),{12:[1,120]},{51:[1,122],71:121},{55:[1,123]},{12:[1,124],45:125,55:$VJ},{12:[1,126]},o($VG,[2,89],{83:[1,127]}),o($VG,[2,90]),o($VG,[2,91]),o($VG,[2,92]),o($VG,[2,81]),o($VG,[2,82]),{5:[2,3],23:$Vc},o($Vd,[2,11]),o($Vf,[2,22]),o($Vd,[2,12]),o($Vd,[2,13]),o($Vd,[2,14]),o($Vd,[2,15]),o($Vd,[2,16]),o($Vd,[2,17]),o($Vd,[2,18]),o($Vd,[2,19]),o($Vd,[2,20]),o($Ve,$V1,{28:20,25:128}),o($Vi,[2,29],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),o($VK,$VI,{46:129}),o($VL,[2,48],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($Vu1,[2,60],{56:192}),o($VK,$VI,{46:193}),o($VL,[2,49],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,$VI,{46:194}),o($VL,[2,64],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,$VI,{46:195}),o($VL,[2,65],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($Vv1,$V1,{28:196}),o($VG,[2,94]),o($VG,[2,95]),{76:[1,197]},{55:[1,198]},o($VG,[2,42]),o($VG,[2,43]),o($VG,[2,44]),{47:200,50:[1,199],51:$Vo},o($Vw1,[2,51]),o($VK,[2,53],{53:[1,201],54:[1,202]}),o($Vx1,[2,55]),o($Vx1,[2,56]),o($VG,[2,75]),{72:203,73:[1,204],74:[1,205]},o([73,74],[2,77]),{76:[1,206]},o($VG,[2,84],{45:207,55:$VJ}),{80:[1,208]},o($VG,[2,86]),{55:[1,209],84:[1,210]},o($Vg,[2,26],{29:$Vh}),o($VL,[2,46],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,[2,103]),o($VK,[2,104]),o($VK,[2,105]),o($VK,[2,106]),o($VK,[2,107]),o($VK,[2,108]),o($VK,[2,109]),o($VK,[2,110]),o($VK,[2,111]),o($VK,[2,112]),o($VK,[2,113]),o($VK,[2,114]),o($VK,[2,115]),o($VK,[2,116]),o($VK,[2,117]),o($VK,[2,118]),o($VK,[2,120]),o($VK,[2,121]),o($VK,[2,122]),o($VK,[2,123]),o($VK,[2,124]),o($VK,[2,125]),o([5,9,13,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93,111,112,113,114,115,116,117,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150],[2,134],{50:[1,214],55:[1,217],57:[1,211],84:[1,216],118:[1,212],119:[1,213],120:[1,215]}),o($VK,[2,132]),o($VK,[2,133]),o($VK,[2,135]),o($VL,[2,136],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:218,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,137],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:219,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,[2,138]),o($VK,[2,139]),o($VK,[2,140]),o($VK,[2,141]),o($VK,[2,142]),o($VK,[2,143]),o($VK,[2,144]),o($VK,[2,145]),o($VK,[2,146]),o($VK,[2,147]),o($VK,[2,148]),o($VK,[2,149]),o($VK,[2,150]),o($VK,[2,151]),o($VK,[2,152]),o($VK,[2,153]),o($VK,[2,154]),o($VK,[2,155]),o($VK,[2,156]),o($VK,[2,157]),o($VK,[2,158]),o($VK,[2,159]),o($VK,[2,160]),o($VK,[2,161]),o($VK,[2,162]),o($VK,[2,163]),o($VK,[2,164]),o($VK,[2,165]),{55:[1,220]},o($VK,[2,119]),o($VK,[2,170]),o($VK,[2,171]),o($VK,[2,172]),{12:[1,221]},o([5,9,13,23,26,29,41,42,43,48,50,51,55,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],[2,59],{57:[1,222]}),o($VL,[2,47],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,62],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,63],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,223],91:$VD,93:$VE},{55:[1,224]},{89:[1,225]},o($VK,[2,50]),o($Vw1,[2,52]),o($Vx1,[2,57]),o($Vx1,[2,58]),o($VG,[2,76]),o($VG,[2,78]),o($VG,[2,79]),{55:[1,226]},{80:[1,227]},{55:[1,228]},o($VG,[2,87]),{55:[1,229]},o($VK,[2,126]),o($VK,[2,127]),o($VK,[2,128]),o($VK,[2,129]),o($VK,[2,130]),o($VK,[2,131]),o($VK,[2,169]),o($VK,[2,167]),o($VK,[2,168]),o($VK,[2,166]),o($VK,[2,173]),o($Vu1,[2,61]),o($VG,[2,93]),{89:[1,230]},{44:233,47:232,48:$Vn,51:$Vo,92:231},o($VG,[2,80]),{55:[1,234]},o($VG,[2,85]),o($VG,[2,88]),o($Vv1,$V1,{28:235}),{44:233,45:236,47:232,48:$Vn,51:$Vo,55:$VJ,92:237},o($Vy1,[2,97]),o($Vy1,[2,98]),o($VG,[2,83]),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,238],91:$VD,93:$VE},{44:233,47:232,48:$Vn,51:$Vo,92:239},{90:[1,240]},o($VG,[2,96]),{45:241,55:$VJ,90:[1,242]},o($VG,[2,101]),{90:[1,243]},o($VG,[2,100]),o($VG,[2,99])],
477
+ table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,22:8,24:18,25:19,28:20,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{1:[3]},{5:[1,21]},o($V0,$V1,{22:8,24:18,25:19,28:20,7:22,8:23,10:24,9:[1,25],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),o($V0,$V1,{22:8,24:18,25:19,28:20,7:26,9:$Vb}),{5:[2,5],23:$Vc},o($Vd,[2,8]),o($Ve,[2,6]),o($Vf,[2,21]),{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},o($Vf,[2,24],{26:[1,38]}),o($Vg,[2,25],{29:$Vh}),o($Vi,[2,28],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),{1:[2,1]},{5:[2,2],23:$Vc},o($V0,$V1,{22:8,24:18,25:19,28:20,7:84,9:$Vb}),o($Vd,[2,9]),o($Ve,[2,10],{10:85,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{5:[2,4],23:$Vc},o($Ve,[2,7]),o([9,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1,{24:18,25:19,28:20,22:86,5:$VF,23:$VF}),{13:[1,87]},{13:[1,88]},{13:[1,89]},{13:[1,90]},{13:[1,91]},{13:[1,92]},{13:[1,93]},{13:[1,94]},{13:[1,95]},o($Ve,[2,27],{27:96}),o($Ve,$V1,{28:97}),o($VG,[2,31]),o($VG,[2,32]),o($VG,[2,33]),o($VG,[2,34]),o($VG,[2,35]),o($VG,[2,36]),o($VG,[2,37]),o($VG,[2,38]),o($VG,[2,39]),o($VG,[2,40]),o($VG,[2,41]),o($VH,$VI,{45:98,46:99,55:$VJ}),o($VH,$VI,{45:101,46:102,55:$VJ}),o($VH,$VI,{45:103,46:104,55:$VJ}),o($VH,$VI,{45:105,46:106,55:$VJ}),o($VG,[2,66]),o($VG,[2,67]),o($VG,[2,68]),o($VG,[2,69]),o($VG,[2,70]),o($VG,[2,71]),o($VG,[2,72]),o($VG,[2,73]),o($VG,[2,74]),{31:108,32:109,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,89:[1,107]},{55:[1,110]},{94:[1,111]},o($VG,[2,45]),{12:[1,112]},{12:[1,113]},{12:[1,114]},{47:116,49:115,51:$Vo},o($VK,[2,54],{52:117,53:[1,118],54:[1,119]}),{12:[1,120]},{51:[1,122],71:121},{55:[1,123]},{12:[1,124],45:125,55:$VJ},{12:[1,126]},o($VG,[2,89],{83:[1,127]}),o($VG,[2,90]),o($VG,[2,91]),o($VG,[2,92]),o($VG,[2,81]),o($VG,[2,82]),{5:[2,3],23:$Vc},o($Vd,[2,11]),o($Vf,[2,22]),o($Vd,[2,12]),o($Vd,[2,13]),o($Vd,[2,14]),o($Vd,[2,15]),o($Vd,[2,16]),o($Vd,[2,17]),o($Vd,[2,18]),o($Vd,[2,19]),o($Vd,[2,20]),o($Ve,$V1,{28:20,25:128}),o($Vi,[2,29],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),o($VK,$VI,{46:129}),o($VL,[2,48],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($Vv1,[2,60],{56:193}),o($VK,$VI,{46:194}),o($VL,[2,49],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,$VI,{46:195}),o($VL,[2,64],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,$VI,{46:196}),o($VL,[2,65],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($Vw1,$V1,{28:197}),o($VG,[2,94]),o($VG,[2,95]),{76:[1,198]},{55:[1,199]},o($VG,[2,42]),o($VG,[2,43]),o($VG,[2,44]),{47:201,50:[1,200],51:$Vo},o($Vx1,[2,51]),o($VK,[2,53],{53:[1,202],54:[1,203]}),o($Vy1,[2,55]),o($Vy1,[2,56]),o($VG,[2,75]),{72:204,73:[1,205],74:[1,206]},o([73,74],[2,77]),{76:[1,207]},o($VG,[2,84],{45:208,55:$VJ}),{80:[1,209]},o($VG,[2,86]),{55:[1,210],84:[1,211]},o($Vg,[2,26],{29:$Vh}),o($VL,[2,46],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,[2,103]),o($VK,[2,104]),o($VK,[2,105]),o($VK,[2,106]),o($VK,[2,107]),o($VK,[2,108]),o($VK,[2,109]),o($VK,[2,110]),o($VK,[2,111]),o($VK,[2,112]),o($VK,[2,113]),o($VK,[2,114]),o($VK,[2,115]),o($VK,[2,116]),o($VK,[2,117]),o($VK,[2,118]),o($VK,[2,120]),o($VK,[2,121]),o($VK,[2,122]),o($VK,[2,123]),o($VK,[2,124]),o($VK,[2,125]),o([5,9,13,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93,111,112,113,114,115,116,117,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151],[2,134],{50:[1,215],55:[1,218],57:[1,212],84:[1,217],118:[1,213],119:[1,214],120:[1,216]}),o($VK,[2,132]),o($VK,[2,133]),o($VK,[2,135]),o($VL,[2,136],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:219,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,137],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:220,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,[2,138]),o($VK,[2,139]),o($VK,[2,140]),o($VK,[2,141]),o($VK,[2,142]),o($VK,[2,143]),o($VK,[2,144]),o($VK,[2,145]),o($VK,[2,146]),o($VK,[2,147]),o($VK,[2,148]),o($VK,[2,149]),o($VK,[2,150]),o($VK,[2,151]),o($VK,[2,152]),o($VK,[2,153]),o($VK,[2,154]),o($VK,[2,155]),o($VK,[2,156]),o($VK,[2,157]),o($VK,[2,158]),o($VK,[2,159]),o($VK,[2,160]),o($VK,[2,161]),o($VK,[2,162]),o($VK,[2,163]),o($VK,[2,164]),o($VK,[2,165]),o($VK,[2,166]),{55:[1,221]},o($VK,[2,119]),o($VK,[2,171]),o($VK,[2,172]),o($VK,[2,173]),{12:[1,222]},o([5,9,13,23,26,29,41,42,43,48,50,51,55,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],[2,59],{57:[1,223]}),o($VL,[2,47],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,62],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,63],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,224],91:$VD,93:$VE},{55:[1,225]},{89:[1,226]},o($VK,[2,50]),o($Vx1,[2,52]),o($Vy1,[2,57]),o($Vy1,[2,58]),o($VG,[2,76]),o($VG,[2,78]),o($VG,[2,79]),{55:[1,227]},{80:[1,228]},{55:[1,229]},o($VG,[2,87]),{55:[1,230]},o($VK,[2,126]),o($VK,[2,127]),o($VK,[2,128]),o($VK,[2,129]),o($VK,[2,130]),o($VK,[2,131]),o($VK,[2,170]),o($VK,[2,168]),o($VK,[2,169]),o($VK,[2,167]),o($VK,[2,174]),o($Vv1,[2,61]),o($VG,[2,93]),{89:[1,231]},{44:234,47:233,48:$Vn,51:$Vo,92:232},o($VG,[2,80]),{55:[1,235]},o($VG,[2,85]),o($VG,[2,88]),o($Vw1,$V1,{28:236}),{44:234,45:237,47:233,48:$Vn,51:$Vo,55:$VJ,92:238},o($Vz1,[2,97]),o($Vz1,[2,98]),o($VG,[2,83]),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,239],91:$VD,93:$VE},{44:234,47:233,48:$Vn,51:$Vo,92:240},{90:[1,241]},o($VG,[2,96]),{45:242,55:$VJ,90:[1,243]},o($VG,[2,101]),{90:[1,244]},o($VG,[2,100]),o($VG,[2,99])],
475
478
  defaultActions: {21:[2,1]},
476
479
  parseError: function parseError (str, hash) {
477
480
  if (hash.recoverable) {
@@ -1151,25 +1154,25 @@ case 28:return 73
1151
1154
  break;
1152
1155
  case 29:return 74
1153
1156
  break;
1154
- case 30:return 142
1157
+ case 30:return 143
1155
1158
  break;
1156
- case 31:return 143
1159
+ case 31:return 144
1157
1160
  break;
1158
1161
  case 32:return 41
1159
1162
  break;
1160
- case 33:return 149
1163
+ case 33:return 150
1161
1164
  break;
1162
- case 34:return 150
1165
+ case 34:return 151
1163
1166
  break;
1164
1167
  case 35:return 42
1165
1168
  break;
1166
1169
  case 36:return 43
1167
1170
  break;
1168
- case 37:return 139
1171
+ case 37:return 140
1169
1172
  break;
1170
- case 38:return 140
1173
+ case 38:return 141
1171
1174
  break;
1172
- case 39:return 141
1175
+ case 39:return 142
1173
1176
  break;
1174
1177
  case 40:return 112
1175
1178
  break;
@@ -1215,76 +1218,78 @@ case 60:return 137
1215
1218
  break;
1216
1219
  case 61:return 138
1217
1220
  break;
1218
- case 62:return 130
1221
+ case 62:return 139
1219
1222
  break;
1220
- case 63:return 133
1223
+ case 63:return 130
1221
1224
  break;
1222
- case 64:return 111
1225
+ case 64:return 133
1223
1226
  break;
1224
- case 65:return 26
1227
+ case 65:return 111
1225
1228
  break;
1226
- case 66:return 29
1229
+ case 66:return 26
1227
1230
  break;
1228
- case 67:return 94
1231
+ case 67:return 29
1229
1232
  break;
1230
- case 68:return 51
1233
+ case 68:return 94
1231
1234
  break;
1232
- case 69:return 53
1235
+ case 69:return 51
1233
1236
  break;
1234
- case 70:return 54
1237
+ case 70:return 53
1235
1238
  break;
1236
- case 71:return 55
1239
+ case 71:return 54
1237
1240
  break;
1238
- case 72:return 76
1241
+ case 72:return 55
1239
1242
  break;
1240
- case 73:return 83
1243
+ case 73:return 76
1241
1244
  break;
1242
- case 74:return 89
1245
+ case 74:return 83
1243
1246
  break;
1244
- case 75:return 90
1247
+ case 75:return 89
1245
1248
  break;
1246
- case 76:return 48
1249
+ case 76:return 90
1247
1250
  break;
1248
- case 77:return 50
1251
+ case 77:return 48
1249
1252
  break;
1250
- case 78:return 23
1253
+ case 78:return 50
1251
1254
  break;
1252
- case 79:return 147
1255
+ case 79:return 23
1253
1256
  break;
1254
- case 80:return 13
1257
+ case 80:return 148
1255
1258
  break;
1256
- case 81:return 145
1259
+ case 81:return 13
1257
1260
  break;
1258
1261
  case 82:return 146
1259
1262
  break;
1260
- case 83:return 144
1263
+ case 83:return 147
1264
+ break;
1265
+ case 84:return 145
1261
1266
  break;
1262
- case 84:return 57
1267
+ case 85:return 57
1263
1268
  break;
1264
- case 85:return 84
1269
+ case 86:return 84
1265
1270
  break;
1266
- case 86:return 118
1271
+ case 87:return 118
1267
1272
  break;
1268
- case 87:return 119
1273
+ case 88:return 119
1269
1274
  break;
1270
- case 88:return 120
1275
+ case 89:return 120
1271
1276
  break;
1272
- case 89:return 148
1277
+ case 90:return 149
1273
1278
  break;
1274
- case 90:return 80
1279
+ case 91:return 80
1275
1280
  break;
1276
- case 91:return 58
1281
+ case 92:return 58
1277
1282
  break;
1278
- case 92:return 59
1283
+ case 93:return 59
1279
1284
  break;
1280
- case 93:return 5
1285
+ case 94:return 5
1281
1286
  break;
1282
- case 94:
1287
+ case 95:
1283
1288
  break;
1284
1289
  }
1285
1290
  },
1286
- rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\numericTimeSignature\b)/,/^(?:\\defaultTimeSignature\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])/,/^(?:$)/,/^(?:.)/],
1287
- 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,92,93,94],"inclusive":true}}
1291
+ rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\numericTimeSignature\b)/,/^(?:\\defaultTimeSignature\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)/,/^(?:\\fp\b)/,/^(?:\\p\b)/,/^(?:\\f)/,/^(?:\\rest\b)/,/^(?:\\\\\\)/,/^(?:\\\\)/,/^(?:tremolo\b)/,/^(?:[a-g](ss|ff|s|f)?)/,/^(?:')/,/^(?:,)/,/^(?:[0-9]+)/,/^(?:\/)/,/^(?:#)/,/^(?:\{)/,/^(?:\})/,/^(?:<)/,/^(?:>)/,/^(?:\|)/,/^(?:\[)/,/^(?:\])/,/^(?:\()/,/^(?:\))/,/^(?:~)/,/^(?:\.)/,/^(?:-)/,/^(?:[_])/,/^(?:\^)/,/^(?:!)/,/^(?::)/,/^(?:=)/,/^(?:[rR])/,/^(?:[sS])/,/^(?:$)/,/^(?:.)/],
1292
+ 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,92,93,94,95],"inclusive":true}}
1288
1293
  });
1289
1294
  return lexer;
1290
1295
  })();
package/lib/lilylet/meiEncoder.js CHANGED
@@ -85,6 +85,7 @@ const DYNAMIC_MAP = {
85
85
  fff: "fff",
86
86
  sfz: "sfz",
87
87
  rfz: "rfz",
88
+ fp: "fp",
88
89
  };
89
90
  // ID generation state - uses session prefix to prevent collisions in concurrent encoding
90
91
  let idCounter = 0;
@@ -475,6 +476,22 @@ const restEventToMEI = (event, indent, keyFifths = 0, ottavaShift = 0) => {
475
476
  }
476
477
  return `${indent}<rest ${attrs} />\n`;
477
478
  };
479
+ // Check if a tuplet has balanced internal beam groups (both [ and ] inside the same tuplet)
480
+ // Returns false for cross-tuplet beams where [ is in one tuplet and ] in another
481
+ const tupletHasInternalBeams = (event) => {
482
+ let starts = 0;
483
+ let ends = 0;
484
+ for (const e of event.events) {
485
+ if (e.type === 'note') {
486
+ const markOptions = extractMarkOptions(e.marks);
487
+ if (markOptions.beamStart)
488
+ starts++;
489
+ if (markOptions.beamEnd)
490
+ ends++;
491
+ }
492
+ }
493
+ return starts > 0 && starts === ends;
494
+ };
478
495
  // Convert TupletEvent to MEI
479
496
  const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff, ottavaShift = 0, inParentBeam = false) => {
480
497
  // LilyPond \times 2/3 means "multiply duration by 2/3"
@@ -495,17 +512,24 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
495
512
  const mordents = [];
496
513
  const turns = [];
497
514
  const arpeggios = [];
498
- // If we're inside a parent beam, don't create internal beams - notes go directly into tuplet
499
- // MEI allows: <beam><tuplet><note/>...</tuplet><tuplet><note/>...</tuplet></beam>
500
- // Beam state is managed by encodeLayer, not here.
515
+ // Handle internal beam groups: if notes have manual beam marks, respect them
516
+ const hasInternalBeams = !inParentBeam && tupletHasInternalBeams(event);
517
+ let beamOpen = false;
501
518
  for (const e of event.events) {
502
519
  if (e.type === 'note') {
503
- // For cross-staff notation: set note's staff if different from layerStaff
504
520
  const noteEvent = e;
521
+ const markOptions = extractMarkOptions(noteEvent.marks);
522
+ // Open beam if this note starts a beam group
523
+ if (hasInternalBeams && markOptions.beamStart && !beamOpen) {
524
+ xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
525
+ beamOpen = true;
526
+ }
527
+ const noteIndent = beamOpen ? baseIndent + ' ' : baseIndent;
528
+ // For cross-staff notation: set note's staff if different from layerStaff
505
529
  const effectiveNoteEvent = effectiveStaff && layerStaff && effectiveStaff !== layerStaff
506
530
  ? { ...noteEvent, staff: effectiveStaff }
507
531
  : noteEvent;
508
- const result = noteEventToMEI(effectiveNoteEvent, baseIndent, layerStaff, false, undefined, keyFifths, ottavaShift);
532
+ const result = noteEventToMEI(effectiveNoteEvent, noteIndent, layerStaff, false, undefined, keyFifths, ottavaShift);
509
533
  xml += result.xml;
510
534
  // Collect slur info
511
535
  if (result.slurStart)
@@ -525,11 +549,21 @@ const tupletEventToMEI = (event, indent, layerStaff, keyFifths = 0, currentStaff
525
549
  turns.push({ startid: result.elementId });
526
550
  if (result.arpeggio)
527
551
  arpeggios.push({ plist: result.elementId });
552
+ // Close beam if this note ends a beam group
553
+ if (hasInternalBeams && markOptions.beamEnd && beamOpen) {
554
+ xml += `${baseIndent}</beam>\n`;
555
+ beamOpen = false;
556
+ }
528
557
  }
529
558
  else if (e.type === 'rest') {
530
- xml += restEventToMEI(e, baseIndent, keyFifths, ottavaShift);
559
+ const restIndent = beamOpen ? baseIndent + ' ' : baseIndent;
560
+ xml += restEventToMEI(e, restIndent, keyFifths, ottavaShift);
531
561
  }
532
562
  }
563
+ // Close any unclosed beam
564
+ if (beamOpen) {
565
+ xml += `${baseIndent}</beam>\n`;
566
+ }
533
567
  xml += `${indent}</tuplet>\n`;
534
568
  return { xml, slurStarts, slurEnds, dynamics, fermatas, trills, mordents, turns, arpeggios };
535
569
  };
@@ -608,6 +642,11 @@ const getEventBeamMarks = (event) => {
608
642
  }
609
643
  if (event.type === 'tuplet') {
610
644
  const tuplet = event;
645
+ // If the tuplet has internal beam groups, don't report beam marks to the parent
646
+ // so the parent won't wrap the tuplet in an external <beam>
647
+ if (tupletHasInternalBeams(tuplet)) {
648
+ return { beamStart: false, beamEnd: false };
649
+ }
611
650
  let beamStart = false;
612
651
  let beamEnd = false;
613
652
  for (const e of tuplet.events) {
package/lib/lilylet/serializer.js CHANGED
@@ -89,6 +89,7 @@ const DYNAMIC_MAP = {
89
89
  fff: '\\fff',
90
90
  sfz: '\\sfz',
91
91
  rfz: '\\rfz',
92
+ fp: '\\fp',
92
93
  };
93
94
  // Hairpin to Lilylet notation
94
95
  const HAIRPIN_MAP = {
package/lib/lilylet/types.d.ts CHANGED
@@ -51,7 +51,8 @@ export declare enum DynamicType {
51
51
  ff = "ff",
52
52
  fff = "fff",
53
53
  sfz = "sfz",
54
- rfz = "rfz"
54
+ rfz = "rfz",
55
+ fp = "fp"
55
56
  }
56
57
  export declare enum HairpinType {
57
58
  crescendoStart = "crescendoStart",
package/lib/lilylet/types.js CHANGED
@@ -60,6 +60,7 @@ export var DynamicType;
60
60
  DynamicType["fff"] = "fff";
61
61
  DynamicType["sfz"] = "sfz";
62
62
  DynamicType["rfz"] = "rfz";
63
+ DynamicType["fp"] = "fp";
63
64
  })(DynamicType || (DynamicType = {}));
64
65
  export var HairpinType;
65
66
  (function (HairpinType) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@k-l-lambda/lilylet",
3
- "version": "0.1.51",
3
+ "version": "0.1.52",
4
4
  "description": "Lilylet is a lilyopnd-like sheet music language designed for Markdown rendering and symbolic music representation in AIGC applications.",
5
5
  "type": "module",
6
6
  "main": "lib/index.js",
package/source/lilylet/grammar.jison.js CHANGED
@@ -72,12 +72,12 @@
72
72
  }
73
73
  */
74
74
  Object.defineProperty(globalThis, "__lilyletGrammar__", { value: (function(){
75
- var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1=[2,30],$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,17],$Vb=[1,27],$Vc=[1,28],$Vd=[5,9,11,14,15,16,17,18,19,20,21,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Ve=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Vf=[5,23],$Vg=[5,23,26],$Vh=[1,39],$Vi=[5,23,26,29],$Vj=[1,67],$Vk=[1,68],$Vl=[1,69],$Vm=[1,70],$Vn=[1,71],$Vo=[1,72],$Vp=[1,53],$Vq=[1,54],$Vr=[1,73],$Vs=[1,74],$Vt=[1,75],$Vu=[1,82],$Vv=[1,83],$Vw=[1,76],$Vx=[1,77],$Vy=[1,78],$Vz=[1,79],$VA=[1,80],$VB=[1,81],$VC=[1,64],$VD=[1,65],$VE=[1,66],$VF=[2,23],$VG=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VH=[5,9,13,23,26,29,41,42,43,48,50,51,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$VI=[2,102],$VJ=[1,100],$VK=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$VL=[5,9,23,26,29,41,42,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VM=[1,185],$VN=[1,191],$VO=[1,153],$VP=[1,188],$VQ=[1,154],$VR=[1,152],$VS=[1,187],$VT=[1,146],$VU=[1,147],$VV=[1,148],$VW=[1,149],$VX=[1,150],$VY=[1,151],$VZ=[1,157],$V_=[1,156],$V$=[1,155],$V01=[1,158],$V11=[1,159],$V21=[1,160],$V31=[1,161],$V41=[1,162],$V51=[1,163],$V61=[1,164],$V71=[1,165],$V81=[1,166],$V91=[1,167],$Va1=[1,168],$Vb1=[1,169],$Vc1=[1,170],$Vd1=[1,171],$Ve1=[1,172],$Vf1=[1,173],$Vg1=[1,174],$Vh1=[1,175],$Vi1=[1,176],$Vj1=[1,177],$Vk1=[1,178],$Vl1=[1,179],$Vm1=[1,180],$Vn1=[1,181],$Vo1=[1,182],$Vp1=[1,183],$Vq1=[1,184],$Vr1=[1,186],$Vs1=[1,189],$Vt1=[1,190],$Vu1=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$Vv1=[9,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$Vw1=[50,51],$Vx1=[5,9,13,23,26,29,41,42,43,48,50,51,53,54,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],$Vy1=[48,51,55,90];
75
+ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1=[2,30],$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,17],$Vb=[1,27],$Vc=[1,28],$Vd=[5,9,11,14,15,16,17,18,19,20,21,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Ve=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$Vf=[5,23],$Vg=[5,23,26],$Vh=[1,39],$Vi=[5,23,26,29],$Vj=[1,67],$Vk=[1,68],$Vl=[1,69],$Vm=[1,70],$Vn=[1,71],$Vo=[1,72],$Vp=[1,53],$Vq=[1,54],$Vr=[1,73],$Vs=[1,74],$Vt=[1,75],$Vu=[1,82],$Vv=[1,83],$Vw=[1,76],$Vx=[1,77],$Vy=[1,78],$Vz=[1,79],$VA=[1,80],$VB=[1,81],$VC=[1,64],$VD=[1,65],$VE=[1,66],$VF=[2,23],$VG=[5,9,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VH=[5,9,13,23,26,29,41,42,43,48,50,51,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$VI=[2,102],$VJ=[1,100],$VK=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$VL=[5,9,23,26,29,41,42,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$VM=[1,186],$VN=[1,192],$VO=[1,153],$VP=[1,189],$VQ=[1,154],$VR=[1,152],$VS=[1,188],$VT=[1,146],$VU=[1,147],$VV=[1,148],$VW=[1,149],$VX=[1,150],$VY=[1,151],$VZ=[1,157],$V_=[1,156],$V$=[1,155],$V01=[1,158],$V11=[1,159],$V21=[1,160],$V31=[1,161],$V41=[1,162],$V51=[1,163],$V61=[1,164],$V71=[1,165],$V81=[1,166],$V91=[1,167],$Va1=[1,168],$Vb1=[1,169],$Vc1=[1,170],$Vd1=[1,171],$Ve1=[1,172],$Vf1=[1,173],$Vg1=[1,174],$Vh1=[1,175],$Vi1=[1,176],$Vj1=[1,177],$Vk1=[1,178],$Vl1=[1,179],$Vm1=[1,180],$Vn1=[1,181],$Vo1=[1,182],$Vp1=[1,183],$Vq1=[1,184],$Vr1=[1,185],$Vs1=[1,187],$Vt1=[1,190],$Vu1=[1,191],$Vv1=[5,9,13,23,26,29,41,42,43,48,50,51,55,57,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$Vw1=[9,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93],$Vx1=[50,51],$Vy1=[5,9,13,23,26,29,41,42,43,48,50,51,53,54,55,57,58,59,69,70,75,77,78,79,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],$Vz1=[48,51,55,90];
76
76
  var parser = {trace: function trace () { },
77
77
  yy: {},
78
- 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,"HEADER_AUTOBEAM":21,"measure_content":22,"|":23,"parts":24,"part_voices":25,"PART_SEP":26,"part_start":27,"voice_events":28,"VOICE_SEP":29,"event":30,"note_event":31,"rest_event":32,"context_event":33,"grace_event":34,"tuplet_event":35,"tremolo_event":36,"pitch_reset_event":37,"barline_event":38,"harmony_event":39,"markup_event":40,"CMD_BAR":41,"CMD_CHORDS":42,"CMD_MARKUP":43,"chord":44,"duration":45,"post_events":46,"pitch":47,"<":48,"pitches":49,">":50,"PITCH":51,"octave":52,"OCT_UP":53,"OCT_DOWN":54,"NUMBER":55,"dots":56,".":57,"REST_CHAR":58,"SPACE_CHAR":59,"clef_cmd":60,"key_cmd":61,"time_cmd":62,"tempo_cmd":63,"staff_cmd":64,"ottava_cmd":65,"stem_cmd":66,"numeric_time_sig_cmd":67,"default_time_sig_cmd":68,"CMD_CLEF":69,"CMD_KEY":70,"pitch_name":71,"mode":72,"MODE_MAJOR":73,"MODE_MINOR":74,"CMD_TIME":75,"/":76,"CMD_NUMERIC_TIME_SIG":77,"CMD_DEFAULT_TIME_SIG":78,"CMD_TEMPO":79,"=":80,"CMD_STAFF":81,"CMD_OTTAVA":82,"#":83,"-":84,"CMD_STEMUP":85,"CMD_STEMDOWN":86,"CMD_STEMNEUTRAL":87,"CMD_GRACE":88,"{":89,"}":90,"CMD_TIMES":91,"tremolo_pitches":92,"CMD_REPEAT":93,"TREMOLO":94,"post_event":95,"articulation_mark":96,"ornament_mark":97,"dynamic_mark":98,"hairpin_mark":99,"pedal_mark":100,"tie_mark":101,"slur_mark":102,"beam_mark":103,"tremolo_mark":104,"direction_mark":105,"rest_mark":106,"fingering_mark":107,"fingering_number":108,"navigation_mark":109,"markup_mark":110,"CMD_REST":111,"ART_STACCATO":112,"ART_STACCATISSIMO":113,"ART_TENUTO":114,"ART_MARCATO":115,"ART_ACCENT":116,"ART_PORTATO":117,"_":118,"^":119,"!":120,"ORN_TRILL":121,"ORN_TURN":122,"ORN_MORDENT":123,"ORN_PRALL":124,"ORN_FERMATA":125,"ORN_SHORTFERMATA":126,"ORN_ARPEGGIO":127,"DYN_PPP":128,"DYN_PP":129,"DYN_P":130,"DYN_MP":131,"DYN_MF":132,"DYN_F":133,"DYN_FF":134,"DYN_FFF":135,"DYN_SFZ":136,"DYN_RFZ":137,"DYN_SF":138,"CMD_CRESC_BEGIN":139,"CMD_DIM_BEGIN":140,"CMD_DYNAMICS_END":141,"CMD_SUSTAINON":142,"CMD_SUSTAINOFF":143,"~":144,"(":145,")":146,"[":147,":":148,"CMD_CODA":149,"CMD_SEGNO":150,"$accept":0,"$end":1},
79
- 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",21:"HEADER_AUTOBEAM",23:"|",26:"PART_SEP",29:"VOICE_SEP",41:"CMD_BAR",42:"CMD_CHORDS",43:"CMD_MARKUP",48:"<",50:">",51:"PITCH",53:"OCT_UP",54:"OCT_DOWN",55:"NUMBER",57:".",58:"REST_CHAR",59:"SPACE_CHAR",69:"CMD_CLEF",70:"CMD_KEY",73:"MODE_MAJOR",74:"MODE_MINOR",75:"CMD_TIME",76:"/",77:"CMD_NUMERIC_TIME_SIG",78:"CMD_DEFAULT_TIME_SIG",79:"CMD_TEMPO",80:"=",81:"CMD_STAFF",82:"CMD_OTTAVA",83:"#",84:"-",85:"CMD_STEMUP",86:"CMD_STEMDOWN",87:"CMD_STEMNEUTRAL",88:"CMD_GRACE",89:"{",90:"}",91:"CMD_TIMES",93:"CMD_REPEAT",94:"TREMOLO",111:"CMD_REST",112:"ART_STACCATO",113:"ART_STACCATISSIMO",114:"ART_TENUTO",115:"ART_MARCATO",116:"ART_ACCENT",117:"ART_PORTATO",118:"_",119:"^",120:"!",121:"ORN_TRILL",122:"ORN_TURN",123:"ORN_MORDENT",124:"ORN_PRALL",125:"ORN_FERMATA",126:"ORN_SHORTFERMATA",127:"ORN_ARPEGGIO",128:"DYN_PPP",129:"DYN_PP",130:"DYN_P",131:"DYN_MP",132:"DYN_MF",133:"DYN_F",134:"DYN_FF",135:"DYN_FFF",136:"DYN_SFZ",137:"DYN_RFZ",138:"DYN_SF",139:"CMD_CRESC_BEGIN",140:"CMD_DIM_BEGIN",141:"CMD_DYNAMICS_END",142:"CMD_SUSTAINON",143:"CMD_SUSTAINOFF",144:"~",145:"(",146:")",147:"[",148:":",149:"CMD_CODA",150:"CMD_SEGNO"},
80
- 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],[10,3],[7,1],[7,3],[7,2],[22,1],[24,1],[24,4],[27,0],[25,1],[25,3],[28,0],[28,2],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[38,2],[39,2],[40,2],[37,1],[31,3],[31,3],[31,2],[31,2],[44,3],[49,1],[49,2],[47,2],[47,1],[52,1],[52,1],[52,2],[52,2],[45,2],[56,0],[56,2],[32,3],[32,3],[32,2],[32,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[60,2],[61,3],[71,1],[72,1],[72,1],[62,4],[67,1],[68,1],[63,5],[63,2],[63,4],[64,2],[65,3],[65,4],[65,1],[66,1],[66,1],[66,1],[34,4],[34,2],[34,2],[35,7],[92,1],[92,1],[36,9],[36,8],[36,7],[46,0],[46,2],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[106,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,2],[96,2],[96,2],[96,2],[96,2],[96,2],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[99,1],[99,1],[99,1],[100,1],[100,1],[101,1],[102,1],[102,1],[103,1],[103,1],[104,2],[105,2],[105,2],[107,2],[108,1],[109,1],[109,1],[110,2]],
78
+ 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,"HEADER_AUTOBEAM":21,"measure_content":22,"|":23,"parts":24,"part_voices":25,"PART_SEP":26,"part_start":27,"voice_events":28,"VOICE_SEP":29,"event":30,"note_event":31,"rest_event":32,"context_event":33,"grace_event":34,"tuplet_event":35,"tremolo_event":36,"pitch_reset_event":37,"barline_event":38,"harmony_event":39,"markup_event":40,"CMD_BAR":41,"CMD_CHORDS":42,"CMD_MARKUP":43,"chord":44,"duration":45,"post_events":46,"pitch":47,"<":48,"pitches":49,">":50,"PITCH":51,"octave":52,"OCT_UP":53,"OCT_DOWN":54,"NUMBER":55,"dots":56,".":57,"REST_CHAR":58,"SPACE_CHAR":59,"clef_cmd":60,"key_cmd":61,"time_cmd":62,"tempo_cmd":63,"staff_cmd":64,"ottava_cmd":65,"stem_cmd":66,"numeric_time_sig_cmd":67,"default_time_sig_cmd":68,"CMD_CLEF":69,"CMD_KEY":70,"pitch_name":71,"mode":72,"MODE_MAJOR":73,"MODE_MINOR":74,"CMD_TIME":75,"/":76,"CMD_NUMERIC_TIME_SIG":77,"CMD_DEFAULT_TIME_SIG":78,"CMD_TEMPO":79,"=":80,"CMD_STAFF":81,"CMD_OTTAVA":82,"#":83,"-":84,"CMD_STEMUP":85,"CMD_STEMDOWN":86,"CMD_STEMNEUTRAL":87,"CMD_GRACE":88,"{":89,"}":90,"CMD_TIMES":91,"tremolo_pitches":92,"CMD_REPEAT":93,"TREMOLO":94,"post_event":95,"articulation_mark":96,"ornament_mark":97,"dynamic_mark":98,"hairpin_mark":99,"pedal_mark":100,"tie_mark":101,"slur_mark":102,"beam_mark":103,"tremolo_mark":104,"direction_mark":105,"rest_mark":106,"fingering_mark":107,"fingering_number":108,"navigation_mark":109,"markup_mark":110,"CMD_REST":111,"ART_STACCATO":112,"ART_STACCATISSIMO":113,"ART_TENUTO":114,"ART_MARCATO":115,"ART_ACCENT":116,"ART_PORTATO":117,"_":118,"^":119,"!":120,"ORN_TRILL":121,"ORN_TURN":122,"ORN_MORDENT":123,"ORN_PRALL":124,"ORN_FERMATA":125,"ORN_SHORTFERMATA":126,"ORN_ARPEGGIO":127,"DYN_PPP":128,"DYN_PP":129,"DYN_P":130,"DYN_MP":131,"DYN_MF":132,"DYN_F":133,"DYN_FF":134,"DYN_FFF":135,"DYN_SFZ":136,"DYN_RFZ":137,"DYN_SF":138,"DYN_FP":139,"CMD_CRESC_BEGIN":140,"CMD_DIM_BEGIN":141,"CMD_DYNAMICS_END":142,"CMD_SUSTAINON":143,"CMD_SUSTAINOFF":144,"~":145,"(":146,")":147,"[":148,":":149,"CMD_CODA":150,"CMD_SEGNO":151,"$accept":0,"$end":1},
79
+ 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",21:"HEADER_AUTOBEAM",23:"|",26:"PART_SEP",29:"VOICE_SEP",41:"CMD_BAR",42:"CMD_CHORDS",43:"CMD_MARKUP",48:"<",50:">",51:"PITCH",53:"OCT_UP",54:"OCT_DOWN",55:"NUMBER",57:".",58:"REST_CHAR",59:"SPACE_CHAR",69:"CMD_CLEF",70:"CMD_KEY",73:"MODE_MAJOR",74:"MODE_MINOR",75:"CMD_TIME",76:"/",77:"CMD_NUMERIC_TIME_SIG",78:"CMD_DEFAULT_TIME_SIG",79:"CMD_TEMPO",80:"=",81:"CMD_STAFF",82:"CMD_OTTAVA",83:"#",84:"-",85:"CMD_STEMUP",86:"CMD_STEMDOWN",87:"CMD_STEMNEUTRAL",88:"CMD_GRACE",89:"{",90:"}",91:"CMD_TIMES",93:"CMD_REPEAT",94:"TREMOLO",111:"CMD_REST",112:"ART_STACCATO",113:"ART_STACCATISSIMO",114:"ART_TENUTO",115:"ART_MARCATO",116:"ART_ACCENT",117:"ART_PORTATO",118:"_",119:"^",120:"!",121:"ORN_TRILL",122:"ORN_TURN",123:"ORN_MORDENT",124:"ORN_PRALL",125:"ORN_FERMATA",126:"ORN_SHORTFERMATA",127:"ORN_ARPEGGIO",128:"DYN_PPP",129:"DYN_PP",130:"DYN_P",131:"DYN_MP",132:"DYN_MF",133:"DYN_F",134:"DYN_FF",135:"DYN_FFF",136:"DYN_SFZ",137:"DYN_RFZ",138:"DYN_SF",139:"DYN_FP",140:"CMD_CRESC_BEGIN",141:"CMD_DIM_BEGIN",142:"CMD_DYNAMICS_END",143:"CMD_SUSTAINON",144:"CMD_SUSTAINOFF",145:"~",146:"(",147:")",148:"[",149:":",150:"CMD_CODA",151:"CMD_SEGNO"},
80
+ 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],[10,3],[7,1],[7,3],[7,2],[22,1],[24,1],[24,4],[27,0],[25,1],[25,3],[28,0],[28,2],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[38,2],[39,2],[40,2],[37,1],[31,3],[31,3],[31,2],[31,2],[44,3],[49,1],[49,2],[47,2],[47,1],[52,1],[52,1],[52,2],[52,2],[45,2],[56,0],[56,2],[32,3],[32,3],[32,2],[32,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[60,2],[61,3],[71,1],[72,1],[72,1],[62,4],[67,1],[68,1],[63,5],[63,2],[63,4],[64,2],[65,3],[65,4],[65,1],[66,1],[66,1],[66,1],[34,4],[34,2],[34,2],[35,7],[92,1],[92,1],[36,9],[36,8],[36,7],[46,0],[46,2],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[106,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,2],[96,2],[96,2],[96,2],[96,2],[96,2],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[97,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[98,1],[99,1],[99,1],[99,1],[100,1],[100,1],[101,1],[102,1],[102,1],[103,1],[103,1],[104,2],[105,2],[105,2],[107,2],[108,1],[109,1],[109,1],[110,2]],
81
81
  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
82
82
  /* this == yyval */
83
83
 
@@ -419,59 +419,62 @@ case 154:
419
419
  this.$ = dynamic('rfz');
420
420
  break;
421
421
  case 156:
422
- this.$ = hairpin('crescendoStart');
422
+ this.$ = dynamic('fp');
423
423
  break;
424
424
  case 157:
425
- this.$ = hairpin('diminuendoStart');
425
+ this.$ = hairpin('crescendoStart');
426
426
  break;
427
427
  case 158:
428
- this.$ = hairpin('crescendoEnd');
428
+ this.$ = hairpin('diminuendoStart');
429
429
  break;
430
430
  case 159:
431
- this.$ = pedal('sustainOn');
431
+ this.$ = hairpin('crescendoEnd');
432
432
  break;
433
433
  case 160:
434
- this.$ = pedal('sustainOff');
434
+ this.$ = pedal('sustainOn');
435
435
  break;
436
436
  case 161:
437
- this.$ = tie(true);
437
+ this.$ = pedal('sustainOff');
438
438
  break;
439
439
  case 162:
440
- this.$ = slur(true);
440
+ this.$ = tie(true);
441
441
  break;
442
442
  case 163:
443
- this.$ = slur(false);
443
+ this.$ = slur(true);
444
444
  break;
445
445
  case 164:
446
- this.$ = beam(true);
446
+ this.$ = slur(false);
447
447
  break;
448
448
  case 165:
449
- this.$ = beam(false);
449
+ this.$ = beam(true);
450
450
  break;
451
451
  case 166:
452
- this.$ = ({ tremolo: Number($$[$0]) });
452
+ this.$ = beam(false);
453
453
  break;
454
454
  case 167:
455
- this.$ = ({ ...$$[$0], placement: 'above' });
455
+ this.$ = ({ tremolo: Number($$[$0]) });
456
456
  break;
457
457
  case 168:
458
+ this.$ = ({ ...$$[$0], placement: 'above' });
459
+ break;
460
+ case 169:
458
461
  this.$ = ({ ...$$[$0], placement: 'below' });
459
462
  break;
460
- case 169: case 170:
463
+ case 170: case 171:
461
464
  const n = Number($$[$0]); if (n >= 1 && n <= 5) this.$ = fingering(n); else this.$ = null;
462
465
  break;
463
- case 171:
466
+ case 172:
464
467
  this.$ = navigation('coda');
465
468
  break;
466
- case 172:
469
+ case 173:
467
470
  this.$ = navigation('segno');
468
471
  break;
469
- case 173:
472
+ case 174:
470
473
  this.$ = markupMark($$[$0].slice(1, -1));
471
474
  break;
472
475
  }
473
476
  },
474
- table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,22:8,24:18,25:19,28:20,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{1:[3]},{5:[1,21]},o($V0,$V1,{22:8,24:18,25:19,28:20,7:22,8:23,10:24,9:[1,25],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),o($V0,$V1,{22:8,24:18,25:19,28:20,7:26,9:$Vb}),{5:[2,5],23:$Vc},o($Vd,[2,8]),o($Ve,[2,6]),o($Vf,[2,21]),{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},o($Vf,[2,24],{26:[1,38]}),o($Vg,[2,25],{29:$Vh}),o($Vi,[2,28],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),{1:[2,1]},{5:[2,2],23:$Vc},o($V0,$V1,{22:8,24:18,25:19,28:20,7:84,9:$Vb}),o($Vd,[2,9]),o($Ve,[2,10],{10:85,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{5:[2,4],23:$Vc},o($Ve,[2,7]),o([9,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1,{24:18,25:19,28:20,22:86,5:$VF,23:$VF}),{13:[1,87]},{13:[1,88]},{13:[1,89]},{13:[1,90]},{13:[1,91]},{13:[1,92]},{13:[1,93]},{13:[1,94]},{13:[1,95]},o($Ve,[2,27],{27:96}),o($Ve,$V1,{28:97}),o($VG,[2,31]),o($VG,[2,32]),o($VG,[2,33]),o($VG,[2,34]),o($VG,[2,35]),o($VG,[2,36]),o($VG,[2,37]),o($VG,[2,38]),o($VG,[2,39]),o($VG,[2,40]),o($VG,[2,41]),o($VH,$VI,{45:98,46:99,55:$VJ}),o($VH,$VI,{45:101,46:102,55:$VJ}),o($VH,$VI,{45:103,46:104,55:$VJ}),o($VH,$VI,{45:105,46:106,55:$VJ}),o($VG,[2,66]),o($VG,[2,67]),o($VG,[2,68]),o($VG,[2,69]),o($VG,[2,70]),o($VG,[2,71]),o($VG,[2,72]),o($VG,[2,73]),o($VG,[2,74]),{31:108,32:109,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,89:[1,107]},{55:[1,110]},{94:[1,111]},o($VG,[2,45]),{12:[1,112]},{12:[1,113]},{12:[1,114]},{47:116,49:115,51:$Vo},o($VK,[2,54],{52:117,53:[1,118],54:[1,119]}),{12:[1,120]},{51:[1,122],71:121},{55:[1,123]},{12:[1,124],45:125,55:$VJ},{12:[1,126]},o($VG,[2,89],{83:[1,127]}),o($VG,[2,90]),o($VG,[2,91]),o($VG,[2,92]),o($VG,[2,81]),o($VG,[2,82]),{5:[2,3],23:$Vc},o($Vd,[2,11]),o($Vf,[2,22]),o($Vd,[2,12]),o($Vd,[2,13]),o($Vd,[2,14]),o($Vd,[2,15]),o($Vd,[2,16]),o($Vd,[2,17]),o($Vd,[2,18]),o($Vd,[2,19]),o($Vd,[2,20]),o($Ve,$V1,{28:20,25:128}),o($Vi,[2,29],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),o($VK,$VI,{46:129}),o($VL,[2,48],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($Vu1,[2,60],{56:192}),o($VK,$VI,{46:193}),o($VL,[2,49],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,$VI,{46:194}),o($VL,[2,64],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,$VI,{46:195}),o($VL,[2,65],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($Vv1,$V1,{28:196}),o($VG,[2,94]),o($VG,[2,95]),{76:[1,197]},{55:[1,198]},o($VG,[2,42]),o($VG,[2,43]),o($VG,[2,44]),{47:200,50:[1,199],51:$Vo},o($Vw1,[2,51]),o($VK,[2,53],{53:[1,201],54:[1,202]}),o($Vx1,[2,55]),o($Vx1,[2,56]),o($VG,[2,75]),{72:203,73:[1,204],74:[1,205]},o([73,74],[2,77]),{76:[1,206]},o($VG,[2,84],{45:207,55:$VJ}),{80:[1,208]},o($VG,[2,86]),{55:[1,209],84:[1,210]},o($Vg,[2,26],{29:$Vh}),o($VL,[2,46],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,[2,103]),o($VK,[2,104]),o($VK,[2,105]),o($VK,[2,106]),o($VK,[2,107]),o($VK,[2,108]),o($VK,[2,109]),o($VK,[2,110]),o($VK,[2,111]),o($VK,[2,112]),o($VK,[2,113]),o($VK,[2,114]),o($VK,[2,115]),o($VK,[2,116]),o($VK,[2,117]),o($VK,[2,118]),o($VK,[2,120]),o($VK,[2,121]),o($VK,[2,122]),o($VK,[2,123]),o($VK,[2,124]),o($VK,[2,125]),o([5,9,13,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93,111,112,113,114,115,116,117,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150],[2,134],{50:[1,214],55:[1,217],57:[1,211],84:[1,216],118:[1,212],119:[1,213],120:[1,215]}),o($VK,[2,132]),o($VK,[2,133]),o($VK,[2,135]),o($VL,[2,136],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:218,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,137],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:219,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VK,[2,138]),o($VK,[2,139]),o($VK,[2,140]),o($VK,[2,141]),o($VK,[2,142]),o($VK,[2,143]),o($VK,[2,144]),o($VK,[2,145]),o($VK,[2,146]),o($VK,[2,147]),o($VK,[2,148]),o($VK,[2,149]),o($VK,[2,150]),o($VK,[2,151]),o($VK,[2,152]),o($VK,[2,153]),o($VK,[2,154]),o($VK,[2,155]),o($VK,[2,156]),o($VK,[2,157]),o($VK,[2,158]),o($VK,[2,159]),o($VK,[2,160]),o($VK,[2,161]),o($VK,[2,162]),o($VK,[2,163]),o($VK,[2,164]),o($VK,[2,165]),{55:[1,220]},o($VK,[2,119]),o($VK,[2,170]),o($VK,[2,171]),o($VK,[2,172]),{12:[1,221]},o([5,9,13,23,26,29,41,42,43,48,50,51,55,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150],[2,59],{57:[1,222]}),o($VL,[2,47],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,62],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),o($VL,[2,63],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1}),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,223],91:$VD,93:$VE},{55:[1,224]},{89:[1,225]},o($VK,[2,50]),o($Vw1,[2,52]),o($Vx1,[2,57]),o($Vx1,[2,58]),o($VG,[2,76]),o($VG,[2,78]),o($VG,[2,79]),{55:[1,226]},{80:[1,227]},{55:[1,228]},o($VG,[2,87]),{55:[1,229]},o($VK,[2,126]),o($VK,[2,127]),o($VK,[2,128]),o($VK,[2,129]),o($VK,[2,130]),o($VK,[2,131]),o($VK,[2,169]),o($VK,[2,167]),o($VK,[2,168]),o($VK,[2,166]),o($VK,[2,173]),o($Vu1,[2,61]),o($VG,[2,93]),{89:[1,230]},{44:233,47:232,48:$Vn,51:$Vo,92:231},o($VG,[2,80]),{55:[1,234]},o($VG,[2,85]),o($VG,[2,88]),o($Vv1,$V1,{28:235}),{44:233,45:236,47:232,48:$Vn,51:$Vo,55:$VJ,92:237},o($Vy1,[2,97]),o($Vy1,[2,98]),o($VG,[2,83]),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,238],91:$VD,93:$VE},{44:233,47:232,48:$Vn,51:$Vo,92:239},{90:[1,240]},o($VG,[2,96]),{45:241,55:$VJ,90:[1,242]},o($VG,[2,101]),{90:[1,243]},o($VG,[2,100]),o($VG,[2,99])],
477
+ table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,22:8,24:18,25:19,28:20,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{1:[3]},{5:[1,21]},o($V0,$V1,{22:8,24:18,25:19,28:20,7:22,8:23,10:24,9:[1,25],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),o($V0,$V1,{22:8,24:18,25:19,28:20,7:26,9:$Vb}),{5:[2,5],23:$Vc},o($Vd,[2,8]),o($Ve,[2,6]),o($Vf,[2,21]),{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},o($Vf,[2,24],{26:[1,38]}),o($Vg,[2,25],{29:$Vh}),o($Vi,[2,28],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),{1:[2,1]},{5:[2,2],23:$Vc},o($V0,$V1,{22:8,24:18,25:19,28:20,7:84,9:$Vb}),o($Vd,[2,9]),o($Ve,[2,10],{10:85,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va}),{5:[2,4],23:$Vc},o($Ve,[2,7]),o([9,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,91,93],$V1,{24:18,25:19,28:20,22:86,5:$VF,23:$VF}),{13:[1,87]},{13:[1,88]},{13:[1,89]},{13:[1,90]},{13:[1,91]},{13:[1,92]},{13:[1,93]},{13:[1,94]},{13:[1,95]},o($Ve,[2,27],{27:96}),o($Ve,$V1,{28:97}),o($VG,[2,31]),o($VG,[2,32]),o($VG,[2,33]),o($VG,[2,34]),o($VG,[2,35]),o($VG,[2,36]),o($VG,[2,37]),o($VG,[2,38]),o($VG,[2,39]),o($VG,[2,40]),o($VG,[2,41]),o($VH,$VI,{45:98,46:99,55:$VJ}),o($VH,$VI,{45:101,46:102,55:$VJ}),o($VH,$VI,{45:103,46:104,55:$VJ}),o($VH,$VI,{45:105,46:106,55:$VJ}),o($VG,[2,66]),o($VG,[2,67]),o($VG,[2,68]),o($VG,[2,69]),o($VG,[2,70]),o($VG,[2,71]),o($VG,[2,72]),o($VG,[2,73]),o($VG,[2,74]),{31:108,32:109,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,89:[1,107]},{55:[1,110]},{94:[1,111]},o($VG,[2,45]),{12:[1,112]},{12:[1,113]},{12:[1,114]},{47:116,49:115,51:$Vo},o($VK,[2,54],{52:117,53:[1,118],54:[1,119]}),{12:[1,120]},{51:[1,122],71:121},{55:[1,123]},{12:[1,124],45:125,55:$VJ},{12:[1,126]},o($VG,[2,89],{83:[1,127]}),o($VG,[2,90]),o($VG,[2,91]),o($VG,[2,92]),o($VG,[2,81]),o($VG,[2,82]),{5:[2,3],23:$Vc},o($Vd,[2,11]),o($Vf,[2,22]),o($Vd,[2,12]),o($Vd,[2,13]),o($Vd,[2,14]),o($Vd,[2,15]),o($Vd,[2,16]),o($Vd,[2,17]),o($Vd,[2,18]),o($Vd,[2,19]),o($Vd,[2,20]),o($Ve,$V1,{28:20,25:128}),o($Vi,[2,29],{30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,44:51,47:52,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,9:$Vj,41:$Vk,42:$Vl,43:$Vm,48:$Vn,51:$Vo,58:$Vp,59:$Vq,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,91:$VD,93:$VE}),o($VK,$VI,{46:129}),o($VL,[2,48],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($Vv1,[2,60],{56:193}),o($VK,$VI,{46:194}),o($VL,[2,49],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,$VI,{46:195}),o($VL,[2,64],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,$VI,{46:196}),o($VL,[2,65],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($Vw1,$V1,{28:197}),o($VG,[2,94]),o($VG,[2,95]),{76:[1,198]},{55:[1,199]},o($VG,[2,42]),o($VG,[2,43]),o($VG,[2,44]),{47:201,50:[1,200],51:$Vo},o($Vx1,[2,51]),o($VK,[2,53],{53:[1,202],54:[1,203]}),o($Vy1,[2,55]),o($Vy1,[2,56]),o($VG,[2,75]),{72:204,73:[1,205],74:[1,206]},o([73,74],[2,77]),{76:[1,207]},o($VG,[2,84],{45:208,55:$VJ}),{80:[1,209]},o($VG,[2,86]),{55:[1,210],84:[1,211]},o($Vg,[2,26],{29:$Vh}),o($VL,[2,46],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,[2,103]),o($VK,[2,104]),o($VK,[2,105]),o($VK,[2,106]),o($VK,[2,107]),o($VK,[2,108]),o($VK,[2,109]),o($VK,[2,110]),o($VK,[2,111]),o($VK,[2,112]),o($VK,[2,113]),o($VK,[2,114]),o($VK,[2,115]),o($VK,[2,116]),o($VK,[2,117]),o($VK,[2,118]),o($VK,[2,120]),o($VK,[2,121]),o($VK,[2,122]),o($VK,[2,123]),o($VK,[2,124]),o($VK,[2,125]),o([5,9,13,23,26,29,41,42,43,48,51,58,59,69,70,75,77,78,79,81,82,85,86,87,88,90,91,93,111,112,113,114,115,116,117,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151],[2,134],{50:[1,215],55:[1,218],57:[1,212],84:[1,217],118:[1,213],119:[1,214],120:[1,216]}),o($VK,[2,132]),o($VK,[2,133]),o($VK,[2,135]),o($VL,[2,136],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:219,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,137],{96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,95:220,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VK,[2,138]),o($VK,[2,139]),o($VK,[2,140]),o($VK,[2,141]),o($VK,[2,142]),o($VK,[2,143]),o($VK,[2,144]),o($VK,[2,145]),o($VK,[2,146]),o($VK,[2,147]),o($VK,[2,148]),o($VK,[2,149]),o($VK,[2,150]),o($VK,[2,151]),o($VK,[2,152]),o($VK,[2,153]),o($VK,[2,154]),o($VK,[2,155]),o($VK,[2,156]),o($VK,[2,157]),o($VK,[2,158]),o($VK,[2,159]),o($VK,[2,160]),o($VK,[2,161]),o($VK,[2,162]),o($VK,[2,163]),o($VK,[2,164]),o($VK,[2,165]),o($VK,[2,166]),{55:[1,221]},o($VK,[2,119]),o($VK,[2,171]),o($VK,[2,172]),o($VK,[2,173]),{12:[1,222]},o([5,9,13,23,26,29,41,42,43,48,50,51,55,58,59,69,70,75,77,78,79,80,81,82,84,85,86,87,88,90,91,93,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,145,146,147,148,149,150,151],[2,59],{57:[1,223]}),o($VL,[2,47],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,62],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),o($VL,[2,63],{95:130,96:131,97:132,98:133,99:134,100:135,101:136,102:137,103:138,104:139,105:140,106:141,107:142,108:143,109:144,110:145,13:$VM,43:$VN,50:$VO,55:$VP,57:$VQ,84:$VR,111:$VS,112:$VT,113:$VU,114:$VV,115:$VW,116:$VX,117:$VY,118:$VZ,119:$V_,120:$V$,121:$V01,122:$V11,123:$V21,124:$V31,125:$V41,126:$V51,127:$V61,128:$V71,129:$V81,130:$V91,131:$Va1,132:$Vb1,133:$Vc1,134:$Vd1,135:$Ve1,136:$Vf1,137:$Vg1,138:$Vh1,139:$Vi1,140:$Vj1,141:$Vk1,142:$Vl1,143:$Vm1,144:$Vn1,145:$Vo1,146:$Vp1,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1}),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,224],91:$VD,93:$VE},{55:[1,225]},{89:[1,226]},o($VK,[2,50]),o($Vx1,[2,52]),o($Vy1,[2,57]),o($Vy1,[2,58]),o($VG,[2,76]),o($VG,[2,78]),o($VG,[2,79]),{55:[1,227]},{80:[1,228]},{55:[1,229]},o($VG,[2,87]),{55:[1,230]},o($VK,[2,126]),o($VK,[2,127]),o($VK,[2,128]),o($VK,[2,129]),o($VK,[2,130]),o($VK,[2,131]),o($VK,[2,170]),o($VK,[2,168]),o($VK,[2,169]),o($VK,[2,167]),o($VK,[2,174]),o($Vv1,[2,61]),o($VG,[2,93]),{89:[1,231]},{44:234,47:233,48:$Vn,51:$Vo,92:232},o($VG,[2,80]),{55:[1,235]},o($VG,[2,85]),o($VG,[2,88]),o($Vw1,$V1,{28:236}),{44:234,45:237,47:233,48:$Vn,51:$Vo,55:$VJ,92:238},o($Vz1,[2,97]),o($Vz1,[2,98]),o($VG,[2,83]),{9:$Vj,30:40,31:41,32:42,33:43,34:44,35:45,36:46,37:47,38:48,39:49,40:50,41:$Vk,42:$Vl,43:$Vm,44:51,47:52,48:$Vn,51:$Vo,58:$Vp,59:$Vq,60:55,61:56,62:57,63:58,64:59,65:60,66:61,67:62,68:63,69:$Vr,70:$Vs,75:$Vt,77:$Vu,78:$Vv,79:$Vw,81:$Vx,82:$Vy,85:$Vz,86:$VA,87:$VB,88:$VC,90:[1,239],91:$VD,93:$VE},{44:234,47:233,48:$Vn,51:$Vo,92:240},{90:[1,241]},o($VG,[2,96]),{45:242,55:$VJ,90:[1,243]},o($VG,[2,101]),{90:[1,244]},o($VG,[2,100]),o($VG,[2,99])],
475
478
  defaultActions: {21:[2,1]},
476
479
  parseError: function parseError (str, hash) {
477
480
  if (hash.recoverable) {
@@ -1151,25 +1154,25 @@ case 28:return 73
1151
1154
  break;
1152
1155
  case 29:return 74
1153
1156
  break;
1154
- case 30:return 142
1157
+ case 30:return 143
1155
1158
  break;
1156
- case 31:return 143
1159
+ case 31:return 144
1157
1160
  break;
1158
1161
  case 32:return 41
1159
1162
  break;
1160
- case 33:return 149
1163
+ case 33:return 150
1161
1164
  break;
1162
- case 34:return 150
1165
+ case 34:return 151
1163
1166
  break;
1164
1167
  case 35:return 42
1165
1168
  break;
1166
1169
  case 36:return 43
1167
1170
  break;
1168
- case 37:return 139
1171
+ case 37:return 140
1169
1172
  break;
1170
- case 38:return 140
1173
+ case 38:return 141
1171
1174
  break;
1172
- case 39:return 141
1175
+ case 39:return 142
1173
1176
  break;
1174
1177
  case 40:return 112
1175
1178
  break;
@@ -1215,76 +1218,78 @@ case 60:return 137
1215
1218
  break;
1216
1219
  case 61:return 138
1217
1220
  break;
1218
- case 62:return 130
1221
+ case 62:return 139
1219
1222
  break;
1220
- case 63:return 133
1223
+ case 63:return 130
1221
1224
  break;
1222
- case 64:return 111
1225
+ case 64:return 133
1223
1226
  break;
1224
- case 65:return 26
1227
+ case 65:return 111
1225
1228
  break;
1226
- case 66:return 29
1229
+ case 66:return 26
1227
1230
  break;
1228
- case 67:return 94
1231
+ case 67:return 29
1229
1232
  break;
1230
- case 68:return 51
1233
+ case 68:return 94
1231
1234
  break;
1232
- case 69:return 53
1235
+ case 69:return 51
1233
1236
  break;
1234
- case 70:return 54
1237
+ case 70:return 53
1235
1238
  break;
1236
- case 71:return 55
1239
+ case 71:return 54
1237
1240
  break;
1238
- case 72:return 76
1241
+ case 72:return 55
1239
1242
  break;
1240
- case 73:return 83
1243
+ case 73:return 76
1241
1244
  break;
1242
- case 74:return 89
1245
+ case 74:return 83
1243
1246
  break;
1244
- case 75:return 90
1247
+ case 75:return 89
1245
1248
  break;
1246
- case 76:return 48
1249
+ case 76:return 90
1247
1250
  break;
1248
- case 77:return 50
1251
+ case 77:return 48
1249
1252
  break;
1250
- case 78:return 23
1253
+ case 78:return 50
1251
1254
  break;
1252
- case 79:return 147
1255
+ case 79:return 23
1253
1256
  break;
1254
- case 80:return 13
1257
+ case 80:return 148
1255
1258
  break;
1256
- case 81:return 145
1259
+ case 81:return 13
1257
1260
  break;
1258
1261
  case 82:return 146
1259
1262
  break;
1260
- case 83:return 144
1263
+ case 83:return 147
1264
+ break;
1265
+ case 84:return 145
1261
1266
  break;
1262
- case 84:return 57
1267
+ case 85:return 57
1263
1268
  break;
1264
- case 85:return 84
1269
+ case 86:return 84
1265
1270
  break;
1266
- case 86:return 118
1271
+ case 87:return 118
1267
1272
  break;
1268
- case 87:return 119
1273
+ case 88:return 119
1269
1274
  break;
1270
- case 88:return 120
1275
+ case 89:return 120
1271
1276
  break;
1272
- case 89:return 148
1277
+ case 90:return 149
1273
1278
  break;
1274
- case 90:return 80
1279
+ case 91:return 80
1275
1280
  break;
1276
- case 91:return 58
1281
+ case 92:return 58
1277
1282
  break;
1278
- case 92:return 59
1283
+ case 93:return 59
1279
1284
  break;
1280
- case 93:return 5
1285
+ case 94:return 5
1281
1286
  break;
1282
- case 94:
1287
+ case 95:
1283
1288
  break;
1284
1289
  }
1285
1290
  },
1286
- rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\numericTimeSignature\b)/,/^(?:\\defaultTimeSignature\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])/,/^(?:$)/,/^(?:.)/],
1287
- 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,92,93,94],"inclusive":true}}
1291
+ rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\numericTimeSignature\b)/,/^(?:\\defaultTimeSignature\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)/,/^(?:\\fp\b)/,/^(?:\\p\b)/,/^(?:\\f)/,/^(?:\\rest\b)/,/^(?:\\\\\\)/,/^(?:\\\\)/,/^(?:tremolo\b)/,/^(?:[a-g](ss|ff|s|f)?)/,/^(?:')/,/^(?:,)/,/^(?:[0-9]+)/,/^(?:\/)/,/^(?:#)/,/^(?:\{)/,/^(?:\})/,/^(?:<)/,/^(?:>)/,/^(?:\|)/,/^(?:\[)/,/^(?:\])/,/^(?:\()/,/^(?:\))/,/^(?:~)/,/^(?:\.)/,/^(?:-)/,/^(?:[_])/,/^(?:\^)/,/^(?:!)/,/^(?::)/,/^(?:=)/,/^(?:[rR])/,/^(?:[sS])/,/^(?:$)/,/^(?:.)/],
1292
+ 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,92,93,94,95],"inclusive":true}}
1288
1293
  });
1289
1294
  return lexer;
1290
1295
  })();
package/source/lilylet/lilylet.jison CHANGED
@@ -225,6 +225,7 @@
225
225
  "\\sfz" return 'DYN_SFZ'
226
226
  "\\rfz" return 'DYN_RFZ'
227
227
  "\\sf" return 'DYN_SF'
228
+ "\\fp" return 'DYN_FP'
228
229
  "\\p" return 'DYN_P'
229
230
  "\\f" return 'DYN_F'
230
231
 
@@ -590,6 +591,7 @@ dynamic_mark
590
591
  | DYN_SFZ -> dynamic('sfz')
591
592
  | DYN_RFZ -> dynamic('rfz')
592
593
  | DYN_SF -> dynamic('sfz')
594
+ | DYN_FP -> dynamic('fp')
593
595
  ;
594
596
 
595
597
  hairpin_mark
package/source/lilylet/meiEncoder.ts CHANGED
@@ -125,6 +125,7 @@ const DYNAMIC_MAP: Record<string, string> = {
125
125
  fff: "fff",
126
126
  sfz: "sfz",
127
127
  rfz: "rfz",
128
+ fp: "fp",
128
129
  };
129
130
 
130
131
 
@@ -615,6 +616,21 @@ interface TupletEventResult {
615
616
  arpeggios: ArpegRef[];
616
617
  }
617
618
 
619
+ // Check if a tuplet has balanced internal beam groups (both [ and ] inside the same tuplet)
620
+ // Returns false for cross-tuplet beams where [ is in one tuplet and ] in another
621
+ const tupletHasInternalBeams = (event: TupletEvent): boolean => {
622
+ let starts = 0;
623
+ let ends = 0;
624
+ for (const e of event.events) {
625
+ if (e.type === 'note') {
626
+ const markOptions = extractMarkOptions((e as NoteEvent).marks);
627
+ if (markOptions.beamStart) starts++;
628
+ if (markOptions.beamEnd) ends++;
629
+ }
630
+ }
631
+ return starts > 0 && starts === ends;
632
+ };
633
+
618
634
  // Convert TupletEvent to MEI
619
635
  const tupletEventToMEI = (event: TupletEvent, indent: string, layerStaff?: number, keyFifths: number = 0, currentStaff?: number, ottavaShift: number = 0, inParentBeam: boolean = false): TupletEventResult => {
620
636
  // LilyPond \times 2/3 means "multiply duration by 2/3"
@@ -640,18 +656,28 @@ const tupletEventToMEI = (event: TupletEvent, indent: string, layerStaff?: numbe
640
656
  const turns: TurnRef[] = [];
641
657
  const arpeggios: ArpegRef[] = [];
642
658
 
643
- // If we're inside a parent beam, don't create internal beams - notes go directly into tuplet
644
- // MEI allows: <beam><tuplet><note/>...</tuplet><tuplet><note/>...</tuplet></beam>
645
- // Beam state is managed by encodeLayer, not here.
659
+ // Handle internal beam groups: if notes have manual beam marks, respect them
660
+ const hasInternalBeams = !inParentBeam && tupletHasInternalBeams(event);
661
+ let beamOpen = false;
646
662
 
647
663
  for (const e of event.events) {
648
664
  if (e.type === 'note') {
649
- // For cross-staff notation: set note's staff if different from layerStaff
650
665
  const noteEvent = e as NoteEvent;
666
+ const markOptions = extractMarkOptions(noteEvent.marks);
667
+
668
+ // Open beam if this note starts a beam group
669
+ if (hasInternalBeams && markOptions.beamStart && !beamOpen) {
670
+ xml += `${baseIndent}<beam xml:id="${generateId('beam')}">\n`;
671
+ beamOpen = true;
672
+ }
673
+
674
+ const noteIndent = beamOpen ? baseIndent + ' ' : baseIndent;
675
+
676
+ // For cross-staff notation: set note's staff if different from layerStaff
651
677
  const effectiveNoteEvent = effectiveStaff && layerStaff && effectiveStaff !== layerStaff
652
678
  ? { ...noteEvent, staff: effectiveStaff }
653
679
  : noteEvent;
654
- const result = noteEventToMEI(effectiveNoteEvent, baseIndent, layerStaff, false, undefined, keyFifths, ottavaShift);
680
+ const result = noteEventToMEI(effectiveNoteEvent, noteIndent, layerStaff, false, undefined, keyFifths, ottavaShift);
655
681
  xml += result.xml;
656
682
 
657
683
  // Collect slur info
@@ -665,11 +691,23 @@ const tupletEventToMEI = (event: TupletEvent, indent: string, layerStaff?: numbe
665
691
  if (result.mordent) mordents.push({ startid: result.elementId, form: result.mordent === 'upper' ? 'upper' : undefined });
666
692
  if (result.turn) turns.push({ startid: result.elementId });
667
693
  if (result.arpeggio) arpeggios.push({ plist: result.elementId });
694
+
695
+ // Close beam if this note ends a beam group
696
+ if (hasInternalBeams && markOptions.beamEnd && beamOpen) {
697
+ xml += `${baseIndent}</beam>\n`;
698
+ beamOpen = false;
699
+ }
668
700
  } else if (e.type === 'rest') {
669
- xml += restEventToMEI(e as RestEvent, baseIndent, keyFifths, ottavaShift);
701
+ const restIndent = beamOpen ? baseIndent + ' ' : baseIndent;
702
+ xml += restEventToMEI(e as RestEvent, restIndent, keyFifths, ottavaShift);
670
703
  }
671
704
  }
672
705
 
706
+ // Close any unclosed beam
707
+ if (beamOpen) {
708
+ xml += `${baseIndent}</beam>\n`;
709
+ }
710
+
673
711
  xml += `${indent}</tuplet>\n`;
674
712
  return { xml, slurStarts, slurEnds, dynamics, fermatas, trills, mordents, turns, arpeggios };
675
713
  };
@@ -869,6 +907,11 @@ const getEventBeamMarks = (event: NoteEvent | RestEvent | TupletEvent | TremoloE
869
907
  }
870
908
  if (event.type === 'tuplet') {
871
909
  const tuplet = event as TupletEvent;
910
+ // If the tuplet has internal beam groups, don't report beam marks to the parent
911
+ // so the parent won't wrap the tuplet in an external <beam>
912
+ if (tupletHasInternalBeams(tuplet)) {
913
+ return { beamStart: false, beamEnd: false };
914
+ }
872
915
  let beamStart = false;
873
916
  let beamEnd = false;
874
917
  for (const e of tuplet.events) {
package/source/lilylet/serializer.ts CHANGED
@@ -144,6 +144,7 @@ const DYNAMIC_MAP: Record<string, string> = {
144
144
  fff: '\\fff',
145
145
  sfz: '\\sfz',
146
146
  rfz: '\\rfz',
147
+ fp: '\\fp',
147
148
  };
148
149
 
149
150
 
package/source/lilylet/types.ts CHANGED
@@ -60,6 +60,7 @@ export enum DynamicType {
60
60
  fff = 'fff',
61
61
  sfz = 'sfz',
62
62
  rfz = 'rfz',
63
+ fp = 'fp',
63
64
  }
64
65
 
65
66
  export enum HairpinType {