github-linguist 5.3.3 → 6.0.0

data/grammars/source.lean.json

@@ -1,9 +1,6 @@
 {
-  "fileTypes": [
-    "lean",
-    "hlean"
-  ],
   "name": "Lean",
+  "scopeName": "source.lean",
   "patterns": [
     {
       "include": "#dashComment"
@@ -12,20 +9,19 @@
       "include": "#blockComment"
     },
     {
+      "name": "meta.import.lean",
       "begin": "^\\s*(import)\\b",
+      "end": "$",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.lean"
         }
-      },
-      "end": "$",
-      "name": "meta.import.lean",
-      "patterns": [
-
-      ]
+      }
     },
     {
+      "name": "meta.names.lean",
       "begin": "\\b(inductive|structure|record|theorem|proposition|axiom|axioms|lemma|hypothesis|definition|def|instance|class|constant)\\b[ \\t\\n\\r({\\[]+([^ \\t\\n\\r{(\\[]*)",
+      "end": "[ \\t\\n\\r{(\\[]",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.lean"
@@ -33,117 +29,109 @@
         "2": {
           "name": "variable.language.lean"
         }
-      },
-      "end": "[ \\t\\n\\r{(\\[]",
-      "name": "meta.names.lean",
-      "pattern": [
-
-      ]
+      }
     },
     {
+      "name": "string.quoted.double.lean",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.lean",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.lean"
+          "name": "constant.character.escape.lean",
+          "match": "\\\\."
         }
       ]
     },
     {
-      "match": "\\b(Prop|Type[\\'₊₀-₉]?)",
-      "name": "storage.type.lean"
+      "name": "storage.type.lean",
+      "match": "\\b(Prop|Type[\\'₊₀-₉]?)"
     },
     {
-      "match": "@\\[[^\\]]*\\]",
-      "name": "storage.modifier.lean"
+      "name": "storage.modifier.lean",
+      "match": "@\\[[^\\]]*\\]"
     },
     {
-      "match": "attribute\\s*\\[[^\\]]*\\]",
-      "name": "storage.modifier.lean"
+      "name": "storage.modifier.lean",
+      "match": "attribute\\s*\\[[^\\]]*\\]"
     },
     {
-      "match": "\\b(import|prelude|theory|protected|private|noncomputable|mutual|meta|definition|def|instance|renaming|hiding|exposing|parameter|parameters|begin|conjecture|constant|constants|hypothesis|lemma|corollary|variable|variables|premise|premises|print|theorem|example|abbreviation|context|open|as|export|axiom|inductive|with|structure|record|universe|universes|alias|help|override|precedence|reserve|postfix|prefix|infix|infixl|infixr|notation|vm_eval|eval|check|exit|end|using|namespace|section|local|set_option|extends|include|omit|class|classes|instances|metaclasses|raw|run_command)\\b",
-      "name": "keyword.other.lean"
+      "name": "keyword.other.lean",
+      "match": "\\b(import|prelude|theory|protected|private|noncomputable|mutual|meta|definition|def|instance|renaming|hiding|exposing|parameter|parameters|begin|conjecture|constant|constants|hypothesis|lemma|corollary|variable|variables|premise|premises|print|theorem|example|abbreviation|context|open|as|export|axiom|inductive|with|structure|record|universe|universes|alias|help|override|precedence|reserve|postfix|prefix|infix|infixl|infixr|notation|vm_eval|eval|check|exit|end|using|namespace|section|local|set_option|extends|include|omit|class|classes|instances|metaclasses|raw|run_command)\\b"
     },
     {
-      "match": "\\b(calc|have|assert|suppose|this|match|obtains|do|suffices|show|by|in|at|let|forall|fun|exists|if|then|else|assume|take|obtain|from)\\b",
-      "name": "keyword.other.lean"
+      "name": "keyword.other.lean",
+      "match": "\\b(calc|have|assert|suppose|this|match|obtains|do|suffices|show|by|in|at|let|forall|fun|exists|if|then|else|assume|take|obtain|from)\\b"
     },
     {
-      "match": "(->|==|:=|<->|\\\\/|/\\\\|<=|>=|⁻¹)",
-      "name": "constant.language.lua"
+      "name": "constant.language.lua",
+      "match": "(-\u003e|==|:=|\u003c-\u003e|\\\\/|/\\\\|\u003c=|\u003e=|⁻¹)"
     },
     {
-      "match": "[#@∼↔/=∧∨≠<>≤≥¬⬝▸+*-]",
-      "name": "constant.language.lua"
+      "name": "constant.language.lua",
+      "match": "[#@∼↔/=∧∨≠\u003c\u003e≤≥¬⬝▸+*-]"
     },
     {
-      "match": "(?<=\\s)[=→λ∀?]",
-      "name": "keyword.operator.lean"
+      "name": "keyword.operator.lean",
+      "match": "(?\u003c=\\s)[=→λ∀?]"
     },
     {
+      "name": "string.quoted.double.lean",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.lean",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\\u0026])"
+        },
+        {
+          "name": "constant.character.escape.octal.lean",
+          "match": "\\\\o[0-7]+|\\\\x[0-9A-Fa-f]+|\\\\[0-9]+"
+        },
+        {
+          "name": "constant.character.escape.control.lean",
+          "match": "\\^[A-Z@\\[\\]\\\\\\^_]"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.lean"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.lean"
         }
