@k-l-lambda/lilylet 0.1.34 → 0.1.36

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.
@@ -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,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1=[2,29],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,16],$Va=[1,26],$Vb=[1,27],$Vc=[5,9,11,14,15,16,17,18,19,20,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Vd=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$Ve=[5,22],$Vf=[5,22,25],$Vg=[1,37],$Vh=[5,22,25,28],$Vi=[1,63],$Vj=[1,64],$Vk=[1,65],$Vl=[1,66],$Vm=[1,67],$Vn=[1,68],$Vo=[1,51],$Vp=[1,52],$Vq=[1,69],$Vr=[1,70],$Vs=[1,71],$Vt=[1,72],$Vu=[1,73],$Vv=[1,74],$Vw=[1,75],$Vx=[1,76],$Vy=[1,77],$Vz=[1,60],$VA=[1,61],$VB=[1,62],$VC=[2,22],$VD=[5,9,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VE=[5,9,13,22,25,28,40,41,42,47,49,50,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$VF=[2,95],$VG=[1,93],$VH=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$VI=[5,9,22,25,28,40,41,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$VJ=[1,178],$VK=[1,184],$VL=[1,146],$VM=[1,181],$VN=[1,147],$VO=[1,145],$VP=[1,180],$VQ=[1,139],$VR=[1,140],$VS=[1,141],$VT=[1,142],$VU=[1,143],$VV=[1,144],$VW=[1,150],$VX=[1,149],$VY=[1,148],$VZ=[1,151],$V_=[1,152],$V$=[1,153],$V01=[1,154],$V11=[1,155],$V21=[1,156],$V31=[1,157],$V41=[1,158],$V51=[1,159],$V61=[1,160],$V71=[1,161],$V81=[1,162],$V91=[1,163],$Va1=[1,164],$Vb1=[1,165],$Vc1=[1,166],$Vd1=[1,167],$Ve1=[1,168],$Vf1=[1,169],$Vg1=[1,170],$Vh1=[1,171],$Vi1=[1,172],$Vj1=[1,173],$Vk1=[1,174],$Vl1=[1,175],$Vm1=[1,176],$Vn1=[1,177],$Vo1=[1,179],$Vp1=[1,182],$Vq1=[1,183],$Vr1=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],$Vs1=[9,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87],$Vt1=[49,50],$Vu1=[5,9,13,22,25,28,40,41,42,47,49,50,52,53,54,56,57,58,66,67,72,74,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144];
75
+ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,22,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,90,91],$V1=[2,29],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,16],$Va=[1,26],$Vb=[1,27],$Vc=[5,9,11,14,15,16,17,18,19,20,22,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,90,91],$Vd=[5,9,22,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,90,91],$Ve=[5,22],$Vf=[5,22,25],$Vg=[1,37],$Vh=[5,22,25,28],$Vi=[1,65],$Vj=[1,66],$Vk=[1,67],$Vl=[1,68],$Vm=[1,69],$Vn=[1,70],$Vo=[1,51],$Vp=[1,52],$Vq=[1,71],$Vr=[1,72],$Vs=[1,73],$Vt=[1,80],$Vu=[1,81],$Vv=[1,74],$Vw=[1,75],$Vx=[1,76],$Vy=[1,77],$Vz=[1,78],$VA=[1,79],$VB=[1,62],$VC=[1,63],$VD=[1,64],$VE=[2,22],$VF=[5,9,22,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,89,90,91],$VG=[5,9,13,22,25,28,40,41,42,47,49,50,56,57,58,68,69,74,76,77,78,80,81,83,84,85,86,87,89,90,91,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148],$VH=[2,99],$VI=[1,97],$VJ=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,68,69,74,76,77,78,80,81,83,84,85,86,87,89,90,91,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148],$VK=[5,9,22,25,28,40,41,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,89,90,91],$VL=[1,182],$VM=[1,188],$VN=[1,150],$VO=[1,185],$VP=[1,151],$VQ=[1,149],$VR=[1,184],$VS=[1,143],$VT=[1,144],$VU=[1,145],$VV=[1,146],$VW=[1,147],$VX=[1,148],$VY=[1,154],$VZ=[1,153],$V_=[1,152],$V$=[1,155],$V01=[1,156],$V11=[1,157],$V21=[1,158],$V31=[1,159],$V41=[1,160],$V51=[1,161],$V61=[1,162],$V71=[1,163],$V81=[1,164],$V91=[1,165],$Va1=[1,166],$Vb1=[1,167],$Vc1=[1,168],$Vd1=[1,169],$Ve1=[1,170],$Vf1=[1,171],$Vg1=[1,172],$Vh1=[1,173],$Vi1=[1,174],$Vj1=[1,175],$Vk1=[1,176],$Vl1=[1,177],$Vm1=[1,178],$Vn1=[1,179],$Vo1=[1,180],$Vp1=[1,181],$Vq1=[1,183],$Vr1=[1,186],$Vs1=[1,187],$Vt1=[5,9,13,22,25,28,40,41,42,47,49,50,54,56,57,58,68,69,74,76,77,78,79,80,81,83,84,85,86,87,89,90,91,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148],$Vu1=[9,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,89,90,91],$Vv1=[49,50],$Vw1=[5,9,13,22,25,28,40,41,42,47,49,50,52,53,54,56,57,58,68,69,74,76,77,78,80,81,83,84,85,86,87,89,90,91,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148];
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,"measure_content":21,"|":22,"parts":23,"part_voices":24,"PART_SEP":25,"part_start":26,"voice_events":27,"VOICE_SEP":28,"event":29,"note_event":30,"rest_event":31,"context_event":32,"grace_event":33,"tuplet_event":34,"tremolo_event":35,"pitch_reset_event":36,"barline_event":37,"harmony_event":38,"markup_event":39,"CMD_BAR":40,"CMD_CHORDS":41,"CMD_MARKUP":42,"chord":43,"duration":44,"post_events":45,"pitch":46,"<":47,"pitches":48,">":49,"PITCH":50,"octave":51,"OCT_UP":52,"OCT_DOWN":53,"NUMBER":54,"dots":55,".":56,"REST_CHAR":57,"SPACE_CHAR":58,"clef_cmd":59,"key_cmd":60,"time_cmd":61,"tempo_cmd":62,"staff_cmd":63,"ottava_cmd":64,"stem_cmd":65,"CMD_CLEF":66,"CMD_KEY":67,"pitch_name":68,"mode":69,"MODE_MAJOR":70,"MODE_MINOR":71,"CMD_TIME":72,"/":73,"CMD_TEMPO":74,"=":75,"CMD_STAFF":76,"CMD_OTTAVA":77,"#":78,"-":79,"CMD_STEMUP":80,"CMD_STEMDOWN":81,"CMD_STEMNEUTRAL":82,"CMD_GRACE":83,"{":84,"}":85,"CMD_TIMES":86,"CMD_REPEAT":87,"TREMOLO":88,"post_event":89,"articulation_mark":90,"ornament_mark":91,"dynamic_mark":92,"hairpin_mark":93,"pedal_mark":94,"tie_mark":95,"slur_mark":96,"beam_mark":97,"tremolo_mark":98,"direction_mark":99,"rest_mark":100,"fingering_mark":101,"fingering_number":102,"navigation_mark":103,"markup_mark":104,"CMD_REST":105,"ART_STACCATO":106,"ART_STACCATISSIMO":107,"ART_TENUTO":108,"ART_MARCATO":109,"ART_ACCENT":110,"ART_PORTATO":111,"_":112,"^":113,"!":114,"ORN_TRILL":115,"ORN_TURN":116,"ORN_MORDENT":117,"ORN_PRALL":118,"ORN_FERMATA":119,"ORN_SHORTFERMATA":120,"ORN_ARPEGGIO":121,"DYN_PPP":122,"DYN_PP":123,"DYN_P":124,"DYN_MP":125,"DYN_MF":126,"DYN_F":127,"DYN_FF":128,"DYN_FFF":129,"DYN_SFZ":130,"DYN_RFZ":131,"DYN_SF":132,"CMD_CRESC_BEGIN":133,"CMD_DIM_BEGIN":134,"CMD_DYNAMICS_END":135,"CMD_SUSTAINON":136,"CMD_SUSTAINOFF":137,"~":138,"(":139,")":140,"[":141,":":142,"CMD_CODA":143,"CMD_SEGNO":144,"$accept":0,"$end":1},
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",22:"|",25:"PART_SEP",28:"VOICE_SEP",40:"CMD_BAR",41:"CMD_CHORDS",42:"CMD_MARKUP",47:"<",49:">",50:"PITCH",52:"OCT_UP",53:"OCT_DOWN",54:"NUMBER",56:".",57:"REST_CHAR",58:"SPACE_CHAR",66:"CMD_CLEF",67:"CMD_KEY",70:"MODE_MAJOR",71:"MODE_MINOR",72:"CMD_TIME",73:"/",74:"CMD_TEMPO",75:"=",76:"CMD_STAFF",77:"CMD_OTTAVA",78:"#",79:"-",80:"CMD_STEMUP",81:"CMD_STEMDOWN",82:"CMD_STEMNEUTRAL",83:"CMD_GRACE",84:"{",85:"}",86:"CMD_TIMES",87:"CMD_REPEAT",88:"TREMOLO",105:"CMD_REST",106:"ART_STACCATO",107:"ART_STACCATISSIMO",108:"ART_TENUTO",109:"ART_MARCATO",110:"ART_ACCENT",111:"ART_PORTATO",112:"_",113:"^",114:"!",115:"ORN_TRILL",116:"ORN_TURN",117:"ORN_MORDENT",118:"ORN_PRALL",119:"ORN_FERMATA",120:"ORN_SHORTFERMATA",121:"ORN_ARPEGGIO",122:"DYN_PPP",123:"DYN_PP",124:"DYN_P",125:"DYN_MP",126:"DYN_MF",127:"DYN_F",128:"DYN_FF",129:"DYN_FFF",130:"DYN_SFZ",131:"DYN_RFZ",132:"DYN_SF",133:"CMD_CRESC_BEGIN",134:"CMD_DIM_BEGIN",135:"CMD_DYNAMICS_END",136:"CMD_SUSTAINON",137:"CMD_SUSTAINOFF",138:"~",139:"(",140:")",141:"[",142:":",143:"CMD_CODA",144:"CMD_SEGNO"},
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],[7,1],[7,3],[7,2],[21,1],[23,1],[23,4],[26,0],[24,1],[24,3],[27,0],[27,2],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[37,2],[38,2],[39,2],[36,1],[30,3],[30,3],[30,2],[30,2],[43,3],[48,1],[48,2],[46,2],[46,1],[51,1],[51,1],[51,2],[51,2],[44,2],[55,0],[55,2],[31,3],[31,3],[31,2],[31,2],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[59,2],[60,3],[68,1],[69,1],[69,1],[61,4],[62,5],[62,2],[62,4],[63,2],[64,3],[64,4],[64,1],[65,1],[65,1],[65,1],[33,4],[33,2],[33,2],[34,7],[35,9],[35,8],[35,7],[45,0],[45,2],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[89,1],[100,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,2],[90,2],[90,2],[90,2],[90,2],[90,2],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[93,1],[93,1],[93,1],[94,1],[94,1],[95,1],[96,1],[96,1],[97,1],[97,1],[98,2],[99,2],[99,2],[101,2],[102,1],[103,1],[103,1],[104,2]],
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,"measure_content":21,"|":22,"parts":23,"part_voices":24,"PART_SEP":25,"part_start":26,"voice_events":27,"VOICE_SEP":28,"event":29,"note_event":30,"rest_event":31,"context_event":32,"grace_event":33,"tuplet_event":34,"tremolo_event":35,"pitch_reset_event":36,"barline_event":37,"harmony_event":38,"markup_event":39,"CMD_BAR":40,"CMD_CHORDS":41,"CMD_MARKUP":42,"chord":43,"duration":44,"post_events":45,"pitch":46,"<":47,"pitches":48,">":49,"PITCH":50,"octave":51,"OCT_UP":52,"OCT_DOWN":53,"NUMBER":54,"dots":55,".":56,"REST_CHAR":57,"SPACE_CHAR":58,"clef_cmd":59,"key_cmd":60,"time_cmd":61,"tempo_cmd":62,"staff_cmd":63,"ottava_cmd":64,"stem_cmd":65,"numeric_time_sig_cmd":66,"default_time_sig_cmd":67,"CMD_CLEF":68,"CMD_KEY":69,"pitch_name":70,"mode":71,"MODE_MAJOR":72,"MODE_MINOR":73,"CMD_TIME":74,"/":75,"CMD_NUMERIC_TIME_SIG":76,"CMD_DEFAULT_TIME_SIG":77,"CMD_TEMPO":78,"=":79,"CMD_STAFF":80,"CMD_OTTAVA":81,"#":82,"-":83,"CMD_STEMUP":84,"CMD_STEMDOWN":85,"CMD_STEMNEUTRAL":86,"CMD_GRACE":87,"{":88,"}":89,"CMD_TIMES":90,"CMD_REPEAT":91,"TREMOLO":92,"post_event":93,"articulation_mark":94,"ornament_mark":95,"dynamic_mark":96,"hairpin_mark":97,"pedal_mark":98,"tie_mark":99,"slur_mark":100,"beam_mark":101,"tremolo_mark":102,"direction_mark":103,"rest_mark":104,"fingering_mark":105,"fingering_number":106,"navigation_mark":107,"markup_mark":108,"CMD_REST":109,"ART_STACCATO":110,"ART_STACCATISSIMO":111,"ART_TENUTO":112,"ART_MARCATO":113,"ART_ACCENT":114,"ART_PORTATO":115,"_":116,"^":117,"!":118,"ORN_TRILL":119,"ORN_TURN":120,"ORN_MORDENT":121,"ORN_PRALL":122,"ORN_FERMATA":123,"ORN_SHORTFERMATA":124,"ORN_ARPEGGIO":125,"DYN_PPP":126,"DYN_PP":127,"DYN_P":128,"DYN_MP":129,"DYN_MF":130,"DYN_F":131,"DYN_FF":132,"DYN_FFF":133,"DYN_SFZ":134,"DYN_RFZ":135,"DYN_SF":136,"CMD_CRESC_BEGIN":137,"CMD_DIM_BEGIN":138,"CMD_DYNAMICS_END":139,"CMD_SUSTAINON":140,"CMD_SUSTAINOFF":141,"~":142,"(":143,")":144,"[":145,":":146,"CMD_CODA":147,"CMD_SEGNO":148,"$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",22:"|",25:"PART_SEP",28:"VOICE_SEP",40:"CMD_BAR",41:"CMD_CHORDS",42:"CMD_MARKUP",47:"<",49:">",50:"PITCH",52:"OCT_UP",53:"OCT_DOWN",54:"NUMBER",56:".",57:"REST_CHAR",58:"SPACE_CHAR",68:"CMD_CLEF",69:"CMD_KEY",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:"CMD_REPEAT",92:"TREMOLO",109:"CMD_REST",110:"ART_STACCATO",111:"ART_STACCATISSIMO",112:"ART_TENUTO",113:"ART_MARCATO",114:"ART_ACCENT",115:"ART_PORTATO",116:"_",117:"^",118:"!",119:"ORN_TRILL",120:"ORN_TURN",121:"ORN_MORDENT",122:"ORN_PRALL",123:"ORN_FERMATA",124:"ORN_SHORTFERMATA",125:"ORN_ARPEGGIO",126:"DYN_PPP",127:"DYN_PP",128:"DYN_P",129:"DYN_MP",130:"DYN_MF",131:"DYN_F",132:"DYN_FF",133:"DYN_FFF",134:"DYN_SFZ",135:"DYN_RFZ",136:"DYN_SF",137:"CMD_CRESC_BEGIN",138:"CMD_DIM_BEGIN",139:"CMD_DYNAMICS_END",140:"CMD_SUSTAINON",141:"CMD_SUSTAINOFF",142:"~",143:"(",144:")",145:"[",146:":",147:"CMD_CODA",148:"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],[7,1],[7,3],[7,2],[21,1],[23,1],[23,4],[26,0],[24,1],[24,3],[27,0],[27,2],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[29,1],[37,2],[38,2],[39,2],[36,1],[30,3],[30,3],[30,2],[30,2],[43,3],[48,1],[48,2],[46,2],[46,1],[51,1],[51,1],[51,2],[51,2],[44,2],[55,0],[55,2],[31,3],[31,3],[31,2],[31,2],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[59,2],[60,3],[70,1],[71,1],[71,1],[61,4],[66,1],[67,1],[62,5],[62,2],[62,4],[63,2],[64,3],[64,4],[64,1],[65,1],[65,1],[65,1],[33,4],[33,2],[33,2],[34,7],[35,9],[35,8],[35,7],[45,0],[45,2],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[104,1],[94,1],[94,1],[94,1],[94,1],[94,1],[94,1],[94,2],[94,2],[94,2],[94,2],[94,2],[94,2],[94,1],[94,1],[94,1],[94,1],[94,1],[94,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[95,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[96,1],[97,1],[97,1],[97,1],[98,1],[98,1],[99,1],[100,1],[100,1],[101,1],[101,1],[102,2],[103,2],[103,2],[105,2],[106,1],[107,1],[107,1],[108,2]],
81
81
  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
