github-linguist 5.3.3 → 6.0.0

data/grammars/source.acucobol.json

@@ -1,16 +1,13 @@
 {
-  "fileTypes": [
-
-  ],
   "name": "ACUCOBOL",
+  "scopeName": "source.acucobol",
   "patterns": [
     {
-      "match": "(^......[ a-zA-Z0-9\\-]...................................................................*$)",
-      "name": "invalid.illegal.cobol"
+      "name": "invalid.illegal.cobol",
+      "match": "(^......[ a-zA-Z0-9\\-]...................................................................*$)"
     },
     {
       "include": "source.cobol"
     }
-  ],
-  "scopeName": "source.acucobol"
-}
+  ]
+}

data/grammars/source.ada.json

@@ -1,13 +1,10 @@
 {
-  "comment": "Ada -- chris@cjack.com. Feel free to modify, distribute, be happy. Share and enjoy.",
-  "fileTypes": [
-    "adb",
-    "ads"
-  ],
-  "keyEquivalent": "^~A",
   "name": "Ada",
+  "scopeName": "source.ada",
   "patterns": [
     {
+      "name": "meta.function.ada",
+      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?|\"(?:\\+|-|=|\\*|/)\")",
       "captures": {
         "1": {
           "name": "storage.type.function.ada"
@@ -15,11 +12,11 @@
         "2": {
           "name": "entity.name.function.ada"
         }
-      },
-      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?|\"(?:\\+|-|=|\\*|/)\")",
-      "name": "meta.function.ada"
+      }
     },
     {
+      "name": "meta.function.ada",
+      "match": "\\b(?i:(package)(?:\\b\\s+(body))?)\\b\\s+(\\w+(\\.\\w+)*|\"(?:\\+|-|=|\\*|/)\")",
       "captures": {
         "1": {
           "name": "storage.type.package.ada"
@@ -30,11 +27,11 @@
         "3": {
           "name": "entity.name.type.package.ada"
         }
-      },
-      "match": "\\b(?i:(package)(?:\\b\\s+(body))?)\\b\\s+(\\w+(\\.\\w+)*|\"(?:\\+|-|=|\\*|/)\")",
-      "name": "meta.function.ada"
+      }
     },
     {
+      "name": "meta.function.end.ada",
+      "match": "\\b(?i:(end))\\b\\s+(\\w+(\\.\\w+)*|\"(\\+|-|=|\\*|/)\")\\s?;",
       "captures": {
         "1": {
           "name": "storage.type.function.ada"
@@ -42,11 +39,11 @@
         "2": {
           "name": "entity.name.function.ada"
         }
-      },
-      "match": "\\b(?i:(end))\\b\\s+(\\w+(\\.\\w+)*|\"(\\+|-|=|\\*|/)\")\\s?;",
-      "name": "meta.function.end.ada"
+      }
     },
     {
+      "name": "meta.import.ada",
+      "match": "^\\s*(?:(limited)\\s+)?(?:(private)\\s+)?(with)\\s+(\\w+(\\.\\w+)*)\\s*;",
       "captures": {
         "1": {
           "name": "keyword.control.import.limited.ada"
@@ -60,48 +57,48 @@
         "4": {
           "name": "entity.name.function.ada"
         }
-      },
-      "match": "^\\s*(?:(limited)\\s+)?(?:(private)\\s+)?(with)\\s+(\\w+(\\.\\w+)*)\\s*;",
-      "name": "meta.import.ada"
+      }
     },
     {
-      "match": "\\b(?i:(begin|end|package))\\b",
-      "name": "keyword.control.ada"
+      "name": "keyword.control.ada",
+      "match": "\\b(?i:(begin|end|package))\\b"
     },
     {
-      "match": "\\b(?i:(\\=>|abort|abs|abstract|accept|access|aliased|all|and|array|at|body|case|constant|declare|delay|delta|digits|do|else|elsif|entry|exception|exit|for|function|generic|goto|if|in|interface|is|limited|loop|mod|new|not|null|of|or|others|out|overriding|pragma|private|procedure|protected|raise|range|record|rem|renames|requeue|return|reverse|select|separate|some|subtype|synchronized|tagged|task|terminate|then|type|until|use|when|while|with|xor))\\b",
-      "name": "keyword.other.ada"
+      "name": "keyword.other.ada",
+      "match": "\\b(?i:(\\=\u003e|abort|abs|abstract|accept|access|aliased|all|and|array|at|body|case|constant|declare|delay|delta|digits|do|else|elsif|entry|exception|exit|for|function|generic|goto|if|in|interface|is|limited|loop|mod|new|not|null|of|or|others|out|overriding|pragma|private|procedure|protected|raise|range|record|rem|renames|requeue|return|reverse|select|separate|some|subtype|synchronized|tagged|task|terminate|then|type|until|use|when|while|with|xor))\\b"
     },
     {
-      "match": "\\b(?i:([0-9](_?[0-9])*((#[0-9a-f](_?[0-9a-f])*#((e(\\+|-)?[0-9](_?[0-9])*\\b)|\\B))|((\\.[0-9](_?[0-9])*)?(e(\\+|-)?[0-9](_?[0-9])*)?\\b))))",
-      "name": "constant.numeric.ada"
+      "name": "constant.numeric.ada",
+      "match": "\\b(?i:([0-9](_?[0-9])*((#[0-9a-f](_?[0-9a-f])*#((e(\\+|-)?[0-9](_?[0-9])*\\b)|\\B))|((\\.[0-9](_?[0-9])*)?(e(\\+|-)?[0-9](_?[0-9])*)?\\b))))"
     },
     {
+      "name": "string.quoted.double.ada",
       "begin": "\"",
+      "end": "\"(?!\")",
+      "patterns": [
+        {
+          "name": "constant.character.escape.ada",
+          "match": "\"\""
+        },
+        {
+          "name": "invalid.illegal.lf-in-string.ada",
+          "match": "\\n"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ada"
         }
       },
-      "end": "\"(?!\")",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ada"
         }
-      },
-      "name": "string.quoted.double.ada",
-      "patterns": [
-        {
-          "match": "\"\"",
-          "name": "constant.character.escape.ada"
-        },
-        {
-          "match": "\\n",
-          "name": "invalid.illegal.lf-in-string.ada"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.single.ada",
+      "match": "(').(')",
       "captures": {
         "1": {
           "name": "punctuation.definition.string.begin.ada"
@@ -109,32 +106,28 @@
         "2": {
           "name": "punctuation.definition.string.end.ada"
         }
-      },
-      "match": "(').(')",
-      "name": "string.quoted.single.ada"
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=--)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.ada"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-dash.ada",
           "begin": "--",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.ada"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-dash.ada"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.ada"
+        }
+      }
     }