-      },
-      "name": "string.quoted.double.lean",
-      "patterns": [
-        {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])",
-          "name": "constant.character.escape.lean"
-        },
-        {
-          "match": "\\\\o[0-7]+|\\\\x[0-9A-Fa-f]+|\\\\[0-9]+",
-          "name": "constant.character.escape.octal.lean"
-        },
-        {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
-          "name": "constant.character.escape.control.lean"
-        }
-      ]
+      }
     },
     {
-      "match": "\\b([0-9]+|0([xX][0-9a-fA-F]+))\\b",
-      "name": "constant.numeric.lean"
+      "name": "constant.numeric.lean",
+      "match": "\\b([0-9]+|0([xX][0-9a-fA-F]+))\\b"
     }
   ],
   "repository": {
     "blockComment": {
+      "name": "comment.block.lean",
       "begin": "/-",
+      "end": "-/",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.lean"
         }
-      },
-      "end": "-/",
-      "name": "comment.block.lean"
+      }
     },
     "dashComment": {
+      "name": "comment.line.double-dash.lean",
       "begin": "(--)",
+      "end": "$",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.lean"
         }
-      },
-      "end": "$",
-      "name": "comment.line.double-dash.lean"
+      }
     },
     "identifier": {
-      "comment": "not so much here to be used as to be a reference",
-      "match": "\\b[^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*",
-      "name": "entity.name.function.lean"
+      "name": "entity.name.function.lean",
+      "match": "\\b[^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*"
     }
-  },
-  "scopeName": "source.lean",
-  "uuid": "BCCD7FA1-4C45-41B2-B1C9-C850F00AFCD8"
-}
+  }
+}

data/grammars/source.lid.json

@@ -1,11 +1,11 @@
 {
-  "fileTypes": [
-    "lid"
-  ],
   "name": "Lid File",
+  "scopeName": "source.lid",
   "patterns": [
     {
+      "name": "meta.header.mail",
       "begin": "([\\x{21}-\\x{39}\\x{3B}-\\x{7E}]+)(:)\\s*",
+      "end": "^(?![ \\t\\v])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.mail"
@@ -13,11 +13,7 @@
         "2": {
           "name": "punctuation.separator.key-value.mail"
         }
-      },
-      "end": "^(?![ \\t\\v])",
-      "name": "meta.header.mail"
+      }
     }
-  ],
-  "scopeName": "source.lid",
-  "uuid": "7E074E76-1515-4B0D-BFAB-E0D9D8854163"
-}
+  ]
+}

data/grammars/source.lilypond.json

@@ -1,12 +1,6 @@
 {
-  "comment": "\n\t\tThis bundle is, as can easily be seen, far from complete,\n\t\tbut it should still be as useful as the Lilypond.app pyobjc\n\t\tapplication, which has no syntax coloring, no way to do\n\t\tsnippets, and pretty much no interesting functionality at\n\t\tall, other than a \"Run\" menu option. :)\n\t",
-  "fileTypes": [
-    "ly",
-    "lily",
-    "ily"
-  ],
-  "keyEquivalent": "^~L",
   "name": "LilyPond",
+  "scopeName": "source.lilypond",
   "patterns": [
     {
       "include": "#comments"
@@ -31,39 +25,41 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.lilypond",
           "begin": "%{",
+          "end": "%}",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.lilypond"
             }
-          },
-          "end": "%}",
-          "name": "comment.block.lilypond"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=%)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.lilypond"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.percentage.lilypond",
               "begin": "%",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.lilypond"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.percentage.lilypond"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.lilypond"