82
82
  /* this == yyval */
83
83
 
@@ -150,7 +150,7 @@ case 25:
150
150
  this.$ = $$[$0-3].concat([part($$[$0])]);
151
151
  break;
152
152
  case 26:
153
- currentStaff = 1;
153
+ currentStaff = 1; currentOttava = 0;
154
154
  break;
155
155
  case 27:
156
156
  this.$ = [voice(currentStaff, $$[$0])];
@@ -158,11 +158,11 @@ break;
158
158
  case 28:
159
159
  this.$ = $$[$0-2].concat([voice(currentStaff, $$[$0])]);
160
160
  break;
161
- case 29: case 95:
161
+ case 29: case 99:
162
162
  this.$ = [];
163
163
  break;
164
164
  case 30:
165
- this.$ = $$[$0-1].concat(Array.isArray($$[$0]) ? $$[$0] : [$$[$0]]);
165
+ this.$ = $$[$0] === null ? $$[$0-1] : $$[$0-1].concat(Array.isArray($$[$0]) ? $$[$0] : [$$[$0]]);
166
166
  break;
167
167
  case 41:
168
168
  this.$ = barlineEvent($$[$0].slice(1, -1));
@@ -174,7 +174,16 @@ case 43:
174
174
  this.$ = markupEvent($$[$0].slice(1, -1));
