@leafo/lml 0.1.1 → 0.3.0

package/dist/grammar.js

@@ -136,79 +136,116 @@ function peg$parse(input, options) {
     const peg$source = options.grammarSource;
     const peg$startRuleFunctions = {
         start: peg$parsestart,
+        note: peg$parsenote,
     };
     let peg$startRuleFunction = peg$parsestart;
-    const peg$c0 = "ks";
-    const peg$c1 = "-";
-    const peg$c2 = "ts";
-    const peg$c3 = "/";
-    const peg$c4 = "t";
-    const peg$c5 = "$";
-    const peg$c6 = "|";
-    const peg$c7 = ".";
-    const peg$c8 = "ht";
-    const peg$c9 = "dt";
-    const peg$c10 = "tt";
-    const peg$c11 = "m";
-    const peg$c12 = "{";
-    const peg$c13 = "}";
-    const peg$c14 = "#";
-    const peg$r0 = /^[0-9]/;
-    const peg$r1 = /^[gcfGCF]/;
+    const peg$c0 = "#";
+    const peg$c1 = ":";
+    const peg$c2 = "\n";
+    const peg$c3 = "ks";
+    const peg$c4 = "-";
+    const peg$c5 = "ts";
+    const peg$c6 = "/";
+    const peg$c7 = "t";
+    const peg$c8 = "$";
+    const peg$c9 = "|";
+    const peg$c10 = "*";
+    const peg$c11 = ".";
+    const peg$c12 = "@";
+    const peg$c13 = "ht";
+    const peg$c14 = "dt";
+    const peg$c15 = "tt";
+    const peg$c16 = "m";
+    const peg$c17 = "{";
+    const peg$c18 = "}";
+    const peg$c19 = "\"";
+    const peg$c20 = "'";
+    const peg$c21 = "\\";
+    const peg$c22 = "n";
+    const peg$r0 = /^[ \t]/;
+    const peg$r1 = /^[a-zA-Z_]/;
     const peg$r2 = /^[a-zA-Z0-9_]/;
-    const peg$r3 = /^[a-gA-G]/;
-    const peg$r4 = /^[+=\-]/;
-    const peg$r5 = /^[rR]/;
-    const peg$r6 = /^[^\n]/;
-    const peg$r7 = /^[\t\r\n ]/;
-    const peg$e0 = peg$literalExpectation("ks", false);
-    const peg$e1 = peg$literalExpectation("-", false);
-    const peg$e2 = peg$classExpectation([["0", "9"]], false, false, false);
-    const peg$e3 = peg$literalExpectation("ts", false);
-    const peg$e4 = peg$literalExpectation("/", false);
-    const peg$e5 = peg$literalExpectation("t", false);
-    const peg$e6 = peg$classExpectation(["g", "c", "f", "G", "C", "F"], false, false, false);
-    const peg$e7 = peg$literalExpectation("$", false);
-    const peg$e8 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
-    const peg$e9 = peg$literalExpectation("|", false);
-    const peg$e10 = peg$classExpectation([["a", "g"], ["A", "G"]], false, false, false);
-    const peg$e11 = peg$classExpectation(["+", "=", "-"], false, false, false);
-    const peg$e12 = peg$literalExpectation(".", false);
-    const peg$e13 = peg$classExpectation(["r", "R"], false, false, false);
-    const peg$e14 = peg$literalExpectation("ht", false);
-    const peg$e15 = peg$literalExpectation("dt", false);
-    const peg$e16 = peg$literalExpectation("tt", false);
-    const peg$e17 = peg$literalExpectation("m", false);
-    const peg$e18 = peg$literalExpectation("{", false);
-    const peg$e19 = peg$literalExpectation("}", false);
-    const peg$e20 = peg$literalExpectation("#", false);
-    const peg$e21 = peg$classExpectation(["\n"], true, false, false);
-    const peg$e22 = peg$classExpectation(["\t", "\r", "\n", " "], false, false, false);
-    function peg$f0(head, rest) {
+    const peg$r3 = /^[^\n]/;
+    const peg$r4 = /^[0-9]/;
+    const peg$r5 = /^[gcfGCF]/;
+    const peg$r6 = /^[a-gA-G]/;
+    const peg$r7 = /^[+=\-]/;
+    const peg$r8 = /^[rR_]/;
+    const peg$r9 = /^[\t\r\n ]/;
+    const peg$r10 = /^["\\]/;
+    const peg$r11 = /^['\\]/;
+    const peg$e0 = peg$literalExpectation("#", false);
+    const peg$e1 = peg$classExpectation([" ", "\t"], false, false, false);
+    const peg$e2 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false, false);
+    const peg$e3 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+    const peg$e4 = peg$literalExpectation(":", false);
+    const peg$e5 = peg$classExpectation(["\n"], true, false, false);
+    const peg$e6 = peg$literalExpectation("\n", false);
+    const peg$e7 = peg$literalExpectation("ks", false);
+    const peg$e8 = peg$literalExpectation("-", false);
+    const peg$e9 = peg$classExpectation([["0", "9"]], false, false, false);
+    const peg$e10 = peg$literalExpectation("ts", false);
+    const peg$e11 = peg$literalExpectation("/", false);
+    const peg$e12 = peg$literalExpectation("t", false);
+    const peg$e13 = peg$classExpectation(["g", "c", "f", "G", "C", "F"], false, false, false);
+    const peg$e14 = peg$literalExpectation("$", false);
+    const peg$e15 = peg$literalExpectation("|", false);
+    const peg$e16 = peg$classExpectation([["a", "g"], ["A", "G"]], false, false, false);
+    const peg$e17 = peg$classExpectation(["+", "=", "-"], false, false, false);
+    const peg$e18 = peg$classExpectation(["r", "R", "_"], false, false, false);
+    const peg$e19 = peg$literalExpectation("*", false);
+    const peg$e20 = peg$literalExpectation(".", false);
+    const peg$e21 = peg$literalExpectation("@", false);
+    const peg$e22 = peg$literalExpectation("ht", false);
+    const peg$e23 = peg$literalExpectation("dt", false);
+    const peg$e24 = peg$literalExpectation("tt", false);
+    const peg$e25 = peg$literalExpectation("m", false);
+    const peg$e26 = peg$literalExpectation("{", false);
+    const peg$e27 = peg$literalExpectation("}", false);
+    const peg$e28 = peg$classExpectation(["\t", "\r", "\n", " "], false, false, false);
+    const peg$e29 = peg$literalExpectation("\"", false);
+    const peg$e30 = peg$literalExpectation("'", false);
+    const peg$e31 = peg$classExpectation(["\"", "\\"], false, false, false);
+    const peg$e32 = peg$anyExpectation();
+    const peg$e33 = peg$literalExpectation("\\", false);
+    const peg$e34 = peg$classExpectation(["'", "\\"], false, false, false);
+    const peg$e35 = peg$literalExpectation("n", false);
+    function peg$f0(frontmatter, commands) {
+        return frontmatter.concat(commands);
+    }
+    function peg$f1(key, value) {
+        return ["frontmatter", key, value.trim()];
+    }
+    function peg$f2(head, rest) {
         return [head].concat(rest.map((m) => m[1]));
     }
-    function peg$f1(mod) {
-        return ["keySignature", +mod];
+    function peg$f3() {
+        return [];
     }
-    function peg$f2(upper, lower) {
+    function peg$f4(mod) {
+        let loc = location();
+        return ["keySignature", +mod, [loc.start.offset, loc.end.offset]];
+    }
+    function peg$f5(upper, lower) {
         return ["timeSignature", +upper, +lower];
     }
-    function peg$f3(track) {
+    function peg$f6(track) {
         return ["setTrack", +track];
     }
-    function peg$f4(clef) {
+    function peg$f7(clef) {
         return ["clef", clef.toLowerCase()];
     }
-    function peg$f5(name) {
+    function peg$f8(name) {
         return ["macro", name.join("")];
     }
-    function peg$f6() {
+    function peg$f9() {
         return ["restoreStartPosition"];
     }
-    function peg$f7(name, accidental, octave, t) { return t; }
-    function peg$f8(name, accidental, octave, timing) {
+    function peg$f10(name, accidental, octave, timing) {
+        let loc = location();
         let opts = {
-            ...timing
+            ...timing,
+            location: [loc.start.offset, loc.end.offset]
         };
         if (accidental == "+") {
             opts.sharp = true;
@@ -219,39 +256,65 @@ function peg$parse(input, options) {
         else if (accidental == "=") {
             opts.natural = true;
         }
-        let note = ["note", `${name.toUpperCase()}${octave}`];
-        if (timing || accidental) {
-            note.push(opts);
-        }
-        return note;
+        return ["note", `${name.toUpperCase()}${octave ?? ""}`, opts];
     }
-    function peg$f9(timing) {
+    function peg$f11(timing) {
         let rest = ["rest"];
         if (timing) {
             rest.push(timing);
         }
         return rest;
     }
-    function peg$f10(duration, s) { return s; }
-    function peg$f11(duration, start) {
+    function peg$f12(d) { return +d; }
+    function peg$f13(d) { return 1 / +d; }
+    function peg$f14(duration, dots, s) { return +s; }
+    function peg$f15(duration, dots, start) { return duration !== null || dots || start !== null; }
+    function peg$f16(duration, dots, start) {
         let timing = {};
-        if (duration) {
-            timing.duration = +duration;
-        }
-        if (start) {
-            timing.start = +start;
-        }
+        if (duration !== null)
+            timing.duration = duration;
+        if (dots)
+            timing.dots = dots.length;
+        if (start !== null)
+            timing.start = start;
         return timing;
     }
-    function peg$f12() { return ["halfTime"]; }
-    function peg$f13() { return ["doubleTime"]; }
-    function peg$f14() { return ["tripleTime"]; }
-    function peg$f15(measure) {
-        return ["measure", +measure];
+    function peg$f17(d) { return +d; }
+    function peg$f18(d) { return 1 / +d; }
+    function peg$f19(duration, dots, s) { return +s; }
+    function peg$f20(duration, dots, start) { return duration !== null || dots || start !== null; }
+    function peg$f21(duration, dots, start) {
+        let timing = {};
+        if (duration !== null)
+            timing.duration = duration;
+        if (dots)
+            timing.dots = dots.length;
+        if (start !== null)
+            timing.start = start;
+        return timing;
     }
-    function peg$f16(commands) {
+    function peg$f22(count) { return count ? ["halfTime", +count] : ["halfTime"]; }
+    function peg$f23(count) { return count ? ["doubleTime", +count] : ["doubleTime"]; }
+    function peg$f24(count) { return count ? ["tripleTime", +count] : ["tripleTime"]; }
+    function peg$f25(measure) { return ["measure", +measure]; }
+    function peg$f26() { return ["measure"]; }
+    function peg$f27(commands) {
         return ["block", commands];
     }
+    function peg$f28(chars) {
+        return ["string", chars.join("")];
+    }
+    function peg$f29(chars) {
+        return ["string", chars.join("")];
+    }
+    function peg$f30(char) { return char; }
+    function peg$f31(escape) { return escape; }
+    function peg$f32(char) { return char; }
+    function peg$f33(escape) { return escape; }
+    function peg$f34() { return '"'; }
+    function peg$f35() { return "'"; }
+    function peg$f36() { return "\\"; }
+    function peg$f37() { return "\n"; }
     let peg$currPos = options.peg$currPos | 0;
     let peg$savedPos = peg$currPos;
     const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -387,8 +450,208 @@ function peg$parse(input, options) {
         return new peg$SyntaxError(peg$SyntaxError.buildMessage(expected, found), expected, found, location);
     }
     function peg$parsestart() {
-        let s0;
-        s0 = peg$parsecommands();
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$parsefrontmatterLine();
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$parsefrontmatterLine();
+        }
+        s2 = peg$parsecommands();
+        if (s2 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s0 = peg$f0(s1, s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parsefrontmatterLine() {
+        let s0, s1, s2, s3, s4, s5, s6, s7, s8;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 35) {
+            s1 = peg$c0;
+            peg$currPos++;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e0);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = [];
+            s3 = input.charAt(peg$currPos);
+            if (peg$r0.test(s3)) {
+                peg$currPos++;
+            }
+            else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e1);
+                }
+            }
+            while (s3 !== peg$FAILED) {
+                s2.push(s3);
+                s3 = input.charAt(peg$currPos);
+                if (peg$r0.test(s3)) {
+                    peg$currPos++;
+                }
+                else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e1);
+                    }
+                }
+            }
+            s3 = peg$currPos;
+            s4 = peg$currPos;
+            s5 = input.charAt(peg$currPos);
+            if (peg$r1.test(s5)) {
+                peg$currPos++;
+            }
+            else {
+                s5 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e2);
+                }
+            }
+            if (s5 !== peg$FAILED) {
+                s6 = [];
+                s7 = input.charAt(peg$currPos);
+                if (peg$r2.test(s7)) {
+                    peg$currPos++;
+                }
+                else {
+                    s7 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e3);
+                    }
+                }
+                while (s7 !== peg$FAILED) {
+                    s6.push(s7);
+                    s7 = input.charAt(peg$currPos);
+                    if (peg$r2.test(s7)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s7 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e3);
+                        }
+                    }
+                }
+                s5 = [s5, s6];
+                s4 = s5;
+            }
+            else {
+                peg$currPos = s4;
+                s4 = peg$FAILED;
+            }
+            if (s4 !== peg$FAILED) {
+                s3 = input.substring(s3, peg$currPos);
+            }
+            else {
+                s3 = s4;
+            }
+            if (s3 !== peg$FAILED) {
+                s4 = [];
+                s5 = input.charAt(peg$currPos);
+                if (peg$r0.test(s5)) {
+                    peg$currPos++;
+                }
+                else {
+                    s5 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e1);
+                    }
+                }
+                while (s5 !== peg$FAILED) {
+                    s4.push(s5);
+                    s5 = input.charAt(peg$currPos);
+                    if (peg$r0.test(s5)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s5 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e1);
+                        }
+                    }
+                }
+                if (input.charCodeAt(peg$currPos) === 58) {
+                    s5 = peg$c1;
+                    peg$currPos++;
+                }
+                else {
+                    s5 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e4);
+                    }
+                }
+                if (s5 !== peg$FAILED) {
+                    s6 = peg$currPos;
+                    s7 = [];
+                    s8 = input.charAt(peg$currPos);
+                    if (peg$r3.test(s8)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s8 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e5);
+                        }
+                    }
+                    while (s8 !== peg$FAILED) {
+                        s7.push(s8);
+                        s8 = input.charAt(peg$currPos);
+                        if (peg$r3.test(s8)) {
+                            peg$currPos++;
+                        }
+                        else {
+                            s8 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e5);
+                            }
+                        }
+                    }
+                    s6 = input.substring(s6, peg$currPos);
+                    if (input.charCodeAt(peg$currPos) === 10) {
+                        s7 = peg$c2;
+                        peg$currPos++;
+                    }
+                    else {
+                        s7 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e6);
+                        }
+                    }
+                    if (s7 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s0 = peg$f1(s3, s6);
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
         return s0;
     }
     function peg$parsecommands() {
@@ -443,41 +706,54 @@ function peg$parse(input, options) {
                 s4 = null;
             }
             peg$savedPos = s0;
-            s0 = peg$f0(s2, s3);
+            s0 = peg$f2(s2, s3);
         }
         else {
             peg$currPos = s0;
             s0 = peg$FAILED;
         }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parsewhite();