+            }
+          }
         }
       ]
     },
     "f_clef": {
+      "name": "meta.element.clef.lilypond",
+      "match": "(?x)\n\t\t\t\t((\\\\) clef) \\s+  # backslash + \"clef\" + spaces (groups 1-2)\n\t\t\t\t(?:\n\t\t\t\t  (\"?)\t# beginning quotes (group 3)\n\t\t\t\t  (?:\n\t\t\t\t\t  ( (?: # group 4\n\t\t\t\t\t\t  treble | violin | G | french |                    # G clefs\n\t\t\t\t\t      alto | C | tenor | (?:mezzo)?soprano | baritone | # C clefs\n\t\t\t\t\t      (?:sub)?bass | F | varbaritone |                  # F clefs\n\t\t\t\t\t      percussion | tab | # percussion / tablature clefs\n                      \n\t\t\t\t          (?:neo)?mensural-c[1-4] | mensural-[fg] | \t\t# Ancient clefs\n\t\t\t\t\t      petrucci-(?: [fg] | c[1-5] ) |\n\t\t\t\t\t      (?: vaticana | medicaea | hufnagel ) - (?: do[1-3] | fa[12] ) |\n\t\t\t\t\t      hufnagel-do-fa\n\t\t\t\t\t    )\n\t\t\t\t\t    ([_^](?:8|15)?)? # optionally shift 1-2 octaves ↑/↓ (group 5)\n\t\t\t\t\t  ) |\n\t\t\t\t\t  ( (?:\\w+) ([_^](?:8|15))? ) # unknown clef name (groups 6-7)\n\t\t\t\t  )\n\t\t\t\t  (\\3) # closing quotes (group 8)\n\t\t\t\t)?\n\t\t\t",
       "captures": {
         "1": {
           "name": "support.function.element.lilypond"
@@ -89,34 +85,32 @@
         "8": {
           "name": "punctuation.definition.string.lilypond"
         }
-      },
-      "comment": "\n\t\t\t\tThis looks something like:   \\clef mezzosoprano_8\n\t\t\t\tOr maybe:                    \\clef neomensural-c3^15\n\t\t\t",
-      "match": "(?x)\n\t\t\t\t((\\\\) clef) \\s+  # backslash + \"clef\" + spaces (groups 1-2)\n\t\t\t\t(?:\n\t\t\t\t  (\"?)\t# beginning quotes (group 3)\n\t\t\t\t  (?:\n\t\t\t\t\t  ( (?: # group 4\n\t\t\t\t\t\t  treble | violin | G | french |                    # G clefs\n\t\t\t\t\t      alto | C | tenor | (?:mezzo)?soprano | baritone | # C clefs\n\t\t\t\t\t      (?:sub)?bass | F | varbaritone |                  # F clefs\n\t\t\t\t\t      percussion | tab | # percussion / tablature clefs\n                      \n\t\t\t\t          (?:neo)?mensural-c[1-4] | mensural-[fg] | \t\t# Ancient clefs\n\t\t\t\t\t      petrucci-(?: [fg] | c[1-5] ) |\n\t\t\t\t\t      (?: vaticana | medicaea | hufnagel ) - (?: do[1-3] | fa[12] ) |\n\t\t\t\t\t      hufnagel-do-fa\n\t\t\t\t\t    )\n\t\t\t\t\t    ([_^](?:8|15)?)? # optionally shift 1-2 octaves ↑/↓ (group 5)\n\t\t\t\t\t  ) |\n\t\t\t\t\t  ( (?:\\w+) ([_^](?:8|15))? ) # unknown clef name (groups 6-7)\n\t\t\t\t  )\n\t\t\t\t  (\\3) # closing quotes (group 8)\n\t\t\t\t)?\n\t\t\t",
-      "name": "meta.element.clef.lilypond"
+      }
     },
     "f_generic": {
+      "name": "support.function.general.lilypond",
+      "match": "(\\\\)[a-zA-Z-]+\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.function.lilypond"
         }