175
175
  break;
176
176
  case 44:
177
- this.$ = ({ type: 'pitchReset' });
177
+
178
+ // On newline, reset ottava to 0 if it's non-zero (like pitch base resets)
179
+ if (currentOttava !== 0) {
180
+ const ottavaReset = contextChange({ ottava: 0 });
181
+ currentOttava = 0;
182
+ this.$ = [ottavaReset, { type: 'pitchReset' }];
183
+ } else {
184
+ this.$ = { type: 'pitchReset' };
185
+ }
186
+
178
187
  break;
179
188
  case 45: case 46:
180
189
  currentDuration = $$[$0-1]; this.$ = noteEvent($$[$0-2], $$[$0-1], $$[$0]);
@@ -182,7 +191,7 @@ break;
182
191
  case 47: case 48:
183
192
  this.$ = noteEvent($$[$0-1], currentDuration, $$[$0]);
184
193
  break;
185
- case 51: case 96:
194
+ case 51: case 100:
186
195
  this.$ = $$[$0-1].concat([$$[$0]]);
187
196
  break;
188
197
  case 52:
@@ -245,198 +254,221 @@ break;
245
254
  case 71:
246
255
  this.$ = contextChange({ stemDirection: $$[$0] });
247
256
  break;
248
- case 72:
249
- this.$ = $$[$0].slice(1, -1);
250
- break;
251
- case 73:
252
- currentKey = keySignature($$[$0-1].phonet, $$[$0-1].accidental, $$[$0]); this.$ = currentKey;
257
+ case 72: case 73:
258
+ this.$ = null;
253
259
  break;
254
260
  case 74:
255
- this.$ = parsePitchName($$[$0]);
261
+ this.$ = $$[$0].slice(1, -1);
256
262
  break;
257
263
  case 75:
258
- this.$ = 'major';
264
+ currentKey = keySignature($$[$0-1].phonet, $$[$0-1].accidental, $$[$0]); this.$ = currentKey;
259
265
  break;
260
266
  case 76:
261
- this.$ = 'minor';
267
+ this.$ = parsePitchName($$[$0]);
262
268
  break;
263
269
  case 77:
264
- currentTimeSig = fraction(Number($$[$0-2]), Number($$[$0])); this.$ = currentTimeSig;
270
+ this.$ = 'major';
265
271
  break;
266
272
  case 78:
267
- this.$ = ({ text: $$[$0-3].slice(1, -1), beat: $$[$0-2], bpm: Number($$[$0]) });
273
+ this.$ = 'minor';
268
274
  break;
269
275
  case 79:
270
- this.$ = ({ text: $$[$0].slice(1, -1) });
276
+
277
+ const num = Number($$[$0-2]);
278
+ const den = Number($$[$0]);
279
+ const timeSig = fraction(num, den);
280
+ // Add symbol for 4/4 (common) and 2/2 (cut) unless numericTimeSignature is set
281
+ if (!numericTimeSignature) {
282
+ if (num === 4 && den === 4) {
283
+ timeSig.symbol = 'common';
284
+ } else if (num === 2 && den === 2) {
285
+ timeSig.symbol = 'cut';
286
+ }
287
+ }
288
+ currentTimeSig = timeSig;
289
+ this.$ = currentTimeSig;
290
+
271
291
  break;
272
292
  case 80:
273
- this.$ = ({ beat: $$[$0-2], bpm: Number($$[$0]) });
293
+ numericTimeSignature = true; this.$ = null;
274
294
  break;
275
295
  case 81:
276
- currentStaff = Number($$[$0].slice(1, -1)); this.$ = currentStaff;
296
+ numericTimeSignature = false; this.$ = null;
277
297
  break;
278
298
  case 82:
279
- this.$ = Number($$[$0]);
299
+ this.$ = ({ text: $$[$0-3].slice(1, -1), beat: $$[$0-2], bpm: Number($$[$0]) });
280
300
  break;
281
301
  case 83:
282
- this.$ = -Number($$[$0]);
302
+ this.$ = ({ text: $$[$0].slice(1, -1) });
283
303
  break;
284
304
  case 84:
285
- this.$ = 0;
305
+ this.$ = ({ beat: $$[$0-2], bpm: Number($$[$0]) });
286
306
  break;
287
307
  case 85:
288
- this.$ = 'up';
308
+ currentStaff = Number($$[$0].slice(1, -1)); this.$ = currentStaff;
289
309
  break;
290
310
  case 86:
291
- this.$ = 'down';
311
+ currentOttava = Number($$[$0]); this.$ = currentOttava;
292
312
  break;
293
313
  case 87:
294
- this.$ = 'auto';
314
+ currentOttava = -Number($$[$0]); this.$ = currentOttava;
295
315
  break;
296
316
  case 88:
317
+ currentOttava = 0; this.$ = 0;
318
+ break;
319
+ case 89:
320
+ this.$ = 'up';
321
+ break;
322
+ case 90:
323
+ this.$ = 'down';
324
+ break;
325
+ case 91:
326
+ this.$ = 'auto';
327
+ break;
328
+ case 92:
297
329
  this.$ = ($$[$0-1].filter(e => e.type === 'note' || e.type === 'rest').map(e => ({ ...e, grace: true })));
298
330
  break;
299
- case 89: case 90:
331
+ case 93: case 94:
300
332
  this.$ = ({ ...$$[$0], grace: true });
301
333
  break;
302
- case 91:
334
+ case 95:
303
335
  this.$ = tupletEvent(fraction(Number($$[$0-5]), Number($$[$0-3])), $$[$0-1].filter(e => e.type === 'note' || e.type === 'rest'));
304
336
  break;
305
- case 92:
337
+ case 96:
306
338
  currentDuration = $$[$0-3]; this.$ = tremoloEvent([$$[$0-4]], [$$[$0-2]], Number($$[$0-6]), $$[$0-3].division);
307
339
  break;
308
- case 93:
340
+ case 97:
309
341
  currentDuration = $$[$0-2]; this.$ = tremoloEvent([$$[$0-3]], [$$[$0-1]], Number($$[$0-5]), $$[$0-2].division);
310
342
  break;
311
- case 94:
343
+ case 98:
312
344
  this.$ = tremoloEvent([$$[$0-2]], [$$[$0-1]], Number($$[$0-4]), currentDuration.division);
313
345
  break;
314
- case 112:
346
+ case 116:
315
347
  this.$ = ({ pitchedRest: true });
316
348
  break;
317
- case 113: case 119: case 126:
349
+ case 117: case 123: case 130:
318
350
  this.$ = articulation('staccato');
319
351
  break;
320
- case 114: case 123: case 128:
352
+ case 118: case 127: case 132:
321
353
  this.$ = articulation('staccatissimo');
322
354
  break;
323
- case 115: case 124: case 127:
355
+ case 119: case 128: case 131:
324
356
  this.$ = articulation('tenuto');
325
357
  break;
326
- case 116: case 121: case 129:
358
+ case 120: case 125: case 133:
327
359
  this.$ = articulation('marcato');
328
360
  break;
329
- case 117: case 122: case 125:
361
+ case 121: case 126: case 129:
330
362
  this.$ = articulation('accent');
331
363
  break;
332
- case 118: case 120: case 130:
364
+ case 122: case 124: case 134:
333
365
  this.$ = articulation('portato');
334
366
  break;
335
- case 131:
367
+ case 135:
336
368
  this.$ = ornament('trill');
337
369
  break;
338
- case 132:
370
+ case 136:
339
371
  this.$ = ornament('turn');
340
372
  break;
341
- case 133:
373
+ case 137:
342
374
  this.$ = ornament('mordent');
343
375
  break;
344
- case 134:
376
+ case 138:
345
377
  this.$ = ornament('prall');
346
378
  break;
347
- case 135:
379
+ case 139:
348
380
  this.$ = ornament('fermata');
349
381
  break;
350
- case 136:
382
+ case 140:
351
383
  this.$ = ornament('shortFermata');
352
384
  break;
353
- case 137:
385
+ case 141:
354
386
  this.$ = ornament('arpeggio');
355
387
  break;
356
- case 138:
388
+ case 142:
357
389
  this.$ = dynamic('ppp');
358
390
  break;
359
- case 139:
391
+ case 143:
360
392
  this.$ = dynamic('pp');
361
393
  break;
362
- case 140:
394
+ case 144:
363
395
  this.$ = dynamic('p');
364
396
  break;
365
- case 141:
397
+ case 145:
366
398
  this.$ = dynamic('mp');
367
399
  break;
368
- case 142:
400
+ case 146:
369
401
  this.$ = dynamic('mf');
370
402
  break;
371
- case 143:
403
+ case 147:
372
404
  this.$ = dynamic('f');
373
405
  break;
374
- case 144:
406
+ case 148:
375
407
  this.$ = dynamic('ff');
376
408
  break;
377
- case 145:
409
+ case 149:
378
410
  this.$ = dynamic('fff');
379
411
  break;
380
- case 146: case 148:
412
+ case 150: case 152:
381
413
  this.$ = dynamic('sfz');
382
414
  break;
383
- case 147:
415
+ case 151:
384
416
  this.$ = dynamic('rfz');
385
417
  break;
386
- case 149:
418
+ case 153:
387
419
  this.$ = hairpin('crescendoStart');
388
420
  break;
389
- case 150:
421
+ case 154:
390
422
  this.$ = hairpin('diminuendoStart');
391
423
  break;
392
- case 151:
424
+ case 155:
393
425
  this.$ = hairpin('crescendoEnd');
394
426
  break;
395
- case 152:
427
+ case 156:
396
428
  this.$ = pedal('sustainOn');
397
429
  break;
398
- case 153:
430
+ case 157:
399
431
  this.$ = pedal('sustainOff');
400
432
  break;
401
- case 154:
433
+ case 158:
402
434
  this.$ = tie(true);
403
435
  break;
404
- case 155:
436
+ case 159:
405
437
  this.$ = slur(true);
406
438
  break;
407
- case 156:
439
+ case 160:
408
440
  this.$ = slur(false);
409
441
  break;
410
- case 157:
442
+ case 161:
411
443
  this.$ = beam(true);
412
444
  break;
413
- case 158:
445
+ case 162:
414
446
  this.$ = beam(false);
415
447
  break;
416
- case 159:
448
+ case 163:
417
449
  this.$ = ({ tremolo: Number($$[$0]) });
418
450
  break;
419
- case 160:
451
+ case 164:
420
452
  this.$ = ({ ...$$[$0], placement: 'above' });
421
453
  break;
422
- case 161:
454
+ case 165:
423
455
  this.$ = ({ ...$$[$0], placement: 'below' });
424
456
  break;
425
- case 162: case 163:
457
+ case 166: case 167:
426
458
  const n = Number($$[$0]); if (n >= 1 && n <= 5) this.$ = fingering(n); else this.$ = null;
427
459
  break;
428
- case 164:
460
+ case 168:
429
461
  this.$ = navigation('coda');
430
462
  break;
431
- case 165:
463
+ case 169:
432
464
  this.$ = navigation('segno');
433
465
  break;