+            if (s1 === peg$FAILED) {
+                s1 = null;
+            }
+            peg$savedPos = s0;
+            s1 = peg$f3();
+            s0 = s1;
+        }
         return s0;
     }
     function peg$parsecommand() {
         let s0;
-        s0 = peg$parsenote();
+        s0 = peg$parsekeySignature();
         if (s0 === peg$FAILED) {
-            s0 = peg$parserest();
+            s0 = peg$parsetimeSignature();
             if (s0 === peg$FAILED) {
-                s0 = peg$parsekeySignature();
+                s0 = peg$parsehalfTime();
                 if (s0 === peg$FAILED) {
-                    s0 = peg$parsetimeSignature();
+                    s0 = peg$parsedoubleTime();
                     if (s0 === peg$FAILED) {
-                        s0 = peg$parsehalfTime();
+                        s0 = peg$parsetripleTime();
                         if (s0 === peg$FAILED) {
-                            s0 = peg$parsedoubleTime();
+                            s0 = peg$parsemeasure();
                             if (s0 === peg$FAILED) {
-                                s0 = peg$parsetripleTime();
+                                s0 = peg$parseblock();
                                 if (s0 === peg$FAILED) {
-                                    s0 = peg$parsemeasure();
+                                    s0 = peg$parserestoreStartPosition();
                                     if (s0 === peg$FAILED) {
-                                        s0 = peg$parseblock();
+                                        s0 = peg$parsesetTrack();
                                         if (s0 === peg$FAILED) {
-                                            s0 = peg$parserestoreStartPosition();
+                                            s0 = peg$parsemacro();
                                             if (s0 === peg$FAILED) {
-                                                s0 = peg$parsesetTrack();
+                                                s0 = peg$parsesetClef();
                                                 if (s0 === peg$FAILED) {
-                                                    s0 = peg$parsemacro();
+                                                    s0 = peg$parsestring();
                                                     if (s0 === peg$FAILED) {
-                                                        s0 = peg$parsesetClef();
+                                                        s0 = peg$parsenote();
+                                                        if (s0 === peg$FAILED) {
+                                                            s0 = peg$parserest();
+                                                        }
                                                     }
                                                 }
                                             }
@@ -495,27 +771,27 @@ function peg$parse(input, options) {
     function peg$parsekeySignature() {
         let s0, s1, s2, s3, s4, s5, s6;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c0) {
-            s1 = peg$c0;
+        if (input.substr(peg$currPos, 2) === peg$c3) {
+            s1 = peg$c3;
             peg$currPos += 2;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e0);
+                peg$fail(peg$e7);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = peg$currPos;
             s3 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 45) {
-                s4 = peg$c1;
+                s4 = peg$c4;
                 peg$currPos++;
             }
             else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e1);
+                    peg$fail(peg$e8);
                 }
             }
             if (s4 === peg$FAILED) {
@@ -523,26 +799,26 @@ function peg$parse(input, options) {
             }
             s5 = [];
             s6 = input.charAt(peg$currPos);
-            if (peg$r0.test(s6)) {
+            if (peg$r4.test(s6)) {
                 peg$currPos++;
             }
             else {
                 s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e2);
+                    peg$fail(peg$e9);
                 }
             }
             if (s6 !== peg$FAILED) {
                 while (s6 !== peg$FAILED) {
                     s5.push(s6);
                     s6 = input.charAt(peg$currPos);
-                    if (peg$r0.test(s6)) {
+                    if (peg$r4.test(s6)) {
                         peg$currPos++;
                     }
                     else {
                         s6 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e2);
+                            peg$fail(peg$e9);
                         }
                     }
                 }
@@ -566,7 +842,7 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f1(s2);
+                s0 = peg$f4(s2);
             }
             else {
                 peg$currPos = s0;
@@ -582,40 +858,40 @@ function peg$parse(input, options) {
     function peg$parsetimeSignature() {
         let s0, s1, s2, s3, s4, s5, s6;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c2) {
-            s1 = peg$c2;
+        if (input.substr(peg$currPos, 2) === peg$c5) {
+            s1 = peg$c5;
             peg$currPos += 2;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e3);
+                peg$fail(peg$e10);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = peg$currPos;
             s3 = [];
             s4 = input.charAt(peg$currPos);
-            if (peg$r0.test(s4)) {
+            if (peg$r4.test(s4)) {
                 peg$currPos++;
             }
             else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e2);
+                    peg$fail(peg$e9);
                 }
             }
             if (s4 !== peg$FAILED) {
                 while (s4 !== peg$FAILED) {
                     s3.push(s4);
                     s4 = input.charAt(peg$currPos);
-                    if (peg$r0.test(s4)) {
+                    if (peg$r4.test(s4)) {
                         peg$currPos++;
                     }
                     else {
                         s4 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e2);
+                            peg$fail(peg$e9);
                         }
                     }
                 }
@@ -631,39 +907,39 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 47) {
-                    s3 = peg$c3;
+                    s3 = peg$c6;
                     peg$currPos++;
                 }
                 else {
                     s3 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e4);
+                        peg$fail(peg$e11);
                     }
                 }
                 if (s3 !== peg$FAILED) {
                     s4 = peg$currPos;
                     s5 = [];
                     s6 = input.charAt(peg$currPos);
-                    if (peg$r0.test(s6)) {
+                    if (peg$r4.test(s6)) {
                         peg$currPos++;
                     }
                     else {
                         s6 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e2);
+                            peg$fail(peg$e9);
                         }
                     }
                     if (s6 !== peg$FAILED) {
                         while (s6 !== peg$FAILED) {
                             s5.push(s6);
                             s6 = input.charAt(peg$currPos);
-                            if (peg$r0.test(s6)) {
+                            if (peg$r4.test(s6)) {
                                 peg$currPos++;
                             }
                             else {
                                 s6 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e2);
+                                    peg$fail(peg$e9);
                                 }
                             }
                         }
@@ -679,7 +955,7 @@ function peg$parse(input, options) {
                     }
                     if (s4 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f2(s2, s4);
+                        s0 = peg$f5(s2, s4);
                     }
                     else {
                         peg$currPos = s0;
@@ -706,39 +982,39 @@ function peg$parse(input, options) {
         let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 116) {
-            s1 = peg$c4;
+            s1 = peg$c7;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e5);
+                peg$fail(peg$e12);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = peg$currPos;
             s3 = [];
             s4 = input.charAt(peg$currPos);
-            if (peg$r0.test(s4)) {
+            if (peg$r4.test(s4)) {
                 peg$currPos++;
             }
             else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e2);
+                    peg$fail(peg$e9);
                 }
             }
             if (s4 !== peg$FAILED) {
                 while (s4 !== peg$FAILED) {
                     s3.push(s4);
                     s4 = input.charAt(peg$currPos);
-                    if (peg$r0.test(s4)) {
+                    if (peg$r4.test(s4)) {
                         peg$currPos++;
                     }
                     else {
                         s4 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e2);
+                            peg$fail(peg$e9);
                         }
                     }
                 }
@@ -754,7 +1030,7 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f3(s2);
+                s0 = peg$f6(s2);
             }
             else {
                 peg$currPos = s0;
@@ -771,29 +1047,29 @@ function peg$parse(input, options) {
         let s0, s1, s2;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 47) {
-            s1 = peg$c3;
+            s1 = peg$c6;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e4);
+                peg$fail(peg$e11);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = input.charAt(peg$currPos);
-            if (peg$r1.test(s2)) {
+            if (peg$r5.test(s2)) {
                 peg$currPos++;
             }
             else {
                 s2 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e6);
+                    peg$fail(peg$e13);
                 }
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f4(s2);
+                s0 = peg$f7(s2);
             }
             else {
                 peg$currPos = s0;
@@ -810,13 +1086,13 @@ function peg$parse(input, options) {
         let s0, s1, s2, s3;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 36) {
-            s1 = peg$c5;
+            s1 = peg$c8;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
+                peg$fail(peg$e14);
             }
         }
         if (s1 !== peg$FAILED) {
@@ -828,7 +1104,7 @@ function peg$parse(input, options) {
             else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e8);
+                    peg$fail(peg$e3);
                 }
             }
             if (s3 !== peg$FAILED) {
@@ -841,7 +1117,7 @@ function peg$parse(input, options) {
                     else {
                         s3 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e8);
+                            peg$fail(peg$e3);
                         }
                     }
                 }
@@ -851,7 +1127,7 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f5(s2);
+                s0 = peg$f8(s2);
             }
             else {
                 peg$currPos = s0;
@@ -868,96 +1144,68 @@ function peg$parse(input, options) {
         let s0, s1;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 124) {
-            s1 = peg$c6;
+            s1 = peg$c9;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e9);
+                peg$fail(peg$e15);
             }
         }
         if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f6();