-      },
-      "match": "(\\\\)[a-zA-Z-]+\\b",
-      "name": "support.function.general.lilypond"
+      }
     },
     "f_key-signature": {
-      "comment": "FIXME",
       "name": "meta.element.key-signature.lilypond"
     },
     "f_keywords": {
+      "name": "keyword.control.lilypond",
+      "match": "(?x)\n\t\t\t\t(?: (\\\\)\n\t\t\t\t    (?: set | new | override | revert)\\b\n\t\t\t\t)\n\t\t\t",
       "captures": {
         "1": {
           "name": "punctuation.definition.function.lilypond"
         }
-      },
-      "match": "(?x)\n\t\t\t\t(?: (\\\\)\n\t\t\t\t    (?: set | new | override | revert)\\b\n\t\t\t\t)\n\t\t\t",
-      "name": "keyword.control.lilypond"
+      }
     },
     "f_time-signature": {
+      "name": "meta.element.time-signature.lilypond",
+      "match": "(?x)\n\t\t\t\t((\\\\) time) \\s+ # backslash + \"time\" + spaces (groups 1-2)\n\t\t\t\t([1-9][0-9]*/[1-9][0-9]*)?\n\t\t\t",
       "captures": {
         "1": {
           "name": "support.function.element.lilypond"
@@ -127,9 +121,7 @@
         "3": {
           "name": "constant.numeric.time-signature.lilypond"
         }
-      },
-      "match": "(?x)\n\t\t\t\t((\\\\) time) \\s+ # backslash + \"time\" + spaces (groups 1-2)\n\t\t\t\t([1-9][0-9]*/[1-9][0-9]*)?\n\t\t\t",
-      "name": "meta.element.time-signature.lilypond"
+      }
     },
     "functions": {
       "patterns": [
@@ -151,25 +143,9 @@
       ]
     },
     "g_header": {
+      "name": "meta.header.lilypond",
       "begin": "((\\\\)header)\\s*({)",
-      "beginCaptures": {
-        "1": {
-          "name": "support.function.section.header.lilypond"
-        },
-        "2": {
-          "name": "punctuation.definition.function.lilypond"
-        },
-        "3": {
-          "name": "punctuation.section.group.begin.lilypond"
-        }
-      },
       "end": "}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.group.end.lilypond"
-        }
-      },
-      "name": "meta.header.lilypond",
       "patterns": [
         {
           "include": "#comments"
@@ -184,33 +160,39 @@
           "include": "#g_markup"
         },
         {
-          "match": "=",
-          "name": "punctuation.separator.key-value.lilypond"
+          "name": "punctuation.separator.key-value.lilypond",
+          "match": "="
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\tdedication | title | subtitle | subsubtitle | poet |\n\t\t\t\t\t\tcomposer | meter | opus | arranger | instrument |\n\t\t\t\t\t\tpiece | breakbefore | copyright | tagline | enteredby\n\t\t\t\t\t",
-          "name": "support.constant.header.lilypond"
+          "name": "support.constant.header.lilypond",
+          "match": "(?x)\n\t\t\t\t\t\tdedication | title | subtitle | subsubtitle | poet |\n\t\t\t\t\t\tcomposer | meter | opus | arranger | instrument |\n\t\t\t\t\t\tpiece | breakbefore | copyright | tagline | enteredby\n\t\t\t\t\t"
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\tmutopiatitle | mutopiacomposer | mutopiapoet |\n\t\t\t\t\t\tmutopiaopus | mutopiainstrument | date | source |\n\t\t\t\t\t\tstyle | maintainer | maintainerEmail |\n\t\t\t\t\t\tmaintainerWeb | lastupdated\n\t\t\t\t\t",
-          "name": "support.constant.header.mutopia.lilypond"
+          "name": "support.constant.header.mutopia.lilypond",
+          "match": "(?x)\n\t\t\t\t\t\tmutopiatitle | mutopiacomposer | mutopiapoet |\n\t\t\t\t\t\tmutopiaopus | mutopiainstrument | date | source |\n\t\t\t\t\t\tstyle | maintainer | maintainerEmail |\n\t\t\t\t\t\tmaintainerWeb | lastupdated\n\t\t\t\t\t"
         }
-      ]
-    },
-    "g_m_group": {
-      "begin": "{",
+      ],
       "beginCaptures": {
-        "0": {
+        "1": {
+          "name": "support.function.section.header.lilypond"
+        },
+        "2": {
+          "name": "punctuation.definition.function.lilypond"
+        },
+        "3": {
           "name": "punctuation.section.group.begin.lilypond"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.group.end.lilypond"
         }
-      },
+      }
+    },
+    "g_m_group": {
       "name": "meta.group.lilypond",
+      "begin": "{",
+      "end": "}",
       "patterns": [
         {
           "include": "#f_generic"
@@ -227,10 +209,27 @@
         {
           "include": "#g_m_group"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.group.begin.lilypond"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.group.end.lilypond"
+        }
+      }
     },
     "g_markup": {
+      "name": "meta.element.markup.lilypond",
       "begin": "(?x)\n\t\t\t\t((\\\\) markup) \\s+ # backslash + \"markup\" + spaces\n\t\t\t\t(?={)\n\t\t\t",
+      "end": "(?\u003c=})",
+      "patterns": [
+        {
+          "include": "#g_m_group"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.element.markup.lilypond"
@@ -238,17 +237,16 @@
         "2": {
           "name": "punctuation.definition.function.markup"
         }
-      },
-      "end": "(?<=})",
-      "name": "meta.element.markup.lilypond",
-      "patterns": [
-        {
-          "include": "#g_m_group"
-        }
-      ]
+      }
     },
     "g_relative": {
       "begin": "((\\\\)relative)\\s*(?:([a-h][',]*)\\s*)?(?={)",
+      "end": "(?\u003c=})",
+      "patterns": [
+        {
+          "include": "#group"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.section.lilypond"
@@ -259,36 +257,36 @@
         "3": {
           "name": "storage.type.pitch.lilypond"
         }
-      },
-      "end": "(?<=})",
+      }
+    },
+    "g_system": {
+      "name": "meta.system.lilypond",
+      "begin": "\u003c\u003c",
+      "end": "\u003e\u003e",
       "patterns": [
         {
-          "include": "#group"
+          "include": "$self"
         }
-      ]
-    },
-    "g_system": {
-      "begin": "<<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.system.begin.lilypond"
         }
       },