434
- case 166:
466
+ case 170:
435
467
  this.$ = markupMark($$[$0].slice(1, -1));
436
468
  break;
437
469
  }
438
470
  },
439
- table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,21:8,23:17,24:18,27:19,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{1:[3]},{5:[1,20]},o($V0,$V1,{21:8,23:17,24:18,27:19,7:21,8:22,10:23,9:[1,24],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),o($V0,$V1,{21:8,23:17,24:18,27:19,7:25,9:$Va}),{5:[2,5],22:$Vb},o($Vc,[2,8]),o($Vd,[2,6]),o($Ve,[2,20]),{12:[1,28]},{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},o($Ve,[2,23],{25:[1,36]}),o($Vf,[2,24],{28:$Vg}),o($Vh,[2,27],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),{1:[2,1]},{5:[2,2],22:$Vb},o($V0,$V1,{21:8,23:17,24:18,27:19,7:78,9:$Va}),o($Vc,[2,9]),o($Vd,[2,10],{10:79,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{5:[2,4],22:$Vb},o($Vd,[2,7]),o([9,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,86,87],$V1,{23:17,24:18,27:19,21:80,5:$VC,22:$VC}),{13:[1,81]},{13:[1,82]},{13:[1,83]},{13:[1,84]},{13:[1,85]},{13:[1,86]},{13:[1,87]},{13:[1,88]},o($Vd,[2,26],{26:89}),o($Vd,$V1,{27:90}),o($VD,[2,30]),o($VD,[2,31]),o($VD,[2,32]),o($VD,[2,33]),o($VD,[2,34]),o($VD,[2,35]),o($VD,[2,36]),o($VD,[2,37]),o($VD,[2,38]),o($VD,[2,39]),o($VD,[2,40]),o($VE,$VF,{44:91,45:92,54:$VG}),o($VE,$VF,{44:94,45:95,54:$VG}),o($VE,$VF,{44:96,45:97,54:$VG}),o($VE,$VF,{44:98,45:99,54:$VG}),o($VD,[2,65]),o($VD,[2,66]),o($VD,[2,67]),o($VD,[2,68]),o($VD,[2,69]),o($VD,[2,70]),o($VD,[2,71]),{30:101,31:102,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,84:[1,100]},{54:[1,103]},{88:[1,104]},o($VD,[2,44]),{12:[1,105]},{12:[1,106]},{12:[1,107]},{46:109,48:108,50:$Vn},o($VH,[2,53],{51:110,52:[1,111],53:[1,112]}),{12:[1,113]},{50:[1,115],68:114},{54:[1,116]},{12:[1,117],44:118,54:$VG},{12:[1,119]},o($VD,[2,84],{78:[1,120]}),o($VD,[2,85]),o($VD,[2,86]),o($VD,[2,87]),{5:[2,3],22:$Vb},o($Vc,[2,11]),o($Ve,[2,21]),o($Vc,[2,12]),o($Vc,[2,13]),o($Vc,[2,14]),o($Vc,[2,15]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,18]),o($Vc,[2,19]),o($Vd,$V1,{27:19,24:121}),o($Vh,[2,28],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,86:$VA,87:$VB}),o($VH,$VF,{45:122}),o($VI,[2,47],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($Vr1,[2,59],{55:185}),o($VH,$VF,{45:186}),o($VI,[2,48],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,$VF,{45:187}),o($VI,[2,63],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,$VF,{45:188}),o($VI,[2,64],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($Vs1,$V1,{27:189}),o($VD,[2,89]),o($VD,[2,90]),{73:[1,190]},{54:[1,191]},o($VD,[2,41]),o($VD,[2,42]),o($VD,[2,43]),{46:193,49:[1,192],50:$Vn},o($Vt1,[2,50]),o($VH,[2,52],{52:[1,194],53:[1,195]}),o($Vu1,[2,54]),o($Vu1,[2,55]),o($VD,[2,72]),{69:196,70:[1,197],71:[1,198]},o([70,71],[2,74]),{73:[1,199]},o($VD,[2,79],{44:200,54:$VG}),{75:[1,201]},o($VD,[2,81]),{54:[1,202],79:[1,203]},o($Vf,[2,25],{28:$Vg}),o($VI,[2,45],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,[2,96]),o($VH,[2,97]),o($VH,[2,98]),o($VH,[2,99]),o($VH,[2,100]),o($VH,[2,101]),o($VH,[2,102]),o($VH,[2,103]),o($VH,[2,104]),o($VH,[2,105]),o($VH,[2,106]),o($VH,[2,107]),o($VH,[2,108]),o($VH,[2,109]),o($VH,[2,110]),o($VH,[2,111]),o($VH,[2,113]),o($VH,[2,114]),o($VH,[2,115]),o($VH,[2,116]),o($VH,[2,117]),o($VH,[2,118]),o([5,9,13,22,25,28,40,41,42,47,50,57,58,66,67,72,74,76,77,80,81,82,83,85,86,87,105,106,107,108,109,110,111,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],[2,127],{49:[1,207],54:[1,210],56:[1,204],79:[1,209],112:[1,205],113:[1,206],114:[1,208]}),o($VH,[2,125]),o($VH,[2,126]),o($VH,[2,128]),o($VI,[2,129],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,89:211,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,130],{90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,89:212,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VH,[2,131]),o($VH,[2,132]),o($VH,[2,133]),o($VH,[2,134]),o($VH,[2,135]),o($VH,[2,136]),o($VH,[2,137]),o($VH,[2,138]),o($VH,[2,139]),o($VH,[2,140]),o($VH,[2,141]),o($VH,[2,142]),o($VH,[2,143]),o($VH,[2,144]),o($VH,[2,145]),o($VH,[2,146]),o($VH,[2,147]),o($VH,[2,148]),o($VH,[2,149]),o($VH,[2,150]),o($VH,[2,151]),o($VH,[2,152]),o($VH,[2,153]),o($VH,[2,154]),o($VH,[2,155]),o($VH,[2,156]),o($VH,[2,157]),o($VH,[2,158]),{54:[1,213]},o($VH,[2,112]),o($VH,[2,163]),o($VH,[2,164]),o($VH,[2,165]),{12:[1,214]},o([5,9,13,22,25,28,40,41,42,47,49,50,54,57,58,66,67,72,74,75,76,77,79,80,81,82,83,85,86,87,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144],[2,58],{56:[1,215]}),o($VI,[2,46],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,61],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),o($VI,[2,62],{89:123,90:124,91:125,92:126,93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,13:$VJ,42:$VK,49:$VL,54:$VM,56:$VN,79:$VO,105:$VP,106:$VQ,107:$VR,108:$VS,109:$VT,110:$VU,111:$VV,112:$VW,113:$VX,114:$VY,115:$VZ,116:$V_,117:$V$,118:$V01,119:$V11,120:$V21,121:$V31,122:$V41,123:$V51,124:$V61,125:$V71,126:$V81,127:$V91,128:$Va1,129:$Vb1,130:$Vc1,131:$Vd1,132:$Ve1,133:$Vf1,134:$Vg1,135:$Vh1,136:$Vi1,137:$Vj1,138:$Vk1,139:$Vl1,140:$Vm1,141:$Vn1,142:$Vo1,143:$Vp1,144:$Vq1}),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,216],86:$VA,87:$VB},{54:[1,217]},{84:[1,218]},o($VH,[2,49]),o($Vt1,[2,51]),o($Vu1,[2,56]),o($Vu1,[2,57]),o($VD,[2,73]),o($VD,[2,75]),o($VD,[2,76]),{54:[1,219]},{75:[1,220]},{54:[1,221]},o($VD,[2,82]),{54:[1,222]},o($VH,[2,119]),o($VH,[2,120]),o($VH,[2,121]),o($VH,[2,122]),o($VH,[2,123]),o($VH,[2,124]),o($VH,[2,162]),o($VH,[2,160]),o($VH,[2,161]),o($VH,[2,159]),o($VH,[2,166]),o($Vr1,[2,60]),o($VD,[2,88]),{84:[1,223]},{46:224,50:$Vn},o($VD,[2,77]),{54:[1,225]},o($VD,[2,80]),o($VD,[2,83]),o($Vs1,$V1,{27:226}),{44:227,46:228,50:$Vn,54:$VG},o($VD,[2,78]),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:$Vq,67:$Vr,72:$Vs,74:$Vt,76:$Vu,77:$Vv,80:$Vw,81:$Vx,82:$Vy,83:$Vz,85:[1,229],86:$VA,87:$VB},{46:230,50:$Vn},{85:[1,231]},o($VD,[2,91]),{44:232,54:$VG,85:[1,233]},o($VD,[2,94]),{85:[1,234]},o($VD,[2,93]),o($VD,[2,92])],
471
+ table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,21:8,23:17,24:18,27:19,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{1:[3]},{5:[1,20]},o($V0,$V1,{21:8,23:17,24:18,27:19,7:21,8:22,10:23,9:[1,24],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),o($V0,$V1,{21:8,23:17,24:18,27:19,7:25,9:$Va}),{5:[2,5],22:$Vb},o($Vc,[2,8]),o($Vd,[2,6]),o($Ve,[2,20]),{12:[1,28]},{12:[1,29]},{12:[1,30]},{12:[1,31]},{12:[1,32]},{12:[1,33]},{12:[1,34]},{12:[1,35]},o($Ve,[2,23],{25:[1,36]}),o($Vf,[2,24],{28:$Vg}),o($Vh,[2,27],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:60,67:61,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,68:$Vq,69:$Vr,74:$Vs,76:$Vt,77:$Vu,78:$Vv,80:$Vw,81:$Vx,84:$Vy,85:$Vz,86:$VA,87:$VB,90:$VC,91:$VD}),{1:[2,1]},{5:[2,2],22:$Vb},o($V0,$V1,{21:8,23:17,24:18,27:19,7:82,9:$Va}),o($Vc,[2,9]),o($Vd,[2,10],{10:83,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9}),{5:[2,4],22:$Vb},o($Vd,[2,7]),o([9,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,90,91],$V1,{23:17,24:18,27:19,21:84,5:$VE,22:$VE}),{13:[1,85]},{13:[1,86]},{13:[1,87]},{13:[1,88]},{13:[1,89]},{13:[1,90]},{13:[1,91]},{13:[1,92]},o($Vd,[2,26],{26:93}),o($Vd,$V1,{27:94}),o($VF,[2,30]),o($VF,[2,31]),o($VF,[2,32]),o($VF,[2,33]),o($VF,[2,34]),o($VF,[2,35]),o($VF,[2,36]),o($VF,[2,37]),o($VF,[2,38]),o($VF,[2,39]),o($VF,[2,40]),o($VG,$VH,{44:95,45:96,54:$VI}),o($VG,$VH,{44:98,45:99,54:$VI}),o($VG,$VH,{44:100,45:101,54:$VI}),o($VG,$VH,{44:102,45:103,54:$VI}),o($VF,[2,65]),o($VF,[2,66]),o($VF,[2,67]),o($VF,[2,68]),o($VF,[2,69]),o($VF,[2,70]),o($VF,[2,71]),o($VF,[2,72]),o($VF,[2,73]),{30:105,31:106,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,88:[1,104]},{54:[1,107]},{92:[1,108]},o($VF,[2,44]),{12:[1,109]},{12:[1,110]},{12:[1,111]},{46:113,48:112,50:$Vn},o($VJ,[2,53],{51:114,52:[1,115],53:[1,116]}),{12:[1,117]},{50:[1,119],70:118},{54:[1,120]},{12:[1,121],44:122,54:$VI},{12:[1,123]},o($VF,[2,88],{82:[1,124]}),o($VF,[2,89]),o($VF,[2,90]),o($VF,[2,91]),o($VF,[2,80]),o($VF,[2,81]),{5:[2,3],22:$Vb},o($Vc,[2,11]),o($Ve,[2,21]),o($Vc,[2,12]),o($Vc,[2,13]),o($Vc,[2,14]),o($Vc,[2,15]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,18]),o($Vc,[2,19]),o($Vd,$V1,{27:19,24:125}),o($Vh,[2,28],{29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,43:49,46:50,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:60,67:61,9:$Vi,40:$Vj,41:$Vk,42:$Vl,47:$Vm,50:$Vn,57:$Vo,58:$Vp,68:$Vq,69:$Vr,74:$Vs,76:$Vt,77:$Vu,78:$Vv,80:$Vw,81:$Vx,84:$Vy,85:$Vz,86:$VA,87:$VB,90:$VC,91:$VD}),o($VJ,$VH,{45:126}),o($VK,[2,47],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($Vt1,[2,59],{55:189}),o($VJ,$VH,{45:190}),o($VK,[2,48],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VJ,$VH,{45:191}),o($VK,[2,63],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VJ,$VH,{45:192}),o($VK,[2,64],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($Vu1,$V1,{27:193}),o($VF,[2,93]),o($VF,[2,94]),{75:[1,194]},{54:[1,195]},o($VF,[2,41]),o($VF,[2,42]),o($VF,[2,43]),{46:197,49:[1,196],50:$Vn},o($Vv1,[2,50]),o($VJ,[2,52],{52:[1,198],53:[1,199]}),o($Vw1,[2,54]),o($Vw1,[2,55]),o($VF,[2,74]),{71:200,72:[1,201],73:[1,202]},o([72,73],[2,76]),{75:[1,203]},o($VF,[2,83],{44:204,54:$VI}),{79:[1,205]},o($VF,[2,85]),{54:[1,206],83:[1,207]},o($Vf,[2,25],{28:$Vg}),o($VK,[2,45],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VJ,[2,100]),o($VJ,[2,101]),o($VJ,[2,102]),o($VJ,[2,103]),o($VJ,[2,104]),o($VJ,[2,105]),o($VJ,[2,106]),o($VJ,[2,107]),o($VJ,[2,108]),o($VJ,[2,109]),o($VJ,[2,110]),o($VJ,[2,111]),o($VJ,[2,112]),o($VJ,[2,113]),o($VJ,[2,114]),o($VJ,[2,115]),o($VJ,[2,117]),o($VJ,[2,118]),o($VJ,[2,119]),o($VJ,[2,120]),o($VJ,[2,121]),o($VJ,[2,122]),o([5,9,13,22,25,28,40,41,42,47,50,57,58,68,69,74,76,77,78,80,81,84,85,86,87,89,90,91,109,110,111,112,113,114,115,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],[2,131],{49:[1,211],54:[1,214],56:[1,208],83:[1,213],116:[1,209],117:[1,210],118:[1,212]}),o($VJ,[2,129]),o($VJ,[2,130]),o($VJ,[2,132]),o($VK,[2,133],{94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,93:215,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VK,[2,134],{94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,93:216,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VJ,[2,135]),o($VJ,[2,136]),o($VJ,[2,137]),o($VJ,[2,138]),o($VJ,[2,139]),o($VJ,[2,140]),o($VJ,[2,141]),o($VJ,[2,142]),o($VJ,[2,143]),o($VJ,[2,144]),o($VJ,[2,145]),o($VJ,[2,146]),o($VJ,[2,147]),o($VJ,[2,148]),o($VJ,[2,149]),o($VJ,[2,150]),o($VJ,[2,151]),o($VJ,[2,152]),o($VJ,[2,153]),o($VJ,[2,154]),o($VJ,[2,155]),o($VJ,[2,156]),o($VJ,[2,157]),o($VJ,[2,158]),o($VJ,[2,159]),o($VJ,[2,160]),o($VJ,[2,161]),o($VJ,[2,162]),{54:[1,217]},o($VJ,[2,116]),o($VJ,[2,167]),o($VJ,[2,168]),o($VJ,[2,169]),{12:[1,218]},o([5,9,13,22,25,28,40,41,42,47,49,50,54,57,58,68,69,74,76,77,78,79,80,81,83,84,85,86,87,89,90,91,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148],[2,58],{56:[1,219]}),o($VK,[2,46],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VK,[2,61],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),o($VK,[2,62],{93:127,94:128,95:129,96:130,97:131,98:132,99:133,100:134,101:135,102:136,103:137,104:138,105:139,106:140,107:141,108:142,13:$VL,42:$VM,49:$VN,54:$VO,56:$VP,83:$VQ,109:$VR,110:$VS,111:$VT,112:$VU,113:$VV,114:$VW,115:$VX,116:$VY,117:$VZ,118:$V_,119:$V$,120:$V01,121:$V11,122:$V21,123:$V31,124:$V41,125:$V51,126:$V61,127:$V71,128:$V81,129:$V91,130:$Va1,131:$Vb1,132:$Vc1,133:$Vd1,134:$Ve1,135:$Vf1,136:$Vg1,137:$Vh1,138:$Vi1,139:$Vj1,140:$Vk1,141:$Vl1,142:$Vm1,143:$Vn1,144:$Vo1,145:$Vp1,146:$Vq1,147:$Vr1,148:$Vs1}),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:60,67:61,68:$Vq,69:$Vr,74:$Vs,76:$Vt,77:$Vu,78:$Vv,80:$Vw,81:$Vx,84:$Vy,85:$Vz,86:$VA,87:$VB,89:[1,220],90:$VC,91:$VD},{54:[1,221]},{88:[1,222]},o($VJ,[2,49]),o($Vv1,[2,51]),o($Vw1,[2,56]),o($Vw1,[2,57]),o($VF,[2,75]),o($VF,[2,77]),o($VF,[2,78]),{54:[1,223]},{79:[1,224]},{54:[1,225]},o($VF,[2,86]),{54:[1,226]},o($VJ,[2,123]),o($VJ,[2,124]),o($VJ,[2,125]),o($VJ,[2,126]),o($VJ,[2,127]),o($VJ,[2,128]),o($VJ,[2,166]),o($VJ,[2,164]),o($VJ,[2,165]),o($VJ,[2,163]),o($VJ,[2,170]),o($Vt1,[2,60]),o($VF,[2,92]),{88:[1,227]},{46:228,50:$Vn},o($VF,[2,79]),{54:[1,229]},o($VF,[2,84]),o($VF,[2,87]),o($Vu1,$V1,{27:230}),{44:231,46:232,50:$Vn,54:$VI},o($VF,[2,82]),{9:$Vi,29:38,30:39,31:40,32:41,33:42,34:43,35:44,36:45,37:46,38:47,39:48,40:$Vj,41:$Vk,42:$Vl,43:49,46:50,47:$Vm,50:$Vn,57:$Vo,58:$Vp,59:53,60:54,61:55,62:56,63:57,64:58,65:59,66:60,67:61,68:$Vq,69:$Vr,74:$Vs,76:$Vt,77:$Vu,78:$Vv,80:$Vw,81:$Vx,84:$Vy,85:$Vz,86:$VA,87:$VB,89:[1,233],90:$VC,91:$VD},{46:234,50:$Vn},{89:[1,235]},o($VF,[2,95]),{44:236,54:$VI,89:[1,237]},o($VF,[2,98]),{89:[1,238]},o($VF,[2,97]),o($VF,[2,96])],
440
472
  defaultActions: {20:[2,1]},
441
473
  parseError: function parseError (str, hash) {
442
474
  if (hash.recoverable) {
@@ -713,6 +745,8 @@ parse: function parse(input) {
713
745
  let currentKey = null;
714
746
  let currentTimeSig = null;
715
747
  let currentDuration = { division: 4, dots: 0 }; // default quarter note
748
+ let numericTimeSignature = false; // When true, 4/4 and 2/2 use numeric display instead of C/C|
749
+ let currentOttava = 0; // Current ottava level, resets on newline
716
750
 
717
751
  // Reset parser state - call before each parse
718
752
  const resetParserState = () => {
@@ -720,6 +754,8 @@ parse: function parse(input) {
720
754
  currentKey = null;
721
755
  currentTimeSig = null;
722
756
  currentDuration = { division: 4, dots: 0 };
757
+ numericTimeSignature = false;
758
+ currentOttava = 0;
723
759
  };
724
760
 
725
761
  // Export reset function
@@ -1078,168 +1114,172 @@ case 11:return 13
1078
1114
  break;
1079
1115
  case 12:return 12
1080
1116
  break;
1081
- case 13:return 66
1117
+ case 13:return 68
1082
1118
  break;
1083
- case 14:return 67
1119
+ case 14:return 69
1084
1120
  break;
1085
- case 15:return 72
1121
+ case 15:return 74
1086
1122
  break;
1087
- case 16:return 74
1123
+ case 16:return 76
1088
1124
  break;
1089
- case 17:return 76
1125
+ case 17:return 77
1090
1126
  break;
1091
- case 18:return 83
1127
+ case 18:return 78
1092
1128
  break;
1093
- case 19:return 86
1129
+ case 19:return 80
1094
1130
  break;
1095
1131
  case 20:return 87
1096
1132
  break;
1097
- case 21:return 77
1133
+ case 21:return 90
1098
1134
  break;
1099
- case 22:return 80
1135
+ case 22:return 91
1100
1136
  break;
1101
1137
  case 23:return 81
1102
1138
  break;
1103
- case 24:return 82
1139
+ case 24:return 84
1104
1140
  break;
1105
- case 25:return 70
1141
+ case 25:return 85
1106
1142
  break;
1107
- case 26:return 71
1143
+ case 26:return 86
1108
1144
  break;
1109
- case 27:return 136
1145
+ case 27:return 72
1110
1146
  break;
1111
- case 28:return 137
1147
+ case 28:return 73
1112
1148
  break;
1113
- case 29:return 40
1149
+ case 29:return 140
1114
1150
  break;
1115
- case 30:return 143
1151
+ case 30:return 141
1116
1152
  break;
1117
- case 31:return 144
1153
+ case 31:return 40
1118
1154
  break;
1119
- case 32:return 41
1155
+ case 32:return 147
1120
1156
  break;
1121
- case 33:return 42
1157
+ case 33:return 148
1122
1158
  break;
1123
- case 34:return 133
1159
+ case 34:return 41
1124
1160
  break;
1125
- case 35:return 134
1161
+ case 35:return 42
1126
1162
  break;
1127
- case 36:return 135
1163
+ case 36:return 137
1128
1164
  break;
1129
- case 37:return 106
1165
+ case 37:return 138
1130
1166
  break;
1131
- case 38:return 107
1167
+ case 38:return 139
1132
1168
  break;
1133
- case 39:return 108
1169
+ case 39:return 110
1134
1170
  break;
1135
- case 40:return 109
1171
+ case 40:return 111
1136
1172
  break;
1137
- case 41:return 110
1173
+ case 41:return 112
1138
1174
  break;
1139
- case 42:return 111
1175
+ case 42:return 113
1140
1176
  break;
1141
- case 43:return 115
1177
+ case 43:return 114
1142
1178
  break;
1143
- case 44:return 116
1179
+ case 44:return 115
1144
1180
  break;
1145
- case 45:return 117
1181
+ case 45:return 119
1146
1182
  break;
1147
- case 46:return 118
1183
+ case 46:return 120
1148
1184
  break;
1149
- case 47:return 119
1185
+ case 47:return 121
1150
1186
  break;
1151
- case 48:return 120
1187
+ case 48:return 122
1152
1188
  break;
1153
- case 49:return 121
1189
+ case 49:return 123
1154
1190
  break;
1155
- case 50:return 122
1191
+ case 50:return 124
1156
1192
  break;
1157
- case 51:return 123
1193
+ case 51:return 125
1158
1194
  break;
1159
- case 52:return 125
1195
+ case 52:return 126
1160
1196
  break;
1161
- case 53:return 126
1197
+ case 53:return 127
1162
1198
  break;
1163
1199
  case 54:return 129
1164
1200
  break;
1165
- case 55:return 128
1201
+ case 55:return 130
1166
1202
  break;
1167
- case 56:return 130
1203
+ case 56:return 133
1168
1204
  break;
1169
- case 57:return 131
1205
+ case 57:return 132
1170
1206
  break;
1171
- case 58:return 132
1207
+ case 58:return 134
1172
1208
  break;
1173
- case 59:return 124
1209
+ case 59:return 135
1174
1210
  break;
1175
- case 60:return 127
1211
+ case 60:return 136
1176
1212
  break;
1177
- case 61:return 105
1213
+ case 61:return 128
1178
1214
  break;
1179
- case 62:return 25
1215
+ case 62:return 131
1180
1216
  break;
1181
- case 63:return 28
1217
+ case 63:return 109
1182
1218
  break;
1183
- case 64:return 88
1219
+ case 64:return 25
1184
1220
  break;
1185
- case 65:return 50
1221
+ case 65:return 28
1186
1222
  break;
1187
- case 66:return 52
1223
+ case 66:return 92
1188
1224
  break;
1189
- case 67:return 53
1225
+ case 67:return 50
1190
1226
  break;
1191
- case 68:return 54
1227
+ case 68:return 52
1192
1228
  break;
1193
- case 69:return 73
1229
+ case 69:return 53
1194
1230
  break;
1195
- case 70:return 78
1231
+ case 70:return 54
1196
1232
  break;
1197
- case 71:return 84
1233
+ case 71:return 75
1198
1234
  break;
1199
- case 72:return 85
1235
+ case 72:return 82
1200
1236
  break;
1201
- case 73:return 47
1237
+ case 73:return 88
1202
1238
  break;
1203
- case 74:return 49
1239
+ case 74:return 89
1204
1240
  break;
1205
- case 75:return 22
1241
+ case 75:return 47
1206
1242
  break;
1207
- case 76:return 141
1243
+ case 76:return 49
1208
1244
  break;
1209
- case 77:return 13
1245
+ case 77:return 22
1210
1246
  break;
1211
- case 78:return 139
1247
+ case 78:return 145
1212
1248
  break;
1213
- case 79:return 140
1249
+ case 79:return 13
1214
1250
  break;
1215
- case 80:return 138
1251
+ case 80:return 143
1216
1252
  break;
1217
- case 81:return 56
1253
+ case 81:return 144
1218
1254
  break;
1219
- case 82:return 79
1255
+ case 82:return 142
1220
1256
  break;
1221
- case 83:return 112
1257
+ case 83:return 56
1222
1258
  break;
1223
- case 84:return 113
1259
+ case 84:return 83
1224
1260
  break;
1225
- case 85:return 114
1261
+ case 85:return 116
1226
1262
  break;
1227
- case 86:return 142
1263
+ case 86:return 117
1228
1264
  break;
1229
- case 87:return 75
1265
+ case 87:return 118
1230
1266
  break;
1231
- case 88:return 57
1267
+ case 88:return 146
1232
1268
  break;
1233
- case 89:return 58
1269
+ case 89:return 79
1234
1270
  break;
1235
- case 90:return 5
1271
+ case 90:return 57
1236
1272
  break;
1237
- case 91:
1273
+ case 91:return 58
1274
+ break;
1275
+ case 92:return 5
1276
+ break;
1277
+ case 93:
1238
1278
  break;
1239
1279
  }
1240
1280
  },
1241
- rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\tempo\b)/,/^(?:\\staff\b)/,/^(?:\\grace\b)/,/^(?:\\times\b)/,/^(?:\\repeat\b)/,/^(?:\\ottava\b)/,/^(?:\\stemUp\b)/,/^(?:\\stemDown\b)/,/^(?:\\stemNeutral\b)/,/^(?:\\major\b)/,/^(?:\\minor\b)/,/^(?:\\sustainOn\b)/,/^(?:\\sustainOff\b)/,/^(?:\\bar\b)/,/^(?:\\coda\b)/,/^(?:\\segno\b)/,/^(?:\\chords\b)/,/^(?:\\markup\b)/,/^(?:\\<)/,/^(?:\\>)/,/^(?:\\!)/,/^(?:\\staccato\b)/,/^(?:\\staccatissimo\b)/,/^(?:\\tenuto\b)/,/^(?:\\marcato\b)/,/^(?:\\accent\b)/,/^(?:\\portato\b)/,/^(?:\\trill\b)/,/^(?:\\turn\b)/,/^(?:\\mordent\b)/,/^(?:\\prall\b)/,/^(?:\\fermata\b)/,/^(?:\\shortfermata\b)/,/^(?:\\arpeggio\b)/,/^(?:\\ppp\b)/,/^(?:\\pp\b)/,/^(?:\\mp\b)/,/^(?:\\mf\b)/,/^(?:\\fff\b)/,/^(?:\\ff\b)/,/^(?:\\sfz\b)/,/^(?:\\rfz\b)/,/^(?:\\sf\b)/,/^(?:\\p\b)/,/^(?:\\f)/,/^(?:\\rest\b)/,/^(?:\\\\\\)/,/^(?:\\\\)/,/^(?:tremolo\b)/,/^(?:[a-g](ss|ff|s|f)?)/,/^(?:')/,/^(?:,)/,/^(?:[0-9]+)/,/^(?:\/)/,/^(?:#)/,/^(?:\{)/,/^(?:\})/,/^(?:<)/,/^(?:>)/,/^(?:\|)/,/^(?:\[)/,/^(?:\])/,/^(?:\()/,/^(?:\))/,/^(?:~)/,/^(?:\.)/,/^(?:-)/,/^(?:[_])/,/^(?:\^)/,/^(?:!)/,/^(?::)/,/^(?:=)/,/^(?:[rR])/,/^(?:[sS])/,/^(?:$)/,/^(?:.)/],
1242
- conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91],"inclusive":true}}
1281
+ rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\])/,/^(?:"[^"]*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\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])/,/^(?:$)/,/^(?:.)/],
1282
+ 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],"inclusive":true}}
1243
1283
  });
1244
1284
  return lexer;
1245
1285
  })();