-  ],
-  "scopeName": "source.ada",
-  "uuid": "0AB8A36E-6B1D-11D9-B034-000D93589AF6"
-}
+  ]
+}

data/grammars/source.afm.json

@@ -1,12 +1,6 @@
 {
   "name": "Adobe Font Metrics",
   "scopeName": "source.afm",
-  "fileTypes": [
-    "afm",
-    "amfm",
-    "acfm"
-  ],
-  "firstLineMatch": "\\AStart(?:Comp|Master)?FontMetrics\\s+(?:\\d+(?:\\.\\d+)?)\\s*$",
   "patterns": [
     {
       "include": "#resources"
@@ -16,97 +10,312 @@
     }
   ],
   "repository": {
-    "main": {
+    "amfmSpecific": {
+      "name": "meta.${2:/downcase}.afm",
+      "begin": "^(Start(Direction|Axis|Master))(?:\\s+([-+]?\\d+))?\\s*$",
+      "end": "^End\\2\\s*$",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#real"
-        },
-        {
-          "include": "#integer"
+          "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.start.${2:/downcase}.afm"
         },
+        "3": {
+          "patterns": [
+            {
+              "include": "#integer"
+            }
+          ]
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.end.${2:/downcase}.afm"
+        }
+      }
+    },
+    "array": {
+      "begin": "\\[",
+      "end": "\\]|(?=$)",
+      "patterns": [
         {
           "include": "#array"
         },
         {
-          "include": "#globalInfo"
-        },
-        {
-          "include": "#kerningData"
+          "include": "#numbers"
         },
         {
-          "include": "#charMetrics"
-        },
+          "include": "#psLiteral"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.list.bracket.square.begin.afm"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.list.bracket.square.end.afm"
+        }
+      }
+    },
+    "bestGuessHighlights": {
+      "patterns": [
         {
-          "include": "#compositesData"
+          "match": "\\G\\s*(true|false)(?=\\s|$)",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#boolean"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#amfmSpecific"
+          "match": "^(?:\\s+[-+]?[.\\d]+)+\\s*$",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#numbers"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#direction"
+          "match": "^\\s*(\\[.*\\])\\s*$",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#array"
+                },
+                {
+                  "include": "#main"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#primaryFonts"
+          "match": "^\\s*\u003c[A-Fa-f0-9]+\u003e\\s*$",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#hex"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#reserved"
+          "match": "(?:(?:^|\\s+)/[^\\s\\[\\];]+)+\\s*$",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#psLiteral"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#userDefined"
+          "name": "variable.assignment.afm",
+          "match": "^.+$",
+          "captures": {
+            "0": {
+              "name": "string.unquoted.afm"
+            }
+          }
         }
       ]
     },