-      "end": ">>",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.system.end.lilypond"
         }
-      },
-      "name": "meta.system.lilypond",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     "g_times": {
       "begin": "((\\\\)times)\\s*(?:([1-9][0-9]*/[1-9][0-9])\\s*)(?={)",
+      "end": "(?\u003c=})",
+      "patterns": [
+        {
+          "include": "#group"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.section.lilypond"
@@ -299,33 +297,27 @@
         "3": {
           "name": "constant.numeric.fraction.lilypond"
         }
-      },
-      "end": "(?<=})",
-      "patterns": [
-        {
-          "include": "#group"
-        }
-      ]
+      }
     },
     "group": {
+      "name": "meta.music-expression.lilypond",
       "begin": "{",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "#music-expr"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.group.begin.lilypond"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.group.end.lilypond"
         }
-      },
-      "name": "meta.music-expression.lilypond",
-      "patterns": [
-        {
-          "include": "#music-expr"
-        }
-      ]
+      }
     },
     "groupings": {
       "patterns": [
@@ -368,41 +360,47 @@
     "n_articulations": {
       "patterns": [
         {
-          "match": "(?x)\n\t\t\t\t\t\t([_^-])\n\t\t\t\t\t\t(?:[.>^+|_-])\n\t\t\t\t\t",
-          "name": "storage.modifier.articulation.accent.lilypond"
+          "name": "storage.modifier.articulation.accent.lilypond",
+          "match": "(?x)\n\t\t\t\t\t\t([_^-])\n\t\t\t\t\t\t(?:[.\u003e^+|_-])\n\t\t\t\t\t"
         },
         {
+          "name": "storage.modifier.articulation.named.lilypond",
+          "match": "(?x)\n\t\t\t\t\t\t(\\\\)\n\t\t\t\t\t\t(?: accent | markato | staccatissimo |\t\t       # basic accents\n\t\t\t\t\t\t\tespressivo | staccato | tenuto | portato | \n\t\t\t\t\t\t\t(?:up|down)bow | flageolet | thumb |\n\t\t\t\t\t\t\t[lr](?:heel|toe) | open | stopped |\n\t\t\t\t\t\t\t(?:reverse)?turn | trill |\n\t\t\t\t\t\t\tprall(?: prall | mordent | down | up)? |       # pralls\n\t\t\t\t\t\t\t(?: up | down | line ) prall |                 # and\n\t\t\t\t\t\t\t(?: up | down )? mordent |                     # mordents\n\t\t\t\t\t\t\tsignumcongruentiae |\n\t\t\t\t\t\t\t(?: (?:very)? long | short)?fermata(Markup)? | # fermatas\n\t\t\t\t\t\t\tsegno | (?:var)?coda \n\t\t\t\t\t\t)\n\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "punctuation.definition.function.lilypond"
             }
-          },
-          "match": "(?x)\n\t\t\t\t\t\t(\\\\)\n\t\t\t\t\t\t(?: accent | markato | staccatissimo |\t\t       # basic accents\n\t\t\t\t\t\t\tespressivo | staccato | tenuto | portato | \n\t\t\t\t\t\t\t(?:up|down)bow | flageolet | thumb |\n\t\t\t\t\t\t\t[lr](?:heel|toe) | open | stopped |\n\t\t\t\t\t\t\t(?:reverse)?turn | trill |\n\t\t\t\t\t\t\tprall(?: prall | mordent | down | up)? |       # pralls\n\t\t\t\t\t\t\t(?: up | down | line ) prall |                 # and\n\t\t\t\t\t\t\t(?: up | down )? mordent |                     # mordents\n\t\t\t\t\t\t\tsignumcongruentiae |\n\t\t\t\t\t\t\t(?: (?:very)? long | short)?fermata(Markup)? | # fermatas\n\t\t\t\t\t\t\tsegno | (?:var)?coda \n\t\t\t\t\t\t)\n\t\t\t\t\t",
-          "name": "storage.modifier.articulation.named.lilypond"
+          }
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\t(\\\\) # backslash\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t    p{1,5} | m[pf] | f{1,4} | fp | # forte, piano, etc.\n    \t\t\t\t\t\t[sr]fz | sff? | spp? | \n    \t\t\t\t\t\t< | > | ! | espressivo         # (de)crescendo\n\t\t\t\t\t\t)\n\t\t\t\t\t",
-          "name": "storage.modifier.articulation.dynamics.lilypond"
+          "name": "storage.modifier.articulation.dynamics.lilypond",
+          "match": "(?x)\n\t\t\t\t\t\t(\\\\) # backslash\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t    p{1,5} | m[pf] | f{1,4} | fp | # forte, piano, etc.\n    \t\t\t\t\t\t[sr]fz | sff? | spp? | \n    \t\t\t\t\t\t\u003c | \u003e | ! | espressivo         # (de)crescendo\n\t\t\t\t\t\t)\n\t\t\t\t\t"
         },
         {
-          "match": "\\[|\\]",
-          "name": "storage.modifier.beam.lilypond"
+          "name": "storage.modifier.beam.lilypond",
+          "match": "\\[|\\]"
         },
         {
-          "match": "\\(|\\)",
-          "name": "storage.modifier.slur.lilypond"
+          "name": "storage.modifier.slur.lilypond",
+          "match": "\\(|\\)"
         },
         {
-          "match": "\\\\\\(|\\\\\\)",
-          "name": "storage.modifier.slur.phrasing.lilypond"
+          "name": "storage.modifier.slur.phrasing.lilypond",
+          "match": "\\\\\\(|\\\\\\)"
         }
       ]
     },
     "notes": {
-      "comment": "\n\t\t\t\tThis section includes the rules for notes, rests, and chords\n\t\t\t",
       "patterns": [
         {
+          "name": "meta.element.note.lilypond",
           "begin": "(?x)\\b\n\t\t\t\t\t    (\t\t\t\t\t\t  # (group 1)\n\t\t\t\t\t\t  ( [a-h]                 # Pitch (group 2)\n\t\t\t\t\t\t    ( (?:i[sh]){1,2} |    #   - sharp (group 3)\n\t\t\t\t\t\t      (?:e[sh]|s){1,2}    #   - flat\n\t\t\t\t\t\t    )?\n\t\t\t\t\t        (?:(\\!)|(\\?))?               # Cautionary accidental (groups 4-5)\n\t\t\t\t\t        ('+|,+)?             # Octave (group 6)\n\t\t\t\t\t\t  )\n\t\t\t\t\t\t  ( ( ((\\\\)breve)|        # Duration (groups 7-10)\n\t\t\t\t\t\t      64|32|16|8|4|2|1\n\t\t\t\t\t\t    )\n\t\t\t\t\t\t    (\\.+)?                 # Augmentation dot (group 11)\n\t\t\t\t\t\t\t((?:(\\*)(\\d+(?:/\\d+)?))*) # Scaling duration (groups 12-14)\n\t\t\t\t\t\t  )?\n\t\t\t\t\t\t)(?![a-z])\t# do not follow a note with a letter\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t(?= [\\s}~a-z] |$) # End when we encounter a space or } or end of line\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#n_articulations"
+            }
+          ],
           "beginCaptures": {
             "10": {
               "name": "punctuation.definition.function.lilypond"
@@ -428,18 +426,17 @@
             "7": {
               "name": "storage.type.duration.lilypond"
             }
-          },
-          "comment": "\n\t\t\t\t\t\tThis rule handles notes, including the pitch, the\n\t\t\t\t\t\tduration, and any articulations drawn along with\n\t\t\t\t\t\tthe note.\n\t\t\t\t\t\t\n\t\t\t\t\t\tThis rule gets a whole lot uglier if we want to\n\t\t\t\t\t\tsupport multilingual note names.  If so, the rule\n\t\t\t\t\t\tgoes something like:\n\t\t\t\t\t\t\n\t\t\t\t\t\t(?x)\n\t\t\t\t\t\t\t\\b( # Basic Pitches\n\t\t\t\t\t\t\t  [a-h]  # Dutch/English/etc.                         \n\t\t\t\t\t\t\t  (?: (iss?|s|sharp|x)(iss?|s|sharp|x|ih) | # sharp / flat\n\t\t\t\t\t\t\t\t  (ess?|s|flat|f)(ess?|s|flat|f|eh)\n\t\t\t\t\t\t\t  )? |\n\t\t\t\t\t\t\t  (?: do|re|mi|fa|sol|la|si) # Italian/Spanish\n\t\t\t\t\t\t\t  (?: ss?|dd?bb?) # sharp/flat\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t...\n\t\t\t\t\t",
-          "end": "(?x)\n\t\t\t\t\t\t(?= [\\s}~a-z] |$) # End when we encounter a space or } or end of line\n\t\t\t\t\t",
-          "name": "meta.element.note.lilypond",
+          }
+        },
+        {
+          "name": "meta.element.pause.rest.lilypond",
+          "begin": "(?x)\\b\n\t\t\t\t\t\t(?:(r)|(R)) # (groups 1-2)\n\t\t\t\t\t\t( ( (\\\\)breve|       # Duration (groups 3-5)\n\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t  )\n\t\t\t\t\t\t  (\\.+)?                 # Augmentation dot (group 6)\n\t\t\t\t\t\t  ((?:(\\*)(\\d+(?:/\\d+)?))*) # Scaling duration (groups 7-9)\n\t\t\t\t\t\t\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?![a-z])\t# do not follow a note with a letter\n\t\t\t\t\t",
+          "end": "(?=[\\s}~a-z])",
           "patterns": [
             {
               "include": "#n_articulations"
             }
-          ]
-        },
-        {
-          "begin": "(?x)\\b\n\t\t\t\t\t\t(?:(r)|(R)) # (groups 1-2)\n\t\t\t\t\t\t( ( (\\\\)breve|       # Duration (groups 3-5)\n\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t  )\n\t\t\t\t\t\t  (\\.+)?                 # Augmentation dot (group 6)\n\t\t\t\t\t\t  ((?:(\\*)(\\d+(?:/\\d+)?))*) # Scaling duration (groups 7-9)\n\t\t\t\t\t\t\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?![a-z])\t# do not follow a note with a letter\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.pause.rest.lilypond"
@@ -459,17 +456,17 @@
             "9": {
               "name": "constant.numeric.fraction.lilypond"
             }
-          },
-          "end": "(?=[\\s}~a-z])",
-          "name": "meta.element.pause.rest.lilypond",
+          }
+        },
+        {
+          "name": "meta.element.pause.skip.lilypond",
+          "begin": "(?x)\\b\n\t\t\t\t\t\t(s) # (group 1)\n\t\t\t\t\t\t( ( (\\\\)breve|       # Duration (groups 2-4)\n\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t  )\n\t\t\t\t\t\t  (\\.+)?                 # Augmentation dot (group 5)\n\t\t\t\t\t\t  ((?:(\\*)(\\d+(?:/\\d+)?))*) # Scaling duration (groups 6-8)\n\t\t\t\t\t\t\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?![a-z])\t# do not follow a note with a letter\n\t\t\t\t\t",
+          "end": "(?=[\\s}~a-z]|$)",
           "patterns": [
             {
               "include": "#n_articulations"
             }
-          ]
-        },
-        {
-          "begin": "(?x)\\b\n\t\t\t\t\t\t(s) # (group 1)\n\t\t\t\t\t\t( ( (\\\\)breve|       # Duration (groups 2-4)\n\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t  )\n\t\t\t\t\t\t  (\\.+)?                 # Augmentation dot (group 5)\n\t\t\t\t\t\t  ((?:(\\*)(\\d+(?:/\\d+)?))*) # Scaling duration (groups 6-8)\n\t\t\t\t\t\t\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?![a-z])\t# do not follow a note with a letter\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.pause.skip.lilypond"
@@ -486,16 +483,11 @@
             "8": {
               "name": "constant.numeric.fraction.lilypond"
             }
-          },
-          "end": "(?=[\\s}~a-z]|$)",
-          "name": "meta.element.pause.skip.lilypond",
-          "patterns": [
-            {
-              "include": "#n_articulations"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.element.pause.skip.lilypond",
+          "match": "((\\\\)skip)\\s+(64|32|16|8|4|2|1)",
           "captures": {
             "1": {
               "name": "storage.type.pause.skip.lilypond"
@@ -506,27 +498,15 @@
             "3": {
               "name": "storage.type.duration.lilypond"
             }
-          },
-          "match": "((\\\\)skip)\\s+(64|32|16|8|4|2|1)",
-          "name": "meta.element.pause.skip.lilypond"
+          }
         },
         {
-          "begin": "<",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.chord.lilypond"
-            }
-          },
-          "comment": "\n\t\t\t\t\t\tLilypond chords look like:    < a b c >\n\t\t\t\t\t",
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.chord.lilypond"
-            }
-          },
           "name": "meta.element.chord.lilypond",
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
+              "match": "(?x)\\b\n\t\t\t\t\t\t\t\t  ( [a-h]                 # Pitch (group 1)\n\t\t\t\t\t\t\t\t    ( (?:i[sh]){1,2} |    #   - sharp (group 2)\n\t\t\t\t\t\t\t\t      (?:e[sh]|s){1,2}    #   - flat\n\t\t\t\t\t\t\t\t    )?\n\t\t\t\t\t\t\t        (?:(\\!)|(\\?))?       # Reminder/cautionary accidental (groups 3-4)\n\t\t\t\t\t\t\t        ('+|,+)?             # Octave (group 5)\n\t\t\t\t\t\t\t\t  )\n\t\t\t\t\t\t\t",
               "captures": {
                 "1": {
                   "name": "storage.type.pitch.lilypond"
@@ -540,13 +520,29 @@
                 "5": {
                   "name": "meta.note-modifier.octave.lilypond"
                 }
-              },
-              "match": "(?x)\\b\n\t\t\t\t\t\t\t\t  ( [a-h]                 # Pitch (group 1)\n\t\t\t\t\t\t\t\t    ( (?:i[sh]){1,2} |    #   - sharp (group 2)\n\t\t\t\t\t\t\t\t      (?:e[sh]|s){1,2}    #   - flat\n\t\t\t\t\t\t\t\t    )?\n\t\t\t\t\t\t\t        (?:(\\!)|(\\?))?       # Reminder/cautionary accidental (groups 3-4)\n\t\t\t\t\t\t\t        ('+|,+)?             # Octave (group 5)\n\t\t\t\t\t\t\t\t  )\n\t\t\t\t\t\t\t"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.chord.lilypond"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.chord.lilypond"
+            }
+          }
         },
         {
-          "begin": "(?x)\n\t\t\t\t\t    (?<!-)\n\t\t\t\t\t    (?<=>)\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t( ( ((\\\\)breve)|        # Duration (groups 1-4)\n\t\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t\t  )\n\t\t\t\t\t\t\t  (\\.+)?                  # Augmentation dot (group 5)\n\t\t\t\t\t\t\t) |\n\t\t\t\t\t\t\t(?![\\s}~a-z]|$)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
+          "name": "meta.element.chord.lilypond",
+          "begin": "(?x)\n\t\t\t\t\t    (?\u003c!-)\n\t\t\t\t\t    (?\u003c=\u003e)\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t( ( ((\\\\)breve)|        # Duration (groups 1-4)\n\t\t\t\t\t\t\t    64|32|16|8|4|2|1\n\t\t\t\t\t\t\t  )\n\t\t\t\t\t\t\t  (\\.+)?                  # Augmentation dot (group 5)\n\t\t\t\t\t\t\t) |\n\t\t\t\t\t\t\t(?![\\s}~a-z]|$)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
+          "end": "(?=[\\s}~a-z]|$)(?\u003c![^-]\u003e)",
+          "patterns": [
+            {
+              "include": "#n_articulations"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.duration.lilypond"
@@ -554,70 +550,60 @@
             "4": {
               "name": "punctuation.definition.function.lilypond"
             }
-          },
-          "comment": "\n\t\t\t\t\t\tThis rule attaches stuff to the end of a chord\n\t\t\t\t\t\t\n\t\t\t\t\t\tTherefore it begins after the > which ends a chord,\n\t\t\t\t\t\tand does not end after a > which ends a chord.\n\t\t\t\t\t\t(to avoid infinite loops)\n\t\t\t\t\t",
-          "end": "(?=[\\s}~a-z]|$)(?<![^-]>)",
-          "name": "meta.element.chord.lilypond",
-          "patterns": [
-            {
-              "include": "#n_articulations"
-            }
-          ]
+          }
         },
         {
-          "match": "~",
-          "name": "storage.type.tie.lilypond"
+          "name": "storage.type.tie.lilypond",
+          "match": "~"
         },
         {
+          "name": "storage.type.breath-mark.lilypond",
+          "match": "(\\\\)breathe",
           "captures": {
             "1": {
               "name": "punctuation.definition.function.lilypond"
             }
-          },
-          "match": "(\\\\)breathe",
-          "name": "storage.type.breath-mark.lilypond"
+          }
         }
       ]
     },
     "scheme": {
       "begin": "(^[ \\t])?(?=#)",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.whitespace.embedded.leading.scheme"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
-          "begin": "#",
-          "contentName": "source.scheme",
-          "end": "(?=[\\s%])|(?<=\\n)",
           "name": "meta.embedded.line.scheme",
+          "contentName": "source.scheme",
+          "begin": "#",
+          "end": "(?=[\\s%])|(?\u003c=\\n)",
           "patterns": [
             {
               "include": "source.scheme"
             }
           ]
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.whitespace.embedded.leading.scheme"
+        }
+      }
     },
     "strings": {
+      "name": "string.quoted.double.lilypond",
       "begin": "\"",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.string.lilypond"
-        }
-      },
       "end": "\"",
-      "name": "string.quoted.double.lilypond",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.lilypond"
+          "name": "constant.character.escape.lilypond",
+          "match": "\\\\."
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.string.lilypond"
+        }
+      }
     }
-  },
-  "scopeName": "source.lilypond",
-  "uuid": "F25B30BE-0526-4D92-806C-F0D678DDF669"
-}
+  }
+}