+            s1 = peg$f9();
         }
         s0 = s1;
         return s0;
     }
     function peg$parsenote() {
-        let s0, s1, s2, s3, s4, s5, s6;
+        let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
         s1 = input.charAt(peg$currPos);
-        if (peg$r3.test(s1)) {
+        if (peg$r6.test(s1)) {
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e10);
+                peg$fail(peg$e16);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = input.charAt(peg$currPos);
-            if (peg$r4.test(s2)) {
+            if (peg$r7.test(s2)) {
                 peg$currPos++;
             }
             else {
                 s2 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e11);
+                    peg$fail(peg$e17);
                 }
             }
             if (s2 === peg$FAILED) {
                 s2 = null;
             }
             s3 = input.charAt(peg$currPos);
-            if (peg$r0.test(s3)) {
+            if (peg$r4.test(s3)) {
                 peg$currPos++;
             }
             else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e2);
+                    peg$fail(peg$e9);
                 }
             }
-            if (s3 !== peg$FAILED) {
-                s4 = peg$currPos;
-                if (input.charCodeAt(peg$currPos) === 46) {
-                    s5 = peg$c7;
-                    peg$currPos++;
-                }
-                else {
-                    s5 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                        peg$fail(peg$e12);
-                    }
-                }
-                if (s5 !== peg$FAILED) {
-                    s6 = peg$parsenoteTiming();
-                    if (s6 !== peg$FAILED) {
-                        peg$savedPos = s4;
-                        s4 = peg$f7(s1, s2, s3, s6);
-                    }
-                    else {
-                        peg$currPos = s4;
-                        s4 = peg$FAILED;
-                    }
-                }
-                else {
-                    peg$currPos = s4;
-                    s4 = peg$FAILED;
-                }
-                if (s4 === peg$FAILED) {
-                    s4 = null;
-                }
-                peg$savedPos = s0;
-                s0 = peg$f8(s1, s2, s3, s4);
+            if (s3 === peg$FAILED) {
+                s3 = null;
             }