-    "array": {
-      "begin": "\\[",
-      "end": "\\]|(?=$)",
+    "boolean": {
+      "name": "constant.language.boolean.$1.afm",
+      "match": "(?\u003c!\\w)(true|false)(?!\\w)"
+    },
+    "bracketedString": {
+      "name": "string.quoted.double.bracketed.afm",
+      "begin": "\\(",
+      "end": "\\)|(?=$)",
+      "patterns": [
+        {
+          "include": "#bracketedString"
+        }
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.list.bracket.square.begin.afm"
+          "name": "punctuation.definition.bracket.round.begin.afm"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.list.bracket.square.end.afm"
+          "name": "punctuation.definition.bracket.round.end.afm"
         }
-      },
+      }
+    },
+    "charMetricInnards": {
       "patterns": [
         {
-          "include": "#array"
+          "include": "#delimiter"
         },
         {
-          "include": "#numbers"
+          "name": "meta.character.code.hexadecimal.afm",
+          "match": "\\G(CH)\\s+(\u003c[^\u003e\\s]++\u003e)\\s*(?=;|$)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.codepoint.afm"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#hex"
+                }
+              ]
+            }
+          }
         },
         {
-          "include": "#psLiteral"
+          "name": "meta.character.code.decimal.afm",
+          "match": "\\G(C)\\s+([-+]?\\d+)\\s*(?=;|$)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.codepoint.afm"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#integer"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "name": "meta.metric.character.width.afm",
+          "begin": "(?\u003c=\\s|^|;)(W[01]?|VV)(?=\\s|;|$)",
+          "end": "(?=;|$)",
+          "patterns": [
+            {
+              "include": "#numbers"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.assignment.character-width.afm"
+            }
+          }
+        },
+        {
+          "name": "meta.metric.character.width.afm",
+          "match": "(?\u003c=\\s|^|;)(W[01]?(X|Y))(?:\\s+([-+]?[\\d.]+)\\s*)(?=\\s|$|;)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.${2:/downcase}-width.afm"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#integer"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "name": "meta.metric.character.name.afm",
+          "match": "(?\u003c=\\s|^|;)(N)(?:\\s+([^;\\s]+))?\\s*(?=\\s|$|;)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.character.name.afm"
+            },
+            "2": {
+              "name": "string.unquoted.parameter.identifier.afm"
+            }
+          }
+        },
+        {
+          "name": "meta.metric.bounding-box.afm",
+          "begin": "(?\u003c=\\s|^|;)(B)(?=\\s|$|;)",
+          "end": "(?=$|;)",
+          "patterns": [
+            {
+              "include": "#numbers"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.assignment.metric.afm"
+            }
+          }
+        },
+        {
+          "name": "meta.metric.next-ligature.afm",
+          "begin": "(?\u003c=\\s|^|;)(L)(?=\\s|$|;)",
+          "end": "(?=$|;)",
+          "patterns": [
+            {
+              "include": "#name"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.assignment.metric.afm"
+            }
+          }
         }
       ]
     },
