@k-l-lambda/lilylet 0.1.76 → 0.1.79
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.
- package/lib/abc/grammar.jison.js +85 -79
- package/lib/lilylet/abcDecoder.js +167 -0
- package/lib/lilylet/grammar.jison.js +120 -109
- package/lib/lilylet/highlight.js +3 -1
- package/lib/lilylet/measureLayoutFromXml.d.ts +1 -0
- package/lib/lilylet/measureLayoutFromXml.js +52 -3
- package/lib/lilylet/meiEncoder.js +62 -7
- package/lib/lilylet/musicXmlDecoder.js +119 -24
- package/lib/lilylet/musicXmlEncoder.js +85 -18
- package/lib/lilylet/musicXmlTypes.d.ts +3 -1
- package/lib/lilylet/musicXmlUtils.js +1 -1
- package/lib/lilylet/serializer.js +14 -0
- package/lib/lilylet/types.d.ts +6 -2
- package/lib/lilylet/types.js +1 -0
- package/package.json +3 -1
- package/source/abc/abc.jison +8 -4
- package/source/abc/grammar.jison.js +85 -79
- package/source/lilylet/abcDecoder.ts +189 -0
- package/source/lilylet/grammar.jison.js +120 -109
- package/source/lilylet/highlight.ts +3 -1
- package/source/lilylet/lilylet.jison +10 -1
- package/source/lilylet/measureLayoutFromXml.ts +53 -3
- package/source/lilylet/meiEncoder.ts +83 -7
- package/source/lilylet/musicXmlDecoder.ts +117 -23
- package/source/lilylet/musicXmlEncoder.ts +89 -16
- package/source/lilylet/musicXmlTypes.ts +5 -1
- package/source/lilylet/musicXmlUtils.ts +1 -1
- package/source/lilylet/serializer.ts +14 -0
- package/source/lilylet/types.ts +10 -1
|
@@ -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,26,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,
|
|
75
|
+
var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[5,26,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$V1=[2,36],$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,18],$Vc=[1,19],$Vd=[1,20],$Ve=[1,28],$Vf=[1,31],$Vg=[1,32],$Vh=[5,9,11,14,15,16,17,18,19,20,21,22,23,24,26,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$Vi=[5,26],$Vj=[5,26,29],$Vk=[1,46],$Vl=[5,26,29,32],$Vm=[1,77],$Vn=[1,78],$Vo=[1,79],$Vp=[1,80],$Vq=[1,81],$Vr=[1,82],$Vs=[1,84],$Vt=[1,85],$Vu=[1,61],$Vv=[1,62],$Vw=[1,86],$Vx=[1,87],$Vy=[1,88],$Vz=[1,96],$VA=[1,97],$VB=[1,89],$VC=[1,90],$VD=[1,91],$VE=[1,92],$VF=[1,93],$VG=[1,94],$VH=[1,95],$VI=[1,73],$VJ=[1,74],$VK=[1,75],$VL=[1,76],$VM=[1,98],$VN=[1,99],$VO=[1,100],$VP=[1,101],$VQ=[1,102],$VR=[1,103],$VS=[1,104],$VT=[1,105],$VU=[1,106],$VV=[1,107],$VW=[1,108],$VX=[1,109],$VY=[5,9,26,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$VZ=[2,29],$V_=[5,9,26,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,100,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$V$=[5,9,13,26,29,32,45,46,47,48,49,55,57,58,65,66,67,78,79,84,86,87,88,89,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],$V01=[2,117],$V11=[1,132],$V21=[5,9,13,26,29,32,45,46,47,48,49,55,57,58,63,65,66,67,78,79,84,86,87,88,89,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],$V31=[5,9,26,29,32,45,46,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,100,101,102,104],$V41=[1,214],$V51=[1,220],$V61=[1,195],$V71=[1,196],$V81=[1,193],$V91=[1,217],$Va1=[1,194],$Vb1=[1,192],$Vc1=[1,216],$Vd1=[1,186],$Ve1=[1,187],$Vf1=[1,188],$Vg1=[1,189],$Vh1=[1,190],$Vi1=[1,191],$Vj1=[1,197],$Vk1=[1,198],$Vl1=[1,199],$Vm1=[1,200],$Vn1=[1,201],$Vo1=[1,202],$Vp1=[1,203],$Vq1=[1,204],$Vr1=[1,205],$Vs1=[1,206],$Vt1=[1,207],$Vu1=[1,208],$Vv1=[1,209],$Vw1=[1,210],$Vx1=[1,211],$Vy1=[1,212],$Vz1=[1,213],$VA1=[1,215],$VB1=[1,218],$VC1=[1,219],$VD1=[1,221],$VE1=[5,9,13,26,29,32,45,46,47,48,49,55,57,58,63,65,66,67,78,79,84,86,87,88,89,90,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],$VF1=[9,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,100,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$VG1=[57,58],$VH1=[5,9,13,26,29,32,45,46,47,48,49,55,57,58,60,61,62,63,65,66,67,78,79,84,86,87,88,89,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],$VI1=[55,58,63,100];
|
|
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_INSTRUMENT_STAFF":20,"HEADER_GENRE":21,"HEADER_STAVES":22,"HEADER_MEASURES":23,"HEADER_AUTOBEAM":24,"measure_content":25,"|":26,"parts":27,"part_voices":28,"PART_SEP":29,"part_start":30,"voice_events":31,"VOICE_SEP":32,"event":33,"note_event":34,"rest_event":35,"context_event":36,"grace_event":37,"tuplet_event":38,"tremolo_event":39,"pitch_reset_event":40,"barline_event":41,"harmony_event":42,"markup_event":43,"dynamic_event":44,"CMD_BAR":45,"CMD_CHORDS":46,"CMD_MARKUP":47,"^":48,"_":49,"dynamic_mark":50,"chord":51,"duration":52,"post_events":53,"pitch":54,"<":55,"pitches":56,">":57,"PITCH":58,"octave":59,"!":60,"OCT_UP":61,"OCT_DOWN":62,"NUMBER":63,"dots":64,".":65,"REST_CHAR":66,"SPACE_CHAR":67,"clef_cmd":68,"key_cmd":69,"time_cmd":70,"partial_cmd":71,"tempo_cmd":72,"staff_cmd":73,"ottava_cmd":74,"stem_cmd":75,"numeric_time_sig_cmd":76,"default_time_sig_cmd":77,"CMD_CLEF":78,"CMD_KEY":79,"pitch_name":80,"mode":81,"MODE_MAJOR":82,"MODE_MINOR":83,"CMD_TIME":84,"/":85,"CMD_NUMERIC_TIME_SIG":86,"CMD_DEFAULT_TIME_SIG":87,"CMD_PARTIAL":88,"CMD_TEMPO":89,"=":90,"CMD_STAFF":91,"CMD_OTTAVA":92,"#":93,"-":94,"CMD_STEMUP":95,"CMD_STEMDOWN":96,"CMD_STEMNEUTRAL":97,"CMD_GRACE":98,"{":99,"}":100,"CMD_TIMES":101,"CMD_TUPLET":102,"tremolo_pitches":103,"CMD_REPEAT":104,"TREMOLO":105,"post_event":106,"articulation_mark":107,"ornament_mark":108,"hairpin_mark":109,"pedal_mark":110,"tie_mark":111,"slur_mark":112,"beam_mark":113,"tremolo_mark":114,"direction_mark":115,"rest_mark":116,"fingering_mark":117,"fingering_number":118,"navigation_mark":119,"markup_mark":120,"
|
|
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_INSTRUMENT_STAFF",21:"HEADER_GENRE",22:"HEADER_STAVES",23:"HEADER_MEASURES",24:"HEADER_AUTOBEAM",26:"|",29:"PART_SEP",32:"VOICE_SEP",45:"CMD_BAR",46:"CMD_CHORDS",47:"CMD_MARKUP",48:"^",49:"_",55:"<",57:">",58:"PITCH",60:"!",61:"OCT_UP",62:"OCT_DOWN",63:"NUMBER",65:".",66:"REST_CHAR",67:"SPACE_CHAR",78:"CMD_CLEF",79:"CMD_KEY",82:"MODE_MAJOR",83:"MODE_MINOR",84:"CMD_TIME",85:"/",86:"CMD_NUMERIC_TIME_SIG",87:"CMD_DEFAULT_TIME_SIG",88:"CMD_PARTIAL",89:"CMD_TEMPO",90:"=",91:"CMD_STAFF",92:"CMD_OTTAVA",93:"#",94:"-",95:"CMD_STEMUP",96:"CMD_STEMDOWN",97:"CMD_STEMNEUTRAL",98:"CMD_GRACE",99:"{",100:"}",101:"CMD_TIMES",102:"CMD_TUPLET",104:"CMD_REPEAT",105:"TREMOLO",
|
|
80
|
-
productions_: [0,[3,2],[4,2],[4,3],[4,3],[4,4],[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,4],[10,3],[10,3],[10,3],[10,3],[7,1],[7,3],[7,2],[25,1],[27,1],[27,4],[30,0],[28,1],[28,3],[31,0],[31,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[41,2],[42,2],[43,2],[43,3],[43,3],[44,1],[40,1],[34,3],[34,3],[34,2],[34,2],[51,3],[56,1],[56,2],[54,3],[54,2],[54,2],[54,1],[59,1],[59,1],[59,2],[59,2],[52,2],[64,0],[64,2],[35,3],[35,3],[35,2],[35,2],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[68,2],[69,3],[80,1],[81,1],[81,1],[70,4],[76,1],[77,1],[71,2],[72,5],[72,2],[72,4],[73,2],[74,3],[74,4],[74,1],[75,1],[75,1],[75,1],[37,4],[37,2],[37,2],[38,7],[38,7],[103,1],[103,1],[39,9],[39,8],[39,7],[53,0],[53,2],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[116,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,2],[107,2],[107,2],[107,2],[107,2],[107,2],[107,1],[107,1],[107,1],[107,1],[107,1],[108,1],[108,1],[108,1],[108,1],[108,1],[108,1],[108,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[109,1],[109,1],[109,1],[110,1],[110,1],[111,1],[112,1],[112,1],[113,1],[113,1],[114,2],[115,2],[115,2],[117,2],[118,1],[119,1],[119,1],[120,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_INSTRUMENT_STAFF":20,"HEADER_GENRE":21,"HEADER_STAVES":22,"HEADER_MEASURES":23,"HEADER_AUTOBEAM":24,"measure_content":25,"|":26,"parts":27,"part_voices":28,"PART_SEP":29,"part_start":30,"voice_events":31,"VOICE_SEP":32,"event":33,"note_event":34,"rest_event":35,"context_event":36,"grace_event":37,"tuplet_event":38,"tremolo_event":39,"pitch_reset_event":40,"barline_event":41,"harmony_event":42,"markup_event":43,"dynamic_event":44,"CMD_BAR":45,"CMD_CHORDS":46,"CMD_MARKUP":47,"^":48,"_":49,"dynamic_mark":50,"chord":51,"duration":52,"post_events":53,"pitch":54,"<":55,"pitches":56,">":57,"PITCH":58,"octave":59,"!":60,"OCT_UP":61,"OCT_DOWN":62,"NUMBER":63,"dots":64,".":65,"REST_CHAR":66,"SPACE_CHAR":67,"clef_cmd":68,"key_cmd":69,"time_cmd":70,"partial_cmd":71,"tempo_cmd":72,"staff_cmd":73,"ottava_cmd":74,"stem_cmd":75,"numeric_time_sig_cmd":76,"default_time_sig_cmd":77,"CMD_CLEF":78,"CMD_KEY":79,"pitch_name":80,"mode":81,"MODE_MAJOR":82,"MODE_MINOR":83,"CMD_TIME":84,"/":85,"CMD_NUMERIC_TIME_SIG":86,"CMD_DEFAULT_TIME_SIG":87,"CMD_PARTIAL":88,"CMD_TEMPO":89,"=":90,"CMD_STAFF":91,"CMD_OTTAVA":92,"#":93,"-":94,"CMD_STEMUP":95,"CMD_STEMDOWN":96,"CMD_STEMNEUTRAL":97,"CMD_GRACE":98,"{":99,"}":100,"CMD_TIMES":101,"CMD_TUPLET":102,"tremolo_pitches":103,"CMD_REPEAT":104,"TREMOLO":105,"post_event":106,"articulation_mark":107,"ornament_mark":108,"hairpin_mark":109,"pedal_mark":110,"tie_mark":111,"slur_mark":112,"beam_mark":113,"tremolo_mark":114,"direction_mark":115,"rest_mark":116,"fingering_mark":117,"fingering_number":118,"navigation_mark":119,"markup_mark":120,"glissando_mark":121,"CMD_REST":122,"ART_STACCATO":123,"ART_STACCATISSIMO":124,"ART_TENUTO":125,"ART_MARCATO":126,"ART_ACCENT":127,"ART_PORTATO":128,"ORN_TRILL":129,"ORN_TURN":130,"ORN_MORDENT":131,"ORN_PRALL":132,"ORN_FERMATA":133,"ORN_SHORTFERMATA":134,"ORN_ARPEGGIO":135,"ORN_BREATHE":136,"DYN_PPP":137,"DYN_PP":138,"DYN_P":139,"DYN_MP":140,"DYN_MF":141,"DYN_F":142,"DYN_FF":143,"DYN_FFF":144,"DYN_SFZ":145,"DYN_RFZ":146,"DYN_SF":147,"DYN_FP":148,"CMD_CRESC_BEGIN":149,"CMD_DIM_BEGIN":150,"CMD_DYNAMICS_END":151,"CMD_SUSTAINON":152,"CMD_SUSTAINOFF":153,"~":154,"(":155,")":156,"[":157,":":158,"CMD_CODA":159,"CMD_SEGNO":160,"CMD_GLISSANDO":161,"$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_INSTRUMENT_STAFF",21:"HEADER_GENRE",22:"HEADER_STAVES",23:"HEADER_MEASURES",24:"HEADER_AUTOBEAM",26:"|",29:"PART_SEP",32:"VOICE_SEP",45:"CMD_BAR",46:"CMD_CHORDS",47:"CMD_MARKUP",48:"^",49:"_",55:"<",57:">",58:"PITCH",60:"!",61:"OCT_UP",62:"OCT_DOWN",63:"NUMBER",65:".",66:"REST_CHAR",67:"SPACE_CHAR",78:"CMD_CLEF",79:"CMD_KEY",82:"MODE_MAJOR",83:"MODE_MINOR",84:"CMD_TIME",85:"/",86:"CMD_NUMERIC_TIME_SIG",87:"CMD_DEFAULT_TIME_SIG",88:"CMD_PARTIAL",89:"CMD_TEMPO",90:"=",91:"CMD_STAFF",92:"CMD_OTTAVA",93:"#",94:"-",95:"CMD_STEMUP",96:"CMD_STEMDOWN",97:"CMD_STEMNEUTRAL",98:"CMD_GRACE",99:"{",100:"}",101:"CMD_TIMES",102:"CMD_TUPLET",104:"CMD_REPEAT",105:"TREMOLO",122:"CMD_REST",123:"ART_STACCATO",124:"ART_STACCATISSIMO",125:"ART_TENUTO",126:"ART_MARCATO",127:"ART_ACCENT",128:"ART_PORTATO",129:"ORN_TRILL",130:"ORN_TURN",131:"ORN_MORDENT",132:"ORN_PRALL",133:"ORN_FERMATA",134:"ORN_SHORTFERMATA",135:"ORN_ARPEGGIO",136:"ORN_BREATHE",137:"DYN_PPP",138:"DYN_PP",139:"DYN_P",140:"DYN_MP",141:"DYN_MF",142:"DYN_F",143:"DYN_FF",144:"DYN_FFF",145:"DYN_SFZ",146:"DYN_RFZ",147:"DYN_SF",148:"DYN_FP",149:"CMD_CRESC_BEGIN",150:"CMD_DIM_BEGIN",151:"CMD_DYNAMICS_END",152:"CMD_SUSTAINON",153:"CMD_SUSTAINOFF",154:"~",155:"(",156:")",157:"[",158:":",159:"CMD_CODA",160:"CMD_SEGNO",161:"CMD_GLISSANDO"},
|
|
80
|
+
productions_: [0,[3,2],[4,2],[4,3],[4,3],[4,4],[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,4],[10,3],[10,3],[10,3],[10,3],[7,1],[7,3],[7,2],[25,1],[27,1],[27,4],[30,0],[28,1],[28,3],[31,0],[31,2],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[41,2],[42,2],[43,2],[43,3],[43,3],[44,1],[40,1],[34,3],[34,3],[34,2],[34,2],[51,3],[56,1],[56,2],[54,3],[54,2],[54,2],[54,1],[59,1],[59,1],[59,2],[59,2],[52,2],[64,0],[64,2],[35,3],[35,3],[35,2],[35,2],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[68,2],[69,3],[80,1],[81,1],[81,1],[70,4],[76,1],[77,1],[71,2],[72,5],[72,2],[72,4],[73,2],[74,3],[74,4],[74,1],[75,1],[75,1],[75,1],[37,4],[37,2],[37,2],[38,7],[38,7],[103,1],[103,1],[39,9],[39,8],[39,7],[53,0],[53,2],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[106,1],[116,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,2],[107,2],[107,2],[107,2],[107,2],[107,2],[107,1],[107,1],[107,1],[107,1],[107,1],[108,1],[108,1],[108,1],[108,1],[108,1],[108,1],[108,1],[108,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[50,1],[109,1],[109,1],[109,1],[110,1],[110,1],[111,1],[112,1],[112,1],[113,1],[113,1],[114,2],[115,2],[115,2],[117,2],[118,1],[119,1],[119,1],[120,2],[121,1]],
|
|
81
81
|
performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
|
|
82
82
|
/* this == yyval */
|
|
83
83
|
|
|
@@ -401,135 +401,141 @@ break;
|
|
|
401
401
|
case 116:
|
|
402
402
|
this.$ = tremoloEvent($$[$0-2], $$[$0-1], Number($$[$0-4]), currentDuration.division);
|
|
403
403
|
break;
|
|
404
|
-
case
|
|
404
|
+
case 135:
|
|
405
405
|
this.$ = ({ pitchedRest: true });
|
|
406
406
|
break;
|
|
407
|
-
case
|
|
407
|
+
case 136: case 142: case 149:
|
|
408
408
|
this.$ = articulation('staccato');
|
|
409
409
|
break;
|
|
410
|
-
case
|
|
410
|
+
case 137: case 146:
|
|
411
411
|
this.$ = articulation('staccatissimo');
|
|
412
412
|
break;
|
|
413
|
-
case
|
|
413
|
+
case 138: case 147: case 150:
|
|
414
414
|
this.$ = articulation('tenuto');
|
|
415
415
|
break;
|
|
416
|
-
case
|
|
416
|
+
case 139: case 144: case 151:
|
|
417
417
|
this.$ = articulation('marcato');
|
|
418
418
|
break;
|
|
419
|
-
case
|
|
419
|
+
case 140: case 145: case 148:
|
|
420
420
|
this.$ = articulation('accent');
|
|
421
421
|
break;
|
|
422
|
-
case
|
|
422
|
+
case 141: case 143: case 152:
|
|
423
423
|
this.$ = articulation('portato');
|
|
424
424
|
break;
|
|
425
|
-
case
|
|
425
|
+
case 153:
|
|
426
426
|
this.$ = ornament('trill');
|
|
427
427
|
break;
|
|
428
|
-
case
|
|
428
|
+
case 154:
|
|
429
429
|
this.$ = ornament('turn');
|
|
430
430
|
break;
|
|
431
|
-
case
|
|
431
|
+
case 155:
|
|
432
432
|
this.$ = ornament('mordent');
|
|
433
433
|
break;
|
|
434
|
-
case
|
|
434
|
+
case 156:
|
|
435
435
|
this.$ = ornament('prall');
|
|
436
436
|
break;
|
|
437
|
-
case
|
|
437
|
+
case 157:
|
|
438
438
|
this.$ = ornament('fermata');
|
|
439
439
|
break;
|
|
440
|
-
case
|
|
440
|
+
case 158:
|
|
441
441
|
this.$ = ornament('shortFermata');
|
|
442
442
|
break;
|
|
443
|
-
case
|
|
443
|
+
case 159:
|
|
444
444
|
this.$ = ornament('arpeggio');
|
|
445
445
|
break;
|
|
446
|
-
case
|
|
446
|
+
case 160:
|
|
447
|
+
this.$ = ornament('breath');
|
|
448
|
+
break;
|
|
449
|
+
case 161:
|
|
447
450
|
this.$ = dynamic('ppp');
|
|
448
451
|
break;
|
|
449
|
-
case
|
|
452
|
+
case 162:
|
|
450
453
|
this.$ = dynamic('pp');
|
|
451
454
|
break;
|
|
452
|
-
case
|
|
455
|
+
case 163:
|
|
453
456
|
this.$ = dynamic('p');
|
|
454
457
|
break;
|
|
455
|
-
case
|
|
458
|
+
case 164:
|
|
456
459
|
this.$ = dynamic('mp');
|
|
457
460
|
break;
|
|
458
|
-
case
|
|
461
|
+
case 165:
|
|
459
462
|
this.$ = dynamic('mf');
|
|
460
463
|
break;
|
|
461
|
-
case
|
|
464
|
+
case 166:
|
|
462
465
|
this.$ = dynamic('f');
|
|
463
466
|
break;
|
|
464
|
-
case
|
|
467
|
+
case 167:
|
|
465
468
|
this.$ = dynamic('ff');
|
|
466
469
|
break;
|
|
467
|
-
case
|
|
470
|
+
case 168:
|
|
468
471
|
this.$ = dynamic('fff');
|
|
469
472
|
break;
|
|
470
|
-
case
|
|
473
|
+
case 169: case 171:
|
|
471
474
|
this.$ = dynamic('sfz');
|
|
472
475
|
break;
|
|
473
|
-
case
|
|
476
|
+
case 170:
|
|
474
477
|
this.$ = dynamic('rfz');
|
|
475
478
|
break;
|
|
476
|
-
case
|
|
479
|
+
case 172:
|
|
477
480
|
this.$ = dynamic('fp');
|
|
478
481
|
break;
|
|
479
|
-
case
|
|
482
|
+
case 173:
|
|
480
483
|
this.$ = hairpin('crescendoStart');
|
|
481
484
|
break;
|
|
482
|
-
case
|
|
485
|
+
case 174:
|
|
483
486
|
this.$ = hairpin('diminuendoStart');
|
|
484
487
|
break;
|
|
485
|
-
case
|
|
488
|
+
case 175:
|
|
486
489
|
this.$ = hairpin('crescendoEnd');
|
|
487
490
|
break;
|
|
488
|
-
case
|
|
491
|
+
case 176:
|
|
489
492
|
this.$ = pedal('sustainOn');
|
|
490
493
|
break;
|
|
491
|
-
case
|
|
494
|
+
case 177:
|
|
492
495
|
this.$ = pedal('sustainOff');
|
|
493
496
|
break;
|
|
494
|
-
case
|
|
497
|
+
case 178:
|
|
495
498
|
this.$ = tie(true);
|
|
496
499
|
break;
|
|
497
|
-
case
|
|
500
|
+
case 179:
|
|
498
501
|
this.$ = slur(true);
|
|
499
502
|
break;
|
|
500
|
-
case
|
|
503
|
+
case 180:
|
|
501
504
|
this.$ = slur(false);
|
|
502
505
|
break;
|
|
503
|
-
case
|
|
506
|
+
case 181:
|
|
504
507
|
this.$ = beam(true);
|
|
505
508
|
break;
|
|
506
|
-
case
|
|
509
|
+
case 182:
|
|
507
510
|
this.$ = beam(false);
|
|
508
511
|
break;
|
|
509
|
-
case
|
|
512
|
+
case 183:
|
|
510
513
|
this.$ = ({ tremolo: Number($$[$0]) });
|
|
511
514
|
break;
|
|
512
|
-
case
|
|
515
|
+
case 184:
|
|
513
516
|
this.$ = ({ ...$$[$0], placement: 'above' });
|
|
514
517
|
break;
|
|
515
|
-
case
|
|
518
|
+
case 185:
|
|
516
519
|
this.$ = ({ ...$$[$0], placement: 'below' });
|
|
517
520
|
break;
|
|
518
|
-
case
|
|
521
|
+
case 186: case 187:
|
|
519
522
|
const n = Number($$[$0]); if (n >= 1 && n <= 5) this.$ = fingering(n); else this.$ = null;
|
|
520
523
|
break;
|
|
521
|
-
case
|
|
524
|
+
case 188:
|
|
522
525
|
this.$ = navigation('coda');
|
|
523
526
|
break;
|
|
524
|
-
case
|
|
527
|
+
case 189:
|
|
525
528
|
this.$ = navigation('segno');
|
|
526
529
|
break;
|
|
527
|
-
case
|
|
530
|
+
case 190:
|
|
528
531
|
this.$ = markupMark(unq($$[$0]));
|
|
529
532
|
break;
|
|
533
|
+
case 191:
|
|
534
|
+
this.$ = glissando();
|
|
535
|
+
break;
|
|
530
536
|
}
|
|
531
537
|
},
|
|
532
|
-
table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,25:8,27:21,28:22,31:23,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{1:[3]},{5:[1,24]},o($V0,$V1,{25:8,27:21,28:22,31:23,7:25,8:26,10:27,9:$Ve,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),o($V0,$V1,{10:6,25:8,27:21,28:22,31:23,6:29,7:30,9:$Vf,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{5:[2,7],26:$Vg},o($Vh,[2,10]),o($Vh,[2,8]),o($Vi,[2,27]),{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},{12:[1,38]},{12:[1,39]},{12:[1,40]},{12:[1,41]},{12:[1,42]},{12:[1,43]},{12:[1,44]},o($Vi,[2,30],{29:[1,45]}),o($Vj,[2,31],{32:$Vk}),o($Vl,[2,34],{33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,51:59,54:60,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,50:83,9:$Vm,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,55:$Vs,58:$Vt,66:$Vu,67:$Vv,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,101:$VJ,102:$VK,104:$VL,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX}),{1:[2,1]},{5:[2,2],26:$Vg},o($V0,$V1,{25:8,27:21,28:22,31:23,7:110,9:$Vf}),o($Vh,[2,11]),o($VY,[2,12],{10:111,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),o($V0,$V1,{25:8,27:21,28:22,31:23,10:27,7:112,8:113,9:$Ve,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{5:[2,6],26:$Vg},o($Vh,[2,9]),o([9,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,135,136,137,138,139,140,141,142,143,144,145,146],$V1,{27:21,28:22,31:23,25:114,5:$VZ,26:$VZ}),{13:[1,115]},{13:[1,116]},{13:[1,117]},{13:[1,118]},{13:[1,119]},{13:[1,120]},{13:[1,121]},{12:[1,123],13:[1,122]},{13:[1,124]},{13:[1,125]},{13:[1,126]},{13:[1,127]},o($VY,[2,33],{30:128}),o($VY,$V1,{31:129}),o($V_,[2,37]),o($V_,[2,38]),o($V_,[2,39]),o($V_,[2,40]),o($V_,[2,41]),o($V_,[2,42]),o($V_,[2,43]),o($V_,[2,44]),o($V_,[2,45]),o($V_,[2,46]),o($V_,[2,47]),o($V_,[2,48]),o($V$,$V01,{52:130,53:131,63:$V11}),o($V$,$V01,{52:133,53:134,63:$V11}),o($V$,$V01,{52:135,53:136,63:$V11}),o($V$,$V01,{52:137,53:138,63:$V11}),o($V_,[2,78]),o($V_,[2,79]),o($V_,[2,80]),o($V_,[2,81]),o($V_,[2,82]),o($V_,[2,83]),o($V_,[2,84]),o($V_,[2,85]),o($V_,[2,86]),o($V_,[2,87]),{34:140,35:141,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,99:[1,139]},{63:[1,142]},{63:[1,143]},{105:[1,144]},o($V_,[2,55]),{12:[1,145]},{12:[1,146]},{12:[1,147]},{47:[1,148]},{47:[1,149]},o($V_,[2,54]),{54:151,56:150,58:$Vt},o($V21,[2,66],{59:152,60:[1,153],61:[1,154],62:[1,155]}),{12:[1,156]},{58:[1,158],80:157},{63:[1,159]},{52:160,63:$V11},{12:[1,161],52:162,63:$V11},{12:[1,163]},o($V_,[2,103],{93:[1,164]}),o($V_,[2,104]),o($V_,[2,105]),o($V_,[2,106]),o($V_,[2,94]),o($V_,[2,95]),o($V21,[2,159]),o($V21,[2,160]),o($V21,[2,161]),o($V21,[2,162]),o($V21,[2,163]),o($V21,[2,164]),o($V21,[2,165]),o($V21,[2,166]),o($V21,[2,167]),o($V21,[2,168]),o($V21,[2,169]),o($V21,[2,170]),{5:[2,3],26:$Vg},o($Vh,[2,13]),{5:[2,4],26:$Vg},o($V0,$V1,{25:8,27:21,28:22,31:23,7:165,9:$Vf}),o($Vi,[2,28]),o($Vh,[2,14]),o($Vh,[2,15]),o($Vh,[2,16]),o($Vh,[2,17]),o($Vh,[2,18]),o($Vh,[2,19]),o($Vh,[2,20]),o($Vh,[2,21]),{13:[1,166]},o($Vh,[2,23]),o($Vh,[2,24]),o($Vh,[2,25]),o($Vh,[2,26]),o($VY,$V1,{31:23,28:167}),o($Vl,[2,35],{33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,51:59,54:60,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,50:83,9:$Vm,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,55:$Vs,58:$Vt,66:$Vu,67:$Vv,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,101:$VJ,102:$VK,104:$VL,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX}),o($V21,$V01,{53:168}),o($V31,[2,58],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($VC1,[2,72],{64:219}),o($V21,$V01,{53:220}),o($V31,[2,59],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V21,$V01,{53:221}),o($V31,[2,76],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V21,$V01,{53:222}),o($V31,[2,77],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($VD1,$V1,{31:223}),o($V_,[2,108]),o($V_,[2,109]),{85:[1,224]},{85:[1,225]},{63:[1,226]},o($V_,[2,49]),o($V_,[2,50]),o($V_,[2,51]),{12:[1,227]},{12:[1,228]},{54:230,57:[1,229],58:$Vt},o($VE1,[2,61]),o($V21,[2,65],{60:[1,231],61:[1,232],62:[1,233]}),o($V21,[2,64]),o($VF1,[2,67]),o($VF1,[2,68]),o($V_,[2,88]),{81:234,82:[1,235],83:[1,236]},o([82,83],[2,90]),{85:[1,237]},o($V_,[2,96]),o($V_,[2,98],{52:238,63:$V11}),{90:[1,239]},o($V_,[2,100]),{63:[1,240],94:[1,241]},{5:[2,5],26:$Vg},o($Vh,[2,22]),o($Vj,[2,32],{32:$Vk}),o($V31,[2,56],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V21,[2,118]),o($V21,[2,119]),o($V21,[2,120]),o($V21,[2,121]),o($V21,[2,122]),o($V21,[2,123]),o($V21,[2,124]),o($V21,[2,125]),o($V21,[2,126]),o($V21,[2,127]),o($V21,[2,128]),o($V21,[2,129]),o($V21,[2,130]),o($V21,[2,131]),o($V21,[2,132]),o($V21,[2,133]),o($V21,[2,135]),o($V21,[2,136]),o($V21,[2,137]),o($V21,[2,138]),o($V21,[2,139]),o($V21,[2,140]),o([5,9,13,26,29,32,45,46,47,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158],[2,149],{48:[1,244],49:[1,243],57:[1,245],60:[1,246],63:[1,248],65:[1,242],94:[1,247]}),o($V21,[2,147]),o($V21,[2,148]),o($V31,[2,150],{107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,106:249,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V31,[2,151],{107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,106:250,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V21,[2,152]),o($V21,[2,153]),o($V21,[2,154]),o($V21,[2,155]),o($V21,[2,156]),o($V21,[2,157]),o($V21,[2,158]),o($V21,[2,171]),o($V21,[2,172]),o($V21,[2,173]),o($V21,[2,174]),o($V21,[2,175]),o($V21,[2,176]),o($V21,[2,177]),o($V21,[2,178]),o($V21,[2,179]),o($V21,[2,180]),{63:[1,251]},o($V21,[2,134]),o($V21,[2,185]),o($V21,[2,186]),o($V21,[2,187]),{12:[1,252]},o([5,9,13,26,29,32,45,46,47,48,49,55,57,58,63,66,67,78,79,84,86,87,88,89,90,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158],[2,71],{65:[1,253]}),o($V31,[2,57],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V31,[2,74],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),o($V31,[2,75],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,121:$Vc1,122:$Vd1,123:$Ve1,124:$Vf1,125:$Vg1,126:$Vh1,127:$Vi1,128:$Vj1,129:$Vk1,130:$Vl1,131:$Vm1,132:$Vn1,133:$Vo1,134:$Vp1,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX,147:$Vq1,148:$Vr1,149:$Vs1,150:$Vt1,151:$Vu1,152:$Vv1,153:$Vw1,154:$Vx1,155:$Vy1,156:$Vz1,157:$VA1,158:$VB1}),{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,254],101:$VJ,102:$VK,104:$VL,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX},{63:[1,255]},{63:[1,256]},{99:[1,257]},o($V_,[2,52]),o($V_,[2,53]),o($V21,[2,60]),o($VE1,[2,62]),o($V21,[2,63]),o($VF1,[2,69]),o($VF1,[2,70]),o($V_,[2,89]),o($V_,[2,91]),o($V_,[2,92]),{63:[1,258]},{90:[1,259]},{63:[1,260]},o($V_,[2,101]),{63:[1,261]},o($V21,[2,141]),o($V21,[2,142]),o($V21,[2,143]),o($V21,[2,144]),o($V21,[2,145]),o($V21,[2,146]),o($V21,[2,184]),o($V21,[2,182]),o($V21,[2,183]),o($V21,[2,181]),o($V21,[2,188]),o($VC1,[2,73]),o($V_,[2,107]),{99:[1,262]},{99:[1,263]},{51:266,54:265,55:$Vs,58:$Vt,103:264},o($V_,[2,93]),{63:[1,267]},o($V_,[2,99]),o($V_,[2,102]),o($VD1,$V1,{31:268}),o($VD1,$V1,{31:269}),{51:266,52:270,54:265,55:$Vs,58:$Vt,63:$V11,103:271},o($VG1,[2,112]),o($VG1,[2,113]),o($V_,[2,97]),{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,272],101:$VJ,102:$VK,104:$VL,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX},{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,273],101:$VJ,102:$VK,104:$VL,135:$VM,136:$VN,137:$VO,138:$VP,139:$VQ,140:$VR,141:$VS,142:$VT,143:$VU,144:$VV,145:$VW,146:$VX},{51:266,54:265,55:$Vs,58:$Vt,103:274},{100:[1,275]},o($V_,[2,110]),o($V_,[2,111]),{52:276,63:$V11,100:[1,277]},o($V_,[2,116]),{100:[1,278]},o($V_,[2,115]),o($V_,[2,114])],
|
|
538
|
+
table: [o($V0,$V1,{3:1,4:2,6:3,8:4,7:5,10:6,25:8,27:21,28:22,31:23,9:[1,7],11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{1:[3]},{5:[1,24]},o($V0,$V1,{25:8,27:21,28:22,31:23,7:25,8:26,10:27,9:$Ve,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),o($V0,$V1,{10:6,25:8,27:21,28:22,31:23,6:29,7:30,9:$Vf,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{5:[2,7],26:$Vg},o($Vh,[2,10]),o($Vh,[2,8]),o($Vi,[2,27]),{12:[1,33]},{12:[1,34]},{12:[1,35]},{12:[1,36]},{12:[1,37]},{12:[1,38]},{12:[1,39]},{12:[1,40]},{12:[1,41]},{12:[1,42]},{12:[1,43]},{12:[1,44]},o($Vi,[2,30],{29:[1,45]}),o($Vj,[2,31],{32:$Vk}),o($Vl,[2,34],{33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,51:59,54:60,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,50:83,9:$Vm,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,55:$Vs,58:$Vt,66:$Vu,67:$Vv,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,101:$VJ,102:$VK,104:$VL,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX}),{1:[2,1]},{5:[2,2],26:$Vg},o($V0,$V1,{25:8,27:21,28:22,31:23,7:110,9:$Vf}),o($Vh,[2,11]),o($VY,[2,12],{10:111,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),o($V0,$V1,{25:8,27:21,28:22,31:23,10:27,7:112,8:113,9:$Ve,11:$V2,14:$V3,15:$V4,16:$V5,17:$V6,18:$V7,19:$V8,20:$V9,21:$Va,22:$Vb,23:$Vc,24:$Vd}),{5:[2,6],26:$Vg},o($Vh,[2,9]),o([9,29,32,45,46,47,48,49,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,101,102,104,137,138,139,140,141,142,143,144,145,146,147,148],$V1,{27:21,28:22,31:23,25:114,5:$VZ,26:$VZ}),{13:[1,115]},{13:[1,116]},{13:[1,117]},{13:[1,118]},{13:[1,119]},{13:[1,120]},{13:[1,121]},{12:[1,123],13:[1,122]},{13:[1,124]},{13:[1,125]},{13:[1,126]},{13:[1,127]},o($VY,[2,33],{30:128}),o($VY,$V1,{31:129}),o($V_,[2,37]),o($V_,[2,38]),o($V_,[2,39]),o($V_,[2,40]),o($V_,[2,41]),o($V_,[2,42]),o($V_,[2,43]),o($V_,[2,44]),o($V_,[2,45]),o($V_,[2,46]),o($V_,[2,47]),o($V_,[2,48]),o($V$,$V01,{52:130,53:131,63:$V11}),o($V$,$V01,{52:133,53:134,63:$V11}),o($V$,$V01,{52:135,53:136,63:$V11}),o($V$,$V01,{52:137,53:138,63:$V11}),o($V_,[2,78]),o($V_,[2,79]),o($V_,[2,80]),o($V_,[2,81]),o($V_,[2,82]),o($V_,[2,83]),o($V_,[2,84]),o($V_,[2,85]),o($V_,[2,86]),o($V_,[2,87]),{34:140,35:141,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,99:[1,139]},{63:[1,142]},{63:[1,143]},{105:[1,144]},o($V_,[2,55]),{12:[1,145]},{12:[1,146]},{12:[1,147]},{47:[1,148]},{47:[1,149]},o($V_,[2,54]),{54:151,56:150,58:$Vt},o($V21,[2,66],{59:152,60:[1,153],61:[1,154],62:[1,155]}),{12:[1,156]},{58:[1,158],80:157},{63:[1,159]},{52:160,63:$V11},{12:[1,161],52:162,63:$V11},{12:[1,163]},o($V_,[2,103],{93:[1,164]}),o($V_,[2,104]),o($V_,[2,105]),o($V_,[2,106]),o($V_,[2,94]),o($V_,[2,95]),o($V21,[2,161]),o($V21,[2,162]),o($V21,[2,163]),o($V21,[2,164]),o($V21,[2,165]),o($V21,[2,166]),o($V21,[2,167]),o($V21,[2,168]),o($V21,[2,169]),o($V21,[2,170]),o($V21,[2,171]),o($V21,[2,172]),{5:[2,3],26:$Vg},o($Vh,[2,13]),{5:[2,4],26:$Vg},o($V0,$V1,{25:8,27:21,28:22,31:23,7:165,9:$Vf}),o($Vi,[2,28]),o($Vh,[2,14]),o($Vh,[2,15]),o($Vh,[2,16]),o($Vh,[2,17]),o($Vh,[2,18]),o($Vh,[2,19]),o($Vh,[2,20]),o($Vh,[2,21]),{13:[1,166]},o($Vh,[2,23]),o($Vh,[2,24]),o($Vh,[2,25]),o($Vh,[2,26]),o($VY,$V1,{31:23,28:167}),o($Vl,[2,35],{33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,51:59,54:60,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,50:83,9:$Vm,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,55:$Vs,58:$Vt,66:$Vu,67:$Vv,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,101:$VJ,102:$VK,104:$VL,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX}),o($V21,$V01,{53:168}),o($V31,[2,58],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($VE1,[2,72],{64:222}),o($V21,$V01,{53:223}),o($V31,[2,59],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V21,$V01,{53:224}),o($V31,[2,76],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V21,$V01,{53:225}),o($V31,[2,77],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($VF1,$V1,{31:226}),o($V_,[2,108]),o($V_,[2,109]),{85:[1,227]},{85:[1,228]},{63:[1,229]},o($V_,[2,49]),o($V_,[2,50]),o($V_,[2,51]),{12:[1,230]},{12:[1,231]},{54:233,57:[1,232],58:$Vt},o($VG1,[2,61]),o($V21,[2,65],{60:[1,234],61:[1,235],62:[1,236]}),o($V21,[2,64]),o($VH1,[2,67]),o($VH1,[2,68]),o($V_,[2,88]),{81:237,82:[1,238],83:[1,239]},o([82,83],[2,90]),{85:[1,240]},o($V_,[2,96]),o($V_,[2,98],{52:241,63:$V11}),{90:[1,242]},o($V_,[2,100]),{63:[1,243],94:[1,244]},{5:[2,5],26:$Vg},o($Vh,[2,22]),o($Vj,[2,32],{32:$Vk}),o($V31,[2,56],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V21,[2,118]),o($V21,[2,119]),o($V21,[2,120]),o($V21,[2,121]),o($V21,[2,122]),o($V21,[2,123]),o($V21,[2,124]),o($V21,[2,125]),o($V21,[2,126]),o($V21,[2,127]),o($V21,[2,128]),o($V21,[2,129]),o($V21,[2,130]),o($V21,[2,131]),o($V21,[2,132]),o($V21,[2,133]),o($V21,[2,134]),o($V21,[2,136]),o($V21,[2,137]),o($V21,[2,138]),o($V21,[2,139]),o($V21,[2,140]),o($V21,[2,141]),o([5,9,13,26,29,32,45,46,47,55,58,66,67,78,79,84,86,87,88,89,91,92,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],[2,150],{48:[1,247],49:[1,246],57:[1,248],60:[1,249],63:[1,251],65:[1,245],94:[1,250]}),o($V21,[2,148]),o($V21,[2,149]),o($V31,[2,151],{107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,106:252,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V31,[2,152],{107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,106:253,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V21,[2,153]),o($V21,[2,154]),o($V21,[2,155]),o($V21,[2,156]),o($V21,[2,157]),o($V21,[2,158]),o($V21,[2,159]),o($V21,[2,160]),o($V21,[2,173]),o($V21,[2,174]),o($V21,[2,175]),o($V21,[2,176]),o($V21,[2,177]),o($V21,[2,178]),o($V21,[2,179]),o($V21,[2,180]),o($V21,[2,181]),o($V21,[2,182]),{63:[1,254]},o($V21,[2,135]),o($V21,[2,187]),o($V21,[2,188]),o($V21,[2,189]),{12:[1,255]},o($V21,[2,191]),o([5,9,13,26,29,32,45,46,47,48,49,55,57,58,63,66,67,78,79,84,86,87,88,89,90,91,92,94,95,96,97,98,100,101,102,104,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,152,153,154,155,156,157,158,159,160,161],[2,71],{65:[1,256]}),o($V31,[2,57],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V31,[2,74],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),o($V31,[2,75],{106:169,107:170,108:171,50:172,109:173,110:174,111:175,112:176,113:177,114:178,115:179,116:180,117:181,118:182,119:183,120:184,121:185,13:$V41,47:$V51,48:$V61,49:$V71,57:$V81,63:$V91,65:$Va1,94:$Vb1,122:$Vc1,123:$Vd1,124:$Ve1,125:$Vf1,126:$Vg1,127:$Vh1,128:$Vi1,129:$Vj1,130:$Vk1,131:$Vl1,132:$Vm1,133:$Vn1,134:$Vo1,135:$Vp1,136:$Vq1,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX,149:$Vr1,150:$Vs1,151:$Vt1,152:$Vu1,153:$Vv1,154:$Vw1,155:$Vx1,156:$Vy1,157:$Vz1,158:$VA1,159:$VB1,160:$VC1,161:$VD1}),{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,257],101:$VJ,102:$VK,104:$VL,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX},{63:[1,258]},{63:[1,259]},{99:[1,260]},o($V_,[2,52]),o($V_,[2,53]),o($V21,[2,60]),o($VG1,[2,62]),o($V21,[2,63]),o($VH1,[2,69]),o($VH1,[2,70]),o($V_,[2,89]),o($V_,[2,91]),o($V_,[2,92]),{63:[1,261]},{90:[1,262]},{63:[1,263]},o($V_,[2,101]),{63:[1,264]},o($V21,[2,142]),o($V21,[2,143]),o($V21,[2,144]),o($V21,[2,145]),o($V21,[2,146]),o($V21,[2,147]),o($V21,[2,186]),o($V21,[2,184]),o($V21,[2,185]),o($V21,[2,183]),o($V21,[2,190]),o($VE1,[2,73]),o($V_,[2,107]),{99:[1,265]},{99:[1,266]},{51:269,54:268,55:$Vs,58:$Vt,103:267},o($V_,[2,93]),{63:[1,270]},o($V_,[2,99]),o($V_,[2,102]),o($VF1,$V1,{31:271}),o($VF1,$V1,{31:272}),{51:269,52:273,54:268,55:$Vs,58:$Vt,63:$V11,103:274},o($VI1,[2,112]),o($VI1,[2,113]),o($V_,[2,97]),{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,275],101:$VJ,102:$VK,104:$VL,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX},{9:$Vm,33:47,34:48,35:49,36:50,37:51,38:52,39:53,40:54,41:55,42:56,43:57,44:58,45:$Vn,46:$Vo,47:$Vp,48:$Vq,49:$Vr,50:83,51:59,54:60,55:$Vs,58:$Vt,66:$Vu,67:$Vv,68:63,69:64,70:65,71:66,72:67,73:68,74:69,75:70,76:71,77:72,78:$Vw,79:$Vx,84:$Vy,86:$Vz,87:$VA,88:$VB,89:$VC,91:$VD,92:$VE,95:$VF,96:$VG,97:$VH,98:$VI,100:[1,276],101:$VJ,102:$VK,104:$VL,137:$VM,138:$VN,139:$VO,140:$VP,141:$VQ,142:$VR,143:$VS,144:$VT,145:$VU,146:$VV,147:$VW,148:$VX},{51:269,54:268,55:$Vs,58:$Vt,103:277},{100:[1,278]},o($V_,[2,110]),o($V_,[2,111]),{52:279,63:$V11,100:[1,280]},o($V_,[2,116]),{100:[1,281]},o($V_,[2,115]),o($V_,[2,114])],
|
|
533
539
|
defaultActions: {24:[2,1]},
|
|
534
540
|
parseError: function parseError (str, hash) {
|
|
535
541
|
if (hash.recoverable) {
|
|
@@ -807,6 +813,7 @@ parse: function parse(input) {
|
|
|
807
813
|
const markupEvent = (content, placement) => ({ type: 'markup', content, placement: placement || undefined });
|
|
808
814
|
const dynamicEvent = (type) => ({ type: 'dynamic', dynamicType: type });
|
|
809
815
|
const markupMark = (content) => ({ markType: 'markup', content });
|
|
816
|
+
const glissando = () => ({ markType: 'glissando' });
|
|
810
817
|
|
|
811
818
|
// Strip the surrounding quotes from a STRING token and unescape the control
|
|
812
819
|
// sequences the serializer emits (escapeString): \n \r \t \" \\ . A single
|
|
@@ -1309,142 +1316,146 @@ case 33:return 82
|
|
|
1309
1316
|
break;
|
|
1310
1317
|
case 34:return 83
|
|
1311
1318
|
break;
|
|
1312
|
-
case 35:return
|
|
1319
|
+
case 35:return 152
|
|
1313
1320
|
break;
|
|
1314
|
-
case 36:return
|
|
1321
|
+
case 36:return 153
|
|
1315
1322
|
break;
|
|
1316
1323
|
case 37:return 45
|
|
1317
1324
|
break;
|
|
1318
|
-
case 38:return
|
|
1325
|
+
case 38:return 159
|
|
1319
1326
|
break;
|
|
1320
|
-
case 39:return
|
|
1327
|
+
case 39:return 160
|
|
1321
1328
|
break;
|
|
1322
1329
|
case 40:return 46
|
|
1323
1330
|
break;
|
|
1324
1331
|
case 41:return 47
|
|
1325
1332
|
break;
|
|
1326
|
-
case 42:return
|
|
1333
|
+
case 42:return 149
|
|
1327
1334
|
break;
|
|
1328
|
-
case 43:return
|
|
1335
|
+
case 43:return 150
|
|
1329
1336
|
break;
|
|
1330
|
-
case 44:return
|
|
1337
|
+
case 44:return 151
|
|
1331
1338
|
break;
|
|
1332
|
-
case 45:return
|
|
1339
|
+
case 45:return 123
|
|
1333
1340
|
break;
|
|
1334
|
-
case 46:return
|
|
1341
|
+
case 46:return 124
|
|
1335
1342
|
break;
|
|
1336
|
-
case 47:return
|
|
1343
|
+
case 47:return 125
|
|
1337
1344
|
break;
|
|
1338
|
-
case 48:return
|
|
1345
|
+
case 48:return 126
|
|
1339
1346
|
break;
|
|
1340
|
-
case 49:return
|
|
1347
|
+
case 49:return 127
|
|
1341
1348
|
break;
|
|
1342
|
-
case 50:return
|
|
1349
|
+
case 50:return 128
|
|
1343
1350
|
break;
|
|
1344
|
-
case 51:return
|
|
1351
|
+
case 51:return 129
|
|
1345
1352
|
break;
|
|
1346
|
-
case 52:return
|
|
1353
|
+
case 52:return 130
|
|
1347
1354
|
break;
|
|
1348
|
-
case 53:return
|
|
1355
|
+
case 53:return 131
|
|
1349
1356
|
break;
|
|
1350
|
-
case 54:return
|
|
1357
|
+
case 54:return 132
|
|
1351
1358
|
break;
|
|
1352
|
-
case 55:return
|
|
1359
|
+
case 55:return 133
|
|
1353
1360
|
break;
|
|
1354
|
-
case 56:return
|
|
1361
|
+
case 56:return 134
|
|
1355
1362
|
break;
|
|
1356
|
-
case 57:return
|
|
1363
|
+
case 57:return 135
|
|
1357
1364
|
break;
|
|
1358
|
-
case 58:return
|
|
1365
|
+
case 58:return 136
|
|
1359
1366
|
break;
|
|
1360
|
-
case 59:return
|
|
1367
|
+
case 59:return 161
|
|
1361
1368
|
break;
|
|
1362
|
-
case 60:return
|
|
1369
|
+
case 60:return 137
|
|
1363
1370
|
break;
|
|
1364
|
-
case 61:return
|
|
1371
|
+
case 61:return 138
|
|
1365
1372
|
break;
|
|
1366
|
-
case 62:return
|
|
1373
|
+
case 62:return 140
|
|
1367
1374
|
break;
|
|
1368
1375
|
case 63:return 141
|
|
1369
1376
|
break;
|
|
1370
|
-
case 64:return
|
|
1377
|
+
case 64:return 144
|
|
1371
1378
|
break;
|
|
1372
|
-
case 65:return
|
|
1379
|
+
case 65:return 143
|
|
1373
1380
|
break;
|
|
1374
1381
|
case 66:return 145
|
|
1375
1382
|
break;
|
|
1376
1383
|
case 67:return 146
|
|
1377
1384
|
break;
|
|
1378
|
-
case 68:return
|
|
1385
|
+
case 68:return 147
|
|
1379
1386
|
break;
|
|
1380
|
-
case 69:return
|
|
1387
|
+
case 69:return 148
|
|
1381
1388
|
break;
|
|
1382
|
-
case 70:return
|
|
1389
|
+
case 70:return 139
|
|
1383
1390
|
break;
|
|
1384
|
-
case 71:return
|
|
1391
|
+
case 71:return 142
|
|
1385
1392
|
break;
|
|
1386
|
-
case 72:return
|
|
1393
|
+
case 72:return 122
|
|
1387
1394
|
break;
|
|
1388
|
-
case 73:return
|
|
1395
|
+
case 73:return 29
|
|
1389
1396
|
break;
|
|
1390
|
-
case 74:return
|
|
1397
|
+
case 74:return 32
|
|
1391
1398
|
break;
|
|
1392
|
-
case 75:return
|
|
1399
|
+
case 75:return 105
|
|
1393
1400
|
break;
|
|
1394
|
-
case 76:return
|
|
1401
|
+
case 76:return 58
|
|
1395
1402
|
break;
|
|
1396
|
-
case 77:return
|
|
1403
|
+
case 77:return 61
|
|
1397
1404
|
break;
|
|
1398
|
-
case 78:return
|
|
1405
|
+
case 78:return 62
|
|
1399
1406
|
break;
|
|
1400
|
-
case 79:return
|
|
1407
|
+
case 79:return 63
|
|
1401
1408
|
break;
|
|
1402
|
-
case 80:return
|
|
1409
|
+
case 80:return 85
|
|
1403
1410
|
break;
|
|
1404
|
-
case 81:return
|
|
1411
|
+
case 81:return 93
|
|
1405
1412
|
break;
|
|
1406
|
-
case 82:return
|
|
1413
|
+
case 82:return 99
|
|
1407
1414
|
break;
|
|
1408
|
-
case 83:return
|
|
1415
|
+
case 83:return 100
|
|
1409
1416
|
break;
|
|
1410
|
-
case 84:return
|
|
1417
|
+
case 84:return 55
|
|
1411
1418
|
break;
|
|
1412
|
-
case 85:return
|
|
1419
|
+
case 85:return 57
|
|
1413
1420
|
break;
|
|
1414
|
-
case 86:return
|
|
1421
|
+
case 86:return 26
|
|
1415
1422
|
break;
|
|
1416
|
-
case 87:return
|
|
1423
|
+
case 87:return 157
|
|
1417
1424
|
break;
|
|
1418
|
-
case 88:return
|
|
1425
|
+
case 88:return 13
|
|
1419
1426
|
break;
|
|
1420
|
-
case 89:return
|
|
1427
|
+
case 89:return 155
|
|
1421
1428
|
break;
|
|
1422
|
-
case 90:return
|
|
1429
|
+
case 90:return 156
|
|
1423
1430
|
break;
|
|
1424
|
-
case 91:return
|
|
1431
|
+
case 91:return 154
|
|
1425
1432
|
break;
|
|
1426
|
-
case 92:return
|
|
1433
|
+
case 92:return 65
|
|
1427
1434
|
break;
|
|
1428
|
-
case 93:return
|
|
1435
|
+
case 93:return 94
|
|
1429
1436
|
break;
|
|
1430
|
-
case 94:return
|
|
1437
|
+
case 94:return 49
|
|
1431
1438
|
break;
|
|
1432
|
-
case 95:return
|
|
1439
|
+
case 95:return 48
|
|
1433
1440
|
break;
|
|
1434
|
-
case 96:return
|
|
1441
|
+
case 96:return 60
|
|
1435
1442
|
break;
|
|
1436
|
-
case 97:return
|
|
1443
|
+
case 97:return 158
|
|
1437
1444
|
break;
|
|
1438
|
-
case 98:return
|
|
1445
|
+
case 98:return 90
|
|
1439
1446
|
break;
|
|
1440
|
-
case 99:return
|
|
1447
|
+
case 99:return 66
|
|
1441
1448
|
break;
|
|
1442
|
-
case 100:
|
|
1449
|
+
case 100:return 67
|
|
1450
|
+
break;
|
|
1451
|
+
case 101:return 5
|
|
1452
|
+
break;
|
|
1453
|
+
case 102:
|
|
1443
1454
|
break;
|
|
1444
1455
|
}
|
|
1445
1456
|
},
|
|
1446
|
-
rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument-[A-Za-z0-9_]+(?:-[A-Za-z0-9_]+)*)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[staves\b)/,/^(?:\[measures\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"[
|
|
1447
|
-
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,96,97,98,99,100],"inclusive":true}}
|
|
1457
|
+
rules: [/^(?:[ \t]+)/,/^(?:(\r?\n)+)/,/^(?:%.*)/,/^(?:\[title\b)/,/^(?:\[subtitle\b)/,/^(?:\[composer\b)/,/^(?:\[arranger\b)/,/^(?:\[lyricist\b)/,/^(?:\[opus\b)/,/^(?:\[instrument-[A-Za-z0-9_]+(?:-[A-Za-z0-9_]+)*)/,/^(?:\[instrument\b)/,/^(?:\[genre\b)/,/^(?:\[staves\b)/,/^(?:\[measures\b)/,/^(?:\[auto-beam\b)/,/^(?:\])/,/^(?:"([^\"\\]|\\.)*")/,/^(?:\\clef\b)/,/^(?:\\key\b)/,/^(?:\\time\b)/,/^(?:\\partial\b)/,/^(?:\\numericTimeSignature\b)/,/^(?:\\defaultTimeSignature\b)/,/^(?:\\tempo\b)/,/^(?:\\staff\b)/,/^(?:\\grace\b)/,/^(?:\\times\b)/,/^(?:\\tuplet\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)/,/^(?:\\breathe\b)/,/^(?:\\glissando\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])/,/^(?:$)/,/^(?:.)/],
|
|
1458
|
+
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,96,97,98,99,100,101,102],"inclusive":true}}
|
|
1448
1459
|
});
|
|
1449
1460
|
return lexer;
|
|
1450
1461
|
})();
|
package/lib/lilylet/highlight.js
CHANGED
|
@@ -24,7 +24,7 @@ export const HIGHLIGHT_RULES = [
|
|
|
24
24
|
{ re: /(?:\[measures\b)/iy, scope: "header" },
|
|
25
25
|
{ re: /(?:\[auto-beam\b)/iy, scope: "header" },
|
|
26
26
|
{ re: /(?:\])/iy, scope: "squareBracket" },
|
|
27
|
-
{ re: /(?:"[
|
|
27
|
+
{ re: /(?:"([^\"\\]|\\.)*")/iy, scope: "string" },
|
|
28
28
|
{ re: /(?:\\clef\b)/iy, scope: "keyword" },
|
|
29
29
|
{ re: /(?:\\key\b)/iy, scope: "keyword" },
|
|
30
30
|
{ re: /(?:\\time\b)/iy, scope: "keyword" },
|
|
@@ -66,6 +66,8 @@ export const HIGHLIGHT_RULES = [
|
|
|
66
66
|
{ re: /(?:\\fermata\b)/iy, scope: "ornament" },
|
|
67
67
|
{ re: /(?:\\shortfermata\b)/iy, scope: "ornament" },
|
|
68
68
|
{ re: /(?:\\arpeggio\b)/iy, scope: "ornament" },
|
|
69
|
+
{ re: /(?:\\breathe\b)/iy, scope: "ornament" },
|
|
70
|
+
{ re: /(?:\\glissando\b)/iy, scope: "ornament" },
|
|
69
71
|
{ re: /(?:\\ppp\b)/iy, scope: "dynamic" },
|
|
70
72
|
{ re: /(?:\\pp\b)/iy, scope: "dynamic" },
|
|
71
73
|
{ re: /(?:\\mp\b)/iy, scope: "dynamic" },
|
|
@@ -39,6 +39,7 @@ export interface MeasureRepeatInfo {
|
|
|
39
39
|
* guaranteed to expand (via measureLayout.ts) to the simulated performed order.
|
|
40
40
|
*/
|
|
41
41
|
export declare const buildMeasureLayout: (infos: MeasureRepeatInfo[], totalMeasures: number) => string | undefined;
|
|
42
|
+
export declare const applyNavText: (info: MeasureRepeatInfo, raw: string) => void;
|
|
42
43
|
export declare const collectRepeatInfo: (partEl: Element) => MeasureRepeatInfo[];
|
|
43
44
|
/**
|
|
44
45
|
* Derive metadata.measureLayout from a <part> element, or undefined if no
|
|
@@ -205,6 +205,51 @@ const renderRepeatSpan = (infos, lo, hi) => {
|
|
|
205
205
|
parts.push(rangeCode(lastStop + 1, hi));
|
|
206
206
|
return parts.join(", ");
|
|
207
207
|
};
|
|
208
|
+
// Render a whole piece that has one OR MORE plain repeat/volta sections in
|
|
209
|
+
// sequence (no navigation). Real scores are usually multi-section (AABB minuets,
|
|
210
|
+
// sonata exposition+recap), which the single-span renderRepeatSpan can't express
|
|
211
|
+
// — it bails when it sees >1 repeat-end. Here we cut the piece at section
|
|
212
|
+
// boundaries (each cut ends a repeat section, voltas included) and render each
|
|
213
|
+
// span independently, joining with commas. Any non-repeated measures between two
|
|
214
|
+
// sections are absorbed as the `pre` of the following span. Returns null if any
|
|
215
|
+
// section isn't a clean single repeat/volta (caller then falls back to flat).
|
|
216
|
+
const renderRepeatSections = (infos, total) => {
|
|
217
|
+
const repeatEnds = infos.filter(i => i.repeatEnd).map(i => i.index).sort((a, b) => a - b);
|
|
218
|
+
const repeatStarts = infos.filter(i => i.repeatStart).map(i => i.index).sort((a, b) => a - b);
|
|
219
|
+
if (repeatEnds.length <= 1)
|
|
220
|
+
return renderRepeatSpan(infos, 1, total);
|
|
221
|
+
const endingStops = infos.filter(i => i.endingStop !== undefined).map(i => i.index);
|
|
222
|
+
const parts = [];
|
|
223
|
+
let prevHi = 0;
|
|
224
|
+
for (const e of repeatEnds) {
|
|
225
|
+
const lo = prevHi + 1;
|
|
226
|
+
// The next section's repeat-start bounds this section's voltas (2nd/3rd
|
|
227
|
+
// endings sit AFTER the repeat-end but BEFORE the next section starts).
|
|
228
|
+
const nextStart = repeatStarts.find(s => s > e);
|
|
229
|
+
const sectionEndingStarts = infos
|
|
230
|
+
.filter(i => i.endingStart !== undefined && i.index >= lo && (nextStart === undefined || i.index < nextStart))
|
|
231
|
+
.map(i => i.index)
|
|
232
|
+
.sort((a, b) => a - b);
|
|
233
|
+
let hi;
|
|
234
|
+
if (sectionEndingStarts.length) {
|
|
235
|
+
const lastStart = sectionEndingStarts[sectionEndingStarts.length - 1];
|
|
236
|
+
// the last ending's stop closes the section; else the ending start itself
|
|
237
|
+
const stop = endingStops.filter(s => s >= lastStart).sort((a, b) => a - b)[0];
|
|
238
|
+
hi = stop ?? lastStart;
|
|
239
|
+
}
|
|
240
|
+
else
|
|
241
|
+
hi = e;
|
|
242
|
+
const code = renderRepeatSpan(infos, lo, hi);
|
|
243
|
+
if (code === null)
|
|
244
|
+
return null;
|
|
245
|
+
parts.push(code);
|
|
246
|
+
prevHi = hi;
|
|
247
|
+
}
|
|
248
|
+
// trailing non-repeated tail
|
|
249
|
+
if (prevHi < total)
|
|
250
|
+
parts.push(rangeCode(prevHi + 1, total));
|
|
251
|
+
return parts.join(", ");
|
|
252
|
+
};
|
|
208
253
|
const tryStructured = (infos, total) => {
|
|
209
254
|
const dacapo = infos.find(i => i.dacapo);
|
|
210
255
|
const dalsegno = infos.some(i => i.dalsegno);
|
|
@@ -223,8 +268,10 @@ const tryStructured = (infos, total) => {
|
|
|
223
268
|
}
|
|
224
269
|
if (dalsegno || tocoda || infos.some(i => i.fine || i.segno || i.coda))
|
|
225
270
|
return null;
|
|
226
|
-
// No navigation:
|
|
227
|
-
|
|
271
|
+
// No navigation: one or more plain repeat/volta sections in sequence. Most
|
|
272
|
+
// real pieces (AABB minuets, sonata exposition+recap) have ≥2 repeat sections;
|
|
273
|
+
// render each independently and join with commas.
|
|
274
|
+
return renderRepeatSections(infos, total);
|
|
228
275
|
};
|
|
229
276
|
// Construct the ABA form <main, rest> for a D.C. case. main = the volta/repeat
|
|
230
277
|
// structure; rest = the post-volta tail before the D.C. measure. The Once
|
|
@@ -298,7 +345,9 @@ export const buildMeasureLayout = (infos, totalMeasures) => {
|
|
|
298
345
|
// "D.C. al Fine" → dacapo (the Fine stop is marked separately where "Fine"
|
|
299
346
|
// appears); "D.S. al Coda"/"D.S." → dalsegno; "To Coda" → tocoda; bare "Fine"
|
|
300
347
|
// → fine; bare "Coda"/"Segno" → mark the landing point.
|
|
301
|
-
|
|
348
|
+
// Exported so the ABC decoder can feed its !D.C.!/!D.S.!/!fine! decoration text
|
|
349
|
+
// through the SAME recognizer, keeping the ABC and MusicXML nav semantics identical.
|
|
350
|
+
export const applyNavText = (info, raw) => {
|
|
302
351
|
const t = raw.trim().toLowerCase().replace(/\s+/g, " ");
|
|
303
352
|
if (!t)
|
|
304
353
|
return;
|