-            else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
+            s4 = peg$parsenoteTiming();
+            if (s4 === peg$FAILED) {
+                s4 = null;
             }
+            peg$savedPos = s0;
+            s0 = peg$f10(s1, s2, s3, s4);
         }
         else {
             peg$currPos = s0;
@@ -969,22 +1217,22 @@ function peg$parse(input, options) {
         let s0, s1, s2;
         s0 = peg$currPos;
         s1 = input.charAt(peg$currPos);
-        if (peg$r5.test(s1)) {
+        if (peg$r8.test(s1)) {
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e13);
+                peg$fail(peg$e18);
             }
         }
         if (s1 !== peg$FAILED) {
-            s2 = peg$parsenoteTiming();
+            s2 = peg$parserestTiming();
             if (s2 === peg$FAILED) {
                 s2 = null;
             }
             peg$savedPos = s0;
-            s0 = peg$f9(s2);
+            s0 = peg$f11(s2);
         }
         else {
             peg$currPos = s0;
@@ -993,111 +1241,529 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parsenoteTiming() {
-        let s0, s1, s2, s3, s4, s5, s6;
+        let s0, s1, s2, s3, s4, s5, s6, s7;
         s0 = peg$currPos;
         s1 = peg$currPos;
-        s2 = [];
-        s3 = input.charAt(peg$currPos);
-        if (peg$r0.test(s3)) {
+        if (input.charCodeAt(peg$currPos) === 42) {
+            s2 = peg$c10;
             peg$currPos++;
         }
         else {
-            s3 = peg$FAILED;
+            s2 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e2);
-            }
-        }
-        if (s3 !== peg$FAILED) {
-            while (s3 !== peg$FAILED) {
-                s2.push(s3);
-                s3 = input.charAt(peg$currPos);
-                if (peg$r0.test(s3)) {
-                    peg$currPos++;
-                }
-                else {
-                    s3 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                        peg$fail(peg$e2);
-                    }
-                }
+                peg$fail(peg$e19);
             }
         }
-        else {
-            s2 = peg$FAILED;
-        }
         if (s2 !== peg$FAILED) {
-            s1 = input.substring(s1, peg$currPos);
-        }
-        else {
-            s1 = s2;
-        }
-        if (s1 !== peg$FAILED) {
-            s2 = peg$currPos;
-            if (input.charCodeAt(peg$currPos) === 46) {
-                s3 = peg$c7;
+            s3 = peg$currPos;
+            s4 = peg$currPos;
+            s5 = [];
+            s6 = input.charAt(peg$currPos);
+            if (peg$r4.test(s6)) {
                 peg$currPos++;
             }
             else {
-                s3 = peg$FAILED;
+                s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e12);
+                    peg$fail(peg$e9);
                 }
             }
+            while (s6 !== peg$FAILED) {
+                s5.push(s6);
+                if (s5.length >= 3) {
+                    s6 = peg$FAILED;
+                }
+                else {
+                    s6 = input.charAt(peg$currPos);
+                    if (peg$r4.test(s6)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s6 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e9);
+                        }
+                    }
+                }
+            }
+            if (s5.length < 1) {
+                peg$currPos = s4;
+                s4 = peg$FAILED;
+            }
+            else {
+                s4 = s5;
+            }
+            if (s4 !== peg$FAILED) {
+                s3 = input.substring(s3, peg$currPos);
+            }
+            else {
+                s3 = s4;
+            }
             if (s3 !== peg$FAILED) {
+                peg$savedPos = s1;
+                s1 = peg$f12(s3);
+            }
+            else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+        }
+        if (s1 === peg$FAILED) {
+            s1 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 47) {
+                s2 = peg$c6;
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e11);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$currPos;
                 s4 = peg$currPos;
                 s5 = [];
                 s6 = input.charAt(peg$currPos);