-    "boolean": {
-      "name": "constant.language.boolean.$1.afm",
-      "match": "(?<!\\w)(true|false)(?!\\w)"
-    },
-    "bracketedString": {
-      "name": "string.quoted.double.bracketed.afm",
-      "begin": "\\(",
-      "end": "\\)|(?=$)",
+    "charMetrics": {
+      "name": "meta.metrics-list.afm",
+      "begin": "^(StartCharMetrics)(?:\\s+(\\d+))?\\s*$",
+      "end": "^EndCharMetrics\\s*$",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "name": "meta.unencoded.character.metrics.afm",
+          "begin": "^\\s*(?=C\\s+-\\d)",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#charMetricInnards"
+            }
+          ]
+        },
+        {
+          "name": "meta.character.metrics.afm",
+          "begin": "^\\s*",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#charMetricInnards"
+            }
+          ]
+        }
+      ],
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.bracket.round.begin.afm"
+        "1": {
+          "name": "keyword.control.start.metrics.afm"
+        },
+        "2": {
+          "name": "constant.numeric.decimal.integer.afm"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.bracket.round.end.afm"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#bracketedString"
+          "name": "keyword.control.end.metrics.afm"
         }
-      ]
+      }
     },
     "comment": {
       "contentName": "comment.line.afm",
@@ -118,63 +327,80 @@
         }
       }
     },