-                if (peg$r0.test(s6)) {
+                if (peg$r4.test(s6)) {
                     peg$currPos++;
                 }
                 else {
                     s6 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e2);
+                        peg$fail(peg$e9);
                     }
                 }
-                if (s6 !== peg$FAILED) {
-                    while (s6 !== peg$FAILED) {
-                        s5.push(s6);
+                while (s6 !== peg$FAILED) {
+                    s5.push(s6);
+                    if (s5.length >= 3) {
+                        s6 = peg$FAILED;
+                    }
+                    else {
                         s6 = input.charAt(peg$currPos);
-                        if (peg$r0.test(s6)) {
+                        if (peg$r4.test(s6)) {
                             peg$currPos++;
                         }
                         else {
                             s6 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e2);
+                                peg$fail(peg$e9);
                             }
                         }
                     }
                 }
+                if (s5.length < 1) {
+                    peg$currPos = s4;
+                    s4 = peg$FAILED;
+                }
                 else {
-                    s5 = peg$FAILED;
+                    s4 = s5;
                 }
-                if (s5 !== peg$FAILED) {
-                    s4 = input.substring(s4, peg$currPos);
+                if (s4 !== peg$FAILED) {
+                    s3 = input.substring(s3, peg$currPos);
+                }
+                else {
+                    s3 = s4;
+                }
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s1;
+                    s1 = peg$f13(s3);
+                }
+                else {
+                    peg$currPos = s1;
+                    s1 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+            }
+        }
+        if (s1 === peg$FAILED) {
+            s1 = null;
+        }
+        s2 = peg$currPos;
+        s3 = [];
+        if (input.charCodeAt(peg$currPos) === 46) {
+            s4 = peg$c11;
+            peg$currPos++;
+        }
+        else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e20);
+            }
+        }
+        if (s4 !== peg$FAILED) {
+            while (s4 !== peg$FAILED) {
+                s3.push(s4);
+                if (input.charCodeAt(peg$currPos) === 46) {
+                    s4 = peg$c11;
+                    peg$currPos++;
+                }
+                else {
+                    s4 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e20);
+                    }
+                }
+            }
+        }
+        else {
+            s3 = peg$FAILED;
+        }
+        if (s3 !== peg$FAILED) {
+            s2 = input.substring(s2, peg$currPos);
+        }
+        else {
+            s2 = s3;
+        }
+        if (s2 === peg$FAILED) {
+            s2 = null;
+        }
+        s3 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 64) {
+            s4 = peg$c12;
+            peg$currPos++;
+        }
+        else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e21);
+            }
+        }
+        if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            s6 = [];
+            s7 = input.charAt(peg$currPos);
+            if (peg$r4.test(s7)) {
+                peg$currPos++;
+            }
+            else {
+                s7 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                }
+            }
+            if (s7 !== peg$FAILED) {
+                while (s7 !== peg$FAILED) {
+                    s6.push(s7);
+                    s7 = input.charAt(peg$currPos);
+                    if (peg$r4.test(s7)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s7 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e9);
+                        }
+                    }
+                }
+            }
+            else {
+                s6 = peg$FAILED;
+            }
+            if (s6 !== peg$FAILED) {
+                s5 = input.substring(s5, peg$currPos);
+            }
+            else {
+                s5 = s6;
+            }
+            if (s5 !== peg$FAILED) {
+                peg$savedPos = s3;
+                s3 = peg$f14(s1, s2, s5);
+            }
+            else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+        }
+        if (s3 === peg$FAILED) {
+            s3 = null;
+        }
+        peg$savedPos = peg$currPos;
+        s4 = peg$f15(s1, s2, s3);
+        if (s4) {
+            s4 = undefined;
+        }
+        else {
+            s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s0 = peg$f16(s1, s2, s3);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parserestTiming() {
+        let s0, s1, s2, s3, s4, s5, s6, s7;
+        s0 = peg$currPos;
+        s1 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 42) {
+            s2 = peg$c10;
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e19);
+            }
+        }
+        if (s2 === peg$FAILED) {
+            s2 = null;
+        }
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        s5 = [];
+        s6 = input.charAt(peg$currPos);
+        if (peg$r4.test(s6)) {
+            peg$currPos++;
+        }
+        else {
+            s6 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e9);
+            }
+        }
+        while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            if (s5.length >= 3) {
+                s6 = peg$FAILED;
+            }
+            else {
+                s6 = input.charAt(peg$currPos);
+                if (peg$r4.test(s6)) {
+                    peg$currPos++;
+                }
+                else {
+                    s6 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e9);
+                    }
+                }
+            }
+        }
+        if (s5.length < 1) {
+            peg$currPos = s4;
+            s4 = peg$FAILED;
+        }
+        else {
+            s4 = s5;
+        }
+        if (s4 !== peg$FAILED) {
+            s3 = input.substring(s3, peg$currPos);
+        }
+        else {
+            s3 = s4;
+        }
+        if (s3 !== peg$FAILED) {
+            peg$savedPos = s1;
+            s1 = peg$f17(s3);
+        }
+        else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+        }
+        if (s1 === peg$FAILED) {
+            s1 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 47) {
+                s2 = peg$c6;
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e11);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$currPos;
+                s4 = peg$currPos;
+                s5 = [];
+                s6 = input.charAt(peg$currPos);
+                if (peg$r4.test(s6)) {
+                    peg$currPos++;
+                }
+                else {
+                    s6 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e9);
+                    }
+                }
+                while (s6 !== peg$FAILED) {
+                    s5.push(s6);
+                    if (s5.length >= 3) {
+                        s6 = peg$FAILED;
+                    }
+                    else {
+                        s6 = input.charAt(peg$currPos);
+                        if (peg$r4.test(s6)) {
+                            peg$currPos++;
+                        }
+                        else {
+                            s6 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e9);
+                            }
+                        }
+                    }
+                }
+                if (s5.length < 1) {
+                    peg$currPos = s4;
+                    s4 = peg$FAILED;
                 }
                 else {
                     s4 = s5;
                 }
                 if (s4 !== peg$FAILED) {
-                    peg$savedPos = s2;
-                    s2 = peg$f10(s1, s4);
+                    s3 = input.substring(s3, peg$currPos);
                 }
                 else {
-                    peg$currPos = s2;
-                    s2 = peg$FAILED;
+                    s3 = s4;
+                }
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s1;
+                    s1 = peg$f18(s3);
+                }
+                else {
+                    peg$currPos = s1;
+                    s1 = peg$FAILED;
                 }
             }
             else {
-                peg$currPos = s2;
-                s2 = peg$FAILED;
+                peg$currPos = s1;
+                s1 = peg$FAILED;
             }
-            if (s2 === peg$FAILED) {
-                s2 = null;
+        }
+        if (s1 === peg$FAILED) {
+            s1 = null;
+        }
+        s2 = peg$currPos;
+        s3 = [];
+        if (input.charCodeAt(peg$currPos) === 46) {
+            s4 = peg$c11;
+            peg$currPos++;
+        }
+        else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e20);
+            }
+        }
+        if (s4 !== peg$FAILED) {
+            while (s4 !== peg$FAILED) {
+                s3.push(s4);
+                if (input.charCodeAt(peg$currPos) === 46) {
+                    s4 = peg$c11;
+                    peg$currPos++;
+                }
+                else {
+                    s4 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e20);
+                    }
+                }
+            }
+        }
+        else {
+            s3 = peg$FAILED;
+        }
+        if (s3 !== peg$FAILED) {
+            s2 = input.substring(s2, peg$currPos);
+        }
+        else {
+            s2 = s3;
+        }
+        if (s2 === peg$FAILED) {
+            s2 = null;
+        }
+        s3 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 64) {
+            s4 = peg$c12;
+            peg$currPos++;
+        }
+        else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e21);
+            }
+        }
+        if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            s6 = [];
+            s7 = input.charAt(peg$currPos);
+            if (peg$r4.test(s7)) {
+                peg$currPos++;
+            }
+            else {
+                s7 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                }
+            }
+            if (s7 !== peg$FAILED) {
+                while (s7 !== peg$FAILED) {
+                    s6.push(s7);
+                    s7 = input.charAt(peg$currPos);
+                    if (peg$r4.test(s7)) {
+                        peg$currPos++;
+                    }
+                    else {
+                        s7 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e9);
+                        }
+                    }
+                }
+            }
+            else {
+                s6 = peg$FAILED;
+            }
+            if (s6 !== peg$FAILED) {
+                s5 = input.substring(s5, peg$currPos);
+            }
+            else {
+                s5 = s6;
             }