-    "delimiter": {
-      "name": "punctuation.delimiter.metrics.semicolon.afm",
-      "match": ";"
-    },
-    "hex": {
-      "name": "constant.numeric.integer.hexadecimal.afm",
-      "match": "(<)(?:[A-Fa-f0-9]+|([^>\\s]+))(>)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.hex.bracket.angle.begin.afm"
-        },
-        "2": {
-          "name": "invalid.illegal.syntax.bad-characters.afm"
-        },
-        "3": {
-          "name": "punctuation.definition.hex.bracket.angle.end.afm"
-        }
-      }
-    },
-    "integer": {
+    "compositesData": {
+      "name": "meta.composites.afm",
+      "begin": "^(StartComposites)(?:\\s+([-+]?\\d+))?\\s*$",
+      "end": "^EndComposites",
       "patterns": [
         {
-          "match": "(?<!\\w)[-+]?(?=0)\\d+",
-          "name": "constant.numeric.integer.octal.afm"
+          "include": "#comment"
         },
         {
-          "match": "(?<!\\w)[-+]?\\d+",
-          "name": "constant.numeric.integer.decimal.afm"
+          "name": "meta.composition.afm",
+          "begin": "^CC(?=\\s|$|;)",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#delimiter"
+            },
+            {
+              "match": "\\G\\s+([^;\\s]+)(?:\\s+([-+]?\\d+))?",
+              "captures": {
+                "1": {
+                  "name": "string.unquoted.parameter.identifier.afm"
+                },
+                "2": {
+                  "patterns": [
+                    {
+                      "include": "#integer"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "match": "(?\u003c=;|\\s)(PCC)\\s+([^;\\s]+)",
+              "captures": {
+                "1": {
+                  "name": "keyword.operator.char-comp.afm"
+                },
+                "2": {
+                  "name": "string.unquoted.parameter.identifier.afm"
+                }
+              }
+            },
+            {
+              "include": "#numbers"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.char-comp.afm"
+            }
+          }
         }
-      ]
-    },
-    "name": {
-      "match": "[^;\\s]+",
-      "name": "string.unquoted.parameter.identifier.afm"
-    },
-    "numbers": {
-      "patterns": [
-        {
-          "include": "#real"
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.start.metrics.afm"
         },
-        {
-          "include": "#integer"
+        "2": {
+          "patterns": [
+            {
+              "include": "#integer"
+            }
+          ]
         }
-      ]
-    },
-    "psLiteral": {
-      "name": "support.language.constant.literal.afm",
-      "match": "(/)[^\\s\\[\\];]+",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.literal.slash.afm"
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.end.metrics.afm"
         }
       }
     },
-    "real": {
-      "name": "constant.numeric.float.afm",
-      "match": "(?<!\\w)[-+]?\\d*\\.\\d+"
+    "delimiter": {
+      "name": "punctuation.delimiter.metrics.semicolon.afm",
+      "match": ";"
     },
     "globalInfo": {
       "patterns": [
@@ -430,240 +656,41 @@
               "include": "#numbers"
             },
             {
-              "include": "#psLiteral"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.metadata.afm"
-            }
-          }
-        }
-      ]
-    },
-    "charMetrics": {
-      "name": "meta.metrics-list.afm",
-      "begin": "^(StartCharMetrics)(?:\\s+(\\d+))?\\s*$",
-      "end": "^EndCharMetrics\\s*$",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.start.metrics.afm"
-        },
-        "2": {
-          "name": "constant.numeric.decimal.integer.afm"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.control.end.metrics.afm"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "name": "meta.unencoded.character.metrics.afm",
-          "begin": "^\\s*(?=C\\s+-\\d)",
-          "end": "$",
-          "patterns": [
-            {
-              "include": "#charMetricInnards"
-            }
-          ]
-        },
-        {
-          "name": "meta.character.metrics.afm",
-          "begin": "^\\s*",
-          "end": "$",
-          "patterns": [
-            {
-              "include": "#charMetricInnards"
-            }
-          ]
-        }
-      ]
-    },
-    "charMetricInnards": {
-      "patterns": [
-        {
-          "include": "#delimiter"
-        },
-        {
-          "name": "meta.character.code.hexadecimal.afm",
-          "match": "\\G(CH)\\s+(<[^>\\s]++>)\\s*(?=;|$)",
-          "captures": {
-            "1": {
-              "name": "variable.assignment.codepoint.afm"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#hex"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "name": "meta.character.code.decimal.afm",
-          "match": "\\G(C)\\s+([-+]?\\d+)\\s*(?=;|$)",
-          "captures": {
-            "1": {
-              "name": "variable.assignment.codepoint.afm"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#integer"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "name": "meta.metric.character.width.afm",
-          "begin": "(?<=\\s|^|;)(W[01]?|VV)(?=\\s|;|$)",
-          "end": "(?=;|$)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.assignment.character-width.afm"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#numbers"
-            }
-          ]
-        },
-        {
-          "name": "meta.metric.character.width.afm",
-          "match": "(?<=\\s|^|;)(W[01]?(X|Y))(?:\\s+([-+]?[\\d.]+)\\s*)(?=\\s|$|;)",
-          "captures": {
-            "1": {
-              "name": "variable.assignment.${2:/downcase}-width.afm"
-            },
-            "3": {
-              "patterns": [
-                {
-                  "include": "#integer"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "name": "meta.metric.character.name.afm",
-          "match": "(?<=\\s|^|;)(N)(?:\\s+([^;\\s]+))?\\s*(?=\\s|$|;)",
-          "captures": {
-            "1": {
-              "name": "variable.assignment.character.name.afm"
-            },
-            "2": {
-              "name": "string.unquoted.parameter.identifier.afm"
-            }
-          }
-        },
-        {
-          "name": "meta.metric.bounding-box.afm",
-          "begin": "(?<=\\s|^|;)(B)(?=\\s|$|;)",
-          "end": "(?=$|;)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.assignment.metric.afm"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#numbers"
+              "include": "#psLiteral"
             }
-          ]
-        },
-        {
-          "name": "meta.metric.next-ligature.afm",
-          "begin": "(?<=\\s|^|;)(L)(?=\\s|$|;)",
-          "end": "(?=$|;)",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "variable.assignment.metric.afm"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#name"
+              "name": "keyword.operator.metadata.afm"
             }
-          ]
+          }
         }
       ]
     },
-    "compositesData": {
-      "name": "meta.composites.afm",
-      "begin": "^(StartComposites)(?:\\s+([-+]?\\d+))?\\s*$",
-      "end": "^EndComposites",
-      "beginCaptures": {
+    "hex": {
+      "name": "constant.numeric.integer.hexadecimal.afm",
+      "match": "(\u003c)(?:[A-Fa-f0-9]+|([^\u003e\\s]+))(\u003e)",
+      "captures": {
         "1": {
-          "name": "keyword.control.start.metrics.afm"
+          "name": "punctuation.definition.hex.bracket.angle.begin.afm"
         },
         "2": {
-          "patterns": [
-            {
-              "include": "#integer"
-            }
-          ]
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.control.end.metrics.afm"
+          "name": "invalid.illegal.syntax.bad-characters.afm"
+        },
+        "3": {
+          "name": "punctuation.definition.hex.bracket.angle.end.afm"
         }
-      },
+      }
+    },
+    "integer": {
       "patterns": [
         {
-          "include": "#comment"
+          "name": "constant.numeric.integer.octal.afm",
+          "match": "(?\u003c!\\w)[-+]?(?=0)\\d+"
         },
         {
-          "name": "meta.composition.afm",
-          "begin": "^CC(?=\\s|$|;)",
-          "end": "$",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.operator.char-comp.afm"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#delimiter"
-            },
-            {
-              "match": "\\G\\s+([^;\\s]+)(?:\\s+([-+]?\\d+))?",
-              "captures": {
-                "1": {
-                  "name": "string.unquoted.parameter.identifier.afm"
-                },
-                "2": {
-                  "patterns": [
-                    {
-                      "include": "#integer"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "match": "(?<=;|\\s)(PCC)\\s+([^;\\s]+)",
-              "captures": {
-                "1": {
-                  "name": "keyword.operator.char-comp.afm"
-                },
-                "2": {
-                  "name": "string.unquoted.parameter.identifier.afm"
-                }
-              }
-            },
-            {
-              "include": "#numbers"
-            }
-          ]
+          "name": "constant.numeric.integer.decimal.afm",
+          "match": "(?\u003c!\\w)[-+]?\\d+"
         }
       ]
     },
@@ -671,20 +698,18 @@
       "name": "meta.kerning-data.afm",
       "begin": "^(StartKernData)\\s*$",
       "end": "^EndKernData\\s*$",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.start.metrics.afm"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.control.end.metrics.afm"
-        }
-      },
       "patterns": [
         {
           "begin": "^(StartTrackKern)(?:\\s+([-+]?\\d+))?\\s*$",
           "end": "^EndTrackKern\\s*$",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#kerningTrack"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.start.metrics.afm"
@@ -701,19 +726,19 @@
             "0": {
               "name": "keyword.control.end.metrics.afm"
             }
-          },
+          }
+        },
+        {
+          "begin": "^(StartKernPairs[0-1]?)(?:\\s+([-+]?\\d+))?\\s*$",
+          "end": "^EndKernPairs\\s*$",
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "include": "#kerningTrack"
+              "include": "#kerningPairs"
             }
-          ]
-        },
-        {
-          "begin": "^(StartKernPairs[0-1]?)(?:\\s+([-+]?\\d+))?\\s*$",
-          "end": "^EndKernPairs\\s*$",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.start.metrics.afm"
@@ -730,17 +755,19 @@
             "0": {
               "name": "keyword.control.end.metrics.afm"
             }
-          },
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#kerningPairs"
-            }
-          ]
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.start.metrics.afm"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.end.metrics.afm"
+        }
+      }
     },
     "kerningPairs": {
       "patterns": [
@@ -748,14 +775,9 @@
           "name": "meta.kerning-pair.by-codepoint.afm",
           "begin": "^KPH(?=\\s|$)",
           "end": "^|$",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.operator.kern-pair.afm"
-            }
-          },
           "patterns": [
             {
-              "match": "\\G((?:\\s+<[^>\\s]*>)+)\\s+",
+              "match": "\\G((?:\\s+\u003c[^\u003e\\s]*\u003e)+)\\s+",
               "captures": {
                 "1": {
                   "patterns": [
@@ -769,17 +791,17 @@
             {
               "include": "#numbers"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.kern-pair.afm"
+            }
+          }
         },
         {
           "name": "meta.kerning-pair.by-name.afm",
           "begin": "^KP[XY]?(?=\\s|$)",
           "end": "^|$",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.operator.kern-pair.afm"
-            }
-          },
           "patterns": [
             {
               "match": "\\G((?:\\s+\\S+){1,2})",
@@ -796,7 +818,12 @@
             {
               "include": "#numbers"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.kern-pair.afm"
+            }
+          }
         }
       ]
     },
@@ -814,104 +841,60 @@
         }
       }
     },
-    "amfmSpecific": {
-      "name": "meta.${2:/downcase}.afm",
-      "begin": "^(Start(Direction|Axis|Master))(?:\\s+([-+]?\\d+))?\\s*$",
-      "end": "^End\\2\\s*$",
+    "main": {
       "patterns": [
         {
-          "include": "#main"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.start.${2:/downcase}.afm"
+          "include": "#comment"
         },
-        "3": {
-          "patterns": [
-            {
-              "include": "#integer"
-            }
-          ]
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.control.end.${2:/downcase}.afm"
-        }
-      }
-    },
-    "primaryFonts": {
-      "name": "meta.primary-fonts.afm",
-      "begin": "^(StartPrimaryFonts)(?:\\s+([-+]?\\d+))?\\s*$",
-      "end": "^EndPrimaryFonts\\s*$",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.start.font-list.afm"
+        {
+          "include": "#real"
         },
-        "2": {
-          "patterns": [
-            {
-              "include": "#integer"
-            }
-          ]
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.control.end.font-list.afm"
-        }
-      },
-      "patterns": [
         {
-          "include": "#comment"
+          "include": "#integer"
         },
         {
-          "include": "#delimiter"
+          "include": "#array"
         },
         {
-          "include": "#primaryFontLine"
-        }
-      ]
-    },
-    "primaryFontLine": {
-      "begin": "^\\s*",
-      "end": "$",
-      "patterns": [
+          "include": "#globalInfo"
+        },
         {
-          "match": "\\G(PC)((?:\\s+[-+]?\\d+)+)",
-          "captures": {
-            "1": {
-              "name": "variable.assignment.metadata.afm"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#integer"
-                }
-              ]
-            }
-          }
+          "include": "#kerningData"
+        },
+        {
+          "include": "#charMetrics"
+        },
+        {
+          "include": "#compositesData"
+        },
+        {
+          "include": "#amfmSpecific"
+        },
+        {
+          "include": "#direction"
+        },
+        {
+          "include": "#primaryFonts"
         },
         {
-          "begin": "(?<=\\s|;)(P[LN])\\s+",
-          "end": "(?=;|$)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.assignment.metadata.afm"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#bracketedString"
-            },
-            {
-              "include": "#delimiter"
-            }
-          ]
+          "include": "#reserved"
         },
         {
-          "include": "#delimiter"
+          "include": "#userDefined"
+        }
+      ]
+    },
+    "name": {
+      "name": "string.unquoted.parameter.identifier.afm",
+      "match": "[^;\\s]+"
+    },
+    "numbers": {
+      "patterns": [
+        {
+          "include": "#real"
+        },
+        {
+          "include": "#integer"
         }
       ]
     },