+            if (s5 !== peg$FAILED) {
+                peg$savedPos = s3;
+                s3 = peg$f19(s1, s2, s5);
+            }
+            else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+        }
+        if (s3 === peg$FAILED) {
+            s3 = null;
+        }
+        peg$savedPos = peg$currPos;
+        s4 = peg$f20(s1, s2, s3);
+        if (s4) {
+            s4 = undefined;
+        }
+        else {
+            s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f11(s1, s2);
+            s0 = peg$f21(s1, s2, s3);
         }
         else {
             peg$currPos = s0;
@@ -1106,102 +1772,189 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parsehalfTime() {
-        let s0, s1;
+        let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c8) {
-            s1 = peg$c8;
+        if (input.substr(peg$currPos, 2) === peg$c13) {
+            s1 = peg$c13;
             peg$currPos += 2;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e14);
+                peg$fail(peg$e22);
             }
         }
         if (s1 !== peg$FAILED) {
+            s2 = peg$currPos;
+            s3 = [];
+            s4 = input.charAt(peg$currPos);
+            if (peg$r4.test(s4)) {
+                peg$currPos++;
+            }
+            else {
+                s4 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                }
+            }
+            while (s4 !== peg$FAILED) {
+                s3.push(s4);
+                s4 = input.charAt(peg$currPos);
+                if (peg$r4.test(s4)) {
+                    peg$currPos++;
+                }
+                else {
+                    s4 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e9);
+                    }
+                }
+            }
+            s2 = input.substring(s2, peg$currPos);
             peg$savedPos = s0;
-            s1 = peg$f12();
+            s0 = peg$f22(s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
         }
-        s0 = s1;
         return s0;
     }
     function peg$parsedoubleTime() {
-        let s0, s1;
+        let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-            s1 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c14) {
+            s1 = peg$c14;
             peg$currPos += 2;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+                peg$fail(peg$e23);
             }
         }
         if (s1 !== peg$FAILED) {
+            s2 = peg$currPos;
+            s3 = [];
+            s4 = input.charAt(peg$currPos);
+            if (peg$r4.test(s4)) {
+                peg$currPos++;
+            }
+            else {
+                s4 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                }
+            }
+            while (s4 !== peg$FAILED) {
+                s3.push(s4);
+                s4 = input.charAt(peg$currPos);
+                if (peg$r4.test(s4)) {
+                    peg$currPos++;
+                }
+                else {
+                    s4 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e9);
+                    }
+                }
+            }
+            s2 = input.substring(s2, peg$currPos);
             peg$savedPos = s0;
-            s1 = peg$f13();
+            s0 = peg$f23(s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
         }
-        s0 = s1;
         return s0;
     }
     function peg$parsetripleTime() {
-        let s0, s1;
+        let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-            s1 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c15) {
+            s1 = peg$c15;
             peg$currPos += 2;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e24);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$currPos;
+            s3 = [];
+            s4 = input.charAt(peg$currPos);
+            if (peg$r4.test(s4)) {
+                peg$currPos++;
+            }
+            else {
+                s4 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                }
+            }
+            while (s4 !== peg$FAILED) {
+                s3.push(s4);
+                s4 = input.charAt(peg$currPos);
+                if (peg$r4.test(s4)) {
+                    peg$currPos++;
+                }
+                else {
+                    s4 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e9);
+                    }
+                }
             }
-        }
-        if (s1 !== peg$FAILED) {
+            s2 = input.substring(s2, peg$currPos);
             peg$savedPos = s0;
-            s1 = peg$f14();
+            s0 = peg$f24(s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
         }
-        s0 = s1;
         return s0;
     }
     function peg$parsemeasure() {
         let s0, s1, s2, s3, s4;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 109) {
-            s1 = peg$c11;
+            s1 = peg$c16;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e17);
+                peg$fail(peg$e25);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = peg$currPos;
             s3 = [];
             s4 = input.charAt(peg$currPos);
-            if (peg$r0.test(s4)) {
+            if (peg$r4.test(s4)) {
                 peg$currPos++;
             }
             else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e2);
+                    peg$fail(peg$e9);
                 }
             }
             if (s4 !== peg$FAILED) {
                 while (s4 !== peg$FAILED) {
                     s3.push(s4);
                     s4 = input.charAt(peg$currPos);
-                    if (peg$r0.test(s4)) {
+                    if (peg$r4.test(s4)) {
                         peg$currPos++;
                     }
                     else {
                         s4 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e2);
+                            peg$fail(peg$e9);
                         }
                     }
                 }
@@ -1217,7 +1970,7 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f15(s2);
+                s0 = peg$f25(s2);
             }
             else {
                 peg$currPos = s0;
@@ -1228,37 +1981,55 @@ function peg$parse(input, options) {
             peg$currPos = s0;
             s0 = peg$FAILED;
         }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 109) {
+                s1 = peg$c16;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e25);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f26();
+            }
+            s0 = s1;
+        }
         return s0;
     }
     function peg$parseblock() {
         let s0, s1, s2, s3;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 123) {
-            s1 = peg$c12;
+            s1 = peg$c17;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e18);
+                peg$fail(peg$e26);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = peg$parsecommands();
             if (s2 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 125) {
-                    s3 = peg$c13;
+                    s3 = peg$c18;
                     peg$currPos++;
                 }
                 else {
                     s3 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e19);