@@ -1000,8 +983,8 @@
           "include": "#integer"
         },
         {
-          "match": "(?![-+0-9.])\\S+",
-          "name": "invalid.illegal.syntax.type.afm"
+          "name": "invalid.illegal.syntax.type.afm",
+          "match": "(?![-+0-9.])\\S+"
         }
       ]
     },
@@ -1022,12 +1005,119 @@
         }
       }
     },
+    "primaryFontLine": {
+      "begin": "^\\s*",
+      "end": "$",
+      "patterns": [
+        {
+          "match": "\\G(PC)((?:\\s+[-+]?\\d+)+)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.metadata.afm"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#integer"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "begin": "(?\u003c=\\s|;)(P[LN])\\s+",
+          "end": "(?=;|$)",
+          "patterns": [
+            {
+              "include": "#bracketedString"
+            },
+            {
+              "include": "#delimiter"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.assignment.metadata.afm"
+            }
+          }
+        },
+        {
+          "include": "#delimiter"
+        }
+      ]
+    },
+    "primaryFonts": {
+      "name": "meta.primary-fonts.afm",
+      "begin": "^(StartPrimaryFonts)(?:\\s+([-+]?\\d+))?\\s*$",
+      "end": "^EndPrimaryFonts\\s*$",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#delimiter"
+        },
+        {
+          "include": "#primaryFontLine"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.start.font-list.afm"
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#integer"
+            }
+          ]
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.end.font-list.afm"
+        }
+      }
+    },
+    "psLiteral": {
+      "name": "support.language.constant.literal.afm",
+      "match": "(/)[^\\s\\[\\];]+",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.literal.slash.afm"
+        }
+      }
+    },
+    "real": {
+      "name": "constant.numeric.float.afm",
+      "match": "(?\u003c!\\w)[-+]?\\d*\\.\\d+"
+    },
+    "reserved": {
+      "match": "^([A-Z][A-Za-z0-9]+)(?=\\s)(.*)$",
+      "captures": {
+        "1": {
+          "name": "variable.other.reserved.afm"
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#bestGuessHighlights"
+            }
+          ]
+        }
+      }
+    },
     "resources": {
       "patterns": [
         {
           "name": "meta.metrics.file-resource.afm",
           "begin": "^(StartFontMetrics)\\s+(\\d+(?:\\.\\d+)?)?\\s*$",
           "end": "^(EndFontMetrics)\\s*$",
+          "patterns": [
+            {
+              "include": "#main"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.start.file.afm"
@@ -1040,17 +1130,17 @@
             "1": {
               "name": "keyword.control.end.file.afm"
             }
-          },
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ]
+          }
         },
         {
           "name": "meta.composite.metrics.file-resource.afm",
           "begin": "^(StartCompFontMetrics)\\s+(\\d+(?:\\.\\d+)?)?\\s*$",
           "end": "^(EndCompFontMetrics)\\s*$",
+          "patterns": [
+            {
+              "include": "#main"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.start.file.afm"
@@ -1063,17 +1153,17 @@
             "1": {
               "name": "keyword.control.end.file.afm"
             }
-          },
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ]
+          }
         },
         {
           "name": "meta.master.metrics.file-resource.afm",
           "begin": "^(StartMasterFontMetrics)\\s+(\\d+(?:\\.\\d+)?)?\\s*$",
           "end": "^(EndMasterFontMetrics)\\s*$",
+          "patterns": [
+            {
+              "include": "#main"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.start.file.afm"
@@ -1086,12 +1176,7 @@
             "1": {
               "name": "keyword.control.end.file.afm"
             }
-          },
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ]
+          }
         }
       ]
     },
@@ -1109,97 +1194,6 @@
           ]
         }
       }
-    },
-    "reserved": {
-      "match": "^([A-Z][A-Za-z0-9]+)(?=\\s)(.*)$",
-      "captures": {
-        "1": {
-          "name": "variable.other.reserved.afm"
-        },
-        "2": {
-          "patterns": [
-            {
-              "include": "#bestGuessHighlights"
-            }
-          ]
-        }
-      }
-    },
-    "bestGuessHighlights": {
-      "patterns": [
-        {
-          "match": "\\G\\s*(true|false)(?=\\s|$)",
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "#boolean"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "match": "^(?:\\s+[-+]?[.\\d]+)+\\s*$",
-          "captures": {
-            "0": {
-              "patterns": [
-                {
-                  "include": "#numbers"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "match": "^\\s*(\\[.*\\])\\s*$",
-          "captures": {
-            "0": {
-              "patterns": [
-                {
-                  "include": "#array"
-                },
-                {
-                  "include": "#main"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "match": "^\\s*<[A-Fa-f0-9]+>\\s*$",
-          "captures": {
-            "0": {
-              "patterns": [
-                {
-                  "include": "#hex"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "match": "(?:(?:^|\\s+)/[^\\s\\[\\];]+)+\\s*$",
-          "captures": {
-            "0": {
-              "patterns": [
-                {
-                  "include": "#psLiteral"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "match": "^.+$",
-          "name": "variable.assignment.afm",
-          "captures": {
-            "0": {
-              "name": "string.unquoted.afm"
-            }
-          }
-        }
-      ]
     }
   }
-}
+}