+                        peg$fail(peg$e27);
                     }
                 }
                 if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f16(s2);
+                    s0 = peg$f27(s2);
                 }
                 else {
                     peg$currPos = s0;
@@ -1280,38 +2051,38 @@ function peg$parse(input, options) {
         let s0, s1, s2, s3;
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 35) {
-            s1 = peg$c14;
+            s1 = peg$c0;
             peg$currPos++;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e20);
+                peg$fail(peg$e0);
             }
         }
         if (s1 !== peg$FAILED) {
             s2 = [];
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r3.test(s3)) {
                 peg$currPos++;
             }
             else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e21);
+                    peg$fail(peg$e5);
                 }
             }
             if (s3 !== peg$FAILED) {
                 while (s3 !== peg$FAILED) {
                     s2.push(s3);
                     s3 = input.charAt(peg$currPos);
-                    if (peg$r6.test(s3)) {
+                    if (peg$r3.test(s3)) {
                         peg$currPos++;
                     }
                     else {
                         s3 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e21);
+                            peg$fail(peg$e5);
                         }
                     }
                 }
@@ -1339,26 +2110,26 @@ function peg$parse(input, options) {
         s0 = [];
         s1 = [];
         s2 = input.charAt(peg$currPos);
-        if (peg$r7.test(s2)) {
+        if (peg$r9.test(s2)) {
             peg$currPos++;
         }
         else {
             s2 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e22);
+                peg$fail(peg$e28);
             }
         }
         if (s2 !== peg$FAILED) {
             while (s2 !== peg$FAILED) {
                 s1.push(s2);
                 s2 = input.charAt(peg$currPos);
-                if (peg$r7.test(s2)) {
+                if (peg$r9.test(s2)) {
                     peg$currPos++;
                 }
                 else {
                     s2 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e22);
+                        peg$fail(peg$e28);
                     }
                 }
             }
@@ -1374,26 +2145,26 @@ function peg$parse(input, options) {
                 s0.push(s1);
                 s1 = [];
                 s2 = input.charAt(peg$currPos);
-                if (peg$r7.test(s2)) {
+                if (peg$r9.test(s2)) {
                     peg$currPos++;
                 }
                 else {
                     s2 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e22);
+                        peg$fail(peg$e28);
                     }
                 }
                 if (s2 !== peg$FAILED) {
                     while (s2 !== peg$FAILED) {
                         s1.push(s2);
                         s2 = input.charAt(peg$currPos);
-                        if (peg$r7.test(s2)) {
+                        if (peg$r9.test(s2)) {
                             peg$currPos++;
                         }
                         else {
                             s2 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e22);
+                                peg$fail(peg$e28);
                             }
                         }
                     }
@@ -1411,6 +2182,322 @@ function peg$parse(input, options) {
         }
         return s0;
     }
+    function peg$parsestring() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 34) {
+            s1 = peg$c19;
+            peg$currPos++;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e29);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = [];
+            s3 = peg$parsedoubleStringChar();
+            while (s3 !== peg$FAILED) {
+                s2.push(s3);
+                s3 = peg$parsedoubleStringChar();
+            }
+            if (input.charCodeAt(peg$currPos) === 34) {
+                s3 = peg$c19;
+                peg$currPos++;
+            }
+            else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e29);
+                }
+            }
+            if (s3 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f28(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 39) {
+                s1 = peg$c20;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e30);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = [];
+                s3 = peg$parsesingleStringChar();
+                while (s3 !== peg$FAILED) {
+                    s2.push(s3);
+                    s3 = peg$parsesingleStringChar();
+                }
+                if (input.charCodeAt(peg$currPos) === 39) {
+                    s3 = peg$c20;
+                    peg$currPos++;
+                }
+                else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e30);
+                    }
+                }
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f29(s2);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        return s0;
+    }
+    function peg$parsedoubleStringChar() {
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = peg$currPos;
+        peg$silentFails++;
+        s2 = input.charAt(peg$currPos);
+        if (peg$r10.test(s2)) {
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e31);
+            }
+        }
+        peg$silentFails--;
+        if (s2 === peg$FAILED) {
+            s1 = undefined;
+        }
+        else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+        }
+        if (s1 !== peg$FAILED) {
+            if (input.length > peg$currPos) {
+                s2 = input.charAt(peg$currPos);
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e32);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f30(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 92) {
+                s1 = peg$c21;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e33);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseescapeChar();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f31(s2);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        return s0;
+    }
+    function peg$parsesingleStringChar() {
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = peg$currPos;
+        peg$silentFails++;
+        s2 = input.charAt(peg$currPos);
+        if (peg$r11.test(s2)) {
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e34);
+            }
+        }
+        peg$silentFails--;
+        if (s2 === peg$FAILED) {
+            s1 = undefined;
+        }
+        else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+        }
+        if (s1 !== peg$FAILED) {
+            if (input.length > peg$currPos) {
+                s2 = input.charAt(peg$currPos);
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e32);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f32(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 92) {
+                s1 = peg$c21;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e33);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseescapeChar();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f33(s2);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        return s0;
+    }
+    function peg$parseescapeChar() {
+        let s0, s1;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 34) {
+            s1 = peg$c19;
+            peg$currPos++;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e29);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f34();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 39) {
+                s1 = peg$c20;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e30);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f35();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 92) {
+                    s1 = peg$c21;
+                    peg$currPos++;
+                }
+                else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e33);
+                    }
+                }
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$f36();
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    if (input.charCodeAt(peg$currPos) === 110) {
+                        s1 = peg$c22;
+                        peg$currPos++;
+                    }
+                    else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e35);
+                        }
+                    }
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$f37();
+                    }
+                    s0 = s1;
+                }
+            }
+        }
+        return s0;
+    }
     peg$result = peg$startRuleFunction();
     const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
     function peg$throw() {
@@ -1440,7 +2527,8 @@ function peg$parse(input, options) {
     }
 }
 const peg$allowedStartRules = [
-    "start"
+    "start",
+    "note"
 ];
 export { peg$allowedStartRules as StartRules, peg$SyntaxError as SyntaxError, peg$parse as parse };
 //# sourceMappingURL=grammar.js.map