From 54d1ed068ae0834bb817c91c71b6f92715465654 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 17 Jun 2020 13:11:46 -0400
Subject: [PATCH 001/223] (chore) update docs to match issue template

---
 docs/language-requests.rst | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/language-requests.rst b/docs/language-requests.rst
index c8f33d9d02..c67ff676e5 100644
--- a/docs/language-requests.rst
+++ b/docs/language-requests.rst
@@ -4,14 +4,25 @@ On requesting new languages
 This is a general answer to requests for adding new languages that appear from
 time to time in the highlight.js issue tracker and discussion group.
 
-    Highlight.js doesn't have a fundamental plan for implementing languages,
-    instead the project works by encouraging development of 3rd party language
-    grammars from contributors.  We're also happy to host 3rd party language
-    grammars at the ``highlightjs`` GitHub organization - no matter how obscure
-    or weird.
+    Highlight.js does not have a fundamental plan for implementing new languages
+    - i.e., the core team doesn't usually develop new languages. The core team
+    instead focuses on parser development, bugs, and supporting the existing
+    languages. They also currently does not have time to review, merge and
+    maintain any additional languages (fixing bugs, dealing with issues, etc).
+
+    Instead, the project works by encouraging 3rd party language grammars from
+    contributors willing to help develop and maintain them. We're also happy to
+    host those 3rd party language grammars at the ``highlightjs`` GitHub
+    organization - no matter how obscure or weird. Or you're wlecome to host it
+    yourself - we're still happy to link to it.
+
+    This means that *there's no point in requesting a new language without also
+    providing a 3rd party implementation* (we'll simply close "Please support
+    language Xyz" issues with a link to this explanation). If you'd like to see
+    a particular language available but cannot implement it, the best way to
+    make it happen is to find another developer interested in doing so.
+
+    For more info on actually developing a language see our :doc:`language-guide`,
+    and for information on how to properly package your 3rd party language module
+    see :doc:`language-contribution`.
 
-    This means that *there's no point in requesting a new language without
-    providing an implementation for it*. If you want to see a particular language
-    included in highlight.js but cannot implement it, the best way to make it
-    happen is to get another developer interested in doing so. Here's our
-    :doc:`language-guide`.

From ab5083b2fc61e1cb7fec270186613d3cdb437245 Mon Sep 17 00:00:00 2001
From: Samia <39127633+samiaab1990@users.noreply.github.com>
Date: Sat, 27 Jun 2020 23:35:30 -0400
Subject: [PATCH 002/223] New Style: Gradient Light  (#2616)

---
 CHANGES.md                    |   8 +++
 src/styles/gradient-light.css | 130 ++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 src/styles/gradient-light.css

diff --git a/CHANGES.md b/CHANGES.md
index 7dde7b4582..717db18a5a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+## Version 10.2.0 (next up)
+
+New themes:
+
+- *Gradient Light* by [Samia Ali]()
+
+[Samia Ali]: https://github.com/samiaab1990
+
 ## Version 10.1.1
 
 Fixes:
diff --git a/src/styles/gradient-light.css b/src/styles/gradient-light.css
new file mode 100644
index 0000000000..801a136f4f
--- /dev/null
+++ b/src/styles/gradient-light.css
@@ -0,0 +1,130 @@
+/*
+
+Gradient Light (c) Samia Ali <samiaab1990@gmail.com>
+
+*/
+
+.hljs
+{
+display: block;
+overflow-x: auto;
+padding: 0.5em;
+background: rgb(255,253,141);
+background: linear-gradient(142deg, rgba(255,253,141,1) 0%, rgba(252,183,255,1) 35%, rgba(144,236,255,1) 100%);
+color:#250482;
+}
+
+.hljs-subtr{
+color:#01958B;
+}
+
+.hljs-doctag,
+.hljs-meta,
+.hljs-comment,
+.hljs-quote
+{
+  color:#CB7200;
+}
+
+.hljs-selector-tag,
+.hljs-selector-id,
+.hljs-template-tag,
+.hljs-regexp,
+.hljs-attr,
+.hljs-tag
+{
+  color:#07BD5F;
+}
+
+.hljs-params,
+.hljs-selector-class,
+.hljs-bullet
+
+{
+  color:#43449F;
+  
+}
+
+.hljs-keyword,
+.hljs-section,
+.hljs-meta-keyword,
+.hljs-symbol,
+.hljs-type
+
+{
+
+  color:#7D2801;
+}
+
+.hljs-addition,
+.hljs-number,
+.hljs-link
+{
+  color:#7F0096;
+}
+
+
+.hljs-string
+{
+  color: #38c0ff;
+}
+
+
+.hljs-attribute,
+.hljs-addition
+{
+  color:#296562;
+}
+
+.hljs-variable,
+.hljs-template-variable
+
+{
+  color:#025C8F;
+}
+
+.hljs-builtin-name,
+.hljs-built_in,
+.hljs-formula,
+.hljs-name,
+.hljs-title,
+.hljs-class,
+.hljs-function
+{
+  color: #529117;
+
+}
+
+.hljs-selector-pseudo,
+.hljs-deletion,
+.hljs-literal
+{
+  color:#AD13FF;
+
+}
+
+.hljs-emphasis,
+.hljs-quote
+{
+  font-style:italic;
+}
+
+.hljs-params,
+.hljs-selector-class,
+.hljs-strong,
+.hljs-selector-tag,
+.hljs-selector-id,
+.hljs-template-tag,
+.hljs-section,
+.hljs-keyword
+{
+  font-weight:bold;
+}
+
+
+
+
+
+
+
+

From 7bd0d62e016c72e4da83aea78db133c7413f80fd Mon Sep 17 00:00:00 2001
From: Andrew Janke <floss@apjanke.net>
Date: Mon, 29 Jun 2020 16:01:58 -0400
Subject: [PATCH 003/223] enh(matlab) add "arguments" keyword and fix
 "enumeration" (#2619)

---
 CHANGES.md              | 6 ++++++
 src/languages/matlab.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 717db18a5a..3b9b3db00f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,14 @@ New themes:
 
 - *Gradient Light* by [Samia Ali]()
 
+Language Improvements:
+
+- enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
+
+[Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
 
+
 ## Version 10.1.1
 
 Fixes:
diff --git a/src/languages/matlab.js b/src/languages/matlab.js
index a3d0cde8b0..0a75e8a5b0 100644
--- a/src/languages/matlab.js
+++ b/src/languages/matlab.js
@@ -24,7 +24,7 @@ export default function(hljs) {
     name: 'Matlab',
     keywords: {
       keyword:
-        'break case catch classdef continue else elseif end enumerated events for function ' +
+        'arguments break case catch classdef continue else elseif end enumeration events for function ' +
         'global if methods otherwise parfor persistent properties return spmd switch try while',
       built_in:
         'sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan ' +

From 465c2fe9e4964e10c239552f2fac912a547adbba Mon Sep 17 00:00:00 2001
From: kageru <kageru@encode.moe>
Date: Thu, 2 Jul 2020 16:01:33 +0200
Subject: [PATCH 004/223] (kotlin) remove very old keywords and update example
 code (#2623)

Removes obsolete Kotlin keywords and updates example.

- These are no longer valid Kotlin keywords. (and there removal from the grammar was suggested years ago)
- Also remove the `trait` usage from the example and format the code
  according to the Kotlin coding conventions.

Reference:
https://github.com/highlightjs/highlight.js/commit/af601cb4ca53fdbf6cd8f33f9ea9603581691113
---
 CHANGES.md                     | 2 ++
 src/languages/kotlin.js        | 4 +---
 test/detect/kotlin/default.txt | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3b9b3db00f..b530661178 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,9 +7,11 @@ New themes:
 Language Improvements:
 
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
+- fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
 
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
+[kageru]: https://github.com/kageru
 
 
 ## Version 10.1.1
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index f1d368c020..fe19c386d8 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -14,9 +14,7 @@ export default function(hljs) {
       'crossinline dynamic final enum if else do while for when throw try catch finally ' +
       'import package is in fun override companion reified inline lateinit init ' +
       'interface annotation data sealed internal infix operator out by constructor super ' +
-      'tailrec where const inner suspend typealias external expect actual ' +
-      // to be deleted soon
-      'trait volatile transient native default',
+      'tailrec where const inner suspend typealias external expect actual',
     built_in:
       'Byte Short Char Int Long Boolean Float Double Void Unit Nothing',
     literal:
diff --git a/test/detect/kotlin/default.txt b/test/detect/kotlin/default.txt
index 5360533a2e..024f3cc94d 100644
--- a/test/detect/kotlin/default.txt
+++ b/test/detect/kotlin/default.txt
@@ -1,12 +1,12 @@
 import kotlin.lang.test
 
-trait A {
+interface A {
     fun x()
 }
 
-fun xxx() : Int {
-	return 888
+fun xxx(): Int {
+    return 888
 }
 
-public fun main(args : Array<String>) {
+public fun main(args: Array<String>) {
 }

From eec9b8481c7c36ab959f3eee9a75301641d4e601 Mon Sep 17 00:00:00 2001
From: Alireza Rezaee <alireza-git-commits@rezaee.org>
Date: Sun, 5 Jul 2020 17:53:20 +0430
Subject: [PATCH 005/223] (chore) Update CDN urls to version 10.1.1 (#2627)

---
 README.md    | 10 +++++-----
 README.ru.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index dd596c099c..445e0489b1 100644
--- a/README.md
+++ b/README.md
@@ -199,19 +199,19 @@ A prebuilt version of highlight.js bundled with many common languages is hosted
 
 ```html
 <link rel="stylesheet"
-      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.0/styles/default.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.0/highlight.min.js"></script>
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.0/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
 ```
 
 **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release))
 
 ```html
 <link rel="stylesheet"
-      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/styles/default.min.css">
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/highlight.min.js"></script>
+      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/styles/default.min.css">
+<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/highlight.min.js"></script>
 ```
 
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be
diff --git a/README.ru.md b/README.ru.md
index a448e217ed..7f7badc8e8 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -108,7 +108,7 @@ Highlight.js можно использовать в браузере прямо
 
 ```html
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.0/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
 ```
 
 **Про Almond.** Нужно задать имя модуля в оптимизаторе, например:

From d8692db1efa893b4b9e22ca0dbd96c64cc8da8c4 Mon Sep 17 00:00:00 2001
From: Zack <night@users.noreply.github.com>
Date: Mon, 20 Jul 2020 17:22:42 -0700
Subject: [PATCH 006/223] (parser) use null prototype objects for
 languages/aliases (#2636)

Fix: Discord uses getLanguage to validate that a language specified exists in highlightJS and retrieve metadata about the language for code block highlighting in chat. Because highlightJS returns prototype values instead of the highlight languages themselves, the result is a few different bugs in our clients which expect the return type to be only `Language | undefined`.
---
 CHANGES.md              |  2 ++
 src/highlight.js        |  4 ++--
 test/api/getLanguage.js | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b530661178..c641b19cfd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,10 +8,12 @@ Language Improvements:
 
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
 - fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
+- fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
 
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
 [kageru]: https://github.com/kageru
+[night]: https://github.com/night
 
 
 ## Version 10.1.1
diff --git a/src/highlight.js b/src/highlight.js
index 4f98f38ea5..b16efe83a0 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -29,9 +29,9 @@ const HLJS = function(hljs) {
 
   // Global internal variables used within the highlight.js library.
   /** @type {Record<string, Language>} */
-  var languages = {};
+  var languages = Object.create(null);
   /** @type {Record<string, string>} */
-  var aliases = {};
+  var aliases = Object.create(null);
   /** @type {HLJSPlugin[]} */
   var plugins = [];
 
diff --git a/test/api/getLanguage.js b/test/api/getLanguage.js
index d2654a4f63..ae14ebb92e 100644
--- a/test/api/getLanguage.js
+++ b/test/api/getLanguage.js
@@ -41,4 +41,16 @@ describe('.getLanguage()', () => {
     result.should.have.property('aliases').with.containEql('cs');
     should.strictEqual(result, hljs.getLanguage('csharp'))
   });
+
+  it('should not succeed for constructor', () => {
+    const result = hljs.getLanguage('constructor');
+
+    should.strictEqual(result, undefined);
+  });
+
+  it('should not succeed for __proto__', () => {
+    const result = hljs.getLanguage('__proto__');
+
+    should.strictEqual(result, undefined);
+  });
 });

From e3665447f9b345c6a562986385353dffc018ce59 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 21 Jul 2020 07:07:15 -0400
Subject: [PATCH 007/223] (arduion) no longer has all the C/C++ aliases

Resolves #2626.

The mistake is that Arduino language incorrectly picks up the aliases of
C++. This is because it inherits from C++ but does not strip off the
aliases. This affects functionaltiy. It seems that later-registered
languages' aliases overwrite any earlier registration. Since Arduino is
registered after C++ (because the former requires the latter), calling
getLanguage('c++') will give Arduino (arduino with alias c++) instead of
C++ (cpp with alias c++).
---
 src/languages/arduino.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/arduino.js b/src/languages/arduino.js
index 823e20395c..ce105003c7 100644
--- a/src/languages/arduino.js
+++ b/src/languages/arduino.js
@@ -104,6 +104,7 @@ export default function(hljs) {
   kws.built_in += ' ' + ARDUINO_KW.built_in;
 
   ARDUINO.name = 'Arduino';
+  ARDUINO.aliases = ['ino'];
 
   return ARDUINO;
 }

From 7f63502b1cd7fda116a8731f74d4af1a203a179a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 21 Jul 2020 07:18:57 -0400
Subject: [PATCH 008/223] (chore) add alias overlap table

Related #2626.
---
 SUPPORTED_LANGUAGES.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 482595f134..bef0f0de66 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -169,6 +169,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Shell                   | shell, console         |         |
 | Smali                   | smali                  |         |
 | Smalltalk               | smalltalk, st          |         |
+| SML                     | sml, ml                |         |
 | Solidity                | solidity, sol          | [highlightjs-solidity](https://github.com/highlightjs/highlightjs-solidity) |
 | Stan                    | stan, stanfuncs        |         |
 | Stata                   | stata                  |         |
@@ -201,5 +202,18 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Zephir                  | zephir, zep            |         |
 <!-- LANGLIST_END -->
 
+<!-- document it until we can fix it -->
+## Alias Overlap
+
+If you are using either of these languages at the same time please be sure to
+use the full name and not the alias to avoid any ambiguity.
+
+| Language                | Overlap                |
+| :-----------------------| :--------------------- |
+| SML                     | ml                     |
+| OCaml                   | ml                     |
+| Lasso                   | ls                     |
+| LiveScript              | ls                     |
+
 
 [1]: https://github.com/highlightjs/highlight.js#getting-the-library

From 1809bca77c35039cb268ed863cf191572f275510 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 24 Jul 2020 09:13:47 -0400
Subject: [PATCH 009/223] (chore) bump lodash dependency

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e4a829a203..9bddb911e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2308,9 +2308,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
       "dev": true
     },
     "lodash.sortby": {
diff --git a/package.json b/package.json
index 2fc3a729c2..408bd412ce 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "handlebars": "^4.7.6",
     "js-beautify": "^1.11.0",
     "jsdom": "^16.2.2",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
     "mocha": "^8.0.1",
     "rollup": "^2.0.0",
     "rollup-plugin-commonjs": "^10.1.0",

From 8dcdddd4552bf0de6f84ab3a129426f73a7fa73d Mon Sep 17 00:00:00 2001
From: Gabriel Staples <ercaguy@gmail.com>
Date: Mon, 27 Jul 2020 07:01:52 -0700
Subject: [PATCH 010/223] (chore) Update SUPPORTED_LANGUAGES.md to add
 `arduino` (#2639)

---
 SUPPORTED_LANGUAGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index bef0f0de66..468730cb26 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -12,6 +12,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | ABNF                    | abnf                   |         |
 | Access logs             | accesslog              |         |
 | Ada                     | ada                    |         |
+| Arduino (C++ w/Arduino libs) | arduino ino           |         |
 | ARM assembler           | armasm, arm            |         |
 | AVR assembler           | avrasm                 |         |
 | ActionScript            | actionscript, as       |         |

From a2a7db5d8f9cfdb28c99751fed9a55d17631511d Mon Sep 17 00:00:00 2001
From: ezksd <ezksdo@gmail.com>
Date: Mon, 3 Aug 2020 09:12:41 +0800
Subject: [PATCH 011/223] enh(java) class definitions could start with keyword
 `enum` (#2643)

---
 CHANGES.md            | 2 ++
 src/languages/java.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c641b19cfd..27f3dae26c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,11 +9,13 @@ Language Improvements:
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
 - fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
 - fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
+- enh(java) Add support for `enum`, which will identify as a `class` now (#2643) [ezksd][]
 
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
 [kageru]: https://github.com/kageru
 [night]: https://github.com/night
+[ezksd]: https://github.com/ezksd
 
 
 ## Version 10.1.1
diff --git a/src/languages/java.js b/src/languages/java.js
index 395a80d86a..13ae1c5fc2 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -98,8 +98,8 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /[{;=]/, excludeEnd: true,
-        keywords: 'class interface',
+        beginKeywords: 'class interface enum', end: /[{;=]/, excludeEnd: true,
+        keywords: 'class interface enum',
         illegal: /[:"\[\]]/,
         contains: [
           { beginKeywords: 'extends implements' },

From bc7c2a1dc4445d79e38976d903a4d3c8b1e2e1ff Mon Sep 17 00:00:00 2001
From: Alireza Rezaee <alireza-git-commits@rezaee.org>
Date: Wed, 5 Aug 2020 01:02:50 +0430
Subject: [PATCH 012/223] (chore) Update CDN urls to version 10.1.2 (#2645)

---
 README.md    | 10 +++++-----
 README.ru.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 445e0489b1..03b249a37e 100644
--- a/README.md
+++ b/README.md
@@ -199,19 +199,19 @@ A prebuilt version of highlight.js bundled with many common languages is hosted
 
 ```html
 <link rel="stylesheet"
-      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/default.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js"></script>
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/go.min.js"></script>
 ```
 
 **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release))
 
 ```html
 <link rel="stylesheet"
-      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/styles/default.min.css">
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/highlight.min.js"></script>
+      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/styles/default.min.css">
+<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/highlight.min.js"></script>
 ```
 
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be
diff --git a/README.ru.md b/README.ru.md
index 7f7badc8e8..26afb40106 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -108,7 +108,7 @@ Highlight.js можно использовать в браузере прямо
 
 ```html
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/go.min.js"></script>
 ```
 
 **Про Almond.** Нужно задать имя модуля в оптимизаторе, например:

From d3aa27fe73d20f6aa4bdd64804a78cc60988e29e Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 5 Aug 2020 21:56:47 -0400
Subject: [PATCH 013/223] (chore) document support for older versions

---
 OLD_VERSIONS.md | 14 ++++++++++++++
 README.md       |  9 ++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 OLD_VERSIONS.md

diff --git a/OLD_VERSIONS.md b/OLD_VERSIONS.md
new file mode 100644
index 0000000000..e287aeac34
--- /dev/null
+++ b/OLD_VERSIONS.md
@@ -0,0 +1,14 @@
+## Support for Older Versions
+
+Due to both time and resource constrains the Highlight.js core team only fully supports the most current major version of the library. The prior major release will only receive critical security updates (when feasible).
+
+| Version | Status  | EOL |
+| :-----: | :------------ | :-: | - |
+| 10.x | *Current.* Regular updates; bug fixes & new features. | n/a |
+| 9.18.x | *Deprecated.* Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). | TBD |
+| < 9.17.x | Obsolete. | Jan 2020 |
+| 8.x | Obsolete. |  |
+| 7.x | Obsolete. |  |
+| Older | Obsolete. |  |
+
+Support for IE11 is really the only reason anyone should still prefer version 9. It's recommended that everyone else upgrade.
diff --git a/README.md b/README.md
index 03b249a37e..16f1c62046 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ the browser as well as on the server. It works with pretty much any
 markup, doesn’t depend on any framework, and has automatic language
 detection.
 
-## Upgrading from Version 9
+#### Upgrading to Version 10
 
 Version 10 is one of the biggest releases in quite some time.  If you're
 upgrading from version 9, there are some breaking changes and things you may
@@ -15,11 +15,14 @@ want to double check first.
 
 Please read [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md) for  high-level summary of breaking changes and any actions you may need to take. See [VERSION_10_BREAKING_CHANGES.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_BREAKING_CHANGES.md) for a more detailed list and [CHANGES.md](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md) to learn what else is new.
 
+##### Support for older versions
+
+Please see [OLD_VERSIONS.md](https://github.com/highlightjs/highlight.js/blob/master/OLD_VERSIONS.md) for support information.
+
 ## Getting Started
 
 The bare minimum for using highlight.js on a web page is linking to the
-library along with one of the styles and calling
-[`initHighlightingOnLoad`][1]:
+library along with one of the styles and calling [`initHighlightingOnLoad`][1]:
 
 ```html
 <link rel="stylesheet" href="/path/to/styles/default.css">

From bf5b797c788b0e8fe71bbe82b5a871f79e52967b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 5 Aug 2020 21:58:56 -0400
Subject: [PATCH 014/223] (chore) Fix broken encoding of Markdown table

---
 OLD_VERSIONS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OLD_VERSIONS.md b/OLD_VERSIONS.md
index e287aeac34..62b9ea014d 100644
--- a/OLD_VERSIONS.md
+++ b/OLD_VERSIONS.md
@@ -3,7 +3,7 @@
 Due to both time and resource constrains the Highlight.js core team only fully supports the most current major version of the library. The prior major release will only receive critical security updates (when feasible).
 
 | Version | Status  | EOL |
-| :-----: | :------------ | :-: | - |
+| :-----: | :------ | :-: | 
 | 10.x | *Current.* Regular updates; bug fixes & new features. | n/a |
 | 9.18.x | *Deprecated.* Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). | TBD |
 | < 9.17.x | Obsolete. | Jan 2020 |

From 8965ebe6967f5adcb8d848b9de695e7dca41b995 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 5 Aug 2020 22:28:30 -0400
Subject: [PATCH 015/223] (parser) Add basic Vue.js component and examples.
 (#2544)

- add basic Vue.js component
- add simple usage case to the README
- eat our own dogfood with `tools/developer.html` now using the Vue plugin just for fun
---
 CHANGES.md           |     5 +
 README.md            |    20 +
 demo/vue.js          | 11965 +++++++++++++++++++++++++++++++++++++++++
 src/highlight.js     |     5 +-
 src/plugins/vue.js   |    63 +
 tools/developer.html |    27 +-
 6 files changed, 12077 insertions(+), 8 deletions(-)
 create mode 100644 demo/vue.js
 create mode 100644 src/plugins/vue.js

diff --git a/CHANGES.md b/CHANGES.md
index 27f3dae26c..c098bc8690 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,10 @@ New themes:
 
 - *Gradient Light* by [Samia Ali]()
 
+Big picture:
+
+- Add simple Vue plugin for basic use cases (#2544) [Josh Goebel][]
+
 Language Improvements:
 
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
@@ -11,6 +15,7 @@ Language Improvements:
 - fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
 - enh(java) Add support for `enum`, which will identify as a `class` now (#2643) [ezksd][]
 
+[Josh Goebel]: https://github.com/yyyc514
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
 [kageru]: https://github.com/kageru
diff --git a/README.md b/README.md
index 16f1c62046..81d81faefb 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,26 @@ document.querySelectorAll('div.code').forEach((block) => {
 For other options refer to the documentation for [`configure`][4].
 
 
+## Using with Vue.js
+
+Simply register the plugin with Vue:
+
+```js
+Vue.use(hljs.vuePlugin);
+```
+
+And you'll be provided with a `highlightjs` component for use
+in your templates:
+
+```html
+  <div id="app">
+    <!-- bind to a data property named `code` -->
+    <highlightjs autodetect :code="code" />
+    <!-- or literal code works as well -->
+    <highlightjs language='javascript' code="var x = 5;" />
+  </div>
+```
+
 ## Web Workers
 
 You can run highlighting inside a web worker to avoid freezing the browser
diff --git a/demo/vue.js b/demo/vue.js
new file mode 100644
index 0000000000..e22cf13003
--- /dev/null
+++ b/demo/vue.js
@@ -0,0 +1,11965 @@
+/*!
+ * Vue.js v2.6.11
+ * (c) 2014-2019 Evan You
+ * Released under the MIT License.
+ */
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = global || self, global.Vue = factory());
+}(this, function () { 'use strict';
+
+  /*  */
+
+  var emptyObject = Object.freeze({});
+
+  // These helpers produce better VM code in JS engines due to their
+  // explicitness and function inlining.
+  function isUndef (v) {
+    return v === undefined || v === null
+  }
+
+  function isDef (v) {
+    return v !== undefined && v !== null
+  }
+
+  function isTrue (v) {
+    return v === true
+  }
+
+  function isFalse (v) {
+    return v === false
+  }
+
+  /**
+   * Check if value is primitive.
+   */
+  function isPrimitive (value) {
+    return (
+      typeof value === 'string' ||
+      typeof value === 'number' ||
+      // $flow-disable-line
+      typeof value === 'symbol' ||
+      typeof value === 'boolean'
+    )
+  }
+
+  /**
+   * Quick object check - this is primarily used to tell
+   * Objects from primitive values when we know the value
+   * is a JSON-compliant type.
+   */
+  function isObject (obj) {
+    return obj !== null && typeof obj === 'object'
+  }
+
+  /**
+   * Get the raw type string of a value, e.g., [object Object].
+   */
+  var _toString = Object.prototype.toString;
+
+  function toRawType (value) {
+    return _toString.call(value).slice(8, -1)
+  }
+
+  /**
+   * Strict object type check. Only returns true
+   * for plain JavaScript objects.
+   */
+  function isPlainObject (obj) {
+    return _toString.call(obj) === '[object Object]'
+  }
+
+  function isRegExp (v) {
+    return _toString.call(v) === '[object RegExp]'
+  }
+
+  /**
+   * Check if val is a valid array index.
+   */
+  function isValidArrayIndex (val) {
+    var n = parseFloat(String(val));
+    return n >= 0 && Math.floor(n) === n && isFinite(val)
+  }
+
+  function isPromise (val) {
+    return (
+      isDef(val) &&
+      typeof val.then === 'function' &&
+      typeof val.catch === 'function'
+    )
+  }
+
+  /**
+   * Convert a value to a string that is actually rendered.
+   */
+  function toString (val) {
+    return val == null
+      ? ''
+      : Array.isArray(val) || (isPlainObject(val) && val.toString === _toString)
+        ? JSON.stringify(val, null, 2)
+        : String(val)
+  }
+
+  /**
+   * Convert an input value to a number for persistence.
+   * If the conversion fails, return original string.
+   */
+  function toNumber (val) {
+    var n = parseFloat(val);
+    return isNaN(n) ? val : n
+  }
+
+  /**
+   * Make a map and return a function for checking if a key
+   * is in that map.
+   */
+  function makeMap (
+    str,
+    expectsLowerCase
+  ) {
+    var map = Object.create(null);
+    var list = str.split(',');
+    for (var i = 0; i < list.length; i++) {
+      map[list[i]] = true;
+    }
+    return expectsLowerCase
+      ? function (val) { return map[val.toLowerCase()]; }
+      : function (val) { return map[val]; }
+  }
+
+  /**
+   * Check if a tag is a built-in tag.
+   */
+  var isBuiltInTag = makeMap('slot,component', true);
+
+  /**
+   * Check if an attribute is a reserved attribute.
+   */
+  var isReservedAttribute = makeMap('key,ref,slot,slot-scope,is');
+
+  /**
+   * Remove an item from an array.
+   */
+  function remove (arr, item) {
+    if (arr.length) {
+      var index = arr.indexOf(item);
+      if (index > -1) {
+        return arr.splice(index, 1)
+      }
+    }
+  }
+
+  /**
+   * Check whether an object has the property.
+   */
+  var hasOwnProperty = Object.prototype.hasOwnProperty;
+  function hasOwn (obj, key) {
+    return hasOwnProperty.call(obj, key)
+  }
+
+  /**
+   * Create a cached version of a pure function.
+   */
+  function cached (fn) {
+    var cache = Object.create(null);
+    return (function cachedFn (str) {
+      var hit = cache[str];
+      return hit || (cache[str] = fn(str))
+    })
+  }
+
+  /**
+   * Camelize a hyphen-delimited string.
+   */
+  var camelizeRE = /-(\w)/g;
+  var camelize = cached(function (str) {
+    return str.replace(camelizeRE, function (_, c) { return c ? c.toUpperCase() : ''; })
+  });
+
+  /**
+   * Capitalize a string.
+   */
+  var capitalize = cached(function (str) {
+    return str.charAt(0).toUpperCase() + str.slice(1)
+  });
+
+  /**
+   * Hyphenate a camelCase string.
+   */
+  var hyphenateRE = /\B([A-Z])/g;
+  var hyphenate = cached(function (str) {
+    return str.replace(hyphenateRE, '-$1').toLowerCase()
+  });
+
+  /**
+   * Simple bind polyfill for environments that do not support it,
+   * e.g., PhantomJS 1.x. Technically, we don't need this anymore
+   * since native bind is now performant enough in most browsers.
+   * But removing it would mean breaking code that was able to run in
+   * PhantomJS 1.x, so this must be kept for backward compatibility.
+   */
+
+  /* istanbul ignore next */
+  function polyfillBind (fn, ctx) {
+    function boundFn (a) {
+      var l = arguments.length;
+      return l
+        ? l > 1
+          ? fn.apply(ctx, arguments)
+          : fn.call(ctx, a)
+        : fn.call(ctx)
+    }
+
+    boundFn._length = fn.length;
+    return boundFn
+  }
+
+  function nativeBind (fn, ctx) {
+    return fn.bind(ctx)
+  }
+
+  var bind = Function.prototype.bind
+    ? nativeBind
+    : polyfillBind;
+
+  /**
+   * Convert an Array-like object to a real Array.
+   */
+  function toArray (list, start) {
+    start = start || 0;
+    var i = list.length - start;
+    var ret = new Array(i);
+    while (i--) {
+      ret[i] = list[i + start];
+    }
+    return ret
+  }
+
+  /**
+   * Mix properties into target object.
+   */
+  function extend (to, _from) {
+    for (var key in _from) {
+      to[key] = _from[key];
+    }
+    return to
+  }
+
+  /**
+   * Merge an Array of Objects into a single Object.
+   */
+  function toObject (arr) {
+    var res = {};
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i]) {
+        extend(res, arr[i]);
+      }
+    }
+    return res
+  }
+
+  /* eslint-disable no-unused-vars */
+
+  /**
+   * Perform no operation.
+   * Stubbing args to make Flow happy without leaving useless transpiled code
+   * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/).
+   */
+  function noop (a, b, c) {}
+
+  /**
+   * Always return false.
+   */
+  var no = function (a, b, c) { return false; };
+
+  /* eslint-enable no-unused-vars */
+
+  /**
+   * Return the same value.
+   */
+  var identity = function (_) { return _; };
+
+  /**
+   * Generate a string containing static keys from compiler modules.
+   */
+  function genStaticKeys (modules) {
+    return modules.reduce(function (keys, m) {
+      return keys.concat(m.staticKeys || [])
+    }, []).join(',')
+  }
+
+  /**
+   * Check if two values are loosely equal - that is,
+   * if they are plain objects, do they have the same shape?
+   */
+  function looseEqual (a, b) {
+    if (a === b) { return true }
+    var isObjectA = isObject(a);
+    var isObjectB = isObject(b);
+    if (isObjectA && isObjectB) {
+      try {
+        var isArrayA = Array.isArray(a);
+        var isArrayB = Array.isArray(b);
+        if (isArrayA && isArrayB) {
+          return a.length === b.length && a.every(function (e, i) {
+            return looseEqual(e, b[i])
+          })
+        } else if (a instanceof Date && b instanceof Date) {
+          return a.getTime() === b.getTime()
+        } else if (!isArrayA && !isArrayB) {
+          var keysA = Object.keys(a);
+          var keysB = Object.keys(b);
+          return keysA.length === keysB.length && keysA.every(function (key) {
+            return looseEqual(a[key], b[key])
+          })
+        } else {
+          /* istanbul ignore next */
+          return false
+        }
+      } catch (e) {
+        /* istanbul ignore next */
+        return false
+      }
+    } else if (!isObjectA && !isObjectB) {
+      return String(a) === String(b)
+    } else {
+      return false
+    }
+  }
+
+  /**
+   * Return the first index at which a loosely equal value can be
+   * found in the array (if value is a plain object, the array must
+   * contain an object of the same shape), or -1 if it is not present.
+   */
+  function looseIndexOf (arr, val) {
+    for (var i = 0; i < arr.length; i++) {
+      if (looseEqual(arr[i], val)) { return i }
+    }
+    return -1
+  }
+
+  /**
+   * Ensure a function is called only once.
+   */
+  function once (fn) {
+    var called = false;
+    return function () {
+      if (!called) {
+        called = true;
+        fn.apply(this, arguments);
+      }
+    }
+  }
+
+  var SSR_ATTR = 'data-server-rendered';
+
+  var ASSET_TYPES = [
+    'component',
+    'directive',
+    'filter'
+  ];
+
+  var LIFECYCLE_HOOKS = [
+    'beforeCreate',
+    'created',
+    'beforeMount',
+    'mounted',
+    'beforeUpdate',
+    'updated',
+    'beforeDestroy',
+    'destroyed',
+    'activated',
+    'deactivated',
+    'errorCaptured',
+    'serverPrefetch'
+  ];
+
+  /*  */
+
+
+
+  var config = ({
+    /**
+     * Option merge strategies (used in core/util/options)
+     */
+    // $flow-disable-line
+    optionMergeStrategies: Object.create(null),
+
+    /**
+     * Whether to suppress warnings.
+     */
+    silent: false,
+
+    /**
+     * Show production mode tip message on boot?
+     */
+    productionTip: "development" !== 'production',
+
+    /**
+     * Whether to enable devtools
+     */
+    devtools: "development" !== 'production',
+
+    /**
+     * Whether to record perf
+     */
+    performance: false,
+
+    /**
+     * Error handler for watcher errors
+     */
+    errorHandler: null,
+
+    /**
+     * Warn handler for watcher warns
+     */
+    warnHandler: null,
+
+    /**
+     * Ignore certain custom elements
+     */
+    ignoredElements: [],
+
+    /**
+     * Custom user key aliases for v-on
+     */
+    // $flow-disable-line
+    keyCodes: Object.create(null),
+
+    /**
+     * Check if a tag is reserved so that it cannot be registered as a
+     * component. This is platform-dependent and may be overwritten.
+     */
+    isReservedTag: no,
+
+    /**
+     * Check if an attribute is reserved so that it cannot be used as a component
+     * prop. This is platform-dependent and may be overwritten.
+     */
+    isReservedAttr: no,
+
+    /**
+     * Check if a tag is an unknown element.
+     * Platform-dependent.
+     */
+    isUnknownElement: no,
+
+    /**
+     * Get the namespace of an element
+     */
+    getTagNamespace: noop,
+
+    /**
+     * Parse the real tag name for the specific platform.
+     */
+    parsePlatformTagName: identity,
+
+    /**
+     * Check if an attribute must be bound using property, e.g. value
+     * Platform-dependent.
+     */
+    mustUseProp: no,
+
+    /**
+     * Perform updates asynchronously. Intended to be used by Vue Test Utils
+     * This will significantly reduce performance if set to false.
+     */
+    async: true,
+
+    /**
+     * Exposed for legacy reasons
+     */
+    _lifecycleHooks: LIFECYCLE_HOOKS
+  });
+
+  /*  */
+
+  /**
+   * unicode letters used for parsing html tags, component names and property paths.
+   * using https://www.w3.org/TR/html53/semantics-scripting.html#potentialcustomelementname
+   * skipping \u10000-\uEFFFF due to it freezing up PhantomJS
+   */
+  var unicodeRegExp = /a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/;
+
+  /**
+   * Check if a string starts with $ or _
+   */
+  function isReserved (str) {
+    var c = (str + '').charCodeAt(0);
+    return c === 0x24 || c === 0x5F
+  }
+
+  /**
+   * Define a property.
+   */
+  function def (obj, key, val, enumerable) {
+    Object.defineProperty(obj, key, {
+      value: val,
+      enumerable: !!enumerable,
+      writable: true,
+      configurable: true
+    });
+  }
+
+  /**
+   * Parse simple path.
+   */
+  var bailRE = new RegExp(("[^" + (unicodeRegExp.source) + ".$_\\d]"));
+  function parsePath (path) {
+    if (bailRE.test(path)) {
+      return
+    }
+    var segments = path.split('.');
+    return function (obj) {
+      for (var i = 0; i < segments.length; i++) {
+        if (!obj) { return }
+        obj = obj[segments[i]];
+      }
+      return obj
+    }
+  }
+
+  /*  */
+
+  // can we use __proto__?
+  var hasProto = '__proto__' in {};
+
+  // Browser environment sniffing
+  var inBrowser = typeof window !== 'undefined';
+  var inWeex = typeof WXEnvironment !== 'undefined' && !!WXEnvironment.platform;
+  var weexPlatform = inWeex && WXEnvironment.platform.toLowerCase();
+  var UA = inBrowser && window.navigator.userAgent.toLowerCase();
+  var isIE = UA && /msie|trident/.test(UA);
+  var isIE9 = UA && UA.indexOf('msie 9.0') > 0;
+  var isEdge = UA && UA.indexOf('edge/') > 0;
+  var isAndroid = (UA && UA.indexOf('android') > 0) || (weexPlatform === 'android');
+  var isIOS = (UA && /iphone|ipad|ipod|ios/.test(UA)) || (weexPlatform === 'ios');
+  var isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge;
+  var isPhantomJS = UA && /phantomjs/.test(UA);
+  var isFF = UA && UA.match(/firefox\/(\d+)/);
+
+  // Firefox has a "watch" function on Object.prototype...
+  var nativeWatch = ({}).watch;
+
+  var supportsPassive = false;
+  if (inBrowser) {
+    try {
+      var opts = {};
+      Object.defineProperty(opts, 'passive', ({
+        get: function get () {
+          /* istanbul ignore next */
+          supportsPassive = true;
+        }
+      })); // https://github.com/facebook/flow/issues/285
+      window.addEventListener('test-passive', null, opts);
+    } catch (e) {}
+  }
+
+  // this needs to be lazy-evaled because vue may be required before
+  // vue-server-renderer can set VUE_ENV
+  var _isServer;
+  var isServerRendering = function () {
+    if (_isServer === undefined) {
+      /* istanbul ignore if */
+      if (!inBrowser && !inWeex && typeof global !== 'undefined') {
+        // detect presence of vue-server-renderer and avoid
+        // Webpack shimming the process
+        _isServer = global['process'] && global['process'].env.VUE_ENV === 'server';
+      } else {
+        _isServer = false;
+      }
+    }
+    return _isServer
+  };
+
+  // detect devtools
+  var devtools = inBrowser && window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
+
+  /* istanbul ignore next */
+  function isNative (Ctor) {
+    return typeof Ctor === 'function' && /native code/.test(Ctor.toString())
+  }
+
+  var hasSymbol =
+    typeof Symbol !== 'undefined' && isNative(Symbol) &&
+    typeof Reflect !== 'undefined' && isNative(Reflect.ownKeys);
+
+  var _Set;
+  /* istanbul ignore if */ // $flow-disable-line
+  if (typeof Set !== 'undefined' && isNative(Set)) {
+    // use native Set when available.
+    _Set = Set;
+  } else {
+    // a non-standard Set polyfill that only works with primitive keys.
+    _Set = /*@__PURE__*/(function () {
+      function Set () {
+        this.set = Object.create(null);
+      }
+      Set.prototype.has = function has (key) {
+        return this.set[key] === true
+      };
+      Set.prototype.add = function add (key) {
+        this.set[key] = true;
+      };
+      Set.prototype.clear = function clear () {
+        this.set = Object.create(null);
+      };
+
+      return Set;
+    }());
+  }
+
+  /*  */
+
+  var warn = noop;
+  var tip = noop;
+  var generateComponentTrace = (noop); // work around flow check
+  var formatComponentName = (noop);
+
+  {
+    var hasConsole = typeof console !== 'undefined';
+    var classifyRE = /(?:^|[-_])(\w)/g;
+    var classify = function (str) { return str
+      .replace(classifyRE, function (c) { return c.toUpperCase(); })
+      .replace(/[-_]/g, ''); };
+
+    warn = function (msg, vm) {
+      var trace = vm ? generateComponentTrace(vm) : '';
+
+      if (config.warnHandler) {
+        config.warnHandler.call(null, msg, vm, trace);
+      } else if (hasConsole && (!config.silent)) {
+        console.error(("[Vue warn]: " + msg + trace));
+      }
+    };
+
+    tip = function (msg, vm) {
+      if (hasConsole && (!config.silent)) {
+        console.warn("[Vue tip]: " + msg + (
+          vm ? generateComponentTrace(vm) : ''
+        ));
+      }
+    };
+
+    formatComponentName = function (vm, includeFile) {
+      if (vm.$root === vm) {
+        return '<Root>'
+      }
+      var options = typeof vm === 'function' && vm.cid != null
+        ? vm.options
+        : vm._isVue
+          ? vm.$options || vm.constructor.options
+          : vm;
+      var name = options.name || options._componentTag;
+      var file = options.__file;
+      if (!name && file) {
+        var match = file.match(/([^/\\]+)\.vue$/);
+        name = match && match[1];
+      }
+
+      return (
+        (name ? ("<" + (classify(name)) + ">") : "<Anonymous>") +
+        (file && includeFile !== false ? (" at " + file) : '')
+      )
+    };
+
+    var repeat = function (str, n) {
+      var res = '';
+      while (n) {
+        if (n % 2 === 1) { res += str; }
+        if (n > 1) { str += str; }
+        n >>= 1;
+      }
+      return res
+    };
+
+    generateComponentTrace = function (vm) {
+      if (vm._isVue && vm.$parent) {
+        var tree = [];
+        var currentRecursiveSequence = 0;
+        while (vm) {
+          if (tree.length > 0) {
+            var last = tree[tree.length - 1];
+            if (last.constructor === vm.constructor) {
+              currentRecursiveSequence++;
+              vm = vm.$parent;
+              continue
+            } else if (currentRecursiveSequence > 0) {
+              tree[tree.length - 1] = [last, currentRecursiveSequence];
+              currentRecursiveSequence = 0;
+            }
+          }
+          tree.push(vm);
+          vm = vm.$parent;
+        }
+        return '\n\nfound in\n\n' + tree
+          .map(function (vm, i) { return ("" + (i === 0 ? '---> ' : repeat(' ', 5 + i * 2)) + (Array.isArray(vm)
+              ? ((formatComponentName(vm[0])) + "... (" + (vm[1]) + " recursive calls)")
+              : formatComponentName(vm))); })
+          .join('\n')
+      } else {
+        return ("\n\n(found in " + (formatComponentName(vm)) + ")")
+      }
+    };
+  }
+
+  /*  */
+
+  var uid = 0;
+
+  /**
+   * A dep is an observable that can have multiple
+   * directives subscribing to it.
+   */
+  var Dep = function Dep () {
+    this.id = uid++;
+    this.subs = [];
+  };
+
+  Dep.prototype.addSub = function addSub (sub) {
+    this.subs.push(sub);
+  };
+
+  Dep.prototype.removeSub = function removeSub (sub) {
+    remove(this.subs, sub);
+  };
+
+  Dep.prototype.depend = function depend () {
+    if (Dep.target) {
+      Dep.target.addDep(this);
+    }
+  };
+
+  Dep.prototype.notify = function notify () {
+    // stabilize the subscriber list first
+    var subs = this.subs.slice();
+    if (!config.async) {
+      // subs aren't sorted in scheduler if not running async
+      // we need to sort them now to make sure they fire in correct
+      // order
+      subs.sort(function (a, b) { return a.id - b.id; });
+    }
+    for (var i = 0, l = subs.length; i < l; i++) {
+      subs[i].update();
+    }
+  };
+
+  // The current target watcher being evaluated.
+  // This is globally unique because only one watcher
+  // can be evaluated at a time.
+  Dep.target = null;
+  var targetStack = [];
+
+  function pushTarget (target) {
+    targetStack.push(target);
+    Dep.target = target;
+  }
+
+  function popTarget () {
+    targetStack.pop();
+    Dep.target = targetStack[targetStack.length - 1];
+  }
+
+  /*  */
+
+  var VNode = function VNode (
+    tag,
+    data,
+    children,
+    text,
+    elm,
+    context,
+    componentOptions,
+    asyncFactory
+  ) {
+    this.tag = tag;
+    this.data = data;
+    this.children = children;
+    this.text = text;
+    this.elm = elm;
+    this.ns = undefined;
+    this.context = context;
+    this.fnContext = undefined;
+    this.fnOptions = undefined;
+    this.fnScopeId = undefined;
+    this.key = data && data.key;
+    this.componentOptions = componentOptions;
+    this.componentInstance = undefined;
+    this.parent = undefined;
+    this.raw = false;
+    this.isStatic = false;
+    this.isRootInsert = true;
+    this.isComment = false;
+    this.isCloned = false;
+    this.isOnce = false;
+    this.asyncFactory = asyncFactory;
+    this.asyncMeta = undefined;
+    this.isAsyncPlaceholder = false;
+  };
+
+  var prototypeAccessors = { child: { configurable: true } };
+
+  // DEPRECATED: alias for componentInstance for backwards compat.
+  /* istanbul ignore next */
+  prototypeAccessors.child.get = function () {
+    return this.componentInstance
+  };
+
+  Object.defineProperties( VNode.prototype, prototypeAccessors );
+
+  var createEmptyVNode = function (text) {
+    if ( text === void 0 ) text = '';
+
+    var node = new VNode();
+    node.text = text;
+    node.isComment = true;
+    return node
+  };
+
+  function createTextVNode (val) {
+    return new VNode(undefined, undefined, undefined, String(val))
+  }
+
+  // optimized shallow clone
+  // used for static nodes and slot nodes because they may be reused across
+  // multiple renders, cloning them avoids errors when DOM manipulations rely
+  // on their elm reference.
+  function cloneVNode (vnode) {
+    var cloned = new VNode(
+      vnode.tag,
+      vnode.data,
+      // #7975
+      // clone children array to avoid mutating original in case of cloning
+      // a child.
+      vnode.children && vnode.children.slice(),
+      vnode.text,
+      vnode.elm,
+      vnode.context,
+      vnode.componentOptions,
+      vnode.asyncFactory
+    );
+    cloned.ns = vnode.ns;
+    cloned.isStatic = vnode.isStatic;
+    cloned.key = vnode.key;
+    cloned.isComment = vnode.isComment;
+    cloned.fnContext = vnode.fnContext;
+    cloned.fnOptions = vnode.fnOptions;
+    cloned.fnScopeId = vnode.fnScopeId;
+    cloned.asyncMeta = vnode.asyncMeta;
+    cloned.isCloned = true;
+    return cloned
+  }
+
+  /*
+   * not type checking this file because flow doesn't play well with
+   * dynamically accessing methods on Array prototype
+   */
+
+  var arrayProto = Array.prototype;
+  var arrayMethods = Object.create(arrayProto);
+
+  var methodsToPatch = [
+    'push',
+    'pop',
+    'shift',
+    'unshift',
+    'splice',
+    'sort',
+    'reverse'
+  ];
+
+  /**
+   * Intercept mutating methods and emit events
+   */
+  methodsToPatch.forEach(function (method) {
+    // cache original method
+    var original = arrayProto[method];
+    def(arrayMethods, method, function mutator () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var result = original.apply(this, args);
+      var ob = this.__ob__;
+      var inserted;
+      switch (method) {
+        case 'push':
+        case 'unshift':
+          inserted = args;
+          break
+        case 'splice':
+          inserted = args.slice(2);
+          break
+      }
+      if (inserted) { ob.observeArray(inserted); }
+      // notify change
+      ob.dep.notify();
+      return result
+    });
+  });
+
+  /*  */
+
+  var arrayKeys = Object.getOwnPropertyNames(arrayMethods);
+
+  /**
+   * In some cases we may want to disable observation inside a component's
+   * update computation.
+   */
+  var shouldObserve = true;
+
+  function toggleObserving (value) {
+    shouldObserve = value;
+  }
+
+  /**
+   * Observer class that is attached to each observed
+   * object. Once attached, the observer converts the target
+   * object's property keys into getter/setters that
+   * collect dependencies and dispatch updates.
+   */
+  var Observer = function Observer (value) {
+    this.value = value;
+    this.dep = new Dep();
+    this.vmCount = 0;
+    def(value, '__ob__', this);
+    if (Array.isArray(value)) {
+      if (hasProto) {
+        protoAugment(value, arrayMethods);
+      } else {
+        copyAugment(value, arrayMethods, arrayKeys);
+      }
+      this.observeArray(value);
+    } else {
+      this.walk(value);
+    }
+  };
+
+  /**
+   * Walk through all properties and convert them into
+   * getter/setters. This method should only be called when
+   * value type is Object.
+   */
+  Observer.prototype.walk = function walk (obj) {
+    var keys = Object.keys(obj);
+    for (var i = 0; i < keys.length; i++) {
+      defineReactive$$1(obj, keys[i]);
+    }
+  };
+
+  /**
+   * Observe a list of Array items.
+   */
+  Observer.prototype.observeArray = function observeArray (items) {
+    for (var i = 0, l = items.length; i < l; i++) {
+      observe(items[i]);
+    }
+  };
+
+  // helpers
+
+  /**
+   * Augment a target Object or Array by intercepting
+   * the prototype chain using __proto__
+   */
+  function protoAugment (target, src) {
+    /* eslint-disable no-proto */
+    target.__proto__ = src;
+    /* eslint-enable no-proto */
+  }
+
+  /**
+   * Augment a target Object or Array by defining
+   * hidden properties.
+   */
+  /* istanbul ignore next */
+  function copyAugment (target, src, keys) {
+    for (var i = 0, l = keys.length; i < l; i++) {
+      var key = keys[i];
+      def(target, key, src[key]);
+    }
+  }
+
+  /**
+   * Attempt to create an observer instance for a value,
+   * returns the new observer if successfully observed,
+   * or the existing observer if the value already has one.
+   */
+  function observe (value, asRootData) {
+    if (!isObject(value) || value instanceof VNode) {
+      return
+    }
+    var ob;
+    if (hasOwn(value, '__ob__') && value.__ob__ instanceof Observer) {
+      ob = value.__ob__;
+    } else if (
+      shouldObserve &&
+      !isServerRendering() &&
+      (Array.isArray(value) || isPlainObject(value)) &&
+      Object.isExtensible(value) &&
+      !value._isVue
+    ) {
+      ob = new Observer(value);
+    }
+    if (asRootData && ob) {
+      ob.vmCount++;
+    }
+    return ob
+  }
+
+  /**
+   * Define a reactive property on an Object.
+   */
+  function defineReactive$$1 (
+    obj,
+    key,
+    val,
+    customSetter,
+    shallow
+  ) {
+    var dep = new Dep();
+
+    var property = Object.getOwnPropertyDescriptor(obj, key);
+    if (property && property.configurable === false) {
+      return
+    }
+
+    // cater for pre-defined getter/setters
+    var getter = property && property.get;
+    var setter = property && property.set;
+    if ((!getter || setter) && arguments.length === 2) {
+      val = obj[key];
+    }
+
+    var childOb = !shallow && observe(val);
+    Object.defineProperty(obj, key, {
+      enumerable: true,
+      configurable: true,
+      get: function reactiveGetter () {
+        var value = getter ? getter.call(obj) : val;
+        if (Dep.target) {
+          dep.depend();
+          if (childOb) {
+            childOb.dep.depend();
+            if (Array.isArray(value)) {
+              dependArray(value);
+            }
+          }
+        }
+        return value
+      },
+      set: function reactiveSetter (newVal) {
+        var value = getter ? getter.call(obj) : val;
+        /* eslint-disable no-self-compare */
+        if (newVal === value || (newVal !== newVal && value !== value)) {
+          return
+        }
+        /* eslint-enable no-self-compare */
+        if (customSetter) {
+          customSetter();
+        }
+        // #7981: for accessor properties without setter
+        if (getter && !setter) { return }
+        if (setter) {
+          setter.call(obj, newVal);
+        } else {
+          val = newVal;
+        }
+        childOb = !shallow && observe(newVal);
+        dep.notify();
+      }
+    });
+  }
+
+  /**
+   * Set a property on an object. Adds the new property and
+   * triggers change notification if the property doesn't
+   * already exist.
+   */
+  function set (target, key, val) {
+    if (isUndef(target) || isPrimitive(target)
+    ) {
+      warn(("Cannot set reactive property on undefined, null, or primitive value: " + ((target))));
+    }
+    if (Array.isArray(target) && isValidArrayIndex(key)) {
+      target.length = Math.max(target.length, key);
+      target.splice(key, 1, val);
+      return val
+    }
+    if (key in target && !(key in Object.prototype)) {
+      target[key] = val;
+      return val
+    }
+    var ob = (target).__ob__;
+    if (target._isVue || (ob && ob.vmCount)) {
+      warn(
+        'Avoid adding reactive properties to a Vue instance or its root $data ' +
+        'at runtime - declare it upfront in the data option.'
+      );
+      return val
+    }
+    if (!ob) {
+      target[key] = val;
+      return val
+    }
+    defineReactive$$1(ob.value, key, val);
+    ob.dep.notify();
+    return val
+  }
+
+  /**
+   * Delete a property and trigger change if necessary.
+   */
+  function del (target, key) {
+    if (isUndef(target) || isPrimitive(target)
+    ) {
+      warn(("Cannot delete reactive property on undefined, null, or primitive value: " + ((target))));
+    }
+    if (Array.isArray(target) && isValidArrayIndex(key)) {
+      target.splice(key, 1);
+      return
+    }
+    var ob = (target).__ob__;
+    if (target._isVue || (ob && ob.vmCount)) {
+      warn(
+        'Avoid deleting properties on a Vue instance or its root $data ' +
+        '- just set it to null.'
+      );
+      return
+    }
+    if (!hasOwn(target, key)) {
+      return
+    }
+    delete target[key];
+    if (!ob) {
+      return
+    }
+    ob.dep.notify();
+  }
+
+  /**
+   * Collect dependencies on array elements when the array is touched, since
+   * we cannot intercept array element access like property getters.
+   */
+  function dependArray (value) {
+    for (var e = (void 0), i = 0, l = value.length; i < l; i++) {
+      e = value[i];
+      e && e.__ob__ && e.__ob__.dep.depend();
+      if (Array.isArray(e)) {
+        dependArray(e);
+      }
+    }
+  }
+
+  /*  */
+
+  /**
+   * Option overwriting strategies are functions that handle
+   * how to merge a parent option value and a child option
+   * value into the final value.
+   */
+  var strats = config.optionMergeStrategies;
+
+  /**
+   * Options with restrictions
+   */
+  {
+    strats.el = strats.propsData = function (parent, child, vm, key) {
+      if (!vm) {
+        warn(
+          "option \"" + key + "\" can only be used during instance " +
+          'creation with the `new` keyword.'
+        );
+      }
+      return defaultStrat(parent, child)
+    };
+  }
+
+  /**
+   * Helper that recursively merges two data objects together.
+   */
+  function mergeData (to, from) {
+    if (!from) { return to }
+    var key, toVal, fromVal;
+
+    var keys = hasSymbol
+      ? Reflect.ownKeys(from)
+      : Object.keys(from);
+
+    for (var i = 0; i < keys.length; i++) {
+      key = keys[i];
+      // in case the object is already observed...
+      if (key === '__ob__') { continue }
+      toVal = to[key];
+      fromVal = from[key];
+      if (!hasOwn(to, key)) {
+        set(to, key, fromVal);
+      } else if (
+        toVal !== fromVal &&
+        isPlainObject(toVal) &&
+        isPlainObject(fromVal)
+      ) {
+        mergeData(toVal, fromVal);
+      }
+    }
+    return to
+  }
+
+  /**
+   * Data
+   */
+  function mergeDataOrFn (
+    parentVal,
+    childVal,
+    vm
+  ) {
+    if (!vm) {
+      // in a Vue.extend merge, both should be functions
+      if (!childVal) {
+        return parentVal
+      }
+      if (!parentVal) {
+        return childVal
+      }
+      // when parentVal & childVal are both present,
+      // we need to return a function that returns the
+      // merged result of both functions... no need to
+      // check if parentVal is a function here because
+      // it has to be a function to pass previous merges.
+      return function mergedDataFn () {
+        return mergeData(
+          typeof childVal === 'function' ? childVal.call(this, this) : childVal,
+          typeof parentVal === 'function' ? parentVal.call(this, this) : parentVal
+        )
+      }
+    } else {
+      return function mergedInstanceDataFn () {
+        // instance merge
+        var instanceData = typeof childVal === 'function'
+          ? childVal.call(vm, vm)
+          : childVal;
+        var defaultData = typeof parentVal === 'function'
+          ? parentVal.call(vm, vm)
+          : parentVal;
+        if (instanceData) {
+          return mergeData(instanceData, defaultData)
+        } else {
+          return defaultData
+        }
+      }
+    }
+  }
+
+  strats.data = function (
+    parentVal,
+    childVal,
+    vm
+  ) {
+    if (!vm) {
+      if (childVal && typeof childVal !== 'function') {
+        warn(
+          'The "data" option should be a function ' +
+          'that returns a per-instance value in component ' +
+          'definitions.',
+          vm
+        );
+
+        return parentVal
+      }
+      return mergeDataOrFn(parentVal, childVal)
+    }
+
+    return mergeDataOrFn(parentVal, childVal, vm)
+  };
+
+  /**
+   * Hooks and props are merged as arrays.
+   */
+  function mergeHook (
+    parentVal,
+    childVal
+  ) {
+    var res = childVal
+      ? parentVal
+        ? parentVal.concat(childVal)
+        : Array.isArray(childVal)
+          ? childVal
+          : [childVal]
+      : parentVal;
+    return res
+      ? dedupeHooks(res)
+      : res
+  }
+
+  function dedupeHooks (hooks) {
+    var res = [];
+    for (var i = 0; i < hooks.length; i++) {
+      if (res.indexOf(hooks[i]) === -1) {
+        res.push(hooks[i]);
+      }
+    }
+    return res
+  }
+
+  LIFECYCLE_HOOKS.forEach(function (hook) {
+    strats[hook] = mergeHook;
+  });
+
+  /**
+   * Assets
+   *
+   * When a vm is present (instance creation), we need to do
+   * a three-way merge between constructor options, instance
+   * options and parent options.
+   */
+  function mergeAssets (
+    parentVal,
+    childVal,
+    vm,
+    key
+  ) {
+    var res = Object.create(parentVal || null);
+    if (childVal) {
+      assertObjectType(key, childVal, vm);
+      return extend(res, childVal)
+    } else {
+      return res
+    }
+  }
+
+  ASSET_TYPES.forEach(function (type) {
+    strats[type + 's'] = mergeAssets;
+  });
+
+  /**
+   * Watchers.
+   *
+   * Watchers hashes should not overwrite one
+   * another, so we merge them as arrays.
+   */
+  strats.watch = function (
+    parentVal,
+    childVal,
+    vm,
+    key
+  ) {
+    // work around Firefox's Object.prototype.watch...
+    if (parentVal === nativeWatch) { parentVal = undefined; }
+    if (childVal === nativeWatch) { childVal = undefined; }
+    /* istanbul ignore if */
+    if (!childVal) { return Object.create(parentVal || null) }
+    {
+      assertObjectType(key, childVal, vm);
+    }
+    if (!parentVal) { return childVal }
+    var ret = {};
+    extend(ret, parentVal);
+    for (var key$1 in childVal) {
+      var parent = ret[key$1];
+      var child = childVal[key$1];
+      if (parent && !Array.isArray(parent)) {
+        parent = [parent];
+      }
+      ret[key$1] = parent
+        ? parent.concat(child)
+        : Array.isArray(child) ? child : [child];
+    }
+    return ret
+  };
+
+  /**
+   * Other object hashes.
+   */
+  strats.props =
+  strats.methods =
+  strats.inject =
+  strats.computed = function (
+    parentVal,
+    childVal,
+    vm,
+    key
+  ) {
+    if (childVal && "development" !== 'production') {
+      assertObjectType(key, childVal, vm);
+    }
+    if (!parentVal) { return childVal }
+    var ret = Object.create(null);
+    extend(ret, parentVal);
+    if (childVal) { extend(ret, childVal); }
+    return ret
+  };
+  strats.provide = mergeDataOrFn;
+
+  /**
+   * Default strategy.
+   */
+  var defaultStrat = function (parentVal, childVal) {
+    return childVal === undefined
+      ? parentVal
+      : childVal
+  };
+
+  /**
+   * Validate component names
+   */
+  function checkComponents (options) {
+    for (var key in options.components) {
+      validateComponentName(key);
+    }
+  }
+
+  function validateComponentName (name) {
+    if (!new RegExp(("^[a-zA-Z][\\-\\.0-9_" + (unicodeRegExp.source) + "]*$")).test(name)) {
+      warn(
+        'Invalid component name: "' + name + '". Component names ' +
+        'should conform to valid custom element name in html5 specification.'
+      );
+    }
+    if (isBuiltInTag(name) || config.isReservedTag(name)) {
+      warn(
+        'Do not use built-in or reserved HTML elements as component ' +
+        'id: ' + name
+      );
+    }
+  }
+
+  /**
+   * Ensure all props option syntax are normalized into the
+   * Object-based format.
+   */
+  function normalizeProps (options, vm) {
+    var props = options.props;
+    if (!props) { return }
+    var res = {};
+    var i, val, name;
+    if (Array.isArray(props)) {
+      i = props.length;
+      while (i--) {
+        val = props[i];
+        if (typeof val === 'string') {
+          name = camelize(val);
+          res[name] = { type: null };
+        } else {
+          warn('props must be strings when using array syntax.');
+        }
+      }
+    } else if (isPlainObject(props)) {
+      for (var key in props) {
+        val = props[key];
+        name = camelize(key);
+        res[name] = isPlainObject(val)
+          ? val
+          : { type: val };
+      }
+    } else {
+      warn(
+        "Invalid value for option \"props\": expected an Array or an Object, " +
+        "but got " + (toRawType(props)) + ".",
+        vm
+      );
+    }
+    options.props = res;
+  }
+
+  /**
+   * Normalize all injections into Object-based format
+   */
+  function normalizeInject (options, vm) {
+    var inject = options.inject;
+    if (!inject) { return }
+    var normalized = options.inject = {};
+    if (Array.isArray(inject)) {
+      for (var i = 0; i < inject.length; i++) {
+        normalized[inject[i]] = { from: inject[i] };
+      }
+    } else if (isPlainObject(inject)) {
+      for (var key in inject) {
+        var val = inject[key];
+        normalized[key] = isPlainObject(val)
+          ? extend({ from: key }, val)
+          : { from: val };
+      }
+    } else {
+      warn(
+        "Invalid value for option \"inject\": expected an Array or an Object, " +
+        "but got " + (toRawType(inject)) + ".",
+        vm
+      );
+    }
+  }
+
+  /**
+   * Normalize raw function directives into object format.
+   */
+  function normalizeDirectives (options) {
+    var dirs = options.directives;
+    if (dirs) {
+      for (var key in dirs) {
+        var def$$1 = dirs[key];
+        if (typeof def$$1 === 'function') {
+          dirs[key] = { bind: def$$1, update: def$$1 };
+        }
+      }
+    }
+  }
+
+  function assertObjectType (name, value, vm) {
+    if (!isPlainObject(value)) {
+      warn(
+        "Invalid value for option \"" + name + "\": expected an Object, " +
+        "but got " + (toRawType(value)) + ".",
+        vm
+      );
+    }
+  }
+
+  /**
+   * Merge two option objects into a new one.
+   * Core utility used in both instantiation and inheritance.
+   */
+  function mergeOptions (
+    parent,
+    child,
+    vm
+  ) {
+    {
+      checkComponents(child);
+    }
+
+    if (typeof child === 'function') {
+      child = child.options;
+    }
+
+    normalizeProps(child, vm);
+    normalizeInject(child, vm);
+    normalizeDirectives(child);
+
+    // Apply extends and mixins on the child options,
+    // but only if it is a raw options object that isn't
+    // the result of another mergeOptions call.
+    // Only merged options has the _base property.
+    if (!child._base) {
+      if (child.extends) {
+        parent = mergeOptions(parent, child.extends, vm);
+      }
+      if (child.mixins) {
+        for (var i = 0, l = child.mixins.length; i < l; i++) {
+          parent = mergeOptions(parent, child.mixins[i], vm);
+        }
+      }
+    }
+
+    var options = {};
+    var key;
+    for (key in parent) {
+      mergeField(key);
+    }
+    for (key in child) {
+      if (!hasOwn(parent, key)) {
+        mergeField(key);
+      }
+    }
+    function mergeField (key) {
+      var strat = strats[key] || defaultStrat;
+      options[key] = strat(parent[key], child[key], vm, key);
+    }
+    return options
+  }
+
+  /**
+   * Resolve an asset.
+   * This function is used because child instances need access
+   * to assets defined in its ancestor chain.
+   */
+  function resolveAsset (
+    options,
+    type,
+    id,
+    warnMissing
+  ) {
+    /* istanbul ignore if */
+    if (typeof id !== 'string') {
+      return
+    }
+    var assets = options[type];
+    // check local registration variations first
+    if (hasOwn(assets, id)) { return assets[id] }
+    var camelizedId = camelize(id);
+    if (hasOwn(assets, camelizedId)) { return assets[camelizedId] }
+    var PascalCaseId = capitalize(camelizedId);
+    if (hasOwn(assets, PascalCaseId)) { return assets[PascalCaseId] }
+    // fallback to prototype chain
+    var res = assets[id] || assets[camelizedId] || assets[PascalCaseId];
+    if (warnMissing && !res) {
+      warn(
+        'Failed to resolve ' + type.slice(0, -1) + ': ' + id,
+        options
+      );
+    }
+    return res
+  }
+
+  /*  */
+
+
+
+  function validateProp (
+    key,
+    propOptions,
+    propsData,
+    vm
+  ) {
+    var prop = propOptions[key];
+    var absent = !hasOwn(propsData, key);
+    var value = propsData[key];
+    // boolean casting
+    var booleanIndex = getTypeIndex(Boolean, prop.type);
+    if (booleanIndex > -1) {
+      if (absent && !hasOwn(prop, 'default')) {
+        value = false;
+      } else if (value === '' || value === hyphenate(key)) {
+        // only cast empty string / same name to boolean if
+        // boolean has higher priority
+        var stringIndex = getTypeIndex(String, prop.type);
+        if (stringIndex < 0 || booleanIndex < stringIndex) {
+          value = true;
+        }
+      }
+    }
+    // check default value
+    if (value === undefined) {
+      value = getPropDefaultValue(vm, prop, key);
+      // since the default value is a fresh copy,
+      // make sure to observe it.
+      var prevShouldObserve = shouldObserve;
+      toggleObserving(true);
+      observe(value);
+      toggleObserving(prevShouldObserve);
+    }
+    {
+      assertProp(prop, key, value, vm, absent);
+    }
+    return value
+  }
+
+  /**
+   * Get the default value of a prop.
+   */
+  function getPropDefaultValue (vm, prop, key) {
+    // no default, return undefined
+    if (!hasOwn(prop, 'default')) {
+      return undefined
+    }
+    var def = prop.default;
+    // warn against non-factory defaults for Object & Array
+    if (isObject(def)) {
+      warn(
+        'Invalid default value for prop "' + key + '": ' +
+        'Props with type Object/Array must use a factory function ' +
+        'to return the default value.',
+        vm
+      );
+    }
+    // the raw prop value was also undefined from previous render,
+    // return previous default value to avoid unnecessary watcher trigger
+    if (vm && vm.$options.propsData &&
+      vm.$options.propsData[key] === undefined &&
+      vm._props[key] !== undefined
+    ) {
+      return vm._props[key]
+    }
+    // call factory function for non-Function types
+    // a value is Function if its prototype is function even across different execution context
+    return typeof def === 'function' && getType(prop.type) !== 'Function'
+      ? def.call(vm)
+      : def
+  }
+
+  /**
+   * Assert whether a prop is valid.
+   */
+  function assertProp (
+    prop,
+    name,
+    value,
+    vm,
+    absent
+  ) {
+    if (prop.required && absent) {
+      warn(
+        'Missing required prop: "' + name + '"',
+        vm
+      );
+      return
+    }
+    if (value == null && !prop.required) {
+      return
+    }
+    var type = prop.type;
+    var valid = !type || type === true;
+    var expectedTypes = [];
+    if (type) {
+      if (!Array.isArray(type)) {
+        type = [type];
+      }
+      for (var i = 0; i < type.length && !valid; i++) {
+        var assertedType = assertType(value, type[i]);
+        expectedTypes.push(assertedType.expectedType || '');
+        valid = assertedType.valid;
+      }
+    }
+
+    if (!valid) {
+      warn(
+        getInvalidTypeMessage(name, value, expectedTypes),
+        vm
+      );
+      return
+    }
+    var validator = prop.validator;
+    if (validator) {
+      if (!validator(value)) {
+        warn(
+          'Invalid prop: custom validator check failed for prop "' + name + '".',
+          vm
+        );
+      }
+    }
+  }
+
+  var simpleCheckRE = /^(String|Number|Boolean|Function|Symbol)$/;
+
+  function assertType (value, type) {
+    var valid;
+    var expectedType = getType(type);
+    if (simpleCheckRE.test(expectedType)) {
+      var t = typeof value;
+      valid = t === expectedType.toLowerCase();
+      // for primitive wrapper objects
+      if (!valid && t === 'object') {
+        valid = value instanceof type;
+      }
+    } else if (expectedType === 'Object') {
+      valid = isPlainObject(value);
+    } else if (expectedType === 'Array') {
+      valid = Array.isArray(value);
+    } else {
+      valid = value instanceof type;
+    }
+    return {
+      valid: valid,
+      expectedType: expectedType
+    }
+  }
+
+  /**
+   * Use function string name to check built-in types,
+   * because a simple equality check will fail when running
+   * across different vms / iframes.
+   */
+  function getType (fn) {
+    var match = fn && fn.toString().match(/^\s*function (\w+)/);
+    return match ? match[1] : ''
+  }
+
+  function isSameType (a, b) {
+    return getType(a) === getType(b)
+  }
+
+  function getTypeIndex (type, expectedTypes) {
+    if (!Array.isArray(expectedTypes)) {
+      return isSameType(expectedTypes, type) ? 0 : -1
+    }
+    for (var i = 0, len = expectedTypes.length; i < len; i++) {
+      if (isSameType(expectedTypes[i], type)) {
+        return i
+      }
+    }
+    return -1
+  }
+
+  function getInvalidTypeMessage (name, value, expectedTypes) {
+    var message = "Invalid prop: type check failed for prop \"" + name + "\"." +
+      " Expected " + (expectedTypes.map(capitalize).join(', '));
+    var expectedType = expectedTypes[0];
+    var receivedType = toRawType(value);
+    var expectedValue = styleValue(value, expectedType);
+    var receivedValue = styleValue(value, receivedType);
+    // check if we need to specify expected value
+    if (expectedTypes.length === 1 &&
+        isExplicable(expectedType) &&
+        !isBoolean(expectedType, receivedType)) {
+      message += " with value " + expectedValue;
+    }
+    message += ", got " + receivedType + " ";
+    // check if we need to specify received value
+    if (isExplicable(receivedType)) {
+      message += "with value " + receivedValue + ".";
+    }
+    return message
+  }
+
+  function styleValue (value, type) {
+    if (type === 'String') {
+      return ("\"" + value + "\"")
+    } else if (type === 'Number') {
+      return ("" + (Number(value)))
+    } else {
+      return ("" + value)
+    }
+  }
+
+  function isExplicable (value) {
+    var explicitTypes = ['string', 'number', 'boolean'];
+    return explicitTypes.some(function (elem) { return value.toLowerCase() === elem; })
+  }
+
+  function isBoolean () {
+    var args = [], len = arguments.length;
+    while ( len-- ) args[ len ] = arguments[ len ];
+
+    return args.some(function (elem) { return elem.toLowerCase() === 'boolean'; })
+  }
+
+  /*  */
+
+  function handleError (err, vm, info) {
+    // Deactivate deps tracking while processing error handler to avoid possible infinite rendering.
+    // See: https://github.com/vuejs/vuex/issues/1505
+    pushTarget();
+    try {
+      if (vm) {
+        var cur = vm;
+        while ((cur = cur.$parent)) {
+          var hooks = cur.$options.errorCaptured;
+          if (hooks) {
+            for (var i = 0; i < hooks.length; i++) {
+              try {
+                var capture = hooks[i].call(cur, err, vm, info) === false;
+                if (capture) { return }
+              } catch (e) {
+                globalHandleError(e, cur, 'errorCaptured hook');
+              }
+            }
+          }
+        }
+      }
+      globalHandleError(err, vm, info);
+    } finally {
+      popTarget();
+    }
+  }
+
+  function invokeWithErrorHandling (
+    handler,
+    context,
+    args,
+    vm,
+    info
+  ) {
+    var res;
+    try {
+      res = args ? handler.apply(context, args) : handler.call(context);
+      if (res && !res._isVue && isPromise(res) && !res._handled) {
+        res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
+        // issue #9511
+        // avoid catch triggering multiple times when nested calls
+        res._handled = true;
+      }
+    } catch (e) {
+      handleError(e, vm, info);
+    }
+    return res
+  }
+
+  function globalHandleError (err, vm, info) {
+    if (config.errorHandler) {
+      try {
+        return config.errorHandler.call(null, err, vm, info)
+      } catch (e) {
+        // if the user intentionally throws the original error in the handler,
+        // do not log it twice
+        if (e !== err) {
+          logError(e, null, 'config.errorHandler');
+        }
+      }
+    }
+    logError(err, vm, info);
+  }
+
+  function logError (err, vm, info) {
+    {
+      warn(("Error in " + info + ": \"" + (err.toString()) + "\""), vm);
+    }
+    /* istanbul ignore else */
+    if ((inBrowser || inWeex) && typeof console !== 'undefined') {
+      console.error(err);
+    } else {
+      throw err
+    }
+  }
+
+  /*  */
+
+  var isUsingMicroTask = false;
+
+  var callbacks = [];
+  var pending = false;
+
+  function flushCallbacks () {
+    pending = false;
+    var copies = callbacks.slice(0);
+    callbacks.length = 0;
+    for (var i = 0; i < copies.length; i++) {
+      copies[i]();
+    }
+  }
+
+  // Here we have async deferring wrappers using microtasks.
+  // In 2.5 we used (macro) tasks (in combination with microtasks).
+  // However, it has subtle problems when state is changed right before repaint
+  // (e.g. #6813, out-in transitions).
+  // Also, using (macro) tasks in event handler would cause some weird behaviors
+  // that cannot be circumvented (e.g. #7109, #7153, #7546, #7834, #8109).
+  // So we now use microtasks everywhere, again.
+  // A major drawback of this tradeoff is that there are some scenarios
+  // where microtasks have too high a priority and fire in between supposedly
+  // sequential events (e.g. #4521, #6690, which have workarounds)
+  // or even between bubbling of the same event (#6566).
+  var timerFunc;
+
+  // The nextTick behavior leverages the microtask queue, which can be accessed
+  // via either native Promise.then or MutationObserver.
+  // MutationObserver has wider support, however it is seriously bugged in
+  // UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It
+  // completely stops working after triggering a few times... so, if native
+  // Promise is available, we will use it:
+  /* istanbul ignore next, $flow-disable-line */
+  if (typeof Promise !== 'undefined' && isNative(Promise)) {
+    var p = Promise.resolve();
+    timerFunc = function () {
+      p.then(flushCallbacks);
+      // In problematic UIWebViews, Promise.then doesn't completely break, but
+      // it can get stuck in a weird state where callbacks are pushed into the
+      // microtask queue but the queue isn't being flushed, until the browser
+      // needs to do some other work, e.g. handle a timer. Therefore we can
+      // "force" the microtask queue to be flushed by adding an empty timer.
+      if (isIOS) { setTimeout(noop); }
+    };
+    isUsingMicroTask = true;
+  } else if (!isIE && typeof MutationObserver !== 'undefined' && (
+    isNative(MutationObserver) ||
+    // PhantomJS and iOS 7.x
+    MutationObserver.toString() === '[object MutationObserverConstructor]'
+  )) {
+    // Use MutationObserver where native Promise is not available,
+    // e.g. PhantomJS, iOS7, Android 4.4
+    // (#6466 MutationObserver is unreliable in IE11)
+    var counter = 1;
+    var observer = new MutationObserver(flushCallbacks);
+    var textNode = document.createTextNode(String(counter));
+    observer.observe(textNode, {
+      characterData: true
+    });
+    timerFunc = function () {
+      counter = (counter + 1) % 2;
+      textNode.data = String(counter);
+    };
+    isUsingMicroTask = true;
+  } else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
+    // Fallback to setImmediate.
+    // Technically it leverages the (macro) task queue,
+    // but it is still a better choice than setTimeout.
+    timerFunc = function () {
+      setImmediate(flushCallbacks);
+    };
+  } else {
+    // Fallback to setTimeout.
+    timerFunc = function () {
+      setTimeout(flushCallbacks, 0);
+    };
+  }
+
+  function nextTick (cb, ctx) {
+    var _resolve;
+    callbacks.push(function () {
+      if (cb) {
+        try {
+          cb.call(ctx);
+        } catch (e) {
+          handleError(e, ctx, 'nextTick');
+        }
+      } else if (_resolve) {
+        _resolve(ctx);
+      }
+    });
+    if (!pending) {
+      pending = true;
+      timerFunc();
+    }
+    // $flow-disable-line
+    if (!cb && typeof Promise !== 'undefined') {
+      return new Promise(function (resolve) {
+        _resolve = resolve;
+      })
+    }
+  }
+
+  /*  */
+
+  var mark;
+  var measure;
+
+  {
+    var perf = inBrowser && window.performance;
+    /* istanbul ignore if */
+    if (
+      perf &&
+      perf.mark &&
+      perf.measure &&
+      perf.clearMarks &&
+      perf.clearMeasures
+    ) {
+      mark = function (tag) { return perf.mark(tag); };
+      measure = function (name, startTag, endTag) {
+        perf.measure(name, startTag, endTag);
+        perf.clearMarks(startTag);
+        perf.clearMarks(endTag);
+        // perf.clearMeasures(name)
+      };
+    }
+  }
+
+  /* not type checking this file because flow doesn't play well with Proxy */
+
+  var initProxy;
+
+  {
+    var allowedGlobals = makeMap(
+      'Infinity,undefined,NaN,isFinite,isNaN,' +
+      'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' +
+      'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,' +
+      'require' // for Webpack/Browserify
+    );
+
+    var warnNonPresent = function (target, key) {
+      warn(
+        "Property or method \"" + key + "\" is not defined on the instance but " +
+        'referenced during render. Make sure that this property is reactive, ' +
+        'either in the data option, or for class-based components, by ' +
+        'initializing the property. ' +
+        'See: https://vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.',
+        target
+      );
+    };
+
+    var warnReservedPrefix = function (target, key) {
+      warn(
+        "Property \"" + key + "\" must be accessed with \"$data." + key + "\" because " +
+        'properties starting with "$" or "_" are not proxied in the Vue instance to ' +
+        'prevent conflicts with Vue internals. ' +
+        'See: https://vuejs.org/v2/api/#data',
+        target
+      );
+    };
+
+    var hasProxy =
+      typeof Proxy !== 'undefined' && isNative(Proxy);
+
+    if (hasProxy) {
+      var isBuiltInModifier = makeMap('stop,prevent,self,ctrl,shift,alt,meta,exact');
+      config.keyCodes = new Proxy(config.keyCodes, {
+        set: function set (target, key, value) {
+          if (isBuiltInModifier(key)) {
+            warn(("Avoid overwriting built-in modifier in config.keyCodes: ." + key));
+            return false
+          } else {
+            target[key] = value;
+            return true
+          }
+        }
+      });
+    }
+
+    var hasHandler = {
+      has: function has (target, key) {
+        var has = key in target;
+        var isAllowed = allowedGlobals(key) ||
+          (typeof key === 'string' && key.charAt(0) === '_' && !(key in target.$data));
+        if (!has && !isAllowed) {
+          if (key in target.$data) { warnReservedPrefix(target, key); }
+          else { warnNonPresent(target, key); }
+        }
+        return has || !isAllowed
+      }
+    };
+
+    var getHandler = {
+      get: function get (target, key) {
+        if (typeof key === 'string' && !(key in target)) {
+          if (key in target.$data) { warnReservedPrefix(target, key); }
+          else { warnNonPresent(target, key); }
+        }
+        return target[key]
+      }
+    };
+
+    initProxy = function initProxy (vm) {
+      if (hasProxy) {
+        // determine which proxy handler to use
+        var options = vm.$options;
+        var handlers = options.render && options.render._withStripped
+          ? getHandler
+          : hasHandler;
+        vm._renderProxy = new Proxy(vm, handlers);
+      } else {
+        vm._renderProxy = vm;
+      }
+    };
+  }
+
+  /*  */
+
+  var seenObjects = new _Set();
+
+  /**
+   * Recursively traverse an object to evoke all converted
+   * getters, so that every nested property inside the object
+   * is collected as a "deep" dependency.
+   */
+  function traverse (val) {
+    _traverse(val, seenObjects);
+    seenObjects.clear();
+  }
+
+  function _traverse (val, seen) {
+    var i, keys;
+    var isA = Array.isArray(val);
+    if ((!isA && !isObject(val)) || Object.isFrozen(val) || val instanceof VNode) {
+      return
+    }
+    if (val.__ob__) {
+      var depId = val.__ob__.dep.id;
+      if (seen.has(depId)) {
+        return
+      }
+      seen.add(depId);
+    }
+    if (isA) {
+      i = val.length;
+      while (i--) { _traverse(val[i], seen); }
+    } else {
+      keys = Object.keys(val);
+      i = keys.length;
+      while (i--) { _traverse(val[keys[i]], seen); }
+    }
+  }
+
+  /*  */
+
+  var normalizeEvent = cached(function (name) {
+    var passive = name.charAt(0) === '&';
+    name = passive ? name.slice(1) : name;
+    var once$$1 = name.charAt(0) === '~'; // Prefixed last, checked first
+    name = once$$1 ? name.slice(1) : name;
+    var capture = name.charAt(0) === '!';
+    name = capture ? name.slice(1) : name;
+    return {
+      name: name,
+      once: once$$1,
+      capture: capture,
+      passive: passive
+    }
+  });
+
+  function createFnInvoker (fns, vm) {
+    function invoker () {
+      var arguments$1 = arguments;
+
+      var fns = invoker.fns;
+      if (Array.isArray(fns)) {
+        var cloned = fns.slice();
+        for (var i = 0; i < cloned.length; i++) {
+          invokeWithErrorHandling(cloned[i], null, arguments$1, vm, "v-on handler");
+        }
+      } else {
+        // return handler return value for single handlers
+        return invokeWithErrorHandling(fns, null, arguments, vm, "v-on handler")
+      }
+    }
+    invoker.fns = fns;
+    return invoker
+  }
+
+  function updateListeners (
+    on,
+    oldOn,
+    add,
+    remove$$1,
+    createOnceHandler,
+    vm
+  ) {
+    var name, def$$1, cur, old, event;
+    for (name in on) {
+      def$$1 = cur = on[name];
+      old = oldOn[name];
+      event = normalizeEvent(name);
+      if (isUndef(cur)) {
+        warn(
+          "Invalid handler for event \"" + (event.name) + "\": got " + String(cur),
+          vm
+        );
+      } else if (isUndef(old)) {
+        if (isUndef(cur.fns)) {
+          cur = on[name] = createFnInvoker(cur, vm);
+        }
+        if (isTrue(event.once)) {
+          cur = on[name] = createOnceHandler(event.name, cur, event.capture);
+        }
+        add(event.name, cur, event.capture, event.passive, event.params);
+      } else if (cur !== old) {
+        old.fns = cur;
+        on[name] = old;
+      }
+    }
+    for (name in oldOn) {
+      if (isUndef(on[name])) {
+        event = normalizeEvent(name);
+        remove$$1(event.name, oldOn[name], event.capture);
+      }
+    }
+  }
+
+  /*  */
+
+  function mergeVNodeHook (def, hookKey, hook) {
+    if (def instanceof VNode) {
+      def = def.data.hook || (def.data.hook = {});
+    }
+    var invoker;
+    var oldHook = def[hookKey];
+
+    function wrappedHook () {
+      hook.apply(this, arguments);
+      // important: remove merged hook to ensure it's called only once
+      // and prevent memory leak
+      remove(invoker.fns, wrappedHook);
+    }
+
+    if (isUndef(oldHook)) {
+      // no existing hook
+      invoker = createFnInvoker([wrappedHook]);
+    } else {
+      /* istanbul ignore if */
+      if (isDef(oldHook.fns) && isTrue(oldHook.merged)) {
+        // already a merged invoker
+        invoker = oldHook;
+        invoker.fns.push(wrappedHook);
+      } else {
+        // existing plain hook
+        invoker = createFnInvoker([oldHook, wrappedHook]);
+      }
+    }
+
+    invoker.merged = true;
+    def[hookKey] = invoker;
+  }
+
+  /*  */
+
+  function extractPropsFromVNodeData (
+    data,
+    Ctor,
+    tag
+  ) {
+    // we are only extracting raw values here.
+    // validation and default values are handled in the child
+    // component itself.
+    var propOptions = Ctor.options.props;
+    if (isUndef(propOptions)) {
+      return
+    }
+    var res = {};
+    var attrs = data.attrs;
+    var props = data.props;
+    if (isDef(attrs) || isDef(props)) {
+      for (var key in propOptions) {
+        var altKey = hyphenate(key);
+        {
+          var keyInLowerCase = key.toLowerCase();
+          if (
+            key !== keyInLowerCase &&
+            attrs && hasOwn(attrs, keyInLowerCase)
+          ) {
+            tip(
+              "Prop \"" + keyInLowerCase + "\" is passed to component " +
+              (formatComponentName(tag || Ctor)) + ", but the declared prop name is" +
+              " \"" + key + "\". " +
+              "Note that HTML attributes are case-insensitive and camelCased " +
+              "props need to use their kebab-case equivalents when using in-DOM " +
+              "templates. You should probably use \"" + altKey + "\" instead of \"" + key + "\"."
+            );
+          }
+        }
+        checkProp(res, props, key, altKey, true) ||
+        checkProp(res, attrs, key, altKey, false);
+      }
+    }
+    return res
+  }
+
+  function checkProp (
+    res,
+    hash,
+    key,
+    altKey,
+    preserve
+  ) {
+    if (isDef(hash)) {
+      if (hasOwn(hash, key)) {
+        res[key] = hash[key];
+        if (!preserve) {
+          delete hash[key];
+        }
+        return true
+      } else if (hasOwn(hash, altKey)) {
+        res[key] = hash[altKey];
+        if (!preserve) {
+          delete hash[altKey];
+        }
+        return true
+      }
+    }
+    return false
+  }
+
+  /*  */
+
+  // The template compiler attempts to minimize the need for normalization by
+  // statically analyzing the template at compile time.
+  //
+  // For plain HTML markup, normalization can be completely skipped because the
+  // generated render function is guaranteed to return Array<VNode>. There are
+  // two cases where extra normalization is needed:
+
+  // 1. When the children contains components - because a functional component
+  // may return an Array instead of a single root. In this case, just a simple
+  // normalization is needed - if any child is an Array, we flatten the whole
+  // thing with Array.prototype.concat. It is guaranteed to be only 1-level deep
+  // because functional components already normalize their own children.
+  function simpleNormalizeChildren (children) {
+    for (var i = 0; i < children.length; i++) {
+      if (Array.isArray(children[i])) {
+        return Array.prototype.concat.apply([], children)
+      }
+    }
+    return children
+  }
+
+  // 2. When the children contains constructs that always generated nested Arrays,
+  // e.g. <template>, <slot>, v-for, or when the children is provided by user
+  // with hand-written render functions / JSX. In such cases a full normalization
+  // is needed to cater to all possible types of children values.
+  function normalizeChildren (children) {
+    return isPrimitive(children)
+      ? [createTextVNode(children)]
+      : Array.isArray(children)
+        ? normalizeArrayChildren(children)
+        : undefined
+  }
+
+  function isTextNode (node) {
+    return isDef(node) && isDef(node.text) && isFalse(node.isComment)
+  }
+
+  function normalizeArrayChildren (children, nestedIndex) {
+    var res = [];
+    var i, c, lastIndex, last;
+    for (i = 0; i < children.length; i++) {
+      c = children[i];
+      if (isUndef(c) || typeof c === 'boolean') { continue }
+      lastIndex = res.length - 1;
+      last = res[lastIndex];
+      //  nested
+      if (Array.isArray(c)) {
+        if (c.length > 0) {
+          c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
+          // merge adjacent text nodes
+          if (isTextNode(c[0]) && isTextNode(last)) {
+            res[lastIndex] = createTextVNode(last.text + (c[0]).text);
+            c.shift();
+          }
+          res.push.apply(res, c);
+        }
+      } else if (isPrimitive(c)) {
+        if (isTextNode(last)) {
+          // merge adjacent text nodes
+          // this is necessary for SSR hydration because text nodes are
+          // essentially merged when rendered to HTML strings
+          res[lastIndex] = createTextVNode(last.text + c);
+        } else if (c !== '') {
+          // convert primitive to vnode
+          res.push(createTextVNode(c));
+        }
+      } else {
+        if (isTextNode(c) && isTextNode(last)) {
+          // merge adjacent text nodes
+          res[lastIndex] = createTextVNode(last.text + c.text);
+        } else {
+          // default key for nested array children (likely generated by v-for)
+          if (isTrue(children._isVList) &&
+            isDef(c.tag) &&
+            isUndef(c.key) &&
+            isDef(nestedIndex)) {
+            c.key = "__vlist" + nestedIndex + "_" + i + "__";
+          }
+          res.push(c);
+        }
+      }
+    }
+    return res
+  }
+
+  /*  */
+
+  function initProvide (vm) {
+    var provide = vm.$options.provide;
+    if (provide) {
+      vm._provided = typeof provide === 'function'
+        ? provide.call(vm)
+        : provide;
+    }
+  }
+
+  function initInjections (vm) {
+    var result = resolveInject(vm.$options.inject, vm);
+    if (result) {
+      toggleObserving(false);
+      Object.keys(result).forEach(function (key) {
+        /* istanbul ignore else */
+        {
+          defineReactive$$1(vm, key, result[key], function () {
+            warn(
+              "Avoid mutating an injected value directly since the changes will be " +
+              "overwritten whenever the provided component re-renders. " +
+              "injection being mutated: \"" + key + "\"",
+              vm
+            );
+          });
+        }
+      });
+      toggleObserving(true);
+    }
+  }
+
+  function resolveInject (inject, vm) {
+    if (inject) {
+      // inject is :any because flow is not smart enough to figure out cached
+      var result = Object.create(null);
+      var keys = hasSymbol
+        ? Reflect.ownKeys(inject)
+        : Object.keys(inject);
+
+      for (var i = 0; i < keys.length; i++) {
+        var key = keys[i];
+        // #6574 in case the inject object is observed...
+        if (key === '__ob__') { continue }
+        var provideKey = inject[key].from;
+        var source = vm;
+        while (source) {
+          if (source._provided && hasOwn(source._provided, provideKey)) {
+            result[key] = source._provided[provideKey];
+            break
+          }
+          source = source.$parent;
+        }
+        if (!source) {
+          if ('default' in inject[key]) {
+            var provideDefault = inject[key].default;
+            result[key] = typeof provideDefault === 'function'
+              ? provideDefault.call(vm)
+              : provideDefault;
+          } else {
+            warn(("Injection \"" + key + "\" not found"), vm);
+          }
+        }
+      }
+      return result
+    }
+  }
+
+  /*  */
+
+
+
+  /**
+   * Runtime helper for resolving raw children VNodes into a slot object.
+   */
+  function resolveSlots (
+    children,
+    context
+  ) {
+    if (!children || !children.length) {
+      return {}
+    }
+    var slots = {};
+    for (var i = 0, l = children.length; i < l; i++) {
+      var child = children[i];
+      var data = child.data;
+      // remove slot attribute if the node is resolved as a Vue slot node
+      if (data && data.attrs && data.attrs.slot) {
+        delete data.attrs.slot;
+      }
+      // named slots should only be respected if the vnode was rendered in the
+      // same context.
+      if ((child.context === context || child.fnContext === context) &&
+        data && data.slot != null
+      ) {
+        var name = data.slot;
+        var slot = (slots[name] || (slots[name] = []));
+        if (child.tag === 'template') {
+          slot.push.apply(slot, child.children || []);
+        } else {
+          slot.push(child);
+        }
+      } else {
+        (slots.default || (slots.default = [])).push(child);
+      }
+    }
+    // ignore slots that contains only whitespace
+    for (var name$1 in slots) {
+      if (slots[name$1].every(isWhitespace)) {
+        delete slots[name$1];
+      }
+    }
+    return slots
+  }
+
+  function isWhitespace (node) {
+    return (node.isComment && !node.asyncFactory) || node.text === ' '
+  }
+
+  /*  */
+
+  function normalizeScopedSlots (
+    slots,
+    normalSlots,
+    prevSlots
+  ) {
+    var res;
+    var hasNormalSlots = Object.keys(normalSlots).length > 0;
+    var isStable = slots ? !!slots.$stable : !hasNormalSlots;
+    var key = slots && slots.$key;
+    if (!slots) {
+      res = {};
+    } else if (slots._normalized) {
+      // fast path 1: child component re-render only, parent did not change
+      return slots._normalized
+    } else if (
+      isStable &&
+      prevSlots &&
+      prevSlots !== emptyObject &&
+      key === prevSlots.$key &&
+      !hasNormalSlots &&
+      !prevSlots.$hasNormal
+    ) {
+      // fast path 2: stable scoped slots w/ no normal slots to proxy,
+      // only need to normalize once
+      return prevSlots
+    } else {
+      res = {};
+      for (var key$1 in slots) {
+        if (slots[key$1] && key$1[0] !== '$') {
+          res[key$1] = normalizeScopedSlot(normalSlots, key$1, slots[key$1]);
+        }
+      }
+    }
+    // expose normal slots on scopedSlots
+    for (var key$2 in normalSlots) {
+      if (!(key$2 in res)) {
+        res[key$2] = proxyNormalSlot(normalSlots, key$2);
+      }
+    }
+    // avoriaz seems to mock a non-extensible $scopedSlots object
+    // and when that is passed down this would cause an error
+    if (slots && Object.isExtensible(slots)) {
+      (slots)._normalized = res;
+    }
+    def(res, '$stable', isStable);
+    def(res, '$key', key);
+    def(res, '$hasNormal', hasNormalSlots);
+    return res
+  }
+
+  function normalizeScopedSlot(normalSlots, key, fn) {
+    var normalized = function () {
+      var res = arguments.length ? fn.apply(null, arguments) : fn({});
+      res = res && typeof res === 'object' && !Array.isArray(res)
+        ? [res] // single vnode
+        : normalizeChildren(res);
+      return res && (
+        res.length === 0 ||
+        (res.length === 1 && res[0].isComment) // #9658
+      ) ? undefined
+        : res
+    };
+    // this is a slot using the new v-slot syntax without scope. although it is
+    // compiled as a scoped slot, render fn users would expect it to be present
+    // on this.$slots because the usage is semantically a normal slot.
+    if (fn.proxy) {
+      Object.defineProperty(normalSlots, key, {
+        get: normalized,
+        enumerable: true,
+        configurable: true
+      });
+    }
+    return normalized
+  }
+
+  function proxyNormalSlot(slots, key) {
+    return function () { return slots[key]; }
+  }
+
+  /*  */
+
+  /**
+   * Runtime helper for rendering v-for lists.
+   */
+  function renderList (
+    val,
+    render
+  ) {
+    var ret, i, l, keys, key;
+    if (Array.isArray(val) || typeof val === 'string') {
+      ret = new Array(val.length);
+      for (i = 0, l = val.length; i < l; i++) {
+        ret[i] = render(val[i], i);
+      }
+    } else if (typeof val === 'number') {
+      ret = new Array(val);
+      for (i = 0; i < val; i++) {
+        ret[i] = render(i + 1, i);
+      }
+    } else if (isObject(val)) {
+      if (hasSymbol && val[Symbol.iterator]) {
+        ret = [];
+        var iterator = val[Symbol.iterator]();
+        var result = iterator.next();
+        while (!result.done) {
+          ret.push(render(result.value, ret.length));
+          result = iterator.next();
+        }
+      } else {
+        keys = Object.keys(val);
+        ret = new Array(keys.length);
+        for (i = 0, l = keys.length; i < l; i++) {
+          key = keys[i];
+          ret[i] = render(val[key], key, i);
+        }
+      }
+    }
+    if (!isDef(ret)) {
+      ret = [];
+    }
+    (ret)._isVList = true;
+    return ret
+  }
+
+  /*  */
+
+  /**
+   * Runtime helper for rendering <slot>
+   */
+  function renderSlot (
+    name,
+    fallback,
+    props,
+    bindObject
+  ) {
+    var scopedSlotFn = this.$scopedSlots[name];
+    var nodes;
+    if (scopedSlotFn) { // scoped slot
+      props = props || {};
+      if (bindObject) {
+        if (!isObject(bindObject)) {
+          warn(
+            'slot v-bind without argument expects an Object',
+            this
+          );
+        }
+        props = extend(extend({}, bindObject), props);
+      }
+      nodes = scopedSlotFn(props) || fallback;
+    } else {
+      nodes = this.$slots[name] || fallback;
+    }
+
+    var target = props && props.slot;
+    if (target) {
+      return this.$createElement('template', { slot: target }, nodes)
+    } else {
+      return nodes
+    }
+  }
+
+  /*  */
+
+  /**
+   * Runtime helper for resolving filters
+   */
+  function resolveFilter (id) {
+    return resolveAsset(this.$options, 'filters', id, true) || identity
+  }
+
+  /*  */
+
+  function isKeyNotMatch (expect, actual) {
+    if (Array.isArray(expect)) {
+      return expect.indexOf(actual) === -1
+    } else {
+      return expect !== actual
+    }
+  }
+
+  /**
+   * Runtime helper for checking keyCodes from config.
+   * exposed as Vue.prototype._k
+   * passing in eventKeyName as last argument separately for backwards compat
+   */
+  function checkKeyCodes (
+    eventKeyCode,
+    key,
+    builtInKeyCode,
+    eventKeyName,
+    builtInKeyName
+  ) {
+    var mappedKeyCode = config.keyCodes[key] || builtInKeyCode;
+    if (builtInKeyName && eventKeyName && !config.keyCodes[key]) {
+      return isKeyNotMatch(builtInKeyName, eventKeyName)
+    } else if (mappedKeyCode) {
+      return isKeyNotMatch(mappedKeyCode, eventKeyCode)
+    } else if (eventKeyName) {
+      return hyphenate(eventKeyName) !== key
+    }
+  }
+
+  /*  */
+
+  /**
+   * Runtime helper for merging v-bind="object" into a VNode's data.
+   */
+  function bindObjectProps (
+    data,
+    tag,
+    value,
+    asProp,
+    isSync
+  ) {
+    if (value) {
+      if (!isObject(value)) {
+        warn(
+          'v-bind without argument expects an Object or Array value',
+          this
+        );
+      } else {
+        if (Array.isArray(value)) {
+          value = toObject(value);
+        }
+        var hash;
+        var loop = function ( key ) {
+          if (
+            key === 'class' ||
+            key === 'style' ||
+            isReservedAttribute(key)
+          ) {
+            hash = data;
+          } else {
+            var type = data.attrs && data.attrs.type;
+            hash = asProp || config.mustUseProp(tag, type, key)
+              ? data.domProps || (data.domProps = {})
+              : data.attrs || (data.attrs = {});
+          }
+          var camelizedKey = camelize(key);
+          var hyphenatedKey = hyphenate(key);
+          if (!(camelizedKey in hash) && !(hyphenatedKey in hash)) {
+            hash[key] = value[key];
+
+            if (isSync) {
+              var on = data.on || (data.on = {});
+              on[("update:" + key)] = function ($event) {
+                value[key] = $event;
+              };
+            }
+          }
+        };
+
+        for (var key in value) loop( key );
+      }
+    }
+    return data
+  }
+
+  /*  */
+
+  /**
+   * Runtime helper for rendering static trees.
+   */
+  function renderStatic (
+    index,
+    isInFor
+  ) {
+    var cached = this._staticTrees || (this._staticTrees = []);
+    var tree = cached[index];
+    // if has already-rendered static tree and not inside v-for,
+    // we can reuse the same tree.
+    if (tree && !isInFor) {
+      return tree
+    }
+    // otherwise, render a fresh tree.
+    tree = cached[index] = this.$options.staticRenderFns[index].call(
+      this._renderProxy,
+      null,
+      this // for render fns generated for functional component templates
+    );
+    markStatic(tree, ("__static__" + index), false);
+    return tree
+  }
+
+  /**
+   * Runtime helper for v-once.
+   * Effectively it means marking the node as static with a unique key.
+   */
+  function markOnce (
+    tree,
+    index,
+    key
+  ) {
+    markStatic(tree, ("__once__" + index + (key ? ("_" + key) : "")), true);
+    return tree
+  }
+
+  function markStatic (
+    tree,
+    key,
+    isOnce
+  ) {
+    if (Array.isArray(tree)) {
+      for (var i = 0; i < tree.length; i++) {
+        if (tree[i] && typeof tree[i] !== 'string') {
+          markStaticNode(tree[i], (key + "_" + i), isOnce);
+        }
+      }
+    } else {
+      markStaticNode(tree, key, isOnce);
+    }
+  }
+
+  function markStaticNode (node, key, isOnce) {
+    node.isStatic = true;
+    node.key = key;
+    node.isOnce = isOnce;
+  }
+
+  /*  */
+
+  function bindObjectListeners (data, value) {
+    if (value) {
+      if (!isPlainObject(value)) {
+        warn(
+          'v-on without argument expects an Object value',
+          this
+        );
+      } else {
+        var on = data.on = data.on ? extend({}, data.on) : {};
+        for (var key in value) {
+          var existing = on[key];
+          var ours = value[key];
+          on[key] = existing ? [].concat(existing, ours) : ours;
+        }
+      }
+    }
+    return data
+  }
+
+  /*  */
+
+  function resolveScopedSlots (
+    fns, // see flow/vnode
+    res,
+    // the following are added in 2.6
+    hasDynamicKeys,
+    contentHashKey
+  ) {
+    res = res || { $stable: !hasDynamicKeys };
+    for (var i = 0; i < fns.length; i++) {
+      var slot = fns[i];
+      if (Array.isArray(slot)) {
+        resolveScopedSlots(slot, res, hasDynamicKeys);
+      } else if (slot) {
+        // marker for reverse proxying v-slot without scope on this.$slots
+        if (slot.proxy) {
+          slot.fn.proxy = true;
+        }
+        res[slot.key] = slot.fn;
+      }
+    }
+    if (contentHashKey) {
+      (res).$key = contentHashKey;
+    }
+    return res
+  }
+
+  /*  */
+
+  function bindDynamicKeys (baseObj, values) {
+    for (var i = 0; i < values.length; i += 2) {
+      var key = values[i];
+      if (typeof key === 'string' && key) {
+        baseObj[values[i]] = values[i + 1];
+      } else if (key !== '' && key !== null) {
+        // null is a special value for explicitly removing a binding
+        warn(
+          ("Invalid value for dynamic directive argument (expected string or null): " + key),
+          this
+        );
+      }
+    }
+    return baseObj
+  }
+
+  // helper to dynamically append modifier runtime markers to event names.
+  // ensure only append when value is already string, otherwise it will be cast
+  // to string and cause the type check to miss.
+  function prependModifier (value, symbol) {
+    return typeof value === 'string' ? symbol + value : value
+  }
+
+  /*  */
+
+  function installRenderHelpers (target) {
+    target._o = markOnce;
+    target._n = toNumber;
+    target._s = toString;
+    target._l = renderList;
+    target._t = renderSlot;
+    target._q = looseEqual;
+    target._i = looseIndexOf;
+    target._m = renderStatic;
+    target._f = resolveFilter;
+    target._k = checkKeyCodes;
+    target._b = bindObjectProps;
+    target._v = createTextVNode;
+    target._e = createEmptyVNode;
+    target._u = resolveScopedSlots;
+    target._g = bindObjectListeners;
+    target._d = bindDynamicKeys;
+    target._p = prependModifier;
+  }
+
+  /*  */
+
+  function FunctionalRenderContext (
+    data,
+    props,
+    children,
+    parent,
+    Ctor
+  ) {
+    var this$1 = this;
+
+    var options = Ctor.options;
+    // ensure the createElement function in functional components
+    // gets a unique context - this is necessary for correct named slot check
+    var contextVm;
+    if (hasOwn(parent, '_uid')) {
+      contextVm = Object.create(parent);
+      // $flow-disable-line
+      contextVm._original = parent;
+    } else {
+      // the context vm passed in is a functional context as well.
+      // in this case we want to make sure we are able to get a hold to the
+      // real context instance.
+      contextVm = parent;
+      // $flow-disable-line
+      parent = parent._original;
+    }
+    var isCompiled = isTrue(options._compiled);
+    var needNormalization = !isCompiled;
+
+    this.data = data;
+    this.props = props;
+    this.children = children;
+    this.parent = parent;
+    this.listeners = data.on || emptyObject;
+    this.injections = resolveInject(options.inject, parent);
+    this.slots = function () {
+      if (!this$1.$slots) {
+        normalizeScopedSlots(
+          data.scopedSlots,
+          this$1.$slots = resolveSlots(children, parent)
+        );
+      }
+      return this$1.$slots
+    };
+
+    Object.defineProperty(this, 'scopedSlots', ({
+      enumerable: true,
+      get: function get () {
+        return normalizeScopedSlots(data.scopedSlots, this.slots())
+      }
+    }));
+
+    // support for compiled functional template
+    if (isCompiled) {
+      // exposing $options for renderStatic()
+      this.$options = options;
+      // pre-resolve slots for renderSlot()
+      this.$slots = this.slots();
+      this.$scopedSlots = normalizeScopedSlots(data.scopedSlots, this.$slots);
+    }
+
+    if (options._scopeId) {
+      this._c = function (a, b, c, d) {
+        var vnode = createElement(contextVm, a, b, c, d, needNormalization);
+        if (vnode && !Array.isArray(vnode)) {
+          vnode.fnScopeId = options._scopeId;
+          vnode.fnContext = parent;
+        }
+        return vnode
+      };
+    } else {
+      this._c = function (a, b, c, d) { return createElement(contextVm, a, b, c, d, needNormalization); };
+    }
+  }
+
+  installRenderHelpers(FunctionalRenderContext.prototype);
+
+  function createFunctionalComponent (
+    Ctor,
+    propsData,
+    data,
+    contextVm,
+    children
+  ) {
+    var options = Ctor.options;
+    var props = {};
+    var propOptions = options.props;
+    if (isDef(propOptions)) {
+      for (var key in propOptions) {
+        props[key] = validateProp(key, propOptions, propsData || emptyObject);
+      }
+    } else {
+      if (isDef(data.attrs)) { mergeProps(props, data.attrs); }
+      if (isDef(data.props)) { mergeProps(props, data.props); }
+    }
+
+    var renderContext = new FunctionalRenderContext(
+      data,
+      props,
+      children,
+      contextVm,
+      Ctor
+    );
+
+    var vnode = options.render.call(null, renderContext._c, renderContext);
+
+    if (vnode instanceof VNode) {
+      return cloneAndMarkFunctionalResult(vnode, data, renderContext.parent, options, renderContext)
+    } else if (Array.isArray(vnode)) {
+      var vnodes = normalizeChildren(vnode) || [];
+      var res = new Array(vnodes.length);
+      for (var i = 0; i < vnodes.length; i++) {
+        res[i] = cloneAndMarkFunctionalResult(vnodes[i], data, renderContext.parent, options, renderContext);
+      }
+      return res
+    }
+  }
+
+  function cloneAndMarkFunctionalResult (vnode, data, contextVm, options, renderContext) {
+    // #7817 clone node before setting fnContext, otherwise if the node is reused
+    // (e.g. it was from a cached normal slot) the fnContext causes named slots
+    // that should not be matched to match.
+    var clone = cloneVNode(vnode);
+    clone.fnContext = contextVm;
+    clone.fnOptions = options;
+    {
+      (clone.devtoolsMeta = clone.devtoolsMeta || {}).renderContext = renderContext;
+    }
+    if (data.slot) {
+      (clone.data || (clone.data = {})).slot = data.slot;
+    }
+    return clone
+  }
+
+  function mergeProps (to, from) {
+    for (var key in from) {
+      to[camelize(key)] = from[key];
+    }
+  }
+
+  /*  */
+
+  /*  */
+
+  /*  */
+
+  /*  */
+
+  // inline hooks to be invoked on component VNodes during patch
+  var componentVNodeHooks = {
+    init: function init (vnode, hydrating) {
+      if (
+        vnode.componentInstance &&
+        !vnode.componentInstance._isDestroyed &&
+        vnode.data.keepAlive
+      ) {
+        // kept-alive components, treat as a patch
+        var mountedNode = vnode; // work around flow
+        componentVNodeHooks.prepatch(mountedNode, mountedNode);
+      } else {
+        var child = vnode.componentInstance = createComponentInstanceForVnode(
+          vnode,
+          activeInstance
+        );
+        child.$mount(hydrating ? vnode.elm : undefined, hydrating);
+      }
+    },
+
+    prepatch: function prepatch (oldVnode, vnode) {
+      var options = vnode.componentOptions;
+      var child = vnode.componentInstance = oldVnode.componentInstance;
+      updateChildComponent(
+        child,
+        options.propsData, // updated props
+        options.listeners, // updated listeners
+        vnode, // new parent vnode
+        options.children // new children
+      );
+    },
+
+    insert: function insert (vnode) {
+      var context = vnode.context;
+      var componentInstance = vnode.componentInstance;
+      if (!componentInstance._isMounted) {
+        componentInstance._isMounted = true;
+        callHook(componentInstance, 'mounted');
+      }
+      if (vnode.data.keepAlive) {
+        if (context._isMounted) {
+          // vue-router#1212
+          // During updates, a kept-alive component's child components may
+          // change, so directly walking the tree here may call activated hooks
+          // on incorrect children. Instead we push them into a queue which will
+          // be processed after the whole patch process ended.
+          queueActivatedComponent(componentInstance);
+        } else {
+          activateChildComponent(componentInstance, true /* direct */);
+        }
+      }
+    },
+
+    destroy: function destroy (vnode) {
+      var componentInstance = vnode.componentInstance;
+      if (!componentInstance._isDestroyed) {
+        if (!vnode.data.keepAlive) {
+          componentInstance.$destroy();
+        } else {
+          deactivateChildComponent(componentInstance, true /* direct */);
+        }
+      }
+    }
+  };
+
+  var hooksToMerge = Object.keys(componentVNodeHooks);
+
+  function createComponent (
+    Ctor,
+    data,
+    context,
+    children,
+    tag
+  ) {
+    if (isUndef(Ctor)) {
+      return
+    }
+
+    var baseCtor = context.$options._base;
+
+    // plain options object: turn it into a constructor
+    if (isObject(Ctor)) {
+      Ctor = baseCtor.extend(Ctor);
+    }
+
+    // if at this stage it's not a constructor or an async component factory,
+    // reject.
+    if (typeof Ctor !== 'function') {
+      {
+        warn(("Invalid Component definition: " + (String(Ctor))), context);
+      }
+      return
+    }
+
+    // async component
+    var asyncFactory;
+    if (isUndef(Ctor.cid)) {
+      asyncFactory = Ctor;
+      Ctor = resolveAsyncComponent(asyncFactory, baseCtor);
+      if (Ctor === undefined) {
+        // return a placeholder node for async component, which is rendered
+        // as a comment node but preserves all the raw information for the node.
+        // the information will be used for async server-rendering and hydration.
+        return createAsyncPlaceholder(
+          asyncFactory,
+          data,
+          context,
+          children,
+          tag
+        )
+      }
+    }
+
+    data = data || {};
+
+    // resolve constructor options in case global mixins are applied after
+    // component constructor creation
+    resolveConstructorOptions(Ctor);
+
+    // transform component v-model data into props & events
+    if (isDef(data.model)) {
+      transformModel(Ctor.options, data);
+    }
+
+    // extract props
+    var propsData = extractPropsFromVNodeData(data, Ctor, tag);
+
+    // functional component
+    if (isTrue(Ctor.options.functional)) {
+      return createFunctionalComponent(Ctor, propsData, data, context, children)
+    }
+
+    // extract listeners, since these needs to be treated as
+    // child component listeners instead of DOM listeners
+    var listeners = data.on;
+    // replace with listeners with .native modifier
+    // so it gets processed during parent component patch.
+    data.on = data.nativeOn;
+
+    if (isTrue(Ctor.options.abstract)) {
+      // abstract components do not keep anything
+      // other than props & listeners & slot
+
+      // work around flow
+      var slot = data.slot;
+      data = {};
+      if (slot) {
+        data.slot = slot;
+      }
+    }
+
+    // install component management hooks onto the placeholder node
+    installComponentHooks(data);
+
+    // return a placeholder vnode
+    var name = Ctor.options.name || tag;
+    var vnode = new VNode(
+      ("vue-component-" + (Ctor.cid) + (name ? ("-" + name) : '')),
+      data, undefined, undefined, undefined, context,
+      { Ctor: Ctor, propsData: propsData, listeners: listeners, tag: tag, children: children },
+      asyncFactory
+    );
+
+    return vnode
+  }
+
+  function createComponentInstanceForVnode (
+    vnode, // we know it's MountedComponentVNode but flow doesn't
+    parent // activeInstance in lifecycle state
+  ) {
+    var options = {
+      _isComponent: true,
+      _parentVnode: vnode,
+      parent: parent
+    };
+    // check inline-template render functions
+    var inlineTemplate = vnode.data.inlineTemplate;
+    if (isDef(inlineTemplate)) {
+      options.render = inlineTemplate.render;
+      options.staticRenderFns = inlineTemplate.staticRenderFns;
+    }
+    return new vnode.componentOptions.Ctor(options)
+  }
+
+  function installComponentHooks (data) {
+    var hooks = data.hook || (data.hook = {});
+    for (var i = 0; i < hooksToMerge.length; i++) {
+      var key = hooksToMerge[i];
+      var existing = hooks[key];
+      var toMerge = componentVNodeHooks[key];
+      if (existing !== toMerge && !(existing && existing._merged)) {
+        hooks[key] = existing ? mergeHook$1(toMerge, existing) : toMerge;
+      }
+    }
+  }
+
+  function mergeHook$1 (f1, f2) {
+    var merged = function (a, b) {
+      // flow complains about extra args which is why we use any
+      f1(a, b);
+      f2(a, b);
+    };
+    merged._merged = true;
+    return merged
+  }
+
+  // transform component v-model info (value and callback) into
+  // prop and event handler respectively.
+  function transformModel (options, data) {
+    var prop = (options.model && options.model.prop) || 'value';
+    var event = (options.model && options.model.event) || 'input'
+    ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
+    var on = data.on || (data.on = {});
+    var existing = on[event];
+    var callback = data.model.callback;
+    if (isDef(existing)) {
+      if (
+        Array.isArray(existing)
+          ? existing.indexOf(callback) === -1
+          : existing !== callback
+      ) {
+        on[event] = [callback].concat(existing);
+      }
+    } else {
+      on[event] = callback;
+    }
+  }
+
+  /*  */
+
+  var SIMPLE_NORMALIZE = 1;
+  var ALWAYS_NORMALIZE = 2;
+
+  // wrapper function for providing a more flexible interface
+  // without getting yelled at by flow
+  function createElement (
+    context,
+    tag,
+    data,
+    children,
+    normalizationType,
+    alwaysNormalize
+  ) {
+    if (Array.isArray(data) || isPrimitive(data)) {
+      normalizationType = children;
+      children = data;
+      data = undefined;
+    }
+    if (isTrue(alwaysNormalize)) {
+      normalizationType = ALWAYS_NORMALIZE;
+    }
+    return _createElement(context, tag, data, children, normalizationType)
+  }
+
+  function _createElement (
+    context,
+    tag,
+    data,
+    children,
+    normalizationType
+  ) {
+    if (isDef(data) && isDef((data).__ob__)) {
+      warn(
+        "Avoid using observed data object as vnode data: " + (JSON.stringify(data)) + "\n" +
+        'Always create fresh vnode data objects in each render!',
+        context
+      );
+      return createEmptyVNode()
+    }
+    // object syntax in v-bind
+    if (isDef(data) && isDef(data.is)) {
+      tag = data.is;
+    }
+    if (!tag) {
+      // in case of component :is set to falsy value
+      return createEmptyVNode()
+    }
+    // warn against non-primitive key
+    if (isDef(data) && isDef(data.key) && !isPrimitive(data.key)
+    ) {
+      {
+        warn(
+          'Avoid using non-primitive value as key, ' +
+          'use string/number value instead.',
+          context
+        );
+      }
+    }
+    // support single function children as default scoped slot
+    if (Array.isArray(children) &&
+      typeof children[0] === 'function'
+    ) {
+      data = data || {};
+      data.scopedSlots = { default: children[0] };
+      children.length = 0;
+    }
+    if (normalizationType === ALWAYS_NORMALIZE) {
+      children = normalizeChildren(children);
+    } else if (normalizationType === SIMPLE_NORMALIZE) {
+      children = simpleNormalizeChildren(children);
+    }
+    var vnode, ns;
+    if (typeof tag === 'string') {
+      var Ctor;
+      ns = (context.$vnode && context.$vnode.ns) || config.getTagNamespace(tag);
+      if (config.isReservedTag(tag)) {
+        // platform built-in elements
+        if (isDef(data) && isDef(data.nativeOn)) {
+          warn(
+            ("The .native modifier for v-on is only valid on components but it was used on <" + tag + ">."),
+            context
+          );
+        }
+        vnode = new VNode(
+          config.parsePlatformTagName(tag), data, children,
+          undefined, undefined, context
+        );
+      } else if ((!data || !data.pre) && isDef(Ctor = resolveAsset(context.$options, 'components', tag))) {
+        // component
+        vnode = createComponent(Ctor, data, context, children, tag);
+      } else {
+        // unknown or unlisted namespaced elements
+        // check at runtime because it may get assigned a namespace when its
+        // parent normalizes children
+        vnode = new VNode(
+          tag, data, children,
+          undefined, undefined, context
+        );
+      }
+    } else {
+      // direct component options / constructor
+      vnode = createComponent(tag, data, context, children);
+    }
+    if (Array.isArray(vnode)) {
+      return vnode
+    } else if (isDef(vnode)) {
+      if (isDef(ns)) { applyNS(vnode, ns); }
+      if (isDef(data)) { registerDeepBindings(data); }
+      return vnode
+    } else {
+      return createEmptyVNode()
+    }
+  }
+
+  function applyNS (vnode, ns, force) {
+    vnode.ns = ns;
+    if (vnode.tag === 'foreignObject') {
+      // use default namespace inside foreignObject
+      ns = undefined;
+      force = true;
+    }
+    if (isDef(vnode.children)) {
+      for (var i = 0, l = vnode.children.length; i < l; i++) {
+        var child = vnode.children[i];
+        if (isDef(child.tag) && (
+          isUndef(child.ns) || (isTrue(force) && child.tag !== 'svg'))) {
+          applyNS(child, ns, force);
+        }
+      }
+    }
+  }
+
+  // ref #5318
+  // necessary to ensure parent re-render when deep bindings like :style and
+  // :class are used on slot nodes
+  function registerDeepBindings (data) {
+    if (isObject(data.style)) {
+      traverse(data.style);
+    }
+    if (isObject(data.class)) {
+      traverse(data.class);
+    }
+  }
+
+  /*  */
+
+  function initRender (vm) {
+    vm._vnode = null; // the root of the child tree
+    vm._staticTrees = null; // v-once cached trees
+    var options = vm.$options;
+    var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
+    var renderContext = parentVnode && parentVnode.context;
+    vm.$slots = resolveSlots(options._renderChildren, renderContext);
+    vm.$scopedSlots = emptyObject;
+    // bind the createElement fn to this instance
+    // so that we get proper render context inside it.
+    // args order: tag, data, children, normalizationType, alwaysNormalize
+    // internal version is used by render functions compiled from templates
+    vm._c = function (a, b, c, d) { return createElement(vm, a, b, c, d, false); };
+    // normalization is always applied for the public version, used in
+    // user-written render functions.
+    vm.$createElement = function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
+
+    // $attrs & $listeners are exposed for easier HOC creation.
+    // they need to be reactive so that HOCs using them are always updated
+    var parentData = parentVnode && parentVnode.data;
+
+    /* istanbul ignore else */
+    {
+      defineReactive$$1(vm, '$attrs', parentData && parentData.attrs || emptyObject, function () {
+        !isUpdatingChildComponent && warn("$attrs is readonly.", vm);
+      }, true);
+      defineReactive$$1(vm, '$listeners', options._parentListeners || emptyObject, function () {
+        !isUpdatingChildComponent && warn("$listeners is readonly.", vm);
+      }, true);
+    }
+  }
+
+  var currentRenderingInstance = null;
+
+  function renderMixin (Vue) {
+    // install runtime convenience helpers
+    installRenderHelpers(Vue.prototype);
+
+    Vue.prototype.$nextTick = function (fn) {
+      return nextTick(fn, this)
+    };
+
+    Vue.prototype._render = function () {
+      var vm = this;
+      var ref = vm.$options;
+      var render = ref.render;
+      var _parentVnode = ref._parentVnode;
+
+      if (_parentVnode) {
+        vm.$scopedSlots = normalizeScopedSlots(
+          _parentVnode.data.scopedSlots,
+          vm.$slots,
+          vm.$scopedSlots
+        );
+      }
+
+      // set parent vnode. this allows render functions to have access
+      // to the data on the placeholder node.
+      vm.$vnode = _parentVnode;
+      // render self
+      var vnode;
+      try {
+        // There's no need to maintain a stack because all render fns are called
+        // separately from one another. Nested component's render fns are called
+        // when parent component is patched.
+        currentRenderingInstance = vm;
+        vnode = render.call(vm._renderProxy, vm.$createElement);
+      } catch (e) {
+        handleError(e, vm, "render");
+        // return error render result,
+        // or previous vnode to prevent render error causing blank component
+        /* istanbul ignore else */
+        if (vm.$options.renderError) {
+          try {
+            vnode = vm.$options.renderError.call(vm._renderProxy, vm.$createElement, e);
+          } catch (e) {
+            handleError(e, vm, "renderError");
+            vnode = vm._vnode;
+          }
+        } else {
+          vnode = vm._vnode;
+        }
+      } finally {
+        currentRenderingInstance = null;
+      }
+      // if the returned array contains only a single node, allow it
+      if (Array.isArray(vnode) && vnode.length === 1) {
+        vnode = vnode[0];
+      }
+      // return empty vnode in case the render function errored out
+      if (!(vnode instanceof VNode)) {
+        if (Array.isArray(vnode)) {
+          warn(
+            'Multiple root nodes returned from render function. Render function ' +
+            'should return a single root node.',
+            vm
+          );
+        }
+        vnode = createEmptyVNode();
+      }
+      // set parent
+      vnode.parent = _parentVnode;
+      return vnode
+    };
+  }
+
+  /*  */
+
+  function ensureCtor (comp, base) {
+    if (
+      comp.__esModule ||
+      (hasSymbol && comp[Symbol.toStringTag] === 'Module')
+    ) {
+      comp = comp.default;
+    }
+    return isObject(comp)
+      ? base.extend(comp)
+      : comp
+  }
+
+  function createAsyncPlaceholder (
+    factory,
+    data,
+    context,
+    children,
+    tag
+  ) {
+    var node = createEmptyVNode();
+    node.asyncFactory = factory;
+    node.asyncMeta = { data: data, context: context, children: children, tag: tag };
+    return node
+  }
+
+  function resolveAsyncComponent (
+    factory,
+    baseCtor
+  ) {
+    if (isTrue(factory.error) && isDef(factory.errorComp)) {
+      return factory.errorComp
+    }
+
+    if (isDef(factory.resolved)) {
+      return factory.resolved
+    }
+
+    var owner = currentRenderingInstance;
+    if (owner && isDef(factory.owners) && factory.owners.indexOf(owner) === -1) {
+      // already pending
+      factory.owners.push(owner);
+    }
+
+    if (isTrue(factory.loading) && isDef(factory.loadingComp)) {
+      return factory.loadingComp
+    }
+
+    if (owner && !isDef(factory.owners)) {
+      var owners = factory.owners = [owner];
+      var sync = true;
+      var timerLoading = null;
+      var timerTimeout = null
+
+      ;(owner).$on('hook:destroyed', function () { return remove(owners, owner); });
+
+      var forceRender = function (renderCompleted) {
+        for (var i = 0, l = owners.length; i < l; i++) {
+          (owners[i]).$forceUpdate();
+        }
+
+        if (renderCompleted) {
+          owners.length = 0;
+          if (timerLoading !== null) {
+            clearTimeout(timerLoading);
+            timerLoading = null;
+          }
+          if (timerTimeout !== null) {
+            clearTimeout(timerTimeout);
+            timerTimeout = null;
+          }
+        }
+      };
+
+      var resolve = once(function (res) {
+        // cache resolved
+        factory.resolved = ensureCtor(res, baseCtor);
+        // invoke callbacks only if this is not a synchronous resolve
+        // (async resolves are shimmed as synchronous during SSR)
+        if (!sync) {
+          forceRender(true);
+        } else {
+          owners.length = 0;
+        }
+      });
+
+      var reject = once(function (reason) {
+        warn(
+          "Failed to resolve async component: " + (String(factory)) +
+          (reason ? ("\nReason: " + reason) : '')
+        );
+        if (isDef(factory.errorComp)) {
+          factory.error = true;
+          forceRender(true);
+        }
+      });
+
+      var res = factory(resolve, reject);
+
+      if (isObject(res)) {
+        if (isPromise(res)) {
+          // () => Promise
+          if (isUndef(factory.resolved)) {
+            res.then(resolve, reject);
+          }
+        } else if (isPromise(res.component)) {
+          res.component.then(resolve, reject);
+
+          if (isDef(res.error)) {
+            factory.errorComp = ensureCtor(res.error, baseCtor);
+          }
+
+          if (isDef(res.loading)) {
+            factory.loadingComp = ensureCtor(res.loading, baseCtor);
+            if (res.delay === 0) {
+              factory.loading = true;
+            } else {
+              timerLoading = setTimeout(function () {
+                timerLoading = null;
+                if (isUndef(factory.resolved) && isUndef(factory.error)) {
+                  factory.loading = true;
+                  forceRender(false);
+                }
+              }, res.delay || 200);
+            }
+          }
+
+          if (isDef(res.timeout)) {
+            timerTimeout = setTimeout(function () {
+              timerTimeout = null;
+              if (isUndef(factory.resolved)) {
+                reject(
+                  "timeout (" + (res.timeout) + "ms)"
+                );
+              }
+            }, res.timeout);
+          }
+        }
+      }
+
+      sync = false;
+      // return in case resolved synchronously
+      return factory.loading
+        ? factory.loadingComp
+        : factory.resolved
+    }
+  }
+
+  /*  */
+
+  function isAsyncPlaceholder (node) {
+    return node.isComment && node.asyncFactory
+  }
+
+  /*  */
+
+  function getFirstComponentChild (children) {
+    if (Array.isArray(children)) {
+      for (var i = 0; i < children.length; i++) {
+        var c = children[i];
+        if (isDef(c) && (isDef(c.componentOptions) || isAsyncPlaceholder(c))) {
+          return c
+        }
+      }
+    }
+  }
+
+  /*  */
+
+  /*  */
+
+  function initEvents (vm) {
+    vm._events = Object.create(null);
+    vm._hasHookEvent = false;
+    // init parent attached events
+    var listeners = vm.$options._parentListeners;
+    if (listeners) {
+      updateComponentListeners(vm, listeners);
+    }
+  }
+
+  var target;
+
+  function add (event, fn) {
+    target.$on(event, fn);
+  }
+
+  function remove$1 (event, fn) {
+    target.$off(event, fn);
+  }
+
+  function createOnceHandler (event, fn) {
+    var _target = target;
+    return function onceHandler () {
+      var res = fn.apply(null, arguments);
+      if (res !== null) {
+        _target.$off(event, onceHandler);
+      }
+    }
+  }
+
+  function updateComponentListeners (
+    vm,
+    listeners,
+    oldListeners
+  ) {
+    target = vm;
+    updateListeners(listeners, oldListeners || {}, add, remove$1, createOnceHandler, vm);
+    target = undefined;
+  }
+
+  function eventsMixin (Vue) {
+    var hookRE = /^hook:/;
+    Vue.prototype.$on = function (event, fn) {
+      var vm = this;
+      if (Array.isArray(event)) {
+        for (var i = 0, l = event.length; i < l; i++) {
+          vm.$on(event[i], fn);
+        }
+      } else {
+        (vm._events[event] || (vm._events[event] = [])).push(fn);
+        // optimize hook:event cost by using a boolean flag marked at registration
+        // instead of a hash lookup
+        if (hookRE.test(event)) {
+          vm._hasHookEvent = true;
+        }
+      }
+      return vm
+    };
+
+    Vue.prototype.$once = function (event, fn) {
+      var vm = this;
+      function on () {
+        vm.$off(event, on);
+        fn.apply(vm, arguments);
+      }
+      on.fn = fn;
+      vm.$on(event, on);
+      return vm
+    };
+
+    Vue.prototype.$off = function (event, fn) {
+      var vm = this;
+      // all
+      if (!arguments.length) {
+        vm._events = Object.create(null);
+        return vm
+      }
+      // array of events
+      if (Array.isArray(event)) {
+        for (var i$1 = 0, l = event.length; i$1 < l; i$1++) {
+          vm.$off(event[i$1], fn);
+        }
+        return vm
+      }
+      // specific event
+      var cbs = vm._events[event];
+      if (!cbs) {
+        return vm
+      }
+      if (!fn) {
+        vm._events[event] = null;
+        return vm
+      }
+      // specific handler
+      var cb;
+      var i = cbs.length;
+      while (i--) {
+        cb = cbs[i];
+        if (cb === fn || cb.fn === fn) {
+          cbs.splice(i, 1);
+          break
+        }
+      }
+      return vm
+    };
+
+    Vue.prototype.$emit = function (event) {
+      var vm = this;
+      {
+        var lowerCaseEvent = event.toLowerCase();
+        if (lowerCaseEvent !== event && vm._events[lowerCaseEvent]) {
+          tip(
+            "Event \"" + lowerCaseEvent + "\" is emitted in component " +
+            (formatComponentName(vm)) + " but the handler is registered for \"" + event + "\". " +
+            "Note that HTML attributes are case-insensitive and you cannot use " +
+            "v-on to listen to camelCase events when using in-DOM templates. " +
+            "You should probably use \"" + (hyphenate(event)) + "\" instead of \"" + event + "\"."
+          );
+        }
+      }
+      var cbs = vm._events[event];
+      if (cbs) {
+        cbs = cbs.length > 1 ? toArray(cbs) : cbs;
+        var args = toArray(arguments, 1);
+        var info = "event handler for \"" + event + "\"";
+        for (var i = 0, l = cbs.length; i < l; i++) {
+          invokeWithErrorHandling(cbs[i], vm, args, vm, info);
+        }
+      }
+      return vm
+    };
+  }
+
+  /*  */
+
+  var activeInstance = null;
+  var isUpdatingChildComponent = false;
+
+  function setActiveInstance(vm) {
+    var prevActiveInstance = activeInstance;
+    activeInstance = vm;
+    return function () {
+      activeInstance = prevActiveInstance;
+    }
+  }
+
+  function initLifecycle (vm) {
+    var options = vm.$options;
+
+    // locate first non-abstract parent
+    var parent = options.parent;
+    if (parent && !options.abstract) {
+      while (parent.$options.abstract && parent.$parent) {
+        parent = parent.$parent;
+      }
+      parent.$children.push(vm);
+    }
+
+    vm.$parent = parent;
+    vm.$root = parent ? parent.$root : vm;
+
+    vm.$children = [];
+    vm.$refs = {};
+
+    vm._watcher = null;
+    vm._inactive = null;
+    vm._directInactive = false;
+    vm._isMounted = false;
+    vm._isDestroyed = false;
+    vm._isBeingDestroyed = false;
+  }
+
+  function lifecycleMixin (Vue) {
+    Vue.prototype._update = function (vnode, hydrating) {
+      var vm = this;
+      var prevEl = vm.$el;
+      var prevVnode = vm._vnode;
+      var restoreActiveInstance = setActiveInstance(vm);
+      vm._vnode = vnode;
+      // Vue.prototype.__patch__ is injected in entry points
+      // based on the rendering backend used.
+      if (!prevVnode) {
+        // initial render
+        vm.$el = vm.__patch__(vm.$el, vnode, hydrating, false /* removeOnly */);
+      } else {
+        // updates
+        vm.$el = vm.__patch__(prevVnode, vnode);
+      }
+      restoreActiveInstance();
+      // update __vue__ reference
+      if (prevEl) {
+        prevEl.__vue__ = null;
+      }
+      if (vm.$el) {
+        vm.$el.__vue__ = vm;
+      }
+      // if parent is an HOC, update its $el as well
+      if (vm.$vnode && vm.$parent && vm.$vnode === vm.$parent._vnode) {
+        vm.$parent.$el = vm.$el;
+      }
+      // updated hook is called by the scheduler to ensure that children are
+      // updated in a parent's updated hook.
+    };
+
+    Vue.prototype.$forceUpdate = function () {
+      var vm = this;
+      if (vm._watcher) {
+        vm._watcher.update();
+      }
+    };
+
+    Vue.prototype.$destroy = function () {
+      var vm = this;
+      if (vm._isBeingDestroyed) {
+        return
+      }
+      callHook(vm, 'beforeDestroy');
+      vm._isBeingDestroyed = true;
+      // remove self from parent
+      var parent = vm.$parent;
+      if (parent && !parent._isBeingDestroyed && !vm.$options.abstract) {
+        remove(parent.$children, vm);
+      }
+      // teardown watchers
+      if (vm._watcher) {
+        vm._watcher.teardown();
+      }
+      var i = vm._watchers.length;
+      while (i--) {
+        vm._watchers[i].teardown();
+      }
+      // remove reference from data ob
+      // frozen object may not have observer.
+      if (vm._data.__ob__) {
+        vm._data.__ob__.vmCount--;
+      }
+      // call the last hook...
+      vm._isDestroyed = true;
+      // invoke destroy hooks on current rendered tree
+      vm.__patch__(vm._vnode, null);
+      // fire destroyed hook
+      callHook(vm, 'destroyed');
+      // turn off all instance listeners.
+      vm.$off();
+      // remove __vue__ reference
+      if (vm.$el) {
+        vm.$el.__vue__ = null;
+      }
+      // release circular reference (#6759)
+      if (vm.$vnode) {
+        vm.$vnode.parent = null;
+      }
+    };
+  }
+
+  function mountComponent (
+    vm,
+    el,
+    hydrating
+  ) {
+    vm.$el = el;
+    if (!vm.$options.render) {
+      vm.$options.render = createEmptyVNode;
+      {
+        /* istanbul ignore if */
+        if ((vm.$options.template && vm.$options.template.charAt(0) !== '#') ||
+          vm.$options.el || el) {
+          warn(
+            'You are using the runtime-only build of Vue where the template ' +
+            'compiler is not available. Either pre-compile the templates into ' +
+            'render functions, or use the compiler-included build.',
+            vm
+          );
+        } else {
+          warn(
+            'Failed to mount component: template or render function not defined.',
+            vm
+          );
+        }
+      }
+    }
+    callHook(vm, 'beforeMount');
+
+    var updateComponent;
+    /* istanbul ignore if */
+    if (config.performance && mark) {
+      updateComponent = function () {
+        var name = vm._name;
+        var id = vm._uid;
+        var startTag = "vue-perf-start:" + id;
+        var endTag = "vue-perf-end:" + id;
+
+        mark(startTag);
+        var vnode = vm._render();
+        mark(endTag);
+        measure(("vue " + name + " render"), startTag, endTag);
+
+        mark(startTag);
+        vm._update(vnode, hydrating);
+        mark(endTag);
+        measure(("vue " + name + " patch"), startTag, endTag);
+      };
+    } else {
+      updateComponent = function () {
+        vm._update(vm._render(), hydrating);
+      };
+    }
+
+    // we set this to vm._watcher inside the watcher's constructor
+    // since the watcher's initial patch may call $forceUpdate (e.g. inside child
+    // component's mounted hook), which relies on vm._watcher being already defined
+    new Watcher(vm, updateComponent, noop, {
+      before: function before () {
+        if (vm._isMounted && !vm._isDestroyed) {
+          callHook(vm, 'beforeUpdate');
+        }
+      }
+    }, true /* isRenderWatcher */);
+    hydrating = false;
+
+    // manually mounted instance, call mounted on self
+    // mounted is called for render-created child components in its inserted hook
+    if (vm.$vnode == null) {
+      vm._isMounted = true;
+      callHook(vm, 'mounted');
+    }
+    return vm
+  }
+
+  function updateChildComponent (
+    vm,
+    propsData,
+    listeners,
+    parentVnode,
+    renderChildren
+  ) {
+    {
+      isUpdatingChildComponent = true;
+    }
+
+    // determine whether component has slot children
+    // we need to do this before overwriting $options._renderChildren.
+
+    // check if there are dynamic scopedSlots (hand-written or compiled but with
+    // dynamic slot names). Static scoped slots compiled from template has the
+    // "$stable" marker.
+    var newScopedSlots = parentVnode.data.scopedSlots;
+    var oldScopedSlots = vm.$scopedSlots;
+    var hasDynamicScopedSlot = !!(
+      (newScopedSlots && !newScopedSlots.$stable) ||
+      (oldScopedSlots !== emptyObject && !oldScopedSlots.$stable) ||
+      (newScopedSlots && vm.$scopedSlots.$key !== newScopedSlots.$key)
+    );
+
+    // Any static slot children from the parent may have changed during parent's
+    // update. Dynamic scoped slots may also have changed. In such cases, a forced
+    // update is necessary to ensure correctness.
+    var needsForceUpdate = !!(
+      renderChildren ||               // has new static slots
+      vm.$options._renderChildren ||  // has old static slots
+      hasDynamicScopedSlot
+    );
+
+    vm.$options._parentVnode = parentVnode;
+    vm.$vnode = parentVnode; // update vm's placeholder node without re-render
+
+    if (vm._vnode) { // update child tree's parent
+      vm._vnode.parent = parentVnode;
+    }
+    vm.$options._renderChildren = renderChildren;
+
+    // update $attrs and $listeners hash
+    // these are also reactive so they may trigger child update if the child
+    // used them during render
+    vm.$attrs = parentVnode.data.attrs || emptyObject;
+    vm.$listeners = listeners || emptyObject;
+
+    // update props
+    if (propsData && vm.$options.props) {
+      toggleObserving(false);
+      var props = vm._props;
+      var propKeys = vm.$options._propKeys || [];
+      for (var i = 0; i < propKeys.length; i++) {
+        var key = propKeys[i];
+        var propOptions = vm.$options.props; // wtf flow?
+        props[key] = validateProp(key, propOptions, propsData, vm);
+      }
+      toggleObserving(true);
+      // keep a copy of raw propsData
+      vm.$options.propsData = propsData;
+    }
+
+    // update listeners
+    listeners = listeners || emptyObject;
+    var oldListeners = vm.$options._parentListeners;
+    vm.$options._parentListeners = listeners;
+    updateComponentListeners(vm, listeners, oldListeners);
+
+    // resolve slots + force update if has children
+    if (needsForceUpdate) {
+      vm.$slots = resolveSlots(renderChildren, parentVnode.context);
+      vm.$forceUpdate();
+    }
+
+    {
+      isUpdatingChildComponent = false;
+    }
+  }
+
+  function isInInactiveTree (vm) {
+    while (vm && (vm = vm.$parent)) {
+      if (vm._inactive) { return true }
+    }
+    return false
+  }
+
+  function activateChildComponent (vm, direct) {
+    if (direct) {
+      vm._directInactive = false;
+      if (isInInactiveTree(vm)) {
+        return
+      }
+    } else if (vm._directInactive) {
+      return
+    }
+    if (vm._inactive || vm._inactive === null) {
+      vm._inactive = false;
+      for (var i = 0; i < vm.$children.length; i++) {
+        activateChildComponent(vm.$children[i]);
+      }
+      callHook(vm, 'activated');
+    }
+  }
+
+  function deactivateChildComponent (vm, direct) {
+    if (direct) {
+      vm._directInactive = true;
+      if (isInInactiveTree(vm)) {
+        return
+      }
+    }
+    if (!vm._inactive) {
+      vm._inactive = true;
+      for (var i = 0; i < vm.$children.length; i++) {
+        deactivateChildComponent(vm.$children[i]);
+      }
+      callHook(vm, 'deactivated');
+    }
+  }
+
+  function callHook (vm, hook) {
+    // #7573 disable dep collection when invoking lifecycle hooks
+    pushTarget();
+    var handlers = vm.$options[hook];
+    var info = hook + " hook";
+    if (handlers) {
+      for (var i = 0, j = handlers.length; i < j; i++) {
+        invokeWithErrorHandling(handlers[i], vm, null, vm, info);
+      }
+    }
+    if (vm._hasHookEvent) {
+      vm.$emit('hook:' + hook);
+    }
+    popTarget();
+  }
+
+  /*  */
+
+  var MAX_UPDATE_COUNT = 100;
+
+  var queue = [];
+  var activatedChildren = [];
+  var has = {};
+  var circular = {};
+  var waiting = false;
+  var flushing = false;
+  var index = 0;
+
+  /**
+   * Reset the scheduler's state.
+   */
+  function resetSchedulerState () {
+    index = queue.length = activatedChildren.length = 0;
+    has = {};
+    {
+      circular = {};
+    }
+    waiting = flushing = false;
+  }
+
+  // Async edge case #6566 requires saving the timestamp when event listeners are
+  // attached. However, calling performance.now() has a perf overhead especially
+  // if the page has thousands of event listeners. Instead, we take a timestamp
+  // every time the scheduler flushes and use that for all event listeners
+  // attached during that flush.
+  var currentFlushTimestamp = 0;
+
+  // Async edge case fix requires storing an event listener's attach timestamp.
+  var getNow = Date.now;
+
+  // Determine what event timestamp the browser is using. Annoyingly, the
+  // timestamp can either be hi-res (relative to page load) or low-res
+  // (relative to UNIX epoch), so in order to compare time we have to use the
+  // same timestamp type when saving the flush timestamp.
+  // All IE versions use low-res event timestamps, and have problematic clock
+  // implementations (#9632)
+  if (inBrowser && !isIE) {
+    var performance = window.performance;
+    if (
+      performance &&
+      typeof performance.now === 'function' &&
+      getNow() > document.createEvent('Event').timeStamp
+    ) {
+      // if the event timestamp, although evaluated AFTER the Date.now(), is
+      // smaller than it, it means the event is using a hi-res timestamp,
+      // and we need to use the hi-res version for event listener timestamps as
+      // well.
+      getNow = function () { return performance.now(); };
+    }
+  }
+
+  /**
+   * Flush both queues and run the watchers.
+   */
+  function flushSchedulerQueue () {
+    currentFlushTimestamp = getNow();
+    flushing = true;
+    var watcher, id;
+
+    // Sort queue before flush.
+    // This ensures that:
+    // 1. Components are updated from parent to child. (because parent is always
+    //    created before the child)
+    // 2. A component's user watchers are run before its render watcher (because
+    //    user watchers are created before the render watcher)
+    // 3. If a component is destroyed during a parent component's watcher run,
+    //    its watchers can be skipped.
+    queue.sort(function (a, b) { return a.id - b.id; });
+
+    // do not cache length because more watchers might be pushed
+    // as we run existing watchers
+    for (index = 0; index < queue.length; index++) {
+      watcher = queue[index];
+      if (watcher.before) {
+        watcher.before();
+      }
+      id = watcher.id;
+      has[id] = null;
+      watcher.run();
+      // in dev build, check and stop circular updates.
+      if (has[id] != null) {
+        circular[id] = (circular[id] || 0) + 1;
+        if (circular[id] > MAX_UPDATE_COUNT) {
+          warn(
+            'You may have an infinite update loop ' + (
+              watcher.user
+                ? ("in watcher with expression \"" + (watcher.expression) + "\"")
+                : "in a component render function."
+            ),
+            watcher.vm
+          );
+          break
+        }
+      }
+    }
+
+    // keep copies of post queues before resetting state
+    var activatedQueue = activatedChildren.slice();
+    var updatedQueue = queue.slice();
+
+    resetSchedulerState();
+
+    // call component updated and activated hooks
+    callActivatedHooks(activatedQueue);
+    callUpdatedHooks(updatedQueue);
+
+    // devtool hook
+    /* istanbul ignore if */
+    if (devtools && config.devtools) {
+      devtools.emit('flush');
+    }
+  }
+
+  function callUpdatedHooks (queue) {
+    var i = queue.length;
+    while (i--) {
+      var watcher = queue[i];
+      var vm = watcher.vm;
+      if (vm._watcher === watcher && vm._isMounted && !vm._isDestroyed) {
+        callHook(vm, 'updated');
+      }
+    }
+  }
+
+  /**
+   * Queue a kept-alive component that was activated during patch.
+   * The queue will be processed after the entire tree has been patched.
+   */
+  function queueActivatedComponent (vm) {
+    // setting _inactive to false here so that a render function can
+    // rely on checking whether it's in an inactive tree (e.g. router-view)
+    vm._inactive = false;
+    activatedChildren.push(vm);
+  }
+
+  function callActivatedHooks (queue) {
+    for (var i = 0; i < queue.length; i++) {
+      queue[i]._inactive = true;
+      activateChildComponent(queue[i], true /* true */);
+    }
+  }
+
+  /**
+   * Push a watcher into the watcher queue.
+   * Jobs with duplicate IDs will be skipped unless it's
+   * pushed when the queue is being flushed.
+   */
+  function queueWatcher (watcher) {
+    var id = watcher.id;
+    if (has[id] == null) {
+      has[id] = true;
+      if (!flushing) {
+        queue.push(watcher);
+      } else {
+        // if already flushing, splice the watcher based on its id
+        // if already past its id, it will be run next immediately.
+        var i = queue.length - 1;
+        while (i > index && queue[i].id > watcher.id) {
+          i--;
+        }
+        queue.splice(i + 1, 0, watcher);
+      }
+      // queue the flush
+      if (!waiting) {
+        waiting = true;
+
+        if (!config.async) {
+          flushSchedulerQueue();
+          return
+        }
+        nextTick(flushSchedulerQueue);
+      }
+    }
+  }
+
+  /*  */
+
+
+
+  var uid$2 = 0;
+
+  /**
+   * A watcher parses an expression, collects dependencies,
+   * and fires callback when the expression value changes.
+   * This is used for both the $watch() api and directives.
+   */
+  var Watcher = function Watcher (
+    vm,
+    expOrFn,
+    cb,
+    options,
+    isRenderWatcher
+  ) {
+    this.vm = vm;
+    if (isRenderWatcher) {
+      vm._watcher = this;
+    }
+    vm._watchers.push(this);
+    // options
+    if (options) {
+      this.deep = !!options.deep;
+      this.user = !!options.user;
+      this.lazy = !!options.lazy;
+      this.sync = !!options.sync;
+      this.before = options.before;
+    } else {
+      this.deep = this.user = this.lazy = this.sync = false;
+    }
+    this.cb = cb;
+    this.id = ++uid$2; // uid for batching
+    this.active = true;
+    this.dirty = this.lazy; // for lazy watchers
+    this.deps = [];
+    this.newDeps = [];
+    this.depIds = new _Set();
+    this.newDepIds = new _Set();
+    this.expression = expOrFn.toString();
+    // parse expression for getter
+    if (typeof expOrFn === 'function') {
+      this.getter = expOrFn;
+    } else {
+      this.getter = parsePath(expOrFn);
+      if (!this.getter) {
+        this.getter = noop;
+        warn(
+          "Failed watching path: \"" + expOrFn + "\" " +
+          'Watcher only accepts simple dot-delimited paths. ' +
+          'For full control, use a function instead.',
+          vm
+        );
+      }
+    }
+    this.value = this.lazy
+      ? undefined
+      : this.get();
+  };
+
+  /**
+   * Evaluate the getter, and re-collect dependencies.
+   */
+  Watcher.prototype.get = function get () {
+    pushTarget(this);
+    var value;
+    var vm = this.vm;
+    try {
+      value = this.getter.call(vm, vm);
+    } catch (e) {
+      if (this.user) {
+        handleError(e, vm, ("getter for watcher \"" + (this.expression) + "\""));
+      } else {
+        throw e
+      }
+    } finally {
+      // "touch" every property so they are all tracked as
+      // dependencies for deep watching
+      if (this.deep) {
+        traverse(value);
+      }
+      popTarget();
+      this.cleanupDeps();
+    }
+    return value
+  };
+
+  /**
+   * Add a dependency to this directive.
+   */
+  Watcher.prototype.addDep = function addDep (dep) {
+    var id = dep.id;
+    if (!this.newDepIds.has(id)) {
+      this.newDepIds.add(id);
+      this.newDeps.push(dep);
+      if (!this.depIds.has(id)) {
+        dep.addSub(this);
+      }
+    }
+  };
+
+  /**
+   * Clean up for dependency collection.
+   */
+  Watcher.prototype.cleanupDeps = function cleanupDeps () {
+    var i = this.deps.length;
+    while (i--) {
+      var dep = this.deps[i];
+      if (!this.newDepIds.has(dep.id)) {
+        dep.removeSub(this);
+      }
+    }
+    var tmp = this.depIds;
+    this.depIds = this.newDepIds;
+    this.newDepIds = tmp;
+    this.newDepIds.clear();
+    tmp = this.deps;
+    this.deps = this.newDeps;
+    this.newDeps = tmp;
+    this.newDeps.length = 0;
+  };
+
+  /**
+   * Subscriber interface.
+   * Will be called when a dependency changes.
+   */
+  Watcher.prototype.update = function update () {
+    /* istanbul ignore else */
+    if (this.lazy) {
+      this.dirty = true;
+    } else if (this.sync) {
+      this.run();
+    } else {
+      queueWatcher(this);
+    }
+  };
+
+  /**
+   * Scheduler job interface.
+   * Will be called by the scheduler.
+   */
+  Watcher.prototype.run = function run () {
+    if (this.active) {
+      var value = this.get();
+      if (
+        value !== this.value ||
+        // Deep watchers and watchers on Object/Arrays should fire even
+        // when the value is the same, because the value may
+        // have mutated.
+        isObject(value) ||
+        this.deep
+      ) {
+        // set new value
+        var oldValue = this.value;
+        this.value = value;
+        if (this.user) {
+          try {
+            this.cb.call(this.vm, value, oldValue);
+          } catch (e) {
+            handleError(e, this.vm, ("callback for watcher \"" + (this.expression) + "\""));
+          }
+        } else {
+          this.cb.call(this.vm, value, oldValue);
+        }
+      }
+    }
+  };
+
+  /**
+   * Evaluate the value of the watcher.
+   * This only gets called for lazy watchers.
+   */
+  Watcher.prototype.evaluate = function evaluate () {
+    this.value = this.get();
+    this.dirty = false;
+  };
+
+  /**
+   * Depend on all deps collected by this watcher.
+   */
+  Watcher.prototype.depend = function depend () {
+    var i = this.deps.length;
+    while (i--) {
+      this.deps[i].depend();
+    }
+  };
+
+  /**
+   * Remove self from all dependencies' subscriber list.
+   */
+  Watcher.prototype.teardown = function teardown () {
+    if (this.active) {
+      // remove self from vm's watcher list
+      // this is a somewhat expensive operation so we skip it
+      // if the vm is being destroyed.
+      if (!this.vm._isBeingDestroyed) {
+        remove(this.vm._watchers, this);
+      }
+      var i = this.deps.length;
+      while (i--) {
+        this.deps[i].removeSub(this);
+      }
+      this.active = false;
+    }
+  };
+
+  /*  */
+
+  var sharedPropertyDefinition = {
+    enumerable: true,
+    configurable: true,
+    get: noop,
+    set: noop
+  };
+
+  function proxy (target, sourceKey, key) {
+    sharedPropertyDefinition.get = function proxyGetter () {
+      return this[sourceKey][key]
+    };
+    sharedPropertyDefinition.set = function proxySetter (val) {
+      this[sourceKey][key] = val;
+    };
+    Object.defineProperty(target, key, sharedPropertyDefinition);
+  }
+
+  function initState (vm) {
+    vm._watchers = [];
+    var opts = vm.$options;
+    if (opts.props) { initProps(vm, opts.props); }
+    if (opts.methods) { initMethods(vm, opts.methods); }
+    if (opts.data) {
+      initData(vm);
+    } else {
+      observe(vm._data = {}, true /* asRootData */);
+    }
+    if (opts.computed) { initComputed(vm, opts.computed); }
+    if (opts.watch && opts.watch !== nativeWatch) {
+      initWatch(vm, opts.watch);
+    }
+  }
+
+  function initProps (vm, propsOptions) {
+    var propsData = vm.$options.propsData || {};
+    var props = vm._props = {};
+    // cache prop keys so that future props updates can iterate using Array
+    // instead of dynamic object key enumeration.
+    var keys = vm.$options._propKeys = [];
+    var isRoot = !vm.$parent;
+    // root instance props should be converted
+    if (!isRoot) {
+      toggleObserving(false);
+    }
+    var loop = function ( key ) {
+      keys.push(key);
+      var value = validateProp(key, propsOptions, propsData, vm);
+      /* istanbul ignore else */
+      {
+        var hyphenatedKey = hyphenate(key);
+        if (isReservedAttribute(hyphenatedKey) ||
+            config.isReservedAttr(hyphenatedKey)) {
+          warn(
+            ("\"" + hyphenatedKey + "\" is a reserved attribute and cannot be used as component prop."),
+            vm
+          );
+        }
+        defineReactive$$1(props, key, value, function () {
+          if (!isRoot && !isUpdatingChildComponent) {
+            warn(
+              "Avoid mutating a prop directly since the value will be " +
+              "overwritten whenever the parent component re-renders. " +
+              "Instead, use a data or computed property based on the prop's " +
+              "value. Prop being mutated: \"" + key + "\"",
+              vm
+            );
+          }
+        });
+      }
+      // static props are already proxied on the component's prototype
+      // during Vue.extend(). We only need to proxy props defined at
+      // instantiation here.
+      if (!(key in vm)) {
+        proxy(vm, "_props", key);
+      }
+    };
+
+    for (var key in propsOptions) loop( key );
+    toggleObserving(true);
+  }
+
+  function initData (vm) {
+    var data = vm.$options.data;
+    data = vm._data = typeof data === 'function'
+      ? getData(data, vm)
+      : data || {};
+    if (!isPlainObject(data)) {
+      data = {};
+      warn(
+        'data functions should return an object:\n' +
+        'https://vuejs.org/v2/guide/components.html#data-Must-Be-a-Function',
+        vm
+      );
+    }
+    // proxy data on instance
+    var keys = Object.keys(data);
+    var props = vm.$options.props;
+    var methods = vm.$options.methods;
+    var i = keys.length;
+    while (i--) {
+      var key = keys[i];
+      {
+        if (methods && hasOwn(methods, key)) {
+          warn(
+            ("Method \"" + key + "\" has already been defined as a data property."),
+            vm
+          );
+        }
+      }
+      if (props && hasOwn(props, key)) {
+        warn(
+          "The data property \"" + key + "\" is already declared as a prop. " +
+          "Use prop default value instead.",
+          vm
+        );
+      } else if (!isReserved(key)) {
+        proxy(vm, "_data", key);
+      }
+    }
+    // observe data
+    observe(data, true /* asRootData */);
+  }
+
+  function getData (data, vm) {
+    // #7573 disable dep collection when invoking data getters
+    pushTarget();
+    try {
+      return data.call(vm, vm)
+    } catch (e) {
+      handleError(e, vm, "data()");
+      return {}
+    } finally {
+      popTarget();
+    }
+  }
+
+  var computedWatcherOptions = { lazy: true };
+
+  function initComputed (vm, computed) {
+    // $flow-disable-line
+    var watchers = vm._computedWatchers = Object.create(null);
+    // computed properties are just getters during SSR
+    var isSSR = isServerRendering();
+
+    for (var key in computed) {
+      var userDef = computed[key];
+      var getter = typeof userDef === 'function' ? userDef : userDef.get;
+      if (getter == null) {
+        warn(
+          ("Getter is missing for computed property \"" + key + "\"."),
+          vm
+        );
+      }
+
+      if (!isSSR) {
+        // create internal watcher for the computed property.
+        watchers[key] = new Watcher(
+          vm,
+          getter || noop,
+          noop,
+          computedWatcherOptions
+        );
+      }
+
+      // component-defined computed properties are already defined on the
+      // component prototype. We only need to define computed properties defined
+      // at instantiation here.
+      if (!(key in vm)) {
+        defineComputed(vm, key, userDef);
+      } else {
+        if (key in vm.$data) {
+          warn(("The computed property \"" + key + "\" is already defined in data."), vm);
+        } else if (vm.$options.props && key in vm.$options.props) {
+          warn(("The computed property \"" + key + "\" is already defined as a prop."), vm);
+        }
+      }
+    }
+  }
+
+  function defineComputed (
+    target,
+    key,
+    userDef
+  ) {
+    var shouldCache = !isServerRendering();
+    if (typeof userDef === 'function') {
+      sharedPropertyDefinition.get = shouldCache
+        ? createComputedGetter(key)
+        : createGetterInvoker(userDef);
+      sharedPropertyDefinition.set = noop;
+    } else {
+      sharedPropertyDefinition.get = userDef.get
+        ? shouldCache && userDef.cache !== false
+          ? createComputedGetter(key)
+          : createGetterInvoker(userDef.get)
+        : noop;
+      sharedPropertyDefinition.set = userDef.set || noop;
+    }
+    if (sharedPropertyDefinition.set === noop) {
+      sharedPropertyDefinition.set = function () {
+        warn(
+          ("Computed property \"" + key + "\" was assigned to but it has no setter."),
+          this
+        );
+      };
+    }
+    Object.defineProperty(target, key, sharedPropertyDefinition);
+  }
+
+  function createComputedGetter (key) {
+    return function computedGetter () {
+      var watcher = this._computedWatchers && this._computedWatchers[key];
+      if (watcher) {
+        if (watcher.dirty) {
+          watcher.evaluate();
+        }
+        if (Dep.target) {
+          watcher.depend();
+        }
+        return watcher.value
+      }
+    }
+  }
+
+  function createGetterInvoker(fn) {
+    return function computedGetter () {
+      return fn.call(this, this)
+    }
+  }
+
+  function initMethods (vm, methods) {
+    var props = vm.$options.props;
+    for (var key in methods) {
+      {
+        if (typeof methods[key] !== 'function') {
+          warn(
+            "Method \"" + key + "\" has type \"" + (typeof methods[key]) + "\" in the component definition. " +
+            "Did you reference the function correctly?",
+            vm
+          );
+        }
+        if (props && hasOwn(props, key)) {
+          warn(
+            ("Method \"" + key + "\" has already been defined as a prop."),
+            vm
+          );
+        }
+        if ((key in vm) && isReserved(key)) {
+          warn(
+            "Method \"" + key + "\" conflicts with an existing Vue instance method. " +
+            "Avoid defining component methods that start with _ or $."
+          );
+        }
+      }
+      vm[key] = typeof methods[key] !== 'function' ? noop : bind(methods[key], vm);
+    }
+  }
+
+  function initWatch (vm, watch) {
+    for (var key in watch) {
+      var handler = watch[key];
+      if (Array.isArray(handler)) {
+        for (var i = 0; i < handler.length; i++) {
+          createWatcher(vm, key, handler[i]);
+        }
+      } else {
+        createWatcher(vm, key, handler);
+      }
+    }
+  }
+
+  function createWatcher (
+    vm,
+    expOrFn,
+    handler,
+    options
+  ) {
+    if (isPlainObject(handler)) {
+      options = handler;
+      handler = handler.handler;
+    }
+    if (typeof handler === 'string') {
+      handler = vm[handler];
+    }
+    return vm.$watch(expOrFn, handler, options)
+  }
+
+  function stateMixin (Vue) {
+    // flow somehow has problems with directly declared definition object
+    // when using Object.defineProperty, so we have to procedurally build up
+    // the object here.
+    var dataDef = {};
+    dataDef.get = function () { return this._data };
+    var propsDef = {};
+    propsDef.get = function () { return this._props };
+    {
+      dataDef.set = function () {
+        warn(
+          'Avoid replacing instance root $data. ' +
+          'Use nested data properties instead.',
+          this
+        );
+      };
+      propsDef.set = function () {
+        warn("$props is readonly.", this);
+      };
+    }
+    Object.defineProperty(Vue.prototype, '$data', dataDef);
+    Object.defineProperty(Vue.prototype, '$props', propsDef);
+
+    Vue.prototype.$set = set;
+    Vue.prototype.$delete = del;
+
+    Vue.prototype.$watch = function (
+      expOrFn,
+      cb,
+      options
+    ) {
+      var vm = this;
+      if (isPlainObject(cb)) {
+        return createWatcher(vm, expOrFn, cb, options)
+      }
+      options = options || {};
+      options.user = true;
+      var watcher = new Watcher(vm, expOrFn, cb, options);
+      if (options.immediate) {
+        try {
+          cb.call(vm, watcher.value);
+        } catch (error) {
+          handleError(error, vm, ("callback for immediate watcher \"" + (watcher.expression) + "\""));
+        }
+      }
+      return function unwatchFn () {
+        watcher.teardown();
+      }
+    };
+  }
+
+  /*  */
+
+  var uid$3 = 0;
+
+  function initMixin (Vue) {
+    Vue.prototype._init = function (options) {
+      var vm = this;
+      // a uid
+      vm._uid = uid$3++;
+
+      var startTag, endTag;
+      /* istanbul ignore if */
+      if (config.performance && mark) {
+        startTag = "vue-perf-start:" + (vm._uid);
+        endTag = "vue-perf-end:" + (vm._uid);
+        mark(startTag);
+      }
+
+      // a flag to avoid this being observed
+      vm._isVue = true;
+      // merge options
+      if (options && options._isComponent) {
+        // optimize internal component instantiation
+        // since dynamic options merging is pretty slow, and none of the
+        // internal component options needs special treatment.
+        initInternalComponent(vm, options);
+      } else {
+        vm.$options = mergeOptions(
+          resolveConstructorOptions(vm.constructor),
+          options || {},
+          vm
+        );
+      }
+      /* istanbul ignore else */
+      {
+        initProxy(vm);
+      }
+      // expose real self
+      vm._self = vm;
+      initLifecycle(vm);
+      initEvents(vm);
+      initRender(vm);
+      callHook(vm, 'beforeCreate');
+      initInjections(vm); // resolve injections before data/props
+      initState(vm);
+      initProvide(vm); // resolve provide after data/props
+      callHook(vm, 'created');
+
+      /* istanbul ignore if */
+      if (config.performance && mark) {
+        vm._name = formatComponentName(vm, false);
+        mark(endTag);
+        measure(("vue " + (vm._name) + " init"), startTag, endTag);
+      }
+
+      if (vm.$options.el) {
+        vm.$mount(vm.$options.el);
+      }
+    };
+  }
+
+  function initInternalComponent (vm, options) {
+    var opts = vm.$options = Object.create(vm.constructor.options);
+    // doing this because it's faster than dynamic enumeration.
+    var parentVnode = options._parentVnode;
+    opts.parent = options.parent;
+    opts._parentVnode = parentVnode;
+
+    var vnodeComponentOptions = parentVnode.componentOptions;
+    opts.propsData = vnodeComponentOptions.propsData;
+    opts._parentListeners = vnodeComponentOptions.listeners;
+    opts._renderChildren = vnodeComponentOptions.children;
+    opts._componentTag = vnodeComponentOptions.tag;
+
+    if (options.render) {
+      opts.render = options.render;
+      opts.staticRenderFns = options.staticRenderFns;
+    }
+  }
+
+  function resolveConstructorOptions (Ctor) {
+    var options = Ctor.options;
+    if (Ctor.super) {
+      var superOptions = resolveConstructorOptions(Ctor.super);
+      var cachedSuperOptions = Ctor.superOptions;
+      if (superOptions !== cachedSuperOptions) {
+        // super option changed,
+        // need to resolve new options.
+        Ctor.superOptions = superOptions;
+        // check if there are any late-modified/attached options (#4976)
+        var modifiedOptions = resolveModifiedOptions(Ctor);
+        // update base extend options
+        if (modifiedOptions) {
+          extend(Ctor.extendOptions, modifiedOptions);
+        }
+        options = Ctor.options = mergeOptions(superOptions, Ctor.extendOptions);
+        if (options.name) {
+          options.components[options.name] = Ctor;
+        }
+      }
+    }
+    return options
+  }
+
+  function resolveModifiedOptions (Ctor) {
+    var modified;
+    var latest = Ctor.options;
+    var sealed = Ctor.sealedOptions;
+    for (var key in latest) {
+      if (latest[key] !== sealed[key]) {
+        if (!modified) { modified = {}; }
+        modified[key] = latest[key];
+      }
+    }
+    return modified
+  }
+
+  function Vue (options) {
+    if (!(this instanceof Vue)
+    ) {
+      warn('Vue is a constructor and should be called with the `new` keyword');
+    }
+    this._init(options);
+  }
+
+  initMixin(Vue);
+  stateMixin(Vue);
+  eventsMixin(Vue);
+  lifecycleMixin(Vue);
+  renderMixin(Vue);
+
+  /*  */
+
+  function initUse (Vue) {
+    Vue.use = function (plugin) {
+      var installedPlugins = (this._installedPlugins || (this._installedPlugins = []));
+      if (installedPlugins.indexOf(plugin) > -1) {
+        return this
+      }
+
+      // additional parameters
+      var args = toArray(arguments, 1);
+      args.unshift(this);
+      if (typeof plugin.install === 'function') {
+        plugin.install.apply(plugin, args);
+      } else if (typeof plugin === 'function') {
+        plugin.apply(null, args);
+      }
+      installedPlugins.push(plugin);
+      return this
+    };
+  }
+
+  /*  */
+
+  function initMixin$1 (Vue) {
+    Vue.mixin = function (mixin) {
+      this.options = mergeOptions(this.options, mixin);
+      return this
+    };
+  }
+
+  /*  */
+
+  function initExtend (Vue) {
+    /**
+     * Each instance constructor, including Vue, has a unique
+     * cid. This enables us to create wrapped "child
+     * constructors" for prototypal inheritance and cache them.
+     */
+    Vue.cid = 0;
+    var cid = 1;
+
+    /**
+     * Class inheritance
+     */
+    Vue.extend = function (extendOptions) {
+      extendOptions = extendOptions || {};
+      var Super = this;
+      var SuperId = Super.cid;
+      var cachedCtors = extendOptions._Ctor || (extendOptions._Ctor = {});
+      if (cachedCtors[SuperId]) {
+        return cachedCtors[SuperId]
+      }
+
+      var name = extendOptions.name || Super.options.name;
+      if (name) {
+        validateComponentName(name);
+      }
+
+      var Sub = function VueComponent (options) {
+        this._init(options);
+      };
+      Sub.prototype = Object.create(Super.prototype);
+      Sub.prototype.constructor = Sub;
+      Sub.cid = cid++;
+      Sub.options = mergeOptions(
+        Super.options,
+        extendOptions
+      );
+      Sub['super'] = Super;
+
+      // For props and computed properties, we define the proxy getters on
+      // the Vue instances at extension time, on the extended prototype. This
+      // avoids Object.defineProperty calls for each instance created.
+      if (Sub.options.props) {
+        initProps$1(Sub);
+      }
+      if (Sub.options.computed) {
+        initComputed$1(Sub);
+      }
+
+      // allow further extension/mixin/plugin usage
+      Sub.extend = Super.extend;
+      Sub.mixin = Super.mixin;
+      Sub.use = Super.use;
+
+      // create asset registers, so extended classes
+      // can have their private assets too.
+      ASSET_TYPES.forEach(function (type) {
+        Sub[type] = Super[type];
+      });
+      // enable recursive self-lookup
+      if (name) {
+        Sub.options.components[name] = Sub;
+      }
+
+      // keep a reference to the super options at extension time.
+      // later at instantiation we can check if Super's options have
+      // been updated.
+      Sub.superOptions = Super.options;
+      Sub.extendOptions = extendOptions;
+      Sub.sealedOptions = extend({}, Sub.options);
+
+      // cache constructor
+      cachedCtors[SuperId] = Sub;
+      return Sub
+    };
+  }
+
+  function initProps$1 (Comp) {
+    var props = Comp.options.props;
+    for (var key in props) {
+      proxy(Comp.prototype, "_props", key);
+    }
+  }
+
+  function initComputed$1 (Comp) {
+    var computed = Comp.options.computed;
+    for (var key in computed) {
+      defineComputed(Comp.prototype, key, computed[key]);
+    }
+  }
+
+  /*  */
+
+  function initAssetRegisters (Vue) {
+    /**
+     * Create asset registration methods.
+     */
+    ASSET_TYPES.forEach(function (type) {
+      Vue[type] = function (
+        id,
+        definition
+      ) {
+        if (!definition) {
+          return this.options[type + 's'][id]
+        } else {
+          /* istanbul ignore if */
+          if (type === 'component') {
+            validateComponentName(id);
+          }
+          if (type === 'component' && isPlainObject(definition)) {
+            definition.name = definition.name || id;
+            definition = this.options._base.extend(definition);
+          }
+          if (type === 'directive' && typeof definition === 'function') {
+            definition = { bind: definition, update: definition };
+          }
+          this.options[type + 's'][id] = definition;
+          return definition
+        }
+      };
+    });
+  }
+
+  /*  */
+
+
+
+  function getComponentName (opts) {
+    return opts && (opts.Ctor.options.name || opts.tag)
+  }
+
+  function matches (pattern, name) {
+    if (Array.isArray(pattern)) {
+      return pattern.indexOf(name) > -1
+    } else if (typeof pattern === 'string') {
+      return pattern.split(',').indexOf(name) > -1
+    } else if (isRegExp(pattern)) {
+      return pattern.test(name)
+    }
+    /* istanbul ignore next */
+    return false
+  }
+
+  function pruneCache (keepAliveInstance, filter) {
+    var cache = keepAliveInstance.cache;
+    var keys = keepAliveInstance.keys;
+    var _vnode = keepAliveInstance._vnode;
+    for (var key in cache) {
+      var cachedNode = cache[key];
+      if (cachedNode) {
+        var name = getComponentName(cachedNode.componentOptions);
+        if (name && !filter(name)) {
+          pruneCacheEntry(cache, key, keys, _vnode);
+        }
+      }
+    }
+  }
+
+  function pruneCacheEntry (
+    cache,
+    key,
+    keys,
+    current
+  ) {
+    var cached$$1 = cache[key];
+    if (cached$$1 && (!current || cached$$1.tag !== current.tag)) {
+      cached$$1.componentInstance.$destroy();
+    }
+    cache[key] = null;
+    remove(keys, key);
+  }
+
+  var patternTypes = [String, RegExp, Array];
+
+  var KeepAlive = {
+    name: 'keep-alive',
+    abstract: true,
+
+    props: {
+      include: patternTypes,
+      exclude: patternTypes,
+      max: [String, Number]
+    },
+
+    created: function created () {
+      this.cache = Object.create(null);
+      this.keys = [];
+    },
+
+    destroyed: function destroyed () {
+      for (var key in this.cache) {
+        pruneCacheEntry(this.cache, key, this.keys);
+      }
+    },
+
+    mounted: function mounted () {
+      var this$1 = this;
+
+      this.$watch('include', function (val) {
+        pruneCache(this$1, function (name) { return matches(val, name); });
+      });
+      this.$watch('exclude', function (val) {
+        pruneCache(this$1, function (name) { return !matches(val, name); });
+      });
+    },
+
+    render: function render () {
+      var slot = this.$slots.default;
+      var vnode = getFirstComponentChild(slot);
+      var componentOptions = vnode && vnode.componentOptions;
+      if (componentOptions) {
+        // check pattern
+        var name = getComponentName(componentOptions);
+        var ref = this;
+        var include = ref.include;
+        var exclude = ref.exclude;
+        if (
+          // not included
+          (include && (!name || !matches(include, name))) ||
+          // excluded
+          (exclude && name && matches(exclude, name))
+        ) {
+          return vnode
+        }
+
+        var ref$1 = this;
+        var cache = ref$1.cache;
+        var keys = ref$1.keys;
+        var key = vnode.key == null
+          // same constructor may get registered as different local components
+          // so cid alone is not enough (#3269)
+          ? componentOptions.Ctor.cid + (componentOptions.tag ? ("::" + (componentOptions.tag)) : '')
+          : vnode.key;
+        if (cache[key]) {
+          vnode.componentInstance = cache[key].componentInstance;
+          // make current key freshest
+          remove(keys, key);
+          keys.push(key);
+        } else {
+          cache[key] = vnode;
+          keys.push(key);
+          // prune oldest entry
+          if (this.max && keys.length > parseInt(this.max)) {
+            pruneCacheEntry(cache, keys[0], keys, this._vnode);
+          }
+        }
+
+        vnode.data.keepAlive = true;
+      }
+      return vnode || (slot && slot[0])
+    }
+  };
+
+  var builtInComponents = {
+    KeepAlive: KeepAlive
+  };
+
+  /*  */
+
+  function initGlobalAPI (Vue) {
+    // config
+    var configDef = {};
+    configDef.get = function () { return config; };
+    {
+      configDef.set = function () {
+        warn(
+          'Do not replace the Vue.config object, set individual fields instead.'
+        );
+      };
+    }
+    Object.defineProperty(Vue, 'config', configDef);
+
+    // exposed util methods.
+    // NOTE: these are not considered part of the public API - avoid relying on
+    // them unless you are aware of the risk.
+    Vue.util = {
+      warn: warn,
+      extend: extend,
+      mergeOptions: mergeOptions,
+      defineReactive: defineReactive$$1
+    };
+
+    Vue.set = set;
+    Vue.delete = del;
+    Vue.nextTick = nextTick;
+
+    // 2.6 explicit observable API
+    Vue.observable = function (obj) {
+      observe(obj);
+      return obj
+    };
+
+    Vue.options = Object.create(null);
+    ASSET_TYPES.forEach(function (type) {
+      Vue.options[type + 's'] = Object.create(null);
+    });
+
+    // this is used to identify the "base" constructor to extend all plain-object
+    // components with in Weex's multi-instance scenarios.
+    Vue.options._base = Vue;
+
+    extend(Vue.options.components, builtInComponents);
+
+    initUse(Vue);
+    initMixin$1(Vue);
+    initExtend(Vue);
+    initAssetRegisters(Vue);
+  }
+
+  initGlobalAPI(Vue);
+
+  Object.defineProperty(Vue.prototype, '$isServer', {
+    get: isServerRendering
+  });
+
+  Object.defineProperty(Vue.prototype, '$ssrContext', {
+    get: function get () {
+      /* istanbul ignore next */
+      return this.$vnode && this.$vnode.ssrContext
+    }
+  });
+
+  // expose FunctionalRenderContext for ssr runtime helper installation
+  Object.defineProperty(Vue, 'FunctionalRenderContext', {
+    value: FunctionalRenderContext
+  });
+
+  Vue.version = '2.6.11';
+
+  /*  */
+
+  // these are reserved for web because they are directly compiled away
+  // during template compilation
+  var isReservedAttr = makeMap('style,class');
+
+  // attributes that should be using props for binding
+  var acceptValue = makeMap('input,textarea,option,select,progress');
+  var mustUseProp = function (tag, type, attr) {
+    return (
+      (attr === 'value' && acceptValue(tag)) && type !== 'button' ||
+      (attr === 'selected' && tag === 'option') ||
+      (attr === 'checked' && tag === 'input') ||
+      (attr === 'muted' && tag === 'video')
+    )
+  };
+
+  var isEnumeratedAttr = makeMap('contenteditable,draggable,spellcheck');
+
+  var isValidContentEditableValue = makeMap('events,caret,typing,plaintext-only');
+
+  var convertEnumeratedValue = function (key, value) {
+    return isFalsyAttrValue(value) || value === 'false'
+      ? 'false'
+      // allow arbitrary string value for contenteditable
+      : key === 'contenteditable' && isValidContentEditableValue(value)
+        ? value
+        : 'true'
+  };
+
+  var isBooleanAttr = makeMap(
+    'allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,' +
+    'default,defaultchecked,defaultmuted,defaultselected,defer,disabled,' +
+    'enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,' +
+    'muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,' +
+    'required,reversed,scoped,seamless,selected,sortable,translate,' +
+    'truespeed,typemustmatch,visible'
+  );
+
+  var xlinkNS = 'http://www.w3.org/1999/xlink';
+
+  var isXlink = function (name) {
+    return name.charAt(5) === ':' && name.slice(0, 5) === 'xlink'
+  };
+
+  var getXlinkProp = function (name) {
+    return isXlink(name) ? name.slice(6, name.length) : ''
+  };
+
+  var isFalsyAttrValue = function (val) {
+    return val == null || val === false
+  };
+
+  /*  */
+
+  function genClassForVnode (vnode) {
+    var data = vnode.data;
+    var parentNode = vnode;
+    var childNode = vnode;
+    while (isDef(childNode.componentInstance)) {
+      childNode = childNode.componentInstance._vnode;
+      if (childNode && childNode.data) {
+        data = mergeClassData(childNode.data, data);
+      }
+    }
+    while (isDef(parentNode = parentNode.parent)) {
+      if (parentNode && parentNode.data) {
+        data = mergeClassData(data, parentNode.data);
+      }
+    }
+    return renderClass(data.staticClass, data.class)
+  }
+
+  function mergeClassData (child, parent) {
+    return {
+      staticClass: concat(child.staticClass, parent.staticClass),
+      class: isDef(child.class)
+        ? [child.class, parent.class]
+        : parent.class
+    }
+  }
+
+  function renderClass (
+    staticClass,
+    dynamicClass
+  ) {
+    if (isDef(staticClass) || isDef(dynamicClass)) {
+      return concat(staticClass, stringifyClass(dynamicClass))
+    }
+    /* istanbul ignore next */
+    return ''
+  }
+
+  function concat (a, b) {
+    return a ? b ? (a + ' ' + b) : a : (b || '')
+  }
+
+  function stringifyClass (value) {
+    if (Array.isArray(value)) {
+      return stringifyArray(value)
+    }
+    if (isObject(value)) {
+      return stringifyObject(value)
+    }
+    if (typeof value === 'string') {
+      return value
+    }
+    /* istanbul ignore next */
+    return ''
+  }
+
+  function stringifyArray (value) {
+    var res = '';
+    var stringified;
+    for (var i = 0, l = value.length; i < l; i++) {
+      if (isDef(stringified = stringifyClass(value[i])) && stringified !== '') {
+        if (res) { res += ' '; }
+        res += stringified;
+      }
+    }
+    return res
+  }
+
+  function stringifyObject (value) {
+    var res = '';
+    for (var key in value) {
+      if (value[key]) {
+        if (res) { res += ' '; }
+        res += key;
+      }
+    }
+    return res
+  }
+
+  /*  */
+
+  var namespaceMap = {
+    svg: 'http://www.w3.org/2000/svg',
+    math: 'http://www.w3.org/1998/Math/MathML'
+  };
+
+  var isHTMLTag = makeMap(
+    'html,body,base,head,link,meta,style,title,' +
+    'address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,' +
+    'div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,' +
+    'a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,' +
+    's,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,' +
+    'embed,object,param,source,canvas,script,noscript,del,ins,' +
+    'caption,col,colgroup,table,thead,tbody,td,th,tr,' +
+    'button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,' +
+    'output,progress,select,textarea,' +
+    'details,dialog,menu,menuitem,summary,' +
+    'content,element,shadow,template,blockquote,iframe,tfoot'
+  );
+
+  // this map is intentionally selective, only covering SVG elements that may
+  // contain child elements.
+  var isSVG = makeMap(
+    'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,' +
+    'foreignObject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
+    'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
+    true
+  );
+
+  var isPreTag = function (tag) { return tag === 'pre'; };
+
+  var isReservedTag = function (tag) {
+    return isHTMLTag(tag) || isSVG(tag)
+  };
+
+  function getTagNamespace (tag) {
+    if (isSVG(tag)) {
+      return 'svg'
+    }
+    // basic support for MathML
+    // note it doesn't support other MathML elements being component roots
+    if (tag === 'math') {
+      return 'math'
+    }
+  }
+
+  var unknownElementCache = Object.create(null);
+  function isUnknownElement (tag) {
+    /* istanbul ignore if */
+    if (!inBrowser) {
+      return true
+    }
+    if (isReservedTag(tag)) {
+      return false
+    }
+    tag = tag.toLowerCase();
+    /* istanbul ignore if */
+    if (unknownElementCache[tag] != null) {
+      return unknownElementCache[tag]
+    }
+    var el = document.createElement(tag);
+    if (tag.indexOf('-') > -1) {
+      // http://stackoverflow.com/a/28210364/1070244
+      return (unknownElementCache[tag] = (
+        el.constructor === window.HTMLUnknownElement ||
+        el.constructor === window.HTMLElement
+      ))
+    } else {
+      return (unknownElementCache[tag] = /HTMLUnknownElement/.test(el.toString()))
+    }
+  }
+
+  var isTextInputType = makeMap('text,number,password,search,email,tel,url');
+
+  /*  */
+
+  /**
+   * Query an element selector if it's not an element already.
+   */
+  function query (el) {
+    if (typeof el === 'string') {
+      var selected = document.querySelector(el);
+      if (!selected) {
+        warn(
+          'Cannot find element: ' + el
+        );
+        return document.createElement('div')
+      }
+      return selected
+    } else {
+      return el
+    }
+  }
+
+  /*  */
+
+  function createElement$1 (tagName, vnode) {
+    var elm = document.createElement(tagName);
+    if (tagName !== 'select') {
+      return elm
+    }
+    // false or null will remove the attribute but undefined will not
+    if (vnode.data && vnode.data.attrs && vnode.data.attrs.multiple !== undefined) {
+      elm.setAttribute('multiple', 'multiple');
+    }
+    return elm
+  }
+
+  function createElementNS (namespace, tagName) {
+    return document.createElementNS(namespaceMap[namespace], tagName)
+  }
+
+  function createTextNode (text) {
+    return document.createTextNode(text)
+  }
+
+  function createComment (text) {
+    return document.createComment(text)
+  }
+
+  function insertBefore (parentNode, newNode, referenceNode) {
+    parentNode.insertBefore(newNode, referenceNode);
+  }
+
+  function removeChild (node, child) {
+    node.removeChild(child);
+  }
+
+  function appendChild (node, child) {
+    node.appendChild(child);
+  }
+
+  function parentNode (node) {
+    return node.parentNode
+  }
+
+  function nextSibling (node) {
+    return node.nextSibling
+  }
+
+  function tagName (node) {
+    return node.tagName
+  }
+
+  function setTextContent (node, text) {
+    node.textContent = text;
+  }
+
+  function setStyleScope (node, scopeId) {
+    node.setAttribute(scopeId, '');
+  }
+
+  var nodeOps = /*#__PURE__*/Object.freeze({
+    createElement: createElement$1,
+    createElementNS: createElementNS,
+    createTextNode: createTextNode,
+    createComment: createComment,
+    insertBefore: insertBefore,
+    removeChild: removeChild,
+    appendChild: appendChild,
+    parentNode: parentNode,
+    nextSibling: nextSibling,
+    tagName: tagName,
+    setTextContent: setTextContent,
+    setStyleScope: setStyleScope
+  });
+
+  /*  */
+
+  var ref = {
+    create: function create (_, vnode) {
+      registerRef(vnode);
+    },
+    update: function update (oldVnode, vnode) {
+      if (oldVnode.data.ref !== vnode.data.ref) {
+        registerRef(oldVnode, true);
+        registerRef(vnode);
+      }
+    },
+    destroy: function destroy (vnode) {
+      registerRef(vnode, true);
+    }
+  };
+
+  function registerRef (vnode, isRemoval) {
+    var key = vnode.data.ref;
+    if (!isDef(key)) { return }
+
+    var vm = vnode.context;
+    var ref = vnode.componentInstance || vnode.elm;
+    var refs = vm.$refs;
+    if (isRemoval) {
+      if (Array.isArray(refs[key])) {
+        remove(refs[key], ref);
+      } else if (refs[key] === ref) {
+        refs[key] = undefined;
+      }
+    } else {
+      if (vnode.data.refInFor) {
+        if (!Array.isArray(refs[key])) {
+          refs[key] = [ref];
+        } else if (refs[key].indexOf(ref) < 0) {
+          // $flow-disable-line
+          refs[key].push(ref);
+        }
+      } else {
+        refs[key] = ref;
+      }
+    }
+  }
+
+  /**
+   * Virtual DOM patching algorithm based on Snabbdom by
+   * Simon Friis Vindum (@paldepind)
+   * Licensed under the MIT License
+   * https://github.com/paldepind/snabbdom/blob/master/LICENSE
+   *
+   * modified by Evan You (@yyx990803)
+   *
+   * Not type-checking this because this file is perf-critical and the cost
+   * of making flow understand it is not worth it.
+   */
+
+  var emptyNode = new VNode('', {}, []);
+
+  var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
+
+  function sameVnode (a, b) {
+    return (
+      a.key === b.key && (
+        (
+          a.tag === b.tag &&
+          a.isComment === b.isComment &&
+          isDef(a.data) === isDef(b.data) &&
+          sameInputType(a, b)
+        ) || (
+          isTrue(a.isAsyncPlaceholder) &&
+          a.asyncFactory === b.asyncFactory &&
+          isUndef(b.asyncFactory.error)
+        )
+      )
+    )
+  }
+
+  function sameInputType (a, b) {
+    if (a.tag !== 'input') { return true }
+    var i;
+    var typeA = isDef(i = a.data) && isDef(i = i.attrs) && i.type;
+    var typeB = isDef(i = b.data) && isDef(i = i.attrs) && i.type;
+    return typeA === typeB || isTextInputType(typeA) && isTextInputType(typeB)
+  }
+
+  function createKeyToOldIdx (children, beginIdx, endIdx) {
+    var i, key;
+    var map = {};
+    for (i = beginIdx; i <= endIdx; ++i) {
+      key = children[i].key;
+      if (isDef(key)) { map[key] = i; }
+    }
+    return map
+  }
+
+  function createPatchFunction (backend) {
+    var i, j;
+    var cbs = {};
+
+    var modules = backend.modules;
+    var nodeOps = backend.nodeOps;
+
+    for (i = 0; i < hooks.length; ++i) {
+      cbs[hooks[i]] = [];
+      for (j = 0; j < modules.length; ++j) {
+        if (isDef(modules[j][hooks[i]])) {
+          cbs[hooks[i]].push(modules[j][hooks[i]]);
+        }
+      }
+    }
+
+    function emptyNodeAt (elm) {
+      return new VNode(nodeOps.tagName(elm).toLowerCase(), {}, [], undefined, elm)
+    }
+
+    function createRmCb (childElm, listeners) {
+      function remove$$1 () {
+        if (--remove$$1.listeners === 0) {
+          removeNode(childElm);
+        }
+      }
+      remove$$1.listeners = listeners;
+      return remove$$1
+    }
+
+    function removeNode (el) {
+      var parent = nodeOps.parentNode(el);
+      // element may have already been removed due to v-html / v-text
+      if (isDef(parent)) {
+        nodeOps.removeChild(parent, el);
+      }
+    }
+
+    function isUnknownElement$$1 (vnode, inVPre) {
+      return (
+        !inVPre &&
+        !vnode.ns &&
+        !(
+          config.ignoredElements.length &&
+          config.ignoredElements.some(function (ignore) {
+            return isRegExp(ignore)
+              ? ignore.test(vnode.tag)
+              : ignore === vnode.tag
+          })
+        ) &&
+        config.isUnknownElement(vnode.tag)
+      )
+    }
+
+    var creatingElmInVPre = 0;
+
+    function createElm (
+      vnode,
+      insertedVnodeQueue,
+      parentElm,
+      refElm,
+      nested,
+      ownerArray,
+      index
+    ) {
+      if (isDef(vnode.elm) && isDef(ownerArray)) {
+        // This vnode was used in a previous render!
+        // now it's used as a new node, overwriting its elm would cause
+        // potential patch errors down the road when it's used as an insertion
+        // reference node. Instead, we clone the node on-demand before creating
+        // associated DOM element for it.
+        vnode = ownerArray[index] = cloneVNode(vnode);
+      }
+
+      vnode.isRootInsert = !nested; // for transition enter check
+      if (createComponent(vnode, insertedVnodeQueue, parentElm, refElm)) {
+        return
+      }
+
+      var data = vnode.data;
+      var children = vnode.children;
+      var tag = vnode.tag;
+      if (isDef(tag)) {
+        {
+          if (data && data.pre) {
+            creatingElmInVPre++;
+          }
+          if (isUnknownElement$$1(vnode, creatingElmInVPre)) {
+            warn(
+              'Unknown custom element: <' + tag + '> - did you ' +
+              'register the component correctly? For recursive components, ' +
+              'make sure to provide the "name" option.',
+              vnode.context
+            );
+          }
+        }
+
+        vnode.elm = vnode.ns
+          ? nodeOps.createElementNS(vnode.ns, tag)
+          : nodeOps.createElement(tag, vnode);
+        setScope(vnode);
+
+        /* istanbul ignore if */
+        {
+          createChildren(vnode, children, insertedVnodeQueue);
+          if (isDef(data)) {
+            invokeCreateHooks(vnode, insertedVnodeQueue);
+          }
+          insert(parentElm, vnode.elm, refElm);
+        }
+
+        if (data && data.pre) {
+          creatingElmInVPre--;
+        }
+      } else if (isTrue(vnode.isComment)) {
+        vnode.elm = nodeOps.createComment(vnode.text);
+        insert(parentElm, vnode.elm, refElm);
+      } else {
+        vnode.elm = nodeOps.createTextNode(vnode.text);
+        insert(parentElm, vnode.elm, refElm);
+      }
+    }
+
+    function createComponent (vnode, insertedVnodeQueue, parentElm, refElm) {
+      var i = vnode.data;
+      if (isDef(i)) {
+        var isReactivated = isDef(vnode.componentInstance) && i.keepAlive;
+        if (isDef(i = i.hook) && isDef(i = i.init)) {
+          i(vnode, false /* hydrating */);
+        }
+        // after calling the init hook, if the vnode is a child component
+        // it should've created a child instance and mounted it. the child
+        // component also has set the placeholder vnode's elm.
+        // in that case we can just return the element and be done.
+        if (isDef(vnode.componentInstance)) {
+          initComponent(vnode, insertedVnodeQueue);
+          insert(parentElm, vnode.elm, refElm);
+          if (isTrue(isReactivated)) {
+            reactivateComponent(vnode, insertedVnodeQueue, parentElm, refElm);
+          }
+          return true
+        }
+      }
+    }
+
+    function initComponent (vnode, insertedVnodeQueue) {
+      if (isDef(vnode.data.pendingInsert)) {
+        insertedVnodeQueue.push.apply(insertedVnodeQueue, vnode.data.pendingInsert);
+        vnode.data.pendingInsert = null;
+      }
+      vnode.elm = vnode.componentInstance.$el;
+      if (isPatchable(vnode)) {
+        invokeCreateHooks(vnode, insertedVnodeQueue);
+        setScope(vnode);
+      } else {
+        // empty component root.
+        // skip all element-related modules except for ref (#3455)
+        registerRef(vnode);
+        // make sure to invoke the insert hook
+        insertedVnodeQueue.push(vnode);
+      }
+    }
+
+    function reactivateComponent (vnode, insertedVnodeQueue, parentElm, refElm) {
+      var i;
+      // hack for #4339: a reactivated component with inner transition
+      // does not trigger because the inner node's created hooks are not called
+      // again. It's not ideal to involve module-specific logic in here but
+      // there doesn't seem to be a better way to do it.
+      var innerNode = vnode;
+      while (innerNode.componentInstance) {
+        innerNode = innerNode.componentInstance._vnode;
+        if (isDef(i = innerNode.data) && isDef(i = i.transition)) {
+          for (i = 0; i < cbs.activate.length; ++i) {
+            cbs.activate[i](emptyNode, innerNode);
+          }
+          insertedVnodeQueue.push(innerNode);
+          break
+        }
+      }
+      // unlike a newly created component,
+      // a reactivated keep-alive component doesn't insert itself
+      insert(parentElm, vnode.elm, refElm);
+    }
+
+    function insert (parent, elm, ref$$1) {
+      if (isDef(parent)) {
+        if (isDef(ref$$1)) {
+          if (nodeOps.parentNode(ref$$1) === parent) {
+            nodeOps.insertBefore(parent, elm, ref$$1);
+          }
+        } else {
+          nodeOps.appendChild(parent, elm);
+        }
+      }
+    }
+
+    function createChildren (vnode, children, insertedVnodeQueue) {
+      if (Array.isArray(children)) {
+        {
+          checkDuplicateKeys(children);
+        }
+        for (var i = 0; i < children.length; ++i) {
+          createElm(children[i], insertedVnodeQueue, vnode.elm, null, true, children, i);
+        }
+      } else if (isPrimitive(vnode.text)) {
+        nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(String(vnode.text)));
+      }
+    }
+
+    function isPatchable (vnode) {
+      while (vnode.componentInstance) {
+        vnode = vnode.componentInstance._vnode;
+      }
+      return isDef(vnode.tag)
+    }
+
+    function invokeCreateHooks (vnode, insertedVnodeQueue) {
+      for (var i$1 = 0; i$1 < cbs.create.length; ++i$1) {
+        cbs.create[i$1](emptyNode, vnode);
+      }
+      i = vnode.data.hook; // Reuse variable
+      if (isDef(i)) {
+        if (isDef(i.create)) { i.create(emptyNode, vnode); }
+        if (isDef(i.insert)) { insertedVnodeQueue.push(vnode); }
+      }
+    }
+
+    // set scope id attribute for scoped CSS.
+    // this is implemented as a special case to avoid the overhead
+    // of going through the normal attribute patching process.
+    function setScope (vnode) {
+      var i;
+      if (isDef(i = vnode.fnScopeId)) {
+        nodeOps.setStyleScope(vnode.elm, i);
+      } else {
+        var ancestor = vnode;
+        while (ancestor) {
+          if (isDef(i = ancestor.context) && isDef(i = i.$options._scopeId)) {
+            nodeOps.setStyleScope(vnode.elm, i);
+          }
+          ancestor = ancestor.parent;
+        }
+      }
+      // for slot content they should also get the scopeId from the host instance.
+      if (isDef(i = activeInstance) &&
+        i !== vnode.context &&
+        i !== vnode.fnContext &&
+        isDef(i = i.$options._scopeId)
+      ) {
+        nodeOps.setStyleScope(vnode.elm, i);
+      }
+    }
+
+    function addVnodes (parentElm, refElm, vnodes, startIdx, endIdx, insertedVnodeQueue) {
+      for (; startIdx <= endIdx; ++startIdx) {
+        createElm(vnodes[startIdx], insertedVnodeQueue, parentElm, refElm, false, vnodes, startIdx);
+      }
+    }
+
+    function invokeDestroyHook (vnode) {
+      var i, j;
+      var data = vnode.data;
+      if (isDef(data)) {
+        if (isDef(i = data.hook) && isDef(i = i.destroy)) { i(vnode); }
+        for (i = 0; i < cbs.destroy.length; ++i) { cbs.destroy[i](vnode); }
+      }
+      if (isDef(i = vnode.children)) {
+        for (j = 0; j < vnode.children.length; ++j) {
+          invokeDestroyHook(vnode.children[j]);
+        }
+      }
+    }
+
+    function removeVnodes (vnodes, startIdx, endIdx) {
+      for (; startIdx <= endIdx; ++startIdx) {
+        var ch = vnodes[startIdx];
+        if (isDef(ch)) {
+          if (isDef(ch.tag)) {
+            removeAndInvokeRemoveHook(ch);
+            invokeDestroyHook(ch);
+          } else { // Text node
+            removeNode(ch.elm);
+          }
+        }
+      }
+    }
+
+    function removeAndInvokeRemoveHook (vnode, rm) {
+      if (isDef(rm) || isDef(vnode.data)) {
+        var i;
+        var listeners = cbs.remove.length + 1;
+        if (isDef(rm)) {
+          // we have a recursively passed down rm callback
+          // increase the listeners count
+          rm.listeners += listeners;
+        } else {
+          // directly removing
+          rm = createRmCb(vnode.elm, listeners);
+        }
+        // recursively invoke hooks on child component root node
+        if (isDef(i = vnode.componentInstance) && isDef(i = i._vnode) && isDef(i.data)) {
+          removeAndInvokeRemoveHook(i, rm);
+        }
+        for (i = 0; i < cbs.remove.length; ++i) {
+          cbs.remove[i](vnode, rm);
+        }
+        if (isDef(i = vnode.data.hook) && isDef(i = i.remove)) {
+          i(vnode, rm);
+        } else {
+          rm();
+        }
+      } else {
+        removeNode(vnode.elm);
+      }
+    }
+
+    function updateChildren (parentElm, oldCh, newCh, insertedVnodeQueue, removeOnly) {
+      var oldStartIdx = 0;
+      var newStartIdx = 0;
+      var oldEndIdx = oldCh.length - 1;
+      var oldStartVnode = oldCh[0];
+      var oldEndVnode = oldCh[oldEndIdx];
+      var newEndIdx = newCh.length - 1;
+      var newStartVnode = newCh[0];
+      var newEndVnode = newCh[newEndIdx];
+      var oldKeyToIdx, idxInOld, vnodeToMove, refElm;
+
+      // removeOnly is a special flag used only by <transition-group>
+      // to ensure removed elements stay in correct relative positions
+      // during leaving transitions
+      var canMove = !removeOnly;
+
+      {
+        checkDuplicateKeys(newCh);
+      }
+
+      while (oldStartIdx <= oldEndIdx && newStartIdx <= newEndIdx) {
+        if (isUndef(oldStartVnode)) {
+          oldStartVnode = oldCh[++oldStartIdx]; // Vnode has been moved left
+        } else if (isUndef(oldEndVnode)) {
+          oldEndVnode = oldCh[--oldEndIdx];
+        } else if (sameVnode(oldStartVnode, newStartVnode)) {
+          patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
+          oldStartVnode = oldCh[++oldStartIdx];
+          newStartVnode = newCh[++newStartIdx];
+        } else if (sameVnode(oldEndVnode, newEndVnode)) {
+          patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
+          oldEndVnode = oldCh[--oldEndIdx];
+          newEndVnode = newCh[--newEndIdx];
+        } else if (sameVnode(oldStartVnode, newEndVnode)) { // Vnode moved right
+          patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
+          canMove && nodeOps.insertBefore(parentElm, oldStartVnode.elm, nodeOps.nextSibling(oldEndVnode.elm));
+          oldStartVnode = oldCh[++oldStartIdx];
+          newEndVnode = newCh[--newEndIdx];
+        } else if (sameVnode(oldEndVnode, newStartVnode)) { // Vnode moved left
+          patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
+          canMove && nodeOps.insertBefore(parentElm, oldEndVnode.elm, oldStartVnode.elm);
+          oldEndVnode = oldCh[--oldEndIdx];
+          newStartVnode = newCh[++newStartIdx];
+        } else {
+          if (isUndef(oldKeyToIdx)) { oldKeyToIdx = createKeyToOldIdx(oldCh, oldStartIdx, oldEndIdx); }
+          idxInOld = isDef(newStartVnode.key)
+            ? oldKeyToIdx[newStartVnode.key]
+            : findIdxInOld(newStartVnode, oldCh, oldStartIdx, oldEndIdx);
+          if (isUndef(idxInOld)) { // New element
+            createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
+          } else {
+            vnodeToMove = oldCh[idxInOld];
+            if (sameVnode(vnodeToMove, newStartVnode)) {
+              patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
+              oldCh[idxInOld] = undefined;
+              canMove && nodeOps.insertBefore(parentElm, vnodeToMove.elm, oldStartVnode.elm);
+            } else {
+              // same key but different element. treat as new element
+              createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
+            }
+          }
+          newStartVnode = newCh[++newStartIdx];
+        }
+      }
+      if (oldStartIdx > oldEndIdx) {
+        refElm = isUndef(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+        addVnodes(parentElm, refElm, newCh, newStartIdx, newEndIdx, insertedVnodeQueue);
+      } else if (newStartIdx > newEndIdx) {
+        removeVnodes(oldCh, oldStartIdx, oldEndIdx);
+      }
+    }
+
+    function checkDuplicateKeys (children) {
+      var seenKeys = {};
+      for (var i = 0; i < children.length; i++) {
+        var vnode = children[i];
+        var key = vnode.key;
+        if (isDef(key)) {
+          if (seenKeys[key]) {
+            warn(
+              ("Duplicate keys detected: '" + key + "'. This may cause an update error."),
+              vnode.context
+            );
+          } else {
+            seenKeys[key] = true;
+          }
+        }
+      }
+    }
+
+    function findIdxInOld (node, oldCh, start, end) {
+      for (var i = start; i < end; i++) {
+        var c = oldCh[i];
+        if (isDef(c) && sameVnode(node, c)) { return i }
+      }
+    }
+
+    function patchVnode (
+      oldVnode,
+      vnode,
+      insertedVnodeQueue,
+      ownerArray,
+      index,
+      removeOnly
+    ) {
+      if (oldVnode === vnode) {
+        return
+      }
+
+      if (isDef(vnode.elm) && isDef(ownerArray)) {
+        // clone reused vnode
+        vnode = ownerArray[index] = cloneVNode(vnode);
+      }
+
+      var elm = vnode.elm = oldVnode.elm;
+
+      if (isTrue(oldVnode.isAsyncPlaceholder)) {
+        if (isDef(vnode.asyncFactory.resolved)) {
+          hydrate(oldVnode.elm, vnode, insertedVnodeQueue);
+        } else {
+          vnode.isAsyncPlaceholder = true;
+        }
+        return
+      }
+
+      // reuse element for static trees.
+      // note we only do this if the vnode is cloned -
+      // if the new node is not cloned it means the render functions have been
+      // reset by the hot-reload-api and we need to do a proper re-render.
+      if (isTrue(vnode.isStatic) &&
+        isTrue(oldVnode.isStatic) &&
+        vnode.key === oldVnode.key &&
+        (isTrue(vnode.isCloned) || isTrue(vnode.isOnce))
+      ) {
+        vnode.componentInstance = oldVnode.componentInstance;
+        return
+      }
+
+      var i;
+      var data = vnode.data;
+      if (isDef(data) && isDef(i = data.hook) && isDef(i = i.prepatch)) {
+        i(oldVnode, vnode);
+      }
+
+      var oldCh = oldVnode.children;
+      var ch = vnode.children;
+      if (isDef(data) && isPatchable(vnode)) {
+        for (i = 0; i < cbs.update.length; ++i) { cbs.update[i](oldVnode, vnode); }
+        if (isDef(i = data.hook) && isDef(i = i.update)) { i(oldVnode, vnode); }
+      }
+      if (isUndef(vnode.text)) {
+        if (isDef(oldCh) && isDef(ch)) {
+          if (oldCh !== ch) { updateChildren(elm, oldCh, ch, insertedVnodeQueue, removeOnly); }
+        } else if (isDef(ch)) {
+          {
+            checkDuplicateKeys(ch);
+          }
+          if (isDef(oldVnode.text)) { nodeOps.setTextContent(elm, ''); }
+          addVnodes(elm, null, ch, 0, ch.length - 1, insertedVnodeQueue);
+        } else if (isDef(oldCh)) {
+          removeVnodes(oldCh, 0, oldCh.length - 1);
+        } else if (isDef(oldVnode.text)) {
+          nodeOps.setTextContent(elm, '');
+        }
+      } else if (oldVnode.text !== vnode.text) {
+        nodeOps.setTextContent(elm, vnode.text);
+      }
+      if (isDef(data)) {
+        if (isDef(i = data.hook) && isDef(i = i.postpatch)) { i(oldVnode, vnode); }
+      }
+    }
+
+    function invokeInsertHook (vnode, queue, initial) {
+      // delay insert hooks for component root nodes, invoke them after the
+      // element is really inserted
+      if (isTrue(initial) && isDef(vnode.parent)) {
+        vnode.parent.data.pendingInsert = queue;
+      } else {
+        for (var i = 0; i < queue.length; ++i) {
+          queue[i].data.hook.insert(queue[i]);
+        }
+      }
+    }
+
+    var hydrationBailed = false;
+    // list of modules that can skip create hook during hydration because they
+    // are already rendered on the client or has no need for initialization
+    // Note: style is excluded because it relies on initial clone for future
+    // deep updates (#7063).
+    var isRenderedModule = makeMap('attrs,class,staticClass,staticStyle,key');
+
+    // Note: this is a browser-only function so we can assume elms are DOM nodes.
+    function hydrate (elm, vnode, insertedVnodeQueue, inVPre) {
+      var i;
+      var tag = vnode.tag;
+      var data = vnode.data;
+      var children = vnode.children;
+      inVPre = inVPre || (data && data.pre);
+      vnode.elm = elm;
+
+      if (isTrue(vnode.isComment) && isDef(vnode.asyncFactory)) {
+        vnode.isAsyncPlaceholder = true;
+        return true
+      }
+      // assert node match
+      {
+        if (!assertNodeMatch(elm, vnode, inVPre)) {
+          return false
+        }
+      }
+      if (isDef(data)) {
+        if (isDef(i = data.hook) && isDef(i = i.init)) { i(vnode, true /* hydrating */); }
+        if (isDef(i = vnode.componentInstance)) {
+          // child component. it should have hydrated its own tree.
+          initComponent(vnode, insertedVnodeQueue);
+          return true
+        }
+      }
+      if (isDef(tag)) {
+        if (isDef(children)) {
+          // empty element, allow client to pick up and populate children
+          if (!elm.hasChildNodes()) {
+            createChildren(vnode, children, insertedVnodeQueue);
+          } else {
+            // v-html and domProps: innerHTML
+            if (isDef(i = data) && isDef(i = i.domProps) && isDef(i = i.innerHTML)) {
+              if (i !== elm.innerHTML) {
+                /* istanbul ignore if */
+                if (typeof console !== 'undefined' &&
+                  !hydrationBailed
+                ) {
+                  hydrationBailed = true;
+                  console.warn('Parent: ', elm);
+                  console.warn('server innerHTML: ', i);
+                  console.warn('client innerHTML: ', elm.innerHTML);
+                }
+                return false
+              }
+            } else {
+              // iterate and compare children lists
+              var childrenMatch = true;
+              var childNode = elm.firstChild;
+              for (var i$1 = 0; i$1 < children.length; i$1++) {
+                if (!childNode || !hydrate(childNode, children[i$1], insertedVnodeQueue, inVPre)) {
+                  childrenMatch = false;
+                  break
+                }
+                childNode = childNode.nextSibling;
+              }
+              // if childNode is not null, it means the actual childNodes list is
+              // longer than the virtual children list.
+              if (!childrenMatch || childNode) {
+                /* istanbul ignore if */
+                if (typeof console !== 'undefined' &&
+                  !hydrationBailed
+                ) {
+                  hydrationBailed = true;
+                  console.warn('Parent: ', elm);
+                  console.warn('Mismatching childNodes vs. VNodes: ', elm.childNodes, children);
+                }
+                return false
+              }
+            }
+          }
+        }
+        if (isDef(data)) {
+          var fullInvoke = false;
+          for (var key in data) {
+            if (!isRenderedModule(key)) {
+              fullInvoke = true;
+              invokeCreateHooks(vnode, insertedVnodeQueue);
+              break
+            }
+          }
+          if (!fullInvoke && data['class']) {
+            // ensure collecting deps for deep class bindings for future updates
+            traverse(data['class']);
+          }
+        }
+      } else if (elm.data !== vnode.text) {
+        elm.data = vnode.text;
+      }
+      return true
+    }
+
+    function assertNodeMatch (node, vnode, inVPre) {
+      if (isDef(vnode.tag)) {
+        return vnode.tag.indexOf('vue-component') === 0 || (
+          !isUnknownElement$$1(vnode, inVPre) &&
+          vnode.tag.toLowerCase() === (node.tagName && node.tagName.toLowerCase())
+        )
+      } else {
+        return node.nodeType === (vnode.isComment ? 8 : 3)
+      }
+    }
+
+    return function patch (oldVnode, vnode, hydrating, removeOnly) {
+      if (isUndef(vnode)) {
+        if (isDef(oldVnode)) { invokeDestroyHook(oldVnode); }
+        return
+      }
+
+      var isInitialPatch = false;
+      var insertedVnodeQueue = [];
+
+      if (isUndef(oldVnode)) {
+        // empty mount (likely as component), create new root element
+        isInitialPatch = true;
+        createElm(vnode, insertedVnodeQueue);
+      } else {
+        var isRealElement = isDef(oldVnode.nodeType);
+        if (!isRealElement && sameVnode(oldVnode, vnode)) {
+          // patch existing root node
+          patchVnode(oldVnode, vnode, insertedVnodeQueue, null, null, removeOnly);
+        } else {
+          if (isRealElement) {
+            // mounting to a real element
+            // check if this is server-rendered content and if we can perform
+            // a successful hydration.
+            if (oldVnode.nodeType === 1 && oldVnode.hasAttribute(SSR_ATTR)) {
+              oldVnode.removeAttribute(SSR_ATTR);
+              hydrating = true;
+            }
+            if (isTrue(hydrating)) {
+              if (hydrate(oldVnode, vnode, insertedVnodeQueue)) {
+                invokeInsertHook(vnode, insertedVnodeQueue, true);
+                return oldVnode
+              } else {
+                warn(
+                  'The client-side rendered virtual DOM tree is not matching ' +
+                  'server-rendered content. This is likely caused by incorrect ' +
+                  'HTML markup, for example nesting block-level elements inside ' +
+                  '<p>, or missing <tbody>. Bailing hydration and performing ' +
+                  'full client-side render.'
+                );
+              }
+            }
+            // either not server-rendered, or hydration failed.
+            // create an empty node and replace it
+            oldVnode = emptyNodeAt(oldVnode);
+          }
+
+          // replacing existing element
+          var oldElm = oldVnode.elm;
+          var parentElm = nodeOps.parentNode(oldElm);
+
+          // create new node
+          createElm(
+            vnode,
+            insertedVnodeQueue,
+            // extremely rare edge case: do not insert if old element is in a
+            // leaving transition. Only happens when combining transition +
+            // keep-alive + HOCs. (#4590)
+            oldElm._leaveCb ? null : parentElm,
+            nodeOps.nextSibling(oldElm)
+          );
+
+          // update parent placeholder node element, recursively
+          if (isDef(vnode.parent)) {
+            var ancestor = vnode.parent;
+            var patchable = isPatchable(vnode);
+            while (ancestor) {
+              for (var i = 0; i < cbs.destroy.length; ++i) {
+                cbs.destroy[i](ancestor);
+              }
+              ancestor.elm = vnode.elm;
+              if (patchable) {
+                for (var i$1 = 0; i$1 < cbs.create.length; ++i$1) {
+                  cbs.create[i$1](emptyNode, ancestor);
+                }
+                // #6513
+                // invoke insert hooks that may have been merged by create hooks.
+                // e.g. for directives that uses the "inserted" hook.
+                var insert = ancestor.data.hook.insert;
+                if (insert.merged) {
+                  // start at index 1 to avoid re-invoking component mounted hook
+                  for (var i$2 = 1; i$2 < insert.fns.length; i$2++) {
+                    insert.fns[i$2]();
+                  }
+                }
+              } else {
+                registerRef(ancestor);
+              }
+              ancestor = ancestor.parent;
+            }
+          }
+
+          // destroy old node
+          if (isDef(parentElm)) {
+            removeVnodes([oldVnode], 0, 0);
+          } else if (isDef(oldVnode.tag)) {
+            invokeDestroyHook(oldVnode);
+          }
+        }
+      }
+
+      invokeInsertHook(vnode, insertedVnodeQueue, isInitialPatch);
+      return vnode.elm
+    }
+  }
+
+  /*  */
+
+  var directives = {
+    create: updateDirectives,
+    update: updateDirectives,
+    destroy: function unbindDirectives (vnode) {
+      updateDirectives(vnode, emptyNode);
+    }
+  };
+
+  function updateDirectives (oldVnode, vnode) {
+    if (oldVnode.data.directives || vnode.data.directives) {
+      _update(oldVnode, vnode);
+    }
+  }
+
+  function _update (oldVnode, vnode) {
+    var isCreate = oldVnode === emptyNode;
+    var isDestroy = vnode === emptyNode;
+    var oldDirs = normalizeDirectives$1(oldVnode.data.directives, oldVnode.context);
+    var newDirs = normalizeDirectives$1(vnode.data.directives, vnode.context);
+
+    var dirsWithInsert = [];
+    var dirsWithPostpatch = [];
+
+    var key, oldDir, dir;
+    for (key in newDirs) {
+      oldDir = oldDirs[key];
+      dir = newDirs[key];
+      if (!oldDir) {
+        // new directive, bind
+        callHook$1(dir, 'bind', vnode, oldVnode);
+        if (dir.def && dir.def.inserted) {
+          dirsWithInsert.push(dir);
+        }
+      } else {
+        // existing directive, update
+        dir.oldValue = oldDir.value;
+        dir.oldArg = oldDir.arg;
+        callHook$1(dir, 'update', vnode, oldVnode);
+        if (dir.def && dir.def.componentUpdated) {
+          dirsWithPostpatch.push(dir);
+        }
+      }
+    }
+
+    if (dirsWithInsert.length) {
+      var callInsert = function () {
+        for (var i = 0; i < dirsWithInsert.length; i++) {
+          callHook$1(dirsWithInsert[i], 'inserted', vnode, oldVnode);
+        }
+      };
+      if (isCreate) {
+        mergeVNodeHook(vnode, 'insert', callInsert);
+      } else {
+        callInsert();
+      }
+    }
+
+    if (dirsWithPostpatch.length) {
+      mergeVNodeHook(vnode, 'postpatch', function () {
+        for (var i = 0; i < dirsWithPostpatch.length; i++) {
+          callHook$1(dirsWithPostpatch[i], 'componentUpdated', vnode, oldVnode);
+        }
+      });
+    }
+
+    if (!isCreate) {
+      for (key in oldDirs) {
+        if (!newDirs[key]) {
+          // no longer present, unbind
+          callHook$1(oldDirs[key], 'unbind', oldVnode, oldVnode, isDestroy);
+        }
+      }
+    }
+  }
+
+  var emptyModifiers = Object.create(null);
+
+  function normalizeDirectives$1 (
+    dirs,
+    vm
+  ) {
+    var res = Object.create(null);
+    if (!dirs) {
+      // $flow-disable-line
+      return res
+    }
+    var i, dir;
+    for (i = 0; i < dirs.length; i++) {
+      dir = dirs[i];
+      if (!dir.modifiers) {
+        // $flow-disable-line
+        dir.modifiers = emptyModifiers;
+      }
+      res[getRawDirName(dir)] = dir;
+      dir.def = resolveAsset(vm.$options, 'directives', dir.name, true);
+    }
+    // $flow-disable-line
+    return res
+  }
+
+  function getRawDirName (dir) {
+    return dir.rawName || ((dir.name) + "." + (Object.keys(dir.modifiers || {}).join('.')))
+  }
+
+  function callHook$1 (dir, hook, vnode, oldVnode, isDestroy) {
+    var fn = dir.def && dir.def[hook];
+    if (fn) {
+      try {
+        fn(vnode.elm, dir, vnode, oldVnode, isDestroy);
+      } catch (e) {
+        handleError(e, vnode.context, ("directive " + (dir.name) + " " + hook + " hook"));
+      }
+    }
+  }
+
+  var baseModules = [
+    ref,
+    directives
+  ];
+
+  /*  */
+
+  function updateAttrs (oldVnode, vnode) {
+    var opts = vnode.componentOptions;
+    if (isDef(opts) && opts.Ctor.options.inheritAttrs === false) {
+      return
+    }
+    if (isUndef(oldVnode.data.attrs) && isUndef(vnode.data.attrs)) {
+      return
+    }
+    var key, cur, old;
+    var elm = vnode.elm;
+    var oldAttrs = oldVnode.data.attrs || {};
+    var attrs = vnode.data.attrs || {};
+    // clone observed objects, as the user probably wants to mutate it
+    if (isDef(attrs.__ob__)) {
+      attrs = vnode.data.attrs = extend({}, attrs);
+    }
+
+    for (key in attrs) {
+      cur = attrs[key];
+      old = oldAttrs[key];
+      if (old !== cur) {
+        setAttr(elm, key, cur);
+      }
+    }
+    // #4391: in IE9, setting type can reset value for input[type=radio]
+    // #6666: IE/Edge forces progress value down to 1 before setting a max
+    /* istanbul ignore if */
+    if ((isIE || isEdge) && attrs.value !== oldAttrs.value) {
+      setAttr(elm, 'value', attrs.value);
+    }
+    for (key in oldAttrs) {
+      if (isUndef(attrs[key])) {
+        if (isXlink(key)) {
+          elm.removeAttributeNS(xlinkNS, getXlinkProp(key));
+        } else if (!isEnumeratedAttr(key)) {
+          elm.removeAttribute(key);
+        }
+      }
+    }
+  }
+
+  function setAttr (el, key, value) {
+    if (el.tagName.indexOf('-') > -1) {
+      baseSetAttr(el, key, value);
+    } else if (isBooleanAttr(key)) {
+      // set attribute for blank value
+      // e.g. <option disabled>Select one</option>
+      if (isFalsyAttrValue(value)) {
+        el.removeAttribute(key);
+      } else {
+        // technically allowfullscreen is a boolean attribute for <iframe>,
+        // but Flash expects a value of "true" when used on <embed> tag
+        value = key === 'allowfullscreen' && el.tagName === 'EMBED'
+          ? 'true'
+          : key;
+        el.setAttribute(key, value);
+      }
+    } else if (isEnumeratedAttr(key)) {
+      el.setAttribute(key, convertEnumeratedValue(key, value));
+    } else if (isXlink(key)) {
+      if (isFalsyAttrValue(value)) {
+        el.removeAttributeNS(xlinkNS, getXlinkProp(key));
+      } else {
+        el.setAttributeNS(xlinkNS, key, value);
+      }
+    } else {
+      baseSetAttr(el, key, value);
+    }
+  }
+
+  function baseSetAttr (el, key, value) {
+    if (isFalsyAttrValue(value)) {
+      el.removeAttribute(key);
+    } else {
+      // #7138: IE10 & 11 fires input event when setting placeholder on
+      // <textarea>... block the first input event and remove the blocker
+      // immediately.
+      /* istanbul ignore if */
+      if (
+        isIE && !isIE9 &&
+        el.tagName === 'TEXTAREA' &&
+        key === 'placeholder' && value !== '' && !el.__ieph
+      ) {
+        var blocker = function (e) {
+          e.stopImmediatePropagation();
+          el.removeEventListener('input', blocker);
+        };
+        el.addEventListener('input', blocker);
+        // $flow-disable-line
+        el.__ieph = true; /* IE placeholder patched */
+      }
+      el.setAttribute(key, value);
+    }
+  }
+
+  var attrs = {
+    create: updateAttrs,
+    update: updateAttrs
+  };
+
+  /*  */
+
+  function updateClass (oldVnode, vnode) {
+    var el = vnode.elm;
+    var data = vnode.data;
+    var oldData = oldVnode.data;
+    if (
+      isUndef(data.staticClass) &&
+      isUndef(data.class) && (
+        isUndef(oldData) || (
+          isUndef(oldData.staticClass) &&
+          isUndef(oldData.class)
+        )
+      )
+    ) {
+      return
+    }
+
+    var cls = genClassForVnode(vnode);
+
+    // handle transition classes
+    var transitionClass = el._transitionClasses;
+    if (isDef(transitionClass)) {
+      cls = concat(cls, stringifyClass(transitionClass));
+    }
+
+    // set the class
+    if (cls !== el._prevClass) {
+      el.setAttribute('class', cls);
+      el._prevClass = cls;
+    }
+  }
+
+  var klass = {
+    create: updateClass,
+    update: updateClass
+  };
+
+  /*  */
+
+  var validDivisionCharRE = /[\w).+\-_$\]]/;
+
+  function parseFilters (exp) {
+    var inSingle = false;
+    var inDouble = false;
+    var inTemplateString = false;
+    var inRegex = false;
+    var curly = 0;
+    var square = 0;
+    var paren = 0;
+    var lastFilterIndex = 0;
+    var c, prev, i, expression, filters;
+
+    for (i = 0; i < exp.length; i++) {
+      prev = c;
+      c = exp.charCodeAt(i);
+      if (inSingle) {
+        if (c === 0x27 && prev !== 0x5C) { inSingle = false; }
+      } else if (inDouble) {
+        if (c === 0x22 && prev !== 0x5C) { inDouble = false; }
+      } else if (inTemplateString) {
+        if (c === 0x60 && prev !== 0x5C) { inTemplateString = false; }
+      } else if (inRegex) {
+        if (c === 0x2f && prev !== 0x5C) { inRegex = false; }
+      } else if (
+        c === 0x7C && // pipe
+        exp.charCodeAt(i + 1) !== 0x7C &&
+        exp.charCodeAt(i - 1) !== 0x7C &&
+        !curly && !square && !paren
+      ) {
+        if (expression === undefined) {
+          // first filter, end of expression
+          lastFilterIndex = i + 1;
+          expression = exp.slice(0, i).trim();
+        } else {
+          pushFilter();
+        }
+      } else {
+        switch (c) {
+          case 0x22: inDouble = true; break         // "
+          case 0x27: inSingle = true; break         // '
+          case 0x60: inTemplateString = true; break // `
+          case 0x28: paren++; break                 // (
+          case 0x29: paren--; break                 // )
+          case 0x5B: square++; break                // [
+          case 0x5D: square--; break                // ]
+          case 0x7B: curly++; break                 // {
+          case 0x7D: curly--; break                 // }
+        }
+        if (c === 0x2f) { // /
+          var j = i - 1;
+          var p = (void 0);
+          // find first non-whitespace prev char
+          for (; j >= 0; j--) {
+            p = exp.charAt(j);
+            if (p !== ' ') { break }
+          }
+          if (!p || !validDivisionCharRE.test(p)) {
+            inRegex = true;
+          }
+        }
+      }
+    }
+
+    if (expression === undefined) {
+      expression = exp.slice(0, i).trim();
+    } else if (lastFilterIndex !== 0) {
+      pushFilter();
+    }
+
+    function pushFilter () {
+      (filters || (filters = [])).push(exp.slice(lastFilterIndex, i).trim());
+      lastFilterIndex = i + 1;
+    }
+
+    if (filters) {
+      for (i = 0; i < filters.length; i++) {
+        expression = wrapFilter(expression, filters[i]);
+      }
+    }
+
+    return expression
+  }
+
+  function wrapFilter (exp, filter) {
+    var i = filter.indexOf('(');
+    if (i < 0) {
+      // _f: resolveFilter
+      return ("_f(\"" + filter + "\")(" + exp + ")")
+    } else {
+      var name = filter.slice(0, i);
+      var args = filter.slice(i + 1);
+      return ("_f(\"" + name + "\")(" + exp + (args !== ')' ? ',' + args : args))
+    }
+  }
+
+  /*  */
+
+
+
+  /* eslint-disable no-unused-vars */
+  function baseWarn (msg, range) {
+    console.error(("[Vue compiler]: " + msg));
+  }
+  /* eslint-enable no-unused-vars */
+
+  function pluckModuleFunction (
+    modules,
+    key
+  ) {
+    return modules
+      ? modules.map(function (m) { return m[key]; }).filter(function (_) { return _; })
+      : []
+  }
+
+  function addProp (el, name, value, range, dynamic) {
+    (el.props || (el.props = [])).push(rangeSetItem({ name: name, value: value, dynamic: dynamic }, range));
+    el.plain = false;
+  }
+
+  function addAttr (el, name, value, range, dynamic) {
+    var attrs = dynamic
+      ? (el.dynamicAttrs || (el.dynamicAttrs = []))
+      : (el.attrs || (el.attrs = []));
+    attrs.push(rangeSetItem({ name: name, value: value, dynamic: dynamic }, range));
+    el.plain = false;
+  }
+
+  // add a raw attr (use this in preTransforms)
+  function addRawAttr (el, name, value, range) {
+    el.attrsMap[name] = value;
+    el.attrsList.push(rangeSetItem({ name: name, value: value }, range));
+  }
+
+  function addDirective (
+    el,
+    name,
+    rawName,
+    value,
+    arg,
+    isDynamicArg,
+    modifiers,
+    range
+  ) {
+    (el.directives || (el.directives = [])).push(rangeSetItem({
+      name: name,
+      rawName: rawName,
+      value: value,
+      arg: arg,
+      isDynamicArg: isDynamicArg,
+      modifiers: modifiers
+    }, range));
+    el.plain = false;
+  }
+
+  function prependModifierMarker (symbol, name, dynamic) {
+    return dynamic
+      ? ("_p(" + name + ",\"" + symbol + "\")")
+      : symbol + name // mark the event as captured
+  }
+
+  function addHandler (
+    el,
+    name,
+    value,
+    modifiers,
+    important,
+    warn,
+    range,
+    dynamic
+  ) {
+    modifiers = modifiers || emptyObject;
+    // warn prevent and passive modifier
+    /* istanbul ignore if */
+    if (
+      warn &&
+      modifiers.prevent && modifiers.passive
+    ) {
+      warn(
+        'passive and prevent can\'t be used together. ' +
+        'Passive handler can\'t prevent default event.',
+        range
+      );
+    }
+
+    // normalize click.right and click.middle since they don't actually fire
+    // this is technically browser-specific, but at least for now browsers are
+    // the only target envs that have right/middle clicks.
+    if (modifiers.right) {
+      if (dynamic) {
+        name = "(" + name + ")==='click'?'contextmenu':(" + name + ")";
+      } else if (name === 'click') {
+        name = 'contextmenu';
+        delete modifiers.right;
+      }
+    } else if (modifiers.middle) {
+      if (dynamic) {
+        name = "(" + name + ")==='click'?'mouseup':(" + name + ")";
+      } else if (name === 'click') {
+        name = 'mouseup';
+      }
+    }
+
+    // check capture modifier
+    if (modifiers.capture) {
+      delete modifiers.capture;
+      name = prependModifierMarker('!', name, dynamic);
+    }
+    if (modifiers.once) {
+      delete modifiers.once;
+      name = prependModifierMarker('~', name, dynamic);
+    }
+    /* istanbul ignore if */
+    if (modifiers.passive) {
+      delete modifiers.passive;
+      name = prependModifierMarker('&', name, dynamic);
+    }
+
+    var events;
+    if (modifiers.native) {
+      delete modifiers.native;
+      events = el.nativeEvents || (el.nativeEvents = {});
+    } else {
+      events = el.events || (el.events = {});
+    }
+
+    var newHandler = rangeSetItem({ value: value.trim(), dynamic: dynamic }, range);
+    if (modifiers !== emptyObject) {
+      newHandler.modifiers = modifiers;
+    }
+
+    var handlers = events[name];
+    /* istanbul ignore if */
+    if (Array.isArray(handlers)) {
+      important ? handlers.unshift(newHandler) : handlers.push(newHandler);
+    } else if (handlers) {
+      events[name] = important ? [newHandler, handlers] : [handlers, newHandler];
+    } else {
+      events[name] = newHandler;
+    }
+
+    el.plain = false;
+  }
+
+  function getRawBindingAttr (
+    el,
+    name
+  ) {
+    return el.rawAttrsMap[':' + name] ||
+      el.rawAttrsMap['v-bind:' + name] ||
+      el.rawAttrsMap[name]
+  }
+
+  function getBindingAttr (
+    el,
+    name,
+    getStatic
+  ) {
+    var dynamicValue =
+      getAndRemoveAttr(el, ':' + name) ||
+      getAndRemoveAttr(el, 'v-bind:' + name);
+    if (dynamicValue != null) {
+      return parseFilters(dynamicValue)
+    } else if (getStatic !== false) {
+      var staticValue = getAndRemoveAttr(el, name);
+      if (staticValue != null) {
+        return JSON.stringify(staticValue)
+      }
+    }
+  }
+
+  // note: this only removes the attr from the Array (attrsList) so that it
+  // doesn't get processed by processAttrs.
+  // By default it does NOT remove it from the map (attrsMap) because the map is
+  // needed during codegen.
+  function getAndRemoveAttr (
+    el,
+    name,
+    removeFromMap
+  ) {
+    var val;
+    if ((val = el.attrsMap[name]) != null) {
+      var list = el.attrsList;
+      for (var i = 0, l = list.length; i < l; i++) {
+        if (list[i].name === name) {
+          list.splice(i, 1);
+          break
+        }
+      }
+    }
+    if (removeFromMap) {
+      delete el.attrsMap[name];
+    }
+    return val
+  }
+
+  function getAndRemoveAttrByRegex (
+    el,
+    name
+  ) {
+    var list = el.attrsList;
+    for (var i = 0, l = list.length; i < l; i++) {
+      var attr = list[i];
+      if (name.test(attr.name)) {
+        list.splice(i, 1);
+        return attr
+      }
+    }
+  }
+
+  function rangeSetItem (
+    item,
+    range
+  ) {
+    if (range) {
+      if (range.start != null) {
+        item.start = range.start;
+      }
+      if (range.end != null) {
+        item.end = range.end;
+      }
+    }
+    return item
+  }
+
+  /*  */
+
+  /**
+   * Cross-platform code generation for component v-model
+   */
+  function genComponentModel (
+    el,
+    value,
+    modifiers
+  ) {
+    var ref = modifiers || {};
+    var number = ref.number;
+    var trim = ref.trim;
+
+    var baseValueExpression = '$$v';
+    var valueExpression = baseValueExpression;
+    if (trim) {
+      valueExpression =
+        "(typeof " + baseValueExpression + " === 'string'" +
+        "? " + baseValueExpression + ".trim()" +
+        ": " + baseValueExpression + ")";
+    }
+    if (number) {
+      valueExpression = "_n(" + valueExpression + ")";
+    }
+    var assignment = genAssignmentCode(value, valueExpression);
+
+    el.model = {
+      value: ("(" + value + ")"),
+      expression: JSON.stringify(value),
+      callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
+    };
+  }
+
+  /**
+   * Cross-platform codegen helper for generating v-model value assignment code.
+   */
+  function genAssignmentCode (
+    value,
+    assignment
+  ) {
+    var res = parseModel(value);
+    if (res.key === null) {
+      return (value + "=" + assignment)
+    } else {
+      return ("$set(" + (res.exp) + ", " + (res.key) + ", " + assignment + ")")
+    }
+  }
+
+  /**
+   * Parse a v-model expression into a base path and a final key segment.
+   * Handles both dot-path and possible square brackets.
+   *
+   * Possible cases:
+   *
+   * - test
+   * - test[key]
+   * - test[test1[key]]
+   * - test["a"][key]
+   * - xxx.test[a[a].test1[key]]
+   * - test.xxx.a["asa"][test1[key]]
+   *
+   */
+
+  var len, str, chr, index$1, expressionPos, expressionEndPos;
+
+
+
+  function parseModel (val) {
+    // Fix https://github.com/vuejs/vue/pull/7730
+    // allow v-model="obj.val " (trailing whitespace)
+    val = val.trim();
+    len = val.length;
+
+    if (val.indexOf('[') < 0 || val.lastIndexOf(']') < len - 1) {
+      index$1 = val.lastIndexOf('.');
+      if (index$1 > -1) {
+        return {
+          exp: val.slice(0, index$1),
+          key: '"' + val.slice(index$1 + 1) + '"'
+        }
+      } else {
+        return {
+          exp: val,
+          key: null
+        }
+      }
+    }
+
+    str = val;
+    index$1 = expressionPos = expressionEndPos = 0;
+
+    while (!eof()) {
+      chr = next();
+      /* istanbul ignore if */
+      if (isStringStart(chr)) {
+        parseString(chr);
+      } else if (chr === 0x5B) {
+        parseBracket(chr);
+      }
+    }
+
+    return {
+      exp: val.slice(0, expressionPos),
+      key: val.slice(expressionPos + 1, expressionEndPos)
+    }
+  }
+
+  function next () {
+    return str.charCodeAt(++index$1)
+  }
+
+  function eof () {
+    return index$1 >= len
+  }
+
+  function isStringStart (chr) {
+    return chr === 0x22 || chr === 0x27
+  }
+
+  function parseBracket (chr) {
+    var inBracket = 1;
+    expressionPos = index$1;
+    while (!eof()) {
+      chr = next();
+      if (isStringStart(chr)) {
+        parseString(chr);
+        continue
+      }
+      if (chr === 0x5B) { inBracket++; }
+      if (chr === 0x5D) { inBracket--; }
+      if (inBracket === 0) {
+        expressionEndPos = index$1;
+        break
+      }
+    }
+  }
+
+  function parseString (chr) {
+    var stringQuote = chr;
+    while (!eof()) {
+      chr = next();
+      if (chr === stringQuote) {
+        break
+      }
+    }
+  }
+
+  /*  */
+
+  var warn$1;
+
+  // in some cases, the event used has to be determined at runtime
+  // so we used some reserved tokens during compile.
+  var RANGE_TOKEN = '__r';
+  var CHECKBOX_RADIO_TOKEN = '__c';
+
+  function model (
+    el,
+    dir,
+    _warn
+  ) {
+    warn$1 = _warn;
+    var value = dir.value;
+    var modifiers = dir.modifiers;
+    var tag = el.tag;
+    var type = el.attrsMap.type;
+
+    {
+      // inputs with type="file" are read only and setting the input's
+      // value will throw an error.
+      if (tag === 'input' && type === 'file') {
+        warn$1(
+          "<" + (el.tag) + " v-model=\"" + value + "\" type=\"file\">:\n" +
+          "File inputs are read only. Use a v-on:change listener instead.",
+          el.rawAttrsMap['v-model']
+        );
+      }
+    }
+
+    if (el.component) {
+      genComponentModel(el, value, modifiers);
+      // component v-model doesn't need extra runtime
+      return false
+    } else if (tag === 'select') {
+      genSelect(el, value, modifiers);
+    } else if (tag === 'input' && type === 'checkbox') {
+      genCheckboxModel(el, value, modifiers);
+    } else if (tag === 'input' && type === 'radio') {
+      genRadioModel(el, value, modifiers);
+    } else if (tag === 'input' || tag === 'textarea') {
+      genDefaultModel(el, value, modifiers);
+    } else if (!config.isReservedTag(tag)) {
+      genComponentModel(el, value, modifiers);
+      // component v-model doesn't need extra runtime
+      return false
+    } else {
+      warn$1(
+        "<" + (el.tag) + " v-model=\"" + value + "\">: " +
+        "v-model is not supported on this element type. " +
+        'If you are working with contenteditable, it\'s recommended to ' +
+        'wrap a library dedicated for that purpose inside a custom component.',
+        el.rawAttrsMap['v-model']
+      );
+    }
+
+    // ensure runtime directive metadata
+    return true
+  }
+
+  function genCheckboxModel (
+    el,
+    value,
+    modifiers
+  ) {
+    var number = modifiers && modifiers.number;
+    var valueBinding = getBindingAttr(el, 'value') || 'null';
+    var trueValueBinding = getBindingAttr(el, 'true-value') || 'true';
+    var falseValueBinding = getBindingAttr(el, 'false-value') || 'false';
+    addProp(el, 'checked',
+      "Array.isArray(" + value + ")" +
+      "?_i(" + value + "," + valueBinding + ")>-1" + (
+        trueValueBinding === 'true'
+          ? (":(" + value + ")")
+          : (":_q(" + value + "," + trueValueBinding + ")")
+      )
+    );
+    addHandler(el, 'change',
+      "var $$a=" + value + "," +
+          '$$el=$event.target,' +
+          "$$c=$$el.checked?(" + trueValueBinding + "):(" + falseValueBinding + ");" +
+      'if(Array.isArray($$a)){' +
+        "var $$v=" + (number ? '_n(' + valueBinding + ')' : valueBinding) + "," +
+            '$$i=_i($$a,$$v);' +
+        "if($$el.checked){$$i<0&&(" + (genAssignmentCode(value, '$$a.concat([$$v])')) + ")}" +
+        "else{$$i>-1&&(" + (genAssignmentCode(value, '$$a.slice(0,$$i).concat($$a.slice($$i+1))')) + ")}" +
+      "}else{" + (genAssignmentCode(value, '$$c')) + "}",
+      null, true
+    );
+  }
+
+  function genRadioModel (
+    el,
+    value,
+    modifiers
+  ) {
+    var number = modifiers && modifiers.number;
+    var valueBinding = getBindingAttr(el, 'value') || 'null';
+    valueBinding = number ? ("_n(" + valueBinding + ")") : valueBinding;
+    addProp(el, 'checked', ("_q(" + value + "," + valueBinding + ")"));
+    addHandler(el, 'change', genAssignmentCode(value, valueBinding), null, true);
+  }
+
+  function genSelect (
+    el,
+    value,
+    modifiers
+  ) {
+    var number = modifiers && modifiers.number;
+    var selectedVal = "Array.prototype.filter" +
+      ".call($event.target.options,function(o){return o.selected})" +
+      ".map(function(o){var val = \"_value\" in o ? o._value : o.value;" +
+      "return " + (number ? '_n(val)' : 'val') + "})";
+
+    var assignment = '$event.target.multiple ? $$selectedVal : $$selectedVal[0]';
+    var code = "var $$selectedVal = " + selectedVal + ";";
+    code = code + " " + (genAssignmentCode(value, assignment));
+    addHandler(el, 'change', code, null, true);
+  }
+
+  function genDefaultModel (
+    el,
+    value,
+    modifiers
+  ) {
+    var type = el.attrsMap.type;
+
+    // warn if v-bind:value conflicts with v-model
+    // except for inputs with v-bind:type
+    {
+      var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
+      var typeBinding = el.attrsMap['v-bind:type'] || el.attrsMap[':type'];
+      if (value$1 && !typeBinding) {
+        var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
+        warn$1(
+          binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
+          'because the latter already expands to a value binding internally',
+          el.rawAttrsMap[binding]
+        );
+      }
+    }
+
+    var ref = modifiers || {};
+    var lazy = ref.lazy;
+    var number = ref.number;
+    var trim = ref.trim;
+    var needCompositionGuard = !lazy && type !== 'range';
+    var event = lazy
+      ? 'change'
+      : type === 'range'
+        ? RANGE_TOKEN
+        : 'input';
+
+    var valueExpression = '$event.target.value';
+    if (trim) {
+      valueExpression = "$event.target.value.trim()";
+    }
+    if (number) {
+      valueExpression = "_n(" + valueExpression + ")";
+    }
+
+    var code = genAssignmentCode(value, valueExpression);
+    if (needCompositionGuard) {
+      code = "if($event.target.composing)return;" + code;
+    }
+
+    addProp(el, 'value', ("(" + value + ")"));
+    addHandler(el, event, code, null, true);
+    if (trim || number) {
+      addHandler(el, 'blur', '$forceUpdate()');
+    }
+  }
+
+  /*  */
+
+  // normalize v-model event tokens that can only be determined at runtime.
+  // it's important to place the event as the first in the array because
+  // the whole point is ensuring the v-model callback gets called before
+  // user-attached handlers.
+  function normalizeEvents (on) {
+    /* istanbul ignore if */
+    if (isDef(on[RANGE_TOKEN])) {
+      // IE input[type=range] only supports `change` event
+      var event = isIE ? 'change' : 'input';
+      on[event] = [].concat(on[RANGE_TOKEN], on[event] || []);
+      delete on[RANGE_TOKEN];
+    }
+    // This was originally intended to fix #4521 but no longer necessary
+    // after 2.5. Keeping it for backwards compat with generated code from < 2.4
+    /* istanbul ignore if */
+    if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
+      on.change = [].concat(on[CHECKBOX_RADIO_TOKEN], on.change || []);
+      delete on[CHECKBOX_RADIO_TOKEN];
+    }
+  }
+
+  var target$1;
+
+  function createOnceHandler$1 (event, handler, capture) {
+    var _target = target$1; // save current target element in closure
+    return function onceHandler () {
+      var res = handler.apply(null, arguments);
+      if (res !== null) {
+        remove$2(event, onceHandler, capture, _target);
+      }
+    }
+  }
+
+  // #9446: Firefox <= 53 (in particular, ESR 52) has incorrect Event.timeStamp
+  // implementation and does not fire microtasks in between event propagation, so
+  // safe to exclude.
+  var useMicrotaskFix = isUsingMicroTask && !(isFF && Number(isFF[1]) <= 53);
+
+  function add$1 (
+    name,
+    handler,
+    capture,
+    passive
+  ) {
+    // async edge case #6566: inner click event triggers patch, event handler
+    // attached to outer element during patch, and triggered again. This
+    // happens because browsers fire microtask ticks between event propagation.
+    // the solution is simple: we save the timestamp when a handler is attached,
+    // and the handler would only fire if the event passed to it was fired
+    // AFTER it was attached.
+    if (useMicrotaskFix) {
+      var attachedTimestamp = currentFlushTimestamp;
+      var original = handler;
+      handler = original._wrapper = function (e) {
+        if (
+          // no bubbling, should always fire.
+          // this is just a safety net in case event.timeStamp is unreliable in
+          // certain weird environments...
+          e.target === e.currentTarget ||
+          // event is fired after handler attachment
+          e.timeStamp >= attachedTimestamp ||
+          // bail for environments that have buggy event.timeStamp implementations
+          // #9462 iOS 9 bug: event.timeStamp is 0 after history.pushState
+          // #9681 QtWebEngine event.timeStamp is negative value
+          e.timeStamp <= 0 ||
+          // #9448 bail if event is fired in another document in a multi-page
+          // electron/nw.js app, since event.timeStamp will be using a different
+          // starting reference
+          e.target.ownerDocument !== document
+        ) {
+          return original.apply(this, arguments)
+        }
+      };
+    }
+    target$1.addEventListener(
+      name,
+      handler,
+      supportsPassive
+        ? { capture: capture, passive: passive }
+        : capture
+    );
+  }
+
+  function remove$2 (
+    name,
+    handler,
+    capture,
+    _target
+  ) {
+    (_target || target$1).removeEventListener(
+      name,
+      handler._wrapper || handler,
+      capture
+    );
+  }
+
+  function updateDOMListeners (oldVnode, vnode) {
+    if (isUndef(oldVnode.data.on) && isUndef(vnode.data.on)) {
+      return
+    }
+    var on = vnode.data.on || {};
+    var oldOn = oldVnode.data.on || {};
+    target$1 = vnode.elm;
+    normalizeEvents(on);
+    updateListeners(on, oldOn, add$1, remove$2, createOnceHandler$1, vnode.context);
+    target$1 = undefined;
+  }
+
+  var events = {
+    create: updateDOMListeners,
+    update: updateDOMListeners
+  };
+
+  /*  */
+
+  var svgContainer;
+
+  function updateDOMProps (oldVnode, vnode) {
+    if (isUndef(oldVnode.data.domProps) && isUndef(vnode.data.domProps)) {
+      return
+    }
+    var key, cur;
+    var elm = vnode.elm;
+    var oldProps = oldVnode.data.domProps || {};
+    var props = vnode.data.domProps || {};
+    // clone observed objects, as the user probably wants to mutate it
+    if (isDef(props.__ob__)) {
+      props = vnode.data.domProps = extend({}, props);
+    }
+
+    for (key in oldProps) {
+      if (!(key in props)) {
+        elm[key] = '';
+      }
+    }
+
+    for (key in props) {
+      cur = props[key];
+      // ignore children if the node has textContent or innerHTML,
+      // as these will throw away existing DOM nodes and cause removal errors
+      // on subsequent patches (#3360)
+      if (key === 'textContent' || key === 'innerHTML') {
+        if (vnode.children) { vnode.children.length = 0; }
+        if (cur === oldProps[key]) { continue }
+        // #6601 work around Chrome version <= 55 bug where single textNode
+        // replaced by innerHTML/textContent retains its parentNode property
+        if (elm.childNodes.length === 1) {
+          elm.removeChild(elm.childNodes[0]);
+        }
+      }
+
+      if (key === 'value' && elm.tagName !== 'PROGRESS') {
+        // store value as _value as well since
+        // non-string values will be stringified
+        elm._value = cur;
+        // avoid resetting cursor position when value is the same
+        var strCur = isUndef(cur) ? '' : String(cur);
+        if (shouldUpdateValue(elm, strCur)) {
+          elm.value = strCur;
+        }
+      } else if (key === 'innerHTML' && isSVG(elm.tagName) && isUndef(elm.innerHTML)) {
+        // IE doesn't support innerHTML for SVG elements
+        svgContainer = svgContainer || document.createElement('div');
+        svgContainer.innerHTML = "<svg>" + cur + "</svg>";
+        var svg = svgContainer.firstChild;
+        while (elm.firstChild) {
+          elm.removeChild(elm.firstChild);
+        }
+        while (svg.firstChild) {
+          elm.appendChild(svg.firstChild);
+        }
+      } else if (
+        // skip the update if old and new VDOM state is the same.
+        // `value` is handled separately because the DOM value may be temporarily
+        // out of sync with VDOM state due to focus, composition and modifiers.
+        // This  #4521 by skipping the unnecesarry `checked` update.
+        cur !== oldProps[key]
+      ) {
+        // some property updates can throw
+        // e.g. `value` on <progress> w/ non-finite value
+        try {
+          elm[key] = cur;
+        } catch (e) {}
+      }
+    }
+  }
+
+  // check platforms/web/util/attrs.js acceptValue
+
+
+  function shouldUpdateValue (elm, checkVal) {
+    return (!elm.composing && (
+      elm.tagName === 'OPTION' ||
+      isNotInFocusAndDirty(elm, checkVal) ||
+      isDirtyWithModifiers(elm, checkVal)
+    ))
+  }
+
+  function isNotInFocusAndDirty (elm, checkVal) {
+    // return true when textbox (.number and .trim) loses focus and its value is
+    // not equal to the updated value
+    var notInFocus = true;
+    // #6157
+    // work around IE bug when accessing document.activeElement in an iframe
+    try { notInFocus = document.activeElement !== elm; } catch (e) {}
+    return notInFocus && elm.value !== checkVal
+  }
+
+  function isDirtyWithModifiers (elm, newVal) {
+    var value = elm.value;
+    var modifiers = elm._vModifiers; // injected by v-model runtime
+    if (isDef(modifiers)) {
+      if (modifiers.number) {
+        return toNumber(value) !== toNumber(newVal)
+      }
+      if (modifiers.trim) {
+        return value.trim() !== newVal.trim()
+      }
+    }
+    return value !== newVal
+  }
+
+  var domProps = {
+    create: updateDOMProps,
+    update: updateDOMProps
+  };
+
+  /*  */
+
+  var parseStyleText = cached(function (cssText) {
+    var res = {};
+    var listDelimiter = /;(?![^(]*\))/g;
+    var propertyDelimiter = /:(.+)/;
+    cssText.split(listDelimiter).forEach(function (item) {
+      if (item) {
+        var tmp = item.split(propertyDelimiter);
+        tmp.length > 1 && (res[tmp[0].trim()] = tmp[1].trim());
+      }
+    });
+    return res
+  });
+
+  // merge static and dynamic style data on the same vnode
+  function normalizeStyleData (data) {
+    var style = normalizeStyleBinding(data.style);
+    // static style is pre-processed into an object during compilation
+    // and is always a fresh object, so it's safe to merge into it
+    return data.staticStyle
+      ? extend(data.staticStyle, style)
+      : style
+  }
+
+  // normalize possible array / string values into Object
+  function normalizeStyleBinding (bindingStyle) {
+    if (Array.isArray(bindingStyle)) {
+      return toObject(bindingStyle)
+    }
+    if (typeof bindingStyle === 'string') {
+      return parseStyleText(bindingStyle)
+    }
+    return bindingStyle
+  }
+
+  /**
+   * parent component style should be after child's
+   * so that parent component's style could override it
+   */
+  function getStyle (vnode, checkChild) {
+    var res = {};
+    var styleData;
+
+    if (checkChild) {
+      var childNode = vnode;
+      while (childNode.componentInstance) {
+        childNode = childNode.componentInstance._vnode;
+        if (
+          childNode && childNode.data &&
+          (styleData = normalizeStyleData(childNode.data))
+        ) {
+          extend(res, styleData);
+        }
+      }
+    }
+
+    if ((styleData = normalizeStyleData(vnode.data))) {
+      extend(res, styleData);
+    }
+
+    var parentNode = vnode;
+    while ((parentNode = parentNode.parent)) {
+      if (parentNode.data && (styleData = normalizeStyleData(parentNode.data))) {
+        extend(res, styleData);
+      }
+    }
+    return res
+  }
+
+  /*  */
+
+  var cssVarRE = /^--/;
+  var importantRE = /\s*!important$/;
+  var setProp = function (el, name, val) {
+    /* istanbul ignore if */
+    if (cssVarRE.test(name)) {
+      el.style.setProperty(name, val);
+    } else if (importantRE.test(val)) {
+      el.style.setProperty(hyphenate(name), val.replace(importantRE, ''), 'important');
+    } else {
+      var normalizedName = normalize(name);
+      if (Array.isArray(val)) {
+        // Support values array created by autoprefixer, e.g.
+        // {display: ["-webkit-box", "-ms-flexbox", "flex"]}
+        // Set them one by one, and the browser will only set those it can recognize
+        for (var i = 0, len = val.length; i < len; i++) {
+          el.style[normalizedName] = val[i];
+        }
+      } else {
+        el.style[normalizedName] = val;
+      }
+    }
+  };
+
+  var vendorNames = ['Webkit', 'Moz', 'ms'];
+
+  var emptyStyle;
+  var normalize = cached(function (prop) {
+    emptyStyle = emptyStyle || document.createElement('div').style;
+    prop = camelize(prop);
+    if (prop !== 'filter' && (prop in emptyStyle)) {
+      return prop
+    }
+    var capName = prop.charAt(0).toUpperCase() + prop.slice(1);
+    for (var i = 0; i < vendorNames.length; i++) {
+      var name = vendorNames[i] + capName;
+      if (name in emptyStyle) {
+        return name
+      }
+    }
+  });
+
+  function updateStyle (oldVnode, vnode) {
+    var data = vnode.data;
+    var oldData = oldVnode.data;
+
+    if (isUndef(data.staticStyle) && isUndef(data.style) &&
+      isUndef(oldData.staticStyle) && isUndef(oldData.style)
+    ) {
+      return
+    }
+
+    var cur, name;
+    var el = vnode.elm;
+    var oldStaticStyle = oldData.staticStyle;
+    var oldStyleBinding = oldData.normalizedStyle || oldData.style || {};
+
+    // if static style exists, stylebinding already merged into it when doing normalizeStyleData
+    var oldStyle = oldStaticStyle || oldStyleBinding;
+
+    var style = normalizeStyleBinding(vnode.data.style) || {};
+
+    // store normalized style under a different key for next diff
+    // make sure to clone it if it's reactive, since the user likely wants
+    // to mutate it.
+    vnode.data.normalizedStyle = isDef(style.__ob__)
+      ? extend({}, style)
+      : style;
+
+    var newStyle = getStyle(vnode, true);
+
+    for (name in oldStyle) {
+      if (isUndef(newStyle[name])) {
+        setProp(el, name, '');
+      }
+    }
+    for (name in newStyle) {
+      cur = newStyle[name];
+      if (cur !== oldStyle[name]) {
+        // ie9 setting to null has no effect, must use empty string
+        setProp(el, name, cur == null ? '' : cur);
+      }
+    }
+  }
+
+  var style = {
+    create: updateStyle,
+    update: updateStyle
+  };
+
+  /*  */
+
+  var whitespaceRE = /\s+/;
+
+  /**
+   * Add class with compatibility for SVG since classList is not supported on
+   * SVG elements in IE
+   */
+  function addClass (el, cls) {
+    /* istanbul ignore if */
+    if (!cls || !(cls = cls.trim())) {
+      return
+    }
+
+    /* istanbul ignore else */
+    if (el.classList) {
+      if (cls.indexOf(' ') > -1) {
+        cls.split(whitespaceRE).forEach(function (c) { return el.classList.add(c); });
+      } else {
+        el.classList.add(cls);
+      }
+    } else {
+      var cur = " " + (el.getAttribute('class') || '') + " ";
+      if (cur.indexOf(' ' + cls + ' ') < 0) {
+        el.setAttribute('class', (cur + cls).trim());
+      }
+    }
+  }
+
+  /**
+   * Remove class with compatibility for SVG since classList is not supported on
+   * SVG elements in IE
+   */
+  function removeClass (el, cls) {
+    /* istanbul ignore if */
+    if (!cls || !(cls = cls.trim())) {
+      return
+    }
+
+    /* istanbul ignore else */
+    if (el.classList) {
+      if (cls.indexOf(' ') > -1) {
+        cls.split(whitespaceRE).forEach(function (c) { return el.classList.remove(c); });
+      } else {
+        el.classList.remove(cls);
+      }
+      if (!el.classList.length) {
+        el.removeAttribute('class');
+      }
+    } else {
+      var cur = " " + (el.getAttribute('class') || '') + " ";
+      var tar = ' ' + cls + ' ';
+      while (cur.indexOf(tar) >= 0) {
+        cur = cur.replace(tar, ' ');
+      }
+      cur = cur.trim();
+      if (cur) {
+        el.setAttribute('class', cur);
+      } else {
+        el.removeAttribute('class');
+      }
+    }
+  }
+
+  /*  */
+
+  function resolveTransition (def$$1) {
+    if (!def$$1) {
+      return
+    }
+    /* istanbul ignore else */
+    if (typeof def$$1 === 'object') {
+      var res = {};
+      if (def$$1.css !== false) {
+        extend(res, autoCssTransition(def$$1.name || 'v'));
+      }
+      extend(res, def$$1);
+      return res
+    } else if (typeof def$$1 === 'string') {
+      return autoCssTransition(def$$1)
+    }
+  }
+
+  var autoCssTransition = cached(function (name) {
+    return {
+      enterClass: (name + "-enter"),
+      enterToClass: (name + "-enter-to"),
+      enterActiveClass: (name + "-enter-active"),
+      leaveClass: (name + "-leave"),
+      leaveToClass: (name + "-leave-to"),
+      leaveActiveClass: (name + "-leave-active")
+    }
+  });
+
+  var hasTransition = inBrowser && !isIE9;
+  var TRANSITION = 'transition';
+  var ANIMATION = 'animation';
+
+  // Transition property/event sniffing
+  var transitionProp = 'transition';
+  var transitionEndEvent = 'transitionend';
+  var animationProp = 'animation';
+  var animationEndEvent = 'animationend';
+  if (hasTransition) {
+    /* istanbul ignore if */
+    if (window.ontransitionend === undefined &&
+      window.onwebkittransitionend !== undefined
+    ) {
+      transitionProp = 'WebkitTransition';
+      transitionEndEvent = 'webkitTransitionEnd';
+    }
+    if (window.onanimationend === undefined &&
+      window.onwebkitanimationend !== undefined
+    ) {
+      animationProp = 'WebkitAnimation';
+      animationEndEvent = 'webkitAnimationEnd';
+    }
+  }
+
+  // binding to window is necessary to make hot reload work in IE in strict mode
+  var raf = inBrowser
+    ? window.requestAnimationFrame
+      ? window.requestAnimationFrame.bind(window)
+      : setTimeout
+    : /* istanbul ignore next */ function (fn) { return fn(); };
+
+  function nextFrame (fn) {
+    raf(function () {
+      raf(fn);
+    });
+  }
+
+  function addTransitionClass (el, cls) {
+    var transitionClasses = el._transitionClasses || (el._transitionClasses = []);
+    if (transitionClasses.indexOf(cls) < 0) {
+      transitionClasses.push(cls);
+      addClass(el, cls);
+    }
+  }
+
+  function removeTransitionClass (el, cls) {
+    if (el._transitionClasses) {
+      remove(el._transitionClasses, cls);
+    }
+    removeClass(el, cls);
+  }
+
+  function whenTransitionEnds (
+    el,
+    expectedType,
+    cb
+  ) {
+    var ref = getTransitionInfo(el, expectedType);
+    var type = ref.type;
+    var timeout = ref.timeout;
+    var propCount = ref.propCount;
+    if (!type) { return cb() }
+    var event = type === TRANSITION ? transitionEndEvent : animationEndEvent;
+    var ended = 0;
+    var end = function () {
+      el.removeEventListener(event, onEnd);
+      cb();
+    };
+    var onEnd = function (e) {
+      if (e.target === el) {
+        if (++ended >= propCount) {
+          end();
+        }
+      }
+    };
+    setTimeout(function () {
+      if (ended < propCount) {
+        end();
+      }
+    }, timeout + 1);
+    el.addEventListener(event, onEnd);
+  }
+
+  var transformRE = /\b(transform|all)(,|$)/;
+
+  function getTransitionInfo (el, expectedType) {
+    var styles = window.getComputedStyle(el);
+    // JSDOM may return undefined for transition properties
+    var transitionDelays = (styles[transitionProp + 'Delay'] || '').split(', ');
+    var transitionDurations = (styles[transitionProp + 'Duration'] || '').split(', ');
+    var transitionTimeout = getTimeout(transitionDelays, transitionDurations);
+    var animationDelays = (styles[animationProp + 'Delay'] || '').split(', ');
+    var animationDurations = (styles[animationProp + 'Duration'] || '').split(', ');
+    var animationTimeout = getTimeout(animationDelays, animationDurations);
+
+    var type;
+    var timeout = 0;
+    var propCount = 0;
+    /* istanbul ignore if */
+    if (expectedType === TRANSITION) {
+      if (transitionTimeout > 0) {
+        type = TRANSITION;
+        timeout = transitionTimeout;
+        propCount = transitionDurations.length;
+      }
+    } else if (expectedType === ANIMATION) {
+      if (animationTimeout > 0) {
+        type = ANIMATION;
+        timeout = animationTimeout;
+        propCount = animationDurations.length;
+      }
+    } else {
+      timeout = Math.max(transitionTimeout, animationTimeout);
+      type = timeout > 0
+        ? transitionTimeout > animationTimeout
+          ? TRANSITION
+          : ANIMATION
+        : null;
+      propCount = type
+        ? type === TRANSITION
+          ? transitionDurations.length
+          : animationDurations.length
+        : 0;
+    }
+    var hasTransform =
+      type === TRANSITION &&
+      transformRE.test(styles[transitionProp + 'Property']);
+    return {
+      type: type,
+      timeout: timeout,
+      propCount: propCount,
+      hasTransform: hasTransform
+    }
+  }
+
+  function getTimeout (delays, durations) {
+    /* istanbul ignore next */
+    while (delays.length < durations.length) {
+      delays = delays.concat(delays);
+    }
+
+    return Math.max.apply(null, durations.map(function (d, i) {
+      return toMs(d) + toMs(delays[i])
+    }))
+  }
+
+  // Old versions of Chromium (below 61.0.3163.100) formats floating pointer numbers
+  // in a locale-dependent way, using a comma instead of a dot.
+  // If comma is not replaced with a dot, the input will be rounded down (i.e. acting
+  // as a floor function) causing unexpected behaviors
+  function toMs (s) {
+    return Number(s.slice(0, -1).replace(',', '.')) * 1000
+  }
+
+  /*  */
+
+  function enter (vnode, toggleDisplay) {
+    var el = vnode.elm;
+
+    // call leave callback now
+    if (isDef(el._leaveCb)) {
+      el._leaveCb.cancelled = true;
+      el._leaveCb();
+    }
+
+    var data = resolveTransition(vnode.data.transition);
+    if (isUndef(data)) {
+      return
+    }
+
+    /* istanbul ignore if */
+    if (isDef(el._enterCb) || el.nodeType !== 1) {
+      return
+    }
+
+    var css = data.css;
+    var type = data.type;
+    var enterClass = data.enterClass;
+    var enterToClass = data.enterToClass;
+    var enterActiveClass = data.enterActiveClass;
+    var appearClass = data.appearClass;
+    var appearToClass = data.appearToClass;
+    var appearActiveClass = data.appearActiveClass;
+    var beforeEnter = data.beforeEnter;
+    var enter = data.enter;
+    var afterEnter = data.afterEnter;
+    var enterCancelled = data.enterCancelled;
+    var beforeAppear = data.beforeAppear;
+    var appear = data.appear;
+    var afterAppear = data.afterAppear;
+    var appearCancelled = data.appearCancelled;
+    var duration = data.duration;
+
+    // activeInstance will always be the <transition> component managing this
+    // transition. One edge case to check is when the <transition> is placed
+    // as the root node of a child component. In that case we need to check
+    // <transition>'s parent for appear check.
+    var context = activeInstance;
+    var transitionNode = activeInstance.$vnode;
+    while (transitionNode && transitionNode.parent) {
+      context = transitionNode.context;
+      transitionNode = transitionNode.parent;
+    }
+
+    var isAppear = !context._isMounted || !vnode.isRootInsert;
+
+    if (isAppear && !appear && appear !== '') {
+      return
+    }
+
+    var startClass = isAppear && appearClass
+      ? appearClass
+      : enterClass;
+    var activeClass = isAppear && appearActiveClass
+      ? appearActiveClass
+      : enterActiveClass;
+    var toClass = isAppear && appearToClass
+      ? appearToClass
+      : enterToClass;
+
+    var beforeEnterHook = isAppear
+      ? (beforeAppear || beforeEnter)
+      : beforeEnter;
+    var enterHook = isAppear
+      ? (typeof appear === 'function' ? appear : enter)
+      : enter;
+    var afterEnterHook = isAppear
+      ? (afterAppear || afterEnter)
+      : afterEnter;
+    var enterCancelledHook = isAppear
+      ? (appearCancelled || enterCancelled)
+      : enterCancelled;
+
+    var explicitEnterDuration = toNumber(
+      isObject(duration)
+        ? duration.enter
+        : duration
+    );
+
+    if (explicitEnterDuration != null) {
+      checkDuration(explicitEnterDuration, 'enter', vnode);
+    }
+
+    var expectsCSS = css !== false && !isIE9;
+    var userWantsControl = getHookArgumentsLength(enterHook);
+
+    var cb = el._enterCb = once(function () {
+      if (expectsCSS) {
+        removeTransitionClass(el, toClass);
+        removeTransitionClass(el, activeClass);
+      }
+      if (cb.cancelled) {
+        if (expectsCSS) {
+          removeTransitionClass(el, startClass);
+        }
+        enterCancelledHook && enterCancelledHook(el);
+      } else {
+        afterEnterHook && afterEnterHook(el);
+      }
+      el._enterCb = null;
+    });
+
+    if (!vnode.data.show) {
+      // remove pending leave element on enter by injecting an insert hook
+      mergeVNodeHook(vnode, 'insert', function () {
+        var parent = el.parentNode;
+        var pendingNode = parent && parent._pending && parent._pending[vnode.key];
+        if (pendingNode &&
+          pendingNode.tag === vnode.tag &&
+          pendingNode.elm._leaveCb
+        ) {
+          pendingNode.elm._leaveCb();
+        }
+        enterHook && enterHook(el, cb);
+      });
+    }
+
+    // start enter transition
+    beforeEnterHook && beforeEnterHook(el);
+    if (expectsCSS) {
+      addTransitionClass(el, startClass);
+      addTransitionClass(el, activeClass);
+      nextFrame(function () {
+        removeTransitionClass(el, startClass);
+        if (!cb.cancelled) {
+          addTransitionClass(el, toClass);
+          if (!userWantsControl) {
+            if (isValidDuration(explicitEnterDuration)) {
+              setTimeout(cb, explicitEnterDuration);
+            } else {
+              whenTransitionEnds(el, type, cb);
+            }
+          }
+        }
+      });
+    }
+
+    if (vnode.data.show) {
+      toggleDisplay && toggleDisplay();
+      enterHook && enterHook(el, cb);
+    }
+
+    if (!expectsCSS && !userWantsControl) {
+      cb();
+    }
+  }
+
+  function leave (vnode, rm) {
+    var el = vnode.elm;
+
+    // call enter callback now
+    if (isDef(el._enterCb)) {
+      el._enterCb.cancelled = true;
+      el._enterCb();
+    }
+
+    var data = resolveTransition(vnode.data.transition);
+    if (isUndef(data) || el.nodeType !== 1) {
+      return rm()
+    }
+
+    /* istanbul ignore if */
+    if (isDef(el._leaveCb)) {
+      return
+    }
+
+    var css = data.css;
+    var type = data.type;
+    var leaveClass = data.leaveClass;
+    var leaveToClass = data.leaveToClass;
+    var leaveActiveClass = data.leaveActiveClass;
+    var beforeLeave = data.beforeLeave;
+    var leave = data.leave;
+    var afterLeave = data.afterLeave;
+    var leaveCancelled = data.leaveCancelled;
+    var delayLeave = data.delayLeave;
+    var duration = data.duration;
+
+    var expectsCSS = css !== false && !isIE9;
+    var userWantsControl = getHookArgumentsLength(leave);
+
+    var explicitLeaveDuration = toNumber(
+      isObject(duration)
+        ? duration.leave
+        : duration
+    );
+
+    if (isDef(explicitLeaveDuration)) {
+      checkDuration(explicitLeaveDuration, 'leave', vnode);
+    }
+
+    var cb = el._leaveCb = once(function () {
+      if (el.parentNode && el.parentNode._pending) {
+        el.parentNode._pending[vnode.key] = null;
+      }
+      if (expectsCSS) {
+        removeTransitionClass(el, leaveToClass);
+        removeTransitionClass(el, leaveActiveClass);
+      }
+      if (cb.cancelled) {
+        if (expectsCSS) {
+          removeTransitionClass(el, leaveClass);
+        }
+        leaveCancelled && leaveCancelled(el);
+      } else {
+        rm();
+        afterLeave && afterLeave(el);
+      }
+      el._leaveCb = null;
+    });
+
+    if (delayLeave) {
+      delayLeave(performLeave);
+    } else {
+      performLeave();
+    }
+
+    function performLeave () {
+      // the delayed leave may have already been cancelled
+      if (cb.cancelled) {
+        return
+      }
+      // record leaving element
+      if (!vnode.data.show && el.parentNode) {
+        (el.parentNode._pending || (el.parentNode._pending = {}))[(vnode.key)] = vnode;
+      }
+      beforeLeave && beforeLeave(el);
+      if (expectsCSS) {
+        addTransitionClass(el, leaveClass);
+        addTransitionClass(el, leaveActiveClass);
+        nextFrame(function () {
+          removeTransitionClass(el, leaveClass);
+          if (!cb.cancelled) {
+            addTransitionClass(el, leaveToClass);
+            if (!userWantsControl) {
+              if (isValidDuration(explicitLeaveDuration)) {
+                setTimeout(cb, explicitLeaveDuration);
+              } else {
+                whenTransitionEnds(el, type, cb);
+              }
+            }
+          }
+        });
+      }
+      leave && leave(el, cb);
+      if (!expectsCSS && !userWantsControl) {
+        cb();
+      }
+    }
+  }
+
+  // only used in dev mode
+  function checkDuration (val, name, vnode) {
+    if (typeof val !== 'number') {
+      warn(
+        "<transition> explicit " + name + " duration is not a valid number - " +
+        "got " + (JSON.stringify(val)) + ".",
+        vnode.context
+      );
+    } else if (isNaN(val)) {
+      warn(
+        "<transition> explicit " + name + " duration is NaN - " +
+        'the duration expression might be incorrect.',
+        vnode.context
+      );
+    }
+  }
+
+  function isValidDuration (val) {
+    return typeof val === 'number' && !isNaN(val)
+  }
+
+  /**
+   * Normalize a transition hook's argument length. The hook may be:
+   * - a merged hook (invoker) with the original in .fns
+   * - a wrapped component method (check ._length)
+   * - a plain function (.length)
+   */
+  function getHookArgumentsLength (fn) {
+    if (isUndef(fn)) {
+      return false
+    }
+    var invokerFns = fn.fns;
+    if (isDef(invokerFns)) {
+      // invoker
+      return getHookArgumentsLength(
+        Array.isArray(invokerFns)
+          ? invokerFns[0]
+          : invokerFns
+      )
+    } else {
+      return (fn._length || fn.length) > 1
+    }
+  }
+
+  function _enter (_, vnode) {
+    if (vnode.data.show !== true) {
+      enter(vnode);
+    }
+  }
+
+  var transition = inBrowser ? {
+    create: _enter,
+    activate: _enter,
+    remove: function remove$$1 (vnode, rm) {
+      /* istanbul ignore else */
+      if (vnode.data.show !== true) {
+        leave(vnode, rm);
+      } else {
+        rm();
+      }
+    }
+  } : {};
+
+  var platformModules = [
+    attrs,
+    klass,
+    events,
+    domProps,
+    style,
+    transition
+  ];
+
+  /*  */
+
+  // the directive module should be applied last, after all
+  // built-in modules have been applied.
+  var modules = platformModules.concat(baseModules);
+
+  var patch = createPatchFunction({ nodeOps: nodeOps, modules: modules });
+
+  /**
+   * Not type checking this file because flow doesn't like attaching
+   * properties to Elements.
+   */
+
+  /* istanbul ignore if */
+  if (isIE9) {
+    // http://www.matts411.com/post/internet-explorer-9-oninput/
+    document.addEventListener('selectionchange', function () {
+      var el = document.activeElement;
+      if (el && el.vmodel) {
+        trigger(el, 'input');
+      }
+    });
+  }
+
+  var directive = {
+    inserted: function inserted (el, binding, vnode, oldVnode) {
+      if (vnode.tag === 'select') {
+        // #6903
+        if (oldVnode.elm && !oldVnode.elm._vOptions) {
+          mergeVNodeHook(vnode, 'postpatch', function () {
+            directive.componentUpdated(el, binding, vnode);
+          });
+        } else {
+          setSelected(el, binding, vnode.context);
+        }
+        el._vOptions = [].map.call(el.options, getValue);
+      } else if (vnode.tag === 'textarea' || isTextInputType(el.type)) {
+        el._vModifiers = binding.modifiers;
+        if (!binding.modifiers.lazy) {
+          el.addEventListener('compositionstart', onCompositionStart);
+          el.addEventListener('compositionend', onCompositionEnd);
+          // Safari < 10.2 & UIWebView doesn't fire compositionend when
+          // switching focus before confirming composition choice
+          // this also fixes the issue where some browsers e.g. iOS Chrome
+          // fires "change" instead of "input" on autocomplete.
+          el.addEventListener('change', onCompositionEnd);
+          /* istanbul ignore if */
+          if (isIE9) {
+            el.vmodel = true;
+          }
+        }
+      }
+    },
+
+    componentUpdated: function componentUpdated (el, binding, vnode) {
+      if (vnode.tag === 'select') {
+        setSelected(el, binding, vnode.context);
+        // in case the options rendered by v-for have changed,
+        // it's possible that the value is out-of-sync with the rendered options.
+        // detect such cases and filter out values that no longer has a matching
+        // option in the DOM.
+        var prevOptions = el._vOptions;
+        var curOptions = el._vOptions = [].map.call(el.options, getValue);
+        if (curOptions.some(function (o, i) { return !looseEqual(o, prevOptions[i]); })) {
+          // trigger change event if
+          // no matching option found for at least one value
+          var needReset = el.multiple
+            ? binding.value.some(function (v) { return hasNoMatchingOption(v, curOptions); })
+            : binding.value !== binding.oldValue && hasNoMatchingOption(binding.value, curOptions);
+          if (needReset) {
+            trigger(el, 'change');
+          }
+        }
+      }
+    }
+  };
+
+  function setSelected (el, binding, vm) {
+    actuallySetSelected(el, binding, vm);
+    /* istanbul ignore if */
+    if (isIE || isEdge) {
+      setTimeout(function () {
+        actuallySetSelected(el, binding, vm);
+      }, 0);
+    }
+  }
+
+  function actuallySetSelected (el, binding, vm) {
+    var value = binding.value;
+    var isMultiple = el.multiple;
+    if (isMultiple && !Array.isArray(value)) {
+      warn(
+        "<select multiple v-model=\"" + (binding.expression) + "\"> " +
+        "expects an Array value for its binding, but got " + (Object.prototype.toString.call(value).slice(8, -1)),
+        vm
+      );
+      return
+    }
+    var selected, option;
+    for (var i = 0, l = el.options.length; i < l; i++) {
+      option = el.options[i];
+      if (isMultiple) {
+        selected = looseIndexOf(value, getValue(option)) > -1;
+        if (option.selected !== selected) {
+          option.selected = selected;
+        }
+      } else {
+        if (looseEqual(getValue(option), value)) {
+          if (el.selectedIndex !== i) {
+            el.selectedIndex = i;
+          }
+          return
+        }
+      }
+    }
+    if (!isMultiple) {
+      el.selectedIndex = -1;
+    }
+  }
+
+  function hasNoMatchingOption (value, options) {
+    return options.every(function (o) { return !looseEqual(o, value); })
+  }
+
+  function getValue (option) {
+    return '_value' in option
+      ? option._value
+      : option.value
+  }
+
+  function onCompositionStart (e) {
+    e.target.composing = true;
+  }
+
+  function onCompositionEnd (e) {
+    // prevent triggering an input event for no reason
+    if (!e.target.composing) { return }
+    e.target.composing = false;
+    trigger(e.target, 'input');
+  }
+
+  function trigger (el, type) {
+    var e = document.createEvent('HTMLEvents');
+    e.initEvent(type, true, true);
+    el.dispatchEvent(e);
+  }
+
+  /*  */
+
+  // recursively search for possible transition defined inside the component root
+  function locateNode (vnode) {
+    return vnode.componentInstance && (!vnode.data || !vnode.data.transition)
+      ? locateNode(vnode.componentInstance._vnode)
+      : vnode
+  }
+
+  var show = {
+    bind: function bind (el, ref, vnode) {
+      var value = ref.value;
+
+      vnode = locateNode(vnode);
+      var transition$$1 = vnode.data && vnode.data.transition;
+      var originalDisplay = el.__vOriginalDisplay =
+        el.style.display === 'none' ? '' : el.style.display;
+      if (value && transition$$1) {
+        vnode.data.show = true;
+        enter(vnode, function () {
+          el.style.display = originalDisplay;
+        });
+      } else {
+        el.style.display = value ? originalDisplay : 'none';
+      }
+    },
+
+    update: function update (el, ref, vnode) {
+      var value = ref.value;
+      var oldValue = ref.oldValue;
+
+      /* istanbul ignore if */
+      if (!value === !oldValue) { return }
+      vnode = locateNode(vnode);
+      var transition$$1 = vnode.data && vnode.data.transition;
+      if (transition$$1) {
+        vnode.data.show = true;
+        if (value) {
+          enter(vnode, function () {
+            el.style.display = el.__vOriginalDisplay;
+          });
+        } else {
+          leave(vnode, function () {
+            el.style.display = 'none';
+          });
+        }
+      } else {
+        el.style.display = value ? el.__vOriginalDisplay : 'none';
+      }
+    },
+
+    unbind: function unbind (
+      el,
+      binding,
+      vnode,
+      oldVnode,
+      isDestroy
+    ) {
+      if (!isDestroy) {
+        el.style.display = el.__vOriginalDisplay;
+      }
+    }
+  };
+
+  var platformDirectives = {
+    model: directive,
+    show: show
+  };
+
+  /*  */
+
+  var transitionProps = {
+    name: String,
+    appear: Boolean,
+    css: Boolean,
+    mode: String,
+    type: String,
+    enterClass: String,
+    leaveClass: String,
+    enterToClass: String,
+    leaveToClass: String,
+    enterActiveClass: String,
+    leaveActiveClass: String,
+    appearClass: String,
+    appearActiveClass: String,
+    appearToClass: String,
+    duration: [Number, String, Object]
+  };
+
+  // in case the child is also an abstract component, e.g. <keep-alive>
+  // we want to recursively retrieve the real component to be rendered
+  function getRealChild (vnode) {
+    var compOptions = vnode && vnode.componentOptions;
+    if (compOptions && compOptions.Ctor.options.abstract) {
+      return getRealChild(getFirstComponentChild(compOptions.children))
+    } else {
+      return vnode
+    }
+  }
+
+  function extractTransitionData (comp) {
+    var data = {};
+    var options = comp.$options;
+    // props
+    for (var key in options.propsData) {
+      data[key] = comp[key];
+    }
+    // events.
+    // extract listeners and pass them directly to the transition methods
+    var listeners = options._parentListeners;
+    for (var key$1 in listeners) {
+      data[camelize(key$1)] = listeners[key$1];
+    }
+    return data
+  }
+
+  function placeholder (h, rawChild) {
+    if (/\d-keep-alive$/.test(rawChild.tag)) {
+      return h('keep-alive', {
+        props: rawChild.componentOptions.propsData
+      })
+    }
+  }
+
+  function hasParentTransition (vnode) {
+    while ((vnode = vnode.parent)) {
+      if (vnode.data.transition) {
+        return true
+      }
+    }
+  }
+
+  function isSameChild (child, oldChild) {
+    return oldChild.key === child.key && oldChild.tag === child.tag
+  }
+
+  var isNotTextNode = function (c) { return c.tag || isAsyncPlaceholder(c); };
+
+  var isVShowDirective = function (d) { return d.name === 'show'; };
+
+  var Transition = {
+    name: 'transition',
+    props: transitionProps,
+    abstract: true,
+
+    render: function render (h) {
+      var this$1 = this;
+
+      var children = this.$slots.default;
+      if (!children) {
+        return
+      }
+
+      // filter out text nodes (possible whitespaces)
+      children = children.filter(isNotTextNode);
+      /* istanbul ignore if */
+      if (!children.length) {
+        return
+      }
+
+      // warn multiple elements
+      if (children.length > 1) {
+        warn(
+          '<transition> can only be used on a single element. Use ' +
+          '<transition-group> for lists.',
+          this.$parent
+        );
+      }
+
+      var mode = this.mode;
+
+      // warn invalid mode
+      if (mode && mode !== 'in-out' && mode !== 'out-in'
+      ) {
+        warn(
+          'invalid <transition> mode: ' + mode,
+          this.$parent
+        );
+      }
+
+      var rawChild = children[0];
+
+      // if this is a component root node and the component's
+      // parent container node also has transition, skip.
+      if (hasParentTransition(this.$vnode)) {
+        return rawChild
+      }
+
+      // apply transition data to child
+      // use getRealChild() to ignore abstract components e.g. keep-alive
+      var child = getRealChild(rawChild);
+      /* istanbul ignore if */
+      if (!child) {
+        return rawChild
+      }
+
+      if (this._leaving) {
+        return placeholder(h, rawChild)
+      }
+
+      // ensure a key that is unique to the vnode type and to this transition
+      // component instance. This key will be used to remove pending leaving nodes
+      // during entering.
+      var id = "__transition-" + (this._uid) + "-";
+      child.key = child.key == null
+        ? child.isComment
+          ? id + 'comment'
+          : id + child.tag
+        : isPrimitive(child.key)
+          ? (String(child.key).indexOf(id) === 0 ? child.key : id + child.key)
+          : child.key;
+
+      var data = (child.data || (child.data = {})).transition = extractTransitionData(this);
+      var oldRawChild = this._vnode;
+      var oldChild = getRealChild(oldRawChild);
+
+      // mark v-show
+      // so that the transition module can hand over the control to the directive
+      if (child.data.directives && child.data.directives.some(isVShowDirective)) {
+        child.data.show = true;
+      }
+
+      if (
+        oldChild &&
+        oldChild.data &&
+        !isSameChild(child, oldChild) &&
+        !isAsyncPlaceholder(oldChild) &&
+        // #6687 component root is a comment node
+        !(oldChild.componentInstance && oldChild.componentInstance._vnode.isComment)
+      ) {
+        // replace old child transition data with fresh one
+        // important for dynamic transitions!
+        var oldData = oldChild.data.transition = extend({}, data);
+        // handle transition mode
+        if (mode === 'out-in') {
+          // return placeholder node and queue update when leave finishes
+          this._leaving = true;
+          mergeVNodeHook(oldData, 'afterLeave', function () {
+            this$1._leaving = false;
+            this$1.$forceUpdate();
+          });
+          return placeholder(h, rawChild)
+        } else if (mode === 'in-out') {
+          if (isAsyncPlaceholder(child)) {
+            return oldRawChild
+          }
+          var delayedLeave;
+          var performLeave = function () { delayedLeave(); };
+          mergeVNodeHook(data, 'afterEnter', performLeave);
+          mergeVNodeHook(data, 'enterCancelled', performLeave);
+          mergeVNodeHook(oldData, 'delayLeave', function (leave) { delayedLeave = leave; });
+        }
+      }
+
+      return rawChild
+    }
+  };
+
+  /*  */
+
+  var props = extend({
+    tag: String,
+    moveClass: String
+  }, transitionProps);
+
+  delete props.mode;
+
+  var TransitionGroup = {
+    props: props,
+
+    beforeMount: function beforeMount () {
+      var this$1 = this;
+
+      var update = this._update;
+      this._update = function (vnode, hydrating) {
+        var restoreActiveInstance = setActiveInstance(this$1);
+        // force removing pass
+        this$1.__patch__(
+          this$1._vnode,
+          this$1.kept,
+          false, // hydrating
+          true // removeOnly (!important, avoids unnecessary moves)
+        );
+        this$1._vnode = this$1.kept;
+        restoreActiveInstance();
+        update.call(this$1, vnode, hydrating);
+      };
+    },
+
+    render: function render (h) {
+      var tag = this.tag || this.$vnode.data.tag || 'span';
+      var map = Object.create(null);
+      var prevChildren = this.prevChildren = this.children;
+      var rawChildren = this.$slots.default || [];
+      var children = this.children = [];
+      var transitionData = extractTransitionData(this);
+
+      for (var i = 0; i < rawChildren.length; i++) {
+        var c = rawChildren[i];
+        if (c.tag) {
+          if (c.key != null && String(c.key).indexOf('__vlist') !== 0) {
+            children.push(c);
+            map[c.key] = c
+            ;(c.data || (c.data = {})).transition = transitionData;
+          } else {
+            var opts = c.componentOptions;
+            var name = opts ? (opts.Ctor.options.name || opts.tag || '') : c.tag;
+            warn(("<transition-group> children must be keyed: <" + name + ">"));
+          }
+        }
+      }
+
+      if (prevChildren) {
+        var kept = [];
+        var removed = [];
+        for (var i$1 = 0; i$1 < prevChildren.length; i$1++) {
+          var c$1 = prevChildren[i$1];
+          c$1.data.transition = transitionData;
+          c$1.data.pos = c$1.elm.getBoundingClientRect();
+          if (map[c$1.key]) {
+            kept.push(c$1);
+          } else {
+            removed.push(c$1);
+          }
+        }
+        this.kept = h(tag, null, kept);
+        this.removed = removed;
+      }
+
+      return h(tag, null, children)
+    },
+
+    updated: function updated () {
+      var children = this.prevChildren;
+      var moveClass = this.moveClass || ((this.name || 'v') + '-move');
+      if (!children.length || !this.hasMove(children[0].elm, moveClass)) {
+        return
+      }
+
+      // we divide the work into three loops to avoid mixing DOM reads and writes
+      // in each iteration - which helps prevent layout thrashing.
+      children.forEach(callPendingCbs);
+      children.forEach(recordPosition);
+      children.forEach(applyTranslation);
+
+      // force reflow to put everything in position
+      // assign to this to avoid being removed in tree-shaking
+      // $flow-disable-line
+      this._reflow = document.body.offsetHeight;
+
+      children.forEach(function (c) {
+        if (c.data.moved) {
+          var el = c.elm;
+          var s = el.style;
+          addTransitionClass(el, moveClass);
+          s.transform = s.WebkitTransform = s.transitionDuration = '';
+          el.addEventListener(transitionEndEvent, el._moveCb = function cb (e) {
+            if (e && e.target !== el) {
+              return
+            }
+            if (!e || /transform$/.test(e.propertyName)) {
+              el.removeEventListener(transitionEndEvent, cb);
+              el._moveCb = null;
+              removeTransitionClass(el, moveClass);
+            }
+          });
+        }
+      });
+    },
+
+    methods: {
+      hasMove: function hasMove (el, moveClass) {
+        /* istanbul ignore if */
+        if (!hasTransition) {
+          return false
+        }
+        /* istanbul ignore if */
+        if (this._hasMove) {
+          return this._hasMove
+        }
+        // Detect whether an element with the move class applied has
+        // CSS transitions. Since the element may be inside an entering
+        // transition at this very moment, we make a clone of it and remove
+        // all other transition classes applied to ensure only the move class
+        // is applied.
+        var clone = el.cloneNode();
+        if (el._transitionClasses) {
+          el._transitionClasses.forEach(function (cls) { removeClass(clone, cls); });
+        }
+        addClass(clone, moveClass);
+        clone.style.display = 'none';
+        this.$el.appendChild(clone);
+        var info = getTransitionInfo(clone);
+        this.$el.removeChild(clone);
+        return (this._hasMove = info.hasTransform)
+      }
+    }
+  };
+
+  function callPendingCbs (c) {
+    /* istanbul ignore if */
+    if (c.elm._moveCb) {
+      c.elm._moveCb();
+    }
+    /* istanbul ignore if */
+    if (c.elm._enterCb) {
+      c.elm._enterCb();
+    }
+  }
+
+  function recordPosition (c) {
+    c.data.newPos = c.elm.getBoundingClientRect();
+  }
+
+  function applyTranslation (c) {
+    var oldPos = c.data.pos;
+    var newPos = c.data.newPos;
+    var dx = oldPos.left - newPos.left;
+    var dy = oldPos.top - newPos.top;
+    if (dx || dy) {
+      c.data.moved = true;
+      var s = c.elm.style;
+      s.transform = s.WebkitTransform = "translate(" + dx + "px," + dy + "px)";
+      s.transitionDuration = '0s';
+    }
+  }
+
+  var platformComponents = {
+    Transition: Transition,
+    TransitionGroup: TransitionGroup
+  };
+
+  /*  */
+
+  // install platform specific utils
+  Vue.config.mustUseProp = mustUseProp;
+  Vue.config.isReservedTag = isReservedTag;
+  Vue.config.isReservedAttr = isReservedAttr;
+  Vue.config.getTagNamespace = getTagNamespace;
+  Vue.config.isUnknownElement = isUnknownElement;
+
+  // install platform runtime directives & components
+  extend(Vue.options.directives, platformDirectives);
+  extend(Vue.options.components, platformComponents);
+
+  // install platform patch function
+  Vue.prototype.__patch__ = inBrowser ? patch : noop;
+
+  // public mount method
+  Vue.prototype.$mount = function (
+    el,
+    hydrating
+  ) {
+    el = el && inBrowser ? query(el) : undefined;
+    return mountComponent(this, el, hydrating)
+  };
+
+  // devtools global hook
+  /* istanbul ignore next */
+  if (inBrowser) {
+    setTimeout(function () {
+      if (config.devtools) {
+        if (devtools) {
+          devtools.emit('init', Vue);
+        } else {
+          console[console.info ? 'info' : 'log'](
+            'Download the Vue Devtools extension for a better development experience:\n' +
+            'https://github.com/vuejs/vue-devtools'
+          );
+        }
+      }
+      if (config.productionTip !== false &&
+        typeof console !== 'undefined'
+      ) {
+        console[console.info ? 'info' : 'log'](
+          "You are running Vue in development mode.\n" +
+          "Make sure to turn on production mode when deploying for production.\n" +
+          "See more tips at https://vuejs.org/guide/deployment.html"
+        );
+      }
+    }, 0);
+  }
+
+  /*  */
+
+  var defaultTagRE = /\{\{((?:.|\r?\n)+?)\}\}/g;
+  var regexEscapeRE = /[-.*+?^${}()|[\]\/\\]/g;
+
+  var buildRegex = cached(function (delimiters) {
+    var open = delimiters[0].replace(regexEscapeRE, '\\$&');
+    var close = delimiters[1].replace(regexEscapeRE, '\\$&');
+    return new RegExp(open + '((?:.|\\n)+?)' + close, 'g')
+  });
+
+
+
+  function parseText (
+    text,
+    delimiters
+  ) {
+    var tagRE = delimiters ? buildRegex(delimiters) : defaultTagRE;
+    if (!tagRE.test(text)) {
+      return
+    }
+    var tokens = [];
+    var rawTokens = [];
+    var lastIndex = tagRE.lastIndex = 0;
+    var match, index, tokenValue;
+    while ((match = tagRE.exec(text))) {
+      index = match.index;
+      // push text token
+      if (index > lastIndex) {
+        rawTokens.push(tokenValue = text.slice(lastIndex, index));
+        tokens.push(JSON.stringify(tokenValue));
+      }
+      // tag token
+      var exp = parseFilters(match[1].trim());
+      tokens.push(("_s(" + exp + ")"));
+      rawTokens.push({ '@binding': exp });
+      lastIndex = index + match[0].length;
+    }
+    if (lastIndex < text.length) {
+      rawTokens.push(tokenValue = text.slice(lastIndex));
+      tokens.push(JSON.stringify(tokenValue));
+    }
+    return {
+      expression: tokens.join('+'),
+      tokens: rawTokens
+    }
+  }
+
+  /*  */
+
+  function transformNode (el, options) {
+    var warn = options.warn || baseWarn;
+    var staticClass = getAndRemoveAttr(el, 'class');
+    if (staticClass) {
+      var res = parseText(staticClass, options.delimiters);
+      if (res) {
+        warn(
+          "class=\"" + staticClass + "\": " +
+          'Interpolation inside attributes has been removed. ' +
+          'Use v-bind or the colon shorthand instead. For example, ' +
+          'instead of <div class="{{ val }}">, use <div :class="val">.',
+          el.rawAttrsMap['class']
+        );
+      }
+    }
+    if (staticClass) {
+      el.staticClass = JSON.stringify(staticClass);
+    }
+    var classBinding = getBindingAttr(el, 'class', false /* getStatic */);
+    if (classBinding) {
+      el.classBinding = classBinding;
+    }
+  }
+
+  function genData (el) {
+    var data = '';
+    if (el.staticClass) {
+      data += "staticClass:" + (el.staticClass) + ",";
+    }
+    if (el.classBinding) {
+      data += "class:" + (el.classBinding) + ",";
+    }
+    return data
+  }
+
+  var klass$1 = {
+    staticKeys: ['staticClass'],
+    transformNode: transformNode,
+    genData: genData
+  };
+
+  /*  */
+
+  function transformNode$1 (el, options) {
+    var warn = options.warn || baseWarn;
+    var staticStyle = getAndRemoveAttr(el, 'style');
+    if (staticStyle) {
+      /* istanbul ignore if */
+      {
+        var res = parseText(staticStyle, options.delimiters);
+        if (res) {
+          warn(
+            "style=\"" + staticStyle + "\": " +
+            'Interpolation inside attributes has been removed. ' +
+            'Use v-bind or the colon shorthand instead. For example, ' +
+            'instead of <div style="{{ val }}">, use <div :style="val">.',
+            el.rawAttrsMap['style']
+          );
+        }
+      }
+      el.staticStyle = JSON.stringify(parseStyleText(staticStyle));
+    }
+
+    var styleBinding = getBindingAttr(el, 'style', false /* getStatic */);
+    if (styleBinding) {
+      el.styleBinding = styleBinding;
+    }
+  }
+
+  function genData$1 (el) {
+    var data = '';
+    if (el.staticStyle) {
+      data += "staticStyle:" + (el.staticStyle) + ",";
+    }
+    if (el.styleBinding) {
+      data += "style:(" + (el.styleBinding) + "),";
+    }
+    return data
+  }
+
+  var style$1 = {
+    staticKeys: ['staticStyle'],
+    transformNode: transformNode$1,
+    genData: genData$1
+  };
+
+  /*  */
+
+  var decoder;
+
+  var he = {
+    decode: function decode (html) {
+      decoder = decoder || document.createElement('div');
+      decoder.innerHTML = html;
+      return decoder.textContent
+    }
+  };
+
+  /*  */
+
+  var isUnaryTag = makeMap(
+    'area,base,br,col,embed,frame,hr,img,input,isindex,keygen,' +
+    'link,meta,param,source,track,wbr'
+  );
+
+  // Elements that you can, intentionally, leave open
+  // (and which close themselves)
+  var canBeLeftOpenTag = makeMap(
+    'colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source'
+  );
+
+  // HTML5 tags https://html.spec.whatwg.org/multipage/indices.html#elements-3
+  // Phrasing Content https://html.spec.whatwg.org/multipage/dom.html#phrasing-content
+  var isNonPhrasingTag = makeMap(
+    'address,article,aside,base,blockquote,body,caption,col,colgroup,dd,' +
+    'details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,' +
+    'h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,' +
+    'optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,' +
+    'title,tr,track'
+  );
+
+  /**
+   * Not type-checking this file because it's mostly vendor code.
+   */
+
+  // Regular Expressions for parsing tags and attributes
+  var attribute = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/;
+  var dynamicArgAttribute = /^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/;
+  var ncname = "[a-zA-Z_][\\-\\.0-9_a-zA-Z" + (unicodeRegExp.source) + "]*";
+  var qnameCapture = "((?:" + ncname + "\\:)?" + ncname + ")";
+  var startTagOpen = new RegExp(("^<" + qnameCapture));
+  var startTagClose = /^\s*(\/?)>/;
+  var endTag = new RegExp(("^<\\/" + qnameCapture + "[^>]*>"));
+  var doctype = /^<!DOCTYPE [^>]+>/i;
+  // #7298: escape - to avoid being passed as HTML comment when inlined in page
+  var comment = /^<!\--/;
+  var conditionalComment = /^<!\[/;
+
+  // Special Elements (can contain anything)
+  var isPlainTextElement = makeMap('script,style,textarea', true);
+  var reCache = {};
+
+  var decodingMap = {
+    '&lt;': '<',
+    '&gt;': '>',
+    '&quot;': '"',
+    '&amp;': '&',
+    '&#10;': '\n',
+    '&#9;': '\t',
+    '&#39;': "'"
+  };
+  var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
+  var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;
+
+  // #5992
+  var isIgnoreNewlineTag = makeMap('pre,textarea', true);
+  var shouldIgnoreFirstNewline = function (tag, html) { return tag && isIgnoreNewlineTag(tag) && html[0] === '\n'; };
+
+  function decodeAttr (value, shouldDecodeNewlines) {
+    var re = shouldDecodeNewlines ? encodedAttrWithNewLines : encodedAttr;
+    return value.replace(re, function (match) { return decodingMap[match]; })
+  }
+
+  function parseHTML (html, options) {
+    var stack = [];
+    var expectHTML = options.expectHTML;
+    var isUnaryTag$$1 = options.isUnaryTag || no;
+    var canBeLeftOpenTag$$1 = options.canBeLeftOpenTag || no;
+    var index = 0;
+    var last, lastTag;
+    while (html) {
+      last = html;
+      // Make sure we're not in a plaintext content element like script/style
+      if (!lastTag || !isPlainTextElement(lastTag)) {
+        var textEnd = html.indexOf('<');
+        if (textEnd === 0) {
+          // Comment:
+          if (comment.test(html)) {
+            var commentEnd = html.indexOf('-->');
+
+            if (commentEnd >= 0) {
+              if (options.shouldKeepComment) {
+                options.comment(html.substring(4, commentEnd), index, index + commentEnd + 3);
+              }
+              advance(commentEnd + 3);
+              continue
+            }
+          }
+
+          // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
+          if (conditionalComment.test(html)) {
+            var conditionalEnd = html.indexOf(']>');
+
+            if (conditionalEnd >= 0) {
+              advance(conditionalEnd + 2);
+              continue
+            }
+          }
+
+          // Doctype:
+          var doctypeMatch = html.match(doctype);
+          if (doctypeMatch) {
+            advance(doctypeMatch[0].length);
+            continue
+          }
+
+          // End tag:
+          var endTagMatch = html.match(endTag);
+          if (endTagMatch) {
+            var curIndex = index;
+            advance(endTagMatch[0].length);
+            parseEndTag(endTagMatch[1], curIndex, index);
+            continue
+          }
+
+          // Start tag:
+          var startTagMatch = parseStartTag();
+          if (startTagMatch) {
+            handleStartTag(startTagMatch);
+            if (shouldIgnoreFirstNewline(startTagMatch.tagName, html)) {
+              advance(1);
+            }
+            continue
+          }
+        }
+
+        var text = (void 0), rest = (void 0), next = (void 0);
+        if (textEnd >= 0) {
+          rest = html.slice(textEnd);
+          while (
+            !endTag.test(rest) &&
+            !startTagOpen.test(rest) &&
+            !comment.test(rest) &&
+            !conditionalComment.test(rest)
+          ) {
+            // < in plain text, be forgiving and treat it as text
+            next = rest.indexOf('<', 1);
+            if (next < 0) { break }
+            textEnd += next;
+            rest = html.slice(textEnd);
+          }
+          text = html.substring(0, textEnd);
+        }
+
+        if (textEnd < 0) {
+          text = html;
+        }
+
+        if (text) {
+          advance(text.length);
+        }
+
+        if (options.chars && text) {
+          options.chars(text, index - text.length, index);
+        }
+      } else {
+        var endTagLength = 0;
+        var stackedTag = lastTag.toLowerCase();
+        var reStackedTag = reCache[stackedTag] || (reCache[stackedTag] = new RegExp('([\\s\\S]*?)(</' + stackedTag + '[^>]*>)', 'i'));
+        var rest$1 = html.replace(reStackedTag, function (all, text, endTag) {
+          endTagLength = endTag.length;
+          if (!isPlainTextElement(stackedTag) && stackedTag !== 'noscript') {
+            text = text
+              .replace(/<!\--([\s\S]*?)-->/g, '$1') // #7298
+              .replace(/<!\[CDATA\[([\s\S]*?)]]>/g, '$1');
+          }
+          if (shouldIgnoreFirstNewline(stackedTag, text)) {
+            text = text.slice(1);
+          }
+          if (options.chars) {
+            options.chars(text);
+          }
+          return ''
+        });
+        index += html.length - rest$1.length;
+        html = rest$1;
+        parseEndTag(stackedTag, index - endTagLength, index);
+      }
+
+      if (html === last) {
+        options.chars && options.chars(html);
+        if (!stack.length && options.warn) {
+          options.warn(("Mal-formatted tag at end of template: \"" + html + "\""), { start: index + html.length });
+        }
+        break
+      }
+    }
+
+    // Clean up any remaining tags
+    parseEndTag();
+
+    function advance (n) {
+      index += n;
+      html = html.substring(n);
+    }
+
+    function parseStartTag () {
+      var start = html.match(startTagOpen);
+      if (start) {
+        var match = {
+          tagName: start[1],
+          attrs: [],
+          start: index
+        };
+        advance(start[0].length);
+        var end, attr;
+        while (!(end = html.match(startTagClose)) && (attr = html.match(dynamicArgAttribute) || html.match(attribute))) {
+          attr.start = index;
+          advance(attr[0].length);
+          attr.end = index;
+          match.attrs.push(attr);
+        }
+        if (end) {
+          match.unarySlash = end[1];
+          advance(end[0].length);
+          match.end = index;
+          return match
+        }
+      }
+    }
+
+    function handleStartTag (match) {
+      var tagName = match.tagName;
+      var unarySlash = match.unarySlash;
+
+      if (expectHTML) {
+        if (lastTag === 'p' && isNonPhrasingTag(tagName)) {
+          parseEndTag(lastTag);
+        }
+        if (canBeLeftOpenTag$$1(tagName) && lastTag === tagName) {
+          parseEndTag(tagName);
+        }
+      }
+
+      var unary = isUnaryTag$$1(tagName) || !!unarySlash;
+
+      var l = match.attrs.length;
+      var attrs = new Array(l);
+      for (var i = 0; i < l; i++) {
+        var args = match.attrs[i];
+        var value = args[3] || args[4] || args[5] || '';
+        var shouldDecodeNewlines = tagName === 'a' && args[1] === 'href'
+          ? options.shouldDecodeNewlinesForHref
+          : options.shouldDecodeNewlines;
+        attrs[i] = {
+          name: args[1],
+          value: decodeAttr(value, shouldDecodeNewlines)
+        };
+        if (options.outputSourceRange) {
+          attrs[i].start = args.start + args[0].match(/^\s*/).length;
+          attrs[i].end = args.end;
+        }
+      }
+
+      if (!unary) {
+        stack.push({ tag: tagName, lowerCasedTag: tagName.toLowerCase(), attrs: attrs, start: match.start, end: match.end });
+        lastTag = tagName;
+      }
+
+      if (options.start) {
+        options.start(tagName, attrs, unary, match.start, match.end);
+      }
+    }
+
+    function parseEndTag (tagName, start, end) {
+      var pos, lowerCasedTagName;
+      if (start == null) { start = index; }
+      if (end == null) { end = index; }
+
+      // Find the closest opened tag of the same type
+      if (tagName) {
+        lowerCasedTagName = tagName.toLowerCase();
+        for (pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos].lowerCasedTag === lowerCasedTagName) {
+            break
+          }
+        }
+      } else {
+        // If no tag name is provided, clean shop
+        pos = 0;
+      }
+
+      if (pos >= 0) {
+        // Close all the open elements, up the stack
+        for (var i = stack.length - 1; i >= pos; i--) {
+          if (i > pos || !tagName &&
+            options.warn
+          ) {
+            options.warn(
+              ("tag <" + (stack[i].tag) + "> has no matching end tag."),
+              { start: stack[i].start, end: stack[i].end }
+            );
+          }
+          if (options.end) {
+            options.end(stack[i].tag, start, end);
+          }
+        }
+
+        // Remove the open elements from the stack
+        stack.length = pos;
+        lastTag = pos && stack[pos - 1].tag;
+      } else if (lowerCasedTagName === 'br') {
+        if (options.start) {
+          options.start(tagName, [], true, start, end);
+        }
+      } else if (lowerCasedTagName === 'p') {
+        if (options.start) {
+          options.start(tagName, [], false, start, end);
+        }
+        if (options.end) {
+          options.end(tagName, start, end);
+        }
+      }
+    }
+  }
+
+  /*  */
+
+  var onRE = /^@|^v-on:/;
+  var dirRE = /^v-|^@|^:|^#/;
+  var forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
+  var forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/;
+  var stripParensRE = /^\(|\)$/g;
+  var dynamicArgRE = /^\[.*\]$/;
+
+  var argRE = /:(.*)$/;
+  var bindRE = /^:|^\.|^v-bind:/;
+  var modifierRE = /\.[^.\]]+(?=[^\]]*$)/g;
+
+  var slotRE = /^v-slot(:|$)|^#/;
+
+  var lineBreakRE = /[\r\n]/;
+  var whitespaceRE$1 = /\s+/g;
+
+  var invalidAttributeRE = /[\s"'<>\/=]/;
+
+  var decodeHTMLCached = cached(he.decode);
+
+  var emptySlotScopeToken = "_empty_";
+
+  // configurable state
+  var warn$2;
+  var delimiters;
+  var transforms;
+  var preTransforms;
+  var postTransforms;
+  var platformIsPreTag;
+  var platformMustUseProp;
+  var platformGetTagNamespace;
+  var maybeComponent;
+
+  function createASTElement (
+    tag,
+    attrs,
+    parent
+  ) {
+    return {
+      type: 1,
+      tag: tag,
+      attrsList: attrs,
+      attrsMap: makeAttrsMap(attrs),
+      rawAttrsMap: {},
+      parent: parent,
+      children: []
+    }
+  }
+
+  /**
+   * Convert HTML string to AST.
+   */
+  function parse (
+    template,
+    options
+  ) {
+    warn$2 = options.warn || baseWarn;
+
+    platformIsPreTag = options.isPreTag || no;
+    platformMustUseProp = options.mustUseProp || no;
+    platformGetTagNamespace = options.getTagNamespace || no;
+    var isReservedTag = options.isReservedTag || no;
+    maybeComponent = function (el) { return !!el.component || !isReservedTag(el.tag); };
+
+    transforms = pluckModuleFunction(options.modules, 'transformNode');
+    preTransforms = pluckModuleFunction(options.modules, 'preTransformNode');
+    postTransforms = pluckModuleFunction(options.modules, 'postTransformNode');
+
+    delimiters = options.delimiters;
+
+    var stack = [];
+    var preserveWhitespace = options.preserveWhitespace !== false;
+    var whitespaceOption = options.whitespace;
+    var root;
+    var currentParent;
+    var inVPre = false;
+    var inPre = false;
+    var warned = false;
+
+    function warnOnce (msg, range) {
+      if (!warned) {
+        warned = true;
+        warn$2(msg, range);
+      }
+    }
+
+    function closeElement (element) {
+      trimEndingWhitespace(element);
+      if (!inVPre && !element.processed) {
+        element = processElement(element, options);
+      }
+      // tree management
+      if (!stack.length && element !== root) {
+        // allow root elements with v-if, v-else-if and v-else
+        if (root.if && (element.elseif || element.else)) {
+          {
+            checkRootConstraints(element);
+          }
+          addIfCondition(root, {
+            exp: element.elseif,
+            block: element
+          });
+        } else {
+          warnOnce(
+            "Component template should contain exactly one root element. " +
+            "If you are using v-if on multiple elements, " +
+            "use v-else-if to chain them instead.",
+            { start: element.start }
+          );
+        }
+      }
+      if (currentParent && !element.forbidden) {
+        if (element.elseif || element.else) {
+          processIfConditions(element, currentParent);
+        } else {
+          if (element.slotScope) {
+            // scoped slot
+            // keep it in the children list so that v-else(-if) conditions can
+            // find it as the prev node.
+            var name = element.slotTarget || '"default"'
+            ;(currentParent.scopedSlots || (currentParent.scopedSlots = {}))[name] = element;
+          }
+          currentParent.children.push(element);
+          element.parent = currentParent;
+        }
+      }
+
+      // final children cleanup
+      // filter out scoped slots
+      element.children = element.children.filter(function (c) { return !(c).slotScope; });
+      // remove trailing whitespace node again
+      trimEndingWhitespace(element);
+
+      // check pre state
+      if (element.pre) {
+        inVPre = false;
+      }
+      if (platformIsPreTag(element.tag)) {
+        inPre = false;
+      }
+      // apply post-transforms
+      for (var i = 0; i < postTransforms.length; i++) {
+        postTransforms[i](element, options);
+      }
+    }
+
+    function trimEndingWhitespace (el) {
+      // remove trailing whitespace node
+      if (!inPre) {
+        var lastNode;
+        while (
+          (lastNode = el.children[el.children.length - 1]) &&
+          lastNode.type === 3 &&
+          lastNode.text === ' '
+        ) {
+          el.children.pop();
+        }
+      }
+    }
+
+    function checkRootConstraints (el) {
+      if (el.tag === 'slot' || el.tag === 'template') {
+        warnOnce(
+          "Cannot use <" + (el.tag) + "> as component root element because it may " +
+          'contain multiple nodes.',
+          { start: el.start }
+        );
+      }
+      if (el.attrsMap.hasOwnProperty('v-for')) {
+        warnOnce(
+          'Cannot use v-for on stateful component root element because ' +
+          'it renders multiple elements.',
+          el.rawAttrsMap['v-for']
+        );
+      }
+    }
+
+    parseHTML(template, {
+      warn: warn$2,
+      expectHTML: options.expectHTML,
+      isUnaryTag: options.isUnaryTag,
+      canBeLeftOpenTag: options.canBeLeftOpenTag,
+      shouldDecodeNewlines: options.shouldDecodeNewlines,
+      shouldDecodeNewlinesForHref: options.shouldDecodeNewlinesForHref,
+      shouldKeepComment: options.comments,
+      outputSourceRange: options.outputSourceRange,
+      start: function start (tag, attrs, unary, start$1, end) {
+        // check namespace.
+        // inherit parent ns if there is one
+        var ns = (currentParent && currentParent.ns) || platformGetTagNamespace(tag);
+
+        // handle IE svg bug
+        /* istanbul ignore if */
+        if (isIE && ns === 'svg') {
+          attrs = guardIESVGBug(attrs);
+        }
+
+        var element = createASTElement(tag, attrs, currentParent);
+        if (ns) {
+          element.ns = ns;
+        }
+
+        {
+          if (options.outputSourceRange) {
+            element.start = start$1;
+            element.end = end;
+            element.rawAttrsMap = element.attrsList.reduce(function (cumulated, attr) {
+              cumulated[attr.name] = attr;
+              return cumulated
+            }, {});
+          }
+          attrs.forEach(function (attr) {
+            if (invalidAttributeRE.test(attr.name)) {
+              warn$2(
+                "Invalid dynamic argument expression: attribute names cannot contain " +
+                "spaces, quotes, <, >, / or =.",
+                {
+                  start: attr.start + attr.name.indexOf("["),
+                  end: attr.start + attr.name.length
+                }
+              );
+            }
+          });
+        }
+
+        if (isForbiddenTag(element) && !isServerRendering()) {
+          element.forbidden = true;
+          warn$2(
+            'Templates should only be responsible for mapping the state to the ' +
+            'UI. Avoid placing tags with side-effects in your templates, such as ' +
+            "<" + tag + ">" + ', as they will not be parsed.',
+            { start: element.start }
+          );
+        }
+
+        // apply pre-transforms
+        for (var i = 0; i < preTransforms.length; i++) {
+          element = preTransforms[i](element, options) || element;
+        }
+
+        if (!inVPre) {
+          processPre(element);
+          if (element.pre) {
+            inVPre = true;
+          }
+        }
+        if (platformIsPreTag(element.tag)) {
+          inPre = true;
+        }
+        if (inVPre) {
+          processRawAttrs(element);
+        } else if (!element.processed) {
+          // structural directives
+          processFor(element);
+          processIf(element);
+          processOnce(element);
+        }
+
+        if (!root) {
+          root = element;
+          {
+            checkRootConstraints(root);
+          }
+        }
+
+        if (!unary) {
+          currentParent = element;
+          stack.push(element);
+        } else {
+          closeElement(element);
+        }
+      },
+
+      end: function end (tag, start, end$1) {
+        var element = stack[stack.length - 1];
+        // pop stack
+        stack.length -= 1;
+        currentParent = stack[stack.length - 1];
+        if (options.outputSourceRange) {
+          element.end = end$1;
+        }
+        closeElement(element);
+      },
+
+      chars: function chars (text, start, end) {
+        if (!currentParent) {
+          {
+            if (text === template) {
+              warnOnce(
+                'Component template requires a root element, rather than just text.',
+                { start: start }
+              );
+            } else if ((text = text.trim())) {
+              warnOnce(
+                ("text \"" + text + "\" outside root element will be ignored."),
+                { start: start }
+              );
+            }
+          }
+          return
+        }
+        // IE textarea placeholder bug
+        /* istanbul ignore if */
+        if (isIE &&
+          currentParent.tag === 'textarea' &&
+          currentParent.attrsMap.placeholder === text
+        ) {
+          return
+        }
+        var children = currentParent.children;
+        if (inPre || text.trim()) {
+          text = isTextTag(currentParent) ? text : decodeHTMLCached(text);
+        } else if (!children.length) {
+          // remove the whitespace-only node right after an opening tag
+          text = '';
+        } else if (whitespaceOption) {
+          if (whitespaceOption === 'condense') {
+            // in condense mode, remove the whitespace node if it contains
+            // line break, otherwise condense to a single space
+            text = lineBreakRE.test(text) ? '' : ' ';
+          } else {
+            text = ' ';
+          }
+        } else {
+          text = preserveWhitespace ? ' ' : '';
+        }
+        if (text) {
+          if (!inPre && whitespaceOption === 'condense') {
+            // condense consecutive whitespaces into single space
+            text = text.replace(whitespaceRE$1, ' ');
+          }
+          var res;
+          var child;
+          if (!inVPre && text !== ' ' && (res = parseText(text, delimiters))) {
+            child = {
+              type: 2,
+              expression: res.expression,
+              tokens: res.tokens,
+              text: text
+            };
+          } else if (text !== ' ' || !children.length || children[children.length - 1].text !== ' ') {
+            child = {
+              type: 3,
+              text: text
+            };
+          }
+          if (child) {
+            if (options.outputSourceRange) {
+              child.start = start;
+              child.end = end;
+            }
+            children.push(child);
+          }
+        }
+      },
+      comment: function comment (text, start, end) {
+        // adding anyting as a sibling to the root node is forbidden
+        // comments should still be allowed, but ignored
+        if (currentParent) {
+          var child = {
+            type: 3,
+            text: text,
+            isComment: true
+          };
+          if (options.outputSourceRange) {
+            child.start = start;
+            child.end = end;
+          }
+          currentParent.children.push(child);
+        }
+      }
+    });
+    return root
+  }
+
+  function processPre (el) {
+    if (getAndRemoveAttr(el, 'v-pre') != null) {
+      el.pre = true;
+    }
+  }
+
+  function processRawAttrs (el) {
+    var list = el.attrsList;
+    var len = list.length;
+    if (len) {
+      var attrs = el.attrs = new Array(len);
+      for (var i = 0; i < len; i++) {
+        attrs[i] = {
+          name: list[i].name,
+          value: JSON.stringify(list[i].value)
+        };
+        if (list[i].start != null) {
+          attrs[i].start = list[i].start;
+          attrs[i].end = list[i].end;
+        }
+      }
+    } else if (!el.pre) {
+      // non root node in pre blocks with no attributes
+      el.plain = true;
+    }
+  }
+
+  function processElement (
+    element,
+    options
+  ) {
+    processKey(element);
+
+    // determine whether this is a plain element after
+    // removing structural attributes
+    element.plain = (
+      !element.key &&
+      !element.scopedSlots &&
+      !element.attrsList.length
+    );
+
+    processRef(element);
+    processSlotContent(element);
+    processSlotOutlet(element);
+    processComponent(element);
+    for (var i = 0; i < transforms.length; i++) {
+      element = transforms[i](element, options) || element;
+    }
+    processAttrs(element);
+    return element
+  }
+
+  function processKey (el) {
+    var exp = getBindingAttr(el, 'key');
+    if (exp) {
+      {
+        if (el.tag === 'template') {
+          warn$2(
+            "<template> cannot be keyed. Place the key on real elements instead.",
+            getRawBindingAttr(el, 'key')
+          );
+        }
+        if (el.for) {
+          var iterator = el.iterator2 || el.iterator1;
+          var parent = el.parent;
+          if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
+            warn$2(
+              "Do not use v-for index as key on <transition-group> children, " +
+              "this is the same as not using keys.",
+              getRawBindingAttr(el, 'key'),
+              true /* tip */
+            );
+          }
+        }
+      }
+      el.key = exp;
+    }
+  }
+
+  function processRef (el) {
+    var ref = getBindingAttr(el, 'ref');
+    if (ref) {
+      el.ref = ref;
+      el.refInFor = checkInFor(el);
+    }
+  }
+
+  function processFor (el) {
+    var exp;
+    if ((exp = getAndRemoveAttr(el, 'v-for'))) {
+      var res = parseFor(exp);
+      if (res) {
+        extend(el, res);
+      } else {
+        warn$2(
+          ("Invalid v-for expression: " + exp),
+          el.rawAttrsMap['v-for']
+        );
+      }
+    }
+  }
+
+
+
+  function parseFor (exp) {
+    var inMatch = exp.match(forAliasRE);
+    if (!inMatch) { return }
+    var res = {};
+    res.for = inMatch[2].trim();
+    var alias = inMatch[1].trim().replace(stripParensRE, '');
+    var iteratorMatch = alias.match(forIteratorRE);
+    if (iteratorMatch) {
+      res.alias = alias.replace(forIteratorRE, '').trim();
+      res.iterator1 = iteratorMatch[1].trim();
+      if (iteratorMatch[2]) {
+        res.iterator2 = iteratorMatch[2].trim();
+      }
+    } else {
+      res.alias = alias;
+    }
+    return res
+  }
+
+  function processIf (el) {
+    var exp = getAndRemoveAttr(el, 'v-if');
+    if (exp) {
+      el.if = exp;
+      addIfCondition(el, {
+        exp: exp,
+        block: el
+      });
+    } else {
+      if (getAndRemoveAttr(el, 'v-else') != null) {
+        el.else = true;
+      }
+      var elseif = getAndRemoveAttr(el, 'v-else-if');
+      if (elseif) {
+        el.elseif = elseif;
+      }
+    }
+  }
+
+  function processIfConditions (el, parent) {
+    var prev = findPrevElement(parent.children);
+    if (prev && prev.if) {
+      addIfCondition(prev, {
+        exp: el.elseif,
+        block: el
+      });
+    } else {
+      warn$2(
+        "v-" + (el.elseif ? ('else-if="' + el.elseif + '"') : 'else') + " " +
+        "used on element <" + (el.tag) + "> without corresponding v-if.",
+        el.rawAttrsMap[el.elseif ? 'v-else-if' : 'v-else']
+      );
+    }
+  }
+
+  function findPrevElement (children) {
+    var i = children.length;
+    while (i--) {
+      if (children[i].type === 1) {
+        return children[i]
+      } else {
+        if (children[i].text !== ' ') {
+          warn$2(
+            "text \"" + (children[i].text.trim()) + "\" between v-if and v-else(-if) " +
+            "will be ignored.",
+            children[i]
+          );
+        }
+        children.pop();
+      }
+    }
+  }
+
+  function addIfCondition (el, condition) {
+    if (!el.ifConditions) {
+      el.ifConditions = [];
+    }
+    el.ifConditions.push(condition);
+  }
+
+  function processOnce (el) {
+    var once$$1 = getAndRemoveAttr(el, 'v-once');
+    if (once$$1 != null) {
+      el.once = true;
+    }
+  }
+
+  // handle content being passed to a component as slot,
+  // e.g. <template slot="xxx">, <div slot-scope="xxx">
+  function processSlotContent (el) {
+    var slotScope;
+    if (el.tag === 'template') {
+      slotScope = getAndRemoveAttr(el, 'scope');
+      /* istanbul ignore if */
+      if (slotScope) {
+        warn$2(
+          "the \"scope\" attribute for scoped slots have been deprecated and " +
+          "replaced by \"slot-scope\" since 2.5. The new \"slot-scope\" attribute " +
+          "can also be used on plain elements in addition to <template> to " +
+          "denote scoped slots.",
+          el.rawAttrsMap['scope'],
+          true
+        );
+      }
+      el.slotScope = slotScope || getAndRemoveAttr(el, 'slot-scope');
+    } else if ((slotScope = getAndRemoveAttr(el, 'slot-scope'))) {
+      /* istanbul ignore if */
+      if (el.attrsMap['v-for']) {
+        warn$2(
+          "Ambiguous combined usage of slot-scope and v-for on <" + (el.tag) + "> " +
+          "(v-for takes higher priority). Use a wrapper <template> for the " +
+          "scoped slot to make it clearer.",
+          el.rawAttrsMap['slot-scope'],
+          true
+        );
+      }
+      el.slotScope = slotScope;
+    }
+
+    // slot="xxx"
+    var slotTarget = getBindingAttr(el, 'slot');
+    if (slotTarget) {
+      el.slotTarget = slotTarget === '""' ? '"default"' : slotTarget;
+      el.slotTargetDynamic = !!(el.attrsMap[':slot'] || el.attrsMap['v-bind:slot']);
+      // preserve slot as an attribute for native shadow DOM compat
+      // only for non-scoped slots.
+      if (el.tag !== 'template' && !el.slotScope) {
+        addAttr(el, 'slot', slotTarget, getRawBindingAttr(el, 'slot'));
+      }
+    }
+
+    // 2.6 v-slot syntax
+    {
+      if (el.tag === 'template') {
+        // v-slot on <template>
+        var slotBinding = getAndRemoveAttrByRegex(el, slotRE);
+        if (slotBinding) {
+          {
+            if (el.slotTarget || el.slotScope) {
+              warn$2(
+                "Unexpected mixed usage of different slot syntaxes.",
+                el
+              );
+            }
+            if (el.parent && !maybeComponent(el.parent)) {
+              warn$2(
+                "<template v-slot> can only appear at the root level inside " +
+                "the receiving component",
+                el
+              );
+            }
+          }
+          var ref = getSlotName(slotBinding);
+          var name = ref.name;
+          var dynamic = ref.dynamic;
+          el.slotTarget = name;
+          el.slotTargetDynamic = dynamic;
+          el.slotScope = slotBinding.value || emptySlotScopeToken; // force it into a scoped slot for perf
+        }
+      } else {
+        // v-slot on component, denotes default slot
+        var slotBinding$1 = getAndRemoveAttrByRegex(el, slotRE);
+        if (slotBinding$1) {
+          {
+            if (!maybeComponent(el)) {
+              warn$2(
+                "v-slot can only be used on components or <template>.",
+                slotBinding$1
+              );
+            }
+            if (el.slotScope || el.slotTarget) {
+              warn$2(
+                "Unexpected mixed usage of different slot syntaxes.",
+                el
+              );
+            }
+            if (el.scopedSlots) {
+              warn$2(
+                "To avoid scope ambiguity, the default slot should also use " +
+                "<template> syntax when there are other named slots.",
+                slotBinding$1
+              );
+            }
+          }
+          // add the component's children to its default slot
+          var slots = el.scopedSlots || (el.scopedSlots = {});
+          var ref$1 = getSlotName(slotBinding$1);
+          var name$1 = ref$1.name;
+          var dynamic$1 = ref$1.dynamic;
+          var slotContainer = slots[name$1] = createASTElement('template', [], el);
+          slotContainer.slotTarget = name$1;
+          slotContainer.slotTargetDynamic = dynamic$1;
+          slotContainer.children = el.children.filter(function (c) {
+            if (!c.slotScope) {
+              c.parent = slotContainer;
+              return true
+            }
+          });
+          slotContainer.slotScope = slotBinding$1.value || emptySlotScopeToken;
+          // remove children as they are returned from scopedSlots now
+          el.children = [];
+          // mark el non-plain so data gets generated
+          el.plain = false;
+        }
+      }
+    }
+  }
+
+  function getSlotName (binding) {
+    var name = binding.name.replace(slotRE, '');
+    if (!name) {
+      if (binding.name[0] !== '#') {
+        name = 'default';
+      } else {
+        warn$2(
+          "v-slot shorthand syntax requires a slot name.",
+          binding
+        );
+      }
+    }
+    return dynamicArgRE.test(name)
+      // dynamic [name]
+      ? { name: name.slice(1, -1), dynamic: true }
+      // static name
+      : { name: ("\"" + name + "\""), dynamic: false }
+  }
+
+  // handle <slot/> outlets
+  function processSlotOutlet (el) {
+    if (el.tag === 'slot') {
+      el.slotName = getBindingAttr(el, 'name');
+      if (el.key) {
+        warn$2(
+          "`key` does not work on <slot> because slots are abstract outlets " +
+          "and can possibly expand into multiple elements. " +
+          "Use the key on a wrapping element instead.",
+          getRawBindingAttr(el, 'key')
+        );
+      }
+    }
+  }
+
+  function processComponent (el) {
+    var binding;
+    if ((binding = getBindingAttr(el, 'is'))) {
+      el.component = binding;
+    }
+    if (getAndRemoveAttr(el, 'inline-template') != null) {
+      el.inlineTemplate = true;
+    }
+  }
+
+  function processAttrs (el) {
+    var list = el.attrsList;
+    var i, l, name, rawName, value, modifiers, syncGen, isDynamic;
+    for (i = 0, l = list.length; i < l; i++) {
+      name = rawName = list[i].name;
+      value = list[i].value;
+      if (dirRE.test(name)) {
+        // mark element as dynamic
+        el.hasBindings = true;
+        // modifiers
+        modifiers = parseModifiers(name.replace(dirRE, ''));
+        // support .foo shorthand syntax for the .prop modifier
+        if (modifiers) {
+          name = name.replace(modifierRE, '');
+        }
+        if (bindRE.test(name)) { // v-bind
+          name = name.replace(bindRE, '');
+          value = parseFilters(value);
+          isDynamic = dynamicArgRE.test(name);
+          if (isDynamic) {
+            name = name.slice(1, -1);
+          }
+          if (
+            value.trim().length === 0
+          ) {
+            warn$2(
+              ("The value for a v-bind expression cannot be empty. Found in \"v-bind:" + name + "\"")
+            );
+          }
+          if (modifiers) {
+            if (modifiers.prop && !isDynamic) {
+              name = camelize(name);
+              if (name === 'innerHtml') { name = 'innerHTML'; }
+            }
+            if (modifiers.camel && !isDynamic) {
+              name = camelize(name);
+            }
+            if (modifiers.sync) {
+              syncGen = genAssignmentCode(value, "$event");
+              if (!isDynamic) {
+                addHandler(
+                  el,
+                  ("update:" + (camelize(name))),
+                  syncGen,
+                  null,
+                  false,
+                  warn$2,
+                  list[i]
+                );
+                if (hyphenate(name) !== camelize(name)) {
+                  addHandler(
+                    el,
+                    ("update:" + (hyphenate(name))),
+                    syncGen,
+                    null,
+                    false,
+                    warn$2,
+                    list[i]
+                  );
+                }
+              } else {
+                // handler w/ dynamic event name
+                addHandler(
+                  el,
+                  ("\"update:\"+(" + name + ")"),
+                  syncGen,
+                  null,
+                  false,
+                  warn$2,
+                  list[i],
+                  true // dynamic
+                );
+              }
+            }
+          }
+          if ((modifiers && modifiers.prop) || (
+            !el.component && platformMustUseProp(el.tag, el.attrsMap.type, name)
+          )) {
+            addProp(el, name, value, list[i], isDynamic);
+          } else {
+            addAttr(el, name, value, list[i], isDynamic);
+          }
+        } else if (onRE.test(name)) { // v-on
+          name = name.replace(onRE, '');
+          isDynamic = dynamicArgRE.test(name);
+          if (isDynamic) {
+            name = name.slice(1, -1);
+          }
+          addHandler(el, name, value, modifiers, false, warn$2, list[i], isDynamic);
+        } else { // normal directives
+          name = name.replace(dirRE, '');
+          // parse arg
+          var argMatch = name.match(argRE);
+          var arg = argMatch && argMatch[1];
+          isDynamic = false;
+          if (arg) {
+            name = name.slice(0, -(arg.length + 1));
+            if (dynamicArgRE.test(arg)) {
+              arg = arg.slice(1, -1);
+              isDynamic = true;
+            }
+          }
+          addDirective(el, name, rawName, value, arg, isDynamic, modifiers, list[i]);
+          if (name === 'model') {
+            checkForAliasModel(el, value);
+          }
+        }
+      } else {
+        // literal attribute
+        {
+          var res = parseText(value, delimiters);
+          if (res) {
+            warn$2(
+              name + "=\"" + value + "\": " +
+              'Interpolation inside attributes has been removed. ' +
+              'Use v-bind or the colon shorthand instead. For example, ' +
+              'instead of <div id="{{ val }}">, use <div :id="val">.',
+              list[i]
+            );
+          }
+        }
+        addAttr(el, name, JSON.stringify(value), list[i]);
+        // #6887 firefox doesn't update muted state if set via attribute
+        // even immediately after element creation
+        if (!el.component &&
+            name === 'muted' &&
+            platformMustUseProp(el.tag, el.attrsMap.type, name)) {
+          addProp(el, name, 'true', list[i]);
+        }
+      }
+    }
+  }
+
+  function checkInFor (el) {
+    var parent = el;
+    while (parent) {
+      if (parent.for !== undefined) {
+        return true
+      }
+      parent = parent.parent;
+    }
+    return false
+  }
+
+  function parseModifiers (name) {
+    var match = name.match(modifierRE);
+    if (match) {
+      var ret = {};
+      match.forEach(function (m) { ret[m.slice(1)] = true; });
+      return ret
+    }
+  }
+
+  function makeAttrsMap (attrs) {
+    var map = {};
+    for (var i = 0, l = attrs.length; i < l; i++) {
+      if (
+        map[attrs[i].name] && !isIE && !isEdge
+      ) {
+        warn$2('duplicate attribute: ' + attrs[i].name, attrs[i]);
+      }
+      map[attrs[i].name] = attrs[i].value;
+    }
+    return map
+  }
+
+  // for script (e.g. type="x/template") or style, do not decode content
+  function isTextTag (el) {
+    return el.tag === 'script' || el.tag === 'style'
+  }
+
+  function isForbiddenTag (el) {
+    return (
+      el.tag === 'style' ||
+      (el.tag === 'script' && (
+        !el.attrsMap.type ||
+        el.attrsMap.type === 'text/javascript'
+      ))
+    )
+  }
+
+  var ieNSBug = /^xmlns:NS\d+/;
+  var ieNSPrefix = /^NS\d+:/;
+
+  /* istanbul ignore next */
+  function guardIESVGBug (attrs) {
+    var res = [];
+    for (var i = 0; i < attrs.length; i++) {
+      var attr = attrs[i];
+      if (!ieNSBug.test(attr.name)) {
+        attr.name = attr.name.replace(ieNSPrefix, '');
+        res.push(attr);
+      }
+    }
+    return res
+  }
+
+  function checkForAliasModel (el, value) {
+    var _el = el;
+    while (_el) {
+      if (_el.for && _el.alias === value) {
+        warn$2(
+          "<" + (el.tag) + " v-model=\"" + value + "\">: " +
+          "You are binding v-model directly to a v-for iteration alias. " +
+          "This will not be able to modify the v-for source array because " +
+          "writing to the alias is like modifying a function local variable. " +
+          "Consider using an array of objects and use v-model on an object property instead.",
+          el.rawAttrsMap['v-model']
+        );
+      }
+      _el = _el.parent;
+    }
+  }
+
+  /*  */
+
+  function preTransformNode (el, options) {
+    if (el.tag === 'input') {
+      var map = el.attrsMap;
+      if (!map['v-model']) {
+        return
+      }
+
+      var typeBinding;
+      if (map[':type'] || map['v-bind:type']) {
+        typeBinding = getBindingAttr(el, 'type');
+      }
+      if (!map.type && !typeBinding && map['v-bind']) {
+        typeBinding = "(" + (map['v-bind']) + ").type";
+      }
+
+      if (typeBinding) {
+        var ifCondition = getAndRemoveAttr(el, 'v-if', true);
+        var ifConditionExtra = ifCondition ? ("&&(" + ifCondition + ")") : "";
+        var hasElse = getAndRemoveAttr(el, 'v-else', true) != null;
+        var elseIfCondition = getAndRemoveAttr(el, 'v-else-if', true);
+        // 1. checkbox
+        var branch0 = cloneASTElement(el);
+        // process for on the main node
+        processFor(branch0);
+        addRawAttr(branch0, 'type', 'checkbox');
+        processElement(branch0, options);
+        branch0.processed = true; // prevent it from double-processed
+        branch0.if = "(" + typeBinding + ")==='checkbox'" + ifConditionExtra;
+        addIfCondition(branch0, {
+          exp: branch0.if,
+          block: branch0
+        });
+        // 2. add radio else-if condition
+        var branch1 = cloneASTElement(el);
+        getAndRemoveAttr(branch1, 'v-for', true);
+        addRawAttr(branch1, 'type', 'radio');
+        processElement(branch1, options);
+        addIfCondition(branch0, {
+          exp: "(" + typeBinding + ")==='radio'" + ifConditionExtra,
+          block: branch1
+        });
+        // 3. other
+        var branch2 = cloneASTElement(el);
+        getAndRemoveAttr(branch2, 'v-for', true);
+        addRawAttr(branch2, ':type', typeBinding);
+        processElement(branch2, options);
+        addIfCondition(branch0, {
+          exp: ifCondition,
+          block: branch2
+        });
+
+        if (hasElse) {
+          branch0.else = true;
+        } else if (elseIfCondition) {
+          branch0.elseif = elseIfCondition;
+        }
+
+        return branch0
+      }
+    }
+  }
+
+  function cloneASTElement (el) {
+    return createASTElement(el.tag, el.attrsList.slice(), el.parent)
+  }
+
+  var model$1 = {
+    preTransformNode: preTransformNode
+  };
+
+  var modules$1 = [
+    klass$1,
+    style$1,
+    model$1
+  ];
+
+  /*  */
+
+  function text (el, dir) {
+    if (dir.value) {
+      addProp(el, 'textContent', ("_s(" + (dir.value) + ")"), dir);
+    }
+  }
+
+  /*  */
+
+  function html (el, dir) {
+    if (dir.value) {
+      addProp(el, 'innerHTML', ("_s(" + (dir.value) + ")"), dir);
+    }
+  }
+
+  var directives$1 = {
+    model: model,
+    text: text,
+    html: html
+  };
+
+  /*  */
+
+  var baseOptions = {
+    expectHTML: true,
+    modules: modules$1,
+    directives: directives$1,
+    isPreTag: isPreTag,
+    isUnaryTag: isUnaryTag,
+    mustUseProp: mustUseProp,
+    canBeLeftOpenTag: canBeLeftOpenTag,
+    isReservedTag: isReservedTag,
+    getTagNamespace: getTagNamespace,
+    staticKeys: genStaticKeys(modules$1)
+  };
+
+  /*  */
+
+  var isStaticKey;
+  var isPlatformReservedTag;
+
+  var genStaticKeysCached = cached(genStaticKeys$1);
+
+  /**
+   * Goal of the optimizer: walk the generated template AST tree
+   * and detect sub-trees that are purely static, i.e. parts of
+   * the DOM that never needs to change.
+   *
+   * Once we detect these sub-trees, we can:
+   *
+   * 1. Hoist them into constants, so that we no longer need to
+   *    create fresh nodes for them on each re-render;
+   * 2. Completely skip them in the patching process.
+   */
+  function optimize (root, options) {
+    if (!root) { return }
+    isStaticKey = genStaticKeysCached(options.staticKeys || '');
+    isPlatformReservedTag = options.isReservedTag || no;
+    // first pass: mark all non-static nodes.
+    markStatic$1(root);
+    // second pass: mark static roots.
+    markStaticRoots(root, false);
+  }
+
+  function genStaticKeys$1 (keys) {
+    return makeMap(
+      'type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap' +
+      (keys ? ',' + keys : '')
+    )
+  }
+
+  function markStatic$1 (node) {
+    node.static = isStatic(node);
+    if (node.type === 1) {
+      // do not make component slot content static. this avoids
+      // 1. components not able to mutate slot nodes
+      // 2. static slot content fails for hot-reloading
+      if (
+        !isPlatformReservedTag(node.tag) &&
+        node.tag !== 'slot' &&
+        node.attrsMap['inline-template'] == null
+      ) {
+        return
+      }
+      for (var i = 0, l = node.children.length; i < l; i++) {
+        var child = node.children[i];
+        markStatic$1(child);
+        if (!child.static) {
+          node.static = false;
+        }
+      }
+      if (node.ifConditions) {
+        for (var i$1 = 1, l$1 = node.ifConditions.length; i$1 < l$1; i$1++) {
+          var block = node.ifConditions[i$1].block;
+          markStatic$1(block);
+          if (!block.static) {
+            node.static = false;
+          }
+        }
+      }
+    }
+  }
+
+  function markStaticRoots (node, isInFor) {
+    if (node.type === 1) {
+      if (node.static || node.once) {
+        node.staticInFor = isInFor;
+      }
+      // For a node to qualify as a static root, it should have children that
+      // are not just static text. Otherwise the cost of hoisting out will
+      // outweigh the benefits and it's better off to just always render it fresh.
+      if (node.static && node.children.length && !(
+        node.children.length === 1 &&
+        node.children[0].type === 3
+      )) {
+        node.staticRoot = true;
+        return
+      } else {
+        node.staticRoot = false;
+      }
+      if (node.children) {
+        for (var i = 0, l = node.children.length; i < l; i++) {
+          markStaticRoots(node.children[i], isInFor || !!node.for);
+        }
+      }
+      if (node.ifConditions) {
+        for (var i$1 = 1, l$1 = node.ifConditions.length; i$1 < l$1; i$1++) {
+          markStaticRoots(node.ifConditions[i$1].block, isInFor);
+        }
+      }
+    }
+  }
+
+  function isStatic (node) {
+    if (node.type === 2) { // expression
+      return false
+    }
+    if (node.type === 3) { // text
+      return true
+    }
+    return !!(node.pre || (
+      !node.hasBindings && // no dynamic bindings
+      !node.if && !node.for && // not v-if or v-for or v-else
+      !isBuiltInTag(node.tag) && // not a built-in
+      isPlatformReservedTag(node.tag) && // not a component
+      !isDirectChildOfTemplateFor(node) &&
+      Object.keys(node).every(isStaticKey)
+    ))
+  }
+
+  function isDirectChildOfTemplateFor (node) {
+    while (node.parent) {
+      node = node.parent;
+      if (node.tag !== 'template') {
+        return false
+      }
+      if (node.for) {
+        return true
+      }
+    }
+    return false
+  }
+
+  /*  */
+
+  var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/;
+  var fnInvokeRE = /\([^)]*?\);*$/;
+  var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
+
+  // KeyboardEvent.keyCode aliases
+  var keyCodes = {
+    esc: 27,
+    tab: 9,
+    enter: 13,
+    space: 32,
+    up: 38,
+    left: 37,
+    right: 39,
+    down: 40,
+    'delete': [8, 46]
+  };
+
+  // KeyboardEvent.key aliases
+  var keyNames = {
+    // #7880: IE11 and Edge use `Esc` for Escape key name.
+    esc: ['Esc', 'Escape'],
+    tab: 'Tab',
+    enter: 'Enter',
+    // #9112: IE11 uses `Spacebar` for Space key name.
+    space: [' ', 'Spacebar'],
+    // #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
+    up: ['Up', 'ArrowUp'],
+    left: ['Left', 'ArrowLeft'],
+    right: ['Right', 'ArrowRight'],
+    down: ['Down', 'ArrowDown'],
+    // #9112: IE11 uses `Del` for Delete key name.
+    'delete': ['Backspace', 'Delete', 'Del']
+  };
+
+  // #4868: modifiers that prevent the execution of the listener
+  // need to explicitly return null so that we can determine whether to remove
+  // the listener for .once
+  var genGuard = function (condition) { return ("if(" + condition + ")return null;"); };
+
+  var modifierCode = {
+    stop: '$event.stopPropagation();',
+    prevent: '$event.preventDefault();',
+    self: genGuard("$event.target !== $event.currentTarget"),
+    ctrl: genGuard("!$event.ctrlKey"),
+    shift: genGuard("!$event.shiftKey"),
+    alt: genGuard("!$event.altKey"),
+    meta: genGuard("!$event.metaKey"),
+    left: genGuard("'button' in $event && $event.button !== 0"),
+    middle: genGuard("'button' in $event && $event.button !== 1"),
+    right: genGuard("'button' in $event && $event.button !== 2")
+  };
+
+  function genHandlers (
+    events,
+    isNative
+  ) {
+    var prefix = isNative ? 'nativeOn:' : 'on:';
+    var staticHandlers = "";
+    var dynamicHandlers = "";
+    for (var name in events) {
+      var handlerCode = genHandler(events[name]);
+      if (events[name] && events[name].dynamic) {
+        dynamicHandlers += name + "," + handlerCode + ",";
+      } else {
+        staticHandlers += "\"" + name + "\":" + handlerCode + ",";
+      }
+    }
+    staticHandlers = "{" + (staticHandlers.slice(0, -1)) + "}";
+    if (dynamicHandlers) {
+      return prefix + "_d(" + staticHandlers + ",[" + (dynamicHandlers.slice(0, -1)) + "])"
+    } else {
+      return prefix + staticHandlers
+    }
+  }
+
+  function genHandler (handler) {
+    if (!handler) {
+      return 'function(){}'
+    }
+
+    if (Array.isArray(handler)) {
+      return ("[" + (handler.map(function (handler) { return genHandler(handler); }).join(',')) + "]")
+    }
+
+    var isMethodPath = simplePathRE.test(handler.value);
+    var isFunctionExpression = fnExpRE.test(handler.value);
+    var isFunctionInvocation = simplePathRE.test(handler.value.replace(fnInvokeRE, ''));
+
+    if (!handler.modifiers) {
+      if (isMethodPath || isFunctionExpression) {
+        return handler.value
+      }
+      return ("function($event){" + (isFunctionInvocation ? ("return " + (handler.value)) : handler.value) + "}") // inline statement
+    } else {
+      var code = '';
+      var genModifierCode = '';
+      var keys = [];
+      for (var key in handler.modifiers) {
+        if (modifierCode[key]) {
+          genModifierCode += modifierCode[key];
+          // left/right
+          if (keyCodes[key]) {
+            keys.push(key);
+          }
+        } else if (key === 'exact') {
+          var modifiers = (handler.modifiers);
+          genModifierCode += genGuard(
+            ['ctrl', 'shift', 'alt', 'meta']
+              .filter(function (keyModifier) { return !modifiers[keyModifier]; })
+              .map(function (keyModifier) { return ("$event." + keyModifier + "Key"); })
+              .join('||')
+          );
+        } else {
+          keys.push(key);
+        }
+      }
+      if (keys.length) {
+        code += genKeyFilter(keys);
+      }
+      // Make sure modifiers like prevent and stop get executed after key filtering
+      if (genModifierCode) {
+        code += genModifierCode;
+      }
+      var handlerCode = isMethodPath
+        ? ("return " + (handler.value) + "($event)")
+        : isFunctionExpression
+          ? ("return (" + (handler.value) + ")($event)")
+          : isFunctionInvocation
+            ? ("return " + (handler.value))
+            : handler.value;
+      return ("function($event){" + code + handlerCode + "}")
+    }
+  }
+
+  function genKeyFilter (keys) {
+    return (
+      // make sure the key filters only apply to KeyboardEvents
+      // #9441: can't use 'keyCode' in $event because Chrome autofill fires fake
+      // key events that do not have keyCode property...
+      "if(!$event.type.indexOf('key')&&" +
+      (keys.map(genFilterCode).join('&&')) + ")return null;"
+    )
+  }
+
+  function genFilterCode (key) {
+    var keyVal = parseInt(key, 10);
+    if (keyVal) {
+      return ("$event.keyCode!==" + keyVal)
+    }
+    var keyCode = keyCodes[key];
+    var keyName = keyNames[key];
+    return (
+      "_k($event.keyCode," +
+      (JSON.stringify(key)) + "," +
+      (JSON.stringify(keyCode)) + "," +
+      "$event.key," +
+      "" + (JSON.stringify(keyName)) +
+      ")"
+    )
+  }
+
+  /*  */
+
+  function on (el, dir) {
+    if (dir.modifiers) {
+      warn("v-on without argument does not support modifiers.");
+    }
+    el.wrapListeners = function (code) { return ("_g(" + code + "," + (dir.value) + ")"); };
+  }
+
+  /*  */
+
+  function bind$1 (el, dir) {
+    el.wrapData = function (code) {
+      return ("_b(" + code + ",'" + (el.tag) + "'," + (dir.value) + "," + (dir.modifiers && dir.modifiers.prop ? 'true' : 'false') + (dir.modifiers && dir.modifiers.sync ? ',true' : '') + ")")
+    };
+  }
+
+  /*  */
+
+  var baseDirectives = {
+    on: on,
+    bind: bind$1,
+    cloak: noop
+  };
+
+  /*  */
+
+
+
+
+
+  var CodegenState = function CodegenState (options) {
+    this.options = options;
+    this.warn = options.warn || baseWarn;
+    this.transforms = pluckModuleFunction(options.modules, 'transformCode');
+    this.dataGenFns = pluckModuleFunction(options.modules, 'genData');
+    this.directives = extend(extend({}, baseDirectives), options.directives);
+    var isReservedTag = options.isReservedTag || no;
+    this.maybeComponent = function (el) { return !!el.component || !isReservedTag(el.tag); };
+    this.onceId = 0;
+    this.staticRenderFns = [];
+    this.pre = false;
+  };
+
+
+
+  function generate (
+    ast,
+    options
+  ) {
+    var state = new CodegenState(options);
+    var code = ast ? genElement(ast, state) : '_c("div")';
+    return {
+      render: ("with(this){return " + code + "}"),
+      staticRenderFns: state.staticRenderFns
+    }
+  }
+
+  function genElement (el, state) {
+    if (el.parent) {
+      el.pre = el.pre || el.parent.pre;
+    }
+
+    if (el.staticRoot && !el.staticProcessed) {
+      return genStatic(el, state)
+    } else if (el.once && !el.onceProcessed) {
+      return genOnce(el, state)
+    } else if (el.for && !el.forProcessed) {
+      return genFor(el, state)
+    } else if (el.if && !el.ifProcessed) {
+      return genIf(el, state)
+    } else if (el.tag === 'template' && !el.slotTarget && !state.pre) {
+      return genChildren(el, state) || 'void 0'
+    } else if (el.tag === 'slot') {
+      return genSlot(el, state)
+    } else {
+      // component or element
+      var code;
+      if (el.component) {
+        code = genComponent(el.component, el, state);
+      } else {
+        var data;
+        if (!el.plain || (el.pre && state.maybeComponent(el))) {
+          data = genData$2(el, state);
+        }
+
+        var children = el.inlineTemplate ? null : genChildren(el, state, true);
+        code = "_c('" + (el.tag) + "'" + (data ? ("," + data) : '') + (children ? ("," + children) : '') + ")";
+      }
+      // module transforms
+      for (var i = 0; i < state.transforms.length; i++) {
+        code = state.transforms[i](el, code);
+      }
+      return code
+    }
+  }
+
+  // hoist static sub-trees out
+  function genStatic (el, state) {
+    el.staticProcessed = true;
+    // Some elements (templates) need to behave differently inside of a v-pre
+    // node.  All pre nodes are static roots, so we can use this as a location to
+    // wrap a state change and reset it upon exiting the pre node.
+    var originalPreState = state.pre;
+    if (el.pre) {
+      state.pre = el.pre;
+    }
+    state.staticRenderFns.push(("with(this){return " + (genElement(el, state)) + "}"));
+    state.pre = originalPreState;
+    return ("_m(" + (state.staticRenderFns.length - 1) + (el.staticInFor ? ',true' : '') + ")")
+  }
+
+  // v-once
+  function genOnce (el, state) {
+    el.onceProcessed = true;
+    if (el.if && !el.ifProcessed) {
+      return genIf(el, state)
+    } else if (el.staticInFor) {
+      var key = '';
+      var parent = el.parent;
+      while (parent) {
+        if (parent.for) {
+          key = parent.key;
+          break
+        }
+        parent = parent.parent;
+      }
+      if (!key) {
+        state.warn(
+          "v-once can only be used inside v-for that is keyed. ",
+          el.rawAttrsMap['v-once']
+        );
+        return genElement(el, state)
+      }
+      return ("_o(" + (genElement(el, state)) + "," + (state.onceId++) + "," + key + ")")
+    } else {
+      return genStatic(el, state)
+    }
+  }
+
+  function genIf (
+    el,
+    state,
+    altGen,
+    altEmpty
+  ) {
+    el.ifProcessed = true; // avoid recursion
+    return genIfConditions(el.ifConditions.slice(), state, altGen, altEmpty)
+  }
+
+  function genIfConditions (
+    conditions,
+    state,
+    altGen,
+    altEmpty
+  ) {
+    if (!conditions.length) {
+      return altEmpty || '_e()'
+    }
+
+    var condition = conditions.shift();
+    if (condition.exp) {
+      return ("(" + (condition.exp) + ")?" + (genTernaryExp(condition.block)) + ":" + (genIfConditions(conditions, state, altGen, altEmpty)))
+    } else {
+      return ("" + (genTernaryExp(condition.block)))
+    }
+
+    // v-if with v-once should generate code like (a)?_m(0):_m(1)
+    function genTernaryExp (el) {
+      return altGen
+        ? altGen(el, state)
+        : el.once
+          ? genOnce(el, state)
+          : genElement(el, state)
+    }
+  }
+
+  function genFor (
+    el,
+    state,
+    altGen,
+    altHelper
+  ) {
+    var exp = el.for;
+    var alias = el.alias;
+    var iterator1 = el.iterator1 ? ("," + (el.iterator1)) : '';
+    var iterator2 = el.iterator2 ? ("," + (el.iterator2)) : '';
+
+    if (state.maybeComponent(el) &&
+      el.tag !== 'slot' &&
+      el.tag !== 'template' &&
+      !el.key
+    ) {
+      state.warn(
+        "<" + (el.tag) + " v-for=\"" + alias + " in " + exp + "\">: component lists rendered with " +
+        "v-for should have explicit keys. " +
+        "See https://vuejs.org/guide/list.html#key for more info.",
+        el.rawAttrsMap['v-for'],
+        true /* tip */
+      );
+    }
+
+    el.forProcessed = true; // avoid recursion
+    return (altHelper || '_l') + "((" + exp + ")," +
+      "function(" + alias + iterator1 + iterator2 + "){" +
+        "return " + ((altGen || genElement)(el, state)) +
+      '})'
+  }
+
+  function genData$2 (el, state) {
+    var data = '{';
+
+    // directives first.
+    // directives may mutate the el's other properties before they are generated.
+    var dirs = genDirectives(el, state);
+    if (dirs) { data += dirs + ','; }
+
+    // key
+    if (el.key) {
+      data += "key:" + (el.key) + ",";
+    }
+    // ref
+    if (el.ref) {
+      data += "ref:" + (el.ref) + ",";
+    }
+    if (el.refInFor) {
+      data += "refInFor:true,";
+    }
+    // pre
+    if (el.pre) {
+      data += "pre:true,";
+    }
+    // record original tag name for components using "is" attribute
+    if (el.component) {
+      data += "tag:\"" + (el.tag) + "\",";
+    }
+    // module data generation functions
+    for (var i = 0; i < state.dataGenFns.length; i++) {
+      data += state.dataGenFns[i](el);
+    }
+    // attributes
+    if (el.attrs) {
+      data += "attrs:" + (genProps(el.attrs)) + ",";
+    }
+    // DOM props
+    if (el.props) {
+      data += "domProps:" + (genProps(el.props)) + ",";
+    }
+    // event handlers
+    if (el.events) {
+      data += (genHandlers(el.events, false)) + ",";
+    }
+    if (el.nativeEvents) {
+      data += (genHandlers(el.nativeEvents, true)) + ",";
+    }
+    // slot target
+    // only for non-scoped slots
+    if (el.slotTarget && !el.slotScope) {
+      data += "slot:" + (el.slotTarget) + ",";
+    }
+    // scoped slots
+    if (el.scopedSlots) {
+      data += (genScopedSlots(el, el.scopedSlots, state)) + ",";
+    }
+    // component v-model
+    if (el.model) {
+      data += "model:{value:" + (el.model.value) + ",callback:" + (el.model.callback) + ",expression:" + (el.model.expression) + "},";
+    }
+    // inline-template
+    if (el.inlineTemplate) {
+      var inlineTemplate = genInlineTemplate(el, state);
+      if (inlineTemplate) {
+        data += inlineTemplate + ",";
+      }
+    }
+    data = data.replace(/,$/, '') + '}';
+    // v-bind dynamic argument wrap
+    // v-bind with dynamic arguments must be applied using the same v-bind object
+    // merge helper so that class/style/mustUseProp attrs are handled correctly.
+    if (el.dynamicAttrs) {
+      data = "_b(" + data + ",\"" + (el.tag) + "\"," + (genProps(el.dynamicAttrs)) + ")";
+    }
+    // v-bind data wrap
+    if (el.wrapData) {
+      data = el.wrapData(data);
+    }
+    // v-on data wrap
+    if (el.wrapListeners) {
+      data = el.wrapListeners(data);
+    }
+    return data
+  }
+
+  function genDirectives (el, state) {
+    var dirs = el.directives;
+    if (!dirs) { return }
+    var res = 'directives:[';
+    var hasRuntime = false;
+    var i, l, dir, needRuntime;
+    for (i = 0, l = dirs.length; i < l; i++) {
+      dir = dirs[i];
+      needRuntime = true;
+      var gen = state.directives[dir.name];
+      if (gen) {
+        // compile-time directive that manipulates AST.
+        // returns true if it also needs a runtime counterpart.
+        needRuntime = !!gen(el, dir, state.warn);
+      }
+      if (needRuntime) {
+        hasRuntime = true;
+        res += "{name:\"" + (dir.name) + "\",rawName:\"" + (dir.rawName) + "\"" + (dir.value ? (",value:(" + (dir.value) + "),expression:" + (JSON.stringify(dir.value))) : '') + (dir.arg ? (",arg:" + (dir.isDynamicArg ? dir.arg : ("\"" + (dir.arg) + "\""))) : '') + (dir.modifiers ? (",modifiers:" + (JSON.stringify(dir.modifiers))) : '') + "},";
+      }
+    }
+    if (hasRuntime) {
+      return res.slice(0, -1) + ']'
+    }
+  }
+
+  function genInlineTemplate (el, state) {
+    var ast = el.children[0];
+    if (el.children.length !== 1 || ast.type !== 1) {
+      state.warn(
+        'Inline-template components must have exactly one child element.',
+        { start: el.start }
+      );
+    }
+    if (ast && ast.type === 1) {
+      var inlineRenderFns = generate(ast, state.options);
+      return ("inlineTemplate:{render:function(){" + (inlineRenderFns.render) + "},staticRenderFns:[" + (inlineRenderFns.staticRenderFns.map(function (code) { return ("function(){" + code + "}"); }).join(',')) + "]}")
+    }
+  }
+
+  function genScopedSlots (
+    el,
+    slots,
+    state
+  ) {
+    // by default scoped slots are considered "stable", this allows child
+    // components with only scoped slots to skip forced updates from parent.
+    // but in some cases we have to bail-out of this optimization
+    // for example if the slot contains dynamic names, has v-if or v-for on them...
+    var needsForceUpdate = el.for || Object.keys(slots).some(function (key) {
+      var slot = slots[key];
+      return (
+        slot.slotTargetDynamic ||
+        slot.if ||
+        slot.for ||
+        containsSlotChild(slot) // is passing down slot from parent which may be dynamic
+      )
+    });
+
+    // #9534: if a component with scoped slots is inside a conditional branch,
+    // it's possible for the same component to be reused but with different
+    // compiled slot content. To avoid that, we generate a unique key based on
+    // the generated code of all the slot contents.
+    var needsKey = !!el.if;
+
+    // OR when it is inside another scoped slot or v-for (the reactivity may be
+    // disconnected due to the intermediate scope variable)
+    // #9438, #9506
+    // TODO: this can be further optimized by properly analyzing in-scope bindings
+    // and skip force updating ones that do not actually use scope variables.
+    if (!needsForceUpdate) {
+      var parent = el.parent;
+      while (parent) {
+        if (
+          (parent.slotScope && parent.slotScope !== emptySlotScopeToken) ||
+          parent.for
+        ) {
+          needsForceUpdate = true;
+          break
+        }
+        if (parent.if) {
+          needsKey = true;
+        }
+        parent = parent.parent;
+      }
+    }
+
+    var generatedSlots = Object.keys(slots)
+      .map(function (key) { return genScopedSlot(slots[key], state); })
+      .join(',');
+
+    return ("scopedSlots:_u([" + generatedSlots + "]" + (needsForceUpdate ? ",null,true" : "") + (!needsForceUpdate && needsKey ? (",null,false," + (hash(generatedSlots))) : "") + ")")
+  }
+
+  function hash(str) {
+    var hash = 5381;
+    var i = str.length;
+    while(i) {
+      hash = (hash * 33) ^ str.charCodeAt(--i);
+    }
+    return hash >>> 0
+  }
+
+  function containsSlotChild (el) {
+    if (el.type === 1) {
+      if (el.tag === 'slot') {
+        return true
+      }
+      return el.children.some(containsSlotChild)
+    }
+    return false
+  }
+
+  function genScopedSlot (
+    el,
+    state
+  ) {
+    var isLegacySyntax = el.attrsMap['slot-scope'];
+    if (el.if && !el.ifProcessed && !isLegacySyntax) {
+      return genIf(el, state, genScopedSlot, "null")
+    }
+    if (el.for && !el.forProcessed) {
+      return genFor(el, state, genScopedSlot)
+    }
+    var slotScope = el.slotScope === emptySlotScopeToken
+      ? ""
+      : String(el.slotScope);
+    var fn = "function(" + slotScope + "){" +
+      "return " + (el.tag === 'template'
+        ? el.if && isLegacySyntax
+          ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+          : genChildren(el, state) || 'undefined'
+        : genElement(el, state)) + "}";
+    // reverse proxy v-slot without scope on this.$slots
+    var reverseProxy = slotScope ? "" : ",proxy:true";
+    return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + reverseProxy + "}")
+  }
+
+  function genChildren (
+    el,
+    state,
+    checkSkip,
+    altGenElement,
+    altGenNode
+  ) {
+    var children = el.children;
+    if (children.length) {
+      var el$1 = children[0];
+      // optimize single v-for
+      if (children.length === 1 &&
+        el$1.for &&
+        el$1.tag !== 'template' &&
+        el$1.tag !== 'slot'
+      ) {
+        var normalizationType = checkSkip
+          ? state.maybeComponent(el$1) ? ",1" : ",0"
+          : "";
+        return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
+      }
+      var normalizationType$1 = checkSkip
+        ? getNormalizationType(children, state.maybeComponent)
+        : 0;
+      var gen = altGenNode || genNode;
+      return ("[" + (children.map(function (c) { return gen(c, state); }).join(',')) + "]" + (normalizationType$1 ? ("," + normalizationType$1) : ''))
+    }
+  }
+
+  // determine the normalization needed for the children array.
+  // 0: no normalization needed
+  // 1: simple normalization needed (possible 1-level deep nested array)
+  // 2: full normalization needed
+  function getNormalizationType (
+    children,
+    maybeComponent
+  ) {
+    var res = 0;
+    for (var i = 0; i < children.length; i++) {
+      var el = children[i];
+      if (el.type !== 1) {
+        continue
+      }
+      if (needsNormalization(el) ||
+          (el.ifConditions && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
+        res = 2;
+        break
+      }
+      if (maybeComponent(el) ||
+          (el.ifConditions && el.ifConditions.some(function (c) { return maybeComponent(c.block); }))) {
+        res = 1;
+      }
+    }
+    return res
+  }
+
+  function needsNormalization (el) {
+    return el.for !== undefined || el.tag === 'template' || el.tag === 'slot'
+  }
+
+  function genNode (node, state) {
+    if (node.type === 1) {
+      return genElement(node, state)
+    } else if (node.type === 3 && node.isComment) {
+      return genComment(node)
+    } else {
+      return genText(node)
+    }
+  }
+
+  function genText (text) {
+    return ("_v(" + (text.type === 2
+      ? text.expression // no need for () because already wrapped in _s()
+      : transformSpecialNewlines(JSON.stringify(text.text))) + ")")
+  }
+
+  function genComment (comment) {
+    return ("_e(" + (JSON.stringify(comment.text)) + ")")
+  }
+
+  function genSlot (el, state) {
+    var slotName = el.slotName || '"default"';
+    var children = genChildren(el, state);
+    var res = "_t(" + slotName + (children ? ("," + children) : '');
+    var attrs = el.attrs || el.dynamicAttrs
+      ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(function (attr) { return ({
+          // slot props are camelized
+          name: camelize(attr.name),
+          value: attr.value,
+          dynamic: attr.dynamic
+        }); }))
+      : null;
+    var bind$$1 = el.attrsMap['v-bind'];
+    if ((attrs || bind$$1) && !children) {
+      res += ",null";
+    }
+    if (attrs) {
+      res += "," + attrs;
+    }
+    if (bind$$1) {
+      res += (attrs ? '' : ',null') + "," + bind$$1;
+    }
+    return res + ')'
+  }
+
+  // componentName is el.component, take it as argument to shun flow's pessimistic refinement
+  function genComponent (
+    componentName,
+    el,
+    state
+  ) {
+    var children = el.inlineTemplate ? null : genChildren(el, state, true);
+    return ("_c(" + componentName + "," + (genData$2(el, state)) + (children ? ("," + children) : '') + ")")
+  }
+
+  function genProps (props) {
+    var staticProps = "";
+    var dynamicProps = "";
+    for (var i = 0; i < props.length; i++) {
+      var prop = props[i];
+      var value = transformSpecialNewlines(prop.value);
+      if (prop.dynamic) {
+        dynamicProps += (prop.name) + "," + value + ",";
+      } else {
+        staticProps += "\"" + (prop.name) + "\":" + value + ",";
+      }
+    }
+    staticProps = "{" + (staticProps.slice(0, -1)) + "}";
+    if (dynamicProps) {
+      return ("_d(" + staticProps + ",[" + (dynamicProps.slice(0, -1)) + "])")
+    } else {
+      return staticProps
+    }
+  }
+
+  // #3895, #4268
+  function transformSpecialNewlines (text) {
+    return text
+      .replace(/\u2028/g, '\\u2028')
+      .replace(/\u2029/g, '\\u2029')
+  }
+
+  /*  */
+
+
+
+  // these keywords should not appear inside expressions, but operators like
+  // typeof, instanceof and in are allowed
+  var prohibitedKeywordRE = new RegExp('\\b' + (
+    'do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,' +
+    'super,throw,while,yield,delete,export,import,return,switch,default,' +
+    'extends,finally,continue,debugger,function,arguments'
+  ).split(',').join('\\b|\\b') + '\\b');
+
+  // these unary operators should not be used as property/method names
+  var unaryOperatorsRE = new RegExp('\\b' + (
+    'delete,typeof,void'
+  ).split(',').join('\\s*\\([^\\)]*\\)|\\b') + '\\s*\\([^\\)]*\\)');
+
+  // strip strings in expressions
+  var stripStringRE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g;
+
+  // detect problematic expressions in a template
+  function detectErrors (ast, warn) {
+    if (ast) {
+      checkNode(ast, warn);
+    }
+  }
+
+  function checkNode (node, warn) {
+    if (node.type === 1) {
+      for (var name in node.attrsMap) {
+        if (dirRE.test(name)) {
+          var value = node.attrsMap[name];
+          if (value) {
+            var range = node.rawAttrsMap[name];
+            if (name === 'v-for') {
+              checkFor(node, ("v-for=\"" + value + "\""), warn, range);
+            } else if (name === 'v-slot' || name[0] === '#') {
+              checkFunctionParameterExpression(value, (name + "=\"" + value + "\""), warn, range);
+            } else if (onRE.test(name)) {
+              checkEvent(value, (name + "=\"" + value + "\""), warn, range);
+            } else {
+              checkExpression(value, (name + "=\"" + value + "\""), warn, range);
+            }
+          }
+        }
+      }
+      if (node.children) {
+        for (var i = 0; i < node.children.length; i++) {
+          checkNode(node.children[i], warn);
+        }
+      }
+    } else if (node.type === 2) {
+      checkExpression(node.expression, node.text, warn, node);
+    }
+  }
+
+  function checkEvent (exp, text, warn, range) {
+    var stripped = exp.replace(stripStringRE, '');
+    var keywordMatch = stripped.match(unaryOperatorsRE);
+    if (keywordMatch && stripped.charAt(keywordMatch.index - 1) !== '$') {
+      warn(
+        "avoid using JavaScript unary operator as property name: " +
+        "\"" + (keywordMatch[0]) + "\" in expression " + (text.trim()),
+        range
+      );
+    }
+    checkExpression(exp, text, warn, range);
+  }
+
+  function checkFor (node, text, warn, range) {
+    checkExpression(node.for || '', text, warn, range);
+    checkIdentifier(node.alias, 'v-for alias', text, warn, range);
+    checkIdentifier(node.iterator1, 'v-for iterator', text, warn, range);
+    checkIdentifier(node.iterator2, 'v-for iterator', text, warn, range);
+  }
+
+  function checkIdentifier (
+    ident,
+    type,
+    text,
+    warn,
+    range
+  ) {
+    if (typeof ident === 'string') {
+      try {
+        new Function(("var " + ident + "=_"));
+      } catch (e) {
+        warn(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())), range);
+      }
+    }
+  }
+
+  function checkExpression (exp, text, warn, range) {
+    try {
+      new Function(("return " + exp));
+    } catch (e) {
+      var keywordMatch = exp.replace(stripStringRE, '').match(prohibitedKeywordRE);
+      if (keywordMatch) {
+        warn(
+          "avoid using JavaScript keyword as property name: " +
+          "\"" + (keywordMatch[0]) + "\"\n  Raw expression: " + (text.trim()),
+          range
+        );
+      } else {
+        warn(
+          "invalid expression: " + (e.message) + " in\n\n" +
+          "    " + exp + "\n\n" +
+          "  Raw expression: " + (text.trim()) + "\n",
+          range
+        );
+      }
+    }
+  }
+
+  function checkFunctionParameterExpression (exp, text, warn, range) {
+    try {
+      new Function(exp, '');
+    } catch (e) {
+      warn(
+        "invalid function parameter expression: " + (e.message) + " in\n\n" +
+        "    " + exp + "\n\n" +
+        "  Raw expression: " + (text.trim()) + "\n",
+        range
+      );
+    }
+  }
+
+  /*  */
+
+  var range = 2;
+
+  function generateCodeFrame (
+    source,
+    start,
+    end
+  ) {
+    if ( start === void 0 ) start = 0;
+    if ( end === void 0 ) end = source.length;
+
+    var lines = source.split(/\r?\n/);
+    var count = 0;
+    var res = [];
+    for (var i = 0; i < lines.length; i++) {
+      count += lines[i].length + 1;
+      if (count >= start) {
+        for (var j = i - range; j <= i + range || end > count; j++) {
+          if (j < 0 || j >= lines.length) { continue }
+          res.push(("" + (j + 1) + (repeat$1(" ", 3 - String(j + 1).length)) + "|  " + (lines[j])));
+          var lineLength = lines[j].length;
+          if (j === i) {
+            // push underline
+            var pad = start - (count - lineLength) + 1;
+            var length = end > count ? lineLength - pad : end - start;
+            res.push("   |  " + repeat$1(" ", pad) + repeat$1("^", length));
+          } else if (j > i) {
+            if (end > count) {
+              var length$1 = Math.min(end - count, lineLength);
+              res.push("   |  " + repeat$1("^", length$1));
+            }
+            count += lineLength + 1;
+          }
+        }
+        break
+      }
+    }
+    return res.join('\n')
+  }
+
+  function repeat$1 (str, n) {
+    var result = '';
+    if (n > 0) {
+      while (true) { // eslint-disable-line
+        if (n & 1) { result += str; }
+        n >>>= 1;
+        if (n <= 0) { break }
+        str += str;
+      }
+    }
+    return result
+  }
+
+  /*  */
+
+
+
+  function createFunction (code, errors) {
+    try {
+      return new Function(code)
+    } catch (err) {
+      errors.push({ err: err, code: code });
+      return noop
+    }
+  }
+
+  function createCompileToFunctionFn (compile) {
+    var cache = Object.create(null);
+
+    return function compileToFunctions (
+      template,
+      options,
+      vm
+    ) {
+      options = extend({}, options);
+      var warn$$1 = options.warn || warn;
+      delete options.warn;
+
+      /* istanbul ignore if */
+      {
+        // detect possible CSP restriction
+        try {
+          new Function('return 1');
+        } catch (e) {
+          if (e.toString().match(/unsafe-eval|CSP/)) {
+            warn$$1(
+              'It seems you are using the standalone build of Vue.js in an ' +
+              'environment with Content Security Policy that prohibits unsafe-eval. ' +
+              'The template compiler cannot work in this environment. Consider ' +
+              'relaxing the policy to allow unsafe-eval or pre-compiling your ' +
+              'templates into render functions.'
+            );
+          }
+        }
+      }
+
+      // check cache
+      var key = options.delimiters
+        ? String(options.delimiters) + template
+        : template;
+      if (cache[key]) {
+        return cache[key]
+      }
+
+      // compile
+      var compiled = compile(template, options);
+
+      // check compilation errors/tips
+      {
+        if (compiled.errors && compiled.errors.length) {
+          if (options.outputSourceRange) {
+            compiled.errors.forEach(function (e) {
+              warn$$1(
+                "Error compiling template:\n\n" + (e.msg) + "\n\n" +
+                generateCodeFrame(template, e.start, e.end),
+                vm
+              );
+            });
+          } else {
+            warn$$1(
+              "Error compiling template:\n\n" + template + "\n\n" +
+              compiled.errors.map(function (e) { return ("- " + e); }).join('\n') + '\n',
+              vm
+            );
+          }
+        }
+        if (compiled.tips && compiled.tips.length) {
+          if (options.outputSourceRange) {
+            compiled.tips.forEach(function (e) { return tip(e.msg, vm); });
+          } else {
+            compiled.tips.forEach(function (msg) { return tip(msg, vm); });
+          }
+        }
+      }
+
+      // turn code into functions
+      var res = {};
+      var fnGenErrors = [];
+      res.render = createFunction(compiled.render, fnGenErrors);
+      res.staticRenderFns = compiled.staticRenderFns.map(function (code) {
+        return createFunction(code, fnGenErrors)
+      });
+
+      // check function generation errors.
+      // this should only happen if there is a bug in the compiler itself.
+      // mostly for codegen development use
+      /* istanbul ignore if */
+      {
+        if ((!compiled.errors || !compiled.errors.length) && fnGenErrors.length) {
+          warn$$1(
+            "Failed to generate render function:\n\n" +
+            fnGenErrors.map(function (ref) {
+              var err = ref.err;
+              var code = ref.code;
+
+              return ((err.toString()) + " in\n\n" + code + "\n");
+          }).join('\n'),
+            vm
+          );
+        }
+      }
+
+      return (cache[key] = res)
+    }
+  }
+
+  /*  */
+
+  function createCompilerCreator (baseCompile) {
+    return function createCompiler (baseOptions) {
+      function compile (
+        template,
+        options
+      ) {
+        var finalOptions = Object.create(baseOptions);
+        var errors = [];
+        var tips = [];
+
+        var warn = function (msg, range, tip) {
+          (tip ? tips : errors).push(msg);
+        };
+
+        if (options) {
+          if (options.outputSourceRange) {
+            // $flow-disable-line
+            var leadingSpaceLength = template.match(/^\s*/)[0].length;
+
+            warn = function (msg, range, tip) {
+              var data = { msg: msg };
+              if (range) {
+                if (range.start != null) {
+                  data.start = range.start + leadingSpaceLength;
+                }
+                if (range.end != null) {
+                  data.end = range.end + leadingSpaceLength;
+                }
+              }
+              (tip ? tips : errors).push(data);
+            };
+          }
+          // merge custom modules
+          if (options.modules) {
+            finalOptions.modules =
+              (baseOptions.modules || []).concat(options.modules);
+          }
+          // merge custom directives
+          if (options.directives) {
+            finalOptions.directives = extend(
+              Object.create(baseOptions.directives || null),
+              options.directives
+            );
+          }
+          // copy other options
+          for (var key in options) {
+            if (key !== 'modules' && key !== 'directives') {
+              finalOptions[key] = options[key];
+            }
+          }
+        }
+
+        finalOptions.warn = warn;
+
+        var compiled = baseCompile(template.trim(), finalOptions);
+        {
+          detectErrors(compiled.ast, warn);
+        }
+        compiled.errors = errors;
+        compiled.tips = tips;
+        return compiled
+      }
+
+      return {
+        compile: compile,
+        compileToFunctions: createCompileToFunctionFn(compile)
+      }
+    }
+  }
+
+  /*  */
+
+  // `createCompilerCreator` allows creating compilers that use alternative
+  // parser/optimizer/codegen, e.g the SSR optimizing compiler.
+  // Here we just export a default compiler using the default parts.
+  var createCompiler = createCompilerCreator(function baseCompile (
+    template,
+    options
+  ) {
+    var ast = parse(template.trim(), options);
+    if (options.optimize !== false) {
+      optimize(ast, options);
+    }
+    var code = generate(ast, options);
+    return {
+      ast: ast,
+      render: code.render,
+      staticRenderFns: code.staticRenderFns
+    }
+  });
+
+  /*  */
+
+  var ref$1 = createCompiler(baseOptions);
+  var compile = ref$1.compile;
+  var compileToFunctions = ref$1.compileToFunctions;
+
+  /*  */
+
+  // check whether current browser encodes a char inside attribute values
+  var div;
+  function getShouldDecode (href) {
+    div = div || document.createElement('div');
+    div.innerHTML = href ? "<a href=\"\n\"/>" : "<div a=\"\n\"/>";
+    return div.innerHTML.indexOf('&#10;') > 0
+  }
+
+  // #3663: IE encodes newlines inside attribute values while other browsers don't
+  var shouldDecodeNewlines = inBrowser ? getShouldDecode(false) : false;
+  // #6828: chrome encodes content in a[href]
+  var shouldDecodeNewlinesForHref = inBrowser ? getShouldDecode(true) : false;
+
+  /*  */
+
+  var idToTemplate = cached(function (id) {
+    var el = query(id);
+    return el && el.innerHTML
+  });
+
+  var mount = Vue.prototype.$mount;
+  Vue.prototype.$mount = function (
+    el,
+    hydrating
+  ) {
+    el = el && query(el);
+
+    /* istanbul ignore if */
+    if (el === document.body || el === document.documentElement) {
+      warn(
+        "Do not mount Vue to <html> or <body> - mount to normal elements instead."
+      );
+      return this
+    }
+
+    var options = this.$options;
+    // resolve template/el and convert to render function
+    if (!options.render) {
+      var template = options.template;
+      if (template) {
+        if (typeof template === 'string') {
+          if (template.charAt(0) === '#') {
+            template = idToTemplate(template);
+            /* istanbul ignore if */
+            if (!template) {
+              warn(
+                ("Template element not found or is empty: " + (options.template)),
+                this
+              );
+            }
+          }
+        } else if (template.nodeType) {
+          template = template.innerHTML;
+        } else {
+          {
+            warn('invalid template option:' + template, this);
+          }
+          return this
+        }
+      } else if (el) {
+        template = getOuterHTML(el);
+      }
+      if (template) {
+        /* istanbul ignore if */
+        if (config.performance && mark) {
+          mark('compile');
+        }
+
+        var ref = compileToFunctions(template, {
+          outputSourceRange: "development" !== 'production',
+          shouldDecodeNewlines: shouldDecodeNewlines,
+          shouldDecodeNewlinesForHref: shouldDecodeNewlinesForHref,
+          delimiters: options.delimiters,
+          comments: options.comments
+        }, this);
+        var render = ref.render;
+        var staticRenderFns = ref.staticRenderFns;
+        options.render = render;
+        options.staticRenderFns = staticRenderFns;
+
+        /* istanbul ignore if */
+        if (config.performance && mark) {
+          mark('compile end');
+          measure(("vue " + (this._name) + " compile"), 'compile', 'compile end');
+        }
+      }
+    }
+    return mount.call(this, el, hydrating)
+  };
+
+  /**
+   * Get outerHTML of elements, taking care
+   * of SVG elements in IE as well.
+   */
+  function getOuterHTML (el) {
+    if (el.outerHTML) {
+      return el.outerHTML
+    } else {
+      var container = document.createElement('div');
+      container.appendChild(el.cloneNode(true));
+      return container.innerHTML
+    }
+  }
+
+  Vue.compile = compileToFunctions;
+
+  return Vue;
+
+}));
diff --git a/src/highlight.js b/src/highlight.js
index b16efe83a0..1034eafb7a 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -11,6 +11,7 @@ import * as utils from './lib/utils.js';
 import * as MODES from './lib/modes.js';
 import { compileLanguage } from './lib/mode_compiler.js';
 import * as packageJSON from '../package.json';
+import { VuePlugin } from "./plugins/vue";
 
 const escape = utils.escapeHTML;
 const inherit = utils.inherit;
@@ -847,7 +848,9 @@ const HLJS = function(hljs) {
     requireLanguage,
     autoDetection,
     inherit,
-    addPlugin
+    addPlugin,
+    // plugins for frameworks
+    vuePlugin: VuePlugin
   });
 
   hljs.debugMode = function() { SAFE_MODE = false; };
diff --git a/src/plugins/vue.js b/src/plugins/vue.js
new file mode 100644
index 0000000000..dee6e833a4
--- /dev/null
+++ b/src/plugins/vue.js
@@ -0,0 +1,63 @@
+// @ts-nocheck
+import { escapeHTML } from "../lib/utils";
+
+function hasValueOrEmptyAttribute(value) {
+  return Boolean(value || value === "");
+}
+
+export const Component = {
+  props: ["language", "code", "autodetect"],
+  data: function() {
+    return {
+      detectedLanguage: "",
+      unknownLanguage: false
+    };
+  },
+  computed: {
+    className() {
+      if (this.unknownLanguage) return "";
+
+      return "hljs " + this.detectedLanguage;
+    },
+    highlighted() {
+      // no idea what language to use, return raw code
+      if (!this.autoDetect && !hljs.getLanguage(this.language)) {
+        console.warn(`The language "${this.language}" you specified could not be found.`);
+        this.unknownLanguage = true;
+        return escapeHTML(this.code);
+      }
+
+      let result;
+      if (this.autoDetect) {
+        result = hljs.highlightAuto(this.code);
+        this.detectedLanguage = result.language;
+      } else {
+        result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
+        this.detectectLanguage = this.language;
+      }
+      return result.value;
+    },
+    autoDetect() {
+      return !this.language || hasValueOrEmptyAttribute(this.autodetect);
+    },
+    ignoreIllegals() {
+      return true;
+    }
+  },
+  // this avoids needing to use a whole Vue compilation pipeline just
+  // to build Highlight.js
+  render(createElement) {
+    return createElement("pre", {}, [
+      createElement("code", {
+        class: this.className,
+        domProps: { innerHTML: this.highlighted }})
+    ]);
+  }
+  // template: `<pre><code :class="className" v-html="highlighted"></code></pre>`
+};
+
+export const VuePlugin = {
+  install(Vue) {
+    Vue.component('highlightjs', Component);
+  }
+};
diff --git a/tools/developer.html b/tools/developer.html
index 0c32d11a87..6355cf2919 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -57,8 +57,8 @@
     }
   </style>
 </head>
-<body>
-  <div class="editor">
+<body id>
+  <div class="editor" id="app">
     <h3>Code</h3>
     <div>
       <textarea>Put code here…</textarea>
@@ -70,7 +70,7 @@ <h3>Code</h3>
     </div>
     <div>
       <h3>Rendered in <span class="rendering_time">...</span> ms [<span class="rendering_stats">...</span>]</h3>
-      <pre><code class="hljs">...</code></pre>
+      <highlightjs auto :code="code" />
     </div>
     <div>
       <h3>Markup</h3>
@@ -80,6 +80,7 @@ <h3>Markup</h3>
 
   <script src="../build/highlight.js"></script>
   <script src="../demo/jquery-2.1.1.min.js"></script>
+  <script src="../demo/vue.js"></script>
 
   <script>
     hljs.debugMode();
@@ -97,10 +98,8 @@ <h3>Markup</h3>
         var start_time = +new Date();
         var result = hljs.getLanguage(language) ? hljs.highlight(language, source, true) : hljs.highlightAuto(source);
         var rendering_time = +new Date() - start_time;
-        editor.find('.hljs').html(result.value);
-        $(".hljs span").each((_,el) => {
-          $(el).attr("data-klass", el.className.replace("hljs-",""))
-        })
+        vue.code = source;
+
         var rendering_stats = result.language + ': relevance ' + (result.relevance );
         if (result.second_best) {
             rendering_stats += ', ' + result.second_best.language + ': ' + (result.second_best.relevance || result.second_best.r);
@@ -141,6 +140,20 @@ <h3>Markup</h3>
         $('.editor button').click();
       });
     }());
+
+    Vue.use(hljs.vuePlugin);
+    let vue = new Vue({
+      el: '#app',
+      data: { code: "" },
+      watch: { code: function(){
+        // update data-klass post-render for cool class previews
+        this.$nextTick(() => {
+          $(".hljs span").each((_,el) => {
+            $(el).attr("data-klass", el.className.replace("hljs-",""))
+          })
+        })
+      }}
+    })
   </script>
 </body>
 </html>

From 9a26a111cf75dd0ceb4a3ecc4b92d5683377c13a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 6 Aug 2020 11:34:43 -0400
Subject: [PATCH 016/223] (chore) add vuePlugin to index.d.ts

---
 types/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/index.d.ts b/types/index.d.ts
index 5bfe98a07c..c11675dc43 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -5,6 +5,10 @@ declare const hljs : HLJSApi;
 
 type HLJSApi = PublicApi & ModesAPI
 
+interface VuePlugin {
+    install: (vue: any) => void
+}
+
 interface PublicApi {
     highlight: (languageName: string, code: string, ignoreIllegals?: boolean, continuation?: Mode) => HighlightResult
     highlightAuto: (code: string, languageSubset?: string[]) => AutoHighlightResult
@@ -24,6 +28,7 @@ interface PublicApi {
     debugMode: () => void
     safeMode: () => void
     versionString: string
+    vuePlugin: () => VuePlugin
 }
 
 interface ModesAPI {

From 639da2c69ef8af7693eb3c1290cb43bbf745e64c Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Mon, 17 Aug 2020 18:20:39 +0200
Subject: [PATCH 017/223] (nsis) add NSIS v3.06 commands (#2653)

---
 CHANGES.md            | 2 ++
 src/languages/nsis.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c098bc8690..2e0d6ebd19 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Language Improvements:
 - fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
 - fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
 - enh(java) Add support for `enum`, which will identify as a `class` now (#2643) [ezksd][]
+- enh(nsis) Add support for NSIS 3.06 commands (#2653) [idleberg][]
 
 [Josh Goebel]: https://github.com/yyyc514
 [Andrew Janke]: https://github.com/apjanke
@@ -21,6 +22,7 @@ Language Improvements:
 [kageru]: https://github.com/kageru
 [night]: https://github.com/night
 [ezksd]: https://github.com/ezksd
+[idleberg]: https://github.com/idleberg
 
 
 ## Version 10.1.1
diff --git a/src/languages/nsis.js b/src/languages/nsis.js
index 1b1b7aa637..cddaaec249 100644
--- a/src/languages/nsis.js
+++ b/src/languages/nsis.js
@@ -82,7 +82,7 @@ export default function(hljs) {
     case_insensitive: false,
     keywords: {
       keyword:
-      'Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle',
+      'Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileWriteUTF16LE FileSeek FileWrite FileWriteByte FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetKnownFolderPath GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfRtlLanguage IfShellVarContextAll IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadAndSetImage LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestLongPathAware ManifestMaxVersionTested ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PEAddResource PEDllCharacteristics PERemoveResource PESubsysVer Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle',
       literal:
       'admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib'
     },

From fb0b19c8fe2a438e5bca35b40d845b92a8f69373 Mon Sep 17 00:00:00 2001
From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com>
Date: Thu, 20 Aug 2020 19:58:39 +0200
Subject: [PATCH 018/223] enh(csharp) add keywords `record` and `init` (C# 9.0)
 (#2660)

---
 CHANGES.md                            |  2 ++
 src/languages/csharp.js               | 12 +++++++++++-
 test/markup/csharp/records.expect.txt |  4 ++++
 test/markup/csharp/records.txt        |  4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/markup/csharp/records.expect.txt
 create mode 100644 test/markup/csharp/records.txt

diff --git a/CHANGES.md b/CHANGES.md
index 2e0d6ebd19..bf6ce1b550 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,12 +10,14 @@ Big picture:
 
 Language Improvements:
 
+- enh(csharp) Add `init` and `record` keywords for C# 9.0 (#2660) [Youssef Victor][]
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
 - fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
 - fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
 - enh(java) Add support for `enum`, which will identify as a `class` now (#2643) [ezksd][]
 - enh(nsis) Add support for NSIS 3.06 commands (#2653) [idleberg][]
 
+[Youssef Victor]: https://github.com/Youssef1313
 [Josh Goebel]: https://github.com/yyyc514
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index 8c20e37db9..ceef2a4921 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -13,7 +13,7 @@ export default function(hljs) {
       // Normal keywords.
       'abstract as base bool break byte case catch char checked const continue decimal ' +
       'default delegate do double enum event explicit extern finally fixed float ' +
-      'for foreach goto if implicit in int interface internal is lock long ' +
+      'for foreach goto if implicit in init int interface internal is lock long ' +
       'object operator out override params private protected public readonly ref sbyte ' +
       'sealed short sizeof stackalloc static string struct switch this try typeof ' +
       'uint ulong unchecked unsafe ushort using virtual void volatile while ' +
@@ -164,6 +164,16 @@ export default function(hljs) {
           hljs.C_BLOCK_COMMENT_MODE
         ]
       },
+      {
+        beginKeywords: 'record', end: /[{;=]/,
+        illegal: /[^\s:]/,
+        contains: [
+          TITLE_MODE,
+          GENERIC_MODIFIER,
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.C_BLOCK_COMMENT_MODE
+        ]
+      },
       {
         // [Attributes("")]
         className: 'meta',
diff --git a/test/markup/csharp/records.expect.txt b/test/markup/csharp/records.expect.txt
new file mode 100644
index 0000000000..d09db1aa21
--- /dev/null
+++ b/test/markup/csharp/records.expect.txt
@@ -0,0 +1,4 @@
+<span class="hljs-keyword">public</span> <span class="hljs-keyword">record</span> <span class="hljs-title">MyRecord</span>
+{
+    <span class="hljs-keyword">public</span> <span class="hljs-keyword">string</span> SomeMember { <span class="hljs-keyword">get</span>; <span class="hljs-keyword">set</span>; }
+}
diff --git a/test/markup/csharp/records.txt b/test/markup/csharp/records.txt
new file mode 100644
index 0000000000..86f5218745
--- /dev/null
+++ b/test/markup/csharp/records.txt
@@ -0,0 +1,4 @@
+public record MyRecord
+{
+    public string SomeMember { get; set; }
+}

From 82f470689ccc5c6cd853a4bcdd2e8546d0a2c964 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 21 Aug 2020 08:30:03 -0400
Subject: [PATCH 019/223] fix(js) prevent long series of ///// from freezing
 (#2657)

Resolves #2656.
---
 CHANGES.md                  | 1 +
 src/languages/javascript.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index bf6ce1b550..68737f117f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Big picture:
 
 Language Improvements:
 
+- fix(js) Prevent long series of /////// from causing freezes (#2656) [Josh Goebel][]
 - enh(csharp) Add `init` and `record` keywords for C# 9.0 (#2660) [Youssef Victor][]
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
 - fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index bc7a4a5349..66eeaba135 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -164,7 +164,7 @@ export default function(hljs) {
           regex.lookahead(regex.concat(
             // we also need to allow for multiple possible comments inbetween
             // the first key:value pairing
-            /(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,
+            /(((\/\/.*$)|(\/\*(.|\n)*\*\/))\s*)*/,
             IDENT_RE + '\\s*:'))),
         relevance: 0,
         contains: [

From ea62ab20db435ee3c2a8730a165925f2a6117de6 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Tue, 25 Aug 2020 15:14:35 -0600
Subject: [PATCH 020/223] fix(types): Allow users to not specify dom in their
 lib (#2663)

Closes #2648
---
 types/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/index.d.ts b/types/index.d.ts
index c11675dc43..ab38f736b1 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,3 +1,6 @@
+// For TS consumers who use Node and don't have dom in their tsconfig lib, import the necessary types here.
+/// <reference lib="dom" />
+
 /* Public API */
 
 // eslint-disable-next-line

From 2a65144dfe92bc2eca0af913b29be56a97e66eae Mon Sep 17 00:00:00 2001
From: eytienne <34628622+eytienne@users.noreply.github.com>
Date: Mon, 31 Aug 2020 06:22:32 +0200
Subject: [PATCH 021/223] enh(php) detect newer more flexible HEREdoc syntax 
 (#2658)

- separate tests along purpose + support of indented heredoc + heredoc as string variant
- share subst with double quoted string
---
 CHANGES.md                         |  2 ++
 src/languages/php.js               | 54 ++++++++++++++++++------------
 test/markup/php/heredoc.expect.txt | 14 --------
 test/markup/php/heredoc.txt        | 14 --------
 test/markup/php/strings.expect.txt | 23 +++++++++++++
 test/markup/php/strings.txt        | 23 +++++++++++++
 6 files changed, 80 insertions(+), 50 deletions(-)
 delete mode 100644 test/markup/php/heredoc.expect.txt
 delete mode 100644 test/markup/php/heredoc.txt
 create mode 100644 test/markup/php/strings.expect.txt
 create mode 100644 test/markup/php/strings.txt

diff --git a/CHANGES.md b/CHANGES.md
index 68737f117f..f1ce3f4c05 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Language Improvements:
 - fix(night) Prevent object prototypes method values from being returned in `getLanguage` (#2636) [night][]
 - enh(java) Add support for `enum`, which will identify as a `class` now (#2643) [ezksd][]
 - enh(nsis) Add support for NSIS 3.06 commands (#2653) [idleberg][]
+- enh(php) detect newer more flexible HEREdoc syntax (#2658) [eytienne][]
 
 [Youssef Victor]: https://github.com/Youssef1313
 [Josh Goebel]: https://github.com/yyyc514
@@ -26,6 +27,7 @@ Language Improvements:
 [night]: https://github.com/night
 [ezksd]: https://github.com/ezksd
 [idleberg]: https://github.com/idleberg
+[eytienne]: https://github.com/eytienne
 
 
 ## Version 10.1.1
diff --git a/src/languages/php.js b/src/languages/php.js
index 45471053da..8b4ed71896 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -6,6 +6,10 @@ Website: https://www.php.net
 Category: common
 */
 
+/**
+ * @param {HLJSApi} hljs
+ * @returns {LanguageDetail}
+ * */
 export default function(hljs) {
   var VARIABLE = {
     begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
@@ -18,18 +22,38 @@ export default function(hljs) {
       { begin: /\?>/ } // end php tag
     ]
   };
+  var SUBST = {
+    className: 'subst',
+    variants: [
+      { begin: /\$\w+/ },
+      { begin: /\{\$/, end: /\}/ }
+    ]
+  };
+  var SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, {
+    illegal: null,
+  });
+  var DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+    illegal: null,
+    contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+  });
+  var HEREDOC = hljs.END_SAME_AS_BEGIN({
+    begin: /<<<[ \t]*(\w+)\n/,
+    end: /[ \t]*(\w+)\b/,
+    contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+  });
   var STRING = {
     className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE, PREPROCESSOR],
     variants: [
-      {
-        begin: 'b"', end: '"'
-      },
-      {
-        begin: 'b\'', end: '\''
-      },
-      hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null})
+      hljs.inherit(SINGLE_QUOTED, {
+        begin: "b'", end: "'",
+      }),
+      hljs.inherit(DOUBLE_QUOTED, {
+        begin: 'b"', end: '"',
+      }),
+      DOUBLE_QUOTED,
+      SINGLE_QUOTED,
+      HEREDOC
     ]
   };
   var NUMBER = {variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]};
@@ -87,20 +111,6 @@ export default function(hljs) {
           keywords: '__halt_compiler'
         }
       ),
-      {
-        className: 'string',
-        begin: /<<<['"]?\w+['"]?$/, end: /^\w+;?$/,
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          {
-            className: 'subst',
-            variants: [
-              {begin: /\$\w+/},
-              {begin: /\{\$/, end: /\}/}
-            ]
-          }
-        ]
-      },
       PREPROCESSOR,
       {
         className: 'keyword', begin: /\$this\b/
diff --git a/test/markup/php/heredoc.expect.txt b/test/markup/php/heredoc.expect.txt
deleted file mode 100644
index 6b560eee69..0000000000
--- a/test/markup/php/heredoc.expect.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="hljs-keyword">echo</span> <span class="hljs-string">&lt;&lt;&lt;EOT
-String with <span class="hljs-subst">$var</span> and <span class="hljs-subst">{$foo-&gt;bar[1]}</span>.
-EOT;</span>
-
-<span class="hljs-keyword">echo</span> <span class="hljs-string">&lt;&lt;&lt;EOT
-  string
-  EOT
-  still string
-EOT;</span>
-
-<span class="hljs-keyword">array</span>(<span class="hljs-string">&lt;&lt;&lt;EOD
-foobar!
-EOD</span>
-);
diff --git a/test/markup/php/heredoc.txt b/test/markup/php/heredoc.txt
deleted file mode 100644
index 443d5fa8b7..0000000000
--- a/test/markup/php/heredoc.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-echo <<<EOT
-String with $var and {$foo->bar[1]}.
-EOT;
-
-echo <<<EOT
-  string
-  EOT
-  still string
-EOT;
-
-array(<<<EOD
-foobar!
-EOD
-);
diff --git a/test/markup/php/strings.expect.txt b/test/markup/php/strings.expect.txt
new file mode 100644
index 0000000000..520834d77f
--- /dev/null
+++ b/test/markup/php/strings.expect.txt
@@ -0,0 +1,23 @@
+<span class="hljs-meta">&lt;?php</span>
+
+<span class="hljs-comment">// variable substitution</span>
+
+<span class="hljs-keyword">echo</span> (<span class="hljs-string">&#x27;Hello {$person-&gt;name}! Welcome to $company!&#x27;</span>);
+
+<span class="hljs-keyword">echo</span> (<span class="hljs-string">&quot;Hello <span class="hljs-subst">{$person-&gt;name}</span>! Welcome to <span class="hljs-subst">$company</span>!&quot;</span>);
+
+<span class="hljs-keyword">echo</span> (<span class="hljs-string">&lt;&lt;&lt;MSG
+    Hello <span class="hljs-subst">{$person-&gt;name}</span>! Welcome to <span class="hljs-subst">$company</span>!
+MSG</span>);
+
+<span class="hljs-comment">// heredoc syntax</span>
+
+var_dump(<span class="hljs-string">&lt;&lt;&lt;SQL
+    SELECT *
+    FROM table
+SQL</span>);
+
+var_dump(<span class="hljs-string">&lt;&lt;&lt;SQL
+    SELECT *
+    FROM table
+    SQL</span>);
\ No newline at end of file
diff --git a/test/markup/php/strings.txt b/test/markup/php/strings.txt
new file mode 100644
index 0000000000..d539d549a8
--- /dev/null
+++ b/test/markup/php/strings.txt
@@ -0,0 +1,23 @@
+<?php
+
+// variable substitution
+
+echo ('Hello {$person->name}! Welcome to $company!');
+
+echo ("Hello {$person->name}! Welcome to $company!");
+
+echo (<<<MSG
+    Hello {$person->name}! Welcome to $company!
+MSG);
+
+// heredoc syntax
+
+var_dump(<<<SQL
+    SELECT *
+    FROM table
+SQL);
+
+var_dump(<<<SQL
+    SELECT *
+    FROM table
+    SQL);

From fc33aea76518928f791589f01371908949c332aa Mon Sep 17 00:00:00 2001
From: Peter Kinnaird <peter@peterkinnaird.eu>
Date: Tue, 1 Sep 2020 08:23:10 +0100
Subject: [PATCH 022/223] (chore) fix typo

---
 docs/language-requests.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/language-requests.rst b/docs/language-requests.rst
index c67ff676e5..07b8d8c98e 100644
--- a/docs/language-requests.rst
+++ b/docs/language-requests.rst
@@ -13,7 +13,7 @@ time to time in the highlight.js issue tracker and discussion group.
     Instead, the project works by encouraging 3rd party language grammars from
     contributors willing to help develop and maintain them. We're also happy to
     host those 3rd party language grammars at the ``highlightjs`` GitHub
-    organization - no matter how obscure or weird. Or you're wlecome to host it
+    organization - no matter how obscure or weird. Or you're welcome to host it
     yourself - we're still happy to link to it.
 
     This means that *there's no point in requesting a new language without also

From 3abf3a2c436615ecea05e76a0b12ed9a1bb52429 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sat, 5 Sep 2020 09:29:56 +1000
Subject: [PATCH 023/223] (docs) fix typo: higlighted -> highlighted (#2671)

There is a small typo in src/languages/autohotkey.js, src/languages/typescript.js.

Should read `highlighted` rather than `higlighted`.
---
 src/languages/autohotkey.js | 2 +-
 src/languages/typescript.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/autohotkey.js b/src/languages/autohotkey.js
index 94c5d19ad6..1efe3c6192 100644
--- a/src/languages/autohotkey.js
+++ b/src/languages/autohotkey.js
@@ -40,7 +40,7 @@ export default function(hljs) {
         //I don't really know if this is totally relevant
       },
       {
-        className: 'title', //symbol would be most accurate however is higlighted just like built_in and that makes up a lot of AutoHotkey code
+        className: 'title', //symbol would be most accurate however is highlighted just like built_in and that makes up a lot of AutoHotkey code
 		                        //meaning that it would fail to highlight anything
         variants: [
           {begin: '^[^\\n";]+::(?!=)'},
diff --git a/src/languages/typescript.js b/src/languages/typescript.js
index 537d243679..1bf54a0522 100644
--- a/src/languages/typescript.js
+++ b/src/languages/typescript.js
@@ -205,7 +205,7 @@ export default function(hljs) {
           PARAMS
         ]
       },
-      { // prevent references like module.id from being higlighted as module definitions
+      { // prevent references like module.id from being highlighted as module definitions
         begin: /module\./,
         keywords: { built_in: 'module' },
         relevance: 0

From 730f891cb841611de76f428af41c3c09fd1c5f17 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 4 Sep 2020 20:24:34 -0400
Subject: [PATCH 024/223] fix(parser) When ignoring a potential match
 highlighting can terminate early (#2650)

---
 CHANGES.md                 |  4 ++++
 src/highlight.js           | 25 +++++++++++++++++++++----
 src/lib/mode_compiler.js   |  4 ++++
 test/parser/index.js       |  4 +++-
 test/parser/resume-scan.js | 13 +++++++++++++
 5 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 test/parser/resume-scan.js

diff --git a/CHANGES.md b/CHANGES.md
index f1ce3f4c05..92a89ac686 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 ## Version 10.2.0 (next up)
 
+Parser Engine:
+
+- (fix) When ignoring a potential match highlighting can terminate early (#2649) [Josh Goebel][]
+
 New themes:
 
 - *Gradient Light* by [Samia Ali]()
diff --git a/src/highlight.js b/src/highlight.js
index 1034eafb7a..e28074a573 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -261,6 +261,14 @@ const HLJS = function(hljs) {
       }
     }
 
+    /**
+     * Advance a single character
+     */
+    function advanceOne() {
+      mode_buffer += codeToHighlight[index];
+      index += 1;
+    }
+
     /**
      * Handle matching but then ignoring a sequence of text
      *
@@ -275,7 +283,7 @@ const HLJS = function(hljs) {
       } else {
         // no need to move the cursor, we still have additional regexes to try and
         // match at this very spot
-        continueScanAtSamePosition = true;
+        resumeScanAtSamePosition = true;
         return 0;
       }
     }
@@ -478,23 +486,32 @@ const HLJS = function(hljs) {
     var relevance = 0;
     var index = 0;
     var iterations = 0;
-    var continueScanAtSamePosition = false;
+    var resumeScanAtSamePosition = false;
 
     try {
       top.matcher.considerAll();
 
       for (;;) {
         iterations++;
-        if (continueScanAtSamePosition) {
+        if (resumeScanAtSamePosition) {
           // only regexes not matched previously will now be
           // considered for a potential match
-          continueScanAtSamePosition = false;
+          resumeScanAtSamePosition = false;
         } else {
           top.matcher.lastIndex = index;
           top.matcher.considerAll();
         }
+
         const match = top.matcher.exec(codeToHighlight);
         // console.log("match", match[0], match.rule && match.rule.begin)
+
+        // if our failure to match was the result of a "resumed scan" then we
+        // need to advance one position and revert to full scanning before we
+        // decide there are truly no more matches at all to be had
+        if (!match && top.matcher.resumingScanAtSamePosition()) {
+          advanceOne();
+          continue;
+        }
         if (!match) break;
 
         const beforeMatch = codeToHighlight.substring(index, match.index);
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index 7608d6a156..56c0c20c82 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -142,6 +142,10 @@ export function compileLanguage(language) {
       return matcher;
     }
 
+    resumingScanAtSamePosition() {
+      return this.regexIndex != 0;
+    }
+
     considerAll() {
       this.regexIndex = 0;
     }
diff --git a/test/parser/index.js b/test/parser/index.js
index 1472a03191..8763b67b7a 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -1,7 +1,9 @@
 'use strict';
 
 describe('hljs', function() {
+  require('./look-ahead-end-matchers');
+  require('./resume-scan');
   require('./reuse-endsWithParent');
   require('./should-not-destroyData');
-  require('./look-ahead-end-matchers');
+
 });
diff --git a/test/parser/resume-scan.js b/test/parser/resume-scan.js
new file mode 100644
index 0000000000..9ed2bb9120
--- /dev/null
+++ b/test/parser/resume-scan.js
@@ -0,0 +1,13 @@
+const hljs = require('../../build');
+
+describe("bugs", function () {
+
+  describe("resume scan when a match is ignored", () => {
+    it("should continue to highlight later matches", () => {
+      hljs.highlight('java', 'ImmutablePair.of(Stuff.class, "bar")').value
+        .should.equal(
+          'ImmutablePair.of(Stuff.class, <span class="hljs-string">&quot;bar&quot;</span>)'
+      )
+    })
+  })
+})

From be8348c85854ea09077ad118cf1b11b36b5fba35 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 4 Sep 2020 20:43:18 -0400
Subject: [PATCH 025/223] chore(parser) use correct `requireLanguage` API for
 cpp and c languages

---
 src/languages/c.js   | 4 +---
 src/languages/cpp.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/languages/c.js b/src/languages/c.js
index 70f0afc9ba..d2eb8223f2 100644
--- a/src/languages/c.js
+++ b/src/languages/c.js
@@ -7,8 +7,7 @@ Requires: c-like.js
 
 /** @type LanguageFn */
 export default function(hljs) {
-
-  var lang = hljs.getLanguage('c-like').rawDefinition();
+  var lang = hljs.requireLanguage('c-like').rawDefinition();
   // Until C is actually different than C++ there is no reason to auto-detect C
   // as it's own language since it would just fail auto-detect testing or
   // simply match with C++.
@@ -19,5 +18,4 @@ export default function(hljs) {
   lang.name = 'C';
   lang.aliases = ['c', 'h'];
   return lang;
-
 }
diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index 2f2bd748b6..7c9f940031 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -7,7 +7,7 @@ Requires: c-like.js
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var lang = hljs.getLanguage('c-like').rawDefinition();
+  var lang = hljs.requireLanguage('c-like').rawDefinition();
   // return auto-detection back on
   lang.disableAutodetect = false;
   lang.name = 'C++';

From 621ba9de596ceed07c9970c81e8de52db873a577 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 4 Sep 2020 21:40:31 -0400
Subject: [PATCH 026/223] chore(parser) deprecate `fixMarkup` and add console
 warning

---
 CHANGES.md       |  4 ++++
 src/highlight.js | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 92a89ac686..12471fab3d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,10 @@ New themes:
 
 - *Gradient Light* by [Samia Ali]()
 
+Deprecations:
+
+- `fixMarkup` is now deprecated and will be removed in v11.0. (#2534) [Josh Goebel][]
+
 Big picture:
 
 - Add simple Vue plugin for basic use cases (#2544) [Josh Goebel][]
diff --git a/src/highlight.js b/src/highlight.js
index e28074a573..53026738c6 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -848,12 +848,19 @@ const HLJS = function(hljs) {
     });
   }
 
-  /* Interface definition */
+  /* fixMarkup is deprecated and will be removed entirely in v11 */
+  function deprecate_fixMarkup(arg) {
+    console.warn("fixMarkup is deprecated and will be removed entirely in v11.0")
+    console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534")
+
+    return fixMarkup(arg)
+  }
 
+  /* Interface definition */
   Object.assign(hljs, {
     highlight,
     highlightAuto,
-    fixMarkup,
+    fixMarkup: deprecate_fixMarkup,
     highlightBlock,
     configure,
     initHighlighting,

From 01f049b66344a67f739477820bb9a742aefb68b4 Mon Sep 17 00:00:00 2001
From: Stephen Rosen <1300022+sirosen@users.noreply.github.com>
Date: Fri, 4 Sep 2020 22:23:59 -0400
Subject: [PATCH 027/223] enh(bash) Less false positives for keywords in
 arguments (#2669)

In bash, option, param, and command names may contain builtins as
hyphen-delimited components. As in `foo --set-bar`.  (where `set`
is a keyword and therefore incorrectly highlighted)

In order to handle this, just add `-` to the pattern's set of word
characters. Includes a new test for bash tokens containing keywords,
which checks hyphens and underscores for a few common cases.
---
 CHANGES.md                                           |  2 ++
 src/languages/bash.js                                |  2 +-
 test/markup/bash/token-containing-keyword.expect.txt | 10 ++++++++++
 test/markup/bash/token-containing-keyword.txt        | 10 ++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 test/markup/bash/token-containing-keyword.expect.txt
 create mode 100644 test/markup/bash/token-containing-keyword.txt

diff --git a/CHANGES.md b/CHANGES.md
index 12471fab3d..c9d294a82f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Big picture:
 
 Language Improvements:
 
+- fix(bash) Fewer false positives for keywords in arguments (#2669) [sirosen][]
 - fix(js) Prevent long series of /////// from causing freezes (#2656) [Josh Goebel][]
 - enh(csharp) Add `init` and `record` keywords for C# 9.0 (#2660) [Youssef Victor][]
 - enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
@@ -36,6 +37,7 @@ Language Improvements:
 [ezksd]: https://github.com/ezksd
 [idleberg]: https://github.com/idleberg
 [eytienne]: https://github.com/eytienne
+[sirosen]: https://github.com/sirosen
 
 
 ## Version 10.1.1
diff --git a/src/languages/bash.js b/src/languages/bash.js
index e199f4f448..428c21aa98 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -83,7 +83,7 @@ export default function(hljs) {
     name: 'Bash',
     aliases: ['sh', 'zsh'],
     keywords: {
-      $pattern: /\b-?[a-z\._]+\b/,
+      $pattern: /\b-?[a-z\._-]+\b/,
       keyword:
         'if then else elif fi for while in do done case esac function',
       literal:
diff --git a/test/markup/bash/token-containing-keyword.expect.txt b/test/markup/bash/token-containing-keyword.expect.txt
new file mode 100644
index 0000000000..90f9d8df2f
--- /dev/null
+++ b/test/markup/bash/token-containing-keyword.expect.txt
@@ -0,0 +1,10 @@
+<span class="hljs-comment"># a keyword as part of an option</span>
+mycmd --disable-foo
+
+<span class="hljs-comment"># a keyword as part of a parameter</span>
+some-cmd set-some-setting
+some-cmd set_some_setting
+
+<span class="hljs-comment"># a keyword as part of command</span>
+check-case foo
+check_case foo
diff --git a/test/markup/bash/token-containing-keyword.txt b/test/markup/bash/token-containing-keyword.txt
new file mode 100644
index 0000000000..9b956bc040
--- /dev/null
+++ b/test/markup/bash/token-containing-keyword.txt
@@ -0,0 +1,10 @@
+# a keyword as part of an option
+mycmd --disable-foo
+
+# a keyword as part of a parameter
+some-cmd set-some-setting
+some-cmd set_some_setting
+
+# a keyword as part of command
+check-case foo
+check_case foo

From f3f29acffc4a828603ec4717ba903d826d0d9fa9 Mon Sep 17 00:00:00 2001
From: Egor Rogov <e.rogov@postgrespro.ru>
Date: Sun, 6 Sep 2020 02:03:31 +0300
Subject: [PATCH 028/223] fix(tooling) developer.html does not render
 highlighted language properly (#2672)

* Fix inconsistency in developer.html

Co-authored-by: Josh Goebel <me@joshgoebel.com>
---
 tools/developer.html | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/tools/developer.html b/tools/developer.html
index 6355cf2919..86e9e63f8f 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -70,7 +70,7 @@ <h3>Code</h3>
     </div>
     <div>
       <h3>Rendered in <span class="rendering_time">...</span> ms [<span class="rendering_stats">...</span>]</h3>
-      <highlightjs auto :code="code" />
+      <highlightjs :language="language" :code="code" />
     </div>
     <div>
       <h3>Markup</h3>
@@ -99,6 +99,7 @@ <h3>Markup</h3>
         var result = hljs.getLanguage(language) ? hljs.highlight(language, source, true) : hljs.highlightAuto(source);
         var rendering_time = +new Date() - start_time;
         vue.code = source;
+        vue.language = hljs.getLanguage(language) ? language : '';
 
         var rendering_stats = result.language + ': relevance ' + (result.relevance );
         if (result.second_best) {
@@ -144,15 +145,25 @@ <h3>Markup</h3>
     Vue.use(hljs.vuePlugin);
     let vue = new Vue({
       el: '#app',
-      data: { code: "" },
-      watch: { code: function(){
-        // update data-klass post-render for cool class previews
-        this.$nextTick(() => {
-          $(".hljs span").each((_,el) => {
-            $(el).attr("data-klass", el.className.replace("hljs-",""))
+      data: { code: "", language: "" },
+      methods: {
+        refreshKlass: function() {
+          // update data-klass post-render for cool class previews
+          this.$nextTick(() => {
+            $(".hljs span").each((_,el) => {
+              $(el).attr("data-klass", el.className.replace("hljs-",""))
+            })
           })
-        })
-      }}
+        }
+      },
+      watch: {
+        code: function(){
+          this.refreshKlass();
+        },
+        language: function(){
+          this.refreshKlass();
+        }
+      }
     })
   </script>
 </body>

From 2c9323346c634570f8307bd92ec40484e2315f98 Mon Sep 17 00:00:00 2001
From: depombo <lfdepombo@gmail.com>
Date: Mon, 7 Sep 2020 13:02:34 -0700
Subject: [PATCH 029/223] (docs) add ln/Alan programming language to supported
 list (#2675)

* add syntax highlighter for ln/alan programming language


Co-authored-by: David Ellis <isv.damocles@gmail.com>
---
 SUPPORTED_LANGUAGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 468730cb26..0d2fd820dc 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -16,7 +16,8 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | ARM assembler           | armasm, arm            |         |
 | AVR assembler           | avrasm                 |         |
 | ActionScript            | actionscript, as       |         |
-| Alan                    | alan, i                | [highlightjs-alan](https://github.com/highlightjs/highlightjs-alan) |
+| Alan IF                 | alan, i                | [highlightjs-alan](https://github.com/highlightjs/highlightjs-alan) |
+| Alan                    | ln                     | [highlightjs-alan](https://github.com/alantech/highlightjs-alan) |
 | AngelScript             | angelscript, asc       |         |
 | Apache                  | apache, apacheconf     |         |
 | AppleScript             | applescript, osascript |         |

From f000229a7f8b7750d169ec6bc9c4362cf2aca395 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 7 Sep 2020 16:16:53 -0400
Subject: [PATCH 030/223] bump 10.2.0

---
 CHANGES.md        | 2 +-
 docs/conf.py      | 4 ++--
 package-lock.json | 2 +-
 package.json      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c9d294a82f..64af1e904b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-## Version 10.2.0 (next up)
+## Version 10.2.0
 
 Parser Engine:
 
diff --git a/docs/conf.py b/docs/conf.py
index 08dad766f9..71554e24c0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '10.1'
+version = '10.2'
 # The full version, including alpha/beta/rc tags.
-release = '10.1.1'
+release = '10.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package-lock.json b/package-lock.json
index 9bddb911e7..62247fd227 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.1.1",
+  "version": "10.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 408bd412ce..0c16c5ab73 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.1.1",
+  "version": "10.2.0",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"

From da7d149b0415e34aac5d740373174616ce0fefa3 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 7 Sep 2020 16:19:06 -0400
Subject: [PATCH 031/223] bump modules for security fixes

---
 package-lock.json | 306 ++++++++++++++++++++++++++++++++++------------
 package.json      |   2 +-
 2 files changed, 230 insertions(+), 78 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 62247fd227..48da9c73fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -390,9 +390,9 @@
       }
     },
     "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
     "brace-expansion": {
@@ -479,9 +479,9 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-      "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -491,7 +491,7 @@
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.3.0"
+        "readdirp": "~3.4.0"
       },
       "dependencies": {
         "glob-parent": {
@@ -1546,12 +1546,12 @@
       }
     },
     "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "requires": {
-        "locate-path": "^5.0.0",
+        "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
       },
       "dependencies": {
@@ -2053,6 +2053,12 @@
       "integrity": "sha512-CKstxrctq1kUesU6WhtZDbYKzzYBuRH0UYInAVrkc/EYdB9ltbfE0gOoayG9nhohG6447sOOVGhHqsdmBvkbNg==",
       "dev": true
     },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
     "is-potential-custom-element-name": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
@@ -2299,12 +2305,12 @@
       }
     },
     "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "requires": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^5.0.0"
       }
     },
     "lodash": {
@@ -2320,12 +2326,49 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2"
+        "chalk": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
     "lru-cache": {
@@ -2399,28 +2442,28 @@
       }
     },
     "mocha": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz",
-      "integrity": "sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg==",
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz",
+      "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==",
       "dev": true,
       "requires": {
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.3.1",
-        "debug": "3.2.6",
+        "chokidar": "3.4.2",
+        "debug": "4.1.1",
         "diff": "4.0.2",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "4.1.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
         "glob": "7.1.6",
         "growl": "1.10.5",
         "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "3.0.0",
+        "js-yaml": "3.14.0",
+        "log-symbols": "4.0.0",
         "minimatch": "3.0.4",
         "ms": "2.1.2",
         "object.assign": "4.1.0",
         "promise.allsettled": "1.0.2",
-        "serialize-javascript": "3.0.0",
+        "serialize-javascript": "4.0.0",
         "strip-json-comments": "3.0.1",
         "supports-color": "7.1.0",
         "which": "2.0.2",
@@ -2428,30 +2471,23 @@
         "workerpool": "6.0.0",
         "yargs": "13.3.2",
         "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
+        "yargs-unparser": "1.6.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
         },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+        "js-yaml": {
+          "version": "3.14.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+          "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
         "ms": {
@@ -2465,15 +2501,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
           "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
           "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
@@ -2632,21 +2659,21 @@
       }
     },
     "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
       "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
     },
     "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^3.0.2"
       }
     },
     "p-map": {
@@ -2845,6 +2872,15 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -2923,12 +2959,20 @@
       }
     },
     "readdirp": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-      "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
       "dev": true,
       "requires": {
-        "picomatch": "^2.0.7"
+        "picomatch": "^2.2.1"
+      },
+      "dependencies": {
+        "picomatch": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+          "dev": true
+        }
       }
     },
     "regexpp": {
@@ -3161,10 +3205,13 @@
       "dev": true
     },
     "serialize-javascript": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
-      "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -4130,6 +4177,15 @@
             "path-exists": "^3.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -4172,14 +4228,110 @@
       }
     },
     "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz",
+      "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==",
       "dev": true,
       "requires": {
+        "camelcase": "^5.3.1",
+        "decamelize": "^1.2.0",
         "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "is-plain-obj": "^1.1.0",
+        "yargs": "^14.2.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "yargs": {
+          "version": "14.2.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^15.0.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "15.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
+          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
       }
     }
   }
diff --git a/package.json b/package.json
index 0c16c5ab73..9881a2e198 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "js-beautify": "^1.11.0",
     "jsdom": "^16.2.2",
     "lodash": "^4.17.19",
-    "mocha": "^8.0.1",
+    "mocha": "^8.1.3",
     "rollup": "^2.0.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",

From d7b1edeac5cdbc3ffe60544a671bbd6561e27f7a Mon Sep 17 00:00:00 2001
From: David Pine <david.pine@microsoft.com>
Date: Thu, 10 Sep 2020 14:03:44 -0500
Subject: [PATCH 032/223] enh(csharp) Add all v9 keywords, and other missing
 keywords (#2679)

* Added C# 9 keywords, and other missing keywords.

- Improved organization, and added built-ins
---
 AUTHORS.txt                                   |   1 +
 CHANGES.md                                    |  10 +-
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 src/languages/csharp.js                       | 140 ++++++++++++++++--
 test/markup/csharp/floats.expect.txt          |   8 +-
 test/markup/csharp/functions.expect.txt       |   4 +-
 .../csharp/generic_modifiers.expect.txt       |   4 +-
 test/markup/csharp/records.expect.txt         |   4 +-
 test/markup/csharp/records.txt                |   4 +-
 test/markup/csharp/titles.expect.txt          |   4 +-
 11 files changed, 154 insertions(+), 29 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 131f873ad8..a1833dec06 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -288,3 +288,4 @@ Contributors:
 - Alexandre Grison <a.grison@gmail.com>
 - Jim Mason <jmason@ibinx.com>
 - lioshi <lioshi@lioshi.com>
+- David Pine <david.pine.7@gmail.com>
\ No newline at end of file
diff --git a/CHANGES.md b/CHANGES.md
index 64af1e904b..358e457d8b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+## Version 10.3.0 (next up)
+
+Language Improvements:
+
+- Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
+
+[David Pine]: https://github.com/IEvangelist
+
 ## Version 10.2.0
 
 Parser Engine:
@@ -1397,7 +1405,7 @@ New languages:
 - *Protocol Buffers* by [Dan Tao][]
 - *Nix* by [Domen Kožar][]
 - *x86asm* by [innocenat][]
-- *Cap’n Proto* and *Thrift* by [Oleg Efimov][]
+- *Cap'n Proto* and *Thrift* by [Oleg Efimov][]
 - *Monkey* by [Arthur Bikmullin][]
 - *TypeScript* by [Panu Horsmalahti][]
 - *Nimrod* by [Flaviu Tamas][]
diff --git a/package-lock.json b/package-lock.json
index 48da9c73fc..ff8814b9f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9881a2e198..d769ce065d 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index ceef2a4921..a4d3cab878 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -1,27 +1,139 @@
 /*
 Language: C#
 Author: Jason Diamond <jason@diamond.name>
-Contributor: Nicolas LLOBERA <nllobera@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>
+Contributor: Nicolas LLOBERA <nllobera@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>, David Pine <david.pine@microsoft.com>
 Website: https://docs.microsoft.com/en-us/dotnet/csharp/
 Category: common
 */
 
 /** @type LanguageFn */
 export default function(hljs) {
+  var BUILT_IN_KEYWORDS = [
+      'bool',
+      'byte',
+      'char',
+      'decimal',
+      'delegate',
+      'double',
+      'dynamic',
+      'enum',
+      'float',
+      'int',
+      'long',
+      'nint',
+      'nuint',
+      'object',
+      'sbyte',
+      'short',
+      'string',
+      'ulong',
+      'unit',
+      'ushort'
+  ];
+  var LITERAL_KEYWORDS = [
+      'default',
+      'false',
+      'null',
+      'true'
+  ];
+  var NORMAL_KEYWORDS = [
+    'abstract',
+    'as',
+    'base',
+    'break',
+    'case',
+    'class',
+    'const',
+    'continue',
+    'do',
+    'else',
+    'event',
+    'explicit',
+    'extern',
+    'finally',
+    'fixed',
+    'for',
+    'foreach',
+    'goto',
+    'if',
+    'implicit',
+    'in',
+    'interface',
+    'internal',
+    'is',
+    'lock',
+    'namespace',
+    'new',
+    'operator',
+    'out',
+    'override',
+    'params',
+    'private',
+    'protected',
+    'public',
+    'readonly',
+    'record',
+    'ref',
+    'return',
+    'sealed',
+    'sizeof',
+    'stackalloc',
+    'static',
+    'struct',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'unchecked',
+    'unsafe',
+    'using',
+    'virtual',
+    'void',
+    'volatile',
+    'while'
+  ];
+  var CONTEXTUAL_KEYWORDS = [
+    'add',
+    'alias',
+    'and',
+    'ascending',
+    'async',
+    'await',
+    'by',
+    'descending',
+    'equals',
+    'from',
+    'get',
+    'global',
+    'group',
+    'init',
+    'into',
+    'join',
+    'let',
+    'nameof',
+    'not',
+    'notnull',
+    'on',
+    'or',
+    'orderby',
+    'partial',
+    'remove',
+    'select',
+    'set',
+    'unmanaged',
+    'value',
+    'var',
+    'when',
+    'where',
+    'with',
+    'yield'
+  ];
+
   var KEYWORDS = {
-    keyword:
-      // Normal keywords.
-      'abstract as base bool break byte case catch char checked const continue decimal ' +
-      'default delegate do double enum event explicit extern finally fixed float ' +
-      'for foreach goto if implicit in init int interface internal is lock long ' +
-      'object operator out override params private protected public readonly ref sbyte ' +
-      'sealed short sizeof stackalloc static string struct switch this try typeof ' +
-      'uint ulong unchecked unsafe ushort using virtual void volatile while ' +
-      // Contextual keywords.
-      'add alias ascending async await by descending dynamic equals from get global group into join ' +
-      'let nameof on orderby partial remove select set value var when where yield',
-    literal:
-      'null false true'
+    keyword: NORMAL_KEYWORDS.concat(CONTEXTUAL_KEYWORDS).join(' '),
+    built_in: BUILT_IN_KEYWORDS.join(' '),
+    literal: LITERAL_KEYWORDS.join(' ')
   };
   var TITLE_MODE = hljs.inherit(hljs.TITLE_MODE, {begin: '[a-zA-Z](\\.?\\w)*'});
   var NUMBERS = {
diff --git a/test/markup/csharp/floats.expect.txt b/test/markup/csharp/floats.expect.txt
index 7935858550..d6440e522c 100644
--- a/test/markup/csharp/floats.expect.txt
+++ b/test/markup/csharp/floats.expect.txt
@@ -1,4 +1,4 @@
-<span class="hljs-keyword">float</span> test = <span class="hljs-number">1.0f</span>;
-<span class="hljs-keyword">float</span> test2 = <span class="hljs-number">1.f</span>;
-<span class="hljs-keyword">float</span> test3 = <span class="hljs-number">1.0</span>;
-<span class="hljs-keyword">float</span> test4 = <span class="hljs-number">1</span>;
\ No newline at end of file
+<span class="hljs-built_in">float</span> test = <span class="hljs-number">1.0f</span>;
+<span class="hljs-built_in">float</span> test2 = <span class="hljs-number">1.f</span>;
+<span class="hljs-built_in">float</span> test3 = <span class="hljs-number">1.0</span>;
+<span class="hljs-built_in">float</span> test4 = <span class="hljs-number">1</span>;
\ No newline at end of file
diff --git a/test/markup/csharp/functions.expect.txt b/test/markup/csharp/functions.expect.txt
index 0451c638dd..f3c7cba65f 100644
--- a/test/markup/csharp/functions.expect.txt
+++ b/test/markup/csharp/functions.expect.txt
@@ -10,7 +10,7 @@
 <span class="hljs-function"><span class="hljs-keyword">void</span> <span class="hljs-title">ExampleFunctionDeclaration2</span>(<span class="hljs-params"></span>)</span>
 ;
 
-<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">string</span> <span class="hljs-title">ExampleExpressionBodiedFunction1</span>(<span class="hljs-params"></span>)</span> =&gt; <span class="hljs-string">&quot;dummy&quot;</span>;
+<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-built_in">string</span> <span class="hljs-title">ExampleExpressionBodiedFunction1</span>(<span class="hljs-params"></span>)</span> =&gt; <span class="hljs-string">&quot;dummy&quot;</span>;
 
-<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">string</span> <span class="hljs-title">ExampleExpressionBodiedFunction2</span>(<span class="hljs-params"></span>)</span>
+<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-built_in">string</span> <span class="hljs-title">ExampleExpressionBodiedFunction2</span>(<span class="hljs-params"></span>)</span>
     =&gt; <span class="hljs-string">&quot;dummy&quot;</span>;
\ No newline at end of file
diff --git a/test/markup/csharp/generic_modifiers.expect.txt b/test/markup/csharp/generic_modifiers.expect.txt
index 6e0a0ef4dc..04d3a96b09 100644
--- a/test/markup/csharp/generic_modifiers.expect.txt
+++ b/test/markup/csharp/generic_modifiers.expect.txt
@@ -4,9 +4,9 @@
 <span class="hljs-keyword">interface</span> <span class="hljs-title">IObservable</span>&lt;<span class="hljs-keyword">out</span> <span class="hljs-title">T</span>&gt;;
 {}
 
-<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">delegate</span> <span class="hljs-keyword">void</span> <span class="hljs-title">DContravariant</span>&lt;<span class="hljs-keyword">in</span> <span class="hljs-title">A</span>&gt;(<span class="hljs-params">A argument</span>)</span>;
+<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-built_in">delegate</span> <span class="hljs-keyword">void</span> <span class="hljs-title">DContravariant</span>&lt;<span class="hljs-keyword">in</span> <span class="hljs-title">A</span>&gt;(<span class="hljs-params">A argument</span>)</span>;
 
-<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">delegate</span> A <span class="hljs-title">DCovariant</span>&lt;<span class="hljs-keyword">out</span> <span class="hljs-title">A</span>&gt;(<span class="hljs-params"></span>)</span>;
+<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-built_in">delegate</span> A <span class="hljs-title">DCovariant</span>&lt;<span class="hljs-keyword">out</span> <span class="hljs-title">A</span>&gt;(<span class="hljs-params"></span>)</span>;
 
 <span class="hljs-function"><span class="hljs-keyword">void</span> <span class="hljs-title">MethodWithGenericParameter</span>&lt;<span class="hljs-title">T</span>&gt;(<span class="hljs-params"></span>)
 </span>
\ No newline at end of file
diff --git a/test/markup/csharp/records.expect.txt b/test/markup/csharp/records.expect.txt
index d09db1aa21..0ee20d84b4 100644
--- a/test/markup/csharp/records.expect.txt
+++ b/test/markup/csharp/records.expect.txt
@@ -1,4 +1,6 @@
 <span class="hljs-keyword">public</span> <span class="hljs-keyword">record</span> <span class="hljs-title">MyRecord</span>
 {
-    <span class="hljs-keyword">public</span> <span class="hljs-keyword">string</span> SomeMember { <span class="hljs-keyword">get</span>; <span class="hljs-keyword">set</span>; }
+    <span class="hljs-keyword">public</span> <span class="hljs-built_in">string</span> SomeMember { <span class="hljs-keyword">get</span>; <span class="hljs-keyword">init</span>; }
 }
+
+<span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">record</span> <span class="hljs-title">Person</span>(<span class="hljs-params"><span class="hljs-built_in">string</span> FirstName, <span class="hljs-built_in">string</span>? MiddleName, <span class="hljs-built_in">string</span> LastName</span>)</span>;
\ No newline at end of file
diff --git a/test/markup/csharp/records.txt b/test/markup/csharp/records.txt
index 86f5218745..304c11d0ed 100644
--- a/test/markup/csharp/records.txt
+++ b/test/markup/csharp/records.txt
@@ -1,4 +1,6 @@
 public record MyRecord
 {
-    public string SomeMember { get; set; }
+    public string SomeMember { get; init; }
 }
+
+public record Person(string FirstName, string? MiddleName, string LastName);
\ No newline at end of file
diff --git a/test/markup/csharp/titles.expect.txt b/test/markup/csharp/titles.expect.txt
index 46fa652d17..502ba2d76f 100644
--- a/test/markup/csharp/titles.expect.txt
+++ b/test/markup/csharp/titles.expect.txt
@@ -2,12 +2,12 @@
 {
     <span class="hljs-keyword">public</span> <span class="hljs-keyword">class</span> <span class="hljs-title">Greet</span> : <span class="hljs-title">Base</span>, <span class="hljs-title">Other</span>, <span class="hljs-title">IInterface.test.path</span> <span class="hljs-comment">// class</span>
     {
-        <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-title">Greet</span>(<span class="hljs-params"><span class="hljs-keyword">string</span> who</span>) <span class="hljs-comment">// function</span></span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-title">Greet</span>(<span class="hljs-params"><span class="hljs-built_in">string</span> who</span>) <span class="hljs-comment">// function</span></span>
         {
             Who = who;
         }
 
-        <span class="hljs-function"><span class="hljs-keyword">int</span>[] <span class="hljs-title">f</span>(<span class="hljs-params"><span class="hljs-keyword">int</span> val = <span class="hljs-number">0</span></span>)</span>
+        <span class="hljs-function"><span class="hljs-built_in">int</span>[] <span class="hljs-title">f</span>(<span class="hljs-params"><span class="hljs-built_in">int</span> val = <span class="hljs-number">0</span></span>)</span>
         {
             <span class="hljs-keyword">new</span> Type();
             <span class="hljs-keyword">return</span> getType();

From 9d194506592cfe61490a385bf9412e5937334c8b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 11 Sep 2020 07:08:10 -0400
Subject: [PATCH 033/223] chore(bash) Remove relevance boost that never worked

- This never worked and hasn't proven necessary.
- If we were to add it back in the future it'd likely be
  better done with custom modes.

Closes #2673.
---
 src/languages/bash.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/languages/bash.js b/src/languages/bash.js
index 428c21aa98..3cab99715c 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -83,7 +83,7 @@ export default function(hljs) {
     name: 'Bash',
     aliases: ['sh', 'zsh'],
     keywords: {
-      $pattern: /\b-?[a-z\._-]+\b/,
+      $pattern: /\b[a-z._-]+\b/,
       keyword:
         'if then else elif fi for while in do done case esac function',
       literal:
@@ -104,9 +104,7 @@ export default function(hljs) {
         'fc fg float functions getcap getln history integer jobs kill limit log noglob popd print ' +
         'pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit ' +
         'unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof ' +
-        'zpty zregexparse zsocket zstyle ztcp',
-      _:
-        '-ne -eq -lt -gt -f -d -e -s -l -a' // relevance booster
+        'zpty zregexparse zsocket zstyle ztcp'
     },
     contains: [
       KNOWN_SHEBANG, // to catch known shells and boost relevancy

From df19138499818d9c7c631b88f1ca1bcab99645af Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 11 Sep 2020 07:23:51 -0400
Subject: [PATCH 034/223] chore(objectivec) Add `objective-c++` and `obj-c++`
 aliases

Closes #2652.
---
 SUPPORTED_LANGUAGES.md      | 2 +-
 src/languages/objectivec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 0d2fd820dc..74f6259bb7 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -127,7 +127,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Nix                     | nix                    |         |
 | Object Constraint Language | ocl                 | [highlightjs-ocl](https://github.com/nhomble/highlightjs-ocl)        |
 | OCaml                   | ocaml, ml              |         |
-| Objective C             | objectivec, mm, objc, obj-c |    |
+| Objective C             | objectivec, mm, objc, obj-c, obj-c++, objective-c++ |    |
 | OpenGL Shading Language | glsl                   |         |
 | OpenSCAD                | openscad, scad         |         |
 | Oracle Rules Language   | ruleslanguage          |         |
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index 5bd98d1bf3..004f8f16e6 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -48,7 +48,7 @@ export default function(hljs) {
   };
   return {
     name: 'Objective-C',
-    aliases: ['mm', 'objc', 'obj-c'],
+    aliases: ['mm', 'objc', 'obj-c', 'obj-c++', 'objective-c++'],
     keywords: OBJC_KEYWORDS,
     illegal: '</',
     contains: [

From 36392c38acf8a65d105c77b15ec43be3f10897a2 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 11 Sep 2020 08:20:18 -0400
Subject: [PATCH 035/223] chore(docs) oops, forgot to add to prior commit

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 358e457d8b..a779fdecc3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,8 +3,10 @@
 Language Improvements:
 
 - Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
+- Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
 
 [David Pine]: https://github.com/IEvangelist
+[Josh Goebel]: https://github.com/yyyc514
 
 ## Version 10.2.0
 

From 889be9507f9fd06d6a8c8835418569b37d0be932 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 11 Sep 2020 09:47:40 -0400
Subject: [PATCH 036/223] chore(tests) allow running of individual tests again

---
 .mocharc.json | 3 +++
 package.json  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 .mocharc.json

diff --git a/.mocharc.json b/.mocharc.json
new file mode 100644
index 0000000000..ef2f5d36c8
--- /dev/null
+++ b/.mocharc.json
@@ -0,0 +1,3 @@
+{
+    "require": "should"
+}
diff --git a/package.json b/package.json
index d769ce065d..90233e270f 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
     "build": "node ./tools/build.js -t node",
     "build-cdn": "node ./tools/build.js -t cdn",
     "build-browser": "node ./tools/build.js -t browser :common",
-    "test": "mocha --globals document test",
-    "test-markup": "mocha --globals document test/markup",
-    "test-detect": "mocha --globals document test/detect",
-    "test-browser": "mocha --globals document test/browser"
+    "test": "mocha test",
+    "test-markup": "mocha test/markup",
+    "test-detect": "mocha test/detect",
+    "test-browser": "mocha test/browser"
   },
   "engines": {
     "node": "*"

From 913f0e55435d56daf5bfbb6888ac9c371ec31cdc Mon Sep 17 00:00:00 2001
From: ryanjonasson <47223209+ryanjonasson@users.noreply.github.com>
Date: Fri, 11 Sep 2020 11:00:11 -0500
Subject: [PATCH 037/223] enh(axapta) Update X++ keyword list (#2688)

* Upate Axapta keyword list
* Refactor to one line per keyword
* Break out keywords into descriptive groups
* Update language description
* Update SUPPORTED_LANGUAGES.md
---
 CHANGES.md              |   2 +
 SUPPORTED_LANGUAGES.md  |   2 +-
 src/languages/axapta.js | 149 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 144 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a779fdecc3..7f0ca1dc64 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,9 +4,11 @@ Language Improvements:
 
 - Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
 - Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
+- Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/yyyc514
+[Ryan Jonasson]: https://github.com/ryanjonasson
 
 ## Version 10.2.0
 
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 74f6259bb7..5c9caea03e 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -27,7 +27,6 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | AutoHotkey              | autohotkey             |         |
 | AutoIt                  | autoit                 |         |
 | Awk                     | awk, mawk, nawk, gawk  |         |
-| Axapta                  | axapta                 |         |
 | Bash                    | bash, sh, zsh          |         |
 | Basic                   | basic                  |         |
 | BNF                     | bnf                    |         |
@@ -197,6 +196,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Vala                    | vala                   |         |
 | Verilog                 | verilog, v             |         |
 | Vim Script              | vim                    |         |
+| X++                     | axapta, x++            |         |
 | x86 Assembly            | x86asm                 |         |
 | XL                      | xl, tao                |         |
 | XQuery                  | xquery, xpath, xq      |         |
diff --git a/src/languages/axapta.js b/src/languages/axapta.js
index e91207963b..61511b39f0 100644
--- a/src/languages/axapta.js
+++ b/src/languages/axapta.js
@@ -1,5 +1,6 @@
 /*
-Language: Microsoft Axapta (now Dynamics 365)
+Language: Microsoft X++
+Description: X++ is a language used in Microsoft Dynamics 365, Dynamics AX, and Axapta.
 Author: Dmitri Roudakov <dmitri@roudakov.ru>
 Website: https://dynamics.microsoft.com/en-us/ax-overview/
 Category: enterprise
@@ -7,14 +8,146 @@ Category: enterprise
 
 /** @type LanguageFn */
 export default function(hljs) {
+  const BUILT_IN_KEYWORDS = [
+    'anytype',
+    'boolean',
+    'byte',
+    'char',
+    'container',
+    'date',
+    'double',
+    'enum',
+    'guid',
+    'int',
+    'int64',
+    'long',
+    'real',
+    'short',
+    'str',
+    'utcdatetime',
+    'var'
+  ];
+
+  const LITERAL_KEYWORDS = [
+    'default',
+    'false',
+    'null',
+    'true',
+  ];
+
+  const NORMAL_KEYWORDS = [
+    'abstract',
+    'as',
+    'asc',
+    'avg',
+    'break',
+    'breakpoint',
+    'by',
+    'byref',
+    'case',
+    'catch',
+    'changecompany',
+    'class',
+    'client',
+    'client',
+    'common',
+    'const',
+    'continue',
+    'count',
+    'crosscompany',
+    'delegate',
+    'delete_from',
+    'desc',
+    'display',
+    'div',
+    'do',
+    'edit',
+    'else',
+    'eventhandler',
+    'exists',
+    'extends',
+    'final',
+    'finally',
+    'firstfast',
+    'firstonly',
+    'firstonly1',
+    'firstonly10',
+    'firstonly100',
+    'firstonly1000',
+    'flush',
+    'for', 
+    'forceliterals',
+    'forcenestedloop',
+    'forceplaceholders',
+    'forceselectorder',
+    'forupdate',
+    'from',
+    'generateonly',
+    'group', 
+    'hint',
+    'if',
+    'implements',
+    'in',
+    'index',
+    'insert_recordset',
+    'interface',
+    'internal',
+    'is',
+    'join',
+    'like',
+    'maxof',
+    'minof',
+    'mod',
+    'namespace',
+    'new',
+    'next',
+    'nofetch',
+    'notexists',
+    'optimisticlock',
+    'order',
+    'outer',
+    'pessimisticlock',
+    'print',
+    'private',
+    'protected',
+    'public',
+    'readonly',
+    'repeatableread',
+    'retry',
+    'return',
+    'reverse',
+    'select',
+    'server',
+    'setting',
+    'static', 
+    'sum',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'ttsabort',
+    'ttsbegin',
+    'ttscommit',
+    'unchecked',
+    'update_recordset',
+    'using',
+    'validtimestate',
+    'void',
+    'where',
+    'while',
+  ];
+
+  const KEYWORDS = {
+    keyword: NORMAL_KEYWORDS.join(' '),
+    built_in: BUILT_IN_KEYWORDS.join(' '),
+    literal: LITERAL_KEYWORDS.join(' ')
+  };
+
   return {
-    name: 'Dynamics 365',
-    keywords: 'false int abstract private char boolean static null if for true ' +
-      'while long throw finally protected final return void enum else ' +
-      'break new catch byte super case short default double public try this switch ' +
-      'continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count ' +
-      'order group by asc desc index hint like dispaly edit client server ttsbegin ' +
-      'ttscommit str real date container anytype common div mod',
+    name: 'X++',
+    aliases: ['x++'],
+    keywords: KEYWORDS,
     contains: [
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,

From ce64570d04aa79b53a153727b9cc919e94a99311 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 17 Sep 2020 17:28:49 -0400
Subject: [PATCH 038/223] fix(csharp) prevent public/static/private incorrect
 flagged as title (#2683)

---
 CHANGES.md              |  3 ++-
 src/languages/csharp.js | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7f0ca1dc64..b8bf688ecb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,8 @@ Language Improvements:
 
 - Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
 - Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
-- Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
+- fix(csharp) prevent modifier keywords wrongly flagged as `title` (#2683) [Josh Goebel][]
+- enh(axapta) Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/yyyc514
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index a4d3cab878..28963f707c 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -30,6 +30,23 @@ export default function(hljs) {
       'unit',
       'ushort'
   ];
+  var FUNCTION_MODIFIERS = [
+    'public',
+    'private',
+    'protected',
+    'static',
+    'internal',
+    'protected',
+    'abstract',
+    'async',
+    'extern',
+    'override',
+    'unsafe',
+    'virtual',
+    'new',
+    'sealed',
+    'partial'
+  ];
   var LITERAL_KEYWORDS = [
       'default',
       'false',
@@ -203,9 +220,9 @@ export default function(hljs) {
   var GENERIC_MODIFIER = {
     begin: "<",
     end: ">",
-    contains: [ 
+    contains: [
       { beginKeywords: "in out"},
-      TITLE_MODE 
+      TITLE_MODE
     ]
   };
   var TYPE_IDENT_RE = hljs.IDENT_RE + '(<' + hljs.IDENT_RE + '(\\s*,\\s*' + hljs.IDENT_RE + ')*>)?(\\[\\])?';
@@ -306,6 +323,8 @@ export default function(hljs) {
         end: /\s*[{;=]/, excludeEnd: true,
         keywords: KEYWORDS,
         contains: [
+          // prevents these from being highlighted `title`
+          { beginKeywords: FUNCTION_MODIFIERS.join(" ")},
           {
             begin: hljs.IDENT_RE + '\\s*(\\<.+\\>)?\\s*\\(', returnBegin: true,
             contains: [

From 1d1ddcd152f9c2af1c86419f6471aecf5c20592d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 17 Sep 2020 17:30:19 -0400
Subject: [PATCH 039/223] enh(java) Add support for `record` (#2685)

---
 CHANGES.md            |  5 +++--
 src/languages/java.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b8bf688ecb..a680f9f52a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,8 +2,9 @@
 
 Language Improvements:
 
-- Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
-- Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
+- enh(csharp) Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
+- enh(objectivec) Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
+- enh(java) Add support for `record` (#2685) [Josh Goebel][]
 - fix(csharp) prevent modifier keywords wrongly flagged as `title` (#2683) [Josh Goebel][]
 - enh(axapta) Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
 
diff --git a/src/languages/java.js b/src/languages/java.js
index 13ae1c5fc2..cad12baf48 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -112,6 +112,34 @@ export default function(hljs) {
         beginKeywords: 'new throw return else',
         relevance: 0
       },
+      {
+        className: 'class',
+        begin: 'record\\s+' + hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+        returnBegin: true,
+        excludeEnd: true,
+        end: /[{;=]/,
+        keywords: KEYWORDS,
+        contains: [
+          { beginKeywords: "record" },
+          {
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+            returnBegin: true,
+            relevance: 0,
+            contains: [hljs.UNDERSCORE_TITLE_MODE]
+          },
+          {
+            className: 'params',
+            begin: /\(/, end: /\)/,
+            keywords: KEYWORDS,
+            relevance: 0,
+            contains: [
+              hljs.C_BLOCK_COMMENT_MODE
+            ]
+          },
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.C_BLOCK_COMMENT_MODE
+        ]
+      },
       {
         className: 'function',
         begin: '(' + GENERIC_IDENT_RE + '\\s+)+' + hljs.UNDERSCORE_IDENT_RE + '\\s*\\(', returnBegin: true, end: /[{;=]/,

From b45e211271e95fd2615725f9dd23d24198c91200 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 17 Sep 2020 17:42:43 -0400
Subject: [PATCH 040/223] fix(parser) complete fix for resuming matches from
 same index (#2678)

---
 package-lock.json          |  6 ++---
 package.json               |  3 ++-
 src/highlight.js           |  9 +------
 src/lib/mode_compiler.js   | 53 ++++++++++++++++++++++++++++++++++----
 test/index.js              |  5 ++--
 test/parser/index.js       |  2 ++
 test/parser/resume-scan.js | 31 +++++++++++++++-------
 7 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff8814b9f3..96acf60f84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3283,9 +3283,9 @@
       }
     },
     "should-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
-      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
       "dev": true
     },
     "sigmund": {
diff --git a/package.json b/package.json
index 90233e270f..83ce33c3bd 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
     "test": "mocha test",
     "test-markup": "mocha test/markup",
     "test-detect": "mocha test/detect",
-    "test-browser": "mocha test/browser"
+    "test-browser": "mocha test/browser",
+    "test-parser": "mocha test/parser"
   },
   "engines": {
     "node": "*"
diff --git a/src/highlight.js b/src/highlight.js
index 53026738c6..cbd0ae9fe5 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -498,20 +498,13 @@ const HLJS = function(hljs) {
           // considered for a potential match
           resumeScanAtSamePosition = false;
         } else {
-          top.matcher.lastIndex = index;
           top.matcher.considerAll();
         }
+        top.matcher.lastIndex = index;
 
         const match = top.matcher.exec(codeToHighlight);
         // console.log("match", match[0], match.rule && match.rule.begin)
 
-        // if our failure to match was the result of a "resumed scan" then we
-        // need to advance one position and revert to full scanning before we
-        // decide there are truly no more matches at all to be had
-        if (!match && top.matcher.resumingScanAtSamePosition()) {
-          advanceOne();
-          continue;
-        }
         if (!match) break;
 
         const beforeMatch = codeToHighlight.substring(index, match.index);
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index 56c0c20c82..70837c0a0f 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -143,7 +143,7 @@ export function compileLanguage(language) {
     }
 
     resumingScanAtSamePosition() {
-      return this.regexIndex != 0;
+      return this.regexIndex !== 0;
     }
 
     considerAll() {
@@ -160,15 +160,58 @@ export function compileLanguage(language) {
     exec(s) {
       const m = this.getMatcher(this.regexIndex);
       m.lastIndex = this.lastIndex;
-      const result = m.exec(s);
+      let result = m.exec(s);
+
+      // The following is because we have no easy way to say "resume scanning at the
+      // existing position but also skip the current rule ONLY". What happens is
+      // all prior rules are also skipped which can result in matching the wrong
+      // thing. Example of matching "booger":
+
+      // our matcher is [string, "booger", number]
+      //
+      // ....booger....
+
+      // if "booger" is ignored then we'd really need a regex to scan from the
+      // SAME position for only: [string, number] but ignoring "booger" (if it
+      // was the first match), a simple resume would scan ahead who knows how
+      // far looking only for "number", ignoring potential string matches (or
+      // future "booger" matches that might be valid.)
+
+      // So what we do: We execute two matchers, one resuming at the same
+      // position, but the second full matcher starting at the position after:
+
+      //     /--- resume first regex match here (for [number])
+      //     |/---- full match here for [string, "booger", number]
+      //     vv
+      // ....booger....
+
+      // Which ever results in a match first is then used. So this 3-4 step
+      // process essentially allows us to say "match at this position, excluding
+      // a prior rule that was ignored".
+      //
+      // 1. Match "booger" first, ignore. Also proves that [string] does non match.
+      // 2. Resume matching for [number]
+      // 3. Match at index + 1 for [string, "booger", number]
+      // 4. If #2 and #3 result in matches, which came first?
+      if (this.resumingScanAtSamePosition()) {
+        if (result && result.index === this.lastIndex) {
+          // result is position +0 and therefore a valid
+          // "resume" match so result stays result
+        } else { // use the second matcher result
+          const m2 = this.getMatcher(0);
+          m2.lastIndex = this.lastIndex + 1;
+          result = m2.exec(s);
+        }
+      }
+
       if (result) {
         this.regexIndex += result.position + 1;
-        if (this.regexIndex === this.count) { // wrap-around
-          this.regexIndex = 0;
+        if (this.regexIndex === this.count) {
+          // wrap-around to considering all matches again
+          this.considerAll();
         }
       }
 
-      // this.regexIndex = 0;
       return result;
     }
   }
diff --git a/test/index.js b/test/index.js
index 4fbf3b2edb..57923ed69c 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const hljs     = require('../build');
+const hljs = require('../build');
 hljs.debugMode(); // tests run in debug mode so errors are raised
 
 // Tests specific to the API exposed inside the hljs object.
@@ -8,7 +8,7 @@ hljs.debugMode(); // tests run in debug mode so errors are raised
 require('./api');
 
 // Test weird bugs we've fixed over time
-require("./parser")
+require("./parser");
 
 // Tests for auto detection of languages via `highlightAuto`.
 require('./detect');
@@ -26,4 +26,3 @@ require('./markup');
 // isn't actually used to test inside a browser but `jsdom` acts as a virtual
 // browser inside of node.js and runs together with all the other tests.
 require('./special');
-
diff --git a/test/parser/index.js b/test/parser/index.js
index 8763b67b7a..cb36144839 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const should = require('should');
+
 describe('hljs', function() {
   require('./look-ahead-end-matchers');
   require('./resume-scan');
diff --git a/test/parser/resume-scan.js b/test/parser/resume-scan.js
index 9ed2bb9120..fb50a47f37 100644
--- a/test/parser/resume-scan.js
+++ b/test/parser/resume-scan.js
@@ -1,13 +1,26 @@
-const hljs = require('../../build');
+'use strict';
 
-describe("bugs", function () {
+const hljs = require('../../build');
+hljs.debugMode(); // tests run in debug mode so errors are raised
 
+describe("bugs", function() {
   describe("resume scan when a match is ignored", () => {
     it("should continue to highlight later matches", () => {
-      hljs.highlight('java', 'ImmutablePair.of(Stuff.class, "bar")').value
-        .should.equal(
-          'ImmutablePair.of(Stuff.class, <span class="hljs-string">&quot;bar&quot;</span>)'
-      )
-    })
-  })
-})
+      const result = hljs.highlight('java', 'ImmutablePair.of(Stuff.class, "bar")');
+      result.value.should.equal(
+        'ImmutablePair.of(Stuff.class, <span class="hljs-string">&quot;bar&quot;</span>)'
+      );
+    });
+    // previously the match rule was resumed but it would scan ahead too far and ignore
+    // later matches that matched the PRIOR rules... this is because when we "skip" (ignore) a
+    // rule we really only want to skip searching for THAT rule at that same location, we
+    // do not want to stop searching for ALL the prior rules at that location...
+    it("BUT should not skip ahead too far", () => {
+      const result = hljs.highlight('java', 'ImmutablePair.of(Stuff.class, "bar");\n23');
+      result.value.should.equal(
+        'ImmutablePair.of(Stuff.class, <span class="hljs-string">&quot;bar&quot;</span>);\n' +
+        '<span class="hljs-number">23</span>'
+      );
+    });
+  });
+});

From cda973c7c2c8bf44b6722f3d460b4c6359dcc79c Mon Sep 17 00:00:00 2001
From: Konrad Rudolph <konrad.rudolph@gmail.com>
Date: Thu, 17 Sep 2020 22:56:15 +0100
Subject: [PATCH 041/223] enh(R) major overhaul for the R language grammar 
 (#2680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixes the idiosyncratic R rule for identifiers
- fixes the list of keywords, which was previously just an ad-hoc list of some true keywords and some (but not all) functions from the base package
- adds a category of builtin functions
- adds a syntax rule to match R’s custom %…% infix operators
- adds support for ‘roxygen’ doc comments
- adds R 4.0 raw string literal (r"(…)") support
- fixes some inaccuracies and missing features in the number literals, such as hexadecimal binary exponents (e.g. 0x1.ap+5 == 52).
---
 CHANGES.md                       |   2 +
 src/languages/r.js               | 171 ++++++++++++++++++++++---------
 test/detect/r/default.txt        | 101 +++++++-----------
 test/markup/r/names.expect.txt   |  38 +++++++
 test/markup/r/names.txt          |  38 +++++++
 test/markup/r/numbers.expect.txt |  19 ++++
 test/markup/r/numbers.txt        |  19 ++++
 test/markup/r/ops.expect.r       |  53 ++++++++++
 test/markup/r/ops.r              |  53 ++++++++++
 test/markup/r/roxygen.expect.txt |  24 +++++
 test/markup/r/roxygen.txt        |  24 +++++
 test/markup/r/strings.expect.txt |  33 ++++++
 test/markup/r/strings.txt        |  33 ++++++
 13 files changed, 500 insertions(+), 108 deletions(-)
 create mode 100644 test/markup/r/names.expect.txt
 create mode 100644 test/markup/r/names.txt
 create mode 100644 test/markup/r/numbers.expect.txt
 create mode 100644 test/markup/r/numbers.txt
 create mode 100644 test/markup/r/ops.expect.r
 create mode 100644 test/markup/r/ops.r
 create mode 100644 test/markup/r/roxygen.expect.txt
 create mode 100644 test/markup/r/roxygen.txt
 create mode 100644 test/markup/r/strings.expect.txt
 create mode 100644 test/markup/r/strings.txt

diff --git a/CHANGES.md b/CHANGES.md
index a680f9f52a..be7c9cd603 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- enh(r) major overhaul of the R language grammar (and fix a few bugs) (#2680) [Konrad Rudolph][]
 - enh(csharp) Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
 - enh(objectivec) Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
 - enh(java) Add support for `record` (#2685) [Josh Goebel][]
@@ -11,6 +12,7 @@ Language Improvements:
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/yyyc514
 [Ryan Jonasson]: https://github.com/ryanjonasson
+[Konrad Rudolph]: https://github.com/klmr
 
 ## Version 10.2.0
 
diff --git a/src/languages/r.js b/src/languages/r.js
index 3c5c2c3d7f..176e2075a7 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -2,75 +2,154 @@
 Language: R
 Description: R is a free software environment for statistical computing and graphics.
 Author: Joe Cheng <joe@rstudio.org>
+Contributors: Konrad Rudolph <konrad.rudolph@gmail.com>
 Website: https://www.r-project.org
 Category: scientific
 */
 
 export default function(hljs) {
-  var IDENT_RE = '([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*';
+  // Identifiers in R cannot start with `_`, but they can start with `.` if it
+  // is not immediately followed by a digit.
+  // R also supports quoted identifiers, which are near-arbitrary sequences
+  // delimited by backticks (`…`), which may contain escape sequences. These are
+  // handled in a separate mode. See `test/markup/r/names.txt` for examples.
+  // FIXME: Support Unicode identifiers.
+  const IDENT_RE = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
 
   return {
     name: 'R',
+
+    keywords: {
+      $pattern: IDENT_RE,
+      keyword:
+        'function if in break next repeat else for while',
+      literal:
+        'NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 ' +
+        'NA_character_|10 NA_complex_|10',
+      built_in:
+        // Builtin constants
+        'LETTERS letters month.abb month.name pi T F ' +
+        // Primitive functions
+        // These are all the functions in `base` that are implemented as a
+        // `.Primitive`, minus those functions that are also keywords.
+        'abs acos acosh all any anyNA Arg as.call as.character' +
+        'as.complex as.double as.environment as.integer as.logical' +
+        'as.null.default as.numeric as.raw asin asinh atan atanh attr' +
+        'attributes baseenv browser c call ceiling class Conj cos cosh' +
+        'cospi cummax cummin cumprod cumsum digamma dim dimnames' +
+        'emptyenv exp expression floor forceAndCall gamma gc.time' +
+        'globalenv Im interactive invisible is.array is.atomic is.call' +
+        'is.character is.complex is.double is.environment is.expression' +
+        'is.finite is.function is.infinite is.integer is.language' +
+        'is.list is.logical is.matrix is.na is.name is.nan is.null' +
+        'is.numeric is.object is.pairlist is.raw is.recursive is.single' +
+        'is.symbol lazyLoadDBfetch length lgamma list log max min' +
+        'missing Mod names nargs nzchar oldClass on.exit pos.to.env' +
+        'proc.time prod quote range Re rep retracemem return round' +
+        'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt' +
+        'standardGeneric substitute sum switch tan tanh tanpi tracemem' +
+        'trigamma trunc unclass untracemem UseMethod xtfrm',
+    },
+
     contains: [
+      // Roxygen comments
+      hljs.COMMENT(
+        /#'/,
+        /$/,
+        {
+          contains: [
+            {
+              // Handle `@examples` separately to cause all subsequent code
+              // until the next `@`-tag on its own line to be kept as-is,
+              // preventing highlighting. This code is example R code, so nested
+              // doctags shouldn’t be treated as such. See
+              // `test/markup/r/roxygen.txt` for an example.
+              className: 'doctag',
+              begin: '@examples',
+              starts: {
+                contains: [
+                  { begin: /\n/ },
+                  {
+                    begin: /#'\s*(?=@[a-zA-Z]+)/,
+                    endsParent: true,
+                  },
+                  {
+                    begin: /#'/,
+                    end: /$/,
+                    excludeBegin: true,
+                  }
+                ]
+              }
+            },
+            {
+              // Handle `@param` to highlight the parameter name following
+              // after.
+              className: 'doctag',
+              begin: '@param',
+              end: /$/,
+              contains: [
+                {
+                  className: 'variable',
+                  variants: [
+                    { begin: IDENT_RE },
+                    { begin: /`(?:\\.|[^`])+`/ }
+                  ],
+                  endsParent: true
+                }
+              ]
+            },
+            {
+              className: 'doctag',
+              begin: /@[a-zA-Z]+/
+            },
+            {
+              className: 'meta-keyword',
+              begin: /\\[a-zA-Z]+/,
+            }
+          ]
+        }
+      ),
+
       hljs.HASH_COMMENT_MODE,
+
       {
-        begin: IDENT_RE,
-        keywords: {
-          $pattern: IDENT_RE,
-          keyword:
-            'function if in break next repeat else for return switch while try tryCatch ' +
-            'stop warning require library attach detach source setMethod setGeneric ' +
-            'setGroupGeneric setClass ...',
-          literal:
-            'NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 ' +
-            'NA_complex_|10'
-        },
-        relevance: 0
-      },
-      {
-        // hex value
-        className: 'number',
-        begin: "0[xX][0-9a-fA-F]+[Li]?\\b",
-        relevance: 0
-      },
-      {
-        // explicit integer
-        className: 'number',
-        begin: "\\d+(?:[eE][+\\-]?\\d*)?L\\b",
-        relevance: 0
-      },
-      {
-        // number with trailing decimal
-        className: 'number',
-        begin: "\\d+\\.(?!\\d)(?:i\\b)?",
-        relevance: 0
+        className: 'string',
+        contains: [hljs.BACKSLASH_ESCAPE],
+        variants: [
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\(/, end: /\)(-*)"/ }),
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\{/, end: /\}(-*)"/ }),
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\[/, end: /\](-*)"/ }),
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\(/, end: /\)(-*)'/ }),
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\{/, end: /\}(-*)'/ }),
+          hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\[/, end: /\](-*)'/ }),
+          {begin: '"', end: '"', relevance: 0},
+          {begin: "'", end: "'", relevance: 0}
+        ],
       },
+
       {
-        // number
         className: 'number',
-        begin: "\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",
+        variants: [
+          // Special case: only hexadecimal binary powers can contain fractions.
+          { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
+          { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
+          { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
+        ],
         relevance: 0
       },
+
       {
-        // number with leading decimal
-        className: 'number',
-        begin: "\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",
-        relevance: 0
+        // infix operator
+        begin: '%',
+        end: '%'
       },
 
       {
         // escaped identifier
         begin: '`',
         end: '`',
-        relevance: 0
-      },
-
-      {
-        className: 'string',
-        contains: [hljs.BACKSLASH_ESCAPE],
-        variants: [
-          {begin: '"', end: '"'},
-          {begin: "'", end: "'"}
+        contains: [
+          { begin: /\\./ }
         ]
       }
     ]
diff --git a/test/detect/r/default.txt b/test/detect/r/default.txt
index fc9f4e5d03..803b87e429 100644
--- a/test/detect/r/default.txt
+++ b/test/detect/r/default.txt
@@ -1,69 +1,46 @@
-library(ggplot2)
-
-centre <- function(x, type, ...) {
+require(stats)
+
+#' Compute different averages
+#'
+#' @param x \code{numeric} vector of sample data
+#' @param type \code{character} vector of length 1 specifying the average type
+#' @return \code{centre} returns the sample average according to the chosen method.
+#' @examples
+#' centre(rcauchy(10), "mean")
+#' @export
+centre <- function(x, type) {
   switch(type,
          mean = mean(x),
          median = median(x),
          trimmed = mean(x, trim = .1))
 }
+x <- rcauchy(10)
+centre(x, "mean")
 
-myVar1
-myVar.2
-data$x
-foo "bar" baz
-# test "test"
-"test # test"
-
-(123) (1) (10) (0.1) (.2) (1e-7)
-(1.2e+7) (2e) (3e+10) (0x0) (0xa)
-(0xabcdef1234567890) (123L) (1L)
-(0x10L) (10000000L) (1e6L) (1.1L)
-(1e-3L) (4123.381E-10i)
-(3.) (3.E10) # BUG: .E10 should be part of number
-
-# Numbers in some different contexts
-1L
-0x40
-.234
-3.
-1L + 30
-plot(cars, xlim=20)
-plot(cars, xlim=0x20)
-foo<-30
-my.data.3 <- read() # not a number
-c(1,2,3)
-1%%2
-
-"this is a quote that spans
-multiple lines
-\"
-
-is this still a quote? it should be.
-# even still!
-
-" # now we're done.
-
-'same for
-single quotes #'
-
-# keywords
-NULL, NA, TRUE, FALSE, Inf, NaN, NA_integer_,
-NA_real_, NA_character_, NA_complex_, function,
-while, repeat, for, if, in, else, next, break,
-..., ..1, ..2
-
-# not keywords
-the quick brown fox jumped over the lazy dogs
-null na true false inf nan na_integer_ na_real_
-na_character_ na_complex_ Function While Repeat
-For If In Else Next Break .. .... "NULL" `NULL` 'NULL'
-
-# operators
-+, -, *, /, %%, ^, >, >=, <, <=, ==, !=, !, &, |, ~,
-->, <-, <<-, $, :, ::
-
-# infix operator
-foo %union% bar
-%"test"%
-`"test"`
+library(ggplot2)
 
+models <- tibble::tribble(
+  ~model_name,    ~ formula,
+  "length-width", Sepal.Length ~ Petal.Width + Petal.Length,
+  "interaction",  Sepal.Length ~ Petal.Width * Petal.Length
+)
+
+iris %>% 
+  nest_by(Species) %>% 
+  left_join(models, by = character()) %>% 
+  rowwise(Species, model_name) %>% 
+  mutate(model = list(lm(formula, data = data))) %>% 
+  summarise(broom::glance(model))
+#> `summarise()` regrouping output by 'Species', 'model_name' (override with `.groups` argument)
+#> # A tibble: 6 x 13
+#> # Groups:   Species, model_name [6]
+#>   Species model_name r.squared adj.r.squared sigma statistic  p.value    df
+#>   <fct>   <chr>          <dbl>         <dbl> <dbl>     <dbl>    <dbl> <int>
+#> 1 setosa  length-wi…     0.112        0.0739 0.339      2.96 6.18e- 2     3
+#> 2 setosa  interacti…     0.133        0.0760 0.339      2.34 8.54e- 2     4
+#> 3 versic… length-wi…     0.574        0.556  0.344     31.7  1.92e- 9     3
+#> 4 versic… interacti…     0.577        0.549  0.347     20.9  1.11e- 8     4
+#> 5 virgin… length-wi…     0.747        0.736  0.327     69.3  9.50e-15     3
+#> 6 virgin… interacti…     0.757        0.741  0.323     47.8  3.54e-14     4
+#> # … with 5 more variables: logLik <dbl>, AIC <dbl>, BIC <dbl>, deviance <dbl>,
+#> #   df.residual <int>
diff --git a/test/markup/r/names.expect.txt b/test/markup/r/names.expect.txt
new file mode 100644
index 0000000000..1c297e711b
--- /dev/null
+++ b/test/markup/r/names.expect.txt
@@ -0,0 +1,38 @@
+<span class="hljs-comment"># Valid names</span>
+
+a1_foo, A1_FOO, .foo_, ._foo, Bar.42, foo..1, ., ._, .., ..., ..1, <span class="hljs-built_in">c</span>, <span class="hljs-built_in">T</span>, <span class="hljs-built_in">F</span>, ._1
+
+<span class="hljs-comment"># Reserved Words</span>
+
+<span class="hljs-literal">NA</span>, <span class="hljs-literal">NA_integer_</span>, <span class="hljs-literal">NA_real_</span>, <span class="hljs-literal">NA_character_</span>, <span class="hljs-literal">NA_complex_</span>, <span class="hljs-literal">NULL</span>, <span class="hljs-literal">NaN</span>, <span class="hljs-literal">Inf</span>
+
+<span class="hljs-comment"># Keywords</span>
+
+<span class="hljs-keyword">function</span>, <span class="hljs-keyword">while</span>, <span class="hljs-keyword">repeat</span>, <span class="hljs-keyword">for</span>, <span class="hljs-keyword">if</span>, <span class="hljs-keyword">in</span>, <span class="hljs-keyword">else</span>, <span class="hljs-keyword">next</span>, <span class="hljs-keyword">break</span>
+
+<span class="hljs-comment"># Not reserved</span>
+
+NULLa, NULL1, NULL., `NULL`, <span class="hljs-string">&#x27;NULL&#x27;</span>, NA_foo_, na_real_, Function, for.
+
+<span class="hljs-comment"># Primitive built-ins</span>
+
+<span class="hljs-built_in">return</span>, <span class="hljs-built_in">switch</span>, <span class="hljs-built_in">sum</span>
+
+<span class="hljs-comment"># Non-primitive base functions</span>
+
+stop, try
+
+<span class="hljs-comment"># Quoted identifiers</span>
+
+`+`
+`%*%`
+`a 10 b`
+`for`
+`# x`
+`\`b`
+`\\`
+`%\`%`
+
+<span class="hljs-comment"># Invalid names (for reference)</span>
+
+<span class="hljs-comment"># 0abc, .0abc, abc+cde, _, _., _x, _1, .1_</span>
diff --git a/test/markup/r/names.txt b/test/markup/r/names.txt
new file mode 100644
index 0000000000..9431aeed98
--- /dev/null
+++ b/test/markup/r/names.txt
@@ -0,0 +1,38 @@
+# Valid names
+
+a1_foo, A1_FOO, .foo_, ._foo, Bar.42, foo..1, ., ._, .., ..., ..1, c, T, F, ._1
+
+# Reserved Words
+
+NA, NA_integer_, NA_real_, NA_character_, NA_complex_, NULL, NaN, Inf
+
+# Keywords
+
+function, while, repeat, for, if, in, else, next, break
+
+# Not reserved
+
+NULLa, NULL1, NULL., `NULL`, 'NULL', NA_foo_, na_real_, Function, for.
+
+# Primitive built-ins
+
+return, switch, sum
+
+# Non-primitive base functions
+
+stop, try
+
+# Quoted identifiers
+
+`+`
+`%*%`
+`a 10 b`
+`for`
+`# x`
+`\`b`
+`\\`
+`%\`%`
+
+# Invalid names (for reference)
+
+# 0abc, .0abc, abc+cde, _, _., _x, _1, .1_
diff --git a/test/markup/r/numbers.expect.txt b/test/markup/r/numbers.expect.txt
new file mode 100644
index 0000000000..5ab3296803
--- /dev/null
+++ b/test/markup/r/numbers.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-comment"># Numbers</span>
+
+<span class="hljs-number">0</span>, <span class="hljs-number">01</span>, <span class="hljs-number">08</span>, <span class="hljs-number">123456</span>, <span class="hljs-number">1256.701</span>, <span class="hljs-number">123e3</span>, <span class="hljs-number">123E+3</span>, <span class="hljs-number">1.23e-3</span>, <span class="hljs-number">1.23E3</span>, <span class="hljs-number">.25</span>, <span class="hljs-number">2.</span>
+
+<span class="hljs-comment"># Integers</span>
+
+<span class="hljs-number">123L</span>, -<span class="hljs-number">50L</span>
+
+<span class="hljs-comment"># Imaginary numbers</span>
+
+<span class="hljs-number">123i</span>, -<span class="hljs-number">123i</span>, <span class="hljs-number">1.2e-3i</span>, <span class="hljs-number">1.i</span>, <span class="hljs-number">.0i</span>
+
+<span class="hljs-comment"># Hex numbers</span>
+
+<span class="hljs-number">0x0</span>, <span class="hljs-number">0xabcdefABCDEF01234</span>, <span class="hljs-number">0xabcp123</span>, <span class="hljs-number">0xabcP-123</span>, <span class="hljs-number">0x1.2p2</span>, <span class="hljs-number">0xa.bp-3i</span>
+
+<span class="hljs-comment"># Invalid/not literals (for reference)</span>
+
+<span class="hljs-comment"># 2e, 0x1pa, 0x1.2, 0xg, .2L, 0.L</span>
diff --git a/test/markup/r/numbers.txt b/test/markup/r/numbers.txt
new file mode 100644
index 0000000000..423cbaf9d7
--- /dev/null
+++ b/test/markup/r/numbers.txt
@@ -0,0 +1,19 @@
+# Numbers
+
+0, 01, 08, 123456, 1256.701, 123e3, 123E+3, 1.23e-3, 1.23E3, .25, 2.
+
+# Integers
+
+123L, -50L
+
+# Imaginary numbers
+
+123i, -123i, 1.2e-3i, 1.i, .0i
+
+# Hex numbers
+
+0x0, 0xabcdefABCDEF01234, 0xabcp123, 0xabcP-123, 0x1.2p2, 0xa.bp-3i
+
+# Invalid/not literals (for reference)
+
+# 2e, 0x1pa, 0x1.2, 0xg, .2L, 0.L
diff --git a/test/markup/r/ops.expect.r b/test/markup/r/ops.expect.r
new file mode 100644
index 0000000000..aca8f5e926
--- /dev/null
+++ b/test/markup/r/ops.expect.r
@@ -0,0 +1,53 @@
+<span class="hljs-comment"># General operators (from R documentation `?Syntax`)</span>
+
+:: :::
+$ @
+[ [[
+^
+- +
+:
+%any%
+* /
++ -
+&lt; &gt; &lt;= &gt;= == !=
+!
+&amp;  &amp;&amp;
+| ||
+~
+-&gt; -&gt;&gt;
+&lt;- &lt;&lt;-
+=
+?
+
+<span class="hljs-comment"># Subset extraction</span>
+
+x[<span class="hljs-number">3</span>]
+x[[<span class="hljs-string">&quot;a&quot;</span>]]
+x$y
+x$`a a`
+x$<span class="hljs-string">&quot;a b&quot;</span>
+
+<span class="hljs-comment"># Operators</span>
+
+<span class="hljs-number">2</span>-<span class="hljs-number">2</span>, <span class="hljs-number">2</span>+<span class="hljs-number">2</span>, <span class="hljs-number">2</span>~<span class="hljs-number">2</span>, <span class="hljs-number">2</span>*<span class="hljs-number">2</span>, <span class="hljs-number">2</span>/<span class="hljs-number">2</span>, <span class="hljs-number">2</span>^<span class="hljs-number">2</span>, <span class="hljs-number">2</span>&lt;<span class="hljs-number">2</span>, <span class="hljs-number">2</span>&gt;<span class="hljs-number">2</span>, <span class="hljs-number">2</span>==<span class="hljs-number">2</span>, <span class="hljs-number">2</span>&gt;=<span class="hljs-number">2</span>, <span class="hljs-number">2</span>&lt;=<span class="hljs-number">2</span>, <span class="hljs-number">2</span>!=<span class="hljs-number">2</span>, a&lt;-<span class="hljs-number">2</span>, a=<span class="hljs-number">2</span>, a&lt;&lt;-<span class="hljs-number">2</span>, a:=<span class="hljs-number">2</span>, <span class="hljs-number">2</span>-&gt;a, <span class="hljs-number">2</span>-&gt;&gt;a, <span class="hljs-number">1</span>:<span class="hljs-number">2</span>
+~a+b
+!<span class="hljs-literal">TRUE</span>
+?help, ?`?`, methods?show, ??topic
+<span class="hljs-literal">TRUE</span>&amp;<span class="hljs-literal">FALSE</span>, <span class="hljs-built_in">T</span>|<span class="hljs-built_in">F</span>
+<span class="hljs-literal">TRUE</span>&amp;&amp;<span class="hljs-literal">FALSE</span>, <span class="hljs-built_in">T</span>||<span class="hljs-built_in">F</span>
+base::<span class="hljs-built_in">sum</span>, base:::<span class="hljs-built_in">sum</span>
+
+<span class="hljs-comment"># Custom operators</span>
+
+<span class="hljs-number">2</span>%*%<span class="hljs-number">3</span>
+a%&lt;&gt;%b
+<span class="hljs-number">2</span>%in%y
+a %`tick`% b
+a %&#x27;quot&#x27;% b
+a %&quot;quot&quot;% b
+a %for% b
+a %\% b
+a %`% b
+
+`% %` = paste
+<span class="hljs-string">&quot;foo&quot;</span>`% %`<span class="hljs-string">&quot;bar&quot;</span>
diff --git a/test/markup/r/ops.r b/test/markup/r/ops.r
new file mode 100644
index 0000000000..11a7a1e889
--- /dev/null
+++ b/test/markup/r/ops.r
@@ -0,0 +1,53 @@
+# General operators (from R documentation `?Syntax`)
+
+:: :::
+$ @
+[ [[
+^
+- +
+:
+%any%
+* /
++ -
+< > <= >= == !=
+!
+&  &&
+| ||
+~
+-> ->>
+<- <<-
+=
+?
+
+# Subset extraction
+
+x[3]
+x[["a"]]
+x$y
+x$`a a`
+x$"a b"
+
+# Operators
+
+2-2, 2+2, 2~2, 2*2, 2/2, 2^2, 2<2, 2>2, 2==2, 2>=2, 2<=2, 2!=2, a<-2, a=2, a<<-2, a:=2, 2->a, 2->>a, 1:2
+~a+b
+!TRUE
+?help, ?`?`, methods?show, ??topic
+TRUE&FALSE, T|F
+TRUE&&FALSE, T||F
+base::sum, base:::sum
+
+# Custom operators
+
+2%*%3
+a%<>%b
+2%in%y
+a %`tick`% b
+a %'quot'% b
+a %"quot"% b
+a %for% b
+a %\% b
+a %`% b
+
+`% %` = paste
+"foo"`% %`"bar"
diff --git a/test/markup/r/roxygen.expect.txt b/test/markup/r/roxygen.expect.txt
new file mode 100644
index 0000000000..4dfc0a19da
--- /dev/null
+++ b/test/markup/r/roxygen.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-comment">#&#x27; A description</span>
+<span class="hljs-comment">#&#x27;</span>
+<span class="hljs-comment">#&#x27; Long description</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@param <span class="hljs-variable">x</span></span> the object of type <span class="hljs-meta-keyword">\code</span>{numeric}</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@return</span> A logical indicating whether <span class="hljs-meta-keyword">\code</span>{x == 0}</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@export</span></span>
+is_zero = <span class="hljs-keyword">function</span> (x) x == <span class="hljs-number">0</span>
+
+<span class="hljs-comment">#&#x27; Sum of numbers</span>
+<span class="hljs-comment">#&#x27;</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-meta-keyword">\code</span>{sum_all} is a wrapper for <span class="hljs-meta-keyword">\code</span>{<span class="hljs-meta-keyword">\link</span>{sum}(..., na.rm = TRUE)}.</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@param <span class="hljs-variable">...</span></span> one or more numeric vectors</span>
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@examples</span>
+#&#x27; sum_all(1 : 10) # 55 @this \link{should not be highlighted!}
+#&#x27; sum_all(1, NA, 2, 3) # 6
+#&#x27; <span class="hljs-doctag">@seealso</span> <span class="hljs-meta-keyword">\link</span>[base]{sum} # this SHOULD be highlighted again.</span>
+<span class="hljs-comment"># comment</span>
+sum_all &lt;- <span class="hljs-keyword">function</span> (...) {
+  <span class="hljs-built_in">sum</span>(..., na.rm = <span class="hljs-literal">TRUE</span>)
+}
+
+<span class="hljs-comment"># Weird identifier in @param string</span>
+
+<span class="hljs-comment">#&#x27; <span class="hljs-doctag">@param <span class="hljs-variable">`a\`b\\`</span></span> test</span>
diff --git a/test/markup/r/roxygen.txt b/test/markup/r/roxygen.txt
new file mode 100644
index 0000000000..e54cade722
--- /dev/null
+++ b/test/markup/r/roxygen.txt
@@ -0,0 +1,24 @@
+#' A description
+#'
+#' Long description
+#' @param x the object of type \code{numeric}
+#' @return A logical indicating whether \code{x == 0}
+#' @export
+is_zero = function (x) x == 0
+
+#' Sum of numbers
+#'
+#' \code{sum_all} is a wrapper for \code{\link{sum}(..., na.rm = TRUE)}.
+#' @param ... one or more numeric vectors
+#' @examples
+#' sum_all(1 : 10) # 55 @this \link{should not be highlighted!}
+#' sum_all(1, NA, 2, 3) # 6
+#' @seealso \link[base]{sum} # this SHOULD be highlighted again.
+# comment
+sum_all <- function (...) {
+  sum(..., na.rm = TRUE)
+}
+
+# Weird identifier in @param string
+
+#' @param `a\`b\\` test
diff --git a/test/markup/r/strings.expect.txt b/test/markup/r/strings.expect.txt
new file mode 100644
index 0000000000..5f34cd8d5f
--- /dev/null
+++ b/test/markup/r/strings.expect.txt
@@ -0,0 +1,33 @@
+<span class="hljs-string">&quot;test #&quot;</span>
+<span class="hljs-string">&quot;a&#x27;b&quot;</span>
+<span class="hljs-string">&#x27;a&quot;b&#x27;</span>
+<span class="hljs-string">&quot;foo\&quot;bar&quot;</span>
+<span class="hljs-string">&#x27;foo\&#x27;bar&#x27;</span>
+<span class="hljs-string">&quot;\013x&quot;</span>
+<span class="hljs-string">&quot;\xfex&quot;</span>
+<span class="hljs-string">&quot;\uabc0x&quot;</span>
+<span class="hljs-string">&quot;\U0123abcdx&quot;</span>
+<span class="hljs-string">&quot;\u{abcd}x&quot;</span>
+<span class="hljs-string">&quot;\U{0123abcd}x&quot;</span>
+<span class="hljs-string">r&quot;(foo&quot;bar)&quot;</span>
+<span class="hljs-string">r&quot;{foo)&quot;bar}&quot;</span>
+<span class="hljs-string">r&quot;[foo)&quot;bar]&quot;</span>
+<span class="hljs-string">r&quot;-(foo)&quot;bar)-&quot;</span>
+<span class="hljs-string">R&quot;--(foo)-&quot;bar)--&quot;</span>
+<span class="hljs-string">r&#x27;-(foo)&#x27;bar)-&#x27;</span> <span class="hljs-comment"># &#x27;</span>
+<span class="hljs-string">r&quot;(
+xyz
+&quot;
+\
+)
+)&quot;</span>
+<span class="hljs-string">&quot;this is a quote that spans
+multiple lines
+\&quot;
+
+is this still a quote? it should be.
+# even still!
+
+&quot;</span>
+<span class="hljs-string">&#x27;same for
+single quotes #&#x27;</span>
diff --git a/test/markup/r/strings.txt b/test/markup/r/strings.txt
new file mode 100644
index 0000000000..dcf41247cd
--- /dev/null
+++ b/test/markup/r/strings.txt
@@ -0,0 +1,33 @@
+"test #"
+"a'b"
+'a"b'
+"foo\"bar"
+'foo\'bar'
+"\013x"
+"\xfex"
+"\uabc0x"
+"\U0123abcdx"
+"\u{abcd}x"
+"\U{0123abcd}x"
+r"(foo"bar)"
+r"{foo)"bar}"
+r"[foo)"bar]"
+r"-(foo)"bar)-"
+R"--(foo)-"bar)--"
+r'-(foo)'bar)-' # '
+r"(
+xyz
+"
+\
+)
+)"
+"this is a quote that spans
+multiple lines
+\"
+
+is this still a quote? it should be.
+# even still!
+
+"
+'same for
+single quotes #'

From afe5334e3e9ac380576a7d6474576a2d7116013d Mon Sep 17 00:00:00 2001
From: Philipp <interkosmos@users.noreply.github.com>
Date: Mon, 21 Sep 2020 14:53:06 +0200
Subject: [PATCH 042/223] fix(fortran) Fixed FORTRAN 77 style comments (#2689)

---
 CHANGES.md                              | 2 ++
 src/languages/fortran.js                | 5 +++--
 test/markup/fortran/comments.expect.txt | 6 ++----
 test/markup/fortran/comments.txt        | 6 ++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index be7c9cd603..4fbec70be6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,10 +8,12 @@ Language Improvements:
 - enh(java) Add support for `record` (#2685) [Josh Goebel][]
 - fix(csharp) prevent modifier keywords wrongly flagged as `title` (#2683) [Josh Goebel][]
 - enh(axapta) Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
+- fix(fortran) FORTRAN 77-style comments (#2677) [Philipp Engel][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/yyyc514
 [Ryan Jonasson]: https://github.com/ryanjonasson
+[Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
 
 ## Version 10.2.0
diff --git a/src/languages/fortran.js b/src/languages/fortran.js
index fc5ebeaa5f..32f9d3139a 100644
--- a/src/languages/fortran.js
+++ b/src/languages/fortran.js
@@ -14,8 +14,9 @@ export default function(hljs) {
   const COMMENT = {
     variants: [
       hljs.COMMENT('!', '$', {relevance: 0}),
-      // allow Fortran 77 style comments
-      hljs.COMMENT('^C', '$', {relevance: 0})
+      // allow FORTRAN 77 style comments
+      hljs.COMMENT('^C[ ]', '$', {relevance: 0}),
+      hljs.COMMENT('^C$', '$', {relevance: 0})
     ]
   };
 
diff --git a/test/markup/fortran/comments.expect.txt b/test/markup/fortran/comments.expect.txt
index 839dac23e5..e434e906ed 100644
--- a/test/markup/fortran/comments.expect.txt
+++ b/test/markup/fortran/comments.expect.txt
@@ -1,7 +1,3 @@
-<span class="hljs-comment">C</span>
-<span class="hljs-comment">C  This program in FORTRAN 77 outputs &quot;Hello, World!&quot;.</span>
-<span class="hljs-comment">C ====================================================</span>
-
   <span class="hljs-comment">!===============================</span>
   <span class="hljs-comment">!   This is a test subroutine</span>
   <span class="hljs-comment">!===============================</span>
@@ -11,3 +7,5 @@
 C=<span class="hljs-number">2</span>
 C = <span class="hljs-number">2</span> <span class="hljs-comment">!correct</span>
 C =<span class="hljs-string">&#x27;boo&#x27;</span>
+
+<span class="hljs-keyword">contains</span>
diff --git a/test/markup/fortran/comments.txt b/test/markup/fortran/comments.txt
index 6127dbc32e..8c8f8246a8 100644
--- a/test/markup/fortran/comments.txt
+++ b/test/markup/fortran/comments.txt
@@ -1,7 +1,3 @@
-C
-C  This program in FORTRAN 77 outputs "Hello, World!".
-C ====================================================
-
   !===============================
   !   This is a test subroutine
   !===============================
@@ -11,3 +7,5 @@ C ====================================================
 C=2
 C = 2 !correct
 C ='boo'
+
+contains

From 7942bea2dcf533574f59c00c679190591c06875d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 21 Sep 2020 11:01:00 -0400
Subject: [PATCH 043/223] chore(docs) update my profile URL on GitHub

---
 CHANGES.md                     | 24 ++++++++++++------------
 VERSION_10_BREAKING_CHANGES.md |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4fbec70be6..b60a56dd51 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ Language Improvements:
 - fix(fortran) FORTRAN 77-style comments (#2677) [Philipp Engel][]
 
 [David Pine]: https://github.com/IEvangelist
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Ryan Jonasson]: https://github.com/ryanjonasson
 [Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
@@ -47,7 +47,7 @@ Language Improvements:
 - enh(php) detect newer more flexible HEREdoc syntax (#2658) [eytienne][]
 
 [Youssef Victor]: https://github.com/Youssef1313
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Andrew Janke]: https://github.com/apjanke
 [Samia Ali]: https://github.com/samiaab1990
 [kageru]: https://github.com/kageru
@@ -65,7 +65,7 @@ Fixes:
 - Resolve issue on Node 6 due to dangling comma (#2608) [Edwin Hoogerbeets][]
 - Resolve `index.d.ts is not a module` error (#2603) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Edwin Hoogerbeets]: https://github.com/ehoogerbeets
 
 
@@ -121,7 +121,7 @@ Language Improvements:
 - enh(protobuf) Support multiline comments (#2597) [Pavel Evstigneev][]
 - fix(toml) Improve key parsing (#2595) [Antoine du Hamel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Peter Plantinga]: https://github.com/pplantinga
 [David Benjamin]: https://github.com/davidben
 [Vania Kucher]: https://github.com/qWici
@@ -149,7 +149,7 @@ Parser Engine Changes:
 - [Issue](https://github.com/highlightjs/highlight.js/issues/2522) fix(parser) Fix freez issue with illegal 0 width matches (#2524) [Josh Goebel][]
 
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 
 
 ## Version 10.0.1
@@ -158,7 +158,7 @@ Parser Engine Changes:
 
 - (bug) Fix sublanguage with no relevance score (#2506) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 
 
 ## Version 10.0.0
@@ -227,12 +227,12 @@ Developer Tools:
 
 [Omid Golparvar]: https://github.com/omidgolparvar
 [Alexandre Grison]: https://github.com/agrison
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Chen Bin]: https://github.com/redguardtoo
 [Sam Miller]: https://github.com/smillerc
 [Robert Riebisch]: https://github.com/bttrx
 [Taufik Nurrohman]: https://github.com/taufik-nurrohman
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Sean Williams]: https://github.com/hmmwhatsthisdo
 [Adnan Yaqoob]: https://github.com/adnanyaqoobvirk
 [Álvaro Mondéjar]: https://github.com/mondeja
@@ -244,7 +244,7 @@ Grammar Improvements:
 
 - bug(coffeescript) fix freezing bug due to badly behaved regex (#2376) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 
 
 ## Version 9.18.0
@@ -279,7 +279,7 @@ Developer Tools:
 - feat(developer): add button to show parsed structure (#2345) [Nils Knappmeier][]
 
 [Jeffrey Arnold]: https://github.com/jrnold
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Philipp Engel]: https://github.com/interkosmos
 [Youssef Victor]: https://github.com/Youssef1313
 [Nils Knappmeier]: https://github.com/nknapp
@@ -291,7 +291,7 @@ Fixes:
 
 - fix(parser): resolve IE 11 issue with Object.freeze() (#2319) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 
 
 ## Version 9.17.0
@@ -341,7 +341,7 @@ Language Improvements:
 - fix(objectivec): Handle multibyte character literals (#2268) [David Benjamin][]
 - enh(cpp): Add additional keywords (#2289) [Adrian Ostrowski][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 [Liam Nobel]: https://github.com/liamnobel
 [Carl Baxter]: https://github.com/cdbax
 [Milutin Kristofic]: https://github.com/milutin
diff --git a/VERSION_10_BREAKING_CHANGES.md b/VERSION_10_BREAKING_CHANGES.md
index f60a6c00d5..cc9ac1cce5 100644
--- a/VERSION_10_BREAKING_CHANGES.md
+++ b/VERSION_10_BREAKING_CHANGES.md
@@ -32,7 +32,7 @@ Removed styles:
 
 - chore(styles): darkula.css (use darcula.css instead) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/yyyc514
+[Josh Goebel]: https://github.com/joshgoebel
 
 ---
 

From 9a9592a597d9c40432ce7886cb2c30e0d83416fb Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 22 Sep 2020 11:22:59 -0400
Subject: [PATCH 044/223] fix(c-like) Correctly highlight modifiers in class
 declaration (#2698)

---
 CHANGES.md              | 1 +
 src/languages/c-like.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b60a56dd51..fe65752781 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Language Improvements:
 - fix(csharp) prevent modifier keywords wrongly flagged as `title` (#2683) [Josh Goebel][]
 - enh(axapta) Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
 - fix(fortran) FORTRAN 77-style comments (#2677) [Philipp Engel][]
+- fix(c-like) Correctly highlight modifiers (`final`) in class declaration (#2696) [Josh Goebel][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index 11fad83a89..cfc040c7fb 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -226,6 +226,7 @@ export default function(hljs) {
         className: 'class',
         beginKeywords: 'class struct', end: /[{;:]/,
         contains: [
+          { beginKeywords: "final" },
           {begin: /</, end: />/, contains: ['self']}, // skip generic stuff
           hljs.TITLE_MODE
         ]

From 25dd12a5324f3554a2ec30116789861ec318ed5f Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 22 Sep 2020 11:42:40 -0400
Subject: [PATCH 045/223] (chore) drop 10.2.1 release notes into master branch

---
 CHANGES.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fe65752781..c926805162 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,16 @@ Language Improvements:
 [Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
 
+
+## Version 10.2.1
+
+ Parser Engine:
+
+ -  fix(parser) complete fix for resuming matches from same index (#2678) [Josh Goebel][]
+
+ [Josh Goebel]: https://github.com/yyyc514
+
+
 ## Version 10.2.0
 
 Parser Engine:

From 5b87cc4d106059bee1c30f123e5a4053e0af9de4 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 27 Sep 2020 13:03:50 -0400
Subject: [PATCH 046/223] fix(javascript,scala) Resolves various highlighting
 issues with comments (#2703)

* fix(javascript) Comments highlighted inside params (#2702)
* fix(scala) Comments inside class header should be highlighted (#1559)
---
 CHANGES.md                                 |  2 ++
 src/languages/javascript.js                | 21 ++++++++++++++-------
 src/languages/scala.js                     |  2 ++
 test/markup/javascript/comments.expect.txt |  6 ++++++
 test/markup/javascript/comments.txt        |  6 ++++++
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 test/markup/javascript/comments.expect.txt
 create mode 100644 test/markup/javascript/comments.txt

diff --git a/CHANGES.md b/CHANGES.md
index c926805162..5eea761111 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,8 @@ Language Improvements:
 - fix(csharp) prevent modifier keywords wrongly flagged as `title` (#2683) [Josh Goebel][]
 - enh(axapta) Update keyword list for Axapta (X++) (#2686) [Ryan Jonasson][]
 - fix(fortran) FORTRAN 77-style comments (#2677) [Philipp Engel][]
+- fix(javascript) Comments inside params should be highlighted (#2702) [Josh Goebel][]
+- fix(scala) Comments inside class header should be highlighted (#1559) [Josh Goebel][]
 - fix(c-like) Correctly highlight modifiers (`final`) in class declaration (#2696) [Josh Goebel][]
 
 [David Pine]: https://github.com/IEvangelist
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 66eeaba135..76743f813f 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -78,14 +78,21 @@ export default function(hljs) {
     NUMBER,
     hljs.REGEXP_MODE
   ];
-  var PARAMS_CONTAINS = SUBST.contains.concat([
-    // eat recursive parens in sub expressions
-    { begin: /\(/, end: /\)/,
-      contains: ["self"].concat(SUBST.contains, [hljs.C_BLOCK_COMMENT_MODE, hljs.C_LINE_COMMENT_MODE])
-    },
+  var PARAMS_CONTAINS = [].concat([
     hljs.C_BLOCK_COMMENT_MODE,
-    hljs.C_LINE_COMMENT_MODE
-  ]);
+    hljs.C_LINE_COMMENT_MODE,
+    // eat recursive parens in sub expressions
+    {
+      begin: /\(/,
+      end: /\)/,
+      contains: ["self"].concat([
+          hljs.C_BLOCK_COMMENT_MODE,
+          hljs.C_LINE_COMMENT_MODE
+        ],
+        SUBST.contains
+      )
+    }
+  ], SUBST.contains);
   var PARAMS = {
     className: 'params',
     begin: /\(/, end: /\)/,
diff --git a/src/languages/scala.js b/src/languages/scala.js
index ee3beab3c8..b8e1350a0d 100644
--- a/src/languages/scala.js
+++ b/src/languages/scala.js
@@ -69,6 +69,8 @@ export default function(hljs) {
     end: /[:={\[\n;]/,
     excludeEnd: true,
     contains: [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
       {
         beginKeywords: 'extends with',
         relevance: 10
diff --git a/test/markup/javascript/comments.expect.txt b/test/markup/javascript/comments.expect.txt
new file mode 100644
index 0000000000..0a0ba7b512
--- /dev/null
+++ b/test/markup/javascript/comments.expect.txt
@@ -0,0 +1,6 @@
+f = <span class="hljs-function">(<span class="hljs-params">                <span class="hljs-comment">// f is a recursive function taking:</span>
+  [c,                <span class="hljs-comment">//   c   = next digit character</span>
+      ...a],         <span class="hljs-comment">//   a[] = array of remaining digits</span>
+  o = b,            <span class="hljs-comment">//   o   = output string</span>
+  S = s        <span class="hljs-comment">//   S   = set of solutions</span>
+</span>) =&gt;</span>  {}
diff --git a/test/markup/javascript/comments.txt b/test/markup/javascript/comments.txt
new file mode 100644
index 0000000000..f533306251
--- /dev/null
+++ b/test/markup/javascript/comments.txt
@@ -0,0 +1,6 @@
+f = (                // f is a recursive function taking:
+  [c,                //   c   = next digit character
+      ...a],         //   a[] = array of remaining digits
+  o = b,            //   o   = output string
+  S = s        //   S   = set of solutions
+) =>  {}

From 04d581c81a2353b96c44d1c340a565a173630143 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 30 Sep 2020 19:05:34 -0400
Subject: [PATCH 047/223] fix(fsharp) Prevent `(*)` from being detected as a
 multi-line comment (#2704)

* fix(fsharp) Prevent `(*)` from being detected as a multi-line comment
* allow comments within comments
---
 CHANGES.md                             |  1 +
 src/languages/fsharp.js                |  4 +++-
 test/markup/fsharp/comments.expect.txt | 14 ++++++++++++++
 test/markup/fsharp/comments.txt        | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/markup/fsharp/comments.expect.txt
 create mode 100644 test/markup/fsharp/comments.txt

diff --git a/CHANGES.md b/CHANGES.md
index 5eea761111..5ab6197358 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
 - enh(r) major overhaul of the R language grammar (and fix a few bugs) (#2680) [Konrad Rudolph][]
 - enh(csharp) Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
 - enh(objectivec) Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
diff --git a/src/languages/fsharp.js b/src/languages/fsharp.js
index 828a55ec88..f3ae55143c 100644
--- a/src/languages/fsharp.js
+++ b/src/languages/fsharp.js
@@ -39,7 +39,9 @@ export default function(hljs) {
         className: 'string',
         begin: '"""', end: '"""'
       },
-      hljs.COMMENT('\\(\\*', '\\*\\)'),
+      hljs.COMMENT('\\(\\*(\\s)', '\\*\\)',{
+        contains: [ "self" ]
+      }),
       {
         className: 'class',
         beginKeywords: 'type', end: '\\(|=|$', excludeEnd: true,
diff --git a/test/markup/fsharp/comments.expect.txt b/test/markup/fsharp/comments.expect.txt
new file mode 100644
index 0000000000..66c6723163
--- /dev/null
+++ b/test/markup/fsharp/comments.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-comment">(* here is a multi-line comment on one line *)</span>
+
+<span class="hljs-comment">(*
+    here is a multi-line comment on
+    multiple lines
+*)</span>
+
+<span class="hljs-keyword">let</span> index =
+    len
+    |&gt; float
+    |&gt; Operators.(*) <span class="hljs-number">0.1</span>      <span class="hljs-comment">// (*) here is not comment</span>
+    |&gt; Operators.(+) <span class="hljs-number">1</span>        <span class="hljs-comment">// (+) here is not comment</span>
+    |&gt; Operators.(-) len      <span class="hljs-comment">// (-) here is not comment</span>
+;;
diff --git a/test/markup/fsharp/comments.txt b/test/markup/fsharp/comments.txt
new file mode 100644
index 0000000000..1834138f10
--- /dev/null
+++ b/test/markup/fsharp/comments.txt
@@ -0,0 +1,14 @@
+(* here is a multi-line comment on one line *)
+
+(*
+    here is a multi-line comment on
+    multiple lines
+*)
+
+let index =
+    len
+    |> float
+    |> Operators.(*) 0.1      // (*) here is not comment
+    |> Operators.(+) 1        // (+) here is not comment
+    |> Operators.(-) len      // (-) here is not comment
+;;

From 191cc3127f2bfde78020291db24ffa034148a028 Mon Sep 17 00:00:00 2001
From: Sujit Kumar <kumarsujit2002@gmail.com>
Date: Thu, 1 Oct 2020 06:33:17 +0530
Subject: [PATCH 048/223] chore(css) Fix background color of the Lightfair
 theme (#2720)

---
 src/styles/lightfair.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/lightfair.css b/src/styles/lightfair.css
index b5c45e87c0..7d645d60f9 100644
--- a/src/styles/lightfair.css
+++ b/src/styles/lightfair.css
@@ -8,7 +8,7 @@ Lightfair style (c) Tristian Kelly <tristian.kelly560@gmail.com>
   display: block;
   overflow-x: auto;
   padding: 0.5em;
-  /* TODO: background? */
+  background: #fff;
 }
 
 .hljs-name {

From 6562ef254b38aa94f9ec69c5847dfb0a87066108 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 30 Sep 2020 21:40:26 -0400
Subject: [PATCH 049/223] chore(lint) fix a few linter issues

---
 .eslintrc.js     | 133 ++++++++++++++++++++++++-----------------------
 src/highlight.js |  23 ++++----
 2 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1561b367b1..f4b09fafec 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,71 +1,72 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "node": true,
-        "mocha": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "standard"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "parser": '@typescript-eslint/parser',
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "array-callback-return": "error",
-      "block-scoped-var": "error",
-      // we like our semi-colons
-      "semi": ["error","always"],
-      // our codebase doesn't do this at all, so disabled for now
-      "space-before-function-paren": ["error","never"],
-      // for now ignore diff between types of quoting
-      "quotes": "off",
-      // this is the style we are already using
-      "operator-linebreak": ["error","before", { "overrides": { "?": "after", ":": "after", "+": "after" } }],
-      // sometimes we declare variables with extra spacing
-      "indent": ["error", 2, {"VariableDeclarator":2}],
-      // seems like a good idea not to use explicit undefined
-      "no-undefined": "error",
-      // ensure import specifier contains file extension
-      "import/extensions": ["error", "always"],
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "mocha": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "standard"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "parser": '@typescript-eslint/parser',
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "rules": {
+    "quote-props": "off",
+    "array-callback-return": "error",
+    "block-scoped-var": "error",
+    // we like our semi-colons
+    "semi": ["error", "always"],
+    // our codebase doesn't do this at all, so disabled for now
+    "space-before-function-paren": ["error", "never"],
+    // for now ignore diff between types of quoting
+    "quotes": "off",
+    // this is the style we are already using
+    "operator-linebreak": ["error", "before", { "overrides": { "?": "after", ":": "after", "+": "after" } }],
+    // sometimes we declare variables with extra spacing
+    "indent": ["error", 2, { "VariableDeclarator": 2 }],
+    // seems like a good idea not to use explicit undefined
+    "no-undefined": "error",
+    // ensure import specifier contains file extension
+    "import/extensions": ["error", "always"],
 
-      // TODO maybe
-      "camelcase": "off", // TODO: turn on later
-      "init-declarations": ["error","always"]
+    // TODO maybe
+    "camelcase": "off", // TODO: turn on later
+    "init-declarations": ["error", "always"]
+  },
+  "overrides": [
+    {
+      "files": ["src/**/*.js"],
+      "rules": {
+        // make sure there is no Node.js specific API slipping into the source files
+        "import/no-nodejs-modules": "error",
+        "import/no-commonjs": "error"
+      }
     },
-    "overrides": [
-      {
-        "files": ["src/**/*.js"],
-        "rules": {
-          // make sure there is no Node.js specific API slipping into the source files
-          "import/no-nodejs-modules": "error",
-          "import/no-commonjs": "error",
-        }
-      },
-      {
-        "files": ["src/languages/*.js"],
-        "rules": {
-          "no-unused-expressions": "off",
-          // languages are all over the map and we don't want to
-          // do a mass edit so turn off the most egregious rule violations
-          "indent": "off",
-          "comma-dangle": "off",
-          "array-bracket-spacing": "off",
-          "object-curly-spacing": "off",
-          "key-spacing": "off",
-          "object-curly-newline": "off",
-          "object-property-newline": "off"
-        }
+    {
+      "files": ["src/languages/*.js"],
+      "rules": {
+        "no-unused-expressions": "off",
+        // languages are all over the map and we don't want to
+        // do a mass edit so turn off the most egregious rule violations
+        "indent": "off",
+        "comma-dangle": "off",
+        "array-bracket-spacing": "off",
+        "object-curly-spacing": "off",
+        "key-spacing": "off",
+        "object-curly-newline": "off",
+        "object-property-newline": "off"
       }
-    ]
+    }
+  ]
 };
diff --git a/src/highlight.js b/src/highlight.js
index cbd0ae9fe5..67c783e719 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -11,7 +11,7 @@ import * as utils from './lib/utils.js';
 import * as MODES from './lib/modes.js';
 import { compileLanguage } from './lib/mode_compiler.js';
 import * as packageJSON from '../package.json';
-import { VuePlugin } from "./plugins/vue";
+import { VuePlugin } from "./plugins/vue.js";
 
 const escape = utils.escapeHTML;
 const inherit = utils.inherit;
@@ -261,14 +261,6 @@ const HLJS = function(hljs) {
       }
     }
 
-    /**
-     * Advance a single character
-     */
-    function advanceOne() {
-      mode_buffer += codeToHighlight[index];
-      index += 1;
-    }
-
     /**
      * Handle matching but then ignoring a sequence of text
      *
@@ -841,12 +833,17 @@ const HLJS = function(hljs) {
     });
   }
 
-  /* fixMarkup is deprecated and will be removed entirely in v11 */
+  /**
+  Note: fixMarkup is deprecated and will be removed entirely in v11
+
+  @param {string} arg
+  @returns {string}
+  */
   function deprecate_fixMarkup(arg) {
-    console.warn("fixMarkup is deprecated and will be removed entirely in v11.0")
-    console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534")
+    console.warn("fixMarkup is deprecated and will be removed entirely in v11.0");
+    console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534");
 
-    return fixMarkup(arg)
+    return fixMarkup(arg);
   }
 
   /* Interface definition */

From e1e91d6f6178aa8c027f0645c065e23bd4b832f5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 30 Sep 2020 21:49:59 -0400
Subject: [PATCH 050/223] chore(lint) more linter happiness

---
 .eslintrc.js             | 58 +++++++++++++--------------
 src/highlight.js         | 84 ++++++++++++++++++++--------------------
 src/lib/mode_compiler.js | 24 ++++++------
 src/lib/utils.js         |  4 +-
 4 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index f4b09fafec..d25ec874cb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,65 +1,61 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": true,
-    "mocha": true
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+    mocha: true
   },
-  "extends": [
+  extends: [
     "eslint:recommended",
     "standard"
   ],
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly"
   },
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module"
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: "module"
   },
-  "parser": '@typescript-eslint/parser',
-  "plugins": [
+  parser: '@typescript-eslint/parser',
+  plugins: [
     "@typescript-eslint"
   ],
-  "rules": {
-    "quote-props": "off",
+  rules: {
+    "init-declarations": ["error", "always"],
     "array-callback-return": "error",
     "block-scoped-var": "error",
     // we like our semi-colons
-    "semi": ["error", "always"],
+    semi: ["error", "always"],
     // our codebase doesn't do this at all, so disabled for now
     "space-before-function-paren": ["error", "never"],
     // for now ignore diff between types of quoting
-    "quotes": "off",
+    quotes: "off",
     // this is the style we are already using
-    "operator-linebreak": ["error", "before", { "overrides": { "?": "after", ":": "after", "+": "after" } }],
+    "operator-linebreak": ["error", "before", { overrides: { "?": "after", ":": "after", "+": "after" } }],
     // sometimes we declare variables with extra spacing
-    "indent": ["error", 2, { "VariableDeclarator": 2 }],
+    indent: ["error", 2, { VariableDeclarator: 2 }],
     // seems like a good idea not to use explicit undefined
     "no-undefined": "error",
     // ensure import specifier contains file extension
-    "import/extensions": ["error", "always"],
-
-    // TODO maybe
-    "camelcase": "off", // TODO: turn on later
-    "init-declarations": ["error", "always"]
+    "import/extensions": ["error", "always"]
   },
-  "overrides": [
+  overrides: [
     {
-      "files": ["src/**/*.js"],
-      "rules": {
+      files: ["src/**/*.js"],
+      rules: {
         // make sure there is no Node.js specific API slipping into the source files
         "import/no-nodejs-modules": "error",
         "import/no-commonjs": "error"
       }
     },
     {
-      "files": ["src/languages/*.js"],
-      "rules": {
+      files: ["src/languages/*.js"],
+      rules: {
         "no-unused-expressions": "off",
         // languages are all over the map and we don't want to
         // do a mass edit so turn off the most egregious rule violations
-        "indent": "off",
+        indent: "off",
         "comma-dangle": "off",
         "array-bracket-spacing": "off",
         "object-curly-spacing": "off",
diff --git a/src/highlight.js b/src/highlight.js
index 67c783e719..ad674d5dc5 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -156,17 +156,17 @@ const HLJS = function(hljs) {
 
     function processKeywords() {
       if (!top.keywords) {
-        emitter.addText(mode_buffer);
+        emitter.addText(modeBuffer);
         return;
       }
 
-      let last_index = 0;
+      let lastIndex = 0;
       top.keywordPatternRe.lastIndex = 0;
-      let match = top.keywordPatternRe.exec(mode_buffer);
+      let match = top.keywordPatternRe.exec(modeBuffer);
       let buf = "";
 
       while (match) {
-        buf += mode_buffer.substring(last_index, match.index);
+        buf += modeBuffer.substring(lastIndex, match.index);
         const data = keywordData(top, match);
         if (data) {
           const [kind, keywordRelevance] = data;
@@ -178,27 +178,27 @@ const HLJS = function(hljs) {
         } else {
           buf += match[0];
         }
-        last_index = top.keywordPatternRe.lastIndex;
-        match = top.keywordPatternRe.exec(mode_buffer);
+        lastIndex = top.keywordPatternRe.lastIndex;
+        match = top.keywordPatternRe.exec(modeBuffer);
       }
-      buf += mode_buffer.substr(last_index);
+      buf += modeBuffer.substr(lastIndex);
       emitter.addText(buf);
     }
 
     function processSubLanguage() {
-      if (mode_buffer === "") return;
+      if (modeBuffer === "") return;
       /** @type HighlightResult */
       var result = null;
 
       if (typeof top.subLanguage === 'string') {
         if (!languages[top.subLanguage]) {
-          emitter.addText(mode_buffer);
+          emitter.addText(modeBuffer);
           return;
         }
-        result = _highlight(top.subLanguage, mode_buffer, true, continuations[top.subLanguage]);
+        result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
         continuations[top.subLanguage] = result.top;
       } else {
-        result = highlightAuto(mode_buffer, top.subLanguage.length ? top.subLanguage : null);
+        result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
       }
 
       // Counting embedded language score towards the host language may be disabled
@@ -217,7 +217,7 @@ const HLJS = function(hljs) {
       } else {
         processKeywords();
       }
-      mode_buffer = '';
+      modeBuffer = '';
     }
 
     /**
@@ -270,7 +270,7 @@ const HLJS = function(hljs) {
       if (top.matcher.regexIndex === 0) {
         // no more regexs to potentially match here, so we move the cursor forward one
         // space
-        mode_buffer += lexeme[0];
+        modeBuffer += lexeme[0];
         return 1;
       } else {
         // no need to move the cursor, we still have additional regexes to try and
@@ -288,38 +288,38 @@ const HLJS = function(hljs) {
      */
     function doBeginMatch(match) {
       var lexeme = match[0];
-      var new_mode = match.rule;
+      var newMode = match.rule;
 
-      const resp = new Response(new_mode);
+      const resp = new Response(newMode);
       // first internal before callbacks, then the public ones
-      const beforeCallbacks = [new_mode.__beforeBegin, new_mode["on:begin"]];
+      const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
       for (const cb of beforeCallbacks) {
         if (!cb) continue;
         cb(match, resp);
         if (resp.ignore) return doIgnore(lexeme);
       }
 
-      if (new_mode && new_mode.endSameAsBegin) {
-        new_mode.endRe = regex.escape(lexeme);
+      if (newMode && newMode.endSameAsBegin) {
+        newMode.endRe = regex.escape(lexeme);
       }
 
-      if (new_mode.skip) {
-        mode_buffer += lexeme;
+      if (newMode.skip) {
+        modeBuffer += lexeme;
       } else {
-        if (new_mode.excludeBegin) {
-          mode_buffer += lexeme;
+        if (newMode.excludeBegin) {
+          modeBuffer += lexeme;
         }
         processBuffer();
-        if (!new_mode.returnBegin && !new_mode.excludeBegin) {
-          mode_buffer = lexeme;
+        if (!newMode.returnBegin && !newMode.excludeBegin) {
+          modeBuffer = lexeme;
         }
       }
-      startNewMode(new_mode);
+      startNewMode(newMode);
       // if (mode["after:begin"]) {
       //   let resp = new Response(mode);
       //   mode["after:begin"](match, resp);
       // }
-      return new_mode.returnBegin ? 0 : lexeme.length;
+      return newMode.returnBegin ? 0 : lexeme.length;
     }
 
     /**
@@ -331,19 +331,19 @@ const HLJS = function(hljs) {
       var lexeme = match[0];
       var matchPlusRemainder = codeToHighlight.substr(match.index);
 
-      var end_mode = endOfMode(top, match, matchPlusRemainder);
-      if (!end_mode) { return NO_MATCH; }
+      var endMode = endOfMode(top, match, matchPlusRemainder);
+      if (!endMode) { return NO_MATCH; }
 
       var origin = top;
       if (origin.skip) {
-        mode_buffer += lexeme;
+        modeBuffer += lexeme;
       } else {
         if (!(origin.returnEnd || origin.excludeEnd)) {
-          mode_buffer += lexeme;
+          modeBuffer += lexeme;
         }
         processBuffer();
         if (origin.excludeEnd) {
-          mode_buffer = lexeme;
+          modeBuffer = lexeme;
         }
       }
       do {
@@ -354,12 +354,12 @@ const HLJS = function(hljs) {
           relevance += top.relevance;
         }
         top = top.parent;
-      } while (top !== end_mode.parent);
-      if (end_mode.starts) {
-        if (end_mode.endSameAsBegin) {
-          end_mode.starts.endRe = end_mode.endRe;
+      } while (top !== endMode.parent);
+      if (endMode.starts) {
+        if (endMode.endSameAsBegin) {
+          endMode.starts.endRe = endMode.endRe;
         }
-        startNewMode(end_mode.starts);
+        startNewMode(endMode.starts);
       }
       return origin.returnEnd ? 0 : lexeme.length;
     }
@@ -387,7 +387,7 @@ const HLJS = function(hljs) {
       var lexeme = match && match[0];
 
       // add non-matched text to the current mode buffer
-      mode_buffer += textBeforeMatch;
+      modeBuffer += textBeforeMatch;
 
       if (lexeme == null) {
         processBuffer();
@@ -400,7 +400,7 @@ const HLJS = function(hljs) {
       // Ref: https://github.com/highlightjs/highlight.js/issues/2140
       if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
         // spit the "skipped" character that our regex choked on back into the output sequence
-        mode_buffer += codeToHighlight.slice(match.index, match.index + 1);
+        modeBuffer += codeToHighlight.slice(match.index, match.index + 1);
         if (!SAFE_MODE) {
           /** @type {AnnotatedError} */
           const err = new Error('0 width match regex');
@@ -456,7 +456,7 @@ const HLJS = function(hljs) {
       This causes no real harm other than stopping a few times too many.
       */
 
-      mode_buffer += lexeme;
+      modeBuffer += lexeme;
       return lexeme.length;
     }
 
@@ -474,7 +474,7 @@ const HLJS = function(hljs) {
     var continuations = {}; // keep continuations for sub-languages
     var emitter = new options.__emitter(options);
     processContinuations();
-    var mode_buffer = '';
+    var modeBuffer = '';
     var relevance = 0;
     var index = 0;
     var iterations = 0;
@@ -839,7 +839,7 @@ const HLJS = function(hljs) {
   @param {string} arg
   @returns {string}
   */
-  function deprecate_fixMarkup(arg) {
+  function deprecateFixMarkup(arg) {
     console.warn("fixMarkup is deprecated and will be removed entirely in v11.0");
     console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534");
 
@@ -850,7 +850,7 @@ const HLJS = function(hljs) {
   Object.assign(hljs, {
     highlight,
     highlightAuto,
-    fixMarkup: deprecate_fixMarkup,
+    fixMarkup: deprecateFixMarkup,
     highlightBlock,
     configure,
     initHighlighting,
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index 70837c0a0f..5d1df3e6e4 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -305,9 +305,9 @@ export function compileLanguage(language) {
 
     mode.keywords = mode.keywords || mode.beginKeywords;
 
-    let kw_pattern = null;
+    let keywordPattern = null;
     if (typeof mode.keywords === "object") {
-      kw_pattern = mode.keywords.$pattern;
+      keywordPattern = mode.keywords.$pattern;
       delete mode.keywords.$pattern;
     }
 
@@ -316,13 +316,13 @@ export function compileLanguage(language) {
     }
 
     // both are not allowed
-    if (mode.lexemes && kw_pattern) {
+    if (mode.lexemes && keywordPattern) {
       throw new Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");
     }
 
     // `mode.lexemes` was the old standard before we added and now recommend
     // using `keywords.$pattern` to pass the keyword pattern
-    cmode.keywordPatternRe = langRe(mode.lexemes || kw_pattern || /\w+/, true);
+    cmode.keywordPatternRe = langRe(mode.lexemes || keywordPattern || /\w+/, true);
 
     if (parent) {
       if (mode.beginKeywords) {
@@ -350,7 +350,7 @@ export function compileLanguage(language) {
     if (!mode.contains) mode.contains = [];
 
     mode.contains = [].concat(...mode.contains.map(function(c) {
-      return expand_or_clone_mode(c === 'self' ? mode : c);
+      return expandOrCloneMode(c === 'self' ? mode : c);
     }));
     mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
 
@@ -396,7 +396,7 @@ function dependencyOnParent(mode) {
  * @param {Mode} mode
  * @returns {Mode | Mode[]}
  * */
-function expand_or_clone_mode(mode) {
+function expandOrCloneMode(mode) {
   if (mode.variants && !mode.cached_variants) {
     mode.cached_variants = mode.variants.map(function(variant) {
       return inherit(mode, { variants: null }, variant);
@@ -434,11 +434,11 @@ function expand_or_clone_mode(mode) {
  * Given raw keywords from a language definition, compile them.
  *
  * @param {string | Record<string,string>} rawKeywords
- * @param {boolean} case_insensitive
+ * @param {boolean} caseInsensitive
  */
-function compileKeywords(rawKeywords, case_insensitive) {
+function compileKeywords(rawKeywords, caseInsensitive) {
   /** @type KeywordDict */
-  var compiled_keywords = {};
+  var compiledKeywords = {};
 
   if (typeof rawKeywords === 'string') { // string
     splitAndCompile('keyword', rawKeywords);
@@ -447,7 +447,7 @@ function compileKeywords(rawKeywords, case_insensitive) {
       splitAndCompile(className, rawKeywords[className]);
     });
   }
-  return compiled_keywords;
+  return compiledKeywords;
 
   // ---
 
@@ -460,12 +460,12 @@ function compileKeywords(rawKeywords, case_insensitive) {
    * @param {string} keywordList
    */
   function splitAndCompile(className, keywordList) {
-    if (case_insensitive) {
+    if (caseInsensitive) {
       keywordList = keywordList.toLowerCase();
     }
     keywordList.split(' ').forEach(function(keyword) {
       var pair = keyword.split('|');
-      compiled_keywords[pair[0]] = [className, scoreForKeyword(pair[0], pair[1])];
+      compiledKeywords[pair[0]] = [className, scoreForKeyword(pair[0], pair[1])];
     });
   }
 }
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 3b9a0f1069..860b5e0a6d 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -125,11 +125,11 @@ export function mergeStreams(original, highlighted, value) {
    */
   function open(node) {
     /** @param {Attr} attr */
-    function attr_str(attr) {
+    function attributeString(attr) {
       return ' ' + attr.nodeName + '="' + escapeHTML(attr.value) + '"';
     }
     // @ts-ignore
-    result += '<' + tag(node) + [].map.call(node.attributes, attr_str).join('') + '>';
+    result += '<' + tag(node) + [].map.call(node.attributes, attributeString).join('') + '>';
   }
 
   /**

From 309cfd01b8e9a273fa50386b5bcd6c8d9bb49a51 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 30 Sep 2020 21:55:33 -0400
Subject: [PATCH 051/223] chore(lint) clean up linting of fsharp (after recent
 improvements)

---
 src/languages/fsharp.js | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/languages/fsharp.js b/src/languages/fsharp.js
index f3ae55143c..25298a3f15 100644
--- a/src/languages/fsharp.js
+++ b/src/languages/fsharp.js
@@ -5,11 +5,16 @@ Contributors: Troy Kershaw <hello@troykershaw.com>, Henrik Feldt <henrik@haf.se>
 Website: https://docs.microsoft.com/en-us/dotnet/fsharp/
 Category: functional
 */
+
+/** @type LanguageFn */
 export default function(hljs) {
-  var TYPEPARAM = {
-    begin: '<', end: '>',
+  const TYPEPARAM = {
+    begin: '<',
+    end: '>',
     contains: [
-      hljs.inherit(hljs.TITLE_MODE, {begin: /'[a-zA-Z0-9_]+/})
+      hljs.inherit(hljs.TITLE_MODE, {
+        begin: /'[a-zA-Z0-9_]+/
+      })
     ]
   };
 
@@ -32,19 +37,25 @@ export default function(hljs) {
       },
       {
         className: 'string',
-        begin: '@"', end: '"',
-        contains: [{begin: '""'}]
+        begin: '@"',
+        end: '"',
+        contains: [{
+          begin: '""'
+        }]
       },
       {
         className: 'string',
-        begin: '"""', end: '"""'
+        begin: '"""',
+        end: '"""'
       },
-      hljs.COMMENT('\\(\\*(\\s)', '\\*\\)',{
-        contains: [ "self" ]
+      hljs.COMMENT('\\(\\*(\\s)', '\\*\\)', {
+        contains: ["self"]
       }),
       {
         className: 'class',
-        beginKeywords: 'type', end: '\\(|=|$', excludeEnd: true,
+        beginKeywords: 'type',
+        end: '\\(|=|$',
+        excludeEnd: true,
         contains: [
           hljs.UNDERSCORE_TITLE_MODE,
           TYPEPARAM
@@ -52,16 +63,19 @@ export default function(hljs) {
       },
       {
         className: 'meta',
-        begin: '\\[<', end: '>\\]',
+        begin: '\\[<',
+        end: '>\\]',
         relevance: 10
       },
       {
         className: 'symbol',
         begin: '\\B(\'[A-Za-z])\\b',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [
+          hljs.BACKSLASH_ESCAPE
+        ]
       },
       hljs.C_LINE_COMMENT_MODE,
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, { illegal: null }),
       hljs.C_NUMBER_MODE
     ]
   };

From e980213f497e06289cacf03acd2a55d7f418b4d5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 30 Sep 2020 22:03:56 -0400
Subject: [PATCH 052/223] chore(build) Build demo with correct script link

- Previously minified JS would always be linked (even if not built)
- Non-minified link will now be used if `--no-minify` is passed

Resolves #2711
---
 demo/index.html        | 4 ++++
 tools/build_browser.js | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/demo/index.html b/demo/index.html
index 6ff356a32c..0089baa56d 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -47,7 +47,11 @@ <h2><%- language.prettyName %></h2>
 
   </div>
 
+  <% if (minify) { %>
   <script src="../highlight.min.js"></script>
+  <% } else { %>
+  <script src="../highlight.js"></script>
+  <% } %>
   <script src="jquery-2.1.1.min.js"></script>
   <script src="perfect-scrollbar.min.js"></script>
   <script src="demo.js"></script>
diff --git a/tools/build_browser.js b/tools/build_browser.js
index 94fa029e40..f1eb848e07 100644
--- a/tools/build_browser.js
+++ b/tools/build_browser.js
@@ -25,7 +25,7 @@ async function buildBrowser(options) {
   languages = filter(languages, options["languages"]);
 
   await installDocs();
-  await installDemo(languages);
+  await installDemo(languages, { minify: options.minify });
 
   log("Preparing languages.")
   await Promise.all(
@@ -58,7 +58,7 @@ async function buildBrowser(options) {
   log("-----");
 }
 
-async function installDemo(languages) {
+async function installDemo(languages, { minify }) {
   log("Writing demo files.");
   mkdir("demo");
   installDemoStyles();
@@ -70,7 +70,7 @@ async function installDemo(languages) {
   const styles = css.map((el) => (
     { "name": _.startCase(path.basename(el,".css")), "path": el }
   ));
-  renderTemplate("./demo/index.html", "./demo/index.html", { styles , languages });
+  renderTemplate("./demo/index.html", "./demo/index.html", { styles, languages, minify });
 }
 
 async function installDocs() {

From 00a6749effbb95bde10cfa64c2ea888aec930585 Mon Sep 17 00:00:00 2001
From: Melissa <spansjh@gmail.com>
Date: Thu, 1 Oct 2020 16:32:10 +0200
Subject: [PATCH 053/223] enh(angelscript) Improve heredocs, numbers, metadata
 blocks (#2724)

* Fixed problematic heredoc strings
* Fixed unhandled valid number formatting
* Added missing metadata block
* Added more Angelscript code to detect test case
---
 CHANGES.md                          |  2 ++
 src/languages/angelscript.js        | 19 ++++++++++++-------
 test/detect/angelscript/default.txt |  6 ++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5ab6197358..ddede5aef3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,12 +13,14 @@ Language Improvements:
 - fix(javascript) Comments inside params should be highlighted (#2702) [Josh Goebel][]
 - fix(scala) Comments inside class header should be highlighted (#1559) [Josh Goebel][]
 - fix(c-like) Correctly highlight modifiers (`final`) in class declaration (#2696) [Josh Goebel][]
+- enh(angelscript) Improve heredocs, numbers, metadata blocks (#2724) [Melissa Geels][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
 [Ryan Jonasson]: https://github.com/ryanjonasson
 [Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
+[Melissa Geels]: https://github.com/codecat
 
 
 ## Version 10.2.1
diff --git a/src/languages/angelscript.js b/src/languages/angelscript.js
index d04be25d50..981a9976d2 100644
--- a/src/languages/angelscript.js
+++ b/src/languages/angelscript.js
@@ -48,6 +48,12 @@ export default function(hljs) {
         relevance: 0
       },
 
+      // """heredoc strings"""
+      {
+        className: 'string',
+        begin: '"""', end: '"""'
+      },
+
       { // "strings"
         className: 'string',
         begin: '"', end: '"',
@@ -56,15 +62,14 @@ export default function(hljs) {
         relevance: 0
       },
 
-      // """heredoc strings"""
-      {
-        className: 'string',
-        begin: '"""', end: '"""'
-      },
-
       hljs.C_LINE_COMMENT_MODE, // single-line comments
       hljs.C_BLOCK_COMMENT_MODE, // comment blocks
 
+      { // metadata
+        className: 'string',
+        begin: '^\\s*\\[', end: '\\]',
+      },
+
       { // interface or namespace declaration
         beginKeywords: 'interface namespace', end: '{',
         illegal: '[;.\\-]',
@@ -108,7 +113,7 @@ export default function(hljs) {
 
       { // numbers
         className: 'number',
-        begin: '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)'
+        begin: '(-?)(\\b0[xXbBoOdD][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)'
       }
     ]
   };
diff --git a/test/detect/angelscript/default.txt b/test/detect/angelscript/default.txt
index da527f90b4..e22f5a6151 100644
--- a/test/detect/angelscript/default.txt
+++ b/test/detect/angelscript/default.txt
@@ -25,11 +25,13 @@ namespace MyApplication
             m_arr.insertLast(3.14159f);
             uint x = 0x7fff0000;
             int y = 9001;
+            uint z = 0b10101010;
         }
 
         int get_Thing() property { return m_thing; }
         void set_Thing(int x) property { m_thing = x; }
 
+        [Hook x=1 y=2]
         void DoSomething()
         {
             print("Something! " + 'stuff.');
@@ -54,3 +56,7 @@ void Main()
     SomeClass@ c = SomeClass();
     c.DoSomething();
 }
+
+string multilineString = """
+Hello world, "this is a test"!
+""";

From f5e24b9413265fe76ff24244e2642f47d722a8e4 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 2 Oct 2020 09:15:53 -0400
Subject: [PATCH 054/223] enh(typescript,javascript) Build both JS and TS on a
 common foundation (#2569)

---
 src/languages/javascript.js                   | 266 ++++++++++++------
 src/languages/typescript.js                   | 238 ++++------------
 test/markup/javascript/class.expect.txt       |   2 +-
 test/markup/typescript/class.expect.txt       |   2 +-
 test/markup/typescript/declares.expect.txt    |   4 +-
 .../typescript/decorator-factories.expect.txt |   6 +-
 .../markup/typescript/decorator-factories.txt |   4 +-
 test/markup/typescript/functions.expect.txt   |   2 +-
 test/markup/typescript/jsx.expect.txt         |  44 +--
 test/markup/typescript/jsx.txt                |  44 +--
 test/markup/typescript/module-id.expect.txt   |  16 +-
 test/markup/typescript/module-id.txt          |   2 +-
 types/index.d.ts                              |   6 +-
 13 files changed, 271 insertions(+), 365 deletions(-)

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 76743f813f..1603545154 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unreachable */
 /*
 Language: JavaScript
 Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.
@@ -8,23 +9,61 @@ Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
 import * as ECMAScript from './lib/ecmascript.js';
 import * as regex from '../lib/regex.js';
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var IDENT_RE = ECMAScript.IDENT_RE;
-  var FRAGMENT = {
+  /**
+   * Takes a string like "<Booger" and checks to see
+   * if we can find a matching "</Booger" later in the
+   * content.
+   * @param {RegExpMatchArray} match
+   * @param {{after:number}} param1
+   */
+  const hasClosingTag = (match, { after }) => {
+    const tag = match[0].replace("<", "</");
+    const pos = match.input.indexOf(tag, after);
+    return pos !== -1;
+  };
+
+  const IDENT_RE = ECMAScript.IDENT_RE;
+  const FRAGMENT = {
     begin: '<>',
     end: '</>'
   };
-  var XML_TAG = {
+  const XML_TAG = {
     begin: /<[A-Za-z0-9\\._:-]+/,
-    end: /\/[A-Za-z0-9\\._:-]+>|\/>/
+    end: /\/[A-Za-z0-9\\._:-]+>|\/>/,
+    /**
+     * @param {RegExpMatchArray} match
+     * @param {CallbackResponse} response
+     */
+    isTrulyOpeningTag: (match, response) => {
+      const afterMatchIndex = match[0].length + match.index;
+      const nextChar = match.input[afterMatchIndex];
+      // nested type?
+      // HTML should not include another raw `<` inside a tag
+      // But a type might: `<Array<Array<number>>`, etc.
+      if (nextChar === "<") {
+        response.ignoreMatch();
+        return;
+      }
+      // <something>
+      // This is now either a tag or a type.
+      if (nextChar === ">") {
+        // if we cannot find a matching closing tag, then we
+        // will ignore it
+        if (!hasClosingTag(match, { after: afterMatchIndex })) {
+          response.ignoreMatch();
+        }
+      }
+    }
   };
-  var KEYWORDS = {
+  const KEYWORDS = {
     $pattern: ECMAScript.IDENT_RE,
     keyword: ECMAScript.KEYWORDS.join(" "),
     literal: ECMAScript.LITERALS.join(" "),
     built_in: ECMAScript.BUILT_INS.join(" ")
   };
-  var NUMBER = {
+  const NUMBER = {
     className: 'number',
     variants: [
       { begin: '\\b(0[bB][01]+)n?' },
@@ -33,42 +72,89 @@ export default function(hljs) {
     ],
     relevance: 0
   };
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
-    begin: '\\$\\{', end: '\\}',
+    begin: '\\$\\{',
+    end: '\\}',
     keywords: KEYWORDS,
-    contains: []  // defined later
+    contains: [] // defined later
   };
-  var HTML_TEMPLATE = {
-    begin: 'html`', end: '',
+  const HTML_TEMPLATE = {
+    begin: 'html`',
+    end: '',
     starts: {
-      end: '`', returnEnd: false,
+      end: '`',
+      returnEnd: false,
       contains: [
         hljs.BACKSLASH_ESCAPE,
         SUBST
       ],
-      subLanguage: 'xml',
+      subLanguage: 'xml'
     }
   };
-  var CSS_TEMPLATE = {
-    begin: 'css`', end: '',
+  const CSS_TEMPLATE = {
+    begin: 'css`',
+    end: '',
     starts: {
-      end: '`', returnEnd: false,
+      end: '`',
+      returnEnd: false,
       contains: [
         hljs.BACKSLASH_ESCAPE,
         SUBST
       ],
-      subLanguage: 'css',
+      subLanguage: 'css'
     }
   };
-  var TEMPLATE_STRING = {
+  const TEMPLATE_STRING = {
     className: 'string',
-    begin: '`', end: '`',
+    begin: '`',
+    end: '`',
     contains: [
       hljs.BACKSLASH_ESCAPE,
       SUBST
     ]
   };
+  const JSDOC_COMMENT = hljs.COMMENT(
+    '/\\*\\*',
+    '\\*/',
+    {
+      relevance: 0,
+      contains: [
+        {
+          className: 'doctag',
+          begin: '@[A-Za-z]+',
+          contains: [
+            {
+              className: 'type',
+              begin: '\\{',
+              end: '\\}',
+              relevance: 0
+            },
+            {
+              className: 'variable',
+              begin: IDENT_RE + '(?=\\s*(-)|$)',
+              endsParent: true,
+              relevance: 0
+            },
+            // eat spaces (not newlines) so we can find
+            // types or variables
+            {
+              begin: /(?=[^\n])\s/,
+              relevance: 0
+            }
+          ]
+        }
+      ]
+    }
+  );
+  const COMMENT = {
+    className: "comment",
+    variants: [
+      JSDOC_COMMENT,
+      hljs.C_BLOCK_COMMENT_MODE,
+      hljs.C_LINE_COMMENT_MODE
+    ]
+  };
   SUBST.contains = [
     hljs.APOS_STRING_MODE,
     hljs.QUOTE_STRING_MODE,
@@ -78,39 +164,41 @@ export default function(hljs) {
     NUMBER,
     hljs.REGEXP_MODE
   ];
-  var PARAMS_CONTAINS = [].concat([
-    hljs.C_BLOCK_COMMENT_MODE,
-    hljs.C_LINE_COMMENT_MODE,
+  const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
+  const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
     // eat recursive parens in sub expressions
     {
       begin: /\(/,
       end: /\)/,
-      contains: ["self"].concat([
-          hljs.C_BLOCK_COMMENT_MODE,
-          hljs.C_LINE_COMMENT_MODE
-        ],
-        SUBST.contains
-      )
+      keywords: KEYWORDS,
+      contains: ["self"].concat(SUBST_AND_COMMENTS)
     }
-  ], SUBST.contains);
-  var PARAMS = {
+  ]);
+  const PARAMS = {
     className: 'params',
-    begin: /\(/, end: /\)/,
+    begin: /\(/,
+    end: /\)/,
     excludeBegin: true,
     excludeEnd: true,
+    keywords: KEYWORDS,
     contains: PARAMS_CONTAINS
   };
 
   return {
-    name: 'JavaScript',
+    name: 'Javascript',
     aliases: ['js', 'jsx', 'mjs', 'cjs'],
     keywords: KEYWORDS,
+    // this will be extended by TypeScript
+    exports: { PARAMS_CONTAINS },
+    illegal: /#(?!!)/,
     contains: [
       hljs.SHEBANG({
+        label: "shebang",
         binary: "node",
         relevance: 5
       }),
       {
+        label: "use_strict",
         className: 'meta',
         relevance: 10,
         begin: /^\s*['"]use (strict|asm)['"]/
@@ -120,41 +208,7 @@ export default function(hljs) {
       HTML_TEMPLATE,
       CSS_TEMPLATE,
       TEMPLATE_STRING,
-      hljs.C_LINE_COMMENT_MODE,
-      hljs.COMMENT(
-        '/\\*\\*',
-        '\\*/',
-        {
-          relevance : 0,
-          contains : [
-            {
-              className : 'doctag',
-              begin : '@[A-Za-z]+',
-              contains : [
-                {
-                  className: 'type',
-                  begin: '\\{',
-                  end: '\\}',
-                  relevance: 0
-                },
-                {
-                  className: 'variable',
-                  begin: IDENT_RE + '(?=\\s*(-)|$)',
-                  endsParent: true,
-                  relevance: 0
-                },
-                // eat spaces (not newlines) so we can find
-                // types or variables
-                {
-                  begin: /(?=[^\n])\s/,
-                  relevance: 0
-                },
-              ]
-            }
-          ]
-        }
-      ),
-      hljs.C_BLOCK_COMMENT_MODE,
+      COMMENT,
       NUMBER,
       { // object attr container
         begin: regex.concat(/[{,\n]\s*/,
@@ -178,16 +232,15 @@ export default function(hljs) {
           {
             className: 'attr',
             begin: IDENT_RE + regex.lookahead('\\s*:'),
-            relevance: 0,
-          },
+            relevance: 0
+          }
         ]
       },
       { // "value" container
         begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
         keywords: 'return throw case',
         contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
+          COMMENT,
           hljs.REGEXP_MODE,
           {
             className: 'function',
@@ -199,7 +252,8 @@ export default function(hljs) {
                 '(\\([^(]*' +
                 '\\))?' +
               '\\))?' +
-            '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>', returnBegin: true,
+            '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>',
+            returnBegin: true,
             end: '\\s*=>',
             contains: [
               {
@@ -214,8 +268,10 @@ export default function(hljs) {
                     skip: true
                   },
                   {
-                    begin: /\(/, end: /\)/,
-                    excludeBegin: true, excludeEnd: true,
+                    begin: /\(/,
+                    end: /\)/,
+                    excludeBegin: true,
+                    excludeEnd: true,
                     keywords: KEYWORDS,
                     contains: PARAMS_CONTAINS
                   }
@@ -224,68 +280,94 @@ export default function(hljs) {
             ]
           },
           { // could be a comma delimited list of params to a function call
-            begin: /,/, relevance: 0,
+            begin: /,/, relevance: 0
           },
           {
             className: '',
             begin: /\s/,
             end: /\s*/,
-            skip: true,
+            skip: true
           },
           { // JSX
             variants: [
               { begin: FRAGMENT.begin, end: FRAGMENT.end },
-              { begin: XML_TAG.begin, end: XML_TAG.end }
+              {
+                begin: XML_TAG.begin,
+                // we carefully check the opening tag to see if it truly
+                // is a tag and not a false positive
+                'on:begin': XML_TAG.isTrulyOpeningTag,
+                end: XML_TAG.end
+              }
             ],
             subLanguage: 'xml',
             contains: [
               {
-                begin: XML_TAG.begin, end: XML_TAG.end, skip: true,
+                begin: XML_TAG.begin,
+                end: XML_TAG.end,
+                skip: true,
                 contains: ['self']
               }
             ]
-          },
+          }
         ],
         relevance: 0
       },
       {
         className: 'function',
-        beginKeywords: 'function', end: /\{/, excludeEnd: true,
+        beginKeywords: 'function',
+        end: /[{;]/,
+        excludeEnd: true,
+        keywords: KEYWORDS,
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE}),
+          'self',
+          hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
           PARAMS
         ],
-        illegal: /\[|%/
+        illegal: /%/
       },
+      // hack: prevents detection of keywords in some circumstances
+      // .keyword()
+      // $keyword = x
       {
-        begin: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
+        variants: [
+          { begin: '\\.' + IDENT_RE },
+          { begin: '\\$' + IDENT_RE }
+        ],
+        relevance: 0
       },
-
-      hljs.METHOD_GUARD,
       { // ES6 class
         className: 'class',
-        beginKeywords: 'class', end: /[{;=]/, excludeEnd: true,
+        beginKeywords: 'class',
+        end: /[{;=]/,
+        excludeEnd: true,
         illegal: /[:"\[\]]/,
         contains: [
-          {beginKeywords: 'extends'},
+          { beginKeywords: 'extends' },
           hljs.UNDERSCORE_TITLE_MODE
         ]
       },
       {
-        beginKeywords: 'constructor', end: /\{/, excludeEnd: true
+        beginKeywords: 'constructor',
+        end: /[\{;]/,
+        excludeEnd: true,
+        contains: [
+          'self',
+          PARAMS
+        ]
       },
       {
         begin: '(get|set)\\s+(?=' + IDENT_RE + '\\()',
         end: /{/,
         keywords: "get set",
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE}),
+          hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
           { begin: /\(\)/ }, // eat to avoid empty params
           PARAMS
         ]
-
+      },
+      {
+        begin: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
       }
-    ],
-    illegal: /#(?!!)/
+    ]
   };
 }
diff --git a/src/languages/typescript.js b/src/languages/typescript.js
index 1bf54a0522..8c8483be7e 100644
--- a/src/languages/typescript.js
+++ b/src/languages/typescript.js
@@ -7,11 +7,25 @@ Website: https://www.typescriptlang.org
 Category: common, scripting
 */
 
-import * as ECMAScript from './lib/ecmascript.js';
+import * as ECMAScript from "./lib/ecmascript.js";
+import javascript from "./javascript.js";
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var IDENT_RE = ECMAScript.IDENT_RE;
-  var TYPES = [
+  const IDENT_RE = ECMAScript.IDENT_RE;
+  const NAMESPACE = {
+    beginKeywords: 'namespace', end: /\{/, excludeEnd: true
+  };
+  const INTERFACE = {
+    beginKeywords: 'interface', end: /\{/, excludeEnd: true,
+    keywords: 'interface extends'
+  };
+  const USE_STRICT = {
+    className: 'meta',
+    relevance: 10,
+    begin: /^\s*['"]use strict['"]/
+  };
+  const TYPES = [
     "any",
     "void",
     "number",
@@ -21,7 +35,7 @@ export default function(hljs) {
     "never",
     "enum"
   ];
-  var TS_SPECIFIC_KEYWORDS = [
+  const TS_SPECIFIC_KEYWORDS = [
     "type",
     "namespace",
     "typedef",
@@ -34,197 +48,49 @@ export default function(hljs) {
     "abstract",
     "readonly"
   ];
-  var KEYWORDS = {
+  const KEYWORDS = {
     $pattern: ECMAScript.IDENT_RE,
     keyword: ECMAScript.KEYWORDS.concat(TS_SPECIFIC_KEYWORDS).join(" "),
     literal: ECMAScript.LITERALS.join(" "),
     built_in: ECMAScript.BUILT_INS.concat(TYPES).join(" ")
   };
-  var DECORATOR = {
+  const DECORATOR = {
     className: 'meta',
     begin: '@' + IDENT_RE,
   };
-  var NUMBER = {
-    className: 'number',
-    variants: [
-      { begin: '\\b(0[bB][01]+)n?' },
-      { begin: '\\b(0[oO][0-7]+)n?' },
-      { begin: hljs.C_NUMBER_RE + 'n?' }
-    ],
-    relevance: 0
-  };
-  var SUBST = {
-    className: 'subst',
-    begin: '\\$\\{', end: '\\}',
-    keywords: KEYWORDS,
-    contains: [] // defined later
-  };
-  var HTML_TEMPLATE = {
-    begin: 'html`', end: '',
-    starts: {
-      end: '`', returnEnd: false,
-      contains: [
-        hljs.BACKSLASH_ESCAPE,
-        SUBST
-      ],
-      subLanguage: 'xml',
-    }
-  };
-  var CSS_TEMPLATE = {
-    begin: 'css`', end: '',
-    starts: {
-      end: '`', returnEnd: false,
-      contains: [
-        hljs.BACKSLASH_ESCAPE,
-        SUBST
-      ],
-      subLanguage: 'css',
-    }
-  };
-  var TEMPLATE_STRING = {
-    className: 'string',
-    begin: '`', end: '`',
-    contains: [
-      hljs.BACKSLASH_ESCAPE,
-      SUBST
-    ]
-  };
-  SUBST.contains = [
-    hljs.APOS_STRING_MODE,
-    hljs.QUOTE_STRING_MODE,
-    HTML_TEMPLATE,
-    CSS_TEMPLATE,
-    TEMPLATE_STRING,
-    NUMBER,
-    hljs.REGEXP_MODE
-  ];
-  var ARGUMENTS =
-  {
-    begin: '\\(',
-    end: /\)/,
-    keywords: KEYWORDS,
-    contains: [
-      'self',
-      hljs.QUOTE_STRING_MODE,
-      hljs.APOS_STRING_MODE,
-      hljs.NUMBER_MODE
-    ]
-  };
-  var PARAMS = {
-    className: 'params',
-    begin: /\(/, end: /\)/,
-    excludeBegin: true,
-    excludeEnd: true,
-    keywords: KEYWORDS,
-    contains: [
-      hljs.C_LINE_COMMENT_MODE,
-      hljs.C_BLOCK_COMMENT_MODE,
-      DECORATOR,
-      ARGUMENTS
-    ]
+
+  const swapMode = (mode, label, replacement) => {
+    const indx = mode.contains.findIndex(m => m.label === label);
+    if (indx === -1) { throw new Error("can not find mode to replace"); };
+
+    mode.contains.splice(indx, 1, replacement);
   };
 
-  return {
+  const tsLanguage = javascript(hljs);
+
+  // this should update anywhere keywords is used since
+  // it will be the same actual JS object
+  Object.assign(tsLanguage.keywords, KEYWORDS);
+
+  tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
+  tsLanguage.contains = tsLanguage.contains.concat([
+    DECORATOR,
+    NAMESPACE,
+    INTERFACE,
+  ]);
+
+  // TS gets a simpler shebang rule than JS
+  swapMode(tsLanguage, "shebang", hljs.SHEBANG());
+  // JS use strict rule purposely excludes `asm` which makes no sense
+  swapMode(tsLanguage, "use_strict", USE_STRICT);
+
+  const functionDeclaration = tsLanguage.contains.find(m => m.className === "function");
+  functionDeclaration.relevance = 0; // () => {} is more typical in TypeScript
+
+  Object.assign(tsLanguage, {
     name: 'TypeScript',
-    aliases: ['ts'],
-    keywords: KEYWORDS,
-    contains: [
-      hljs.SHEBANG(),
-      {
-        className: 'meta',
-        begin: /^\s*['"]use strict['"]/
-      },
-      hljs.APOS_STRING_MODE,
-      hljs.QUOTE_STRING_MODE,
-      HTML_TEMPLATE,
-      CSS_TEMPLATE,
-      TEMPLATE_STRING,
-      hljs.C_LINE_COMMENT_MODE,
-      hljs.C_BLOCK_COMMENT_MODE,
-      NUMBER,
-      { // "value" container
-        begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
-        keywords: 'return throw case',
-        contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          hljs.REGEXP_MODE,
-          {
-            className: 'function',
-            // we have to count the parens to make sure we actually have the
-            // correct bounding ( ) before the =>.  There could be any number of
-            // sub-expressions inside also surrounded by parens.
-            begin: '(\\([^(]*' +
-              '(\\([^(]*' +
-                '(\\([^(]*' +
-                '\\))?' +
-              '\\))?' +
-            '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>', returnBegin: true,
-            end: '\\s*=>',
-            contains: [
-              {
-                className: 'params',
-                variants: [
-                  {
-                    begin: hljs.UNDERSCORE_IDENT_RE
-                  },
-                  {
-                    className: null,
-                    begin: /\(\s*\)/,
-                    skip: true
-                  },
-                  {
-                    begin: /\(/, end: /\)/,
-                    excludeBegin: true, excludeEnd: true,
-                    keywords: KEYWORDS,
-                    contains: ARGUMENTS.contains
-                  }
-                ]
-              }
-            ]
-          }
-        ],
-        relevance: 0
-      },
-      {
-        className: 'function',
-        beginKeywords: 'function', end: /[\{;]/, excludeEnd: true,
-        keywords: KEYWORDS,
-        contains: [
-          'self',
-          hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
-          PARAMS
-        ],
-        illegal: /%/,
-        relevance: 0 // () => {} is more typical in TypeScript
-      },
-      {
-        beginKeywords: 'constructor', end: /[\{;]/, excludeEnd: true,
-        contains: [
-          'self',
-          PARAMS
-        ]
-      },
-      { // prevent references like module.id from being highlighted as module definitions
-        begin: /module\./,
-        keywords: { built_in: 'module' },
-        relevance: 0
-      },
-      {
-        beginKeywords: 'module', end: /\{/, excludeEnd: true
-      },
-      {
-        beginKeywords: 'interface', end: /\{/, excludeEnd: true,
-        keywords: 'interface extends'
-      },
-      {
-        begin: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
-      },
-      {
-        begin: '\\.' + hljs.IDENT_RE, relevance: 0 // hack: prevents detection of keywords after dots
-      },
-      DECORATOR,
-      ARGUMENTS
-    ]
-  };
+    aliases: ['ts']
+  });
+
+  return tsLanguage;
 }
diff --git a/test/markup/javascript/class.expect.txt b/test/markup/javascript/class.expect.txt
index edc3e79e3b..f3921e2f72 100644
--- a/test/markup/javascript/class.expect.txt
+++ b/test/markup/javascript/class.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Car</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Vehicle</span> </span>{
-  <span class="hljs-keyword">constructor</span>(speed, cost) {
+  <span class="hljs-keyword">constructor</span>(<span class="hljs-params">speed, cost</span>) {
     <span class="hljs-built_in">super</span>(speed);
 
     <span class="hljs-keyword">var</span> c = <span class="hljs-built_in">Symbol</span>(<span class="hljs-string">&#x27;cost&#x27;</span>);
diff --git a/test/markup/typescript/class.expect.txt b/test/markup/typescript/class.expect.txt
index b85c55bf67..f3921e2f72 100644
--- a/test/markup/typescript/class.expect.txt
+++ b/test/markup/typescript/class.expect.txt
@@ -1,4 +1,4 @@
-<span class="hljs-keyword">class</span> Car <span class="hljs-keyword">extends</span> Vehicle {
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Car</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Vehicle</span> </span>{
   <span class="hljs-keyword">constructor</span>(<span class="hljs-params">speed, cost</span>) {
     <span class="hljs-built_in">super</span>(speed);
 
diff --git a/test/markup/typescript/declares.expect.txt b/test/markup/typescript/declares.expect.txt
index e90a7e2696..75f3eb5ebd 100644
--- a/test/markup/typescript/declares.expect.txt
+++ b/test/markup/typescript/declares.expect.txt
@@ -1,8 +1,8 @@
-<span class="hljs-keyword">export</span> <span class="hljs-keyword">declare</span> <span class="hljs-keyword">class</span> CommandHandler <span class="hljs-keyword">extends</span> EventEmitter {
+<span class="hljs-keyword">export</span> <span class="hljs-keyword">declare</span> <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">CommandHandler</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">EventEmitter</span> </span>{
 
     <span class="hljs-keyword">constructor</span>(<span class="hljs-params">config: CommandHandlerConfig</span>);
     <span class="hljs-comment">/**
      * Install the handler onto Discord.js
-     * @param client - Client to handle
+     * <span class="hljs-doctag">@param <span class="hljs-variable">client</span></span> - Client to handle
      */</span>
 }
diff --git a/test/markup/typescript/decorator-factories.expect.txt b/test/markup/typescript/decorator-factories.expect.txt
index d9532d9117..7eae4a4c80 100644
--- a/test/markup/typescript/decorator-factories.expect.txt
+++ b/test/markup/typescript/decorator-factories.expect.txt
@@ -1,13 +1,13 @@
 <span class="hljs-meta">@foo</span>(<span class="hljs-string">&#x27;foo&#x27;</span>)
-<span class="hljs-keyword">export</span> <span class="hljs-keyword">class</span> MyClass {
+<span class="hljs-keyword">export</span> <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">MyClass</span> </span>{
     <span class="hljs-meta">@baz</span>(<span class="hljs-number">123</span>)
     <span class="hljs-keyword">private</span> myAttribute: <span class="hljs-built_in">string</span>;
 
-    <span class="hljs-keyword">constructor</span>(<span class="hljs-params"><span class="hljs-meta">@bar</span>(<span class="hljs-literal">true</span>) <span class="hljs-keyword">private</span> x, 
+    <span class="hljs-keyword">constructor</span>(<span class="hljs-params"><span class="hljs-meta">@bar</span>(<span class="hljs-literal">true</span>) <span class="hljs-keyword">private</span> x,
                 <span class="hljs-meta">@bar</span>(qux(quux(<span class="hljs-literal">true</span>))) <span class="hljs-keyword">private</span> y</span>) { }
 
     <span class="hljs-meta">@bar</span>()
     <span class="hljs-keyword">private</span> myMethod(<span class="hljs-meta">@bar</span>() z) {
         <span class="hljs-built_in">console</span>.log(<span class="hljs-string">&#x27;Hello world.&#x27;</span>);
     }
-}
\ No newline at end of file
+}
diff --git a/test/markup/typescript/decorator-factories.txt b/test/markup/typescript/decorator-factories.txt
index c8081c6040..2b1b6fe94a 100644
--- a/test/markup/typescript/decorator-factories.txt
+++ b/test/markup/typescript/decorator-factories.txt
@@ -3,11 +3,11 @@ export class MyClass {
     @baz(123)
     private myAttribute: string;
 
-    constructor(@bar(true) private x, 
+    constructor(@bar(true) private x,
                 @bar(qux(quux(true))) private y) { }
 
     @bar()
     private myMethod(@bar() z) {
         console.log('Hello world.');
     }
-}
\ No newline at end of file
+}
diff --git a/test/markup/typescript/functions.expect.txt b/test/markup/typescript/functions.expect.txt
index 5c2595c296..45d6d5987c 100644
--- a/test/markup/typescript/functions.expect.txt
+++ b/test/markup/typescript/functions.expect.txt
@@ -22,5 +22,5 @@
 <span class="hljs-keyword">const</span> bad = (<span class="hljs-function">(<span class="hljs-params">a, b</span>) =&gt;</span> [...a, b]);
 <span class="hljs-keyword">const</span> array = [<span class="hljs-number">1</span>, <span class="hljs-number">2</span>, <span class="hljs-number">3</span>].reduce&lt;<span class="hljs-built_in">number</span>[]&gt;(<span class="hljs-function">(<span class="hljs-params">acc, next</span>) =&gt;</span> [...acc, next], []);
 <span class="hljs-keyword">const</span> bad = (<span class="hljs-function">(<span class="hljs-params">a=<span class="hljs-number">2</span>, b=<span class="hljs-number">5</span></span>) =&gt;</span> [...a, b]);
-sides.every(<span class="hljs-function">(<span class="hljs-params">length,width=(<span class="hljs-params"><span class="hljs-number">3</span>+<span class="hljs-number">2</span>+(<span class="hljs-params"><span class="hljs-number">4</span>/<span class="hljs-number">5</span></span>)</span>)</span>) =&gt;</span> length &gt; <span class="hljs-number">0</span> );
+sides.every(<span class="hljs-function">(<span class="hljs-params">length,width=(<span class="hljs-number">3</span>+<span class="hljs-number">2</span>+(<span class="hljs-number">4</span>/<span class="hljs-number">5</span>))</span>) =&gt;</span> length &gt; <span class="hljs-number">0</span> );
 
diff --git a/test/markup/typescript/jsx.expect.txt b/test/markup/typescript/jsx.expect.txt
index 8d3c418b2d..70505ab378 100644
--- a/test/markup/typescript/jsx.expect.txt
+++ b/test/markup/typescript/jsx.expect.txt
@@ -1,38 +1,16 @@
-<span class="hljs-keyword">export</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">getModuleInstanceState</span>(<span class="hljs-params">node: Node</span>): <span class="hljs-title">ModuleInstanceState</span> </span>{
-    <span class="hljs-comment">// A module is uninstantiated if it contains only</span>
-    <span class="hljs-comment">// 1. interface declarations, type alias declarations</span>
-    <span class="hljs-keyword">if</span> (node.kind === SyntaxKind.InterfaceDeclaration || node.kind === SyntaxKind.TypeAliasDeclaration) {
-        <span class="hljs-keyword">return</span> ModuleInstanceState.NonInstantiated;
-    }
-    <span class="hljs-comment">// 2. const enum declarations</span>
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (isConstEnumDeclaration(node)) {
-        <span class="hljs-keyword">return</span> ModuleInstanceState.ConstEnumOnly;
-    }
-    <span class="hljs-comment">// 3. non-exported import declarations</span>
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) &amp;&amp; !(node.flags &amp; NodeFlags.Export)) {
-        <span class="hljs-keyword">return</span> ModuleInstanceState.NonInstantiated;
-    }
-    <span class="hljs-comment">// 4. other uninstantiated module declarations.</span>
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (node.kind === SyntaxKind.ModuleBlock) {
-        <span class="hljs-keyword">let</span> state = ModuleInstanceState.NonInstantiated;
-        forEachChild(node, <span class="hljs-function"><span class="hljs-params">n</span> =&gt;</span> {
-            <span class="hljs-keyword">switch</span> (getModuleInstanceState(n)) {
-                <span class="hljs-keyword">case</span> ModuleInstanceState.NonInstantiated:
-                    <span class="hljs-comment">// child is non-instantiated - continue searching</span>
-                    <span class="hljs-keyword">return</span> <span class="hljs-literal">false</span>;
-                <span class="hljs-keyword">case</span> ModuleInstanceState.ConstEnumOnly:
-                    <span class="hljs-comment">// child is const enum only - record state and continue searching</span>
-                    state = ModuleInstanceState.ConstEnumOnly;
-                    <span class="hljs-keyword">return</span> <span class="hljs-literal">false</span>;
-                <span class="hljs-keyword">case</span> ModuleInstanceState.Instantiated:
-                    <span class="hljs-comment">// child is instantiated - record state and stop</span>
-                    state = ModuleInstanceState.Instantiated;
-                    <span class="hljs-keyword">return</span> <span class="hljs-literal">true</span>;
-            }
-        });
-        <span class="hljs-keyword">return</span> state;
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">MyComponent</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Component</span>&lt;<span class="hljs-title">Props</span>&gt; </span>{
+    render() {
+        <span class="hljs-keyword">let</span> a : <span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">number</span>&gt;&gt; = [[<span class="hljs-number">1</span>,<span class="hljs-number">2</span>]];
+        <span class="hljs-keyword">let</span> b = <span class="hljs-keyword">new</span> <span class="hljs-built_in">Map</span>&lt;<span class="hljs-built_in">string</span>,<span class="hljs-built_in">number</span>&gt;();
+        <span class="hljs-keyword">return</span> (
+            <span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">div</span> /&gt;</span></span>
+        );
     }
+}
+
+<span class="hljs-keyword">export</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">getModuleInstanceState</span>(<span class="hljs-params">node: Node</span>): <span class="hljs-title">ModuleInstanceState</span> </span>{
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (node.kind === SyntaxKind.ModuleDeclaration) {
+        <span class="hljs-keyword">return</span> getModuleInstanceState((&lt;<span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">number</span>&gt;&gt;node).body);
         <span class="hljs-keyword">return</span> getModuleInstanceState((&lt;ModuleDeclaration&gt;node).body);
     }
     <span class="hljs-keyword">else</span> {
diff --git a/test/markup/typescript/jsx.txt b/test/markup/typescript/jsx.txt
index 72d8fe363c..48b64d3bd8 100644
--- a/test/markup/typescript/jsx.txt
+++ b/test/markup/typescript/jsx.txt
@@ -1,38 +1,16 @@
-export function getModuleInstanceState(node: Node): ModuleInstanceState {
-    // A module is uninstantiated if it contains only
-    // 1. interface declarations, type alias declarations
-    if (node.kind === SyntaxKind.InterfaceDeclaration || node.kind === SyntaxKind.TypeAliasDeclaration) {
-        return ModuleInstanceState.NonInstantiated;
-    }
-    // 2. const enum declarations
-    else if (isConstEnumDeclaration(node)) {
-        return ModuleInstanceState.ConstEnumOnly;
-    }
-    // 3. non-exported import declarations
-    else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && !(node.flags & NodeFlags.Export)) {
-        return ModuleInstanceState.NonInstantiated;
-    }
-    // 4. other uninstantiated module declarations.
-    else if (node.kind === SyntaxKind.ModuleBlock) {
-        let state = ModuleInstanceState.NonInstantiated;
-        forEachChild(node, n => {
-            switch (getModuleInstanceState(n)) {
-                case ModuleInstanceState.NonInstantiated:
-                    // child is non-instantiated - continue searching
-                    return false;
-                case ModuleInstanceState.ConstEnumOnly:
-                    // child is const enum only - record state and continue searching
-                    state = ModuleInstanceState.ConstEnumOnly;
-                    return false;
-                case ModuleInstanceState.Instantiated:
-                    // child is instantiated - record state and stop
-                    state = ModuleInstanceState.Instantiated;
-                    return true;
-            }
-        });
-        return state;
+class MyComponent extends Component<Props> {
+    render() {
+        let a : Array<Array<number>> = [[1,2]];
+        let b = new Map<string,number>();
+        return (
+            <div />
+        );
     }
+}
+
+export function getModuleInstanceState(node: Node): ModuleInstanceState {
     else if (node.kind === SyntaxKind.ModuleDeclaration) {
+        return getModuleInstanceState((<Array<Array<number>>node).body);
         return getModuleInstanceState((<ModuleDeclaration>node).body);
     }
     else {
diff --git a/test/markup/typescript/module-id.expect.txt b/test/markup/typescript/module-id.expect.txt
index b7582e6559..b12d006b91 100644
--- a/test/markup/typescript/module-id.expect.txt
+++ b/test/markup/typescript/module-id.expect.txt
@@ -1,14 +1,14 @@
 <span class="hljs-meta">@Component</span>({
-  selector: <span class="hljs-string">&#x27;my-example&#x27;</span>,
-  directives: [SomeDirective],
-  templateUrl: <span class="hljs-string">&#x27;./my-example.component.html&#x27;</span>,
-  moduleId: <span class="hljs-built_in">module</span>.id,
-  styles: [<span class="hljs-string">`
+  <span class="hljs-attr">selector</span>: <span class="hljs-string">&#x27;my-example&#x27;</span>,
+  <span class="hljs-attr">directives</span>: [SomeDirective],
+  <span class="hljs-attr">templateUrl</span>: <span class="hljs-string">&#x27;./my-example.component.html&#x27;</span>,
+  <span class="hljs-attr">moduleId</span>: <span class="hljs-built_in">module</span>.id,
+  <span class="hljs-attr">styles</span>: [<span class="hljs-string">`
     .my-example {
       padding: 5px;
     }
   `</span>]
 })
-<span class="hljs-keyword">export</span> <span class="hljs-keyword">class</span> MyExampleComponent {
-  someProp: <span class="hljs-built_in">string</span> = <span class="hljs-string">&quot;blah&quot;</span>;
-}
\ No newline at end of file
+<span class="hljs-keyword">export</span> <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">MyExampleComponent</span> </span>{
+  <span class="hljs-attr">someProp</span>: <span class="hljs-built_in">string</span> = <span class="hljs-string">&quot;blah&quot;</span>;
+}
diff --git a/test/markup/typescript/module-id.txt b/test/markup/typescript/module-id.txt
index ed0ebbb0b8..a9f57c4281 100644
--- a/test/markup/typescript/module-id.txt
+++ b/test/markup/typescript/module-id.txt
@@ -11,4 +11,4 @@
 })
 export class MyExampleComponent {
   someProp: string = "blah";
-}
\ No newline at end of file
+}
diff --git a/types/index.d.ts b/types/index.d.ts
index ab38f736b1..ee4cc79d01 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -154,10 +154,11 @@ interface LanguageDetail {
     rawDefinition?: () => Language
     aliases?: string[]
     disableAutodetect?: boolean
-    contains: ("self"|Mode)[]
+    contains: (Mode)[]
     case_insensitive?: boolean
     keywords?: Record<string, any> | string
-    compiled?: boolean
+    compiled?: boolean,
+    exports?: any
 }
 
 type Language = LanguageDetail & Partial<Mode>
@@ -213,6 +214,7 @@ interface ModeDetails {
     // parsed
     subLanguage?: string | string[]
     compiled?: boolean
+    label?: string
 }
 
 // deprecated API since v10

From 14e1f6542ee05b9a063c1e161d5661c90483f40d Mon Sep 17 00:00:00 2001
From: Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>
Date: Sat, 3 Oct 2020 11:40:39 -0400
Subject: [PATCH 055/223] enh(build) slimmer Docker image and add .dockerignore
 (#2719)

* use node:12-slim base image + minor cleanups
* do not copy unnecessary things into the Docker images

- The use of `node:12-slim` as a base image dramatically decreases Docker image size (from 1.1 GB to 342 MB).
---
 .dockerignore | 15 +++++++++++++++
 Dockerfile    | 22 +++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..a3d789ae81
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,15 @@
+.DS_Store
+build
+docs/_build
+__pycache__
+*.swp
+node_modules
+.project
+
+# editors
+.idea/
+.vscode/
+.Rproj.user
+
+# misc
+/work
diff --git a/Dockerfile b/Dockerfile
index c41904b806..e6ed8aaae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,22 @@
-FROM node:12
-# docker build -t highlight-js .
-RUN apt-get update && apt-get install -y nginx
+# Dockerfile for highlight.js
+#
+# Build image:
+#   docker build -t highlight-js .
+#
+# Run container:
+#   docker run --rm -it --publish 8080:80 highlight-js
+#
+#   And open a browser to http://localhost:8080
+
+FROM node:12-slim
+RUN apt-get update -qq \
+    && apt-get install --yes --no-install-recommends \
+        nginx \
+    && rm -rf /var/lib/apt/lists/*
 WORKDIR /var/www/html
-COPY ./package*.json /var/www/html/
+COPY package*.json /var/www/html/
 RUN npm install
-COPY . /var/www/html
+COPY . .
 RUN node tools/build.js :common
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

From 4e17c1a0e8545ed034e187eae235a248f655fc2a Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sat, 3 Oct 2020 13:21:43 -0400
Subject: [PATCH 056/223] enh(js/ts) Implement Numeric Separator proposal
 (#2617)

* Implement Numeric Separator proposal

Refs: https://github.com/tc39/proposal-numeric-separator
Refs: https://tc39.es/ecma262/#sec-literals-numeric-literals

Since TS builds upon JS this also adds support to TypeScript as well.
---
 CHANGES.md                                    |  3 ++
 src/languages/javascript.js                   | 20 ++++++--
 test/markup/javascript/keywords.expect.txt    |  2 +-
 test/markup/javascript/numbers.expect.txt     | 50 +++++++++++++++++++
 test/markup/javascript/numbers.txt            | 50 +++++++++++++++++++
 .../typescript/numbers-and-dashes.expect.txt  |  9 ++++
 test/markup/typescript/numbers-and-dashes.txt |  9 ++++
 test/markup/typescript/numbers.expect.txt     | 50 +++++++++++++++++++
 test/markup/typescript/numbers.txt            | 50 +++++++++++++++++++
 9 files changed, 239 insertions(+), 4 deletions(-)
 create mode 100644 test/markup/javascript/numbers.expect.txt
 create mode 100644 test/markup/javascript/numbers.txt
 create mode 100644 test/markup/typescript/numbers-and-dashes.expect.txt
 create mode 100644 test/markup/typescript/numbers-and-dashes.txt
 create mode 100644 test/markup/typescript/numbers.expect.txt
 create mode 100644 test/markup/typescript/numbers.txt

diff --git a/CHANGES.md b/CHANGES.md
index ddede5aef3..d3e6f6a6f4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,8 @@ Language Improvements:
 - fix(scala) Comments inside class header should be highlighted (#1559) [Josh Goebel][]
 - fix(c-like) Correctly highlight modifiers (`final`) in class declaration (#2696) [Josh Goebel][]
 - enh(angelscript) Improve heredocs, numbers, metadata blocks (#2724) [Melissa Geels][]
+- enh(javascript) Implement Numeric Separators (#2617) [Antoine du Hamel][]
+- enh(typescript) TypeScript also gains support for numeric separators (#2617) [Antoine du Hamel][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
@@ -21,6 +23,7 @@ Language Improvements:
 [Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
 [Melissa Geels]: https://github.com/codecat
+[Antoine du Hamel]: https://github.com/aduh95
 
 
 ## Version 10.2.1
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 1603545154..428b473a5e 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -63,12 +63,26 @@ export default function(hljs) {
     literal: ECMAScript.LITERALS.join(" "),
     built_in: ECMAScript.BUILT_INS.join(" ")
   };
+  const nonDecimalLiterals = (prefixLetters, validChars) => 
+    `\\b0[${prefixLetters}][${validChars}]([${validChars}_]*[${validChars}])?n?`;
+  const noLeadingZeroDecimalDigits = /[1-9]([0-9_]*\d)?/;
+  const decimalDigits = /\d([0-9_]*\d)?/;
+  const exponentPart = regex.concat(/[eE][+-]?/, decimalDigits);
   const NUMBER = {
     className: 'number',
     variants: [
-      { begin: '\\b(0[bB][01]+)n?' },
-      { begin: '\\b(0[oO][0-7]+)n?' },
-      { begin: hljs.C_NUMBER_RE + 'n?' }
+      { begin: nonDecimalLiterals('bB', '01') }, // Binary literals
+      { begin: nonDecimalLiterals('oO', '0-7') }, // Octal literals
+      { begin: nonDecimalLiterals('xX', '0-9a-fA-F') }, // Hexadecimal literals
+      { begin: regex.concat(/\b/, noLeadingZeroDecimalDigits, 'n') }, // Non-zero BigInt literals
+      { begin: regex.concat(/(\b0)?\./, decimalDigits, regex.optional(exponentPart)) }, // Decimal literals between 0 and 1
+      { begin: regex.concat(
+        /\b/,
+        noLeadingZeroDecimalDigits,
+        regex.optional(regex.concat(/\./, regex.optional(decimalDigits))), // fractional part
+        regex.optional(exponentPart)
+        ) }, // Decimal literals >= 1
+      { begin: /\b0[\.n]?/ }, // Zero literals (`0`, `0.`, `0n`)
     ],
     relevance: 0
   };
diff --git a/test/markup/javascript/keywords.expect.txt b/test/markup/javascript/keywords.expect.txt
index 35f70a2546..b2f2241f2a 100644
--- a/test/markup/javascript/keywords.expect.txt
+++ b/test/markup/javascript/keywords.expect.txt
@@ -1,6 +1,6 @@
 <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">$initHighlight</span>(<span class="hljs-params">block, cls</span>) </span>{
   <span class="hljs-keyword">try</span> {
-    <span class="hljs-keyword">if</span> (cls.search(<span class="hljs-regexp">/\bno\-highlight\b/</span>) != <span class="hljs-number">-1</span>)
+    <span class="hljs-keyword">if</span> (cls.search(<span class="hljs-regexp">/\bno\-highlight\b/</span>) != -<span class="hljs-number">1</span>)
       <span class="hljs-keyword">return</span> process(block, <span class="hljs-literal">true</span>, <span class="hljs-number">0x0F</span>) +
              <span class="hljs-string">&#x27; class=&quot;&quot;&#x27;</span>;
   } <span class="hljs-keyword">catch</span> (e) {
diff --git a/test/markup/javascript/numbers.expect.txt b/test/markup/javascript/numbers.expect.txt
new file mode 100644
index 0000000000..8f1bb93a98
--- /dev/null
+++ b/test/markup/javascript/numbers.expect.txt
@@ -0,0 +1,50 @@
+<span class="hljs-number">1000000000</span>   <span class="hljs-comment">// Is this a billion? a hundred millions? Ten millions?</span>
+<span class="hljs-number">101475938.38</span> <span class="hljs-comment">// what scale is this? what power of 10?</span>
+
+<span class="hljs-keyword">const</span> FEE = <span class="hljs-number">12300</span>;
+<span class="hljs-comment">// is this 12,300? Or 123, because it&#x27;s in cents?</span>
+
+<span class="hljs-keyword">const</span> AMOUNT = <span class="hljs-number">1234500</span>;
+<span class="hljs-comment">// is this 1,234,500? Or cents, hence 12,345? Or financial, 4-fixed 123.45?</span>
+
+<span class="hljs-number">1_000_000_000</span>           <span class="hljs-comment">// Ah, so a billion</span>
+<span class="hljs-number">101_475_938.38</span>          <span class="hljs-comment">// And this is hundreds of millions</span>
+
+<span class="hljs-keyword">let</span> fee = <span class="hljs-number">123_00</span>;       <span class="hljs-comment">// $123 (12300 cents, apparently)</span>
+<span class="hljs-keyword">let</span> fee = <span class="hljs-number">12_300</span>;       <span class="hljs-comment">// $12,300 (woah, that fee!)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">12345_00</span>;  <span class="hljs-comment">// 12,345 (1234500 cents, apparently)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">123_4500</span>;  <span class="hljs-comment">// 123.45 (4-fixed financial)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">1_234_500</span>; <span class="hljs-comment">// 1,234,500</span>
+
+<span class="hljs-number">0.000001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">0.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+-<span class="hljs-number">.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">1e10_000</span>  <span class="hljs-comment">// 10^10000 -- granted, far less useful / in-range...</span>
+
+<span class="hljs-keyword">let</span> nibbles = <span class="hljs-number">0b1010_0001_1000_0101</span>;
+<span class="hljs-keyword">let</span> message = <span class="hljs-number">0xA0_B0_C0</span>;
+
+<span class="hljs-keyword">let</span> x1 = _52;              <span class="hljs-comment">// This is an identifier, not a numeric literal</span>
+<span class="hljs-keyword">let</span> x2 = <span class="hljs-number">5_2</span>;              <span class="hljs-comment">// OK (decimal literal)</span>
+
+<span class="hljs-keyword">let</span> x7 = <span class="hljs-number">0x5_2</span>;            <span class="hljs-comment">// OK (hexadecimal literal)</span>
+<span class="hljs-number">0xff</span>
+<span class="hljs-number">0xdead_beef</span>
+
+<span class="hljs-number">0o52</span>
+<span class="hljs-number">0O52</span>
+
+<span class="hljs-number">0xa</span>
+<span class="hljs-number">0Xa</span>
+<span class="hljs-number">0XA</span>
+<span class="hljs-number">0xA</span>
+
+<span class="hljs-number">0n</span>
+<span class="hljs-number">2n</span>
+<span class="hljs-number">20n</span>
+<span class="hljs-number">2_0n</span>
+<span class="hljs-number">2_00n</span>
+<span class="hljs-number">2_0_0n</span>
+<span class="hljs-number">20_0n</span>
+-<span class="hljs-number">20_0n</span>
diff --git a/test/markup/javascript/numbers.txt b/test/markup/javascript/numbers.txt
new file mode 100644
index 0000000000..40d4311c50
--- /dev/null
+++ b/test/markup/javascript/numbers.txt
@@ -0,0 +1,50 @@
+1000000000   // Is this a billion? a hundred millions? Ten millions?
+101475938.38 // what scale is this? what power of 10?
+
+const FEE = 12300;
+// is this 12,300? Or 123, because it's in cents?
+
+const AMOUNT = 1234500;
+// is this 1,234,500? Or cents, hence 12,345? Or financial, 4-fixed 123.45?
+
+1_000_000_000           // Ah, so a billion
+101_475_938.38          // And this is hundreds of millions
+
+let fee = 123_00;       // $123 (12300 cents, apparently)
+let fee = 12_300;       // $12,300 (woah, that fee!)
+let amount = 12345_00;  // 12,345 (1234500 cents, apparently)
+let amount = 123_4500;  // 123.45 (4-fixed financial)
+let amount = 1_234_500; // 1,234,500
+
+0.000001 // 1 millionth
+0.000_001 // 1 millionth
+.000_001 // 1 millionth
+-.000_001 // 1 millionth
+1e10_000  // 10^10000 -- granted, far less useful / in-range...
+
+let nibbles = 0b1010_0001_1000_0101;
+let message = 0xA0_B0_C0;
+
+let x1 = _52;              // This is an identifier, not a numeric literal
+let x2 = 5_2;              // OK (decimal literal)
+
+let x7 = 0x5_2;            // OK (hexadecimal literal)
+0xff
+0xdead_beef
+
+0o52
+0O52
+
+0xa
+0Xa
+0XA
+0xA
+
+0n
+2n
+20n
+2_0n
+2_00n
+2_0_0n
+20_0n
+-20_0n
diff --git a/test/markup/typescript/numbers-and-dashes.expect.txt b/test/markup/typescript/numbers-and-dashes.expect.txt
new file mode 100644
index 0000000000..5f03b5decb
--- /dev/null
+++ b/test/markup/typescript/numbers-and-dashes.expect.txt
@@ -0,0 +1,9 @@
+<span class="hljs-keyword">let</span> num = -<span class="hljs-number">3</span>;
+
+<span class="hljs-keyword">let</span> diff = <span class="hljs-number">5</span> - <span class="hljs-number">3</span>;
+<span class="hljs-keyword">let</span> diff = <span class="hljs-number">5</span>-<span class="hljs-number">3</span>;
+
+<span class="hljs-comment">// Who writes JS like that??</span>
+<span class="hljs-keyword">let</span> num = - <span class="hljs-number">3</span>;
+<span class="hljs-keyword">let</span> diff = <span class="hljs-number">5</span> -<span class="hljs-number">3</span>;
+<span class="hljs-keyword">let</span> diff = <span class="hljs-number">5</span>- <span class="hljs-number">3</span>;
diff --git a/test/markup/typescript/numbers-and-dashes.txt b/test/markup/typescript/numbers-and-dashes.txt
new file mode 100644
index 0000000000..a419d80048
--- /dev/null
+++ b/test/markup/typescript/numbers-and-dashes.txt
@@ -0,0 +1,9 @@
+let num = -3;
+
+let diff = 5 - 3;
+let diff = 5-3;
+
+// Who writes JS like that??
+let num = - 3;
+let diff = 5 -3;
+let diff = 5- 3;
diff --git a/test/markup/typescript/numbers.expect.txt b/test/markup/typescript/numbers.expect.txt
new file mode 100644
index 0000000000..8f1bb93a98
--- /dev/null
+++ b/test/markup/typescript/numbers.expect.txt
@@ -0,0 +1,50 @@
+<span class="hljs-number">1000000000</span>   <span class="hljs-comment">// Is this a billion? a hundred millions? Ten millions?</span>
+<span class="hljs-number">101475938.38</span> <span class="hljs-comment">// what scale is this? what power of 10?</span>
+
+<span class="hljs-keyword">const</span> FEE = <span class="hljs-number">12300</span>;
+<span class="hljs-comment">// is this 12,300? Or 123, because it&#x27;s in cents?</span>
+
+<span class="hljs-keyword">const</span> AMOUNT = <span class="hljs-number">1234500</span>;
+<span class="hljs-comment">// is this 1,234,500? Or cents, hence 12,345? Or financial, 4-fixed 123.45?</span>
+
+<span class="hljs-number">1_000_000_000</span>           <span class="hljs-comment">// Ah, so a billion</span>
+<span class="hljs-number">101_475_938.38</span>          <span class="hljs-comment">// And this is hundreds of millions</span>
+
+<span class="hljs-keyword">let</span> fee = <span class="hljs-number">123_00</span>;       <span class="hljs-comment">// $123 (12300 cents, apparently)</span>
+<span class="hljs-keyword">let</span> fee = <span class="hljs-number">12_300</span>;       <span class="hljs-comment">// $12,300 (woah, that fee!)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">12345_00</span>;  <span class="hljs-comment">// 12,345 (1234500 cents, apparently)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">123_4500</span>;  <span class="hljs-comment">// 123.45 (4-fixed financial)</span>
+<span class="hljs-keyword">let</span> amount = <span class="hljs-number">1_234_500</span>; <span class="hljs-comment">// 1,234,500</span>
+
+<span class="hljs-number">0.000001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">0.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+-<span class="hljs-number">.000_001</span> <span class="hljs-comment">// 1 millionth</span>
+<span class="hljs-number">1e10_000</span>  <span class="hljs-comment">// 10^10000 -- granted, far less useful / in-range...</span>
+
+<span class="hljs-keyword">let</span> nibbles = <span class="hljs-number">0b1010_0001_1000_0101</span>;
+<span class="hljs-keyword">let</span> message = <span class="hljs-number">0xA0_B0_C0</span>;
+
+<span class="hljs-keyword">let</span> x1 = _52;              <span class="hljs-comment">// This is an identifier, not a numeric literal</span>
+<span class="hljs-keyword">let</span> x2 = <span class="hljs-number">5_2</span>;              <span class="hljs-comment">// OK (decimal literal)</span>
+
+<span class="hljs-keyword">let</span> x7 = <span class="hljs-number">0x5_2</span>;            <span class="hljs-comment">// OK (hexadecimal literal)</span>
+<span class="hljs-number">0xff</span>
+<span class="hljs-number">0xdead_beef</span>
+
+<span class="hljs-number">0o52</span>
+<span class="hljs-number">0O52</span>
+
+<span class="hljs-number">0xa</span>
+<span class="hljs-number">0Xa</span>
+<span class="hljs-number">0XA</span>
+<span class="hljs-number">0xA</span>
+
+<span class="hljs-number">0n</span>
+<span class="hljs-number">2n</span>
+<span class="hljs-number">20n</span>
+<span class="hljs-number">2_0n</span>
+<span class="hljs-number">2_00n</span>
+<span class="hljs-number">2_0_0n</span>
+<span class="hljs-number">20_0n</span>
+-<span class="hljs-number">20_0n</span>
diff --git a/test/markup/typescript/numbers.txt b/test/markup/typescript/numbers.txt
new file mode 100644
index 0000000000..40d4311c50
--- /dev/null
+++ b/test/markup/typescript/numbers.txt
@@ -0,0 +1,50 @@
+1000000000   // Is this a billion? a hundred millions? Ten millions?
+101475938.38 // what scale is this? what power of 10?
+
+const FEE = 12300;
+// is this 12,300? Or 123, because it's in cents?
+
+const AMOUNT = 1234500;
+// is this 1,234,500? Or cents, hence 12,345? Or financial, 4-fixed 123.45?
+
+1_000_000_000           // Ah, so a billion
+101_475_938.38          // And this is hundreds of millions
+
+let fee = 123_00;       // $123 (12300 cents, apparently)
+let fee = 12_300;       // $12,300 (woah, that fee!)
+let amount = 12345_00;  // 12,345 (1234500 cents, apparently)
+let amount = 123_4500;  // 123.45 (4-fixed financial)
+let amount = 1_234_500; // 1,234,500
+
+0.000001 // 1 millionth
+0.000_001 // 1 millionth
+.000_001 // 1 millionth
+-.000_001 // 1 millionth
+1e10_000  // 10^10000 -- granted, far less useful / in-range...
+
+let nibbles = 0b1010_0001_1000_0101;
+let message = 0xA0_B0_C0;
+
+let x1 = _52;              // This is an identifier, not a numeric literal
+let x2 = 5_2;              // OK (decimal literal)
+
+let x7 = 0x5_2;            // OK (hexadecimal literal)
+0xff
+0xdead_beef
+
+0o52
+0O52
+
+0xa
+0Xa
+0XA
+0xA
+
+0n
+2n
+20n
+2_0n
+2_00n
+2_0_0n
+20_0n
+-20_0n

From 32d141811c83ed2219600ca696b6fc2dc105e648 Mon Sep 17 00:00:00 2001
From: Konrad Rudolph <konrad.rudolph@gmail.com>
Date: Sun, 4 Oct 2020 00:00:42 +0100
Subject: [PATCH 057/223] enh(Python) Some Python language improvements (#2715)

---
 CHANGES.md                                    |   1 +
 src/languages/python.js                       | 169 +++++++++++++++---
 test/markup/python-repl/sample.expect.txt     |   6 +-
 test/markup/python/escaped-quotes.expect.txt  |  18 +-
 test/markup/python/escaped-quotes.txt         |  18 +-
 test/markup/python/f-strings.expect.txt       |   4 +-
 test/markup/python/f-strings.txt              |   2 +-
 test/markup/python/function-header.expect.txt |   4 +-
 test/markup/python/function-header.txt        |   2 +-
 test/markup/python/keywords.expect.txt        |  12 ++
 test/markup/python/keywords.txt               |  12 ++
 11 files changed, 205 insertions(+), 43 deletions(-)
 create mode 100644 test/markup/python/keywords.expect.txt
 create mode 100644 test/markup/python/keywords.txt

diff --git a/CHANGES.md b/CHANGES.md
index d3e6f6a6f4..af477355fd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
 - fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
 - enh(r) major overhaul of the R language grammar (and fix a few bugs) (#2680) [Konrad Rudolph][]
 - enh(csharp) Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
diff --git a/src/languages/python.js b/src/languages/python.js
index 86e5d32066..d737f4e6cf 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -6,77 +6,195 @@ Category: common
 */
 
 export default function(hljs) {
-  var KEYWORDS = {
-    keyword:
-      'and elif is global as in if from raise for except finally print import pass return ' +
-      'exec else break not with class assert yield try while continue del or def lambda ' +
-      'async await nonlocal|10',
-    built_in:
-      'Ellipsis NotImplemented',
-    literal: 'False None True'
+  const RESERVED_WORDS = [
+    'and',
+    'as',
+    'assert',
+    'async',
+    'await',
+    'break',
+    'class',
+    'continue',
+    'def',
+    'del',
+    'elif',
+    'else',
+    'except',
+    'finally',
+    'for',
+    '',
+    'from',
+    'global',
+    'if',
+    'import',
+    'in',
+    'is',
+    'lambda',
+    'nonlocal|10',
+    'not',
+    'or',
+    'pass',
+    'raise',
+    'return',
+    'try',
+    'while',
+    'with',
+    'yield',
+  ];
+
+  const BUILT_INS = [
+    '__import__',
+    'abs',
+    'all',
+    'any',
+    'ascii',
+    'bin',
+    'bool',
+    'breakpoint',
+    'bytearray',
+    'bytes',
+    'callable',
+    'chr',
+    'classmethod',
+    'compile',
+    'complex',
+    'delattr',
+    'dict',
+    'dir',
+    'divmod',
+    'enumerate',
+    'eval',
+    'exec',
+    'filter',
+    'float',
+    'format',
+    'frozenset',
+    'getattr',
+    'globals',
+    'hasattr',
+    'hash',
+    'help',
+    'hex',
+    'id',
+    'input',
+    'int',
+    'isinstance',
+    'issubclass',
+    'iter',
+    'len',
+    'list',
+    'locals',
+    'map',
+    'max',
+    'memoryview',
+    'min',
+    'next',
+    'object',
+    'oct',
+    'open',
+    'ord',
+    'pow',
+    'print',
+    'property',
+    'range',
+    'repr',
+    'reversed',
+    'round',
+    'set',
+    'setattr',
+    'slice',
+    'sorted',
+    'staticmethod',
+    'str',
+    'sum',
+    'super',
+    'tuple',
+    'type',
+    'vars',
+    'zip',
+  ];
+
+  const LITERALS = [
+    '__debug__',
+    'Ellipsis',
+    'False',
+    'None',
+    'NotImplemented',
+    'True',
+  ];
+
+  const KEYWORDS = {
+    keyword: RESERVED_WORDS.join(' '),
+    built_in: BUILT_INS.join(' '),
+    literal: LITERALS.join(' ')
   };
-  var PROMPT = {
+
+  const PROMPT = {
     className: 'meta',  begin: /^(>>>|\.\.\.) /
   };
-  var SUBST = {
+
+  const SUBST = {
     className: 'subst',
     begin: /\{/, end: /\}/,
     keywords: KEYWORDS,
     illegal: /#/
   };
-  var LITERAL_BRACKET = {
+
+  const LITERAL_BRACKET = {
     begin: /\{\{/,
     relevance: 0
   };
-  var STRING = {
+
+  const STRING = {
     className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE],
     variants: [
       {
-        begin: /(u|b)?r?'''/, end: /'''/,
+        begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/, end: /'''/,
         contains: [hljs.BACKSLASH_ESCAPE, PROMPT],
         relevance: 10
       },
       {
-        begin: /(u|b)?r?"""/, end: /"""/,
+        begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/, end: /"""/,
         contains: [hljs.BACKSLASH_ESCAPE, PROMPT],
         relevance: 10
       },
       {
-        begin: /(fr|rf|f)'''/, end: /'''/,
+        begin: /([fF][rR]|[rR][fF]|[fF])'''/, end: /'''/,
         contains: [hljs.BACKSLASH_ESCAPE, PROMPT, LITERAL_BRACKET, SUBST]
       },
       {
-        begin: /(fr|rf|f)"""/, end: /"""/,
+        begin: /([fF][rR]|[rR][fF]|[fF])"""/, end: /"""/,
         contains: [hljs.BACKSLASH_ESCAPE, PROMPT, LITERAL_BRACKET, SUBST]
       },
       {
-        begin: /(u|r|ur)'/, end: /'/,
+        begin: /([uU]|[rR])'/, end: /'/,
         relevance: 10
       },
       {
-        begin: /(u|r|ur)"/, end: /"/,
+        begin: /([uU]|[rR])"/, end: /"/,
         relevance: 10
       },
       {
-        begin: /(b|br)'/, end: /'/
+        begin: /([bB]|[bB][rR]|[rR][bB])'/, end: /'/
       },
       {
-        begin: /(b|br)"/, end: /"/
+        begin: /([bB]|[bB][rR]|[rR][bB])"/, end: /"/
       },
       {
-        begin: /(fr|rf|f)'/, end: /'/,
+        begin: /([fF][rR]|[rR][fF]|[fF])'/, end: /'/,
         contains: [hljs.BACKSLASH_ESCAPE, LITERAL_BRACKET, SUBST]
       },
       {
-        begin: /(fr|rf|f)"/, end: /"/,
+        begin: /([fF][rR]|[rR][fF]|[fF])"/, end: /"/,
         contains: [hljs.BACKSLASH_ESCAPE, LITERAL_BRACKET, SUBST]
       },
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE
     ]
   };
-  var NUMBER = {
+
+  const NUMBER = {
     className: 'number', relevance: 0,
     variants: [
       {begin: hljs.BINARY_NUMBER_RE + '[lLjJ]?'},
@@ -84,18 +202,21 @@ export default function(hljs) {
       {begin: hljs.C_NUMBER_RE + '[lLjJ]?'}
     ]
   };
-  var PARAMS = {
+
+  const PARAMS = {
     className: 'params',
     variants: [
       // Exclude params at functions without params
       {begin: /\(\s*\)/, skip: true, className: null },
       {
         begin: /\(/, end: /\)/, excludeBegin: true, excludeEnd: true,
+        keywords: KEYWORDS,
         contains: ['self', PROMPT, NUMBER, STRING, hljs.HASH_COMMENT_MODE],
       },
     ],
   };
   SUBST.contains = [STRING, NUMBER, PROMPT];
+
   return {
     name: 'Python',
     aliases: ['py', 'gyp', 'ipython'],
diff --git a/test/markup/python-repl/sample.expect.txt b/test/markup/python-repl/sample.expect.txt
index b4d5b45928..53020f2385 100644
--- a/test/markup/python-repl/sample.expect.txt
+++ b/test/markup/python-repl/sample.expect.txt
@@ -3,9 +3,9 @@
 &quot;foo = 42&quot;
 <span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python">print(v)</span>
 foo = 42
-<span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python">print(repr(v).rstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
+<span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python">print(<span class="hljs-built_in">repr</span>(v).rstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
 &quot;foo = 42
-<span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python">print(repr(v).lstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
+<span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python">print(<span class="hljs-built_in">repr</span>(v).lstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
 foo = 42&quot;
 
 <span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python"><span class="hljs-string">&quot;&quot;&quot;</span></span>
@@ -14,4 +14,4 @@ foo = 42&quot;
 <span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python"><span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">test</span>():</span></span>
 <span class="hljs-meta">...</span> <span class="python">    <span class="hljs-keyword">pass</span></span>
 <span class="hljs-meta">&gt;&gt;&gt;</span>
-<span class="hljs-meta">&gt;&gt;&gt;</span>
+<span class="hljs-meta">&gt;&gt;&gt;</span>
\ No newline at end of file
diff --git a/test/markup/python/escaped-quotes.expect.txt b/test/markup/python/escaped-quotes.expect.txt
index 9afa43acc8..e56a06c2ce 100644
--- a/test/markup/python/escaped-quotes.expect.txt
+++ b/test/markup/python/escaped-quotes.expect.txt
@@ -2,15 +2,15 @@
 <span class="hljs-string">u&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
 <span class="hljs-string">b&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
 <span class="hljs-string">r&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
-<span class="hljs-string">ur&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
 <span class="hljs-string">br&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
+<span class="hljs-string">rb&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
 
 <span class="hljs-string">&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
 <span class="hljs-string">u&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
 <span class="hljs-string">b&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
 <span class="hljs-string">r&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
-<span class="hljs-string">ur&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
 <span class="hljs-string">br&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
+<span class="hljs-string">rb&quot;&quot;&quot;text \&quot;&quot;&quot; text&quot;&quot;&quot;</span>
 
 <span class="hljs-string">f&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
 <span class="hljs-string">fr&#x27;&#x27;&#x27;text \&#x27;&#x27;&#x27; text&#x27;&#x27;&#x27;</span>
@@ -22,17 +22,17 @@
 
 <span class="hljs-string">u&#x27;text \&#x27; text&#x27;</span>
 <span class="hljs-string">r&#x27;text \&#x27; text&#x27;</span>
-<span class="hljs-string">ur&#x27;text \&#x27; text&#x27;</span>
 
 <span class="hljs-string">u&quot;text \&quot; text&quot;</span>
 <span class="hljs-string">r&quot;text \&quot; text&quot;</span>
-<span class="hljs-string">ur&quot;text \&quot; text&quot;</span>
 
 <span class="hljs-string">b&#x27;text \&#x27; text&#x27;</span>
 <span class="hljs-string">br&#x27;text \&#x27; text&#x27;</span>
+<span class="hljs-string">rb&#x27;text \&#x27; text&#x27;</span>
 
 <span class="hljs-string">b&quot;text \&quot; text&quot;</span>
 <span class="hljs-string">br&quot;text \&quot; text&quot;</span>
+<span class="hljs-string">rb&quot;text \&quot; text&quot;</span>
 
 <span class="hljs-string">f&#x27;text \&#x27; text&#x27;</span>
 <span class="hljs-string">fr&#x27;text \&#x27; text&#x27;</span>
@@ -40,4 +40,12 @@
 
 <span class="hljs-string">f&quot;text \&quot; text&quot;</span>
 <span class="hljs-string">fr&quot;text \&quot; text&quot;</span>
-<span class="hljs-string">rf&quot;text \&quot; text&quot;</span>
\ No newline at end of file
+<span class="hljs-string">rf&quot;text \&quot; text&quot;</span>
+
+<span class="hljs-string">F&#x27;text \&#x27; text&#x27;</span>
+<span class="hljs-string">FR&#x27;text \&#x27; text&#x27;</span>
+<span class="hljs-string">Rf&#x27;text \&#x27; text&#x27;</span>
+
+<span class="hljs-string">F&quot;text \&quot; text&quot;</span>
+<span class="hljs-string">fR&quot;text \&quot; text&quot;</span>
+<span class="hljs-string">RF&quot;text \&quot; text&quot;</span>
\ No newline at end of file
diff --git a/test/markup/python/escaped-quotes.txt b/test/markup/python/escaped-quotes.txt
index 68040c931b..392e12e616 100644
--- a/test/markup/python/escaped-quotes.txt
+++ b/test/markup/python/escaped-quotes.txt
@@ -2,15 +2,15 @@
 u'''text \''' text'''
 b'''text \''' text'''
 r'''text \''' text'''
-ur'''text \''' text'''
 br'''text \''' text'''
+rb'''text \''' text'''
 
 """text \""" text"""
 u"""text \""" text"""
 b"""text \""" text"""
 r"""text \""" text"""
-ur"""text \""" text"""
 br"""text \""" text"""
+rb"""text \""" text"""
 
 f'''text \''' text'''
 fr'''text \''' text'''
@@ -22,17 +22,17 @@ rf"""text \""" text"""
 
 u'text \' text'
 r'text \' text'
-ur'text \' text'
 
 u"text \" text"
 r"text \" text"
-ur"text \" text"
 
 b'text \' text'
 br'text \' text'
+rb'text \' text'
 
 b"text \" text"
 br"text \" text"
+rb"text \" text"
 
 f'text \' text'
 fr'text \' text'
@@ -40,4 +40,12 @@ rf'text \' text'
 
 f"text \" text"
 fr"text \" text"
-rf"text \" text"
\ No newline at end of file
+rf"text \" text"
+
+F'text \' text'
+FR'text \' text'
+Rf'text \' text'
+
+F"text \" text"
+fR"text \" text"
+RF"text \" text"
diff --git a/test/markup/python/f-strings.expect.txt b/test/markup/python/f-strings.expect.txt
index 904a3a4a38..14cd2c02e9 100644
--- a/test/markup/python/f-strings.expect.txt
+++ b/test/markup/python/f-strings.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-string">f&#x27;<span class="hljs-subst">{name}</span>&#x27;</span>
-<span class="hljs-string">f&quot;<span class="hljs-subst">{name + <span class="hljs-number">5</span>}</span>&quot;</span>
+<span class="hljs-string">f&quot;<span class="hljs-subst">{<span class="hljs-built_in">len</span>(name) + <span class="hljs-number">5</span>}</span>&quot;</span>
 <span class="hljs-meta">&gt;&gt;&gt; </span><span class="hljs-string">f&quot;&quot;&quot;
 <span class="hljs-meta">... </span><span class="hljs-subst">{
 <span class="hljs-meta">... </span>   name
@@ -10,4 +10,4 @@
 <span class="hljs-string">f&quot;<span class="hljs-subst">{name + <span class="hljs-string">f&#x27;<span class="hljs-subst">{name}</span>&#x27;</span>}</span>&quot;</span>
 <span class="hljs-string">f&quot;{{ }}&quot;</span>
 <span class="hljs-keyword">if</span><span class="hljs-string">&quot;text&quot;</span>==<span class="hljs-string">&quot;text&quot;</span>:
-    <span class="hljs-string">&quot;good&quot;</span>
+    <span class="hljs-string">&quot;good&quot;</span>
\ No newline at end of file
diff --git a/test/markup/python/f-strings.txt b/test/markup/python/f-strings.txt
index 4d880603dc..1c8422f620 100644
--- a/test/markup/python/f-strings.txt
+++ b/test/markup/python/f-strings.txt
@@ -1,5 +1,5 @@
 f'{name}'
-f"{name + 5}"
+f"{len(name) + 5}"
 >>> f"""
 ... {
 ...    name
diff --git a/test/markup/python/function-header.expect.txt b/test/markup/python/function-header.expect.txt
index eb249617df..a8d74d5822 100644
--- a/test/markup/python/function-header.expect.txt
+++ b/test/markup/python/function-header.expect.txt
@@ -1,2 +1,2 @@
-<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span>(<span class="hljs-params">x: int</span>) -&gt; <span class="hljs-keyword">None</span>:</span>
-    <span class="hljs-keyword">pass</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span>(<span class="hljs-params">x: <span class="hljs-built_in">int</span>, *, y: <span class="hljs-built_in">bool</span> = <span class="hljs-literal">True</span></span>) -&gt; <span class="hljs-keyword">None</span>:</span>
+    <span class="hljs-keyword">pass</span>
\ No newline at end of file
diff --git a/test/markup/python/function-header.txt b/test/markup/python/function-header.txt
index 793e3beef7..6d71d18598 100644
--- a/test/markup/python/function-header.txt
+++ b/test/markup/python/function-header.txt
@@ -1,2 +1,2 @@
-def f(x: int) -> None:
+def f(x: int, *, y: bool = True) -> None:
     pass
diff --git a/test/markup/python/keywords.expect.txt b/test/markup/python/keywords.expect.txt
new file mode 100644
index 0000000000..c305b2e04b
--- /dev/null
+++ b/test/markup/python/keywords.expect.txt
@@ -0,0 +1,12 @@
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Shorty</span>(<span class="hljs-params"><span class="hljs-built_in">dict</span></span>):</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">len</span>(<span class="hljs-params">self</span>):</span>
+        <span class="hljs-keyword">return</span> <span class="hljs-literal">NotImplemented</span>
+
+x = Shorty()
+<span class="hljs-built_in">len</span>(x)
+
+<span class="hljs-keyword">if</span> <span class="hljs-literal">__debug__</span>:
+    sys = <span class="hljs-built_in">__import__</span>(<span class="hljs-string">&#x27;sys&#x27;</span>)
+
+<span class="hljs-keyword">for</span> _ <span class="hljs-keyword">in</span> sys.path:
+    print(_)
diff --git a/test/markup/python/keywords.txt b/test/markup/python/keywords.txt
new file mode 100644
index 0000000000..3f382d79b9
--- /dev/null
+++ b/test/markup/python/keywords.txt
@@ -0,0 +1,12 @@
+class Shorty(dict):
+    def len(self):
+        return NotImplemented
+
+x = Shorty()
+len(x)
+
+if __debug__:
+    sys = __import__('sys')
+
+for _ in sys.path:
+    print(_)

From 39b10a698a59c4f75543ee83ae7306e3339e5b08 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 4 Oct 2020 11:55:22 -0400
Subject: [PATCH 058/223] enh(bash) allow nested params (#2731)

- allow nested variables inside `${...}` blocks
---
 CHANGES.md            | 1 +
 src/languages/bash.js | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index af477355fd..510e400947 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
 - fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
 - fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
 - enh(r) major overhaul of the R language grammar (and fix a few bugs) (#2680) [Konrad Rudolph][]
diff --git a/src/languages/bash.js b/src/languages/bash.js
index 3cab99715c..cb134a0734 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -10,9 +10,14 @@ Category: common
 export default function(hljs) {
   const VAR = {};
   const BRACED_VAR = {
-    begin: /\$\{/, end:/\}/,
+    begin: /\$\{/,
+    end:/\}/,
     contains: [
-      { begin: /:-/, contains: [VAR] } // default values
+      "self",
+      {
+        begin: /:-/,
+        contains: [ VAR ]
+      } // default values
     ]
   };
   Object.assign(VAR,{

From fffde71a792274345cd91d97627a8703602b07ed Mon Sep 17 00:00:00 2001
From: Ayesh Karunaratne <Ayesh@users.noreply.github.com>
Date: Sun, 4 Oct 2020 23:44:32 +0700
Subject: [PATCH 059/223] enh(php) add PHP 8 `match` keyword; add `php8` alias
 (#2733)

* [PHP] Add `match` keyword to keywords list

PHP introduces a new [`match` keyword in PHP 8.0](https://php.watch/versions/8.0/match-expression). This commit adds the `match` keyword to the list of keywords for PHP.

* [PHP] Add 'php8' as an alias for PHP
---
 CHANGES.md           | 2 ++
 src/languages/php.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 510e400947..b9bf70c27b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Language Improvements:
 - enh(angelscript) Improve heredocs, numbers, metadata blocks (#2724) [Melissa Geels][]
 - enh(javascript) Implement Numeric Separators (#2617) [Antoine du Hamel][]
 - enh(typescript) TypeScript also gains support for numeric separators (#2617) [Antoine du Hamel][]
+- enh(php) Add support for PHP 8 `match` keyword and add `php8` as an alias (#2733) [Ayesh Karunaratne][]
 
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
@@ -26,6 +27,7 @@ Language Improvements:
 [Konrad Rudolph]: https://github.com/klmr
 [Melissa Geels]: https://github.com/codecat
 [Antoine du Hamel]: https://github.com/aduh95
+[Ayesh Karunaratne]: https://github.com/Ayesh
 
 
 ## Version 10.2.1
diff --git a/src/languages/php.js b/src/languages/php.js
index 8b4ed71896..972083e4b9 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -70,7 +70,7 @@ export default function(hljs) {
     // Other keywords:
     // <https://www.php.net/manual/en/reserved.php>
     // <https://www.php.net/manual/en/language.types.type-juggling.php>
-    'array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield',
+    'array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list match new object or private protected public real return string switch throw trait try unset use var void while xor yield',
     literal: 'false null true',
     built_in:
     // Standard PHP library:
@@ -85,7 +85,7 @@ export default function(hljs) {
     'Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass'
   };
   return {
-    aliases: ['php', 'php3', 'php4', 'php5', 'php6', 'php7'],
+    aliases: ['php', 'php3', 'php4', 'php5', 'php6', 'php7', 'php8'],
     case_insensitive: true,
     keywords: KEYWORDS,
     contains: [

From 580bb711a5c2b26e82b70525054ae9a311a41bbc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 5 Oct 2020 22:58:27 -0400
Subject: [PATCH 060/223] enh(bash) add support for heredocs (#2684)

---
 CHANGES.md                          |  1 +
 src/languages/bash.js               | 13 +++++++++++++
 test/markup/bash/strings.expect.txt | 11 +++++++++++
 test/markup/bash/strings.txt        | 11 +++++++++++
 4 files changed, 36 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b9bf70c27b..695bc4b391 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Language Improvements:
 - fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
 - fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
 - fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
+- enh(bash) add support for heredocs (#2684) [Josh Goebel][]
 - enh(r) major overhaul of the R language grammar (and fix a few bugs) (#2680) [Konrad Rudolph][]
 - enh(csharp) Add all C# 9 keywords, and other missing keywords (#2679) [David Pine][]
 - enh(objectivec) Add `objective-c++` and `obj-c++` aliases for Objective-C [Josh Goebel][]
diff --git a/src/languages/bash.js b/src/languages/bash.js
index cb134a0734..eb62efe04d 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -33,6 +33,18 @@ export default function(hljs) {
     begin: /\$\(/, end: /\)/,
     contains: [hljs.BACKSLASH_ESCAPE]
   };
+  const HERE_DOC = {
+    begin: /<<-?\s*(?=\w+)/,
+    starts: {
+      contains: [
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(\w+)/,
+          end: /(\w+)/,
+          className: 'string'
+        })
+      ]
+    }
+  };
   const QUOTE_STRING = {
     className: 'string',
     begin: /"/, end: /"/,
@@ -117,6 +129,7 @@ export default function(hljs) {
       FUNCTION,
       ARITHMETIC,
       hljs.HASH_COMMENT_MODE,
+      HERE_DOC,
       QUOTE_STRING,
       ESCAPED_QUOTE,
       APOS_STRING,
diff --git a/test/markup/bash/strings.expect.txt b/test/markup/bash/strings.expect.txt
index 4b8adce812..e2715c2fc6 100644
--- a/test/markup/bash/strings.expect.txt
+++ b/test/markup/bash/strings.expect.txt
@@ -1,3 +1,14 @@
 SCRIPT_DIR=<span class="hljs-string">&quot;<span class="hljs-subst">$( cd <span class="hljs-string">&quot;<span class="hljs-subst">$( dirname <span class="hljs-string">&quot;<span class="hljs-variable">${BASH_SOURCE[0]}</span>&quot;</span> )</span>&quot;</span> &gt;/dev/null 2&gt;&amp;1 &amp;&amp; pwd )</span>&quot;</span>
 TLS_DIR=<span class="hljs-string">&quot;<span class="hljs-variable">$SCRIPT_DIR</span>/../src/main/resources/tls&quot;</span>
 ROOT_DIR=<span class="hljs-string">&quot;<span class="hljs-variable">$SCRIPT_DIR</span>/..&quot;</span>
+
+jshell -s - &lt;&lt; <span class="hljs-string">EOF
+System.out.printf(&quot;Procs: %s%n&quot;, getdata())
+EOF</span>
+
+jshell -s - &lt;&lt;&lt;<span class="hljs-string">&#x27;System.out.printf(&quot;Procs: %s%n&quot;, getdata())&#x27;</span>
+
+cat &lt;&lt;&lt; <span class="hljs-string">&#x27;$VARIABLE&#x27;</span>
+cat &lt;&lt;&lt; <span class="hljs-string">&quot;<span class="hljs-variable">$VARIABLE</span>&quot;</span>
+cat &lt;&lt;&lt; <span class="hljs-variable">$VARIABLE</span>
+cat &lt;&lt;&lt; `<span class="hljs-variable">$VARIABLE</span>`
diff --git a/test/markup/bash/strings.txt b/test/markup/bash/strings.txt
index c2d7f55732..eca05f0cb8 100644
--- a/test/markup/bash/strings.txt
+++ b/test/markup/bash/strings.txt
@@ -1,3 +1,14 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 TLS_DIR="$SCRIPT_DIR/../src/main/resources/tls"
 ROOT_DIR="$SCRIPT_DIR/.."
+
+jshell -s - << EOF
+System.out.printf("Procs: %s%n", getdata())
+EOF
+
+jshell -s - <<<'System.out.printf("Procs: %s%n", getdata())'
+
+cat <<< '$VARIABLE'
+cat <<< "$VARIABLE"
+cat <<< $VARIABLE
+cat <<< `$VARIABLE`

From 980832e3d38ce56ab50ec7359492952d2dde5237 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 6 Oct 2020 08:24:11 -0400
Subject: [PATCH 061/223] chore(parser) deprecate `useBR` option and add
 console warning

---
 CHANGES.md       | 4 ++++
 src/highlight.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 695bc4b391..03543d4dd9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,10 @@ Language Improvements:
 - enh(typescript) TypeScript also gains support for numeric separators (#2617) [Antoine du Hamel][]
 - enh(php) Add support for PHP 8 `match` keyword and add `php8` as an alias (#2733) [Ayesh Karunaratne][]
 
+Deprecations:
+
+- `useBR` option deprecated and will be removed in v11.0. (#2559) [Josh Goebel][]
+
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
 [Ryan Jonasson]: https://github.com/ryanjonasson
diff --git a/src/highlight.js b/src/highlight.js
index ad674d5dc5..421d645176 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -706,6 +706,10 @@ const HLJS = function(hljs) {
    * @param {{}} userOptions
    */
   function configure(userOptions) {
+    if (userOptions.useBR) {
+      console.warn("'useBR' option is deprecated and will be removed entirely in v11.0");
+      console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2559");
+    }
     options = inherit(options, userOptions);
   }
 

From 7905f46f7f6a0bc1361d4f9c59f3b34cde6b303c Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 7 Oct 2020 05:31:55 -0600
Subject: [PATCH 062/223] enh(javascript) allow leading `#` for private class
 fields (stop treating as illegal) (#2701)

As of an upcoming release of ECMAScript (almost certainly 2021), private
class fields may be defined with this syntax:

    class Demo {
      #neato;
    }

Accordingly, treating *all* non-shebang `#` as illegal markers for
JavaScript is no longer viable. Instead, support `$`, `_`, and `[A-z]`
legal identifiers here.

The pattern `#!` is also valid for shebang lines, but it is already
handled by the explicit SHEBANG rule.

Note that this will still fail in cases where Unicode characters are
used as the first character of a private class field name.

Resolves #2700.
---
 CHANGES.md                  | 2 ++
 src/languages/javascript.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 03543d4dd9..307239ac96 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- enh(javascript) allow `#` for private class fields (#2701) [Chris Krycho][]
 - fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
 - fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
 - fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
@@ -25,6 +26,7 @@ Deprecations:
 
 - `useBR` option deprecated and will be removed in v11.0. (#2559) [Josh Goebel][]
 
+[Chris Krycho]: https://github.com/chriskrycho
 [David Pine]: https://github.com/IEvangelist
 [Josh Goebel]: https://github.com/joshgoebel
 [Ryan Jonasson]: https://github.com/ryanjonasson
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 428b473a5e..8bfa6eca3f 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -63,7 +63,7 @@ export default function(hljs) {
     literal: ECMAScript.LITERALS.join(" "),
     built_in: ECMAScript.BUILT_INS.join(" ")
   };
-  const nonDecimalLiterals = (prefixLetters, validChars) => 
+  const nonDecimalLiterals = (prefixLetters, validChars) =>
     `\\b0[${prefixLetters}][${validChars}]([${validChars}_]*[${validChars}])?n?`;
   const noLeadingZeroDecimalDigits = /[1-9]([0-9_]*\d)?/;
   const decimalDigits = /\d([0-9_]*\d)?/;
@@ -204,7 +204,7 @@ export default function(hljs) {
     keywords: KEYWORDS,
     // this will be extended by TypeScript
     exports: { PARAMS_CONTAINS },
-    illegal: /#(?!!)/,
+    illegal: /#(?![$_A-z])/,
     contains: [
       hljs.SHEBANG({
         label: "shebang",

From 50d5d21b4e97d16f42386929f7386598b2a1eb89 Mon Sep 17 00:00:00 2001
From: Vladimir Jimenez <allejo@me.com>
Date: Wed, 7 Oct 2020 09:43:38 -0700
Subject: [PATCH 063/223] (chore) Fix compiling language dependencies on
 Windows (#2741)

---
 tools/lib/language.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/lib/language.js b/tools/lib/language.js
index 38897ebe2c..c340bee784 100644
--- a/tools/lib/language.js
+++ b/tools/lib/language.js
@@ -5,9 +5,9 @@ const glob = require("glob")
 const path = require("path")
 const build_config = require("../build_config")
 
-const REQUIRES_REGEX = /\/\*.*?Requires: (.*?)\n/s
-const CATEGORY_REGEX = /\/\*.*?Category: (.*?)\n/s
-const LANGUAGE_REGEX = /\/\*.*?Language: (.*?)\n/s
+const REQUIRES_REGEX = /\/\*.*?Requires: (.*?)\r?\n/s
+const CATEGORY_REGEX = /\/\*.*?Category: (.*?)\r?\n/s
+const LANGUAGE_REGEX = /\/\*.*?Language: (.*?)\r?\n/s
 const {rollupCode} = require("./bundling.js")
 const { getThirdPartyPackages } = require("./external_language")
 

From dd11bbe4363e8851d77908f07e0e6604da7ef8b1 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 7 Oct 2020 16:24:39 -0400
Subject: [PATCH 064/223] fix(c-like) preprocessor directives not detected
 after else (#2738)

---
 CHANGES.md                              |  1 +
 src/languages/c-like.js                 |  1 +
 test/markup/cpp/preprocessor.expect.txt | 10 ++++++++++
 test/markup/cpp/preprocessor.txt        | 10 ++++++++++
 4 files changed, 22 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 307239ac96..4ee2452e19 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- fix(c-like) preprocessor directives not detected after else (#2738) [Josh Goebel][]
 - enh(javascript) allow `#` for private class fields (#2701) [Chris Krycho][]
 - fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
 - fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index cfc040c7fb..ece0952443 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -119,6 +119,7 @@ export default function(hljs) {
   };
 
   var EXPRESSION_CONTAINS = [
+    PREPROCESSOR,
     CPP_PRIMITIVE_TYPES,
     hljs.C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
diff --git a/test/markup/cpp/preprocessor.expect.txt b/test/markup/cpp/preprocessor.expect.txt
index ee89b732a9..81e5b78733 100644
--- a/test/markup/cpp/preprocessor.expect.txt
+++ b/test/markup/cpp/preprocessor.expect.txt
@@ -17,3 +17,13 @@
     EXPRESSION</span>
 <span class="hljs-keyword">int</span> bar;
 <span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span>  <span class="hljs-comment">// comment</span></span>
+
+<span class="hljs-keyword">if</span> (p) {
+<span class="hljs-meta">#<span class="hljs-meta-keyword">ifdef</span> DEBUG</span>
+    onething();
+<span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span></span>
+} <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (errno) {
+<span class="hljs-meta">#<span class="hljs-meta-keyword">ifdef</span> DEBUG</span>
+    anotherthing();
+<span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span></span>
+}
diff --git a/test/markup/cpp/preprocessor.txt b/test/markup/cpp/preprocessor.txt
index 01372cbfcd..fde9760602 100644
--- a/test/markup/cpp/preprocessor.txt
+++ b/test/markup/cpp/preprocessor.txt
@@ -17,3 +17,13 @@ int foo(void)
     EXPRESSION
 int bar;
 #endif  // comment
+
+if (p) {
+#ifdef DEBUG
+    onething();
+#endif
+} else if (errno) {
+#ifdef DEBUG
+    anotherthing();
+#endif
+}

From 57b351842f488a9ccbe29385e075b85482b2234f Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 7 Oct 2020 16:28:41 -0400
Subject: [PATCH 065/223] enh(javascript) highlight class methods (#2727)

---
 CHANGES.md                                    |  2 ++
 src/languages/javascript.js                   | 33 +++++++++++++++----
 test/markup/javascript/class.expect.txt       | 12 ++++++-
 test/markup/javascript/class.txt              | 10 ++++++
 .../markup/javascript/jsx-fragment.expect.txt |  2 +-
 test/markup/javascript/jsx.expect.txt         |  2 +-
 test/markup/typescript/class.expect.txt       |  2 +-
 test/markup/typescript/declares.expect.txt    |  2 +-
 .../typescript/decorator-factories.expect.txt |  4 +--
 test/markup/typescript/jsx.expect.txt         |  2 +-
 10 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4ee2452e19..709d11713d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@
 
 Language Improvements:
 
+- enh(javascipt/typescript) Highlight class methods as functions (#2727) [Josh Goebel][]
+- fix(javascipt/typescript) `constructor` is now highlighted as a function title (not keyword) (#2727) [Josh Goebel][]
 - fix(c-like) preprocessor directives not detected after else (#2738) [Josh Goebel][]
 - enh(javascript) allow `#` for private class fields (#2701) [Chris Krycho][]
 - fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 8bfa6eca3f..5e82802e99 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -261,11 +261,12 @@ export default function(hljs) {
             // we have to count the parens to make sure we actually have the
             // correct bounding ( ) before the =>.  There could be any number of
             // sub-expressions inside also surrounded by parens.
-            begin: '(\\([^(]*' +
-              '(\\([^(]*' +
-                '(\\([^(]*' +
-                '\\))?' +
-              '\\))?' +
+            begin: '(\\(' +
+            '[^()]*(\\(' +
+            '[^()]*(\\(' +
+            '[^()]*' +
+            '\\))*[^()]*' +
+            '\\))*[^()]*' +
             '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>',
             returnBegin: true,
             end: '\\s*=>',
@@ -339,6 +340,25 @@ export default function(hljs) {
         ],
         illegal: /%/
       },
+      {
+        className: 'function',
+        // we have to count the parens to make sure we actually have the correct
+        // bounding ( ).  There could be any number of sub-expressions inside
+        // also surrounded by parens.
+        begin: hljs.UNDERSCORE_IDENT_RE +
+          '\\(' + // first parens
+          '[^()]*(\\(' +
+            '[^()]*(\\(' +
+              '[^()]*' +
+            '\\))*[^()]*' +
+          '\\))*[^()]*' +
+          '\\)\\s*{', // end parens
+        returnBegin:true,
+        contains: [
+          PARAMS,
+          hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
+        ]
+      },
       // hack: prevents detection of keywords in some circumstances
       // .keyword()
       // $keyword = x
@@ -361,10 +381,11 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'constructor',
+        begin: /\b(?=constructor)/,
         end: /[\{;]/,
         excludeEnd: true,
         contains: [
+          hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
           'self',
           PARAMS
         ]
diff --git a/test/markup/javascript/class.expect.txt b/test/markup/javascript/class.expect.txt
index f3921e2f72..8f0f53554c 100644
--- a/test/markup/javascript/class.expect.txt
+++ b/test/markup/javascript/class.expect.txt
@@ -1,5 +1,6 @@
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Vehicle</span> </span>{}
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Car</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Vehicle</span> </span>{
-  <span class="hljs-keyword">constructor</span>(<span class="hljs-params">speed, cost</span>) {
+  <span class="hljs-function"><span class="hljs-title">constructor</span>(<span class="hljs-params">speed, cost</span>)</span> {
     <span class="hljs-built_in">super</span>(speed);
 
     <span class="hljs-keyword">var</span> c = <span class="hljs-built_in">Symbol</span>(<span class="hljs-string">&#x27;cost&#x27;</span>);
@@ -8,4 +9,13 @@
     <span class="hljs-built_in">this</span>.intro = <span class="hljs-string">`This is a car runs at
       <span class="hljs-subst">${speed}</span>.`</span>;
   }
+  <span class="hljs-function"><span class="hljs-title">join</span>(<span class="hljs-params"></span>)</span> {
+  }
+  <span class="hljs-function"><span class="hljs-title">other</span>(<span class="hljs-params">a = ( ( <span class="hljs-number">3</span> + <span class="hljs-number">2</span> ) ) </span>)</span> {
+    <span class="hljs-built_in">console</span>.log(a)
+  }
+  <span class="hljs-function"><span class="hljs-title">something</span>(<span class="hljs-params">a = ( ( <span class="hljs-number">3</span> + <span class="hljs-number">2</span> ) ), b = <span class="hljs-number">1</span> </span>)</span> {
+    <span class="hljs-built_in">console</span>.log(a)
+  }
+  <span class="hljs-function"><span class="hljs-title">onemore</span>(<span class="hljs-params">a=(<span class="hljs-number">3</span>+<span class="hljs-number">2</span>, b=(<span class="hljs-number">5</span>*<span class="hljs-number">9</span>))</span>)</span> {}
 }
diff --git a/test/markup/javascript/class.txt b/test/markup/javascript/class.txt
index 47fa67cc35..db520f2a51 100644
--- a/test/markup/javascript/class.txt
+++ b/test/markup/javascript/class.txt
@@ -1,3 +1,4 @@
+class Vehicle {}
 class Car extends Vehicle {
   constructor(speed, cost) {
     super(speed);
@@ -8,4 +9,13 @@ class Car extends Vehicle {
     this.intro = `This is a car runs at
       ${speed}.`;
   }
+  join() {
+  }
+  other(a = ( ( 3 + 2 ) ) ) {
+    console.log(a)
+  }
+  something(a = ( ( 3 + 2 ) ), b = 1 ) {
+    console.log(a)
+  }
+  onemore(a=(3+2, b=(5*9))) {}
 }
diff --git a/test/markup/javascript/jsx-fragment.expect.txt b/test/markup/javascript/jsx-fragment.expect.txt
index b0a72c9f94..00ca448319 100644
--- a/test/markup/javascript/jsx-fragment.expect.txt
+++ b/test/markup/javascript/jsx-fragment.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Columns</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">React</span>.<span class="hljs-title">Component</span> </span>{
-  render() {
+  <span class="hljs-function"><span class="hljs-title">render</span>(<span class="hljs-params"></span>)</span> {
     <span class="hljs-keyword">return</span> (
       <span class="xml"><span class="hljs-tag">&lt;&gt;</span>
         <span class="hljs-tag">&lt;<span class="hljs-name">td</span>&gt;</span>Hello<span class="hljs-tag">&lt;/<span class="hljs-name">td</span>&gt;</span>
diff --git a/test/markup/javascript/jsx.expect.txt b/test/markup/javascript/jsx.expect.txt
index 9c0501eeca..184388f7ef 100644
--- a/test/markup/javascript/jsx.expect.txt
+++ b/test/markup/javascript/jsx.expect.txt
@@ -12,7 +12,7 @@
 <span class="hljs-keyword">const</span> m = <span class="hljs-function">() =&gt;</span> <span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">X</span> <span class="hljs-attr">x</span>=<span class="hljs-string">&quot;&quot;</span> /&gt;</span></span>
 
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">App</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Component</span> </span>{
-  render() {
+  <span class="hljs-function"><span class="hljs-title">render</span>(<span class="hljs-params"></span>)</span> {
     <span class="hljs-keyword">return</span> (
       <span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">BrowserRouter</span>&gt;</span>
         <span class="hljs-tag">&lt;<span class="hljs-name">div</span>&gt;</span>
diff --git a/test/markup/typescript/class.expect.txt b/test/markup/typescript/class.expect.txt
index f3921e2f72..d33637f803 100644
--- a/test/markup/typescript/class.expect.txt
+++ b/test/markup/typescript/class.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Car</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Vehicle</span> </span>{
-  <span class="hljs-keyword">constructor</span>(<span class="hljs-params">speed, cost</span>) {
+  <span class="hljs-function"><span class="hljs-title">constructor</span>(<span class="hljs-params">speed, cost</span>)</span> {
     <span class="hljs-built_in">super</span>(speed);
 
     <span class="hljs-keyword">var</span> c = <span class="hljs-built_in">Symbol</span>(<span class="hljs-string">&#x27;cost&#x27;</span>);
diff --git a/test/markup/typescript/declares.expect.txt b/test/markup/typescript/declares.expect.txt
index 75f3eb5ebd..bf26700dfb 100644
--- a/test/markup/typescript/declares.expect.txt
+++ b/test/markup/typescript/declares.expect.txt
@@ -1,6 +1,6 @@
 <span class="hljs-keyword">export</span> <span class="hljs-keyword">declare</span> <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">CommandHandler</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">EventEmitter</span> </span>{
 
-    <span class="hljs-keyword">constructor</span>(<span class="hljs-params">config: CommandHandlerConfig</span>);
+    <span class="hljs-title">constructor</span>(<span class="hljs-params">config: CommandHandlerConfig</span>);
     <span class="hljs-comment">/**
      * Install the handler onto Discord.js
      * <span class="hljs-doctag">@param <span class="hljs-variable">client</span></span> - Client to handle
diff --git a/test/markup/typescript/decorator-factories.expect.txt b/test/markup/typescript/decorator-factories.expect.txt
index 7eae4a4c80..1434d0b712 100644
--- a/test/markup/typescript/decorator-factories.expect.txt
+++ b/test/markup/typescript/decorator-factories.expect.txt
@@ -3,11 +3,11 @@
     <span class="hljs-meta">@baz</span>(<span class="hljs-number">123</span>)
     <span class="hljs-keyword">private</span> myAttribute: <span class="hljs-built_in">string</span>;
 
-    <span class="hljs-keyword">constructor</span>(<span class="hljs-params"><span class="hljs-meta">@bar</span>(<span class="hljs-literal">true</span>) <span class="hljs-keyword">private</span> x,
+    <span class="hljs-title">constructor</span>(<span class="hljs-params"><span class="hljs-meta">@bar</span>(<span class="hljs-literal">true</span>) <span class="hljs-keyword">private</span> x,
                 <span class="hljs-meta">@bar</span>(qux(quux(<span class="hljs-literal">true</span>))) <span class="hljs-keyword">private</span> y</span>) { }
 
     <span class="hljs-meta">@bar</span>()
-    <span class="hljs-keyword">private</span> myMethod(<span class="hljs-meta">@bar</span>() z) {
+    <span class="hljs-keyword">private</span> <span class="hljs-function"><span class="hljs-title">myMethod</span>(<span class="hljs-params"><span class="hljs-meta">@bar</span>() z</span>)</span> {
         <span class="hljs-built_in">console</span>.log(<span class="hljs-string">&#x27;Hello world.&#x27;</span>);
     }
 }
diff --git a/test/markup/typescript/jsx.expect.txt b/test/markup/typescript/jsx.expect.txt
index 70505ab378..5c0ae35243 100644
--- a/test/markup/typescript/jsx.expect.txt
+++ b/test/markup/typescript/jsx.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">MyComponent</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Component</span>&lt;<span class="hljs-title">Props</span>&gt; </span>{
-    render() {
+    <span class="hljs-function"><span class="hljs-title">render</span>(<span class="hljs-params"></span>)</span> {
         <span class="hljs-keyword">let</span> a : <span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">Array</span>&lt;<span class="hljs-built_in">number</span>&gt;&gt; = [[<span class="hljs-number">1</span>,<span class="hljs-number">2</span>]];
         <span class="hljs-keyword">let</span> b = <span class="hljs-keyword">new</span> <span class="hljs-built_in">Map</span>&lt;<span class="hljs-built_in">string</span>,<span class="hljs-built_in">number</span>&gt;();
         <span class="hljs-keyword">return</span> (

From 16a19bbc763030d669bfd270ae3c983c806b92d4 Mon Sep 17 00:00:00 2001
From: schtandard <schtandard@users.noreply.github.com>
Date: Wed, 7 Oct 2020 23:34:08 +0200
Subject: [PATCH 066/223] (docs) Clarify that one has to build before testing
 (#2743)

* Clarify that one has to build before testing

A note about build_and_test was also added.
---
 docs/building-testing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-testing.rst b/docs/building-testing.rst
index 72c91ca022..09bbc34235 100644
--- a/docs/building-testing.rst
+++ b/docs/building-testing.rst
@@ -71,8 +71,8 @@ detection still works with your language definition included in the whole suite.
 
 Testing is done using `Mocha <http://mochajs.org/>`_ and the
 files are found in the ``test/`` directory. You can use the node build to
-run the tests in the command line with ``npm test`` after installing the
-dependencies with ``npm install``.
+run the tests from the command line with ``npm test`` after building_. (Using
+``npm run build_and_test`` you can build and then test with one command.)
 
 **Note**: for Debian-based machine, like Ubuntu, you might need to create an
 alias or symbolic link for nodejs to node. The reason for this is the

From e8473a9efb9add404afddde37fa70a630b3d9b89 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 10:19:09 -0400
Subject: [PATCH 067/223] fix(js) prevent runaway regex (#2746)

Evidently detecting a serious of comments one after another can
still lead to a runaway regex when you have a ton of comments in
a large file.
---
 CHANGES.md                  | 1 +
 src/languages/javascript.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 709d11713d..62e7dbd3a0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Language Improvements:
 - fix(javascipt/typescript) `constructor` is now highlighted as a function title (not keyword) (#2727) [Josh Goebel][]
 - fix(c-like) preprocessor directives not detected after else (#2738) [Josh Goebel][]
 - enh(javascript) allow `#` for private class fields (#2701) [Chris Krycho][]
+- fix(js) prevent runaway regex (#2746) [Josh Goebel][]
 - fix(bash) enh(bash) allow nested params (#2731) [Josh Goebel][]
 - fix(python) Fix highlighting of keywords and strings (#2713, #2715) [Konrad Rudolph][]
 - fix(fsharp) Prevent `(*)` from being detected as a multi-line comment [Josh Goebel][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 5e82802e99..656a43a4ae 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -239,7 +239,9 @@ export default function(hljs) {
           regex.lookahead(regex.concat(
             // we also need to allow for multiple possible comments inbetween
             // the first key:value pairing
-            /(((\/\/.*$)|(\/\*(.|\n)*\*\/))\s*)*/,
+            /(\/\/.*$)*/,
+            /(\/\*(.|\n)*\*\/)*/,
+            /\s*/,
             IDENT_RE + '\\s*:'))),
         relevance: 0,
         contains: [

From 663dfb569fb056be3d155b7eb4bccab158bd7ce1 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 11 Oct 2020 11:59:59 -0400
Subject: [PATCH 068/223] chore(lint) clean up build_config.js

---
 tools/build_config.js | 98 +++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/tools/build_config.js b/tools/build_config.js
index c32efe993c..42405704b3 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -2,59 +2,59 @@ const cjsPlugin = require('rollup-plugin-commonjs');
 const jsonPlugin = require('rollup-plugin-json');
 
 module.exports = {
-    build_dir: "build",
-    copyrightYears: "2006-2020",
-    clean_css: {},
-    rollup: {
-      node: {
-        output: { format: "cjs", strict: false },
-        input : {
-          plugins: [
-            cjsPlugin(),
-            jsonPlugin(),
-            {
-              transform: (x) => {
-                if (/var module/.exec(x)) {
-                  // remove shim that only breaks things for rollup
-                  return x.replace(/var module\s*=.*$/m,"")
-                }
+  build_dir: "build",
+  copyrightYears: "2006-2020",
+  clean_css: {},
+  rollup: {
+    node: {
+      output: { format: "cjs", strict: false },
+      input: {
+        plugins: [
+          cjsPlugin(),
+          jsonPlugin(),
+          {
+            transform: (x) => {
+              if (/var module/.exec(x)) {
+                // remove shim that only breaks things for rollup
+                return x.replace(/var module\s*=.*$/m, "");
               }
             }
-          ],
-        },
+          }
+        ],
       },
-      browser_core: {
-        input: {
-          plugins: [jsonPlugin()]
-        },
-        output: {
-          name: "hljs",
-          format: "iife",
-          footer: "if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }",
-          interop: false,
-        }
+    },
+    browser_core: {
+      input: {
+        plugins: [jsonPlugin()]
       },
-      browser: {
-        input: {
-          plugins: [
-            cjsPlugin(),
-            jsonPlugin()
-          ]
-        },
-        output: {
-          format: "iife",
-          outro: "return module.exports.definer || module.exports;",
-          interop: false,
-        }
+      output: {
+        name: "hljs",
+        format: "iife",
+        footer: "if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }",
+        interop: false
       }
     },
-    terser: {
-        "compress": {
-          passes: 2,
-          unsafe: true,
-          warnings: true,
-          dead_code: true,
-          toplevel: "funcs"
-        }
+    browser: {
+      input: {
+        plugins: [
+          cjsPlugin(),
+          jsonPlugin()
+        ]
+      },
+      output: {
+        format: "iife",
+        outro: "return module.exports.definer || module.exports;",
+        interop: false
+      }
+    }
+  },
+  terser: {
+    compress: {
+      passes: 2,
+      unsafe: true,
+      warnings: true,
+      dead_code: true,
+      toplevel: "funcs"
     }
-}
+  }
+};

From 2d07b7e4efc220b684db3b99937a83c00fb24013 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 11 Oct 2020 20:04:56 -0400
Subject: [PATCH 069/223] chore(deps) upgrade to all newer build dependencies

---
 package-lock.json      | 1071 +++++++++++++++++++---------------------
 package.json           |   24 +-
 tools/build_browser.js |    2 +-
 tools/build_config.js  |    5 +-
 tools/lib/language.js  |    2 +-
 5 files changed, 526 insertions(+), 578 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96acf60f84..4036b03899 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,54 +5,114 @@
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-      "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.10.1"
+        "@babel/highlight": "^7.10.4"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
     "@babel/highlight": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.1",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
+      "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "lodash": "^4.17.19",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        }
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz",
-      "integrity": "sha512-NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.1",
+        "@nodelib/fs.stat": "2.0.3",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz",
-      "integrity": "sha512-+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz",
-      "integrity": "sha512-J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.1",
+        "@nodelib/fs.scandir": "2.1.3",
         "fastq": "^1.6.0"
       }
     },
@@ -62,12 +122,6 @@
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
-    "@types/eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
-      "dev": true
-    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -86,9 +140,9 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
-      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
       "dev": true
     },
     "@types/json5": {
@@ -110,12 +164,14 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.2.0.tgz",
-      "integrity": "sha512-t9RTk/GyYilIXt6BmZurhBzuMT9kLKw3fQoJtK9ayv0tXTlznXEAnx07sCLXdkN3/tZDep1s1CEV95CWuARYWA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.0.tgz",
+      "integrity": "sha512-RVt5wU9H/2H+N/ZrCasTXdGbUTkbf7Hfi9eLiA8vPQkzUJ/bLDCC3CsoZioPrNcnoyN8r0gT153dC++A4hKBQQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "3.2.0",
+        "@typescript-eslint/experimental-utils": "4.4.0",
+        "@typescript-eslint/scope-manager": "4.4.0",
+        "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
         "semver": "^7.3.2",
@@ -131,44 +187,138 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.2.0.tgz",
-      "integrity": "sha512-UbJBsk+xO9dIFKtj16+m42EvUvsjZbbgQ2O5xSTSfVT1Z3yGkL90DVu0Hd3029FZ5/uBgl+F3Vo8FAcEcqc6aQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.0.tgz",
+      "integrity": "sha512-01+OtK/oWeSJTjQcyzDztfLF1YjvKpLFo+JZmurK/qjSRcyObpIecJ4rckDoRCSh5Etw+jKfdSzVEHevh9gJ1w==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "3.2.0",
+        "@typescript-eslint/scope-manager": "4.4.0",
+        "@typescript-eslint/types": "4.4.0",
+        "@typescript-eslint/typescript-estree": "4.4.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.2.0.tgz",
-      "integrity": "sha512-Vhu+wwdevDLVDjK1lIcoD6ZbuOa93fzqszkaO3iCnmrScmKwyW/AGkzc2UvfE5TCoCXqq7Jyt6SOXjsIlpqF4A==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.4.0.tgz",
+      "integrity": "sha512-yc14iEItCxoGb7W4Nx30FlTyGpU9r+j+n1LUK/exlq2eJeFxczrz/xFRZUk2f6yzWfK+pr1DOTyQnmDkcC4TnA==",
       "dev": true,
       "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.2.0",
-        "@typescript-eslint/typescript-estree": "3.2.0",
-        "eslint-visitor-keys": "^1.1.0"
+        "@typescript-eslint/scope-manager": "4.4.0",
+        "@typescript-eslint/types": "4.4.0",
+        "@typescript-eslint/typescript-estree": "4.4.0",
+        "debug": "^4.1.1"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.4.0.tgz",
+      "integrity": "sha512-r2FIeeU1lmW4K3CxgOAt8djI5c6Q/5ULAgdVo9AF3hPMpu0B14WznBAtxrmB/qFVbVIB6fSx2a+EVXuhSVMEyA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.4.0",
+        "@typescript-eslint/visitor-keys": "4.4.0"
       }
     },
+    "@typescript-eslint/types": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.4.0.tgz",
+      "integrity": "sha512-nU0VUpzanFw3jjX+50OTQy6MehVvf8pkqFcURPAE06xFNFenMj1GPEI6IESvp7UOHAnq+n/brMirZdR+7rCrlA==",
+      "dev": true
+    },
     "@typescript-eslint/typescript-estree": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.2.0.tgz",
-      "integrity": "sha512-uh+Y2QO7dxNrdLw7mVnjUqkwO/InxEqwN0wF+Za6eo3coxls9aH9kQ/5rSvW2GcNanebRTmsT5w1/92lAOb1bA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.0.tgz",
+      "integrity": "sha512-Fh85feshKXwki4nZ1uhCJHmqKJqCMba+8ZicQIhNi5d5jSQFteWiGeF96DTjO8br7fn+prTP+t3Cz/a/3yOKqw==",
       "dev": true,
       "requires": {
+        "@typescript-eslint/types": "4.4.0",
+        "@typescript-eslint/visitor-keys": "4.4.0",
         "debug": "^4.1.1",
-        "eslint-visitor-keys": "^1.1.0",
-        "glob": "^7.1.6",
+        "globby": "^11.0.1",
         "is-glob": "^4.0.1",
         "lodash": "^4.17.15",
         "semver": "^7.3.2",
         "tsutils": "^3.17.1"
       },
       "dependencies": {
+        "@nodelib/fs.scandir": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+          "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.stat": "2.0.3",
+            "run-parallel": "^1.1.9"
+          }
+        },
+        "@nodelib/fs.stat": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+          "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+          "dev": true
+        },
+        "@nodelib/fs.walk": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+          "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.scandir": "2.1.3",
+            "fastq": "^1.6.0"
+          }
+        },
+        "fast-glob": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+          "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.stat": "^2.0.2",
+            "@nodelib/fs.walk": "^1.2.3",
+            "glob-parent": "^5.1.0",
+            "merge2": "^1.3.0",
+            "micromatch": "^4.0.2",
+            "picomatch": "^2.2.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "globby": {
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+          "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+          "dev": true,
+          "requires": {
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.1.1",
+            "ignore": "^5.1.4",
+            "merge2": "^1.3.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "merge2": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+          "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+          "dev": true
+        },
+        "picomatch": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+          "dev": true
+        },
         "semver": {
           "version": "7.3.2",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -177,10 +327,28 @@
         }
       }
     },
+    "@typescript-eslint/visitor-keys": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.4.0.tgz",
+      "integrity": "sha512-oBWeroUZCVsHLiWRdcTXJB7s1nB3taFY8WGvS23tiAlT6jXVvsdAV4rs581bgdEjOhn43q6ro7NkOiLKu6kFqA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.4.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+          "dev": true
+        }
+      }
+    },
     "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
     "abbrev": {
@@ -190,9 +358,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true
     },
     "acorn-globals": {
@@ -206,25 +374,25 @@
       }
     },
     "acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
       "dev": true
     },
     "acorn-walk": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
-      "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "dev": true
     },
     "aggregate-error": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz",
-      "integrity": "sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
         "clean-stack": "^2.0.0",
-        "indent-string": "^3.2.0"
+        "indent-string": "^4.0.0"
       }
     },
     "ajv": {
@@ -245,23 +413,6 @@
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true
     },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
-      }
-    },
     "ansi-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -369,9 +520,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
       "dev": true
     },
     "balanced-match": {
@@ -451,33 +602,41 @@
       "dev": true
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "color-convert": "^2.0.1"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         }
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
     "chokidar": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
@@ -520,15 +679,6 @@
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
     "cli-table": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
@@ -546,12 +696,6 @@
         }
       }
     },
-    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
-    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -622,9 +766,9 @@
       }
     },
     "commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz",
+      "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==",
       "dev": true
     },
     "concat-map": {
@@ -725,9 +869,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
-      "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
       "dev": true
     },
     "deep-is": {
@@ -746,27 +890,19 @@
       }
     },
     "del": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
-      "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
+      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
       "dev": true,
       "requires": {
-        "globby": "^10.0.1",
-        "graceful-fs": "^4.2.2",
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
         "is-glob": "^4.0.1",
         "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.1",
-        "p-map": "^3.0.0",
-        "rimraf": "^3.0.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true
-        }
       }
     },
     "delayed-stream": {
@@ -858,6 +994,15 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -947,9 +1092,9 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
-      "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
@@ -960,21 +1105,23 @@
       }
     },
     "eslint": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz",
-      "integrity": "sha512-B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz",
+      "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
+        "@eslint/eslintrc": "^0.1.3",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^5.1.0",
-        "eslint-utils": "^2.0.0",
-        "eslint-visitor-keys": "^1.2.0",
-        "espree": "^7.1.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.0",
         "esquery": "^1.2.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^5.0.1",
@@ -984,12 +1131,11 @@
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.14",
+        "lodash": "^4.17.19",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -1009,57 +1155,56 @@
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "eslint-visitor-keys": "^1.1.0"
+          },
+          "dependencies": {
+            "eslint-visitor-keys": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+              "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+              "dev": true
+            }
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "eslint-visitor-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
           "dev": true
         },
-        "eslint-scope": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-          "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+        "esrecurse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+          "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
+            "estraverse": "^5.2.0"
+          },
+          "dependencies": {
+            "estraverse": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+              "dev": true
+            }
           }
         },
-        "eslint-visitor-keys": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz",
-          "integrity": "sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==",
-          "dev": true
-        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -1129,9 +1274,9 @@
       "dev": true
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
       "dev": true,
       "requires": {
         "debug": "^2.6.9",
@@ -1210,9 +1355,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.21.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz",
-      "integrity": "sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.1",
@@ -1220,7 +1365,7 @@
         "contains-path": "^0.1.0",
         "debug": "^2.6.9",
         "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.3",
+        "eslint-import-resolver-node": "^0.3.4",
         "eslint-module-utils": "^2.6.0",
         "has": "^1.0.3",
         "minimatch": "^3.0.4",
@@ -1310,19 +1455,19 @@
       "dev": true
     },
     "eslint-scope": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
     "eslint-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-      "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -1341,20 +1486,26 @@
       "dev": true
     },
     "espree": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz",
-      "integrity": "sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
+      "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
       "dev": true,
       "requires": {
-        "acorn": "^7.2.0",
+        "acorn": "^7.4.0",
         "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.2.0"
+        "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
         "eslint-visitor-keys": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz",
-          "integrity": "sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==",
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
@@ -1375,20 +1526,28 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         }
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
@@ -1415,17 +1574,6 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -1439,61 +1587,33 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz",
-      "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "^2.0.1",
-        "@nodelib/fs.walk": "^1.2.1",
-        "glob-parent": "^5.0.0",
-        "is-glob": "^4.0.1",
-        "merge2": "^1.2.3",
-        "micromatch": "^4.0.2"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       },
       "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "^5.0.1"
+            "is-glob": "^4.0.1"
           }
         },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+        "picomatch": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
           "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
@@ -1518,15 +1638,6 @@
         "reusify": "^1.0.0"
       }
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -1699,18 +1810,16 @@
       }
     },
     "globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
       "dev": true,
       "requires": {
-        "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
         "slash": "^3.0.0"
       }
     },
@@ -1746,13 +1855,27 @@
       "dev": true
     },
     "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
+        "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        }
       }
     },
     "has": {
@@ -1840,9 +1963,9 @@
       "dev": true
     },
     "indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
     "inflight": {
@@ -1867,102 +1990,6 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
-    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
     "ip-regex": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
@@ -2048,9 +2075,9 @@
       "dev": true
     },
     "is-path-inside": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.1.tgz",
-      "integrity": "sha512-CKstxrctq1kUesU6WhtZDbYKzzYBuRH0UYInAVrkc/EYdB9ltbfE0gOoayG9nhohG6447sOOVGhHqsdmBvkbNg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
       "dev": true
     },
     "is-plain-obj": {
@@ -2161,16 +2188,16 @@
       }
     },
     "js-beautify": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz",
-      "integrity": "sha512-a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz",
+      "integrity": "sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.12",
         "editorconfig": "^0.15.3",
         "glob": "^7.1.3",
-        "mkdirp": "~1.0.3",
-        "nopt": "^4.0.3"
+        "mkdirp": "^1.0.4",
+        "nopt": "^5.0.0"
       },
       "dependencies": {
         "mkdirp": {
@@ -2188,9 +2215,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -2204,9 +2231,9 @@
       "dev": true
     },
     "jsdom": {
-      "version": "16.2.2",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz",
-      "integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==",
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
       "dev": true,
       "requires": {
         "abab": "^2.0.3",
@@ -2229,7 +2256,7 @@
         "tough-cookie": "^3.0.1",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.0.0",
+        "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
         "whatwg-url": "^8.0.0",
@@ -2314,9 +2341,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
     "lodash.sortby": {
@@ -2391,11 +2418,21 @@
       }
     },
     "merge2": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz",
-      "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
     "mime-db": {
       "version": "1.44.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
@@ -2411,12 +2448,6 @@
         "mime-db": "1.44.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -2510,12 +2541,6 @@
       "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -2529,13 +2554,12 @@
       "dev": true
     },
     "nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
       "dev": true,
       "requires": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
@@ -2613,15 +2637,6 @@
         "wrappy": "1"
       }
     },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -2636,28 +2651,6 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "p-limit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
@@ -2677,9 +2670,9 @@
       }
     },
     "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "requires": {
         "aggregate-error": "^3.0.0"
@@ -3022,21 +3015,21 @@
       }
     },
     "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.19"
       }
     },
     "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.3",
+        "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       },
@@ -3080,16 +3073,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3097,18 +3080,18 @@
       "dev": true
     },
     "rimraf": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
-      "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
     },
     "rollup": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.0.0.tgz",
-      "integrity": "sha512-tbvWownITR+0ebaX6iRr7IcLkziTCJacRpmWz03NIj3CZDmGlergYSwdG8wPx68LT0ms1YzqmbjUQHb6ut8pdw==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.29.0.tgz",
+      "integrity": "sha512-gtU0sjxMpsVlpuAf4QXienPmUAhd6Kc7owQ4f5lypoxBW18fw2UNYZ4NssLGsri6WhUZkE/Ts3EMRebN+gNLiQ==",
       "dev": true,
       "requires": {
         "fsevents": "~2.1.2"
@@ -3156,27 +3139,12 @@
         "estree-walker": "^0.6.1"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
     "run-parallel": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
       "dev": true
     },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -3294,12 +3262,6 @@
       "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
       "dev": true
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true
-    },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -3324,9 +3286,9 @@
       "dev": true
     },
     "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -3366,9 +3328,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
       "dev": true
     },
     "sprintf-js": {
@@ -3680,9 +3642,9 @@
       "dev": true
     },
     "strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
     "supports-color": {
@@ -3749,14 +3711,14 @@
       }
     },
     "terser": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz",
-      "integrity": "sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.4.tgz",
+      "integrity": "sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
       },
       "dependencies": {
         "commander": {
@@ -3764,6 +3726,12 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
           "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
         }
       }
     },
@@ -3773,12 +3741,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
     "tiny-worker": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.3.0.tgz",
@@ -3788,15 +3750,6 @@
         "esm": "^3.2.25"
       }
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3839,9 +3792,9 @@
       }
     },
     "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "tsutils": {
@@ -3884,9 +3837,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.0.0-dev.20200512",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200512.tgz",
-      "integrity": "sha512-ZsVvhdxpQaA6KpjlT8wNNtweORzNsMtwgCo8viKWQmOvaU+BlMsd3MjD2LONQjFSiETCaw4uq0nNdyfKrCjjIw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
+      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
       "dev": true
     },
     "uglify-js": {
@@ -3990,22 +3943,14 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz",
-      "integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
       "dev": true,
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^2.0.2",
-        "webidl-conversions": "^5.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-          "dev": true
-        }
+        "webidl-conversions": "^6.1.0"
       }
     },
     "which": {
@@ -4105,9 +4050,9 @@
       }
     },
     "ws": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
       "dev": true
     },
     "xml-name-validator": {
diff --git a/package.json b/package.json
index 83ce33c3bd..9a10523025 100644
--- a/package.json
+++ b/package.json
@@ -39,34 +39,34 @@
     "node": "*"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^3.2.0",
-    "@typescript-eslint/parser": "^3.2.0",
+    "@typescript-eslint/eslint-plugin": "^4.4.0",
+    "@typescript-eslint/parser": "^4.4.0",
     "clean-css": "^4.2.3",
     "cli-table": "^0.3.1",
     "colors": "^1.1.2",
-    "commander": "^5.1.0",
-    "del": "^5.1.0",
+    "commander": "^6.1.0",
+    "del": "^6.0.0",
     "dependency-resolver": "^2.0.1",
-    "eslint": "^7.2.0",
+    "eslint": "^7.11.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "glob": "^7.1.6",
     "glob-promise": "^3.4.0",
     "handlebars": "^4.7.6",
-    "js-beautify": "^1.11.0",
-    "jsdom": "^16.2.2",
-    "lodash": "^4.17.19",
+    "js-beautify": "^1.13.0",
+    "jsdom": "^16.4.0",
+    "lodash": "^4.17.20",
     "mocha": "^8.1.3",
-    "rollup": "^2.0.0",
+    "rollup": "^2.29.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "should": "^13.2.3",
-    "terser": "^4.3.9",
+    "terser": "^5.3.4",
     "tiny-worker": "^2.3.0",
-    "typescript": "^4.0.0-dev.20200512"
+    "typescript": "^4.0.3"
   },
   "dependencies": {}
 }
diff --git a/tools/build_browser.js b/tools/build_browser.js
index f1eb848e07..6636da82ed 100644
--- a/tools/build_browser.js
+++ b/tools/build_browser.js
@@ -127,7 +127,7 @@ async function buildBrowserHighlightJS(languages, {minify}) {
   var minifiedSrc = "";
 
   if (minify) {
-    var tersed = Terser.minify(librarySrc, config.terser)
+    var tersed = await Terser.minify(librarySrc, config.terser)
 
     minifiedSrc = [
       header, tersed.code,
diff --git a/tools/build_config.js b/tools/build_config.js
index 42405704b3..fa4a493d75 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -7,7 +7,7 @@ module.exports = {
   clean_css: {},
   rollup: {
     node: {
-      output: { format: "cjs", strict: false },
+      output: { format: "cjs", strict: false, exports: "auto" },
       input: {
         plugins: [
           cjsPlugin(),
@@ -49,6 +49,9 @@ module.exports = {
     }
   },
   terser: {
+    format: {
+      max_line_len: 80
+    },
     compress: {
       passes: 2,
       unsafe: true,
diff --git a/tools/lib/language.js b/tools/lib/language.js
index c340bee784..5c6e73d14b 100644
--- a/tools/lib/language.js
+++ b/tools/lib/language.js
@@ -90,7 +90,7 @@ async function compileLanguage (language, options) {
 
   var original = data;
   language.module = data;
-  data = Terser.minify(data, options["terser"]);
+  data = await Terser.minify(data, options.terser);
   language.minified = data.code || original;
 }
 

From f763a25c5ee86d0b8473513007a4416859195391 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 11 Oct 2020 20:08:26 -0400
Subject: [PATCH 070/223] chore(build) browser/cdn builds are now ASCII only

---
 tools/build_config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/build_config.js b/tools/build_config.js
index fa4a493d75..7346327f07 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -50,7 +50,8 @@ module.exports = {
   },
   terser: {
     format: {
-      max_line_len: 80
+      max_line_len: 80,
+      ascii_only: true
     },
     compress: {
       passes: 2,

From 88f86c475cc5e68416f81688cf7f48f67e305322 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 11 Oct 2020 20:22:07 -0400
Subject: [PATCH 071/223] chore(build) add early exit if test fails

- test failures with test-browser were not being detected
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 67fd1364cf..01429794df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ script:
     if [ "x$BUILD" = "xnode" ]; then
       npm run test
     else
-      npm run test-browser
+      npm run test-browser || exit 1
       # our browser build should also work fine as a Node.js CommonJS module
       node test/builds/browser_build_as_commonjs.js
     fi

From ba619f80ceea9a88cf9eedf060e77d4604c4c45d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 11 Oct 2020 20:39:08 -0400
Subject: [PATCH 072/223] chore(tests) fix broken browser test suite

- web worker expect to see `&quot;` in output since it's calling
  `highlight` proper
- highlightBlock tests will not, because they check innerHTML
  which the browser partially renders (turning &quot into ")
---
 test/browser/test_case.js | 7 +++++--
 test/browser/worker.js    | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/browser/test_case.js b/test/browser/test_case.js
index 303c264802..6a628020b9 100644
--- a/test/browser/test_case.js
+++ b/test/browser/test_case.js
@@ -7,7 +7,7 @@ const fs       = require('fs');
 // default to the minified library if it was built, otherwise fallback to
 // the non-minified
 async function findLibrary() {
-  const files = ['highlight.min.js', 'highlight.js']
+  const files = ['highlight.min.js', 'highlight.js'];
 
   for (let file of files) {
     try {
@@ -16,7 +16,7 @@ async function findLibrary() {
       return path;
     } catch {}
   }
-  throw "could not find library in `build`"
+  throw new Error("could not find library in `build`");
 }
 
 function newTestCase(opts) {
@@ -46,6 +46,9 @@ const buildFakeDOM = async function(data) {
   this.hljs  = window.hljs;
 };
 
+// quotes are not encoded because we're testing the value
+// returned by innerHTML where the browser helpfully reencodes
+// &quot; to " for us...
 const defaultCase = newTestCase({
   code: 'var say = "Hello";',
   language: "javascript",
diff --git a/test/browser/worker.js b/test/browser/worker.js
index e86be43216..c1e99ca64e 100644
--- a/test/browser/worker.js
+++ b/test/browser/worker.js
@@ -31,7 +31,12 @@ describe('web worker', function() {
     this.worker.onmessage = event => {
       const actual = event.data;
 
-      actual.should.equal(defaultCase.expect);
+      // the &quot; will be encoded since it's not being
+      // filtered by the browsers innerHTML implementation
+      const expect = '<span class="hljs-keyword">' +
+        'var</span> say = <span class="hljs-string">' +
+        '&quot;Hello&quot;</span>;';
+      actual.should.equal(expect);
 
       done();
     };

From 14758861c933be47a29298c2c30f4bd2410963ce Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 15 Oct 2020 08:38:52 -0400
Subject: [PATCH 073/223] fix(js/ts) Fix nested `{}` in template literal SUBST
 expression (#2748) (#2750)

---
 CHANGES.md                                         |  5 +++--
 src/languages/javascript.js                        | 13 ++++++++++++-
 test/markup/javascript/inline-languages.expect.txt |  2 +-
 test/markup/typescript/inline-languages.expect.txt |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 62e7dbd3a0..f5deb1dc1c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,8 +2,9 @@
 
 Language Improvements:
 
-- enh(javascipt/typescript) Highlight class methods as functions (#2727) [Josh Goebel][]
-- fix(javascipt/typescript) `constructor` is now highlighted as a function title (not keyword) (#2727) [Josh Goebel][]
+- fix(js/ts) Fix nesting of `{}` inside template literals SUBST expression (#2748) [Josh Goebel][]
+- enh(js/ts) Highlight class methods as functions (#2727) [Josh Goebel][]
+- fix(js/ts) `constructor` is now highlighted as a function title (not keyword) (#2727) [Josh Goebel][]
 - fix(c-like) preprocessor directives not detected after else (#2738) [Josh Goebel][]
 - enh(javascript) allow `#` for private class fields (#2701) [Chris Krycho][]
 - fix(js) prevent runaway regex (#2746) [Josh Goebel][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 656a43a4ae..875a930b34 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -169,7 +169,7 @@ export default function(hljs) {
       hljs.C_LINE_COMMENT_MODE
     ]
   };
-  SUBST.contains = [
+  const SUBST_INTERNALS = [
     hljs.APOS_STRING_MODE,
     hljs.QUOTE_STRING_MODE,
     HTML_TEMPLATE,
@@ -178,6 +178,17 @@ export default function(hljs) {
     NUMBER,
     hljs.REGEXP_MODE
   ];
+  SUBST.contains = SUBST_INTERNALS
+    .concat({
+      // we need to pair up {} inside our subst to prevent
+      // it from ending too early by matching another }
+      begin: /{/,
+      end: /}/,
+      keywords: KEYWORDS,
+      contains: [
+        "self"
+      ].concat(SUBST_INTERNALS)
+    });
   const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
   const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
     // eat recursive parens in sub expressions
diff --git a/test/markup/javascript/inline-languages.expect.txt b/test/markup/javascript/inline-languages.expect.txt
index 370f041a57..d9c1d31305 100644
--- a/test/markup/javascript/inline-languages.expect.txt
+++ b/test/markup/javascript/inline-languages.expect.txt
@@ -10,7 +10,7 @@ html`<span class="xml">
   <span class="hljs-tag">&lt;<span class="hljs-name">ul</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;list&quot;</span>&gt;</span>
     </span><span class="hljs-subst">${repeat([<span class="hljs-string">&#x27;a&#x27;</span>, <span class="hljs-string">&#x27;b&#x27;</span>, <span class="hljs-string">&#x27;c&#x27;</span>], (v) =&gt; {
       <span class="hljs-keyword">return</span> html`<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">li</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;item&quot;</span>&gt;</span></span><span class="hljs-subst">${v}</span><span class="xml"><span class="hljs-tag">&lt;/<span class="hljs-name">li</span>&gt;</span>`</span>;
-    }</span><span class="xml">}
+    }}</span><span class="xml">
   <span class="hljs-tag">&lt;/<span class="hljs-name">ul</span>&gt;</span>
 `</span>;
 
diff --git a/test/markup/typescript/inline-languages.expect.txt b/test/markup/typescript/inline-languages.expect.txt
index 27e2c8f3cb..1ae73fefe0 100644
--- a/test/markup/typescript/inline-languages.expect.txt
+++ b/test/markup/typescript/inline-languages.expect.txt
@@ -10,7 +10,7 @@ html`<span class="xml">
   <span class="hljs-tag">&lt;<span class="hljs-name">ul</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;list&quot;</span>&gt;</span>
     </span><span class="hljs-subst">${repeat([<span class="hljs-string">&#x27;a&#x27;</span>, <span class="hljs-string">&#x27;b&#x27;</span>, <span class="hljs-string">&#x27;c&#x27;</span>], (v) =&gt; {
       <span class="hljs-keyword">return</span> html`<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">li</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;item&quot;</span>&gt;</span></span><span class="hljs-subst">${v}</span><span class="xml"><span class="hljs-tag">&lt;/<span class="hljs-name">li</span>&gt;</span>`</span>;
-    }</span><span class="xml">}
+    }}</span><span class="xml">
   <span class="hljs-tag">&lt;/<span class="hljs-name">ul</span>&gt;</span>
 `</span>;
 

From 6d6b8a6db1e10d1ea7002588b62471f57e160caa Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 15 Oct 2020 11:10:15 -0400
Subject: [PATCH 074/223] fix(cpp) fix class/template parsing issues (#2752)

* fix(cpp) fix class/template parsing issues. Fixes #2716. Fixes #2102.
* enh(cpp) add support for `enum struct` and `enum class`
* add support for `union`
* minor file ending with CR changes for some `markup` tests
---
 CHANGES.md                                    |  2 ++
 src/languages/c-like.js                       |  5 ++--
 .../markup/cpp/template_complexity.expect.txt | 24 +++++++++++++++++++
 test/markup/cpp/template_complexity.txt       | 24 +++++++++++++++++++
 test/markup/php/strings.expect.txt            |  2 +-
 .../protobuf/message-message.expect.txt       |  2 +-
 test/markup/python-repl/sample.expect.txt     |  2 +-
 test/markup/python/escaped-quotes.expect.txt  |  2 +-
 test/markup/python/f-strings.expect.txt       |  2 +-
 test/markup/python/function-header.expect.txt |  2 +-
 10 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 test/markup/cpp/template_complexity.expect.txt
 create mode 100644 test/markup/cpp/template_complexity.txt

diff --git a/CHANGES.md b/CHANGES.md
index f5deb1dc1c..067d52db33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@
 
 Language Improvements:
 
+- fix(cpp) improve parsing issues with templates (#2752) [Josh Goebel][]
+- enh(cpp) add support for `enum (struct|class)` and `union` (#2752) [Josh Goebel][]
 - fix(js/ts) Fix nesting of `{}` inside template literals SUBST expression (#2748) [Josh Goebel][]
 - enh(js/ts) Highlight class methods as functions (#2727) [Josh Goebel][]
 - fix(js/ts) `constructor` is now highlighted as a function title (not keyword) (#2727) [Josh Goebel][]
diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index ece0952443..44a64b97ba 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -225,10 +225,9 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class struct', end: /[{;:]/,
+        beginKeywords: 'enum class struct union', end: /[{;:<>=]/,
         contains: [
-          { beginKeywords: "final" },
-          {begin: /</, end: />/, contains: ['self']}, // skip generic stuff
+          { beginKeywords: "final class struct" },
           hljs.TITLE_MODE
         ]
       }
diff --git a/test/markup/cpp/template_complexity.expect.txt b/test/markup/cpp/template_complexity.expect.txt
new file mode 100644
index 0000000000..0dbe6c993b
--- /dev/null
+++ b/test/markup/cpp/template_complexity.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-keyword">template</span> &lt;<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">T</span>&gt;</span> <span class="hljs-comment">// comment</span>
+<span class="hljs-function"><span class="hljs-keyword">auto</span> <span class="hljs-title">foo</span><span class="hljs-params">(T x)</span> </span>{ ... };
+
+<span class="hljs-keyword">namespace</span> impl {
+    <span class="hljs-keyword">template</span>&lt;<span class="hljs-keyword">typename</span> T&gt;
+    <span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">is_streamable</span>&lt;</span>T, <span class="hljs-built_in">std</span>::<span class="hljs-keyword">void_t</span>&lt;<span class="hljs-keyword">decltype</span>(<span class="hljs-built_in">std</span>::declval&lt;<span class="hljs-built_in">std</span>::wostream &amp;&gt;() &lt;&lt; <span class="hljs-built_in">std</span>::declval&lt;T&gt;())&gt;&gt; : <span class="hljs-built_in">std</span>::true_type { };
+}
+
+<span class="hljs-comment">// Disable overload for already valid operands.</span>
+<span class="hljs-keyword">template</span>&lt;<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">T</span>, <span class="hljs-keyword">class</span> =</span> <span class="hljs-built_in">std</span>::<span class="hljs-keyword">enable_if_t</span>&lt;!impl::is_streamable_v&lt;<span class="hljs-keyword">const</span> T &amp;&gt; &amp;&amp; <span class="hljs-built_in">std</span>::is_convertible_v&lt;<span class="hljs-keyword">const</span> T &amp;, <span class="hljs-built_in">std</span>::wstring_view&gt;&gt;&gt;
+<span class="hljs-built_in">std</span>::wostream &amp;<span class="hljs-keyword">operator</span> &lt;&lt;(<span class="hljs-built_in">std</span>::wostream &amp;stream, <span class="hljs-keyword">const</span> T &amp;thing)
+{
+    <span class="hljs-keyword">return</span> stream &lt;&lt; <span class="hljs-keyword">static_cast</span>&lt;<span class="hljs-built_in">std</span>::wstring_view&gt;(thing);
+}
+
+<span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-keyword">struct</span> <span class="hljs-title">DataHolder</span> {</span> };
+<span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-keyword">class</span> <span class="hljs-title">DataThingy</span> {</span> };
+<span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-keyword">class</span> <span class="hljs-title">Boolean</span> :</span> <span class="hljs-keyword">char</span> {
+    True, False, FileNotFound
+};
+
+<span class="hljs-class"><span class="hljs-keyword">union</span> <span class="hljs-title">Soy</span>
+{</span>
+};
diff --git a/test/markup/cpp/template_complexity.txt b/test/markup/cpp/template_complexity.txt
new file mode 100644
index 0000000000..6c1d64f34d
--- /dev/null
+++ b/test/markup/cpp/template_complexity.txt
@@ -0,0 +1,24 @@
+template <class T> // comment
+auto foo(T x) { ... };
+
+namespace impl {
+    template<typename T>
+    struct is_streamable<T, std::void_t<decltype(std::declval<std::wostream &>() << std::declval<T>())>> : std::true_type { };
+}
+
+// Disable overload for already valid operands.
+template<class T, class = std::enable_if_t<!impl::is_streamable_v<const T &> && std::is_convertible_v<const T &, std::wstring_view>>>
+std::wostream &operator <<(std::wostream &stream, const T &thing)
+{
+    return stream << static_cast<std::wstring_view>(thing);
+}
+
+enum struct DataHolder { };
+enum class DataThingy { };
+enum class Boolean : char {
+    True, False, FileNotFound
+};
+
+union Soy
+{
+};
diff --git a/test/markup/php/strings.expect.txt b/test/markup/php/strings.expect.txt
index 520834d77f..a547757933 100644
--- a/test/markup/php/strings.expect.txt
+++ b/test/markup/php/strings.expect.txt
@@ -20,4 +20,4 @@ SQL</span>);
 var_dump(<span class="hljs-string">&lt;&lt;&lt;SQL
     SELECT *
     FROM table
-    SQL</span>);
\ No newline at end of file
+    SQL</span>);
diff --git a/test/markup/protobuf/message-message.expect.txt b/test/markup/protobuf/message-message.expect.txt
index ff5e780ebf..0243879d38 100644
--- a/test/markup/protobuf/message-message.expect.txt
+++ b/test/markup/protobuf/message-message.expect.txt
@@ -10,4 +10,4 @@
 <span class="hljs-comment">/*
   test multiline
   comment
-*/</span>
\ No newline at end of file
+*/</span>
diff --git a/test/markup/python-repl/sample.expect.txt b/test/markup/python-repl/sample.expect.txt
index 53020f2385..285e6dc914 100644
--- a/test/markup/python-repl/sample.expect.txt
+++ b/test/markup/python-repl/sample.expect.txt
@@ -14,4 +14,4 @@ foo = 42&quot;
 <span class="hljs-meta">&gt;&gt;&gt;</span> <span class="python"><span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">test</span>():</span></span>
 <span class="hljs-meta">...</span> <span class="python">    <span class="hljs-keyword">pass</span></span>
 <span class="hljs-meta">&gt;&gt;&gt;</span>
-<span class="hljs-meta">&gt;&gt;&gt;</span>
\ No newline at end of file
+<span class="hljs-meta">&gt;&gt;&gt;</span>
diff --git a/test/markup/python/escaped-quotes.expect.txt b/test/markup/python/escaped-quotes.expect.txt
index e56a06c2ce..7163558543 100644
--- a/test/markup/python/escaped-quotes.expect.txt
+++ b/test/markup/python/escaped-quotes.expect.txt
@@ -48,4 +48,4 @@
 
 <span class="hljs-string">F&quot;text \&quot; text&quot;</span>
 <span class="hljs-string">fR&quot;text \&quot; text&quot;</span>
-<span class="hljs-string">RF&quot;text \&quot; text&quot;</span>
\ No newline at end of file
+<span class="hljs-string">RF&quot;text \&quot; text&quot;</span>
diff --git a/test/markup/python/f-strings.expect.txt b/test/markup/python/f-strings.expect.txt
index 14cd2c02e9..df3c72f38c 100644
--- a/test/markup/python/f-strings.expect.txt
+++ b/test/markup/python/f-strings.expect.txt
@@ -10,4 +10,4 @@
 <span class="hljs-string">f&quot;<span class="hljs-subst">{name + <span class="hljs-string">f&#x27;<span class="hljs-subst">{name}</span>&#x27;</span>}</span>&quot;</span>
 <span class="hljs-string">f&quot;{{ }}&quot;</span>
 <span class="hljs-keyword">if</span><span class="hljs-string">&quot;text&quot;</span>==<span class="hljs-string">&quot;text&quot;</span>:
-    <span class="hljs-string">&quot;good&quot;</span>
\ No newline at end of file
+    <span class="hljs-string">&quot;good&quot;</span>
diff --git a/test/markup/python/function-header.expect.txt b/test/markup/python/function-header.expect.txt
index a8d74d5822..832816bfd9 100644
--- a/test/markup/python/function-header.expect.txt
+++ b/test/markup/python/function-header.expect.txt
@@ -1,2 +1,2 @@
 <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span>(<span class="hljs-params">x: <span class="hljs-built_in">int</span>, *, y: <span class="hljs-built_in">bool</span> = <span class="hljs-literal">True</span></span>) -&gt; <span class="hljs-keyword">None</span>:</span>
-    <span class="hljs-keyword">pass</span>
\ No newline at end of file
+    <span class="hljs-keyword">pass</span>

From 9b2ba4eb96528d3dbba10ba3bd81cc02273efd55 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 16 Oct 2020 11:44:29 -0400
Subject: [PATCH 075/223] chore(docs) improve relevance guidance (#2734)

---
 docs/language-guide.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/language-guide.rst b/docs/language-guide.rst
index 71aa2754ac..7f38fc02bf 100644
--- a/docs/language-guide.rst
+++ b/docs/language-guide.rst
@@ -230,7 +230,12 @@ and it makes sense to bring their relevance to zero to lessen statistical noise:
     relevance: 0
   }
 
-The default value for relevance is 1. When setting an explicit value it's recommended to use either 10 or 0.
+The default value for relevance is always 1. When setting an explicit value
+typically either 10 or 0 is used. A 0 means this match should not be considered
+for language detection purposes. 0 should be used for very common matches that
+might be found in ANY language (basic numbers, strings, etc) or things that
+would otherwise create too many false positives. A 10 means "this is almost
+guaranteed to be XYZ code". 10 should be used sparingly.
 
 Keywords also influence relevance. Each of them usually has a relevance of 1, but there are some unique names
 that aren't likely to be found outside of their languages, even in the form of variable names.

From 665798ca8ac47fec72d54f0ac558600a7b383ae4 Mon Sep 17 00:00:00 2001
From: Binyamin Aron Green <binyaminagreen@gmail.com>
Date: Fri, 16 Oct 2020 12:16:21 -0400
Subject: [PATCH 076/223] (chore) create pull request template (#2755)

---
 .github/pull_request_template.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..21245f47e6
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+<!-- Please link to a related issue below. -->
+<!-- ie, `Resolves #1234`, etc... so GitHub can magically link it -->
+
+### Changes
+<!--- Describe your changes -->
+
+### Checklist
+- [ ] Added markup tests, or they don't apply here because...
+- [ ] Updated the changelog at `CHANGES.md`
+- [ ] Added myself to `AUTHORS.txt`, under Contributors

From 66ef1eeb9ad06c2d78af0f21aa97284de26b5d5d Mon Sep 17 00:00:00 2001
From: Konrad Rudolph <konrad.rudolph@gmail.com>
Date: Fri, 16 Oct 2020 19:27:19 +0100
Subject: [PATCH 077/223] fix(c/cpp) line continuation in single-line comments
 (#2761)

* Implement C comment line continuation, ie `\` at the end of the line
---
 AUTHORS.txt                             |  3 ++-
 CHANGES.md                              |  1 +
 src/languages/c-like.js                 | 16 +++++++++++-----
 test/markup/cpp/preprocessor.expect.txt |  4 ++++
 test/markup/cpp/preprocessor.txt        |  4 ++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index a1833dec06..3a25c9c652 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -288,4 +288,5 @@ Contributors:
 - Alexandre Grison <a.grison@gmail.com>
 - Jim Mason <jmason@ibinx.com>
 - lioshi <lioshi@lioshi.com>
-- David Pine <david.pine.7@gmail.com>
\ No newline at end of file
+- David Pine <david.pine.7@gmail.com>
+- Konrad Rudolph <konrad.rudolph@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
index 067d52db33..0638dcee51 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- fix(cpp) implement backslash line continuation in comments (#2757) [Konrad Rudolph][]
 - fix(cpp) improve parsing issues with templates (#2752) [Josh Goebel][]
 - enh(cpp) add support for `enum (struct|class)` and `union` (#2752) [Josh Goebel][]
 - fix(js/ts) Fix nesting of `{}` inside template literals SUBST expression (#2748) [Josh Goebel][]
diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index 44a64b97ba..348e6f01e8 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -18,6 +18,12 @@ export default function(hljs) {
   function optional(s) {
     return '(?:' + s + ')?';
   }
+  // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does 
+  // not include such support nor can we be sure all the grammars depending
+  // on it would desire this behavior
+  var C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {
+    contains: [{begin: /\\\n/}]
+  });
   var DECLTYPE_AUTO_RE = 'decltype\\(auto\\)'
   var NAMESPACE_RE = '[a-zA-Z_]\\w*::'
   var TEMPLATE_ARGUMENT_RE = '<.*?>';
@@ -80,7 +86,7 @@ export default function(hljs) {
         begin: /<.*?>/, end: /$/,
         illegal: '\\n',
       },
-      hljs.C_LINE_COMMENT_MODE,
+      C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE
     ]
   };
@@ -121,7 +127,7 @@ export default function(hljs) {
   var EXPRESSION_CONTAINS = [
     PREPROCESSOR,
     CPP_PRIMITIVE_TYPES,
-    hljs.C_LINE_COMMENT_MODE,
+    C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
     NUMBERS,
     STRINGS
@@ -173,7 +179,7 @@ export default function(hljs) {
         keywords: CPP_KEYWORDS,
         relevance: 0,
         contains: [
-          hljs.C_LINE_COMMENT_MODE,
+          C_LINE_COMMENT_MODE,
           hljs.C_BLOCK_COMMENT_MODE,
           STRINGS,
           NUMBERS,
@@ -185,7 +191,7 @@ export default function(hljs) {
             relevance: 0,
             contains: [
               'self',
-              hljs.C_LINE_COMMENT_MODE,
+              C_LINE_COMMENT_MODE,
               hljs.C_BLOCK_COMMENT_MODE,
               STRINGS,
               NUMBERS,
@@ -195,7 +201,7 @@ export default function(hljs) {
         ]
       },
       CPP_PRIMITIVE_TYPES,
-      hljs.C_LINE_COMMENT_MODE,
+      C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       PREPROCESSOR
     ]
diff --git a/test/markup/cpp/preprocessor.expect.txt b/test/markup/cpp/preprocessor.expect.txt
index 81e5b78733..fa1e10f82d 100644
--- a/test/markup/cpp/preprocessor.expect.txt
+++ b/test/markup/cpp/preprocessor.expect.txt
@@ -27,3 +27,7 @@
     anotherthing();
 <span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span></span>
 }
+
+<span class="hljs-comment">// this is a continued\
+comment.</span>
+end
diff --git a/test/markup/cpp/preprocessor.txt b/test/markup/cpp/preprocessor.txt
index fde9760602..69964a8768 100644
--- a/test/markup/cpp/preprocessor.txt
+++ b/test/markup/cpp/preprocessor.txt
@@ -27,3 +27,7 @@ if (p) {
     anotherthing();
 #endif
 }
+
+// this is a continued\
+comment.
+end

From 3cf2f759ba4edd01177c59ead908e5c404fb05df Mon Sep 17 00:00:00 2001
From: Michael Newton <miken32@gmail.com>
Date: Sat, 17 Oct 2020 10:29:05 -0600
Subject: [PATCH 078/223] (fix) Ensure git is installed in docker image (#2764)

* Ensure git is installed in docker image

- Git is not included in the slim image, making it impossible to to build.
  (building uses git to fetch the HEAD commit SHA for the build header)
---
 AUTHORS.txt | 1 +
 Dockerfile  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 3a25c9c652..1aab4fcef9 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -290,3 +290,4 @@ Contributors:
 - lioshi <lioshi@lioshi.com>
 - David Pine <david.pine.7@gmail.com>
 - Konrad Rudolph <konrad.rudolph@gmail.com>
+- Michael Newton <miken32@github>
diff --git a/Dockerfile b/Dockerfile
index e6ed8aaae0..1b20111c1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@
 FROM node:12-slim
 RUN apt-get update -qq \
     && apt-get install --yes --no-install-recommends \
-        nginx \
+        nginx git \
     && rm -rf /var/lib/apt/lists/*
 WORKDIR /var/www/html
 COPY package*.json /var/www/html/

From 373a2668192f64e74a8d2b4848c2cb82625c0519 Mon Sep 17 00:00:00 2001
From: thomas michael wallace <thomasmichaelwallace@gmail.com>
Date: Sat, 17 Oct 2020 17:58:26 +0100
Subject: [PATCH 079/223] fix(handlebars): add proper support for `if else`
 keyword (#2765)

* fix(handlebars): support for if else keyword

Co-authored-by: Josh Goebel <me@joshgoebel.com>
---
 AUTHORS.txt                               | 1 +
 CHANGES.md                                | 2 ++
 src/languages/handlebars.js               | 6 ++++++
 test/markup/handlebars/if-else.expect.txt | 7 +++++++
 test/markup/handlebars/if-else.txt        | 7 +++++++
 5 files changed, 23 insertions(+)
 create mode 100644 test/markup/handlebars/if-else.expect.txt
 create mode 100644 test/markup/handlebars/if-else.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1aab4fcef9..23a2efc04a 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -290,4 +290,5 @@ Contributors:
 - lioshi <lioshi@lioshi.com>
 - David Pine <david.pine.7@gmail.com>
 - Konrad Rudolph <konrad.rudolph@gmail.com>
+- Tom Wallace <thomasmichaelwallace@gmail.com>
 - Michael Newton <miken32@github>
diff --git a/CHANGES.md b/CHANGES.md
index 0638dcee51..bcb941fd8c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Language Improvements:
 - enh(javascript) Implement Numeric Separators (#2617) [Antoine du Hamel][]
 - enh(typescript) TypeScript also gains support for numeric separators (#2617) [Antoine du Hamel][]
 - enh(php) Add support for PHP 8 `match` keyword and add `php8` as an alias (#2733) [Ayesh Karunaratne][]
+- fix(handlebars) Support if else keyboards (#2659) [Tom Wallace][]
 
 Deprecations:
 
@@ -43,6 +44,7 @@ Deprecations:
 [Melissa Geels]: https://github.com/codecat
 [Antoine du Hamel]: https://github.com/aduh95
 [Ayesh Karunaratne]: https://github.com/Ayesh
+[Tom Wallace]: https://github.com/thomasmichaelwallace
 
 
 ## Version 10.2.1
diff --git a/src/languages/handlebars.js b/src/languages/handlebars.js
index eba95ab210..08bb06e03e 100644
--- a/src/languages/handlebars.js
+++ b/src/languages/handlebars.js
@@ -219,6 +219,12 @@ export default function(hljs) {
         end: /\}\}/,
         keywords: 'else'
       },
+      {
+        className: 'template-tag',
+        begin: /\{\{(?=else if)/,
+        end: /\}\}/,
+        keywords: 'else if'
+      },
       {
         // closing block statement
         className: 'template-tag',
diff --git a/test/markup/handlebars/if-else.expect.txt b/test/markup/handlebars/if-else.expect.txt
new file mode 100644
index 0000000000..6affde8339
--- /dev/null
+++ b/test/markup/handlebars/if-else.expect.txt
@@ -0,0 +1,7 @@
+<span class="hljs-template-tag">{{#<span class="hljs-name"><span class="hljs-builtin-name">if</span></span> this.userData.isLoaded}}</span><span class="xml">
+  </span><span class="hljs-template-variable">{{<span class="hljs-name">this.userData.value.userName</span>}}</span><span class="xml">
+</span><span class="hljs-template-tag">{{<span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> this.userData.isError}}</span><span class="xml">
+  Whoops, something went wrong!
+</span><span class="hljs-template-tag">{{<span class="hljs-keyword">else</span>}}</span><span class="xml">
+  Something else!
+</span><span class="hljs-template-tag">{{/<span class="hljs-name"><span class="hljs-builtin-name">if</span></span>}}</span>
\ No newline at end of file
diff --git a/test/markup/handlebars/if-else.txt b/test/markup/handlebars/if-else.txt
new file mode 100644
index 0000000000..5f7168aad6
--- /dev/null
+++ b/test/markup/handlebars/if-else.txt
@@ -0,0 +1,7 @@
+{{#if this.userData.isLoaded}}
+  {{this.userData.value.userName}}
+{{else if this.userData.isError}}
+  Whoops, something went wrong!
+{{else}}
+  Something else!
+{{/if}}
\ No newline at end of file

From 5d8e97b4c1d9af5649d66878269a49a2fe604216 Mon Sep 17 00:00:00 2001
From: schtandard <schtandard@users.noreply.github.com>
Date: Sat, 17 Oct 2020 19:14:24 +0200
Subject: [PATCH 080/223] enh(latex) complete ground up rewrite of the LaTeX
 grammar (#2726)

This is a complete redo of the LaTeX language parser. It aims to solve #2708 and #2709 as well as some other problems not reported in the issue tracker but collected on tex.sx.

* Add a complete redo of the LaTeX language
* Add language samples for the LaTeX languages
* Supports LaTeX3
* Add the double caret input method for characters

While TeX only knows the double caret, LuaTeX and XeTeX accept up to
six carets followed by the same number of lower-case hex digits. This
has also been included.

* Add magic comments
* Add support for verbatim code

Besides the native LaTeX commands, the macros provided by the common
packages fancyvrb, listings and minted are supported. These are:
- \verb, verbatim and verbatim* from LaTeX
  (possibly with package verbatim)
- Verbatim, BVerbatim and LVerbatim from fancyvrb
- \lstinline and lstlisting from listings
- \mintinline, \mint and minted from minted

For the environments, it is expected that the \begin macro (with its
arguments) is the last thing on its line. This is consistent with the
allowed syntax for all environments except the native ones without
the package verbatim loaded. The \end macro (with its argument) does
not have to be the last or only thing on its line, even though this is
necessary for most of the environments.

* Do not allow spaces after \end

Allowing this can lead to an early termination of the verbatim text.

* Add \url and filecontents to the verbatim variants

The argument of \url gets the class `link` instead of string.

* Add \hyperref to the verbatim variants

The first argument of hyperref contains a url.

* Avoid partial LaTeX3 macros

A LaTeX3 macro may not be directly followed by any of [a-zA-Z:_].

Also, we need to test of \::x_unbraced before \::x to avoid partial
detection.

* Really forbid double underscores in LaTeX3 names

Previously, double underscores could still occur towards the end of
LaTeX3 control sequences.

* Add \href to verbatim commands
* Add some markup tests
* Fix LaTeX3 names expecting double letters

Functions may now have single trailing letters, variables single letter
names, quarks and scan marks single letters anywhere in their names.

However, modules (in functions) still need two letters, as to variable
types. Quark names still need at least two characters.

\use_ii_i:nn and \c_e_fp were added to the markup tests.

* Add support for \hbox:n and \vbox:n
* Add math macros for language detection
---
 CHANGES.md                                    |   2 +
 src/languages/latex.js                        | 276 ++++++++++++++----
 test/detect/latex/default.txt                 |  46 ++-
 test/markup/latex/chars.expect.txt            |  18 ++
 test/markup/latex/chars.txt                   |  18 ++
 test/markup/latex/comments.expect.txt         |   4 +
 test/markup/latex/comments.txt                |   4 +
 .../markup/latex/control_sequences.expect.txt |  36 +++
 test/markup/latex/control_sequences.txt       |  36 +++
 test/markup/latex/parameters.expect.txt       |   5 +
 test/markup/latex/parameters.txt              |   5 +
 test/markup/latex/verbatim.expect.txt         |  48 +++
 test/markup/latex/verbatim.txt                |  48 +++
 13 files changed, 483 insertions(+), 63 deletions(-)
 create mode 100644 test/markup/latex/chars.expect.txt
 create mode 100644 test/markup/latex/chars.txt
 create mode 100644 test/markup/latex/comments.expect.txt
 create mode 100644 test/markup/latex/comments.txt
 create mode 100644 test/markup/latex/control_sequences.expect.txt
 create mode 100644 test/markup/latex/control_sequences.txt
 create mode 100644 test/markup/latex/parameters.expect.txt
 create mode 100644 test/markup/latex/parameters.txt
 create mode 100644 test/markup/latex/verbatim.expect.txt
 create mode 100644 test/markup/latex/verbatim.txt

diff --git a/CHANGES.md b/CHANGES.md
index bcb941fd8c..e7ff794ac7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Language Improvements:
 
+- enh(latex) Complete ground up rewrite of LaTex grammar [schtandard][]
 - fix(cpp) implement backslash line continuation in comments (#2757) [Konrad Rudolph][]
 - fix(cpp) improve parsing issues with templates (#2752) [Josh Goebel][]
 - enh(cpp) add support for `enum (struct|class)` and `union` (#2752) [Josh Goebel][]
@@ -45,6 +46,7 @@ Deprecations:
 [Antoine du Hamel]: https://github.com/aduh95
 [Ayesh Karunaratne]: https://github.com/Ayesh
 [Tom Wallace]: https://github.com/thomasmichaelwallace
+[schtandard]: https://github.com/schtandard
 
 
 ## Version 10.2.1
diff --git a/src/languages/latex.js b/src/languages/latex.js
index 7dee6baac9..0cadd1a09e 100644
--- a/src/languages/latex.js
+++ b/src/languages/latex.js
@@ -1,70 +1,248 @@
 /*
 Language: LaTeX
-Author: Vladimir Moskva <vladmos@gmail.com>
+Author: Benedikt Wilde <bwilde@posteo.de>
 Website: https://www.latex-project.org
 Category: markup
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
-  var COMMAND = {
-    className: 'tag',
+  const KNOWN_CONTROL_WORDS = regex.either(...[
+      '(?:NeedsTeXFormat|RequirePackage|GetIdInfo)',
+      'Provides(?:Expl)?(?:Package|Class|File)',
+      '(?:DeclareOption|ProcessOptions)',
+      '(?:documentclass|usepackage|input|include)',
+      'makeat(?:letter|other)',
+      'ExplSyntax(?:On|Off)',
+      '(?:new|renew|provide)?command',
+      '(?:re)newenvironment',
+      '(?:New|Renew|Provide|Declare)(?:Expandable)?DocumentCommand',
+      '(?:New|Renew|Provide|Declare)DocumentEnvironment',
+      '(?:(?:e|g|x)?def|let)',
+      '(?:begin|end)',
+      '(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph)',
+      'caption',
+      '(?:label|(?:eq|page|name)?ref|(?:paren|foot|super)?cite)',
+      '(?:alpha|beta|[Gg]amma|[Dd]elta|(?:var)?epsilon|zeta|eta|[Tt]heta|vartheta)',
+      '(?:iota|(?:var)?kappa|[Ll]ambda|mu|nu|[Xx]i|[Pp]i|varpi|(?:var)rho)',
+      '(?:[Ss]igma|varsigma|tau|[Uu]psilon|[Pp]hi|varphi|chi|[Pp]si|[Oo]mega)',
+      '(?:frac|sum|prod|lim|infty|times|sqrt|leq|geq|left|right|middle|[bB]igg?)',
+      '(?:[lr]angle|q?quad|[lcvdi]?dots|d?dot|hat|tilde|bar)'
+    ].map(word => word + '(?![a-zA-Z@:_])'));
+  const L3_REGEX = new RegExp([
+      // A function \module_function_name:signature or \__module_function_name:signature,
+      // where both module and function_name need at least two characters and
+      // function_name may contain single underscores.
+      '(?:__)?[a-zA-Z]{2,}_[a-zA-Z](?:_?[a-zA-Z])+:[a-zA-Z]*',
+      // A variable \scope_module_and_name_type or \scope__module_ane_name_type,
+      // where scope is one of l, g or c, type needs at least two characters
+      // and module_and_name may contain single underscores.
+      '[lgc]__?[a-zA-Z](?:_?[a-zA-Z])*_[a-zA-Z]{2,}',
+      // A quark \q_the_name or \q__the_name or
+      // scan mark \s_the_name or \s__vthe_name,
+      // where variable_name needs at least two characters and
+      // may contain single underscores.
+      '[qs]__?[a-zA-Z](?:_?[a-zA-Z])+',
+      // Other LaTeX3 macro names that are not covered by the three rules above.
+      'use(?:_i)?:[a-zA-Z]*',
+      '(?:else|fi|or):',
+      '(?:if|cs|exp):w',
+      '(?:hbox|vbox):n',
+      '::[a-zA-Z]_unbraced',
+      '::[a-zA-Z:]'
+    ].map(pattern => pattern + '(?![a-zA-Z:_])').join('|'));
+  const L2_VARIANTS = [
+    {begin: /[a-zA-Z@]+/}, // control word
+    {begin: /[^a-zA-Z@]?/} // control symbol
+  ];
+  const DOUBLE_CARET_VARIANTS = [
+    {begin: /\^{6}[0-9a-f]{6}/},
+    {begin: /\^{5}[0-9a-f]{5}/},
+    {begin: /\^{4}[0-9a-f]{4}/},
+    {begin: /\^{3}[0-9a-f]{3}/},
+    {begin: /\^{2}[0-9a-f]{2}/},
+    {begin: /\^{2}[\u0000-\u007f]/}
+  ];
+  const CONTROL_SEQUENCE = {
+    className: 'keyword',
     begin: /\\/,
     relevance: 0,
     contains: [
       {
-        className: 'name',
-        variants: [
-          {begin: /[a-zA-Z\u0430-\u044f\u0410-\u042f]+[*]?/},
-          {begin: /[^a-zA-Z\u0430-\u044f\u0410-\u042f0-9]/}
-        ],
-        starts: {
-          endsWithParent: true,
-          relevance: 0,
-          contains: [
-            {
-              className: 'string', // because it looks like attributes in HTML tags
-              variants: [
-                {begin: /\[/, end: /\]/},
-                {begin: /\{/, end: /\}/}
-              ]
-            },
-            {
-              begin: /\s*=\s*/, endsWithParent: true,
-              relevance: 0,
-              contains: [
-                {
-                  className: 'number',
-                  begin: /-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/
-                }
-              ]
-            }
-          ]
-        }
+        endsParent: true,
+        begin: KNOWN_CONTROL_WORDS
+      },
+      {
+        endsParent: true,
+        begin: L3_REGEX
+      },
+      {
+        endsParent: true,
+        variants: DOUBLE_CARET_VARIANTS
+      },
+      {
+        endsParent: true,
+        relevance: 0,
+        variants: L2_VARIANTS
       }
     ]
   };
-
-  return {
-    name: 'LaTeX',
-    aliases: ['tex'],
-    contains: [
-      COMMAND,
+  const MACRO_PARAM = {
+    className: 'params',
+    relevance: 0,
+    begin: /#+\d?/
+  };
+  const DOUBLE_CARET_CHAR = {
+    // relevance: 1
+    variants: DOUBLE_CARET_VARIANTS
+  };
+  const SPECIAL_CATCODE = {
+    className: 'built_in',
+    relevance: 0,
+    begin: /[$&^_]/
+  };
+  const MAGIC_COMMENT = {
+    className: 'meta',
+    begin: '% !TeX',
+    end: '$',
+    relevance: 10
+  };
+  const COMMENT = hljs.COMMENT(
+    '%',
+    '$',
+    {
+      relevance: 0
+    }
+  );
+  const EVERYTHING_BUT_VERBATIM = [
+    CONTROL_SEQUENCE,
+    MACRO_PARAM,
+    DOUBLE_CARET_CHAR,
+    SPECIAL_CATCODE,
+    MAGIC_COMMENT,
+    COMMENT
+  ];
+  const BRACE_GROUP_NO_VERBATIM = {
+    begin: /\{/, end: /\}/,
+    relevance: 0,
+    contains: ['self', ...EVERYTHING_BUT_VERBATIM]
+  };
+  const ARGUMENT_BRACES = hljs.inherit(
+    BRACE_GROUP_NO_VERBATIM,
+    {
+      relevance: 0,
+      endsParent: true,
+      contains: [BRACE_GROUP_NO_VERBATIM, ...EVERYTHING_BUT_VERBATIM]
+    }
+  );
+  const ARGUMENT_BRACKETS = {
+    begin: /\[/,
+      end: /\]/,
+    endsParent: true,
+    relevance: 0,
+    contains: [BRACE_GROUP_NO_VERBATIM, ...EVERYTHING_BUT_VERBATIM]
+  };
+  const SPACE_GOBBLER = {
+    begin: /\s+/,
+    relevance: 0
+  };
+  const ARGUMENT_M = [ARGUMENT_BRACES];
+  const ARGUMENT_O = [ARGUMENT_BRACKETS];
+  const ARGUMENT_AND_THEN = function(arg, starts_mode) {
+    return {
+      contains: [SPACE_GOBBLER],
+      starts: {
+        relevance: 0,
+        contains: arg,
+        starts: starts_mode
+      }
+    };
+  };
+  const CSNAME = function(csname, starts_mode) {
+    return {
+        begin: '\\\\' + csname + '(?![a-zA-Z@:_])',
+        keywords: {$pattern: /\\[a-zA-Z]+/, keyword: '\\' + csname},
+        relevance: 0,
+        contains: [SPACE_GOBBLER],
+        starts: starts_mode
+      };
+  };
+  const BEGIN_ENV = function(envname, starts_mode) {
+    return hljs.inherit(
       {
-        className: 'formula',
-        contains: [COMMAND],
+        begin: '\\\\begin(?=\\s*\\r?\\n?\\s*\\{' + envname + '\\})',
+        keywords: {$pattern: /\\[a-zA-Z]+/, keyword: '\\begin'},
         relevance: 0,
-        variants: [
-          {begin: /\$\$/, end: /\$\$/},
-          {begin: /\$/, end: /\$/}
-        ]
       },
-      hljs.COMMENT(
-        '%',
-        '$',
-        {
-          relevance: 0
-        }
+      ARGUMENT_AND_THEN(ARGUMENT_M, starts_mode)
+    );
+  };
+  const VERBATIM_DELIMITED_EQUAL = (innerName = "string") => {
+    return hljs.END_SAME_AS_BEGIN({
+      className: innerName,
+      begin: /(.|\r?\n)/,
+      end: /(.|\r?\n)/,
+      excludeBegin: true,
+      excludeEnd: true,
+      endsParent: true
+    });
+  };
+  const VERBATIM_DELIMITED_ENV = function(envname) {
+    return {
+      className: 'string',
+      end: '(?=\\\\end\\{' + envname + '\\})'
+    };
+  };
+
+  const VERBATIM_DELIMITED_BRACES = (innerName = "string") => {
+    return {
+      relevance: 0,
+      begin: /\{/,
+      starts: {
+        endsParent: true,
+        contains: [
+          {
+            className: innerName,
+            end: /(?=\})/,
+            endsParent:true,
+            contains: [
+              {
+                begin: /\{/,
+                end: /\}/,
+                relevance: 0,
+                contains: ["self"]
+              }
+            ],
+          }
+        ]
+      }
+    };
+  };
+  const VERBATIM = [
+    ...['verb', 'lstinline'].map(csname => CSNAME(csname, {contains: [VERBATIM_DELIMITED_EQUAL()]})),
+    CSNAME('mint', ARGUMENT_AND_THEN(ARGUMENT_M, {contains: [VERBATIM_DELIMITED_EQUAL()]})),
+    CSNAME('mintinline', ARGUMENT_AND_THEN(ARGUMENT_M, {contains: [VERBATIM_DELIMITED_BRACES(), VERBATIM_DELIMITED_EQUAL()]})),
+    CSNAME('url', {contains: [VERBATIM_DELIMITED_BRACES("link"), VERBATIM_DELIMITED_BRACES("link")]}),
+    CSNAME('hyperref', {contains: [VERBATIM_DELIMITED_BRACES("link")]}),
+    CSNAME('href', ARGUMENT_AND_THEN(ARGUMENT_O, {contains: [VERBATIM_DELIMITED_BRACES("link")]})),
+    ...[].concat(...['', '\\*'].map(suffix => [
+      BEGIN_ENV('verbatim' + suffix, VERBATIM_DELIMITED_ENV('verbatim' + suffix)),
+      BEGIN_ENV('filecontents' + suffix,  ARGUMENT_AND_THEN(ARGUMENT_M, VERBATIM_DELIMITED_ENV('filecontents' + suffix))),
+      ...['', 'B', 'L'].map(prefix =>
+        BEGIN_ENV(prefix + 'Verbatim' + suffix, ARGUMENT_AND_THEN(ARGUMENT_O, VERBATIM_DELIMITED_ENV(prefix + 'Verbatim' + suffix)))
       )
+    ])),
+    BEGIN_ENV('minted', ARGUMENT_AND_THEN(ARGUMENT_O, ARGUMENT_AND_THEN(ARGUMENT_M, VERBATIM_DELIMITED_ENV('minted')))),
+  ];
+
+  return {
+    name: 'LaTeX',
+    aliases: ['TeX'],
+    contains: [
+      ...VERBATIM,
+      ...EVERYTHING_BUT_VERBATIM
     ]
   };
 }
diff --git a/test/detect/latex/default.txt b/test/detect/latex/default.txt
index 10b2555731..84156cde11 100644
--- a/test/detect/latex/default.txt
+++ b/test/detect/latex/default.txt
@@ -1,17 +1,35 @@
+% !TeX encoding = utf8
 \documentclass{article}
-\usepackage[koi8-r]{inputenc}
-\hoffset=0pt
-\voffset=.3em
-\tolerance=400
-\newcommand{\eTiX}{\TeX}
+
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{amsfonts}
+\usepackage{xparse}
+\usepackage{mathtools}
+
+\newcommand\hi[1]{Hello #1!}
+
+\ExplSyntaxOn
+  % Convert a roman number into an arabic one
+  \NewDocumentCommand \romantonum { m }
+    { \int_from_roman:n { #1 } }
+\ExplSyntaxOff
+
 \begin{document}
-\section*{Highlight.js}
-\begin{table}[c|c]
-$\frac 12\, + \, \frac 1{x^3}\text{Hello \! world}$ & \textbf{Goodbye\~ world} \\\eTiX $ \pi=400 $
-\end{table}
-Ch\'erie, \c{c}a ne me pla\^\i t pas! % comment \b
-G\"otterd\"ammerung~45\%=34.
-$$
-    \int\limits_{0}^{\pi}\frac{4}{x-7}=3
-$$
+
+\section{Highlight.js}
+\hi{you}
+This is \LaTeX\ syntax highlighted by \verb|highlight.js|.
+You should look at section~\ref{sec:fermat} next.
+
+Did you know that MDCLXI is \romantonum{MDCLXI}? % It's 1661.
+
+\subsection{Fermat}\label{sec:fermat}
+I have a wonderful proof that
+\[
+  a^n + b^n \neq c^n
+\]
+for \(a, b, c, d, n \in \mathbb{Z}_+\) with \(n > 2\).
+Sadly, it is too large to fit in this code snippet.
+
 \end{document}
diff --git a/test/markup/latex/chars.expect.txt b/test/markup/latex/chars.expect.txt
new file mode 100644
index 0000000000..e316eb3458
--- /dev/null
+++ b/test/markup/latex/chars.expect.txt
@@ -0,0 +1,18 @@
+{}<span class="hljs-built_in">$</span><span class="hljs-built_in">&amp;</span><span class="hljs-built_in">^</span><span class="hljs-built_in">_</span>~&quot;[]()&lt;&gt;
+
++-0123456789 pt
+
+^^3abc
+^^3ABC
+^^xyz
+^^#3
+<span class="hljs-built_in">^</span><span class="hljs-built_in">^</span>°!
+^^{
+^^}
+^^$
+^^&amp;
+^^%asdf
+^^^
+^^_
+^^^^3bf2a3
+^^^<span class="hljs-built_in">^</span>g12345
diff --git a/test/markup/latex/chars.txt b/test/markup/latex/chars.txt
new file mode 100644
index 0000000000..1c7c49c802
--- /dev/null
+++ b/test/markup/latex/chars.txt
@@ -0,0 +1,18 @@
+{}$&^_~"[]()<>
+
++-0123456789 pt
+
+^^3abc
+^^3ABC
+^^xyz
+^^#3
+^^°!
+^^{
+^^}
+^^$
+^^&
+^^%asdf
+^^^
+^^_
+^^^^3bf2a3
+^^^^g12345
diff --git a/test/markup/latex/comments.expect.txt b/test/markup/latex/comments.expect.txt
new file mode 100644
index 0000000000..69290f0496
--- /dev/null
+++ b/test/markup/latex/comments.expect.txt
@@ -0,0 +1,4 @@
+<span class="hljs-comment">% foo ^^bar \baz</span>
+foo<span class="hljs-comment">%</span>
+<span class="hljs-meta">% !TeX program = pdflatex</span>
+<span class="hljs-comment">%% !TeX encoding = utf8</span>
diff --git a/test/markup/latex/comments.txt b/test/markup/latex/comments.txt
new file mode 100644
index 0000000000..c12ec09044
--- /dev/null
+++ b/test/markup/latex/comments.txt
@@ -0,0 +1,4 @@
+% foo ^^bar \baz
+foo%
+% !TeX program = pdflatex
+%% !TeX encoding = utf8
diff --git a/test/markup/latex/control_sequences.expect.txt b/test/markup/latex/control_sequences.expect.txt
new file mode 100644
index 0000000000..beb19e216f
--- /dev/null
+++ b/test/markup/latex/control_sequences.expect.txt
@@ -0,0 +1,36 @@
+<span class="hljs-keyword">\foo</span> bar
+<span class="hljs-keyword">\foo</span>:bar
+<span class="hljs-keyword">\ </span>and<span class="hljs-keyword">\
+</span>bar<span class="hljs-keyword">\foo</span>:baz
+<span class="hljs-keyword">\!</span>!
+<span class="hljs-keyword">\^^3a</span>bc
+<span class="hljs-keyword">\^^3</span>ABC
+<span class="hljs-keyword">\^^x</span>yz
+<span class="hljs-comment">% ° does not qualify for the ^^ syntax, as it is not in ASCII</span>
+<span class="hljs-keyword">\^</span><span class="hljs-built_in">^</span>°!
+
+<span class="hljs-comment">% @ is always treated as a letter</span>
+<span class="hljs-keyword">\@foo</span>
+<span class="hljs-keyword">\foo@bar</span>
+<span class="hljs-keyword">\@ifnextchar</span>[<span class="hljs-keyword">\@foo</span><span class="hljs-keyword">\@@foo</span>
+
+<span class="hljs-comment">% expl3 macros are recognized</span>
+<span class="hljs-keyword">\cs_new:Nn</span> <span class="hljs-keyword">\hljs_test:N</span> <span class="hljs-keyword">\__hljs_internal:Nx</span>
+<span class="hljs-keyword">\use_ii_i:nn</span>
+<span class="hljs-keyword">\cs:w</span> hljs<span class="hljs-built_in">_</span>test:N<span class="hljs-keyword">\cs_end:</span>
+<span class="hljs-keyword">\use_i:nn</span> <span class="hljs-keyword">\use:</span><span class="hljs-keyword">\q_test</span>
+<span class="hljs-keyword">\if:w</span><span class="hljs-keyword">\scan_stop:</span><span class="hljs-keyword">\s_test</span>[<span class="hljs-keyword">\else:</span>]<span class="hljs-keyword">\fi:</span>
+<span class="hljs-keyword">\hbox:n</span> <span class="hljs-keyword">\vbox:n</span>
+<span class="hljs-keyword">\::c</span><span class="hljs-keyword">\::o</span><span class="hljs-keyword">\::V</span><span class="hljs-keyword">\:::</span><span class="hljs-keyword">\hljs_test_args:Nnn</span>
+<span class="hljs-keyword">\::V_unbraced</span>
+<span class="hljs-keyword">\l_hljs_var_tl</span> <span class="hljs-keyword">\g_tmpa_prop</span> <span class="hljs-keyword">\c__hljs_secret_int</span>
+<span class="hljs-keyword">\c_e_fp</span>
+<span class="hljs-comment">% but only those conforming to the naming scheme with at least two letters</span>
+<span class="hljs-comment">% in module, function, type, quark and scan mark names</span>
+<span class="hljs-comment">% see latex.js for details</span>
+<span class="hljs-keyword">\hljs</span><span class="hljs-built_in">_</span>error:Nn<span class="hljs-built_in">_</span>foo <span class="hljs-keyword">\hljs</span><span class="hljs-built_in">_</span>double:colon:x
+<span class="hljs-keyword">\a</span>:n <span class="hljs-keyword">\foo</span>:n <span class="hljs-keyword">\x</span><span class="hljs-built_in">_</span>foo:nn <span class="hljs-keyword">\foo</span><span class="hljs-built_in">_</span>x:nnn
+<span class="hljs-keyword">\hljs</span><span class="hljs-built_in">_</span>trailing<span class="hljs-built_in">_</span>:N <span class="hljs-keyword">\hljs</span><span class="hljs-built_in">_</span><span class="hljs-built_in">_</span>double:N <span class="hljs-keyword">\hljs</span><span class="hljs-built_in">_</span>later<span class="hljs-built_in">_</span><span class="hljs-built_in">_</span>double:N
+<span class="hljs-keyword">\:</span>:xy <span class="hljs-keyword">\:</span>:n<span class="hljs-built_in">_</span>unbraceddd
+<span class="hljs-keyword">\l</span><span class="hljs-built_in">_</span>tl <span class="hljs-keyword">\c_x_int</span> <span class="hljs-keyword">\h</span><span class="hljs-built_in">_</span>imaginary<span class="hljs-built_in">_</span>scope
+<span class="hljs-keyword">\g</span><span class="hljs-built_in">_</span>hljs<span class="hljs-built_in">_</span>trailing<span class="hljs-built_in">_</span> <span class="hljs-keyword">\l</span><span class="hljs-built_in">_</span>hljs<span class="hljs-built_in">_</span>double<span class="hljs-built_in">_</span><span class="hljs-built_in">_</span>int
diff --git a/test/markup/latex/control_sequences.txt b/test/markup/latex/control_sequences.txt
new file mode 100644
index 0000000000..1c2188d6fd
--- /dev/null
+++ b/test/markup/latex/control_sequences.txt
@@ -0,0 +1,36 @@
+\foo bar
+\foo:bar
+\ and\
+bar\foo:baz
+\!!
+\^^3abc
+\^^3ABC
+\^^xyz
+% ° does not qualify for the ^^ syntax, as it is not in ASCII
+\^^°!
+
+% @ is always treated as a letter
+\@foo
+\foo@bar
+\@ifnextchar[\@foo\@@foo
+
+% expl3 macros are recognized
+\cs_new:Nn \hljs_test:N \__hljs_internal:Nx
+\use_ii_i:nn
+\cs:w hljs_test:N\cs_end:
+\use_i:nn \use:\q_test
+\if:w\scan_stop:\s_test[\else:]\fi:
+\hbox:n \vbox:n
+\::c\::o\::V\:::\hljs_test_args:Nnn
+\::V_unbraced
+\l_hljs_var_tl \g_tmpa_prop \c__hljs_secret_int
+\c_e_fp
+% but only those conforming to the naming scheme with at least two letters
+% in module, function, type, quark and scan mark names
+% see latex.js for details
+\hljs_error:Nn_foo \hljs_double:colon:x
+\a:n \foo:n \x_foo:nn \foo_x:nnn
+\hljs_trailing_:N \hljs__double:N \hljs_later__double:N
+\::xy \::n_unbraceddd
+\l_tl \c_x_int \h_imaginary_scope
+\g_hljs_trailing_ \l_hljs_double__int
diff --git a/test/markup/latex/parameters.expect.txt b/test/markup/latex/parameters.expect.txt
new file mode 100644
index 0000000000..5cc2fd0966
--- /dev/null
+++ b/test/markup/latex/parameters.expect.txt
@@ -0,0 +1,5 @@
+<span class="hljs-params">#7</span>
+<span class="hljs-params">#7</span>89
+<span class="hljs-params">##1</span>
+<span class="hljs-params">#######2</span>
+<span class="hljs-params">#</span>{foo}
diff --git a/test/markup/latex/parameters.txt b/test/markup/latex/parameters.txt
new file mode 100644
index 0000000000..ac0c2aeb4f
--- /dev/null
+++ b/test/markup/latex/parameters.txt
@@ -0,0 +1,5 @@
+#7
+#789
+##1
+#######2
+#{foo}
diff --git a/test/markup/latex/verbatim.expect.txt b/test/markup/latex/verbatim.expect.txt
new file mode 100644
index 0000000000..e69e5f3958
--- /dev/null
+++ b/test/markup/latex/verbatim.expect.txt
@@ -0,0 +1,48 @@
+<span class="hljs-keyword">\verb</span>|<span class="hljs-string">\verb</span>|<span class="hljs-keyword">\verb</span>!<span class="hljs-string">%\&amp;$^_{}</span>!foo
+<span class="hljs-keyword">\verb</span>{<span class="hljs-string">\verb</span>{<span class="hljs-keyword">\verb</span>}<span class="hljs-string">\verb{</span>}
+<span class="hljs-keyword">\lstinline</span>|<span class="hljs-string"></span>|foo
+<span class="hljs-keyword">\mint</span>{<span class="hljs-keyword">\foo</span>{bar}[}.<span class="hljs-string">\foo{bar}</span>.
+<span class="hljs-keyword">\mintinline</span>{foo}{<span class="hljs-string">\mintinline{foo}{\foo{bar}}</span>}
+
+<span class="hljs-keyword">\verb</span> x<span class="hljs-string">foo</span>xfoo foo
+<span class="hljs-keyword">\verb</span>  x<span class="hljs-string">foo</span>xfoo foo
+<span class="hljs-keyword">\lstinline</span>  x<span class="hljs-string">foo</span>xfoo foo
+<span class="hljs-keyword">\mintinline</span> {foo} <span class="hljs-string">\delimited_by_spaces$</span> foo
+
+<span class="hljs-keyword">\url</span> {<span class="hljs-link">https://en.wikipedia.org/w/index.php?search=%25&amp;advancedSearch-current={}</span>}
+<span class="hljs-keyword">\hyperref</span>{<span class="hljs-link">url</span>}{category}{name}{text}
+<span class="hljs-keyword">\hyperref</span>[label]{text}
+<span class="hljs-keyword">\href</span>{<span class="hljs-link">url</span>}{text}
+<span class="hljs-keyword">\href</span>[options]{<span class="hljs-link">url</span>}{text}
+<span class="hljs-keyword">\href</span>[
+  several,
+  options,
+  on=lines,
+  ]{<span class="hljs-link">url</span>}{text}
+
+<span class="hljs-keyword">\begin</span>{verbatim}<span class="hljs-string">
+  Some verbatim text
+  }}%&amp;$
+</span><span class="hljs-keyword">\end</span>{verbatim}
+
+<span class="hljs-keyword">\begin</span>{filecontents*}{filename}<span class="hljs-string">
+  {The file&#x27;s contents}
+</span><span class="hljs-keyword">\end</span>{filecontents*}
+
+<span class="hljs-keyword">\begin</span> {Verbatim}
+<span class="hljs-string">\end {Verbatim}
+\begin{Verbatim}
+\end{Verbatim*}
+\begin{Verbatim*}
+</span><span class="hljs-keyword">\end</span>{Verbatim}
+
+<span class="hljs-keyword">\begin</span> {minted}
+    [some options,
+     given here]
+    {language}<span class="hljs-string">
+  [code]
+</span><span class="hljs-keyword">\end</span>{minted}
+
+<span class="hljs-keyword">\begin</span>{minted}{latex}<span class="hljs-string">
+On \beginnings and \endings
+</span><span class="hljs-keyword">\end</span>{minted}
diff --git a/test/markup/latex/verbatim.txt b/test/markup/latex/verbatim.txt
new file mode 100644
index 0000000000..cf3543105a
--- /dev/null
+++ b/test/markup/latex/verbatim.txt
@@ -0,0 +1,48 @@
+\verb|\verb|\verb!%\&$^_{}!foo
+\verb{\verb{\verb}\verb{}
+\lstinline||foo
+\mint{\foo{bar}[}.\foo{bar}.
+\mintinline{foo}{\mintinline{foo}{\foo{bar}}}
+
+\verb xfooxfoo foo
+\verb  xfooxfoo foo
+\lstinline  xfooxfoo foo
+\mintinline {foo} \delimited_by_spaces$ foo
+
+\url {https://en.wikipedia.org/w/index.php?search=%25&advancedSearch-current={}}
+\hyperref{url}{category}{name}{text}
+\hyperref[label]{text}
+\href{url}{text}
+\href[options]{url}{text}
+\href[
+  several,
+  options,
+  on=lines,
+  ]{url}{text}
+
+\begin{verbatim}
+  Some verbatim text
+  }}%&$
+\end{verbatim}
+
+\begin{filecontents*}{filename}
+  {The file's contents}
+\end{filecontents*}
+
+\begin {Verbatim}
+\end {Verbatim}
+\begin{Verbatim}
+\end{Verbatim*}
+\begin{Verbatim*}
+\end{Verbatim}
+
+\begin {minted}
+    [some options,
+     given here]
+    {language}
+  [code]
+\end{minted}
+
+\begin{minted}{latex}
+On \beginnings and \endings
+\end{minted}

From 97f9e8882de6909ff99990c4dbd24327b82647bc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 17 Oct 2020 13:22:01 -0400
Subject: [PATCH 081/223] 10.3.0

---
 CHANGES.md                 | 2 +-
 docs/conf.py               | 8 ++++----
 docs/maintainers-guide.rst | 6 +++---
 package-lock.json          | 2 +-
 package.json               | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e7ff794ac7..fec763a479 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-## Version 10.3.0 (next up)
+## Version 10.3.0
 
 Language Improvements:
 
diff --git a/docs/conf.py b/docs/conf.py
index 71554e24c0..5b9ef9dc7f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -46,11 +46,11 @@
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-#
-# The short X.Y version.
-version = '10.2'
+
 # The full version, including alpha/beta/rc tags.
-release = '10.2.0'
+release = '10.3.0'
+# The short X.Y version.
+version = ".".join(release.split(".")[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/maintainers-guide.rst b/docs/maintainers-guide.rst
index 0ac3719e84..a690982162 100644
--- a/docs/maintainers-guide.rst
+++ b/docs/maintainers-guide.rst
@@ -27,9 +27,9 @@ The goal being that minor version series always get more stable over time and th
 * Update version numbers using the three-part x.y.z notation everywhere:
 
   * The header in CHANGES.md (this is where the site looks for the latest version number)
-  * ``"version"`` attribute in package.json
-  * ``"version"`` attribute in package-lock.json (run `npm install`)
-  * Two places in docs/conf.py (``version`` and ``release``)
+  * ``version`` attribute in package.json
+  * ``version`` attribute in package-lock.json (run `npm install`)
+  * ``release`` variable in docs/conf.py
 
 * Commit the version changes and tag the commit with the version number (``9.16.2``, no "v" prefix or anything like that)
 
diff --git a/package-lock.json b/package-lock.json
index 4036b03899..b49a1505de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.2.1",
+  "version": "10.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9a10523025..ebf01feb67 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.2.1",
+  "version": "10.3.0",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"

From 46955284933e5e503cda8689ded064635e79e730 Mon Sep 17 00:00:00 2001
From: Michael Newton <miken32@gmail.com>
Date: Mon, 19 Oct 2020 13:13:49 -0600
Subject: [PATCH 082/223] (chore) typos and small documentation fixes (#2763)

- clarify location of common modes
- improve grammar and use consistent case for "JavaScript" and "highlight.js"
---
 docs/api.rst               |  2 +-
 docs/language-guide.rst    | 31 +++++++++++++++----------------
 docs/language-requests.rst |  2 +-
 docs/line-numbers.rst      |  8 ++++----
 docs/mode-reference.rst    | 18 +++++++++---------
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index 8b5ee44540..73fb131c65 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -59,7 +59,7 @@ Accepts a string with the highlighted markup.
 Applies highlighting to a DOM node containing code.
 
 This function is the one to use to apply highlighting dynamically after page load
-or within initialization code of third-party Javascript frameworks.
+or within initialization code of third-party JavaScript frameworks.
 
 The function uses language detection by default but you can specify the language
 in the ``class`` attribute of the DOM node. See the :doc:`class reference
diff --git a/docs/language-guide.rst b/docs/language-guide.rst
index 7f38fc02bf..38b0db659d 100644
--- a/docs/language-guide.rst
+++ b/docs/language-guide.rst
@@ -5,10 +5,10 @@ Highlighting overview
 ---------------------
 
 Programming language code consists of parts with different rules of parsing: keywords like ``for`` or ``if``
-don't make sense inside strings, strings may contain backslash-escaped symbols like ``\"``
+don't make sense inside strings, strings may contain backslash-escaped symbols like ``\"``,
 and comments usually don't contain anything interesting except the end of the comment.
 
-In highlight.js such parts are called "modes".
+In Highlight.js such parts are called "modes".
 
 Each mode consists of:
 
@@ -19,7 +19,7 @@ Each mode consists of:
 * …exotic stuff like another language inside a language
 
 The parser's work is to look for modes and their keywords.
-Upon finding, it wraps them into the markup ``<span class="...">...</span>``
+Upon finding them, it wraps them into the markup ``<span class="...">...</span>``
 and puts the name of the mode ("string", "comment", "number")
 or a keyword group name ("keyword", "literal", "built-in") as the span's class name.
 
@@ -75,8 +75,8 @@ In the simple case language keywords can be defined with a string, separated by
 Some languages have different kinds of "keywords" that might not be called as
 such by the language spec but are very close to them from the point of view of a
 syntax highlighter. These are all sorts of "literals", "built-ins", "symbols"
-and such. To define such keyword groups the attribute ``keywords`` becomes an
-object each property of which defines its own group of keywords:
+and such. To define such keyword groups, the attribute ``keywords`` becomes an
+object, each property of which defines its own group of keywords:
 
 ::
 
@@ -87,11 +87,11 @@ object each property of which defines its own group of keywords:
     }
   }
 
-The group name becomes the class name in the generated markup enabling different
-themeing for different kinds of keywords.
+The group name becomes the class name in the generated markup, enabling different
+theming for different kinds of keywords.
 
-To detect keywords highlight.js breaks the processed chunk of code into separate
-words — a process called lexing. By default "words" are matched with the regexp
+To detect keywords, highlight.js breaks the processed chunk of code into separate
+words — a process called lexing. By default, "words" are matched with the regexp
 ``\w+``, and that works well for many languages. Different lexing rules can be
 defined by the magic ``$pattern`` attribute:
 
@@ -188,7 +188,7 @@ A classic example is an escaping sequence inside strings allowing them to contai
     contains: [{begin: '\\\\.'}],
   }
 
-For such modes ``className`` attribute should be omitted so they won't generate excessive markup.
+For such modes, the ``className`` attribute should be omitted so they won't generate excessive markup.
 
 
 Mode attributes
@@ -253,10 +253,10 @@ Illegal symbols
 ---------------
 
 Another way to improve language detection is to define illegal symbols for a mode.
-For example in Python first line of class definition (``class MyClass(object):``) cannot contain symbol "{" or a newline.
-Presence of these symbols clearly shows that the language is not Python and the parser can drop this attempt early.
+For example, in Python the first line of a class definition (``class MyClass(object):``) cannot contain the symbol ``{`` or a newline.
+The presence of these symbols clearly shows that the language is not Python, and the parser can drop this attempt early.
 
-Illegal symbols are defined as a a single regular expression:
+Illegal symbols are defined using a single regular expression:
 
 ::
 
@@ -269,14 +269,13 @@ Illegal symbols are defined as a a single regular expression:
 Pre-defined modes and regular expressions
 -----------------------------------------
 
-Many languages share common modes and regular expressions. Such expressions are defined in core highlight.js code
-at the end under "Common regexps" and "Common modes" titles. Use them when possible.
+Many languages share common modes and regular expressions. These expressions are defined in `lib/modes.js <https://github.com/highlightjs/highlight.js/blob/master/src/lib/modes.js>`_ and should be used whenever possible.
 
 
 Regular Expression Features
 ---------------------------
 
-The goal of Highlight.js is to support whatever regex features Javascript itself supports.  You're using real regular expressions, use them responsibly.  That said, due to the design of the parser, there are some caveats.  These are addressed below.
+The goal of Highlight.js is to support whatever regex features JavaScript itself supports.  You're using real regular expressions, use them responsibly.  That said, due to the design of the parser, there are some caveats.  These are addressed below.
 
 Things we support now that we did not always:
 
diff --git a/docs/language-requests.rst b/docs/language-requests.rst
index 07b8d8c98e..b00df95a01 100644
--- a/docs/language-requests.rst
+++ b/docs/language-requests.rst
@@ -2,7 +2,7 @@ On requesting new languages
 ===========================
 
 This is a general answer to requests for adding new languages that appear from
-time to time in the highlight.js issue tracker and discussion group.
+time to time in the Highlight.js issue tracker and discussion group.
 
     Highlight.js does not have a fundamental plan for implementing new languages
     - i.e., the core team doesn't usually develop new languages. The core team
diff --git a/docs/line-numbers.rst b/docs/line-numbers.rst
index 674542d4ed..07b2f32db6 100644
--- a/docs/line-numbers.rst
+++ b/docs/line-numbers.rst
@@ -5,7 +5,7 @@ Highlight.js' notable lack of line numbers support is not an oversight but a
 feature. Following is the explanation of this policy from the current project
 maintainer (hey guys!):
 
-    One of the defining design principles for highlight.js from the start was
+    One of the defining design principles for Highlight.js from the start was
     simplicity. Not the simplicity of code (in fact, it's quite complex) but
     the simplicity of usage and of the actual look of highlighted snippets on
     HTML pages. Many highlighters, in my opinion, are overdoing it with such
@@ -15,7 +15,7 @@ maintainer (hey guys!):
     reader from understanding it.
 
     This is why it's not a straightforward decision: this new feature will not
-    just make highlight.js better, it might actually make it worse simply by
+    just make Highlight.js better, it might actually make it worse simply by
     making it look more bloated in blog posts around the Internet. This is why
     I'm asking people to show that it's worth it.
 
@@ -28,9 +28,9 @@ maintainer (hey guys!):
     are better is to set up some usability research on the subject. I doubt
     anyone would bother to do it.
 
-    Then there's maintenance. So far the core code of highlight.js is
+    Then there's maintenance. So far the core code of Highlight.js is
     maintained by only one person — yours truly. Inclusion of any new code in
-    highlight.js means that from that moment I will have to fix bugs in it,
+    Highlight.js means that from that moment I will have to fix bugs in it,
     improve it further, make it work together with the rest of the code,
     defend its design. And I don't want to do all this for the feature that I
     consider "evil" and probably will never use myself.
diff --git a/docs/mode-reference.rst b/docs/mode-reference.rst
index afec714bb0..b79500ffd8 100644
--- a/docs/mode-reference.rst
+++ b/docs/mode-reference.rst
@@ -7,19 +7,19 @@ Types
 Types of attributes values in this reference:
 
 +------------+-------------------------------------------------------------------------------------+
-| identifier | String suitable to be used as a Javascript variable and CSS class name              |
+| identifier | String suitable to be used as a JavaScript variable and CSS class name              |
 |            | (i.e. mostly ``/[A-Za-z0-9_]+/``)                                                   |
 +------------+-------------------------------------------------------------------------------------+
-| regexp     | String representing a Javascript regexp.                                            |
+| regexp     | String representing a JavaScript regexp.                                            |
 |            | Note that since it's not a literal regexp all back-slashes should be repeated twice |
 +------------+-------------------------------------------------------------------------------------+
-| boolean    | Javascript boolean: ``true`` or ``false``                                           |
+| boolean    | JavaScript boolean: ``true`` or ``false``                                           |
 +------------+-------------------------------------------------------------------------------------+
-| number     | Javascript number                                                                   |
+| number     | JavaScript number                                                                   |
 +------------+-------------------------------------------------------------------------------------+
-| object     | Javascript object: ``{ ... }``                                                      |
+| object     | JavaScript object: ``{ ... }``                                                      |
 +------------+-------------------------------------------------------------------------------------+
-| array      | Javascript array: ``[ ... ]``                                                       |
+| array      | JavaScript array: ``[ ... ]``                                                       |
 +------------+-------------------------------------------------------------------------------------+
 
 
@@ -304,8 +304,8 @@ returnEnd
 
 **type**: boolean
 
-Returns just found ending lexeme back into parser. This is used for example to parse Javascript embedded into HTML.
-A Javascript block ends with the HTML closing tag ``</script>`` that cannot be parsed with Javascript rules.
+Returns just found ending lexeme back into parser. This is used for example to parse JavaScript embedded into HTML.
+A JavaScript block ends with the HTML closing tag ``</script>`` that cannot be parsed with JavaScript rules.
 So it is returned back into its parent HTML mode that knows what to do with it.
 
 Since the parser is effectively goes back it's quite possible to create a infinite loop here so use with caution!
@@ -326,7 +326,7 @@ starts
 
 The name of the mode that will start right after the current mode ends. The new mode won't be contained within the current one.
 
-Currently this attribute is used to highlight Javascript and CSS contained within HTML.
+Currently this attribute is used to highlight JavaScript and CSS contained within HTML.
 Tags ``<script>`` and ``<style>`` start sub-modes that use another language definition to parse their contents (see :ref:`subLanguage`).
 
 

From 4616c9fc0fb7ab16373367b6bbaa5a4fba7d3d89 Mon Sep 17 00:00:00 2001
From: pietroppeter <pietro.peterlongo@gmail.com>
Date: Mon, 19 Oct 2020 21:17:55 +0200
Subject: [PATCH 083/223] chore(docs) add nim class to SUPPORTED_LANGUAGES list
 of alises (#2773)

---
 SUPPORTED_LANGUAGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 5c9caea03e..73578744a1 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -122,7 +122,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | NSIS                    | nsis                   |         |
 | Never                   | never                  | [highlightjs-never](https://github.com/never-lang/highlightjs-never) |
 | Nginx                   | nginx, nginxconf       |         |
-| Nim                     | nimrod                 |         |
+| Nim                     | nim, nimrod            |         |
 | Nix                     | nix                    |         |
 | Object Constraint Language | ocl                 | [highlightjs-ocl](https://github.com/nhomble/highlightjs-ocl)        |
 | OCaml                   | ocaml, ml              |         |

From 61c0d9bcd16e7291f29ec0503ad8e018711e2e70 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 12 Oct 2020 17:04:53 -0400
Subject: [PATCH 084/223] remove unsupported negative lookbehind regex

- cherry pick from unreleased branch
---
 src/languages/r.js | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/languages/r.js b/src/languages/r.js
index 176e2075a7..b095333004 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -126,15 +126,40 @@ export default function(hljs) {
           {begin: "'", end: "'", relevance: 0}
         ],
       },
-
       {
         className: 'number',
         variants: [
-          // Special case: only hexadecimal binary powers can contain fractions.
-          { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
-          { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
-          { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
+          // TODO: replace with negative look-behind when available
+          // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
+          // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
+          // { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
+
+          // The below rules all eat an extra character in front (for the
+          // look-behind check) and then exclude it from the match, but I think
+          // in many cases this will work out just fine.
+          {
+            // Special case: only hexadecimal binary powers can contain fractions.
+            begin: /([^a-zA-Z0-9._])(?=0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?)/,
+            end: /0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,
+            excludeBegin: true
+          },
+          {
+            begin: /([^a-zA-Z0-9._])(?=0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?)/,
+            end: /0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ ,
+            excludeBegin: true
+          },
+          {
+            begin: /([^a-zA-Z0-9._])(?=(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?)/,
+            end: /(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/,
+            excludeBegin: true
+          }
         ],
+        // "on:begin": (match, response) => {
+        //   if (match.index > 0) {
+        //     let priorChar = match.input[match.index - 1];
+        //     if (priorChar.match(/[a-zA-Z0-9._]/)) response.ignoreMatch();
+        //   }
+        // },
         relevance: 0
       },
 

From 215eb88a8b18a549b6b5340ed595a94d7700a270 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 17 Oct 2020 19:36:41 -0400
Subject: [PATCH 085/223] (chore) add 10.3.1 release notes to the changelog

---
 CHANGES.md        | 12 ++++++++++++
 docs/conf.py      |  2 +-
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fec763a479..4e5e74afc8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,15 @@
+## Version 10.3.1
+
+Prior version let some look-behind regex sneak in, which does not work
+yet on Safari.  This release removes those incompatible regexes.
+
+Fix:
+
+- fix(Safari) Remove currently unsupported look-behind regex ([fix][187e7cfc]) [Josh Goebel][]
+
+[Josh Goebel]: https://github.com/joshgoebel
+[187e7cfc]: https://github.com/highlightjs/highlight.js/commit/187e7cfcb06277ce13b5f35fb6c37ab7a7b46de9
+
 ## Version 10.3.0
 
 Language Improvements:
diff --git a/docs/conf.py b/docs/conf.py
index 5b9ef9dc7f..60dd5aa513 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = '10.3.0'
+release = '10.3.1'
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/package-lock.json b/package-lock.json
index b49a1505de..d659abecaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.3.0",
+  "version": "10.3.99",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ebf01feb67..23169644d2 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.3.0",
+  "version": "10.3.99",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"

From 608f6841e99390d194841773d21ddd3f5a8e7524 Mon Sep 17 00:00:00 2001
From: Luis Romero <6332263+luiscobits@users.noreply.github.com>
Date: Thu, 22 Oct 2020 03:09:14 -0500
Subject: [PATCH 086/223] chore(docs) add unpkg CDN instructions. (#2779)

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 81d81faefb..a8a2daf8e9 100644
--- a/README.md
+++ b/README.md
@@ -237,8 +237,15 @@ A prebuilt version of highlight.js bundled with many common languages is hosted
 <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/highlight.min.js"></script>
 ```
 
+**unpkg** ([link](https://unpkg.com/browse/@highlightjs/cdn-assets/))
+
+```html
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/styles/default.min.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/highlight.min.js"></script>
+```
+
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be
-very large.  You can find our list "common" languages that we bundle by default on our [download page][5].
+very large. You can find our list "common" languages that we bundle by default on our [download page][5].
 
 ### Self Hosting
 

From f2ec26d939e1e99e78a2a508039b4c866570dc82 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 23 Oct 2020 18:25:28 -0400
Subject: [PATCH 087/223] chore(dev) add theme picker to the developer tool
 (#2770)

---
 CHANGES.md           |  13 +++-
 tools/developer.html | 157 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 155 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4e5e74afc8..b87d8c043c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+## Version 10.4.0 (work in process)
+
+Dev Improvements:
+
+- chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
+
+[Josh Goebel]: https://github.com/joshgoebel
+
+
 ## Version 10.3.1
 
 Prior version let some look-behind regex sneak in, which does not work
@@ -10,6 +19,7 @@ Fix:
 [Josh Goebel]: https://github.com/joshgoebel
 [187e7cfc]: https://github.com/highlightjs/highlight.js/commit/187e7cfcb06277ce13b5f35fb6c37ab7a7b46de9
 
+
 ## Version 10.3.0
 
 Language Improvements:
@@ -50,7 +60,8 @@ Deprecations:
 
 [Chris Krycho]: https://github.com/chriskrycho
 [David Pine]: https://github.com/IEvangelist
-[Josh Goebel]: https://github.com/joshgoebel
+
+
 [Ryan Jonasson]: https://github.com/ryanjonasson
 [Philipp Engel]: https://github.com/interkosmos
 [Konrad Rudolph]: https://github.com/klmr
diff --git a/tools/developer.html b/tools/developer.html
index 86e9e63f8f..8e466fd7c1 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -66,6 +66,100 @@ <h3>Code</h3>
         <button id="update-highlighting">Update highlighting</button>
         <button id="show-structure">Show/hide structure</button>
         Language: <select class="languages"><option value="">(Auto)</option></select>
+        Theme: <select class="theme">
+          <option>default.css</option>
+          <option>a11y-dark.css</option>
+          <option>a11y-light.css</option>
+          <option>agate.css</option>
+          <option>an-old-hope.css</option>
+          <option>androidstudio.css</option>
+          <option>arduino-light.css</option>
+          <option>arta.css</option>
+          <option>ascetic.css</option>
+          <option>atelier-cave-dark.css</option>
+          <option>atelier-cave-light.css</option>
+          <option>atelier-dune-dark.css</option>
+          <option>atelier-dune-light.css</option>
+          <option>atelier-estuary-dark.css</option>
+          <option>atelier-estuary-light.css</option>
+          <option>atelier-forest-dark.css</option>
+          <option>atelier-forest-light.css</option>
+          <option>atelier-heath-dark.css</option>
+          <option>atelier-heath-light.css</option>
+          <option>atelier-lakeside-dark.css</option>
+          <option>atelier-lakeside-light.css</option>
+          <option>atelier-plateau-dark.css</option>
+          <option>atelier-plateau-light.css</option>
+          <option>atelier-savanna-dark.css</option>
+          <option>atelier-savanna-light.css</option>
+          <option>atelier-seaside-dark.css</option>
+          <option>atelier-seaside-light.css</option>
+          <option>atelier-sulphurpool-dark.css</option>
+          <option>atelier-sulphurpool-light.css</option>
+          <option>atom-one-dark-reasonable.css</option>
+          <option>atom-one-dark.css</option>
+          <option>atom-one-light.css</option>
+          <option>brown-paper.css</option>
+          <option>codepen-embed.css</option>
+          <option>color-brewer.css</option>
+          <option>darcula.css</option>
+          <option>dark.css</option>
+          <option>default.css</option>
+          <option>docco.css</option>
+          <option>dracula.css</option>
+          <option>far.css</option>
+          <option>foundation.css</option>
+          <option>github-gist.css</option>
+          <option>github.css</option>
+          <option>gml.css</option>
+          <option>googlecode.css</option>
+          <option>gradient-dark.css</option>
+          <option>grayscale.css</option>
+          <option>gruvbox-dark.css</option>
+          <option>gruvbox-light.css</option>
+          <option>hopscotch.css</option>
+          <option>hybrid.css</option>
+          <option>idea.css</option>
+          <option>ir-black.css</option>
+          <option>isbl-editor-dark.css</option>
+          <option>isbl-editor-light.css</option>
+          <option>kimbie.dark.css</option>
+          <option>kimbie.light.css</option>
+          <option>lightfair.css</option>
+          <option>magula.css</option>
+          <option>mono-blue.css</option>
+          <option>monokai-sublime.css</option>
+          <option>monokai.css</option>
+          <option>night-owl.css</option>
+          <option>nord.css</option>
+          <option>obsidian.css</option>
+          <option>ocean.css</option>
+          <option>paraiso-dark.css</option>
+          <option>paraiso-light.css</option>
+          <option>pojoaque.css</option>
+          <option>purebasic.css</option>
+          <option>qtcreator_dark.css</option>
+          <option>qtcreator_light.css</option>
+          <option>railscasts.css</option>
+          <option>rainbow.css</option>
+          <option>routeros.css</option>
+          <option>school-book.css</option>
+          <option>shades-of-purple.css</option>
+          <option>solarized-dark.css</option>
+          <option>solarized-light.css</option>
+          <option>srcery.css</option>
+          <option>sunburst.css</option>
+          <option>tomorrow-night-blue.css</option>
+          <option>tomorrow-night-bright.css</option>
+          <option>tomorrow-night-eighties.css</option>
+          <option>tomorrow-night.css</option>
+          <option>tomorrow.css</option>
+          <option>vs.css</option>
+          <option>vs2015.css</option>
+          <option>xcode.css</option>
+          <option>xt256.css</option>
+          <option>zenburn.css</option>
+        </select>
       </p>
     </div>
     <div>
@@ -85,12 +179,29 @@ <h3>Markup</h3>
   <script>
     hljs.debugMode();
 
+    function saveSettings() {
+      var editor = $("body .editor");
+      var language = editor.find('.languages').val();
+      var code = editor.find('textarea').val();
+      var theme = $(".theme").val();
+      SourceStore.save({
+        language, code, theme
+      })
+    }
+
     $(document).ready(function() {
       var select = $('.languages');
       hljs.listLanguages().forEach(function(l) {
         select.append('<option>' + l + '</option>');
       });
 
+      $(".theme").change(function(e) {
+        var css = e.target.value;
+        var link = $("link[rel=stylesheet]")[0]
+        link.href = `../src/styles/${css}`
+        localStorage.setItem(key_THEME, css);
+      })
+
       $('.editor button#update-highlighting').click(function(e) {
         var editor = $(this).parents('.editor');
         var language = editor.find('.languages').val();
@@ -108,37 +219,55 @@ <h3>Markup</h3>
         editor.find('.rendering_stats').text(rendering_stats);
         editor.find('.rendering_time').text(rendering_time);
         editor.find('output').text(result.value);
-        SourceStore.save(source, language);
+        saveSettings();
       });
 
       $('.editor button#show-structure').click(function(e) {
         var editor = $(this).parents('.editor');
         editor.toggleClass('visible-structure');
+
+        localStorage.setItem(key_STRUCTURE, editor.hasClass('visible-structure'));
       });
     });
 
     var SourceStore;
+    var key_CODE = 'hljs-source';
+    var key_LANGUAGE = 'hljs-lang';
+    var key_THEME = 'hljs-theme';
+    var key_STRUCTURE = 'hljs-structure';
     (function(){
       SourceStore = {
-        save: function(source, lang){
-          localStorage.setItem(key_SOURCE, source);
-          localStorage.setItem(key_LANG, lang);
+        save: function({code, language, theme}){
+          localStorage.setItem(key_CODE, code);
+          localStorage.setItem(key_LANGUAGE, language);
+          localStorage.setItem(key_THEME, theme);
         },
         resolve: function(){
-          return [
-            localStorage.getItem(key_SOURCE),
-            localStorage.getItem(key_LANG)
-          ];
+          let code = localStorage.getItem(key_CODE)
+          if (!code) return null;
+
+          return {
+            code,
+            language: localStorage.getItem(key_LANGUAGE),
+            theme: localStorage.getItem(key_THEME) || 'default.css',
+          };
         }
       };
-      var key_SOURCE = 'hljs-source';
-      var key_LANG = 'hljs-lang';
       $(function(){
         var data = SourceStore.resolve();
-        if (data == null) return;
-        $('.editor textarea').val(data[0]);
-        $('.editor .languages').val(data[1]);
-        $('.editor button').click();
+        if (!data) return;
+        $('.editor textarea').val(data.code);
+        $('.editor .languages').val(data.language);
+        $('.theme').val(data.theme);
+        $('.editor button').first().click();
+
+        if (localStorage.getItem(key_STRUCTURE) === "true") {
+          var editor = $('body .editor');
+          editor.toggleClass('visible-structure');
+        }
+
+        var link = $("link[rel=stylesheet]")[0]
+        link.href = `../src/styles/${data.theme}`
       });
     }());
 

From 23a90dfcdc0d07e8016bf2b834af2b0a2f5baddc Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Sun, 25 Oct 2020 18:10:38 +0100
Subject: [PATCH 088/223] enh(julia) Update keywords, built_in and literals for
 julia 1.x (#2781)

This updates the lists of keyword, built_in and literal for Julia 1.X. Julia 1.X was released over 2 years ago
---
 AUTHORS.txt                   |   1 +
 CHANGES.md                    |   5 +
 src/languages/julia.js        | 383 +++++++++++++++++++++++++++-------
 test/detect/julia/default.txt |  35 ++--
 4 files changed, 334 insertions(+), 90 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 23a2efc04a..f20b549a42 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -292,3 +292,4 @@ Contributors:
 - Konrad Rudolph <konrad.rudolph@gmail.com>
 - Tom Wallace <thomasmichaelwallace@gmail.com>
 - Michael Newton <miken32@github>
+- Fredrik Ekre <ekrefredrik@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
index b87d8c043c..a2a9cf0560 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,15 @@
 ## Version 10.4.0 (work in process)
 
+Language Improvements:
+
+- enh(julia) Update keyword lists for Julia 1.X (#2781) [Fredrik Ekre][]
+
 Dev Improvements:
 
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
 
 [Josh Goebel]: https://github.com/joshgoebel
+[Fredrik Ekre]: https://github.com/fredrikekre
 
 
 ## Version 10.3.1
diff --git a/src/languages/julia.js b/src/languages/julia.js
index 518284fcc6..7b0b78f78c 100644
--- a/src/languages/julia.js
+++ b/src/languages/julia.js
@@ -2,87 +2,330 @@
 Language: Julia
 Description: Julia is a high-level, high-performance, dynamic programming language.
 Author: Kenta Sato <bicycle1885@gmail.com>
-Contributors: Alex Arslan <ararslan@comcast.net>
+Contributors: Alex Arslan <ararslan@comcast.net>, Fredrik Ekre <ekrefredrik@gmail.com>
 Website: https://julialang.org
 */
 
 export default function(hljs) {
   // Since there are numerous special names in Julia, it is too much trouble
   // to maintain them by hand. Hence these names (i.e. keywords, literals and
-  // built-ins) are automatically generated from Julia v0.6 itself through
+  // built-ins) are automatically generated from Julia 1.5.2 itself through
   // the following scripts for each.
 
-  // ref: http://julia.readthedocs.org/en/latest/manual/variables/#allowed-variable-names
+  // ref: https://docs.julialang.org/en/v1/manual/variables/#Allowed-Variable-Names
   var VARIABLE_NAME_RE = '[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*';
 
+  // # keyword generator, multi-word keywords handled manually below (Julia 1.5.2)
+  // import REPL.REPLCompletions
+  // res = String["in", "isa", "where"]
+  // for kw in collect(x.keyword for x in REPLCompletions.complete_keyword(""))
+  //     if !(contains(kw, " ") || kw == "struct")
+  //         push!(res, kw)
+  //     end
+  // end
+  // sort!(unique!(res))
+  // foreach(x -> println("\'", x, "\',"), res)
+  var KEYWORD_LIST = [
+    'baremodule',
+    'begin',
+    'break',
+    'catch',
+    'ccall',
+    'const',
+    'continue',
+    'do',
+    'else',
+    'elseif',
+    'end',
+    'export',
+    'false',
+    'finally',
+    'for',
+    'function',
+    'global',
+    'if',
+    'import',
+    'in',
+    'isa',
+    'let',
+    'local',
+    'macro',
+    'module',
+    'quote',
+    'return',
+    'true',
+    'try',
+    'using',
+    'where',
+    'while',
+  ]
+
+  // # literal generator (Julia 1.5.2)
+  // import REPL.REPLCompletions
+  // res = String["true", "false"]
+  // for compl in filter!(x -> isa(x, REPLCompletions.ModuleCompletion) && (x.parent === Base || x.parent === Core),
+  //                     REPLCompletions.completions("", 0)[1])
+  //     try
+  //         v = eval(Symbol(compl.mod))
+  //         if !(v isa Function || v isa Type || v isa TypeVar || v isa Module || v isa Colon)
+  //             push!(res, compl.mod)
+  //         end
+  //     catch e
+  //     end
+  // end
+  // sort!(unique!(res))
+  // foreach(x -> println("\'", x, "\',"), res)
+  var LITERAL_LIST = [
+    'ARGS',
+    'C_NULL',
+    'DEPOT_PATH',
+    'ENDIAN_BOM',
+    'ENV',
+    'Inf',
+    'Inf16',
+    'Inf32',
+    'Inf64',
+    'InsertionSort',
+    'LOAD_PATH',
+    'MergeSort',
+    'NaN',
+    'NaN16',
+    'NaN32',
+    'NaN64',
+    'PROGRAM_FILE',
+    'QuickSort',
+    'RoundDown',
+    'RoundFromZero',
+    'RoundNearest',
+    'RoundNearestTiesAway',
+    'RoundNearestTiesUp',
+    'RoundToZero',
+    'RoundUp',
+    'VERSION|0',
+    'devnull',
+    'false',
+    'im',
+    'missing',
+    'nothing',
+    'pi',
+    'stderr',
+    'stdin',
+    'stdout',
+    'true',
+    'undef',
+    'π',
+    'ℯ',
+  ]
+
+  // # built_in generator (Julia 1.5.2)
+  // import REPL.REPLCompletions
+  // res = String[]
+  // for compl in filter!(x -> isa(x, REPLCompletions.ModuleCompletion) && (x.parent === Base || x.parent === Core),
+  //                     REPLCompletions.completions("", 0)[1])
+  //     try
+  //         v = eval(Symbol(compl.mod))
+  //         if (v isa Type || v isa TypeVar) && (compl.mod != "=>")
+  //             push!(res, compl.mod)
+  //         end
+  //     catch e
+  //     end
+  // end
+  // sort!(unique!(res))
+  // foreach(x -> println("\'", x, "\',"), res)
+  var BUILT_IN_LIST = [
+    'AbstractArray',
+    'AbstractChannel',
+    'AbstractChar',
+    'AbstractDict',
+    'AbstractDisplay',
+    'AbstractFloat',
+    'AbstractIrrational',
+    'AbstractMatrix',
+    'AbstractRange',
+    'AbstractSet',
+    'AbstractString',
+    'AbstractUnitRange',
+    'AbstractVecOrMat',
+    'AbstractVector',
+    'Any',
+    'ArgumentError',
+    'Array',
+    'AssertionError',
+    'BigFloat',
+    'BigInt',
+    'BitArray',
+    'BitMatrix',
+    'BitSet',
+    'BitVector',
+    'Bool',
+    'BoundsError',
+    'CapturedException',
+    'CartesianIndex',
+    'CartesianIndices',
+    'Cchar',
+    'Cdouble',
+    'Cfloat',
+    'Channel',
+    'Char',
+    'Cint',
+    'Cintmax_t',
+    'Clong',
+    'Clonglong',
+    'Cmd',
+    'Colon',
+    'Complex',
+    'ComplexF16',
+    'ComplexF32',
+    'ComplexF64',
+    'CompositeException',
+    'Condition',
+    'Cptrdiff_t',
+    'Cshort',
+    'Csize_t',
+    'Cssize_t',
+    'Cstring',
+    'Cuchar',
+    'Cuint',
+    'Cuintmax_t',
+    'Culong',
+    'Culonglong',
+    'Cushort',
+    'Cvoid',
+    'Cwchar_t',
+    'Cwstring',
+    'DataType',
+    'DenseArray',
+    'DenseMatrix',
+    'DenseVecOrMat',
+    'DenseVector',
+    'Dict',
+    'DimensionMismatch',
+    'Dims',
+    'DivideError',
+    'DomainError',
+    'EOFError',
+    'Enum',
+    'ErrorException',
+    'Exception',
+    'ExponentialBackOff',
+    'Expr',
+    'Float16',
+    'Float32',
+    'Float64',
+    'Function',
+    'GlobalRef',
+    'HTML',
+    'IO',
+    'IOBuffer',
+    'IOContext',
+    'IOStream',
+    'IdDict',
+    'IndexCartesian',
+    'IndexLinear',
+    'IndexStyle',
+    'InexactError',
+    'InitError',
+    'Int',
+    'Int128',
+    'Int16',
+    'Int32',
+    'Int64',
+    'Int8',
+    'Integer',
+    'InterruptException',
+    'InvalidStateException',
+    'Irrational',
+    'KeyError',
+    'LinRange',
+    'LineNumberNode',
+    'LinearIndices',
+    'LoadError',
+    'MIME',
+    'Matrix',
+    'Method',
+    'MethodError',
+    'Missing',
+    'MissingException',
+    'Module',
+    'NTuple',
+    'NamedTuple',
+    'Nothing',
+    'Number',
+    'OrdinalRange',
+    'OutOfMemoryError',
+    'OverflowError',
+    'Pair',
+    'PartialQuickSort',
+    'PermutedDimsArray',
+    'Pipe',
+    'ProcessFailedException',
+    'Ptr',
+    'QuoteNode',
+    'Rational',
+    'RawFD',
+    'ReadOnlyMemoryError',
+    'Real',
+    'ReentrantLock',
+    'Ref',
+    'Regex',
+    'RegexMatch',
+    'RoundingMode',
+    'SegmentationFault',
+    'Set',
+    'Signed',
+    'Some',
+    'StackOverflowError',
+    'StepRange',
+    'StepRangeLen',
+    'StridedArray',
+    'StridedMatrix',
+    'StridedVecOrMat',
+    'StridedVector',
+    'String',
+    'StringIndexError',
+    'SubArray',
+    'SubString',
+    'SubstitutionString',
+    'Symbol',
+    'SystemError',
+    'Task',
+    'TaskFailedException',
+    'Text',
+    'TextDisplay',
+    'Timer',
+    'Tuple',
+    'Type',
+    'TypeError',
+    'TypeVar',
+    'UInt',
+    'UInt128',
+    'UInt16',
+    'UInt32',
+    'UInt64',
+    'UInt8',
+    'UndefInitializer',
+    'UndefKeywordError',
+    'UndefRefError',
+    'UndefVarError',
+    'Union',
+    'UnionAll',
+    'UnitRange',
+    'Unsigned',
+    'Val',
+    'Vararg',
+    'VecElement',
+    'VecOrMat',
+    'Vector',
+    'VersionNumber',
+    'WeakKeyDict',
+    'WeakRef',
+  ]
+
   var KEYWORDS = {
     $pattern: VARIABLE_NAME_RE,
-    // # keyword generator, multi-word keywords handled manually below
-    // foreach(println, ["in", "isa", "where"])
-    // for kw in Base.REPLCompletions.complete_keyword("")
-    //     if !(contains(kw, " ") || kw == "struct")
-    //         println(kw)
-    //     end
-    // end
-    keyword:
-      'in isa where ' +
-      'baremodule begin break catch ccall const continue do else elseif end export false finally for function ' +
-      'global if import importall let local macro module quote return true try using while ' +
-      // legacy, to be deprecated in the next release
-      'type immutable abstract bitstype typealias ',
-
-    // # literal generator
-    // println("true")
-    // println("false")
-    // for name in Base.REPLCompletions.completions("", 0)[1]
-    //     try
-    //         v = eval(Symbol(name))
-    //         if !(v isa Function || v isa Type || v isa TypeVar || v isa Module || v isa Colon)
-    //             println(name)
-    //         end
-    //     end
-    // end
-    literal:
-      'true false ' +
-      'ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort ' +
-      'NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway ' +
-      'RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im ' +
-      'nothing pi γ π φ ',
-
-    // # built_in generator:
-    // for name in Base.REPLCompletions.completions("", 0)[1]
-    //     try
-    //         v = eval(Symbol(name))
-    //         if v isa Type || v isa TypeVar
-    //             println(name)
-    //         end
-    //     end
-    // end
-    built_in:
-      'ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet ' +
-      'AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat ' +
-      'AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal '+
-      'BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException ' +
-      'CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager ' +
-      'Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ' +
-      'ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t ' +
-      'Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict ' +
-      'DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ' +
-      'ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function ' +
-      'Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear ' +
-      'IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException ' +
-      'InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix ' +
-      'MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict ' +
-      'OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe ' +
-      'PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ' +
-      'ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode ' +
-      'RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed ' +
-      'SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange ' +
-      'StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal ' +
-      'Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry ' +
-      'TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError ' +
-      'UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector ' +
-      'VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool '
+    keyword: KEYWORD_LIST.join(" "),
+    literal: LITERAL_LIST.join(" "),
+    built_in: BUILT_IN_LIST.join(" "),
   };
 
   // placeholder for recursive self-reference
@@ -90,7 +333,7 @@ export default function(hljs) {
     keywords: KEYWORDS, illegal: /<\//
   };
 
-  // ref: http://julia.readthedocs.org/en/latest/manual/integers-and-floating-point-numbers/
+  // ref: https://docs.julialang.org/en/v1/manual/integers-and-floating-point-numbers/
   var NUMBER = {
     className: 'number',
     // supported numeric literals:
diff --git a/test/detect/julia/default.txt b/test/detect/julia/default.txt
index 12f981460a..a20262df03 100644
--- a/test/detect/julia/default.txt
+++ b/test/detect/julia/default.txt
@@ -1,21 +1,5 @@
 ### Types
 
-# Old-style definitions
-
-immutable Point{T<:AbstractFloat}
-    index::Int
-    x::T
-    y::T
-end
-
-abstract A
-
-type B <: A end
-
-typealias P Point{Float16}
-
-# New-style definitions
-
 struct Plus
     f::typeof(+)
 end
@@ -35,7 +19,6 @@ module M
 
 using X
 import Y
-importall Z
 
 export a, b, c
 
@@ -44,7 +27,21 @@ end # module
 baremodule Bare
 end
 
-### New in 0.6
+
+### Miscellaneous
+
+# Some things new for Julia >1.0
+function f(x::Union{String,Missing,Nothing}, y::Tuple{Float64,ComplexF64})
+    if x === nothing
+        println(devnull, "nothing")
+    elseif x === missing
+        println(stderr, "missing")
+    else
+        println(stdout, x)
+    end
+end
+
+f(x::UndefInitializer = undef) = Regex("^hello, world\$")
 
 # where, infix isa, UnionAll
 function F{T}(x::T) where T
@@ -53,8 +50,6 @@ function F{T}(x::T) where T
     end
 end
 
-### Miscellaneous
-
 #=
 Multi
 Line

From 21b146644e15ba2b101341da0d3e4dc61db53056 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Sun, 25 Oct 2020 16:37:18 -0400
Subject: [PATCH 089/223] enh(python) Match numeric literals per the language
 reference (#2780)

- Ref: https://docs.python.org/3/reference/lexical_analysis.html#numeric-literals
---
 AUTHORS.txt                           |  1 +
 CHANGES.md                            |  6 ++--
 src/languages/python.js               | 33 +++++++++++++++++++--
 test/markup/python/numbers.expect.txt | 41 +++++++++++++++++++++++++++
 test/markup/python/numbers.txt        | 41 +++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 5 deletions(-)
 create mode 100644 test/markup/python/numbers.expect.txt
 create mode 100644 test/markup/python/numbers.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index f20b549a42..06e2d0cfe4 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -292,4 +292,5 @@ Contributors:
 - Konrad Rudolph <konrad.rudolph@gmail.com>
 - Tom Wallace <thomasmichaelwallace@gmail.com>
 - Michael Newton <miken32@github>
+- Richard Gibson <gibson042@github>
 - Fredrik Ekre <ekrefredrik@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
index a2a9cf0560..0cb70be3d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,14 +2,16 @@
 
 Language Improvements:
 
-- enh(julia) Update keyword lists for Julia 1.X (#2781) [Fredrik Ekre][]
+- enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
+- enh(python) Match numeric literals per the language reference [Richard Gibson][]
 
 Dev Improvements:
 
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
 
-[Josh Goebel]: https://github.com/joshgoebel
 [Fredrik Ekre]: https://github.com/fredrikekre
+[Richard Gibson]: https://github.com/gibson042
+[Josh Goebel]: https://github.com/joshgoebel
 
 
 ## Version 10.3.1
diff --git a/src/languages/python.js b/src/languages/python.js
index d737f4e6cf..e9151e7560 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -194,12 +194,39 @@ export default function(hljs) {
     ]
   };
 
+  // https://docs.python.org/3.9/reference/lexical_analysis.html#numeric-literals
+  const digitpart = '[0-9](_?[0-9])*';
+  const pointfloat = `(\\b(${digitpart}))?\\.(${digitpart})|\\b(${digitpart})\\.`;
   const NUMBER = {
     className: 'number', relevance: 0,
     variants: [
-      {begin: hljs.BINARY_NUMBER_RE + '[lLjJ]?'},
-      {begin: '\\b(0o[0-7]+)[lLjJ]?'},
-      {begin: hljs.C_NUMBER_RE + '[lLjJ]?'}
+      // exponentfloat, pointfloat
+      // https://docs.python.org/3.9/reference/lexical_analysis.html#floating-point-literals
+      // optionally imaginary
+      // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+      // Note: no leading \b because floats can start with a decimal point
+      // and we don't want to mishandle e.g. `fn(.5)`,
+      // no trailing \b for pointfloat because it can end with a decimal point
+      // and we don't want to mishandle e.g. `0..hex()`; this should be safe
+      // because both MUST contain a decimal point and so cannot be confused with
+      // the interior part of an identifier
+      { begin: `(\\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?\\b` },
+      { begin: `(${pointfloat})[jJ]?` },
+
+      // decinteger, bininteger, octinteger, hexinteger
+      // https://docs.python.org/3.9/reference/lexical_analysis.html#integer-literals
+      // optionally "long" in Python 2
+      // https://docs.python.org/2.7/reference/lexical_analysis.html#integer-and-long-integer-literals
+      // decinteger is optionally imaginary
+      // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+      { begin: '\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\\b' },
+      { begin: '\\b0[bB](_?[01])+[lL]?\\b' },
+      { begin: '\\b0[oO](_?[0-7])+[lL]?\\b' },
+      { begin: '\\b0[xX](_?[0-9a-fA-F])+[lL]?\\b' },
+
+      // imagnumber (digitpart-based)
+      // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+      { begin: `\\b(${digitpart})[jJ]\\b` },
     ]
   };
 
diff --git a/test/markup/python/numbers.expect.txt b/test/markup/python/numbers.expect.txt
new file mode 100644
index 0000000000..004a36eb08
--- /dev/null
+++ b/test/markup/python/numbers.expect.txt
@@ -0,0 +1,41 @@
+<span class="hljs-number">1</span>, <span class="hljs-number">10</span>,  <span class="hljs-number">999</span>,   <span class="hljs-number">0</span>, <span class="hljs-number">00</span>,  <span class="hljs-number">000</span>,   <span class="hljs-number">442L</span>
+<span class="hljs-number">1</span>, <span class="hljs-number">1_0</span>, <span class="hljs-number">9_9_9</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0_0</span>, <span class="hljs-number">0_0_0</span>, <span class="hljs-number">4_42l</span>
+
+<span class="hljs-number">0b0</span>,  <span class="hljs-number">0B11</span>,   <span class="hljs-number">0B000</span>,  <span class="hljs-number">0b010</span>,  <span class="hljs-number">0B11111l</span>
+<span class="hljs-number">0b_0</span>, <span class="hljs-number">0B_1_1</span>, <span class="hljs-number">0B0_00</span>, <span class="hljs-number">0b01_0</span>, <span class="hljs-number">0B1_1111L</span>
+
+<span class="hljs-number">0O0</span>,  <span class="hljs-number">0o01</span>,   <span class="hljs-number">0O777</span>,  <span class="hljs-number">0o644</span>, <span class="hljs-number">0O1234567L</span>
+<span class="hljs-number">0O_0</span>, <span class="hljs-number">0o_0_1</span>, <span class="hljs-number">0O77_7</span>, <span class="hljs-number">0o6_44</span>, <span class="hljs-number">0O123_4567l</span>
+
+<span class="hljs-number">0x0</span>,  <span class="hljs-number">0Xa0</span>,   <span class="hljs-number">0X7FFF</span>,  <span class="hljs-number">0xd3aD</span>,   <span class="hljs-number">0X1d306l</span>
+<span class="hljs-number">0x_0</span>, <span class="hljs-number">0X_a_0</span>, <span class="hljs-number">0X7F_FF</span>, <span class="hljs-number">0x_d3_aD</span>, <span class="hljs-number">0X1_d306L</span>
+
+
+<span class="hljs-number">.0</span>, <span class="hljs-number">.00</span>,  <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">40.0</span>,  <span class="hljs-number">0.</span>, <span class="hljs-number">00.</span>,  <span class="hljs-number">10.</span>
+<span class="hljs-number">.0</span>, <span class="hljs-number">.0_0</span>, <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">4_0.0</span>, <span class="hljs-number">0.</span>, <span class="hljs-number">0_0.</span>, <span class="hljs-number">1_0.</span>
+
+<span class="hljs-number">.0e10</span>,  <span class="hljs-number">.00e+10</span>,  <span class="hljs-number">.9e-10</span>,  <span class="hljs-number">4.2E10</span>,  <span class="hljs-number">40.0E+08</span>,   <span class="hljs-number">0.E-10</span>,  <span class="hljs-number">00.e100</span>,    <span class="hljs-number">0010e+10</span>
+<span class="hljs-number">.0e1_0</span>, <span class="hljs-number">.0_0e+10</span>, <span class="hljs-number">.9e-1_0</span>, <span class="hljs-number">4.2E1_0</span>, <span class="hljs-number">4_0.0E+0_8</span>, <span class="hljs-number">0.E-1_0</span>, <span class="hljs-number">0_0.e1_0_0</span>, <span class="hljs-number">00_10e+10</span>
+
+
+<span class="hljs-number">.0j</span>, <span class="hljs-number">.00J</span>,  <span class="hljs-number">.9j</span>, <span class="hljs-number">4.2J</span>, <span class="hljs-number">40.0j</span>,  <span class="hljs-number">0.J</span>, <span class="hljs-number">00.j</span>,  <span class="hljs-number">10.J</span>
+<span class="hljs-number">.0j</span>, <span class="hljs-number">.0_0J</span>, <span class="hljs-number">.9j</span>, <span class="hljs-number">4.2J</span>, <span class="hljs-number">4_0.0j</span>, <span class="hljs-number">0.J</span>, <span class="hljs-number">0_0.j</span>, <span class="hljs-number">1_0.J</span>
+
+<span class="hljs-number">.0e10J</span>,  <span class="hljs-number">.00e+10j</span>,  <span class="hljs-number">.9e-10J</span>,  <span class="hljs-number">4.2E10j</span>,  <span class="hljs-number">40.0E+08J</span>,   <span class="hljs-number">0.E-10j</span>,  <span class="hljs-number">00.e100J</span>,    <span class="hljs-number">0010e+10j</span>
+<span class="hljs-number">.0e1_0J</span>, <span class="hljs-number">.0_0e+10j</span>, <span class="hljs-number">.9e-1_0J</span>, <span class="hljs-number">4.2E1_0j</span>, <span class="hljs-number">4_0.0E+0_8J</span>, <span class="hljs-number">0.E-1_0j</span>, <span class="hljs-number">0_0.e1_0_0J</span>, <span class="hljs-number">00_10e+10j</span>
+
+<span class="hljs-number">0j</span>, <span class="hljs-number">00J</span>,  <span class="hljs-number">000j</span>,   <span class="hljs-number">1234J</span>
+<span class="hljs-number">0j</span>, <span class="hljs-number">0_0J</span>, <span class="hljs-number">0_0_0j</span>, <span class="hljs-number">12_3_4J</span>
+
+
+<span class="hljs-comment"># expressions containing numeric literals</span>
+<span class="hljs-number">0.</span>.__str__, <span class="hljs-number">1e1</span>.__str__, fn(<span class="hljs-number">.5</span>)
+
+<span class="hljs-comment"># expressions not containing numeric literals</span>
+x0.j
+
+<span class="hljs-comment"># invalid pseudo-numeric expressions</span>
+1__0
+1e_1
+07
+0b1e1
diff --git a/test/markup/python/numbers.txt b/test/markup/python/numbers.txt
new file mode 100644
index 0000000000..a0aeb7dc50
--- /dev/null
+++ b/test/markup/python/numbers.txt
@@ -0,0 +1,41 @@
+1, 10,  999,   0, 00,  000,   442L
+1, 1_0, 9_9_9, 0, 0_0, 0_0_0, 4_42l
+
+0b0,  0B11,   0B000,  0b010,  0B11111l
+0b_0, 0B_1_1, 0B0_00, 0b01_0, 0B1_1111L
+
+0O0,  0o01,   0O777,  0o644, 0O1234567L
+0O_0, 0o_0_1, 0O77_7, 0o6_44, 0O123_4567l
+
+0x0,  0Xa0,   0X7FFF,  0xd3aD,   0X1d306l
+0x_0, 0X_a_0, 0X7F_FF, 0x_d3_aD, 0X1_d306L
+
+
+.0, .00,  .9, 4.2, 40.0,  0., 00.,  10.
+.0, .0_0, .9, 4.2, 4_0.0, 0., 0_0., 1_0.
+
+.0e10,  .00e+10,  .9e-10,  4.2E10,  40.0E+08,   0.E-10,  00.e100,    0010e+10
+.0e1_0, .0_0e+10, .9e-1_0, 4.2E1_0, 4_0.0E+0_8, 0.E-1_0, 0_0.e1_0_0, 00_10e+10
+
+
+.0j, .00J,  .9j, 4.2J, 40.0j,  0.J, 00.j,  10.J
+.0j, .0_0J, .9j, 4.2J, 4_0.0j, 0.J, 0_0.j, 1_0.J
+
+.0e10J,  .00e+10j,  .9e-10J,  4.2E10j,  40.0E+08J,   0.E-10j,  00.e100J,    0010e+10j
+.0e1_0J, .0_0e+10j, .9e-1_0J, 4.2E1_0j, 4_0.0E+0_8J, 0.E-1_0j, 0_0.e1_0_0J, 00_10e+10j
+
+0j, 00J,  000j,   1234J
+0j, 0_0J, 0_0_0j, 12_3_4J
+
+
+# expressions containing numeric literals
+0..__str__, 1e1.__str__, fn(.5)
+
+# expressions not containing numeric literals
+x0.j
+
+# invalid pseudo-numeric expressions
+1__0
+1e_1
+07
+0b1e1

From a636dad242aaaa9fbb6abbd74915e2adb42d09ff Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Tue, 27 Oct 2020 01:19:43 -0400
Subject: [PATCH 090/223] enh(ruby) Match numeric literals per language
 documentation (#2788)

* enh(ruby) Match numeric literals per language documentation

https://docs.ruby-lang.org/en/2.7.0/doc/syntax/literals_rdoc.html#label-Numbers
Fixes #2766

* refactor(ruby) Split integer literal patterns into distinct variants
* lint(ruby) Fix whitespace
---
 CHANGES.md                          |  1 +
 src/languages/ruby.js               | 30 ++++++++++++---
 test/markup/ruby/numbers.expect.txt | 57 +++++++++++++++++++++++++++++
 test/markup/ruby/numbers.txt        | 57 +++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 5 deletions(-)
 create mode 100644 test/markup/ruby/numbers.expect.txt
 create mode 100644 test/markup/ruby/numbers.txt

diff --git a/CHANGES.md b/CHANGES.md
index 0cb70be3d0..4bbcd4c2e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@ Language Improvements:
 
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
+- enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
 
 Dev Improvements:
 
diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index bce2aaf841..f94e7e0328 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -80,6 +80,30 @@ export default function(hljs) {
       }
     ]
   };
+
+  // Ruby syntax is underdocumented, but this grammar seems to be accurate
+  // as of version 2.7.2 (confirmed with (irb and `Ripper.sexp(...)`)
+  // https://docs.ruby-lang.org/en/2.7.0/doc/syntax/literals_rdoc.html#label-Numbers
+  var decimal = '[1-9](_?[0-9])*|0';
+  var digits = '[0-9](_?[0-9])*';
+  var NUMBER = {
+    className: 'number', relevance: 0,
+    variants: [
+      // decimal integer/float, optionally exponential or rational, optionally imaginary
+      { begin: `\\b(${decimal})(\\.(${digits}))?([eE][+-]?(${digits})|r)?i?\\b` },
+
+      // explicit decimal/binary/octal/hexadecimal integer,
+      // optionally rational and/or imaginary
+      { begin: "\\b0[dD][0-9](_?[0-9])*r?i?\\b" },
+      { begin: "\\b0[bB][0-1](_?[0-1])*r?i?\\b" },
+      { begin: "\\b0[oO][0-7](_?[0-7])*r?i?\\b" },
+      { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b" },
+
+      // 0-prefixed implicit octal integer, optionally rational and/or imaginary
+      { begin: "\\b0(_?[0-7])+r?i?\\b" },
+    ]
+  };
+
   var PARAMS = {
     className: 'params',
     begin: '\\(', end: '\\)', endsParent: true,
@@ -126,11 +150,7 @@ export default function(hljs) {
       contains: [STRING, {begin: RUBY_METHOD_RE}],
       relevance: 0
     },
-    {
-      className: 'number',
-      begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
-      relevance: 0
-    },
+    NUMBER,
     {
       begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))' // variables
     },
diff --git a/test/markup/ruby/numbers.expect.txt b/test/markup/ruby/numbers.expect.txt
new file mode 100644
index 0000000000..7c908fc790
--- /dev/null
+++ b/test/markup/ruby/numbers.expect.txt
@@ -0,0 +1,57 @@
+<span class="hljs-number">1</span>; <span class="hljs-number">10</span>;  <span class="hljs-number">999</span>;   <span class="hljs-number">0</span>; <span class="hljs-number">00</span>;  <span class="hljs-number">000</span>
+<span class="hljs-number">1</span>; <span class="hljs-number">1_0</span>; <span class="hljs-number">9_9_9</span>; <span class="hljs-number">0</span>; <span class="hljs-number">0_0</span>; <span class="hljs-number">0_0_0</span>
+
+<span class="hljs-number">0D1</span>; <span class="hljs-number">0d10</span>;  <span class="hljs-number">0D999</span>;   <span class="hljs-number">0d0</span>; <span class="hljs-number">0D00</span>;  <span class="hljs-number">0d000</span>;   <span class="hljs-number">0d008</span>
+<span class="hljs-number">0D1</span>; <span class="hljs-number">0d1_0</span>; <span class="hljs-number">0D9_9_9</span>; <span class="hljs-number">0d0</span>; <span class="hljs-number">0D0_0</span>; <span class="hljs-number">0d0_0_0</span>; <span class="hljs-number">0D0_0_8</span>
+
+<span class="hljs-number">0b0</span>; <span class="hljs-number">0B11</span>;  <span class="hljs-number">0B000</span>;  <span class="hljs-number">0b010</span>
+<span class="hljs-number">0b0</span>; <span class="hljs-number">0B1_1</span>; <span class="hljs-number">0B0_00</span>; <span class="hljs-number">0b01_0</span>
+
+<span class="hljs-number">077</span>;   <span class="hljs-number">0O0</span>; <span class="hljs-number">0o01</span>;  <span class="hljs-number">0O777</span>;  <span class="hljs-number">0o644</span>
+<span class="hljs-number">0_7_7</span>; <span class="hljs-number">0O0</span>; <span class="hljs-number">0o0_1</span>; <span class="hljs-number">0O77_7</span>; <span class="hljs-number">0o6_44</span>
+
+<span class="hljs-number">0x0</span>; <span class="hljs-number">0Xa0</span>;  <span class="hljs-number">0X7FFF</span>;  <span class="hljs-number">0xd3aD</span>
+<span class="hljs-number">0x0</span>; <span class="hljs-number">0Xa_0</span>; <span class="hljs-number">0X7F_FF</span>; <span class="hljs-number">0xd3_aD</span>
+
+
+<span class="hljs-number">4.2</span>; <span class="hljs-number">4.20</span>;  <span class="hljs-number">88.0</span>;  <span class="hljs-number">13.37</span>
+<span class="hljs-number">4.2</span>; <span class="hljs-number">4.2_0</span>; <span class="hljs-number">8_8.0</span>; <span class="hljs-number">1_3.3_7</span>
+
+<span class="hljs-number">0e10</span>;  <span class="hljs-number">0.00e+10</span>;  <span class="hljs-number">9e-10</span>;  <span class="hljs-number">4.2E10</span>;  <span class="hljs-number">40.0E+10</span>;   <span class="hljs-number">0e100</span>;   <span class="hljs-number">1010e+10</span>
+<span class="hljs-number">0e1_0</span>; <span class="hljs-number">0.0_0e+10</span>; <span class="hljs-number">9e-1_0</span>; <span class="hljs-number">4.2E1_0</span>; <span class="hljs-number">4_0.0E+1_0</span>; <span class="hljs-number">0e1_0_0</span>; <span class="hljs-number">10_10e+10</span>
+
+
+<span class="hljs-number">100r</span>;  <span class="hljs-number">077r</span>;   <span class="hljs-number">4.2r</span>; <span class="hljs-number">4.20r</span>;  <span class="hljs-number">88.0r</span>; <span class="hljs-number">13.37r</span>;   <span class="hljs-number">0d800r</span>;   <span class="hljs-number">0B100r</span>;  <span class="hljs-number">0o700r</span>;  <span class="hljs-number">0XaB_cr</span>
+<span class="hljs-number">1_00r</span>; <span class="hljs-number">0_7_7r</span>; <span class="hljs-number">4.2r</span>; <span class="hljs-number">4.2_0r</span>; <span class="hljs-number">88.0r</span>; <span class="hljs-number">1_3.3_7r</span>; <span class="hljs-number">0d8_0_0r</span>; <span class="hljs-number">0B1_00r</span>; <span class="hljs-number">0o70_0r</span>; <span class="hljs-number">0XaB_cr</span>
+
+
+<span class="hljs-number">0i</span>; <span class="hljs-number">00i</span>;  <span class="hljs-number">000i</span>;   <span class="hljs-number">1234i</span>;  <span class="hljs-number">077i</span>;  <span class="hljs-number">0d08i</span>;  <span class="hljs-number">0B11i</span>;  <span class="hljs-number">0o77i</span>;  <span class="hljs-number">13.37i</span>
+<span class="hljs-number">0i</span>; <span class="hljs-number">0_0i</span>; <span class="hljs-number">0_0_0i</span>; <span class="hljs-number">12_34i</span>; <span class="hljs-number">0_77i</span>; <span class="hljs-number">0d0_8i</span>; <span class="hljs-number">0B1_1i</span>; <span class="hljs-number">0o7_7i</span>; <span class="hljs-number">13.3_7i</span>
+
+<span class="hljs-number">1e100i</span>;   <span class="hljs-number">13.37e08i</span>;    <span class="hljs-number">13.37E-07i</span>;   <span class="hljs-number">13.37e+09i</span>
+<span class="hljs-number">1e1_0_0i</span>; <span class="hljs-number">1_3.3_7e0_8i</span>; <span class="hljs-number">1_3.3_7E-07i</span>; <span class="hljs-number">13.37e+0_9i</span>
+
+
+<span class="hljs-number">100ri</span>;  <span class="hljs-number">077ri</span>;   <span class="hljs-number">4.2ri</span>; <span class="hljs-number">4.20ri</span>;  <span class="hljs-number">88.0ri</span>; <span class="hljs-number">13.37ri</span>;   <span class="hljs-number">0d800ri</span>;   <span class="hljs-number">0B100ri</span>;  <span class="hljs-number">0o700ri</span>;  <span class="hljs-number">0XaB_cri</span>
+<span class="hljs-number">1_00ri</span>; <span class="hljs-number">0_7_7ri</span>; <span class="hljs-number">4.2ri</span>; <span class="hljs-number">4.2_0ri</span>; <span class="hljs-number">88.0ri</span>; <span class="hljs-number">1_3.3_7ri</span>; <span class="hljs-number">0d8_0_0ri</span>; <span class="hljs-number">0B1_00ri</span>; <span class="hljs-number">0o70_0ri</span>; <span class="hljs-number">0XaB_cri</span>
+
+
+<span class="hljs-comment"># expressions containing numeric literals</span>
+<span class="hljs-number">0</span>..<span class="hljs-number">7</span>; <span class="hljs-number">1e1</span>..<span class="hljs-number">2e1</span>; <span class="hljs-number">0b0</span>.to_s
+
+<span class="hljs-comment"># pseudo-expressions containing numeric literals</span>
+<span class="hljs-number">0d100</span>.<span class="hljs-number">0</span>
+.<span class="hljs-number">0</span>
+<span class="hljs-number">0</span>.
+<span class="hljs-number">00</span>.<span class="hljs-number">0</span>
+
+<span class="hljs-comment"># invalid pseudo-numeric expressions</span>
+1__0
+1e_1
+1e1r
+08
+07e1
+0b1e1
+0I
+0R
+0ir
diff --git a/test/markup/ruby/numbers.txt b/test/markup/ruby/numbers.txt
new file mode 100644
index 0000000000..cffca3ab2a
--- /dev/null
+++ b/test/markup/ruby/numbers.txt
@@ -0,0 +1,57 @@
+1; 10;  999;   0; 00;  000
+1; 1_0; 9_9_9; 0; 0_0; 0_0_0
+
+0D1; 0d10;  0D999;   0d0; 0D00;  0d000;   0d008
+0D1; 0d1_0; 0D9_9_9; 0d0; 0D0_0; 0d0_0_0; 0D0_0_8
+
+0b0; 0B11;  0B000;  0b010
+0b0; 0B1_1; 0B0_00; 0b01_0
+
+077;   0O0; 0o01;  0O777;  0o644
+0_7_7; 0O0; 0o0_1; 0O77_7; 0o6_44
+
+0x0; 0Xa0;  0X7FFF;  0xd3aD
+0x0; 0Xa_0; 0X7F_FF; 0xd3_aD
+
+
+4.2; 4.20;  88.0;  13.37
+4.2; 4.2_0; 8_8.0; 1_3.3_7
+
+0e10;  0.00e+10;  9e-10;  4.2E10;  40.0E+10;   0e100;   1010e+10
+0e1_0; 0.0_0e+10; 9e-1_0; 4.2E1_0; 4_0.0E+1_0; 0e1_0_0; 10_10e+10
+
+
+100r;  077r;   4.2r; 4.20r;  88.0r; 13.37r;   0d800r;   0B100r;  0o700r;  0XaB_cr
+1_00r; 0_7_7r; 4.2r; 4.2_0r; 88.0r; 1_3.3_7r; 0d8_0_0r; 0B1_00r; 0o70_0r; 0XaB_cr
+
+
+0i; 00i;  000i;   1234i;  077i;  0d08i;  0B11i;  0o77i;  13.37i
+0i; 0_0i; 0_0_0i; 12_34i; 0_77i; 0d0_8i; 0B1_1i; 0o7_7i; 13.3_7i
+
+1e100i;   13.37e08i;    13.37E-07i;   13.37e+09i
+1e1_0_0i; 1_3.3_7e0_8i; 1_3.3_7E-07i; 13.37e+0_9i
+
+
+100ri;  077ri;   4.2ri; 4.20ri;  88.0ri; 13.37ri;   0d800ri;   0B100ri;  0o700ri;  0XaB_cri
+1_00ri; 0_7_7ri; 4.2ri; 4.2_0ri; 88.0ri; 1_3.3_7ri; 0d8_0_0ri; 0B1_00ri; 0o70_0ri; 0XaB_cri
+
+
+# expressions containing numeric literals
+0..7; 1e1..2e1; 0b0.to_s
+
+# pseudo-expressions containing numeric literals
+0d100.0
+.0
+0.
+00.0
+
+# invalid pseudo-numeric expressions
+1__0
+1e_1
+1e1r
+08
+07e1
+0b1e1
+0I
+0R
+0ir

From 95ad8199ab1f3f2c4d83e9ddcfc5e0436f6776f3 Mon Sep 17 00:00:00 2001
From: Taufik Nurrohman <t.nurrohman77@gmail.com>
Date: Tue, 27 Oct 2020 03:45:41 -0400
Subject: [PATCH 091/223] enh(php) highlight variables (#2785)

Resolves #2778.

* Also modernize a bit.
---
 CHANGES.md                          |  4 +++-
 src/languages/php.js                | 19 ++++++++++---------
 test/markup/php/comments.expect.txt |  8 ++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4bbcd4c2e2..f667d57fd7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Language Improvements:
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
 - enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
+- enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 
 Dev Improvements:
 
@@ -13,6 +14,7 @@ Dev Improvements:
 [Fredrik Ekre]: https://github.com/fredrikekre
 [Richard Gibson]: https://github.com/gibson042
 [Josh Goebel]: https://github.com/joshgoebel
+[Taufik Nurrohman]: https://github.com/taufik-nurrohman
 
 
 ## Version 10.3.1
@@ -1323,7 +1325,7 @@ Notable fixes and improvements to existing languages:
 - HTML `<script>` tag now allows any language, not just JavaScript.
 - Multi-line comments are supported now in MatLab.
 
-[Taufik Nurrohman]: https://github.com/tovic
+[Taufik Nurrohman]: https://github.com/taufik-nurrohman
 [Jet Brains]: https://www.jetbrains.com/
 [Peter Piwowarski]: https://github.com/oldlaptop
 [Kenta Sato]: https://github.com/bicycle1885
diff --git a/src/languages/php.js b/src/languages/php.js
index 972083e4b9..c19a501685 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -11,10 +11,11 @@ Category: common
  * @returns {LanguageDetail}
  * */
 export default function(hljs) {
-  var VARIABLE = {
+  const VARIABLE = {
+    className: 'variable',
     begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
   };
-  var PREPROCESSOR = {
+  const PREPROCESSOR = {
     className: 'meta',
     variants: [
       { begin: /<\?php/, relevance: 10 }, // boost for obvious PHP
@@ -22,26 +23,26 @@ export default function(hljs) {
       { begin: /\?>/ } // end php tag
     ]
   };
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
     variants: [
       { begin: /\$\w+/ },
       { begin: /\{\$/, end: /\}/ }
     ]
   };
-  var SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, {
+  const SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, {
     illegal: null,
   });
-  var DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+  const DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
     illegal: null,
     contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
   });
-  var HEREDOC = hljs.END_SAME_AS_BEGIN({
+  const HEREDOC = hljs.END_SAME_AS_BEGIN({
     begin: /<<<[ \t]*(\w+)\n/,
     end: /[ \t]*(\w+)\b/,
     contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
   });
-  var STRING = {
+  const STRING = {
     className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE, PREPROCESSOR],
     variants: [
@@ -56,8 +57,8 @@ export default function(hljs) {
       HEREDOC
     ]
   };
-  var NUMBER = {variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]};
-  var KEYWORDS = {
+  const NUMBER = {variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]};
+  const KEYWORDS = {
     keyword:
     // Magic constants:
     // <https://www.php.net/manual/en/language.constants.predefined.php>
diff --git a/test/markup/php/comments.expect.txt b/test/markup/php/comments.expect.txt
index f02eb145db..fbbcbb1468 100644
--- a/test/markup/php/comments.expect.txt
+++ b/test/markup/php/comments.expect.txt
@@ -4,8 +4,8 @@
  * <span class="hljs-doctag">@param</span> int $a
  * <span class="hljs-doctag">@return</span> bool
  */</span>
-<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">isEven</span>(<span class="hljs-params">$a</span>) </span>{
-    <span class="hljs-keyword">return</span> ($a % <span class="hljs-number">2</span>) === <span class="hljs-number">0</span>;
+<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">isEven</span>(<span class="hljs-params"><span class="hljs-variable">$a</span></span>) </span>{
+    <span class="hljs-keyword">return</span> (<span class="hljs-variable">$a</span> % <span class="hljs-number">2</span>) === <span class="hljs-number">0</span>;
 }
 
 <span class="hljs-comment">/**
@@ -14,6 +14,6 @@
  * <span class="hljs-doctag">@param</span> int $a
  * <span class="hljs-doctag">@return</span> bool
  */</span>
-<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">isOdd</span>(<span class="hljs-params">$a</span>) </span>{
-    <span class="hljs-keyword">return</span> ($a % <span class="hljs-number">2</span>) === <span class="hljs-number">1</span>;
+<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">isOdd</span>(<span class="hljs-params"><span class="hljs-variable">$a</span></span>) </span>{
+    <span class="hljs-keyword">return</span> (<span class="hljs-variable">$a</span> % <span class="hljs-number">2</span>) === <span class="hljs-number">1</span>;
 }

From 005d2ffec1ce9cee04daabf7ded14d5874ec4d23 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 27 Oct 2020 04:17:38 -0400
Subject: [PATCH 092/223] chore(lint) routeros grammar

---
 src/languages/routeros.js | 120 +++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index 8fa38223fe..c1aede9be4 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -12,18 +12,17 @@ Website: https://wiki.mikrotik.com/wiki/Manual:Scripting
 //   light-brown  - #9A9900
 
 export default function(hljs) {
-
-  var STATEMENTS = 'foreach do while for if from to step else on-error and or not in';
+  const STATEMENTS = 'foreach do while for if from to step else on-error and or not in';
 
   // Global commands: Every global command should start with ":" token, otherwise it will be treated as variable.
-  var GLOBAL_COMMANDS = 'global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime';
+  const GLOBAL_COMMANDS = 'global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime';
 
   // Common commands: Following commands available from most sub-menus:
-  var COMMON_COMMANDS = 'add remove enable disable set get print export edit find run debug error info warning';
+  const COMMON_COMMANDS = 'add remove enable disable set get print export edit find run debug error info warning';
 
-  var LITERALS = 'true false yes no nothing nil null';
+  const LITERALS = 'true false yes no nothing nil null';
 
-  var OBJECTS = 'traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw';
+  const OBJECTS = 'traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw';
 
   // print parameters
   // Several parameters are available for print command:
@@ -32,38 +31,41 @@ export default function(hljs) {
   // ToDo: var TYPES = 'num number bool boolean str string ip ip6-prefix id time array';
   // ToDo: The following tokens serve as delimiters in the grammar: ()  []  {}  :   ;   $   /
 
-  var VAR_PREFIX = 'global local set for foreach';
+  const VAR_PREFIX = 'global local set for foreach';
 
-  var VAR = {
+  const VAR = {
     className: 'variable',
     variants: [
-      {begin: /\$[\w\d#@][\w\d_]*/},
-      {begin: /\$\{(.*?)}/}
+      { begin: /\$[\w\d#@][\w\d_]*/ },
+      { begin: /\$\{(.*?)\}/ }
     ]
   };
 
-  var QUOTE_STRING = {
+  const QUOTE_STRING = {
     className: 'string',
-    begin: /"/, end: /"/,
+    begin: /"/,
+    end: /"/,
     contains: [
       hljs.BACKSLASH_ESCAPE,
       VAR,
       {
         className: 'variable',
-        begin: /\$\(/, end: /\)/,
+        begin: /\$\(/,
+        end: /\)/,
         contains: [hljs.BACKSLASH_ESCAPE]
       }
     ]
   };
 
-  var APOS_STRING = {
+  const APOS_STRING = {
     className: 'string',
-    begin: /'/, end: /'/
+    begin: /'/,
+    end: /'/
   };
 
-  var IPADDR = '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b';
-  var IPADDR_wBITMASK =  IPADDR+'/(3[0-2]|[1-2][0-9]|\\d)';
-  //////////////////////////////////////////////////////////////////////
+  const IPADDR = '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b';
+  const IPADDR_wBITMASK = IPADDR + '/(3[0-2]|[1-2][0-9]|\\d)';
+
   return {
     name: 'Microtik RouterOS script',
     aliases: ['routeros', 'mikrotik'],
@@ -71,23 +73,23 @@ export default function(hljs) {
     keywords: {
       $pattern: /:?[\w-]+/,
       literal: LITERALS,
-      keyword: STATEMENTS + ' :' + STATEMENTS.split(' ').join(' :') + ' :' + GLOBAL_COMMANDS.split(' ').join(' :'),
+      keyword: STATEMENTS + ' :' + STATEMENTS.split(' ').join(' :') + ' :' + GLOBAL_COMMANDS.split(' ').join(' :')
     },
     contains: [
       { // недопустимые конструкции
         variants: [
-          { begin: /^@/, end: /$/, },               // dns
-          { begin: /\/\*/, end: /\*\//, },          // -- comment
-          { begin: /%%/, end: /$/, },               // -- comment
-          { begin: /^'/, end: /$/, },               // Monkey one line comment
-          { begin: /^\s*\/[\w-]+=/, end: /$/, },    // jboss-cli
-          { begin: /\/\//, end: /$/, },             // Stan comment
-          { begin: /^\[\</, end: /\>\]$/, },        // F# class declaration?
-          { begin: /<\//, end: />/, },              // HTML tags
-          { begin: /^facet /, end: /\}/, },         // roboconf - лютый костыль )))
-          { begin: '^1\\.\\.(\\d+)$', end: /$/, },  // tap
+          { begin: /^@/, end: /$/ },               // dns
+          { begin: /\/\*/, end: /\*\// },          // -- comment
+          { begin: /%%/, end: /$/ },               // -- comment
+          { begin: /^'/, end: /$/ },               // Monkey one line comment
+          { begin: /^\s*\/[\w-]+=/, end: /$/ },    // jboss-cli
+          { begin: /\/\//, end: /$/ },             // Stan comment
+          { begin: /^\[</, end: />\]$/ },          // F# class declaration?
+          { begin: /<\//, end: />/ },              // HTML tags
+          { begin: /^facet /, end: /\}/ },         // roboconf - лютый костыль )))
+          { begin: '^1\\.\\.(\\d+)$', end: /$/ }   // tap
         ],
-        illegal: /./,
+        illegal: /./
       },
       hljs.COMMENT('^#', '$'),
       QUOTE_STRING,
@@ -104,7 +106,7 @@ export default function(hljs) {
           },
           {
             begin: /=/,
-            endsWithParent:  true,
+            endsWithParent: true,
             relevance: 0,
             contains: [
               QUOTE_STRING,
@@ -112,9 +114,14 @@ export default function(hljs) {
               VAR,
               {
                 className: 'literal',
-                begin: '\\b(' + LITERALS.split(' ').join('|') + ')\\b',
+                begin: '\\b(' + LITERALS.split(' ').join('|') + ')\\b'
               },
-              /*{
+              {
+                // Do not format unclassified values. Needed to exclude highlighting of values ​​as built_in.
+                begin: /("[^"]*"|[^\s\{\}\[\]]+)/
+              }
+              /*
+              {
                 // IPv4 addresses and subnets
                 className: 'number',
                 variants: [
@@ -122,49 +129,44 @@ export default function(hljs) {
                   {begin: IPADDR+'-'+IPADDR},       // 192.168.0.1-192.168.0.3
                   {begin: IPADDR+'(,'+IPADDR+')*'}, // 192.168.0.1,192.168.0.34,192.168.24.1,192.168.0.1
                 ]
-              }, // */
-              /*{
+              },
+              {
                 // MAC addresses and DHCP Client IDs
                 className: 'number',
                 begin: /\b(1:)?([0-9A-Fa-f]{1,2}[:-]){5}([0-9A-Fa-f]){1,2}\b/,
-              }, //*/
-              {
-                // Не форматировать не классифицированные значения. Необходимо для исключения подсветки значений как built_in.
-                // className: 'number',
-                begin: /("[^"]*"|[^\s\{\}\[\]]+)/,
-              }, //*/
+              },
+              */
             ]
-          } //*/
+          }
         ]
-      },//*/
+      },
       {
         // HEX values
         className: 'number',
-        begin: /\*[0-9a-fA-F]+/,
-      }, //*/
-
+        begin: /\*[0-9a-fA-F]+/
+      },
       {
         begin: '\\b(' + COMMON_COMMANDS.split(' ').join('|') + ')([\\s\[\(]|\])',
         returnBegin: true,
         contains: [
           {
-            className: 'builtin-name', //'function',
-            begin: /\w+/,
-          },
-        ],
+            className: 'builtin-name', // 'function',
+            begin: /\w+/
+          }
+        ]
       },
-
       {
         className: 'built_in',
         variants: [
-          {begin: '(\\.\\./|/|\\s)((' + OBJECTS.split(' ').join('|') + ');?\\s)+',relevance: 10,},
-          {begin: /\.\./,},
-        ],
-      },//*/
+          {
+            begin: '(\\.\\./|/|\\s)((' + OBJECTS.split(' ').join('|') + ');?\\s)+',
+            relevance: 10
+          },
+          {
+            begin: /\.\./
+          }
+        ]
+      }
     ]
   };
 }
-
-
-
-

From 1986de7f3a3c959ab18fa2c1e778eb6a3eaefcbe Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 27 Oct 2020 07:09:29 -0400
Subject: [PATCH 093/223] chore(routeros) fix insane relevance and long illegal
 list

- fix huge (incorrect) relevance of 10 for OBJECT matches
- long list of illegals should now be unnecessary
---
 src/languages/routeros.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index c1aede9be4..9876417b56 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -76,18 +76,11 @@ export default function(hljs) {
       keyword: STATEMENTS + ' :' + STATEMENTS.split(' ').join(' :') + ' :' + GLOBAL_COMMANDS.split(' ').join(' :')
     },
     contains: [
-      { // недопустимые конструкции
+      { // illegal syntax
         variants: [
-          { begin: /^@/, end: /$/ },               // dns
           { begin: /\/\*/, end: /\*\// },          // -- comment
-          { begin: /%%/, end: /$/ },               // -- comment
-          { begin: /^'/, end: /$/ },               // Monkey one line comment
-          { begin: /^\s*\/[\w-]+=/, end: /$/ },    // jboss-cli
           { begin: /\/\//, end: /$/ },             // Stan comment
-          { begin: /^\[</, end: />\]$/ },          // F# class declaration?
           { begin: /<\//, end: />/ },              // HTML tags
-          { begin: /^facet /, end: /\}/ },         // roboconf - лютый костыль )))
-          { begin: '^1\\.\\.(\\d+)$', end: /$/ }   // tap
         ],
         illegal: /./
       },
@@ -159,11 +152,11 @@ export default function(hljs) {
         className: 'built_in',
         variants: [
           {
-            begin: '(\\.\\./|/|\\s)((' + OBJECTS.split(' ').join('|') + ');?\\s)+',
-            relevance: 10
+            begin: '(\\.\\./|/|\\s)((' + OBJECTS.split(' ').join('|') + ');?\\s)+'
           },
           {
-            begin: /\.\./
+            begin: /\.\./,
+            relevance: 0
           }
         ]
       }

From f58ea7117ef8d2764551ee183ab6b363503a7787 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Tue, 27 Oct 2020 20:16:23 -0400
Subject: [PATCH 094/223] enh(javascript) Match numeric literals per ECMA-262
 spec (#2790)

Reference:

https://tc39.es/ecma262/#sec-literals-numeric-literals
https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
---
 CHANGES.md                                |  1 +
 src/languages/javascript.js               | 41 +++++++++++++----------
 test/markup/javascript/numbers.expect.txt | 27 +++++++++++++++
 test/markup/javascript/numbers.txt        | 27 +++++++++++++++
 4 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f667d57fd7..9a6b14c6fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Language Improvements:
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
 - enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
+- enh(javascript) Match numeric literals per ECMA-262 spec [Richard Gibson][]
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 
 Dev Improvements:
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 875a930b34..172bcd8e9c 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -63,29 +63,36 @@ export default function(hljs) {
     literal: ECMAScript.LITERALS.join(" "),
     built_in: ECMAScript.BUILT_INS.join(" ")
   };
-  const nonDecimalLiterals = (prefixLetters, validChars) =>
-    `\\b0[${prefixLetters}][${validChars}]([${validChars}_]*[${validChars}])?n?`;
-  const noLeadingZeroDecimalDigits = /[1-9]([0-9_]*\d)?/;
-  const decimalDigits = /\d([0-9_]*\d)?/;
-  const exponentPart = regex.concat(/[eE][+-]?/, decimalDigits);
+
+  // https://tc39.es/ecma262/#sec-literals-numeric-literals
+  const decimalDigits = '[0-9](_?[0-9])*';
+  const frac = `\\.(${decimalDigits})`;
+  // DecimalIntegerLiteral, including Annex B NonOctalDecimalIntegerLiteral
+  // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+  const decimalInteger = `0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*`;
   const NUMBER = {
     className: 'number',
     variants: [
-      { begin: nonDecimalLiterals('bB', '01') }, // Binary literals
-      { begin: nonDecimalLiterals('oO', '0-7') }, // Octal literals
-      { begin: nonDecimalLiterals('xX', '0-9a-fA-F') }, // Hexadecimal literals
-      { begin: regex.concat(/\b/, noLeadingZeroDecimalDigits, 'n') }, // Non-zero BigInt literals
-      { begin: regex.concat(/(\b0)?\./, decimalDigits, regex.optional(exponentPart)) }, // Decimal literals between 0 and 1
-      { begin: regex.concat(
-        /\b/,
-        noLeadingZeroDecimalDigits,
-        regex.optional(regex.concat(/\./, regex.optional(decimalDigits))), // fractional part
-        regex.optional(exponentPart)
-        ) }, // Decimal literals >= 1
-      { begin: /\b0[\.n]?/ }, // Zero literals (`0`, `0.`, `0n`)
+      // DecimalLiteral
+      { begin: `(\\b(${decimalInteger})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})\\b` },
+      { begin: `\\b(${decimalInteger})\\b((${frac})\\b|\\.)?|(${frac})\\b` },
+
+      // DecimalBigIntegerLiteral
+      { begin: `\\b(0|[1-9](_?[0-9])*)n\\b` },
+
+      // NonDecimalIntegerLiteral
+      { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b" },
+      { begin: "\\b0[bB][0-1](_?[0-1])*n?\\b" },
+      { begin: "\\b0[oO][0-7](_?[0-7])*n?\\b" },
+
+      // LegacyOctalIntegerLiteral (does not include underscore separators)
+      // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+      { begin: "\\b0[0-7]+n?\\b" },
     ],
     relevance: 0
   };
+
   const SUBST = {
     className: 'subst',
     begin: '\\$\\{',
diff --git a/test/markup/javascript/numbers.expect.txt b/test/markup/javascript/numbers.expect.txt
index 8f1bb93a98..3e44db1650 100644
--- a/test/markup/javascript/numbers.expect.txt
+++ b/test/markup/javascript/numbers.expect.txt
@@ -22,6 +22,12 @@
 -<span class="hljs-number">.000_001</span> <span class="hljs-comment">// 1 millionth</span>
 <span class="hljs-number">1e10_000</span>  <span class="hljs-comment">// 10^10000 -- granted, far less useful / in-range...</span>
 
+<span class="hljs-number">.0</span>, <span class="hljs-number">.00</span>,  <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">40.0</span>,  <span class="hljs-number">0.</span>, <span class="hljs-number">10.</span>
+<span class="hljs-number">.0</span>, <span class="hljs-number">.0_0</span>, <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">4_0.0</span>, <span class="hljs-number">0.</span>, <span class="hljs-number">1_0.</span>
+
+<span class="hljs-number">.0e10</span>,  <span class="hljs-number">.00e+10</span>,  <span class="hljs-number">.9e-10</span>,  <span class="hljs-number">4.2E10</span>,  <span class="hljs-number">40.0E+08</span>,   <span class="hljs-number">0.E-10</span>,  <span class="hljs-number">0.e100</span>,   <span class="hljs-number">1010e+10</span>
+<span class="hljs-number">.0e1_0</span>, <span class="hljs-number">.0_0e+10</span>, <span class="hljs-number">.9e-1_0</span>, <span class="hljs-number">4.2E1_0</span>, <span class="hljs-number">4_0.0E+0_8</span>, <span class="hljs-number">0.E-1_0</span>, <span class="hljs-number">0.e1_0_0</span>, <span class="hljs-number">10_10e+10</span>
+
 <span class="hljs-keyword">let</span> nibbles = <span class="hljs-number">0b1010_0001_1000_0101</span>;
 <span class="hljs-keyword">let</span> message = <span class="hljs-number">0xA0_B0_C0</span>;
 
@@ -48,3 +54,24 @@
 <span class="hljs-number">2_0_0n</span>
 <span class="hljs-number">20_0n</span>
 -<span class="hljs-number">20_0n</span>
+<span class="hljs-number">0B1n</span>
+<span class="hljs-number">0O1n</span>
+<span class="hljs-number">0X1n</span>
+
+<span class="hljs-comment">// Annex B numeric literals</span>
+<span class="hljs-comment">// https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals</span>
+<span class="hljs-number">00</span>, <span class="hljs-number">04</span>, <span class="hljs-number">0777</span>, <span class="hljs-number">08</span>, <span class="hljs-number">008</span>
+
+<span class="hljs-comment">// expressions containing numeric literals</span>
+<span class="hljs-number">0.</span>.toString, <span class="hljs-number">1e1</span>.toString, fn(<span class="hljs-number">.5</span>)
+
+<span class="hljs-comment">// expressions not containing numeric literals</span>
+x0.e1
+
+<span class="hljs-comment">// invalid pseudo-numeric expressions</span>
+1__0
+0b1__0
+1e_1
+0b1e1
+0N
+<span class="hljs-number">00</span>.
diff --git a/test/markup/javascript/numbers.txt b/test/markup/javascript/numbers.txt
index 40d4311c50..05baf74710 100644
--- a/test/markup/javascript/numbers.txt
+++ b/test/markup/javascript/numbers.txt
@@ -22,6 +22,12 @@ let amount = 1_234_500; // 1,234,500
 -.000_001 // 1 millionth
 1e10_000  // 10^10000 -- granted, far less useful / in-range...
 
+.0, .00,  .9, 4.2, 40.0,  0., 10.
+.0, .0_0, .9, 4.2, 4_0.0, 0., 1_0.
+
+.0e10,  .00e+10,  .9e-10,  4.2E10,  40.0E+08,   0.E-10,  0.e100,   1010e+10
+.0e1_0, .0_0e+10, .9e-1_0, 4.2E1_0, 4_0.0E+0_8, 0.E-1_0, 0.e1_0_0, 10_10e+10
+
 let nibbles = 0b1010_0001_1000_0101;
 let message = 0xA0_B0_C0;
 
@@ -48,3 +54,24 @@ let x7 = 0x5_2;            // OK (hexadecimal literal)
 2_0_0n
 20_0n
 -20_0n
+0B1n
+0O1n
+0X1n
+
+// Annex B numeric literals
+// https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+00, 04, 0777, 08, 008
+
+// expressions containing numeric literals
+0..toString, 1e1.toString, fn(.5)
+
+// expressions not containing numeric literals
+x0.e1
+
+// invalid pseudo-numeric expressions
+1__0
+0b1__0
+1e_1
+0b1e1
+0N
+00.

From c238d41b3405be76f2e1adf62e347289a228eba4 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Wed, 28 Oct 2020 15:46:24 +0100
Subject: [PATCH 095/223] chore(docs) Add Julia to SUPPORTED_LANGUAGES.md
 (#2797)

---
 SUPPORTED_LANGUAGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 73578744a1..62793424c9 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -95,6 +95,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Java                    | java, jsp              |         |
 | JavaScript              | javascript, js, jsx    |         |
 | Jolie                   | jolie, iol, ol         | [highlightjs-jolie](https://github.com/xiroV/highlightjs-jolie) |
+| Julia                   | julia, julia-repl      |         |
 | Kotlin                  | kotlin, kt             |         |
 | LaTeX                   | tex                    |         |
 | Leaf                    | leaf                   |         |

From 1982c8caaf595bea16953fd0574ac2b152b2363d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 29 Oct 2020 09:02:50 -0400
Subject: [PATCH 096/223] (chore) remove old linter hint

---
 src/languages/javascript.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 172bcd8e9c..e51589fd29 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-unreachable */
 /*
 Language: JavaScript
 Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.

From deea7b7ed8f8e62b38b2eb07c935af5592850c9c Mon Sep 17 00:00:00 2001
From: Jan Pilzer <jan.pilzer@gmx.de>
Date: Thu, 29 Oct 2020 22:40:32 -0700
Subject: [PATCH 097/223] (themes) Add StackOverflow dark and light themes
 (#2802)

---
 AUTHORS.txt                        |  1 +
 CHANGES.md                         |  6 +++
 src/styles/stackoverflow-dark.css  | 78 ++++++++++++++++++++++++++++++
 src/styles/stackoverflow-light.css | 78 ++++++++++++++++++++++++++++++
 tools/developer.html               |  2 +
 5 files changed, 165 insertions(+)
 create mode 100644 src/styles/stackoverflow-dark.css
 create mode 100644 src/styles/stackoverflow-light.css

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 06e2d0cfe4..7b48423b6e 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -294,3 +294,4 @@ Contributors:
 - Michael Newton <miken32@github>
 - Richard Gibson <gibson042@github>
 - Fredrik Ekre <ekrefredrik@gmail.com>
+- Jan Pilzer <Hirse@github>
diff --git a/CHANGES.md b/CHANGES.md
index 9a6b14c6fa..1421151217 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,10 +12,16 @@ Dev Improvements:
 
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
 
+New themes:
+
+- *StackOverflow Dark* by [Jan Pilzer][]
+- *StackOverflow Light* by [Jan Pilzer][]
+
 [Fredrik Ekre]: https://github.com/fredrikekre
 [Richard Gibson]: https://github.com/gibson042
 [Josh Goebel]: https://github.com/joshgoebel
 [Taufik Nurrohman]: https://github.com/taufik-nurrohman
+[Jan Pilzer]: https://github.com/Hirse
 
 
 ## Version 10.3.1
diff --git a/src/styles/stackoverflow-dark.css b/src/styles/stackoverflow-dark.css
new file mode 100644
index 0000000000..4e96bc029b
--- /dev/null
+++ b/src/styles/stackoverflow-dark.css
@@ -0,0 +1,78 @@
+/*!
+ * StackOverflow.com dark style
+ *
+ * @stackoverflow/stacks v0.56.0
+ * https://github.com/StackExchange/Stacks
+ */
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #ffffff;
+  background: #1c1b1b;
+}
+
+.hljs-comment {
+  color: #999999;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-meta-keyword,
+.hljs-doctag,
+.hljs-section,
+.hljs-selector-class,
+.hljs-meta,
+.hljs-selector-pseudo,
+.hljs-attr {
+  color: #88aece;
+}
+
+.hljs-attribute {
+  color: v#c59bc1;
+}
+
+.hljs-name,
+.hljs-type,
+.hljs-number,
+.hljs-selector-id,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-built_in,
+.hljs-title,
+.hljs-literal {
+  color: #f08d49;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-meta-string {
+  color: #b5bd68;
+}
+
+.hljs-bullet,
+.hljs-code {
+  color: #cccccc;
+}
+
+.hljs-deletion {
+  color: #de7176;
+}
+
+.hljs-addition {
+  color: #76c490;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/src/styles/stackoverflow-light.css b/src/styles/stackoverflow-light.css
new file mode 100644
index 0000000000..de8dd156b3
--- /dev/null
+++ b/src/styles/stackoverflow-light.css
@@ -0,0 +1,78 @@
+/*!
+ * StackOverflow.com light style
+ *
+ * @stackoverflow/stacks v0.56.0
+ * https://github.com/StackExchange/Stacks
+ */
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #2f3337;
+  background: #f6f6f6;
+}
+
+.hljs-comment {
+  color: #656e77;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-meta-keyword,
+.hljs-doctag,
+.hljs-section,
+.hljs-selector-class,
+.hljs-meta,
+.hljs-selector-pseudo,
+.hljs-attr {
+  color: #015692;
+}
+
+.hljs-attribute {
+  color: #803378;
+}
+
+.hljs-name,
+.hljs-type,
+.hljs-number,
+.hljs-selector-id,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-built_in,
+.hljs-title,
+.hljs-literal {
+  color: #b75501;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-meta-string {
+  color: #54790d;
+}
+
+.hljs-bullet,
+.hljs-code {
+  color: #535a60;
+}
+
+.hljs-deletion {
+  color: #c02d2e;
+}
+
+.hljs-addition {
+  color: #2f6f44;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/tools/developer.html b/tools/developer.html
index 8e466fd7c1..3ef72618a5 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -148,6 +148,8 @@ <h3>Code</h3>
           <option>solarized-dark.css</option>
           <option>solarized-light.css</option>
           <option>srcery.css</option>
+          <option>stackoverflow-dark.css</option>
+          <option>stackoverflow-light.css</option>
           <option>sunburst.css</option>
           <option>tomorrow-night-blue.css</option>
           <option>tomorrow-night-bright.css</option>

From f998a50363487bfab777290af33a148286984c37 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 31 Oct 2020 07:58:56 -0400
Subject: [PATCH 098/223] chore(docs) name OLD_VERSIONS to SECURITY.md and
 improve slightly

---
 OLD_VERSIONS.md | 14 --------------
 SECURITY.md     | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 14 deletions(-)
 delete mode 100644 OLD_VERSIONS.md
 create mode 100644 SECURITY.md

diff --git a/OLD_VERSIONS.md b/OLD_VERSIONS.md
deleted file mode 100644
index 62b9ea014d..0000000000
--- a/OLD_VERSIONS.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Support for Older Versions
-
-Due to both time and resource constrains the Highlight.js core team only fully supports the most current major version of the library. The prior major release will only receive critical security updates (when feasible).
-
-| Version | Status  | EOL |
-| :-----: | :------ | :-: | 
-| 10.x | *Current.* Regular updates; bug fixes & new features. | n/a |
-| 9.18.x | *Deprecated.* Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). | TBD |
-| < 9.17.x | Obsolete. | Jan 2020 |
-| 8.x | Obsolete. |  |
-| 7.x | Obsolete. |  |
-| Older | Obsolete. |  |
-
-Support for IE11 is really the only reason anyone should still prefer version 9. It's recommended that everyone else upgrade.
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..b6d96ba069
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,25 @@
+# Security Policy
+
+## Supported Versions
+
+Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library.  Problems with prior minor releases are often solved by upgrading to the most recent minor release.  Prior major release will only receive critical security updates (when feasible).
+
+| Version  |     | Status  |
+| :-----:  | :-: | :------ |
+| 10.3.x   | :white_check_mark: |  The 10.x series recieves regular updates, new features & bug fixes. |
+| <= 10.2.x  | :x: | *Please upgrade to a more recent release.* |
+| 9.18.x   | :closed_lock_with_key: | Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
+| <= 9.17.x | :x: | Obsolete. |
+| 8.x      | :x: | Obsolete. |
+| 7.x      | :x: | Obsolete. |
+| Older    | :x: | Obsolete. |
+
+### Version 9
+
+Support for IE11 is really the only reason anyone should still prefer version 9. It's recommended that everyone else upgrade.
+
+
+## Reporting a Vulnerability
+
+Minor vulnerabilities can simply be reported (and tracked) via our [GitHub issues](https://github.com/highlightjs/highlight.js/issues).   If you feel your issue is more sensitive than that you can always reach us via email: [security@highlightjs.org](mailto:security@highlightjs.org)
+

From 259b7c91b437b036de8795bb6304c3058858abc3 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Sat, 31 Oct 2020 16:38:31 -0400
Subject: [PATCH 099/223] enh(java) Match numeric literals per Java Language
 Specification (#2812)

Reference:
https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
---
 CHANGES.md                          |   1 +
 src/languages/java.js               |  70 +++++++-------
 test/markup/java/numbers.expect.txt | 140 +++++++++++++++++++++-------
 test/markup/java/numbers.txt        | 140 +++++++++++++++++++++-------
 4 files changed, 243 insertions(+), 108 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1421151217..f4a2c9d127 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Language Improvements:
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
 - enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
 - enh(javascript) Match numeric literals per ECMA-262 spec [Richard Gibson][]
+- enh(java) Match numeric literals per Java Language Specification [Richard Gibson][]
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 
 Dev Improvements:
diff --git a/src/languages/java.js b/src/languages/java.js
index cad12baf48..9c949f726c 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -27,44 +27,38 @@ export default function(hljs) {
       },
     ]
   };
-  /**
-   * A given sequence, possibly with underscores
-   * @type {(s: string | RegExp) => string}  */
-  var SEQUENCE_ALLOWING_UNDERSCORES = (seq) => regex.concat('[', seq, ']+([', seq, '_]*[', seq, ']+)?');
-  var JAVA_NUMBER_MODE = {
+
+  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+  var decimalDigits = '[0-9](_*[0-9])*';
+  var frac = `\\.(${decimalDigits})`;
+  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+  var NUMBER = {
     className: 'number',
     variants: [
-      { begin: `\\b(0[bB]${SEQUENCE_ALLOWING_UNDERSCORES('01')})[lL]?` }, // binary
-      { begin: `\\b(0${SEQUENCE_ALLOWING_UNDERSCORES('0-7')})[dDfFlL]?` }, // octal
-      {
-        begin: regex.concat(
-          /\b0[xX]/,
-          regex.either(
-            regex.concat(SEQUENCE_ALLOWING_UNDERSCORES('a-fA-F0-9'), /\./, SEQUENCE_ALLOWING_UNDERSCORES('a-fA-F0-9')),
-            regex.concat(SEQUENCE_ALLOWING_UNDERSCORES('a-fA-F0-9'), /\.?/),
-            regex.concat(/\./, SEQUENCE_ALLOWING_UNDERSCORES('a-fA-F0-9'))
-          ),
-          /([pP][+-]?(\d+))?/,
-          /[fFdDlL]?/ // decimal & fp mixed for simplicity
-        )
-      },
-      // scientific notation
-      { begin: regex.concat(
-        /\b/,
-        regex.either(
-          regex.concat(/\d*\./, SEQUENCE_ALLOWING_UNDERSCORES("\\d")), // .3, 3.3, 3.3_3
-          SEQUENCE_ALLOWING_UNDERSCORES("\\d") // 3, 3_3
-        ),
-        /[eE][+-]?[\d]+[dDfF]?/)
-      },
-      // decimal & fp mixed for simplicity
-      { begin: regex.concat(
-        /\b/,
-        SEQUENCE_ALLOWING_UNDERSCORES(/\d/),
-        regex.optional(/\.?/),
-        regex.optional(SEQUENCE_ALLOWING_UNDERSCORES(/\d/)),
-        /[dDfFlL]?/)
-      }
+      // DecimalFloatingPointLiteral
+      // including ExponentPart
+      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+      // excluding ExponentPart
+      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+      { begin: `(${frac})[fFdD]?\\b` },
+      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+      // HexadecimalFloatingPointLiteral
+      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+      // DecimalIntegerLiteral
+      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+      // HexIntegerLiteral
+      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+      // OctalIntegerLiteral
+      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+      // BinaryIntegerLiteral
+      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
     ],
     relevance: 0
   };
@@ -160,7 +154,7 @@ export default function(hljs) {
               ANNOTATION,
               hljs.APOS_STRING_MODE,
               hljs.QUOTE_STRING_MODE,
-              hljs.C_NUMBER_MODE,
+              NUMBER,
               hljs.C_BLOCK_COMMENT_MODE
             ]
           },
@@ -168,7 +162,7 @@ export default function(hljs) {
           hljs.C_BLOCK_COMMENT_MODE
         ]
       },
-      JAVA_NUMBER_MODE,
+      NUMBER,
       ANNOTATION
     ]
   };
diff --git a/test/markup/java/numbers.expect.txt b/test/markup/java/numbers.expect.txt
index 7ba247f209..4582db6fb7 100644
--- a/test/markup/java/numbers.expect.txt
+++ b/test/markup/java/numbers.expect.txt
@@ -1,35 +1,105 @@
-<span class="hljs-keyword">long</span> creditCardNumber = <span class="hljs-number">1234_5678_9012_3456L</span>;
-<span class="hljs-keyword">long</span> socialSecurityNumber = <span class="hljs-number">999_99_9999L</span>;
-<span class="hljs-keyword">float</span> pi = <span class="hljs-number">3.14_15F</span>;
-<span class="hljs-keyword">long</span> hexBytes = <span class="hljs-number">0xFF_EC_DE_5E</span>;
-<span class="hljs-keyword">long</span> hexWords = <span class="hljs-number">0xCAFE_BABE</span>;
-<span class="hljs-keyword">long</span> maxLong = <span class="hljs-number">0x7fff_ffff_ffff_ffffL</span>;
-<span class="hljs-keyword">byte</span> nybbles = <span class="hljs-number">0b0010_0101</span>;
-<span class="hljs-keyword">long</span> bytes = <span class="hljs-number">0b11010010_01101001_10010100_10010010</span>;
-<span class="hljs-keyword">int</span> n = <span class="hljs-number">1234</span> + Contacts._ID;
-<span class="hljs-keyword">float</span> f = <span class="hljs-number">0x1.4p2f</span>;
-<span class="hljs-keyword">double</span> d = <span class="hljs-number">0x.ep-6</span>;
-<span class="hljs-keyword">int</span> octal = <span class="hljs-number">0777</span>;
-<span class="hljs-keyword">float</span> f = <span class="hljs-number">2e3f</span>;
-<span class="hljs-keyword">double</span> d = <span class="hljs-number">1.2e4D</span>;
-a = <span class="hljs-number">0x4fa6p2</span>;
-b = <span class="hljs-number">0x.4p2</span>;
-c = <span class="hljs-number">0xa.ffp3f</span>;
-d = <span class="hljs-number">0x1.0p2F</span>;
-e = <span class="hljs-number">0x1.0p2f</span>;
-f = <span class="hljs-number">0x1p1</span>;
-g = <span class="hljs-number">0x.3p4d</span>;
-h = <span class="hljs-number">0x1.2ep5D</span>;
-i = <span class="hljs-number">0x1.p2</span>;
-<span class="hljs-keyword">int</span> i = <span class="hljs-number">23</span>;
-<span class="hljs-keyword">byte</span> mask = <span class="hljs-number">0x0f</span>;
-<span class="hljs-keyword">int</span> i = <span class="hljs-number">4</span>;
-<span class="hljs-keyword">byte</span> mask = <span class="hljs-number">0xa</span>;
-<span class="hljs-keyword">float</span> f = <span class="hljs-number">5.4</span>;
-<span class="hljs-keyword">float</span> f = <span class="hljs-number">2e3</span>;
-<span class="hljs-keyword">int</span> n = <span class="hljs-number">0b1</span>;
-<span class="hljs-keyword">float</span> f = <span class="hljs-number">3.</span>;
-f = <span class="hljs-number">3_3.</span>;
-<span class="hljs-comment">// <span class="hljs-doctag">TODO:</span> in the future</span>
-<span class="hljs-comment">// float f = .2;</span>
-<span class="hljs-comment">// f = .2_022;</span>
+<span class="hljs-keyword">int</span>[] decimalIntegers = {
+	<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">10</span>,  <span class="hljs-number">999</span>,
+	<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">1_0</span>, <span class="hljs-number">9_9__9</span>,
+};
+<span class="hljs-keyword">long</span>[] longDecimalIntegers = {
+	<span class="hljs-number">0l</span>, <span class="hljs-number">1L</span>, <span class="hljs-number">10l</span>,  <span class="hljs-number">999L</span>,
+	<span class="hljs-number">0L</span>, <span class="hljs-number">1l</span>, <span class="hljs-number">1_0L</span>, <span class="hljs-number">9_9__9l</span>,
+};
+
+<span class="hljs-keyword">int</span>[] hexIntegers = {
+	<span class="hljs-number">0x0</span>, <span class="hljs-number">0Xa0</span>,  <span class="hljs-number">0X7FF</span>,   <span class="hljs-number">0xd3aD</span>,    <span class="hljs-number">0x00000000ffffffff</span>,
+	<span class="hljs-number">0X0</span>, <span class="hljs-number">0xa_0</span>, <span class="hljs-number">0x7__FF</span>, <span class="hljs-number">0Xd__3_aD</span>, <span class="hljs-number">0X0000_0000__ffff_ffff</span>,
+};
+<span class="hljs-keyword">long</span>[] longHexIntegers = {
+	<span class="hljs-number">0x0L</span>, <span class="hljs-number">0Xa0l</span>,  <span class="hljs-number">0X7FFL</span>,   <span class="hljs-number">0xd3aDl</span>,    <span class="hljs-number">0x7fffffffffffffffL</span>,
+	<span class="hljs-number">0X0l</span>, <span class="hljs-number">0xa_0L</span>, <span class="hljs-number">0x7__FFl</span>, <span class="hljs-number">0Xd__3_aDL</span>, <span class="hljs-number">0X7fff_ffff__ffff_ffffl</span>,
+};
+
+<span class="hljs-keyword">int</span>[] octalIntegers = {
+	<span class="hljs-number">00</span>,  <span class="hljs-number">001</span>,   <span class="hljs-number">0777</span>,
+	<span class="hljs-number">0_0</span>, <span class="hljs-number">0__01</span>, <span class="hljs-number">07__77</span>,
+};
+<span class="hljs-keyword">long</span>[] longOctalIntegers = {
+	<span class="hljs-number">00l</span>,  <span class="hljs-number">001L</span>,   <span class="hljs-number">0777l</span>,
+	<span class="hljs-number">0_0L</span>, <span class="hljs-number">0__01l</span>, <span class="hljs-number">07__77L</span>,
+};
+
+<span class="hljs-keyword">int</span>[] binaryIntegers = {
+	<span class="hljs-number">0b0</span>, <span class="hljs-number">0B11</span>,  <span class="hljs-number">0B000</span>,   <span class="hljs-number">0b01011</span>,
+	<span class="hljs-number">0b0</span>, <span class="hljs-number">0B1_1</span>, <span class="hljs-number">0B00__0</span>, <span class="hljs-number">0b01__0_1__1</span>,
+};
+<span class="hljs-keyword">long</span>[] longBinaryIntegers = {
+	<span class="hljs-number">0b0l</span>, <span class="hljs-number">0B11L</span>,  <span class="hljs-number">0B000l</span>,   <span class="hljs-number">0b01011L</span>,
+	<span class="hljs-number">0b0L</span>, <span class="hljs-number">0B1_1l</span>, <span class="hljs-number">0B00__0L</span>, <span class="hljs-number">0b01__0_1__1l</span>,
+};
+
+
+<span class="hljs-keyword">double</span>[] doubleDecimalIntegers = {
+	<span class="hljs-number">0d</span>, <span class="hljs-number">00D</span>,  <span class="hljs-number">1d</span>, <span class="hljs-number">00800d</span>,
+	<span class="hljs-number">0D</span>, <span class="hljs-number">0_0d</span>, <span class="hljs-number">1D</span>, <span class="hljs-number">0_0__8__0_0D</span>,
+};
+<span class="hljs-keyword">float</span>[] floatDecimalIntegers = {
+	<span class="hljs-number">0f</span>, <span class="hljs-number">00F</span>,  <span class="hljs-number">1f</span>, <span class="hljs-number">00800f</span>,
+	<span class="hljs-number">0F</span>, <span class="hljs-number">0_0f</span>, <span class="hljs-number">1F</span>, <span class="hljs-number">0_0__8__0_0F</span>,
+};
+
+<span class="hljs-keyword">double</span>[] doubleDecimals = {
+	<span class="hljs-number">.0</span>, <span class="hljs-number">.00</span>,   <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">40.010</span>,     <span class="hljs-number">0.</span>, <span class="hljs-number">00.</span>,  <span class="hljs-number">10.</span>,
+	<span class="hljs-number">.0</span>, <span class="hljs-number">.0__0</span>, <span class="hljs-number">.9</span>, <span class="hljs-number">4.2</span>, <span class="hljs-number">4_0.0__1_0</span>, <span class="hljs-number">0.</span>, <span class="hljs-number">0_0.</span>, <span class="hljs-number">1__0.</span>,
+
+	<span class="hljs-number">.0D</span>, <span class="hljs-number">.00d</span>,   <span class="hljs-number">.9D</span>, <span class="hljs-number">4.2d</span>, <span class="hljs-number">40.010D</span>,     <span class="hljs-number">0.d</span>, <span class="hljs-number">00.D</span>,  <span class="hljs-number">10.d</span>,
+	<span class="hljs-number">.0d</span>, <span class="hljs-number">.0__0D</span>, <span class="hljs-number">.9d</span>, <span class="hljs-number">4.2D</span>, <span class="hljs-number">4_0.0__1_0d</span>, <span class="hljs-number">0.D</span>, <span class="hljs-number">0_0.d</span>, <span class="hljs-number">1__0.D</span>,
+};
+<span class="hljs-keyword">float</span>[] floatDecimals = {
+	<span class="hljs-number">.0F</span>, <span class="hljs-number">.00f</span>,   <span class="hljs-number">.9F</span>, <span class="hljs-number">4.2f</span>, <span class="hljs-number">40.010F</span>,     <span class="hljs-number">0.f</span>, <span class="hljs-number">00.F</span>,  <span class="hljs-number">10.f</span>,
+	<span class="hljs-number">.0f</span>, <span class="hljs-number">.0__0F</span>, <span class="hljs-number">.9f</span>, <span class="hljs-number">4.2F</span>, <span class="hljs-number">4_0.0__1_0f</span>, <span class="hljs-number">0.F</span>, <span class="hljs-number">0_0.f</span>, <span class="hljs-number">1__0.F</span>,
+};
+
+<span class="hljs-keyword">double</span>[] doubleDecimalExponents = {
+	<span class="hljs-number">.0e10</span>,  <span class="hljs-number">.00e+10</span>,  <span class="hljs-number">.9e-10</span>,  <span class="hljs-number">4.2E10</span>,  <span class="hljs-number">40.010E+08</span>,      <span class="hljs-number">0.E-10</span>,  <span class="hljs-number">00.e100</span>,    <span class="hljs-number">00800e+10</span>,
+	<span class="hljs-number">.0e1_0</span>, <span class="hljs-number">.0_0e+10</span>, <span class="hljs-number">.9e-1_0</span>, <span class="hljs-number">4.2E1_0</span>, <span class="hljs-number">4_0.0__1_0E+0_8</span>, <span class="hljs-number">0.E-1_0</span>, <span class="hljs-number">0_0.e1_0_0</span>, <span class="hljs-number">0_0__8__00e+1___0</span>,
+
+	<span class="hljs-number">.0e10d</span>,  <span class="hljs-number">.00e+10D</span>,  <span class="hljs-number">.9e-10d</span>,  <span class="hljs-number">4.2E10D</span>,  <span class="hljs-number">40.010E+08d</span>,      <span class="hljs-number">0.E-10D</span>,  <span class="hljs-number">00.e100d</span>,    <span class="hljs-number">00800e+10D</span>,
+	<span class="hljs-number">.0e1_0D</span>, <span class="hljs-number">.0_0e+10d</span>, <span class="hljs-number">.9e-1_0D</span>, <span class="hljs-number">4.2E1_0d</span>, <span class="hljs-number">4_0.0__1_0E+0_8D</span>, <span class="hljs-number">0.E-1_0d</span>, <span class="hljs-number">0_0.e1_0_0D</span>, <span class="hljs-number">0_0__8__00e+1___0d</span>,
+};
+<span class="hljs-keyword">float</span>[] floatDecimalExponents = {
+	<span class="hljs-number">.0e10f</span>,  <span class="hljs-number">.00e+10F</span>,  <span class="hljs-number">.9e-10f</span>,  <span class="hljs-number">4.2E10F</span>,  <span class="hljs-number">40.010E+08f</span>,      <span class="hljs-number">0.E-10F</span>,  <span class="hljs-number">00.e100f</span>,    <span class="hljs-number">00800e+10F</span>,
+	<span class="hljs-number">.0e1_0F</span>, <span class="hljs-number">.0_0e+10f</span>, <span class="hljs-number">.9e-1_0F</span>, <span class="hljs-number">4.2E1_0f</span>, <span class="hljs-number">4_0.0__1_0E+0_8F</span>, <span class="hljs-number">0.E-1_0f</span>, <span class="hljs-number">0_0.e1_0_0F</span>, <span class="hljs-number">0_0__8__00e+1___0f</span>,
+};
+
+<span class="hljs-keyword">double</span>[] doubleHexExponents = {
+	<span class="hljs-number">0x0p0</span>, <span class="hljs-number">0x.ep6</span>, <span class="hljs-number">0Xa0.p+01</span>,   <span class="hljs-number">0X.7FFp-18</span>,      <span class="hljs-number">0xd3aD.B00p9</span>,
+	<span class="hljs-number">0X0P0</span>, <span class="hljs-number">0x.Ep6</span>, <span class="hljs-number">0xa_0.p+0_1</span>, <span class="hljs-number">0X.7__F_FP-1__8</span>, <span class="hljs-number">0Xd__3_aD.b00p9</span>,
+
+	<span class="hljs-number">0x0p0D</span>, <span class="hljs-number">0x.ep6D</span>, <span class="hljs-number">0Xa0.p+01d</span>,   <span class="hljs-number">0X.7FFp-18D</span>,      <span class="hljs-number">0xd3aD.B00p9d</span>,
+	<span class="hljs-number">0X0P0d</span>, <span class="hljs-number">0x.eP6d</span>, <span class="hljs-number">0xa_0.p+0_1D</span>, <span class="hljs-number">0X.7__F_FP-1__8d</span>, <span class="hljs-number">0Xd__3_aD.b00p9D</span>,
+};
+<span class="hljs-keyword">float</span>[] floatHexExponents = {
+	<span class="hljs-number">0x0p0F</span>, <span class="hljs-number">0x.ep6F</span>, <span class="hljs-number">0Xa0.p+01f</span>,   <span class="hljs-number">0X.7FFp-18F</span>,      <span class="hljs-number">0xf3aF.B00p9f</span>,
+	<span class="hljs-number">0X0P0f</span>, <span class="hljs-number">0x.eP6f</span>, <span class="hljs-number">0xa_0.p+0_1F</span>, <span class="hljs-number">0X.7__F_FP-1__8f</span>, <span class="hljs-number">0Xf__3_aF.b00p9F</span>,
+};
+
+
+<span class="hljs-comment">// expressions containing numeric literals</span>
+fn(<span class="hljs-number">.5</span>);
+fn(<span class="hljs-number">5.</span>);
+
+<span class="hljs-comment">// expressions not containing numeric literals</span>
+fn(x0.d);
+
+<span class="hljs-comment">// invalid pseudo-numeric literals</span>
+<span class="hljs-keyword">int</span>[] badNonDecimalIntegers =      { 08,  0_8,  019,     0x0g,      0B02, };
+<span class="hljs-keyword">long</span>[] longBadNonDecimalIntegers = { 08L, 0_8l, 01_9L,   0x0__GL,   0B0_2l, };
+
+<span class="hljs-keyword">int</span>[] badUnderscoreIntegers =      { 3_,  0x_0,  0X1_,  0B_0,  0b1_, };
+<span class="hljs-keyword">long</span>[] longBadUnderscoreIntegers = { 3_l, 0X_0L, 0x1_l, 0b_0L, 0B1_l, };
+
+<span class="hljs-keyword">double</span>[] doubleBadDecimals = { 0_d, 0_.,  <span class="hljs-number">0.</span>_1,  <span class="hljs-number">0.</span>_D, <span class="hljs-number">0.</span>1_d, };
+<span class="hljs-keyword">float</span>[] floatBadDecimals =   { 0_F, 0_.f, <span class="hljs-number">0.</span>_1F, <span class="hljs-number">0.</span>_f, <span class="hljs-number">0.</span>1_F, };
+
+<span class="hljs-keyword">double</span>[] doubleBadDecimalExponents = { 0_e0,  <span class="hljs-number">0.</span>_E1,  1e_2,  2E3_,  3e4_d, };
+<span class="hljs-keyword">float</span>[] floatBadDecimalExponents =   { 0_e0f, <span class="hljs-number">0.</span>_E1F, 1e_2f, 2E3_F, 3e4_f, };
+
+<span class="hljs-keyword">double</span>[] doubleBadHexExponents = { 0x0pA,  0x0_P0,  <span class="hljs-number">0x0</span>._p1,  0x1P_2,  0x2p3_,  0x3P4_D, };
+<span class="hljs-keyword">float</span>[] floatBadHexExponents =   { 0x0pAF, 0x0_P0f, <span class="hljs-number">0x0</span>._p1F, 0x1P_2f, 0x2p3_F, 0x3P4_f, };
diff --git a/test/markup/java/numbers.txt b/test/markup/java/numbers.txt
index e31545f70e..dc460e7bd5 100644
--- a/test/markup/java/numbers.txt
+++ b/test/markup/java/numbers.txt
@@ -1,35 +1,105 @@
-long creditCardNumber = 1234_5678_9012_3456L;
-long socialSecurityNumber = 999_99_9999L;
-float pi = 3.14_15F;
-long hexBytes = 0xFF_EC_DE_5E;
-long hexWords = 0xCAFE_BABE;
-long maxLong = 0x7fff_ffff_ffff_ffffL;
-byte nybbles = 0b0010_0101;
-long bytes = 0b11010010_01101001_10010100_10010010;
-int n = 1234 + Contacts._ID;
-float f = 0x1.4p2f;
-double d = 0x.ep-6;
-int octal = 0777;
-float f = 2e3f;
-double d = 1.2e4D;
-a = 0x4fa6p2;
-b = 0x.4p2;
-c = 0xa.ffp3f;
-d = 0x1.0p2F;
-e = 0x1.0p2f;
-f = 0x1p1;
-g = 0x.3p4d;
-h = 0x1.2ep5D;
-i = 0x1.p2;
-int i = 23;
-byte mask = 0x0f;
-int i = 4;
-byte mask = 0xa;
-float f = 5.4;
-float f = 2e3;
-int n = 0b1;
-float f = 3.;
-f = 3_3.;
-// TODO: in the future
-// float f = .2;
-// f = .2_022;
+int[] decimalIntegers = {
+	0, 1, 10,  999,
+	0, 1, 1_0, 9_9__9,
+};
+long[] longDecimalIntegers = {
+	0l, 1L, 10l,  999L,
+	0L, 1l, 1_0L, 9_9__9l,
+};
+
+int[] hexIntegers = {
+	0x0, 0Xa0,  0X7FF,   0xd3aD,    0x00000000ffffffff,
+	0X0, 0xa_0, 0x7__FF, 0Xd__3_aD, 0X0000_0000__ffff_ffff,
+};
+long[] longHexIntegers = {
+	0x0L, 0Xa0l,  0X7FFL,   0xd3aDl,    0x7fffffffffffffffL,
+	0X0l, 0xa_0L, 0x7__FFl, 0Xd__3_aDL, 0X7fff_ffff__ffff_ffffl,
+};
+
+int[] octalIntegers = {
+	00,  001,   0777,
+	0_0, 0__01, 07__77,
+};
+long[] longOctalIntegers = {
+	00l,  001L,   0777l,
+	0_0L, 0__01l, 07__77L,
+};
+
+int[] binaryIntegers = {
+	0b0, 0B11,  0B000,   0b01011,
+	0b0, 0B1_1, 0B00__0, 0b01__0_1__1,
+};
+long[] longBinaryIntegers = {
+	0b0l, 0B11L,  0B000l,   0b01011L,
+	0b0L, 0B1_1l, 0B00__0L, 0b01__0_1__1l,
+};
+
+
+double[] doubleDecimalIntegers = {
+	0d, 00D,  1d, 00800d,
+	0D, 0_0d, 1D, 0_0__8__0_0D,
+};
+float[] floatDecimalIntegers = {
+	0f, 00F,  1f, 00800f,
+	0F, 0_0f, 1F, 0_0__8__0_0F,
+};
+
+double[] doubleDecimals = {
+	.0, .00,   .9, 4.2, 40.010,     0., 00.,  10.,
+	.0, .0__0, .9, 4.2, 4_0.0__1_0, 0., 0_0., 1__0.,
+
+	.0D, .00d,   .9D, 4.2d, 40.010D,     0.d, 00.D,  10.d,
+	.0d, .0__0D, .9d, 4.2D, 4_0.0__1_0d, 0.D, 0_0.d, 1__0.D,
+};
+float[] floatDecimals = {
+	.0F, .00f,   .9F, 4.2f, 40.010F,     0.f, 00.F,  10.f,
+	.0f, .0__0F, .9f, 4.2F, 4_0.0__1_0f, 0.F, 0_0.f, 1__0.F,
+};
+
+double[] doubleDecimalExponents = {
+	.0e10,  .00e+10,  .9e-10,  4.2E10,  40.010E+08,      0.E-10,  00.e100,    00800e+10,
+	.0e1_0, .0_0e+10, .9e-1_0, 4.2E1_0, 4_0.0__1_0E+0_8, 0.E-1_0, 0_0.e1_0_0, 0_0__8__00e+1___0,
+
+	.0e10d,  .00e+10D,  .9e-10d,  4.2E10D,  40.010E+08d,      0.E-10D,  00.e100d,    00800e+10D,
+	.0e1_0D, .0_0e+10d, .9e-1_0D, 4.2E1_0d, 4_0.0__1_0E+0_8D, 0.E-1_0d, 0_0.e1_0_0D, 0_0__8__00e+1___0d,
+};
+float[] floatDecimalExponents = {
+	.0e10f,  .00e+10F,  .9e-10f,  4.2E10F,  40.010E+08f,      0.E-10F,  00.e100f,    00800e+10F,
+	.0e1_0F, .0_0e+10f, .9e-1_0F, 4.2E1_0f, 4_0.0__1_0E+0_8F, 0.E-1_0f, 0_0.e1_0_0F, 0_0__8__00e+1___0f,
+};
+
+double[] doubleHexExponents = {
+	0x0p0, 0x.ep6, 0Xa0.p+01,   0X.7FFp-18,      0xd3aD.B00p9,
+	0X0P0, 0x.Ep6, 0xa_0.p+0_1, 0X.7__F_FP-1__8, 0Xd__3_aD.b00p9,
+
+	0x0p0D, 0x.ep6D, 0Xa0.p+01d,   0X.7FFp-18D,      0xd3aD.B00p9d,
+	0X0P0d, 0x.eP6d, 0xa_0.p+0_1D, 0X.7__F_FP-1__8d, 0Xd__3_aD.b00p9D,
+};
+float[] floatHexExponents = {
+	0x0p0F, 0x.ep6F, 0Xa0.p+01f,   0X.7FFp-18F,      0xf3aF.B00p9f,
+	0X0P0f, 0x.eP6f, 0xa_0.p+0_1F, 0X.7__F_FP-1__8f, 0Xf__3_aF.b00p9F,
+};
+
+
+// expressions containing numeric literals
+fn(.5);
+fn(5.);
+
+// expressions not containing numeric literals
+fn(x0.d);
+
+// invalid pseudo-numeric literals
+int[] badNonDecimalIntegers =      { 08,  0_8,  019,     0x0g,      0B02, };
+long[] longBadNonDecimalIntegers = { 08L, 0_8l, 01_9L,   0x0__GL,   0B0_2l, };
+
+int[] badUnderscoreIntegers =      { 3_,  0x_0,  0X1_,  0B_0,  0b1_, };
+long[] longBadUnderscoreIntegers = { 3_l, 0X_0L, 0x1_l, 0b_0L, 0B1_l, };
+
+double[] doubleBadDecimals = { 0_d, 0_.,  0._1,  0._D, 0.1_d, };
+float[] floatBadDecimals =   { 0_F, 0_.f, 0._1F, 0._f, 0.1_F, };
+
+double[] doubleBadDecimalExponents = { 0_e0,  0._E1,  1e_2,  2E3_,  3e4_d, };
+float[] floatBadDecimalExponents =   { 0_e0f, 0._E1F, 1e_2f, 2E3_F, 3e4_f, };
+
+double[] doubleBadHexExponents = { 0x0pA,  0x0_P0,  0x0._p1,  0x1P_2,  0x2p3_,  0x3P4_D, };
+float[] floatBadHexExponents =   { 0x0pAF, 0x0_P0f, 0x0._p1F, 0x1P_2f, 0x2p3_F, 0x3P4_f, };

From cf63d2fc63c6fa0f7d1ddf99fcdbe8ebf8ee8b93 Mon Sep 17 00:00:00 2001
From: Jonathan Sharpe <j.r.sharpe@gmail.com>
Date: Sat, 31 Oct 2020 21:00:54 +0000
Subject: [PATCH 100/223] enh(python) Improve handling of decorators (#2811)

Modifies the meta matching for Python code to handle decorators more accurately. This allows e.g. comments to be correctly formatted on lines starting with `@`.
---
 AUTHORS.txt                              |  1 +
 CHANGES.md                               |  2 ++
 src/languages/python.js                  |  3 ++-
 test/detect/python/default.txt           |  2 +-
 test/markup/python/decorators.expect.txt | 31 ++++++++++++++++++++++++
 test/markup/python/decorators.txt        | 31 ++++++++++++++++++++++++
 6 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 test/markup/python/decorators.expect.txt
 create mode 100644 test/markup/python/decorators.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 7b48423b6e..ec9525f059 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -295,3 +295,4 @@ Contributors:
 - Richard Gibson <gibson042@github>
 - Fredrik Ekre <ekrefredrik@gmail.com>
 - Jan Pilzer <Hirse@github>
+- Jonathan Sharpe <mail@jonrshar.pe>
diff --git a/CHANGES.md b/CHANGES.md
index f4a2c9d127..b713560245 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Language Improvements:
 - enh(javascript) Match numeric literals per ECMA-262 spec [Richard Gibson][]
 - enh(java) Match numeric literals per Java Language Specification [Richard Gibson][]
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
+- fix(python) Handle comments on decorators (#2804) [Jonathan Sharpe][]
 
 Dev Improvements:
 
@@ -23,6 +24,7 @@ New themes:
 [Josh Goebel]: https://github.com/joshgoebel
 [Taufik Nurrohman]: https://github.com/taufik-nurrohman
 [Jan Pilzer]: https://github.com/Hirse
+[Jonathan Sharpe]: https://github.com/textbook
 
 
 ## Version 10.3.1
diff --git a/src/languages/python.js b/src/languages/python.js
index e9151e7560..3840c57b62 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -275,7 +275,8 @@ export default function(hljs) {
       },
       {
         className: 'meta',
-        begin: /^[\t ]*@/, end: /$/
+        begin: /^[\t ]*@/, end: /(?=#)|$/,
+        contains: [NUMBER, PARAMS, STRING]
       },
       {
         begin: /\b(print|exec)\(/ // don’t highlight keywords-turned-functions in Python 3
diff --git a/test/detect/python/default.txt b/test/detect/python/default.txt
index 1216323cbb..17811a2d23 100644
--- a/test/detect/python/default.txt
+++ b/test/detect/python/default.txt
@@ -1,4 +1,4 @@
-@requires_authorization
+@requires_authorization(roles=["ADMIN"])
 def somefunc(param1='', param2=0):
     r'''A docstring'''
     if param1 > param2: # interesting
diff --git a/test/markup/python/decorators.expect.txt b/test/markup/python/decorators.expect.txt
new file mode 100644
index 0000000000..a0ab79766f
--- /dev/null
+++ b/test/markup/python/decorators.expect.txt
@@ -0,0 +1,31 @@
+<span class="hljs-meta">@foo</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">bar</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@foo  </span><span class="hljs-comment"># bar</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">baz</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@foo.bar.baz</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">qux</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@surround_with(<span class="hljs-params"><span class="hljs-string">&quot;#&quot;</span>, repeat=<span class="hljs-number">3</span></span>)</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">text</span>():</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;hi!&quot;</span>
+
+<span class="hljs-meta">@py38.style</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">func</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@py[<span class="hljs-string">&quot;3.9&quot;</span>].style</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">func</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@py[<span class="hljs-number">3.9</span>].style</span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">func</span>():</span>
+    <span class="hljs-keyword">pass</span>
+
+<span class="hljs-meta">@<span class="hljs-number">2</span> + <span class="hljs-number">2</span> == <span class="hljs-number">5</span></span>
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">func</span>():</span>
+    <span class="hljs-keyword">pass</span>
diff --git a/test/markup/python/decorators.txt b/test/markup/python/decorators.txt
new file mode 100644
index 0000000000..950d759319
--- /dev/null
+++ b/test/markup/python/decorators.txt
@@ -0,0 +1,31 @@
+@foo
+def bar():
+    pass
+
+@foo  # bar
+def baz():
+    pass
+
+@foo.bar.baz
+def qux():
+    pass
+
+@surround_with("#", repeat=3)
+def text():
+    return "hi!"
+
+@py38.style
+def func():
+    pass
+
+@py["3.9"].style
+def func():
+    pass
+
+@py[3.9].style
+def func():
+    pass
+
+@2 + 2 == 5
+def func():
+    pass

From 66a2598b1a3849e2840d4113360d157385d65291 Mon Sep 17 00:00:00 2001
From: Brad Chamberlain <bradcray@users.noreply.github.com>
Date: Mon, 2 Nov 2020 10:49:32 -0800
Subject: [PATCH 101/223] (docs) Add Chapel as a listed third-party language
 (#2806)

* Add Chapel as a listed third-party language
---
 CHANGES.md             | 4 ++++
 SUPPORTED_LANGUAGES.md | 1 +
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b713560245..87cdab2702 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 ## Version 10.4.0 (work in process)
 
+New languages:
+
+- Added Chapel grammar to SUPPORTED_LANGUAGES (#2806) [Brad Chamberlain][]
+
 Language Improvements:
 
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 62793424c9..0fec40b51d 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -42,6 +42,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | CSS                     | css                    |         |
 | Cap’n Proto             | capnproto, capnp       |         |
 | Chaos                   | chaos, kaos            | [highlightjs-chaos](https://github.com/chaos-lang/highlightjs-chaos) |
+| Chapel                  | chapel, chpl           | [highlightjs-chapel](https://github.com/chapel-lang/highlightjs-chapel) |
 | Cisco CLI               | cisco                  | [highlightjs-cisco-cli](https://github.com/BMatheas/highlightjs-cisco-cli) |
 | Clojure                 | clojure, clj           |         |
 | CoffeeScript            | coffeescript, coffee, cson, iced | |

From 397117028a90cd7d9bdd01db92894ee76c663ec2 Mon Sep 17 00:00:00 2001
From: Michael Rush <michaelrush@gmail.com>
Date: Mon, 2 Nov 2020 11:31:26 -0800
Subject: [PATCH 102/223] fix(vue) Corrected typo in Vue plugin setting
 detectedLanguage (#2807)

* Corrected typo in Vue plugin setting detectedLanguage

Fixed typo `this.detectectLanguage` -> `this.detectedLanguage` when rendering content when a language has been provided. In that case detectedLanguage was not getting set, which meant the computed className was also not getting the language.
---
 AUTHORS.txt        | 1 +
 CHANGES.md         | 7 ++++++-
 src/plugins/vue.js | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index ec9525f059..9c954ab64d 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -296,3 +296,4 @@ Contributors:
 - Fredrik Ekre <ekrefredrik@gmail.com>
 - Jan Pilzer <Hirse@github>
 - Jonathan Sharpe <mail@jonrshar.pe>
+- Michael Rush <michaelrush@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
index 87cdab2702..67b5ce4a78 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
 ## Version 10.4.0 (work in process)
 
-New languages:
+Parser:
+
+- fix(vue): Language name now appears in CSS class (#2807) [Michael Rush][]
+
+New Languages:
 
 - Added Chapel grammar to SUPPORTED_LANGUAGES (#2806) [Brad Chamberlain][]
 
@@ -29,6 +33,7 @@ New themes:
 [Taufik Nurrohman]: https://github.com/taufik-nurrohman
 [Jan Pilzer]: https://github.com/Hirse
 [Jonathan Sharpe]: https://github.com/textbook
+[Michael Rush]: https://github.com/rushimusmaximus
 
 
 ## Version 10.3.1
diff --git a/src/plugins/vue.js b/src/plugins/vue.js
index dee6e833a4..e61346fab2 100644
--- a/src/plugins/vue.js
+++ b/src/plugins/vue.js
@@ -33,7 +33,7 @@ export const Component = {
         this.detectedLanguage = result.language;
       } else {
         result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
-        this.detectectLanguage = this.language;
+        this.detectedLanguage = this.language;
       }
       return result.value;
     },

From bfbaa081a76ed7d066c910e8e018ea95fd7a5729 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 15:17:19 -0500
Subject: [PATCH 103/223] fix(js/ts) Prevent for/while/if/switch from falsly
 matching as functions (#2803)

---
 CHANGES.md                              | 1 +
 src/languages/javascript.js             | 5 +++++
 test/markup/javascript/class.expect.txt | 7 +++++++
 test/markup/javascript/class.txt        | 7 +++++++
 4 files changed, 20 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 67b5ce4a78..a1a2c1e838 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ New Languages:
 
 Language Improvements:
 
+- fix(js/ts) Prevent for/while/if/switch from falsly matching as functions (#2803) [Josh Goebel][]
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
 - enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index e51589fd29..e2c1243aff 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -359,6 +359,11 @@ export default function(hljs) {
         ],
         illegal: /%/
       },
+      {
+        // prevent this from getting swallowed up by function
+        // since they appear "function like"
+        beginKeywords: "while if switch catch for"
+      },
       {
         className: 'function',
         // we have to count the parens to make sure we actually have the correct
diff --git a/test/markup/javascript/class.expect.txt b/test/markup/javascript/class.expect.txt
index 8f0f53554c..cf8387ee8c 100644
--- a/test/markup/javascript/class.expect.txt
+++ b/test/markup/javascript/class.expect.txt
@@ -19,3 +19,10 @@
   }
   <span class="hljs-function"><span class="hljs-title">onemore</span>(<span class="hljs-params">a=(<span class="hljs-number">3</span>+<span class="hljs-number">2</span>, b=(<span class="hljs-number">5</span>*<span class="hljs-number">9</span>))</span>)</span> {}
 }
+
+<span class="hljs-comment">// these should not be matched as class functions</span>
+<span class="hljs-keyword">for</span>(expr; expr; expr) {}
+<span class="hljs-keyword">while</span>(value) {}
+<span class="hljs-keyword">if</span>(value) {}
+<span class="hljs-keyword">switch</span>(value) {}
+<span class="hljs-keyword">try</span> {} <span class="hljs-keyword">catch</span>(err) {}
diff --git a/test/markup/javascript/class.txt b/test/markup/javascript/class.txt
index db520f2a51..0ba06eab72 100644
--- a/test/markup/javascript/class.txt
+++ b/test/markup/javascript/class.txt
@@ -19,3 +19,10 @@ class Car extends Vehicle {
   }
   onemore(a=(3+2, b=(5*9))) {}
 }
+
+// these should not be matched as class functions
+for(expr; expr; expr) {}
+while(value) {}
+if(value) {}
+switch(value) {}
+try {} catch(err) {}

From afd4114417f5efad5887108413bad182418d295b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 16:40:02 -0500
Subject: [PATCH 104/223] chore(parser) refactor `highlightAuto` to be much
 simpler (#2799)

- Refactors the highlightAuto code in preparation for adding plugin hooks to make it smarter.
---
 src/highlight.js | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/highlight.js b/src/highlight.js
index 421d645176..f827f1dd79 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -581,23 +581,29 @@ const HLJS = function(hljs) {
   */
   function highlightAuto(code, languageSubset) {
     languageSubset = languageSubset || options.languages || Object.keys(languages);
-    var result = justTextHighlightResult(code);
-    var secondBest = result;
-    languageSubset.filter(getLanguage).filter(autoDetection).forEach(function(name) {
-      var current = _highlight(name, code, false);
-      current.language = name;
-      if (current.relevance > secondBest.relevance) {
-        secondBest = current;
-      }
-      if (current.relevance > result.relevance) {
-        secondBest = result;
-        result = current;
-      }
+    const plaintext = justTextHighlightResult(code);
+
+    const results = languageSubset.filter(getLanguage).filter(autoDetection).map(name =>
+      _highlight(name, code, false)
+    );
+    results.unshift(plaintext); // plaintext is always an option
+
+    const sorted = results.sort((a,b) => {
+      // sort base on relevance
+      return b.relevance - a.relevance;
+
+      // otherwise say they are equal, which has the effect of sorting on
+      // relevance while preserving the original ordering - which is how ties
+      // have historically been settled, ie the language that comes first always
+      // wins in the case of a tie
     });
-    if (secondBest.language) {
-      // second_best (with underscore) is the expected API
-      result.second_best = secondBest;
-    }
+
+    const [best, secondBest] = sorted;
+
+    /** @type {AutoHighlightResult} */
+    const result = best;
+    result.second_best = secondBest;
+
     return result;
   }
 

From bab94ff6ec609a209ba87f4e4851c065ed3d6a85 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 16:53:00 -0500
Subject: [PATCH 105/223] (chore) clean up CSS classes reference docs (#2714)

Clarify use of CSS classes a bit more.

- Make it clear the ReasonML classes are not for use.
- Add `operator` and `punctuation`
- Clarify `type` and a few others...
---
 docs/css-classes-reference.rst | 110 +++++++++++++++++++++++----------
 1 file changed, 77 insertions(+), 33 deletions(-)

diff --git a/docs/css-classes-reference.rst b/docs/css-classes-reference.rst
index aa4d45321d..f44c8ceff4 100644
--- a/docs/css-classes-reference.rst
+++ b/docs/css-classes-reference.rst
@@ -5,22 +5,40 @@ CSS classes reference
 Stylable classes
 ----------------
 
+The general purpose classes are intended to be used for any language, but the
+other classes may also be used when they are semantically correct.  For example
+if you had a general purpose language that allowed inline URLs:
+
+::
+
+  var GOOGLE = https://www.google.com/
+
+
+It would be wholly reasonable to use the ``link`` class for this, even though
+your language is not considered a "Markup" language.
+
 +------------------------------------------------------------------------------+
-| **General-purpose**                                                          |
+| **General purpose**                                                          |
 +--------------------------+---------------------------------------------------+
 | keyword                  | keyword in a regular Algol-style language         |
 +--------------------------+---------------------------------------------------+
 | built_in                 | built-in or library object (constant, class,      |
 |                          | function)                                         |
 +--------------------------+---------------------------------------------------+
-| type                     | user-defined type in a language with first-class  |
-|                          | syntactically significant types, like Haskell     |
+| type                     | data type (in a language with syntactically       |
+|                          | significant types) (``string``, ``int``,          |
+|                          | ``array``, etc.)                                  |
 +--------------------------+---------------------------------------------------+
-| literal                  | special identifier for a built-in value ("true",  |
-|                          | "false", "null")                                  |
+| literal                  | special identifier for a built-in value           |
+|                          | (``true``, ``false``, ``null``, etc.)             |
 +--------------------------+---------------------------------------------------+
 | number                   | number, including units and modifiers, if any.    |
 +--------------------------+---------------------------------------------------+
+| operator                 | operators: ``+``, ``-``, ``>>``, ``|``, ``==``    |
++--------------------------+---------------------------------------------------+
+| punctuation              | aux. punctuation that should be subtly highlighted|
+|                          | (parentheses, brackets, etc.)                     |
++--------------------------+---------------------------------------------------+
 | regexp                   | literal regular expression                        |
 +--------------------------+---------------------------------------------------+
 | string                   | literal string, character                         |
@@ -30,24 +48,27 @@ Stylable classes
 | symbol                   | symbolic constant, interned string, goto label    |
 +--------------------------+---------------------------------------------------+
 | class                    | class or class-level declaration (interfaces,     |
-|                          | traits, modules, etc)                             |
+|                          | traits, modules, etc), typically includes a       |
+|                          | ``title`` submode                                 |
 +--------------------------+---------------------------------------------------+
 | function                 | function or method declaration                    |
 +--------------------------+---------------------------------------------------+
+| variable                 | variables                                         |
++--------------------------+---------------------------------------------------+
 | title                    | name of a class or a function at the place of     |
 |                          | declaration                                       |
 +--------------------------+---------------------------------------------------+
 | params                   | block of function arguments (parameters) at the   |
 |                          | place of declaration                              |
 +--------------------------+---------------------------------------------------+
-| **Meta**                                                                     |
-+--------------------------+---------------------------------------------------+
-| comment                  | comment                                           |
+| comment                  | comments                                          |
 +--------------------------+---------------------------------------------------+
 | doctag                   | documentation markup within comments              |
 +--------------------------+---------------------------------------------------+
+| **Meta**                                                                     |
++--------------------------+---------------------------------------------------+
 | meta                     | flags, modifiers, annotations, processing         |
-|                          | instructions, preprocessor directive, etc         |
+|                          | instructions, preprocessor directives, etc        |
 +--------------------------+---------------------------------------------------+
 | meta-keyword             | keyword or built-in within meta construct         |
 +--------------------------+---------------------------------------------------+
@@ -74,36 +95,33 @@ Stylable classes
 | attribute                | name of an attribute followed by a structured     |
 |                          | value part, like CSS properties                   |
 +--------------------------+---------------------------------------------------+
-| variable                 | variable in a config or a template file,          |
-|                          | environment var expansion in a script             |
-+--------------------------+---------------------------------------------------+
-| **Markup**                                                                   |
+| **Text Markup**                                                              |
 +--------------------------+---------------------------------------------------+
-| bullet                   | list item bullet in text markup                   |
+| bullet                   | list item bullet                                  |
 +--------------------------+---------------------------------------------------+
-| code                     | code block in text markup                         |
+| code                     | code block                                        |
 +--------------------------+---------------------------------------------------+
-| emphasis                 | emphasis in text markup                           |
+| emphasis                 | emphasis                                          |
 +--------------------------+---------------------------------------------------+
-| strong                   | strong emphasis in text markup                    |
+| strong                   | strong emphasis                                   |
 +--------------------------+---------------------------------------------------+
-| formula                  | mathematical formula in text markup               |
+| formula                  | mathematical formula                              |
 +--------------------------+---------------------------------------------------+
-| link                     | hyperlink in text markup                          |
+| link                     | hyperlink                                         |
 +--------------------------+---------------------------------------------------+
-| quote                    | quotation in text markup                          |
+| quote                    | quotation or blockquote                           |
 +--------------------------+---------------------------------------------------+
 | **CSS**                                                                      |
 +--------------------------+---------------------------------------------------+
-| selector-tag             | tag selector in CSS                               |
+| selector-tag             | tag selector                                      |
 +--------------------------+---------------------------------------------------+
-| selector-id              | #id selector in CSS                               |
+| selector-id              | #id selector                                      |
 +--------------------------+---------------------------------------------------+
-| selector-class           | .class selector in CSS                            |
+| selector-class           | .class selector                                   |
 +--------------------------+---------------------------------------------------+
-| selector-attr            | [attr] selector in CSS                            |
+| selector-attr            | [attr] selector                                   |
 +--------------------------+---------------------------------------------------+
-| selector-pseudo          | :pseudo selector in CSS                           |
+| selector-pseudo          | :pseudo selector                                  |
 +--------------------------+---------------------------------------------------+
 | **Templates**                                                                |
 +--------------------------+---------------------------------------------------+
@@ -113,23 +131,49 @@ Stylable classes
 +--------------------------+---------------------------------------------------+
 | **diff**                                                                     |
 +--------------------------+---------------------------------------------------+
-| addition                 | added or changed line in a diff                   |
+| addition                 | added or changed line                             |
 +--------------------------+---------------------------------------------------+
-| deletion                 | deleted line in a diff                            |
+| deletion                 | deleted line                                      |
 +--------------------------+---------------------------------------------------+
-| **ReasonML**                                                                 |
+
+A note on newer classes
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Some classes have been added more recently and do not enjoy universal theme
+support.  For themes without support, these items will simply not be
+highlighted.  This doesn't mean not to use them, only that they will be
+highlighted better as support improves over time.
+
+A list of these classes:
+
+- operator
+- punctuation
+
+
+Reserved classes
+^^^^^^^^^^^^^^^^
+
+The below classes (ReasonML) are left here for documentation purposes but may
+not be used in other grammars because they are very poorly supported by all
+themes.
+
+If you'd like to help out with the larger issue here:
+
+- https://github.com/highlightjs/highlight.js/issues/2521
+- https://github.com/highlightjs/highlight.js/issues/2500
+
 +--------------------------+---------------------------------------------------+
-| operator                 | reasonml operator such as pipe                    |
+| **ReasonML**                                                                 |
 +--------------------------+---------------------------------------------------+
-| pattern-match            | reasonml pattern matching matchers                |
+| pattern-match            | pattern matching matchers                         |
 +--------------------------+---------------------------------------------------+
 | typing                   | type signatures on function parameters            |
 +--------------------------+---------------------------------------------------+
 | constructor              | type constructors                                 |
 +--------------------------+---------------------------------------------------+
-| module-access            | scope access into a ReasonML module               |
+| module-access            | scope access into a module                        |
 +--------------------------+---------------------------------------------------+
-| module                   | ReasonML module reference within scope access     |
+| module                   | module reference within scope access              |
 +--------------------------+---------------------------------------------------+
 
 

From 0cee2f3e664b7ad80aab0ed1cee0ce42bef5cbcf Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 18:53:40 -0500
Subject: [PATCH 106/223] (chore) Clean up all regexs to be UTF-8
 compliant/ready (#2759)

Work toward #2756.

Cleans up a lot of incorrect (unnecessary escaped) regex that would not compile with the `u` flag. After that makes some rather large performance improvements (with utf8 turned on at least) to `yaml` and `mipsasm`. It looks like the mipasm rules have been wrong all along... as far as I can determine they are intended to match a literal `.` (otherwise they are far too broad) but were matching any character - which seems to terribly slow down the whole grammar in `u` mode.

The changes consisted largely of:

- Most unescaped { and }
- Lots of unneeded escapes for -, <, >, and others.
- Converting strings to regex if it made them simpler, easier to read (editor syntax coloring)
---
 docs/language-guide.rst         |  2 +-
 docs/mode-reference.rst         |  2 +-
 src/languages/actionscript.js   |  4 +--
 src/languages/ada.js            |  2 +-
 src/languages/angelscript.js    |  6 ++---
 src/languages/asciidoc.js       |  2 +-
 src/languages/awk.js            |  2 +-
 src/languages/axapta.js         |  8 +++---
 src/languages/basic.js          |  8 +++---
 src/languages/brainfuck.js      |  4 +--
 src/languages/ceylon.js         |  2 +-
 src/languages/clojure.js        |  2 +-
 src/languages/cmake.js          |  2 +-
 src/languages/coffeescript.js   |  2 +-
 src/languages/crmsh.js          |  2 +-
 src/languages/crystal.js        | 16 ++++++------
 src/languages/csharp.js         | 12 ++++-----
 src/languages/css.js            |  8 +++---
 src/languages/dart.js           |  6 ++---
 src/languages/diff.js           | 12 ++++-----
 src/languages/django.js         |  8 +++---
 src/languages/dsconfig.js       | 11 +++++----
 src/languages/dts.js            |  8 +++---
 src/languages/ebnf.js           |  2 +-
 src/languages/elixir.js         | 12 ++++-----
 src/languages/elm.js            |  6 ++---
 src/languages/erlang.js         |  4 +--
 src/languages/fortran.js        |  2 +-
 src/languages/gams.js           |  4 +--
 src/languages/gcode.js          |  2 +-
 src/languages/groovy.js         |  2 +-
 src/languages/haml.js           |  8 +++---
 src/languages/handlebars.js     |  4 +--
 src/languages/haskell.js        |  8 +++---
 src/languages/haxe.js           |  2 +-
 src/languages/hsp.js            |  2 +-
 src/languages/ini.js            |  4 +--
 src/languages/irpf90.js         |  2 +-
 src/languages/javascript.js     | 12 ++++-----
 src/languages/json.js           |  2 +-
 src/languages/kotlin.js         |  2 +-
 src/languages/leaf.js           |  2 +-
 src/languages/less.js           | 12 ++++-----
 src/languages/lisp.js           |  4 +--
 src/languages/livecodeserver.js |  2 +-
 src/languages/livescript.js     | 10 ++++----
 src/languages/lsl.js            | 20 +++++++--------
 src/languages/matlab.js         |  6 ++---
 src/languages/mel.js            |  2 +-
 src/languages/mipsasm.js        | 21 ++++++++--------
 src/languages/moonscript.js     |  2 +-
 src/languages/nginx.js          | 14 +++++------
 src/languages/nim.js            |  4 +--
 src/languages/nix.js            |  2 +-
 src/languages/nsis.js           | 10 ++++----
 src/languages/objectivec.js     |  2 +-
 src/languages/openscad.js       |  2 +-
 src/languages/oxygene.js        |  4 +--
 src/languages/parser3.js        | 12 ++++-----
 src/languages/perl.js           | 16 ++++++------
 src/languages/pgsql.js          |  2 +-
 src/languages/php.js            |  6 ++---
 src/languages/powershell.js     |  2 +-
 src/languages/prolog.js         |  6 ++---
 src/languages/qml.js            |  4 ++-
 src/languages/reasonml.js       | 22 ++++++++---------
 src/languages/roboconf.js       |  6 ++---
 src/languages/routeros.js       |  8 +++---
 src/languages/ruby.js           | 32 ++++++++++++------------
 src/languages/ruleslanguage.js  |  4 +--
 src/languages/rust.js           |  4 +--
 src/languages/sas.js            |  4 +--
 src/languages/scala.js          |  2 +-
 src/languages/scheme.js         |  2 +-
 src/languages/scss.js           |  2 +-
 src/languages/smali.js          |  4 +--
 src/languages/smalltalk.js      |  2 +-
 src/languages/stylus.js         |  4 +--
 src/languages/swift.js          |  2 +-
 src/languages/tap.js            |  2 +-
 src/languages/twig.js           |  6 ++---
 src/languages/vala.js           |  2 +-
 src/languages/vbnet.js          |  2 +-
 src/languages/vhdl.js           |  2 +-
 src/languages/xml.js            |  4 +--
 src/languages/xquery.js         | 43 +++++++++++++++------------------
 src/languages/yaml.js           | 16 ++++++------
 src/languages/zephir.js         |  2 +-
 88 files changed, 276 insertions(+), 279 deletions(-)

diff --git a/docs/language-guide.rst b/docs/language-guide.rst
index 38b0db659d..ae8e3c51d3 100644
--- a/docs/language-guide.rst
+++ b/docs/language-guide.rst
@@ -130,7 +130,7 @@ This is commonly used to define nested modes:
 
   {
     className: 'object',
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     contains: [hljs.QUOTE_STRING_MODE, 'self']
   }
 
diff --git a/docs/mode-reference.rst b/docs/mode-reference.rst
index b79500ffd8..c32e705d43 100644
--- a/docs/mode-reference.rst
+++ b/docs/mode-reference.rst
@@ -158,7 +158,7 @@ This is when ``endsWithParent`` comes into play:
 ::
 
   {
-    className: 'rules', begin: '{', end: '}',
+    className: 'rules', begin: /\{/, end: /\}/,
     contains: [
       {className: 'rule', /* ... */ end: ';', endsWithParent: true}
     ]
diff --git a/src/languages/actionscript.js b/src/languages/actionscript.js
index bd290ef823..991a1b72a1 100644
--- a/src/languages/actionscript.js
+++ b/src/languages/actionscript.js
@@ -34,12 +34,12 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'class',
-        beginKeywords: 'package', end: '{',
+        beginKeywords: 'package', end: /\{/,
         contains: [hljs.TITLE_MODE]
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: '{', excludeEnd: true,
+        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
         contains: [
           {
             beginKeywords: 'extends implements'
diff --git a/src/languages/ada.js b/src/languages/ada.js
index eba10a79d5..093fc8a662 100644
--- a/src/languages/ada.js
+++ b/src/languages/ada.js
@@ -37,7 +37,7 @@ export default function(hljs) {
     var ID_REGEX = '[A-Za-z](_?[A-Za-z0-9.])*';
 
     // bad chars, only allowed in literals
-    var BAD_CHARS = `[]{}%#'"`;
+    var BAD_CHARS = `[]\\{\\}%#'"`;
 
     // Ada doesn't have block comments, only line comments
     var COMMENTS = hljs.COMMENT('--', '$');
diff --git a/src/languages/angelscript.js b/src/languages/angelscript.js
index 981a9976d2..5f88af397a 100644
--- a/src/languages/angelscript.js
+++ b/src/languages/angelscript.js
@@ -37,7 +37,7 @@ export default function(hljs) {
       'abstract|0 try catch protected explicit property',
 
     // avoid close detection with C# and JS
-    illegal: '(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunction\s*[^\\(])',
+    illegal: '(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunction\\s*[^\\(])',
 
     contains: [
       { // 'strings'
@@ -71,7 +71,7 @@ export default function(hljs) {
       },
 
       { // interface or namespace declaration
-        beginKeywords: 'interface namespace', end: '{',
+        beginKeywords: 'interface namespace', end: /\{/,
         illegal: '[;.\\-]',
         contains: [
           { // interface or namespace name
@@ -82,7 +82,7 @@ export default function(hljs) {
       },
 
       { // class declaration
-        beginKeywords: 'class', end: '{',
+        beginKeywords: 'class', end: /\{/,
         illegal: '[;.\\-]',
         contains: [
           { // class name
diff --git a/src/languages/asciidoc.js b/src/languages/asciidoc.js
index 419a2d551a..1962bb0930 100644
--- a/src/languages/asciidoc.js
+++ b/src/languages/asciidoc.js
@@ -96,7 +96,7 @@ export default function(hljs) {
       // lists (can only capture indicators)
       {
         className: 'bullet',
-        begin: '^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+'
+        begin: '^(\\*+|-+|\\.+|[^\\n]+?::)\\s+'
       },
       // admonition
       {
diff --git a/src/languages/awk.js b/src/languages/awk.js
index 0d61c54cc5..f2b424154e 100644
--- a/src/languages/awk.js
+++ b/src/languages/awk.js
@@ -11,7 +11,7 @@ export default function(hljs) {
     className: 'variable',
     variants: [
       {begin: /\$[\w\d#@][\w\d_]*/},
-      {begin: /\$\{(.*?)}/}
+      {begin: /\$\{(.*?)\}/}
     ]
   };
   var KEYWORDS = 'BEGIN END if else while do for in break continue delete next nextfile function func exit|10';
diff --git a/src/languages/axapta.js b/src/languages/axapta.js
index 61511b39f0..297a23a118 100644
--- a/src/languages/axapta.js
+++ b/src/languages/axapta.js
@@ -75,7 +75,7 @@ export default function(hljs) {
     'firstonly100',
     'firstonly1000',
     'flush',
-    'for', 
+    'for',
     'forceliterals',
     'forcenestedloop',
     'forceplaceholders',
@@ -83,7 +83,7 @@ export default function(hljs) {
     'forupdate',
     'from',
     'generateonly',
-    'group', 
+    'group',
     'hint',
     'if',
     'implements',
@@ -119,7 +119,7 @@ export default function(hljs) {
     'select',
     'server',
     'setting',
-    'static', 
+    'static',
     'sum',
     'super',
     'switch',
@@ -160,7 +160,7 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: '{', excludeEnd: true,
+        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
         illegal: ':',
         contains: [
           {beginKeywords: 'extends implements'},
diff --git a/src/languages/basic.js b/src/languages/basic.js
index c37bedac71..9143058f5f 100644
--- a/src/languages/basic.js
+++ b/src/languages/basic.js
@@ -13,7 +13,7 @@ export default function(hljs) {
     illegal: '^\.',
     // Support explicitly typed variables that end with $%! or #.
     keywords: {
-        $pattern: '[a-zA-Z][a-zA-Z0-9_\$\%\!\#]*',
+        $pattern: '[a-zA-Z][a-zA-Z0-9_$%!#]*',
         keyword:
           'ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE ' +
           'CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ ' +
@@ -35,7 +35,7 @@ export default function(hljs) {
       {
         // Match line numbers
         className: 'symbol',
-        begin: '^[0-9]+\ ',
+        begin: '^[0-9]+ ',
         relevance: 10
       },
       {
@@ -47,12 +47,12 @@ export default function(hljs) {
       {
         // Match hexadecimal numbers (&Hxxxx)
         className: 'number',
-        begin: '(\&[hH][0-9a-fA-F]{1,4})'
+        begin: '(&[hH][0-9a-fA-F]{1,4})'
       },
       {
         // Match octal numbers (&Oxxxxxx)
         className: 'number',
-        begin: '(\&[oO][0-7]{1,6})'
+        begin: '(&[oO][0-7]{1,6})'
       }
     ]
   };
diff --git a/src/languages/brainfuck.js b/src/languages/brainfuck.js
index 957d19618b..c10cdb1afc 100644
--- a/src/languages/brainfuck.js
+++ b/src/languages/brainfuck.js
@@ -8,7 +8,7 @@ Website: https://esolangs.org/wiki/Brainfuck
 export default function(hljs) {
   var LITERAL = {
     className: 'literal',
-    begin: '[\\+\\-]',
+    begin: /[+-]/,
     relevance: 0
   };
   return {
@@ -35,7 +35,7 @@ export default function(hljs) {
       },
       {
         // this mode works as the only relevance counter
-        begin: /(?:\+\+|\-\-)/,
+        begin: /(?:\+\+|--)/,
         contains: [LITERAL]
       },
       LITERAL
diff --git a/src/languages/ceylon.js b/src/languages/ceylon.js
index f9b1b7e29c..63dfee608c 100644
--- a/src/languages/ceylon.js
+++ b/src/languages/ceylon.js
@@ -67,7 +67,7 @@ export default function(hljs) {
       {
         // compiler annotation
         className: 'meta',
-        begin: '@[a-z]\\w*(?:\\:\"[^\"]*\")?'
+        begin: '@[a-z]\\w*(?::"[^"]*")?'
       }
     ].concat(EXPRESSIONS)
   };
diff --git a/src/languages/clojure.js b/src/languages/clojure.js
index bf0d877810..a243e5805f 100644
--- a/src/languages/clojure.js
+++ b/src/languages/clojure.js
@@ -96,7 +96,7 @@ export default function(hljs) {
   var GLOBAL = {
     beginKeywords: globals,
     lexemes: SYMBOL_RE,
-    end: '(\\[|\\#|\\d|"|:|\\{|\\)|\\(|$)',
+    end: '(\\[|#|\\d|"|:|\\{|\\)|\\(|$)',
     contains: [
       {
         className: 'title',
diff --git a/src/languages/cmake.js b/src/languages/cmake.js
index 040769c610..f7ff736942 100644
--- a/src/languages/cmake.js
+++ b/src/languages/cmake.js
@@ -51,7 +51,7 @@ export default function(hljs) {
     contains: [
       {
         className: 'variable',
-        begin: '\\${', end: '}'
+        begin: /\$\{/, end: /\}/
       },
       hljs.HASH_COMMENT_MODE,
       hljs.QUOTE_STRING_MODE,
diff --git a/src/languages/coffeescript.js b/src/languages/coffeescript.js
index 2d6a8f5094..e5c360d161 100644
--- a/src/languages/coffeescript.js
+++ b/src/languages/coffeescript.js
@@ -51,7 +51,7 @@ export default function(hljs) {
   var JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
   var SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /}/,
+    begin: /#\{/, end: /\}/,
     keywords: KEYWORDS
   };
   var EXPRESSIONS = [
diff --git a/src/languages/crmsh.js b/src/languages/crmsh.js
index ecbcefe836..b7033d31db 100644
--- a/src/languages/crmsh.js
+++ b/src/languages/crmsh.js
@@ -89,7 +89,7 @@ export default function(hljs) {
       },
       {
         className: 'attr',
-        begin: /([A-Za-z\$_\#][\w_-]+)=/,
+        begin: /([A-Za-z$_#][\w_-]+)=/,
         relevance: 0
       },
       {
diff --git a/src/languages/crystal.js b/src/languages/crystal.js
index 7230d6cb7b..3224886803 100644
--- a/src/languages/crystal.js
+++ b/src/languages/crystal.js
@@ -9,8 +9,8 @@ export default function(hljs) {
   var INT_SUFFIX = '(_*[ui](8|16|32|64|128))?';
   var FLOAT_SUFFIX = '(_*f(32|64))?';
   var CRYSTAL_IDENT_RE = '[a-zA-Z_]\\w*[!?=]?';
-  var CRYSTAL_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?';
-  var CRYSTAL_PATH_RE = '[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?';
+  var CRYSTAL_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?';
+  var CRYSTAL_PATH_RE = '[A-Za-z_]\\w*(::\\w+)*(\\?|!)?';
   var CRYSTAL_KEYWORDS = {
     $pattern: CRYSTAL_IDENT_RE,
     keyword:
@@ -22,7 +22,7 @@ export default function(hljs) {
   };
   var SUBST = {
     className: 'subst',
-    begin: '#{', end: '}',
+    begin: /#\{/, end: /\}/,
     keywords: CRYSTAL_KEYWORDS
   };
   var EXPANSION = {
@@ -49,7 +49,7 @@ export default function(hljs) {
       {begin: /`/, end: /`/},
       {begin: '%[Qwi]?\\(', end: '\\)', contains: recursiveParen('\\(', '\\)')},
       {begin: '%[Qwi]?\\[', end: '\\]', contains: recursiveParen('\\[', '\\]')},
-      {begin: '%[Qwi]?{', end: '}', contains: recursiveParen('{', '}')},
+      {begin: '%[Qwi]?\\{', end: /\}/, contains: recursiveParen(/\{/, /\}/)},
       {begin: '%[Qwi]?<', end: '>', contains: recursiveParen('<', '>')},
       {begin: '%[Qwi]?\\|', end: '\\|'},
       {begin: /<<-\w+$/, end: /^\s*\w+$/},
@@ -61,7 +61,7 @@ export default function(hljs) {
     variants: [
       {begin: '%q\\(', end: '\\)', contains: recursiveParen('\\(', '\\)')},
       {begin: '%q\\[', end: '\\]', contains: recursiveParen('\\[', '\\]')},
-      {begin: '%q{', end: '}', contains: recursiveParen('{', '}')},
+      {begin: '%q\\{', end: /\}/, contains: recursiveParen(/\{/, /\}/)},
       {begin: '%q<', end: '>', contains: recursiveParen('<', '>')},
       {begin: '%q\\|', end: '\\|'},
       {begin: /<<-'\w+'$/, end: /^\s*\w+$/},
@@ -69,7 +69,7 @@ export default function(hljs) {
     relevance: 0,
   };
   var REGEXP = {
-    begin: '(?!%})(' + hljs.RE_STARTERS_RE + '|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*',
+    begin: '(?!%\\})(' + hljs.RE_STARTERS_RE + '|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*',
     keywords: 'case if select unless until when while',
     contains: [
       {
@@ -89,7 +89,7 @@ export default function(hljs) {
     variants: [
       {begin: '%r\\(', end: '\\)', contains: recursiveParen('\\(', '\\)')},
       {begin: '%r\\[', end: '\\]', contains: recursiveParen('\\[', '\\]')},
-      {begin: '%r{', end: '}', contains: recursiveParen('{', '}')},
+      {begin: '%r\\{', end: /\}/, contains: recursiveParen(/\{/, /\}/)},
       {begin: '%r<', end: '>', contains: recursiveParen('<', '>')},
       {begin: '%r\\|', end: '\\|'},
     ],
@@ -162,7 +162,7 @@ export default function(hljs) {
     },
     {
       className: 'symbol',
-      begin: hljs.UNDERSCORE_IDENT_RE + '(\\!|\\?)?:',
+      begin: hljs.UNDERSCORE_IDENT_RE + '(!|\\?)?:',
       relevance: 0
     },
     {
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index 28963f707c..5d90471271 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -170,7 +170,7 @@ export default function(hljs) {
   var VERBATIM_STRING_NO_LF = hljs.inherit(VERBATIM_STRING, {illegal: /\n/});
   var SUBST = {
     className: 'subst',
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     keywords: KEYWORDS
   };
   var SUBST_NO_LF = hljs.inherit(SUBST, {illegal: /\n/});
@@ -178,16 +178,16 @@ export default function(hljs) {
     className: 'string',
     begin: /\$"/, end: '"',
     illegal: /\n/,
-    contains: [{begin: '{{'}, {begin: '}}'}, hljs.BACKSLASH_ESCAPE, SUBST_NO_LF]
+    contains: [{begin: /\{\{/}, {begin: /\}\}/}, hljs.BACKSLASH_ESCAPE, SUBST_NO_LF]
   };
   var INTERPOLATED_VERBATIM_STRING = {
     className: 'string',
     begin: /\$@"/, end: '"',
-    contains: [{begin: '{{'}, {begin: '}}'}, {begin: '""'}, SUBST]
+    contains: [{begin: /\{\{/}, {begin: /\}\}/}, {begin: '""'}, SUBST]
   };
   var INTERPOLATED_VERBATIM_STRING_NO_LF = hljs.inherit(INTERPOLATED_VERBATIM_STRING, {
     illegal: /\n/,
-    contains: [{begin: '{{'}, {begin: '}}'}, {begin: '""'}, SUBST_NO_LF]
+    contains: [{begin: /\{\{/}, {begin: /\}\}/}, {begin: '""'}, SUBST_NO_LF]
   });
   SUBST.contains = [
     INTERPOLATED_VERBATIM_STRING,
@@ -319,14 +319,14 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(\\<.+\\>)?\\s*\\(', returnBegin: true,
+        begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
         end: /\s*[{;=]/, excludeEnd: true,
         keywords: KEYWORDS,
         contains: [
           // prevents these from being highlighted `title`
           { beginKeywords: FUNCTION_MODIFIERS.join(" ")},
           {
-            begin: hljs.IDENT_RE + '\\s*(\\<.+\\>)?\\s*\\(', returnBegin: true,
+            begin: hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
             contains: [
               hljs.TITLE_MODE,
               GENERIC_MODIFIER
diff --git a/src/languages/css.js b/src/languages/css.js
index beabf84543..2ef3976c1b 100644
--- a/src/languages/css.js
+++ b/src/languages/css.js
@@ -46,10 +46,10 @@ export default function(hljs) {
   var AT_IDENTIFIER = '@[a-z-]+' // @font-face
   var AT_MODIFIERS = "and or not only"
   var MEDIA_TYPES = "all print screen speech"
-  var AT_PROPERTY_RE = /@\-?\w[\w]*(\-\w+)*/ // @-webkit-keyframes
+  var AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/ // @-webkit-keyframes
   var IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
   var RULE = {
-    begin: /(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/, returnBegin: true, end: ';', endsWithParent: true,
+    begin: /(?:[A-Z_.-]+|--[a-zA-Z0-9_-]+)\s*:/, returnBegin: true, end: ';', endsWithParent: true,
     contains: [
       ATTRIBUTE
     ]
@@ -78,7 +78,7 @@ export default function(hljs) {
       },
       {
         className: 'selector-pseudo',
-        begin: /:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/
+        begin: /:(:)?[a-zA-Z0-9_+()"'.-]+/
       },
       // matching these here allows us to treat them more like regular CSS
       // rules so everything between the {} gets regular rule highlighting,
@@ -121,7 +121,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: '{', end: '}',
+        begin: /\{/, end: /\}/,
         illegal: /\S/,
         contains: [
           hljs.C_BLOCK_COMMENT_MODE,
diff --git a/src/languages/dart.js b/src/languages/dart.js
index 08808da60f..0ceceda46b 100644
--- a/src/languages/dart.js
+++ b/src/languages/dart.js
@@ -18,8 +18,8 @@ export default function(hljs) {
   const BRACED_SUBST = {
     className: 'subst',
     variants: [{
-      begin: '\\${',
-      end: '}'
+      begin: /\$\{/,
+      end: /\}/
     }],
     keywords: 'true false null this is new super',
   };
@@ -155,7 +155,7 @@ export default function(hljs) {
       {
         className: 'class',
         beginKeywords: 'class interface',
-        end: '{',
+        end: /\{/,
         excludeEnd: true,
         contains: [{
             beginKeywords: 'extends implements'
diff --git a/src/languages/diff.js b/src/languages/diff.js
index 4bcbe27540..41de6aacb0 100644
--- a/src/languages/diff.js
+++ b/src/languages/diff.js
@@ -16,9 +16,9 @@ export default function(hljs) {
         className: 'meta',
         relevance: 10,
         variants: [
-          {begin: /^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},
+          {begin: /^@@ +-\d+,\d+ +\+\d+,\d+ +@@$/},
           {begin: /^\*\*\* +\d+,\d+ +\*\*\*\*$/},
-          {begin: /^\-\-\- +\d+,\d+ +\-\-\-\-$/}
+          {begin: /^--- +\d+,\d+ +----$/}
         ]
       },
       {
@@ -26,7 +26,7 @@ export default function(hljs) {
         variants: [
           {begin: /Index: /, end: /$/},
           {begin: /={3,}/, end: /$/},
-          {begin: /^\-{3}/, end: /$/},
+          {begin: /^-{3}/, end: /$/},
           {begin: /^\*{3} /, end: /$/},
           {begin: /^\+{3}/, end: /$/},
           {begin: /^\*{15}$/ }
@@ -34,15 +34,15 @@ export default function(hljs) {
       },
       {
         className: 'addition',
-        begin: '^\\+', end: '$'
+        begin: /^\+/, end: /$/
       },
       {
         className: 'deletion',
-        begin: '^\\-', end: '$'
+        begin: /^-/, end: /$/
       },
       {
         className: 'addition',
-        begin: '^\\!', end: '$'
+        begin: /^!/, end: /$/
       }
     ]
   };
diff --git a/src/languages/django.js b/src/languages/django.js
index bf74f7e7c2..ba9fa57285 100644
--- a/src/languages/django.js
+++ b/src/languages/django.js
@@ -34,11 +34,11 @@ export default function(hljs) {
     case_insensitive: true,
     subLanguage: 'xml',
     contains: [
-      hljs.COMMENT(/\{%\s*comment\s*%}/, /\{%\s*endcomment\s*%}/),
-      hljs.COMMENT(/\{#/, /#}/),
+      hljs.COMMENT(/\{%\s*comment\s*%\}/, /\{%\s*endcomment\s*%\}/),
+      hljs.COMMENT(/\{#/, /#\}/),
       {
         className: 'template-tag',
-        begin: /\{%/, end: /%}/,
+        begin: /\{%/, end: /%\}/,
         contains: [
           {
             className: 'name',
@@ -66,7 +66,7 @@ export default function(hljs) {
       },
       {
         className: 'template-variable',
-        begin: /\{\{/, end: /}}/,
+        begin: /\{\{/, end: /\}\}/,
         contains: [FILTER]
       }
     ]
diff --git a/src/languages/dsconfig.js b/src/languages/dsconfig.js
index 1974d690fb..b9fc0ce6c4 100644
--- a/src/languages/dsconfig.js
+++ b/src/languages/dsconfig.js
@@ -15,12 +15,12 @@ export default function(hljs) {
   };
   var UNQUOTED_PROPERTY = {
     className: 'string',
-    begin: '[\\w-?]+:\\w+', end: '\\W',
+    begin: /[\w\-?]+:\w+/, end: /\W/,
     relevance: 0
   };
   var VALUELESS_PROPERTY = {
     className: 'string',
-    begin: '\\w+-?\\w+', end: '\\W',
+    begin: /\w+-?\w+/, end: /\W/,
     relevance: 0
   };
 
@@ -29,18 +29,19 @@ export default function(hljs) {
     contains: [
       {
         className: 'keyword',
-        begin: '^dsconfig', end: '\\s', excludeEnd: true,
+        begin: '^dsconfig', end: /\s/, excludeEnd: true,
         relevance: 10
       },
       {
         className: 'built_in',
-        begin: '(list|create|get|set|delete)-(\\w+)', end: '\\s', excludeEnd: true,
+        begin: /(list|create|get|set|delete)-(\w+)/,
+        end: /\s/, excludeEnd: true,
         illegal: '!@#$%^&*()',
         relevance: 10
       },
       {
         className: 'built_in',
-        begin: '--(\\w+)', end: '\\s', excludeEnd: true
+        begin: /--(\w+)/, end: /\s/, excludeEnd: true
       },
       QUOTED_PROPERTY,
       APOS_PROPERTY,
diff --git a/src/languages/dts.js b/src/languages/dts.js
index 5e5a241d6e..fa312b3fdc 100644
--- a/src/languages/dts.js
+++ b/src/languages/dts.js
@@ -59,7 +59,7 @@ export default function(hljs) {
 
   var DTS_REFERENCE = {
     className: 'variable',
-    begin: '\\&[a-z\\d_]*\\b'
+    begin: /&[a-z\d_]*\b/
   };
 
   var DTS_KEYWORD = {
@@ -84,7 +84,7 @@ export default function(hljs) {
 
   var DTS_NODE = {
     className: 'class',
-    begin: /[a-zA-Z_][a-zA-Z\d_@]*\s{/,
+    begin: /[a-zA-Z_][a-zA-Z\d_@]*\s\{/,
     end: /[{;=]/,
     returnBegin: true,
     excludeEnd: true
@@ -92,8 +92,8 @@ export default function(hljs) {
 
   var DTS_ROOT_NODE = {
     className: 'class',
-    begin: '/\\s*{',
-    end: '};',
+    begin: '/\\s*\\{',
+    end: /\};/,
     relevance: 10,
     contains: [
       DTS_REFERENCE,
diff --git a/src/languages/ebnf.js b/src/languages/ebnf.js
index bb76cb349c..45d8186fdd 100644
--- a/src/languages/ebnf.js
+++ b/src/languages/ebnf.js
@@ -9,7 +9,7 @@ export default function(hljs) {
 
     var nonTerminalMode = {
         className: "attribute",
-        begin: /^[ ]*[a-zA-Z][a-zA-Z-_]*([\s-_]+[a-zA-Z][a-zA-Z]*)*/
+        begin: /^[ ]*[a-zA-Z][a-zA-Z_-]*([\s_-]+[a-zA-Z][a-zA-Z]*)*/
     };
 
     var specialSequenceMode = {
diff --git a/src/languages/elixir.js b/src/languages/elixir.js
index 70bbe16758..cac524f04a 100644
--- a/src/languages/elixir.js
+++ b/src/languages/elixir.js
@@ -7,8 +7,8 @@ Website: https://elixir-lang.org
 */
 
 export default function(hljs) {
-  var ELIXIR_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?';
-  var ELIXIR_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
+  var ELIXIR_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_.]*(!|\\?)?';
+  var ELIXIR_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
   var ELIXIR_KEYWORDS = {
     $pattern: ELIXIR_IDENT_RE,
     keyword: 'and false then defined module in return redo retry end for true self when ' +
@@ -17,7 +17,7 @@ export default function(hljs) {
   };
   var SUBST = {
     className: 'subst',
-    begin: '#\\{', end: '}',
+    begin: /#\{/, end: /\}/,
     keywords: ELIXIR_KEYWORDS
   };
   var NUMBER = {
@@ -25,7 +25,7 @@ export default function(hljs) {
     begin: '(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)',
     relevance: 0
   };
-  var SIGIL_DELIMITERS = '[/|([{<"\']'
+  var SIGIL_DELIMITERS = '[/|([{<"\']';
   var LOWERCASE_SIGIL = {
     className: 'string',
     begin: '~[a-z]' + '(?=' + SIGIL_DELIMITERS + ')',
@@ -60,7 +60,7 @@ export default function(hljs) {
       { begin: /\(/, end: /\)/ },
       { begin: /\[/, end: /\]/ },
       { begin: /\{/, end: /\}/ },
-      { begin: /\</, end: /\>/ }
+      { begin: /</, end: />/ }
     ]
   };
 
@@ -136,7 +136,7 @@ export default function(hljs) {
     NUMBER,
     {
       className: 'variable',
-      begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))'
+      begin: '(\\$\\W)|((\\$|@@?)(\\w+))'
     },
     {
       begin: '->'
diff --git a/src/languages/elm.js b/src/languages/elm.js
index 85310a6672..60e626a03e 100644
--- a/src/languages/elm.js
+++ b/src/languages/elm.js
@@ -10,8 +10,8 @@ export default function(hljs) {
     variants: [
       hljs.COMMENT('--', '$'),
       hljs.COMMENT(
-        '{-',
-        '-}',
+        /\{-/,
+        /-\}/,
         {
           contains: ['self']
         }
@@ -35,7 +35,7 @@ export default function(hljs) {
   };
 
   var RECORD = {
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     contains: LIST.contains
   };
 
diff --git a/src/languages/erlang.js b/src/languages/erlang.js
index e37b94ea53..d507dbef84 100644
--- a/src/languages/erlang.js
+++ b/src/languages/erlang.js
@@ -43,7 +43,7 @@ export default function(hljs) {
     ]
   };
   var TUPLE = {
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     relevance: 0
     // "contains" defined later
   };
@@ -65,7 +65,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: '{', end: '}',
+        begin: /\{/, end: /\}/,
         relevance: 0
         // "contains" defined later
       }
diff --git a/src/languages/fortran.js b/src/languages/fortran.js
index 32f9d3139a..86a27b9f01 100644
--- a/src/languages/fortran.js
+++ b/src/languages/fortran.js
@@ -23,7 +23,7 @@ export default function(hljs) {
   const NUMBER = {
     className: 'number',
     // regex in both fortran and irpf90 should match
-    begin: '(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
+    begin: '(?=\\b|\\+|-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
     relevance: 0
   };
 
diff --git a/src/languages/gams.js b/src/languages/gams.js
index e94e045c70..0aeb0c23ad 100644
--- a/src/languages/gams.js
+++ b/src/languages/gams.js
@@ -42,7 +42,7 @@ export default function (hljs) {
   var SYMBOLS = {
     className: 'symbol',
     variants: [
-      {begin: /\=[lgenxc]=/},
+      {begin: /=[lgenxc]=/},
       {begin: /\$/},
     ]
   };
@@ -78,7 +78,7 @@ export default function (hljs) {
       ASSIGNMENT,
       {
         className: 'comment',
-        begin: /([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,
+        begin: /([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+/,
         relevance: 0
       },
     ],
diff --git a/src/languages/gcode.js b/src/languages/gcode.js
index 93b86adde4..2e6c70a85f 100644
--- a/src/languages/gcode.js
+++ b/src/languages/gcode.js
@@ -7,7 +7,7 @@
 
 export default function(hljs) {
     var GCODE_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
-    var GCODE_CLOSE_RE = '\\%';
+    var GCODE_CLOSE_RE = '%';
     var GCODE_KEYWORDS = {
       $pattern: GCODE_IDENT_RE,
       keyword: 'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT ' +
diff --git a/src/languages/groovy.js b/src/languages/groovy.js
index 014019e72e..898f258e28 100644
--- a/src/languages/groovy.js
+++ b/src/languages/groovy.js
@@ -85,7 +85,7 @@ export default function(hljs) {
             NUMBER,
             {
                 className: 'class',
-                beginKeywords: 'class interface trait enum', end: '{',
+                beginKeywords: 'class interface trait enum', end: /\{/,
                 illegal: ':',
                 contains: [
                     {beginKeywords: 'extends implements'},
diff --git a/src/languages/haml.js b/src/languages/haml.js
index 62e3eaabc4..e65353aeff 100644
--- a/src/languages/haml.js
+++ b/src/languages/haml.js
@@ -49,8 +49,8 @@ export default function(hljs) {
             begin: '\\.[\\w-]+'
           },
           {
-            begin: '{\\s*',
-            end: '\\s*}',
+            begin: /\{\s*/,
+            end: /\s*\}/,
             contains: [
               {
                 begin: ':\\w+\\s*=>',
@@ -104,9 +104,9 @@ export default function(hljs) {
         begin: '^\\s*[=~]\\s*'
       },
       {
-        begin: '#{',
+        begin: /#\{/,
         starts: {
-          end: '}',
+          end: /\}/,
           subLanguage: 'ruby'
         }
       }
diff --git a/src/languages/handlebars.js b/src/languages/handlebars.js
index 08bb06e03e..a1ed102941 100644
--- a/src/languages/handlebars.js
+++ b/src/languages/handlebars.js
@@ -161,7 +161,7 @@ export default function(hljs) {
     keywords: BUILT_INS,
     className: 'name',
     starts: hljs.inherit(HELPER_PARAMETERS, {
-      end: /}}/,
+      end: /\}\}/,
     })
   });
 
@@ -174,7 +174,7 @@ export default function(hljs) {
     className: 'name',
     keywords: BUILT_INS,
     starts: hljs.inherit(HELPER_PARAMETERS, {
-      end: /}}/,
+      end: /\}\}/,
     })
   });
 
diff --git a/src/languages/haskell.js b/src/languages/haskell.js
index a59f3a996f..5c9417adc9 100644
--- a/src/languages/haskell.js
+++ b/src/languages/haskell.js
@@ -11,8 +11,8 @@ export default function(hljs) {
     variants: [
       hljs.COMMENT('--', '$'),
       hljs.COMMENT(
-        '{-',
-        '-}',
+        /\{-/,
+        /-\}/,
         {
           contains: ['self']
         }
@@ -22,7 +22,7 @@ export default function(hljs) {
 
   var PRAGMA = {
     className: 'meta',
-    begin: '{-#', end: '#-}'
+    begin: /\{-#/, end: /#-\}/
   };
 
   var PREPROCESSOR = {
@@ -49,7 +49,7 @@ export default function(hljs) {
   };
 
   var RECORD = {
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     contains: LIST.contains
   };
 
diff --git a/src/languages/haxe.js b/src/languages/haxe.js
index 355e051e64..7c04449a02 100644
--- a/src/languages/haxe.js
+++ b/src/languages/haxe.js
@@ -34,7 +34,7 @@ export default function(hljs) {
             begin: '\\$\\{', end: '\\}'
           },
           { className: 'subst', // interpolation
-            begin: '\\$', end: '\\W}'
+            begin: '\\$', end: /\W\}/
           }
         ]
       },
diff --git a/src/languages/hsp.js b/src/languages/hsp.js
index 72d6b01e43..3487a2d91a 100644
--- a/src/languages/hsp.js
+++ b/src/languages/hsp.js
@@ -22,7 +22,7 @@ export default function(hljs) {
       {
         // multi-line string
         className: 'string',
-        begin: '{"', end: '"}',
+        begin: /\{"/, end: /"\}/,
         contains: [hljs.BACKSLASH_ESCAPE]
       },
 
diff --git a/src/languages/ini.js b/src/languages/ini.js
index 627c4f0702..32b9547053 100644
--- a/src/languages/ini.js
+++ b/src/languages/ini.js
@@ -13,7 +13,7 @@ export default function(hljs) {
     className: 'number',
     relevance: 0,
     variants: [
-      { begin: /([\+\-]+)?[\d]+_[\d_]+/ },
+      { begin: /([+-]+)?[\d]+_[\d_]+/ },
       { begin: hljs.NUMBER_RE }
     ]
   };
@@ -26,7 +26,7 @@ export default function(hljs) {
     className: 'variable',
     variants: [
       { begin: /\$[\w\d"][\w\d_]*/ },
-      { begin: /\$\{(.*?)}/ }
+      { begin: /\$\{(.*?)\}/ }
     ]
   };
   var LITERALS = {
diff --git a/src/languages/irpf90.js b/src/languages/irpf90.js
index 80d4a80fa1..877f246066 100644
--- a/src/languages/irpf90.js
+++ b/src/languages/irpf90.js
@@ -77,7 +77,7 @@ export default function(hljs) {
       {
         className: 'number',
         // regex in both fortran and irpf90 should match
-        begin: '(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
+        begin: '(?=\\b|\\+|-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
         relevance: 0
       }
     ]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index e2c1243aff..bb077d6138 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -188,8 +188,8 @@ export default function(hljs) {
     .concat({
       // we need to pair up {} inside our subst to prevent
       // it from ending too early by matching another }
-      begin: /{/,
-      end: /}/,
+      begin: /\{/,
+      end: /\}/,
       keywords: KEYWORDS,
       contains: [
         "self"
@@ -376,7 +376,7 @@ export default function(hljs) {
               '[^()]*' +
             '\\))*[^()]*' +
           '\\))*[^()]*' +
-          '\\)\\s*{', // end parens
+          '\\)\\s*\\{', // end parens
         returnBegin:true,
         contains: [
           PARAMS,
@@ -398,7 +398,7 @@ export default function(hljs) {
         beginKeywords: 'class',
         end: /[{;=]/,
         excludeEnd: true,
-        illegal: /[:"\[\]]/,
+        illegal: /[:"[\]]/,
         contains: [
           { beginKeywords: 'extends' },
           hljs.UNDERSCORE_TITLE_MODE
@@ -406,7 +406,7 @@ export default function(hljs) {
       },
       {
         begin: /\b(?=constructor)/,
-        end: /[\{;]/,
+        end: /[{;]/,
         excludeEnd: true,
         contains: [
           hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
@@ -416,7 +416,7 @@ export default function(hljs) {
       },
       {
         begin: '(get|set)\\s+(?=' + IDENT_RE + '\\()',
-        end: /{/,
+        end: /\{/,
         keywords: "get set",
         contains: [
           hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE }),
diff --git a/src/languages/json.js b/src/languages/json.js
index 34bded9298..f8779a4221 100644
--- a/src/languages/json.js
+++ b/src/languages/json.js
@@ -22,7 +22,7 @@ export default function(hljs) {
     keywords: LITERALS
   };
   var OBJECT = {
-    begin: '{', end: '}',
+    begin: /\{/, end: /\}/,
     contains: [
       {
         className: 'attr',
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index fe19c386d8..e2610a9412 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -39,7 +39,7 @@ export default function(hljs) {
   // for string templates
   var SUBST = {
     className: 'subst',
-    begin: '\\${', end: '}', contains: [hljs.C_NUMBER_MODE]
+    begin: /\$\{/, end: /\}/, contains: [hljs.C_NUMBER_MODE]
   };
   var VARIABLE = {
     className: 'variable', begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
diff --git a/src/languages/leaf.js b/src/languages/leaf.js
index 937e3122d2..05f7644898 100644
--- a/src/languages/leaf.js
+++ b/src/languages/leaf.js
@@ -11,7 +11,7 @@ export default function (hljs) {
       {
         className: 'function',
         begin: '#+' + '[A-Za-z_0-9]*' + '\\(',
-        end:' {',
+        end:/ \{/,
         returnBegin: true,
         excludeEnd: true,
         contains : [
diff --git a/src/languages/less.js b/src/languages/less.js
index 00c2617aab..bc92d47bec 100644
--- a/src/languages/less.js
+++ b/src/languages/less.js
@@ -8,7 +8,7 @@ Category: common, css
 
 export default function(hljs) {
   var IDENT_RE        = '[\\w-]+'; // yes, Less identifiers may begin with a digit
-  var INTERP_IDENT_RE = '(' + IDENT_RE + '|@{' + IDENT_RE + '})';
+  var INTERP_IDENT_RE = '(' + IDENT_RE + '|@\\{' + IDENT_RE + '\\})';
 
   /* Generic Modes */
 
@@ -42,7 +42,7 @@ export default function(hljs) {
     IDENT_MODE('number', '#[0-9A-Fa-f]+\\b'),
     PARENS_MODE,
     IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
-    IDENT_MODE('variable', '@{'  + IDENT_RE + '}'),
+    IDENT_MODE('variable', '@\\{'  + IDENT_RE + '\\}'),
     IDENT_MODE('built_in', '~?`[^`]*?`'), // inline javascript (or whatever host language) *multiline* string
     { // @media features (it’s here to not duplicate things in AT_RULE_MODE with extra PARENS_MODE overriding):
       className: 'attribute', begin: IDENT_RE + '\\s*:', end: ':', returnBegin: true, excludeEnd: true
@@ -54,7 +54,7 @@ export default function(hljs) {
   );
 
   var VALUE_WITH_RULESETS = VALUE.concat({
-    begin: '{', end: '}', contains: RULES
+    begin: /\{/, end: /\}/, contains: RULES
   });
 
   var MIXIN_GUARD_MODE = {
@@ -107,7 +107,7 @@ export default function(hljs) {
     variants: [{
       begin: '[\\.#:&\\[>]', end: '[;{}]'  // mixin calls end with ';'
       }, {
-      begin: INTERP_IDENT_RE, end: '{'
+      begin: INTERP_IDENT_RE, end: /\{/
     }],
     returnBegin: true,
     returnEnd:   true,
@@ -118,13 +118,13 @@ export default function(hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       MIXIN_GUARD_MODE,
       IDENT_MODE('keyword',  'all\\b'),
-      IDENT_MODE('variable', '@{'  + IDENT_RE + '}'),     // otherwise it’s identified as tag
+      IDENT_MODE('variable', '@\\{'  + IDENT_RE + '\\}'),     // otherwise it’s identified as tag
       IDENT_MODE('selector-tag',  INTERP_IDENT_RE + '%?', 0), // '%' for more consistent coloring of @keyframes "tags"
       IDENT_MODE('selector-id', '#' + INTERP_IDENT_RE),
       IDENT_MODE('selector-class', '\\.' + INTERP_IDENT_RE, 0),
       IDENT_MODE('selector-tag',  '&', 0),
       {className: 'selector-attr', begin: '\\[', end: '\\]'},
-      {className: 'selector-pseudo', begin: /:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},
+      {className: 'selector-pseudo', begin: /:(:)?[a-zA-Z0-9_\-+()"'.]+/},
       {begin: '\\(', end: '\\)', contains: VALUE_WITH_RULESETS}, // argument list of parametric mixins
       {begin: '!important'} // eat !important after mixin call or it will be colored as tag
     ]
diff --git a/src/languages/lisp.js b/src/languages/lisp.js
index 5b505cd1a5..365e8dda9e 100644
--- a/src/languages/lisp.js
+++ b/src/languages/lisp.js
@@ -6,9 +6,9 @@ Category: lisp
 */
 
 export default function(hljs) {
-  var LISP_IDENT_RE = '[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*';
+  var LISP_IDENT_RE = '[a-zA-Z_\\-+\\*\\/<=>&#][a-zA-Z0-9_\\-+*\\/<=>&#!]*';
   var MEC_RE = '\\|[^]*?\\|';
-  var LISP_SIMPLE_NUMBER_RE = '(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?';
+  var LISP_SIMPLE_NUMBER_RE = '(-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|-)?\\d+)?';
   var LITERAL = {
     className: 'literal',
     begin: '\\b(t{1}|nil)\\b'
diff --git a/src/languages/livecodeserver.js b/src/languages/livecodeserver.js
index ff5641c4d1..be53aff79b 100644
--- a/src/languages/livecodeserver.js
+++ b/src/languages/livecodeserver.js
@@ -165,6 +165,6 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       TITLE1
     ].concat(COMMENT_MODES),
-    illegal: ';$|^\\[|^=|&|{'
+    illegal: ';$|^\\[|^=|&|\\{'
   };
 }
diff --git a/src/languages/livescript.js b/src/languages/livescript.js
index a200bcde8b..c8e9f81301 100644
--- a/src/languages/livescript.js
+++ b/src/languages/livescript.js
@@ -60,16 +60,16 @@ export default function(hljs) {
     literal: ECMAScript.LITERALS.concat(LIVESCRIPT_LITERALS).join(" "),
     built_in: ECMAScript.BUILT_INS.concat(LIVESCRIPT_BUILT_INS).join(" ")
   };
-  var JS_IDENT_RE = '[A-Za-z$_](?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
+  var JS_IDENT_RE = '[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
   var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: JS_IDENT_RE});
   var SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /}/,
+    begin: /#\{/, end: /\}/,
     keywords: KEYWORDS
   };
   var SUBST_SIMPLE = {
     className: 'subst',
-    begin: /#[A-Za-z$_]/, end: /(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
+    begin: /#[A-Za-z$_]/, end: /(?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
     keywords: KEYWORDS
   };
   var EXPRESSIONS = [
@@ -145,7 +145,7 @@ export default function(hljs) {
   };
 
   var SYMBOLS = {
-    begin: '(#=>|=>|\\|>>|-?->|\\!->)'
+    begin: '(#=>|=>|\\|>>|-?->|!->)'
   };
 
   return {
@@ -163,7 +163,7 @@ export default function(hljs) {
         returnBegin: true,
         variants: [
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?', end: '\\->\\*?'
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B->\\*?', end: '->\\*?'
           },
           {
             begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?', end: '[-~]{1,2}>\\*?'
diff --git a/src/languages/lsl.js b/src/languages/lsl.js
index ebab6c1221..08f57d782c 100644
--- a/src/languages/lsl.js
+++ b/src/languages/lsl.js
@@ -31,29 +31,29 @@ export default function(hljs) {
         className: 'literal',
         variants: [
             {
-                begin: '\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b'
+                begin: '\\b(PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b'
             },
             {
-                begin: '\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(?:ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(?:_TAG)?|CREATOR|ATTACHED_(?:POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALLOW_UNSIT|ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(?:INVALID_(?:AGENT|LINK_OBJECT)|NO(?:T_EXPERIENCE|_(?:ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b'
+                begin: '\\b(XP_ERROR_(EXPERIENCES_DISABLED|EXPERIENCE_(DISABLED|SUSPENDED)|INVALID_(EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(FOUND|PERMITTED(_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(_OBJECT)?|(DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(_(BY_(LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(PARCEL(_OWNER)?|REGION)))?|CAMERA_(PITCH|DISTANCE|BEHINDNESS_(ANGLE|LAG)|(FOCUS|POSITION)(_(THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(ROOT|SET|ALL_(OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(IVE|_(ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(FWD|BACK|(ROT_)?(LEFT|RIGHT)|UP|DOWN|(ML_)?LBUTTON)|PERMISSION_(RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(_START)?|TELEPORT|MEDIA)|OBJECT_(CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(COUNT|EQUIVALENCE)|RETURN_(PARCEL(_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(_TAG)?|CREATOR|ATTACHED_(POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(BODY_SHAPE|PATHFINDING)_TYPE|(RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(MEMORY|TIME))|TYPE_(INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(DEBUG|PUBLIC)_CHANNEL|ATTACH_(AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](SHOULDER|HAND|FOOT|EAR|EYE|[UL](ARM|LEG)|HIP)|(LEFT|RIGHT)_PEC|HUD_(CENTER_[12]|TOP_(RIGHT|CENTER|LEFT)|BOTTOM(_(RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(BASE|TIP)|[LR]WING|FACE_(JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(ONLINE|NAME|BORN|SIM_(POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(ON_FILE|USED)|REMOTE_DATA_(CHANNEL|REQUEST|REPLY)|PSYS_(PART_(BF_(ZERO|ONE(_MINUS_(DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(START|END)_(COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(RIBBON|WIND|INTERP_(COLOR|SCALE)|BOUNCE|FOLLOW_(SRC|VELOCITY)|TARGET_(POS|LINEAR)|EMISSIVE)_MASK)|SRC_(MAX_AGE|PATTERN|ANGLE_(BEGIN|END)|BURST_(RATE|PART_COUNT|RADIUS|SPEED_(MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(DROP|EXPLODE|ANGLE(_CONE(_EMPTY)?)?)))|VEHICLE_(REFERENCE_FRAME|TYPE_(NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(LINEAR|ANGULAR)_(FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(LINEAR|ANGULAR)_(DEFLECTION_(EFFICIENCY|TIMESCALE)|MOTOR_(DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(EFFICIENCY|TIMESCALE)|BANKING_(EFFICIENCY|MIX|TIMESCALE)|FLAG_(NO_DEFLECTION_UP|LIMIT_(ROLL_ONLY|MOTOR_UP)|HOVER_((WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(ALLOW_UNSIT|ALPHA_MODE(_(BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(_(BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(_(STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(NONE|LOW|MEDIUM|HIGH)|BUMP_(NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(TYPE_(SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(MIRROR|INVERT))|PHYSICS(_(SHAPE_(CONVEX|NONE|PRIM|TYPE)))?|(POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(ALT_IMAGE_ENABLE|CONTROLS|(CURRENT|HOME)_URL|AUTO_(LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(WIDTH|HEIGHT)_PIXELS|WHITELIST(_ENABLE)?|PERMS_(INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(STANDARD|MINI)|PERM_(NONE|OWNER|GROUP|ANYONE)|MAX_(URL_LENGTH|WHITELIST_(SIZE|COUNT)|(WIDTH|HEIGHT)_PIXELS)))|MASK_(BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(MEDIA_COMMAND_(STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(ALLOW_(FLY|(GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(GROUP_)?OBJECTS)|USE_(ACCESS_(GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(GROUP|ALL)_OBJECT_ENTRY)|COUNT_(TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(HIDE|DEFAULT)|REGION_FLAG_(ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(METHOD|MIMETYPE|BODY_(MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(INVALID_(AGENT|LINK_OBJECT)|NO(T_EXPERIENCE|_(ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(TRIM(_(HEAD|TAIL))?)|CLICK_ACTION_(NONE|TOUCH|SIT|BUY|PAY|OPEN(_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(NONE|SCRIPT_MEMORY)|RC_(DATA_FLAGS|DETECT_PHANTOM|GET_(LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(TYPES|AGENTS|(NON)?PHYSICAL|LAND))|RCERR_(CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(ALLOWED_(AGENT|GROUP)_(ADD|REMOVE)|BANNED_AGENT_(ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(COMMAND|CMD_(PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(CMD_((SMOOTH_)?STOP|JUMP)|DESIRED_(TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(_([ABCD]|NONE))?|MAX_(DECEL|TURN_RADIUS|(ACCEL|SPEED)))|PURSUIT_(OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(EVADE_(HIDDEN|SPOTTED)|FAILURE_(DYNAMIC_PATHFINDING_DISABLED|INVALID_(GOAL|START)|NO_(NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(PARCEL_)?UNREACHABLE)|(GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(_(FAST|NONE|SLOW))?|CONTENT_TYPE_(ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(RADIUS|STATIC)|(PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b'
             },
             {
-                begin: '\\b(?:FALSE|TRUE)\\b'
+                begin: '\\b(FALSE|TRUE)\\b'
             },
             {
-                begin: '\\b(?:ZERO_ROTATION)\\b'
+                begin: '\\b(ZERO_ROTATION)\\b'
             },
             {
-                begin: '\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b'
+                begin: '\\b(EOF|JSON_(ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(GRANTED|DENIED))\\b'
             },
             {
-                begin: '\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b'
+                begin: '\\b(ZERO_VECTOR|TOUCH_INVALID_(TEXCOORD|VECTOR))\\b'
             }
         ]
     };
 
     var LSL_FUNCTIONS = {
         className: 'built_in',
-        begin: '\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|SitOnLink|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b'
+        begin: '\\b(ll(AgentInExperience|(Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(Details|ErrorMessage)|ReturnObjectsBy(ID|Owner)|Json(2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(Mag|Norm|Dist)|Rot(Between|2(Euler|Fwd|Left|Up))|(Euler|Axes)2Rot|Whisper|(Region|Owner)?Say|Shout|Listen(Control|Remove)?|Sensor(Repeat|Remove)?|Detected(Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|([GS]et)(AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(Scale|Offset|Rotate)Texture|(Rot)?Target(Remove)?|(Stop)?MoveToTarget|Apply(Rotational)?Impulse|Set(KeyframedMotion|ContentType|RegionPos|(Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(Queueing|Radius)|Vehicle(Type|(Float|Vector|Rotation)Param)|(Touch|Sit)?Text|Camera(Eye|At)Offset|PrimitiveParams|ClickAction|Link(Alpha|Color|PrimitiveParams(Fast)?|Texture(Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get((Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(PrimitiveParams|Number(OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(Details|PermMask|PrimCount)|Parcel(MaxPrims|Details|Prim(Count|Owners))|Attached(List)?|(SPMax|Free|Used)Memory|Region(Name|TimeDilation|FPS|Corner|AgentCount)|Root(Position|Rotation)|UnixTime|(Parcel|Region)Flags|(Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(Prims|NotecardLines|Sides)|Animation(List)?|(Camera|Local)(Pos|Rot)|Vel|Accel|Omega|Time(stamp|OfDay)|(Object|CenterOf)?Mass|MassMKS|Energy|Owner|(Owner)?Key|SunDirection|Texture(Offset|Scale|Rot)|Inventory(Number|Name|Key|Type|Creator|PermMask)|Permissions(Key)?|StartParameter|List(Length|EntryType)|Date|Agent(Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(Name|State))|(Get|Reset|GetAndReset)Time|PlaySound(Slave)?|LoopSound(Master|Slave)?|(Trigger|Stop|Preload)Sound|((Get|Delete)Sub|Insert)String|To(Upper|Lower)|Give(InventoryList|Money)|RezObject|(Stop)?LookAt|Sleep|CollisionFilter|(Take|Release)Controls|DetachFromAvatar|AttachToAvatar(Temp)?|InstantMessage|(GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(Length|Trim)|(Start|Stop)Animation|TargetOmega|Request(Experience)?Permissions|(Create|Break)Link|BreakAllLinks|(Give|Remove)Inventory|Water|PassTouches|Request(Agent|Inventory)Data|TeleportAgent(Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(Axis|Angle)|A(cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(CSV|Integer|Json|Float|String|Key|Vector|Rot|List(Strided)?)|DeleteSubList|List(Statistics|Sort|Randomize|(Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(Slope|Normal|Contour)|GroundRepel|(Set|Remove)VehicleFlags|SitOnLink|(AvatarOn)?(Link)?SitTarget|Script(Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(Integer|String)ToBase64|XorBase64|Log(10)?|Base64To(String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(Load|Release|(E|Une)scape)URL|ParcelMedia(CommandList|Query)|ModPow|MapDestination|(RemoveFrom|AddTo|Reset)Land(Pass|Ban)List|(Set|Clear)CameraParams|HTTP(Request|Response)|TextBox|DetectedTouch(UV|Face|Pos|(N|Bin)ormal|ST)|(MD5|SHA1|DumpList2)String|Request(Secure)?URL|Clear(Prim|Link)Media|(Link)?ParticleSystem|(Get|Request)(Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b'
     };
 
     return {
@@ -74,10 +74,10 @@ export default function(hljs) {
                 className: 'section',
                 variants: [
                     {
-                        begin: '\\b(?:state|default)\\b'
+                        begin: '\\b(state|default)\\b'
                     },
                     {
-                        begin: '\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b'
+                        begin: '\\b(state_(entry|exit)|touch(_(start|end))?|(land_)?collision(_(start|end))?|timer|listen|(no_)?sensor|control|(not_)?at_(rot_)?target|money|email|experience_permissions(_denied)?|run_time_permissions|changed|attach|dataserver|moving_(start|end)|link_message|(on|object)_rez|remote_data|http_re(sponse|quest)|path_update|transaction_result)\\b'
                     }
                 ]
             },
@@ -85,7 +85,7 @@ export default function(hljs) {
             LSL_CONSTANTS,
             {
                 className: 'type',
-                begin: '\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b'
+                begin: '\\b(integer|float|string|key|vector|quaternion|rotation|list)\\b'
             }
         ]
     };
diff --git a/src/languages/matlab.js b/src/languages/matlab.js
index 0a75e8a5b0..b89a5de22e 100644
--- a/src/languages/matlab.js
+++ b/src/languages/matlab.js
@@ -84,7 +84,7 @@ export default function(hljs) {
           {begin: '\'\''}]
       },
       {
-        begin: /\]|}|\)/,
+        begin: /\]|\}|\)/,
         relevance: 0,
         starts: TRANSPOSE
       },
@@ -97,8 +97,8 @@ export default function(hljs) {
         ],
         starts: TRANSPOSE
       },
-      hljs.COMMENT('^\\s*\\%\\{\\s*$', '^\\s*\\%\\}\\s*$'),
-      hljs.COMMENT('\\%', '$')
+      hljs.COMMENT('^\\s*%\\{\\s*$', '^\\s*%\\}\\s*$'),
+      hljs.COMMENT('%', '$')
     ]
   };
 }
diff --git a/src/languages/mel.js b/src/languages/mel.js
index 326557a25f..42a71377cd 100644
--- a/src/languages/mel.js
+++ b/src/languages/mel.js
@@ -224,7 +224,7 @@ export default function(hljs) {
         contains: [hljs.BACKSLASH_ESCAPE]
       },
       { // eats variables
-        begin: '[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)'
+        begin: /[$%@](\^\w\b|#\w+|[^\s\w{]|\{\w+\}|\w+)/
       },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE
diff --git a/src/languages/mipsasm.js b/src/languages/mipsasm.js
index f7444428bf..6c76ed6da7 100644
--- a/src/languages/mipsasm.js
+++ b/src/languages/mipsasm.js
@@ -36,18 +36,18 @@ export default function(hljs) {
         begin: '\\b('+     //mnemonics
             // 32-bit integer instructions
             'addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|' +
-            'bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(\.hb)?|jr(\.hb)?|lbu?|lhu?|' +
+            'bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(\\.hb)?|jr(\\.hb)?|lbu?|lhu?|' +
             'll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|' +
             'multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|' +
             'srlv?|subu?|sw[lr]?|xori?|wsbh|' +
             // floating-point instructions
-            'abs\.[sd]|add\.[sd]|alnv.ps|bc1[ft]l?|' +
-            'c\.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et])\.[sd]|' +
-            '(ceil|floor|round|trunc)\.[lw]\.[sd]|cfc1|cvt\.d\.[lsw]|' +
-            'cvt\.l\.[dsw]|cvt\.ps\.s|cvt\.s\.[dlw]|cvt\.s\.p[lu]|cvt\.w\.[dls]|' +
-            'div\.[ds]|ldx?c1|luxc1|lwx?c1|madd\.[sd]|mfc1|mov[fntz]?\.[ds]|' +
-            'msub\.[sd]|mth?c1|mul\.[ds]|neg\.[ds]|nmadd\.[ds]|nmsub\.[ds]|' +
-            'p[lu][lu]\.ps|recip\.fmt|r?sqrt\.[ds]|sdx?c1|sub\.[ds]|suxc1|' +
+            'abs\\.[sd]|add\\.[sd]|alnv.ps|bc1[ft]l?|' +
+            'c\\.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et])\\.[sd]|' +
+            '(ceil|floor|round|trunc)\\.[lw]\\.[sd]|cfc1|cvt\\.d\\.[lsw]|' +
+            'cvt\\.l\\.[dsw]|cvt\\.ps\\.s|cvt\\.s\\.[dlw]|cvt\\.s\\.p[lu]|cvt\\.w\\.[dls]|' +
+            'div\\.[ds]|ldx?c1|luxc1|lwx?c1|madd\\.[sd]|mfc1|mov[fntz]?\\.[ds]|' +
+            'msub\\.[sd]|mth?c1|mul\\.[ds]|neg\\.[ds]|nmadd\\.[ds]|nmsub\\.[ds]|' +
+            'p[lu][lu]\\.ps|recip\\.fmt|r?sqrt\\.[ds]|sdx?c1|sub\\.[ds]|suxc1|' +
             'swx?c1|' +
             // system control instructions
             'break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|' +
@@ -57,7 +57,7 @@ export default function(hljs) {
         end: '\\s'
       },
       // lines ending with ; or # aren't really comments, probably auto-detect fail
-      hljs.COMMENT('[;#](?!\s*$)', '$'),
+      hljs.COMMENT('[;#](?!\\s*$)', '$'),
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.QUOTE_STRING_MODE,
       {
@@ -90,6 +90,7 @@ export default function(hljs) {
         relevance: 0
       }
     ],
-    illegal: '\/'
+    // forward slashes are not allowed
+    illegal: /\//
   };
 }
diff --git a/src/languages/moonscript.js b/src/languages/moonscript.js
index 92007499a1..b66d0105f7 100644
--- a/src/languages/moonscript.js
+++ b/src/languages/moonscript.js
@@ -24,7 +24,7 @@ export default function(hljs) {
   var JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
   var SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /}/,
+    begin: /#\{/, end: /\}/,
     keywords: KEYWORDS
   };
   var EXPRESSIONS = [
diff --git a/src/languages/nginx.js b/src/languages/nginx.js
index d0eb3b5dec..f32a2173fa 100644
--- a/src/languages/nginx.js
+++ b/src/languages/nginx.js
@@ -11,8 +11,8 @@ export default function(hljs) {
     className: 'variable',
     variants: [
       {begin: /\$\d+/},
-      {begin: /\$\{/, end: /}/},
-      {begin: '[\\$\\@]' + hljs.UNDERSCORE_IDENT_RE}
+      {begin: /\$\{/, end: /\}/},
+      {begin: /[$@]/ + hljs.UNDERSCORE_IDENT_RE}
     ]
   };
   var DEFAULT = {
@@ -44,9 +44,9 @@ export default function(hljs) {
         className: 'regexp',
         contains: [hljs.BACKSLASH_ESCAPE, VAR],
         variants: [
-          {begin: "\\s\\^", end: "\\s|{|;", returnEnd: true},
+          {begin: "\\s\\^", end: "\\s|\\{|;", returnEnd: true},
           // regexp locations (~, ~*)
-          {begin: "~\\*?\\s+", end: "\\s|{|;", returnEnd: true},
+          {begin: "~\\*?\\s+", end: "\\s|\\{|;", returnEnd: true},
           // *.example.com
           {begin: "\\*(\\.[a-z\\-]+)+"},
           // sub.example.*
@@ -74,8 +74,8 @@ export default function(hljs) {
     contains: [
       hljs.HASH_COMMENT_MODE,
       {
-        begin: hljs.UNDERSCORE_IDENT_RE + '\\s+{', returnBegin: true,
-        end: '{',
+        begin: hljs.UNDERSCORE_IDENT_RE + '\\s+\\{', returnBegin: true,
+        end: /\{/,
         contains: [
           {
             className: 'section',
@@ -85,7 +85,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: hljs.UNDERSCORE_IDENT_RE + '\\s', end: ';|{', returnBegin: true,
+        begin: hljs.UNDERSCORE_IDENT_RE + '\\s', end: ';|\\{', returnBegin: true,
         contains: [
           {
             className: 'attribute',
diff --git a/src/languages/nim.js b/src/languages/nim.js
index 1caaa67a16..6c7e56bc87 100644
--- a/src/languages/nim.js
+++ b/src/languages/nim.js
@@ -28,8 +28,8 @@ export default function(hljs) {
     },
     contains: [ {
         className: 'meta', // Actually pragma
-        begin: /{\./,
-        end: /\.}/,
+        begin: /\{\./,
+        end: /\.\}/,
         relevance: 10
       }, {
         className: 'string',
diff --git a/src/languages/nix.js b/src/languages/nix.js
index 92ff218cf5..e36f760e1e 100644
--- a/src/languages/nix.js
+++ b/src/languages/nix.js
@@ -19,7 +19,7 @@ export default function(hljs) {
   var ANTIQUOTE = {
     className: 'subst',
     begin: /\$\{/,
-    end: /}/,
+    end: /\}/,
     keywords: NIX_KEYWORDS
   };
   var ATTRS = {
diff --git a/src/languages/nsis.js b/src/languages/nsis.js
index cddaaec249..17cfc950b1 100644
--- a/src/languages/nsis.js
+++ b/src/languages/nsis.js
@@ -14,20 +14,20 @@ export default function(hljs) {
   var DEFINES = {
     // ${defines}
     className: 'variable',
-    begin: /\$+{[\w\.:-]+}/
+    begin: /\$+\{[\w.:-]+\}/
   };
 
   var VARIABLES = {
     // $variables
     className: 'variable',
     begin: /\$+\w+/,
-    illegal: /\(\){}/
+    illegal: /\(\)\{\}/
   };
 
   var LANGUAGES = {
     // $(language_strings)
     className: 'variable',
-    begin: /\$+\([\w\^\.:-]+\)/
+    begin: /\$+\([\w^.:-]+\)/
   };
 
   var PARAMETERS = {
@@ -39,7 +39,7 @@ export default function(hljs) {
   var COMPILER = {
     // !compiler_flags
     className: 'keyword',
-    begin: /\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/
+    begin: /!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/
   };
 
   var METACHARS = {
@@ -51,7 +51,7 @@ export default function(hljs) {
   var PLUGINS = {
     // plug::ins
     className: 'class',
-    begin: /\w+\:\:\w+/
+    begin: /\w+::\w+/
   };
 
     var STRING = {
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index 004f8f16e6..9aaa4a5055 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -92,7 +92,7 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        begin: '(' + CLASS_KEYWORDS.keyword.split(' ').join('|') + ')\\b', end: '({|$)', excludeEnd: true,
+        begin: '(' + CLASS_KEYWORDS.keyword.split(' ').join('|') + ')\\b', end: /(\{|$)/, excludeEnd: true,
         keywords: CLASS_KEYWORDS,
         contains: [
           hljs.UNDERSCORE_TITLE_MODE
diff --git a/src/languages/openscad.js b/src/languages/openscad.js
index b1ad4abf44..ff1f19b635 100644
--- a/src/languages/openscad.js
+++ b/src/languages/openscad.js
@@ -39,7 +39,7 @@ export default function(hljs) {
 	FUNCTIONS = {
 		className: 'function',
 		beginKeywords: 'module function',
-		end: '\\=|\\{',
+		end: /=|\{/,
 		contains: [PARAMS, hljs.UNDERSCORE_TITLE_MODE]
 	};
 
diff --git a/src/languages/oxygene.js b/src/languages/oxygene.js
index fbdd1288e0..0eda124f94 100644
--- a/src/languages/oxygene.js
+++ b/src/languages/oxygene.js
@@ -18,8 +18,8 @@ export default function(hljs) {
     'register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained'
   };
   var CURLY_COMMENT = hljs.COMMENT(
-    '{',
-    '}',
+    /\{/,
+    /\}/,
     {
       relevance: 0
     }
diff --git a/src/languages/parser3.js b/src/languages/parser3.js
index 5810bbd361..18ee3634ae 100644
--- a/src/languages/parser3.js
+++ b/src/languages/parser3.js
@@ -8,8 +8,8 @@ Category: template
 
 export default function(hljs) {
   var CURLY_SUBCOMMENT = hljs.COMMENT(
-    '{',
-    '}',
+    /\{/,
+    /\}/,
     {
       contains: ['self']
     }
@@ -20,8 +20,8 @@ export default function(hljs) {
     contains: [
       hljs.COMMENT('^#', '$'),
       hljs.COMMENT(
-        '\\^rem{',
-        '}',
+        /\\^rem\{/,
+        /\}/,
         {
           relevance: 10,
           contains: [
@@ -40,11 +40,11 @@ export default function(hljs) {
       },
       {
         className: 'variable',
-        begin: '\\$\\{?[\\w\\-\\.\\:]+\\}?'
+        begin: /\$\{?[\w\-.:]+\}?/
       },
       {
         className: 'keyword',
-        begin: '\\^[\\w\\-\\.\\:]+'
+        begin: /\^[\w\-.:]+/
       },
       {
         className: 'number',
diff --git a/src/languages/perl.js b/src/languages/perl.js
index 971d64f1c9..9ea76bef87 100644
--- a/src/languages/perl.js
+++ b/src/languages/perl.js
@@ -34,14 +34,14 @@ export default function(hljs) {
     keywords: PERL_KEYWORDS
   };
   var METHOD = {
-    begin: '->{', end: '}'
+    begin: /->\{/, end: /\}/
     // contains defined later
   };
   var VAR = {
     variants: [
       {begin: /\$\d/},
-      {begin: /[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},
-      {begin: /[\$%@][^\s\w{]/, relevance: 0}
+      {begin: /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/},
+      {begin: /[$%@][^\s\w{]/, relevance: 0}
     ]
   };
   var STRING_CONTAINS = [hljs.BACKSLASH_ESCAPE, SUBST, VAR];
@@ -49,8 +49,8 @@ export default function(hljs) {
     VAR,
     hljs.HASH_COMMENT_MODE,
     hljs.COMMENT(
-      '^\\=\\w',
-      '\\=cut',
+      /^=\w/,
+      /=cut/,
       {
         endsWithParent: true
       }
@@ -77,7 +77,7 @@ export default function(hljs) {
           relevance: 5
         },
         {
-          begin: 'q[qwxr]?\\s*\\<', end: '\\>',
+          begin: 'q[qwxr]?\\s*<', end: '>',
           relevance: 5
         },
         {
@@ -96,12 +96,12 @@ export default function(hljs) {
           contains: [hljs.BACKSLASH_ESCAPE]
         },
         {
-          begin: '{\\w+}',
+          begin: /\{\w+\}/,
           contains: [],
           relevance: 0
         },
         {
-          begin: '\-?\\w+\\s*\\=\\>',
+          begin: '-?\\w+\\s*=>',
           contains: [],
           relevance: 0
         }
diff --git a/src/languages/pgsql.js b/src/languages/pgsql.js
index 589a8ba145..78a0744924 100644
--- a/src/languages/pgsql.js
+++ b/src/languages/pgsql.js
@@ -301,7 +301,7 @@ export default function(hljs) {
         },
         // Forbid some cunstructs from other languages to improve autodetect. In fact
         // "[a-z]:" is legal (as part of array slice), but improbabal.
-        illegal: /:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,
+        illegal: /:==|\W\s*\(\*|(^|\s)\$[a-z]|\{\{|[a-z]:\s*$|\.\.\.|TO:|DO:/,
         contains: [
           // special handling of some words, which are reserved only in some contexts
           {
diff --git a/src/languages/php.js b/src/languages/php.js
index c19a501685..ef35c47f6c 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -145,8 +145,8 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: '{', excludeEnd: true,
-        illegal: /[:\(\$"]/,
+        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        illegal: /[:($"]/,
         contains: [
           {beginKeywords: 'extends implements'},
           hljs.UNDERSCORE_TITLE_MODE
@@ -154,7 +154,7 @@ export default function(hljs) {
       },
       {
         beginKeywords: 'namespace', end: ';',
-        illegal: /[\.']/,
+        illegal: /[.']/,
         contains: [hljs.UNDERSCORE_TITLE_MODE]
       },
       {
diff --git a/src/languages/powershell.js b/src/languages/powershell.js
index ed21d082a1..5e80f4714d 100644
--- a/src/languages/powershell.js
+++ b/src/languages/powershell.js
@@ -181,7 +181,7 @@ export default function(hljs) {
 
   var HASH_SIGNS = {
     className: 'selector-tag',
-    begin: /\@\B/,
+    begin: /@\B/,
     relevance: 0
   };
 
diff --git a/src/languages/prolog.js b/src/languages/prolog.js
index 926a7df796..33695ad090 100644
--- a/src/languages/prolog.js
+++ b/src/languages/prolog.js
@@ -51,15 +51,13 @@ export default function(hljs) {
   };
 
   var CHAR_CODE = {
-
     className: 'string', // 0'a etc.
-    begin: /0\'(\\\'|.)/
+    begin: /0'(\\'|.)/
   };
 
   var SPACE_CODE = {
-
     className: 'string',
-    begin: /0\'\\s/ // 0'\s
+    begin: /0'\\s/ // 0'\s
   };
 
   var PRED_OP = { // relevance booster
diff --git a/src/languages/qml.js b/src/languages/qml.js
index 6cb83acb11..e61f9863ec 100644
--- a/src/languages/qml.js
+++ b/src/languages/qml.js
@@ -8,6 +8,8 @@ Website: https://doc.qt.io/qt-5/qmlapplications.html
 Category: scripting
 */
 
+import * as regex from '../lib/regex.js';
+
 export default function(hljs) {
   var KEYWORDS = {
       keyword:
@@ -90,7 +92,7 @@ export default function(hljs) {
   // Find QML object. A QML object is a QML identifier followed by { and ends at the matching }.
   // All we really care about is finding IDENT followed by { and just mark up the IDENT and ignore the {.
   var QML_OBJECT = {
-    begin: QML_IDENT_RE + '\\s*{', end: '{',
+    begin: regex.concat(QML_IDENT_RE, /\s*\{/), end: /\{/,
     returnBegin: true,
     relevance: 0,
     contains: [
diff --git a/src/languages/reasonml.js b/src/languages/reasonml.js
index 37d423701b..cbe629f506 100644
--- a/src/languages/reasonml.js
+++ b/src/languages/reasonml.js
@@ -25,7 +25,7 @@ export default function(hljs) {
   var RE_PARAM_TYPEPARAM = '\'?[a-z$_][0-9a-z$_]*';
   var RE_PARAM_TYPE = '\s*:\s*[a-z$_][0-9a-z$_]*(\(\s*(' + RE_PARAM_TYPEPARAM + '\s*(,' + RE_PARAM_TYPEPARAM + ')*)?\s*\))?';
   var RE_PARAM = RE_IDENT + '(' + RE_PARAM_TYPE + ')?(' + RE_PARAM_TYPE + ')?';
-  var RE_OPERATOR = "(" + orReValues(['||', '&&', '++', '**', '+.', '*', '/', '*.', '/.', '...', '|>']) + "|==|===)";
+  var RE_OPERATOR = "(" + orReValues(['||', '++', '**', '+.', '*', '/', '*.', '/.', '...']) + "|\\|>|&&|==|===)";
   var RE_OPERATOR_SPACED = "\\s+" + RE_OPERATOR + "\\s+";
 
   var KEYWORDS = {
@@ -53,7 +53,7 @@ export default function(hljs) {
         begin: RE_NUMBER
       },
       {
-        begin: '\\(\\-' + RE_NUMBER + '\\)'
+        begin: '\\(-' + RE_NUMBER + '\\)'
       }
     ]
   };
@@ -228,8 +228,8 @@ export default function(hljs) {
         ].concat(MODULE_ACCESS_CONTENTS)
       },
       {
-        begin: "\\b(" + RE_MODULE_IDENT + "\\.)+{",
-        end: "}"
+        begin: "\\b(" + RE_MODULE_IDENT + "\\.)+\\{",
+        end: /\}/
       }
     ],
     contains: MODULE_ACCESS_CONTENTS
@@ -241,9 +241,9 @@ export default function(hljs) {
     name: 'ReasonML',
     aliases: ['re'],
     keywords: KEYWORDS,
-    illegal: '(:\\-|:=|\\${|\\+=)',
+    illegal: '(:-|:=|\\$\\{|\\+=)',
     contains: [
-      hljs.COMMENT('/\\*', '\\*/', { illegal: '^(\\#,\\/\\/)' }),
+      hljs.COMMENT('/\\*', '\\*/', { illegal: '^(#,\\/\\/)' }),
       {
         className: 'character',
         begin: '\'(\\\\[^\']+|[^\'])\'',
@@ -274,7 +274,7 @@ export default function(hljs) {
       {
         className: 'operator',
         begin: RE_OPERATOR_SPACED,
-        illegal: '\\-\\->',
+        illegal: '-->',
         relevance: 0
       },
       NUMBER_MODE,
@@ -283,8 +283,8 @@ export default function(hljs) {
       FUNCTION_BLOCK_MODE,
       {
         className: 'module-def',
-        begin: "\\bmodule\\s+" + RE_IDENT + "\\s+" + RE_MODULE_IDENT + "\\s+=\\s+{",
-        end: "}",
+        begin: "\\bmodule\\s+" + RE_IDENT + "\\s+" + RE_MODULE_IDENT + "\\s+=\\s+\\{",
+        end: /\}/,
         returnBegin: true,
         keywords: KEYWORDS,
         relevance: 0,
@@ -295,8 +295,8 @@ export default function(hljs) {
             begin: RE_MODULE_IDENT
           },
           {
-            begin: '{',
-            end: '}',
+            begin: /\{/,
+            end: /\}/,
             skip: true
           }
         ].concat(MODULE_ACCESS_CONTENTS)
diff --git a/src/languages/roboconf.js b/src/languages/roboconf.js
index 8722fab5c4..e4457af933 100644
--- a/src/languages/roboconf.js
+++ b/src/languages/roboconf.js
@@ -37,7 +37,7 @@ export default function(hljs) {
       // Facet sections
       {
         begin: '^facet ' + IDENTIFIER,
-        end: '}',
+        end: /\}/,
         keywords: 'facet',
         contains: [
           PROPERTY,
@@ -48,7 +48,7 @@ export default function(hljs) {
       // Instance sections
       {
         begin: '^\\s*instance of ' + IDENTIFIER,
-        end: '}',
+        end: /\}/,
         keywords: 'name count channels instance-data instance-state instance of',
         illegal: /\S/,
         contains: [
@@ -61,7 +61,7 @@ export default function(hljs) {
       // Component sections
       {
         begin: '^' + IDENTIFIER,
-        end: '}',
+        end: /\}/,
         contains: [
           PROPERTY,
           hljs.HASH_COMMENT_MODE
diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index 9876417b56..b3c6a64132 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -89,7 +89,7 @@ export default function(hljs) {
       APOS_STRING,
       VAR,
       { // attribute=value
-        begin: /[\w-]+\=([^\s\{\}\[\]\(\)]+)/,
+        begin: /[\w-]+=([^\s{}[\]()]+)/,
         relevance: 0,
         returnBegin: true,
         contains: [
@@ -110,8 +110,8 @@ export default function(hljs) {
                 begin: '\\b(' + LITERALS.split(' ').join('|') + ')\\b'
               },
               {
-                // Do not format unclassified values. Needed to exclude highlighting of values ​​as built_in.
-                begin: /("[^"]*"|[^\s\{\}\[\]]+)/
+                // Do not format unclassified values. Needed to exclude highlighting of values as built_in.
+                begin: /("[^"]*"|[^\s{}[\]]+)/
               }
               /*
               {
@@ -139,7 +139,7 @@ export default function(hljs) {
         begin: /\*[0-9a-fA-F]+/
       },
       {
-        begin: '\\b(' + COMMON_COMMANDS.split(' ').join('|') + ')([\\s\[\(]|\])',
+        begin: '\\b(' + COMMON_COMMANDS.split(' ').join('|') + ')([\\s[(\\]|])',
         returnBegin: true,
         contains: [
           {
diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index f94e7e0328..818063e955 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -8,7 +8,7 @@ Category: common
 */
 
 export default function(hljs) {
-  var RUBY_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
+  var RUBY_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
   var RUBY_KEYWORDS = {
     keyword:
       'and then defined module in return redo if BEGIN retry end for self when ' +
@@ -33,8 +33,8 @@ export default function(hljs) {
       }
     ),
     hljs.COMMENT(
-      '^\\=begin',
-      '^\\=end',
+      '^=begin',
+      '^=end',
       {
         contains: [YARDOCTAG],
         relevance: 10
@@ -44,7 +44,7 @@ export default function(hljs) {
   ];
   var SUBST = {
     className: 'subst',
-    begin: '#\\{', end: '}',
+    begin: /#\{/, end: /\}/,
     keywords: RUBY_KEYWORDS
   };
   var STRING = {
@@ -54,14 +54,14 @@ export default function(hljs) {
       {begin: /'/, end: /'/},
       {begin: /"/, end: /"/},
       {begin: /`/, end: /`/},
-      {begin: '%[qQwWx]?\\(', end: '\\)'},
-      {begin: '%[qQwWx]?\\[', end: '\\]'},
-      {begin: '%[qQwWx]?{', end: '}'},
-      {begin: '%[qQwWx]?<', end: '>'},
-      {begin: '%[qQwWx]?/', end: '/'},
-      {begin: '%[qQwWx]?%', end: '%'},
-      {begin: '%[qQwWx]?-', end: '-'},
-      {begin: '%[qQwWx]?\\|', end: '\\|'},
+      {begin: /%[qQwWx]?\(/, end: /\)/},
+      {begin: /%[qQwWx]?\[/, end: /\]/},
+      {begin: /%[qQwWx]?\{/, end: /\}/},
+      {begin: /%[qQwWx]?</, end: />/},
+      {begin: /%[qQwWx]?\//, end: /\//},
+      {begin: /%[qQwWx]?%/, end: /%/},
+      {begin: /%[qQwWx]?-/, end: /-/},
+      {begin: /%[qQwWx]?\|/, end: /\|/},
       {
         // \B in the beginning suppresses recognition of ?-sequences where ?
         // is the last character of a preceding identifier, as in: `func?4`
@@ -118,7 +118,7 @@ export default function(hljs) {
       beginKeywords: 'class module', end: '$|;',
       illegal: /=/,
       contains: [
-        hljs.inherit(hljs.TITLE_MODE, {begin: '[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?'}),
+        hljs.inherit(hljs.TITLE_MODE, {begin: '[A-Za-z_]\\w*(::\\w+)*(\\?|!)?'}),
         {
           begin: '<\\s*',
           contains: [{
@@ -141,7 +141,7 @@ export default function(hljs) {
     },
     {
       className: 'symbol',
-      begin: hljs.UNDERSCORE_IDENT_RE + '(\\!|\\?)?:',
+      begin: hljs.UNDERSCORE_IDENT_RE + '(!|\\?)?:',
       relevance: 0
     },
     {
@@ -152,7 +152,7 @@ export default function(hljs) {
     },
     NUMBER,
     {
-      begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))' // variables
+      begin: '(\\$\\W)|((\\$|@@?)(\\w+))' // variables
     },
     {
       className: 'params',
@@ -170,7 +170,7 @@ export default function(hljs) {
           illegal: /\n/,
           variants: [
             {begin: '/', end: '/[a-z]*'},
-            {begin: '%r{', end: '}[a-z]*'},
+            {begin: /%r\{/, end: /\}[a-z]*/},
             {begin: '%r\\(', end: '\\)[a-z]*'},
             {begin: '%r!', end: '![a-z]*'},
             {begin: '%r\\[', end: '\\][a-z]*'}
diff --git a/src/languages/ruleslanguage.js b/src/languages/ruleslanguage.js
index 8038bf0e62..12368949fe 100644
--- a/src/languages/ruleslanguage.js
+++ b/src/languages/ruleslanguage.js
@@ -60,8 +60,8 @@ export default function(hljs) {
       {
         className: 'literal',
         variants: [
-          {begin: '#\\s+[a-zA-Z\\ \\.]*', relevance: 0}, // looks like #-comment
-          {begin: '#[a-zA-Z\\ \\.]+'}
+          {begin: '#\\s+[a-zA-Z .]*', relevance: 0}, // looks like #-comment
+          {begin: '#[a-zA-Z .]+'}
         ]
       }
     ]
diff --git a/src/languages/rust.js b/src/languages/rust.js
index 2dbb17a286..7b429d96a6 100644
--- a/src/languages/rust.js
+++ b/src/languages/rust.js
@@ -80,7 +80,7 @@ export default function(hljs) {
       },
       {
         className: 'meta',
-        begin: '#\\!?\\[', end: '\\]',
+        begin: '#!?\\[', end: '\\]',
         contains: [
           {
             className: 'meta-string',
@@ -98,7 +98,7 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'trait enum struct union', end: '{',
+        beginKeywords: 'trait enum struct union', end: /\{/,
         contains: [
           hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {endsParent: true})
         ],
diff --git a/src/languages/sas.js b/src/languages/sas.js
index d5afe5a99e..a14677283e 100644
--- a/src/languages/sas.js
+++ b/src/languages/sas.js
@@ -92,12 +92,12 @@ export default function(hljs) {
             {
                 // Distinct highlight for proc <proc>, data, run, quit
                 className: 'keyword',
-                begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/
+                begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s;]/
             },
             {
                 // Macro variables
                 className: 'variable',
-                begin: /\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/
+                begin: /&[a-zA-Z_&][a-zA-Z0-9_]*\.?/
             },
             {
                 // Special emphasis for datalines|cards
diff --git a/src/languages/scala.js b/src/languages/scala.js
index b8e1350a0d..c8336fa1c3 100644
--- a/src/languages/scala.js
+++ b/src/languages/scala.js
@@ -15,7 +15,7 @@ export default function(hljs) {
     className: 'subst',
     variants: [
       {begin: '\\$[A-Za-z0-9_]+'},
-      {begin: '\\${', end: '}'}
+      {begin: /\$\{/, end: /\}/}
     ]
   };
 
diff --git a/src/languages/scheme.js b/src/languages/scheme.js
index 60b257d199..715ac60608 100644
--- a/src/languages/scheme.js
+++ b/src/languages/scheme.js
@@ -11,7 +11,7 @@ Category: lisp
 
 export default function(hljs) {
   var SCHEME_IDENT_RE = '[^\\(\\)\\[\\]\\{\\}",\'`;#|\\\\\\s]+';
-  var SCHEME_SIMPLE_NUMBER_RE = '(\\-|\\+)?\\d+([./]\\d+)?';
+  var SCHEME_SIMPLE_NUMBER_RE = '(-|\\+)?\\d+([./]\\d+)?';
   var SCHEME_COMPLEX_NUMBER_RE = SCHEME_SIMPLE_NUMBER_RE + '[+\\-]' + SCHEME_SIMPLE_NUMBER_RE + 'i';
   var KEYWORDS = {
     $pattern: SCHEME_IDENT_RE,
diff --git a/src/languages/scss.js b/src/languages/scss.js
index 90ed1b5a57..460c780951 100644
--- a/src/languages/scss.js
+++ b/src/languages/scss.js
@@ -43,7 +43,7 @@ export default function(hljs) {
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       {
-        className: 'selector-id', begin: '\\#[A-Za-z0-9_-]+',
+        className: 'selector-id', begin: '#[A-Za-z0-9_-]+',
         relevance: 0
       },
       {
diff --git a/src/languages/smali.js b/src/languages/smali.js
index 70f36c5831..b23072f5aa 100644
--- a/src/languages/smali.js
+++ b/src/languages/smali.js
@@ -41,11 +41,11 @@ export default function(hljs) {
             begin: '\\s('+smali_instr_low_prio.join('|')+')\\s'
           },
           {
-            begin: '\\s('+smali_instr_low_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)+\\s',
+            begin: '\\s('+smali_instr_low_prio.join('|')+')((-|/)[a-zA-Z0-9]+)+\\s',
             relevance: 10
           },
           {
-            begin: '\\s('+smali_instr_high_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)*\\s',
+            begin: '\\s('+smali_instr_high_prio.join('|')+')((-|/)[a-zA-Z0-9]+)*\\s',
             relevance: 10
           },
         ]
diff --git a/src/languages/smalltalk.js b/src/languages/smalltalk.js
index 543fc6cdda..bd578dd492 100644
--- a/src/languages/smalltalk.js
+++ b/src/languages/smalltalk.js
@@ -44,7 +44,7 @@ export default function(hljs) {
         contains: [{begin: '(\\|[ ]*)?' + VAR_IDENT_RE}]
       },
       {
-        begin: '\\#\\(', end: '\\)',
+        begin: '#\\(', end: '\\)',
         contains: [
           hljs.APOS_STRING_MODE,
           CHAR,
diff --git a/src/languages/stylus.js b/src/languages/stylus.js
index 7496de6f7a..67effd18c2 100644
--- a/src/languages/stylus.js
+++ b/src/languages/stylus.js
@@ -122,7 +122,7 @@ export default function(hljs) {
     'video'
   ];
 
-  var LOOKAHEAD_TAG_END = '(?=[\\.\\s\\n\\[\\:,])';
+  var LOOKAHEAD_TAG_END = '(?=[.\\s\\n[:,])';
 
   var ATTRIBUTES = [
     'align-content',
@@ -372,7 +372,7 @@ export default function(hljs) {
 
       // id tag
       {
-        begin: '\\#[a-zA-Z][a-zA-Z0-9_-]*' + LOOKAHEAD_TAG_END,
+        begin: '#[a-zA-Z][a-zA-Z0-9_-]*' + LOOKAHEAD_TAG_END,
         className: 'selector-id'
       },
 
diff --git a/src/languages/swift.js b/src/languages/swift.js
index e04fd72109..bad2cbb184 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -88,7 +88,7 @@ export default function(hljs) {
       NUMBERS,
       {
         className: 'function',
-        beginKeywords: 'func', end: '{', excludeEnd: true,
+        beginKeywords: 'func', end: /\{/, excludeEnd: true,
         contains: [
           hljs.inherit(hljs.TITLE_MODE, {
             begin: /[A-Za-z$_][0-9A-Za-z$_]*/
diff --git a/src/languages/tap.js b/src/languages/tap.js
index 2c789e6605..0365cb1ebb 100644
--- a/src/languages/tap.js
+++ b/src/languages/tap.js
@@ -22,7 +22,7 @@ export default function(hljs) {
       },
       // YAML block
       {
-        begin: '(\s+)?---$', end: '\\.\\.\\.$',
+        begin: /---$/, end: '\\.\\.\\.$',
         subLanguage: 'yaml',
         relevance: 0
       },
diff --git a/src/languages/twig.js b/src/languages/twig.js
index 814f980995..4ea7bd041a 100644
--- a/src/languages/twig.js
+++ b/src/languages/twig.js
@@ -48,10 +48,10 @@ export default function(hljs) {
     case_insensitive: true,
     subLanguage: 'xml',
     contains: [
-      hljs.COMMENT(/\{#/, /#}/),
+      hljs.COMMENT(/\{#/, /#\}/),
       {
         className: 'template-tag',
-        begin: /\{%/, end: /%}/,
+        begin: /\{%/, end: /%\}/,
         contains: [
           {
             className: 'name',
@@ -67,7 +67,7 @@ export default function(hljs) {
       },
       {
         className: 'template-variable',
-        begin: /\{\{/, end: /}}/,
+        begin: /\{\{/, end: /\}\}/,
         contains: ['self', FILTER, FUNCTIONS]
       }
     ]
diff --git a/src/languages/vala.js b/src/languages/vala.js
index 49b26a8d32..2ca8243e31 100644
--- a/src/languages/vala.js
+++ b/src/languages/vala.js
@@ -31,7 +31,7 @@ export default function(hljs) {
     contains: [
       {
         className: 'class',
-        beginKeywords: 'class interface namespace', end: '{', excludeEnd: true,
+        beginKeywords: 'class interface namespace', end: /\{/, excludeEnd: true,
         illegal: '[^,:\\n\\s\\.]',
         contains: [
           hljs.UNDERSCORE_TITLE_MODE
diff --git a/src/languages/vbnet.js b/src/languages/vbnet.js
index 405f91c461..8346a80c37 100644
--- a/src/languages/vbnet.js
+++ b/src/languages/vbnet.js
@@ -30,7 +30,7 @@ export default function(hljs) {
       literal:
         'true false nothing'
     },
-    illegal: '//|{|}|endif|gosub|variant|wend|^\\$ ', /* reserved deprecated keywords */
+    illegal: '//|\\{|\\}|endif|gosub|variant|wend|^\\$ ', /* reserved deprecated keywords */
     contains: [
       hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [{begin: '""'}]}),
       hljs.COMMENT(
diff --git a/src/languages/vhdl.js b/src/languages/vhdl.js
index c5c49d8010..3b38be6009 100644
--- a/src/languages/vhdl.js
+++ b/src/languages/vhdl.js
@@ -44,7 +44,7 @@ export default function(hljs) {
         'false true note warning error failure ' +  // severity_level
         'line text side width'                      // textio
     },
-    illegal: '{',
+    illegal: /\{/,
     contains: [
       hljs.C_BLOCK_COMMENT_MODE,      // VHDL-2008 block commenting.
       hljs.COMMENT('--', '$'),
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 877092f72e..75ca4051dc 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -89,7 +89,7 @@ export default function(hljs) {
         }
       ),
       {
-        begin: '<\\!\\[CDATA\\[', end: '\\]\\]>',
+        begin: '<!\\[CDATA\\[', end: '\\]\\]>',
         relevance: 10
       },
       XML_ENTITIES,
@@ -120,7 +120,7 @@ export default function(hljs) {
         keywords: {name: 'script'},
         contains: [TAG_INTERNALS],
         starts: {
-          end: '\<\/script\>', returnEnd: true,
+          end: /<\/script>/, returnEnd: true,
           subLanguage: ['javascript', 'handlebars', 'xml']
         }
       },
diff --git a/src/languages/xquery.js b/src/languages/xquery.js
index a03949da91..e7d1323a21 100644
--- a/src/languages/xquery.js
+++ b/src/languages/xquery.js
@@ -31,35 +31,35 @@ export default function(hljs) {
   var BUILT_IN = {
     className: 'built_in',
     variants: [{
-      begin: /\barray\:/,
-      end: /(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/
+      begin: /\barray:/,
+      end: /(?:append|filter|flatten|fold-(?:left|right)|for-each(?:-pair)?|get|head|insert-before|join|put|remove|reverse|size|sort|subarray|tail)\b/
     }, {
-      begin: /\bmap\:/,
-      end: /(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/
+      begin: /\bmap:/,
+      end: /(?:contains|entry|find|for-each|get|keys|merge|put|remove|size)\b/
     }, {
-      begin: /\bmath\:/,
+      begin: /\bmath:/,
       end: /(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/
     }, {
-      begin: /\bop\:/,
+      begin: /\bop:/,
       end: /\(/,
       excludeEnd: true
     }, {
-      begin: /\bfn\:/,
+      begin: /\bfn:/,
       end: /\(/,
       excludeEnd: true
     },
 // do not highlight inbuilt strings as variable or xml element names
     {
-      begin: /[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/,
+      begin: /[^<\/\$:'"-]\b(?:abs|accumulator-(?:after|before)|adjust-(?:date(?:Time)?|time)-to-timezone|analyze-string|apply|available-(?:environment-variables|system-properties)|avg|base-uri|boolean|ceiling|codepoints?-(?:equal|to-string)|collation-key|collection|compare|concat|contains(?:-token)?|copy-of|count|current(?:-)?(?:date(?:Time)?|time|group(?:ing-key)?|output-uri|merge-(?:group|key))?data|dateTime|days?-from-(?:date(?:Time)?|duration)|deep-equal|default-(?:collation|language)|distinct-values|document(?:-uri)?|doc(?:-available)?|element-(?:available|with-id)|empty|encode-for-uri|ends-with|environment-variable|error|escape-html-uri|exactly-one|exists|false|filter|floor|fold-(?:left|right)|for-each(?:-pair)?|format-(?:date(?:Time)?|time|integer|number)|function-(?:arity|available|lookup|name)|generate-id|has-children|head|hours-from-(?:dateTime|duration|time)|id(?:ref)?|implicit-timezone|in-scope-prefixes|index-of|innermost|insert-before|iri-to-uri|json-(?:doc|to-xml)|key|lang|last|load-xquery-module|local-name(?:-from-QName)?|(?:lower|upper)-case|matches|max|minutes-from-(?:dateTime|duration|time)|min|months?-from-(?:date(?:Time)?|duration)|name(?:space-uri-?(?:for-prefix|from-QName)?)?|nilled|node-name|normalize-(?:space|unicode)|not|number|one-or-more|outermost|parse-(?:ietf-date|json)|path|position|(?:prefix-from-)?QName|random-number-generator|regex-group|remove|replace|resolve-(?:QName|uri)|reverse|root|round(?:-half-to-even)?|seconds-from-(?:dateTime|duration|time)|snapshot|sort|starts-with|static-base-uri|stream-available|string-?(?:join|length|to-codepoints)?|subsequence|substring-?(?:after|before)?|sum|system-property|tail|timezone-from-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type-available|unordered|unparsed-(?:entity|text)?-?(?:public-id|uri|available|lines)?|uri-collection|xml-to-json|years?-from-(?:date(?:Time)?|duration)|zero-or-one)\b/,
     }, {
-      begin: /\blocal\:/,
+      begin: /\blocal:/,
       end: /\(/,
       excludeEnd: true
     }, {
-      begin: /\bzip\:/,
-      end: /(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/
+      begin: /\bzip:/,
+      end: /(?:zip-file|(?:xml|html|text|binary)-entry| (?:update-)?entries)\b/
     }, {
-      begin: /\b(?:util|db|functx|app|xdmp|xmldb)\:/,
+      begin: /\b(?:util|db|functx|app|xdmp|xmldb):/,
       end: /\(/,
       excludeEnd: true
     }
@@ -74,7 +74,7 @@ export default function(hljs) {
 
   var VAR = {
     className: 'variable',
-    begin: /[\$][\w-:]+/
+    begin: /[$][\w\-:]+/
   };
 
   var NUMBER = {
@@ -106,7 +106,7 @@ export default function(hljs) {
 
   var ANNOTATION = {
     className: 'meta',
-    begin: /%[\w-:]+/
+    begin: /%[\w\-:]+/
   };
 
   var COMMENT = {
@@ -125,7 +125,7 @@ export default function(hljs) {
   // see https://www.regexpal.com/?fam=99749
   var COMPUTED = {
     beginKeywords: 'element attribute comment document processing-instruction',
-    end: '{',
+    end: /\{/,
     excludeEnd: true
   };
 
@@ -135,13 +135,12 @@ export default function(hljs) {
       end: /(\/[\w\._:\-]+>)/,
       subLanguage: 'xml',
       contains: [{
-        begin: '{',
-        end: '}',
+        begin: /\{/,
+        end: /\}/,
         subLanguage: 'xquery'
       }, 'self']
     };
 
-
   var CONTAINS = [
     VAR,
     BUILT_IN,
@@ -154,16 +153,12 @@ export default function(hljs) {
     DIRECT
   ];
 
-
-
     var METHOD = {
-      begin: '{',
-      end: '}',
+      begin: /\{/,
+      end: /\}/,
       contains: CONTAINS
     };
 
-
-
   return {
     name: 'XQuery',
     aliases: ['xpath', 'xq'],
diff --git a/src/languages/yaml.js b/src/languages/yaml.js
index 02a1d9cee2..f4257be176 100644
--- a/src/languages/yaml.js
+++ b/src/languages/yaml.js
@@ -11,7 +11,7 @@ export default function(hljs) {
   var LITERALS = 'true false yes no null';
 
   // YAML spec allows non-reserved URI characters in tags.
-  var URI_CHARACTERS = '[\\w#;/?:@&=+$,.~*\\\'()[\\]]+';
+  var URI_CHARACTERS = '[\\w#;/?:@&=+$,.~*\'()[\\]]+';
 
   // Define keys as starting with a word character
   // ...containing word chars, spaces, colons, forward-slashes, hyphens and periods
@@ -29,8 +29,8 @@ export default function(hljs) {
   var TEMPLATE_VARIABLES = {
     className: 'template-variable',
     variants: [
-      { begin: '{{', end: '}}' }, // jinja templates Ansible
-      { begin: '%{', end: '}' } // Ruby i18n
+      { begin: /\{\{/, end: /\}\}/ }, // jinja templates Ansible
+      { begin: /%\{/, end: /\}/ } // Ruby i18n
     ]
   };
   var STRING = {
@@ -75,8 +75,8 @@ export default function(hljs) {
     relevance: 0
   };
   var OBJECT = {
-    begin: '{',
-    end: '}',
+    begin: /\{/,
+    end: /\}/,
     contains: [VALUE_CONTAINER],
     illegal: '\\n',
     relevance: 0
@@ -93,7 +93,7 @@ export default function(hljs) {
     KEY,
     {
       className: 'meta',
-      begin: '^---\s*$',
+      begin: '^---\\s*$',
       relevance: 10
     },
     { // multi line string
@@ -102,7 +102,7 @@ export default function(hljs) {
       // Indentation of subsequent lines must be the same to
       // be considered part of the block
       className: 'string',
-      begin: '[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*'
+      begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^\\n]+\\n(\\2[^\\n]+\\n?)*'
     },
     { // Ruby/Rails erb
       begin: '<%[%=-]?',
@@ -140,7 +140,7 @@ export default function(hljs) {
     { // array listing
       className: 'bullet',
       // TODO: remove |$ hack when we have proper look-ahead support
-      begin: '\\-(?=[ ]|$)',
+      begin: '-(?=[ ]|$)',
       relevance: 0
     },
     hljs.HASH_COMMENT_MODE,
diff --git a/src/languages/zephir.js b/src/languages/zephir.js
index 681a8538fb..03f790fcc4 100644
--- a/src/languages/zephir.js
+++ b/src/languages/zephir.js
@@ -91,7 +91,7 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: '{', excludeEnd: true,
+        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
         illegal: /[:\(\$"]/,
         contains: [
           {beginKeywords: 'extends implements'},

From e43084fadc3db8267890d68b28cbb06868632cfd Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 20:39:02 -0500
Subject: [PATCH 107/223] chore(ci) Add a GitHub actions workflow for our CI
 (#2821)

---
 .github/workflows/node.js.yml            | 48 ++++++++++++++++++++++++
 test/builds/browser_build_as_commonjs.js |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 .github/workflows/node.js.yml

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
new file mode 100644
index 0000000000..f3a91de333
--- /dev/null
+++ b/.github/workflows/node.js.yml
@@ -0,0 +1,48 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 15.x]
+        build-how: ["node", "browser", "browser -n"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: node ./tools/build.js -t ${{ matrix.build-how }}
+    # normal browser build
+    - if: contains(matrix.build-how, 'browser')
+      name: Test browser build
+      run: |
+        npm run test-browser
+        node test/builds/browser_build_as_commonjs.js
+
+    - if: contains(matrix.build-how, 'node')
+      name: Test Node.js build
+      run: |
+        npm test
+
+    # test that our build is "use strict" safe for use with packaging
+    # systems importing our source thru ES6 modules (rollup, etc.)
+    - if: contains(matrix.build-how, 'node')
+      name: Test Node.js build is "use strict" safe
+      run: |
+        ./node_modules/.bin/rollup -c test/builds/rollup_import_via_commonjs.js
+        node build/bundle.js
diff --git a/test/builds/browser_build_as_commonjs.js b/test/builds/browser_build_as_commonjs.js
index 4315df2ff0..ef5f6815d7 100644
--- a/test/builds/browser_build_as_commonjs.js
+++ b/test/builds/browser_build_as_commonjs.js
@@ -4,3 +4,5 @@ let major = parseInt(majorVersion=hljs.versionString.split("."))
 if (major != 10) {
   process.exit(1)
 }
+
+console.log("Pass: browser build works with Node.js just fine.")

From aa2bd7a2cda24e7722b281d52aacba80b746b6ee Mon Sep 17 00:00:00 2001
From: Florian Bezdeka <florian@bezdeka.de>
Date: Tue, 3 Nov 2020 02:54:46 +0100
Subject: [PATCH 108/223] enh(diff) enhance diffs generated by `git
 format-patch` (#2814)

* enh(diff) improve highlighting of hunk identifier lines

The line starting with "@@" may contain additional characters after the
closing "@@". Previously the end of the line was expected after the
closing "@@" pair, so if additional characters followed the highlighting
failed.

* enh(diff) mark lines starting with "diff --git" as comment

Patches generated by "git format-patch" will contain such lines, so
highlight them as comment.

* enh(diff) mark lines starting with "index " as comment

Patches generated by "git format-patch" will contain such lines, so
highlight them as comments.
---
 AUTHORS.txt                                  |  1 +
 CHANGES.md                                   |  1 +
 src/languages/diff.js                        |  6 ++++--
 test/markup/diff/comments.expect.txt         |  1 +
 test/markup/diff/comments.txt                |  1 +
 test/markup/diff/git-format-patch.expect.txt | 14 ++++++++++++++
 test/markup/diff/git-format-patch.txt        | 14 ++++++++++++++
 7 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 test/markup/diff/git-format-patch.expect.txt
 create mode 100644 test/markup/diff/git-format-patch.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 9c954ab64d..68fca2ed14 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -297,3 +297,4 @@ Contributors:
 - Jan Pilzer <Hirse@github>
 - Jonathan Sharpe <mail@jonrshar.pe>
 - Michael Rush <michaelrush@gmail.com>
+- Florian Bezdeka <florian@bezdeka.de>
diff --git a/CHANGES.md b/CHANGES.md
index a1a2c1e838..81df3bc980 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Language Improvements:
 - enh(java) Match numeric literals per Java Language Specification [Richard Gibson][]
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 - fix(python) Handle comments on decorators (#2804) [Jonathan Sharpe][]
+- enh(diff) improve highlighting of diff for git patches [Florian Bezdeka][]
 
 Dev Improvements:
 
diff --git a/src/languages/diff.js b/src/languages/diff.js
index 41de6aacb0..b56d94d380 100644
--- a/src/languages/diff.js
+++ b/src/languages/diff.js
@@ -16,7 +16,7 @@ export default function(hljs) {
         className: 'meta',
         relevance: 10,
         variants: [
-          {begin: /^@@ +-\d+,\d+ +\+\d+,\d+ +@@$/},
+          {begin: /^@@ +-\d+,\d+ +\+\d+,\d+ +@@/},
           {begin: /^\*\*\* +\d+,\d+ +\*\*\*\*$/},
           {begin: /^--- +\d+,\d+ +----$/}
         ]
@@ -25,11 +25,13 @@ export default function(hljs) {
         className: 'comment',
         variants: [
           {begin: /Index: /, end: /$/},
+          {begin: /^index/, end: /$/},
           {begin: /={3,}/, end: /$/},
           {begin: /^-{3}/, end: /$/},
           {begin: /^\*{3} /, end: /$/},
           {begin: /^\+{3}/, end: /$/},
-          {begin: /^\*{15}$/ }
+          {begin: /^\*{15}$/ },
+          {begin: /^diff --git/, end: /$/},
         ]
       },
       {
diff --git a/test/markup/diff/comments.expect.txt b/test/markup/diff/comments.expect.txt
index f9a21ddced..217f4fb8c7 100644
--- a/test/markup/diff/comments.expect.txt
+++ b/test/markup/diff/comments.expect.txt
@@ -1,5 +1,6 @@
 <span class="hljs-comment">Index: languages/demo.js</span>
 <span class="hljs-comment">===================================================================</span>
+<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
 <span class="hljs-comment">--- languages/demo.js    (revision 199)</span>
 <span class="hljs-comment">+++ languages/demo.js    (revision 200)</span>
 <span class="hljs-meta">@@ -1,8 +1,7 @@</span>
diff --git a/test/markup/diff/comments.txt b/test/markup/diff/comments.txt
index f79bb67cf9..bb665d2aa1 100644
--- a/test/markup/diff/comments.txt
+++ b/test/markup/diff/comments.txt
@@ -1,5 +1,6 @@
 Index: languages/demo.js
 ===================================================================
+diff --git a/file.txt b/file.txt
 --- languages/demo.js    (revision 199)
 +++ languages/demo.js    (revision 200)
 @@ -1,8 +1,7 @@
diff --git a/test/markup/diff/git-format-patch.expect.txt b/test/markup/diff/git-format-patch.expect.txt
new file mode 100644
index 0000000000..ab02ee1838
--- /dev/null
+++ b/test/markup/diff/git-format-patch.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-comment">diff --git a/file.py b/file.py</span>
+<span class="hljs-comment">index 123456..789abc 100644</span>
+<span class="hljs-comment">--- a/file.py</span>
+<span class="hljs-comment">+++ b/file.py</span>
+<span class="hljs-meta">@@ -28,2 +28,2 @@</span> import logging
+<span class="hljs-addition">+ import shutil</span>
+<span class="hljs-deletion">- import os</span>
+<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
+<span class="hljs-comment">index 123456..789abc 100644</span>
+<span class="hljs-comment">--- a/file.txt</span>
+<span class="hljs-comment">--- b/file.txt</span>
+<span class="hljs-meta">@@ -28,2 +28,2 @@</span>
+<span class="hljs-deletion">- removal</span>
+<span class="hljs-addition">+ addition</span>
diff --git a/test/markup/diff/git-format-patch.txt b/test/markup/diff/git-format-patch.txt
new file mode 100644
index 0000000000..8b5ab0c5d0
--- /dev/null
+++ b/test/markup/diff/git-format-patch.txt
@@ -0,0 +1,14 @@
+diff --git a/file.py b/file.py
+index 123456..789abc 100644
+--- a/file.py
++++ b/file.py
+@@ -28,2 +28,2 @@ import logging
++ import shutil
+- import os
+diff --git a/file.txt b/file.txt
+index 123456..789abc 100644
+--- a/file.txt
+--- b/file.txt
+@@ -28,2 +28,2 @@
+- removal
++ addition

From fa5e615e3701b7939b80bf4e50d57594d9f27065 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 21:04:31 -0500
Subject: [PATCH 109/223] enh(markdown/xml) auto-detection fixes (#2769)

improve precision of XML to prevent false auto-detect positives (much tighter ruleset)

- greatly reduce runaway relevancy of Markdown (+200 to 0 on the test snippet, cpp [the correct language] scores a 17)
- links should not have 10 relevancy
- [x][i] pattern reduced to 0 relevancy, this can just be too many things in so many languages (array access, etc)
- [x][commonscheme://] pattern gets 2 relevancy (data, http, https, ftp, etc)
- [x][neverhardof://] pattern gets 2 relevancy (ie .*(://.*)), stills looks enough like a URL, etc.
- [x][relative url] pattern gets 1 relevancy
- [x](x) pattern gets default 1 relevancy
---
 CHANGES.md                |  2 ++
 src/languages/markdown.js | 31 ++++++++++++++++++------
 src/languages/xml.js      | 50 +++++++++++++++++++++++++++++++++++----
 tools/checkAutoDetect.js  |  1 +
 4 files changed, 73 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 tools/checkAutoDetect.js

diff --git a/CHANGES.md b/CHANGES.md
index 81df3bc980..3ad3aaa345 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ New Languages:
 
 Language Improvements:
 
+- bug(xml) XML grammar was far too imprecise/fuzzy [Josh Goebel][]
+- enh(xml) Improve precision to prevent false auto-detect positives [Josh Goebel][]
 - fix(js/ts) Prevent for/while/if/switch from falsly matching as functions (#2803) [Josh Goebel][]
 - enh(julia) Update keyword lists for Julia 1.x (#2781) [Fredrik Ekre][]
 - enh(python) Match numeric literals per the language reference [Richard Gibson][]
diff --git a/src/languages/markdown.js b/src/languages/markdown.js
index f5b75ef139..7cd7a02f3c 100644
--- a/src/languages/markdown.js
+++ b/src/languages/markdown.js
@@ -6,9 +6,11 @@ Website: https://daringfireball.net/projects/markdown/
 Category: common, markup
 */
 
+import * as regex from '../lib/regex.js';
+
 export default function(hljs) {
   const INLINE_HTML = {
-    begin: '<', end: '>',
+    begin: /<\/?[A-Za-z_]/, end: '>',
     subLanguage: 'xml',
     relevance: 0
   };
@@ -58,29 +60,44 @@ export default function(hljs) {
       }
     ]
   };
+  const URL_SCHEME = /[A-Za-z][A-Za-z0-9+.-]*/;
   const LINK = {
-    begin: '\\[.+?\\][\\(\\[].*?[\\)\\]]',
+    variants: [
+      // too much like nested array access in so many languages
+      // to have any real relevance
+      { begin: /\[.+?\]\[.*?\]/, relevance: 0 },
+      // popular internet URLs
+      { begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/, relevance: 2 },
+      { begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/), relevance: 2 },
+      // relative urls
+      { begin: /\[.+?\]\([./?&#].*?\)/, relevance: 1 },
+      // whatever else, lower relevance (might not be a link at all)
+      { begin: /\[.+?\]\(.*?\)/, relevance: 0 }
+    ],
     returnBegin: true,
     contains: [
       {
         className: 'string',
+        relevance: 0,
         begin: '\\[', end: '\\]',
         excludeBegin: true,
         returnEnd: true,
-        relevance: 0
       },
       {
         className: 'link',
+        relevance: 0,
         begin: '\\]\\(', end: '\\)',
-        excludeBegin: true, excludeEnd: true
+        excludeBegin: true,
+        excludeEnd: true
       },
       {
         className: 'symbol',
+        relevance: 0,
         begin: '\\]\\[', end: '\\]',
-        excludeBegin: true, excludeEnd: true
+        excludeBegin: true,
+        excludeEnd: true
       }
-    ],
-    relevance: 10
+    ]
   };
   const BOLD = {
     className: 'strong',
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 75ca4051dc..7bc1379b6b 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -4,7 +4,12 @@ Website: https://www.w3.org/XML/
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
+  // Element names can contain letters, digits, hyphens, underscores, and periods
+  var TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
   var XML_IDENT_RE = '[A-Za-z0-9\\._:-]+';
   var XML_ENTITIES = {
     className: 'symbol',
@@ -124,16 +129,53 @@ export default function(hljs) {
           subLanguage: ['javascript', 'handlebars', 'xml']
         }
       },
+      // we need this for now for jSX
+      {
+        className: 'tag',
+        begin: /<>|<\/>/,
+      },
+      // open tag
       {
         className: 'tag',
-        begin: '</?', end: '/?>',
+        begin: regex.concat(
+          /</,
+          regex.lookahead(regex.concat(
+            TAG_NAME_RE,
+            // <tag/>
+            // <tag>
+            // <tag ...
+            regex.either(/\/>/, />/, /\s/)
+          ))
+        ),
+        end: /\/?>/,
+        contains: [{
+          className: 'name',
+          begin: TAG_NAME_RE,
+          relevance: 0,
+          starts: TAG_INTERNALS
+        }]
+      },
+      // close tag
+      {
+        className: 'tag',
+        begin: regex.concat(
+          /<\//,
+          regex.lookahead(regex.concat(
+            TAG_NAME_RE, />/
+          ))
+        ),
         contains: [
           {
-            className: 'name', begin: /[^\/><\s]+/, relevance: 0
+            className: 'name',
+            begin: TAG_NAME_RE,
+            relevance: 0
           },
-          TAG_INTERNALS
+          {
+            begin: />/,
+            relevance: 0
+          }
         ]
-      }
+      },
     ]
   };
 }
diff --git a/tools/checkAutoDetect.js b/tools/checkAutoDetect.js
old mode 100644
new mode 100755
index 2b859c60b2..4836a557b0
--- a/tools/checkAutoDetect.js
+++ b/tools/checkAutoDetect.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 'use strict';
 
 let fs       = require('fs')

From 4110fdad8c16abf33236a9be9fbcd10d4ec0fc50 Mon Sep 17 00:00:00 2001
From: Vladimir Jimenez <allejo@me.com>
Date: Mon, 2 Nov 2020 18:19:09 -0800
Subject: [PATCH 110/223] (chore) Update badge on README to point to GHA
 (#2822)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8a2daf8e9..3ca3305195 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Highlight.js
 
-[![Build Status](https://travis-ci.org/highlightjs/highlight.js.svg?branch=master)](https://travis-ci.org/highlightjs/highlight.js) [![Greenkeeper badge](https://badges.greenkeeper.io/highlightjs/highlight.js.svg)](https://greenkeeper.io/) [![install size](https://packagephobia.now.sh/badge?p=highlight.js)](https://packagephobia.now.sh/result?p=highlight.js)
+[![Build CI](https://github.com/highlightjs/highlight.js/workflows/Node.js%20CI/badge.svg)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) [![Greenkeeper badge](https://badges.greenkeeper.io/highlightjs/highlight.js.svg)](https://greenkeeper.io/) [![install size](https://packagephobia.now.sh/badge?p=highlight.js)](https://packagephobia.now.sh/result?p=highlight.js)
 
 Highlight.js is a syntax highlighter written in JavaScript. It works in
 the browser as well as on the server. It works with pretty much any

From 97935cc9d28baf7559ac08dba6582b46cebdc61a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 21:30:18 -0500
Subject: [PATCH 111/223] chore(docs) Snyk badge vs Greenkeeper

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3ca3305195..24903bd345 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Highlight.js
 
-[![Build CI](https://github.com/highlightjs/highlight.js/workflows/Node.js%20CI/badge.svg)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) [![Greenkeeper badge](https://badges.greenkeeper.io/highlightjs/highlight.js.svg)](https://greenkeeper.io/) [![install size](https://packagephobia.now.sh/badge?p=highlight.js)](https://packagephobia.now.sh/result?p=highlight.js)
+[![Build CI](https://github.com/highlightjs/highlight.js/workflows/Node.js%20CI/badge.svg)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) [![Known Vulnerabilities](https://snyk.io/test/github/highlightjs/highlight.js/badge.svg?targetFile=package.json)](https://snyk.io/test/github/highlightjs/highlight.js?targetFile=package.json) [![install size](https://packagephobia.now.sh/badge?p=highlight.js)](https://packagephobia.now.sh/result?p=highlight.js)
 
 Highlight.js is a syntax highlighter written in JavaScript. It works in
 the browser as well as on the server. It works with pretty much any

From 85ac4ac7235587072d6089e091b76e3f34ec2273 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 2 Nov 2020 22:28:24 -0500
Subject: [PATCH 112/223] add missing changelog entry for utf-u work

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3ad3aaa345..1ee8915e53 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 Parser:
 
 - fix(vue): Language name now appears in CSS class (#2807) [Michael Rush][]
+- (chore) Clean up all regexs to be UTF-8 compliant/ready (#2759) [Josh Goebel][]
 
 New Languages:
 

From e0d613761906b873ca212d84fb55f53d4f253037 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 3 Nov 2020 09:57:26 -0500
Subject: [PATCH 113/223] chore(docs) update core team list

---
 AUTHORS.txt | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 68fca2ed14..3acc5ec44a 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -2,20 +2,27 @@ Syntax highlighting with language autodetection.
 
 URL:   https://highlightjs.org/
 
-Current core developers (alphabetical):
+
+Current Core Team:
+
+- Josh Goebel <hello@joshgoebel.com> (maintainer)
+- Egor Rogov <e.rogov@postgrespro.ru>
+- Vladimir Jimenez <me@allejo.io>
+
+Former maintainers:
+
+- Ivan Sagalaev <maniac@softwaremaniacs.org> (original author)
+- Jeremy Hull <sourdrums@gmail.com>
+- Oleg Efimov <efimovov@gmail.com>
+
+Former Core Team members:
 
 - Gidi Meir Morris <gidi@gidi.io>
 - Jan T. Sott <git@idleberg.com>
 - Li Xuanji <xuanji@gmail.com>
 - Marcos Cáceres <marcos@marcosc.com>
 - Sang Dang <sang.dang@polku.io>
-- Josh Goebel <hello@joshgoebel.com>
-
-Former maintainers:
 
-- Ivan Sagalaev (original author) <maniac@softwaremaniacs.org>
-- Jeremy Hull <sourdrums@gmail.com>
-- Oleg Efimov <efimovov@gmail.com>
 
 Contributors:
 

From fb3e3735619e3e88652d97a95a978e75b3adf3a1 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Wed, 4 Nov 2020 07:30:03 -0500
Subject: [PATCH 114/223] chore(lint) Clean up src/highlight.js (#2828)

---
 src/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/highlight.js b/src/highlight.js
index f827f1dd79..538541d498 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -588,7 +588,7 @@ const HLJS = function(hljs) {
     );
     results.unshift(plaintext); // plaintext is always an option
 
-    const sorted = results.sort((a,b) => {
+    const sorted = results.sort((a, b) => {
       // sort base on relevance
       return b.relevance - a.relevance;
 

From b73e6c92bf67a4e0d0330ea7723ecf65e122f71e Mon Sep 17 00:00:00 2001
From: Kyle Brown <kylebrw@gmail.com>
Date: Wed, 4 Nov 2020 07:35:15 -0500
Subject: [PATCH 115/223] fix(vue) Vue.js component should not require `hljs`
 global work (#2816)

* closes #2815
---
 AUTHORS.txt        |   1 +
 CHANGES.md         |   3 +-
 src/highlight.js   |   4 +-
 src/plugins/vue.js | 106 +++++++++++++++++++++++----------------------
 4 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 3acc5ec44a..56eda98394 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -305,3 +305,4 @@ Contributors:
 - Jonathan Sharpe <mail@jonrshar.pe>
 - Michael Rush <michaelrush@gmail.com>
 - Florian Bezdeka <florian@bezdeka.de>
+- Kyle Brown <kylebrown9@github>
diff --git a/CHANGES.md b/CHANGES.md
index 1ee8915e53..17b44a0a11 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@ Language Improvements:
 Dev Improvements:
 
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
+- fix(dev) the Vue.js plugin no longer throws an exception when hljs is not in the global namespace [Kyle Brown][]
 
 New themes:
 
@@ -39,7 +40,7 @@ New themes:
 [Jan Pilzer]: https://github.com/Hirse
 [Jonathan Sharpe]: https://github.com/textbook
 [Michael Rush]: https://github.com/rushimusmaximus
-
+[Kyle Brown]: https://github.com/kylebrown9
 
 ## Version 10.3.1
 
diff --git a/src/highlight.js b/src/highlight.js
index 538541d498..38a55681ae 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -11,7 +11,7 @@ import * as utils from './lib/utils.js';
 import * as MODES from './lib/modes.js';
 import { compileLanguage } from './lib/mode_compiler.js';
 import * as packageJSON from '../package.json';
-import { VuePlugin } from "./plugins/vue.js";
+import { BuildVuePlugin } from "./plugins/vue.js";
 
 const escape = utils.escapeHTML;
 const inherit = utils.inherit;
@@ -874,7 +874,7 @@ const HLJS = function(hljs) {
     inherit,
     addPlugin,
     // plugins for frameworks
-    vuePlugin: VuePlugin
+    vuePlugin: BuildVuePlugin(hljs).VuePlugin
   });
 
   hljs.debugMode = function() { SAFE_MODE = false; };
diff --git a/src/plugins/vue.js b/src/plugins/vue.js
index e61346fab2..3d331ebd7d 100644
--- a/src/plugins/vue.js
+++ b/src/plugins/vue.js
@@ -5,59 +5,63 @@ function hasValueOrEmptyAttribute(value) {
   return Boolean(value || value === "");
 }
 
-export const Component = {
-  props: ["language", "code", "autodetect"],
-  data: function() {
-    return {
-      detectedLanguage: "",
-      unknownLanguage: false
-    };
-  },
-  computed: {
-    className() {
-      if (this.unknownLanguage) return "";
-
-      return "hljs " + this.detectedLanguage;
+export function BuildVuePlugin(hljs) {
+  const Component = {
+    props: ["language", "code", "autodetect"],
+    data: function() {
+      return {
+        detectedLanguage: "",
+        unknownLanguage: false
+      };
     },
-    highlighted() {
-      // no idea what language to use, return raw code
-      if (!this.autoDetect && !hljs.getLanguage(this.language)) {
-        console.warn(`The language "${this.language}" you specified could not be found.`);
-        this.unknownLanguage = true;
-        return escapeHTML(this.code);
-      }
-
-      let result;
-      if (this.autoDetect) {
-        result = hljs.highlightAuto(this.code);
-        this.detectedLanguage = result.language;
-      } else {
-        result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
-        this.detectedLanguage = this.language;
+    computed: {
+      className() {
+        if (this.unknownLanguage) return "";
+  
+        return "hljs " + this.detectedLanguage;
+      },
+      highlighted() {
+        // no idea what language to use, return raw code
+        if (!this.autoDetect && !hljs.getLanguage(this.language)) {
+          console.warn(`The language "${this.language}" you specified could not be found.`);
+          this.unknownLanguage = true;
+          return escapeHTML(this.code);
+        }
+  
+        let result;
+        if (this.autoDetect) {
+          result = hljs.highlightAuto(this.code);
+          this.detectedLanguage = result.language;
+        } else {
+          result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
+          this.detectedLanguage = this.language;
+        }
+        return result.value;
+      },
+      autoDetect() {
+        return !this.language || hasValueOrEmptyAttribute(this.autodetect);
+      },
+      ignoreIllegals() {
+        return true;
       }
-      return result.value;
     },
-    autoDetect() {
-      return !this.language || hasValueOrEmptyAttribute(this.autodetect);
-    },
-    ignoreIllegals() {
-      return true;
+    // this avoids needing to use a whole Vue compilation pipeline just
+    // to build Highlight.js
+    render(createElement) {
+      return createElement("pre", {}, [
+        createElement("code", {
+          class: this.className,
+          domProps: { innerHTML: this.highlighted }})
+      ]);
+    }
+    // template: `<pre><code :class="className" v-html="highlighted"></code></pre>`
+  };
+  
+  const VuePlugin = {
+    install(Vue) {
+      Vue.component('highlightjs', Component);
     }
-  },
-  // this avoids needing to use a whole Vue compilation pipeline just
-  // to build Highlight.js
-  render(createElement) {
-    return createElement("pre", {}, [
-      createElement("code", {
-        class: this.className,
-        domProps: { innerHTML: this.highlighted }})
-    ]);
-  }
-  // template: `<pre><code :class="className" v-html="highlighted"></code></pre>`
-};
+  };
 
-export const VuePlugin = {
-  install(Vue) {
-    Vue.component('highlightjs', Component);
-  }
-};
+  return { Component, VuePlugin };
+}

From 5cf255f84ee59e032148a11e8d98eeba5dbb1180 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Wed, 4 Nov 2020 12:53:25 -0500
Subject: [PATCH 116/223] enh(swift) Match numeric literals per language
 reference (#2829)

Reference:
https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_numeric-literal

Fixes #2824.

For cross-language consistency (and the inability to distinguish from the `-` operator), numeric literals never include a leading `-`.
---
 CHANGES.md                           |  1 +
 src/languages/swift.js               | 31 ++++++++++++---
 test/markup/swift/numbers.expect.txt | 56 ++++++++++++++++++++++++++++
 test/markup/swift/numbers.txt        | 56 ++++++++++++++++++++++++++++
 4 files changed, 138 insertions(+), 6 deletions(-)
 create mode 100644 test/markup/swift/numbers.expect.txt
 create mode 100644 test/markup/swift/numbers.txt

diff --git a/CHANGES.md b/CHANGES.md
index 17b44a0a11..76ed1a7609 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Language Improvements:
 - enh(ruby) Match numeric literals per language documentation [Richard Gibson][]
 - enh(javascript) Match numeric literals per ECMA-262 spec [Richard Gibson][]
 - enh(java) Match numeric literals per Java Language Specification [Richard Gibson][]
+- enh(swift) Match numeric literals per language reference [Richard Gibson][]
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 - fix(python) Handle comments on decorators (#2804) [Jonathan Sharpe][]
 - enh(diff) improve highlighting of diff for git patches [Florian Bezdeka][]
diff --git a/src/languages/swift.js b/src/languages/swift.js
index bad2cbb184..2ee2232fc8 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -69,12 +69,31 @@ export default function(hljs) {
       {begin: /"/, end: /"/},
     ]
   };
-  var NUMBERS = {
+
+  // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_numeric-literal
+  // TODO: Update for leading `-` after lookbehind is supported everywhere
+  var decimalDigits = '([0-9]_*)+';
+  var hexDigits = '([0-9a-fA-F]_*)+';
+  var NUMBER = {
       className: 'number',
-      begin: '\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b',
-      relevance: 0
+      relevance: 0,
+      variants: [
+        // decimal floating-point-literal (subsumes decimal-literal)
+        { begin: `\\b(${decimalDigits})(\\.(${decimalDigits}))?` +
+          `([eE][+-]?(${decimalDigits}))?\\b` },
+
+        // hexadecimal floating-point-literal (subsumes hexadecimal-literal)
+        { begin: `\\b0x(${hexDigits})(\\.(${hexDigits}))?` +
+          `([pP][+-]?(${decimalDigits}))?\\b` },
+
+        // octal-literal
+        { begin: /\b0o([0-7]_*)+\b/ },
+
+        // binary-literal
+        { begin: /\b0b([01]_*)+\b/ },
+      ]
   };
-  SUBST.contains = [NUMBERS];
+  SUBST.contains = [NUMBER];
 
   return {
     name: 'Swift',
@@ -85,7 +104,7 @@ export default function(hljs) {
       BLOCK_COMMENT,
       OPTIONAL_USING_TYPE,
       TYPE,
-      NUMBERS,
+      NUMBER,
       {
         className: 'function',
         beginKeywords: 'func', end: /\{/, excludeEnd: true,
@@ -102,7 +121,7 @@ export default function(hljs) {
             keywords: SWIFT_KEYWORDS,
             contains: [
               'self',
-              NUMBERS,
+              NUMBER,
               STRING,
               hljs.C_BLOCK_COMMENT_MODE,
               {begin: ':'} // relevance booster
diff --git a/test/markup/swift/numbers.expect.txt b/test/markup/swift/numbers.expect.txt
new file mode 100644
index 0000000000..95eb9a2c2b
--- /dev/null
+++ b/test/markup/swift/numbers.expect.txt
@@ -0,0 +1,56 @@
+<span class="hljs-number">1</span>;  <span class="hljs-number">10</span>;  <span class="hljs-number">999</span>;    <span class="hljs-number">0</span>; <span class="hljs-number">00</span>;  <span class="hljs-number">000</span>;     <span class="hljs-number">08</span>;   <span class="hljs-number">019</span>
+<span class="hljs-number">1_</span>; <span class="hljs-number">1_0</span>; <span class="hljs-number">9_9__9</span>; <span class="hljs-number">0</span>; <span class="hljs-number">0_0</span>; <span class="hljs-number">0_0_0__</span>; <span class="hljs-number">0__8</span>; <span class="hljs-number">01_9</span>
+
+<span class="hljs-number">0b0</span>;  <span class="hljs-number">0b11</span>;  <span class="hljs-number">0b000</span>;  <span class="hljs-number">0b010</span>;  <span class="hljs-number">0b01011</span>
+<span class="hljs-number">0b0_</span>; <span class="hljs-number">0b1_1</span>; <span class="hljs-number">0b0_00</span>; <span class="hljs-number">0b01_0</span>; <span class="hljs-number">0b01__0_1__1_</span>
+
+<span class="hljs-number">0o77</span>;   <span class="hljs-number">0o0</span>; <span class="hljs-number">0o01</span>;  <span class="hljs-number">0o777</span>;   <span class="hljs-number">0o644</span>
+<span class="hljs-number">0o7_7_</span>; <span class="hljs-number">0o0</span>; <span class="hljs-number">0o0_1</span>; <span class="hljs-number">0o77__7</span>; <span class="hljs-number">0o6_44__</span>
+
+<span class="hljs-number">0x0</span>;  <span class="hljs-number">0xa0</span>;   <span class="hljs-number">0x7FFF</span>;  <span class="hljs-number">0xd3aD</span>
+<span class="hljs-number">0x0_</span>; <span class="hljs-number">0xa__0</span>; <span class="hljs-number">0x7F_FF</span>; <span class="hljs-number">0xd3_aD__</span>
+
+
+<span class="hljs-number">4.2</span>;  <span class="hljs-number">4.20</span>;   <span class="hljs-number">88.0</span>;  <span class="hljs-number">13.37</span>
+<span class="hljs-number">4.2_</span>; <span class="hljs-number">4.2__0</span>; <span class="hljs-number">8_8.0</span>; <span class="hljs-number">13_.3_7__</span>
+
+<span class="hljs-number">0e10</span>;  <span class="hljs-number">0.00e+10</span>;    <span class="hljs-number">9e-10</span>;     <span class="hljs-number">4.2E10</span>;   <span class="hljs-number">40.0E+10</span>;    <span class="hljs-number">0e100</span>;   <span class="hljs-number">1010e+10</span>
+<span class="hljs-number">0e1_0</span>; <span class="hljs-number">0.0__0e+1_0</span>; <span class="hljs-number">9_e-1__0_</span>; <span class="hljs-number">4.2_E1_0</span>; <span class="hljs-number">4_0_.0E+1_0</span>; <span class="hljs-number">0e1_0_0</span>; <span class="hljs-number">10_10e+10_</span>
+
+<span class="hljs-number">0x0p0</span>;   <span class="hljs-number">0x1.ep6</span>;   <span class="hljs-number">0xa0p+01</span>;    <span class="hljs-number">0x0.7FFp-18</span>;        <span class="hljs-number">0xd3aD.B00p9</span>
+<span class="hljs-number">0x0_P0_</span>; <span class="hljs-number">0x1__.Ep6</span>; <span class="hljs-number">0xa_0p+0__1</span>; <span class="hljs-number">0x0.7__F_F_P-1__8_</span>; <span class="hljs-number">0xd__3_aD.b00__p9</span>
+
+
+<span class="hljs-comment">// expressions containing numeric literals</span>
++<span class="hljs-number">0</span>
++-<span class="hljs-number">1</span>
+<span class="hljs-number">2</span>-<span class="hljs-number">3</span>
+-<span class="hljs-number">10</span>.magnitude
+fn(-<span class="hljs-number">5</span>)
+<span class="hljs-number">0x2</span>.p2
+
+<span class="hljs-comment">// expressions not containing numeric literals</span>
+fn(x0.d);
+
+<span class="hljs-comment">// pseudo-expressions containing numeric literals</span>
+.<span class="hljs-number">0</span>
+<span class="hljs-number">0</span>.
+
+<span class="hljs-comment">// invalid pseudo-numeric expressions</span>
+_0
+0b_0
+0b02
+0B0
+0o_0
+0o08
+0O7
+0x_0
+0x0G
+0X0
+1e_1
+
+0b1e1
+0o1e1
+
+0x0pA
+0x.1p1
diff --git a/test/markup/swift/numbers.txt b/test/markup/swift/numbers.txt
new file mode 100644
index 0000000000..c46986cb9a
--- /dev/null
+++ b/test/markup/swift/numbers.txt
@@ -0,0 +1,56 @@
+1;  10;  999;    0; 00;  000;     08;   019
+1_; 1_0; 9_9__9; 0; 0_0; 0_0_0__; 0__8; 01_9
+
+0b0;  0b11;  0b000;  0b010;  0b01011
+0b0_; 0b1_1; 0b0_00; 0b01_0; 0b01__0_1__1_
+
+0o77;   0o0; 0o01;  0o777;   0o644
+0o7_7_; 0o0; 0o0_1; 0o77__7; 0o6_44__
+
+0x0;  0xa0;   0x7FFF;  0xd3aD
+0x0_; 0xa__0; 0x7F_FF; 0xd3_aD__
+
+
+4.2;  4.20;   88.0;  13.37
+4.2_; 4.2__0; 8_8.0; 13_.3_7__
+
+0e10;  0.00e+10;    9e-10;     4.2E10;   40.0E+10;    0e100;   1010e+10
+0e1_0; 0.0__0e+1_0; 9_e-1__0_; 4.2_E1_0; 4_0_.0E+1_0; 0e1_0_0; 10_10e+10_
+
+0x0p0;   0x1.ep6;   0xa0p+01;    0x0.7FFp-18;        0xd3aD.B00p9
+0x0_P0_; 0x1__.Ep6; 0xa_0p+0__1; 0x0.7__F_F_P-1__8_; 0xd__3_aD.b00__p9
+
+
+// expressions containing numeric literals
++0
++-1
+2-3
+-10.magnitude
+fn(-5)
+0x2.p2
+
+// expressions not containing numeric literals
+fn(x0.d);
+
+// pseudo-expressions containing numeric literals
+.0
+0.
+
+// invalid pseudo-numeric expressions
+_0
+0b_0
+0b02
+0B0
+0o_0
+0o08
+0O7
+0x_0
+0x0G
+0X0
+1e_1
+
+0b1e1
+0o1e1
+
+0x0pA
+0x.1p1

From 67b83beea7f7c4bedd2f4e1844588fce1f26a4d5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 4 Nov 2020 22:09:28 -0500
Subject: [PATCH 117/223] chore(deps) bump npm dependencies

---
 package-lock.json | 872 ++++++++++++----------------------------------
 package.json      |  20 +-
 2 files changed, 237 insertions(+), 655 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d659abecaf..ca1d0b3cbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,22 +40,13 @@
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
           }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "@eslint/eslintrc": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
-      "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz",
+      "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -70,18 +61,6 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -116,12 +95,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -164,13 +137,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.0.tgz",
-      "integrity": "sha512-RVt5wU9H/2H+N/ZrCasTXdGbUTkbf7Hfi9eLiA8vPQkzUJ/bLDCC3CsoZioPrNcnoyN8r0gT153dC++A4hKBQQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.1.tgz",
+      "integrity": "sha512-SNZyflefTMK2JyrPfFFzzoy2asLmZvZJ6+/L5cIqg4HfKGiW2Gr1Go1OyEVqne/U4QwmoasuMwppoBHWBWF2nA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.4.0",
-        "@typescript-eslint/scope-manager": "4.4.0",
+        "@typescript-eslint/experimental-utils": "4.6.1",
+        "@typescript-eslint/scope-manager": "4.6.1",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -187,55 +160,55 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.0.tgz",
-      "integrity": "sha512-01+OtK/oWeSJTjQcyzDztfLF1YjvKpLFo+JZmurK/qjSRcyObpIecJ4rckDoRCSh5Etw+jKfdSzVEHevh9gJ1w==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.1.tgz",
+      "integrity": "sha512-qyPqCFWlHZXkEBoV56UxHSoXW2qnTr4JrWVXOh3soBP3q0o7p4pUEMfInDwIa0dB/ypdtm7gLOS0hg0a73ijfg==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.4.0",
-        "@typescript-eslint/types": "4.4.0",
-        "@typescript-eslint/typescript-estree": "4.4.0",
+        "@typescript-eslint/scope-manager": "4.6.1",
+        "@typescript-eslint/types": "4.6.1",
+        "@typescript-eslint/typescript-estree": "4.6.1",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.4.0.tgz",
-      "integrity": "sha512-yc14iEItCxoGb7W4Nx30FlTyGpU9r+j+n1LUK/exlq2eJeFxczrz/xFRZUk2f6yzWfK+pr1DOTyQnmDkcC4TnA==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.1.tgz",
+      "integrity": "sha512-lScKRPt1wM9UwyKkGKyQDqf0bh6jm8DQ5iN37urRIXDm16GEv+HGEmum2Fc423xlk5NUOkOpfTnKZc/tqKZkDQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.4.0",
-        "@typescript-eslint/types": "4.4.0",
-        "@typescript-eslint/typescript-estree": "4.4.0",
+        "@typescript-eslint/scope-manager": "4.6.1",
+        "@typescript-eslint/types": "4.6.1",
+        "@typescript-eslint/typescript-estree": "4.6.1",
         "debug": "^4.1.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.4.0.tgz",
-      "integrity": "sha512-r2FIeeU1lmW4K3CxgOAt8djI5c6Q/5ULAgdVo9AF3hPMpu0B14WznBAtxrmB/qFVbVIB6fSx2a+EVXuhSVMEyA==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.1.tgz",
+      "integrity": "sha512-f95+80r6VdINYscJY1KDUEDcxZ3prAWHulL4qRDfNVD0I5QAVSGqFkwHERDoLYJJWmEAkUMdQVvx7/c2Hp+Bjg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.4.0",
-        "@typescript-eslint/visitor-keys": "4.4.0"
+        "@typescript-eslint/types": "4.6.1",
+        "@typescript-eslint/visitor-keys": "4.6.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.4.0.tgz",
-      "integrity": "sha512-nU0VUpzanFw3jjX+50OTQy6MehVvf8pkqFcURPAE06xFNFenMj1GPEI6IESvp7UOHAnq+n/brMirZdR+7rCrlA==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.1.tgz",
+      "integrity": "sha512-k2ZCHhJ96YZyPIsykickez+OMHkz06xppVLfJ+DY90i532/Cx2Z+HiRMH8YZQo7a4zVd/TwNBuRCdXlGK4yo8w==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.0.tgz",
-      "integrity": "sha512-Fh85feshKXwki4nZ1uhCJHmqKJqCMba+8ZicQIhNi5d5jSQFteWiGeF96DTjO8br7fn+prTP+t3Cz/a/3yOKqw==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.1.tgz",
+      "integrity": "sha512-/J/kxiyjQQKqEr5kuKLNQ1Finpfb8gf/NpbwqFFYEBjxOsZ621r9AqwS9UDRA1Rrr/eneX/YsbPAIhU2rFLjXQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.4.0",
-        "@typescript-eslint/visitor-keys": "4.4.0",
+        "@typescript-eslint/types": "4.6.1",
+        "@typescript-eslint/visitor-keys": "4.6.1",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -244,81 +217,6 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-        "@nodelib/fs.scandir": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-          "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "2.0.3",
-            "run-parallel": "^1.1.9"
-          }
-        },
-        "@nodelib/fs.stat": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-          "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
-          "dev": true
-        },
-        "@nodelib/fs.walk": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-          "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.scandir": "2.1.3",
-            "fastq": "^1.6.0"
-          }
-        },
-        "fast-glob": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-          "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.0",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.2",
-            "picomatch": "^2.2.1"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "globby": {
-          "version": "11.0.1",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-          "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.1.1",
-            "ignore": "^5.1.4",
-            "merge2": "^1.3.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "merge2": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-          "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-          "dev": true
-        },
-        "picomatch": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-          "dev": true
-        },
         "semver": {
           "version": "7.3.2",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -328,12 +226,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.4.0.tgz",
-      "integrity": "sha512-oBWeroUZCVsHLiWRdcTXJB7s1nB3taFY8WGvS23tiAlT6jXVvsdAV4rs581bgdEjOhn43q6ro7NkOiLKu6kFqA==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.1.tgz",
+      "integrity": "sha512-owABze4toX7QXwOLT3/D5a8NecZEjEWU1srqxENTfqsY3bwVnl3YYbOh6s1rp2wQKO9RTHFGjKes08FgE7SVMw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.4.0",
+        "@typescript-eslint/types": "4.6.1",
         "eslint-visitor-keys": "^2.0.0"
       },
       "dependencies": {
@@ -345,6 +243,12 @@
         }
       }
     },
+    "@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -396,9 +300,9 @@
       }
     },
     "ajv": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -414,9 +318,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true
     },
     "ansi-styles": {
@@ -474,18 +378,6 @@
         "es-abstract": "^1.17.0-next.1"
       }
     },
-    "array.prototype.map": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz",
-      "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.4"
-      }
-    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -634,13 +526,28 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "chokidar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+      "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -650,18 +557,7 @@
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
+        "readdirp": "~3.5.0"
       }
     },
     "clean-css": {
@@ -713,17 +609,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -766,9 +651,9 @@
       }
     },
     "commander": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz",
-      "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz",
+      "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==",
       "dev": true
     },
     "concat-map": {
@@ -854,12 +739,12 @@
       }
     },
     "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
       "dev": true,
       "requires": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
       }
     },
     "decamelize": {
@@ -1039,41 +924,6 @@
         }
       }
     },
-    "es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "es-get-iterator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
-      "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
-      "dev": true,
-      "requires": {
-        "es-abstract": "^1.17.4",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-          "dev": true
-        },
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -1105,13 +955,13 @@
       }
     },
     "eslint": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz",
-      "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz",
+      "integrity": "sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@eslint/eslintrc": "^0.1.3",
+        "@eslint/eslintrc": "^0.2.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -1149,62 +999,12 @@
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          },
-          "dependencies": {
-            "eslint-visitor-keys": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-              "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-              "dev": true
-            }
-          }
-        },
         "eslint-visitor-keys": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
           "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
           "dev": true
         },
-        "esrecurse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-          "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-          "dev": true,
-          "requires": {
-            "estraverse": "^5.2.0"
-          },
-          "dependencies": {
-            "estraverse": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-              "dev": true
-            }
-          }
-        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -1247,15 +1047,6 @@
           "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
         "type-check": {
           "version": "0.4.0",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -1268,9 +1059,9 @@
       }
     },
     "eslint-config-standard": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
-      "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==",
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.1.tgz",
+      "integrity": "sha512-WBBiQQZdaPyL+4sPkGWhWrHCDtvJoU195B9j8yXE9uFQnX34gMXI5CeBRm95gx3PMEZPM5OpwET10hH4F4SxCA==",
       "dev": true
     },
     "eslint-import-resolver-node": {
@@ -1449,9 +1240,9 @@
       "dev": true
     },
     "eslint-plugin-standard": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
-      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.2.tgz",
+      "integrity": "sha512-nKptN8l7jksXkwFk++PhJB3cCDTcXOEyhISIN86Ue2feJ1LFyY3PrY3/xT2keXlJSY5bpmbiTG0f885/YKAvTA==",
       "dev": true
     },
     "eslint-scope": {
@@ -1496,12 +1287,6 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -1675,13 +1460,10 @@
       }
     },
     "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "~2.0.3"
-      }
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
     },
     "flat-cache": {
       "version": "2.0.1",
@@ -1735,9 +1517,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
       "dev": true,
       "optional": true
     },
@@ -1783,9 +1565,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
-      "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -1947,9 +1729,9 @@
       "dev": true
     },
     "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz",
+      "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
       "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
@@ -1996,12 +1778,6 @@
       "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
       "dev": true
     },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -2017,12 +1793,6 @@
         "binary-extensions": "^2.0.0"
       }
     },
-    "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-      "dev": true
-    },
     "is-callable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
@@ -2056,12 +1826,6 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
-      "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==",
-      "dev": true
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2081,9 +1845,9 @@
       "dev": true
     },
     "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "dev": true
     },
     "is-potential-custom-element-name": {
@@ -2126,12 +1890,6 @@
         }
       }
     },
-    "is-set": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
-      "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==",
-      "dev": true
-    },
     "is-string": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
@@ -2171,22 +1929,6 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
-    "iterate-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz",
-      "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==",
-      "dev": true
-    },
-    "iterate-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
-      "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
-      "dev": true,
-      "requires": {
-        "es-get-iterator": "^1.0.2",
-        "iterate-iterator": "^1.0.1"
-      }
-    },
     "js-beautify": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz",
@@ -2359,43 +2101,6 @@
       "dev": true,
       "requires": {
         "chalk": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "lru-cache": {
@@ -2473,15 +2178,16 @@
       }
     },
     "mocha": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz",
-      "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz",
+      "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==",
       "dev": true,
       "requires": {
+        "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.4.2",
-        "debug": "4.1.1",
+        "chokidar": "3.4.3",
+        "debug": "4.2.0",
         "diff": "4.0.2",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
@@ -2492,17 +2198,16 @@
         "log-symbols": "4.0.0",
         "minimatch": "3.0.4",
         "ms": "2.1.2",
-        "object.assign": "4.1.0",
-        "promise.allsettled": "1.0.2",
-        "serialize-javascript": "4.0.0",
-        "strip-json-comments": "3.0.1",
-        "supports-color": "7.1.0",
+        "nanoid": "3.1.12",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "7.2.0",
         "which": "2.0.2",
         "wide-align": "1.1.3",
-        "workerpool": "6.0.0",
+        "workerpool": "6.0.2",
         "yargs": "13.3.2",
         "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.1"
+        "yargs-unparser": "2.0.0"
       },
       "dependencies": {
         "escape-string-regexp": {
@@ -2511,34 +2216,33 @@
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "js-yaml": {
-          "version": "3.14.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-          "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
+            "has-flag": "^4.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-          "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
-          "dev": true
         }
       }
     },
     "ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nanoid": {
+      "version": "3.1.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
+      "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==",
       "dev": true
     },
     "natural-compare": {
@@ -2822,19 +2526,6 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "promise.allsettled": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz",
-      "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==",
-      "dev": true,
-      "requires": {
-        "array.prototype.map": "^1.0.1",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "iterate-value": "^1.0.0"
-      }
-    },
     "proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -2952,9 +2643,9 @@
       }
     },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -3089,9 +2780,9 @@
       }
     },
     "rollup": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.29.0.tgz",
-      "integrity": "sha512-gtU0sjxMpsVlpuAf4QXienPmUAhd6Kc7owQ4f5lypoxBW18fw2UNYZ4NssLGsri6WhUZkE/Ts3EMRebN+gNLiQ==",
+      "version": "2.33.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz",
+      "integrity": "sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==",
       "dev": true,
       "requires": {
         "fsevents": "~2.1.2"
@@ -3173,9 +2864,9 @@
       "dev": true
     },
     "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -3363,13 +3054,31 @@
       "dev": true
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
       "requires": {
+        "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "strip-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "string.prototype.trimend": {
@@ -3627,12 +3336,12 @@
       }
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^5.0.0"
       }
     },
     "strip-bom": {
@@ -3648,20 +3357,12 @@
       "dev": true
     },
     "supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
-        "has-flag": "^4.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        }
+        "has-flag": "^3.0.0"
       }
     },
     "symbol-tree": {
@@ -3680,40 +3381,12 @@
         "lodash": "^4.17.14",
         "slice-ansi": "^2.1.0",
         "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
       }
     },
     "terser": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.4.tgz",
-      "integrity": "sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
+      "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -3837,9 +3510,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
-      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
+      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
       "dev": true
     },
     "uglify-js": {
@@ -3877,9 +3550,9 @@
       "dev": true
     },
     "v8-compile-cache": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -3975,6 +3648,33 @@
       "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "word-wrap": {
@@ -3990,9 +3690,9 @@
       "dev": true
     },
     "workerpool": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz",
-      "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz",
+      "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==",
       "dev": true
     },
     "wrap-ansi": {
@@ -4012,17 +3712,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -4097,12 +3786,6 @@
         "yargs-parser": "^13.1.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
         "find-up": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -4139,26 +3822,6 @@
           "requires": {
             "p-limit": "^2.0.0"
           }
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -4173,109 +3836,28 @@
       }
     },
     "yargs-unparser": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz",
-      "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
       "requires": {
-        "camelcase": "^5.3.1",
-        "decamelize": "^1.2.0",
-        "flat": "^4.1.0",
-        "is-plain-obj": "^1.1.0",
-        "yargs": "^14.2.3"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "yargs": {
-          "version": "14.2.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^15.0.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "15.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
-          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+        "decamelize": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+          "dev": true
         }
       }
     }
diff --git a/package.json b/package.json
index 23169644d2..1bb15f16f7 100644
--- a/package.json
+++ b/package.json
@@ -39,34 +39,34 @@
     "node": "*"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.4.0",
-    "@typescript-eslint/parser": "^4.4.0",
+    "@typescript-eslint/eslint-plugin": "^4.6.1",
+    "@typescript-eslint/parser": "^4.6.1",
     "clean-css": "^4.2.3",
     "cli-table": "^0.3.1",
     "colors": "^1.1.2",
-    "commander": "^6.1.0",
+    "commander": "^6.2.0",
     "del": "^6.0.0",
     "dependency-resolver": "^2.0.1",
-    "eslint": "^7.11.0",
-    "eslint-config-standard": "^14.1.1",
+    "eslint": "^7.12.1",
+    "eslint-config-standard": "^16.0.1",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.2",
     "glob": "^7.1.6",
     "glob-promise": "^3.4.0",
     "handlebars": "^4.7.6",
     "js-beautify": "^1.13.0",
     "jsdom": "^16.4.0",
     "lodash": "^4.17.20",
-    "mocha": "^8.1.3",
-    "rollup": "^2.29.0",
+    "mocha": "^8.2.1",
+    "rollup": "^2.33.1",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "should": "^13.2.3",
-    "terser": "^5.3.4",
+    "terser": "^5.3.8",
     "tiny-worker": "^2.3.0",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.5"
   },
   "dependencies": {}
 }

From ff6df7773fc2a1b394a69aef3ebfc327883673e1 Mon Sep 17 00:00:00 2001
From: Patrick Scheibe <patrick@halirutan.de>
Date: Fri, 6 Nov 2020 22:09:35 +0100
Subject: [PATCH 118/223] enh(mathematica) Much improved highlighting for
 Wolfram (#2706)

Fix several issues and implement additional features for the Wolfram Language (Mathematica)

- Include an up-to-date list of built-in symbols in a separate `lib/mathematica.js` file. It's one keyword per line and more easy to maintain.
- Fix regexp to identify symbols/variables which requires special treatment and does not follow the common `IDENT_RE` matching.
- Replace generic `C_NUMBER_MODE` matching with dedicated regular expressions for all possible numbers in Mathematica.
- Include named-characters in the matching of symbols.
- Allow for dedicated styling of
    - pattern-like forms, e.g. `par_String`
    - slots of anonymous functions, e.g. `##3`
    - message names, e.g. `myFunc::usage`
    - braces, curly braces and brackets
- Introduce `classNameAliases` to map specific styles to general styles used by all themes. This allows for using built-in themes and writing sophisticated Mathematica themes.
---
 AUTHORS.txt                         |    1 +
 CHANGES.md                          |   11 +
 docs/mode-reference.rst             |  117 +-
 src/highlight.js                    |    5 +-
 src/languages/lib/mathematica.js    | 6626 +++++++++++++++++++++++++++
 src/languages/mathematica.js        |  171 +-
 src/lib/mode_compiler.js            |    4 +
 src/lib/utils.js                    |    2 +-
 test/detect/mathematica/default.txt |   81 +-
 types/index.d.ts                    |    5 +-
 10 files changed, 6931 insertions(+), 92 deletions(-)
 create mode 100644 src/languages/lib/mathematica.js

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 56eda98394..7415a097a3 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -305,4 +305,5 @@ Contributors:
 - Jonathan Sharpe <mail@jonrshar.pe>
 - Michael Rush <michaelrush@gmail.com>
 - Florian Bezdeka <florian@bezdeka.de>
+- Patrick Scheibe <patrick@halirutan.de>
 - Kyle Brown <kylebrown9@github>
diff --git a/CHANGES.md b/CHANGES.md
index 76ed1a7609..5f08790487 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,12 +23,21 @@ Language Improvements:
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 - fix(python) Handle comments on decorators (#2804) [Jonathan Sharpe][]
 - enh(diff) improve highlighting of diff for git patches [Florian Bezdeka][]
+- enh(mathematica) Rework entire implementation [Patrick Scheibe][]
+  - Correct matching of the many variations of Mathematica's numbers
+  - Matching of named-characters aka special symbols like `\[Gamma]`
+  - Updated list of version 12.1 built-in symbols
+  - Matching of patterns, slots, message-names and braces
 
 Dev Improvements:
 
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
 - fix(dev) the Vue.js plugin no longer throws an exception when hljs is not in the global namespace [Kyle Brown][]
 
+Parser:
+
+- enh(grammars) allow `classNameAliases` for more complex grammars [Josh Goebel][]
+
 New themes:
 
 - *StackOverflow Dark* by [Jan Pilzer][]
@@ -41,8 +50,10 @@ New themes:
 [Jan Pilzer]: https://github.com/Hirse
 [Jonathan Sharpe]: https://github.com/textbook
 [Michael Rush]: https://github.com/rushimusmaximus
+[Patrick Scheibe]: https://github.com/halirutan
 [Kyle Brown]: https://github.com/kylebrown9
 
+
 ## Version 10.3.1
 
 Prior version let some look-behind regex sneak in, which does not work
diff --git a/docs/mode-reference.rst b/docs/mode-reference.rst
index c32e705d43..4c058a5e63 100644
--- a/docs/mode-reference.rst
+++ b/docs/mode-reference.rst
@@ -1,4 +1,4 @@
-Mode reference
+Mode Reference
 ==============
 
 Types
@@ -23,13 +23,24 @@ Types of attributes values in this reference:
 +------------+-------------------------------------------------------------------------------------+
 
 
-Attributes
-----------
+Language Only Attributes
+------------------------
+
+These attributes are only valid at the language level (ie, they many only exist on the top-most language object and have no meaning if specified in children modes).
+
+
+name
+^^^^
+
+- **type**: string
+
+The canonical name of this language, ie "JavaScript", etc.
+
 
 case_insensitive
 ^^^^^^^^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Case insensitivity of language keywords and regexps. Used only on the top-level mode.
 
@@ -37,15 +48,56 @@ Case insensitivity of language keywords and regexps. Used only on the top-level
 aliases
 ^^^^^^^
 
-**type**: array
+- **type**: array
 
 A list of additional names (besides the canonical one given by the filename) that can be used to identify a language in HTML classes and in a call to :ref:`getLanguage <getLanguage>`.
 
 
+classNameAliases
+^^^^^^^^^^^^^^^^
+
+- **type**: object
+
+A mapping table of any custom class names your grammar uses and their supported  equivalencies.  Perhaps your language has a concept of "slots" that roughly correspond to variables in other languages.  This allows you to write grammar code like:
+
+::
+
+  {
+    classNameAliases: {
+      slot: "variable",
+      "message-name": "string"
+    },
+    contains: [
+      {
+        className: "slot",
+        begin: // ...
+      }
+    ]
+  }
+
+The final HTML output will render slots with the CSS class as ``hljs-variable``.  This feature exists to make it easier for grammar maintainers to think in their own language when maintaining a grammar.
+
+For a list of all supported class names please see the :doc:`CSS class reference
+</css-classes-reference>`.
+
+
+disableAutodetect
+^^^^^^^^^^^^^^^^^
+
+- **type**: boolean
+
+Disables autodetection for this language.
+
+
+
+Mode Attributes
+---------------
+
+
 className
 ^^^^^^^^^
 
-**type**: identifier
+- **type**: identifier
 
 The name of the mode. It is used as a class name in HTML markup.
 
@@ -56,16 +108,16 @@ for one thing like string in single or double quotes.
 begin
 ^^^^^
 
-**type**: regexp
+- **type**: regexp
 
 Regular expression starting a mode. For example a single quote for strings or two forward slashes for C-style comments.
 If absent, ``begin`` defaults to a regexp that matches anything, so the mode starts immediately.
 
 
 on:begin
-^^^^^^^^^^^
+^^^^^^^^
 
-**type**: callback (matchData, response)
+- **type**: callback (matchData, response)
 
 This callback is triggered the moment a begin match is detected. ``matchData`` includes the typical regex match data; the full match, match groups, etc. The ``response`` object is used to tell the parser how it should handle the match. It can be also used to temporarily store data.
 
@@ -78,7 +130,7 @@ For an example of usage see ``END_SAME_AS_BEGIN`` in ``modes.js``.
 end
 ^^^
 
-**type**: regexp
+- **type**: regexp
 
 Regular expression ending a mode. For example a single quote for strings or "$" (end of line) for one-line comments.
 
@@ -93,9 +145,9 @@ This is achieved with :ref:`endsWithParent <endsWithParent>` attribute.
 
 
 on:end
-^^^^^^^^^^^
+^^^^^^
 
-**type**: callback (matchData, response)
+- **type**: callback (matchData, response)
 
 This callback is triggered the moment an end match is detected. ``matchData`` includes the typical regex match data; the full match, match groups, etc. The ``response`` object is used to tell the parser how it should handle the match. It can also be used to retrieve data stored from a `begin` callback.
 
@@ -106,9 +158,9 @@ For an example of usage see ``END_SAME_AS_BEGIN`` in ``modes.js``.
 
 
 beginKeywords
-^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^
 
-**type**: string
+- **type**: string
 
 Used instead of ``begin`` for modes starting with keywords to avoid needless repetition:
 
@@ -140,7 +192,7 @@ Ex. ``class A { ... }`` would match while ``A.class == B.class`` would not.
 endsWithParent
 ^^^^^^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 A flag showing that a mode ends when its parent ends.
 
@@ -169,7 +221,7 @@ This is when ``endsWithParent`` comes into play:
 endsParent
 ^^^^^^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Forces closing of the parent mode right after the current mode is closed.
 
@@ -215,7 +267,7 @@ endSameAsBegin (deprecated as of 10.1)
 ``END_SAME_AS_BEGIN`` mode or use the ``on:begin`` and ``on:end`` attributes to
 build more complex paired matchers.
 
-**type**: boolean
+- **type**: boolean
 
 Acts as ``end`` matching exactly the same string that was found by the
 corresponding ``begin`` regexp.
@@ -244,7 +296,7 @@ and ``endSameAsBegin: true``.
 lexemes (now keywords.$pattern)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**type**: regexp
+- **type**: regexp
 
 A regular expression that extracts individual "words" from the code to compare
 against :ref:`keywords <keywords>`. The default value is ``\w+`` which works for
@@ -260,7 +312,7 @@ constant that you repeat multiple times within different modes of your grammar.
 keywords
 ^^^^^^^^
 
-**type**: object
+- **type**: object / string
 
 Keyword definition comes in two forms:
 
@@ -273,7 +325,7 @@ For detailed explanation see :doc:`Language definition guide </language-guide>`.
 illegal
 ^^^^^^^
 
-**type**: regexp
+- **type**: regexp
 
 A regular expression that defines symbols illegal for the mode.
 When the parser finds a match for illegal expression it immediately drops parsing the whole language altogether.
@@ -282,7 +334,7 @@ When the parser finds a match for illegal expression it immediately drops parsin
 excludeBegin, excludeEnd
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Exclude beginning or ending lexemes out of mode's generated markup. For example in CSS syntax a rule ends with a semicolon.
 However visually it's better not to color it as the rule contents. Having ``excludeEnd: true`` forces a ``<span>`` element for the rule to close before the semicolon.
@@ -291,7 +343,7 @@ However visually it's better not to color it as the rule contents. Having ``excl
 returnBegin
 ^^^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Returns just found beginning lexeme back into parser. This is used when beginning of a sub-mode is a complex expression
 that should not only be found within a parent mode but also parsed according to the rules of a sub-mode.
@@ -302,7 +354,7 @@ Since the parser is effectively goes back it's quite possible to create a infini
 returnEnd
 ^^^^^^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Returns just found ending lexeme back into parser. This is used for example to parse JavaScript embedded into HTML.
 A JavaScript block ends with the HTML closing tag ``</script>`` that cannot be parsed with JavaScript rules.
@@ -314,7 +366,7 @@ Since the parser is effectively goes back it's quite possible to create a infini
 contains
 ^^^^^^^^
 
-**type**: array
+- **type**: array
 
 The list of sub-modes that can be found inside the mode. For detailed explanation see :doc:`Language definition guide </language-guide>`.
 
@@ -322,7 +374,7 @@ The list of sub-modes that can be found inside the mode. For detailed explanatio
 starts
 ^^^^^^
 
-**type**: identifier
+- **type**: identifier
 
 The name of the mode that will start right after the current mode ends. The new mode won't be contained within the current one.
 
@@ -333,7 +385,7 @@ Tags ``<script>`` and ``<style>`` start sub-modes that use another language defi
 variants
 ^^^^^^^^
 
-**type**: array
+- **type**: array
 
 Modification to the main definitions of the mode, effectively expanding it into several similar modes
 each having all the attributes from the main definition augmented or overridden by the variants::
@@ -366,10 +418,11 @@ Further info: https://github.com/highlightjs/highlight.js/issues/826
 
 .. _subLanguage:
 
+
 subLanguage
 ^^^^^^^^^^^
 
-**type**: string or array
+- **type**: string or array
 
 Highlights the entire contents of the mode with another language.
 
@@ -381,10 +434,11 @@ The value of the attribute controls which language or languages will be used for
 * empty array: auto detection with all the languages available
 * array of language names: auto detection constrained to the specified set
 
+
 skip
 ^^^^
 
-**type**: boolean
+- **type**: boolean
 
 Skips any markup processing for the mode ensuring that it remains a part of its
 parent buffer along with the starting and the ending lexemes. This works in
@@ -407,10 +461,3 @@ handle pairs of ``/* .. */`` to correctly find the ending ``?>``::
 Without ``skip: true`` every comment would cause the parser to drop out back
 into the HTML mode.
 
-disableAutodetect
-^^^^^^^^^^^^^^^^^
-
-**type**: boolean
-
-Disables autodetection for this language.
-
diff --git a/src/highlight.js b/src/highlight.js
index 38a55681ae..0bfcd7c742 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -174,7 +174,8 @@ const HLJS = function(hljs) {
           buf = "";
 
           relevance += keywordRelevance;
-          emitter.addKeyword(match[0], kind);
+          const cssClass = language.classNameAliases[kind] || kind;
+          emitter.addKeyword(match[0], cssClass);
         } else {
           buf += match[0];
         }
@@ -225,7 +226,7 @@ const HLJS = function(hljs) {
      */
     function startNewMode(mode) {
       if (mode.className) {
-        emitter.openNode(mode.className);
+        emitter.openNode(language.classNameAliases[mode.className] || mode.className);
       }
       top = Object.create(mode, { parent: { value: top } });
       return top;
diff --git a/src/languages/lib/mathematica.js b/src/languages/lib/mathematica.js
new file mode 100644
index 0000000000..1169ff2f20
--- /dev/null
+++ b/src/languages/lib/mathematica.js
@@ -0,0 +1,6626 @@
+export const SYSTEM_SYMBOLS = [
+  "AASTriangle",
+  "AbelianGroup",
+  "Abort",
+  "AbortKernels",
+  "AbortProtect",
+  "AbortScheduledTask",
+  "Above",
+  "Abs",
+  "AbsArg",
+  "AbsArgPlot",
+  "Absolute",
+  "AbsoluteCorrelation",
+  "AbsoluteCorrelationFunction",
+  "AbsoluteCurrentValue",
+  "AbsoluteDashing",
+  "AbsoluteFileName",
+  "AbsoluteOptions",
+  "AbsolutePointSize",
+  "AbsoluteThickness",
+  "AbsoluteTime",
+  "AbsoluteTiming",
+  "AcceptanceThreshold",
+  "AccountingForm",
+  "Accumulate",
+  "Accuracy",
+  "AccuracyGoal",
+  "ActionDelay",
+  "ActionMenu",
+  "ActionMenuBox",
+  "ActionMenuBoxOptions",
+  "Activate",
+  "Active",
+  "ActiveClassification",
+  "ActiveClassificationObject",
+  "ActiveItem",
+  "ActivePrediction",
+  "ActivePredictionObject",
+  "ActiveStyle",
+  "AcyclicGraphQ",
+  "AddOnHelpPath",
+  "AddSides",
+  "AddTo",
+  "AddToSearchIndex",
+  "AddUsers",
+  "AdjacencyGraph",
+  "AdjacencyList",
+  "AdjacencyMatrix",
+  "AdjacentMeshCells",
+  "AdjustmentBox",
+  "AdjustmentBoxOptions",
+  "AdjustTimeSeriesForecast",
+  "AdministrativeDivisionData",
+  "AffineHalfSpace",
+  "AffineSpace",
+  "AffineStateSpaceModel",
+  "AffineTransform",
+  "After",
+  "AggregatedEntityClass",
+  "AggregationLayer",
+  "AircraftData",
+  "AirportData",
+  "AirPressureData",
+  "AirTemperatureData",
+  "AiryAi",
+  "AiryAiPrime",
+  "AiryAiZero",
+  "AiryBi",
+  "AiryBiPrime",
+  "AiryBiZero",
+  "AlgebraicIntegerQ",
+  "AlgebraicNumber",
+  "AlgebraicNumberDenominator",
+  "AlgebraicNumberNorm",
+  "AlgebraicNumberPolynomial",
+  "AlgebraicNumberTrace",
+  "AlgebraicRules",
+  "AlgebraicRulesData",
+  "Algebraics",
+  "AlgebraicUnitQ",
+  "Alignment",
+  "AlignmentMarker",
+  "AlignmentPoint",
+  "All",
+  "AllowAdultContent",
+  "AllowedCloudExtraParameters",
+  "AllowedCloudParameterExtensions",
+  "AllowedDimensions",
+  "AllowedFrequencyRange",
+  "AllowedHeads",
+  "AllowGroupClose",
+  "AllowIncomplete",
+  "AllowInlineCells",
+  "AllowKernelInitialization",
+  "AllowLooseGrammar",
+  "AllowReverseGroupClose",
+  "AllowScriptLevelChange",
+  "AllowVersionUpdate",
+  "AllTrue",
+  "Alphabet",
+  "AlphabeticOrder",
+  "AlphabeticSort",
+  "AlphaChannel",
+  "AlternateImage",
+  "AlternatingFactorial",
+  "AlternatingGroup",
+  "AlternativeHypothesis",
+  "Alternatives",
+  "AltitudeMethod",
+  "AmbientLight",
+  "AmbiguityFunction",
+  "AmbiguityList",
+  "Analytic",
+  "AnatomyData",
+  "AnatomyForm",
+  "AnatomyPlot3D",
+  "AnatomySkinStyle",
+  "AnatomyStyling",
+  "AnchoredSearch",
+  "And",
+  "AndersonDarlingTest",
+  "AngerJ",
+  "AngleBisector",
+  "AngleBracket",
+  "AnglePath",
+  "AnglePath3D",
+  "AngleVector",
+  "AngularGauge",
+  "Animate",
+  "AnimationCycleOffset",
+  "AnimationCycleRepetitions",
+  "AnimationDirection",
+  "AnimationDisplayTime",
+  "AnimationRate",
+  "AnimationRepetitions",
+  "AnimationRunning",
+  "AnimationRunTime",
+  "AnimationTimeIndex",
+  "Animator",
+  "AnimatorBox",
+  "AnimatorBoxOptions",
+  "AnimatorElements",
+  "Annotate",
+  "Annotation",
+  "AnnotationDelete",
+  "AnnotationKeys",
+  "AnnotationRules",
+  "AnnotationValue",
+  "Annuity",
+  "AnnuityDue",
+  "Annulus",
+  "AnomalyDetection",
+  "AnomalyDetector",
+  "AnomalyDetectorFunction",
+  "Anonymous",
+  "Antialiasing",
+  "AntihermitianMatrixQ",
+  "Antisymmetric",
+  "AntisymmetricMatrixQ",
+  "Antonyms",
+  "AnyOrder",
+  "AnySubset",
+  "AnyTrue",
+  "Apart",
+  "ApartSquareFree",
+  "APIFunction",
+  "Appearance",
+  "AppearanceElements",
+  "AppearanceRules",
+  "AppellF1",
+  "Append",
+  "AppendCheck",
+  "AppendLayer",
+  "AppendTo",
+  "Apply",
+  "ApplySides",
+  "ArcCos",
+  "ArcCosh",
+  "ArcCot",
+  "ArcCoth",
+  "ArcCsc",
+  "ArcCsch",
+  "ArcCurvature",
+  "ARCHProcess",
+  "ArcLength",
+  "ArcSec",
+  "ArcSech",
+  "ArcSin",
+  "ArcSinDistribution",
+  "ArcSinh",
+  "ArcTan",
+  "ArcTanh",
+  "Area",
+  "Arg",
+  "ArgMax",
+  "ArgMin",
+  "ArgumentCountQ",
+  "ARIMAProcess",
+  "ArithmeticGeometricMean",
+  "ARMAProcess",
+  "Around",
+  "AroundReplace",
+  "ARProcess",
+  "Array",
+  "ArrayComponents",
+  "ArrayDepth",
+  "ArrayFilter",
+  "ArrayFlatten",
+  "ArrayMesh",
+  "ArrayPad",
+  "ArrayPlot",
+  "ArrayQ",
+  "ArrayResample",
+  "ArrayReshape",
+  "ArrayRules",
+  "Arrays",
+  "Arrow",
+  "Arrow3DBox",
+  "ArrowBox",
+  "Arrowheads",
+  "ASATriangle",
+  "Ask",
+  "AskAppend",
+  "AskConfirm",
+  "AskDisplay",
+  "AskedQ",
+  "AskedValue",
+  "AskFunction",
+  "AskState",
+  "AskTemplateDisplay",
+  "AspectRatio",
+  "AspectRatioFixed",
+  "Assert",
+  "AssociateTo",
+  "Association",
+  "AssociationFormat",
+  "AssociationMap",
+  "AssociationQ",
+  "AssociationThread",
+  "AssumeDeterministic",
+  "Assuming",
+  "Assumptions",
+  "AstronomicalData",
+  "Asymptotic",
+  "AsymptoticDSolveValue",
+  "AsymptoticEqual",
+  "AsymptoticEquivalent",
+  "AsymptoticGreater",
+  "AsymptoticGreaterEqual",
+  "AsymptoticIntegrate",
+  "AsymptoticLess",
+  "AsymptoticLessEqual",
+  "AsymptoticOutputTracker",
+  "AsymptoticProduct",
+  "AsymptoticRSolveValue",
+  "AsymptoticSolve",
+  "AsymptoticSum",
+  "Asynchronous",
+  "AsynchronousTaskObject",
+  "AsynchronousTasks",
+  "Atom",
+  "AtomCoordinates",
+  "AtomCount",
+  "AtomDiagramCoordinates",
+  "AtomList",
+  "AtomQ",
+  "AttentionLayer",
+  "Attributes",
+  "Audio",
+  "AudioAmplify",
+  "AudioAnnotate",
+  "AudioAnnotationLookup",
+  "AudioBlockMap",
+  "AudioCapture",
+  "AudioChannelAssignment",
+  "AudioChannelCombine",
+  "AudioChannelMix",
+  "AudioChannels",
+  "AudioChannelSeparate",
+  "AudioData",
+  "AudioDelay",
+  "AudioDelete",
+  "AudioDevice",
+  "AudioDistance",
+  "AudioEncoding",
+  "AudioFade",
+  "AudioFrequencyShift",
+  "AudioGenerator",
+  "AudioIdentify",
+  "AudioInputDevice",
+  "AudioInsert",
+  "AudioInstanceQ",
+  "AudioIntervals",
+  "AudioJoin",
+  "AudioLabel",
+  "AudioLength",
+  "AudioLocalMeasurements",
+  "AudioLooping",
+  "AudioLoudness",
+  "AudioMeasurements",
+  "AudioNormalize",
+  "AudioOutputDevice",
+  "AudioOverlay",
+  "AudioPad",
+  "AudioPan",
+  "AudioPartition",
+  "AudioPause",
+  "AudioPitchShift",
+  "AudioPlay",
+  "AudioPlot",
+  "AudioQ",
+  "AudioRecord",
+  "AudioReplace",
+  "AudioResample",
+  "AudioReverb",
+  "AudioReverse",
+  "AudioSampleRate",
+  "AudioSpectralMap",
+  "AudioSpectralTransformation",
+  "AudioSplit",
+  "AudioStop",
+  "AudioStream",
+  "AudioStreams",
+  "AudioTimeStretch",
+  "AudioTracks",
+  "AudioTrim",
+  "AudioType",
+  "AugmentedPolyhedron",
+  "AugmentedSymmetricPolynomial",
+  "Authenticate",
+  "Authentication",
+  "AuthenticationDialog",
+  "AutoAction",
+  "Autocomplete",
+  "AutocompletionFunction",
+  "AutoCopy",
+  "AutocorrelationTest",
+  "AutoDelete",
+  "AutoEvaluateEvents",
+  "AutoGeneratedPackage",
+  "AutoIndent",
+  "AutoIndentSpacings",
+  "AutoItalicWords",
+  "AutoloadPath",
+  "AutoMatch",
+  "Automatic",
+  "AutomaticImageSize",
+  "AutoMultiplicationSymbol",
+  "AutoNumberFormatting",
+  "AutoOpenNotebooks",
+  "AutoOpenPalettes",
+  "AutoQuoteCharacters",
+  "AutoRefreshed",
+  "AutoRemove",
+  "AutorunSequencing",
+  "AutoScaling",
+  "AutoScroll",
+  "AutoSpacing",
+  "AutoStyleOptions",
+  "AutoStyleWords",
+  "AutoSubmitting",
+  "Axes",
+  "AxesEdge",
+  "AxesLabel",
+  "AxesOrigin",
+  "AxesStyle",
+  "AxiomaticTheory",
+  "Axis",
+  "BabyMonsterGroupB",
+  "Back",
+  "Background",
+  "BackgroundAppearance",
+  "BackgroundTasksSettings",
+  "Backslash",
+  "Backsubstitution",
+  "Backward",
+  "Ball",
+  "Band",
+  "BandpassFilter",
+  "BandstopFilter",
+  "BarabasiAlbertGraphDistribution",
+  "BarChart",
+  "BarChart3D",
+  "BarcodeImage",
+  "BarcodeRecognize",
+  "BaringhausHenzeTest",
+  "BarLegend",
+  "BarlowProschanImportance",
+  "BarnesG",
+  "BarOrigin",
+  "BarSpacing",
+  "BartlettHannWindow",
+  "BartlettWindow",
+  "BaseDecode",
+  "BaseEncode",
+  "BaseForm",
+  "Baseline",
+  "BaselinePosition",
+  "BaseStyle",
+  "BasicRecurrentLayer",
+  "BatchNormalizationLayer",
+  "BatchSize",
+  "BatesDistribution",
+  "BattleLemarieWavelet",
+  "BayesianMaximization",
+  "BayesianMaximizationObject",
+  "BayesianMinimization",
+  "BayesianMinimizationObject",
+  "Because",
+  "BeckmannDistribution",
+  "Beep",
+  "Before",
+  "Begin",
+  "BeginDialogPacket",
+  "BeginFrontEndInteractionPacket",
+  "BeginPackage",
+  "BellB",
+  "BellY",
+  "Below",
+  "BenfordDistribution",
+  "BeniniDistribution",
+  "BenktanderGibratDistribution",
+  "BenktanderWeibullDistribution",
+  "BernoulliB",
+  "BernoulliDistribution",
+  "BernoulliGraphDistribution",
+  "BernoulliProcess",
+  "BernsteinBasis",
+  "BesselFilterModel",
+  "BesselI",
+  "BesselJ",
+  "BesselJZero",
+  "BesselK",
+  "BesselY",
+  "BesselYZero",
+  "Beta",
+  "BetaBinomialDistribution",
+  "BetaDistribution",
+  "BetaNegativeBinomialDistribution",
+  "BetaPrimeDistribution",
+  "BetaRegularized",
+  "Between",
+  "BetweennessCentrality",
+  "BeveledPolyhedron",
+  "BezierCurve",
+  "BezierCurve3DBox",
+  "BezierCurve3DBoxOptions",
+  "BezierCurveBox",
+  "BezierCurveBoxOptions",
+  "BezierFunction",
+  "BilateralFilter",
+  "Binarize",
+  "BinaryDeserialize",
+  "BinaryDistance",
+  "BinaryFormat",
+  "BinaryImageQ",
+  "BinaryRead",
+  "BinaryReadList",
+  "BinarySerialize",
+  "BinaryWrite",
+  "BinCounts",
+  "BinLists",
+  "Binomial",
+  "BinomialDistribution",
+  "BinomialProcess",
+  "BinormalDistribution",
+  "BiorthogonalSplineWavelet",
+  "BipartiteGraphQ",
+  "BiquadraticFilterModel",
+  "BirnbaumImportance",
+  "BirnbaumSaundersDistribution",
+  "BitAnd",
+  "BitClear",
+  "BitGet",
+  "BitLength",
+  "BitNot",
+  "BitOr",
+  "BitSet",
+  "BitShiftLeft",
+  "BitShiftRight",
+  "BitXor",
+  "BiweightLocation",
+  "BiweightMidvariance",
+  "Black",
+  "BlackmanHarrisWindow",
+  "BlackmanNuttallWindow",
+  "BlackmanWindow",
+  "Blank",
+  "BlankForm",
+  "BlankNullSequence",
+  "BlankSequence",
+  "Blend",
+  "Block",
+  "BlockchainAddressData",
+  "BlockchainBase",
+  "BlockchainBlockData",
+  "BlockchainContractValue",
+  "BlockchainData",
+  "BlockchainGet",
+  "BlockchainKeyEncode",
+  "BlockchainPut",
+  "BlockchainTokenData",
+  "BlockchainTransaction",
+  "BlockchainTransactionData",
+  "BlockchainTransactionSign",
+  "BlockchainTransactionSubmit",
+  "BlockMap",
+  "BlockRandom",
+  "BlomqvistBeta",
+  "BlomqvistBetaTest",
+  "Blue",
+  "Blur",
+  "BodePlot",
+  "BohmanWindow",
+  "Bold",
+  "Bond",
+  "BondCount",
+  "BondList",
+  "BondQ",
+  "Bookmarks",
+  "Boole",
+  "BooleanConsecutiveFunction",
+  "BooleanConvert",
+  "BooleanCountingFunction",
+  "BooleanFunction",
+  "BooleanGraph",
+  "BooleanMaxterms",
+  "BooleanMinimize",
+  "BooleanMinterms",
+  "BooleanQ",
+  "BooleanRegion",
+  "Booleans",
+  "BooleanStrings",
+  "BooleanTable",
+  "BooleanVariables",
+  "BorderDimensions",
+  "BorelTannerDistribution",
+  "Bottom",
+  "BottomHatTransform",
+  "BoundaryDiscretizeGraphics",
+  "BoundaryDiscretizeRegion",
+  "BoundaryMesh",
+  "BoundaryMeshRegion",
+  "BoundaryMeshRegionQ",
+  "BoundaryStyle",
+  "BoundedRegionQ",
+  "BoundingRegion",
+  "Bounds",
+  "Box",
+  "BoxBaselineShift",
+  "BoxData",
+  "BoxDimensions",
+  "Boxed",
+  "Boxes",
+  "BoxForm",
+  "BoxFormFormatTypes",
+  "BoxFrame",
+  "BoxID",
+  "BoxMargins",
+  "BoxMatrix",
+  "BoxObject",
+  "BoxRatios",
+  "BoxRotation",
+  "BoxRotationPoint",
+  "BoxStyle",
+  "BoxWhiskerChart",
+  "Bra",
+  "BracketingBar",
+  "BraKet",
+  "BrayCurtisDistance",
+  "BreadthFirstScan",
+  "Break",
+  "BridgeData",
+  "BrightnessEqualize",
+  "BroadcastStationData",
+  "Brown",
+  "BrownForsytheTest",
+  "BrownianBridgeProcess",
+  "BrowserCategory",
+  "BSplineBasis",
+  "BSplineCurve",
+  "BSplineCurve3DBox",
+  "BSplineCurve3DBoxOptions",
+  "BSplineCurveBox",
+  "BSplineCurveBoxOptions",
+  "BSplineFunction",
+  "BSplineSurface",
+  "BSplineSurface3DBox",
+  "BSplineSurface3DBoxOptions",
+  "BubbleChart",
+  "BubbleChart3D",
+  "BubbleScale",
+  "BubbleSizes",
+  "BuildingData",
+  "BulletGauge",
+  "BusinessDayQ",
+  "ButterflyGraph",
+  "ButterworthFilterModel",
+  "Button",
+  "ButtonBar",
+  "ButtonBox",
+  "ButtonBoxOptions",
+  "ButtonCell",
+  "ButtonContents",
+  "ButtonData",
+  "ButtonEvaluator",
+  "ButtonExpandable",
+  "ButtonFrame",
+  "ButtonFunction",
+  "ButtonMargins",
+  "ButtonMinHeight",
+  "ButtonNote",
+  "ButtonNotebook",
+  "ButtonSource",
+  "ButtonStyle",
+  "ButtonStyleMenuListing",
+  "Byte",
+  "ByteArray",
+  "ByteArrayFormat",
+  "ByteArrayQ",
+  "ByteArrayToString",
+  "ByteCount",
+  "ByteOrdering",
+  "C",
+  "CachedValue",
+  "CacheGraphics",
+  "CachePersistence",
+  "CalendarConvert",
+  "CalendarData",
+  "CalendarType",
+  "Callout",
+  "CalloutMarker",
+  "CalloutStyle",
+  "CallPacket",
+  "CanberraDistance",
+  "Cancel",
+  "CancelButton",
+  "CandlestickChart",
+  "CanonicalGraph",
+  "CanonicalizePolygon",
+  "CanonicalizePolyhedron",
+  "CanonicalName",
+  "CanonicalWarpingCorrespondence",
+  "CanonicalWarpingDistance",
+  "CantorMesh",
+  "CantorStaircase",
+  "Cap",
+  "CapForm",
+  "CapitalDifferentialD",
+  "Capitalize",
+  "CapsuleShape",
+  "CaptureRunning",
+  "CardinalBSplineBasis",
+  "CarlemanLinearize",
+  "CarmichaelLambda",
+  "CaseOrdering",
+  "Cases",
+  "CaseSensitive",
+  "Cashflow",
+  "Casoratian",
+  "Catalan",
+  "CatalanNumber",
+  "Catch",
+  "CategoricalDistribution",
+  "Catenate",
+  "CatenateLayer",
+  "CauchyDistribution",
+  "CauchyWindow",
+  "CayleyGraph",
+  "CDF",
+  "CDFDeploy",
+  "CDFInformation",
+  "CDFWavelet",
+  "Ceiling",
+  "CelestialSystem",
+  "Cell",
+  "CellAutoOverwrite",
+  "CellBaseline",
+  "CellBoundingBox",
+  "CellBracketOptions",
+  "CellChangeTimes",
+  "CellContents",
+  "CellContext",
+  "CellDingbat",
+  "CellDynamicExpression",
+  "CellEditDuplicate",
+  "CellElementsBoundingBox",
+  "CellElementSpacings",
+  "CellEpilog",
+  "CellEvaluationDuplicate",
+  "CellEvaluationFunction",
+  "CellEvaluationLanguage",
+  "CellEventActions",
+  "CellFrame",
+  "CellFrameColor",
+  "CellFrameLabelMargins",
+  "CellFrameLabels",
+  "CellFrameMargins",
+  "CellGroup",
+  "CellGroupData",
+  "CellGrouping",
+  "CellGroupingRules",
+  "CellHorizontalScrolling",
+  "CellID",
+  "CellLabel",
+  "CellLabelAutoDelete",
+  "CellLabelMargins",
+  "CellLabelPositioning",
+  "CellLabelStyle",
+  "CellLabelTemplate",
+  "CellMargins",
+  "CellObject",
+  "CellOpen",
+  "CellPrint",
+  "CellProlog",
+  "Cells",
+  "CellSize",
+  "CellStyle",
+  "CellTags",
+  "CellularAutomaton",
+  "CensoredDistribution",
+  "Censoring",
+  "Center",
+  "CenterArray",
+  "CenterDot",
+  "CentralFeature",
+  "CentralMoment",
+  "CentralMomentGeneratingFunction",
+  "Cepstrogram",
+  "CepstrogramArray",
+  "CepstrumArray",
+  "CForm",
+  "ChampernowneNumber",
+  "ChangeOptions",
+  "ChannelBase",
+  "ChannelBrokerAction",
+  "ChannelDatabin",
+  "ChannelHistoryLength",
+  "ChannelListen",
+  "ChannelListener",
+  "ChannelListeners",
+  "ChannelListenerWait",
+  "ChannelObject",
+  "ChannelPreSendFunction",
+  "ChannelReceiverFunction",
+  "ChannelSend",
+  "ChannelSubscribers",
+  "ChanVeseBinarize",
+  "Character",
+  "CharacterCounts",
+  "CharacterEncoding",
+  "CharacterEncodingsPath",
+  "CharacteristicFunction",
+  "CharacteristicPolynomial",
+  "CharacterName",
+  "CharacterNormalize",
+  "CharacterRange",
+  "Characters",
+  "ChartBaseStyle",
+  "ChartElementData",
+  "ChartElementDataFunction",
+  "ChartElementFunction",
+  "ChartElements",
+  "ChartLabels",
+  "ChartLayout",
+  "ChartLegends",
+  "ChartStyle",
+  "Chebyshev1FilterModel",
+  "Chebyshev2FilterModel",
+  "ChebyshevDistance",
+  "ChebyshevT",
+  "ChebyshevU",
+  "Check",
+  "CheckAbort",
+  "CheckAll",
+  "Checkbox",
+  "CheckboxBar",
+  "CheckboxBox",
+  "CheckboxBoxOptions",
+  "ChemicalData",
+  "ChessboardDistance",
+  "ChiDistribution",
+  "ChineseRemainder",
+  "ChiSquareDistribution",
+  "ChoiceButtons",
+  "ChoiceDialog",
+  "CholeskyDecomposition",
+  "Chop",
+  "ChromaticityPlot",
+  "ChromaticityPlot3D",
+  "ChromaticPolynomial",
+  "Circle",
+  "CircleBox",
+  "CircleDot",
+  "CircleMinus",
+  "CirclePlus",
+  "CirclePoints",
+  "CircleThrough",
+  "CircleTimes",
+  "CirculantGraph",
+  "CircularOrthogonalMatrixDistribution",
+  "CircularQuaternionMatrixDistribution",
+  "CircularRealMatrixDistribution",
+  "CircularSymplecticMatrixDistribution",
+  "CircularUnitaryMatrixDistribution",
+  "Circumsphere",
+  "CityData",
+  "ClassifierFunction",
+  "ClassifierInformation",
+  "ClassifierMeasurements",
+  "ClassifierMeasurementsObject",
+  "Classify",
+  "ClassPriors",
+  "Clear",
+  "ClearAll",
+  "ClearAttributes",
+  "ClearCookies",
+  "ClearPermissions",
+  "ClearSystemCache",
+  "ClebschGordan",
+  "ClickPane",
+  "Clip",
+  "ClipboardNotebook",
+  "ClipFill",
+  "ClippingStyle",
+  "ClipPlanes",
+  "ClipPlanesStyle",
+  "ClipRange",
+  "Clock",
+  "ClockGauge",
+  "ClockwiseContourIntegral",
+  "Close",
+  "Closed",
+  "CloseKernels",
+  "ClosenessCentrality",
+  "Closing",
+  "ClosingAutoSave",
+  "ClosingEvent",
+  "ClosingSaveDialog",
+  "CloudAccountData",
+  "CloudBase",
+  "CloudConnect",
+  "CloudConnections",
+  "CloudDeploy",
+  "CloudDirectory",
+  "CloudDisconnect",
+  "CloudEvaluate",
+  "CloudExport",
+  "CloudExpression",
+  "CloudExpressions",
+  "CloudFunction",
+  "CloudGet",
+  "CloudImport",
+  "CloudLoggingData",
+  "CloudObject",
+  "CloudObjectInformation",
+  "CloudObjectInformationData",
+  "CloudObjectNameFormat",
+  "CloudObjects",
+  "CloudObjectURLType",
+  "CloudPublish",
+  "CloudPut",
+  "CloudRenderingMethod",
+  "CloudSave",
+  "CloudShare",
+  "CloudSubmit",
+  "CloudSymbol",
+  "CloudUnshare",
+  "CloudUserID",
+  "ClusterClassify",
+  "ClusterDissimilarityFunction",
+  "ClusteringComponents",
+  "ClusteringTree",
+  "CMYKColor",
+  "Coarse",
+  "CodeAssistOptions",
+  "Coefficient",
+  "CoefficientArrays",
+  "CoefficientDomain",
+  "CoefficientList",
+  "CoefficientRules",
+  "CoifletWavelet",
+  "Collect",
+  "Colon",
+  "ColonForm",
+  "ColorBalance",
+  "ColorCombine",
+  "ColorConvert",
+  "ColorCoverage",
+  "ColorData",
+  "ColorDataFunction",
+  "ColorDetect",
+  "ColorDistance",
+  "ColorFunction",
+  "ColorFunctionScaling",
+  "Colorize",
+  "ColorNegate",
+  "ColorOutput",
+  "ColorProfileData",
+  "ColorQ",
+  "ColorQuantize",
+  "ColorReplace",
+  "ColorRules",
+  "ColorSelectorSettings",
+  "ColorSeparate",
+  "ColorSetter",
+  "ColorSetterBox",
+  "ColorSetterBoxOptions",
+  "ColorSlider",
+  "ColorsNear",
+  "ColorSpace",
+  "ColorToneMapping",
+  "Column",
+  "ColumnAlignments",
+  "ColumnBackgrounds",
+  "ColumnForm",
+  "ColumnLines",
+  "ColumnsEqual",
+  "ColumnSpacings",
+  "ColumnWidths",
+  "CombinedEntityClass",
+  "CombinerFunction",
+  "CometData",
+  "CommonDefaultFormatTypes",
+  "Commonest",
+  "CommonestFilter",
+  "CommonName",
+  "CommonUnits",
+  "CommunityBoundaryStyle",
+  "CommunityGraphPlot",
+  "CommunityLabels",
+  "CommunityRegionStyle",
+  "CompanyData",
+  "CompatibleUnitQ",
+  "CompilationOptions",
+  "CompilationTarget",
+  "Compile",
+  "Compiled",
+  "CompiledCodeFunction",
+  "CompiledFunction",
+  "CompilerOptions",
+  "Complement",
+  "ComplementedEntityClass",
+  "CompleteGraph",
+  "CompleteGraphQ",
+  "CompleteKaryTree",
+  "CompletionsListPacket",
+  "Complex",
+  "ComplexContourPlot",
+  "Complexes",
+  "ComplexExpand",
+  "ComplexInfinity",
+  "ComplexityFunction",
+  "ComplexListPlot",
+  "ComplexPlot",
+  "ComplexPlot3D",
+  "ComplexRegionPlot",
+  "ComplexStreamPlot",
+  "ComplexVectorPlot",
+  "ComponentMeasurements",
+  "ComponentwiseContextMenu",
+  "Compose",
+  "ComposeList",
+  "ComposeSeries",
+  "CompositeQ",
+  "Composition",
+  "CompoundElement",
+  "CompoundExpression",
+  "CompoundPoissonDistribution",
+  "CompoundPoissonProcess",
+  "CompoundRenewalProcess",
+  "Compress",
+  "CompressedData",
+  "CompressionLevel",
+  "ComputeUncertainty",
+  "Condition",
+  "ConditionalExpression",
+  "Conditioned",
+  "Cone",
+  "ConeBox",
+  "ConfidenceLevel",
+  "ConfidenceRange",
+  "ConfidenceTransform",
+  "ConfigurationPath",
+  "ConformAudio",
+  "ConformImages",
+  "Congruent",
+  "ConicHullRegion",
+  "ConicHullRegion3DBox",
+  "ConicHullRegionBox",
+  "ConicOptimization",
+  "Conjugate",
+  "ConjugateTranspose",
+  "Conjunction",
+  "Connect",
+  "ConnectedComponents",
+  "ConnectedGraphComponents",
+  "ConnectedGraphQ",
+  "ConnectedMeshComponents",
+  "ConnectedMoleculeComponents",
+  "ConnectedMoleculeQ",
+  "ConnectionSettings",
+  "ConnectLibraryCallbackFunction",
+  "ConnectSystemModelComponents",
+  "ConnesWindow",
+  "ConoverTest",
+  "ConsoleMessage",
+  "ConsoleMessagePacket",
+  "Constant",
+  "ConstantArray",
+  "ConstantArrayLayer",
+  "ConstantImage",
+  "ConstantPlusLayer",
+  "ConstantRegionQ",
+  "Constants",
+  "ConstantTimesLayer",
+  "ConstellationData",
+  "ConstrainedMax",
+  "ConstrainedMin",
+  "Construct",
+  "Containing",
+  "ContainsAll",
+  "ContainsAny",
+  "ContainsExactly",
+  "ContainsNone",
+  "ContainsOnly",
+  "ContentFieldOptions",
+  "ContentLocationFunction",
+  "ContentObject",
+  "ContentPadding",
+  "ContentsBoundingBox",
+  "ContentSelectable",
+  "ContentSize",
+  "Context",
+  "ContextMenu",
+  "Contexts",
+  "ContextToFileName",
+  "Continuation",
+  "Continue",
+  "ContinuedFraction",
+  "ContinuedFractionK",
+  "ContinuousAction",
+  "ContinuousMarkovProcess",
+  "ContinuousTask",
+  "ContinuousTimeModelQ",
+  "ContinuousWaveletData",
+  "ContinuousWaveletTransform",
+  "ContourDetect",
+  "ContourGraphics",
+  "ContourIntegral",
+  "ContourLabels",
+  "ContourLines",
+  "ContourPlot",
+  "ContourPlot3D",
+  "Contours",
+  "ContourShading",
+  "ContourSmoothing",
+  "ContourStyle",
+  "ContraharmonicMean",
+  "ContrastiveLossLayer",
+  "Control",
+  "ControlActive",
+  "ControlAlignment",
+  "ControlGroupContentsBox",
+  "ControllabilityGramian",
+  "ControllabilityMatrix",
+  "ControllableDecomposition",
+  "ControllableModelQ",
+  "ControllerDuration",
+  "ControllerInformation",
+  "ControllerInformationData",
+  "ControllerLinking",
+  "ControllerManipulate",
+  "ControllerMethod",
+  "ControllerPath",
+  "ControllerState",
+  "ControlPlacement",
+  "ControlsRendering",
+  "ControlType",
+  "Convergents",
+  "ConversionOptions",
+  "ConversionRules",
+  "ConvertToBitmapPacket",
+  "ConvertToPostScript",
+  "ConvertToPostScriptPacket",
+  "ConvexHullMesh",
+  "ConvexPolygonQ",
+  "ConvexPolyhedronQ",
+  "ConvolutionLayer",
+  "Convolve",
+  "ConwayGroupCo1",
+  "ConwayGroupCo2",
+  "ConwayGroupCo3",
+  "CookieFunction",
+  "Cookies",
+  "CoordinateBoundingBox",
+  "CoordinateBoundingBoxArray",
+  "CoordinateBounds",
+  "CoordinateBoundsArray",
+  "CoordinateChartData",
+  "CoordinatesToolOptions",
+  "CoordinateTransform",
+  "CoordinateTransformData",
+  "CoprimeQ",
+  "Coproduct",
+  "CopulaDistribution",
+  "Copyable",
+  "CopyDatabin",
+  "CopyDirectory",
+  "CopyFile",
+  "CopyTag",
+  "CopyToClipboard",
+  "CornerFilter",
+  "CornerNeighbors",
+  "Correlation",
+  "CorrelationDistance",
+  "CorrelationFunction",
+  "CorrelationTest",
+  "Cos",
+  "Cosh",
+  "CoshIntegral",
+  "CosineDistance",
+  "CosineWindow",
+  "CosIntegral",
+  "Cot",
+  "Coth",
+  "Count",
+  "CountDistinct",
+  "CountDistinctBy",
+  "CounterAssignments",
+  "CounterBox",
+  "CounterBoxOptions",
+  "CounterClockwiseContourIntegral",
+  "CounterEvaluator",
+  "CounterFunction",
+  "CounterIncrements",
+  "CounterStyle",
+  "CounterStyleMenuListing",
+  "CountRoots",
+  "CountryData",
+  "Counts",
+  "CountsBy",
+  "Covariance",
+  "CovarianceEstimatorFunction",
+  "CovarianceFunction",
+  "CoxianDistribution",
+  "CoxIngersollRossProcess",
+  "CoxModel",
+  "CoxModelFit",
+  "CramerVonMisesTest",
+  "CreateArchive",
+  "CreateCellID",
+  "CreateChannel",
+  "CreateCloudExpression",
+  "CreateDatabin",
+  "CreateDataStructure",
+  "CreateDataSystemModel",
+  "CreateDialog",
+  "CreateDirectory",
+  "CreateDocument",
+  "CreateFile",
+  "CreateIntermediateDirectories",
+  "CreateManagedLibraryExpression",
+  "CreateNotebook",
+  "CreatePacletArchive",
+  "CreatePalette",
+  "CreatePalettePacket",
+  "CreatePermissionsGroup",
+  "CreateScheduledTask",
+  "CreateSearchIndex",
+  "CreateSystemModel",
+  "CreateTemporary",
+  "CreateUUID",
+  "CreateWindow",
+  "CriterionFunction",
+  "CriticalityFailureImportance",
+  "CriticalitySuccessImportance",
+  "CriticalSection",
+  "Cross",
+  "CrossEntropyLossLayer",
+  "CrossingCount",
+  "CrossingDetect",
+  "CrossingPolygon",
+  "CrossMatrix",
+  "Csc",
+  "Csch",
+  "CTCLossLayer",
+  "Cube",
+  "CubeRoot",
+  "Cubics",
+  "Cuboid",
+  "CuboidBox",
+  "Cumulant",
+  "CumulantGeneratingFunction",
+  "Cup",
+  "CupCap",
+  "Curl",
+  "CurlyDoubleQuote",
+  "CurlyQuote",
+  "CurrencyConvert",
+  "CurrentDate",
+  "CurrentImage",
+  "CurrentlySpeakingPacket",
+  "CurrentNotebookImage",
+  "CurrentScreenImage",
+  "CurrentValue",
+  "Curry",
+  "CurryApplied",
+  "CurvatureFlowFilter",
+  "CurveClosed",
+  "Cyan",
+  "CycleGraph",
+  "CycleIndexPolynomial",
+  "Cycles",
+  "CyclicGroup",
+  "Cyclotomic",
+  "Cylinder",
+  "CylinderBox",
+  "CylindricalDecomposition",
+  "D",
+  "DagumDistribution",
+  "DamData",
+  "DamerauLevenshteinDistance",
+  "DampingFactor",
+  "Darker",
+  "Dashed",
+  "Dashing",
+  "DatabaseConnect",
+  "DatabaseDisconnect",
+  "DatabaseReference",
+  "Databin",
+  "DatabinAdd",
+  "DatabinRemove",
+  "Databins",
+  "DatabinUpload",
+  "DataCompression",
+  "DataDistribution",
+  "DataRange",
+  "DataReversed",
+  "Dataset",
+  "DatasetDisplayPanel",
+  "DataStructure",
+  "DataStructureQ",
+  "Date",
+  "DateBounds",
+  "Dated",
+  "DateDelimiters",
+  "DateDifference",
+  "DatedUnit",
+  "DateFormat",
+  "DateFunction",
+  "DateHistogram",
+  "DateInterval",
+  "DateList",
+  "DateListLogPlot",
+  "DateListPlot",
+  "DateListStepPlot",
+  "DateObject",
+  "DateObjectQ",
+  "DateOverlapsQ",
+  "DatePattern",
+  "DatePlus",
+  "DateRange",
+  "DateReduction",
+  "DateString",
+  "DateTicksFormat",
+  "DateValue",
+  "DateWithinQ",
+  "DaubechiesWavelet",
+  "DavisDistribution",
+  "DawsonF",
+  "DayCount",
+  "DayCountConvention",
+  "DayHemisphere",
+  "DaylightQ",
+  "DayMatchQ",
+  "DayName",
+  "DayNightTerminator",
+  "DayPlus",
+  "DayRange",
+  "DayRound",
+  "DeBruijnGraph",
+  "DeBruijnSequence",
+  "Debug",
+  "DebugTag",
+  "Decapitalize",
+  "Decimal",
+  "DecimalForm",
+  "DeclareKnownSymbols",
+  "DeclarePackage",
+  "Decompose",
+  "DeconvolutionLayer",
+  "Decrement",
+  "Decrypt",
+  "DecryptFile",
+  "DedekindEta",
+  "DeepSpaceProbeData",
+  "Default",
+  "DefaultAxesStyle",
+  "DefaultBaseStyle",
+  "DefaultBoxStyle",
+  "DefaultButton",
+  "DefaultColor",
+  "DefaultControlPlacement",
+  "DefaultDuplicateCellStyle",
+  "DefaultDuration",
+  "DefaultElement",
+  "DefaultFaceGridsStyle",
+  "DefaultFieldHintStyle",
+  "DefaultFont",
+  "DefaultFontProperties",
+  "DefaultFormatType",
+  "DefaultFormatTypeForStyle",
+  "DefaultFrameStyle",
+  "DefaultFrameTicksStyle",
+  "DefaultGridLinesStyle",
+  "DefaultInlineFormatType",
+  "DefaultInputFormatType",
+  "DefaultLabelStyle",
+  "DefaultMenuStyle",
+  "DefaultNaturalLanguage",
+  "DefaultNewCellStyle",
+  "DefaultNewInlineCellStyle",
+  "DefaultNotebook",
+  "DefaultOptions",
+  "DefaultOutputFormatType",
+  "DefaultPrintPrecision",
+  "DefaultStyle",
+  "DefaultStyleDefinitions",
+  "DefaultTextFormatType",
+  "DefaultTextInlineFormatType",
+  "DefaultTicksStyle",
+  "DefaultTooltipStyle",
+  "DefaultValue",
+  "DefaultValues",
+  "Defer",
+  "DefineExternal",
+  "DefineInputStreamMethod",
+  "DefineOutputStreamMethod",
+  "DefineResourceFunction",
+  "Definition",
+  "Degree",
+  "DegreeCentrality",
+  "DegreeGraphDistribution",
+  "DegreeLexicographic",
+  "DegreeReverseLexicographic",
+  "DEigensystem",
+  "DEigenvalues",
+  "Deinitialization",
+  "Del",
+  "DelaunayMesh",
+  "Delayed",
+  "Deletable",
+  "Delete",
+  "DeleteAnomalies",
+  "DeleteBorderComponents",
+  "DeleteCases",
+  "DeleteChannel",
+  "DeleteCloudExpression",
+  "DeleteContents",
+  "DeleteDirectory",
+  "DeleteDuplicates",
+  "DeleteDuplicatesBy",
+  "DeleteFile",
+  "DeleteMissing",
+  "DeleteObject",
+  "DeletePermissionsKey",
+  "DeleteSearchIndex",
+  "DeleteSmallComponents",
+  "DeleteStopwords",
+  "DeleteWithContents",
+  "DeletionWarning",
+  "DelimitedArray",
+  "DelimitedSequence",
+  "Delimiter",
+  "DelimiterFlashTime",
+  "DelimiterMatching",
+  "Delimiters",
+  "DeliveryFunction",
+  "Dendrogram",
+  "Denominator",
+  "DensityGraphics",
+  "DensityHistogram",
+  "DensityPlot",
+  "DensityPlot3D",
+  "DependentVariables",
+  "Deploy",
+  "Deployed",
+  "Depth",
+  "DepthFirstScan",
+  "Derivative",
+  "DerivativeFilter",
+  "DerivedKey",
+  "DescriptorStateSpace",
+  "DesignMatrix",
+  "DestroyAfterEvaluation",
+  "Det",
+  "DeviceClose",
+  "DeviceConfigure",
+  "DeviceExecute",
+  "DeviceExecuteAsynchronous",
+  "DeviceObject",
+  "DeviceOpen",
+  "DeviceOpenQ",
+  "DeviceRead",
+  "DeviceReadBuffer",
+  "DeviceReadLatest",
+  "DeviceReadList",
+  "DeviceReadTimeSeries",
+  "Devices",
+  "DeviceStreams",
+  "DeviceWrite",
+  "DeviceWriteBuffer",
+  "DGaussianWavelet",
+  "DiacriticalPositioning",
+  "Diagonal",
+  "DiagonalizableMatrixQ",
+  "DiagonalMatrix",
+  "DiagonalMatrixQ",
+  "Dialog",
+  "DialogIndent",
+  "DialogInput",
+  "DialogLevel",
+  "DialogNotebook",
+  "DialogProlog",
+  "DialogReturn",
+  "DialogSymbols",
+  "Diamond",
+  "DiamondMatrix",
+  "DiceDissimilarity",
+  "DictionaryLookup",
+  "DictionaryWordQ",
+  "DifferenceDelta",
+  "DifferenceOrder",
+  "DifferenceQuotient",
+  "DifferenceRoot",
+  "DifferenceRootReduce",
+  "Differences",
+  "DifferentialD",
+  "DifferentialRoot",
+  "DifferentialRootReduce",
+  "DifferentiatorFilter",
+  "DigitalSignature",
+  "DigitBlock",
+  "DigitBlockMinimum",
+  "DigitCharacter",
+  "DigitCount",
+  "DigitQ",
+  "DihedralAngle",
+  "DihedralGroup",
+  "Dilation",
+  "DimensionalCombinations",
+  "DimensionalMeshComponents",
+  "DimensionReduce",
+  "DimensionReducerFunction",
+  "DimensionReduction",
+  "Dimensions",
+  "DiracComb",
+  "DiracDelta",
+  "DirectedEdge",
+  "DirectedEdges",
+  "DirectedGraph",
+  "DirectedGraphQ",
+  "DirectedInfinity",
+  "Direction",
+  "Directive",
+  "Directory",
+  "DirectoryName",
+  "DirectoryQ",
+  "DirectoryStack",
+  "DirichletBeta",
+  "DirichletCharacter",
+  "DirichletCondition",
+  "DirichletConvolve",
+  "DirichletDistribution",
+  "DirichletEta",
+  "DirichletL",
+  "DirichletLambda",
+  "DirichletTransform",
+  "DirichletWindow",
+  "DisableConsolePrintPacket",
+  "DisableFormatting",
+  "DiscreteAsymptotic",
+  "DiscreteChirpZTransform",
+  "DiscreteConvolve",
+  "DiscreteDelta",
+  "DiscreteHadamardTransform",
+  "DiscreteIndicator",
+  "DiscreteLimit",
+  "DiscreteLQEstimatorGains",
+  "DiscreteLQRegulatorGains",
+  "DiscreteLyapunovSolve",
+  "DiscreteMarkovProcess",
+  "DiscreteMaxLimit",
+  "DiscreteMinLimit",
+  "DiscretePlot",
+  "DiscretePlot3D",
+  "DiscreteRatio",
+  "DiscreteRiccatiSolve",
+  "DiscreteShift",
+  "DiscreteTimeModelQ",
+  "DiscreteUniformDistribution",
+  "DiscreteVariables",
+  "DiscreteWaveletData",
+  "DiscreteWaveletPacketTransform",
+  "DiscreteWaveletTransform",
+  "DiscretizeGraphics",
+  "DiscretizeRegion",
+  "Discriminant",
+  "DisjointQ",
+  "Disjunction",
+  "Disk",
+  "DiskBox",
+  "DiskMatrix",
+  "DiskSegment",
+  "Dispatch",
+  "DispatchQ",
+  "DispersionEstimatorFunction",
+  "Display",
+  "DisplayAllSteps",
+  "DisplayEndPacket",
+  "DisplayFlushImagePacket",
+  "DisplayForm",
+  "DisplayFunction",
+  "DisplayPacket",
+  "DisplayRules",
+  "DisplaySetSizePacket",
+  "DisplayString",
+  "DisplayTemporary",
+  "DisplayWith",
+  "DisplayWithRef",
+  "DisplayWithVariable",
+  "DistanceFunction",
+  "DistanceMatrix",
+  "DistanceTransform",
+  "Distribute",
+  "Distributed",
+  "DistributedContexts",
+  "DistributeDefinitions",
+  "DistributionChart",
+  "DistributionDomain",
+  "DistributionFitTest",
+  "DistributionParameterAssumptions",
+  "DistributionParameterQ",
+  "Dithering",
+  "Div",
+  "Divergence",
+  "Divide",
+  "DivideBy",
+  "Dividers",
+  "DivideSides",
+  "Divisible",
+  "Divisors",
+  "DivisorSigma",
+  "DivisorSum",
+  "DMSList",
+  "DMSString",
+  "Do",
+  "DockedCells",
+  "DocumentGenerator",
+  "DocumentGeneratorInformation",
+  "DocumentGeneratorInformationData",
+  "DocumentGenerators",
+  "DocumentNotebook",
+  "DocumentWeightingRules",
+  "Dodecahedron",
+  "DomainRegistrationInformation",
+  "DominantColors",
+  "DOSTextFormat",
+  "Dot",
+  "DotDashed",
+  "DotEqual",
+  "DotLayer",
+  "DotPlusLayer",
+  "Dotted",
+  "DoubleBracketingBar",
+  "DoubleContourIntegral",
+  "DoubleDownArrow",
+  "DoubleLeftArrow",
+  "DoubleLeftRightArrow",
+  "DoubleLeftTee",
+  "DoubleLongLeftArrow",
+  "DoubleLongLeftRightArrow",
+  "DoubleLongRightArrow",
+  "DoubleRightArrow",
+  "DoubleRightTee",
+  "DoubleUpArrow",
+  "DoubleUpDownArrow",
+  "DoubleVerticalBar",
+  "DoublyInfinite",
+  "Down",
+  "DownArrow",
+  "DownArrowBar",
+  "DownArrowUpArrow",
+  "DownLeftRightVector",
+  "DownLeftTeeVector",
+  "DownLeftVector",
+  "DownLeftVectorBar",
+  "DownRightTeeVector",
+  "DownRightVector",
+  "DownRightVectorBar",
+  "Downsample",
+  "DownTee",
+  "DownTeeArrow",
+  "DownValues",
+  "DragAndDrop",
+  "DrawEdges",
+  "DrawFrontFaces",
+  "DrawHighlighted",
+  "Drop",
+  "DropoutLayer",
+  "DSolve",
+  "DSolveValue",
+  "Dt",
+  "DualLinearProgramming",
+  "DualPolyhedron",
+  "DualSystemsModel",
+  "DumpGet",
+  "DumpSave",
+  "DuplicateFreeQ",
+  "Duration",
+  "Dynamic",
+  "DynamicBox",
+  "DynamicBoxOptions",
+  "DynamicEvaluationTimeout",
+  "DynamicGeoGraphics",
+  "DynamicImage",
+  "DynamicLocation",
+  "DynamicModule",
+  "DynamicModuleBox",
+  "DynamicModuleBoxOptions",
+  "DynamicModuleParent",
+  "DynamicModuleValues",
+  "DynamicName",
+  "DynamicNamespace",
+  "DynamicReference",
+  "DynamicSetting",
+  "DynamicUpdating",
+  "DynamicWrapper",
+  "DynamicWrapperBox",
+  "DynamicWrapperBoxOptions",
+  "E",
+  "EarthImpactData",
+  "EarthquakeData",
+  "EccentricityCentrality",
+  "Echo",
+  "EchoFunction",
+  "EclipseType",
+  "EdgeAdd",
+  "EdgeBetweennessCentrality",
+  "EdgeCapacity",
+  "EdgeCapForm",
+  "EdgeColor",
+  "EdgeConnectivity",
+  "EdgeContract",
+  "EdgeCost",
+  "EdgeCount",
+  "EdgeCoverQ",
+  "EdgeCycleMatrix",
+  "EdgeDashing",
+  "EdgeDelete",
+  "EdgeDetect",
+  "EdgeForm",
+  "EdgeIndex",
+  "EdgeJoinForm",
+  "EdgeLabeling",
+  "EdgeLabels",
+  "EdgeLabelStyle",
+  "EdgeList",
+  "EdgeOpacity",
+  "EdgeQ",
+  "EdgeRenderingFunction",
+  "EdgeRules",
+  "EdgeShapeFunction",
+  "EdgeStyle",
+  "EdgeTaggedGraph",
+  "EdgeTaggedGraphQ",
+  "EdgeTags",
+  "EdgeThickness",
+  "EdgeWeight",
+  "EdgeWeightedGraphQ",
+  "Editable",
+  "EditButtonSettings",
+  "EditCellTagsSettings",
+  "EditDistance",
+  "EffectiveInterest",
+  "Eigensystem",
+  "Eigenvalues",
+  "EigenvectorCentrality",
+  "Eigenvectors",
+  "Element",
+  "ElementData",
+  "ElementwiseLayer",
+  "ElidedForms",
+  "Eliminate",
+  "EliminationOrder",
+  "Ellipsoid",
+  "EllipticE",
+  "EllipticExp",
+  "EllipticExpPrime",
+  "EllipticF",
+  "EllipticFilterModel",
+  "EllipticK",
+  "EllipticLog",
+  "EllipticNomeQ",
+  "EllipticPi",
+  "EllipticReducedHalfPeriods",
+  "EllipticTheta",
+  "EllipticThetaPrime",
+  "EmbedCode",
+  "EmbeddedHTML",
+  "EmbeddedService",
+  "EmbeddingLayer",
+  "EmbeddingObject",
+  "EmitSound",
+  "EmphasizeSyntaxErrors",
+  "EmpiricalDistribution",
+  "Empty",
+  "EmptyGraphQ",
+  "EmptyRegion",
+  "EnableConsolePrintPacket",
+  "Enabled",
+  "Encode",
+  "Encrypt",
+  "EncryptedObject",
+  "EncryptFile",
+  "End",
+  "EndAdd",
+  "EndDialogPacket",
+  "EndFrontEndInteractionPacket",
+  "EndOfBuffer",
+  "EndOfFile",
+  "EndOfLine",
+  "EndOfString",
+  "EndPackage",
+  "EngineEnvironment",
+  "EngineeringForm",
+  "Enter",
+  "EnterExpressionPacket",
+  "EnterTextPacket",
+  "Entity",
+  "EntityClass",
+  "EntityClassList",
+  "EntityCopies",
+  "EntityFunction",
+  "EntityGroup",
+  "EntityInstance",
+  "EntityList",
+  "EntityPrefetch",
+  "EntityProperties",
+  "EntityProperty",
+  "EntityPropertyClass",
+  "EntityRegister",
+  "EntityStore",
+  "EntityStores",
+  "EntityTypeName",
+  "EntityUnregister",
+  "EntityValue",
+  "Entropy",
+  "EntropyFilter",
+  "Environment",
+  "Epilog",
+  "EpilogFunction",
+  "Equal",
+  "EqualColumns",
+  "EqualRows",
+  "EqualTilde",
+  "EqualTo",
+  "EquatedTo",
+  "Equilibrium",
+  "EquirippleFilterKernel",
+  "Equivalent",
+  "Erf",
+  "Erfc",
+  "Erfi",
+  "ErlangB",
+  "ErlangC",
+  "ErlangDistribution",
+  "Erosion",
+  "ErrorBox",
+  "ErrorBoxOptions",
+  "ErrorNorm",
+  "ErrorPacket",
+  "ErrorsDialogSettings",
+  "EscapeRadius",
+  "EstimatedBackground",
+  "EstimatedDistribution",
+  "EstimatedProcess",
+  "EstimatorGains",
+  "EstimatorRegulator",
+  "EuclideanDistance",
+  "EulerAngles",
+  "EulerCharacteristic",
+  "EulerE",
+  "EulerGamma",
+  "EulerianGraphQ",
+  "EulerMatrix",
+  "EulerPhi",
+  "Evaluatable",
+  "Evaluate",
+  "Evaluated",
+  "EvaluatePacket",
+  "EvaluateScheduledTask",
+  "EvaluationBox",
+  "EvaluationCell",
+  "EvaluationCompletionAction",
+  "EvaluationData",
+  "EvaluationElements",
+  "EvaluationEnvironment",
+  "EvaluationMode",
+  "EvaluationMonitor",
+  "EvaluationNotebook",
+  "EvaluationObject",
+  "EvaluationOrder",
+  "Evaluator",
+  "EvaluatorNames",
+  "EvenQ",
+  "EventData",
+  "EventEvaluator",
+  "EventHandler",
+  "EventHandlerTag",
+  "EventLabels",
+  "EventSeries",
+  "ExactBlackmanWindow",
+  "ExactNumberQ",
+  "ExactRootIsolation",
+  "ExampleData",
+  "Except",
+  "ExcludedForms",
+  "ExcludedLines",
+  "ExcludedPhysicalQuantities",
+  "ExcludePods",
+  "Exclusions",
+  "ExclusionsStyle",
+  "Exists",
+  "Exit",
+  "ExitDialog",
+  "ExoplanetData",
+  "Exp",
+  "Expand",
+  "ExpandAll",
+  "ExpandDenominator",
+  "ExpandFileName",
+  "ExpandNumerator",
+  "Expectation",
+  "ExpectationE",
+  "ExpectedValue",
+  "ExpGammaDistribution",
+  "ExpIntegralE",
+  "ExpIntegralEi",
+  "ExpirationDate",
+  "Exponent",
+  "ExponentFunction",
+  "ExponentialDistribution",
+  "ExponentialFamily",
+  "ExponentialGeneratingFunction",
+  "ExponentialMovingAverage",
+  "ExponentialPowerDistribution",
+  "ExponentPosition",
+  "ExponentStep",
+  "Export",
+  "ExportAutoReplacements",
+  "ExportByteArray",
+  "ExportForm",
+  "ExportPacket",
+  "ExportString",
+  "Expression",
+  "ExpressionCell",
+  "ExpressionGraph",
+  "ExpressionPacket",
+  "ExpressionUUID",
+  "ExpToTrig",
+  "ExtendedEntityClass",
+  "ExtendedGCD",
+  "Extension",
+  "ExtentElementFunction",
+  "ExtentMarkers",
+  "ExtentSize",
+  "ExternalBundle",
+  "ExternalCall",
+  "ExternalDataCharacterEncoding",
+  "ExternalEvaluate",
+  "ExternalFunction",
+  "ExternalFunctionName",
+  "ExternalIdentifier",
+  "ExternalObject",
+  "ExternalOptions",
+  "ExternalSessionObject",
+  "ExternalSessions",
+  "ExternalStorageBase",
+  "ExternalStorageDownload",
+  "ExternalStorageGet",
+  "ExternalStorageObject",
+  "ExternalStoragePut",
+  "ExternalStorageUpload",
+  "ExternalTypeSignature",
+  "ExternalValue",
+  "Extract",
+  "ExtractArchive",
+  "ExtractLayer",
+  "ExtractPacletArchive",
+  "ExtremeValueDistribution",
+  "FaceAlign",
+  "FaceForm",
+  "FaceGrids",
+  "FaceGridsStyle",
+  "FacialFeatures",
+  "Factor",
+  "FactorComplete",
+  "Factorial",
+  "Factorial2",
+  "FactorialMoment",
+  "FactorialMomentGeneratingFunction",
+  "FactorialPower",
+  "FactorInteger",
+  "FactorList",
+  "FactorSquareFree",
+  "FactorSquareFreeList",
+  "FactorTerms",
+  "FactorTermsList",
+  "Fail",
+  "Failure",
+  "FailureAction",
+  "FailureDistribution",
+  "FailureQ",
+  "False",
+  "FareySequence",
+  "FARIMAProcess",
+  "FeatureDistance",
+  "FeatureExtract",
+  "FeatureExtraction",
+  "FeatureExtractor",
+  "FeatureExtractorFunction",
+  "FeatureNames",
+  "FeatureNearest",
+  "FeatureSpacePlot",
+  "FeatureSpacePlot3D",
+  "FeatureTypes",
+  "FEDisableConsolePrintPacket",
+  "FeedbackLinearize",
+  "FeedbackSector",
+  "FeedbackSectorStyle",
+  "FeedbackType",
+  "FEEnableConsolePrintPacket",
+  "FetalGrowthData",
+  "Fibonacci",
+  "Fibonorial",
+  "FieldCompletionFunction",
+  "FieldHint",
+  "FieldHintStyle",
+  "FieldMasked",
+  "FieldSize",
+  "File",
+  "FileBaseName",
+  "FileByteCount",
+  "FileConvert",
+  "FileDate",
+  "FileExistsQ",
+  "FileExtension",
+  "FileFormat",
+  "FileHandler",
+  "FileHash",
+  "FileInformation",
+  "FileName",
+  "FileNameDepth",
+  "FileNameDialogSettings",
+  "FileNameDrop",
+  "FileNameForms",
+  "FileNameJoin",
+  "FileNames",
+  "FileNameSetter",
+  "FileNameSplit",
+  "FileNameTake",
+  "FilePrint",
+  "FileSize",
+  "FileSystemMap",
+  "FileSystemScan",
+  "FileTemplate",
+  "FileTemplateApply",
+  "FileType",
+  "FilledCurve",
+  "FilledCurveBox",
+  "FilledCurveBoxOptions",
+  "Filling",
+  "FillingStyle",
+  "FillingTransform",
+  "FilteredEntityClass",
+  "FilterRules",
+  "FinancialBond",
+  "FinancialData",
+  "FinancialDerivative",
+  "FinancialIndicator",
+  "Find",
+  "FindAnomalies",
+  "FindArgMax",
+  "FindArgMin",
+  "FindChannels",
+  "FindClique",
+  "FindClusters",
+  "FindCookies",
+  "FindCurvePath",
+  "FindCycle",
+  "FindDevices",
+  "FindDistribution",
+  "FindDistributionParameters",
+  "FindDivisions",
+  "FindEdgeCover",
+  "FindEdgeCut",
+  "FindEdgeIndependentPaths",
+  "FindEquationalProof",
+  "FindEulerianCycle",
+  "FindExternalEvaluators",
+  "FindFaces",
+  "FindFile",
+  "FindFit",
+  "FindFormula",
+  "FindFundamentalCycles",
+  "FindGeneratingFunction",
+  "FindGeoLocation",
+  "FindGeometricConjectures",
+  "FindGeometricTransform",
+  "FindGraphCommunities",
+  "FindGraphIsomorphism",
+  "FindGraphPartition",
+  "FindHamiltonianCycle",
+  "FindHamiltonianPath",
+  "FindHiddenMarkovStates",
+  "FindImageText",
+  "FindIndependentEdgeSet",
+  "FindIndependentVertexSet",
+  "FindInstance",
+  "FindIntegerNullVector",
+  "FindKClan",
+  "FindKClique",
+  "FindKClub",
+  "FindKPlex",
+  "FindLibrary",
+  "FindLinearRecurrence",
+  "FindList",
+  "FindMatchingColor",
+  "FindMaximum",
+  "FindMaximumCut",
+  "FindMaximumFlow",
+  "FindMaxValue",
+  "FindMeshDefects",
+  "FindMinimum",
+  "FindMinimumCostFlow",
+  "FindMinimumCut",
+  "FindMinValue",
+  "FindMoleculeSubstructure",
+  "FindPath",
+  "FindPeaks",
+  "FindPermutation",
+  "FindPostmanTour",
+  "FindProcessParameters",
+  "FindRepeat",
+  "FindRoot",
+  "FindSequenceFunction",
+  "FindSettings",
+  "FindShortestPath",
+  "FindShortestTour",
+  "FindSpanningTree",
+  "FindSystemModelEquilibrium",
+  "FindTextualAnswer",
+  "FindThreshold",
+  "FindTransientRepeat",
+  "FindVertexCover",
+  "FindVertexCut",
+  "FindVertexIndependentPaths",
+  "Fine",
+  "FinishDynamic",
+  "FiniteAbelianGroupCount",
+  "FiniteGroupCount",
+  "FiniteGroupData",
+  "First",
+  "FirstCase",
+  "FirstPassageTimeDistribution",
+  "FirstPosition",
+  "FischerGroupFi22",
+  "FischerGroupFi23",
+  "FischerGroupFi24Prime",
+  "FisherHypergeometricDistribution",
+  "FisherRatioTest",
+  "FisherZDistribution",
+  "Fit",
+  "FitAll",
+  "FitRegularization",
+  "FittedModel",
+  "FixedOrder",
+  "FixedPoint",
+  "FixedPointList",
+  "FlashSelection",
+  "Flat",
+  "Flatten",
+  "FlattenAt",
+  "FlattenLayer",
+  "FlatTopWindow",
+  "FlipView",
+  "Floor",
+  "FlowPolynomial",
+  "FlushPrintOutputPacket",
+  "Fold",
+  "FoldList",
+  "FoldPair",
+  "FoldPairList",
+  "FollowRedirects",
+  "Font",
+  "FontColor",
+  "FontFamily",
+  "FontForm",
+  "FontName",
+  "FontOpacity",
+  "FontPostScriptName",
+  "FontProperties",
+  "FontReencoding",
+  "FontSize",
+  "FontSlant",
+  "FontSubstitutions",
+  "FontTracking",
+  "FontVariations",
+  "FontWeight",
+  "For",
+  "ForAll",
+  "ForceVersionInstall",
+  "Format",
+  "FormatRules",
+  "FormatType",
+  "FormatTypeAutoConvert",
+  "FormatValues",
+  "FormBox",
+  "FormBoxOptions",
+  "FormControl",
+  "FormFunction",
+  "FormLayoutFunction",
+  "FormObject",
+  "FormPage",
+  "FormTheme",
+  "FormulaData",
+  "FormulaLookup",
+  "FortranForm",
+  "Forward",
+  "ForwardBackward",
+  "Fourier",
+  "FourierCoefficient",
+  "FourierCosCoefficient",
+  "FourierCosSeries",
+  "FourierCosTransform",
+  "FourierDCT",
+  "FourierDCTFilter",
+  "FourierDCTMatrix",
+  "FourierDST",
+  "FourierDSTMatrix",
+  "FourierMatrix",
+  "FourierParameters",
+  "FourierSequenceTransform",
+  "FourierSeries",
+  "FourierSinCoefficient",
+  "FourierSinSeries",
+  "FourierSinTransform",
+  "FourierTransform",
+  "FourierTrigSeries",
+  "FractionalBrownianMotionProcess",
+  "FractionalGaussianNoiseProcess",
+  "FractionalPart",
+  "FractionBox",
+  "FractionBoxOptions",
+  "FractionLine",
+  "Frame",
+  "FrameBox",
+  "FrameBoxOptions",
+  "Framed",
+  "FrameInset",
+  "FrameLabel",
+  "Frameless",
+  "FrameMargins",
+  "FrameRate",
+  "FrameStyle",
+  "FrameTicks",
+  "FrameTicksStyle",
+  "FRatioDistribution",
+  "FrechetDistribution",
+  "FreeQ",
+  "FrenetSerretSystem",
+  "FrequencySamplingFilterKernel",
+  "FresnelC",
+  "FresnelF",
+  "FresnelG",
+  "FresnelS",
+  "Friday",
+  "FrobeniusNumber",
+  "FrobeniusSolve",
+  "FromAbsoluteTime",
+  "FromCharacterCode",
+  "FromCoefficientRules",
+  "FromContinuedFraction",
+  "FromDate",
+  "FromDigits",
+  "FromDMS",
+  "FromEntity",
+  "FromJulianDate",
+  "FromLetterNumber",
+  "FromPolarCoordinates",
+  "FromRomanNumeral",
+  "FromSphericalCoordinates",
+  "FromUnixTime",
+  "Front",
+  "FrontEndDynamicExpression",
+  "FrontEndEventActions",
+  "FrontEndExecute",
+  "FrontEndObject",
+  "FrontEndResource",
+  "FrontEndResourceString",
+  "FrontEndStackSize",
+  "FrontEndToken",
+  "FrontEndTokenExecute",
+  "FrontEndValueCache",
+  "FrontEndVersion",
+  "FrontFaceColor",
+  "FrontFaceOpacity",
+  "Full",
+  "FullAxes",
+  "FullDefinition",
+  "FullForm",
+  "FullGraphics",
+  "FullInformationOutputRegulator",
+  "FullOptions",
+  "FullRegion",
+  "FullSimplify",
+  "Function",
+  "FunctionCompile",
+  "FunctionCompileExport",
+  "FunctionCompileExportByteArray",
+  "FunctionCompileExportLibrary",
+  "FunctionCompileExportString",
+  "FunctionDomain",
+  "FunctionExpand",
+  "FunctionInterpolation",
+  "FunctionPeriod",
+  "FunctionRange",
+  "FunctionSpace",
+  "FussellVeselyImportance",
+  "GaborFilter",
+  "GaborMatrix",
+  "GaborWavelet",
+  "GainMargins",
+  "GainPhaseMargins",
+  "GalaxyData",
+  "GalleryView",
+  "Gamma",
+  "GammaDistribution",
+  "GammaRegularized",
+  "GapPenalty",
+  "GARCHProcess",
+  "GatedRecurrentLayer",
+  "Gather",
+  "GatherBy",
+  "GaugeFaceElementFunction",
+  "GaugeFaceStyle",
+  "GaugeFrameElementFunction",
+  "GaugeFrameSize",
+  "GaugeFrameStyle",
+  "GaugeLabels",
+  "GaugeMarkers",
+  "GaugeStyle",
+  "GaussianFilter",
+  "GaussianIntegers",
+  "GaussianMatrix",
+  "GaussianOrthogonalMatrixDistribution",
+  "GaussianSymplecticMatrixDistribution",
+  "GaussianUnitaryMatrixDistribution",
+  "GaussianWindow",
+  "GCD",
+  "GegenbauerC",
+  "General",
+  "GeneralizedLinearModelFit",
+  "GenerateAsymmetricKeyPair",
+  "GenerateConditions",
+  "GeneratedCell",
+  "GeneratedDocumentBinding",
+  "GenerateDerivedKey",
+  "GenerateDigitalSignature",
+  "GenerateDocument",
+  "GeneratedParameters",
+  "GeneratedQuantityMagnitudes",
+  "GenerateFileSignature",
+  "GenerateHTTPResponse",
+  "GenerateSecuredAuthenticationKey",
+  "GenerateSymmetricKey",
+  "GeneratingFunction",
+  "GeneratorDescription",
+  "GeneratorHistoryLength",
+  "GeneratorOutputType",
+  "Generic",
+  "GenericCylindricalDecomposition",
+  "GenomeData",
+  "GenomeLookup",
+  "GeoAntipode",
+  "GeoArea",
+  "GeoArraySize",
+  "GeoBackground",
+  "GeoBoundingBox",
+  "GeoBounds",
+  "GeoBoundsRegion",
+  "GeoBubbleChart",
+  "GeoCenter",
+  "GeoCircle",
+  "GeoContourPlot",
+  "GeoDensityPlot",
+  "GeodesicClosing",
+  "GeodesicDilation",
+  "GeodesicErosion",
+  "GeodesicOpening",
+  "GeoDestination",
+  "GeodesyData",
+  "GeoDirection",
+  "GeoDisk",
+  "GeoDisplacement",
+  "GeoDistance",
+  "GeoDistanceList",
+  "GeoElevationData",
+  "GeoEntities",
+  "GeoGraphics",
+  "GeogravityModelData",
+  "GeoGridDirectionDifference",
+  "GeoGridLines",
+  "GeoGridLinesStyle",
+  "GeoGridPosition",
+  "GeoGridRange",
+  "GeoGridRangePadding",
+  "GeoGridUnitArea",
+  "GeoGridUnitDistance",
+  "GeoGridVector",
+  "GeoGroup",
+  "GeoHemisphere",
+  "GeoHemisphereBoundary",
+  "GeoHistogram",
+  "GeoIdentify",
+  "GeoImage",
+  "GeoLabels",
+  "GeoLength",
+  "GeoListPlot",
+  "GeoLocation",
+  "GeologicalPeriodData",
+  "GeomagneticModelData",
+  "GeoMarker",
+  "GeometricAssertion",
+  "GeometricBrownianMotionProcess",
+  "GeometricDistribution",
+  "GeometricMean",
+  "GeometricMeanFilter",
+  "GeometricOptimization",
+  "GeometricScene",
+  "GeometricTransformation",
+  "GeometricTransformation3DBox",
+  "GeometricTransformation3DBoxOptions",
+  "GeometricTransformationBox",
+  "GeometricTransformationBoxOptions",
+  "GeoModel",
+  "GeoNearest",
+  "GeoPath",
+  "GeoPosition",
+  "GeoPositionENU",
+  "GeoPositionXYZ",
+  "GeoProjection",
+  "GeoProjectionData",
+  "GeoRange",
+  "GeoRangePadding",
+  "GeoRegionValuePlot",
+  "GeoResolution",
+  "GeoScaleBar",
+  "GeoServer",
+  "GeoSmoothHistogram",
+  "GeoStreamPlot",
+  "GeoStyling",
+  "GeoStylingImageFunction",
+  "GeoVariant",
+  "GeoVector",
+  "GeoVectorENU",
+  "GeoVectorPlot",
+  "GeoVectorXYZ",
+  "GeoVisibleRegion",
+  "GeoVisibleRegionBoundary",
+  "GeoWithinQ",
+  "GeoZoomLevel",
+  "GestureHandler",
+  "GestureHandlerTag",
+  "Get",
+  "GetBoundingBoxSizePacket",
+  "GetContext",
+  "GetEnvironment",
+  "GetFileName",
+  "GetFrontEndOptionsDataPacket",
+  "GetLinebreakInformationPacket",
+  "GetMenusPacket",
+  "GetPageBreakInformationPacket",
+  "Glaisher",
+  "GlobalClusteringCoefficient",
+  "GlobalPreferences",
+  "GlobalSession",
+  "Glow",
+  "GoldenAngle",
+  "GoldenRatio",
+  "GompertzMakehamDistribution",
+  "GoochShading",
+  "GoodmanKruskalGamma",
+  "GoodmanKruskalGammaTest",
+  "Goto",
+  "Grad",
+  "Gradient",
+  "GradientFilter",
+  "GradientOrientationFilter",
+  "GrammarApply",
+  "GrammarRules",
+  "GrammarToken",
+  "Graph",
+  "Graph3D",
+  "GraphAssortativity",
+  "GraphAutomorphismGroup",
+  "GraphCenter",
+  "GraphComplement",
+  "GraphData",
+  "GraphDensity",
+  "GraphDiameter",
+  "GraphDifference",
+  "GraphDisjointUnion",
+  "GraphDistance",
+  "GraphDistanceMatrix",
+  "GraphElementData",
+  "GraphEmbedding",
+  "GraphHighlight",
+  "GraphHighlightStyle",
+  "GraphHub",
+  "Graphics",
+  "Graphics3D",
+  "Graphics3DBox",
+  "Graphics3DBoxOptions",
+  "GraphicsArray",
+  "GraphicsBaseline",
+  "GraphicsBox",
+  "GraphicsBoxOptions",
+  "GraphicsColor",
+  "GraphicsColumn",
+  "GraphicsComplex",
+  "GraphicsComplex3DBox",
+  "GraphicsComplex3DBoxOptions",
+  "GraphicsComplexBox",
+  "GraphicsComplexBoxOptions",
+  "GraphicsContents",
+  "GraphicsData",
+  "GraphicsGrid",
+  "GraphicsGridBox",
+  "GraphicsGroup",
+  "GraphicsGroup3DBox",
+  "GraphicsGroup3DBoxOptions",
+  "GraphicsGroupBox",
+  "GraphicsGroupBoxOptions",
+  "GraphicsGrouping",
+  "GraphicsHighlightColor",
+  "GraphicsRow",
+  "GraphicsSpacing",
+  "GraphicsStyle",
+  "GraphIntersection",
+  "GraphLayout",
+  "GraphLinkEfficiency",
+  "GraphPeriphery",
+  "GraphPlot",
+  "GraphPlot3D",
+  "GraphPower",
+  "GraphPropertyDistribution",
+  "GraphQ",
+  "GraphRadius",
+  "GraphReciprocity",
+  "GraphRoot",
+  "GraphStyle",
+  "GraphUnion",
+  "Gray",
+  "GrayLevel",
+  "Greater",
+  "GreaterEqual",
+  "GreaterEqualLess",
+  "GreaterEqualThan",
+  "GreaterFullEqual",
+  "GreaterGreater",
+  "GreaterLess",
+  "GreaterSlantEqual",
+  "GreaterThan",
+  "GreaterTilde",
+  "Green",
+  "GreenFunction",
+  "Grid",
+  "GridBaseline",
+  "GridBox",
+  "GridBoxAlignment",
+  "GridBoxBackground",
+  "GridBoxDividers",
+  "GridBoxFrame",
+  "GridBoxItemSize",
+  "GridBoxItemStyle",
+  "GridBoxOptions",
+  "GridBoxSpacings",
+  "GridCreationSettings",
+  "GridDefaultElement",
+  "GridElementStyleOptions",
+  "GridFrame",
+  "GridFrameMargins",
+  "GridGraph",
+  "GridLines",
+  "GridLinesStyle",
+  "GroebnerBasis",
+  "GroupActionBase",
+  "GroupBy",
+  "GroupCentralizer",
+  "GroupElementFromWord",
+  "GroupElementPosition",
+  "GroupElementQ",
+  "GroupElements",
+  "GroupElementToWord",
+  "GroupGenerators",
+  "Groupings",
+  "GroupMultiplicationTable",
+  "GroupOrbits",
+  "GroupOrder",
+  "GroupPageBreakWithin",
+  "GroupSetwiseStabilizer",
+  "GroupStabilizer",
+  "GroupStabilizerChain",
+  "GroupTogetherGrouping",
+  "GroupTogetherNestedGrouping",
+  "GrowCutComponents",
+  "Gudermannian",
+  "GuidedFilter",
+  "GumbelDistribution",
+  "HaarWavelet",
+  "HadamardMatrix",
+  "HalfLine",
+  "HalfNormalDistribution",
+  "HalfPlane",
+  "HalfSpace",
+  "HalftoneShading",
+  "HamiltonianGraphQ",
+  "HammingDistance",
+  "HammingWindow",
+  "HandlerFunctions",
+  "HandlerFunctionsKeys",
+  "HankelH1",
+  "HankelH2",
+  "HankelMatrix",
+  "HankelTransform",
+  "HannPoissonWindow",
+  "HannWindow",
+  "HaradaNortonGroupHN",
+  "HararyGraph",
+  "HarmonicMean",
+  "HarmonicMeanFilter",
+  "HarmonicNumber",
+  "Hash",
+  "HatchFilling",
+  "HatchShading",
+  "Haversine",
+  "HazardFunction",
+  "Head",
+  "HeadCompose",
+  "HeaderAlignment",
+  "HeaderBackground",
+  "HeaderDisplayFunction",
+  "HeaderLines",
+  "HeaderSize",
+  "HeaderStyle",
+  "Heads",
+  "HeavisideLambda",
+  "HeavisidePi",
+  "HeavisideTheta",
+  "HeldGroupHe",
+  "HeldPart",
+  "HelpBrowserLookup",
+  "HelpBrowserNotebook",
+  "HelpBrowserSettings",
+  "Here",
+  "HermiteDecomposition",
+  "HermiteH",
+  "HermitianMatrixQ",
+  "HessenbergDecomposition",
+  "Hessian",
+  "HeunB",
+  "HeunBPrime",
+  "HeunC",
+  "HeunCPrime",
+  "HeunD",
+  "HeunDPrime",
+  "HeunG",
+  "HeunGPrime",
+  "HeunT",
+  "HeunTPrime",
+  "HexadecimalCharacter",
+  "Hexahedron",
+  "HexahedronBox",
+  "HexahedronBoxOptions",
+  "HiddenItems",
+  "HiddenMarkovProcess",
+  "HiddenSurface",
+  "Highlighted",
+  "HighlightGraph",
+  "HighlightImage",
+  "HighlightMesh",
+  "HighpassFilter",
+  "HigmanSimsGroupHS",
+  "HilbertCurve",
+  "HilbertFilter",
+  "HilbertMatrix",
+  "Histogram",
+  "Histogram3D",
+  "HistogramDistribution",
+  "HistogramList",
+  "HistogramTransform",
+  "HistogramTransformInterpolation",
+  "HistoricalPeriodData",
+  "HitMissTransform",
+  "HITSCentrality",
+  "HjorthDistribution",
+  "HodgeDual",
+  "HoeffdingD",
+  "HoeffdingDTest",
+  "Hold",
+  "HoldAll",
+  "HoldAllComplete",
+  "HoldComplete",
+  "HoldFirst",
+  "HoldForm",
+  "HoldPattern",
+  "HoldRest",
+  "HolidayCalendar",
+  "HomeDirectory",
+  "HomePage",
+  "Horizontal",
+  "HorizontalForm",
+  "HorizontalGauge",
+  "HorizontalScrollPosition",
+  "HornerForm",
+  "HostLookup",
+  "HotellingTSquareDistribution",
+  "HoytDistribution",
+  "HTMLSave",
+  "HTTPErrorResponse",
+  "HTTPRedirect",
+  "HTTPRequest",
+  "HTTPRequestData",
+  "HTTPResponse",
+  "Hue",
+  "HumanGrowthData",
+  "HumpDownHump",
+  "HumpEqual",
+  "HurwitzLerchPhi",
+  "HurwitzZeta",
+  "HyperbolicDistribution",
+  "HypercubeGraph",
+  "HyperexponentialDistribution",
+  "Hyperfactorial",
+  "Hypergeometric0F1",
+  "Hypergeometric0F1Regularized",
+  "Hypergeometric1F1",
+  "Hypergeometric1F1Regularized",
+  "Hypergeometric2F1",
+  "Hypergeometric2F1Regularized",
+  "HypergeometricDistribution",
+  "HypergeometricPFQ",
+  "HypergeometricPFQRegularized",
+  "HypergeometricU",
+  "Hyperlink",
+  "HyperlinkAction",
+  "HyperlinkCreationSettings",
+  "Hyperplane",
+  "Hyphenation",
+  "HyphenationOptions",
+  "HypoexponentialDistribution",
+  "HypothesisTestData",
+  "I",
+  "IconData",
+  "Iconize",
+  "IconizedObject",
+  "IconRules",
+  "Icosahedron",
+  "Identity",
+  "IdentityMatrix",
+  "If",
+  "IgnoreCase",
+  "IgnoreDiacritics",
+  "IgnorePunctuation",
+  "IgnoreSpellCheck",
+  "IgnoringInactive",
+  "Im",
+  "Image",
+  "Image3D",
+  "Image3DProjection",
+  "Image3DSlices",
+  "ImageAccumulate",
+  "ImageAdd",
+  "ImageAdjust",
+  "ImageAlign",
+  "ImageApply",
+  "ImageApplyIndexed",
+  "ImageAspectRatio",
+  "ImageAssemble",
+  "ImageAugmentationLayer",
+  "ImageBoundingBoxes",
+  "ImageCache",
+  "ImageCacheValid",
+  "ImageCapture",
+  "ImageCaptureFunction",
+  "ImageCases",
+  "ImageChannels",
+  "ImageClip",
+  "ImageCollage",
+  "ImageColorSpace",
+  "ImageCompose",
+  "ImageContainsQ",
+  "ImageContents",
+  "ImageConvolve",
+  "ImageCooccurrence",
+  "ImageCorners",
+  "ImageCorrelate",
+  "ImageCorrespondingPoints",
+  "ImageCrop",
+  "ImageData",
+  "ImageDeconvolve",
+  "ImageDemosaic",
+  "ImageDifference",
+  "ImageDimensions",
+  "ImageDisplacements",
+  "ImageDistance",
+  "ImageEffect",
+  "ImageExposureCombine",
+  "ImageFeatureTrack",
+  "ImageFileApply",
+  "ImageFileFilter",
+  "ImageFileScan",
+  "ImageFilter",
+  "ImageFocusCombine",
+  "ImageForestingComponents",
+  "ImageFormattingWidth",
+  "ImageForwardTransformation",
+  "ImageGraphics",
+  "ImageHistogram",
+  "ImageIdentify",
+  "ImageInstanceQ",
+  "ImageKeypoints",
+  "ImageLabels",
+  "ImageLegends",
+  "ImageLevels",
+  "ImageLines",
+  "ImageMargins",
+  "ImageMarker",
+  "ImageMarkers",
+  "ImageMeasurements",
+  "ImageMesh",
+  "ImageMultiply",
+  "ImageOffset",
+  "ImagePad",
+  "ImagePadding",
+  "ImagePartition",
+  "ImagePeriodogram",
+  "ImagePerspectiveTransformation",
+  "ImagePosition",
+  "ImagePreviewFunction",
+  "ImagePyramid",
+  "ImagePyramidApply",
+  "ImageQ",
+  "ImageRangeCache",
+  "ImageRecolor",
+  "ImageReflect",
+  "ImageRegion",
+  "ImageResize",
+  "ImageResolution",
+  "ImageRestyle",
+  "ImageRotate",
+  "ImageRotated",
+  "ImageSaliencyFilter",
+  "ImageScaled",
+  "ImageScan",
+  "ImageSize",
+  "ImageSizeAction",
+  "ImageSizeCache",
+  "ImageSizeMultipliers",
+  "ImageSizeRaw",
+  "ImageSubtract",
+  "ImageTake",
+  "ImageTransformation",
+  "ImageTrim",
+  "ImageType",
+  "ImageValue",
+  "ImageValuePositions",
+  "ImagingDevice",
+  "ImplicitRegion",
+  "Implies",
+  "Import",
+  "ImportAutoReplacements",
+  "ImportByteArray",
+  "ImportOptions",
+  "ImportString",
+  "ImprovementImportance",
+  "In",
+  "Inactivate",
+  "Inactive",
+  "IncidenceGraph",
+  "IncidenceList",
+  "IncidenceMatrix",
+  "IncludeAromaticBonds",
+  "IncludeConstantBasis",
+  "IncludeDefinitions",
+  "IncludeDirectories",
+  "IncludeFileExtension",
+  "IncludeGeneratorTasks",
+  "IncludeHydrogens",
+  "IncludeInflections",
+  "IncludeMetaInformation",
+  "IncludePods",
+  "IncludeQuantities",
+  "IncludeRelatedTables",
+  "IncludeSingularTerm",
+  "IncludeWindowTimes",
+  "Increment",
+  "IndefiniteMatrixQ",
+  "Indent",
+  "IndentingNewlineSpacings",
+  "IndentMaxFraction",
+  "IndependenceTest",
+  "IndependentEdgeSetQ",
+  "IndependentPhysicalQuantity",
+  "IndependentUnit",
+  "IndependentUnitDimension",
+  "IndependentVertexSetQ",
+  "Indeterminate",
+  "IndeterminateThreshold",
+  "IndexCreationOptions",
+  "Indexed",
+  "IndexEdgeTaggedGraph",
+  "IndexGraph",
+  "IndexTag",
+  "Inequality",
+  "InexactNumberQ",
+  "InexactNumbers",
+  "InfiniteFuture",
+  "InfiniteLine",
+  "InfinitePast",
+  "InfinitePlane",
+  "Infinity",
+  "Infix",
+  "InflationAdjust",
+  "InflationMethod",
+  "Information",
+  "InformationData",
+  "InformationDataGrid",
+  "Inherited",
+  "InheritScope",
+  "InhomogeneousPoissonProcess",
+  "InitialEvaluationHistory",
+  "Initialization",
+  "InitializationCell",
+  "InitializationCellEvaluation",
+  "InitializationCellWarning",
+  "InitializationObjects",
+  "InitializationValue",
+  "Initialize",
+  "InitialSeeding",
+  "InlineCounterAssignments",
+  "InlineCounterIncrements",
+  "InlineRules",
+  "Inner",
+  "InnerPolygon",
+  "InnerPolyhedron",
+  "Inpaint",
+  "Input",
+  "InputAliases",
+  "InputAssumptions",
+  "InputAutoReplacements",
+  "InputField",
+  "InputFieldBox",
+  "InputFieldBoxOptions",
+  "InputForm",
+  "InputGrouping",
+  "InputNamePacket",
+  "InputNotebook",
+  "InputPacket",
+  "InputSettings",
+  "InputStream",
+  "InputString",
+  "InputStringPacket",
+  "InputToBoxFormPacket",
+  "Insert",
+  "InsertionFunction",
+  "InsertionPointObject",
+  "InsertLinebreaks",
+  "InsertResults",
+  "Inset",
+  "Inset3DBox",
+  "Inset3DBoxOptions",
+  "InsetBox",
+  "InsetBoxOptions",
+  "Insphere",
+  "Install",
+  "InstallService",
+  "InstanceNormalizationLayer",
+  "InString",
+  "Integer",
+  "IntegerDigits",
+  "IntegerExponent",
+  "IntegerLength",
+  "IntegerName",
+  "IntegerPart",
+  "IntegerPartitions",
+  "IntegerQ",
+  "IntegerReverse",
+  "Integers",
+  "IntegerString",
+  "Integral",
+  "Integrate",
+  "Interactive",
+  "InteractiveTradingChart",
+  "Interlaced",
+  "Interleaving",
+  "InternallyBalancedDecomposition",
+  "InterpolatingFunction",
+  "InterpolatingPolynomial",
+  "Interpolation",
+  "InterpolationOrder",
+  "InterpolationPoints",
+  "InterpolationPrecision",
+  "Interpretation",
+  "InterpretationBox",
+  "InterpretationBoxOptions",
+  "InterpretationFunction",
+  "Interpreter",
+  "InterpretTemplate",
+  "InterquartileRange",
+  "Interrupt",
+  "InterruptSettings",
+  "IntersectedEntityClass",
+  "IntersectingQ",
+  "Intersection",
+  "Interval",
+  "IntervalIntersection",
+  "IntervalMarkers",
+  "IntervalMarkersStyle",
+  "IntervalMemberQ",
+  "IntervalSlider",
+  "IntervalUnion",
+  "Into",
+  "Inverse",
+  "InverseBetaRegularized",
+  "InverseCDF",
+  "InverseChiSquareDistribution",
+  "InverseContinuousWaveletTransform",
+  "InverseDistanceTransform",
+  "InverseEllipticNomeQ",
+  "InverseErf",
+  "InverseErfc",
+  "InverseFourier",
+  "InverseFourierCosTransform",
+  "InverseFourierSequenceTransform",
+  "InverseFourierSinTransform",
+  "InverseFourierTransform",
+  "InverseFunction",
+  "InverseFunctions",
+  "InverseGammaDistribution",
+  "InverseGammaRegularized",
+  "InverseGaussianDistribution",
+  "InverseGudermannian",
+  "InverseHankelTransform",
+  "InverseHaversine",
+  "InverseImagePyramid",
+  "InverseJacobiCD",
+  "InverseJacobiCN",
+  "InverseJacobiCS",
+  "InverseJacobiDC",
+  "InverseJacobiDN",
+  "InverseJacobiDS",
+  "InverseJacobiNC",
+  "InverseJacobiND",
+  "InverseJacobiNS",
+  "InverseJacobiSC",
+  "InverseJacobiSD",
+  "InverseJacobiSN",
+  "InverseLaplaceTransform",
+  "InverseMellinTransform",
+  "InversePermutation",
+  "InverseRadon",
+  "InverseRadonTransform",
+  "InverseSeries",
+  "InverseShortTimeFourier",
+  "InverseSpectrogram",
+  "InverseSurvivalFunction",
+  "InverseTransformedRegion",
+  "InverseWaveletTransform",
+  "InverseWeierstrassP",
+  "InverseWishartMatrixDistribution",
+  "InverseZTransform",
+  "Invisible",
+  "InvisibleApplication",
+  "InvisibleTimes",
+  "IPAddress",
+  "IrreduciblePolynomialQ",
+  "IslandData",
+  "IsolatingInterval",
+  "IsomorphicGraphQ",
+  "IsotopeData",
+  "Italic",
+  "Item",
+  "ItemAspectRatio",
+  "ItemBox",
+  "ItemBoxOptions",
+  "ItemDisplayFunction",
+  "ItemSize",
+  "ItemStyle",
+  "ItoProcess",
+  "JaccardDissimilarity",
+  "JacobiAmplitude",
+  "Jacobian",
+  "JacobiCD",
+  "JacobiCN",
+  "JacobiCS",
+  "JacobiDC",
+  "JacobiDN",
+  "JacobiDS",
+  "JacobiNC",
+  "JacobiND",
+  "JacobiNS",
+  "JacobiP",
+  "JacobiSC",
+  "JacobiSD",
+  "JacobiSN",
+  "JacobiSymbol",
+  "JacobiZeta",
+  "JankoGroupJ1",
+  "JankoGroupJ2",
+  "JankoGroupJ3",
+  "JankoGroupJ4",
+  "JarqueBeraALMTest",
+  "JohnsonDistribution",
+  "Join",
+  "JoinAcross",
+  "Joined",
+  "JoinedCurve",
+  "JoinedCurveBox",
+  "JoinedCurveBoxOptions",
+  "JoinForm",
+  "JordanDecomposition",
+  "JordanModelDecomposition",
+  "JulianDate",
+  "JuliaSetBoettcher",
+  "JuliaSetIterationCount",
+  "JuliaSetPlot",
+  "JuliaSetPoints",
+  "K",
+  "KagiChart",
+  "KaiserBesselWindow",
+  "KaiserWindow",
+  "KalmanEstimator",
+  "KalmanFilter",
+  "KarhunenLoeveDecomposition",
+  "KaryTree",
+  "KatzCentrality",
+  "KCoreComponents",
+  "KDistribution",
+  "KEdgeConnectedComponents",
+  "KEdgeConnectedGraphQ",
+  "KeepExistingVersion",
+  "KelvinBei",
+  "KelvinBer",
+  "KelvinKei",
+  "KelvinKer",
+  "KendallTau",
+  "KendallTauTest",
+  "KernelExecute",
+  "KernelFunction",
+  "KernelMixtureDistribution",
+  "KernelObject",
+  "Kernels",
+  "Ket",
+  "Key",
+  "KeyCollisionFunction",
+  "KeyComplement",
+  "KeyDrop",
+  "KeyDropFrom",
+  "KeyExistsQ",
+  "KeyFreeQ",
+  "KeyIntersection",
+  "KeyMap",
+  "KeyMemberQ",
+  "KeypointStrength",
+  "Keys",
+  "KeySelect",
+  "KeySort",
+  "KeySortBy",
+  "KeyTake",
+  "KeyUnion",
+  "KeyValueMap",
+  "KeyValuePattern",
+  "Khinchin",
+  "KillProcess",
+  "KirchhoffGraph",
+  "KirchhoffMatrix",
+  "KleinInvariantJ",
+  "KnapsackSolve",
+  "KnightTourGraph",
+  "KnotData",
+  "KnownUnitQ",
+  "KochCurve",
+  "KolmogorovSmirnovTest",
+  "KroneckerDelta",
+  "KroneckerModelDecomposition",
+  "KroneckerProduct",
+  "KroneckerSymbol",
+  "KuiperTest",
+  "KumaraswamyDistribution",
+  "Kurtosis",
+  "KuwaharaFilter",
+  "KVertexConnectedComponents",
+  "KVertexConnectedGraphQ",
+  "LABColor",
+  "Label",
+  "Labeled",
+  "LabeledSlider",
+  "LabelingFunction",
+  "LabelingSize",
+  "LabelStyle",
+  "LabelVisibility",
+  "LaguerreL",
+  "LakeData",
+  "LambdaComponents",
+  "LambertW",
+  "LaminaData",
+  "LanczosWindow",
+  "LandauDistribution",
+  "Language",
+  "LanguageCategory",
+  "LanguageData",
+  "LanguageIdentify",
+  "LanguageOptions",
+  "LaplaceDistribution",
+  "LaplaceTransform",
+  "Laplacian",
+  "LaplacianFilter",
+  "LaplacianGaussianFilter",
+  "Large",
+  "Larger",
+  "Last",
+  "Latitude",
+  "LatitudeLongitude",
+  "LatticeData",
+  "LatticeReduce",
+  "Launch",
+  "LaunchKernels",
+  "LayeredGraphPlot",
+  "LayerSizeFunction",
+  "LayoutInformation",
+  "LCHColor",
+  "LCM",
+  "LeaderSize",
+  "LeafCount",
+  "LeapYearQ",
+  "LearnDistribution",
+  "LearnedDistribution",
+  "LearningRate",
+  "LearningRateMultipliers",
+  "LeastSquares",
+  "LeastSquaresFilterKernel",
+  "Left",
+  "LeftArrow",
+  "LeftArrowBar",
+  "LeftArrowRightArrow",
+  "LeftDownTeeVector",
+  "LeftDownVector",
+  "LeftDownVectorBar",
+  "LeftRightArrow",
+  "LeftRightVector",
+  "LeftTee",
+  "LeftTeeArrow",
+  "LeftTeeVector",
+  "LeftTriangle",
+  "LeftTriangleBar",
+  "LeftTriangleEqual",
+  "LeftUpDownVector",
+  "LeftUpTeeVector",
+  "LeftUpVector",
+  "LeftUpVectorBar",
+  "LeftVector",
+  "LeftVectorBar",
+  "LegendAppearance",
+  "Legended",
+  "LegendFunction",
+  "LegendLabel",
+  "LegendLayout",
+  "LegendMargins",
+  "LegendMarkers",
+  "LegendMarkerSize",
+  "LegendreP",
+  "LegendreQ",
+  "LegendreType",
+  "Length",
+  "LengthWhile",
+  "LerchPhi",
+  "Less",
+  "LessEqual",
+  "LessEqualGreater",
+  "LessEqualThan",
+  "LessFullEqual",
+  "LessGreater",
+  "LessLess",
+  "LessSlantEqual",
+  "LessThan",
+  "LessTilde",
+  "LetterCharacter",
+  "LetterCounts",
+  "LetterNumber",
+  "LetterQ",
+  "Level",
+  "LeveneTest",
+  "LeviCivitaTensor",
+  "LevyDistribution",
+  "Lexicographic",
+  "LibraryDataType",
+  "LibraryFunction",
+  "LibraryFunctionError",
+  "LibraryFunctionInformation",
+  "LibraryFunctionLoad",
+  "LibraryFunctionUnload",
+  "LibraryLoad",
+  "LibraryUnload",
+  "LicenseID",
+  "LiftingFilterData",
+  "LiftingWaveletTransform",
+  "LightBlue",
+  "LightBrown",
+  "LightCyan",
+  "Lighter",
+  "LightGray",
+  "LightGreen",
+  "Lighting",
+  "LightingAngle",
+  "LightMagenta",
+  "LightOrange",
+  "LightPink",
+  "LightPurple",
+  "LightRed",
+  "LightSources",
+  "LightYellow",
+  "Likelihood",
+  "Limit",
+  "LimitsPositioning",
+  "LimitsPositioningTokens",
+  "LindleyDistribution",
+  "Line",
+  "Line3DBox",
+  "Line3DBoxOptions",
+  "LinearFilter",
+  "LinearFractionalOptimization",
+  "LinearFractionalTransform",
+  "LinearGradientImage",
+  "LinearizingTransformationData",
+  "LinearLayer",
+  "LinearModelFit",
+  "LinearOffsetFunction",
+  "LinearOptimization",
+  "LinearProgramming",
+  "LinearRecurrence",
+  "LinearSolve",
+  "LinearSolveFunction",
+  "LineBox",
+  "LineBoxOptions",
+  "LineBreak",
+  "LinebreakAdjustments",
+  "LineBreakChart",
+  "LinebreakSemicolonWeighting",
+  "LineBreakWithin",
+  "LineColor",
+  "LineGraph",
+  "LineIndent",
+  "LineIndentMaxFraction",
+  "LineIntegralConvolutionPlot",
+  "LineIntegralConvolutionScale",
+  "LineLegend",
+  "LineOpacity",
+  "LineSpacing",
+  "LineWrapParts",
+  "LinkActivate",
+  "LinkClose",
+  "LinkConnect",
+  "LinkConnectedQ",
+  "LinkCreate",
+  "LinkError",
+  "LinkFlush",
+  "LinkFunction",
+  "LinkHost",
+  "LinkInterrupt",
+  "LinkLaunch",
+  "LinkMode",
+  "LinkObject",
+  "LinkOpen",
+  "LinkOptions",
+  "LinkPatterns",
+  "LinkProtocol",
+  "LinkRankCentrality",
+  "LinkRead",
+  "LinkReadHeld",
+  "LinkReadyQ",
+  "Links",
+  "LinkService",
+  "LinkWrite",
+  "LinkWriteHeld",
+  "LiouvilleLambda",
+  "List",
+  "Listable",
+  "ListAnimate",
+  "ListContourPlot",
+  "ListContourPlot3D",
+  "ListConvolve",
+  "ListCorrelate",
+  "ListCurvePathPlot",
+  "ListDeconvolve",
+  "ListDensityPlot",
+  "ListDensityPlot3D",
+  "Listen",
+  "ListFormat",
+  "ListFourierSequenceTransform",
+  "ListInterpolation",
+  "ListLineIntegralConvolutionPlot",
+  "ListLinePlot",
+  "ListLogLinearPlot",
+  "ListLogLogPlot",
+  "ListLogPlot",
+  "ListPicker",
+  "ListPickerBox",
+  "ListPickerBoxBackground",
+  "ListPickerBoxOptions",
+  "ListPlay",
+  "ListPlot",
+  "ListPlot3D",
+  "ListPointPlot3D",
+  "ListPolarPlot",
+  "ListQ",
+  "ListSliceContourPlot3D",
+  "ListSliceDensityPlot3D",
+  "ListSliceVectorPlot3D",
+  "ListStepPlot",
+  "ListStreamDensityPlot",
+  "ListStreamPlot",
+  "ListSurfacePlot3D",
+  "ListVectorDensityPlot",
+  "ListVectorPlot",
+  "ListVectorPlot3D",
+  "ListZTransform",
+  "Literal",
+  "LiteralSearch",
+  "LocalAdaptiveBinarize",
+  "LocalCache",
+  "LocalClusteringCoefficient",
+  "LocalizeDefinitions",
+  "LocalizeVariables",
+  "LocalObject",
+  "LocalObjects",
+  "LocalResponseNormalizationLayer",
+  "LocalSubmit",
+  "LocalSymbol",
+  "LocalTime",
+  "LocalTimeZone",
+  "LocationEquivalenceTest",
+  "LocationTest",
+  "Locator",
+  "LocatorAutoCreate",
+  "LocatorBox",
+  "LocatorBoxOptions",
+  "LocatorCentering",
+  "LocatorPane",
+  "LocatorPaneBox",
+  "LocatorPaneBoxOptions",
+  "LocatorRegion",
+  "Locked",
+  "Log",
+  "Log10",
+  "Log2",
+  "LogBarnesG",
+  "LogGamma",
+  "LogGammaDistribution",
+  "LogicalExpand",
+  "LogIntegral",
+  "LogisticDistribution",
+  "LogisticSigmoid",
+  "LogitModelFit",
+  "LogLikelihood",
+  "LogLinearPlot",
+  "LogLogisticDistribution",
+  "LogLogPlot",
+  "LogMultinormalDistribution",
+  "LogNormalDistribution",
+  "LogPlot",
+  "LogRankTest",
+  "LogSeriesDistribution",
+  "LongEqual",
+  "Longest",
+  "LongestCommonSequence",
+  "LongestCommonSequencePositions",
+  "LongestCommonSubsequence",
+  "LongestCommonSubsequencePositions",
+  "LongestMatch",
+  "LongestOrderedSequence",
+  "LongForm",
+  "Longitude",
+  "LongLeftArrow",
+  "LongLeftRightArrow",
+  "LongRightArrow",
+  "LongShortTermMemoryLayer",
+  "Lookup",
+  "Loopback",
+  "LoopFreeGraphQ",
+  "Looping",
+  "LossFunction",
+  "LowerCaseQ",
+  "LowerLeftArrow",
+  "LowerRightArrow",
+  "LowerTriangularize",
+  "LowerTriangularMatrixQ",
+  "LowpassFilter",
+  "LQEstimatorGains",
+  "LQGRegulator",
+  "LQOutputRegulatorGains",
+  "LQRegulatorGains",
+  "LUBackSubstitution",
+  "LucasL",
+  "LuccioSamiComponents",
+  "LUDecomposition",
+  "LunarEclipse",
+  "LUVColor",
+  "LyapunovSolve",
+  "LyonsGroupLy",
+  "MachineID",
+  "MachineName",
+  "MachineNumberQ",
+  "MachinePrecision",
+  "MacintoshSystemPageSetup",
+  "Magenta",
+  "Magnification",
+  "Magnify",
+  "MailAddressValidation",
+  "MailExecute",
+  "MailFolder",
+  "MailItem",
+  "MailReceiverFunction",
+  "MailResponseFunction",
+  "MailSearch",
+  "MailServerConnect",
+  "MailServerConnection",
+  "MailSettings",
+  "MainSolve",
+  "MaintainDynamicCaches",
+  "Majority",
+  "MakeBoxes",
+  "MakeExpression",
+  "MakeRules",
+  "ManagedLibraryExpressionID",
+  "ManagedLibraryExpressionQ",
+  "MandelbrotSetBoettcher",
+  "MandelbrotSetDistance",
+  "MandelbrotSetIterationCount",
+  "MandelbrotSetMemberQ",
+  "MandelbrotSetPlot",
+  "MangoldtLambda",
+  "ManhattanDistance",
+  "Manipulate",
+  "Manipulator",
+  "MannedSpaceMissionData",
+  "MannWhitneyTest",
+  "MantissaExponent",
+  "Manual",
+  "Map",
+  "MapAll",
+  "MapAt",
+  "MapIndexed",
+  "MAProcess",
+  "MapThread",
+  "MarchenkoPasturDistribution",
+  "MarcumQ",
+  "MardiaCombinedTest",
+  "MardiaKurtosisTest",
+  "MardiaSkewnessTest",
+  "MarginalDistribution",
+  "MarkovProcessProperties",
+  "Masking",
+  "MatchingDissimilarity",
+  "MatchLocalNameQ",
+  "MatchLocalNames",
+  "MatchQ",
+  "Material",
+  "MathematicalFunctionData",
+  "MathematicaNotation",
+  "MathieuC",
+  "MathieuCharacteristicA",
+  "MathieuCharacteristicB",
+  "MathieuCharacteristicExponent",
+  "MathieuCPrime",
+  "MathieuGroupM11",
+  "MathieuGroupM12",
+  "MathieuGroupM22",
+  "MathieuGroupM23",
+  "MathieuGroupM24",
+  "MathieuS",
+  "MathieuSPrime",
+  "MathMLForm",
+  "MathMLText",
+  "Matrices",
+  "MatrixExp",
+  "MatrixForm",
+  "MatrixFunction",
+  "MatrixLog",
+  "MatrixNormalDistribution",
+  "MatrixPlot",
+  "MatrixPower",
+  "MatrixPropertyDistribution",
+  "MatrixQ",
+  "MatrixRank",
+  "MatrixTDistribution",
+  "Max",
+  "MaxBend",
+  "MaxCellMeasure",
+  "MaxColorDistance",
+  "MaxDate",
+  "MaxDetect",
+  "MaxDuration",
+  "MaxExtraBandwidths",
+  "MaxExtraConditions",
+  "MaxFeatureDisplacement",
+  "MaxFeatures",
+  "MaxFilter",
+  "MaximalBy",
+  "Maximize",
+  "MaxItems",
+  "MaxIterations",
+  "MaxLimit",
+  "MaxMemoryUsed",
+  "MaxMixtureKernels",
+  "MaxOverlapFraction",
+  "MaxPlotPoints",
+  "MaxPoints",
+  "MaxRecursion",
+  "MaxStableDistribution",
+  "MaxStepFraction",
+  "MaxSteps",
+  "MaxStepSize",
+  "MaxTrainingRounds",
+  "MaxValue",
+  "MaxwellDistribution",
+  "MaxWordGap",
+  "McLaughlinGroupMcL",
+  "Mean",
+  "MeanAbsoluteLossLayer",
+  "MeanAround",
+  "MeanClusteringCoefficient",
+  "MeanDegreeConnectivity",
+  "MeanDeviation",
+  "MeanFilter",
+  "MeanGraphDistance",
+  "MeanNeighborDegree",
+  "MeanShift",
+  "MeanShiftFilter",
+  "MeanSquaredLossLayer",
+  "Median",
+  "MedianDeviation",
+  "MedianFilter",
+  "MedicalTestData",
+  "Medium",
+  "MeijerG",
+  "MeijerGReduce",
+  "MeixnerDistribution",
+  "MellinConvolve",
+  "MellinTransform",
+  "MemberQ",
+  "MemoryAvailable",
+  "MemoryConstrained",
+  "MemoryConstraint",
+  "MemoryInUse",
+  "MengerMesh",
+  "Menu",
+  "MenuAppearance",
+  "MenuCommandKey",
+  "MenuEvaluator",
+  "MenuItem",
+  "MenuList",
+  "MenuPacket",
+  "MenuSortingValue",
+  "MenuStyle",
+  "MenuView",
+  "Merge",
+  "MergeDifferences",
+  "MergingFunction",
+  "MersennePrimeExponent",
+  "MersennePrimeExponentQ",
+  "Mesh",
+  "MeshCellCentroid",
+  "MeshCellCount",
+  "MeshCellHighlight",
+  "MeshCellIndex",
+  "MeshCellLabel",
+  "MeshCellMarker",
+  "MeshCellMeasure",
+  "MeshCellQuality",
+  "MeshCells",
+  "MeshCellShapeFunction",
+  "MeshCellStyle",
+  "MeshConnectivityGraph",
+  "MeshCoordinates",
+  "MeshFunctions",
+  "MeshPrimitives",
+  "MeshQualityGoal",
+  "MeshRange",
+  "MeshRefinementFunction",
+  "MeshRegion",
+  "MeshRegionQ",
+  "MeshShading",
+  "MeshStyle",
+  "Message",
+  "MessageDialog",
+  "MessageList",
+  "MessageName",
+  "MessageObject",
+  "MessageOptions",
+  "MessagePacket",
+  "Messages",
+  "MessagesNotebook",
+  "MetaCharacters",
+  "MetaInformation",
+  "MeteorShowerData",
+  "Method",
+  "MethodOptions",
+  "MexicanHatWavelet",
+  "MeyerWavelet",
+  "Midpoint",
+  "Min",
+  "MinColorDistance",
+  "MinDate",
+  "MinDetect",
+  "MineralData",
+  "MinFilter",
+  "MinimalBy",
+  "MinimalPolynomial",
+  "MinimalStateSpaceModel",
+  "Minimize",
+  "MinimumTimeIncrement",
+  "MinIntervalSize",
+  "MinkowskiQuestionMark",
+  "MinLimit",
+  "MinMax",
+  "MinorPlanetData",
+  "Minors",
+  "MinRecursion",
+  "MinSize",
+  "MinStableDistribution",
+  "Minus",
+  "MinusPlus",
+  "MinValue",
+  "Missing",
+  "MissingBehavior",
+  "MissingDataMethod",
+  "MissingDataRules",
+  "MissingQ",
+  "MissingString",
+  "MissingStyle",
+  "MissingValuePattern",
+  "MittagLefflerE",
+  "MixedFractionParts",
+  "MixedGraphQ",
+  "MixedMagnitude",
+  "MixedRadix",
+  "MixedRadixQuantity",
+  "MixedUnit",
+  "MixtureDistribution",
+  "Mod",
+  "Modal",
+  "Mode",
+  "Modular",
+  "ModularInverse",
+  "ModularLambda",
+  "Module",
+  "Modulus",
+  "MoebiusMu",
+  "Molecule",
+  "MoleculeContainsQ",
+  "MoleculeEquivalentQ",
+  "MoleculeGraph",
+  "MoleculeModify",
+  "MoleculePattern",
+  "MoleculePlot",
+  "MoleculePlot3D",
+  "MoleculeProperty",
+  "MoleculeQ",
+  "MoleculeRecognize",
+  "MoleculeValue",
+  "Moment",
+  "Momentary",
+  "MomentConvert",
+  "MomentEvaluate",
+  "MomentGeneratingFunction",
+  "MomentOfInertia",
+  "Monday",
+  "Monitor",
+  "MonomialList",
+  "MonomialOrder",
+  "MonsterGroupM",
+  "MoonPhase",
+  "MoonPosition",
+  "MorletWavelet",
+  "MorphologicalBinarize",
+  "MorphologicalBranchPoints",
+  "MorphologicalComponents",
+  "MorphologicalEulerNumber",
+  "MorphologicalGraph",
+  "MorphologicalPerimeter",
+  "MorphologicalTransform",
+  "MortalityData",
+  "Most",
+  "MountainData",
+  "MouseAnnotation",
+  "MouseAppearance",
+  "MouseAppearanceTag",
+  "MouseButtons",
+  "Mouseover",
+  "MousePointerNote",
+  "MousePosition",
+  "MovieData",
+  "MovingAverage",
+  "MovingMap",
+  "MovingMedian",
+  "MoyalDistribution",
+  "Multicolumn",
+  "MultiedgeStyle",
+  "MultigraphQ",
+  "MultilaunchWarning",
+  "MultiLetterItalics",
+  "MultiLetterStyle",
+  "MultilineFunction",
+  "Multinomial",
+  "MultinomialDistribution",
+  "MultinormalDistribution",
+  "MultiplicativeOrder",
+  "Multiplicity",
+  "MultiplySides",
+  "Multiselection",
+  "MultivariateHypergeometricDistribution",
+  "MultivariatePoissonDistribution",
+  "MultivariateTDistribution",
+  "N",
+  "NakagamiDistribution",
+  "NameQ",
+  "Names",
+  "NamespaceBox",
+  "NamespaceBoxOptions",
+  "Nand",
+  "NArgMax",
+  "NArgMin",
+  "NBernoulliB",
+  "NBodySimulation",
+  "NBodySimulationData",
+  "NCache",
+  "NDEigensystem",
+  "NDEigenvalues",
+  "NDSolve",
+  "NDSolveValue",
+  "Nearest",
+  "NearestFunction",
+  "NearestMeshCells",
+  "NearestNeighborGraph",
+  "NearestTo",
+  "NebulaData",
+  "NeedCurrentFrontEndPackagePacket",
+  "NeedCurrentFrontEndSymbolsPacket",
+  "NeedlemanWunschSimilarity",
+  "Needs",
+  "Negative",
+  "NegativeBinomialDistribution",
+  "NegativeDefiniteMatrixQ",
+  "NegativeIntegers",
+  "NegativeMultinomialDistribution",
+  "NegativeRationals",
+  "NegativeReals",
+  "NegativeSemidefiniteMatrixQ",
+  "NeighborhoodData",
+  "NeighborhoodGraph",
+  "Nest",
+  "NestedGreaterGreater",
+  "NestedLessLess",
+  "NestedScriptRules",
+  "NestGraph",
+  "NestList",
+  "NestWhile",
+  "NestWhileList",
+  "NetAppend",
+  "NetBidirectionalOperator",
+  "NetChain",
+  "NetDecoder",
+  "NetDelete",
+  "NetDrop",
+  "NetEncoder",
+  "NetEvaluationMode",
+  "NetExtract",
+  "NetFlatten",
+  "NetFoldOperator",
+  "NetGANOperator",
+  "NetGraph",
+  "NetInformation",
+  "NetInitialize",
+  "NetInsert",
+  "NetInsertSharedArrays",
+  "NetJoin",
+  "NetMapOperator",
+  "NetMapThreadOperator",
+  "NetMeasurements",
+  "NetModel",
+  "NetNestOperator",
+  "NetPairEmbeddingOperator",
+  "NetPort",
+  "NetPortGradient",
+  "NetPrepend",
+  "NetRename",
+  "NetReplace",
+  "NetReplacePart",
+  "NetSharedArray",
+  "NetStateObject",
+  "NetTake",
+  "NetTrain",
+  "NetTrainResultsObject",
+  "NetworkPacketCapture",
+  "NetworkPacketRecording",
+  "NetworkPacketRecordingDuring",
+  "NetworkPacketTrace",
+  "NeumannValue",
+  "NevilleThetaC",
+  "NevilleThetaD",
+  "NevilleThetaN",
+  "NevilleThetaS",
+  "NewPrimitiveStyle",
+  "NExpectation",
+  "Next",
+  "NextCell",
+  "NextDate",
+  "NextPrime",
+  "NextScheduledTaskTime",
+  "NHoldAll",
+  "NHoldFirst",
+  "NHoldRest",
+  "NicholsGridLines",
+  "NicholsPlot",
+  "NightHemisphere",
+  "NIntegrate",
+  "NMaximize",
+  "NMaxValue",
+  "NMinimize",
+  "NMinValue",
+  "NominalVariables",
+  "NonAssociative",
+  "NoncentralBetaDistribution",
+  "NoncentralChiSquareDistribution",
+  "NoncentralFRatioDistribution",
+  "NoncentralStudentTDistribution",
+  "NonCommutativeMultiply",
+  "NonConstants",
+  "NondimensionalizationTransform",
+  "None",
+  "NoneTrue",
+  "NonlinearModelFit",
+  "NonlinearStateSpaceModel",
+  "NonlocalMeansFilter",
+  "NonNegative",
+  "NonNegativeIntegers",
+  "NonNegativeRationals",
+  "NonNegativeReals",
+  "NonPositive",
+  "NonPositiveIntegers",
+  "NonPositiveRationals",
+  "NonPositiveReals",
+  "Nor",
+  "NorlundB",
+  "Norm",
+  "Normal",
+  "NormalDistribution",
+  "NormalGrouping",
+  "NormalizationLayer",
+  "Normalize",
+  "Normalized",
+  "NormalizedSquaredEuclideanDistance",
+  "NormalMatrixQ",
+  "NormalsFunction",
+  "NormFunction",
+  "Not",
+  "NotCongruent",
+  "NotCupCap",
+  "NotDoubleVerticalBar",
+  "Notebook",
+  "NotebookApply",
+  "NotebookAutoSave",
+  "NotebookClose",
+  "NotebookConvertSettings",
+  "NotebookCreate",
+  "NotebookCreateReturnObject",
+  "NotebookDefault",
+  "NotebookDelete",
+  "NotebookDirectory",
+  "NotebookDynamicExpression",
+  "NotebookEvaluate",
+  "NotebookEventActions",
+  "NotebookFileName",
+  "NotebookFind",
+  "NotebookFindReturnObject",
+  "NotebookGet",
+  "NotebookGetLayoutInformationPacket",
+  "NotebookGetMisspellingsPacket",
+  "NotebookImport",
+  "NotebookInformation",
+  "NotebookInterfaceObject",
+  "NotebookLocate",
+  "NotebookObject",
+  "NotebookOpen",
+  "NotebookOpenReturnObject",
+  "NotebookPath",
+  "NotebookPrint",
+  "NotebookPut",
+  "NotebookPutReturnObject",
+  "NotebookRead",
+  "NotebookResetGeneratedCells",
+  "Notebooks",
+  "NotebookSave",
+  "NotebookSaveAs",
+  "NotebookSelection",
+  "NotebookSetupLayoutInformationPacket",
+  "NotebooksMenu",
+  "NotebookTemplate",
+  "NotebookWrite",
+  "NotElement",
+  "NotEqualTilde",
+  "NotExists",
+  "NotGreater",
+  "NotGreaterEqual",
+  "NotGreaterFullEqual",
+  "NotGreaterGreater",
+  "NotGreaterLess",
+  "NotGreaterSlantEqual",
+  "NotGreaterTilde",
+  "Nothing",
+  "NotHumpDownHump",
+  "NotHumpEqual",
+  "NotificationFunction",
+  "NotLeftTriangle",
+  "NotLeftTriangleBar",
+  "NotLeftTriangleEqual",
+  "NotLess",
+  "NotLessEqual",
+  "NotLessFullEqual",
+  "NotLessGreater",
+  "NotLessLess",
+  "NotLessSlantEqual",
+  "NotLessTilde",
+  "NotNestedGreaterGreater",
+  "NotNestedLessLess",
+  "NotPrecedes",
+  "NotPrecedesEqual",
+  "NotPrecedesSlantEqual",
+  "NotPrecedesTilde",
+  "NotReverseElement",
+  "NotRightTriangle",
+  "NotRightTriangleBar",
+  "NotRightTriangleEqual",
+  "NotSquareSubset",
+  "NotSquareSubsetEqual",
+  "NotSquareSuperset",
+  "NotSquareSupersetEqual",
+  "NotSubset",
+  "NotSubsetEqual",
+  "NotSucceeds",
+  "NotSucceedsEqual",
+  "NotSucceedsSlantEqual",
+  "NotSucceedsTilde",
+  "NotSuperset",
+  "NotSupersetEqual",
+  "NotTilde",
+  "NotTildeEqual",
+  "NotTildeFullEqual",
+  "NotTildeTilde",
+  "NotVerticalBar",
+  "Now",
+  "NoWhitespace",
+  "NProbability",
+  "NProduct",
+  "NProductFactors",
+  "NRoots",
+  "NSolve",
+  "NSum",
+  "NSumTerms",
+  "NuclearExplosionData",
+  "NuclearReactorData",
+  "Null",
+  "NullRecords",
+  "NullSpace",
+  "NullWords",
+  "Number",
+  "NumberCompose",
+  "NumberDecompose",
+  "NumberExpand",
+  "NumberFieldClassNumber",
+  "NumberFieldDiscriminant",
+  "NumberFieldFundamentalUnits",
+  "NumberFieldIntegralBasis",
+  "NumberFieldNormRepresentatives",
+  "NumberFieldRegulator",
+  "NumberFieldRootsOfUnity",
+  "NumberFieldSignature",
+  "NumberForm",
+  "NumberFormat",
+  "NumberLinePlot",
+  "NumberMarks",
+  "NumberMultiplier",
+  "NumberPadding",
+  "NumberPoint",
+  "NumberQ",
+  "NumberSeparator",
+  "NumberSigns",
+  "NumberString",
+  "Numerator",
+  "NumeratorDenominator",
+  "NumericalOrder",
+  "NumericalSort",
+  "NumericArray",
+  "NumericArrayQ",
+  "NumericArrayType",
+  "NumericFunction",
+  "NumericQ",
+  "NuttallWindow",
+  "NValues",
+  "NyquistGridLines",
+  "NyquistPlot",
+  "O",
+  "ObservabilityGramian",
+  "ObservabilityMatrix",
+  "ObservableDecomposition",
+  "ObservableModelQ",
+  "OceanData",
+  "Octahedron",
+  "OddQ",
+  "Off",
+  "Offset",
+  "OLEData",
+  "On",
+  "ONanGroupON",
+  "Once",
+  "OneIdentity",
+  "Opacity",
+  "OpacityFunction",
+  "OpacityFunctionScaling",
+  "Open",
+  "OpenAppend",
+  "Opener",
+  "OpenerBox",
+  "OpenerBoxOptions",
+  "OpenerView",
+  "OpenFunctionInspectorPacket",
+  "Opening",
+  "OpenRead",
+  "OpenSpecialOptions",
+  "OpenTemporary",
+  "OpenWrite",
+  "Operate",
+  "OperatingSystem",
+  "OperatorApplied",
+  "OptimumFlowData",
+  "Optional",
+  "OptionalElement",
+  "OptionInspectorSettings",
+  "OptionQ",
+  "Options",
+  "OptionsPacket",
+  "OptionsPattern",
+  "OptionValue",
+  "OptionValueBox",
+  "OptionValueBoxOptions",
+  "Or",
+  "Orange",
+  "Order",
+  "OrderDistribution",
+  "OrderedQ",
+  "Ordering",
+  "OrderingBy",
+  "OrderingLayer",
+  "Orderless",
+  "OrderlessPatternSequence",
+  "OrnsteinUhlenbeckProcess",
+  "Orthogonalize",
+  "OrthogonalMatrixQ",
+  "Out",
+  "Outer",
+  "OuterPolygon",
+  "OuterPolyhedron",
+  "OutputAutoOverwrite",
+  "OutputControllabilityMatrix",
+  "OutputControllableModelQ",
+  "OutputForm",
+  "OutputFormData",
+  "OutputGrouping",
+  "OutputMathEditExpression",
+  "OutputNamePacket",
+  "OutputResponse",
+  "OutputSizeLimit",
+  "OutputStream",
+  "Over",
+  "OverBar",
+  "OverDot",
+  "Overflow",
+  "OverHat",
+  "Overlaps",
+  "Overlay",
+  "OverlayBox",
+  "OverlayBoxOptions",
+  "Overscript",
+  "OverscriptBox",
+  "OverscriptBoxOptions",
+  "OverTilde",
+  "OverVector",
+  "OverwriteTarget",
+  "OwenT",
+  "OwnValues",
+  "Package",
+  "PackingMethod",
+  "PackPaclet",
+  "PacletDataRebuild",
+  "PacletDirectoryAdd",
+  "PacletDirectoryLoad",
+  "PacletDirectoryRemove",
+  "PacletDirectoryUnload",
+  "PacletDisable",
+  "PacletEnable",
+  "PacletFind",
+  "PacletFindRemote",
+  "PacletInformation",
+  "PacletInstall",
+  "PacletInstallSubmit",
+  "PacletNewerQ",
+  "PacletObject",
+  "PacletObjectQ",
+  "PacletSite",
+  "PacletSiteObject",
+  "PacletSiteRegister",
+  "PacletSites",
+  "PacletSiteUnregister",
+  "PacletSiteUpdate",
+  "PacletUninstall",
+  "PacletUpdate",
+  "PaddedForm",
+  "Padding",
+  "PaddingLayer",
+  "PaddingSize",
+  "PadeApproximant",
+  "PadLeft",
+  "PadRight",
+  "PageBreakAbove",
+  "PageBreakBelow",
+  "PageBreakWithin",
+  "PageFooterLines",
+  "PageFooters",
+  "PageHeaderLines",
+  "PageHeaders",
+  "PageHeight",
+  "PageRankCentrality",
+  "PageTheme",
+  "PageWidth",
+  "Pagination",
+  "PairedBarChart",
+  "PairedHistogram",
+  "PairedSmoothHistogram",
+  "PairedTTest",
+  "PairedZTest",
+  "PaletteNotebook",
+  "PalettePath",
+  "PalindromeQ",
+  "Pane",
+  "PaneBox",
+  "PaneBoxOptions",
+  "Panel",
+  "PanelBox",
+  "PanelBoxOptions",
+  "Paneled",
+  "PaneSelector",
+  "PaneSelectorBox",
+  "PaneSelectorBoxOptions",
+  "PaperWidth",
+  "ParabolicCylinderD",
+  "ParagraphIndent",
+  "ParagraphSpacing",
+  "ParallelArray",
+  "ParallelCombine",
+  "ParallelDo",
+  "Parallelepiped",
+  "ParallelEvaluate",
+  "Parallelization",
+  "Parallelize",
+  "ParallelMap",
+  "ParallelNeeds",
+  "Parallelogram",
+  "ParallelProduct",
+  "ParallelSubmit",
+  "ParallelSum",
+  "ParallelTable",
+  "ParallelTry",
+  "Parameter",
+  "ParameterEstimator",
+  "ParameterMixtureDistribution",
+  "ParameterVariables",
+  "ParametricFunction",
+  "ParametricNDSolve",
+  "ParametricNDSolveValue",
+  "ParametricPlot",
+  "ParametricPlot3D",
+  "ParametricRampLayer",
+  "ParametricRegion",
+  "ParentBox",
+  "ParentCell",
+  "ParentConnect",
+  "ParentDirectory",
+  "ParentForm",
+  "Parenthesize",
+  "ParentList",
+  "ParentNotebook",
+  "ParetoDistribution",
+  "ParetoPickandsDistribution",
+  "ParkData",
+  "Part",
+  "PartBehavior",
+  "PartialCorrelationFunction",
+  "PartialD",
+  "ParticleAcceleratorData",
+  "ParticleData",
+  "Partition",
+  "PartitionGranularity",
+  "PartitionsP",
+  "PartitionsQ",
+  "PartLayer",
+  "PartOfSpeech",
+  "PartProtection",
+  "ParzenWindow",
+  "PascalDistribution",
+  "PassEventsDown",
+  "PassEventsUp",
+  "Paste",
+  "PasteAutoQuoteCharacters",
+  "PasteBoxFormInlineCells",
+  "PasteButton",
+  "Path",
+  "PathGraph",
+  "PathGraphQ",
+  "Pattern",
+  "PatternFilling",
+  "PatternSequence",
+  "PatternTest",
+  "PauliMatrix",
+  "PaulWavelet",
+  "Pause",
+  "PausedTime",
+  "PDF",
+  "PeakDetect",
+  "PeanoCurve",
+  "PearsonChiSquareTest",
+  "PearsonCorrelationTest",
+  "PearsonDistribution",
+  "PercentForm",
+  "PerfectNumber",
+  "PerfectNumberQ",
+  "PerformanceGoal",
+  "Perimeter",
+  "PeriodicBoundaryCondition",
+  "PeriodicInterpolation",
+  "Periodogram",
+  "PeriodogramArray",
+  "Permanent",
+  "Permissions",
+  "PermissionsGroup",
+  "PermissionsGroupMemberQ",
+  "PermissionsGroups",
+  "PermissionsKey",
+  "PermissionsKeys",
+  "PermutationCycles",
+  "PermutationCyclesQ",
+  "PermutationGroup",
+  "PermutationLength",
+  "PermutationList",
+  "PermutationListQ",
+  "PermutationMax",
+  "PermutationMin",
+  "PermutationOrder",
+  "PermutationPower",
+  "PermutationProduct",
+  "PermutationReplace",
+  "Permutations",
+  "PermutationSupport",
+  "Permute",
+  "PeronaMalikFilter",
+  "Perpendicular",
+  "PerpendicularBisector",
+  "PersistenceLocation",
+  "PersistenceTime",
+  "PersistentObject",
+  "PersistentObjects",
+  "PersistentValue",
+  "PersonData",
+  "PERTDistribution",
+  "PetersenGraph",
+  "PhaseMargins",
+  "PhaseRange",
+  "PhysicalSystemData",
+  "Pi",
+  "Pick",
+  "PIDData",
+  "PIDDerivativeFilter",
+  "PIDFeedforward",
+  "PIDTune",
+  "Piecewise",
+  "PiecewiseExpand",
+  "PieChart",
+  "PieChart3D",
+  "PillaiTrace",
+  "PillaiTraceTest",
+  "PingTime",
+  "Pink",
+  "PitchRecognize",
+  "Pivoting",
+  "PixelConstrained",
+  "PixelValue",
+  "PixelValuePositions",
+  "Placed",
+  "Placeholder",
+  "PlaceholderReplace",
+  "Plain",
+  "PlanarAngle",
+  "PlanarGraph",
+  "PlanarGraphQ",
+  "PlanckRadiationLaw",
+  "PlaneCurveData",
+  "PlanetaryMoonData",
+  "PlanetData",
+  "PlantData",
+  "Play",
+  "PlayRange",
+  "Plot",
+  "Plot3D",
+  "Plot3Matrix",
+  "PlotDivision",
+  "PlotJoined",
+  "PlotLabel",
+  "PlotLabels",
+  "PlotLayout",
+  "PlotLegends",
+  "PlotMarkers",
+  "PlotPoints",
+  "PlotRange",
+  "PlotRangeClipping",
+  "PlotRangeClipPlanesStyle",
+  "PlotRangePadding",
+  "PlotRegion",
+  "PlotStyle",
+  "PlotTheme",
+  "Pluralize",
+  "Plus",
+  "PlusMinus",
+  "Pochhammer",
+  "PodStates",
+  "PodWidth",
+  "Point",
+  "Point3DBox",
+  "Point3DBoxOptions",
+  "PointBox",
+  "PointBoxOptions",
+  "PointFigureChart",
+  "PointLegend",
+  "PointSize",
+  "PoissonConsulDistribution",
+  "PoissonDistribution",
+  "PoissonProcess",
+  "PoissonWindow",
+  "PolarAxes",
+  "PolarAxesOrigin",
+  "PolarGridLines",
+  "PolarPlot",
+  "PolarTicks",
+  "PoleZeroMarkers",
+  "PolyaAeppliDistribution",
+  "PolyGamma",
+  "Polygon",
+  "Polygon3DBox",
+  "Polygon3DBoxOptions",
+  "PolygonalNumber",
+  "PolygonAngle",
+  "PolygonBox",
+  "PolygonBoxOptions",
+  "PolygonCoordinates",
+  "PolygonDecomposition",
+  "PolygonHoleScale",
+  "PolygonIntersections",
+  "PolygonScale",
+  "Polyhedron",
+  "PolyhedronAngle",
+  "PolyhedronCoordinates",
+  "PolyhedronData",
+  "PolyhedronDecomposition",
+  "PolyhedronGenus",
+  "PolyLog",
+  "PolynomialExtendedGCD",
+  "PolynomialForm",
+  "PolynomialGCD",
+  "PolynomialLCM",
+  "PolynomialMod",
+  "PolynomialQ",
+  "PolynomialQuotient",
+  "PolynomialQuotientRemainder",
+  "PolynomialReduce",
+  "PolynomialRemainder",
+  "Polynomials",
+  "PoolingLayer",
+  "PopupMenu",
+  "PopupMenuBox",
+  "PopupMenuBoxOptions",
+  "PopupView",
+  "PopupWindow",
+  "Position",
+  "PositionIndex",
+  "Positive",
+  "PositiveDefiniteMatrixQ",
+  "PositiveIntegers",
+  "PositiveRationals",
+  "PositiveReals",
+  "PositiveSemidefiniteMatrixQ",
+  "PossibleZeroQ",
+  "Postfix",
+  "PostScript",
+  "Power",
+  "PowerDistribution",
+  "PowerExpand",
+  "PowerMod",
+  "PowerModList",
+  "PowerRange",
+  "PowerSpectralDensity",
+  "PowersRepresentations",
+  "PowerSymmetricPolynomial",
+  "Precedence",
+  "PrecedenceForm",
+  "Precedes",
+  "PrecedesEqual",
+  "PrecedesSlantEqual",
+  "PrecedesTilde",
+  "Precision",
+  "PrecisionGoal",
+  "PreDecrement",
+  "Predict",
+  "PredictionRoot",
+  "PredictorFunction",
+  "PredictorInformation",
+  "PredictorMeasurements",
+  "PredictorMeasurementsObject",
+  "PreemptProtect",
+  "PreferencesPath",
+  "Prefix",
+  "PreIncrement",
+  "Prepend",
+  "PrependLayer",
+  "PrependTo",
+  "PreprocessingRules",
+  "PreserveColor",
+  "PreserveImageOptions",
+  "Previous",
+  "PreviousCell",
+  "PreviousDate",
+  "PriceGraphDistribution",
+  "PrimaryPlaceholder",
+  "Prime",
+  "PrimeNu",
+  "PrimeOmega",
+  "PrimePi",
+  "PrimePowerQ",
+  "PrimeQ",
+  "Primes",
+  "PrimeZetaP",
+  "PrimitivePolynomialQ",
+  "PrimitiveRoot",
+  "PrimitiveRootList",
+  "PrincipalComponents",
+  "PrincipalValue",
+  "Print",
+  "PrintableASCIIQ",
+  "PrintAction",
+  "PrintForm",
+  "PrintingCopies",
+  "PrintingOptions",
+  "PrintingPageRange",
+  "PrintingStartingPageNumber",
+  "PrintingStyleEnvironment",
+  "Printout3D",
+  "Printout3DPreviewer",
+  "PrintPrecision",
+  "PrintTemporary",
+  "Prism",
+  "PrismBox",
+  "PrismBoxOptions",
+  "PrivateCellOptions",
+  "PrivateEvaluationOptions",
+  "PrivateFontOptions",
+  "PrivateFrontEndOptions",
+  "PrivateKey",
+  "PrivateNotebookOptions",
+  "PrivatePaths",
+  "Probability",
+  "ProbabilityDistribution",
+  "ProbabilityPlot",
+  "ProbabilityPr",
+  "ProbabilityScalePlot",
+  "ProbitModelFit",
+  "ProcessConnection",
+  "ProcessDirectory",
+  "ProcessEnvironment",
+  "Processes",
+  "ProcessEstimator",
+  "ProcessInformation",
+  "ProcessObject",
+  "ProcessParameterAssumptions",
+  "ProcessParameterQ",
+  "ProcessStateDomain",
+  "ProcessStatus",
+  "ProcessTimeDomain",
+  "Product",
+  "ProductDistribution",
+  "ProductLog",
+  "ProgressIndicator",
+  "ProgressIndicatorBox",
+  "ProgressIndicatorBoxOptions",
+  "Projection",
+  "Prolog",
+  "PromptForm",
+  "ProofObject",
+  "Properties",
+  "Property",
+  "PropertyList",
+  "PropertyValue",
+  "Proportion",
+  "Proportional",
+  "Protect",
+  "Protected",
+  "ProteinData",
+  "Pruning",
+  "PseudoInverse",
+  "PsychrometricPropertyData",
+  "PublicKey",
+  "PublisherID",
+  "PulsarData",
+  "PunctuationCharacter",
+  "Purple",
+  "Put",
+  "PutAppend",
+  "Pyramid",
+  "PyramidBox",
+  "PyramidBoxOptions",
+  "QBinomial",
+  "QFactorial",
+  "QGamma",
+  "QHypergeometricPFQ",
+  "QnDispersion",
+  "QPochhammer",
+  "QPolyGamma",
+  "QRDecomposition",
+  "QuadraticIrrationalQ",
+  "QuadraticOptimization",
+  "Quantile",
+  "QuantilePlot",
+  "Quantity",
+  "QuantityArray",
+  "QuantityDistribution",
+  "QuantityForm",
+  "QuantityMagnitude",
+  "QuantityQ",
+  "QuantityUnit",
+  "QuantityVariable",
+  "QuantityVariableCanonicalUnit",
+  "QuantityVariableDimensions",
+  "QuantityVariableIdentifier",
+  "QuantityVariablePhysicalQuantity",
+  "Quartics",
+  "QuartileDeviation",
+  "Quartiles",
+  "QuartileSkewness",
+  "Query",
+  "QueueingNetworkProcess",
+  "QueueingProcess",
+  "QueueProperties",
+  "Quiet",
+  "Quit",
+  "Quotient",
+  "QuotientRemainder",
+  "RadialGradientImage",
+  "RadialityCentrality",
+  "RadicalBox",
+  "RadicalBoxOptions",
+  "RadioButton",
+  "RadioButtonBar",
+  "RadioButtonBox",
+  "RadioButtonBoxOptions",
+  "Radon",
+  "RadonTransform",
+  "RamanujanTau",
+  "RamanujanTauL",
+  "RamanujanTauTheta",
+  "RamanujanTauZ",
+  "Ramp",
+  "Random",
+  "RandomChoice",
+  "RandomColor",
+  "RandomComplex",
+  "RandomEntity",
+  "RandomFunction",
+  "RandomGeoPosition",
+  "RandomGraph",
+  "RandomImage",
+  "RandomInstance",
+  "RandomInteger",
+  "RandomPermutation",
+  "RandomPoint",
+  "RandomPolygon",
+  "RandomPolyhedron",
+  "RandomPrime",
+  "RandomReal",
+  "RandomSample",
+  "RandomSeed",
+  "RandomSeeding",
+  "RandomVariate",
+  "RandomWalkProcess",
+  "RandomWord",
+  "Range",
+  "RangeFilter",
+  "RangeSpecification",
+  "RankedMax",
+  "RankedMin",
+  "RarerProbability",
+  "Raster",
+  "Raster3D",
+  "Raster3DBox",
+  "Raster3DBoxOptions",
+  "RasterArray",
+  "RasterBox",
+  "RasterBoxOptions",
+  "Rasterize",
+  "RasterSize",
+  "Rational",
+  "RationalFunctions",
+  "Rationalize",
+  "Rationals",
+  "Ratios",
+  "RawArray",
+  "RawBoxes",
+  "RawData",
+  "RawMedium",
+  "RayleighDistribution",
+  "Re",
+  "Read",
+  "ReadByteArray",
+  "ReadLine",
+  "ReadList",
+  "ReadProtected",
+  "ReadString",
+  "Real",
+  "RealAbs",
+  "RealBlockDiagonalForm",
+  "RealDigits",
+  "RealExponent",
+  "Reals",
+  "RealSign",
+  "Reap",
+  "RebuildPacletData",
+  "RecognitionPrior",
+  "RecognitionThreshold",
+  "Record",
+  "RecordLists",
+  "RecordSeparators",
+  "Rectangle",
+  "RectangleBox",
+  "RectangleBoxOptions",
+  "RectangleChart",
+  "RectangleChart3D",
+  "RectangularRepeatingElement",
+  "RecurrenceFilter",
+  "RecurrenceTable",
+  "RecurringDigitsForm",
+  "Red",
+  "Reduce",
+  "RefBox",
+  "ReferenceLineStyle",
+  "ReferenceMarkers",
+  "ReferenceMarkerStyle",
+  "Refine",
+  "ReflectionMatrix",
+  "ReflectionTransform",
+  "Refresh",
+  "RefreshRate",
+  "Region",
+  "RegionBinarize",
+  "RegionBoundary",
+  "RegionBoundaryStyle",
+  "RegionBounds",
+  "RegionCentroid",
+  "RegionDifference",
+  "RegionDimension",
+  "RegionDisjoint",
+  "RegionDistance",
+  "RegionDistanceFunction",
+  "RegionEmbeddingDimension",
+  "RegionEqual",
+  "RegionFillingStyle",
+  "RegionFunction",
+  "RegionImage",
+  "RegionIntersection",
+  "RegionMeasure",
+  "RegionMember",
+  "RegionMemberFunction",
+  "RegionMoment",
+  "RegionNearest",
+  "RegionNearestFunction",
+  "RegionPlot",
+  "RegionPlot3D",
+  "RegionProduct",
+  "RegionQ",
+  "RegionResize",
+  "RegionSize",
+  "RegionSymmetricDifference",
+  "RegionUnion",
+  "RegionWithin",
+  "RegisterExternalEvaluator",
+  "RegularExpression",
+  "Regularization",
+  "RegularlySampledQ",
+  "RegularPolygon",
+  "ReIm",
+  "ReImLabels",
+  "ReImPlot",
+  "ReImStyle",
+  "Reinstall",
+  "RelationalDatabase",
+  "RelationGraph",
+  "Release",
+  "ReleaseHold",
+  "ReliabilityDistribution",
+  "ReliefImage",
+  "ReliefPlot",
+  "RemoteAuthorizationCaching",
+  "RemoteConnect",
+  "RemoteConnectionObject",
+  "RemoteFile",
+  "RemoteRun",
+  "RemoteRunProcess",
+  "Remove",
+  "RemoveAlphaChannel",
+  "RemoveAsynchronousTask",
+  "RemoveAudioStream",
+  "RemoveBackground",
+  "RemoveChannelListener",
+  "RemoveChannelSubscribers",
+  "Removed",
+  "RemoveDiacritics",
+  "RemoveInputStreamMethod",
+  "RemoveOutputStreamMethod",
+  "RemoveProperty",
+  "RemoveScheduledTask",
+  "RemoveUsers",
+  "RemoveVideoStream",
+  "RenameDirectory",
+  "RenameFile",
+  "RenderAll",
+  "RenderingOptions",
+  "RenewalProcess",
+  "RenkoChart",
+  "RepairMesh",
+  "Repeated",
+  "RepeatedNull",
+  "RepeatedString",
+  "RepeatedTiming",
+  "RepeatingElement",
+  "Replace",
+  "ReplaceAll",
+  "ReplaceHeldPart",
+  "ReplaceImageValue",
+  "ReplaceList",
+  "ReplacePart",
+  "ReplacePixelValue",
+  "ReplaceRepeated",
+  "ReplicateLayer",
+  "RequiredPhysicalQuantities",
+  "Resampling",
+  "ResamplingAlgorithmData",
+  "ResamplingMethod",
+  "Rescale",
+  "RescalingTransform",
+  "ResetDirectory",
+  "ResetMenusPacket",
+  "ResetScheduledTask",
+  "ReshapeLayer",
+  "Residue",
+  "ResizeLayer",
+  "Resolve",
+  "ResourceAcquire",
+  "ResourceData",
+  "ResourceFunction",
+  "ResourceObject",
+  "ResourceRegister",
+  "ResourceRemove",
+  "ResourceSearch",
+  "ResourceSubmissionObject",
+  "ResourceSubmit",
+  "ResourceSystemBase",
+  "ResourceSystemPath",
+  "ResourceUpdate",
+  "ResourceVersion",
+  "ResponseForm",
+  "Rest",
+  "RestartInterval",
+  "Restricted",
+  "Resultant",
+  "ResumePacket",
+  "Return",
+  "ReturnEntersInput",
+  "ReturnExpressionPacket",
+  "ReturnInputFormPacket",
+  "ReturnPacket",
+  "ReturnReceiptFunction",
+  "ReturnTextPacket",
+  "Reverse",
+  "ReverseApplied",
+  "ReverseBiorthogonalSplineWavelet",
+  "ReverseElement",
+  "ReverseEquilibrium",
+  "ReverseGraph",
+  "ReverseSort",
+  "ReverseSortBy",
+  "ReverseUpEquilibrium",
+  "RevolutionAxis",
+  "RevolutionPlot3D",
+  "RGBColor",
+  "RiccatiSolve",
+  "RiceDistribution",
+  "RidgeFilter",
+  "RiemannR",
+  "RiemannSiegelTheta",
+  "RiemannSiegelZ",
+  "RiemannXi",
+  "Riffle",
+  "Right",
+  "RightArrow",
+  "RightArrowBar",
+  "RightArrowLeftArrow",
+  "RightComposition",
+  "RightCosetRepresentative",
+  "RightDownTeeVector",
+  "RightDownVector",
+  "RightDownVectorBar",
+  "RightTee",
+  "RightTeeArrow",
+  "RightTeeVector",
+  "RightTriangle",
+  "RightTriangleBar",
+  "RightTriangleEqual",
+  "RightUpDownVector",
+  "RightUpTeeVector",
+  "RightUpVector",
+  "RightUpVectorBar",
+  "RightVector",
+  "RightVectorBar",
+  "RiskAchievementImportance",
+  "RiskReductionImportance",
+  "RogersTanimotoDissimilarity",
+  "RollPitchYawAngles",
+  "RollPitchYawMatrix",
+  "RomanNumeral",
+  "Root",
+  "RootApproximant",
+  "RootIntervals",
+  "RootLocusPlot",
+  "RootMeanSquare",
+  "RootOfUnityQ",
+  "RootReduce",
+  "Roots",
+  "RootSum",
+  "Rotate",
+  "RotateLabel",
+  "RotateLeft",
+  "RotateRight",
+  "RotationAction",
+  "RotationBox",
+  "RotationBoxOptions",
+  "RotationMatrix",
+  "RotationTransform",
+  "Round",
+  "RoundImplies",
+  "RoundingRadius",
+  "Row",
+  "RowAlignments",
+  "RowBackgrounds",
+  "RowBox",
+  "RowHeights",
+  "RowLines",
+  "RowMinHeight",
+  "RowReduce",
+  "RowsEqual",
+  "RowSpacings",
+  "RSolve",
+  "RSolveValue",
+  "RudinShapiro",
+  "RudvalisGroupRu",
+  "Rule",
+  "RuleCondition",
+  "RuleDelayed",
+  "RuleForm",
+  "RulePlot",
+  "RulerUnits",
+  "Run",
+  "RunProcess",
+  "RunScheduledTask",
+  "RunThrough",
+  "RuntimeAttributes",
+  "RuntimeOptions",
+  "RussellRaoDissimilarity",
+  "SameQ",
+  "SameTest",
+  "SameTestProperties",
+  "SampledEntityClass",
+  "SampleDepth",
+  "SampledSoundFunction",
+  "SampledSoundList",
+  "SampleRate",
+  "SamplingPeriod",
+  "SARIMAProcess",
+  "SARMAProcess",
+  "SASTriangle",
+  "SatelliteData",
+  "SatisfiabilityCount",
+  "SatisfiabilityInstances",
+  "SatisfiableQ",
+  "Saturday",
+  "Save",
+  "Saveable",
+  "SaveAutoDelete",
+  "SaveConnection",
+  "SaveDefinitions",
+  "SavitzkyGolayMatrix",
+  "SawtoothWave",
+  "Scale",
+  "Scaled",
+  "ScaleDivisions",
+  "ScaledMousePosition",
+  "ScaleOrigin",
+  "ScalePadding",
+  "ScaleRanges",
+  "ScaleRangeStyle",
+  "ScalingFunctions",
+  "ScalingMatrix",
+  "ScalingTransform",
+  "Scan",
+  "ScheduledTask",
+  "ScheduledTaskActiveQ",
+  "ScheduledTaskInformation",
+  "ScheduledTaskInformationData",
+  "ScheduledTaskObject",
+  "ScheduledTasks",
+  "SchurDecomposition",
+  "ScientificForm",
+  "ScientificNotationThreshold",
+  "ScorerGi",
+  "ScorerGiPrime",
+  "ScorerHi",
+  "ScorerHiPrime",
+  "ScreenRectangle",
+  "ScreenStyleEnvironment",
+  "ScriptBaselineShifts",
+  "ScriptForm",
+  "ScriptLevel",
+  "ScriptMinSize",
+  "ScriptRules",
+  "ScriptSizeMultipliers",
+  "Scrollbars",
+  "ScrollingOptions",
+  "ScrollPosition",
+  "SearchAdjustment",
+  "SearchIndexObject",
+  "SearchIndices",
+  "SearchQueryString",
+  "SearchResultObject",
+  "Sec",
+  "Sech",
+  "SechDistribution",
+  "SecondOrderConeOptimization",
+  "SectionGrouping",
+  "SectorChart",
+  "SectorChart3D",
+  "SectorOrigin",
+  "SectorSpacing",
+  "SecuredAuthenticationKey",
+  "SecuredAuthenticationKeys",
+  "SeedRandom",
+  "Select",
+  "Selectable",
+  "SelectComponents",
+  "SelectedCells",
+  "SelectedNotebook",
+  "SelectFirst",
+  "Selection",
+  "SelectionAnimate",
+  "SelectionCell",
+  "SelectionCellCreateCell",
+  "SelectionCellDefaultStyle",
+  "SelectionCellParentStyle",
+  "SelectionCreateCell",
+  "SelectionDebuggerTag",
+  "SelectionDuplicateCell",
+  "SelectionEvaluate",
+  "SelectionEvaluateCreateCell",
+  "SelectionMove",
+  "SelectionPlaceholder",
+  "SelectionSetStyle",
+  "SelectWithContents",
+  "SelfLoops",
+  "SelfLoopStyle",
+  "SemanticImport",
+  "SemanticImportString",
+  "SemanticInterpretation",
+  "SemialgebraicComponentInstances",
+  "SemidefiniteOptimization",
+  "SendMail",
+  "SendMessage",
+  "Sequence",
+  "SequenceAlignment",
+  "SequenceAttentionLayer",
+  "SequenceCases",
+  "SequenceCount",
+  "SequenceFold",
+  "SequenceFoldList",
+  "SequenceForm",
+  "SequenceHold",
+  "SequenceLastLayer",
+  "SequenceMostLayer",
+  "SequencePosition",
+  "SequencePredict",
+  "SequencePredictorFunction",
+  "SequenceReplace",
+  "SequenceRestLayer",
+  "SequenceReverseLayer",
+  "SequenceSplit",
+  "Series",
+  "SeriesCoefficient",
+  "SeriesData",
+  "SeriesTermGoal",
+  "ServiceConnect",
+  "ServiceDisconnect",
+  "ServiceExecute",
+  "ServiceObject",
+  "ServiceRequest",
+  "ServiceResponse",
+  "ServiceSubmit",
+  "SessionSubmit",
+  "SessionTime",
+  "Set",
+  "SetAccuracy",
+  "SetAlphaChannel",
+  "SetAttributes",
+  "Setbacks",
+  "SetBoxFormNamesPacket",
+  "SetCloudDirectory",
+  "SetCookies",
+  "SetDelayed",
+  "SetDirectory",
+  "SetEnvironment",
+  "SetEvaluationNotebook",
+  "SetFileDate",
+  "SetFileLoadingContext",
+  "SetNotebookStatusLine",
+  "SetOptions",
+  "SetOptionsPacket",
+  "SetPermissions",
+  "SetPrecision",
+  "SetProperty",
+  "SetSecuredAuthenticationKey",
+  "SetSelectedNotebook",
+  "SetSharedFunction",
+  "SetSharedVariable",
+  "SetSpeechParametersPacket",
+  "SetStreamPosition",
+  "SetSystemModel",
+  "SetSystemOptions",
+  "Setter",
+  "SetterBar",
+  "SetterBox",
+  "SetterBoxOptions",
+  "Setting",
+  "SetUsers",
+  "SetValue",
+  "Shading",
+  "Shallow",
+  "ShannonWavelet",
+  "ShapiroWilkTest",
+  "Share",
+  "SharingList",
+  "Sharpen",
+  "ShearingMatrix",
+  "ShearingTransform",
+  "ShellRegion",
+  "ShenCastanMatrix",
+  "ShiftedGompertzDistribution",
+  "ShiftRegisterSequence",
+  "Short",
+  "ShortDownArrow",
+  "Shortest",
+  "ShortestMatch",
+  "ShortestPathFunction",
+  "ShortLeftArrow",
+  "ShortRightArrow",
+  "ShortTimeFourier",
+  "ShortTimeFourierData",
+  "ShortUpArrow",
+  "Show",
+  "ShowAutoConvert",
+  "ShowAutoSpellCheck",
+  "ShowAutoStyles",
+  "ShowCellBracket",
+  "ShowCellLabel",
+  "ShowCellTags",
+  "ShowClosedCellArea",
+  "ShowCodeAssist",
+  "ShowContents",
+  "ShowControls",
+  "ShowCursorTracker",
+  "ShowGroupOpenCloseIcon",
+  "ShowGroupOpener",
+  "ShowInvisibleCharacters",
+  "ShowPageBreaks",
+  "ShowPredictiveInterface",
+  "ShowSelection",
+  "ShowShortBoxForm",
+  "ShowSpecialCharacters",
+  "ShowStringCharacters",
+  "ShowSyntaxStyles",
+  "ShrinkingDelay",
+  "ShrinkWrapBoundingBox",
+  "SiderealTime",
+  "SiegelTheta",
+  "SiegelTukeyTest",
+  "SierpinskiCurve",
+  "SierpinskiMesh",
+  "Sign",
+  "Signature",
+  "SignedRankTest",
+  "SignedRegionDistance",
+  "SignificanceLevel",
+  "SignPadding",
+  "SignTest",
+  "SimilarityRules",
+  "SimpleGraph",
+  "SimpleGraphQ",
+  "SimplePolygonQ",
+  "SimplePolyhedronQ",
+  "Simplex",
+  "Simplify",
+  "Sin",
+  "Sinc",
+  "SinghMaddalaDistribution",
+  "SingleEvaluation",
+  "SingleLetterItalics",
+  "SingleLetterStyle",
+  "SingularValueDecomposition",
+  "SingularValueList",
+  "SingularValuePlot",
+  "SingularValues",
+  "Sinh",
+  "SinhIntegral",
+  "SinIntegral",
+  "SixJSymbol",
+  "Skeleton",
+  "SkeletonTransform",
+  "SkellamDistribution",
+  "Skewness",
+  "SkewNormalDistribution",
+  "SkinStyle",
+  "Skip",
+  "SliceContourPlot3D",
+  "SliceDensityPlot3D",
+  "SliceDistribution",
+  "SliceVectorPlot3D",
+  "Slider",
+  "Slider2D",
+  "Slider2DBox",
+  "Slider2DBoxOptions",
+  "SliderBox",
+  "SliderBoxOptions",
+  "SlideView",
+  "Slot",
+  "SlotSequence",
+  "Small",
+  "SmallCircle",
+  "Smaller",
+  "SmithDecomposition",
+  "SmithDelayCompensator",
+  "SmithWatermanSimilarity",
+  "SmoothDensityHistogram",
+  "SmoothHistogram",
+  "SmoothHistogram3D",
+  "SmoothKernelDistribution",
+  "SnDispersion",
+  "Snippet",
+  "SnubPolyhedron",
+  "SocialMediaData",
+  "Socket",
+  "SocketConnect",
+  "SocketListen",
+  "SocketListener",
+  "SocketObject",
+  "SocketOpen",
+  "SocketReadMessage",
+  "SocketReadyQ",
+  "Sockets",
+  "SocketWaitAll",
+  "SocketWaitNext",
+  "SoftmaxLayer",
+  "SokalSneathDissimilarity",
+  "SolarEclipse",
+  "SolarSystemFeatureData",
+  "SolidAngle",
+  "SolidData",
+  "SolidRegionQ",
+  "Solve",
+  "SolveAlways",
+  "SolveDelayed",
+  "Sort",
+  "SortBy",
+  "SortedBy",
+  "SortedEntityClass",
+  "Sound",
+  "SoundAndGraphics",
+  "SoundNote",
+  "SoundVolume",
+  "SourceLink",
+  "Sow",
+  "Space",
+  "SpaceCurveData",
+  "SpaceForm",
+  "Spacer",
+  "Spacings",
+  "Span",
+  "SpanAdjustments",
+  "SpanCharacterRounding",
+  "SpanFromAbove",
+  "SpanFromBoth",
+  "SpanFromLeft",
+  "SpanLineThickness",
+  "SpanMaxSize",
+  "SpanMinSize",
+  "SpanningCharacters",
+  "SpanSymmetric",
+  "SparseArray",
+  "SpatialGraphDistribution",
+  "SpatialMedian",
+  "SpatialTransformationLayer",
+  "Speak",
+  "SpeakerMatchQ",
+  "SpeakTextPacket",
+  "SpearmanRankTest",
+  "SpearmanRho",
+  "SpeciesData",
+  "SpecificityGoal",
+  "SpectralLineData",
+  "Spectrogram",
+  "SpectrogramArray",
+  "Specularity",
+  "SpeechCases",
+  "SpeechInterpreter",
+  "SpeechRecognize",
+  "SpeechSynthesize",
+  "SpellingCorrection",
+  "SpellingCorrectionList",
+  "SpellingDictionaries",
+  "SpellingDictionariesPath",
+  "SpellingOptions",
+  "SpellingSuggestionsPacket",
+  "Sphere",
+  "SphereBox",
+  "SpherePoints",
+  "SphericalBesselJ",
+  "SphericalBesselY",
+  "SphericalHankelH1",
+  "SphericalHankelH2",
+  "SphericalHarmonicY",
+  "SphericalPlot3D",
+  "SphericalRegion",
+  "SphericalShell",
+  "SpheroidalEigenvalue",
+  "SpheroidalJoiningFactor",
+  "SpheroidalPS",
+  "SpheroidalPSPrime",
+  "SpheroidalQS",
+  "SpheroidalQSPrime",
+  "SpheroidalRadialFactor",
+  "SpheroidalS1",
+  "SpheroidalS1Prime",
+  "SpheroidalS2",
+  "SpheroidalS2Prime",
+  "Splice",
+  "SplicedDistribution",
+  "SplineClosed",
+  "SplineDegree",
+  "SplineKnots",
+  "SplineWeights",
+  "Split",
+  "SplitBy",
+  "SpokenString",
+  "Sqrt",
+  "SqrtBox",
+  "SqrtBoxOptions",
+  "Square",
+  "SquaredEuclideanDistance",
+  "SquareFreeQ",
+  "SquareIntersection",
+  "SquareMatrixQ",
+  "SquareRepeatingElement",
+  "SquaresR",
+  "SquareSubset",
+  "SquareSubsetEqual",
+  "SquareSuperset",
+  "SquareSupersetEqual",
+  "SquareUnion",
+  "SquareWave",
+  "SSSTriangle",
+  "StabilityMargins",
+  "StabilityMarginsStyle",
+  "StableDistribution",
+  "Stack",
+  "StackBegin",
+  "StackComplete",
+  "StackedDateListPlot",
+  "StackedListPlot",
+  "StackInhibit",
+  "StadiumShape",
+  "StandardAtmosphereData",
+  "StandardDeviation",
+  "StandardDeviationFilter",
+  "StandardForm",
+  "Standardize",
+  "Standardized",
+  "StandardOceanData",
+  "StandbyDistribution",
+  "Star",
+  "StarClusterData",
+  "StarData",
+  "StarGraph",
+  "StartAsynchronousTask",
+  "StartExternalSession",
+  "StartingStepSize",
+  "StartOfLine",
+  "StartOfString",
+  "StartProcess",
+  "StartScheduledTask",
+  "StartupSound",
+  "StartWebSession",
+  "StateDimensions",
+  "StateFeedbackGains",
+  "StateOutputEstimator",
+  "StateResponse",
+  "StateSpaceModel",
+  "StateSpaceRealization",
+  "StateSpaceTransform",
+  "StateTransformationLinearize",
+  "StationaryDistribution",
+  "StationaryWaveletPacketTransform",
+  "StationaryWaveletTransform",
+  "StatusArea",
+  "StatusCentrality",
+  "StepMonitor",
+  "StereochemistryElements",
+  "StieltjesGamma",
+  "StippleShading",
+  "StirlingS1",
+  "StirlingS2",
+  "StopAsynchronousTask",
+  "StoppingPowerData",
+  "StopScheduledTask",
+  "StrataVariables",
+  "StratonovichProcess",
+  "StreamColorFunction",
+  "StreamColorFunctionScaling",
+  "StreamDensityPlot",
+  "StreamMarkers",
+  "StreamPlot",
+  "StreamPoints",
+  "StreamPosition",
+  "Streams",
+  "StreamScale",
+  "StreamStyle",
+  "String",
+  "StringBreak",
+  "StringByteCount",
+  "StringCases",
+  "StringContainsQ",
+  "StringCount",
+  "StringDelete",
+  "StringDrop",
+  "StringEndsQ",
+  "StringExpression",
+  "StringExtract",
+  "StringForm",
+  "StringFormat",
+  "StringFreeQ",
+  "StringInsert",
+  "StringJoin",
+  "StringLength",
+  "StringMatchQ",
+  "StringPadLeft",
+  "StringPadRight",
+  "StringPart",
+  "StringPartition",
+  "StringPosition",
+  "StringQ",
+  "StringRepeat",
+  "StringReplace",
+  "StringReplaceList",
+  "StringReplacePart",
+  "StringReverse",
+  "StringRiffle",
+  "StringRotateLeft",
+  "StringRotateRight",
+  "StringSkeleton",
+  "StringSplit",
+  "StringStartsQ",
+  "StringTake",
+  "StringTemplate",
+  "StringToByteArray",
+  "StringToStream",
+  "StringTrim",
+  "StripBoxes",
+  "StripOnInput",
+  "StripWrapperBoxes",
+  "StrokeForm",
+  "StructuralImportance",
+  "StructuredArray",
+  "StructuredArrayHeadQ",
+  "StructuredSelection",
+  "StruveH",
+  "StruveL",
+  "Stub",
+  "StudentTDistribution",
+  "Style",
+  "StyleBox",
+  "StyleBoxAutoDelete",
+  "StyleData",
+  "StyleDefinitions",
+  "StyleForm",
+  "StyleHints",
+  "StyleKeyMapping",
+  "StyleMenuListing",
+  "StyleNameDialogSettings",
+  "StyleNames",
+  "StylePrint",
+  "StyleSheetPath",
+  "Subdivide",
+  "Subfactorial",
+  "Subgraph",
+  "SubMinus",
+  "SubPlus",
+  "SubresultantPolynomialRemainders",
+  "SubresultantPolynomials",
+  "Subresultants",
+  "Subscript",
+  "SubscriptBox",
+  "SubscriptBoxOptions",
+  "Subscripted",
+  "Subsequences",
+  "Subset",
+  "SubsetCases",
+  "SubsetCount",
+  "SubsetEqual",
+  "SubsetMap",
+  "SubsetPosition",
+  "SubsetQ",
+  "SubsetReplace",
+  "Subsets",
+  "SubStar",
+  "SubstitutionSystem",
+  "Subsuperscript",
+  "SubsuperscriptBox",
+  "SubsuperscriptBoxOptions",
+  "SubtitleEncoding",
+  "SubtitleTracks",
+  "Subtract",
+  "SubtractFrom",
+  "SubtractSides",
+  "SubValues",
+  "Succeeds",
+  "SucceedsEqual",
+  "SucceedsSlantEqual",
+  "SucceedsTilde",
+  "Success",
+  "SuchThat",
+  "Sum",
+  "SumConvergence",
+  "SummationLayer",
+  "Sunday",
+  "SunPosition",
+  "Sunrise",
+  "Sunset",
+  "SuperDagger",
+  "SuperMinus",
+  "SupernovaData",
+  "SuperPlus",
+  "Superscript",
+  "SuperscriptBox",
+  "SuperscriptBoxOptions",
+  "Superset",
+  "SupersetEqual",
+  "SuperStar",
+  "Surd",
+  "SurdForm",
+  "SurfaceAppearance",
+  "SurfaceArea",
+  "SurfaceColor",
+  "SurfaceData",
+  "SurfaceGraphics",
+  "SurvivalDistribution",
+  "SurvivalFunction",
+  "SurvivalModel",
+  "SurvivalModelFit",
+  "SuspendPacket",
+  "SuzukiDistribution",
+  "SuzukiGroupSuz",
+  "SwatchLegend",
+  "Switch",
+  "Symbol",
+  "SymbolName",
+  "SymletWavelet",
+  "Symmetric",
+  "SymmetricGroup",
+  "SymmetricKey",
+  "SymmetricMatrixQ",
+  "SymmetricPolynomial",
+  "SymmetricReduction",
+  "Symmetrize",
+  "SymmetrizedArray",
+  "SymmetrizedArrayRules",
+  "SymmetrizedDependentComponents",
+  "SymmetrizedIndependentComponents",
+  "SymmetrizedReplacePart",
+  "SynchronousInitialization",
+  "SynchronousUpdating",
+  "Synonyms",
+  "Syntax",
+  "SyntaxForm",
+  "SyntaxInformation",
+  "SyntaxLength",
+  "SyntaxPacket",
+  "SyntaxQ",
+  "SynthesizeMissingValues",
+  "SystemCredential",
+  "SystemCredentialData",
+  "SystemCredentialKey",
+  "SystemCredentialKeys",
+  "SystemCredentialStoreObject",
+  "SystemDialogInput",
+  "SystemException",
+  "SystemGet",
+  "SystemHelpPath",
+  "SystemInformation",
+  "SystemInformationData",
+  "SystemInstall",
+  "SystemModel",
+  "SystemModeler",
+  "SystemModelExamples",
+  "SystemModelLinearize",
+  "SystemModelParametricSimulate",
+  "SystemModelPlot",
+  "SystemModelProgressReporting",
+  "SystemModelReliability",
+  "SystemModels",
+  "SystemModelSimulate",
+  "SystemModelSimulateSensitivity",
+  "SystemModelSimulationData",
+  "SystemOpen",
+  "SystemOptions",
+  "SystemProcessData",
+  "SystemProcesses",
+  "SystemsConnectionsModel",
+  "SystemsModelDelay",
+  "SystemsModelDelayApproximate",
+  "SystemsModelDelete",
+  "SystemsModelDimensions",
+  "SystemsModelExtract",
+  "SystemsModelFeedbackConnect",
+  "SystemsModelLabels",
+  "SystemsModelLinearity",
+  "SystemsModelMerge",
+  "SystemsModelOrder",
+  "SystemsModelParallelConnect",
+  "SystemsModelSeriesConnect",
+  "SystemsModelStateFeedbackConnect",
+  "SystemsModelVectorRelativeOrders",
+  "SystemStub",
+  "SystemTest",
+  "Tab",
+  "TabFilling",
+  "Table",
+  "TableAlignments",
+  "TableDepth",
+  "TableDirections",
+  "TableForm",
+  "TableHeadings",
+  "TableSpacing",
+  "TableView",
+  "TableViewBox",
+  "TableViewBoxBackground",
+  "TableViewBoxItemSize",
+  "TableViewBoxOptions",
+  "TabSpacings",
+  "TabView",
+  "TabViewBox",
+  "TabViewBoxOptions",
+  "TagBox",
+  "TagBoxNote",
+  "TagBoxOptions",
+  "TaggingRules",
+  "TagSet",
+  "TagSetDelayed",
+  "TagStyle",
+  "TagUnset",
+  "Take",
+  "TakeDrop",
+  "TakeLargest",
+  "TakeLargestBy",
+  "TakeList",
+  "TakeSmallest",
+  "TakeSmallestBy",
+  "TakeWhile",
+  "Tally",
+  "Tan",
+  "Tanh",
+  "TargetDevice",
+  "TargetFunctions",
+  "TargetSystem",
+  "TargetUnits",
+  "TaskAbort",
+  "TaskExecute",
+  "TaskObject",
+  "TaskRemove",
+  "TaskResume",
+  "Tasks",
+  "TaskSuspend",
+  "TaskWait",
+  "TautologyQ",
+  "TelegraphProcess",
+  "TemplateApply",
+  "TemplateArgBox",
+  "TemplateBox",
+  "TemplateBoxOptions",
+  "TemplateEvaluate",
+  "TemplateExpression",
+  "TemplateIf",
+  "TemplateObject",
+  "TemplateSequence",
+  "TemplateSlot",
+  "TemplateSlotSequence",
+  "TemplateUnevaluated",
+  "TemplateVerbatim",
+  "TemplateWith",
+  "TemporalData",
+  "TemporalRegularity",
+  "Temporary",
+  "TemporaryVariable",
+  "TensorContract",
+  "TensorDimensions",
+  "TensorExpand",
+  "TensorProduct",
+  "TensorQ",
+  "TensorRank",
+  "TensorReduce",
+  "TensorSymmetry",
+  "TensorTranspose",
+  "TensorWedge",
+  "TestID",
+  "TestReport",
+  "TestReportObject",
+  "TestResultObject",
+  "Tetrahedron",
+  "TetrahedronBox",
+  "TetrahedronBoxOptions",
+  "TeXForm",
+  "TeXSave",
+  "Text",
+  "Text3DBox",
+  "Text3DBoxOptions",
+  "TextAlignment",
+  "TextBand",
+  "TextBoundingBox",
+  "TextBox",
+  "TextCases",
+  "TextCell",
+  "TextClipboardType",
+  "TextContents",
+  "TextData",
+  "TextElement",
+  "TextForm",
+  "TextGrid",
+  "TextJustification",
+  "TextLine",
+  "TextPacket",
+  "TextParagraph",
+  "TextPosition",
+  "TextRecognize",
+  "TextSearch",
+  "TextSearchReport",
+  "TextSentences",
+  "TextString",
+  "TextStructure",
+  "TextStyle",
+  "TextTranslation",
+  "Texture",
+  "TextureCoordinateFunction",
+  "TextureCoordinateScaling",
+  "TextWords",
+  "Therefore",
+  "ThermodynamicData",
+  "ThermometerGauge",
+  "Thick",
+  "Thickness",
+  "Thin",
+  "Thinning",
+  "ThisLink",
+  "ThompsonGroupTh",
+  "Thread",
+  "ThreadingLayer",
+  "ThreeJSymbol",
+  "Threshold",
+  "Through",
+  "Throw",
+  "ThueMorse",
+  "Thumbnail",
+  "Thursday",
+  "Ticks",
+  "TicksStyle",
+  "TideData",
+  "Tilde",
+  "TildeEqual",
+  "TildeFullEqual",
+  "TildeTilde",
+  "TimeConstrained",
+  "TimeConstraint",
+  "TimeDirection",
+  "TimeFormat",
+  "TimeGoal",
+  "TimelinePlot",
+  "TimeObject",
+  "TimeObjectQ",
+  "TimeRemaining",
+  "Times",
+  "TimesBy",
+  "TimeSeries",
+  "TimeSeriesAggregate",
+  "TimeSeriesForecast",
+  "TimeSeriesInsert",
+  "TimeSeriesInvertibility",
+  "TimeSeriesMap",
+  "TimeSeriesMapThread",
+  "TimeSeriesModel",
+  "TimeSeriesModelFit",
+  "TimeSeriesResample",
+  "TimeSeriesRescale",
+  "TimeSeriesShift",
+  "TimeSeriesThread",
+  "TimeSeriesWindow",
+  "TimeUsed",
+  "TimeValue",
+  "TimeWarpingCorrespondence",
+  "TimeWarpingDistance",
+  "TimeZone",
+  "TimeZoneConvert",
+  "TimeZoneOffset",
+  "Timing",
+  "Tiny",
+  "TitleGrouping",
+  "TitsGroupT",
+  "ToBoxes",
+  "ToCharacterCode",
+  "ToColor",
+  "ToContinuousTimeModel",
+  "ToDate",
+  "Today",
+  "ToDiscreteTimeModel",
+  "ToEntity",
+  "ToeplitzMatrix",
+  "ToExpression",
+  "ToFileName",
+  "Together",
+  "Toggle",
+  "ToggleFalse",
+  "Toggler",
+  "TogglerBar",
+  "TogglerBox",
+  "TogglerBoxOptions",
+  "ToHeldExpression",
+  "ToInvertibleTimeSeries",
+  "TokenWords",
+  "Tolerance",
+  "ToLowerCase",
+  "Tomorrow",
+  "ToNumberField",
+  "TooBig",
+  "Tooltip",
+  "TooltipBox",
+  "TooltipBoxOptions",
+  "TooltipDelay",
+  "TooltipStyle",
+  "ToonShading",
+  "Top",
+  "TopHatTransform",
+  "ToPolarCoordinates",
+  "TopologicalSort",
+  "ToRadicals",
+  "ToRules",
+  "ToSphericalCoordinates",
+  "ToString",
+  "Total",
+  "TotalHeight",
+  "TotalLayer",
+  "TotalVariationFilter",
+  "TotalWidth",
+  "TouchPosition",
+  "TouchscreenAutoZoom",
+  "TouchscreenControlPlacement",
+  "ToUpperCase",
+  "Tr",
+  "Trace",
+  "TraceAbove",
+  "TraceAction",
+  "TraceBackward",
+  "TraceDepth",
+  "TraceDialog",
+  "TraceForward",
+  "TraceInternal",
+  "TraceLevel",
+  "TraceOff",
+  "TraceOn",
+  "TraceOriginal",
+  "TracePrint",
+  "TraceScan",
+  "TrackedSymbols",
+  "TrackingFunction",
+  "TracyWidomDistribution",
+  "TradingChart",
+  "TraditionalForm",
+  "TraditionalFunctionNotation",
+  "TraditionalNotation",
+  "TraditionalOrder",
+  "TrainingProgressCheckpointing",
+  "TrainingProgressFunction",
+  "TrainingProgressMeasurements",
+  "TrainingProgressReporting",
+  "TrainingStoppingCriterion",
+  "TrainingUpdateSchedule",
+  "TransferFunctionCancel",
+  "TransferFunctionExpand",
+  "TransferFunctionFactor",
+  "TransferFunctionModel",
+  "TransferFunctionPoles",
+  "TransferFunctionTransform",
+  "TransferFunctionZeros",
+  "TransformationClass",
+  "TransformationFunction",
+  "TransformationFunctions",
+  "TransformationMatrix",
+  "TransformedDistribution",
+  "TransformedField",
+  "TransformedProcess",
+  "TransformedRegion",
+  "TransitionDirection",
+  "TransitionDuration",
+  "TransitionEffect",
+  "TransitiveClosureGraph",
+  "TransitiveReductionGraph",
+  "Translate",
+  "TranslationOptions",
+  "TranslationTransform",
+  "Transliterate",
+  "Transparent",
+  "TransparentColor",
+  "Transpose",
+  "TransposeLayer",
+  "TrapSelection",
+  "TravelDirections",
+  "TravelDirectionsData",
+  "TravelDistance",
+  "TravelDistanceList",
+  "TravelMethod",
+  "TravelTime",
+  "TreeForm",
+  "TreeGraph",
+  "TreeGraphQ",
+  "TreePlot",
+  "TrendStyle",
+  "Triangle",
+  "TriangleCenter",
+  "TriangleConstruct",
+  "TriangleMeasurement",
+  "TriangleWave",
+  "TriangularDistribution",
+  "TriangulateMesh",
+  "Trig",
+  "TrigExpand",
+  "TrigFactor",
+  "TrigFactorList",
+  "Trigger",
+  "TrigReduce",
+  "TrigToExp",
+  "TrimmedMean",
+  "TrimmedVariance",
+  "TropicalStormData",
+  "True",
+  "TrueQ",
+  "TruncatedDistribution",
+  "TruncatedPolyhedron",
+  "TsallisQExponentialDistribution",
+  "TsallisQGaussianDistribution",
+  "TTest",
+  "Tube",
+  "TubeBezierCurveBox",
+  "TubeBezierCurveBoxOptions",
+  "TubeBox",
+  "TubeBoxOptions",
+  "TubeBSplineCurveBox",
+  "TubeBSplineCurveBoxOptions",
+  "Tuesday",
+  "TukeyLambdaDistribution",
+  "TukeyWindow",
+  "TunnelData",
+  "Tuples",
+  "TuranGraph",
+  "TuringMachine",
+  "TuttePolynomial",
+  "TwoWayRule",
+  "Typed",
+  "TypeSpecifier",
+  "UnateQ",
+  "Uncompress",
+  "UnconstrainedParameters",
+  "Undefined",
+  "UnderBar",
+  "Underflow",
+  "Underlined",
+  "Underoverscript",
+  "UnderoverscriptBox",
+  "UnderoverscriptBoxOptions",
+  "Underscript",
+  "UnderscriptBox",
+  "UnderscriptBoxOptions",
+  "UnderseaFeatureData",
+  "UndirectedEdge",
+  "UndirectedGraph",
+  "UndirectedGraphQ",
+  "UndoOptions",
+  "UndoTrackedVariables",
+  "Unequal",
+  "UnequalTo",
+  "Unevaluated",
+  "UniformDistribution",
+  "UniformGraphDistribution",
+  "UniformPolyhedron",
+  "UniformSumDistribution",
+  "Uninstall",
+  "Union",
+  "UnionedEntityClass",
+  "UnionPlus",
+  "Unique",
+  "UnitaryMatrixQ",
+  "UnitBox",
+  "UnitConvert",
+  "UnitDimensions",
+  "Unitize",
+  "UnitRootTest",
+  "UnitSimplify",
+  "UnitStep",
+  "UnitSystem",
+  "UnitTriangle",
+  "UnitVector",
+  "UnitVectorLayer",
+  "UnityDimensions",
+  "UniverseModelData",
+  "UniversityData",
+  "UnixTime",
+  "Unprotect",
+  "UnregisterExternalEvaluator",
+  "UnsameQ",
+  "UnsavedVariables",
+  "Unset",
+  "UnsetShared",
+  "UntrackedVariables",
+  "Up",
+  "UpArrow",
+  "UpArrowBar",
+  "UpArrowDownArrow",
+  "Update",
+  "UpdateDynamicObjects",
+  "UpdateDynamicObjectsSynchronous",
+  "UpdateInterval",
+  "UpdatePacletSites",
+  "UpdateSearchIndex",
+  "UpDownArrow",
+  "UpEquilibrium",
+  "UpperCaseQ",
+  "UpperLeftArrow",
+  "UpperRightArrow",
+  "UpperTriangularize",
+  "UpperTriangularMatrixQ",
+  "Upsample",
+  "UpSet",
+  "UpSetDelayed",
+  "UpTee",
+  "UpTeeArrow",
+  "UpTo",
+  "UpValues",
+  "URL",
+  "URLBuild",
+  "URLDecode",
+  "URLDispatcher",
+  "URLDownload",
+  "URLDownloadSubmit",
+  "URLEncode",
+  "URLExecute",
+  "URLExpand",
+  "URLFetch",
+  "URLFetchAsynchronous",
+  "URLParse",
+  "URLQueryDecode",
+  "URLQueryEncode",
+  "URLRead",
+  "URLResponseTime",
+  "URLSave",
+  "URLSaveAsynchronous",
+  "URLShorten",
+  "URLSubmit",
+  "UseGraphicsRange",
+  "UserDefinedWavelet",
+  "Using",
+  "UsingFrontEnd",
+  "UtilityFunction",
+  "V2Get",
+  "ValenceErrorHandling",
+  "ValidationLength",
+  "ValidationSet",
+  "Value",
+  "ValueBox",
+  "ValueBoxOptions",
+  "ValueDimensions",
+  "ValueForm",
+  "ValuePreprocessingFunction",
+  "ValueQ",
+  "Values",
+  "ValuesData",
+  "Variables",
+  "Variance",
+  "VarianceEquivalenceTest",
+  "VarianceEstimatorFunction",
+  "VarianceGammaDistribution",
+  "VarianceTest",
+  "VectorAngle",
+  "VectorAround",
+  "VectorAspectRatio",
+  "VectorColorFunction",
+  "VectorColorFunctionScaling",
+  "VectorDensityPlot",
+  "VectorGlyphData",
+  "VectorGreater",
+  "VectorGreaterEqual",
+  "VectorLess",
+  "VectorLessEqual",
+  "VectorMarkers",
+  "VectorPlot",
+  "VectorPlot3D",
+  "VectorPoints",
+  "VectorQ",
+  "VectorRange",
+  "Vectors",
+  "VectorScale",
+  "VectorScaling",
+  "VectorSizes",
+  "VectorStyle",
+  "Vee",
+  "Verbatim",
+  "Verbose",
+  "VerboseConvertToPostScriptPacket",
+  "VerificationTest",
+  "VerifyConvergence",
+  "VerifyDerivedKey",
+  "VerifyDigitalSignature",
+  "VerifyFileSignature",
+  "VerifyInterpretation",
+  "VerifySecurityCertificates",
+  "VerifySolutions",
+  "VerifyTestAssumptions",
+  "Version",
+  "VersionedPreferences",
+  "VersionNumber",
+  "VertexAdd",
+  "VertexCapacity",
+  "VertexColors",
+  "VertexComponent",
+  "VertexConnectivity",
+  "VertexContract",
+  "VertexCoordinateRules",
+  "VertexCoordinates",
+  "VertexCorrelationSimilarity",
+  "VertexCosineSimilarity",
+  "VertexCount",
+  "VertexCoverQ",
+  "VertexDataCoordinates",
+  "VertexDegree",
+  "VertexDelete",
+  "VertexDiceSimilarity",
+  "VertexEccentricity",
+  "VertexInComponent",
+  "VertexInDegree",
+  "VertexIndex",
+  "VertexJaccardSimilarity",
+  "VertexLabeling",
+  "VertexLabels",
+  "VertexLabelStyle",
+  "VertexList",
+  "VertexNormals",
+  "VertexOutComponent",
+  "VertexOutDegree",
+  "VertexQ",
+  "VertexRenderingFunction",
+  "VertexReplace",
+  "VertexShape",
+  "VertexShapeFunction",
+  "VertexSize",
+  "VertexStyle",
+  "VertexTextureCoordinates",
+  "VertexWeight",
+  "VertexWeightedGraphQ",
+  "Vertical",
+  "VerticalBar",
+  "VerticalForm",
+  "VerticalGauge",
+  "VerticalSeparator",
+  "VerticalSlider",
+  "VerticalTilde",
+  "Video",
+  "VideoEncoding",
+  "VideoExtractFrames",
+  "VideoFrameList",
+  "VideoFrameMap",
+  "VideoPause",
+  "VideoPlay",
+  "VideoQ",
+  "VideoStop",
+  "VideoStream",
+  "VideoStreams",
+  "VideoTimeSeries",
+  "VideoTracks",
+  "VideoTrim",
+  "ViewAngle",
+  "ViewCenter",
+  "ViewMatrix",
+  "ViewPoint",
+  "ViewPointSelectorSettings",
+  "ViewPort",
+  "ViewProjection",
+  "ViewRange",
+  "ViewVector",
+  "ViewVertical",
+  "VirtualGroupData",
+  "Visible",
+  "VisibleCell",
+  "VoiceStyleData",
+  "VoigtDistribution",
+  "VolcanoData",
+  "Volume",
+  "VonMisesDistribution",
+  "VoronoiMesh",
+  "WaitAll",
+  "WaitAsynchronousTask",
+  "WaitNext",
+  "WaitUntil",
+  "WakebyDistribution",
+  "WalleniusHypergeometricDistribution",
+  "WaringYuleDistribution",
+  "WarpingCorrespondence",
+  "WarpingDistance",
+  "WatershedComponents",
+  "WatsonUSquareTest",
+  "WattsStrogatzGraphDistribution",
+  "WaveletBestBasis",
+  "WaveletFilterCoefficients",
+  "WaveletImagePlot",
+  "WaveletListPlot",
+  "WaveletMapIndexed",
+  "WaveletMatrixPlot",
+  "WaveletPhi",
+  "WaveletPsi",
+  "WaveletScale",
+  "WaveletScalogram",
+  "WaveletThreshold",
+  "WeaklyConnectedComponents",
+  "WeaklyConnectedGraphComponents",
+  "WeaklyConnectedGraphQ",
+  "WeakStationarity",
+  "WeatherData",
+  "WeatherForecastData",
+  "WebAudioSearch",
+  "WebElementObject",
+  "WeberE",
+  "WebExecute",
+  "WebImage",
+  "WebImageSearch",
+  "WebSearch",
+  "WebSessionObject",
+  "WebSessions",
+  "WebWindowObject",
+  "Wedge",
+  "Wednesday",
+  "WeibullDistribution",
+  "WeierstrassE1",
+  "WeierstrassE2",
+  "WeierstrassE3",
+  "WeierstrassEta1",
+  "WeierstrassEta2",
+  "WeierstrassEta3",
+  "WeierstrassHalfPeriods",
+  "WeierstrassHalfPeriodW1",
+  "WeierstrassHalfPeriodW2",
+  "WeierstrassHalfPeriodW3",
+  "WeierstrassInvariantG2",
+  "WeierstrassInvariantG3",
+  "WeierstrassInvariants",
+  "WeierstrassP",
+  "WeierstrassPPrime",
+  "WeierstrassSigma",
+  "WeierstrassZeta",
+  "WeightedAdjacencyGraph",
+  "WeightedAdjacencyMatrix",
+  "WeightedData",
+  "WeightedGraphQ",
+  "Weights",
+  "WelchWindow",
+  "WheelGraph",
+  "WhenEvent",
+  "Which",
+  "While",
+  "White",
+  "WhiteNoiseProcess",
+  "WhitePoint",
+  "Whitespace",
+  "WhitespaceCharacter",
+  "WhittakerM",
+  "WhittakerW",
+  "WienerFilter",
+  "WienerProcess",
+  "WignerD",
+  "WignerSemicircleDistribution",
+  "WikidataData",
+  "WikidataSearch",
+  "WikipediaData",
+  "WikipediaSearch",
+  "WilksW",
+  "WilksWTest",
+  "WindDirectionData",
+  "WindingCount",
+  "WindingPolygon",
+  "WindowClickSelect",
+  "WindowElements",
+  "WindowFloating",
+  "WindowFrame",
+  "WindowFrameElements",
+  "WindowMargins",
+  "WindowMovable",
+  "WindowOpacity",
+  "WindowPersistentStyles",
+  "WindowSelected",
+  "WindowSize",
+  "WindowStatusArea",
+  "WindowTitle",
+  "WindowToolbars",
+  "WindowWidth",
+  "WindSpeedData",
+  "WindVectorData",
+  "WinsorizedMean",
+  "WinsorizedVariance",
+  "WishartMatrixDistribution",
+  "With",
+  "WolframAlpha",
+  "WolframAlphaDate",
+  "WolframAlphaQuantity",
+  "WolframAlphaResult",
+  "WolframLanguageData",
+  "Word",
+  "WordBoundary",
+  "WordCharacter",
+  "WordCloud",
+  "WordCount",
+  "WordCounts",
+  "WordData",
+  "WordDefinition",
+  "WordFrequency",
+  "WordFrequencyData",
+  "WordList",
+  "WordOrientation",
+  "WordSearch",
+  "WordSelectionFunction",
+  "WordSeparators",
+  "WordSpacings",
+  "WordStem",
+  "WordTranslation",
+  "WorkingPrecision",
+  "WrapAround",
+  "Write",
+  "WriteLine",
+  "WriteString",
+  "Wronskian",
+  "XMLElement",
+  "XMLObject",
+  "XMLTemplate",
+  "Xnor",
+  "Xor",
+  "XYZColor",
+  "Yellow",
+  "Yesterday",
+  "YuleDissimilarity",
+  "ZernikeR",
+  "ZeroSymmetric",
+  "ZeroTest",
+  "ZeroWidthTimes",
+  "Zeta",
+  "ZetaZero",
+  "ZIPCodeData",
+  "ZipfDistribution",
+  "ZoomCenter",
+  "ZoomFactor",
+  "ZTest",
+  "ZTransform",
+  "$Aborted",
+  "$ActivationGroupID",
+  "$ActivationKey",
+  "$ActivationUserRegistered",
+  "$AddOnsDirectory",
+  "$AllowDataUpdates",
+  "$AllowExternalChannelFunctions",
+  "$AllowInternet",
+  "$AssertFunction",
+  "$Assumptions",
+  "$AsynchronousTask",
+  "$AudioDecoders",
+  "$AudioEncoders",
+  "$AudioInputDevices",
+  "$AudioOutputDevices",
+  "$BaseDirectory",
+  "$BasePacletsDirectory",
+  "$BatchInput",
+  "$BatchOutput",
+  "$BlockchainBase",
+  "$BoxForms",
+  "$ByteOrdering",
+  "$CacheBaseDirectory",
+  "$Canceled",
+  "$ChannelBase",
+  "$CharacterEncoding",
+  "$CharacterEncodings",
+  "$CloudAccountName",
+  "$CloudBase",
+  "$CloudConnected",
+  "$CloudConnection",
+  "$CloudCreditsAvailable",
+  "$CloudEvaluation",
+  "$CloudExpressionBase",
+  "$CloudObjectNameFormat",
+  "$CloudObjectURLType",
+  "$CloudRootDirectory",
+  "$CloudSymbolBase",
+  "$CloudUserID",
+  "$CloudUserUUID",
+  "$CloudVersion",
+  "$CloudVersionNumber",
+  "$CloudWolframEngineVersionNumber",
+  "$CommandLine",
+  "$CompilationTarget",
+  "$ConditionHold",
+  "$ConfiguredKernels",
+  "$Context",
+  "$ContextPath",
+  "$ControlActiveSetting",
+  "$Cookies",
+  "$CookieStore",
+  "$CreationDate",
+  "$CurrentLink",
+  "$CurrentTask",
+  "$CurrentWebSession",
+  "$DataStructures",
+  "$DateStringFormat",
+  "$DefaultAudioInputDevice",
+  "$DefaultAudioOutputDevice",
+  "$DefaultFont",
+  "$DefaultFrontEnd",
+  "$DefaultImagingDevice",
+  "$DefaultLocalBase",
+  "$DefaultMailbox",
+  "$DefaultNetworkInterface",
+  "$DefaultPath",
+  "$DefaultProxyRules",
+  "$DefaultSystemCredentialStore",
+  "$Display",
+  "$DisplayFunction",
+  "$DistributedContexts",
+  "$DynamicEvaluation",
+  "$Echo",
+  "$EmbedCodeEnvironments",
+  "$EmbeddableServices",
+  "$EntityStores",
+  "$Epilog",
+  "$EvaluationCloudBase",
+  "$EvaluationCloudObject",
+  "$EvaluationEnvironment",
+  "$ExportFormats",
+  "$ExternalIdentifierTypes",
+  "$ExternalStorageBase",
+  "$Failed",
+  "$FinancialDataSource",
+  "$FontFamilies",
+  "$FormatType",
+  "$FrontEnd",
+  "$FrontEndSession",
+  "$GeoEntityTypes",
+  "$GeoLocation",
+  "$GeoLocationCity",
+  "$GeoLocationCountry",
+  "$GeoLocationPrecision",
+  "$GeoLocationSource",
+  "$HistoryLength",
+  "$HomeDirectory",
+  "$HTMLExportRules",
+  "$HTTPCookies",
+  "$HTTPRequest",
+  "$IgnoreEOF",
+  "$ImageFormattingWidth",
+  "$ImageResolution",
+  "$ImagingDevice",
+  "$ImagingDevices",
+  "$ImportFormats",
+  "$IncomingMailSettings",
+  "$InitialDirectory",
+  "$Initialization",
+  "$InitializationContexts",
+  "$Input",
+  "$InputFileName",
+  "$InputStreamMethods",
+  "$Inspector",
+  "$InstallationDate",
+  "$InstallationDirectory",
+  "$InterfaceEnvironment",
+  "$InterpreterTypes",
+  "$IterationLimit",
+  "$KernelCount",
+  "$KernelID",
+  "$Language",
+  "$LaunchDirectory",
+  "$LibraryPath",
+  "$LicenseExpirationDate",
+  "$LicenseID",
+  "$LicenseProcesses",
+  "$LicenseServer",
+  "$LicenseSubprocesses",
+  "$LicenseType",
+  "$Line",
+  "$Linked",
+  "$LinkSupported",
+  "$LoadedFiles",
+  "$LocalBase",
+  "$LocalSymbolBase",
+  "$MachineAddresses",
+  "$MachineDomain",
+  "$MachineDomains",
+  "$MachineEpsilon",
+  "$MachineID",
+  "$MachineName",
+  "$MachinePrecision",
+  "$MachineType",
+  "$MaxExtraPrecision",
+  "$MaxLicenseProcesses",
+  "$MaxLicenseSubprocesses",
+  "$MaxMachineNumber",
+  "$MaxNumber",
+  "$MaxPiecewiseCases",
+  "$MaxPrecision",
+  "$MaxRootDegree",
+  "$MessageGroups",
+  "$MessageList",
+  "$MessagePrePrint",
+  "$Messages",
+  "$MinMachineNumber",
+  "$MinNumber",
+  "$MinorReleaseNumber",
+  "$MinPrecision",
+  "$MobilePhone",
+  "$ModuleNumber",
+  "$NetworkConnected",
+  "$NetworkInterfaces",
+  "$NetworkLicense",
+  "$NewMessage",
+  "$NewSymbol",
+  "$NotebookInlineStorageLimit",
+  "$Notebooks",
+  "$NoValue",
+  "$NumberMarks",
+  "$Off",
+  "$OperatingSystem",
+  "$Output",
+  "$OutputForms",
+  "$OutputSizeLimit",
+  "$OutputStreamMethods",
+  "$Packages",
+  "$ParentLink",
+  "$ParentProcessID",
+  "$PasswordFile",
+  "$PatchLevelID",
+  "$Path",
+  "$PathnameSeparator",
+  "$PerformanceGoal",
+  "$Permissions",
+  "$PermissionsGroupBase",
+  "$PersistenceBase",
+  "$PersistencePath",
+  "$PipeSupported",
+  "$PlotTheme",
+  "$Post",
+  "$Pre",
+  "$PreferencesDirectory",
+  "$PreInitialization",
+  "$PrePrint",
+  "$PreRead",
+  "$PrintForms",
+  "$PrintLiteral",
+  "$Printout3DPreviewer",
+  "$ProcessID",
+  "$ProcessorCount",
+  "$ProcessorType",
+  "$ProductInformation",
+  "$ProgramName",
+  "$PublisherID",
+  "$RandomState",
+  "$RecursionLimit",
+  "$RegisteredDeviceClasses",
+  "$RegisteredUserName",
+  "$ReleaseNumber",
+  "$RequesterAddress",
+  "$RequesterWolframID",
+  "$RequesterWolframUUID",
+  "$RootDirectory",
+  "$ScheduledTask",
+  "$ScriptCommandLine",
+  "$ScriptInputString",
+  "$SecuredAuthenticationKeyTokens",
+  "$ServiceCreditsAvailable",
+  "$Services",
+  "$SessionID",
+  "$SetParentLink",
+  "$SharedFunctions",
+  "$SharedVariables",
+  "$SoundDisplay",
+  "$SoundDisplayFunction",
+  "$SourceLink",
+  "$SSHAuthentication",
+  "$SubtitleDecoders",
+  "$SubtitleEncoders",
+  "$SummaryBoxDataSizeLimit",
+  "$SuppressInputFormHeads",
+  "$SynchronousEvaluation",
+  "$SyntaxHandler",
+  "$System",
+  "$SystemCharacterEncoding",
+  "$SystemCredentialStore",
+  "$SystemID",
+  "$SystemMemory",
+  "$SystemShell",
+  "$SystemTimeZone",
+  "$SystemWordLength",
+  "$TemplatePath",
+  "$TemporaryDirectory",
+  "$TemporaryPrefix",
+  "$TestFileName",
+  "$TextStyle",
+  "$TimedOut",
+  "$TimeUnit",
+  "$TimeZone",
+  "$TimeZoneEntity",
+  "$TopDirectory",
+  "$TraceOff",
+  "$TraceOn",
+  "$TracePattern",
+  "$TracePostAction",
+  "$TracePreAction",
+  "$UnitSystem",
+  "$Urgent",
+  "$UserAddOnsDirectory",
+  "$UserAgentLanguages",
+  "$UserAgentMachine",
+  "$UserAgentName",
+  "$UserAgentOperatingSystem",
+  "$UserAgentString",
+  "$UserAgentVersion",
+  "$UserBaseDirectory",
+  "$UserBasePacletsDirectory",
+  "$UserDocumentsDirectory",
+  "$Username",
+  "$UserName",
+  "$UserURLBase",
+  "$Version",
+  "$VersionNumber",
+  "$VideoDecoders",
+  "$VideoEncoders",
+  "$VoiceStyles",
+  "$WolframDocumentsDirectory",
+  "$WolframID",
+  "$WolframUUID"
+];
diff --git a/src/languages/mathematica.js b/src/languages/mathematica.js
index 789b6e8345..a32e28bed1 100644
--- a/src/languages/mathematica.js
+++ b/src/languages/mathematica.js
@@ -1,59 +1,142 @@
 /*
-Language: Mathematica
-Description: Wolfram Mathematica (usually termed Mathematica) is a modern technical computing system spanning most areas of technical computing.
-Authors: Daniel Kvasnicka <dkvasnicka@vendavo.com>, Jan Poeschko <jan@poeschko.com>
+Language: Wolfram Language
+Description: The Wolfram Language is the programming language used in Wolfram Mathematica, a modern technical computing system spanning most areas of technical computing.
+Authors: Patrick Scheibe <patrick@halirutan.de>, Robert Jacobson <robertjacobson@acm.org>
 Website: https://www.wolfram.com/mathematica/
 Category: scientific
 */
 
+/*
+  The ./lib/mathematica.js file was created with Wolfram Mathematica 12.1.1 under Linux
+  with the following code:
+  $outputFile="/path/to/highlight.js/src/languages/lib/mathematica.js";
+  getStrippedContextNames[context_String]:=Block[
+    {
+      $ContextPath={context}
+    },
+    Union[Names@RegularExpression@StringJoin[context,"\\$?[A-Z]\\w*"]]
+  ];
+  $symbols=getStrippedContextNames["System`"];
+  Export[$outputFile,
+    With[
+      {
+        quoted="\""<>#<>"\""&/@$symbols
+      },
+      StringTemplate["export const SYSTEM_SYMBOLS = [\n`syms`\n];\n"][
+        <|"syms"->StringRiffle[Map["  " <> #&,quoted],",\n"]|>
+      ]
+    ],"String"]
+*/
+import * as Mathematica from './lib/mathematica.js';
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
+  /*
+  This rather scary looking matching of Mathematica numbers is carefully explained by Robert Jacobson here:
+  https://wltools.github.io/LanguageSpec/Specification/Syntax/Number-representations/
+   */
+  const BASE_RE = /([2-9]|[1-2]\d|[3][0-5])\^\^/;
+  const BASE_DIGITS_RE = /(\w*\.\w+|\w+\.\w*|\w+)/;
+  const NUMBER_RE = /(\d*\.\d+|\d+\.\d*|\d+)/;
+  const BASE_NUMBER_RE = regex.either(regex.concat(BASE_RE, BASE_DIGITS_RE), NUMBER_RE);
+
+  const ACCURACY_RE = /``[+-]?(\d*\.\d+|\d+\.\d*|\d+)/;
+  const PRECISION_RE = /`([+-]?(\d*\.\d+|\d+\.\d*|\d+))?/;
+  const APPROXIMATE_NUMBER_RE = regex.either(ACCURACY_RE, PRECISION_RE);
+
+  const SCIENTIFIC_NOTATION_RE = /\*\^[+-]?\d+/;
+
+  const MATHEMATICA_NUMBER_RE = regex.concat(
+    BASE_NUMBER_RE,
+    regex.optional(APPROXIMATE_NUMBER_RE),
+    regex.optional(SCIENTIFIC_NOTATION_RE)
+  );
+
+  const NUMBERS = {
+    className: 'number',
+    relevance: 0,
+    begin: MATHEMATICA_NUMBER_RE
+  };
+
+  const SYMBOL_RE = /[a-zA-Z$][a-zA-Z0-9$]*/;
+  const SYSTEM_SYMBOLS_SET = new Set(Mathematica.SYSTEM_SYMBOLS);
+  /** @type {Mode} */
+  const SYMBOLS = {
+    variants: [
+      {
+        className: 'builtin-symbol',
+        begin: SYMBOL_RE,
+        // for performance out of fear of regex.either(...Mathematica.SYSTEM_SYMBOLS)
+        "on:begin": (match, response) => {
+          if (!SYSTEM_SYMBOLS_SET.has(match[0])) response.ignoreMatch();
+        }
+      },
+      {
+        className: 'symbol',
+        relevance: 0,
+        begin: SYMBOL_RE
+      }
+    ]
+  };
+
+  const NAMED_CHARACTER = {
+    className: 'named-character',
+    begin: /\\\[[$a-zA-Z][$a-zA-Z0-9]+\]/
+  };
+
+  const OPERATORS = {
+    className: 'operator',
+    relevance: 0,
+    begin: /[+\-*/,;.:@~=><&|_`'^?!%]+/
+  };
+  const PATTERNS = {
+    className: 'pattern',
+    relevance: 0,
+    begin: /([a-zA-Z$][a-zA-Z0-9$]*)?_+([a-zA-Z$][a-zA-Z0-9$]*)?/
+  };
+
+  const SLOTS = {
+    className: 'slot',
+    relevance: 0,
+    begin: /#[a-zA-Z$][a-zA-Z0-9$]*|#+[0-9]?/
+  };
+
+  const BRACES = {
+    className: 'brace',
+    relevance: 0,
+    begin: /[[\](){}]/
+  };
+
+  const MESSAGES = {
+    className: 'message-name',
+    relevance: 0,
+    begin: regex.concat("::", SYMBOL_RE)
+  };
+
   return {
     name: 'Mathematica',
     aliases: ['mma', 'wl'],
-    //
-    // The list of "keywords" (System` symbols) was determined by evaluating the following Wolfram Language code in Mathematica 12.0:
-    //
-    // StringRiffle[
-    //   "'" <> StringRiffle[#, " "] <> "'" & /@
-    //     Values[GroupBy[
-    //       Select[Names["System`*"],
-    //       StringStartsQ[#, CharacterRange["A", "Z"] | "$"] &],
-    //       First[Characters[#]] &]], " +\n"]
-    //
-    keywords: {
-      $pattern: '(\\$|\\b)' + hljs.IDENT_RE + '\\b',
-      keyword: 'AASTriangle AbelianGroup Abort AbortKernels AbortProtect AbortScheduledTask Above Abs AbsArg AbsArgPlot Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AcceptanceThreshold AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Activate Active ActiveClassification ActiveClassificationObject ActiveItem ActivePrediction ActivePredictionObject ActiveStyle AcyclicGraphQ AddOnHelpPath AddSides AddTo AddToSearchIndex AddUsers AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AdministrativeDivisionData AffineHalfSpace AffineSpace AffineStateSpaceModel AffineTransform After AggregatedEntityClass AggregationLayer AircraftData AirportData AirPressureData AirTemperatureData AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowAdultContent AllowedCloudExtraParameters AllowedCloudParameterExtensions AllowedDimensions AllowedFrequencyRange AllowedHeads AllowGroupClose AllowIncomplete AllowInlineCells AllowKernelInitialization AllowLooseGrammar AllowReverseGroupClose AllowScriptLevelChange AllTrue Alphabet AlphabeticOrder AlphabeticSort AlphaChannel AlternateImage AlternatingFactorial AlternatingGroup AlternativeHypothesis Alternatives AltitudeMethod AmbientLight AmbiguityFunction AmbiguityList Analytic AnatomyData AnatomyForm AnatomyPlot3D AnatomySkinStyle AnatomyStyling AnchoredSearch And AndersonDarlingTest AngerJ AngleBisector AngleBracket AnglePath AnglePath3D AngleVector AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning AnimationRunTime AnimationTimeIndex Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotate Annotation AnnotationDelete AnnotationNames AnnotationRules AnnotationValue Annuity AnnuityDue Annulus AnomalyDetection AnomalyDetectorFunction Anonymous Antialiasing AntihermitianMatrixQ Antisymmetric AntisymmetricMatrixQ Antonyms AnyOrder AnySubset AnyTrue Apart ApartSquareFree APIFunction Appearance AppearanceElements AppearanceRules AppellF1 Append AppendCheck AppendLayer AppendTo ApplicationIdentificationKey Apply ApplySides ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcCurvature ARCHProcess ArcLength ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Area Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess Around AroundReplace ARProcess Array ArrayComponents ArrayDepth ArrayFilter ArrayFlatten ArrayMesh ArrayPad ArrayPlot ArrayQ ArrayResample ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads ASATriangle Ask AskAppend AskConfirm AskDisplay AskedQ AskedValue AskFunction AskState AskTemplateDisplay AspectRatio AspectRatioFixed Assert AssociateTo Association AssociationFormat AssociationMap AssociationQ AssociationThread AssumeDeterministic Assuming Assumptions AstronomicalData AsymptoticDSolveValue AsymptoticEqual AsymptoticEquivalent AsymptoticGreater AsymptoticGreaterEqual AsymptoticIntegrate AsymptoticLess AsymptoticLessEqual AsymptoticOutputTracker AsymptoticRSolveValue AsymptoticSolve AsymptoticSum Asynchronous AsynchronousTaskObject AsynchronousTasks Atom AtomCoordinates AtomCount AtomDiagramCoordinates AtomList AtomQ AttentionLayer Attributes Audio AudioAmplify AudioAnnotate AudioAnnotationLookup AudioBlockMap AudioCapture AudioChannelAssignment AudioChannelCombine AudioChannelMix AudioChannels AudioChannelSeparate AudioData AudioDelay AudioDelete AudioDevice AudioDistance AudioFade AudioFrequencyShift AudioGenerator AudioIdentify AudioInputDevice AudioInsert AudioIntervals AudioJoin AudioLabel AudioLength AudioLocalMeasurements AudioLooping AudioLoudness AudioMeasurements AudioNormalize AudioOutputDevice AudioOverlay AudioPad AudioPan AudioPartition AudioPause AudioPitchShift AudioPlay AudioPlot AudioQ AudioRecord AudioReplace AudioResample AudioReverb AudioSampleRate AudioSpectralMap AudioSpectralTransformation AudioSplit AudioStop AudioStream AudioStreams AudioTimeStretch AudioTrim AudioType AugmentedPolyhedron AugmentedSymmetricPolynomial Authenticate Authentication AuthenticationDialog AutoAction Autocomplete AutocompletionFunction AutoCopy AutocorrelationTest AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutoQuoteCharacters AutoRefreshed AutoRemove AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords AutoSubmitting Axes AxesEdge AxesLabel AxesOrigin AxesStyle AxiomaticTheory Axis ' +
-      'BabyMonsterGroupB Back Background BackgroundAppearance BackgroundTasksSettings Backslash Backsubstitution Backward Ball Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarcodeImage BarcodeRecognize BaringhausHenzeTest BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseDecode BaseEncode BaseForm Baseline BaselinePosition BaseStyle BasicRecurrentLayer BatchNormalizationLayer BatchSize BatesDistribution BattleLemarieWavelet BayesianMaximization BayesianMaximizationObject BayesianMinimization BayesianMinimizationObject Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized Between BetweennessCentrality BeveledPolyhedron BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryDeserialize BinaryDistance BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinarySerialize BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BiquadraticFilterModel BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor BiweightLocation BiweightMidvariance Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockchainAddressData BlockchainBase BlockchainBlockData BlockchainContractValue BlockchainData BlockchainGet BlockchainKeyEncode BlockchainPut BlockchainTokenData BlockchainTransaction BlockchainTransactionData BlockchainTransactionSign BlockchainTransactionSubmit BlockMap BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bond BondCount BondList BondQ Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms BooleanQ BooleanRegion Booleans BooleanStrings BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryDiscretizeGraphics BoundaryDiscretizeRegion BoundaryMesh BoundaryMeshRegion BoundaryMeshRegionQ BoundaryStyle BoundedRegionQ BoundingRegion Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxObject BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break BridgeData BrightnessEqualize BroadcastStationData Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurve3DBoxOptions BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BSplineSurface3DBoxOptions BubbleChart BubbleChart3D BubbleScale BubbleSizes BuildingData BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteArray ByteArrayFormat ByteArrayQ ByteArrayToString ByteCount ByteOrdering ' +
-      'C CachedValue CacheGraphics CachePersistence CalendarConvert CalendarData CalendarType Callout CalloutMarker CalloutStyle CallPacket CanberraDistance Cancel CancelButton CandlestickChart CanonicalGraph CanonicalizePolygon CanonicalizePolyhedron CanonicalName CanonicalWarpingCorrespondence CanonicalWarpingDistance CantorMesh CantorStaircase Cap CapForm CapitalDifferentialD Capitalize CapsuleShape CaptureRunning CardinalBSplineBasis CarlemanLinearize CarmichaelLambda CaseOrdering Cases CaseSensitive Cashflow Casoratian Catalan CatalanNumber Catch Catenate CatenateLayer CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling CelestialSystem Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEvaluationLanguage CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellLabelStyle CellLabelTemplate CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterArray CenterDot CentralFeature CentralMoment CentralMomentGeneratingFunction Cepstrogram CepstrogramArray CepstrumArray CForm ChampernowneNumber ChangeOptions ChannelBase ChannelBrokerAction ChannelDatabin ChannelHistoryLength ChannelListen ChannelListener ChannelListeners ChannelListenerWait ChannelObject ChannelPreSendFunction ChannelReceiverFunction ChannelSend ChannelSubscribers ChanVeseBinarize Character CharacterCounts CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterName CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop ChromaticityPlot ChromaticityPlot3D ChromaticPolynomial Circle CircleBox CircleDot CircleMinus CirclePlus CirclePoints CircleThrough CircleTimes CirculantGraph CircularOrthogonalMatrixDistribution CircularQuaternionMatrixDistribution CircularRealMatrixDistribution CircularSymplecticMatrixDistribution CircularUnitaryMatrixDistribution Circumsphere CityData ClassifierFunction ClassifierInformation ClassifierMeasurements ClassifierMeasurementsObject Classify ClassPriors Clear ClearAll ClearAttributes ClearCookies ClearPermissions ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipPlanesStyle ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent CloudAccountData CloudBase CloudConnect CloudDeploy CloudDirectory CloudDisconnect CloudEvaluate CloudExport CloudExpression CloudExpressions CloudFunction CloudGet CloudImport CloudLoggingData CloudObject CloudObjectInformation CloudObjectInformationData CloudObjectNameFormat CloudObjects CloudObjectURLType CloudPublish CloudPut CloudRenderingMethod CloudSave CloudShare CloudSubmit CloudSymbol CloudUnshare ClusterClassify ClusterDissimilarityFunction ClusteringComponents ClusteringTree CMYKColor Coarse CodeAssistOptions Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorBalance ColorCombine ColorConvert ColorCoverage ColorData ColorDataFunction ColorDetect ColorDistance ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQ ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorsNear ColorSpace ColorToneMapping Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CombinedEntityClass CombinerFunction CometData CommonDefaultFormatTypes Commonest CommonestFilter CommonName CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompanyData CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledCodeFunction CompiledFunction CompilerOptions Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComplexListPlot ComplexPlot ComplexPlot3D ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries CompositeQ Composition CompoundElement CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData ComputeUncertainty Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath ConformAudio ConformImages Congruent ConicHullRegion ConicHullRegion3DBox ConicHullRegionBox ConicOptimization Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphComponents ConnectedGraphQ ConnectedMeshComponents ConnectedMoleculeComponents ConnectedMoleculeQ ConnectionSettings ConnectLibraryCallbackFunction ConnectSystemModelComponents ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray ConstantArrayLayer ConstantImage ConstantPlusLayer ConstantRegionQ Constants ConstantTimesLayer ConstellationData ConstrainedMax ConstrainedMin Construct Containing ContainsAll ContainsAny ContainsExactly ContainsNone ContainsOnly ContentFieldOptions ContentLocationFunction ContentObject ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTask ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean ContrastiveLossLayer Control ControlActive ControlAlignment ControlGroupContentsBox ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket ConvexHullMesh ConvexPolygonQ ConvexPolyhedronQ ConvolutionLayer Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CookieFunction Cookies CoordinateBoundingBox CoordinateBoundingBoxArray CoordinateBounds CoordinateBoundsArray CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDatabin CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance CorrelationFunction CorrelationTest Cos Cosh CoshIntegral CosineDistance CosineWindow CosIntegral Cot Coth Count CountDistinct CountDistinctBy CounterAssignments CounterBox CounterBoxOptions CounterClockwiseContourIntegral CounterEvaluator CounterFunction CounterIncrements CounterStyle CounterStyleMenuListing CountRoots CountryData Counts CountsBy Covariance CovarianceEstimatorFunction CovarianceFunction CoxianDistribution CoxIngersollRossProcess CoxModel CoxModelFit CramerVonMisesTest CreateArchive CreateCellID CreateChannel CreateCloudExpression CreateDatabin CreateDataSystemModel CreateDialog CreateDirectory CreateDocument CreateFile CreateIntermediateDirectories CreateManagedLibraryExpression CreateNotebook CreatePalette CreatePalettePacket CreatePermissionsGroup CreateScheduledTask CreateSearchIndex CreateSystemModel CreateTemporary CreateUUID CreateWindow CriterionFunction CriticalityFailureImportance CriticalitySuccessImportance CriticalSection Cross CrossEntropyLossLayer CrossingCount CrossingDetect CrossingPolygon CrossMatrix Csc Csch CTCLossLayer Cube CubeRoot Cubics Cuboid CuboidBox Cumulant CumulantGeneratingFunction Cup CupCap Curl CurlyDoubleQuote CurlyQuote CurrencyConvert CurrentDate CurrentImage CurrentlySpeakingPacket CurrentNotebookImage CurrentScreenImage CurrentValue Curry CurvatureFlowFilter CurveClosed Cyan CycleGraph CycleIndexPolynomial Cycles CyclicGroup Cyclotomic Cylinder CylinderBox CylindricalDecomposition ' +
-      'D DagumDistribution DamData DamerauLevenshteinDistance DampingFactor Darker Dashed Dashing DatabaseConnect DatabaseDisconnect DatabaseReference Databin DatabinAdd DatabinRemove Databins DatabinUpload DataCompression DataDistribution DataRange DataReversed Dataset Date DateBounds Dated DateDelimiters DateDifference DatedUnit DateFormat DateFunction DateHistogram DateList DateListLogPlot DateListPlot DateListStepPlot DateObject DateObjectQ DateOverlapsQ DatePattern DatePlus DateRange DateReduction DateString DateTicksFormat DateValue DateWithinQ DaubechiesWavelet DavisDistribution DawsonF DayCount DayCountConvention DayHemisphere DaylightQ DayMatchQ DayName DayNightTerminator DayPlus DayRange DayRound DeBruijnGraph DeBruijnSequence Debug DebugTag Decapitalize Decimal DecimalForm DeclareKnownSymbols DeclarePackage Decompose DeconvolutionLayer Decrement Decrypt DecryptFile DedekindEta DeepSpaceProbeData Default DefaultAxesStyle DefaultBaseStyle DefaultBoxStyle DefaultButton DefaultColor DefaultControlPlacement DefaultDuplicateCellStyle DefaultDuration DefaultElement DefaultFaceGridsStyle DefaultFieldHintStyle DefaultFont DefaultFontProperties DefaultFormatType DefaultFormatTypeForStyle DefaultFrameStyle DefaultFrameTicksStyle DefaultGridLinesStyle DefaultInlineFormatType DefaultInputFormatType DefaultLabelStyle DefaultMenuStyle DefaultNaturalLanguage DefaultNewCellStyle DefaultNewInlineCellStyle DefaultNotebook DefaultOptions DefaultOutputFormatType DefaultPrintPrecision DefaultStyle DefaultStyleDefinitions DefaultTextFormatType DefaultTextInlineFormatType DefaultTicksStyle DefaultTooltipStyle DefaultValue DefaultValues Defer DefineExternal DefineInputStreamMethod DefineOutputStreamMethod DefineResourceFunction Definition Degree DegreeCentrality DegreeGraphDistribution DegreeLexicographic DegreeReverseLexicographic DEigensystem DEigenvalues Deinitialization Del DelaunayMesh Delayed Deletable Delete DeleteAnomalies DeleteBorderComponents DeleteCases DeleteChannel DeleteCloudExpression DeleteContents DeleteDirectory DeleteDuplicates DeleteDuplicatesBy DeleteFile DeleteMissing DeleteObject DeletePermissionsKey DeleteSearchIndex DeleteSmallComponents DeleteStopwords DeleteWithContents DeletionWarning DelimitedArray DelimitedSequence Delimiter DelimiterFlashTime DelimiterMatching Delimiters DeliveryFunction Dendrogram Denominator DensityGraphics DensityHistogram DensityPlot DensityPlot3D DependentVariables Deploy Deployed Depth DepthFirstScan Derivative DerivativeFilter DerivedKey DescriptorStateSpace DesignMatrix DestroyAfterEvaluation Det DeviceClose DeviceConfigure DeviceExecute DeviceExecuteAsynchronous DeviceObject DeviceOpen DeviceOpenQ DeviceRead DeviceReadBuffer DeviceReadLatest DeviceReadList DeviceReadTimeSeries Devices DeviceStreams DeviceWrite DeviceWriteBuffer DGaussianWavelet DiacriticalPositioning Diagonal DiagonalizableMatrixQ DiagonalMatrix DiagonalMatrixQ Dialog DialogIndent DialogInput DialogLevel DialogNotebook DialogProlog DialogReturn DialogSymbols Diamond DiamondMatrix DiceDissimilarity DictionaryLookup DictionaryWordQ DifferenceDelta DifferenceOrder DifferenceQuotient DifferenceRoot DifferenceRootReduce Differences DifferentialD DifferentialRoot DifferentialRootReduce DifferentiatorFilter DigitalSignature DigitBlock DigitBlockMinimum DigitCharacter DigitCount DigitQ DihedralAngle DihedralGroup Dilation DimensionalCombinations DimensionalMeshComponents DimensionReduce DimensionReducerFunction DimensionReduction Dimensions DiracComb DiracDelta DirectedEdge DirectedEdges DirectedGraph DirectedGraphQ DirectedInfinity Direction Directive Directory DirectoryName DirectoryQ DirectoryStack DirichletBeta DirichletCharacter DirichletCondition DirichletConvolve DirichletDistribution DirichletEta DirichletL DirichletLambda DirichletTransform DirichletWindow DisableConsolePrintPacket DisableFormatting DiscreteChirpZTransform DiscreteConvolve DiscreteDelta DiscreteHadamardTransform DiscreteIndicator DiscreteLimit DiscreteLQEstimatorGains DiscreteLQRegulatorGains DiscreteLyapunovSolve DiscreteMarkovProcess DiscreteMaxLimit DiscreteMinLimit DiscretePlot DiscretePlot3D DiscreteRatio DiscreteRiccatiSolve DiscreteShift DiscreteTimeModelQ DiscreteUniformDistribution DiscreteVariables DiscreteWaveletData DiscreteWaveletPacketTransform DiscreteWaveletTransform DiscretizeGraphics DiscretizeRegion Discriminant DisjointQ Disjunction Disk DiskBox DiskMatrix DiskSegment Dispatch DispatchQ DispersionEstimatorFunction Display DisplayAllSteps DisplayEndPacket DisplayFlushImagePacket DisplayForm DisplayFunction DisplayPacket DisplayRules DisplaySetSizePacket DisplayString DisplayTemporary DisplayWith DisplayWithRef DisplayWithVariable DistanceFunction DistanceMatrix DistanceTransform Distribute Distributed DistributedContexts DistributeDefinitions DistributionChart DistributionDomain DistributionFitTest DistributionParameterAssumptions DistributionParameterQ Dithering Div Divergence Divide DivideBy Dividers DivideSides Divisible Divisors DivisorSigma DivisorSum DMSList DMSString Do DockedCells DocumentGenerator DocumentGeneratorInformation DocumentGeneratorInformationData DocumentGenerators DocumentNotebook DocumentWeightingRules Dodecahedron DomainRegistrationInformation DominantColors DOSTextFormat Dot DotDashed DotEqual DotLayer DotPlusLayer Dotted DoubleBracketingBar DoubleContourIntegral DoubleDownArrow DoubleLeftArrow DoubleLeftRightArrow DoubleLeftTee DoubleLongLeftArrow DoubleLongLeftRightArrow DoubleLongRightArrow DoubleRightArrow DoubleRightTee DoubleUpArrow DoubleUpDownArrow DoubleVerticalBar DoublyInfinite Down DownArrow DownArrowBar DownArrowUpArrow DownLeftRightVector DownLeftTeeVector DownLeftVector DownLeftVectorBar DownRightTeeVector DownRightVector DownRightVectorBar Downsample DownTee DownTeeArrow DownValues DragAndDrop DrawEdges DrawFrontFaces DrawHighlighted Drop DropoutLayer DSolve DSolveValue Dt DualLinearProgramming DualPolyhedron DualSystemsModel DumpGet DumpSave DuplicateFreeQ Duration Dynamic DynamicBox DynamicBoxOptions DynamicEvaluationTimeout DynamicGeoGraphics DynamicImage DynamicLocation DynamicModule DynamicModuleBox DynamicModuleBoxOptions DynamicModuleParent DynamicModuleValues DynamicName DynamicNamespace DynamicReference DynamicSetting DynamicUpdating DynamicWrapper DynamicWrapperBox DynamicWrapperBoxOptions ' +
-      'E EarthImpactData EarthquakeData EccentricityCentrality Echo EchoFunction EclipseType EdgeAdd EdgeBetweennessCentrality EdgeCapacity EdgeCapForm EdgeColor EdgeConnectivity EdgeContract EdgeCost EdgeCount EdgeCoverQ EdgeCycleMatrix EdgeDashing EdgeDelete EdgeDetect EdgeForm EdgeIndex EdgeJoinForm EdgeLabeling EdgeLabels EdgeLabelStyle EdgeList EdgeOpacity EdgeQ EdgeRenderingFunction EdgeRules EdgeShapeFunction EdgeStyle EdgeThickness EdgeWeight EdgeWeightedGraphQ Editable EditButtonSettings EditCellTagsSettings EditDistance EffectiveInterest Eigensystem Eigenvalues EigenvectorCentrality Eigenvectors Element ElementData ElementwiseLayer ElidedForms Eliminate EliminationOrder Ellipsoid EllipticE EllipticExp EllipticExpPrime EllipticF EllipticFilterModel EllipticK EllipticLog EllipticNomeQ EllipticPi EllipticReducedHalfPeriods EllipticTheta EllipticThetaPrime EmbedCode EmbeddedHTML EmbeddedService EmbeddingLayer EmbeddingObject EmitSound EmphasizeSyntaxErrors EmpiricalDistribution Empty EmptyGraphQ EmptyRegion EnableConsolePrintPacket Enabled Encode Encrypt EncryptedObject EncryptFile End EndAdd EndDialogPacket EndFrontEndInteractionPacket EndOfBuffer EndOfFile EndOfLine EndOfString EndPackage EngineEnvironment EngineeringForm Enter EnterExpressionPacket EnterTextPacket Entity EntityClass EntityClassList EntityCopies EntityFunction EntityGroup EntityInstance EntityList EntityPrefetch EntityProperties EntityProperty EntityPropertyClass EntityRegister EntityStore EntityStores EntityTypeName EntityUnregister EntityValue Entropy EntropyFilter Environment Epilog EpilogFunction Equal EqualColumns EqualRows EqualTilde EqualTo EquatedTo Equilibrium EquirippleFilterKernel Equivalent Erf Erfc Erfi ErlangB ErlangC ErlangDistribution Erosion ErrorBox ErrorBoxOptions ErrorNorm ErrorPacket ErrorsDialogSettings EscapeRadius EstimatedBackground EstimatedDistribution EstimatedProcess EstimatorGains EstimatorRegulator EuclideanDistance EulerAngles EulerCharacteristic EulerE EulerGamma EulerianGraphQ EulerMatrix EulerPhi Evaluatable Evaluate Evaluated EvaluatePacket EvaluateScheduledTask EvaluationBox EvaluationCell EvaluationCompletionAction EvaluationData EvaluationElements EvaluationEnvironment EvaluationMode EvaluationMonitor EvaluationNotebook EvaluationObject EvaluationOrder Evaluator EvaluatorNames EvenQ EventData EventEvaluator EventHandler EventHandlerTag EventLabels EventSeries ExactBlackmanWindow ExactNumberQ ExactRootIsolation ExampleData Except ExcludedForms ExcludedLines ExcludedPhysicalQuantities ExcludePods Exclusions ExclusionsStyle Exists Exit ExitDialog ExoplanetData Exp Expand ExpandAll ExpandDenominator ExpandFileName ExpandNumerator Expectation ExpectationE ExpectedValue ExpGammaDistribution ExpIntegralE ExpIntegralEi ExpirationDate Exponent ExponentFunction ExponentialDistribution ExponentialFamily ExponentialGeneratingFunction ExponentialMovingAverage ExponentialPowerDistribution ExponentPosition ExponentStep Export ExportAutoReplacements ExportByteArray ExportForm ExportPacket ExportString Expression ExpressionCell ExpressionPacket ExpressionUUID ExpToTrig ExtendedEntityClass ExtendedGCD Extension ExtentElementFunction ExtentMarkers ExtentSize ExternalBundle ExternalCall ExternalDataCharacterEncoding ExternalEvaluate ExternalFunction ExternalFunctionName ExternalObject ExternalOptions ExternalSessionObject ExternalSessions ExternalTypeSignature ExternalValue Extract ExtractArchive ExtractLayer ExtremeValueDistribution ' +
-      'FaceForm FaceGrids FaceGridsStyle FacialFeatures Factor FactorComplete Factorial Factorial2 FactorialMoment FactorialMomentGeneratingFunction FactorialPower FactorInteger FactorList FactorSquareFree FactorSquareFreeList FactorTerms FactorTermsList Fail Failure FailureAction FailureDistribution FailureQ False FareySequence FARIMAProcess FeatureDistance FeatureExtract FeatureExtraction FeatureExtractor FeatureExtractorFunction FeatureNames FeatureNearest FeatureSpacePlot FeatureSpacePlot3D FeatureTypes FEDisableConsolePrintPacket FeedbackLinearize FeedbackSector FeedbackSectorStyle FeedbackType FEEnableConsolePrintPacket FetalGrowthData Fibonacci Fibonorial FieldCompletionFunction FieldHint FieldHintStyle FieldMasked FieldSize File FileBaseName FileByteCount FileConvert FileDate FileExistsQ FileExtension FileFormat FileHandler FileHash FileInformation FileName FileNameDepth FileNameDialogSettings FileNameDrop FileNameForms FileNameJoin FileNames FileNameSetter FileNameSplit FileNameTake FilePrint FileSize FileSystemMap FileSystemScan FileTemplate FileTemplateApply FileType FilledCurve FilledCurveBox FilledCurveBoxOptions Filling FillingStyle FillingTransform FilteredEntityClass FilterRules FinancialBond FinancialData FinancialDerivative FinancialIndicator Find FindAnomalies FindArgMax FindArgMin FindChannels FindClique FindClusters FindCookies FindCurvePath FindCycle FindDevices FindDistribution FindDistributionParameters FindDivisions FindEdgeCover FindEdgeCut FindEdgeIndependentPaths FindEquationalProof FindEulerianCycle FindExternalEvaluators FindFaces FindFile FindFit FindFormula FindFundamentalCycles FindGeneratingFunction FindGeoLocation FindGeometricConjectures FindGeometricTransform FindGraphCommunities FindGraphIsomorphism FindGraphPartition FindHamiltonianCycle FindHamiltonianPath FindHiddenMarkovStates FindIndependentEdgeSet FindIndependentVertexSet FindInstance FindIntegerNullVector FindKClan FindKClique FindKClub FindKPlex FindLibrary FindLinearRecurrence FindList FindMatchingColor FindMaximum FindMaximumFlow FindMaxValue FindMeshDefects FindMinimum FindMinimumCostFlow FindMinimumCut FindMinValue FindMoleculeSubstructure FindPath FindPeaks FindPermutation FindPostmanTour FindProcessParameters FindRepeat FindRoot FindSequenceFunction FindSettings FindShortestPath FindShortestTour FindSpanningTree FindSystemModelEquilibrium FindTextualAnswer FindThreshold FindTransientRepeat FindVertexCover FindVertexCut FindVertexIndependentPaths Fine FinishDynamic FiniteAbelianGroupCount FiniteGroupCount FiniteGroupData First FirstCase FirstPassageTimeDistribution FirstPosition FischerGroupFi22 FischerGroupFi23 FischerGroupFi24Prime FisherHypergeometricDistribution FisherRatioTest FisherZDistribution Fit FitAll FitRegularization FittedModel FixedOrder FixedPoint FixedPointList FlashSelection Flat Flatten FlattenAt FlattenLayer FlatTopWindow FlipView Floor FlowPolynomial FlushPrintOutputPacket Fold FoldList FoldPair FoldPairList FollowRedirects Font FontColor FontFamily FontForm FontName FontOpacity FontPostScriptName FontProperties FontReencoding FontSize FontSlant FontSubstitutions FontTracking FontVariations FontWeight For ForAll Format FormatRules FormatType FormatTypeAutoConvert FormatValues FormBox FormBoxOptions FormControl FormFunction FormLayoutFunction FormObject FormPage FormTheme FormulaData FormulaLookup FortranForm Forward ForwardBackward Fourier FourierCoefficient FourierCosCoefficient FourierCosSeries FourierCosTransform FourierDCT FourierDCTFilter FourierDCTMatrix FourierDST FourierDSTMatrix FourierMatrix FourierParameters FourierSequenceTransform FourierSeries FourierSinCoefficient FourierSinSeries FourierSinTransform FourierTransform FourierTrigSeries FractionalBrownianMotionProcess FractionalGaussianNoiseProcess FractionalPart FractionBox FractionBoxOptions FractionLine Frame FrameBox FrameBoxOptions Framed FrameInset FrameLabel Frameless FrameMargins FrameRate FrameStyle FrameTicks FrameTicksStyle FRatioDistribution FrechetDistribution FreeQ FrenetSerretSystem FrequencySamplingFilterKernel FresnelC FresnelF FresnelG FresnelS Friday FrobeniusNumber FrobeniusSolve FromAbsoluteTime FromCharacterCode FromCoefficientRules FromContinuedFraction FromDate FromDigits FromDMS FromEntity FromJulianDate FromLetterNumber FromPolarCoordinates FromRomanNumeral FromSphericalCoordinates FromUnixTime Front FrontEndDynamicExpression FrontEndEventActions FrontEndExecute FrontEndObject FrontEndResource FrontEndResourceString FrontEndStackSize FrontEndToken FrontEndTokenExecute FrontEndValueCache FrontEndVersion FrontFaceColor FrontFaceOpacity Full FullAxes FullDefinition FullForm FullGraphics FullInformationOutputRegulator FullOptions FullRegion FullSimplify Function FunctionCompile FunctionCompileExport FunctionCompileExportByteArray FunctionCompileExportLibrary FunctionCompileExportString FunctionDomain FunctionExpand FunctionInterpolation FunctionPeriod FunctionRange FunctionSpace FussellVeselyImportance' +
-      'GaborFilter GaborMatrix GaborWavelet GainMargins GainPhaseMargins GalaxyData GalleryView Gamma GammaDistribution GammaRegularized GapPenalty GARCHProcess GatedRecurrentLayer Gather GatherBy GaugeFaceElementFunction GaugeFaceStyle GaugeFrameElementFunction GaugeFrameSize GaugeFrameStyle GaugeLabels GaugeMarkers GaugeStyle GaussianFilter GaussianIntegers GaussianMatrix GaussianOrthogonalMatrixDistribution GaussianSymplecticMatrixDistribution GaussianUnitaryMatrixDistribution GaussianWindow GCD GegenbauerC General GeneralizedLinearModelFit GenerateAsymmetricKeyPair GenerateConditions GeneratedCell GeneratedDocumentBinding GenerateDerivedKey GenerateDigitalSignature GenerateDocument GeneratedParameters GeneratedQuantityMagnitudes GenerateHTTPResponse GenerateSecuredAuthenticationKey GenerateSymmetricKey GeneratingFunction GeneratorDescription GeneratorHistoryLength GeneratorOutputType Generic GenericCylindricalDecomposition GenomeData GenomeLookup GeoAntipode GeoArea GeoArraySize GeoBackground GeoBoundingBox GeoBounds GeoBoundsRegion GeoBubbleChart GeoCenter GeoCircle GeodesicClosing GeodesicDilation GeodesicErosion GeodesicOpening GeoDestination GeodesyData GeoDirection GeoDisk GeoDisplacement GeoDistance GeoDistanceList GeoElevationData GeoEntities GeoGraphics GeogravityModelData GeoGridDirectionDifference GeoGridLines GeoGridLinesStyle GeoGridPosition GeoGridRange GeoGridRangePadding GeoGridUnitArea GeoGridUnitDistance GeoGridVector GeoGroup GeoHemisphere GeoHemisphereBoundary GeoHistogram GeoIdentify GeoImage GeoLabels GeoLength GeoListPlot GeoLocation GeologicalPeriodData GeomagneticModelData GeoMarker GeometricAssertion GeometricBrownianMotionProcess GeometricDistribution GeometricMean GeometricMeanFilter GeometricScene GeometricTransformation GeometricTransformation3DBox GeometricTransformation3DBoxOptions GeometricTransformationBox GeometricTransformationBoxOptions GeoModel GeoNearest GeoPath GeoPosition GeoPositionENU GeoPositionXYZ GeoProjection GeoProjectionData GeoRange GeoRangePadding GeoRegionValuePlot GeoResolution GeoScaleBar GeoServer GeoSmoothHistogram GeoStreamPlot GeoStyling GeoStylingImageFunction GeoVariant GeoVector GeoVectorENU GeoVectorPlot GeoVectorXYZ GeoVisibleRegion GeoVisibleRegionBoundary GeoWithinQ GeoZoomLevel GestureHandler GestureHandlerTag Get GetBoundingBoxSizePacket GetContext GetEnvironment GetFileName GetFrontEndOptionsDataPacket GetLinebreakInformationPacket GetMenusPacket GetPageBreakInformationPacket Glaisher GlobalClusteringCoefficient GlobalPreferences GlobalSession Glow GoldenAngle GoldenRatio GompertzMakehamDistribution GoodmanKruskalGamma GoodmanKruskalGammaTest Goto Grad Gradient GradientFilter GradientOrientationFilter GrammarApply GrammarRules GrammarToken Graph Graph3D GraphAssortativity GraphAutomorphismGroup GraphCenter GraphComplement GraphData GraphDensity GraphDiameter GraphDifference GraphDisjointUnion GraphDistance GraphDistanceMatrix GraphElementData GraphEmbedding GraphHighlight GraphHighlightStyle GraphHub Graphics Graphics3D Graphics3DBox Graphics3DBoxOptions GraphicsArray GraphicsBaseline GraphicsBox GraphicsBoxOptions GraphicsColor GraphicsColumn GraphicsComplex GraphicsComplex3DBox GraphicsComplex3DBoxOptions GraphicsComplexBox GraphicsComplexBoxOptions GraphicsContents GraphicsData GraphicsGrid GraphicsGridBox GraphicsGroup GraphicsGroup3DBox GraphicsGroup3DBoxOptions GraphicsGroupBox GraphicsGroupBoxOptions GraphicsGrouping GraphicsHighlightColor GraphicsRow GraphicsSpacing GraphicsStyle GraphIntersection GraphLayout GraphLinkEfficiency GraphPeriphery GraphPlot GraphPlot3D GraphPower GraphPropertyDistribution GraphQ GraphRadius GraphReciprocity GraphRoot GraphStyle GraphUnion Gray GrayLevel Greater GreaterEqual GreaterEqualLess GreaterEqualThan GreaterFullEqual GreaterGreater GreaterLess GreaterSlantEqual GreaterThan GreaterTilde Green GreenFunction Grid GridBaseline GridBox GridBoxAlignment GridBoxBackground GridBoxDividers GridBoxFrame GridBoxItemSize GridBoxItemStyle GridBoxOptions GridBoxSpacings GridCreationSettings GridDefaultElement GridElementStyleOptions GridFrame GridFrameMargins GridGraph GridLines GridLinesStyle GroebnerBasis GroupActionBase GroupBy GroupCentralizer GroupElementFromWord GroupElementPosition GroupElementQ GroupElements GroupElementToWord GroupGenerators Groupings GroupMultiplicationTable GroupOrbits GroupOrder GroupPageBreakWithin GroupSetwiseStabilizer GroupStabilizer GroupStabilizerChain GroupTogetherGrouping GroupTogetherNestedGrouping GrowCutComponents Gudermannian GuidedFilter GumbelDistribution ' +
-      'HaarWavelet HadamardMatrix HalfLine HalfNormalDistribution HalfPlane HalfSpace HamiltonianGraphQ HammingDistance HammingWindow HandlerFunctions HandlerFunctionsKeys HankelH1 HankelH2 HankelMatrix HankelTransform HannPoissonWindow HannWindow HaradaNortonGroupHN HararyGraph HarmonicMean HarmonicMeanFilter HarmonicNumber Hash Haversine HazardFunction Head HeadCompose HeaderLines Heads HeavisideLambda HeavisidePi HeavisideTheta HeldGroupHe HeldPart HelpBrowserLookup HelpBrowserNotebook HelpBrowserSettings Here HermiteDecomposition HermiteH HermitianMatrixQ HessenbergDecomposition Hessian HexadecimalCharacter Hexahedron HexahedronBox HexahedronBoxOptions HiddenMarkovProcess HiddenSurface Highlighted HighlightGraph HighlightImage HighlightMesh HighpassFilter HigmanSimsGroupHS HilbertCurve HilbertFilter HilbertMatrix Histogram Histogram3D HistogramDistribution HistogramList HistogramTransform HistogramTransformInterpolation HistoricalPeriodData HitMissTransform HITSCentrality HjorthDistribution HodgeDual HoeffdingD HoeffdingDTest Hold HoldAll HoldAllComplete HoldComplete HoldFirst HoldForm HoldPattern HoldRest HolidayCalendar HomeDirectory HomePage Horizontal HorizontalForm HorizontalGauge HorizontalScrollPosition HornerForm HostLookup HotellingTSquareDistribution HoytDistribution HTMLSave HTTPErrorResponse HTTPRedirect HTTPRequest HTTPRequestData HTTPResponse Hue HumanGrowthData HumpDownHump HumpEqual HurwitzLerchPhi HurwitzZeta HyperbolicDistribution HypercubeGraph HyperexponentialDistribution Hyperfactorial Hypergeometric0F1 Hypergeometric0F1Regularized Hypergeometric1F1 Hypergeometric1F1Regularized Hypergeometric2F1 Hypergeometric2F1Regularized HypergeometricDistribution HypergeometricPFQ HypergeometricPFQRegularized HypergeometricU Hyperlink HyperlinkCreationSettings Hyperplane Hyphenation HyphenationOptions HypoexponentialDistribution HypothesisTestData ' +
-      'I IconData Iconize IconizedObject IconRules Icosahedron Identity IdentityMatrix If IgnoreCase IgnoreDiacritics IgnorePunctuation IgnoreSpellCheck IgnoringInactive Im Image Image3D Image3DProjection Image3DSlices ImageAccumulate ImageAdd ImageAdjust ImageAlign ImageApply ImageApplyIndexed ImageAspectRatio ImageAssemble ImageAugmentationLayer ImageBoundingBoxes ImageCache ImageCacheValid ImageCapture ImageCaptureFunction ImageCases ImageChannels ImageClip ImageCollage ImageColorSpace ImageCompose ImageContainsQ ImageContents ImageConvolve ImageCooccurrence ImageCorners ImageCorrelate ImageCorrespondingPoints ImageCrop ImageData ImageDeconvolve ImageDemosaic ImageDifference ImageDimensions ImageDisplacements ImageDistance ImageEffect ImageExposureCombine ImageFeatureTrack ImageFileApply ImageFileFilter ImageFileScan ImageFilter ImageFocusCombine ImageForestingComponents ImageFormattingWidth ImageForwardTransformation ImageGraphics ImageHistogram ImageIdentify ImageInstanceQ ImageKeypoints ImageLevels ImageLines ImageMargins ImageMarker ImageMarkers ImageMeasurements ImageMesh ImageMultiply ImageOffset ImagePad ImagePadding ImagePartition ImagePeriodogram ImagePerspectiveTransformation ImagePosition ImagePreviewFunction ImagePyramid ImagePyramidApply ImageQ ImageRangeCache ImageRecolor ImageReflect ImageRegion ImageResize ImageResolution ImageRestyle ImageRotate ImageRotated ImageSaliencyFilter ImageScaled ImageScan ImageSize ImageSizeAction ImageSizeCache ImageSizeMultipliers ImageSizeRaw ImageSubtract ImageTake ImageTransformation ImageTrim ImageType ImageValue ImageValuePositions ImagingDevice ImplicitRegion Implies Import ImportAutoReplacements ImportByteArray ImportOptions ImportString ImprovementImportance In Inactivate Inactive IncidenceGraph IncidenceList IncidenceMatrix IncludeAromaticBonds IncludeConstantBasis IncludeDefinitions IncludeDirectories IncludeFileExtension IncludeGeneratorTasks IncludeHydrogens IncludeInflections IncludeMetaInformation IncludePods IncludeQuantities IncludeRelatedTables IncludeSingularTerm IncludeWindowTimes Increment IndefiniteMatrixQ Indent IndentingNewlineSpacings IndentMaxFraction IndependenceTest IndependentEdgeSetQ IndependentPhysicalQuantity IndependentUnit IndependentUnitDimension IndependentVertexSetQ Indeterminate IndeterminateThreshold IndexCreationOptions Indexed IndexGraph IndexTag Inequality InexactNumberQ InexactNumbers InfiniteLine InfinitePlane Infinity Infix InflationAdjust InflationMethod Information InformationData InformationDataGrid Inherited InheritScope InhomogeneousPoissonProcess InitialEvaluationHistory Initialization InitializationCell InitializationCellEvaluation InitializationCellWarning InitializationObjects InitializationValue Initialize InitialSeeding InlineCounterAssignments InlineCounterIncrements InlineRules Inner InnerPolygon InnerPolyhedron Inpaint Input InputAliases InputAssumptions InputAutoReplacements InputField InputFieldBox InputFieldBoxOptions InputForm InputGrouping InputNamePacket InputNotebook InputPacket InputSettings InputStream InputString InputStringPacket InputToBoxFormPacket Insert InsertionFunction InsertionPointObject InsertLinebreaks InsertResults Inset Inset3DBox Inset3DBoxOptions InsetBox InsetBoxOptions Insphere Install InstallService InstanceNormalizationLayer InString Integer IntegerDigits IntegerExponent IntegerLength IntegerName IntegerPart IntegerPartitions IntegerQ IntegerReverse Integers IntegerString Integral Integrate Interactive InteractiveTradingChart Interlaced Interleaving InternallyBalancedDecomposition InterpolatingFunction InterpolatingPolynomial Interpolation InterpolationOrder InterpolationPoints InterpolationPrecision Interpretation InterpretationBox InterpretationBoxOptions InterpretationFunction Interpreter InterpretTemplate InterquartileRange Interrupt InterruptSettings IntersectingQ Intersection Interval IntervalIntersection IntervalMarkers IntervalMarkersStyle IntervalMemberQ IntervalSlider IntervalUnion Into Inverse InverseBetaRegularized InverseCDF InverseChiSquareDistribution InverseContinuousWaveletTransform InverseDistanceTransform InverseEllipticNomeQ InverseErf InverseErfc InverseFourier InverseFourierCosTransform InverseFourierSequenceTransform InverseFourierSinTransform InverseFourierTransform InverseFunction InverseFunctions InverseGammaDistribution InverseGammaRegularized InverseGaussianDistribution InverseGudermannian InverseHankelTransform InverseHaversine InverseImagePyramid InverseJacobiCD InverseJacobiCN InverseJacobiCS InverseJacobiDC InverseJacobiDN InverseJacobiDS InverseJacobiNC InverseJacobiND InverseJacobiNS InverseJacobiSC InverseJacobiSD InverseJacobiSN InverseLaplaceTransform InverseMellinTransform InversePermutation InverseRadon InverseRadonTransform InverseSeries InverseShortTimeFourier InverseSpectrogram InverseSurvivalFunction InverseTransformedRegion InverseWaveletTransform InverseWeierstrassP InverseWishartMatrixDistribution InverseZTransform Invisible InvisibleApplication InvisibleTimes IPAddress IrreduciblePolynomialQ IslandData IsolatingInterval IsomorphicGraphQ IsotopeData Italic Item ItemAspectRatio ItemBox ItemBoxOptions ItemSize ItemStyle ItoProcess ' +
-      'JaccardDissimilarity JacobiAmplitude Jacobian JacobiCD JacobiCN JacobiCS JacobiDC JacobiDN JacobiDS JacobiNC JacobiND JacobiNS JacobiP JacobiSC JacobiSD JacobiSN JacobiSymbol JacobiZeta JankoGroupJ1 JankoGroupJ2 JankoGroupJ3 JankoGroupJ4 JarqueBeraALMTest JohnsonDistribution Join JoinAcross Joined JoinedCurve JoinedCurveBox JoinedCurveBoxOptions JoinForm JordanDecomposition JordanModelDecomposition JulianDate JuliaSetBoettcher JuliaSetIterationCount JuliaSetPlot JuliaSetPoints ' +
-      'K KagiChart KaiserBesselWindow KaiserWindow KalmanEstimator KalmanFilter KarhunenLoeveDecomposition KaryTree KatzCentrality KCoreComponents KDistribution KEdgeConnectedComponents KEdgeConnectedGraphQ KelvinBei KelvinBer KelvinKei KelvinKer KendallTau KendallTauTest KernelExecute KernelFunction KernelMixtureDistribution Kernels Ket Key KeyCollisionFunction KeyComplement KeyDrop KeyDropFrom KeyExistsQ KeyFreeQ KeyIntersection KeyMap KeyMemberQ KeypointStrength Keys KeySelect KeySort KeySortBy KeyTake KeyUnion KeyValueMap KeyValuePattern Khinchin KillProcess KirchhoffGraph KirchhoffMatrix KleinInvariantJ KnapsackSolve KnightTourGraph KnotData KnownUnitQ KochCurve KolmogorovSmirnovTest KroneckerDelta KroneckerModelDecomposition KroneckerProduct KroneckerSymbol KuiperTest KumaraswamyDistribution Kurtosis KuwaharaFilter KVertexConnectedComponents KVertexConnectedGraphQ ' +
-      'LABColor Label Labeled LabeledSlider LabelingFunction LabelingSize LabelStyle LabelVisibility LaguerreL LakeData LambdaComponents LambertW LaminaData LanczosWindow LandauDistribution Language LanguageCategory LanguageData LanguageIdentify LanguageOptions LaplaceDistribution LaplaceTransform Laplacian LaplacianFilter LaplacianGaussianFilter Large Larger Last Latitude LatitudeLongitude LatticeData LatticeReduce Launch LaunchKernels LayeredGraphPlot LayerSizeFunction LayoutInformation LCHColor LCM LeaderSize LeafCount LeapYearQ LearnDistribution LearnedDistribution LearningRate LearningRateMultipliers LeastSquares LeastSquaresFilterKernel Left LeftArrow LeftArrowBar LeftArrowRightArrow LeftDownTeeVector LeftDownVector LeftDownVectorBar LeftRightArrow LeftRightVector LeftTee LeftTeeArrow LeftTeeVector LeftTriangle LeftTriangleBar LeftTriangleEqual LeftUpDownVector LeftUpTeeVector LeftUpVector LeftUpVectorBar LeftVector LeftVectorBar LegendAppearance Legended LegendFunction LegendLabel LegendLayout LegendMargins LegendMarkers LegendMarkerSize LegendreP LegendreQ LegendreType Length LengthWhile LerchPhi Less LessEqual LessEqualGreater LessEqualThan LessFullEqual LessGreater LessLess LessSlantEqual LessThan LessTilde LetterCharacter LetterCounts LetterNumber LetterQ Level LeveneTest LeviCivitaTensor LevyDistribution Lexicographic LibraryDataType LibraryFunction LibraryFunctionError LibraryFunctionInformation LibraryFunctionLoad LibraryFunctionUnload LibraryLoad LibraryUnload LicenseID LiftingFilterData LiftingWaveletTransform LightBlue LightBrown LightCyan Lighter LightGray LightGreen Lighting LightingAngle LightMagenta LightOrange LightPink LightPurple LightRed LightSources LightYellow Likelihood Limit LimitsPositioning LimitsPositioningTokens LindleyDistribution Line Line3DBox Line3DBoxOptions LinearFilter LinearFractionalOptimization LinearFractionalTransform LinearGradientImage LinearizingTransformationData LinearLayer LinearModelFit LinearOffsetFunction LinearOptimization LinearProgramming LinearRecurrence LinearSolve LinearSolveFunction LineBox LineBoxOptions LineBreak LinebreakAdjustments LineBreakChart LinebreakSemicolonWeighting LineBreakWithin LineColor LineGraph LineIndent LineIndentMaxFraction LineIntegralConvolutionPlot LineIntegralConvolutionScale LineLegend LineOpacity LineSpacing LineWrapParts LinkActivate LinkClose LinkConnect LinkConnectedQ LinkCreate LinkError LinkFlush LinkFunction LinkHost LinkInterrupt LinkLaunch LinkMode LinkObject LinkOpen LinkOptions LinkPatterns LinkProtocol LinkRankCentrality LinkRead LinkReadHeld LinkReadyQ Links LinkService LinkWrite LinkWriteHeld LiouvilleLambda List Listable ListAnimate ListContourPlot ListContourPlot3D ListConvolve ListCorrelate ListCurvePathPlot ListDeconvolve ListDensityPlot ListDensityPlot3D Listen ListFormat ListFourierSequenceTransform ListInterpolation ListLineIntegralConvolutionPlot ListLinePlot ListLogLinearPlot ListLogLogPlot ListLogPlot ListPicker ListPickerBox ListPickerBoxBackground ListPickerBoxOptions ListPlay ListPlot ListPlot3D ListPointPlot3D ListPolarPlot ListQ ListSliceContourPlot3D ListSliceDensityPlot3D ListSliceVectorPlot3D ListStepPlot ListStreamDensityPlot ListStreamPlot ListSurfacePlot3D ListVectorDensityPlot ListVectorPlot ListVectorPlot3D ListZTransform Literal LiteralSearch LocalAdaptiveBinarize LocalCache LocalClusteringCoefficient LocalizeDefinitions LocalizeVariables LocalObject LocalObjects LocalResponseNormalizationLayer LocalSubmit LocalSymbol LocalTime LocalTimeZone LocationEquivalenceTest LocationTest Locator LocatorAutoCreate LocatorBox LocatorBoxOptions LocatorCentering LocatorPane LocatorPaneBox LocatorPaneBoxOptions LocatorRegion Locked Log Log10 Log2 LogBarnesG LogGamma LogGammaDistribution LogicalExpand LogIntegral LogisticDistribution LogisticSigmoid LogitModelFit LogLikelihood LogLinearPlot LogLogisticDistribution LogLogPlot LogMultinormalDistribution LogNormalDistribution LogPlot LogRankTest LogSeriesDistribution LongEqual Longest LongestCommonSequence LongestCommonSequencePositions LongestCommonSubsequence LongestCommonSubsequencePositions LongestMatch LongestOrderedSequence LongForm Longitude LongLeftArrow LongLeftRightArrow LongRightArrow LongShortTermMemoryLayer Lookup Loopback LoopFreeGraphQ LossFunction LowerCaseQ LowerLeftArrow LowerRightArrow LowerTriangularize LowerTriangularMatrixQ LowpassFilter LQEstimatorGains LQGRegulator LQOutputRegulatorGains LQRegulatorGains LUBackSubstitution LucasL LuccioSamiComponents LUDecomposition LunarEclipse LUVColor LyapunovSolve LyonsGroupLy ' +
-      'MachineID MachineName MachineNumberQ MachinePrecision MacintoshSystemPageSetup Magenta Magnification Magnify MailAddressValidation MailExecute MailFolder MailItem MailReceiverFunction MailResponseFunction MailSearch MailServerConnect MailServerConnection MailSettings MainSolve MaintainDynamicCaches Majority MakeBoxes MakeExpression MakeRules ManagedLibraryExpressionID ManagedLibraryExpressionQ MandelbrotSetBoettcher MandelbrotSetDistance MandelbrotSetIterationCount MandelbrotSetMemberQ MandelbrotSetPlot MangoldtLambda ManhattanDistance Manipulate Manipulator MannedSpaceMissionData MannWhitneyTest MantissaExponent Manual Map MapAll MapAt MapIndexed MAProcess MapThread MarchenkoPasturDistribution MarcumQ MardiaCombinedTest MardiaKurtosisTest MardiaSkewnessTest MarginalDistribution MarkovProcessProperties Masking MatchingDissimilarity MatchLocalNameQ MatchLocalNames MatchQ Material MathematicalFunctionData MathematicaNotation MathieuC MathieuCharacteristicA MathieuCharacteristicB MathieuCharacteristicExponent MathieuCPrime MathieuGroupM11 MathieuGroupM12 MathieuGroupM22 MathieuGroupM23 MathieuGroupM24 MathieuS MathieuSPrime MathMLForm MathMLText Matrices MatrixExp MatrixForm MatrixFunction MatrixLog MatrixNormalDistribution MatrixPlot MatrixPower MatrixPropertyDistribution MatrixQ MatrixRank MatrixTDistribution Max MaxBend MaxCellMeasure MaxColorDistance MaxDetect MaxDuration MaxExtraBandwidths MaxExtraConditions MaxFeatureDisplacement MaxFeatures MaxFilter MaximalBy Maximize MaxItems MaxIterations MaxLimit MaxMemoryUsed MaxMixtureKernels MaxOverlapFraction MaxPlotPoints MaxPoints MaxRecursion MaxStableDistribution MaxStepFraction MaxSteps MaxStepSize MaxTrainingRounds MaxValue MaxwellDistribution MaxWordGap McLaughlinGroupMcL Mean MeanAbsoluteLossLayer MeanAround MeanClusteringCoefficient MeanDegreeConnectivity MeanDeviation MeanFilter MeanGraphDistance MeanNeighborDegree MeanShift MeanShiftFilter MeanSquaredLossLayer Median MedianDeviation MedianFilter MedicalTestData Medium MeijerG MeijerGReduce MeixnerDistribution MellinConvolve MellinTransform MemberQ MemoryAvailable MemoryConstrained MemoryConstraint MemoryInUse MengerMesh Menu MenuAppearance MenuCommandKey MenuEvaluator MenuItem MenuList MenuPacket MenuSortingValue MenuStyle MenuView Merge MergeDifferences MergingFunction MersennePrimeExponent MersennePrimeExponentQ Mesh MeshCellCentroid MeshCellCount MeshCellHighlight MeshCellIndex MeshCellLabel MeshCellMarker MeshCellMeasure MeshCellQuality MeshCells MeshCellShapeFunction MeshCellStyle MeshCoordinates MeshFunctions MeshPrimitives MeshQualityGoal MeshRange MeshRefinementFunction MeshRegion MeshRegionQ MeshShading MeshStyle Message MessageDialog MessageList MessageName MessageObject MessageOptions MessagePacket Messages MessagesNotebook MetaCharacters MetaInformation MeteorShowerData Method MethodOptions MexicanHatWavelet MeyerWavelet Midpoint Min MinColorDistance MinDetect MineralData MinFilter MinimalBy MinimalPolynomial MinimalStateSpaceModel Minimize MinimumTimeIncrement MinIntervalSize MinkowskiQuestionMark MinLimit MinMax MinorPlanetData Minors MinRecursion MinSize MinStableDistribution Minus MinusPlus MinValue Missing MissingBehavior MissingDataMethod MissingDataRules MissingQ MissingString MissingStyle MissingValuePattern MittagLefflerE MixedFractionParts MixedGraphQ MixedMagnitude MixedRadix MixedRadixQuantity MixedUnit MixtureDistribution Mod Modal Mode Modular ModularInverse ModularLambda Module Modulus MoebiusMu Molecule MoleculeContainsQ MoleculeEquivalentQ MoleculeGraph MoleculeModify MoleculePattern MoleculePlot MoleculePlot3D MoleculeProperty MoleculeQ MoleculeValue Moment Momentary MomentConvert MomentEvaluate MomentGeneratingFunction MomentOfInertia Monday Monitor MonomialList MonomialOrder MonsterGroupM MoonPhase MoonPosition MorletWavelet MorphologicalBinarize MorphologicalBranchPoints MorphologicalComponents MorphologicalEulerNumber MorphologicalGraph MorphologicalPerimeter MorphologicalTransform MortalityData Most MountainData MouseAnnotation MouseAppearance MouseAppearanceTag MouseButtons Mouseover MousePointerNote MousePosition MovieData MovingAverage MovingMap MovingMedian MoyalDistribution Multicolumn MultiedgeStyle MultigraphQ MultilaunchWarning MultiLetterItalics MultiLetterStyle MultilineFunction Multinomial MultinomialDistribution MultinormalDistribution MultiplicativeOrder Multiplicity MultiplySides Multiselection MultivariateHypergeometricDistribution MultivariatePoissonDistribution MultivariateTDistribution ' +
-      'N NakagamiDistribution NameQ Names NamespaceBox NamespaceBoxOptions Nand NArgMax NArgMin NBernoulliB NBodySimulation NBodySimulationData NCache NDEigensystem NDEigenvalues NDSolve NDSolveValue Nearest NearestFunction NearestNeighborGraph NearestTo NebulaData NeedCurrentFrontEndPackagePacket NeedCurrentFrontEndSymbolsPacket NeedlemanWunschSimilarity Needs Negative NegativeBinomialDistribution NegativeDefiniteMatrixQ NegativeIntegers NegativeMultinomialDistribution NegativeRationals NegativeReals NegativeSemidefiniteMatrixQ NeighborhoodData NeighborhoodGraph Nest NestedGreaterGreater NestedLessLess NestedScriptRules NestGraph NestList NestWhile NestWhileList NetAppend NetBidirectionalOperator NetChain NetDecoder NetDelete NetDrop NetEncoder NetEvaluationMode NetExtract NetFlatten NetFoldOperator NetGraph NetInformation NetInitialize NetInsert NetInsertSharedArrays NetJoin NetMapOperator NetMapThreadOperator NetMeasurements NetModel NetNestOperator NetPairEmbeddingOperator NetPort NetPortGradient NetPrepend NetRename NetReplace NetReplacePart NetSharedArray NetStateObject NetTake NetTrain NetTrainResultsObject NetworkPacketCapture NetworkPacketRecording NetworkPacketRecordingDuring NetworkPacketTrace NeumannValue NevilleThetaC NevilleThetaD NevilleThetaN NevilleThetaS NewPrimitiveStyle NExpectation Next NextCell NextDate NextPrime NextScheduledTaskTime NHoldAll NHoldFirst NHoldRest NicholsGridLines NicholsPlot NightHemisphere NIntegrate NMaximize NMaxValue NMinimize NMinValue NominalVariables NonAssociative NoncentralBetaDistribution NoncentralChiSquareDistribution NoncentralFRatioDistribution NoncentralStudentTDistribution NonCommutativeMultiply NonConstants NondimensionalizationTransform None NoneTrue NonlinearModelFit NonlinearStateSpaceModel NonlocalMeansFilter NonNegative NonNegativeIntegers NonNegativeRationals NonNegativeReals NonPositive NonPositiveIntegers NonPositiveRationals NonPositiveReals Nor NorlundB Norm Normal NormalDistribution NormalGrouping NormalizationLayer Normalize Normalized NormalizedSquaredEuclideanDistance NormalMatrixQ NormalsFunction NormFunction Not NotCongruent NotCupCap NotDoubleVerticalBar Notebook NotebookApply NotebookAutoSave NotebookClose NotebookConvertSettings NotebookCreate NotebookCreateReturnObject NotebookDefault NotebookDelete NotebookDirectory NotebookDynamicExpression NotebookEvaluate NotebookEventActions NotebookFileName NotebookFind NotebookFindReturnObject NotebookGet NotebookGetLayoutInformationPacket NotebookGetMisspellingsPacket NotebookImport NotebookInformation NotebookInterfaceObject NotebookLocate NotebookObject NotebookOpen NotebookOpenReturnObject NotebookPath NotebookPrint NotebookPut NotebookPutReturnObject NotebookRead NotebookResetGeneratedCells Notebooks NotebookSave NotebookSaveAs NotebookSelection NotebookSetupLayoutInformationPacket NotebooksMenu NotebookTemplate NotebookWrite NotElement NotEqualTilde NotExists NotGreater NotGreaterEqual NotGreaterFullEqual NotGreaterGreater NotGreaterLess NotGreaterSlantEqual NotGreaterTilde Nothing NotHumpDownHump NotHumpEqual NotificationFunction NotLeftTriangle NotLeftTriangleBar NotLeftTriangleEqual NotLess NotLessEqual NotLessFullEqual NotLessGreater NotLessLess NotLessSlantEqual NotLessTilde NotNestedGreaterGreater NotNestedLessLess NotPrecedes NotPrecedesEqual NotPrecedesSlantEqual NotPrecedesTilde NotReverseElement NotRightTriangle NotRightTriangleBar NotRightTriangleEqual NotSquareSubset NotSquareSubsetEqual NotSquareSuperset NotSquareSupersetEqual NotSubset NotSubsetEqual NotSucceeds NotSucceedsEqual NotSucceedsSlantEqual NotSucceedsTilde NotSuperset NotSupersetEqual NotTilde NotTildeEqual NotTildeFullEqual NotTildeTilde NotVerticalBar Now NoWhitespace NProbability NProduct NProductFactors NRoots NSolve NSum NSumTerms NuclearExplosionData NuclearReactorData Null NullRecords NullSpace NullWords Number NumberCompose NumberDecompose NumberExpand NumberFieldClassNumber NumberFieldDiscriminant NumberFieldFundamentalUnits NumberFieldIntegralBasis NumberFieldNormRepresentatives NumberFieldRegulator NumberFieldRootsOfUnity NumberFieldSignature NumberForm NumberFormat NumberLinePlot NumberMarks NumberMultiplier NumberPadding NumberPoint NumberQ NumberSeparator NumberSigns NumberString Numerator NumeratorDenominator NumericalOrder NumericalSort NumericArray NumericArrayQ NumericArrayType NumericFunction NumericQ NuttallWindow NValues NyquistGridLines NyquistPlot ' +
-      'O ObservabilityGramian ObservabilityMatrix ObservableDecomposition ObservableModelQ OceanData Octahedron OddQ Off Offset OLEData On ONanGroupON Once OneIdentity Opacity OpacityFunction OpacityFunctionScaling Open OpenAppend Opener OpenerBox OpenerBoxOptions OpenerView OpenFunctionInspectorPacket Opening OpenRead OpenSpecialOptions OpenTemporary OpenWrite Operate OperatingSystem OptimumFlowData Optional OptionalElement OptionInspectorSettings OptionQ Options OptionsPacket OptionsPattern OptionValue OptionValueBox OptionValueBoxOptions Or Orange Order OrderDistribution OrderedQ Ordering OrderingBy OrderingLayer Orderless OrderlessPatternSequence OrnsteinUhlenbeckProcess Orthogonalize OrthogonalMatrixQ Out Outer OuterPolygon OuterPolyhedron OutputAutoOverwrite OutputControllabilityMatrix OutputControllableModelQ OutputForm OutputFormData OutputGrouping OutputMathEditExpression OutputNamePacket OutputResponse OutputSizeLimit OutputStream Over OverBar OverDot Overflow OverHat Overlaps Overlay OverlayBox OverlayBoxOptions Overscript OverscriptBox OverscriptBoxOptions OverTilde OverVector OverwriteTarget OwenT OwnValues ' +
-      'Package PackingMethod PaddedForm Padding PaddingLayer PaddingSize PadeApproximant PadLeft PadRight PageBreakAbove PageBreakBelow PageBreakWithin PageFooterLines PageFooters PageHeaderLines PageHeaders PageHeight PageRankCentrality PageTheme PageWidth Pagination PairedBarChart PairedHistogram PairedSmoothHistogram PairedTTest PairedZTest PaletteNotebook PalettePath PalindromeQ Pane PaneBox PaneBoxOptions Panel PanelBox PanelBoxOptions Paneled PaneSelector PaneSelectorBox PaneSelectorBoxOptions PaperWidth ParabolicCylinderD ParagraphIndent ParagraphSpacing ParallelArray ParallelCombine ParallelDo Parallelepiped ParallelEvaluate Parallelization Parallelize ParallelMap ParallelNeeds Parallelogram ParallelProduct ParallelSubmit ParallelSum ParallelTable ParallelTry Parameter ParameterEstimator ParameterMixtureDistribution ParameterVariables ParametricFunction ParametricNDSolve ParametricNDSolveValue ParametricPlot ParametricPlot3D ParametricRegion ParentBox ParentCell ParentConnect ParentDirectory ParentForm Parenthesize ParentList ParentNotebook ParetoDistribution ParetoPickandsDistribution ParkData Part PartBehavior PartialCorrelationFunction PartialD ParticleAcceleratorData ParticleData Partition PartitionGranularity PartitionsP PartitionsQ PartLayer PartOfSpeech PartProtection ParzenWindow PascalDistribution PassEventsDown PassEventsUp Paste PasteAutoQuoteCharacters PasteBoxFormInlineCells PasteButton Path PathGraph PathGraphQ Pattern PatternSequence PatternTest PauliMatrix PaulWavelet Pause PausedTime PDF PeakDetect PeanoCurve PearsonChiSquareTest PearsonCorrelationTest PearsonDistribution PercentForm PerfectNumber PerfectNumberQ PerformanceGoal Perimeter PeriodicBoundaryCondition PeriodicInterpolation Periodogram PeriodogramArray Permanent Permissions PermissionsGroup PermissionsGroupMemberQ PermissionsGroups PermissionsKey PermissionsKeys PermutationCycles PermutationCyclesQ PermutationGroup PermutationLength PermutationList PermutationListQ PermutationMax PermutationMin PermutationOrder PermutationPower PermutationProduct PermutationReplace Permutations PermutationSupport Permute PeronaMalikFilter Perpendicular PerpendicularBisector PersistenceLocation PersistenceTime PersistentObject PersistentObjects PersistentValue PersonData PERTDistribution PetersenGraph PhaseMargins PhaseRange PhysicalSystemData Pi Pick PIDData PIDDerivativeFilter PIDFeedforward PIDTune Piecewise PiecewiseExpand PieChart PieChart3D PillaiTrace PillaiTraceTest PingTime Pink PitchRecognize Pivoting PixelConstrained PixelValue PixelValuePositions Placed Placeholder PlaceholderReplace Plain PlanarAngle PlanarGraph PlanarGraphQ PlanckRadiationLaw PlaneCurveData PlanetaryMoonData PlanetData PlantData Play PlayRange Plot Plot3D Plot3Matrix PlotDivision PlotJoined PlotLabel PlotLabels PlotLayout PlotLegends PlotMarkers PlotPoints PlotRange PlotRangeClipping PlotRangeClipPlanesStyle PlotRangePadding PlotRegion PlotStyle PlotTheme Pluralize Plus PlusMinus Pochhammer PodStates PodWidth Point Point3DBox Point3DBoxOptions PointBox PointBoxOptions PointFigureChart PointLegend PointSize PoissonConsulDistribution PoissonDistribution PoissonProcess PoissonWindow PolarAxes PolarAxesOrigin PolarGridLines PolarPlot PolarTicks PoleZeroMarkers PolyaAeppliDistribution PolyGamma Polygon Polygon3DBox Polygon3DBoxOptions PolygonalNumber PolygonAngle PolygonBox PolygonBoxOptions PolygonCoordinates PolygonDecomposition PolygonHoleScale PolygonIntersections PolygonScale Polyhedron PolyhedronAngle PolyhedronCoordinates PolyhedronData PolyhedronDecomposition PolyhedronGenus PolyLog PolynomialExtendedGCD PolynomialForm PolynomialGCD PolynomialLCM PolynomialMod PolynomialQ PolynomialQuotient PolynomialQuotientRemainder PolynomialReduce PolynomialRemainder Polynomials PoolingLayer PopupMenu PopupMenuBox PopupMenuBoxOptions PopupView PopupWindow Position PositionIndex Positive PositiveDefiniteMatrixQ PositiveIntegers PositiveRationals PositiveReals PositiveSemidefiniteMatrixQ PossibleZeroQ Postfix PostScript Power PowerDistribution PowerExpand PowerMod PowerModList PowerRange PowerSpectralDensity PowersRepresentations PowerSymmetricPolynomial Precedence PrecedenceForm Precedes PrecedesEqual PrecedesSlantEqual PrecedesTilde Precision PrecisionGoal PreDecrement Predict PredictionRoot PredictorFunction PredictorInformation PredictorMeasurements PredictorMeasurementsObject PreemptProtect PreferencesPath Prefix PreIncrement Prepend PrependLayer PrependTo PreprocessingRules PreserveColor PreserveImageOptions Previous PreviousCell PreviousDate PriceGraphDistribution PrimaryPlaceholder Prime PrimeNu PrimeOmega PrimePi PrimePowerQ PrimeQ Primes PrimeZetaP PrimitivePolynomialQ PrimitiveRoot PrimitiveRootList PrincipalComponents PrincipalValue Print PrintableASCIIQ PrintAction PrintForm PrintingCopies PrintingOptions PrintingPageRange PrintingStartingPageNumber PrintingStyleEnvironment Printout3D Printout3DPreviewer PrintPrecision PrintTemporary Prism PrismBox PrismBoxOptions PrivateCellOptions PrivateEvaluationOptions PrivateFontOptions PrivateFrontEndOptions PrivateKey PrivateNotebookOptions PrivatePaths Probability ProbabilityDistribution ProbabilityPlot ProbabilityPr ProbabilityScalePlot ProbitModelFit ProcessConnection ProcessDirectory ProcessEnvironment Processes ProcessEstimator ProcessInformation ProcessObject ProcessParameterAssumptions ProcessParameterQ ProcessStateDomain ProcessStatus ProcessTimeDomain Product ProductDistribution ProductLog ProgressIndicator ProgressIndicatorBox ProgressIndicatorBoxOptions Projection Prolog PromptForm ProofObject Properties Property PropertyList PropertyValue Proportion Proportional Protect Protected ProteinData Pruning PseudoInverse PsychrometricPropertyData PublicKey PublisherID PulsarData PunctuationCharacter Purple Put PutAppend Pyramid PyramidBox PyramidBoxOptions ' +
-      'QBinomial QFactorial QGamma QHypergeometricPFQ QnDispersion QPochhammer QPolyGamma QRDecomposition QuadraticIrrationalQ QuadraticOptimization Quantile QuantilePlot Quantity QuantityArray QuantityDistribution QuantityForm QuantityMagnitude QuantityQ QuantityUnit QuantityVariable QuantityVariableCanonicalUnit QuantityVariableDimensions QuantityVariableIdentifier QuantityVariablePhysicalQuantity Quartics QuartileDeviation Quartiles QuartileSkewness Query QueueingNetworkProcess QueueingProcess QueueProperties Quiet Quit Quotient QuotientRemainder ' +
-      'RadialGradientImage RadialityCentrality RadicalBox RadicalBoxOptions RadioButton RadioButtonBar RadioButtonBox RadioButtonBoxOptions Radon RadonTransform RamanujanTau RamanujanTauL RamanujanTauTheta RamanujanTauZ Ramp Random RandomChoice RandomColor RandomComplex RandomEntity RandomFunction RandomGeoPosition RandomGraph RandomImage RandomInstance RandomInteger RandomPermutation RandomPoint RandomPolygon RandomPolyhedron RandomPrime RandomReal RandomSample RandomSeed RandomSeeding RandomVariate RandomWalkProcess RandomWord Range RangeFilter RangeSpecification RankedMax RankedMin RarerProbability Raster Raster3D Raster3DBox Raster3DBoxOptions RasterArray RasterBox RasterBoxOptions Rasterize RasterSize Rational RationalFunctions Rationalize Rationals Ratios RawArray RawBoxes RawData RawMedium RayleighDistribution Re Read ReadByteArray ReadLine ReadList ReadProtected ReadString Real RealAbs RealBlockDiagonalForm RealDigits RealExponent Reals RealSign Reap RecognitionPrior RecognitionThreshold Record RecordLists RecordSeparators Rectangle RectangleBox RectangleBoxOptions RectangleChart RectangleChart3D RectangularRepeatingElement RecurrenceFilter RecurrenceTable RecurringDigitsForm Red Reduce RefBox ReferenceLineStyle ReferenceMarkers ReferenceMarkerStyle Refine ReflectionMatrix ReflectionTransform Refresh RefreshRate Region RegionBinarize RegionBoundary RegionBounds RegionCentroid RegionDifference RegionDimension RegionDisjoint RegionDistance RegionDistanceFunction RegionEmbeddingDimension RegionEqual RegionFunction RegionImage RegionIntersection RegionMeasure RegionMember RegionMemberFunction RegionMoment RegionNearest RegionNearestFunction RegionPlot RegionPlot3D RegionProduct RegionQ RegionResize RegionSize RegionSymmetricDifference RegionUnion RegionWithin RegisterExternalEvaluator RegularExpression Regularization RegularlySampledQ RegularPolygon ReIm ReImLabels ReImPlot ReImStyle Reinstall RelationalDatabase RelationGraph Release ReleaseHold ReliabilityDistribution ReliefImage ReliefPlot RemoteAuthorizationCaching RemoteConnect RemoteConnectionObject RemoteFile RemoteRun RemoteRunProcess Remove RemoveAlphaChannel RemoveAsynchronousTask RemoveAudioStream RemoveBackground RemoveChannelListener RemoveChannelSubscribers Removed RemoveDiacritics RemoveInputStreamMethod RemoveOutputStreamMethod RemoveProperty RemoveScheduledTask RemoveUsers RenameDirectory RenameFile RenderAll RenderingOptions RenewalProcess RenkoChart RepairMesh Repeated RepeatedNull RepeatedString RepeatedTiming RepeatingElement Replace ReplaceAll ReplaceHeldPart ReplaceImageValue ReplaceList ReplacePart ReplacePixelValue ReplaceRepeated ReplicateLayer RequiredPhysicalQuantities Resampling ResamplingAlgorithmData ResamplingMethod Rescale RescalingTransform ResetDirectory ResetMenusPacket ResetScheduledTask ReshapeLayer Residue ResizeLayer Resolve ResourceAcquire ResourceData ResourceFunction ResourceObject ResourceRegister ResourceRemove ResourceSearch ResourceSubmissionObject ResourceSubmit ResourceSystemBase ResourceUpdate ResponseForm Rest RestartInterval Restricted Resultant ResumePacket Return ReturnEntersInput ReturnExpressionPacket ReturnInputFormPacket ReturnPacket ReturnReceiptFunction ReturnTextPacket Reverse ReverseBiorthogonalSplineWavelet ReverseElement ReverseEquilibrium ReverseGraph ReverseSort ReverseSortBy ReverseUpEquilibrium RevolutionAxis RevolutionPlot3D RGBColor RiccatiSolve RiceDistribution RidgeFilter RiemannR RiemannSiegelTheta RiemannSiegelZ RiemannXi Riffle Right RightArrow RightArrowBar RightArrowLeftArrow RightComposition RightCosetRepresentative RightDownTeeVector RightDownVector RightDownVectorBar RightTee RightTeeArrow RightTeeVector RightTriangle RightTriangleBar RightTriangleEqual RightUpDownVector RightUpTeeVector RightUpVector RightUpVectorBar RightVector RightVectorBar RiskAchievementImportance RiskReductionImportance RogersTanimotoDissimilarity RollPitchYawAngles RollPitchYawMatrix RomanNumeral Root RootApproximant RootIntervals RootLocusPlot RootMeanSquare RootOfUnityQ RootReduce Roots RootSum Rotate RotateLabel RotateLeft RotateRight RotationAction RotationBox RotationBoxOptions RotationMatrix RotationTransform Round RoundImplies RoundingRadius Row RowAlignments RowBackgrounds RowBox RowHeights RowLines RowMinHeight RowReduce RowsEqual RowSpacings RSolve RSolveValue RudinShapiro RudvalisGroupRu Rule RuleCondition RuleDelayed RuleForm RulePlot RulerUnits Run RunProcess RunScheduledTask RunThrough RuntimeAttributes RuntimeOptions RussellRaoDissimilarity ' +
-      'SameQ SameTest SampledEntityClass SampleDepth SampledSoundFunction SampledSoundList SampleRate SamplingPeriod SARIMAProcess SARMAProcess SASTriangle SatelliteData SatisfiabilityCount SatisfiabilityInstances SatisfiableQ Saturday Save Saveable SaveAutoDelete SaveConnection SaveDefinitions SavitzkyGolayMatrix SawtoothWave Scale Scaled ScaleDivisions ScaledMousePosition ScaleOrigin ScalePadding ScaleRanges ScaleRangeStyle ScalingFunctions ScalingMatrix ScalingTransform Scan ScheduledTask ScheduledTaskActiveQ ScheduledTaskInformation ScheduledTaskInformationData ScheduledTaskObject ScheduledTasks SchurDecomposition ScientificForm ScientificNotationThreshold ScorerGi ScorerGiPrime ScorerHi ScorerHiPrime ScreenRectangle ScreenStyleEnvironment ScriptBaselineShifts ScriptForm ScriptLevel ScriptMinSize ScriptRules ScriptSizeMultipliers Scrollbars ScrollingOptions ScrollPosition SearchAdjustment SearchIndexObject SearchIndices SearchQueryString SearchResultObject Sec Sech SechDistribution SecondOrderConeOptimization SectionGrouping SectorChart SectorChart3D SectorOrigin SectorSpacing SecuredAuthenticationKey SecuredAuthenticationKeys SeedRandom Select Selectable SelectComponents SelectedCells SelectedNotebook SelectFirst Selection SelectionAnimate SelectionCell SelectionCellCreateCell SelectionCellDefaultStyle SelectionCellParentStyle SelectionCreateCell SelectionDebuggerTag SelectionDuplicateCell SelectionEvaluate SelectionEvaluateCreateCell SelectionMove SelectionPlaceholder SelectionSetStyle SelectWithContents SelfLoops SelfLoopStyle SemanticImport SemanticImportString SemanticInterpretation SemialgebraicComponentInstances SemidefiniteOptimization SendMail SendMessage Sequence SequenceAlignment SequenceAttentionLayer SequenceCases SequenceCount SequenceFold SequenceFoldList SequenceForm SequenceHold SequenceLastLayer SequenceMostLayer SequencePosition SequencePredict SequencePredictorFunction SequenceReplace SequenceRestLayer SequenceReverseLayer SequenceSplit Series SeriesCoefficient SeriesData ServiceConnect ServiceDisconnect ServiceExecute ServiceObject ServiceRequest ServiceResponse ServiceSubmit SessionSubmit SessionTime Set SetAccuracy SetAlphaChannel SetAttributes Setbacks SetBoxFormNamesPacket SetCloudDirectory SetCookies SetDelayed SetDirectory SetEnvironment SetEvaluationNotebook SetFileDate SetFileLoadingContext SetNotebookStatusLine SetOptions SetOptionsPacket SetPermissions SetPrecision SetProperty SetSecuredAuthenticationKey SetSelectedNotebook SetSharedFunction SetSharedVariable SetSpeechParametersPacket SetStreamPosition SetSystemModel SetSystemOptions Setter SetterBar SetterBox SetterBoxOptions Setting SetUsers SetValue Shading Shallow ShannonWavelet ShapiroWilkTest Share SharingList Sharpen ShearingMatrix ShearingTransform ShellRegion ShenCastanMatrix ShiftedGompertzDistribution ShiftRegisterSequence Short ShortDownArrow Shortest ShortestMatch ShortestPathFunction ShortLeftArrow ShortRightArrow ShortTimeFourier ShortTimeFourierData ShortUpArrow Show ShowAutoConvert ShowAutoSpellCheck ShowAutoStyles ShowCellBracket ShowCellLabel ShowCellTags ShowClosedCellArea ShowCodeAssist ShowContents ShowControls ShowCursorTracker ShowGroupOpenCloseIcon ShowGroupOpener ShowInvisibleCharacters ShowPageBreaks ShowPredictiveInterface ShowSelection ShowShortBoxForm ShowSpecialCharacters ShowStringCharacters ShowSyntaxStyles ShrinkingDelay ShrinkWrapBoundingBox SiderealTime SiegelTheta SiegelTukeyTest SierpinskiCurve SierpinskiMesh Sign Signature SignedRankTest SignedRegionDistance SignificanceLevel SignPadding SignTest SimilarityRules SimpleGraph SimpleGraphQ SimplePolygonQ SimplePolyhedronQ Simplex Simplify Sin Sinc SinghMaddalaDistribution SingleEvaluation SingleLetterItalics SingleLetterStyle SingularValueDecomposition SingularValueList SingularValuePlot SingularValues Sinh SinhIntegral SinIntegral SixJSymbol Skeleton SkeletonTransform SkellamDistribution Skewness SkewNormalDistribution SkinStyle Skip SliceContourPlot3D SliceDensityPlot3D SliceDistribution SliceVectorPlot3D Slider Slider2D Slider2DBox Slider2DBoxOptions SliderBox SliderBoxOptions SlideView Slot SlotSequence Small SmallCircle Smaller SmithDecomposition SmithDelayCompensator SmithWatermanSimilarity SmoothDensityHistogram SmoothHistogram SmoothHistogram3D SmoothKernelDistribution SnDispersion Snippet SnubPolyhedron SocialMediaData Socket SocketConnect SocketListen SocketListener SocketObject SocketOpen SocketReadMessage SocketReadyQ Sockets SocketWaitAll SocketWaitNext SoftmaxLayer SokalSneathDissimilarity SolarEclipse SolarSystemFeatureData SolidAngle SolidData SolidRegionQ Solve SolveAlways SolveDelayed Sort SortBy SortedBy SortedEntityClass Sound SoundAndGraphics SoundNote SoundVolume SourceLink Sow Space SpaceCurveData SpaceForm Spacer Spacings Span SpanAdjustments SpanCharacterRounding SpanFromAbove SpanFromBoth SpanFromLeft SpanLineThickness SpanMaxSize SpanMinSize SpanningCharacters SpanSymmetric SparseArray SpatialGraphDistribution SpatialMedian SpatialTransformationLayer Speak SpeakTextPacket SpearmanRankTest SpearmanRho SpeciesData SpecificityGoal SpectralLineData Spectrogram SpectrogramArray Specularity SpeechRecognize SpeechSynthesize SpellingCorrection SpellingCorrectionList SpellingDictionaries SpellingDictionariesPath SpellingOptions SpellingSuggestionsPacket Sphere SphereBox SpherePoints SphericalBesselJ SphericalBesselY SphericalHankelH1 SphericalHankelH2 SphericalHarmonicY SphericalPlot3D SphericalRegion SphericalShell SpheroidalEigenvalue SpheroidalJoiningFactor SpheroidalPS SpheroidalPSPrime SpheroidalQS SpheroidalQSPrime SpheroidalRadialFactor SpheroidalS1 SpheroidalS1Prime SpheroidalS2 SpheroidalS2Prime Splice SplicedDistribution SplineClosed SplineDegree SplineKnots SplineWeights Split SplitBy SpokenString Sqrt SqrtBox SqrtBoxOptions Square SquaredEuclideanDistance SquareFreeQ SquareIntersection SquareMatrixQ SquareRepeatingElement SquaresR SquareSubset SquareSubsetEqual SquareSuperset SquareSupersetEqual SquareUnion SquareWave SSSTriangle StabilityMargins StabilityMarginsStyle StableDistribution Stack StackBegin StackComplete StackedDateListPlot StackedListPlot StackInhibit StadiumShape StandardAtmosphereData StandardDeviation StandardDeviationFilter StandardForm Standardize Standardized StandardOceanData StandbyDistribution Star StarClusterData StarData StarGraph StartAsynchronousTask StartExternalSession StartingStepSize StartOfLine StartOfString StartProcess StartScheduledTask StartupSound StartWebSession StateDimensions StateFeedbackGains StateOutputEstimator StateResponse StateSpaceModel StateSpaceRealization StateSpaceTransform StateTransformationLinearize StationaryDistribution StationaryWaveletPacketTransform StationaryWaveletTransform StatusArea StatusCentrality StepMonitor StereochemistryElements StieltjesGamma StirlingS1 StirlingS2 StopAsynchronousTask StoppingPowerData StopScheduledTask StrataVariables StratonovichProcess StreamColorFunction StreamColorFunctionScaling StreamDensityPlot StreamMarkers StreamPlot StreamPoints StreamPosition Streams StreamScale StreamStyle String StringBreak StringByteCount StringCases StringContainsQ StringCount StringDelete StringDrop StringEndsQ StringExpression StringExtract StringForm StringFormat StringFreeQ StringInsert StringJoin StringLength StringMatchQ StringPadLeft StringPadRight StringPart StringPartition StringPosition StringQ StringRepeat StringReplace StringReplaceList StringReplacePart StringReverse StringRiffle StringRotateLeft StringRotateRight StringSkeleton StringSplit StringStartsQ StringTake StringTemplate StringToByteArray StringToStream StringTrim StripBoxes StripOnInput StripWrapperBoxes StrokeForm StructuralImportance StructuredArray StructuredSelection StruveH StruveL Stub StudentTDistribution Style StyleBox StyleBoxAutoDelete StyleData StyleDefinitions StyleForm StyleHints StyleKeyMapping StyleMenuListing StyleNameDialogSettings StyleNames StylePrint StyleSheetPath Subdivide Subfactorial Subgraph SubMinus SubPlus SubresultantPolynomialRemainders SubresultantPolynomials Subresultants Subscript SubscriptBox SubscriptBoxOptions Subscripted Subsequences Subset SubsetEqual SubsetMap SubsetQ Subsets SubStar SubstitutionSystem Subsuperscript SubsuperscriptBox SubsuperscriptBoxOptions Subtract SubtractFrom SubtractSides SubValues Succeeds SucceedsEqual SucceedsSlantEqual SucceedsTilde Success SuchThat Sum SumConvergence SummationLayer Sunday SunPosition Sunrise Sunset SuperDagger SuperMinus SupernovaData SuperPlus Superscript SuperscriptBox SuperscriptBoxOptions Superset SupersetEqual SuperStar Surd SurdForm SurfaceArea SurfaceColor SurfaceData SurfaceGraphics SurvivalDistribution SurvivalFunction SurvivalModel SurvivalModelFit SuspendPacket SuzukiDistribution SuzukiGroupSuz SwatchLegend Switch Symbol SymbolName SymletWavelet Symmetric SymmetricGroup SymmetricKey SymmetricMatrixQ SymmetricPolynomial SymmetricReduction Symmetrize SymmetrizedArray SymmetrizedArrayRules SymmetrizedDependentComponents SymmetrizedIndependentComponents SymmetrizedReplacePart SynchronousInitialization SynchronousUpdating Synonyms Syntax SyntaxForm SyntaxInformation SyntaxLength SyntaxPacket SyntaxQ SynthesizeMissingValues SystemDialogInput SystemException SystemGet SystemHelpPath SystemInformation SystemInformationData SystemInstall SystemModel SystemModeler SystemModelExamples SystemModelLinearize SystemModelParametricSimulate SystemModelPlot SystemModelProgressReporting SystemModelReliability SystemModels SystemModelSimulate SystemModelSimulateSensitivity SystemModelSimulationData SystemOpen SystemOptions SystemProcessData SystemProcesses SystemsConnectionsModel SystemsModelDelay SystemsModelDelayApproximate SystemsModelDelete SystemsModelDimensions SystemsModelExtract SystemsModelFeedbackConnect SystemsModelLabels SystemsModelLinearity SystemsModelMerge SystemsModelOrder SystemsModelParallelConnect SystemsModelSeriesConnect SystemsModelStateFeedbackConnect SystemsModelVectorRelativeOrders SystemStub SystemTest ' +
-      'Tab TabFilling Table TableAlignments TableDepth TableDirections TableForm TableHeadings TableSpacing TableView TableViewBox TableViewBoxBackground TableViewBoxOptions TabSpacings TabView TabViewBox TabViewBoxOptions TagBox TagBoxNote TagBoxOptions TaggingRules TagSet TagSetDelayed TagStyle TagUnset Take TakeDrop TakeLargest TakeLargestBy TakeList TakeSmallest TakeSmallestBy TakeWhile Tally Tan Tanh TargetDevice TargetFunctions TargetSystem TargetUnits TaskAbort TaskExecute TaskObject TaskRemove TaskResume Tasks TaskSuspend TaskWait TautologyQ TelegraphProcess TemplateApply TemplateArgBox TemplateBox TemplateBoxOptions TemplateEvaluate TemplateExpression TemplateIf TemplateObject TemplateSequence TemplateSlot TemplateSlotSequence TemplateUnevaluated TemplateVerbatim TemplateWith TemporalData TemporalRegularity Temporary TemporaryVariable TensorContract TensorDimensions TensorExpand TensorProduct TensorQ TensorRank TensorReduce TensorSymmetry TensorTranspose TensorWedge TestID TestReport TestReportObject TestResultObject Tetrahedron TetrahedronBox TetrahedronBoxOptions TeXForm TeXSave Text Text3DBox Text3DBoxOptions TextAlignment TextBand TextBoundingBox TextBox TextCases TextCell TextClipboardType TextContents TextData TextElement TextForm TextGrid TextJustification TextLine TextPacket TextParagraph TextPosition TextRecognize TextSearch TextSearchReport TextSentences TextString TextStructure TextStyle TextTranslation Texture TextureCoordinateFunction TextureCoordinateScaling TextWords Therefore ThermodynamicData ThermometerGauge Thick Thickness Thin Thinning ThisLink ThompsonGroupTh Thread ThreadingLayer ThreeJSymbol Threshold Through Throw ThueMorse Thumbnail Thursday Ticks TicksStyle TideData Tilde TildeEqual TildeFullEqual TildeTilde TimeConstrained TimeConstraint TimeDirection TimeFormat TimeGoal TimelinePlot TimeObject TimeObjectQ Times TimesBy TimeSeries TimeSeriesAggregate TimeSeriesForecast TimeSeriesInsert TimeSeriesInvertibility TimeSeriesMap TimeSeriesMapThread TimeSeriesModel TimeSeriesModelFit TimeSeriesResample TimeSeriesRescale TimeSeriesShift TimeSeriesThread TimeSeriesWindow TimeUsed TimeValue TimeWarpingCorrespondence TimeWarpingDistance TimeZone TimeZoneConvert TimeZoneOffset Timing Tiny TitleGrouping TitsGroupT ToBoxes ToCharacterCode ToColor ToContinuousTimeModel ToDate Today ToDiscreteTimeModel ToEntity ToeplitzMatrix ToExpression ToFileName Together Toggle ToggleFalse Toggler TogglerBar TogglerBox TogglerBoxOptions ToHeldExpression ToInvertibleTimeSeries TokenWords Tolerance ToLowerCase Tomorrow ToNumberField TooBig Tooltip TooltipBox TooltipBoxOptions TooltipDelay TooltipStyle Top TopHatTransform ToPolarCoordinates TopologicalSort ToRadicals ToRules ToSphericalCoordinates ToString Total TotalHeight TotalLayer TotalVariationFilter TotalWidth TouchPosition TouchscreenAutoZoom TouchscreenControlPlacement ToUpperCase Tr Trace TraceAbove TraceAction TraceBackward TraceDepth TraceDialog TraceForward TraceInternal TraceLevel TraceOff TraceOn TraceOriginal TracePrint TraceScan TrackedSymbols TrackingFunction TracyWidomDistribution TradingChart TraditionalForm TraditionalFunctionNotation TraditionalNotation TraditionalOrder TrainingProgressCheckpointing TrainingProgressFunction TrainingProgressMeasurements TrainingProgressReporting TrainingStoppingCriterion TransferFunctionCancel TransferFunctionExpand TransferFunctionFactor TransferFunctionModel TransferFunctionPoles TransferFunctionTransform TransferFunctionZeros TransformationClass TransformationFunction TransformationFunctions TransformationMatrix TransformedDistribution TransformedField TransformedProcess TransformedRegion TransitionDirection TransitionDuration TransitionEffect TransitiveClosureGraph TransitiveReductionGraph Translate TranslationOptions TranslationTransform Transliterate Transparent TransparentColor Transpose TransposeLayer TrapSelection TravelDirections TravelDirectionsData TravelDistance TravelDistanceList TravelMethod TravelTime TreeForm TreeGraph TreeGraphQ TreePlot TrendStyle Triangle TriangleCenter TriangleConstruct TriangleMeasurement TriangleWave TriangularDistribution TriangulateMesh Trig TrigExpand TrigFactor TrigFactorList Trigger TrigReduce TrigToExp TrimmedMean TrimmedVariance TropicalStormData True TrueQ TruncatedDistribution TruncatedPolyhedron TsallisQExponentialDistribution TsallisQGaussianDistribution TTest Tube TubeBezierCurveBox TubeBezierCurveBoxOptions TubeBox TubeBoxOptions TubeBSplineCurveBox TubeBSplineCurveBoxOptions Tuesday TukeyLambdaDistribution TukeyWindow TunnelData Tuples TuranGraph TuringMachine TuttePolynomial TwoWayRule Typed TypeSpecifier ' +
-      'UnateQ Uncompress UnconstrainedParameters Undefined UnderBar Underflow Underlined Underoverscript UnderoverscriptBox UnderoverscriptBoxOptions Underscript UnderscriptBox UnderscriptBoxOptions UnderseaFeatureData UndirectedEdge UndirectedGraph UndirectedGraphQ UndoOptions UndoTrackedVariables Unequal UnequalTo Unevaluated UniformDistribution UniformGraphDistribution UniformPolyhedron UniformSumDistribution Uninstall Union UnionPlus Unique UnitaryMatrixQ UnitBox UnitConvert UnitDimensions Unitize UnitRootTest UnitSimplify UnitStep UnitSystem UnitTriangle UnitVector UnitVectorLayer UnityDimensions UniverseModelData UniversityData UnixTime Unprotect UnregisterExternalEvaluator UnsameQ UnsavedVariables Unset UnsetShared UntrackedVariables Up UpArrow UpArrowBar UpArrowDownArrow Update UpdateDynamicObjects UpdateDynamicObjectsSynchronous UpdateInterval UpdateSearchIndex UpDownArrow UpEquilibrium UpperCaseQ UpperLeftArrow UpperRightArrow UpperTriangularize UpperTriangularMatrixQ Upsample UpSet UpSetDelayed UpTee UpTeeArrow UpTo UpValues URL URLBuild URLDecode URLDispatcher URLDownload URLDownloadSubmit URLEncode URLExecute URLExpand URLFetch URLFetchAsynchronous URLParse URLQueryDecode URLQueryEncode URLRead URLResponseTime URLSave URLSaveAsynchronous URLShorten URLSubmit UseGraphicsRange UserDefinedWavelet Using UsingFrontEnd UtilityFunction ' +
-      'V2Get ValenceErrorHandling ValidationLength ValidationSet Value ValueBox ValueBoxOptions ValueDimensions ValueForm ValuePreprocessingFunction ValueQ Values ValuesData Variables Variance VarianceEquivalenceTest VarianceEstimatorFunction VarianceGammaDistribution VarianceTest VectorAngle VectorAround VectorColorFunction VectorColorFunctionScaling VectorDensityPlot VectorGlyphData VectorGreater VectorGreaterEqual VectorLess VectorLessEqual VectorMarkers VectorPlot VectorPlot3D VectorPoints VectorQ Vectors VectorScale VectorStyle Vee Verbatim Verbose VerboseConvertToPostScriptPacket VerificationTest VerifyConvergence VerifyDerivedKey VerifyDigitalSignature VerifyInterpretation VerifySecurityCertificates VerifySolutions VerifyTestAssumptions Version VersionNumber VertexAdd VertexCapacity VertexColors VertexComponent VertexConnectivity VertexContract VertexCoordinateRules VertexCoordinates VertexCorrelationSimilarity VertexCosineSimilarity VertexCount VertexCoverQ VertexDataCoordinates VertexDegree VertexDelete VertexDiceSimilarity VertexEccentricity VertexInComponent VertexInDegree VertexIndex VertexJaccardSimilarity VertexLabeling VertexLabels VertexLabelStyle VertexList VertexNormals VertexOutComponent VertexOutDegree VertexQ VertexRenderingFunction VertexReplace VertexShape VertexShapeFunction VertexSize VertexStyle VertexTextureCoordinates VertexWeight VertexWeightedGraphQ Vertical VerticalBar VerticalForm VerticalGauge VerticalSeparator VerticalSlider VerticalTilde ViewAngle ViewCenter ViewMatrix ViewPoint ViewPointSelectorSettings ViewPort ViewProjection ViewRange ViewVector ViewVertical VirtualGroupData Visible VisibleCell VoiceStyleData VoigtDistribution VolcanoData Volume VonMisesDistribution VoronoiMesh ' +
-      'WaitAll WaitAsynchronousTask WaitNext WaitUntil WakebyDistribution WalleniusHypergeometricDistribution WaringYuleDistribution WarpingCorrespondence WarpingDistance WatershedComponents WatsonUSquareTest WattsStrogatzGraphDistribution WaveletBestBasis WaveletFilterCoefficients WaveletImagePlot WaveletListPlot WaveletMapIndexed WaveletMatrixPlot WaveletPhi WaveletPsi WaveletScale WaveletScalogram WaveletThreshold WeaklyConnectedComponents WeaklyConnectedGraphComponents WeaklyConnectedGraphQ WeakStationarity WeatherData WeatherForecastData WebAudioSearch WebElementObject WeberE WebExecute WebImage WebImageSearch WebSearch WebSessionObject WebSessions WebWindowObject Wedge Wednesday WeibullDistribution WeierstrassE1 WeierstrassE2 WeierstrassE3 WeierstrassEta1 WeierstrassEta2 WeierstrassEta3 WeierstrassHalfPeriods WeierstrassHalfPeriodW1 WeierstrassHalfPeriodW2 WeierstrassHalfPeriodW3 WeierstrassInvariantG2 WeierstrassInvariantG3 WeierstrassInvariants WeierstrassP WeierstrassPPrime WeierstrassSigma WeierstrassZeta WeightedAdjacencyGraph WeightedAdjacencyMatrix WeightedData WeightedGraphQ Weights WelchWindow WheelGraph WhenEvent Which While White WhiteNoiseProcess WhitePoint Whitespace WhitespaceCharacter WhittakerM WhittakerW WienerFilter WienerProcess WignerD WignerSemicircleDistribution WikipediaData WikipediaSearch WilksW WilksWTest WindDirectionData WindingCount WindingPolygon WindowClickSelect WindowElements WindowFloating WindowFrame WindowFrameElements WindowMargins WindowMovable WindowOpacity WindowPersistentStyles WindowSelected WindowSize WindowStatusArea WindowTitle WindowToolbars WindowWidth WindSpeedData WindVectorData WinsorizedMean WinsorizedVariance WishartMatrixDistribution With WolframAlpha WolframAlphaDate WolframAlphaQuantity WolframAlphaResult WolframLanguageData Word WordBoundary WordCharacter WordCloud WordCount WordCounts WordData WordDefinition WordFrequency WordFrequencyData WordList WordOrientation WordSearch WordSelectionFunction WordSeparators WordSpacings WordStem WordTranslation WorkingPrecision WrapAround Write WriteLine WriteString Wronskian ' +
-      'XMLElement XMLObject XMLTemplate Xnor Xor XYZColor ' +
-      'Yellow Yesterday YuleDissimilarity ' +
-      'ZernikeR ZeroSymmetric ZeroTest ZeroWidthTimes Zeta ZetaZero ZIPCodeData ZipfDistribution ZoomCenter ZoomFactor ZTest ZTransform ' +
-      '$Aborted $ActivationGroupID $ActivationKey $ActivationUserRegistered $AddOnsDirectory $AllowExternalChannelFunctions $AssertFunction $Assumptions $AsynchronousTask $AudioInputDevices $AudioOutputDevices $BaseDirectory $BatchInput $BatchOutput $BlockchainBase $BoxForms $ByteOrdering $CacheBaseDirectory $Canceled $ChannelBase $CharacterEncoding $CharacterEncodings $CloudBase $CloudConnected $CloudCreditsAvailable $CloudEvaluation $CloudExpressionBase $CloudObjectNameFormat $CloudObjectURLType $CloudRootDirectory $CloudSymbolBase $CloudUserID $CloudUserUUID $CloudVersion $CloudVersionNumber $CloudWolframEngineVersionNumber $CommandLine $CompilationTarget $ConditionHold $ConfiguredKernels $Context $ContextPath $ControlActiveSetting $Cookies $CookieStore $CreationDate $CurrentLink $CurrentTask $CurrentWebSession $DateStringFormat $DefaultAudioInputDevice $DefaultAudioOutputDevice $DefaultFont $DefaultFrontEnd $DefaultImagingDevice $DefaultLocalBase $DefaultMailbox $DefaultNetworkInterface $DefaultPath $Display $DisplayFunction $DistributedContexts $DynamicEvaluation $Echo $EmbedCodeEnvironments $EmbeddableServices $EntityStores $Epilog $EvaluationCloudBase $EvaluationCloudObject $EvaluationEnvironment $ExportFormats $Failed $FinancialDataSource $FontFamilies $FormatType $FrontEnd $FrontEndSession $GeoEntityTypes $GeoLocation $GeoLocationCity $GeoLocationCountry $GeoLocationPrecision $GeoLocationSource $HistoryLength $HomeDirectory $HTMLExportRules $HTTPCookies $HTTPRequest $IgnoreEOF $ImageFormattingWidth $ImagingDevice $ImagingDevices $ImportFormats $IncomingMailSettings $InitialDirectory $Initialization $InitializationContexts $Input $InputFileName $InputStreamMethods $Inspector $InstallationDate $InstallationDirectory $InterfaceEnvironment $InterpreterTypes $IterationLimit $KernelCount $KernelID $Language $LaunchDirectory $LibraryPath $LicenseExpirationDate $LicenseID $LicenseProcesses $LicenseServer $LicenseSubprocesses $LicenseType $Line $Linked $LinkSupported $LoadedFiles $LocalBase $LocalSymbolBase $MachineAddresses $MachineDomain $MachineDomains $MachineEpsilon $MachineID $MachineName $MachinePrecision $MachineType $MaxExtraPrecision $MaxLicenseProcesses $MaxLicenseSubprocesses $MaxMachineNumber $MaxNumber $MaxPiecewiseCases $MaxPrecision $MaxRootDegree $MessageGroups $MessageList $MessagePrePrint $Messages $MinMachineNumber $MinNumber $MinorReleaseNumber $MinPrecision $MobilePhone $ModuleNumber $NetworkConnected $NetworkInterfaces $NetworkLicense $NewMessage $NewSymbol $Notebooks $NoValue $NumberMarks $Off $OperatingSystem $Output $OutputForms $OutputSizeLimit $OutputStreamMethods $Packages $ParentLink $ParentProcessID $PasswordFile $PatchLevelID $Path $PathnameSeparator $PerformanceGoal $Permissions $PermissionsGroupBase $PersistenceBase $PersistencePath $PipeSupported $PlotTheme $Post $Pre $PreferencesDirectory $PreInitialization $PrePrint $PreRead $PrintForms $PrintLiteral $Printout3DPreviewer $ProcessID $ProcessorCount $ProcessorType $ProductInformation $ProgramName $PublisherID $RandomState $RecursionLimit $RegisteredDeviceClasses $RegisteredUserName $ReleaseNumber $RequesterAddress $RequesterWolframID $RequesterWolframUUID $ResourceSystemBase $RootDirectory $ScheduledTask $ScriptCommandLine $ScriptInputString $SecuredAuthenticationKeyTokens $ServiceCreditsAvailable $Services $SessionID $SetParentLink $SharedFunctions $SharedVariables $SoundDisplay $SoundDisplayFunction $SourceLink $SSHAuthentication $SummaryBoxDataSizeLimit $SuppressInputFormHeads $SynchronousEvaluation $SyntaxHandler $System $SystemCharacterEncoding $SystemID $SystemMemory $SystemShell $SystemTimeZone $SystemWordLength $TemplatePath $TemporaryDirectory $TemporaryPrefix $TestFileName $TextStyle $TimedOut $TimeUnit $TimeZone $TimeZoneEntity $TopDirectory $TraceOff $TraceOn $TracePattern $TracePostAction $TracePreAction $UnitSystem $Urgent $UserAddOnsDirectory $UserAgentLanguages $UserAgentMachine $UserAgentName $UserAgentOperatingSystem $UserAgentString $UserAgentVersion $UserBaseDirectory $UserDocumentsDirectory $Username $UserName $UserURLBase $Version $VersionNumber $VoiceStyles $WolframID $WolframUUID'
+    classNameAliases: {
+      brace: 'punctuation',
+      pattern: 'type',
+      slot: 'type',
+      symbol: 'variable',
+      'named-character': 'variable',
+      'builtin-symbol': 'built_in',
+      'message-name': 'string'
     },
     contains: [
-      hljs.COMMENT('\\(\\*', '\\*\\)', {contains: ['self']}),
+      hljs.COMMENT(/\(\*/, /\*\)/, {contains: ['self']}),
+      PATTERNS,
+      SLOTS,
+      MESSAGES,
+      SYMBOLS,
+      NAMED_CHARACTER,
       hljs.QUOTE_STRING_MODE,
-      hljs.C_NUMBER_MODE
+      NUMBERS,
+      OPERATORS,
+      BRACES
     ]
   };
 }
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index 5d1df3e6e4..d58d13047d 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -366,6 +366,10 @@ export function compileLanguage(language) {
   if (language.contains && language.contains.includes('self')) {
     throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
   }
+
+  // we need a null object, which inherit will guarantee
+  language.classNameAliases = inherit(language.classNameAliases || {});
+
   return compileMode(/** @type Mode */ (language));
 }
 
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 860b5e0a6d..2f97102239 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -21,7 +21,7 @@ export function escapeHTML(value) {
  */
 export function inherit(original, ...objects) {
   /** @type Record<string,any> */
-  var result = {};
+  var result = Object.create(null);
 
   for (const key in original) {
     result[key] = original[key];
diff --git a/test/detect/mathematica/default.txt b/test/detect/mathematica/default.txt
index aeff95e87a..04243a4ab2 100644
--- a/test/detect/mathematica/default.txt
+++ b/test/detect/mathematica/default.txt
@@ -1,14 +1,79 @@
-(* ::Package:: *)
+(* Real-world example from StackExchange *)
+xkcdStyle = {FontFamily -> "Comic Sans MS", 16};
 
-(* Mathematica Package *)
+xkcdLabel[{str_String, {x1_, y1_}, {xo_, yo_}}] := Module[{x2, y2},
+  x2 = x1 + xo; y2 = y1 + yo;
+  {
+    Inset[
+      Style[str, xkcdStyle],
+      {x2, y2},
+      {1.2*Sign[x1 - x2], Sign[y1 - y2] Boole[x1 == x2]}
+    ],
+    Thick,
+    BezierCurve[{{0.9*x1 + 0.1*x2, 0.9*y1 + 0.1*y2}, {x1, y2}, {x2, y2}}]
+  }
+];
 
-BeginPackage["SomePkg`"]
+xkcdRules = {
+  EdgeForm[ef : Except[None]] :> EdgeForm[Flatten@{ef, Thick, Black}],
+  Style[x_, st_] :> Style[x, xkcdStyle],
+  Pane[s_String] :> Pane[Style[s, xkcdStyle]],
+  {h_Hue, l_Line} :> {Thickness[0.02], White, l, Thick, h, l},
+  Grid[{{g_Graphics, s_String}}] :> Grid[{{g, Style[s, xkcdStyle]}}],
+  Rule[PlotLabel, lab_] :> Rule[PlotLabel, Style[lab, xkcdStyle]]
+};
 
-Begin["`Private`"]
+xkcdShow[plot_] := Show[plot, AxesStyle -> Thick, LabelStyle -> xkcdStyle] /. xkcdRules;
+xkcdShow[Labeled[plot_, rest__]] := Labeled[
+  Show[plot, AxesStyle -> Thick, LabelStyle -> xkcdStyle], rest ] /. xkcdRules;
 
-SomeFn[ns_List] := Fold[Function[{x, y}, x + y], 0, Map[# * 2 &, ns]];
-Print[$ActivationKey];
+xkcdDistort[plot_] := Module[{r, ix, iy},
+  r = ImagePad[Rasterize@plot, 10, Padding -> White];
+  {ix, iy} = Table[
+    RandomImage[{-1, 1}, ImageDimensions@r] ~ ImageConvolve ~ GaussianMatrix[10],
+    {2}
+  ];
+  ImagePad[
+    ImageTransformation[r, # + 15 {ImageValue[ix, #], ImageValue[iy, #]} &, DataRange -> Full],
+    -5
+  ]
+];
+xkcdConvert[plot_] := xkcdDistort[xkcdShow[plot]];
+xkcdConvert[Plot[Sin[x], {x, 0, 4 Pi}]]
 
-End[] (* End Private Context *)
+(* Features *)
+
+(* The Wolfram Language supports a variety of different number input forms *)
+(* All numbers below are correct numbers! *)
+
+numbers = {
+    123,
+    123.123,
+    2^^101.101,
+    35^^WolframLanguage,
+    16^^dead.Beef,
+    123`,
+    1.381`,
+    16^^9fe.c3`7,
+    3.0`+7,
+    3`7,
+    3.000000000000000000000`7,
+    3.000000000000000000`-7,
+    3.98`5*^3,
+    16^^dead.beef``+4*^-3,
+    0.0000000001*^10,
+    35^^small*^-10,
+    10000000000*^-10
+}
+
+(* Named Characters are matched as normal symbols *)
+{ \[Gamma],  \[CapitalEAcute], \[DoubleLeftRightArrow], \[FormalEpsilon], my\[CapitalEAcute]Variable }
+
+(* Patterns and Slots *)
+xkcdLabel[{str_String, {x1_Integer, y1_Real}, {_Real, _List}}]
+If[# > 5, #, ## &[]] & /@ Range[10]
+
+(* Usage and other messages, In/Out *)
+In[1]:= func::usage = "A Usage message"
+Out[1]= "A Usage message"
 
-EndPackage[]
diff --git a/types/index.d.ts b/types/index.d.ts
index ee4cc79d01..ee5c5e8513 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -142,7 +142,7 @@ type MatchType = "begin" | "end" | "illegal"
 
  interface ModeCallbacks {
      "on:end"?: Function,
-     "on:begin"?: Function,
+     "on:begin"?: ModeCallback
  }
 
 interface Mode extends ModeCallbacks, ModeDetails {
@@ -158,7 +158,8 @@ interface LanguageDetail {
     case_insensitive?: boolean
     keywords?: Record<string, any> | string
     compiled?: boolean,
-    exports?: any
+    exports?: any,
+    classNameAliases?: Record<string, string>
 }
 
 type Language = LanguageDetail & Partial<Mode>

From d95f1bc89d44b509254a3d570e52eb1c2b841666 Mon Sep 17 00:00:00 2001
From: Jan Pilzer <japilzer@microsoft.com>
Date: Fri, 6 Nov 2020 13:43:51 -0800
Subject: [PATCH 119/223] chore(website) Align demo and website styling (#2805)

* Align Demo and Website styling
* Remove a few non-languages from the list (c-like, plaintext, etc)
---
 demo/demo.js                   |  4 --
 demo/index.html                |  6 +--
 demo/perfect-scrollbar.min.css |  5 ---
 demo/perfect-scrollbar.min.js  |  4 --
 demo/style.css                 | 77 +++++++++++++++++++++++++++-------
 tools/build_browser.js         |  8 ++++
 6 files changed, 72 insertions(+), 32 deletions(-)
 delete mode 100644 demo/perfect-scrollbar.min.css
 delete mode 100644 demo/perfect-scrollbar.min.js

diff --git a/demo/demo.js b/demo/demo.js
index bb46e7a605..cd90785bf7 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -13,11 +13,9 @@
     var screenHeight = $window.height()
 
     $categoryContainer.css('max-height', screenHeight / 4);
-    $categoryContainer.perfectScrollbar('update');
     $styleContainer.height(
       screenHeight - $styleContainer.position().top - 20
     );
-    $styleContainer.perfectScrollbar('update');
   }
 
   function selectCategory(category) {
@@ -83,7 +81,6 @@
     });
 
     $categories.first().click();
-    $categoryContainer.perfectScrollbar();
   }
 
   function selectStyle(style) {
@@ -109,7 +106,6 @@
       selectStyle($style.text());
     });
     $styles.first().click();
-    $styleContainer.perfectScrollbar();
   }
 
   $(function() {
diff --git a/demo/index.html b/demo/index.html
index 0089baa56d..8177631787 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -5,7 +5,6 @@
   <meta charset="utf-8">
   <title>highlight.js demo</title>
   <link rel="stylesheet" href="style.css">
-  <link rel="stylesheet" href="perfect-scrollbar.min.css">
 
   <link rel="stylesheet" title="Default" href="styles/default.css">
   <% _.each(styles, function(style) { %>
@@ -21,12 +20,12 @@ <h1><a href="https://highlightjs.org/">highlight.js</a> demo</h1>
 
     <div id="lists">
       <div>
-        <h2>Language categories</h2>
+        <h2>Languages</h2>
         <ul id="categories"></ul>
       </div>
 
       <div>
-        <h2>Styles</h2>
+        <h2>Themes</h2>
         <ul id="styles"></ul>
       </div>
     </div>
@@ -53,7 +52,6 @@ <h2><%- language.prettyName %></h2>
   <script src="../highlight.js"></script>
   <% } %>
   <script src="jquery-2.1.1.min.js"></script>
-  <script src="perfect-scrollbar.min.js"></script>
   <script src="demo.js"></script>
 </body>
 </html>
diff --git a/demo/perfect-scrollbar.min.css b/demo/perfect-scrollbar.min.css
deleted file mode 100644
index fc452aff82..0000000000
--- a/demo/perfect-scrollbar.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! perfect-scrollbar - v0.5.7
-* http://noraesae.github.com/perfect-scrollbar/
-* Copyright (c) 2014 Hyunje Alex Jun; Licensed MIT */
-
-.ps-container.ps-active-x>.ps-scrollbar-x-rail,.ps-container.ps-active-y>.ps-scrollbar-y-rail{display:block}.ps-container>.ps-scrollbar-x-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;opacity:0;-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);-webkit-transition:background-color .2s linear,opacity .2s linear;-moz-transition:background-color .2s linear,opacity .2s linear;-o-transition:background-color .2s linear,opacity .2s linear;transition:background-color .2s linear,opacity .2s linear;bottom:3px;height:8px}.ps-container>.ps-scrollbar-x-rail>.ps-scrollbar-x{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;-webkit-transition:background-color .2s linear;-moz-transition:background-color .2s linear;-o-transition:background-color .2s linear;transition:background-color .2s linear;bottom:0;height:8px}.ps-container>.ps-scrollbar-x-rail.in-scrolling{background-color:#eee;opacity:.9;-ms-filter:"alpha(Opacity=90)";filter:alpha(opacity=90)}.ps-container>.ps-scrollbar-y-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;opacity:0;-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);-webkit-transition:background-color .2s linear,opacity .2s linear;-moz-transition:background-color .2s linear,opacity .2s linear;-o-transition:background-color .2s linear,opacity .2s linear;transition:background-color .2s linear,opacity .2s linear;right:3px;width:8px}.ps-container>.ps-scrollbar-y-rail>.ps-scrollbar-y{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;-webkit-transition:background-color .2s linear;-moz-transition:background-color .2s linear;-o-transition:background-color .2s linear;transition:background-color .2s linear;right:0;width:8px}.ps-container>.ps-scrollbar-y-rail.in-scrolling{background-color:#eee;opacity:.9;-ms-filter:"alpha(Opacity=90)";filter:alpha(opacity=90)}.ps-container:hover>.ps-scrollbar-x-rail,.ps-container:hover>.ps-scrollbar-y-rail{opacity:.6;-ms-filter:"alpha(Opacity=60)";filter:alpha(opacity=60)}.ps-container:hover>.ps-scrollbar-x-rail.in-scrolling,.ps-container:hover>.ps-scrollbar-y-rail.in-scrolling{background-color:#eee;opacity:.9;-ms-filter:"alpha(Opacity=90)";filter:alpha(opacity=90)}.ps-container:hover>.ps-scrollbar-x-rail:hover{background-color:#eee;opacity:.9;-ms-filter:"alpha(Opacity=90)";filter:alpha(opacity=90)}.ps-container:hover>.ps-scrollbar-x-rail:hover>.ps-scrollbar-x{background-color:#999}.ps-container:hover>.ps-scrollbar-y-rail:hover{background-color:#eee;opacity:.9;-ms-filter:"alpha(Opacity=90)";filter:alpha(opacity=90)}.ps-container:hover>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y{background-color:#999}
\ No newline at end of file
diff --git a/demo/perfect-scrollbar.min.js b/demo/perfect-scrollbar.min.js
deleted file mode 100644
index ff3f5ac9c8..0000000000
--- a/demo/perfect-scrollbar.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! perfect-scrollbar - v0.5.7
-* http://noraesae.github.com/perfect-scrollbar/
-* Copyright (c) 2014 Hyunje Alex Jun; Licensed MIT */
-(function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?e(require("jquery")):e(jQuery)})(function(e){"use strict";function t(e){return"string"==typeof e?parseInt(e,10):~~e}var o={wheelSpeed:1,wheelPropagation:!1,minScrollbarLength:null,maxScrollbarLength:null,useBothWheelAxes:!1,useKeyboard:!0,suppressScrollX:!1,suppressScrollY:!1,scrollXMarginOffset:0,scrollYMarginOffset:0,includePadding:!1},n=0,r=function(){var e=n++;return function(t){var o=".perfect-scrollbar-"+e;return t===void 0?o:t+o}};e.fn.perfectScrollbar=function(n,l){return this.each(function(){function i(e,o){var n=e+o,r=E-W;I=0>n?0:n>r?r:n;var l=t(I*(D-E)/(E-W));S.scrollTop(l)}function a(e,o){var n=e+o,r=x-Y;X=0>n?0:n>r?r:n;var l=t(X*(M-x)/(x-Y));S.scrollLeft(l)}function c(e){return L.minScrollbarLength&&(e=Math.max(e,L.minScrollbarLength)),L.maxScrollbarLength&&(e=Math.min(e,L.maxScrollbarLength)),e}function s(){var e={width:x};e.left=O?S.scrollLeft()+x-M:S.scrollLeft(),B?e.bottom=q-S.scrollTop():e.top=H+S.scrollTop(),A.css(e);var t={top:S.scrollTop(),height:E};z?t.right=O?M-S.scrollLeft()-Q-N.outerWidth():Q-S.scrollLeft():t.left=O?S.scrollLeft()+2*x-M-F-N.outerWidth():F+S.scrollLeft(),_.css(t),K.css({left:X,width:Y-U}),N.css({top:I,height:W-G})}function d(){S.removeClass("ps-active-x"),S.removeClass("ps-active-y"),x=L.includePadding?S.innerWidth():S.width(),E=L.includePadding?S.innerHeight():S.height(),M=S.prop("scrollWidth"),D=S.prop("scrollHeight"),!L.suppressScrollX&&M>x+L.scrollXMarginOffset?(C=!0,Y=c(t(x*x/M)),X=t(S.scrollLeft()*(x-Y)/(M-x))):(C=!1,Y=0,X=0,S.scrollLeft(0)),!L.suppressScrollY&&D>E+L.scrollYMarginOffset?(k=!0,W=c(t(E*E/D)),I=t(S.scrollTop()*(E-W)/(D-E))):(k=!1,W=0,I=0,S.scrollTop(0)),X>=x-Y&&(X=x-Y),I>=E-W&&(I=E-W),s(),C&&S.addClass("ps-active-x"),k&&S.addClass("ps-active-y")}function u(){var t,o,n=!1;K.bind(j("mousedown"),function(e){o=e.pageX,t=K.position().left,A.addClass("in-scrolling"),n=!0,e.stopPropagation(),e.preventDefault()}),e(R).bind(j("mousemove"),function(e){n&&(a(t,e.pageX-o),d(),e.stopPropagation(),e.preventDefault())}),e(R).bind(j("mouseup"),function(){n&&(n=!1,A.removeClass("in-scrolling"))}),t=o=null}function p(){var t,o,n=!1;N.bind(j("mousedown"),function(e){o=e.pageY,t=N.position().top,n=!0,_.addClass("in-scrolling"),e.stopPropagation(),e.preventDefault()}),e(R).bind(j("mousemove"),function(e){n&&(i(t,e.pageY-o),d(),e.stopPropagation(),e.preventDefault())}),e(R).bind(j("mouseup"),function(){n&&(n=!1,_.removeClass("in-scrolling"))}),t=o=null}function f(e,t){var o=S.scrollTop();if(0===e){if(!k)return!1;if(0===o&&t>0||o>=D-E&&0>t)return!L.wheelPropagation}var n=S.scrollLeft();if(0===t){if(!C)return!1;if(0===n&&0>e||n>=M-x&&e>0)return!L.wheelPropagation}return!0}function v(){function e(e){var t=e.originalEvent.deltaX,o=-1*e.originalEvent.deltaY;return(t===void 0||o===void 0)&&(t=-1*e.originalEvent.wheelDeltaX/6,o=e.originalEvent.wheelDeltaY/6),e.originalEvent.deltaMode&&1===e.originalEvent.deltaMode&&(t*=10,o*=10),t!==t&&o!==o&&(t=0,o=e.originalEvent.wheelDelta),[t,o]}function t(t){var n=e(t),r=n[0],l=n[1];o=!1,L.useBothWheelAxes?k&&!C?(l?S.scrollTop(S.scrollTop()-l*L.wheelSpeed):S.scrollTop(S.scrollTop()+r*L.wheelSpeed),o=!0):C&&!k&&(r?S.scrollLeft(S.scrollLeft()+r*L.wheelSpeed):S.scrollLeft(S.scrollLeft()-l*L.wheelSpeed),o=!0):(S.scrollTop(S.scrollTop()-l*L.wheelSpeed),S.scrollLeft(S.scrollLeft()+r*L.wheelSpeed)),d(),o=o||f(r,l),o&&(t.stopPropagation(),t.preventDefault())}var o=!1;window.onwheel!==void 0?S.bind(j("wheel"),t):window.onmousewheel!==void 0&&S.bind(j("mousewheel"),t)}function g(){var t=!1;S.bind(j("mouseenter"),function(){t=!0}),S.bind(j("mouseleave"),function(){t=!1});var o=!1;e(R).bind(j("keydown"),function(n){if((!n.isDefaultPrevented||!n.isDefaultPrevented())&&t){for(var r=document.activeElement?document.activeElement:R.activeElement;r.shadowRoot;)r=r.shadowRoot.activeElement;if(!e(r).is(":input,[contenteditable]")){var l=0,i=0;switch(n.which){case 37:l=-30;break;case 38:i=30;break;case 39:l=30;break;case 40:i=-30;break;case 33:i=90;break;case 32:case 34:i=-90;break;case 35:i=n.ctrlKey?-D:-E;break;case 36:i=n.ctrlKey?S.scrollTop():E;break;default:return}S.scrollTop(S.scrollTop()-i),S.scrollLeft(S.scrollLeft()+l),o=f(l,i),o&&n.preventDefault()}}})}function b(){function e(e){e.stopPropagation()}N.bind(j("click"),e),_.bind(j("click"),function(e){var o=t(W/2),n=e.pageY-_.offset().top-o,r=E-W,l=n/r;0>l?l=0:l>1&&(l=1),S.scrollTop((D-E)*l)}),K.bind(j("click"),e),A.bind(j("click"),function(e){var o=t(Y/2),n=e.pageX-A.offset().left-o,r=x-Y,l=n/r;0>l?l=0:l>1&&(l=1),S.scrollLeft((M-x)*l)})}function h(){function t(){var e=window.getSelection?window.getSelection():document.getSlection?document.getSlection():{rangeCount:0};return 0===e.rangeCount?null:e.getRangeAt(0).commonAncestorContainer}function o(){r||(r=setInterval(function(){return P()?(S.scrollTop(S.scrollTop()+l.top),S.scrollLeft(S.scrollLeft()+l.left),d(),void 0):(clearInterval(r),void 0)},50))}function n(){r&&(clearInterval(r),r=null),A.removeClass("in-scrolling"),_.removeClass("in-scrolling")}var r=null,l={top:0,left:0},i=!1;e(R).bind(j("selectionchange"),function(){e.contains(S[0],t())?i=!0:(i=!1,n())}),e(window).bind(j("mouseup"),function(){i&&(i=!1,n())}),e(window).bind(j("mousemove"),function(e){if(i){var t={x:e.pageX,y:e.pageY},r=S.offset(),a={left:r.left,right:r.left+S.outerWidth(),top:r.top,bottom:r.top+S.outerHeight()};t.x<a.left+3?(l.left=-5,A.addClass("in-scrolling")):t.x>a.right-3?(l.left=5,A.addClass("in-scrolling")):l.left=0,t.y<a.top+3?(l.top=5>a.top+3-t.y?-5:-20,_.addClass("in-scrolling")):t.y>a.bottom-3?(l.top=5>t.y-a.bottom+3?5:20,_.addClass("in-scrolling")):l.top=0,0===l.top&&0===l.left?n():o()}})}function w(t,o){function n(e,t){S.scrollTop(S.scrollTop()-t),S.scrollLeft(S.scrollLeft()-e),d()}function r(){b=!0}function l(){b=!1}function i(e){return e.originalEvent.targetTouches?e.originalEvent.targetTouches[0]:e.originalEvent}function a(e){var t=e.originalEvent;return t.targetTouches&&1===t.targetTouches.length?!0:t.pointerType&&"mouse"!==t.pointerType&&t.pointerType!==t.MSPOINTER_TYPE_MOUSE?!0:!1}function c(e){if(a(e)){h=!0;var t=i(e);p.pageX=t.pageX,p.pageY=t.pageY,f=(new Date).getTime(),null!==g&&clearInterval(g),e.stopPropagation()}}function s(e){if(!b&&h&&a(e)){var t=i(e),o={pageX:t.pageX,pageY:t.pageY},r=o.pageX-p.pageX,l=o.pageY-p.pageY;n(r,l),p=o;var c=(new Date).getTime(),s=c-f;s>0&&(v.x=r/s,v.y=l/s,f=c),e.stopPropagation(),e.preventDefault()}}function u(){!b&&h&&(h=!1,clearInterval(g),g=setInterval(function(){return P()?.01>Math.abs(v.x)&&.01>Math.abs(v.y)?(clearInterval(g),void 0):(n(30*v.x,30*v.y),v.x*=.8,v.y*=.8,void 0):(clearInterval(g),void 0)},10))}var p={},f=0,v={},g=null,b=!1,h=!1;t&&(e(window).bind(j("touchstart"),r),e(window).bind(j("touchend"),l),S.bind(j("touchstart"),c),S.bind(j("touchmove"),s),S.bind(j("touchend"),u)),o&&(window.PointerEvent?(e(window).bind(j("pointerdown"),r),e(window).bind(j("pointerup"),l),S.bind(j("pointerdown"),c),S.bind(j("pointermove"),s),S.bind(j("pointerup"),u)):window.MSPointerEvent&&(e(window).bind(j("MSPointerDown"),r),e(window).bind(j("MSPointerUp"),l),S.bind(j("MSPointerDown"),c),S.bind(j("MSPointerMove"),s),S.bind(j("MSPointerUp"),u)))}function m(){S.bind(j("scroll"),function(){d()})}function T(){S.unbind(j()),e(window).unbind(j()),e(R).unbind(j()),S.data("perfect-scrollbar",null),S.data("perfect-scrollbar-update",null),S.data("perfect-scrollbar-destroy",null),K.remove(),N.remove(),A.remove(),_.remove(),S=A=_=K=N=C=k=x=E=M=D=Y=X=q=B=H=W=I=Q=z=F=O=j=null}function y(){d(),m(),u(),p(),b(),h(),v(),(J||V)&&w(J,V),L.useKeyboard&&g(),S.data("perfect-scrollbar",S),S.data("perfect-scrollbar-update",d),S.data("perfect-scrollbar-destroy",T)}var L=e.extend(!0,{},o),S=e(this),P=function(){return!!S};if("object"==typeof n?e.extend(!0,L,n):l=n,"update"===l)return S.data("perfect-scrollbar-update")&&S.data("perfect-scrollbar-update")(),S;if("destroy"===l)return S.data("perfect-scrollbar-destroy")&&S.data("perfect-scrollbar-destroy")(),S;if(S.data("perfect-scrollbar"))return S.data("perfect-scrollbar");S.addClass("ps-container");var x,E,M,D,C,Y,X,k,W,I,O="rtl"===S.css("direction"),j=r(),R=this.ownerDocument||document,A=e("<div class='ps-scrollbar-x-rail'>").appendTo(S),K=e("<div class='ps-scrollbar-x'>").appendTo(A),q=t(A.css("bottom")),B=q===q,H=B?null:t(A.css("top")),U=t(A.css("borderLeftWidth"))+t(A.css("borderRightWidth")),_=e("<div class='ps-scrollbar-y-rail'>").appendTo(S),N=e("<div class='ps-scrollbar-y'>").appendTo(_),Q=t(_.css("right")),z=Q===Q,F=z?null:t(_.css("left")),G=t(_.css("borderTopWidth"))+t(_.css("borderBottomWidth")),J="ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch,V=null!==window.navigator.msMaxTouchPoints;return y(),S})}});
\ No newline at end of file
diff --git a/demo/style.css b/demo/style.css
index 6fa82319b8..103be0c89f 100644
--- a/demo/style.css
+++ b/demo/style.css
@@ -1,33 +1,51 @@
+@import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic);
+
 /* Base styles */
 body {
-  color: #F0F0F0;
+  color: #f0f0f0;
   background: #500;
-  font-family: Arial, sans;
-  margin: 0; padding: 0;
+  font-family: PT Sans, DejaVu Sans, Arial, sans;
+  margin: 0;
+  padding: 0;
 }
 
 a {
-  color: white;
+  color: #f0f0f0;
 }
 
 h1 {
-  font: bold 150% Arial, sans-serif;
-  margin: 0; padding: 1em 0;
+  font-size: 150%;
+  margin: 0;
+  padding: 1em 0 0.5em;
 }
 
 h2 {
-  font: bold 120% Arial, sans-serif;
+  font-size: 120%;
   margin: 1.5em 0 0.5em 0;
 }
 
 pre {
   margin: 0;
-  font-size: medium;
+}
+
+code {
+  font-family: Consolas, Monaco, monospace;
+  font-size: 10pt;
+  scrollbar-width: thin;
+}
+
+body pre code.hljs {
+  padding-left: 1.5em;
+  /* compatible with school-book */
+  padding-top:15px;
 }
 
 #sidebar {
-  float: left; width: 16em; height: 1000em; position: fixed;
-  padding: 1px 1em;
+  float: left;
+  width: 16em;
+  height: 1000em;
+  position: fixed;
+  padding: 0 1em;
   background: #600;
   box-shadow: 0 0 15px black;
 }
@@ -35,12 +53,38 @@ pre {
 #sidebar ul,
 #sidebar li {
   list-style: none;
-  margin: 0; padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 #sidebar ul {
   position: relative;
-  overflow-y: hidden;
+  overflow-y: auto;
+  scrollbar-width: thin;
+}
+
+#sidebar ul::-webkit-scrollbar {
+  width: 8px;
+}
+
+#sidebar ul::-webkit-scrollbar-track {
+  background: #4d0607;
+  border-radius: 5px;
+}
+
+#sidebar ul::-webkit-scrollbar-thumb {
+  background: #926868;
+  border-right: 1px solid #4d0607;
+  border-left: 1px solid #4d0607;
+  border-radius: 5px;
+}
+
+#sidebar ul::-webkit-scrollbar-thumb:hover {
+  background: #7f5555;
+}
+
+#sidebar ul::-webkit-scrollbar-thumb:active {
+  background: #5d3333;
 }
 
 #sidebar li {
@@ -53,12 +97,15 @@ pre {
 }
 
 #sidebar li.current:before {
-  content: '▶'; font-size: smaller;
-  position: absolute; left: 0;
+  content: "▶";
+  font-size: smaller;
+  position: absolute;
+  left: 0;
 }
 
 #content {
-  margin-left: 19em;
+  margin-left: 18em;
+  min-width: 36em;
 }
 
 #languages {
diff --git a/tools/build_browser.js b/tools/build_browser.js
index 6636da82ed..8e7a448127 100644
--- a/tools/build_browser.js
+++ b/tools/build_browser.js
@@ -66,6 +66,14 @@ async function installDemo(languages, { minify }) {
   const assets = await glob("./demo/*.{js,css}");
   assets.forEach((file) => install(file));
 
+  languages = languages.filter((lang) =>
+    // hide a few languages
+    lang.name !== "plaintext"
+    && lang.name !== "c-like"
+    // no sample means no demo
+    && lang.sample
+  );
+
   const css = await glob("styles/*.css", {cwd:"./src"})
   const styles = css.map((el) => (
     { "name": _.startCase(path.basename(el,".css")), "path": el }

From 0934a4ad88c554837fccc3c85ad9c0c47b16e79c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 10 Nov 2020 16:11:03 -0500
Subject: [PATCH 120/223] chore(code) Stricter linting (and guarantee ES6
 syntax for time being) (#2836)

* lint languages very lightly
* lint workflow
---
 .eslintrc.js               |   4 +-
 .eslintrc.lang.js          |  20 +++++++
 .github/workflows/lint.yml |  31 +++++++++++
 src/highlight.js           | 103 +++++++++++++++++++------------------
 src/lib/mode_compiler.js   |   6 +--
 src/lib/modes.js           |   2 +-
 src/lib/regex.js           |  16 +++---
 src/lib/utils.js           |  14 ++---
 tools/build_config.js      |   4 +-
 9 files changed, 126 insertions(+), 74 deletions(-)
 create mode 100644 .eslintrc.lang.js
 create mode 100644 .github/workflows/lint.yml

diff --git a/.eslintrc.js b/.eslintrc.js
index d25ec874cb..ed767149c7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -14,10 +14,10 @@ module.exports = {
     SharedArrayBuffer: "readonly"
   },
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 2015,
     sourceType: "module"
   },
-  parser: '@typescript-eslint/parser',
+  // parser: '@typescript-eslint/parser',
   plugins: [
     "@typescript-eslint"
   ],
diff --git a/.eslintrc.lang.js b/.eslintrc.lang.js
new file mode 100644
index 0000000000..da193b1a51
--- /dev/null
+++ b/.eslintrc.lang.js
@@ -0,0 +1,20 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+    mocha: true
+  },
+  extends: [],
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly"
+  },
+  parserOptions: {
+    ecmaVersion: 2015,
+    sourceType: "module"
+  },
+  // no rules, this file exists only to lint the grammars and check
+  // that no ES2018 or newer syntax has crept in by accident
+  rules: {}
+};
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000000..187b5f8d45
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Lint
+
+on:
+#   push:
+    # branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [15.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - name: Lint the main source
+      run: npx eslint src/*.js src/lib/*.js
+    - name: Lint the language grammars
+      run: npx eslint --no-eslintrc -c .eslintrc.lang.js src/languages/**/*.js
diff --git a/src/highlight.js b/src/highlight.js
index 0bfcd7c742..f4bc9e1e74 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -26,28 +26,28 @@ const NO_MATCH = Symbol("nomatch");
 const HLJS = function(hljs) {
   // Convenience variables for build-in objects
   /** @type {unknown[]} */
-  var ArrayProto = [];
+  const ArrayProto = [];
 
   // Global internal variables used within the highlight.js library.
   /** @type {Record<string, Language>} */
-  var languages = Object.create(null);
+  const languages = Object.create(null);
   /** @type {Record<string, string>} */
-  var aliases = Object.create(null);
+  const aliases = Object.create(null);
   /** @type {HLJSPlugin[]} */
-  var plugins = [];
+  const plugins = [];
 
   // safe/production mode - swallows more errors, tries to keep running
   // even if a single syntax or parse hits a fatal error
-  var SAFE_MODE = true;
-  var fixMarkupRe = /(^(<[^>]+>|\t|)+|\n)/gm;
-  var LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
+  let SAFE_MODE = true;
+  const fixMarkupRe = /(^(<[^>]+>|\t|)+|\n)/gm;
+  const LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
   /** @type {Language} */
   const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
 
   // Global options used when within external APIs. This is modified when
   // calling the `hljs.configure` function.
   /** @type HLJSOptions */
-  var options = {
+  let options = {
     noHighlightRe: /^(no-?highlight)$/i,
     languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
     classPrefix: 'hljs-',
@@ -73,14 +73,14 @@ const HLJS = function(hljs) {
    * @param {HighlightedHTMLElement} block - the HTML element to determine language for
    */
   function blockLanguage(block) {
-    var classes = block.className + ' ';
+    let classes = block.className + ' ';
 
     classes += block.parentNode ? block.parentNode.className : '';
 
     // language-* takes precedence over non-prefixed class names.
     const match = options.languageDetectRe.exec(classes);
     if (match) {
-      var language = getLanguage(match[1]);
+      const language = getLanguage(match[1]);
       if (!language) {
         console.warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
         console.warn("Falling back to no-highlight mode for this block.", block);
@@ -99,19 +99,19 @@ const HLJS = function(hljs) {
    * @param {string} languageName - the language to use for highlighting
    * @param {string} code - the code to highlight
    * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-   * @param {Mode} [continuation] - current continuation mode, if any
+   * @param {CompiledMode} [continuation] - current continuation mode, if any
    *
    * @returns {HighlightResult} Result - an object that represents the result
    * @property {string} language - the language name
    * @property {number} relevance - the relevance score
    * @property {string} value - the highlighted HTML code
    * @property {string} code - the original raw code
-   * @property {Mode} top - top of the current mode stack
+   * @property {CompiledMode} top - top of the current mode stack
    * @property {boolean} illegal - indicates whether any illegal matches were found
   */
   function highlight(languageName, code, ignoreIllegals, continuation) {
     /** @type {{ code: string, language: string, result?: any }} */
-    var context = {
+    const context = {
       code,
       language: languageName
     };
@@ -121,7 +121,7 @@ const HLJS = function(hljs) {
 
     // a before plugin can usurp the result completely by providing it's own
     // in which case we don't even need to call highlight
-    var result = context.result ?
+    const result = context.result ?
       context.result :
       _highlight(context.language, context.code, ignoreIllegals, continuation);
 
@@ -138,10 +138,11 @@ const HLJS = function(hljs) {
    * @param {string} languageName - the language to use for highlighting
    * @param {string} code - the code to highlight
    * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-   * @param {Mode} [continuation] - current continuation mode, if any
+   * @param {CompiledMode} [continuation] - current continuation mode, if any
+   * @returns {HighlightResult} - result of the highlight operation
   */
   function _highlight(languageName, code, ignoreIllegals, continuation) {
-    var codeToHighlight = code;
+    const codeToHighlight = code;
 
     /**
      * Return keyword data if a match is a keyword
@@ -150,7 +151,7 @@ const HLJS = function(hljs) {
      * @returns {KeywordData | false}
      */
     function keywordData(mode, match) {
-      var matchText = language.case_insensitive ? match[0].toLowerCase() : match[0];
+      const matchText = language.case_insensitive ? match[0].toLowerCase() : match[0];
       return Object.prototype.hasOwnProperty.call(mode.keywords, matchText) && mode.keywords[matchText];
     }
 
@@ -189,7 +190,7 @@ const HLJS = function(hljs) {
     function processSubLanguage() {
       if (modeBuffer === "") return;
       /** @type HighlightResult */
-      var result = null;
+      let result = null;
 
       if (typeof top.subLanguage === 'string') {
         if (!languages[top.subLanguage]) {
@@ -197,7 +198,7 @@ const HLJS = function(hljs) {
           return;
         }
         result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
-        continuations[top.subLanguage] = result.top;
+        continuations[top.subLanguage] = /** @type {CompiledMode} */ (result.top);
       } else {
         result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
       }
@@ -288,8 +289,8 @@ const HLJS = function(hljs) {
      * @returns {number} how far to advance the parse cursor
      */
     function doBeginMatch(match) {
-      var lexeme = match[0];
-      var newMode = match.rule;
+      const lexeme = match[0];
+      const newMode = match.rule;
 
       const resp = new Response(newMode);
       // first internal before callbacks, then the public ones
@@ -329,13 +330,13 @@ const HLJS = function(hljs) {
      * @param {RegExpMatchArray} match - the current match
      */
     function doEndMatch(match) {
-      var lexeme = match[0];
-      var matchPlusRemainder = codeToHighlight.substr(match.index);
+      const lexeme = match[0];
+      const matchPlusRemainder = codeToHighlight.substr(match.index);
 
-      var endMode = endOfMode(top, match, matchPlusRemainder);
+      const endMode = endOfMode(top, match, matchPlusRemainder);
       if (!endMode) { return NO_MATCH; }
 
-      var origin = top;
+      const origin = top;
       if (origin.skip) {
         modeBuffer += lexeme;
       } else {
@@ -366,8 +367,8 @@ const HLJS = function(hljs) {
     }
 
     function processContinuations() {
-      var list = [];
-      for (var current = top; current !== language; current = current.parent) {
+      const list = [];
+      for (let current = top; current !== language; current = current.parent) {
         if (current.className) {
           list.unshift(current.className);
         }
@@ -376,7 +377,7 @@ const HLJS = function(hljs) {
     }
 
     /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
-    var lastMatch = {};
+    let lastMatch = {};
 
     /**
      *  Process an individual match
@@ -385,7 +386,7 @@ const HLJS = function(hljs) {
      * @param {EnhancedMatch} [match] - the match itself
      */
     function processLexeme(textBeforeMatch, match) {
-      var lexeme = match && match[0];
+      const lexeme = match && match[0];
 
       // add non-matched text to the current mode buffer
       modeBuffer += textBeforeMatch;
@@ -422,7 +423,7 @@ const HLJS = function(hljs) {
         err.mode = top;
         throw err;
       } else if (match.type === "end") {
-        var processed = doEndMatch(match);
+        const processed = doEndMatch(match);
         if (processed !== NO_MATCH) {
           return processed;
         }
@@ -461,25 +462,25 @@ const HLJS = function(hljs) {
       return lexeme.length;
     }
 
-    var language = getLanguage(languageName);
+    const language = getLanguage(languageName);
     if (!language) {
       console.error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
       throw new Error('Unknown language: "' + languageName + '"');
     }
 
-    var md = compileLanguage(language);
-    var result = '';
+    const md = compileLanguage(language);
+    let result = '';
     /** @type {CompiledMode} */
-    var top = continuation || md;
-    /** @type Record<string,Mode> */
-    var continuations = {}; // keep continuations for sub-languages
-    var emitter = new options.__emitter(options);
+    let top = continuation || md;
+    /** @type Record<string,CompiledMode> */
+    const continuations = {}; // keep continuations for sub-languages
+    const emitter = new options.__emitter(options);
     processContinuations();
-    var modeBuffer = '';
-    var relevance = 0;
-    var index = 0;
-    var iterations = 0;
-    var resumeScanAtSamePosition = false;
+    let modeBuffer = '';
+    let relevance = 0;
+    let index = 0;
+    let iterations = 0;
+    let resumeScanAtSamePosition = false;
 
     try {
       top.matcher.considerAll();
@@ -640,8 +641,8 @@ const HLJS = function(hljs) {
    * @param {string} [resultLang]
    */
   function buildClassName(prevClassName, currentLang, resultLang) {
-    var language = currentLang ? aliases[currentLang] : resultLang;
-    var result = [prevClassName.trim()];
+    const language = currentLang ? aliases[currentLang] : resultLang;
+    const result = [prevClassName.trim()];
 
     if (!prevClassName.match(/\bhljs\b/)) {
       result.push('hljs');
@@ -710,7 +711,7 @@ const HLJS = function(hljs) {
   /**
    * Updates highlight.js global options with the passed options
    *
-   * @param {{}} userOptions
+   * @param {Partial<HLJSOptions>} userOptions
    */
   function configure(userOptions) {
     if (userOptions.useBR) {
@@ -729,7 +730,7 @@ const HLJS = function(hljs) {
     if (initHighlighting.called) return;
     initHighlighting.called = true;
 
-    var blocks = document.querySelectorAll('pre code');
+    const blocks = document.querySelectorAll('pre code');
     ArrayProto.forEach.call(blocks, highlightBlock);
   };
 
@@ -746,7 +747,7 @@ const HLJS = function(hljs) {
    * @param {LanguageFn} languageDefinition
    */
   function registerLanguage(languageName, languageDefinition) {
-    var lang = null;
+    let lang = null;
     try {
       lang = languageDefinition(hljs);
     } catch (error) {
@@ -786,10 +787,10 @@ const HLJS = function(hljs) {
     @returns {Language | never}
   */
   function requireLanguage(name) {
-    var lang = getLanguage(name);
+    const lang = getLanguage(name);
     if (lang) { return lang; }
 
-    var err = new Error('The \'{}\' language is required, but not loaded.'.replace('{}', name));
+    const err = new Error('The \'{}\' language is required, but not loaded.'.replace('{}', name));
     throw err;
   }
 
@@ -819,7 +820,7 @@ const HLJS = function(hljs) {
    * @param {string} name - name of the language
    */
   function autoDetection(name) {
-    var lang = getLanguage(name);
+    const lang = getLanguage(name);
     return lang && !lang.disableAutodetect;
   }
 
@@ -836,7 +837,7 @@ const HLJS = function(hljs) {
    * @param {any} args
    */
   function fire(event, args) {
-    var cb = event;
+    const cb = event;
     plugins.forEach(function(plugin) {
       if (plugin[cb]) {
         plugin[cb](args);
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index d58d13047d..d5012d1093 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -2,7 +2,7 @@ import * as regex from './regex.js';
 import { inherit } from './utils.js';
 
 // keywords that should have no default relevance value
-var COMMON_KEYWORDS = 'of and for in not or if then'.split(' ');
+const COMMON_KEYWORDS = 'of and for in not or if then'.split(' ');
 
 // compilation
 
@@ -442,7 +442,7 @@ function expandOrCloneMode(mode) {
  */
 function compileKeywords(rawKeywords, caseInsensitive) {
   /** @type KeywordDict */
-  var compiledKeywords = {};
+  const compiledKeywords = {};
 
   if (typeof rawKeywords === 'string') { // string
     splitAndCompile('keyword', rawKeywords);
@@ -468,7 +468,7 @@ function compileKeywords(rawKeywords, caseInsensitive) {
       keywordList = keywordList.toLowerCase();
     }
     keywordList.split(' ').forEach(function(keyword) {
-      var pair = keyword.split('|');
+      const pair = keyword.split('|');
       compiledKeywords[pair[0]] = [className, scoreForKeyword(pair[0], pair[1])];
     });
   }
diff --git a/src/lib/modes.js b/src/lib/modes.js
index f493f073cb..eb4c7f137d 100644
--- a/src/lib/modes.js
+++ b/src/lib/modes.js
@@ -63,7 +63,7 @@ export const PHRASAL_WORDS_MODE = {
  * @returns {Partial<Mode>}
  */
 export const COMMENT = function(begin, end, modeOptions = {}) {
-  var mode = inherit(
+  const mode = inherit(
     {
       className: 'comment',
       begin,
diff --git a/src/lib/regex.js b/src/lib/regex.js
index 53a9158ac7..1667752918 100644
--- a/src/lib/regex.js
+++ b/src/lib/regex.js
@@ -68,7 +68,7 @@ export function countMatchGroups(re) {
  * @param {string} lexeme
  */
 export function startsWith(re, lexeme) {
-  var match = re && re.exec(lexeme);
+  const match = re && re.exec(lexeme);
   return match && match.index === 0;
 }
 
@@ -90,19 +90,19 @@ export function join(regexps, separator = "|") {
   //   interesting elements
   // - non-matching or lookahead parentheses, which do not capture. These
   //   follow the '(' with a '?'.
-  var backreferenceRe = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
-  var numCaptures = 0;
-  var ret = '';
-  for (var i = 0; i < regexps.length; i++) {
+  const backreferenceRe = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
+  let numCaptures = 0;
+  let ret = '';
+  for (let i = 0; i < regexps.length; i++) {
     numCaptures += 1;
-    var offset = numCaptures;
-    var re = source(regexps[i]);
+    const offset = numCaptures;
+    let re = source(regexps[i]);
     if (i > 0) {
       ret += separator;
     }
     ret += "(";
     while (re.length > 0) {
-      var match = backreferenceRe.exec(re);
+      const match = backreferenceRe.exec(re);
       if (match == null) {
         ret += re;
         break;
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 2f97102239..74637afad1 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -21,7 +21,7 @@ export function escapeHTML(value) {
  */
 export function inherit(original, ...objects) {
   /** @type Record<string,any> */
-  var result = Object.create(null);
+  const result = Object.create(null);
 
   for (const key in original) {
     result[key] = original[key];
@@ -55,9 +55,9 @@ function tag(node) {
  */
 export function nodeStream(node) {
   /** @type Event[] */
-  var result = [];
+  const result = [];
   (function _nodeStream(node, offset) {
-    for (var child = node.firstChild; child; child = child.nextSibling) {
+    for (let child = node.firstChild; child; child = child.nextSibling) {
       if (child.nodeType === 3) {
         offset += child.nodeValue.length;
       } else if (child.nodeType === 1) {
@@ -90,9 +90,9 @@ export function nodeStream(node) {
  * @param {string} value - the original source itself
  */
 export function mergeStreams(original, highlighted, value) {
-  var processed = 0;
-  var result = '';
-  var nodeStack = [];
+  let processed = 0;
+  let result = '';
+  const nodeStack = [];
 
   function selectStream() {
     if (!original.length || !highlighted.length) {
@@ -147,7 +147,7 @@ export function mergeStreams(original, highlighted, value) {
   }
 
   while (original.length || highlighted.length) {
-    var stream = selectStream();
+    let stream = selectStream();
     result += escapeHTML(value.substring(processed, stream[0].offset));
     processed = stream[0].offset;
     if (stream === original) {
diff --git a/tools/build_config.js b/tools/build_config.js
index 7346327f07..a635762f64 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -20,8 +20,8 @@ module.exports = {
               }
             }
           }
-        ],
-      },
+        ]
+      }
     },
     browser_core: {
       input: {

From 760dcd6080ba4ef7763ff1deff250530efa1dc94 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 10 Nov 2020 18:41:27 -0500
Subject: [PATCH 121/223] (chore) fix test regex to be UTF-8 compatible

---
 test/parser/should-not-destroyData.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parser/should-not-destroyData.js b/test/parser/should-not-destroyData.js
index 630e6af3b2..e12a571ed0 100644
--- a/test/parser/should-not-destroyData.js
+++ b/test/parser/should-not-destroyData.js
@@ -1,6 +1,6 @@
 const hljs = require('../../build');
 
-describe("bugs", function () {
+describe("parser/should not destroy data", function () {
 
   // CONTEXT: https://github.com/highlightjs/highlight.js/pull/2219
   describe("a grammar with a mode that makes a 0 width match", () => {
@@ -11,7 +11,7 @@ describe("bugs", function () {
         // broken regex from old Fortran ruleset
         const NUMBER = {
           className: "number",
-          begin: '(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?',
+          begin: '(?=\\b|\\+|-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?',
         }
 
         return {

From 435f6c6c5e498464af1133e43a7d77579f421da2 Mon Sep 17 00:00:00 2001
From: Marat Nagayev <nagaevmt49@gmail.com>
Date: Thu, 12 Nov 2020 02:08:28 +0300
Subject: [PATCH 122/223] enh(javascript) Added `node-repl` for Node.js REPL
 sessions (#2792)

---
 AUTHORS.txt                             |  1 +
 CHANGES.md                              |  4 +++-
 src/languages/node-repl.js              | 30 +++++++++++++++++++++++++
 test/detect/node-repl/default.txt       |  4 ++++
 test/markup/node-repl/sample.expect.txt | 10 +++++++++
 test/markup/node-repl/sample.txt        | 10 +++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/languages/node-repl.js
 create mode 100644 test/detect/node-repl/default.txt
 create mode 100644 test/markup/node-repl/sample.expect.txt
 create mode 100644 test/markup/node-repl/sample.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 7415a097a3..6c501dc61c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -305,5 +305,6 @@ Contributors:
 - Jonathan Sharpe <mail@jonrshar.pe>
 - Michael Rush <michaelrush@gmail.com>
 - Florian Bezdeka <florian@bezdeka.de>
+- Marat Nagayev <nagaevmt@yandex.ru>
 - Patrick Scheibe <patrick@halirutan.de>
 - Kyle Brown <kylebrown9@github>
diff --git a/CHANGES.md b/CHANGES.md
index 5f08790487..9373cee483 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,7 +7,8 @@ Parser:
 
 New Languages:
 
-- Added Chapel grammar to SUPPORTED_LANGUAGES (#2806) [Brad Chamberlain][]
+- Added 3rd party Chapel grammar to SUPPORTED_LANGUAGES (#2806) [Brad Chamberlain][]
+- enh(javascript) Added `node-repl` for Node.js REPL sessions (#2792) [Marat Nagayev][]
 
 Language Improvements:
 
@@ -43,6 +44,7 @@ New themes:
 - *StackOverflow Dark* by [Jan Pilzer][]
 - *StackOverflow Light* by [Jan Pilzer][]
 
+[Marat Nagayev]: https://github.com/nagayev
 [Fredrik Ekre]: https://github.com/fredrikekre
 [Richard Gibson]: https://github.com/gibson042
 [Josh Goebel]: https://github.com/joshgoebel
diff --git a/src/languages/node-repl.js b/src/languages/node-repl.js
new file mode 100644
index 0000000000..1de130f204
--- /dev/null
+++ b/src/languages/node-repl.js
@@ -0,0 +1,30 @@
+/*
+Language: Node REPL
+Requires: javascript.js
+Author: Marat Nagayev <nagaevmt@yandex.ru>
+Category: scripting
+*/
+
+/** @type LanguageFn */
+export default function(hljs) {
+    return {
+      name: 'Node REPL',
+      contains: [
+        {
+          className: 'meta',
+          starts: {
+            // a space separates the REPL prefix from the actual code
+            // this is purely for cleaner HTML output
+            end: / |$/,
+            starts: {
+              end: '$', subLanguage: 'javascript'
+            }
+          },
+          variants: [
+            { begin: /^>(?=[ ]|$)/ },
+            { begin: /^\.\.\.(?=[ ]|$)/ }
+          ]
+        },
+      ]
+    }
+  }
diff --git a/test/detect/node-repl/default.txt b/test/detect/node-repl/default.txt
new file mode 100644
index 0000000000..43bc64d08a
--- /dev/null
+++ b/test/detect/node-repl/default.txt
@@ -0,0 +1,4 @@
+> a = "1"
+'1'
+> function b(){
+... return 1+2;
\ No newline at end of file
diff --git a/test/markup/node-repl/sample.expect.txt b/test/markup/node-repl/sample.expect.txt
new file mode 100644
index 0000000000..92c7fc33a6
--- /dev/null
+++ b/test/markup/node-repl/sample.expect.txt
@@ -0,0 +1,10 @@
+<span class="hljs-meta">&gt;</span> <span class="javascript"><span class="hljs-keyword">for</span>(<span class="hljs-keyword">let</span> i=<span class="hljs-number">0</span>;i&lt;<span class="hljs-number">5</span>;i++){</span>
+<span class="hljs-meta">...</span> <span class="javascript"><span class="hljs-built_in">console</span>.log(i);</span>
+<span class="hljs-meta">...</span> <span class="javascript">}</span>
+0
+1
+2
+3
+4
+undefined
+<span class="hljs-meta">&gt;</span> 
diff --git a/test/markup/node-repl/sample.txt b/test/markup/node-repl/sample.txt
new file mode 100644
index 0000000000..26f7b25a27
--- /dev/null
+++ b/test/markup/node-repl/sample.txt
@@ -0,0 +1,10 @@
+> for(let i=0;i<5;i++){
+... console.log(i);
+... }
+0
+1
+2
+3
+4
+undefined
+> 

From 6bc573ca271fe839191092bf4b9d6159f223776c Mon Sep 17 00:00:00 2001
From: Marcus Ortiz <212918+mportiz08@users.noreply.github.com>
Date: Wed, 11 Nov 2020 15:25:26 -0800
Subject: [PATCH 123/223] (swift) improvements: support `some`, `@main`; Fix
 `#` keywords . (#2845)

* Add support for new Swift 5.1 and 5.3 features.

1. [`some` keyword][1] (Introduced in Swift 5.1)
2. [`@main` attribute][2] (Introduced in Swift 5.3)

These language syntax features are utilized heavily in code that depends
on the `SwiftUI` framework for user interfaces.

[1]: https://github.com/apple/swift-evolution/blob/main/proposals/0244-opaque-result-types.md
[2]: https://github.com/apple/swift-evolution/blob/main/proposals/0281-main-attribute.md

* Update Swift keyword `$pattern` to include "#".

The default of lexeme pattern of `/\w+/` is not sufficient to capture
keywords that start with a number sign character (like `#if` as one
example). This updates the pattern to also recognize the number sign
character as well as other alphanumeric characters that were previously
recognized. [1]

[1]: https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413
---
 AUTHORS.txt                          |  1 +
 CHANGES.md                           |  4 ++++
 src/languages/swift.js               |  7 +++++--
 test/markup/swift/swiftui.expect.txt | 12 ++++++++++++
 test/markup/swift/swiftui.txt        | 12 ++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 test/markup/swift/swiftui.expect.txt
 create mode 100644 test/markup/swift/swiftui.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 6c501dc61c..1432d17ca0 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -308,3 +308,4 @@ Contributors:
 - Marat Nagayev <nagaevmt@yandex.ru>
 - Patrick Scheibe <patrick@halirutan.de>
 - Kyle Brown <kylebrown9@github>
+- Marcus Ortiz <mportiz08@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
index 9373cee483..564d2874c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,9 @@ Language Improvements:
   - Matching of named-characters aka special symbols like `\[Gamma]`
   - Updated list of version 12.1 built-in symbols
   - Matching of patterns, slots, message-names and braces
+- fix(swift) Handle keywords that start with `#` [Marcus Ortiz][]
+- enh(swift) Match `some` keyword [Marcus Ortiz][]
+- enh(swift) Match `@main` attribute [Marcus Ortiz][]
 
 Dev Improvements:
 
@@ -54,6 +57,7 @@ New themes:
 [Michael Rush]: https://github.com/rushimusmaximus
 [Patrick Scheibe]: https://github.com/halirutan
 [Kyle Brown]: https://github.com/kylebrown9
+[Marcus Ortiz]: https://github.com/mportiz08
 
 
 ## Version 10.3.1
diff --git a/src/languages/swift.js b/src/languages/swift.js
index 2ee2232fc8..7034f24f45 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -10,6 +10,9 @@ Category: common, system
 
 export default function(hljs) {
   var SWIFT_KEYWORDS = {
+      // override the pattern since the default of of /\w+/ is not sufficient to
+      // capture the keywords that start with the character "#"
+      $pattern: /[\w#]+/,
       keyword: '#available #colorLiteral #column #else #elseif #endif #file ' +
         '#fileLiteral #function #if #imageLiteral #line #selector #sourceLocation ' +
         '_ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype ' +
@@ -18,7 +21,7 @@ export default function(hljs) {
         'get guard if import in indirect infix init inout internal is lazy left let ' +
         'mutating nil none nonmutating open operator optional override postfix precedence ' +
         'prefix private protocol Protocol public repeat required rethrows return ' +
-        'right self Self set static struct subscript super switch throw throws true ' +
+        'right self Self set some static struct subscript super switch throw throws true ' +
         'try try! try? Type typealias unowned var weak where while willSet',
       literal: 'true false nil',
       built_in: 'abs advance alignof alignofValue anyGenerator assert assertionFailure ' +
@@ -148,7 +151,7 @@ export default function(hljs) {
                   '@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|' +
                   '@infix|@prefix|@postfix|@autoclosure|@testable|@available|' +
                   '@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|' +
-                  '@propertyWrapper)\\b'
+                  '@propertyWrapper|@main)\\b'
 
       },
       {
diff --git a/test/markup/swift/swiftui.expect.txt b/test/markup/swift/swiftui.expect.txt
new file mode 100644
index 0000000000..0d9fae6261
--- /dev/null
+++ b/test/markup/swift/swiftui.expect.txt
@@ -0,0 +1,12 @@
+<span class="hljs-meta">@main</span>
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">MyApp</span>: <span class="hljs-title">App</span> </span>{
+    <span class="hljs-keyword">var</span> body: <span class="hljs-keyword">some</span> <span class="hljs-type">Scene</span> {
+        <span class="hljs-type">WindowGroup</span> {
+            <span class="hljs-keyword">#if</span> os(iOS)
+            <span class="hljs-type">Text</span>(<span class="hljs-string">&quot;Hello, world from iOS!&quot;</span>)
+            <span class="hljs-keyword">#else</span>
+            <span class="hljs-type">Text</span>(<span class="hljs-string">&quot;Hello, world!&quot;</span>)
+            <span class="hljs-keyword">#endif</span>
+        }
+    }
+}
diff --git a/test/markup/swift/swiftui.txt b/test/markup/swift/swiftui.txt
new file mode 100644
index 0000000000..374d45bffe
--- /dev/null
+++ b/test/markup/swift/swiftui.txt
@@ -0,0 +1,12 @@
+@main
+struct MyApp: App {
+    var body: some Scene {
+        WindowGroup {
+            #if os(iOS)
+            Text("Hello, world from iOS!")
+            #else
+            Text("Hello, world!")
+            #endif
+        }
+    }
+}

From e8a8216b77c763fe08c426ba73957e3b6ff7b95f Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 12 Nov 2020 02:12:08 -0500
Subject: [PATCH 124/223] chore(docs) - more lovely badges!

---
 .tokeignore |  7 +++++++
 README.md   | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 .tokeignore

diff --git a/.tokeignore b/.tokeignore
new file mode 100644
index 0000000000..783c23bc18
--- /dev/null
+++ b/.tokeignore
@@ -0,0 +1,7 @@
+test/*
+src/styles/*
+*.md
+*.json
+tools
+docs
+types
diff --git a/README.md b/README.md
index 24903bd345..014f73a657 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,26 @@
 # Highlight.js
 
-[![Build CI](https://github.com/highlightjs/highlight.js/workflows/Node.js%20CI/badge.svg)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) [![Known Vulnerabilities](https://snyk.io/test/github/highlightjs/highlight.js/badge.svg?targetFile=package.json)](https://snyk.io/test/github/highlightjs/highlight.js?targetFile=package.json) [![install size](https://packagephobia.now.sh/badge?p=highlight.js)](https://packagephobia.now.sh/result?p=highlight.js)
+[![latest version](https://badgen.net/npm/v/highlight.js?label=latest)](https://www.npmjs.com/package/highlight.js)
+[![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/master/LICENSE)
+[![install size](https://badgen.net/packagephobia/install/highlight.js?label=npm+install)](https://packagephobia.now.sh/result?p=highlight.js)
+![minified](https://img.shields.io/github/size/highlightjs/cdn-release/build/highlight.min.js?label=minified)
+[![NPM downloads weekly](https://badgen.net/npm/dw/highlight.js?label=npm+downloads&color=purple)](https://www.npmjs.com/package/highlight.js)
+[![jsDelivr CDN downloads](https://badgen.net/jsdelivr/hits/gh/highlightjs/cdn-release?label=jsDelivr+CDN&color=purple)](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release)
+![dev deps](https://badgen.net/david/dev/highlightjs/highlight.js?label=dev+deps)
+[![code quality](https://badgen.net/lgtm/grade/g/highlightjs/highlight.js/js)](https://lgtm.com/projects/g/highlightjs/highlight.js/?mode=list)
+
+[![build and CI status](https://badgen.net/github/checks/highlightjs/highlight.js?label=build)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22)
+[![open issues](https://badgen.net/github/open-issues/highlightjs/highlight.js?label=issues&labelColor=orange&color=c41)](https://github.com/highlightjs/highlight.js/issues)
+[![help welcome issues](https://badgen.net/github/label-issues/highlightjs/highlight.js/help%20welcome/open?labelColor=393&color=6c6)](https://github.com/highlightjs/highlight.js/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+welcome%22)
+[![beginner friendly issues](https://badgen.net/github/label-issues/highlightjs/highlight.js/beginner%20friendly/open?labelColor=669&color=99c)](https://github.com/highlightjs/highlight.js/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22)
+[![vulnerabilities](https://badgen.net/snyk/highlightjs/highlight.js)](https://snyk.io/test/github/highlightjs/highlight.js?targetFile=package.json)
+
+<!-- [![Build CI](https://img.shields.io/github/workflow/status/highlightjs/highlight.js/Node.js%20CI)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) -->
+<!-- [![commits since release](https://img.shields.io/github/commits-since/highlightjs/highlight.js/latest?label=commits+since)](https://github.com/highlightjs/highlight.js/commits/master) -->
+<!-- [![](https://data.jsdelivr.com/v1/package/gh/highlightjs/cdn-release/badge?style=rounded)](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release) -->
+<!-- [![Total Lines](https://img.shields.io/tokei/lines/github/highlightjs/highlight.js)]() -->
+<!-- [![npm bundle size (minified + gzip)](https://img.shields.io/bundlephobia/minzip/highlight.js.svg)](https://bundlephobia.com/result?p=highlight.js) -->
+
 
 Highlight.js is a syntax highlighter written in JavaScript. It works in
 the browser as well as on the server. It works with pretty much any

From 9ba5a5d32edf246e505cf4b404e6a15115965318 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 13 Nov 2020 10:48:06 -0500
Subject: [PATCH 125/223] (chore) Deprecate the `requireLanguage` API (#2844)

- Entire library now no longer uses any run-time dependencies (no grammar will break because another is missing)
- Add docs for fixMarkup deprecation
- Add docs for requireLanguage deprecation
- Remove `Requires:` meta-data used only for run-time dependencies.
- Gzip size is only ~230 bytes larger than before
- Fix auto-detect tests now that the equivalency between `cpp` and `arduino` is no longer hidden by the load order.
- adds `supersetOf` to resolve conflicts between very similar languages (C++, Arduino).  The base language wins in the case of a tie. ie `arduino` is now a `supersetOf` `cpp`. (closes #2275)

Note: `Requires: ` still stays overall as it's used to clue the build process about "loose" (non-breaking) sublanguage dependencies between languages.  This dependency is purposely loose and therefore still a thing.
---
 CHANGES.md               |   6 ++
 docs/api.rst             |  15 +++-
 src/highlight.js         |  16 +++-
 src/languages/arduino.js | 177 ++++++++++++++++++++-------------------
 src/languages/c.js       |   5 +-
 src/languages/cpp.js     |   5 +-
 6 files changed, 127 insertions(+), 97 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 564d2874c8..a10d111c42 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 ## Version 10.4.0 (work in process)
 
+Deprecations:
+
+- (chore) `requireLanguage` is deprecated.
+  - Prefer `getLanguage` (with custom error handling) or built-time dependencies.
+  - See [Library API](https://highlightjs.readthedocs.io/en/latest/api.html#requirelanguage-name) for more information.
+
 Parser:
 
 - fix(vue): Language name now appears in CSS class (#2807) [Michael Rush][]
diff --git a/docs/api.rst b/docs/api.rst
index 73fb131c65..877f2c0bda 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -45,8 +45,10 @@ Returns an object with the following properties:
 * ``second_best``: object with the same structure for second-best heuristically detected language (may be absent)
 
 
-``fixMarkup(value)``
---------------------
+``fixMarkup(value)`` (deprecated as of 10.3)
+--------------------------------------------
+
+**fixMarkup is deprecated and will be removed entirely in v11.**
 
 Post-processing of the highlighted markup. Currently consists of replacing indentation TAB characters and using ``<br>`` tags instead of new-line characters. Options are set globally with ``configure``.
 
@@ -138,8 +140,13 @@ Looks up a language by name or alias.
 Returns the language object if found, ``undefined`` otherwise.
 
 
-``requireLanguage(name)``
--------------------------
+``requireLanguage(name)`` (deprecated as of 10.4)
+-------------------------------------------------
+
+**This has been deprecated and will be removed in a future release.**  If you
+need this type of functionality use ``getLanguage`` with your own error
+handling.  It is highly recommended that all inter-dependencies between grammars
+be handled at built-time, not run-time.  This is what the core library now does.
 
 Looks up a language by name or alias.
 
diff --git a/src/highlight.js b/src/highlight.js
index f4bc9e1e74..c4e2f6ddb5 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -592,12 +592,23 @@ const HLJS = function(hljs) {
 
     const sorted = results.sort((a, b) => {
       // sort base on relevance
-      return b.relevance - a.relevance;
+      if (a.relevance !== b.relevance) return b.relevance - a.relevance;
+
+      // always award the tie to the base language
+      // ie if C++ and Arduino are tied, it's more likely to be C++
+      if (a.language && b.language) {
+        if (getLanguage(a.language).supersetOf === b.language) {
+          return 1;
+        } else if (getLanguage(b.language).supersetOf === a.language) {
+          return -1;
+        }
+      }
 
       // otherwise say they are equal, which has the effect of sorting on
       // relevance while preserving the original ordering - which is how ties
       // have historically been settled, ie the language that comes first always
       // wins in the case of a tie
+      return 0;
     });
 
     const [best, secondBest] = sorted;
@@ -787,6 +798,9 @@ const HLJS = function(hljs) {
     @returns {Language | never}
   */
   function requireLanguage(name) {
+    console.warn("requireLanguage is deprecated and will be removed entirely in the future.");
+    console.warn("Please see https://github.com/highlightjs/highlight.js/pull/2844");
+
     const lang = getLanguage(name);
     if (lang) { return lang; }
 
diff --git a/src/languages/arduino.js b/src/languages/arduino.js
index ce105003c7..a706ad6ff5 100644
--- a/src/languages/arduino.js
+++ b/src/languages/arduino.js
@@ -2,102 +2,102 @@
 Language: Arduino
 Author: Stefania Mellai <s.mellai@arduino.cc>
 Description: The Arduino® Language is a superset of C++. This rules are designed to highlight the Arduino® source code. For info about language see http://www.arduino.cc.
-Requires: cpp.js
 Website: https://www.arduino.cc
 */
 
+import cPlusPlus from './cpp.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
-
-	var ARDUINO_KW = {
-      keyword:
-        'boolean byte word String',
-      built_in:
-        'setup loop ' +
-        'KeyboardController MouseController SoftwareSerial ' +
-        'EthernetServer EthernetClient LiquidCrystal ' +
-        'RobotControl GSMVoiceCall EthernetUDP EsploraTFT ' +
-        'HttpClient RobotMotor WiFiClient GSMScanner ' +
-        'FileSystem Scheduler GSMServer YunClient YunServer ' +
-        'IPAddress GSMClient GSMModem Keyboard Ethernet ' +
-        'Console GSMBand Esplora Stepper Process ' +
-        'WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage ' +
-        'Client Server GSMPIN FileIO Bridge Serial ' +
-        'EEPROM Stream Mouse Audio Servo File Task ' +
-        'GPRS WiFi Wire TFT GSM SPI SD ' +
-        'runShellCommandAsynchronously analogWriteResolution ' +
-        'retrieveCallingNumber printFirmwareVersion ' +
-        'analogReadResolution sendDigitalPortPair ' +
-        'noListenOnLocalhost readJoystickButton setFirmwareVersion ' +
-        'readJoystickSwitch scrollDisplayRight getVoiceCallStatus ' +
-        'scrollDisplayLeft writeMicroseconds delayMicroseconds ' +
-        'beginTransmission getSignalStrength runAsynchronously ' +
-        'getAsynchronously listenOnLocalhost getCurrentCarrier ' +
-        'readAccelerometer messageAvailable sendDigitalPorts ' +
-        'lineFollowConfig countryNameWrite runShellCommand ' +
-        'readStringUntil rewindDirectory readTemperature ' +
-        'setClockDivider readLightSensor endTransmission ' +
-        'analogReference detachInterrupt countryNameRead ' +
-        'attachInterrupt encryptionType readBytesUntil ' +
-        'robotNameWrite readMicrophone robotNameRead cityNameWrite ' +
-        'userNameWrite readJoystickY readJoystickX mouseReleased ' +
-        'openNextFile scanNetworks noInterrupts digitalWrite ' +
-        'beginSpeaker mousePressed isActionDone mouseDragged ' +
-        'displayLogos noAutoscroll addParameter remoteNumber ' +
-        'getModifiers keyboardRead userNameRead waitContinue ' +
-        'processInput parseCommand printVersion readNetworks ' +
-        'writeMessage blinkVersion cityNameRead readMessage ' +
-        'setDataMode parsePacket isListening setBitOrder ' +
-        'beginPacket isDirectory motorsWrite drawCompass ' +
-        'digitalRead clearScreen serialEvent rightToLeft ' +
-        'setTextSize leftToRight requestFrom keyReleased ' +
-        'compassRead analogWrite interrupts WiFiServer ' +
-        'disconnect playMelody parseFloat autoscroll ' +
-        'getPINUsed setPINUsed setTimeout sendAnalog ' +
-        'readSlider analogRead beginWrite createChar ' +
-        'motorsStop keyPressed tempoWrite readButton ' +
-        'subnetMask debugPrint macAddress writeGreen ' +
-        'randomSeed attachGPRS readString sendString ' +
-        'remotePort releaseAll mouseMoved background ' +
-        'getXChange getYChange answerCall getResult ' +
-        'voiceCall endPacket constrain getSocket writeJSON ' +
-        'getButton available connected findUntil readBytes ' +
-        'exitValue readGreen writeBlue startLoop IPAddress ' +
-        'isPressed sendSysex pauseMode gatewayIP setCursor ' +
-        'getOemKey tuneWrite noDisplay loadImage switchPIN ' +
-        'onRequest onReceive changePIN playFile noBuffer ' +
-        'parseInt overflow checkPIN knobRead beginTFT ' +
-        'bitClear updateIR bitWrite position writeRGB ' +
-        'highByte writeRed setSpeed readBlue noStroke ' +
-        'remoteIP transfer shutdown hangCall beginSMS ' +
-        'endWrite attached maintain noCursor checkReg ' +
-        'checkPUK shiftOut isValid shiftIn pulseIn ' +
-        'connect println localIP pinMode getIMEI ' +
-        'display noBlink process getBand running beginSD ' +
-        'drawBMP lowByte setBand release bitRead prepare ' +
-        'pointTo readRed setMode noFill remove listen ' +
-        'stroke detach attach noTone exists buffer ' +
-        'height bitSet circle config cursor random ' +
-        'IRread setDNS endSMS getKey micros ' +
-        'millis begin print write ready flush width ' +
-        'isPIN blink clear press mkdir rmdir close ' +
-        'point yield image BSSID click delay ' +
-        'read text move peek beep rect line open ' +
-        'seek fill size turn stop home find ' +
-        'step tone sqrt RSSI SSID ' +
-        'end bit tan cos sin pow map abs max ' +
-        'min get run put',
-      literal:
-        'DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE ' +
-        'REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP ' +
-        'SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN ' +
-        'INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL ' +
-        'DEFAULT OUTPUT INPUT HIGH LOW'
+  const ARDUINO_KW = {
+    keyword:
+      'boolean byte word String',
+    built_in:
+      'setup loop ' +
+      'KeyboardController MouseController SoftwareSerial ' +
+      'EthernetServer EthernetClient LiquidCrystal ' +
+      'RobotControl GSMVoiceCall EthernetUDP EsploraTFT ' +
+      'HttpClient RobotMotor WiFiClient GSMScanner ' +
+      'FileSystem Scheduler GSMServer YunClient YunServer ' +
+      'IPAddress GSMClient GSMModem Keyboard Ethernet ' +
+      'Console GSMBand Esplora Stepper Process ' +
+      'WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage ' +
+      'Client Server GSMPIN FileIO Bridge Serial ' +
+      'EEPROM Stream Mouse Audio Servo File Task ' +
+      'GPRS WiFi Wire TFT GSM SPI SD ' +
+      'runShellCommandAsynchronously analogWriteResolution ' +
+      'retrieveCallingNumber printFirmwareVersion ' +
+      'analogReadResolution sendDigitalPortPair ' +
+      'noListenOnLocalhost readJoystickButton setFirmwareVersion ' +
+      'readJoystickSwitch scrollDisplayRight getVoiceCallStatus ' +
+      'scrollDisplayLeft writeMicroseconds delayMicroseconds ' +
+      'beginTransmission getSignalStrength runAsynchronously ' +
+      'getAsynchronously listenOnLocalhost getCurrentCarrier ' +
+      'readAccelerometer messageAvailable sendDigitalPorts ' +
+      'lineFollowConfig countryNameWrite runShellCommand ' +
+      'readStringUntil rewindDirectory readTemperature ' +
+      'setClockDivider readLightSensor endTransmission ' +
+      'analogReference detachInterrupt countryNameRead ' +
+      'attachInterrupt encryptionType readBytesUntil ' +
+      'robotNameWrite readMicrophone robotNameRead cityNameWrite ' +
+      'userNameWrite readJoystickY readJoystickX mouseReleased ' +
+      'openNextFile scanNetworks noInterrupts digitalWrite ' +
+      'beginSpeaker mousePressed isActionDone mouseDragged ' +
+      'displayLogos noAutoscroll addParameter remoteNumber ' +
+      'getModifiers keyboardRead userNameRead waitContinue ' +
+      'processInput parseCommand printVersion readNetworks ' +
+      'writeMessage blinkVersion cityNameRead readMessage ' +
+      'setDataMode parsePacket isListening setBitOrder ' +
+      'beginPacket isDirectory motorsWrite drawCompass ' +
+      'digitalRead clearScreen serialEvent rightToLeft ' +
+      'setTextSize leftToRight requestFrom keyReleased ' +
+      'compassRead analogWrite interrupts WiFiServer ' +
+      'disconnect playMelody parseFloat autoscroll ' +
+      'getPINUsed setPINUsed setTimeout sendAnalog ' +
+      'readSlider analogRead beginWrite createChar ' +
+      'motorsStop keyPressed tempoWrite readButton ' +
+      'subnetMask debugPrint macAddress writeGreen ' +
+      'randomSeed attachGPRS readString sendString ' +
+      'remotePort releaseAll mouseMoved background ' +
+      'getXChange getYChange answerCall getResult ' +
+      'voiceCall endPacket constrain getSocket writeJSON ' +
+      'getButton available connected findUntil readBytes ' +
+      'exitValue readGreen writeBlue startLoop IPAddress ' +
+      'isPressed sendSysex pauseMode gatewayIP setCursor ' +
+      'getOemKey tuneWrite noDisplay loadImage switchPIN ' +
+      'onRequest onReceive changePIN playFile noBuffer ' +
+      'parseInt overflow checkPIN knobRead beginTFT ' +
+      'bitClear updateIR bitWrite position writeRGB ' +
+      'highByte writeRed setSpeed readBlue noStroke ' +
+      'remoteIP transfer shutdown hangCall beginSMS ' +
+      'endWrite attached maintain noCursor checkReg ' +
+      'checkPUK shiftOut isValid shiftIn pulseIn ' +
+      'connect println localIP pinMode getIMEI ' +
+      'display noBlink process getBand running beginSD ' +
+      'drawBMP lowByte setBand release bitRead prepare ' +
+      'pointTo readRed setMode noFill remove listen ' +
+      'stroke detach attach noTone exists buffer ' +
+      'height bitSet circle config cursor random ' +
+      'IRread setDNS endSMS getKey micros ' +
+      'millis begin print write ready flush width ' +
+      'isPIN blink clear press mkdir rmdir close ' +
+      'point yield image BSSID click delay ' +
+      'read text move peek beep rect line open ' +
+      'seek fill size turn stop home find ' +
+      'step tone sqrt RSSI SSID ' +
+      'end bit tan cos sin pow map abs max ' +
+      'min get run put',
+    literal:
+      'DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE ' +
+      'REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP ' +
+      'SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN ' +
+      'INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL ' +
+      'DEFAULT OUTPUT INPUT HIGH LOW'
   };
 
-  var ARDUINO = hljs.requireLanguage('cpp').rawDefinition();
+  const ARDUINO = cPlusPlus(hljs);
 
-  var kws = ARDUINO.keywords;
+  const kws = /** @type {Record<string,any>} */ (ARDUINO.keywords);
 
   kws.keyword += ' ' + ARDUINO_KW.keyword;
   kws.literal += ' ' + ARDUINO_KW.literal;
@@ -105,6 +105,7 @@ export default function(hljs) {
 
   ARDUINO.name = 'Arduino';
   ARDUINO.aliases = ['ino'];
+  ARDUINO.supersetOf = "cpp";
 
   return ARDUINO;
 }
diff --git a/src/languages/c.js b/src/languages/c.js
index d2eb8223f2..1ace9d497d 100644
--- a/src/languages/c.js
+++ b/src/languages/c.js
@@ -2,12 +2,13 @@
 Language: C
 Category: common, system
 Website: https://en.wikipedia.org/wiki/C_(programming_language)
-Requires: c-like.js
 */
 
+import cLike from './c-like.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
-  var lang = hljs.requireLanguage('c-like').rawDefinition();
+  const lang = cLike(hljs);
   // Until C is actually different than C++ there is no reason to auto-detect C
   // as it's own language since it would just fail auto-detect testing or
   // simply match with C++.
diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index 7c9f940031..7aab27f772 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -2,12 +2,13 @@
 Language: C++
 Category: common, system
 Website: https://isocpp.org
-Requires: c-like.js
 */
 
+import cLike from './c-like.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
-  var lang = hljs.requireLanguage('c-like').rawDefinition();
+  const lang = cLike(hljs);
   // return auto-detection back on
   lang.disableAutodetect = false;
   lang.name = 'C++';

From 7816b2ffcbe1003319b0f57def80f9ebd817743c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 13 Nov 2020 12:09:20 -0500
Subject: [PATCH 126/223] enh(llvm) Improve grammar and align assembly like
 grammars (#2830)

-  Variables are now highlighted as `variable`
-  `i8`, `i32`, etc now highlighted as `type`
-  Labels are now highlighted as `symbol` (matching our other grammars)
-  Better comment detection
-  Restore relevance to strings
-  prevent false positives on `;` line endings as "comments"
-  Add very minimal `operator` and `punctuation` support
---
 CHANGES.md                         |   1 +
 src/languages/llvm.js              | 105 +++++++++++++++++++----------
 test/markup/llvm/simple.expect.txt |  19 ++++++
 test/markup/llvm/simple.txt        |  19 ++++++
 4 files changed, 108 insertions(+), 36 deletions(-)
 create mode 100644 test/markup/llvm/simple.expect.txt
 create mode 100644 test/markup/llvm/simple.txt

diff --git a/CHANGES.md b/CHANGES.md
index a10d111c42..d37e741c0c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,6 +30,7 @@ Language Improvements:
 - enh(php) highlight variables (#2785) [Taufik Nurrohman][]
 - fix(python) Handle comments on decorators (#2804) [Jonathan Sharpe][]
 - enh(diff) improve highlighting of diff for git patches [Florian Bezdeka][]
+- fix(llvm) lots of small improvements and fixes (#2830) [Josh Goebel][]
 - enh(mathematica) Rework entire implementation [Patrick Scheibe][]
   - Correct matching of the many variations of Mathematica's numbers
   - Matching of named-characters aka special symbols like `\[Gamma]`
diff --git a/src/languages/llvm.js b/src/languages/llvm.js
index 21711e88a7..335d728f81 100644
--- a/src/languages/llvm.js
+++ b/src/languages/llvm.js
@@ -4,12 +4,67 @@ Author: Michael Rodler <contact@f0rki.at>
 Description: language used as intermediate representation in the LLVM compiler framework
 Website: https://llvm.org/docs/LangRef.html
 Category: assembler
+Audit: 2020
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
-  var identifier = '([-a-zA-Z$._][\\w\\-$.]*)';
+  const IDENT_RE = /([-a-zA-Z$._][\w$.-]*)/;
+  const TYPE = {
+    className: 'type',
+    begin: /\bi\d+(?=\s|\b)/
+  };
+  const OPERATOR = {
+    className: 'operator',
+    relevance: 0,
+    begin: /=/
+  };
+  const PUNCTUATION = {
+    className: 'punctuation',
+    relevance: 0,
+    begin: /,/
+  };
+  const NUMBER = {
+    className: 'number',
+    variants: [
+        { begin: /0[xX][a-fA-F0-9]+/ },
+        { begin: /-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?/ }
+    ],
+    relevance: 0
+  };
+  const LABEL = {
+    className: 'symbol',
+    variants: [
+        { begin: /^\s*[a-z]+:/ }, // labels
+    ],
+    relevance: 0
+  };
+  const VARIABLE = {
+    className: 'variable',
+    variants: [
+      { begin: regex.concat(/%/, IDENT_RE) },
+      { begin: /%\d+/ },
+      { begin: /#\d+/ },
+    ]
+  };
+  const FUNCTION = {
+    className: 'title',
+    variants: [
+      { begin: regex.concat(/@/, IDENT_RE) },
+      { begin: /@\d+/ },
+      { begin: regex.concat(/!/, IDENT_RE) },
+      { begin: regex.concat(/!\d+/, IDENT_RE) },
+      // https://llvm.org/docs/LangRef.html#namedmetadatastructure
+      // obviously a single digit can also be used in this fashion
+      { begin: /!\d+/ }
+    ]
+  };
+
   return {
     name: 'LLVM IR',
+    // TODO: split into different categories of keywords
     keywords:
       'begin end true false declare define global ' +
       'constant private linker_private internal ' +
@@ -49,48 +104,26 @@ export default function(hljs) {
       'extractvalue insertvalue atomicrmw cmpxchg fence ' +
       'argmemonly double',
     contains: [
-      {
-        className: 'keyword',
-        begin: 'i\\d+'
-      },
-      hljs.COMMENT(
-        ';', '\\n', {relevance: 0}
-      ),
-      // Double quote string
+      TYPE,
+      // this matches "empty comments"...
+      // ...because it's far more likely this is a statement terminator in
+      // another language than an actual comment
+      hljs.COMMENT(/;\s*$/, null, { relevance: 0 }),
+      hljs.COMMENT(/;/, /$/),
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
         variants: [
           // Double-quoted string
-          { begin: '"', end: '[^\\\\]"' },
-        ],
-        relevance: 0
-      },
-      {
-        className: 'title',
-        variants: [
-          { begin: '@' + identifier },
-          { begin: '@\\d+' },
-          { begin: '!' + identifier },
-          { begin: '!\\d+' + identifier }
+          { begin: /"/, end: /[^\\]"/ },
         ]
       },
-      {
-        className: 'symbol',
-        variants: [
-          { begin: '%' + identifier },
-          { begin: '%\\d+' },
-          { begin: '#\\d+' },
-        ]
-      },
-      {
-        className: 'number',
-        variants: [
-            { begin: '0[xX][a-fA-F0-9]+' },
-            { begin: '-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?' }
-        ],
-        relevance: 0
-      },
+      FUNCTION,
+      PUNCTUATION,
+      OPERATOR,
+      VARIABLE,
+      LABEL,
+      NUMBER
     ]
   };
 }
diff --git a/test/markup/llvm/simple.expect.txt b/test/markup/llvm/simple.expect.txt
new file mode 100644
index 0000000000..71bc91b959
--- /dev/null
+++ b/test/markup/llvm/simple.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-comment">;; foooo</span>
+<span class="hljs-keyword">define</span> <span class="hljs-type">i32</span> <span class="hljs-title">@mul_add</span>(<span class="hljs-type">i32</span> <span class="hljs-variable">%x</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%y</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%z</span>) {
+<span class="hljs-symbol">  entry:</span>
+    <span class="hljs-variable">%tmp</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">mul</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%x</span><span class="hljs-punctuation">,</span> <span class="hljs-variable">%y</span>
+    <span class="hljs-variable">%tmp2</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">add</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%tmp</span><span class="hljs-punctuation">,</span> <span class="hljs-variable">%z</span>
+    <span class="hljs-variable">%tmp3</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">add</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%tmp</span><span class="hljs-punctuation">,</span> <span class="hljs-number">0</span>
+    <span class="hljs-keyword">ret</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%tmp3</span>
+}
+
+<span class="hljs-comment">; Named metadata</span>
+<span class="hljs-title">!0</span> <span class="hljs-operator">=</span> !{<span class="hljs-type">i32</span> <span class="hljs-number">42</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">null</span><span class="hljs-punctuation">,</span> !<span class="hljs-string">&quot;string&quot;</span>}
+<span class="hljs-title">!foo</span> <span class="hljs-operator">=</span> !{<span class="hljs-title">!0</span>}
+
+<span class="hljs-comment">; Some unnamed metadata nodes, which are referenced by the named metadata.</span>
+<span class="hljs-title">!0</span> <span class="hljs-operator">=</span> !{!<span class="hljs-string">&quot;zero&quot;</span>}
+<span class="hljs-title">!1</span> <span class="hljs-operator">=</span> !{!<span class="hljs-string">&quot;one&quot;</span>}
+<span class="hljs-title">!2</span> <span class="hljs-operator">=</span> !{!<span class="hljs-string">&quot;two&quot;</span>}
+<span class="hljs-comment">; A named metadata.</span>
+<span class="hljs-title">!name</span> <span class="hljs-operator">=</span> !{<span class="hljs-title">!0</span><span class="hljs-punctuation">,</span> <span class="hljs-title">!1</span><span class="hljs-punctuation">,</span> <span class="hljs-title">!2</span>}
diff --git a/test/markup/llvm/simple.txt b/test/markup/llvm/simple.txt
new file mode 100644
index 0000000000..4e757192b7
--- /dev/null
+++ b/test/markup/llvm/simple.txt
@@ -0,0 +1,19 @@
+;; foooo
+define i32 @mul_add(i32 %x, i32 %y, i32 %z) {
+  entry:
+    %tmp = mul i32 %x, %y
+    %tmp2 = add i32 %tmp, %z
+    %tmp3 = add i32 %tmp, 0
+    ret i32 %tmp3
+}
+
+; Named metadata
+!0 = !{i32 42, null, !"string"}
+!foo = !{!0}
+
+; Some unnamed metadata nodes, which are referenced by the named metadata.
+!0 = !{!"zero"}
+!1 = !{!"one"}
+!2 = !{!"two"}
+; A named metadata.
+!name = !{!0, !1, !2}

From fb007ffd4641c423ca7bfea8d1dbbe1a472ff234 Mon Sep 17 00:00:00 2001
From: Brad Chamberlain <bradcray@users.noreply.github.com>
Date: Fri, 13 Nov 2020 09:12:04 -0800
Subject: [PATCH 127/223] chore(docs) Explain the 1st party vs 3rd party
 situation a little better (#2823)

Co-authored-by: Josh Goebel <me@joshgoebel.com>
---
 docs/language-contribution.rst | 46 ++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/docs/language-contribution.rst b/docs/language-contribution.rst
index f492becb4e..1e2de0a9f5 100644
--- a/docs/language-contribution.rst
+++ b/docs/language-contribution.rst
@@ -1,13 +1,37 @@
 Language contributor checklist
 ==============================
 
-1. Read ``extra/3RD_PARTY_QUICK_START.md``
-------------------------------------------
+1. Know that you are creating a 3rd party grammar
+-------------------------------------------------
 
-It contains rough high-level steps for creating a 3rd party language grammar for Highlight.js.
+*Sadly, due to lack of maintainer time we no longer merge new languages grammars
+into the core library.* Instead, the project works by encouraging 3rd party
+language grammar development by willing contributors ready to help and maintain
+them. We're also happy to host those 3rd party language grammars at the
+``highlightjs`` GitHub organization. Or you're welcome to host yourself - we're
+always happy to link to to new language grammars.
 
+We also make it easy to build, maintain, and distribute 3rd party grammar
+modules so that Highlight.js can always be easily extended with new languages.
+Using a 3rd party language (for end users) is often as simple as just adding a
+single line of code to their JavaScript or build system.
 
-2. Create a language grammar definition file
+We'd love to have your grammar as a 3rd party language module if you'd be
+willing to maintain it over time.  It's easy to develop and publish a 3rd party
+language module.  If you already started work in the main source tree - it's
+trivial to convert your existing work into a 3rd party module. (you pretty much
+just move your files into a new project folder)
+
+
+2. Read extra/3RD_PARTY_QUICK_START.md
+--------------------------------------
+
+Next, read ``extra/3RD_PARTY_QUICK_START.md``.  This should provide you with a
+very high-level overview of the steps for creating a third-party language
+grammar for Highlight.js.
+
+
+3. Create a language grammar definition file
 --------------------------------------------
 
 The file defines a function accepting a reference to the library and returning a language object.
@@ -25,10 +49,12 @@ process and details differ for different build targets.
     }
   }
 
-The name of the file is used as a short language identifier and should be usable as a class name in HTML and CSS.
+The name of the file is used as a short language identifier and should be usable
+as a class name in HTML and CSS.  Typically you'll place this file in your
+new grammar repository under ``my_new_grammar/src/languages/``.
 
 
-3. Add language metadata
+4. Add language metadata
 ----------------------------
 
 At the top of the file there is a specially formatted comment with meta data processed by a build system.
@@ -56,7 +82,7 @@ The build system just makes sure that they will be in the final package in
 The meaning of the other headers should be pretty obvious.
 
 
-4. Create a code example
+5. Create a code example
 ------------------------
 
 The code example is used both to test language detection and for the demo page
@@ -66,7 +92,7 @@ Take inspiration from other languages in ``test/detect/`` and read
 :ref:`testing instructions <basic-testing>` for more details.
 
 
-5. Write a class reference if your class uses custom classes
+6. Write a class reference if your class uses custom classes
 ------------------------------------------------------------
 
 A class reference document should typically be placed at the root of your
@@ -79,14 +105,14 @@ are not going to support your custom classes and you should likely also
 distribute your own custom theme.
 
 
-6. Request a repository at the ``highlightjs`` organization
+7. Request a repository at the ``highlightjs`` organization
 ----------------------------------------------------------
 
 *This is optional.*  Of course you are free to host your repository anywhere
 you would like.
 
 
-7. Create a pull request
+8. Create a pull request
 ------------------------
 
 Submit a PR to add your language to `SUPPORTED_LANGUAGES.md`.

From 04f210dfa5fbe08ec82413f9d959c1508c98ebb8 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 13 Nov 2020 17:23:05 -0500
Subject: [PATCH 128/223] chore(website) remove c-like from the common list

---
 src/languages/c-like.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index 348e6f01e8..50bd0632ff 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -2,7 +2,6 @@
 Language: C-like foundation grammar for C/C++ grammars
 Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
 Contributors: Evgeny Stepanischev <imbolk@gmail.com>, Zaven Muradyan <megalivoithos@gmail.com>, Roel Deckers <admin@codingcat.nl>, Sam Wu <samsam2310@gmail.com>, Jordi Petit <jordi.petit@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>, Google Inc. (David Benjamin) <davidben@google.com>
-Category: common, system
 */
 
 /* In the future the intention is to split out the C/C++ grammars distinctly
@@ -18,7 +17,7 @@ export default function(hljs) {
   function optional(s) {
     return '(?:' + s + ')?';
   }
-  // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does 
+  // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
   // not include such support nor can we be sure all the grammars depending
   // on it would desire this behavior
   var C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {

From c776c4b52a555bd7723bc007b385f14f712cb5a7 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 13 Nov 2020 18:47:42 -0500
Subject: [PATCH 129/223] enh(parser) use negative look-ahead for beginKeywords
 (#2813)

---
 CHANGES.md               |  6 +++++-
 src/lib/mode_compiler.js | 11 +++++------
 test/api/index.js        | 15 ++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d37e741c0c..5363f68b3d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,8 @@
-## Version 10.4.0 (work in process)
+## Version 10.4.0 (a work in process)
+
+Parser:
+
+- enh(parser) use negative look-ahead for `beginKeywords` support (#2813) [Josh Goebel][]
 
 Deprecations:
 
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index d5012d1093..9265be22aa 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -240,7 +240,7 @@ export function compileLanguage(language) {
 
   // TODO: We need negative look-behind support to do this properly
   /**
-   * Skip a match if it has a preceding or trailing dot
+   * Skip a match if it has a preceding dot
    *
    * This is used for `beginKeywords` to prevent matching expressions such as
    * `bob.keyword.do()`. The mode compiler automatically wires this up as a
@@ -248,10 +248,9 @@ export function compileLanguage(language) {
    * @param {RegExpMatchArray} match
    * @param {CallbackResponse} response
    */
-  function skipIfhasPrecedingOrTrailingDot(match, response) {
+  function skipIfhasPrecedingDot(match, response) {
     const before = match.input[match.index - 1];
-    const after = match.input[match.index + match[0].length];
-    if (before === "." || after === ".") {
+    if (before === ".") {
       response.ignoreMatch();
     }
   }
@@ -331,8 +330,8 @@ export function compileLanguage(language) {
         // or whitespace - this does no harm in any case since our keyword engine
         // doesn't allow spaces in keywords anyways and we still check for the boundary
         // first
-        mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?=\\b|\\s)';
-        mode.__beforeBegin = skipIfhasPrecedingOrTrailingDot;
+        mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?!\\.)(?=\\b|\\s)';
+        mode.__beforeBegin = skipIfhasPrecedingDot;
       }
       if (!mode.begin) mode.begin = /\B|\b/;
       cmode.beginRe = langRe(mode.begin);
diff --git a/test/api/index.js b/test/api/index.js
index 0e4b596dcb..223fbc0e30 100644
--- a/test/api/index.js
+++ b/test/api/index.js
@@ -1,16 +1,17 @@
 'use strict';
 
 describe('hljs', function() {
-  require('./ident');
-  require('./underscoreIdent');
-  require('./number');
-  require('./cNumber');
+  require('./autoDetection');
+  require('./beginKeywords');
   require('./binaryNumber');
-  require('./starters');
+  require('./cNumber');
+  require('./fixmarkup');
   require('./getLanguage');
-  require('./autoDetection');
   require('./highlight');
-  require('./fixmarkup');
+  require('./ident');
   require('./keywords');
+  require('./number');
   require('./registerAlias');
+  require('./starters');
+  require('./underscoreIdent');
 });

From 432ff2c496a3ca4d600357373989ea533e443b1d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 12 Nov 2020 04:54:53 -0500
Subject: [PATCH 130/223] chore(lint) various LGTM fixes

---
 src/languages/1c.js         |  2 +-
 src/languages/hy.js         |  2 +-
 src/languages/java.js       |  2 --
 src/languages/javascript.js |  2 +-
 src/languages/kotlin.js     |  2 +-
 src/languages/mercury.js    |  2 +-
 src/languages/parser3.js    |  2 +-
 src/languages/powershell.js |  2 +-
 src/languages/r.js          | 32 ++++++++++++++++----------------
 src/languages/swift.js      |  2 +-
 tools/developer.html        |  4 ++--
 11 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/languages/1c.js b/src/languages/1c.js
index d40f539ec5..595aaeca58 100644
--- a/src/languages/1c.js
+++ b/src/languages/1c.js
@@ -515,5 +515,5 @@ export default function(hljs) {
       STRINGS,
       DATE
     ]
-  }
+  };
 }
diff --git a/src/languages/hy.js b/src/languages/hy.js
index b86d6f787f..fe913e10df 100644
--- a/src/languages/hy.js
+++ b/src/languages/hy.js
@@ -101,5 +101,5 @@ export default function(hljs) {
     aliases: ['hylang'],
     illegal: /\S/,
     contains: [hljs.SHEBANG(), LIST, STRING, HINT, HINT_COL, COMMENT, KEY, COLLECTION, NUMBER, LITERAL]
-  }
+  };
 }
diff --git a/src/languages/java.js b/src/languages/java.js
index 9c949f726c..1e9ab182dc 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -5,8 +5,6 @@ Category: common, enterprise
 Website: https://www.java.com/
 */
 
-import * as regex from '../lib/regex.js';
-
 export default function(hljs) {
   var JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
   var GENERIC_IDENT_RE = JAVA_IDENT_RE + '(<' + JAVA_IDENT_RE + '(\\s*,\\s*' + JAVA_IDENT_RE + ')*>)?';
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index bb077d6138..918a01c54a 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -18,7 +18,7 @@ export default function(hljs) {
    * @param {{after:number}} param1
    */
   const hasClosingTag = (match, { after }) => {
-    const tag = match[0].replace("<", "</");
+    const tag = "</" + match[0].slice(1);
     const pos = match.input.indexOf(tag, after);
     return pos !== -1;
   };
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index e2610a9412..6de5532d04 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -66,7 +66,7 @@ export default function(hljs) {
       }
     ]
   };
-  SUBST.contains.push(STRING)
+  SUBST.contains.push(STRING);
 
   var ANNOTATION_USE_SITE = {
     className: 'meta', begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
diff --git a/src/languages/mercury.js b/src/languages/mercury.js
index eeab89f5e6..ece8023bd4 100644
--- a/src/languages/mercury.js
+++ b/src/languages/mercury.js
@@ -49,7 +49,7 @@ export default function(hljs) {
     begin: '\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]',
     relevance: 0
   };
-  STRING.contains = STRING.contains.slice() // we need our own copy of contains
+  STRING.contains = STRING.contains.slice(); // we need our own copy of contains
   STRING.contains.push(STRING_FMT);
 
   var IMPLICATION = {
diff --git a/src/languages/parser3.js b/src/languages/parser3.js
index 18ee3634ae..e300fc4109 100644
--- a/src/languages/parser3.js
+++ b/src/languages/parser3.js
@@ -20,7 +20,7 @@ export default function(hljs) {
     contains: [
       hljs.COMMENT('^#', '$'),
       hljs.COMMENT(
-        /\\^rem\{/,
+        /\^rem\{/,
         /\}/,
         {
           relevance: 10,
diff --git a/src/languages/powershell.js b/src/languages/powershell.js
index 5e80f4714d..98523c0d82 100644
--- a/src/languages/powershell.js
+++ b/src/languages/powershell.js
@@ -242,7 +242,7 @@ export default function(hljs) {
     )
   };
 
-  PS_METHODS.contains.unshift(PS_TYPE)
+  PS_METHODS.contains.unshift(PS_TYPE);
 
   return {
     name: 'PowerShell',
diff --git a/src/languages/r.js b/src/languages/r.js
index b095333004..82a9874882 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -32,22 +32,22 @@ export default function(hljs) {
         // Primitive functions
         // These are all the functions in `base` that are implemented as a
         // `.Primitive`, minus those functions that are also keywords.
-        'abs acos acosh all any anyNA Arg as.call as.character' +
-        'as.complex as.double as.environment as.integer as.logical' +
-        'as.null.default as.numeric as.raw asin asinh atan atanh attr' +
-        'attributes baseenv browser c call ceiling class Conj cos cosh' +
-        'cospi cummax cummin cumprod cumsum digamma dim dimnames' +
-        'emptyenv exp expression floor forceAndCall gamma gc.time' +
-        'globalenv Im interactive invisible is.array is.atomic is.call' +
-        'is.character is.complex is.double is.environment is.expression' +
-        'is.finite is.function is.infinite is.integer is.language' +
-        'is.list is.logical is.matrix is.na is.name is.nan is.null' +
-        'is.numeric is.object is.pairlist is.raw is.recursive is.single' +
-        'is.symbol lazyLoadDBfetch length lgamma list log max min' +
-        'missing Mod names nargs nzchar oldClass on.exit pos.to.env' +
-        'proc.time prod quote range Re rep retracemem return round' +
-        'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt' +
-        'standardGeneric substitute sum switch tan tanh tanpi tracemem' +
+        'abs acos acosh all any anyNA Arg as.call as.character ' +
+        'as.complex as.double as.environment as.integer as.logical ' +
+        'as.null.default as.numeric as.raw asin asinh atan atanh attr ' +
+        'attributes baseenv browser c call ceiling class Conj cos cosh ' +
+        'cospi cummax cummin cumprod cumsum digamma dim dimnames ' +
+        'emptyenv exp expression floor forceAndCall gamma gc.time ' +
+        'globalenv Im interactive invisible is.array is.atomic is.call ' +
+        'is.character is.complex is.double is.environment is.expression ' +
+        'is.finite is.function is.infinite is.integer is.language ' +
+        'is.list is.logical is.matrix is.na is.name is.nan is.null ' +
+        'is.numeric is.object is.pairlist is.raw is.recursive is.single ' +
+        'is.symbol lazyLoadDBfetch length lgamma list log max min ' +
+        'missing Mod names nargs nzchar oldClass on.exit pos.to.env ' +
+        'proc.time prod quote range Re rep retracemem return round ' +
+        'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt ' +
+        'standardGeneric substitute sum switch tan tanh tanpi tracemem ' +
         'trigamma trunc unclass untracemem UseMethod xtfrm',
     },
 
diff --git a/src/languages/swift.js b/src/languages/swift.js
index 7034f24f45..ad38d8777f 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -50,7 +50,7 @@ export default function(hljs) {
   var OPTIONAL_USING_TYPE = {
     className: 'type',
     begin: '\\b[A-Z][\\w\u00C0-\u02B8\']*[!?]'
-  }
+  };
   var BLOCK_COMMENT = hljs.COMMENT(
     '/\\*',
     '\\*/',
diff --git a/tools/developer.html b/tools/developer.html
index 3ef72618a5..6a53a8abfd 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -57,7 +57,7 @@
     }
   </style>
 </head>
-<body id>
+<body>
   <div class="editor" id="app">
     <h3>Code</h3>
     <div>
@@ -295,7 +295,7 @@ <h3>Markup</h3>
           this.refreshKlass();
         }
       }
-    })
+    });
   </script>
 </body>
 </html>

From 743c4a2a1d551e4467c9ea6919f8750913d9c52c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 12 Nov 2020 06:41:49 -0500
Subject: [PATCH 131/223] fix(livescript) fix potential catastrophic
 backtracking

---
 src/languages/livescript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/livescript.js b/src/languages/livescript.js
index c8e9f81301..6d5f4abf15 100644
--- a/src/languages/livescript.js
+++ b/src/languages/livescript.js
@@ -115,7 +115,7 @@ export default function(hljs) {
         {
           // regex can't start with space to parse x / 2 / 3 as two divisions
           // regex can't start with *, and it supports an "illegal" in the main mode
-          begin: /\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W)/
+          begin: /\/(?![ *])(\\.|[^\\\n])*?\/[gim]*(?=\W)/
         }
       ]
     },

From dc7a81e83ffcc92c92e4ebad0dff472d2d8a3805 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 12 Nov 2020 07:43:29 -0500
Subject: [PATCH 132/223] fix(javascript) final solid fix for runaway regex

---
 CHANGES.md                  | 3 +++
 src/languages/javascript.js | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5363f68b3d..e6e1f1f4a9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,9 @@ New Languages:
 
 Language Improvements:
 
+- fix(r) fixed keywords not properly spaced (#2852) [Josh Goebel][]
+- fix(javascript) fix potential catastrophic backtracking (#2852) [Josh Goebel][]
+- fix(livescript) fix potential catastrophic backtracking (#2852) [Josh Goebel][]
 - bug(xml) XML grammar was far too imprecise/fuzzy [Josh Goebel][]
 - enh(xml) Improve precision to prevent false auto-detect positives [Josh Goebel][]
 - fix(js/ts) Prevent for/while/if/switch from falsly matching as functions (#2803) [Josh Goebel][]
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 918a01c54a..2bccc2190c 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -256,9 +256,7 @@ export default function(hljs) {
           regex.lookahead(regex.concat(
             // we also need to allow for multiple possible comments inbetween
             // the first key:value pairing
-            /(\/\/.*$)*/,
-            /(\/\*(.|\n)*\*\/)*/,
-            /\s*/,
+            /(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,
             IDENT_RE + '\\s*:'))),
         relevance: 0,
         contains: [

From 3fec06b47bf6b4c7caaed8a656a1bbf2e80643ce Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 11:30:17 -0400
Subject: [PATCH 133/223] fix(autodetect) swift should not get double relevance
 for `import`

---
 src/languages/swift.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/languages/swift.js b/src/languages/swift.js
index ad38d8777f..1b829584ee 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -156,7 +156,8 @@ export default function(hljs) {
       },
       {
         beginKeywords: 'import', end: /$/,
-        contains: [hljs.C_LINE_COMMENT_MODE, BLOCK_COMMENT]
+        contains: [hljs.C_LINE_COMMENT_MODE, BLOCK_COMMENT],
+        relevance: 0
       }
     ]
   };

From f6239cfef08d8a006534510957a23809ad75b725 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 11:31:55 -0400
Subject: [PATCH 134/223] fix(autodetect) css can include a forward slash

---
 src/languages/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/css.js b/src/languages/css.js
index 2ef3976c1b..2e336e575a 100644
--- a/src/languages/css.js
+++ b/src/languages/css.js
@@ -58,7 +58,7 @@ export default function(hljs) {
   return {
     name: 'CSS',
     case_insensitive: true,
-    illegal: /[=\/|'\$]/,
+    illegal: /[=|'\$]/,
     contains: [
       hljs.C_BLOCK_COMMENT_MODE,
       {

From 9464c6836ac86b7b713ac4a04f73dcbee32b0072 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 11:32:23 -0400
Subject: [PATCH 135/223] fix(autodetect) css class selectors must be valid
 identifiers

---
 src/languages/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/css.js b/src/languages/css.js
index 2e336e575a..2b381c091f 100644
--- a/src/languages/css.js
+++ b/src/languages/css.js
@@ -65,7 +65,7 @@ export default function(hljs) {
         className: 'selector-id', begin: /#[A-Za-z0-9_-]+/
       },
       {
-        className: 'selector-class', begin: /\.[A-Za-z0-9_-]+/
+        className: 'selector-class', begin: '\\.' + IDENT_RE
       },
       {
         className: 'selector-attr',

From e2978cc4be5825b2f25317013ea7242c132f1a36 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 11:32:43 -0400
Subject: [PATCH 136/223] fix(autodetect) css: allow extra ;

---
 src/languages/css.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/css.js b/src/languages/css.js
index 2b381c091f..4913c59c36 100644
--- a/src/languages/css.js
+++ b/src/languages/css.js
@@ -125,6 +125,7 @@ export default function(hljs) {
         illegal: /\S/,
         contains: [
           hljs.C_BLOCK_COMMENT_MODE,
+          { begin: /;/ }, // empty ; rule
           RULE,
         ]
       }

From d2349b2f2ce3d2ef1ad31ca786d92c607afc4ff2 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 11:33:12 -0400
Subject: [PATCH 137/223] fix(autodetect) improve rule matcher

- can start with `*` (css hacks)
- can include a comment after attribute name before : (css hacks)
---
 src/languages/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/css.js b/src/languages/css.js
index 4913c59c36..50ef1982f1 100644
--- a/src/languages/css.js
+++ b/src/languages/css.js
@@ -49,7 +49,7 @@ export default function(hljs) {
   var AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/ // @-webkit-keyframes
   var IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
   var RULE = {
-    begin: /(?:[A-Z_.-]+|--[a-zA-Z0-9_-]+)\s*:/, returnBegin: true, end: ';', endsWithParent: true,
+    begin: /([*]\s?)?(?:[A-Z_.\-\\]+|--[a-zA-Z0-9_-]+)\s*(\/\*\*\/)?:/, returnBegin: true, end: ';', endsWithParent: true,
     contains: [
       ATTRIBUTE
     ]

From bd2e5766ee6a1e5eac5efe5e800feb2a655e9f0f Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 16:14:06 -0400
Subject: [PATCH 138/223] enh(autodetect) csharp: improve autodetection

- `value` is too common variable name to score points as keyword
- reduce 2x relevance for beginKeywords
- bump csharp relevance slightly
---
 src/languages/csharp.js        | 19 ++++++++++++++-----
 test/detect/csharp/default.txt |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index 5d90471271..7e002ee832 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -139,7 +139,7 @@ export default function(hljs) {
     'select',
     'set',
     'unmanaged',
-    'value',
+    'value|0',
     'var',
     'when',
     'where',
@@ -274,7 +274,9 @@ export default function(hljs) {
       STRING,
       NUMBERS,
       {
-        beginKeywords: 'class interface', end: /[{;=]/,
+        beginKeywords: 'class interface',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:,]/,
         contains: [
           { beginKeywords: "where class" },
@@ -285,7 +287,9 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'namespace', end: /[{;=]/,
+        beginKeywords: 'namespace',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:]/,
         contains: [
           TITLE_MODE,
@@ -294,7 +298,9 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'record', end: /[{;=]/,
+        beginKeywords: 'record',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:]/,
         contains: [
           TITLE_MODE,
@@ -324,7 +330,10 @@ export default function(hljs) {
         keywords: KEYWORDS,
         contains: [
           // prevents these from being highlighted `title`
-          { beginKeywords: FUNCTION_MODIFIERS.join(" ")},
+          {
+            beginKeywords: FUNCTION_MODIFIERS.join(" "),
+            relevance: 0
+          },
           {
             begin: hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
             contains: [
diff --git a/test/detect/csharp/default.txt b/test/detect/csharp/default.txt
index 14c36769c2..5302057983 100644
--- a/test/detect/csharp/default.txt
+++ b/test/detect/csharp/default.txt
@@ -9,6 +9,7 @@ namespace MyApplication
     {
         public static List<int> JustDoIt(int count)
         {
+            Span<int> numbers = stackalloc int[length];
             Console.WriteLine($"Hello {Name}!");
             return new List<int>(new int[] { 1, 2, 3 })
         }

From c15d45582ee759b6a51553d14f62bb680b90e5e5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 16:14:50 -0400
Subject: [PATCH 139/223] enh(autodetect) clojure: reduce runaway relevance

- operators get 0 relevance (consistency: no other grammars score them)
- "name" gets 0 relevance since almost any identifier will match

This reduces false positives in the language-detection.el rosetta data
set significantly.
---
 src/languages/clojure.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/languages/clojure.js b/src/languages/clojure.js
index a243e5805f..22df9dd21e 100644
--- a/src/languages/clojure.js
+++ b/src/languages/clojure.js
@@ -16,7 +16,7 @@ export default function(hljs) {
     'builtin-name':
       // Clojure keywords
       globals + ' ' +
-      'cond apply if-not if-let if not not= = < > <= >= == + / * - rem ' +
+      'cond apply if-not if-let if not not= =|0 <|0 >|0 <=|0 >=|0 ==|0 +|0 /|0 *|0 -|0 rem ' +
       'quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? ' +
       'set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? ' +
       'class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? ' +
@@ -88,7 +88,9 @@ export default function(hljs) {
   };
   var NAME = {
     keywords: keywords,
-    className: 'name', begin: SYMBOL_RE,
+    className: 'name',
+    begin: SYMBOL_RE,
+    relevance: 0,
     starts: BODY
   };
   var DEFAULT_CONTAINS = [LIST, STRING, HINT, HINT_COL, COMMENT, KEY, COLLECTION, NUMBER, LITERAL, SYMBOL];

From d47fe19b80222801278f4a65137626c2877a1809 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 8 Oct 2020 16:38:11 -0400
Subject: [PATCH 140/223] enh(autodetect) matlab: remove relevancy from `i` and
 `j`

---
 src/languages/matlab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/matlab.js b/src/languages/matlab.js
index b89a5de22e..06f99fe23e 100644
--- a/src/languages/matlab.js
+++ b/src/languages/matlab.js
@@ -38,8 +38,8 @@ export default function(hljs) {
         'eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ' +
         'ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril ' +
         'triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute ' +
-        'shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan ' +
-        'isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal ' +
+        'shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i|0 inf nan ' +
+        'isnan isinf isfinite j|0 why compan gallery hadamard hankel hilb invhilb magic pascal ' +
         'rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table ' +
         'readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun ' +
         'legend intersect ismember procrustes hold num2cell '

From b593ff45fc43cadbd392a8b2ede9daa10e9d7356 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 9 Oct 2020 08:16:33 -0400
Subject: [PATCH 141/223] enh(autodetect) groovy

- Add relevance for groovy shebang line
- Ternary should not grant extra relevance
---
 src/languages/groovy.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/languages/groovy.js b/src/languages/groovy.js
index 898f258e28..97b80a9fa9 100644
--- a/src/languages/groovy.js
+++ b/src/languages/groovy.js
@@ -78,7 +78,10 @@ export default function(hljs) {
             'throw throws try catch finally implements extends new import package return instanceof'
         },
         contains: [
-            hljs.SHEBANG(),
+            hljs.SHEBANG({
+              binary: "groovy",
+              relevance: 10
+            }),
             COMMENT,
             STRING,
             REGEXP,
@@ -104,6 +107,7 @@ export default function(hljs) {
               // to avoid highlight it as a label, named parameter, or map key
               begin: /\?/,
               end: /:/,
+              relevance: 0,
               contains: [
                 COMMENT,
                 STRING,

From dd44c533413d482319d4cfcbe76a87fffcd75b03 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 9 Oct 2020 08:17:58 -0400
Subject: [PATCH 142/223] enh(autodetect) lisp: tune relevancy

- "name" gets 0 relevance since almost any identifier will match

Applying same logic as used with Clojure.
---
 src/languages/lisp.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/languages/lisp.js b/src/languages/lisp.js
index 365e8dda9e..971ff069a8 100644
--- a/src/languages/lisp.js
+++ b/src/languages/lisp.js
@@ -80,7 +80,10 @@ export default function(hljs) {
     {
       className: 'name',
       variants: [
-        {begin: LISP_IDENT_RE},
+        {
+          begin: LISP_IDENT_RE,
+          relevance: 0,
+        },
         {begin: MEC_RE}
       ]
     },

From 2697ad2c01f40e2cca7414030b71ee03c5856820 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 9 Oct 2020 13:03:42 -0400
Subject: [PATCH 143/223] enh(autodetect) php: improve auto-detection

- only count => in `fn` context
- prevent beginKeywords double relevancy
- reduce relevance of `match`
---
 src/languages/php.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/languages/php.js b/src/languages/php.js
index ef35c47f6c..c06651ad56 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -71,7 +71,11 @@ export default function(hljs) {
     // Other keywords:
     // <https://www.php.net/manual/en/reserved.php>
     // <https://www.php.net/manual/en/language.types.type-juggling.php>
-    'array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list match new object or private protected public real return string switch throw trait try unset use var void while xor yield',
+    'array abstract and as binary bool boolean break callable case catch class clone const continue declare ' +
+    'default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends ' +
+    'final finally float for foreach from global goto if implements instanceof insteadof int integer interface ' +
+    'isset iterable list match|0 new object or private protected public real return string switch throw trait ' +
+    'try unset use var void while xor yield',
     literal: 'false null true',
     built_in:
     // Standard PHP library:
@@ -123,10 +127,14 @@ export default function(hljs) {
       },
       {
         className: 'function',
+        relevance: 0,
         beginKeywords: 'fn function', end: /[;{]/, excludeEnd: true,
         illegal: '[$%\\[]',
         contains: [
           hljs.UNDERSCORE_TITLE_MODE,
+          {
+            begin: '=>' // No markup, just a relevance booster
+          },
           {
             className: 'params',
             begin: '\\(', end: '\\)',
@@ -145,7 +153,10 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface',
+        relevance: 0,
+        end: /\{/,
+        excludeEnd: true,
         illegal: /[:($"]/,
         contains: [
           {beginKeywords: 'extends implements'},
@@ -153,17 +164,18 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'namespace', end: ';',
+        beginKeywords: 'namespace',
+        relevance: 0,
+        end: ';',
         illegal: /[.']/,
         contains: [hljs.UNDERSCORE_TITLE_MODE]
       },
       {
-        beginKeywords: 'use', end: ';',
+        beginKeywords: 'use',
+        relevance: 0,
+        end: ';',
         contains: [hljs.UNDERSCORE_TITLE_MODE]
       },
-      {
-        begin: '=>' // No markup, just a relevance booster
-      },
       STRING,
       NUMBER
     ]

From 9e420ac90ee3d59b4278662354f25e8d349ce26b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 9 Oct 2020 13:10:58 -0400
Subject: [PATCH 144/223] enh(autodetect) add additional common keywords

---
 src/lib/mode_compiler.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index 9265be22aa..a048478088 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -2,7 +2,18 @@ import * as regex from './regex.js';
 import { inherit } from './utils.js';
 
 // keywords that should have no default relevance value
-const COMMON_KEYWORDS = 'of and for in not or if then'.split(' ');
+const COMMON_KEYWORDS = [
+  'of',
+  'and',
+  'for',
+  'in',
+  'not',
+  'or',
+  'if',
+  'then',
+  'parent', // common variable name
+  'list' // common variable name
+];
 
 // compilation
 

From 2118cca210094d4f39a03d9967f6824827699445 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 9 Oct 2020 14:06:53 -0400
Subject: [PATCH 145/223] enh(autodetect) java: relevance boost for `import
 java.*.`

---
 src/languages/java.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/languages/java.js b/src/languages/java.js
index 1e9ab182dc..9b7c83fb7a 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -84,6 +84,12 @@ export default function(hljs) {
           ]
         }
       ),
+      // relevance boost
+      {
+        begin: /import java\.[a-z]+\./,
+        keywords: "import",
+        relevance: 2
+      },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.APOS_STRING_MODE,

From 122e363f2b257488d67c2fd2202f855e22190280 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 09:25:56 -0400
Subject: [PATCH 146/223] enh(autodetect) python: self is super common
 convention

---
 src/languages/python.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/python.js b/src/languages/python.js
index 3840c57b62..3b7ef5ef98 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -254,6 +254,7 @@ export default function(hljs) {
       NUMBER,
       // eat "if" prior to string so that it won't accidentally be
       // labeled as an f-string as in:
+      { begin: /\bself\b/, }, // very common convention
       { beginKeywords: "if", relevance: 0 },
       STRING,
       hljs.HASH_COMMENT_MODE,

From 8fee641648e6cf151c4e82544697131ae51b60eb Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 09:29:16 -0400
Subject: [PATCH 147/223] enh(autodetect) ruby improvements

- add `__FILE__` to keywords
- add `proc` and `lambda` Kernel methods to build_ins
- stricter rule for identifying method definition
- highlight variables
- `|` style params now get no relevance (can be too many other things)
- add SHEBANG rule
- make Ruby REPL matching a little stricter
---
 src/languages/ruby.js | 44 +++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index 818063e955..f3cc12d142 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -7,13 +7,17 @@ Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
 export default function(hljs) {
-  var RUBY_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
+  var RUBY_METHOD_RE = '([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)';
   var RUBY_KEYWORDS = {
     keyword:
       'and then defined module in return redo if BEGIN retry end for self when ' +
       'next until do begin unless END rescue else break undef not super class case ' +
-      'require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor',
+      'require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor ' +
+      '__FILE__',
+    built_in: 'proc lambda',
     literal:
       'true false nil'
   };
@@ -112,7 +116,6 @@ export default function(hljs) {
 
   var RUBY_DEFAULT_CONTAINS = [
     STRING,
-    IRB_OBJECT,
     {
       className: 'class',
       beginKeywords: 'class module', end: '$|;',
@@ -129,7 +132,12 @@ export default function(hljs) {
     },
     {
       className: 'function',
-      beginKeywords: 'def', end: '$|;',
+      // def method_name(
+      // def method_name;
+      // def method_name (end of line)
+      begin: regex.concat(/def\s*/, regex.lookahead(RUBY_METHOD_RE + "\\s*(\\(|;|$)")),
+      keywords: "def",
+      end: '$|;',
       contains: [
         hljs.inherit(hljs.TITLE_MODE, {begin: RUBY_METHOD_RE}),
         PARAMS
@@ -152,18 +160,20 @@ export default function(hljs) {
     },
     NUMBER,
     {
+      className: "variable",
       begin: '(\\$\\W)|((\\$|@@?)(\\w+))' // variables
     },
     {
       className: 'params',
-      begin: /\|/, end: /\|/,
+      begin: /\|/,
+      end: /\|/,
+      relevance:0, // this could be a lot of things (in other languages) other than params
       keywords: RUBY_KEYWORDS
     },
     { // regexp container
       begin: '(' + hljs.RE_STARTERS_RE + '|unless)\\s*',
       keywords: 'unless',
       contains: [
-        IRB_OBJECT,
         {
           className: 'regexp',
           contains: [hljs.BACKSLASH_ESCAPE, SUBST],
@@ -176,15 +186,18 @@ export default function(hljs) {
             {begin: '%r\\[', end: '\\][a-z]*'}
           ]
         }
-      ].concat(COMMENT_MODES),
+      ].concat(IRB_OBJECT, COMMENT_MODES),
       relevance: 0
     }
-  ].concat(COMMENT_MODES);
+  ].concat(IRB_OBJECT, COMMENT_MODES);
 
-  SUBST.contains = RUBY_DEFAULT_CONTAINS;
-  PARAMS.contains = RUBY_DEFAULT_CONTAINS;
+  SUBST.contains = RUBY_DEFAULT_CONTAINS
+  PARAMS.contains = RUBY_DEFAULT_CONTAINS
 
+  // >>
+  // ?>
   var SIMPLE_PROMPT = "[>?]>";
+  // irb(main):001:0>
   var DEFAULT_PROMPT = "[\\w#]+\\(\\w+\\):\\d+:\\d+>";
   var RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>";
 
@@ -197,18 +210,25 @@ export default function(hljs) {
     },
     {
       className: 'meta',
-      begin: '^('+SIMPLE_PROMPT+"|"+DEFAULT_PROMPT+'|'+RVM_PROMPT+')',
+      begin: '^('+SIMPLE_PROMPT+"|"+DEFAULT_PROMPT+'|'+RVM_PROMPT+')(?=[ ])',
       starts: {
         end: '$', contains: RUBY_DEFAULT_CONTAINS
       }
     }
   ];
 
+  COMMENT_MODES.unshift(IRB_OBJECT);
+
   return {
     name: 'Ruby',
     aliases: ['rb', 'gemspec', 'podspec', 'thor', 'irb'],
     keywords: RUBY_KEYWORDS,
     illegal: /\/\*/,
-    contains: COMMENT_MODES.concat(IRB_DEFAULT).concat(RUBY_DEFAULT_CONTAINS)
+    contains: [
+        hljs.SHEBANG({binary:"ruby"}),
+      ]
+      .concat(IRB_DEFAULT)
+      .concat(COMMENT_MODES)
+      .concat(RUBY_DEFAULT_CONTAINS)
   };
 }

From e95bf066b057b9beec2854de791c8f7412a91d64 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 09:30:55 -0400
Subject: [PATCH 148/223] enh(autodetect) groovy: reduce @meta tags relevance

---
 src/languages/groovy.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/languages/groovy.js b/src/languages/groovy.js
index 97b80a9fa9..4e3c63a6ce 100644
--- a/src/languages/groovy.js
+++ b/src/languages/groovy.js
@@ -96,7 +96,9 @@ export default function(hljs) {
                 ]
             },
             {
-                className: 'meta', begin: '@[A-Za-z]+'
+                className: 'meta',
+                begin: '@[A-Za-z]+',
+                relevance: 0
             },
             {
               // highlight map keys and named parameters as attrs

From 1c98d479d2a69cafb4d1927b8e4acb56add057d6 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 09:56:01 -0400
Subject: [PATCH 149/223] enh(autodetect) vbscript: improve auto-detection

- built-ins should only match if they are a call
- fix function detection
---
 src/languages/vbscript.js | 46 +++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/languages/vbscript.js b/src/languages/vbscript.js
index 8e5ab8ff92..9c7b84abfc 100644
--- a/src/languages/vbscript.js
+++ b/src/languages/vbscript.js
@@ -7,7 +7,40 @@ Website: https://en.wikipedia.org/wiki/VBScript
 Category: scripting
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
+  const BUILT_IN_FUNCTIONS = ('lcase month vartype instrrev ubound setlocale getobject rgb getref string ' +
+  'weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency ' +
+  'conversions csng timevalue second year space abs clng timeserial fixs len asc ' +
+  'isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate ' +
+  'instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex ' +
+  'chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim ' +
+  'strcomp int createobject loadpicture tan formatnumber mid ' +
+  'split  cint sin datepart ltrim sqr ' +
+  'time derived eval date formatpercent exp inputbox left ascw ' +
+  'chrw regexp cstr err').split(" ");
+  const BUILT_IN_OBJECTS = [
+    "server",
+    "response",
+    "request",
+    // take no arguments so can be caleld without ()
+    "scriptengine",
+    "scriptenginebuildversion",
+    "scriptengineminorversion",
+    "scriptenginemajorversion"
+  ];
+
+  const BUILT_IN_CALL = {
+    begin: regex.concat(regex.either(...BUILT_IN_FUNCTIONS), "\\s*\\("),
+    // relevance 0 because this is acting as a beginKeywords really
+    relevance:0,
+    keywords: {
+      built_in: BUILT_IN_FUNCTIONS.join(" ")
+    }
+  };
+
   return {
     name: 'VBScript',
     aliases: ['vbs'],
@@ -18,22 +51,13 @@ export default function(hljs) {
         'if then else on error option explicit new private property let get public randomize ' +
         'redim rem select case set stop sub while wend with end to elseif is or xor and not ' +
         'class_initialize class_terminate default preserve in me byval byref step resume goto',
-      built_in:
-        'lcase month vartype instrrev ubound setlocale getobject rgb getref string ' +
-        'weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency ' +
-        'conversions csng timevalue second year space abs clng timeserial fixs len asc ' +
-        'isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate ' +
-        'instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex ' +
-        'chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim ' +
-        'strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion ' +
-        'scriptengine split scriptengineminorversion cint sin datepart ltrim sqr ' +
-        'scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw ' +
-        'chrw regexp server response request cstr err',
+      built_in: BUILT_IN_OBJECTS.join(" "),
       literal:
         'true false null nothing empty'
     },
     illegal: '//',
     contains: [
+      BUILT_IN_CALL,
       hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [{begin: '""'}]}),
       hljs.COMMENT(
         /'/,

From 670849bd9ddd8b5597d1c92f8c87d0e7ff4648a2 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 10 Oct 2020 10:15:10 -0400
Subject: [PATCH 150/223] enh(autodetect) r: detect `<-`, illegal: `->`

---
 src/languages/r.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/languages/r.js b/src/languages/r.js
index 82a9874882..1c22f62ba4 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -7,6 +7,8 @@ Website: https://www.r-project.org
 Category: scientific
 */
 
+import * as regex from '../lib/regex.js';
+
 export default function(hljs) {
   // Identifiers in R cannot start with `_`, but they can start with `.` if it
   // is not immediately followed by a digit.
@@ -15,10 +17,13 @@ export default function(hljs) {
   // handled in a separate mode. See `test/markup/r/names.txt` for examples.
   // FIXME: Support Unicode identifiers.
   const IDENT_RE = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
+  const SIMPLE_IDENT = /[a-zA-Z][a-zA-Z_0-9]*/;
 
   return {
     name: 'R',
 
+    // only in Haskell, not R
+    illegal: /->/,
     keywords: {
       $pattern: IDENT_RE,
       keyword:
@@ -168,7 +173,10 @@ export default function(hljs) {
         begin: '%',
         end: '%'
       },
-
+      // relevance boost for assignment
+      {
+        begin: regex.concat(SIMPLE_IDENT, "\\s+<-\\s+")
+      },
       {
         // escaped identifier
         begin: '`',

From bee3744f7f2b1466f6d0c8962c7cada5492f8d73 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 12 Oct 2020 16:47:19 -0400
Subject: [PATCH 151/223] enh(autodetect) fewer false positives on variables

For languages with $ident and @ident style variables this attempts
to prevent positives for $ident$ and @ident@ type expressions, which
are likely something else entirely.

- bash
- perl
- php
- ruby
---
 src/languages/bash.js |  4 +++-
 src/languages/perl.js | 10 +++++++++-
 src/languages/php.js  |  2 +-
 src/languages/ruby.js |  4 +++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/languages/bash.js b/src/languages/bash.js
index eb62efe04d..043de0f2aa 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -6,6 +6,8 @@ Website: https://www.gnu.org/software/bash/
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
   const VAR = {};
@@ -23,7 +25,7 @@ export default function(hljs) {
   Object.assign(VAR,{
     className: 'variable',
     variants: [
-      {begin: /\$[\w\d#@][\w\d_]*/},
+      {begin: regex.concat(/\$[\w\d#@][\w\d_]*/, `(?![\\w\\d])(?![$])`) },
       BRACED_VAR
     ]
   });
diff --git a/src/languages/perl.js b/src/languages/perl.js
index 9ea76bef87..881e5fbcd1 100644
--- a/src/languages/perl.js
+++ b/src/languages/perl.js
@@ -5,6 +5,9 @@ Website: https://www.perl.org
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
   var PERL_KEYWORDS = {
     $pattern: /[\w.]+/,
@@ -40,7 +43,12 @@ export default function(hljs) {
   var VAR = {
     variants: [
       {begin: /\$\d/},
-      {begin: /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/},
+      {begin: regex.concat(
+        /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![A-Za-z])(?![@$%])`
+        )},
       {begin: /[$%@][^\s\w{]/, relevance: 0}
     ]
   };
diff --git a/src/languages/php.js b/src/languages/php.js
index c06651ad56..0faa8b38f1 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -13,7 +13,7 @@ Category: common
 export default function(hljs) {
   const VARIABLE = {
     className: 'variable',
-    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
+    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' + `(?![A-Za-z0-9])(?![$])`
   };
   const PREPROCESSOR = {
     className: 'meta',
diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index f3cc12d142..47763bf9e3 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -160,8 +160,10 @@ export default function(hljs) {
     },
     NUMBER,
     {
+      // negative-look forward attemps to prevent false matches like:
+      // @ident@ or $ident$ that might indicate this is not ruby at all
       className: "variable",
-      begin: '(\\$\\W)|((\\$|@@?)(\\w+))' // variables
+      begin: '(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])' + `(?![A-Za-z])(?![@$?'])`
     },
     {
       className: 'params',

From 2780204b686a5662ed443aeac09a580bc9a983df Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 12 Oct 2020 18:06:14 -0400
Subject: [PATCH 152/223] fix(autodetect) yaml: simple numbers should not add
 relevancy

---
 src/languages/yaml.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/languages/yaml.js b/src/languages/yaml.js
index f4257be176..35f9105670 100644
--- a/src/languages/yaml.js
+++ b/src/languages/yaml.js
@@ -153,7 +153,8 @@ export default function(hljs) {
     // sit isolated from other words
     {
       className: 'number',
-      begin: hljs.C_NUMBER_RE + '\\b'
+      begin: hljs.C_NUMBER_RE + '\\b',
+      relevance: 0
     },
     OBJECT,
     ARRAY,

From 7e29ea7881f710a02f91f98e6255e13be29116ba Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 13 Oct 2020 10:26:08 -0400
Subject: [PATCH 153/223] fix(autodetect) crystal: lower function relevance (5
 -> 2)

---
 src/languages/crystal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/crystal.js b/src/languages/crystal.js
index 3224886803..7f4c5b0834 100644
--- a/src/languages/crystal.js
+++ b/src/languages/crystal.js
@@ -158,7 +158,7 @@ export default function(hljs) {
           endsParent: true
         })
       ],
-      relevance: 5
+      relevance: 2
     },
     {
       className: 'symbol',

From c3d93a077b258d0624f78496ac8f11e3af4b296a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 13 Oct 2020 10:34:00 -0400
Subject: [PATCH 154/223] fix(autodetect) hy/scheme: bring in line with new
 `name` relevance from clojure

---
 src/languages/hy.js     | 4 +++-
 src/languages/scheme.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/languages/hy.js b/src/languages/hy.js
index fe913e10df..d603b23d62 100644
--- a/src/languages/hy.js
+++ b/src/languages/hy.js
@@ -86,8 +86,10 @@ export default function(hljs) {
     relevance: 0
   };
   var NAME = {
+    className: 'name',
+    relevance: 0,
     keywords: keywords,
-    className: 'name', begin: SYMBOL_RE,
+    begin: SYMBOL_RE,
     starts: BODY
   };
   var DEFAULT_CONTAINS = [LIST, STRING, HINT, HINT_COL, COMMENT, KEY, COLLECTION, NUMBER, LITERAL, SYMBOL];
diff --git a/src/languages/scheme.js b/src/languages/scheme.js
index 715ac60608..f90c90f45b 100644
--- a/src/languages/scheme.js
+++ b/src/languages/scheme.js
@@ -116,6 +116,7 @@ export default function(hljs) {
 
   var NAME = {
     className: 'name',
+    relevance: 0,
     begin: SCHEME_IDENT_RE,
     keywords: KEYWORDS
   };

From 2ac0dcf598bf05867a228da8ad2bc7d464d8a9dc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 29 Oct 2020 16:50:10 -0400
Subject: [PATCH 155/223] fix(autodetect) protobuf: tighten enum item rule

---
 src/languages/protobuf.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/protobuf.js b/src/languages/protobuf.js
index d4bf4e1353..13c88426ee 100644
--- a/src/languages/protobuf.js
+++ b/src/languages/protobuf.js
@@ -36,9 +36,9 @@ export default function(hljs) {
         end: /[{;]/, excludeEnd: true,
         keywords: 'rpc returns'
       },
-      {
-        begin: /^\s*[A-Z_]+/,
-        end: /\s*=/, excludeEnd: true
+      { // match enum items (relevance)
+        // BLAH = ...;
+        begin: /^\s*[A-Z_]+(?=\s*=[^\n]+;$)/
       }
     ]
   };

From 280de478b49827fe992246a7be01fe386b1d6ab5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 29 Oct 2020 17:07:19 -0400
Subject: [PATCH 156/223] fix(ocaml) `=>` does not actually seem to be a part
 of language

- I looked but couldn't find any reference to this.
---
 src/languages/ocaml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/ocaml.js b/src/languages/ocaml.js
index ff4a918fac..04cc7e7852 100644
--- a/src/languages/ocaml.js
+++ b/src/languages/ocaml.js
@@ -73,7 +73,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: /[-=]>/ // relevance booster
+        begin: /->/ // relevance booster
       }
     ]
   }

From edaa41c9fa001c41fb8e9f11be8d44a77bb94998 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 29 Oct 2020 23:27:59 -0400
Subject: [PATCH 157/223] fix(parser) add `value` to common keywords (0
 relevance)

---
 src/lib/mode_compiler.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
index a048478088..b8202d664d 100644
--- a/src/lib/mode_compiler.js
+++ b/src/lib/mode_compiler.js
@@ -12,7 +12,8 @@ const COMMON_KEYWORDS = [
   'if',
   'then',
   'parent', // common variable name
-  'list' // common variable name
+  'list', // common variable name
+  'value' // common variable name
 ];
 
 // compilation

From 06a98db197147b89a36a43224cd822a205740967 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 31 Oct 2020 06:20:16 -0400
Subject: [PATCH 158/223] fix(n1ql) do not hobble relevancy of strings

- There is no reason to do this every other language gets
  credit for simple strings.
---
 src/languages/n1ql.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/languages/n1ql.js b/src/languages/n1ql.js
index 3e8bc716a5..d631ea901e 100644
--- a/src/languages/n1ql.js
+++ b/src/languages/n1ql.js
@@ -52,14 +52,12 @@ export default function(hljs) {
           {
             className: 'string',
             begin: '\'', end: '\'',
-            contains: [hljs.BACKSLASH_ESCAPE],
-            relevance: 0
+            contains: [hljs.BACKSLASH_ESCAPE]
           },
           {
             className: 'string',
             begin: '"', end: '"',
-            contains: [hljs.BACKSLASH_ESCAPE],
-            relevance: 0
+            contains: [hljs.BACKSLASH_ESCAPE]
           },
           {
             className: 'symbol',

From 1b42bc6830892e0593e500952c9359041a6a48fb Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 31 Oct 2020 12:43:04 -0400
Subject: [PATCH 159/223] fix(javascript) remove relevance of `ident =>`

- This is found in other langauges and isn't a strong signal.
---
 src/languages/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 2bccc2190c..3372b917bf 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -292,7 +292,8 @@ export default function(hljs) {
                 className: 'params',
                 variants: [
                   {
-                    begin: hljs.UNDERSCORE_IDENT_RE
+                    begin: hljs.UNDERSCORE_IDENT_RE,
+                    relevance: 0
                   },
                   {
                     className: null,

From 3aa9861c21bf549436a97a195af1c379532f0cd0 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 3 Nov 2020 15:28:23 -0500
Subject: [PATCH 160/223] fix(angelscript/lsl) no relevance for simple numbers

---
 src/languages/angelscript.js | 1 +
 src/languages/lsl.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/languages/angelscript.js b/src/languages/angelscript.js
index 5f88af397a..8472ccb646 100644
--- a/src/languages/angelscript.js
+++ b/src/languages/angelscript.js
@@ -113,6 +113,7 @@ export default function(hljs) {
 
       { // numbers
         className: 'number',
+        relevance: 0,
         begin: '(-?)(\\b0[xXbBoOdD][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)'
       }
     ]
diff --git a/src/languages/lsl.js b/src/languages/lsl.js
index 08f57d782c..c998894611 100644
--- a/src/languages/lsl.js
+++ b/src/languages/lsl.js
@@ -24,6 +24,7 @@ export default function(hljs) {
 
     var LSL_NUMBERS = {
         className: 'number',
+        relevance:0,
         begin: hljs.C_NUMBER_RE
     };
 

From 9d9f82be69cb5be7763125c1ec78b5b086b8fc66 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 3 Nov 2020 15:30:19 -0500
Subject: [PATCH 161/223] fix(properties) auto-detect: no points for
 ident[space]ident

---
 src/languages/properties.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/languages/properties.js b/src/languages/properties.js
index 5fcc92d00e..64cd341f69 100644
--- a/src/languages/properties.js
+++ b/src/languages/properties.js
@@ -11,7 +11,9 @@ export default function(hljs) {
   var WS0 = '[ \\t\\f]*';
   var WS1 = '[ \\t\\f]+';
   // delimiter
-  var DELIM = '(' + WS0+'[:=]'+WS0+ '|' + WS1 + ')';
+  var EQUAL_DELIM = WS0+'[:=]'+WS0;
+  var WS_DELIM = WS1;
+  var DELIM = '(' + EQUAL_DELIM + '|' + WS_DELIM + ')';
   var KEY_ALPHANUM = '([^\\\\\\W:= \\t\\f\\n]|\\\\.)+';
   var KEY_OTHER = '([^\\\\:= \\t\\f\\n]|\\\\.)+';
 
@@ -39,8 +41,11 @@ export default function(hljs) {
       // key: everything until whitespace or = or : (taking into account backslashes)
       // case of a "normal" key
       {
-        begin: KEY_ALPHANUM + DELIM,
         returnBegin: true,
+        variants: [
+          { begin: KEY_ALPHANUM + EQUAL_DELIM, relevance: 1 },
+          { begin: KEY_ALPHANUM + WS_DELIM, relevance: 0 }
+        ],
         contains: [
           {
             className: 'attr',

From 8acfeebe52bb91f5a83aa76a593c6c60ddcec9b9 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 14 Nov 2020 21:51:20 -0500
Subject: [PATCH 162/223] add comment, fix typos

- also fix pgsql markup test
---
 src/languages/bash.js                       | 5 ++++-
 src/languages/php.js                        | 5 ++++-
 src/languages/vbscript.js                   | 2 +-
 test/markup/pgsql/dollar_strings.expect.txt | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/languages/bash.js b/src/languages/bash.js
index 043de0f2aa..9dd90dd6bd 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -25,7 +25,10 @@ export default function(hljs) {
   Object.assign(VAR,{
     className: 'variable',
     variants: [
-      {begin: regex.concat(/\$[\w\d#@][\w\d_]*/, `(?![\\w\\d])(?![$])`) },
+      {begin: regex.concat(/\$[\w\d#@][\w\d_]*/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![\\w\\d])(?![$])`) },
       BRACED_VAR
     ]
   });
diff --git a/src/languages/php.js b/src/languages/php.js
index 0faa8b38f1..203f579c60 100644
--- a/src/languages/php.js
+++ b/src/languages/php.js
@@ -13,7 +13,10 @@ Category: common
 export default function(hljs) {
   const VARIABLE = {
     className: 'variable',
-    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' + `(?![A-Za-z0-9])(?![$])`
+    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' +
+      // negative look-ahead tries to avoid matching patterns that are not
+      // Perl at all like $ident$, @ident@, etc.
+      `(?![A-Za-z0-9])(?![$])`
   };
   const PREPROCESSOR = {
     className: 'meta',
diff --git a/src/languages/vbscript.js b/src/languages/vbscript.js
index 9c7b84abfc..a43f4e2c89 100644
--- a/src/languages/vbscript.js
+++ b/src/languages/vbscript.js
@@ -25,7 +25,7 @@ export default function(hljs) {
     "server",
     "response",
     "request",
-    // take no arguments so can be caleld without ()
+    // take no arguments so can be called without ()
     "scriptengine",
     "scriptenginebuildversion",
     "scriptengineminorversion",
diff --git a/test/markup/pgsql/dollar_strings.expect.txt b/test/markup/pgsql/dollar_strings.expect.txt
index 52f584761a..978866a3a5 100644
--- a/test/markup/pgsql/dollar_strings.expect.txt
+++ b/test/markup/pgsql/dollar_strings.expect.txt
@@ -1,9 +1,9 @@
 <span class="hljs-keyword">CREATE</span> <span class="hljs-keyword">OR REPLACE</span> <span class="hljs-keyword">FUNCTION</span> hello_world(param_your_name <span class="hljs-type">text</span>)
 <span class="hljs-keyword">RETURNS</span> <span class="hljs-type">text</span> <span class="hljs-keyword">AS</span>
-$$<span class="ruby">
-SELECT <span class="hljs-string">&#x27;Hello world. My name is &#x27;</span> <span class="hljs-params">||</span> param_your_name <span class="hljs-params">||</span> <span class="hljs-string">&#x27;.&#x27;</span>;
+$$<span class="pgsql">
+<span class="hljs-keyword">SELECT</span> <span class="hljs-string">&#x27;Hello world. My name is &#x27;</span> || param_your_name || <span class="hljs-string">&#x27;.&#x27;</span>;
 $$</span>
 <span class="hljs-keyword">language</span> <span class="hljs-keyword">sql</span> <span class="hljs-keyword">STRICT</span>;
 
-<span class="hljs-keyword">SELECT</span> sql_expression($sql$<span class="ruby">SELECT hello_world($phrase$Regina<span class="hljs-string">&#x27;s elephant&#x27;</span>s dog$phrase$)
-    <span class="hljs-params">||</span> $phrase$ I made a cat<span class="hljs-string">&#x27;s meow today.$phrase$ $sql$</span></span>);
+<span class="hljs-keyword">SELECT</span> sql_expression($sql$<span class="tcl">SELECT hello_world($phrase$Regina&#x27;s elephant&#x27;s dog$phrase$)
+    || $phrase$ I made a cat&#x27;s meow today.$phrase$ $sql$</span>);

From 462404c71f474edc65f7212d28a78eab49398a8c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 6 Nov 2020 15:10:38 -0500
Subject: [PATCH 163/223] (chore) bump build deps to newer naming & remove
 vendor

---
 package-lock.json         | 239 ++++++++++++++++++++++++++------------
 package.json              |   6 +-
 src/highlight.js          |   3 +-
 src/vendor/deep_freeze.js |  21 ----
 tools/build_config.js     |  12 +-
 5 files changed, 180 insertions(+), 101 deletions(-)
 delete mode 100644 src/vendor/deep_freeze.js

diff --git a/package-lock.json b/package-lock.json
index ca1d0b3cbf..caf12c145f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,6 +95,132 @@
         "fastq": "^1.6.0"
       }
     },
+    "@rollup/plugin-commonjs": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz",
+      "integrity": "sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.1",
+        "glob": "^7.1.6",
+        "is-reference": "^1.2.1",
+        "magic-string": "^0.25.7",
+        "resolve": "^1.17.0"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz",
+          "integrity": "sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==",
+          "dev": true
+        },
+        "is-reference": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+          "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "*"
+          }
+        },
+        "magic-string": {
+          "version": "0.25.7",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+          "dev": true,
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
+        "resolve": {
+          "version": "1.18.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.0.0",
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rollup/plugin-json": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
+      "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.8"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz",
+      "integrity": "sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.17.0"
+      },
+      "dependencies": {
+        "@types/resolve": {
+          "version": "1.17.1",
+          "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+          "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "resolve": {
+          "version": "1.18.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.0.0",
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+          "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+          "dev": true
+        },
+        "picomatch": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+          "dev": true
+        }
+      }
+    },
+    "@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -475,6 +601,12 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
+    "builtin-modules": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
+      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "dev": true
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -656,6 +788,12 @@
       "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -759,12 +897,24 @@
       "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
       "dev": true
     },
+    "deep-freeze-es6": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-1.3.1.tgz",
+      "integrity": "sha512-h3SrxRF46NCBuk5GLPUk7ceLQ+DgixZ60DzHMCgCcgC12xs7d6zAGa00FKpXrv5YC7Vi4oo0RHL9Q2Gthg77lg==",
+      "dev": true
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -1341,12 +1491,6 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
-    "estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
-      "dev": true
-    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -1799,6 +1943,15 @@
       "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
       "dev": true
     },
+    "is-core-module": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
+      "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-date-object": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
@@ -1826,6 +1979,12 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -1856,23 +2015,6 @@
       "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
       "dev": true
     },
-    "is-reference": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
-      "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.39"
-      },
-      "dependencies": {
-        "@types/estree": {
-          "version": "0.0.39",
-          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-          "dev": true
-        }
-      }
-    },
     "is-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
@@ -2113,15 +2255,6 @@
         "yallist": "^2.1.2"
       }
     },
-    "magic-string": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz",
-      "integrity": "sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
-      }
-    },
     "merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -2788,48 +2921,6 @@
         "fsevents": "~2.1.2"
       }
     },
-    "rollup-plugin-commonjs": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
-      "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0",
-        "rollup-pluginutils": "^2.8.1"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.14.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.0.tgz",
-          "integrity": "sha512-uviWSi5N67j3t3UKFxej1loCH0VZn5XuqdNxoLShPcYPw6cUZn74K1VRj+9myynRX03bxIBEkwlkob/ujLsJVw==",
-          "dev": true,
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "rollup-plugin-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz",
-      "integrity": "sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==",
-      "dev": true,
-      "requires": {
-        "rollup-pluginutils": "^2.5.0"
-      }
-    },
-    "rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1"
-      }
-    },
     "run-parallel": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
diff --git a/package.json b/package.json
index 1bb15f16f7..5241075128 100644
--- a/package.json
+++ b/package.json
@@ -39,12 +39,16 @@
     "node": "*"
   },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^16.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^4.6.1",
     "@typescript-eslint/parser": "^4.6.1",
     "clean-css": "^4.2.3",
     "cli-table": "^0.3.1",
     "colors": "^1.1.2",
     "commander": "^6.2.0",
+    "deep-freeze-es6": "^1.3.1",
     "del": "^6.0.0",
     "dependency-resolver": "^2.0.1",
     "eslint": "^7.12.1",
@@ -61,8 +65,6 @@
     "lodash": "^4.17.20",
     "mocha": "^8.2.1",
     "rollup": "^2.33.1",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-json": "^4.0.0",
     "should": "^13.2.3",
     "terser": "^5.3.8",
     "tiny-worker": "^2.3.0",
diff --git a/src/highlight.js b/src/highlight.js
index c4e2f6ddb5..2182ace6cf 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -3,7 +3,8 @@ Syntax highlighting with language autodetection.
 https://highlightjs.org/
 */
 
-import deepFreeze from './vendor/deep_freeze.js';
+// @ts-ignore
+import deepFreeze from 'deep-freeze-es6';
 import Response from './lib/response.js';
 import TokenTreeEmitter from './lib/token_tree.js';
 import * as regex from './lib/regex.js';
diff --git a/src/vendor/deep_freeze.js b/src/vendor/deep_freeze.js
deleted file mode 100644
index c5ce3eb560..0000000000
--- a/src/vendor/deep_freeze.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// https://github.com/substack/deep-freeze/blob/master/index.js
-/** @param {any} obj */
-export default function deepFreeze(obj) {
-  Object.freeze(obj);
-
-  var objIsFunction = typeof obj === 'function';
-
-  Object.getOwnPropertyNames(obj).forEach(function(prop) {
-    if (Object.hasOwnProperty.call(obj, prop)
-    && obj[prop] !== null
-    && (typeof obj[prop] === "object" || typeof obj[prop] === "function")
-    // IE11 fix: https://github.com/highlightjs/highlight.js/issues/2318
-    // TODO: remove in the future
-    && (objIsFunction ? prop !== 'caller' && prop !== 'callee' && prop !== 'arguments' : true)
-    && !Object.isFrozen(obj[prop])) {
-      deepFreeze(obj[prop]);
-    }
-  });
-
-  return obj;
-}
diff --git a/tools/build_config.js b/tools/build_config.js
index a635762f64..ad103a20d7 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -1,5 +1,6 @@
-const cjsPlugin = require('rollup-plugin-commonjs');
-const jsonPlugin = require('rollup-plugin-json');
+const cjsPlugin = require('@rollup/plugin-commonjs');
+const jsonPlugin = require('@rollup/plugin-json');
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
 
 module.exports = {
   build_dir: "build",
@@ -12,6 +13,7 @@ module.exports = {
         plugins: [
           cjsPlugin(),
           jsonPlugin(),
+          nodeResolve(),
           {
             transform: (x) => {
               if (/var module/.exec(x)) {
@@ -25,7 +27,11 @@ module.exports = {
     },
     browser_core: {
       input: {
-        plugins: [jsonPlugin()]
+        plugins: [
+          jsonPlugin(),
+          cjsPlugin(),
+          nodeResolve()
+        ]
       },
       output: {
         name: "hljs",

From d602ee15a0ac4d8ecf808d60ec3ce0f29ddc6704 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 14 Nov 2020 22:49:50 -0500
Subject: [PATCH 164/223] chore(tests) update to new package name

---
 test/builds/rollup_import_via_commonjs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/builds/rollup_import_via_commonjs.js b/test/builds/rollup_import_via_commonjs.js
index ae5ead20a7..1399d0b514 100644
--- a/test/builds/rollup_import_via_commonjs.js
+++ b/test/builds/rollup_import_via_commonjs.js
@@ -1,5 +1,5 @@
 // rollup.config.js
-import commonjs from 'rollup-plugin-commonjs';
+import commonjs from '@rollup/plugin-commonjs';
 
 export default {
   input: 'test/builds/package.js',

From 7c7f49690334aceaef2e70f60f72cc82b257576a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 14 Nov 2020 23:05:28 -0500
Subject: [PATCH 165/223] chore(build) NPM publish of cdn-assets and
 highlight.js via GHA (#2850)

* Automate publishing of pre-releases to NPM

- Publishes both `highlight.js` and `@highlightjs/cdn-assets`
---
 .github/workflows/release.yml | 132 ++++++++++++++++++++++++++++++++++
 .gitignore                    |   1 +
 2 files changed, 133 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..33deace552
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,132 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "*beta*"
+      - "*pre*"
+      # uncomment this later when we're ready for production releases
+      # - "1[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+  prerelease:
+    name: Pre-release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout highlight.js
+        uses: actions/checkout@v2
+
+      - name: Tag is ${{ github.ref }}.
+        # we have to repeat ourselves here since the environment is not actually updated
+        # until the next step executes, so we can't access $TAG_NAME yet
+        run: |
+          echo "TAG_NAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+          echo "MAJOR_VERSION=$(echo ${GITHUB_REF/refs\/tags\//} | cut -d'.' -f1)" >> $GITHUB_ENV
+      - name: Make sure we are pushing a tag...
+        if: ${{ !contains(github.ref,'refs/tags/') }}
+        run: false
+        # run: echo "TAG_NAME=0.0.0-test0" >> $GITHUB_ENV
+
+      - if: contains(github.ref, 'beta') || contains(github.ref, 'pre')
+        run: |
+          echo "NPM_TAG=beta" >> $GITHUB_ENV
+          echo "RELEASING=beta" >> $GITHUB_ENV
+
+      - if: ${{ !(contains(github.ref, 'beta') || contains(github.ref, 'pre')) }}
+        run: |
+          echo "NPM_TAG=latest" >> $GITHUB_ENV
+          echo "RELEASING=stable" >> $GITHUB_ENV
+
+      - name: match-tag-to-package-version
+        uses: geritol/match-tag-to-package-version@0.0.2
+        env:
+          TAG_PREFIX: refs/tags/ # Optional, default prefix refs/tags/
+
+      - name: Use Node.js 15.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 15.x
+      - name: Build Node.js package
+        run: |
+          npm install
+          node ./tools/build.js -t node
+          npm test
+
+      - name: Publish highlight.js to NPM
+        id: publish
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          check-version: true
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./build/package.json
+          tag: ${{ env.NPM_TAG }}
+
+      - if: steps.publish.outputs.type != 'none'
+        run: |
+          echo "Version changed: ${{ steps.publish.outputs.old-version }} => ${{ steps.publish.outputs.version }}"
+
+        # if stable release
+      - name: Stable Release
+        if: env.RELEASING == 'stable'
+        run: echo "BRANCH_NAME=${MAJOR_VERSION}-stable" >> $GITHUB_ENV
+        # else (beta)
+      - name: Beta Release
+        if: env.RELEASING == 'beta'
+        run: echo "BRANCH_NAME=master" >> $GITHUB_ENV
+      - name: Confirm release is either stable or beta
+        if: ${{ !(env.RELEASING == 'stable' || env.RELEASING == 'beta') }}
+        run: |
+          echo We seem to be releasing `${RELEASING}`.
+          false
+
+      - name: Checkout cdn-release
+        uses: actions/checkout@v2
+        with:
+          repository: 'highlightjs/cdn-release'
+          path: 'cdn-release'
+          token: ${{ secrets.CDN_REPO_TOKEN }}
+          ref: ${{ env.BRANCH_NAME }}
+
+      - name: Build CDN package
+        run: node ./tools/build.js -t cdn :common
+
+      - name: Commmit & Push cdn-release ${{ env.TAG_NAME }}
+        working-directory: ./cdn-release
+        run: |
+          rm -r ./build
+          mv ../build/ ./build/
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git add ./build/
+          git commit -m'Update to version ${{ env.TAG_NAME }}'
+          git tag ${TAG_NAME}
+          git push -f --atomic origin ${BRANCH_NAME} ${TAG_NAME}
+
+      - name: Publish cdn-assets to NPM
+        id: publish_cdn
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          check-version: true
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./cdn-release/build/package.json
+          tag: ${{ env.NPM_TAG }}
+
+        # log.info('Updating CDN repo at %s' % settings.HLJS_CDN_SOURCE)
+        # run(['nodejs', 'tools/build.js', '--target', 'cdn', ':common'])
+        # os.chdir(settings.HLJS_CDN_SOURCE)
+        # run(['git', 'pull', '-f'])
+        # lines = run(['git', '--git-dir', os.path.join(settings.HLJS_CDN_SOURCE, '.git'), 'tag'])
+        # build_dir = os.path.join(settings.HLJS_CDN_SOURCE, 'build')
+        # if version in lines:
+        #     log.info('Tag %s already exists in the local CDN repo' % version)
+        # else:
+        #     if os.path.exists(build_dir):
+        #         shutil.rmtree(build_dir)
+        #     shutil.move(os.path.join(settings.HLJS_SOURCE, 'build'), build_dir)
+        #     run(['git', 'add', '.'])
+        #     run(['git', 'commit', '-m', 'Update to version %s' % version])
+        #     run(['git', 'tag', version])
+        # run(['git', 'push'])
+        # run(['git', 'push', '--tags'])
+        # npm_publish(build_dir)
+        # os.chdir(settings.HLJS_SOURCE)
diff --git a/.gitignore b/.gitignore
index 52ed616381..c61bf80d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ extra/
 
 # misc
 /work
+/website

From d2bf6352cfcd59231708eeeddf0eafe2f49d9280 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sat, 14 Nov 2020 23:16:14 -0500
Subject: [PATCH 166/223] bump 10.4.0-beta1

---
 CHANGES.md        | 8 +++++++-
 docs/conf.py      | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e6e1f1f4a9..0b0a0ba6cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-## Version 10.4.0 (a work in process)
+## Version 10.4.0-beta1
 
 Parser:
 
@@ -22,6 +22,11 @@ New Languages:
 
 Language Improvements:
 
+- enh(autodetect) Over 30+ improvements to auto-detect (#2745) [Josh Goebel][]
+    - 4-5% improvement in auto-detect against large sample set
+    - properties, angelscript, lsl, javascript, n1ql, ocaml, ruby
+    - protobuf, hy, scheme, crystal, yaml, r, vbscript, groovy
+    - python, java, php, lisp, matlab, clojure, csharp, css
 - fix(r) fixed keywords not properly spaced (#2852) [Josh Goebel][]
 - fix(javascript) fix potential catastrophic backtracking (#2852) [Josh Goebel][]
 - fix(livescript) fix potential catastrophic backtracking (#2852) [Josh Goebel][]
@@ -61,6 +66,7 @@ New themes:
 - *StackOverflow Dark* by [Jan Pilzer][]
 - *StackOverflow Light* by [Jan Pilzer][]
 
+[Brad Chamberlain]: https://github.com/bradcray
 [Marat Nagayev]: https://github.com/nagayev
 [Fredrik Ekre]: https://github.com/fredrikekre
 [Richard Gibson]: https://github.com/gibson042
diff --git a/docs/conf.py b/docs/conf.py
index 60dd5aa513..1094886b3f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = '10.3.1'
+release = '10.4.0-beta1'
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/package-lock.json b/package-lock.json
index caf12c145f..e95bef2389 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.3.99",
+  "version": "10.4.0-beta1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5241075128..311b83c7b2 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.3.99",
+  "version": "10.4.0-beta1",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"

From 31a69490cef34aad21fcb2f0cabc41e513b20a2a Mon Sep 17 00:00:00 2001
From: RedGuy12 <61329810+RedGuy12@users.noreply.github.com>
Date: Sun, 15 Nov 2020 09:46:48 -0600
Subject: [PATCH 167/223] chore(docs) Add BBcode to SUPPORTED_LANGUAGES (#2867)

---
 CHANGES.md             | 2 ++
 SUPPORTED_LANGUAGES.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 0b0a0ba6cd..d742756157 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Parser:
 New Languages:
 
 - Added 3rd party Chapel grammar to SUPPORTED_LANGUAGES (#2806) [Brad Chamberlain][]
+- Added BBCode grammar to SUPPORTED_LANGUAGES (#2867) [Paul Reid][]
 - enh(javascript) Added `node-repl` for Node.js REPL sessions (#2792) [Marat Nagayev][]
 
 Language Improvements:
@@ -78,6 +79,7 @@ New themes:
 [Patrick Scheibe]: https://github.com/halirutan
 [Kyle Brown]: https://github.com/kylebrown9
 [Marcus Ortiz]: https://github.com/mportiz08
+[Paul Reid]: https://github.com/RedGuy12
 
 
 ## Version 10.3.1
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 0fec40b51d..8c4661ac98 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -29,6 +29,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | Awk                     | awk, mawk, nawk, gawk  |         |
 | Bash                    | bash, sh, zsh          |         |
 | Basic                   | basic                  |         |
+| BBCode                  | bbcode                 | [highlightjs-bbcode](https://github.com/RedGuy7/highlightjs-bbcode) |
 | BNF                     | bnf                    |         |
 | Brainfuck               | brainfuck, bf          |         |
 | C#                      | csharp, cs             |         |

From 7fc446c51fb3a8c7df6715e913597048d3bfcfb5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 15 Nov 2020 11:37:57 -0500
Subject: [PATCH 168/223] chore(build) tighter terser opts, saves ~50 bytes
 gzipped

---
 tools/build_config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/build_config.js b/tools/build_config.js
index ad103a20d7..9cb9cd2697 100644
--- a/tools/build_config.js
+++ b/tools/build_config.js
@@ -60,6 +60,8 @@ module.exports = {
       ascii_only: true
     },
     compress: {
+      ecma: 2015,
+      unsafe_arrows: true,
       passes: 2,
       unsafe: true,
       warnings: true,

From 3375ec6f64ca54bc2ea3e798439a28fce78ade8b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 15 Nov 2020 11:39:57 -0500
Subject: [PATCH 169/223] chore(docs) add beta badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 014f73a657..3a1be89561 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Highlight.js
 
 [![latest version](https://badgen.net/npm/v/highlight.js?label=latest)](https://www.npmjs.com/package/highlight.js)
+[![beta](https://badgen.net/npm/v/highlight.js/beta)](https://www.npmjs.com/package/highlight.js)
 [![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/master/LICENSE)
 [![install size](https://badgen.net/packagephobia/install/highlight.js?label=npm+install)](https://packagephobia.now.sh/result?p=highlight.js)
 ![minified](https://img.shields.io/github/size/highlightjs/cdn-release/build/highlight.min.js?label=minified)

From c36d5aec8b2b230db2156ebbf81f453c50fb67f6 Mon Sep 17 00:00:00 2001
From: Guillaume Grossetie <g.grossetie@gmail.com>
Date: Sun, 15 Nov 2020 17:48:13 +0100
Subject: [PATCH 170/223] enh(shell) Support multiline commands (#2861)

---
 AUTHORS.txt                                       |  1 +
 CHANGES.md                                        |  2 ++
 src/languages/shell.js                            |  7 +++++--
 test/markup/shell/command-continuation.expect.txt | 14 ++++++++++++++
 test/markup/shell/command-continuation.txt        | 14 ++++++++++++++
 test/markup/shell/simple.expect.txt               |  1 +
 test/markup/shell/simple.txt                      |  1 +
 test/markup/shell/single.expect.txt               |  1 +
 test/markup/shell/single.txt                      |  1 +
 9 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 test/markup/shell/command-continuation.expect.txt
 create mode 100644 test/markup/shell/command-continuation.txt
 create mode 100644 test/markup/shell/simple.expect.txt
 create mode 100644 test/markup/shell/simple.txt
 create mode 100644 test/markup/shell/single.expect.txt
 create mode 100644 test/markup/shell/single.txt

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1432d17ca0..68d7233d31 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -309,3 +309,4 @@ Contributors:
 - Patrick Scheibe <patrick@halirutan.de>
 - Kyle Brown <kylebrown9@github>
 - Marcus Ortiz <mportiz08@gmail.com>
+- Guillaume Grossetie <ggrossetie@yuzutech.fr>
diff --git a/CHANGES.md b/CHANGES.md
index d742756157..e5197e6b04 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ New Languages:
 
 Language Improvements:
 
+- enh(shell) Add support for multiline commands with line continuation `\` (#2861) [Guillaume Grossetie][]
 - enh(autodetect) Over 30+ improvements to auto-detect (#2745) [Josh Goebel][]
     - 4-5% improvement in auto-detect against large sample set
     - properties, angelscript, lsl, javascript, n1ql, ocaml, ruby
@@ -67,6 +68,7 @@ New themes:
 - *StackOverflow Dark* by [Jan Pilzer][]
 - *StackOverflow Light* by [Jan Pilzer][]
 
+[Guillaume Grossetie]: https://github.com/mogztter
 [Brad Chamberlain]: https://github.com/bradcray
 [Marat Nagayev]: https://github.com/nagayev
 [Fredrik Ekre]: https://github.com/fredrikekre
diff --git a/src/languages/shell.js b/src/languages/shell.js
index 3a1bc033ad..7e833ee768 100644
--- a/src/languages/shell.js
+++ b/src/languages/shell.js
@@ -3,8 +3,10 @@ Language: Shell Session
 Requires: bash.js
 Author: TSUYUSATO Kitsune <make.just.on@gmail.com>
 Category: common
+Audit: 2020
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'Shell Session',
@@ -12,9 +14,10 @@ export default function(hljs) {
     contains: [
       {
         className: 'meta',
-        begin: '^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]',
+        begin: /^\s{0,3}[/\w\d[\]()@-]*[>%$#]/,
         starts: {
-          end: '$', subLanguage: 'bash'
+          end: /[^\\](?=\s*$)/,
+          subLanguage: 'bash'
         }
       }
     ]
diff --git a/test/markup/shell/command-continuation.expect.txt b/test/markup/shell/command-continuation.expect.txt
new file mode 100644
index 0000000000..83a2637b16
--- /dev/null
+++ b/test/markup/shell/command-continuation.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-meta">$</span><span class="bash"> docker run \
+      --publish=7474:7474 --publish=7687:7687 \
+      --volume=/neo4j/data:/data \
+      --volume=/neo4j/plugins:/plugins \
+      --volume=/neo4j/conf:/conf \
+      --volume=/logs/neo4j:/logs \
+      --user=<span class="hljs-string">&quot;<span class="hljs-subst">$(id -u neo4j)</span>:<span class="hljs-subst">$(id -g neo4j)</span>&quot;</span> \
+      --group-add=<span class="hljs-variable">$groups</span> \
+      neo4j:3.4</span>
+<span class="hljs-meta">&gt;</span><span class="bash"> /bin/cat \.travis.yml\
+ -b | head -n1</span>
+     1	language: node_js
+<span class="hljs-meta">&gt;</span><span class="bash"> <span class="hljs-built_in">echo</span> <span class="hljs-string">&#x27;hello&#x27;</span></span>
+hello
diff --git a/test/markup/shell/command-continuation.txt b/test/markup/shell/command-continuation.txt
new file mode 100644
index 0000000000..1c3a443c2e
--- /dev/null
+++ b/test/markup/shell/command-continuation.txt
@@ -0,0 +1,14 @@
+$ docker run \
+      --publish=7474:7474 --publish=7687:7687 \
+      --volume=/neo4j/data:/data \
+      --volume=/neo4j/plugins:/plugins \
+      --volume=/neo4j/conf:/conf \
+      --volume=/logs/neo4j:/logs \
+      --user="$(id -u neo4j):$(id -g neo4j)" \
+      --group-add=$groups \
+      neo4j:3.4
+> /bin/cat \.travis.yml\
+ -b | head -n1
+     1	language: node_js
+> echo 'hello'
+hello
diff --git a/test/markup/shell/simple.expect.txt b/test/markup/shell/simple.expect.txt
new file mode 100644
index 0000000000..8aa9c49e6f
--- /dev/null
+++ b/test/markup/shell/simple.expect.txt
@@ -0,0 +1 @@
+<span class="hljs-meta">&gt;</span><span class="bash"> /bin/sh</span>
diff --git a/test/markup/shell/simple.txt b/test/markup/shell/simple.txt
new file mode 100644
index 0000000000..8297a69a5c
--- /dev/null
+++ b/test/markup/shell/simple.txt
@@ -0,0 +1 @@
+> /bin/sh
diff --git a/test/markup/shell/single.expect.txt b/test/markup/shell/single.expect.txt
new file mode 100644
index 0000000000..093bdaa908
--- /dev/null
+++ b/test/markup/shell/single.expect.txt
@@ -0,0 +1 @@
+<span class="hljs-meta">$</span><span class="bash"> <span class="hljs-built_in">echo</span> <span class="hljs-string">&quot;<span class="hljs-variable">$HOME</span>&quot;</span> -n</span>
diff --git a/test/markup/shell/single.txt b/test/markup/shell/single.txt
new file mode 100644
index 0000000000..b05aae75fd
--- /dev/null
+++ b/test/markup/shell/single.txt
@@ -0,0 +1 @@
+$ echo "$HOME" -n

From 4fed71d45bd2b0615013d533bfdeab66d0953f22 Mon Sep 17 00:00:00 2001
From: Guillaume Grossetie <ggrossetie@gmail.com>
Date: Sun, 15 Nov 2020 20:00:41 +0100
Subject: [PATCH 171/223] enh(shell) recognize prompts that contain tilde(s)
 (#2859)

Resolves #2858.
---
 CHANGES.md                                       | 1 +
 src/languages/shell.js                           | 5 ++++-
 test/markup/shell/prompt-with-tilde.expected.txt | 4 ++++
 test/markup/shell/prompt-with-tilde.txt          | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 test/markup/shell/prompt-with-tilde.expected.txt
 create mode 100644 test/markup/shell/prompt-with-tilde.txt

diff --git a/CHANGES.md b/CHANGES.md
index e5197e6b04..afdeb16cd9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ New Languages:
 
 Language Improvements:
 
+- enh(shell) Recognize prompts which contain tilde `~` (#2859) [Guillaume Grossetie][]
 - enh(shell) Add support for multiline commands with line continuation `\` (#2861) [Guillaume Grossetie][]
 - enh(autodetect) Over 30+ improvements to auto-detect (#2745) [Josh Goebel][]
     - 4-5% improvement in auto-detect against large sample set
diff --git a/src/languages/shell.js b/src/languages/shell.js
index 7e833ee768..2c713da19d 100644
--- a/src/languages/shell.js
+++ b/src/languages/shell.js
@@ -14,7 +14,10 @@ export default function(hljs) {
     contains: [
       {
         className: 'meta',
-        begin: /^\s{0,3}[/\w\d[\]()@-]*[>%$#]/,
+        // We cannot add \s (spaces) in the regular expression otherwise it will be too broad and produce unexpected result.
+        // For instance, in the following example, it would match "echo /path/to/home >" as a prompt:
+        // echo /path/to/home > t.exe
+        begin: /^\s{0,3}[/~\w\d[\]()@-]*[>%$#]/,
         starts: {
           end: /[^\\](?=\s*$)/,
           subLanguage: 'bash'
diff --git a/test/markup/shell/prompt-with-tilde.expected.txt b/test/markup/shell/prompt-with-tilde.expected.txt
new file mode 100644
index 0000000000..57af2ff5de
--- /dev/null
+++ b/test/markup/shell/prompt-with-tilde.expected.txt
@@ -0,0 +1,4 @@
+<span class="hljs-meta">~/docs&gt;</span><span class="bash"> cat readme.adoc</span>
+= Highlight.js
+
+Highlight.js is a syntax highlighter written in JavaScript.
diff --git a/test/markup/shell/prompt-with-tilde.txt b/test/markup/shell/prompt-with-tilde.txt
new file mode 100644
index 0000000000..ddbfcf84e3
--- /dev/null
+++ b/test/markup/shell/prompt-with-tilde.txt
@@ -0,0 +1,4 @@
+~/docs> cat readme.adoc
+= Highlight.js
+
+Highlight.js is a syntax highlighter written in JavaScript.

From 6698b8a5959c398568c7c437fe028a6e3167c776 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Mon, 16 Nov 2020 22:50:38 -0500
Subject: [PATCH 172/223] chore(tests) auto-generated markup tests for all
 languages (#2862)

---
 test/markup/1c/default.expect.txt             |  30 ++++
 test/markup/1c/default.txt                    |  30 ++++
 test/markup/ada/default.expect.txt            |  17 ++
 test/markup/ada/default.txt                   |  17 ++
 test/markup/angelscript/default.expect.txt    |  62 +++++++
 test/markup/angelscript/default.txt           |  62 +++++++
 test/markup/apache/default.expect.txt         |  19 +++
 test/markup/apache/default.txt                |  19 +++
 test/markup/applescript/default.expect.txt    |  14 ++
 test/markup/applescript/default.txt           |  14 ++
 test/markup/asciidoc/default.expect.txt       |  65 ++++++++
 test/markup/asciidoc/default.txt              |  65 ++++++++
 test/markup/autohotkey/default.expect.txt     |  24 +++
 test/markup/autohotkey/default.txt            |  24 +++
 test/markup/autoit/default.expect.txt         |  16 ++
 test/markup/autoit/default.txt                |  16 ++
 test/markup/avrasm/default.expect.txt         |  19 +++
 test/markup/avrasm/default.txt                |  19 +++
 test/markup/awk/default.expect.txt            |  16 ++
 test/markup/awk/default.txt                   |  16 ++
 test/markup/axapta/default.expect.txt         |  32 ++++
 test/markup/axapta/default.txt                |  32 ++++
 test/markup/basic/default.expect.txt          |  22 +++
 test/markup/basic/default.txt                 |  22 +++
 test/markup/bnf/default.expect.txt            |   8 +
 test/markup/bnf/default.txt                   |   8 +
 test/markup/brainfuck/default.expect.txt      |  17 ++
 test/markup/brainfuck/default.txt             |  17 ++
 test/markup/cal/default.expect.txt            |  33 ++++
 test/markup/cal/default.txt                   |  33 ++++
 test/markup/capnproto/default.expect.txt      |  55 ++++++
 test/markup/capnproto/default.txt             |  55 ++++++
 test/markup/clean/default.expect.txt          |  30 ++++
 test/markup/clean/default.txt                 |  30 ++++
 test/markup/cmake/default.expect.txt          |  19 +++
 test/markup/cmake/default.txt                 |  19 +++
 test/markup/coq/default.expect.txt            |  41 +++++
 test/markup/coq/default.txt                   |  41 +++++
 test/markup/crmsh/default.expect.txt          |  48 ++++++
 test/markup/crmsh/default.txt                 |  48 ++++++
 test/markup/csp/default.expect.txt            |   5 +
 test/markup/csp/default.txt                   |   5 +
 test/markup/d/default.expect.txt              |  44 +++++
 test/markup/d/default.txt                     |  44 +++++
 test/markup/django/default.expect.txt         |  16 ++
 test/markup/django/default.txt                |  15 ++
 test/markup/dns/default.expect.txt            |  17 ++
 test/markup/dns/default.txt                   |  17 ++
 test/markup/dts/default.expect.txt            |  71 ++++++++
 test/markup/dts/default.txt                   |  71 ++++++++
 test/markup/dust/default.expect.txt           |   8 +
 test/markup/dust/default.txt                  |   7 +
 test/markup/elm/default.expect.txt            |  22 +++
 test/markup/elm/default.txt                   |  22 +++
 test/markup/erb/default.expect.txt            |  11 ++
 test/markup/erb/default.txt                   |  10 ++
 test/markup/erlang-repl/default.expect.txt    |  27 +++
 test/markup/erlang-repl/default.txt           |  27 +++
 test/markup/fix/default.expect.txt            |   4 +
 test/markup/fix/default.txt                   |   4 +
 test/markup/flix/default.expect.txt           |  49 ++++++
 test/markup/flix/default.txt                  |  49 ++++++
 test/markup/gams/default.expect.txt           |  31 ++++
 test/markup/gams/default.txt                  |  31 ++++
 test/markup/gcode/default.expect.txt          |  31 ++++
 test/markup/gcode/default.txt                 |  31 ++++
 test/markup/gherkin/default.expect.txt        |  25 +++
 test/markup/gherkin/default.txt               |  25 +++
 test/markup/glsl/default.expect.txt           |  37 +++++
 test/markup/glsl/default.txt                  |  37 +++++
 test/markup/gml/default.expect.txt            |  22 +++
 test/markup/gml/default.txt                   |  22 +++
 test/markup/gradle/default.expect.txt         |  62 +++++++
 test/markup/gradle/default.txt                |  62 +++++++
 test/markup/haml/default.expect.txt           |  14 ++
 test/markup/haml/default.txt                  |  14 ++
 test/markup/haxe/default.expect.txt           | 142 ++++++++++++++++
 test/markup/haxe/default.txt                  | 142 ++++++++++++++++
 test/markup/hsp/default.expect.txt            |  23 +++
 test/markup/hsp/default.txt                   |  23 +++
 test/markup/hy/default.expect.txt             |  37 +++++
 test/markup/hy/default.txt                    |  37 +++++
 test/markup/inform7/default.expect.txt        |  24 +++
 test/markup/inform7/default.txt               |  24 +++
 test/markup/irpf90/default.expect.txt         |  37 +++++
 test/markup/irpf90/default.txt                |  37 +++++
 test/markup/isbl/default.expect.txt           |  27 +++
 test/markup/isbl/default.txt                  |  27 +++
 test/markup/jboss-cli/default.expect.txt      |  24 +++
 test/markup/jboss-cli/default.txt             |  24 +++
 test/markup/julia-repl/default.expect.txt     |  36 ++++
 test/markup/julia-repl/default.txt            |  36 ++++
 test/markup/julia/default.expect.txt          |  99 +++++++++++
 test/markup/julia/default.txt                 |  99 +++++++++++
 test/markup/leaf/default.expect.txt           |  21 +++
 test/markup/leaf/default.txt                  |  21 +++
 test/markup/livecodeserver/default.expect.txt |  30 ++++
 test/markup/livecodeserver/default.txt        |  30 ++++
 test/markup/livescript/default.expect.txt     |  66 ++++++++
 test/markup/livescript/default.txt            |  66 ++++++++
 test/markup/llvm/default.expect.txt           |  61 +++++++
 test/markup/llvm/default.txt                  |  61 +++++++
 test/markup/lsl/default.expect.txt            |  12 ++
 test/markup/lsl/default.txt                   |  12 ++
 test/markup/lua/default.expect.txt            |  32 ++++
 test/markup/lua/default.txt                   |  32 ++++
 test/markup/makefile/default.expect.txt       |  13 ++
 test/markup/makefile/default.txt              |  13 ++
 test/markup/mathematica/default.expect.txt    |  79 +++++++++
 test/markup/mathematica/default.txt           |  79 +++++++++
 test/markup/mel/default.expect.txt            |  25 +++
 test/markup/mel/default.txt                   |  25 +++
 test/markup/mercury/default.expect.txt        |  24 +++
 test/markup/mercury/default.txt               |  24 +++
 test/markup/mipsasm/default.expect.txt        |  22 +++
 test/markup/mipsasm/default.txt               |  22 +++
 test/markup/mizar/default.expect.txt          |  86 ++++++++++
 test/markup/mizar/default.txt                 |  86 ++++++++++
 test/markup/mojolicious/default.expect.txt    |  21 +++
 test/markup/mojolicious/default.txt           |  20 +++
 test/markup/monkey/default.expect.txt         |  37 +++++
 test/markup/monkey/default.txt                |  37 +++++
 test/markup/moonscript/default.expect.txt     |  37 +++++
 test/markup/moonscript/default.txt            |  37 +++++
 test/markup/n1ql/default.expect.txt           |  19 +++
 test/markup/n1ql/default.txt                  |  19 +++
 test/markup/nginx/default.expect.txt          |  47 ++++++
 test/markup/nginx/default.txt                 |  47 ++++++
 test/markup/nim/default.expect.txt            |  21 +++
 test/markup/nim/default.txt                   |  21 +++
 test/markup/nix/default.expect.txt            |  24 +++
 test/markup/nix/default.txt                   |  24 +++
 test/markup/nsis/default.expect.txt           |  37 +++++
 test/markup/nsis/default.txt                  |  37 +++++
 test/markup/openscad/default.expect.txt       |  15 ++
 test/markup/openscad/default.txt              |  15 ++
 test/markup/oxygene/default.expect.txt        |  56 +++++++
 test/markup/oxygene/default.txt               |  56 +++++++
 test/markup/parser3/default.expect.txt        |  35 ++++
 test/markup/parser3/default.txt               |  34 ++++
 test/markup/perl/default.expect.txt           |  42 +++++
 test/markup/perl/default.txt                  |  41 +++++
 test/markup/pf/default.expect.txt             |  43 +++++
 test/markup/pf/default.txt                    |  43 +++++
 test/markup/php-template/default.expect.txt   |   9 +
 test/markup/php-template/default.txt          |   8 +
 test/markup/plaintext/default.expect.txt      |   6 +
 test/markup/plaintext/default.txt             |   6 +
 test/markup/processing/default.expect.txt     |  17 ++
 test/markup/processing/default.txt            |  17 ++
 test/markup/profile/default.expect.txt        |   8 +
 test/markup/profile/default.txt               |   8 +
 test/markup/prolog/default.expect.txt         |  11 ++
 test/markup/prolog/default.txt                |  11 ++
 test/markup/puppet/default.expect.txt         |  33 ++++
 test/markup/puppet/default.txt                |  33 ++++
 test/markup/purebasic/default.expect.txt      |  29 ++++
 test/markup/purebasic/default.txt             |  29 ++++
 test/markup/q/default.expect.txt              |   9 +
 test/markup/q/default.txt                     |   9 +
 test/markup/qml/default.expect.txt            |  49 ++++++
 test/markup/qml/default.txt                   |  49 ++++++
 test/markup/rib/default.expect.txt            |  25 +++
 test/markup/rib/default.txt                   |  25 +++
 test/markup/roboconf/default.expect.txt       |  54 ++++++
 test/markup/roboconf/default.txt              |  54 ++++++
 test/markup/routeros/default.expect.txt       |  17 ++
 test/markup/routeros/default.txt              |  17 ++
 test/markup/rsl/default.expect.txt            |  15 ++
 test/markup/rsl/default.txt                   |  15 ++
 test/markup/ruleslanguage/default.expect.txt  |  36 ++++
 test/markup/ruleslanguage/default.txt         |  36 ++++
 test/markup/sas/default.expect.txt            |  48 ++++++
 test/markup/sas/default.txt                   |  48 ++++++
 test/markup/scilab/default.expect.txt         |  14 ++
 test/markup/scilab/default.txt                |  14 ++
 test/markup/scss/default.expect.txt           |  73 ++++++++
 test/markup/scss/default.txt                  |  73 ++++++++
 test/markup/smali/default.expect.txt          |  75 +++++++++
 test/markup/smali/default.txt                 |  75 +++++++++
 test/markup/smalltalk/default.expect.txt      |  39 +++++
 test/markup/smalltalk/default.txt             |  39 +++++
 test/markup/sml/default.expect.txt            |  26 +++
 test/markup/sml/default.txt                   |  26 +++
 test/markup/sqf/default.expect.txt            |  16 ++
 test/markup/sqf/default.txt                   |  16 ++
 test/markup/stan/default.expect.txt           |  39 +++++
 test/markup/stan/default.txt                  |  39 +++++
 test/markup/step21/default.expect.txt         |  33 ++++
 test/markup/step21/default.txt                |  33 ++++
 test/markup/stylus/default.expect.txt         |  28 ++++
 test/markup/stylus/default.txt                |  28 ++++
 test/markup/taggerscript/default.expect.txt   |  12 ++
 test/markup/taggerscript/default.txt          |  12 ++
 test/markup/tcl/default.expect.txt            |  26 +++
 test/markup/tcl/default.txt                   |  26 +++
 test/markup/thrift/default.expect.txt         |  40 +++++
 test/markup/thrift/default.txt                |  40 +++++
 test/markup/tp/default.expect.txt             | 156 ++++++++++++++++++
 test/markup/tp/default.txt                    | 156 ++++++++++++++++++
 test/markup/vala/default.expect.txt           |  46 ++++++
 test/markup/vala/default.txt                  |  46 ++++++
 test/markup/vbnet/default.expect.txt          |  42 +++++
 test/markup/vbnet/default.txt                 |  42 +++++
 test/markup/vbscript-html/default.expect.txt  |   8 +
 test/markup/vbscript-html/default.txt         |   7 +
 test/markup/vbscript/default.expect.txt       |  29 ++++
 test/markup/vbscript/default.txt              |  29 ++++
 test/markup/vhdl/default.expect.txt           |  41 +++++
 test/markup/vhdl/default.txt                  |  41 +++++
 test/markup/xl/default.expect.txt             |  28 ++++
 test/markup/xl/default.txt                    |  28 ++++
 212 files changed, 7140 insertions(+)
 create mode 100644 test/markup/1c/default.expect.txt
 create mode 100644 test/markup/1c/default.txt
 create mode 100644 test/markup/ada/default.expect.txt
 create mode 100644 test/markup/ada/default.txt
 create mode 100644 test/markup/angelscript/default.expect.txt
 create mode 100644 test/markup/angelscript/default.txt
 create mode 100644 test/markup/apache/default.expect.txt
 create mode 100644 test/markup/apache/default.txt
 create mode 100644 test/markup/applescript/default.expect.txt
 create mode 100644 test/markup/applescript/default.txt
 create mode 100644 test/markup/asciidoc/default.expect.txt
 create mode 100644 test/markup/asciidoc/default.txt
 create mode 100644 test/markup/autohotkey/default.expect.txt
 create mode 100644 test/markup/autohotkey/default.txt
 create mode 100644 test/markup/autoit/default.expect.txt
 create mode 100644 test/markup/autoit/default.txt
 create mode 100644 test/markup/avrasm/default.expect.txt
 create mode 100644 test/markup/avrasm/default.txt
 create mode 100644 test/markup/awk/default.expect.txt
 create mode 100644 test/markup/awk/default.txt
 create mode 100644 test/markup/axapta/default.expect.txt
 create mode 100644 test/markup/axapta/default.txt
 create mode 100644 test/markup/basic/default.expect.txt
 create mode 100644 test/markup/basic/default.txt
 create mode 100644 test/markup/bnf/default.expect.txt
 create mode 100644 test/markup/bnf/default.txt
 create mode 100644 test/markup/brainfuck/default.expect.txt
 create mode 100644 test/markup/brainfuck/default.txt
 create mode 100644 test/markup/cal/default.expect.txt
 create mode 100644 test/markup/cal/default.txt
 create mode 100644 test/markup/capnproto/default.expect.txt
 create mode 100644 test/markup/capnproto/default.txt
 create mode 100644 test/markup/clean/default.expect.txt
 create mode 100644 test/markup/clean/default.txt
 create mode 100644 test/markup/cmake/default.expect.txt
 create mode 100644 test/markup/cmake/default.txt
 create mode 100644 test/markup/coq/default.expect.txt
 create mode 100644 test/markup/coq/default.txt
 create mode 100644 test/markup/crmsh/default.expect.txt
 create mode 100644 test/markup/crmsh/default.txt
 create mode 100644 test/markup/csp/default.expect.txt
 create mode 100644 test/markup/csp/default.txt
 create mode 100644 test/markup/d/default.expect.txt
 create mode 100644 test/markup/d/default.txt
 create mode 100644 test/markup/django/default.expect.txt
 create mode 100644 test/markup/django/default.txt
 create mode 100644 test/markup/dns/default.expect.txt
 create mode 100644 test/markup/dns/default.txt
 create mode 100644 test/markup/dts/default.expect.txt
 create mode 100644 test/markup/dts/default.txt
 create mode 100644 test/markup/dust/default.expect.txt
 create mode 100644 test/markup/dust/default.txt
 create mode 100644 test/markup/elm/default.expect.txt
 create mode 100644 test/markup/elm/default.txt
 create mode 100644 test/markup/erb/default.expect.txt
 create mode 100644 test/markup/erb/default.txt
 create mode 100644 test/markup/erlang-repl/default.expect.txt
 create mode 100644 test/markup/erlang-repl/default.txt
 create mode 100644 test/markup/fix/default.expect.txt
 create mode 100644 test/markup/fix/default.txt
 create mode 100644 test/markup/flix/default.expect.txt
 create mode 100644 test/markup/flix/default.txt
 create mode 100644 test/markup/gams/default.expect.txt
 create mode 100644 test/markup/gams/default.txt
 create mode 100644 test/markup/gcode/default.expect.txt
 create mode 100644 test/markup/gcode/default.txt
 create mode 100644 test/markup/gherkin/default.expect.txt
 create mode 100644 test/markup/gherkin/default.txt
 create mode 100644 test/markup/glsl/default.expect.txt
 create mode 100644 test/markup/glsl/default.txt
 create mode 100644 test/markup/gml/default.expect.txt
 create mode 100644 test/markup/gml/default.txt
 create mode 100644 test/markup/gradle/default.expect.txt
 create mode 100644 test/markup/gradle/default.txt
 create mode 100644 test/markup/haml/default.expect.txt
 create mode 100644 test/markup/haml/default.txt
 create mode 100644 test/markup/haxe/default.expect.txt
 create mode 100644 test/markup/haxe/default.txt
 create mode 100644 test/markup/hsp/default.expect.txt
 create mode 100644 test/markup/hsp/default.txt
 create mode 100644 test/markup/hy/default.expect.txt
 create mode 100644 test/markup/hy/default.txt
 create mode 100644 test/markup/inform7/default.expect.txt
 create mode 100644 test/markup/inform7/default.txt
 create mode 100644 test/markup/irpf90/default.expect.txt
 create mode 100644 test/markup/irpf90/default.txt
 create mode 100644 test/markup/isbl/default.expect.txt
 create mode 100644 test/markup/isbl/default.txt
 create mode 100644 test/markup/jboss-cli/default.expect.txt
 create mode 100644 test/markup/jboss-cli/default.txt
 create mode 100644 test/markup/julia-repl/default.expect.txt
 create mode 100644 test/markup/julia-repl/default.txt
 create mode 100644 test/markup/julia/default.expect.txt
 create mode 100644 test/markup/julia/default.txt
 create mode 100644 test/markup/leaf/default.expect.txt
 create mode 100644 test/markup/leaf/default.txt
 create mode 100644 test/markup/livecodeserver/default.expect.txt
 create mode 100644 test/markup/livecodeserver/default.txt
 create mode 100644 test/markup/livescript/default.expect.txt
 create mode 100644 test/markup/livescript/default.txt
 create mode 100644 test/markup/llvm/default.expect.txt
 create mode 100644 test/markup/llvm/default.txt
 create mode 100644 test/markup/lsl/default.expect.txt
 create mode 100644 test/markup/lsl/default.txt
 create mode 100644 test/markup/lua/default.expect.txt
 create mode 100644 test/markup/lua/default.txt
 create mode 100644 test/markup/makefile/default.expect.txt
 create mode 100644 test/markup/makefile/default.txt
 create mode 100644 test/markup/mathematica/default.expect.txt
 create mode 100644 test/markup/mathematica/default.txt
 create mode 100644 test/markup/mel/default.expect.txt
 create mode 100644 test/markup/mel/default.txt
 create mode 100644 test/markup/mercury/default.expect.txt
 create mode 100644 test/markup/mercury/default.txt
 create mode 100644 test/markup/mipsasm/default.expect.txt
 create mode 100644 test/markup/mipsasm/default.txt
 create mode 100644 test/markup/mizar/default.expect.txt
 create mode 100644 test/markup/mizar/default.txt
 create mode 100644 test/markup/mojolicious/default.expect.txt
 create mode 100644 test/markup/mojolicious/default.txt
 create mode 100644 test/markup/monkey/default.expect.txt
 create mode 100644 test/markup/monkey/default.txt
 create mode 100644 test/markup/moonscript/default.expect.txt
 create mode 100644 test/markup/moonscript/default.txt
 create mode 100644 test/markup/n1ql/default.expect.txt
 create mode 100644 test/markup/n1ql/default.txt
 create mode 100644 test/markup/nginx/default.expect.txt
 create mode 100644 test/markup/nginx/default.txt
 create mode 100644 test/markup/nim/default.expect.txt
 create mode 100644 test/markup/nim/default.txt
 create mode 100644 test/markup/nix/default.expect.txt
 create mode 100644 test/markup/nix/default.txt
 create mode 100644 test/markup/nsis/default.expect.txt
 create mode 100644 test/markup/nsis/default.txt
 create mode 100644 test/markup/openscad/default.expect.txt
 create mode 100644 test/markup/openscad/default.txt
 create mode 100644 test/markup/oxygene/default.expect.txt
 create mode 100644 test/markup/oxygene/default.txt
 create mode 100644 test/markup/parser3/default.expect.txt
 create mode 100644 test/markup/parser3/default.txt
 create mode 100644 test/markup/perl/default.expect.txt
 create mode 100644 test/markup/perl/default.txt
 create mode 100644 test/markup/pf/default.expect.txt
 create mode 100644 test/markup/pf/default.txt
 create mode 100644 test/markup/php-template/default.expect.txt
 create mode 100644 test/markup/php-template/default.txt
 create mode 100644 test/markup/plaintext/default.expect.txt
 create mode 100644 test/markup/plaintext/default.txt
 create mode 100644 test/markup/processing/default.expect.txt
 create mode 100644 test/markup/processing/default.txt
 create mode 100644 test/markup/profile/default.expect.txt
 create mode 100644 test/markup/profile/default.txt
 create mode 100644 test/markup/prolog/default.expect.txt
 create mode 100644 test/markup/prolog/default.txt
 create mode 100644 test/markup/puppet/default.expect.txt
 create mode 100644 test/markup/puppet/default.txt
 create mode 100644 test/markup/purebasic/default.expect.txt
 create mode 100644 test/markup/purebasic/default.txt
 create mode 100644 test/markup/q/default.expect.txt
 create mode 100644 test/markup/q/default.txt
 create mode 100644 test/markup/qml/default.expect.txt
 create mode 100644 test/markup/qml/default.txt
 create mode 100644 test/markup/rib/default.expect.txt
 create mode 100644 test/markup/rib/default.txt
 create mode 100644 test/markup/roboconf/default.expect.txt
 create mode 100644 test/markup/roboconf/default.txt
 create mode 100644 test/markup/routeros/default.expect.txt
 create mode 100644 test/markup/routeros/default.txt
 create mode 100644 test/markup/rsl/default.expect.txt
 create mode 100644 test/markup/rsl/default.txt
 create mode 100644 test/markup/ruleslanguage/default.expect.txt
 create mode 100644 test/markup/ruleslanguage/default.txt
 create mode 100644 test/markup/sas/default.expect.txt
 create mode 100644 test/markup/sas/default.txt
 create mode 100644 test/markup/scilab/default.expect.txt
 create mode 100644 test/markup/scilab/default.txt
 create mode 100644 test/markup/scss/default.expect.txt
 create mode 100644 test/markup/scss/default.txt
 create mode 100644 test/markup/smali/default.expect.txt
 create mode 100644 test/markup/smali/default.txt
 create mode 100644 test/markup/smalltalk/default.expect.txt
 create mode 100644 test/markup/smalltalk/default.txt
 create mode 100644 test/markup/sml/default.expect.txt
 create mode 100644 test/markup/sml/default.txt
 create mode 100644 test/markup/sqf/default.expect.txt
 create mode 100644 test/markup/sqf/default.txt
 create mode 100644 test/markup/stan/default.expect.txt
 create mode 100644 test/markup/stan/default.txt
 create mode 100644 test/markup/step21/default.expect.txt
 create mode 100644 test/markup/step21/default.txt
 create mode 100644 test/markup/stylus/default.expect.txt
 create mode 100644 test/markup/stylus/default.txt
 create mode 100644 test/markup/taggerscript/default.expect.txt
 create mode 100644 test/markup/taggerscript/default.txt
 create mode 100644 test/markup/tcl/default.expect.txt
 create mode 100644 test/markup/tcl/default.txt
 create mode 100644 test/markup/thrift/default.expect.txt
 create mode 100644 test/markup/thrift/default.txt
 create mode 100644 test/markup/tp/default.expect.txt
 create mode 100644 test/markup/tp/default.txt
 create mode 100644 test/markup/vala/default.expect.txt
 create mode 100644 test/markup/vala/default.txt
 create mode 100644 test/markup/vbnet/default.expect.txt
 create mode 100644 test/markup/vbnet/default.txt
 create mode 100644 test/markup/vbscript-html/default.expect.txt
 create mode 100644 test/markup/vbscript-html/default.txt
 create mode 100644 test/markup/vbscript/default.expect.txt
 create mode 100644 test/markup/vbscript/default.txt
 create mode 100644 test/markup/vhdl/default.expect.txt
 create mode 100644 test/markup/vhdl/default.txt
 create mode 100644 test/markup/xl/default.expect.txt
 create mode 100644 test/markup/xl/default.txt

diff --git a/test/markup/1c/default.expect.txt b/test/markup/1c/default.expect.txt
new file mode 100644
index 0000000000..0f51f27c6b
--- /dev/null
+++ b/test/markup/1c/default.expect.txt
@@ -0,0 +1,30 @@
+<span class="hljs-meta">#<span class="hljs-meta-keyword">ЗагрузитьИзФайла</span> ext_module.txt <span class="hljs-comment">// директива 7.7</span></span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">Если</span> <span class="hljs-meta-keyword">Клиент</span> <span class="hljs-meta-keyword">ИЛИ</span> <span class="hljs-meta-keyword">НаКлиенте</span> <span class="hljs-meta-keyword">Тогда</span> <span class="hljs-comment">// инструкции препроцессора</span></span>
+	<span class="hljs-meta">&amp;<span class="hljs-meta-keyword">НаКлиентеНаСервереБезКонтекста</span> <span class="hljs-comment">// директивы компиляции</span></span>
+	<span class="hljs-function">Функция <span class="hljs-title">ТолстыйКлиентОбычноеПриложение</span>(<span class="hljs-params"><span class="hljs-keyword">Знач</span> Параметр<span class="hljs-number">1</span> = <span class="hljs-literal">Неопределено</span></span>, <span class="hljs-comment">// комментарий</span>
+		<span class="hljs-params">Параметр2 = <span class="hljs-string">&quot;&quot;</span></span>, <span class="hljs-params">ПараметрN = <span class="hljs-number">123.45</span></span>, <span class="hljs-params">ПарамNN</span></span>) <span class="hljs-keyword">Экспорт</span> <span class="hljs-comment">// еще комментарий</span>
+		<span class="hljs-keyword">Попытка</span>
+			Результат_Булевы_Значения = <span class="hljs-keyword">Новый</span> <span class="hljs-type">Структура</span>(<span class="hljs-string">&quot;П1, П2&quot;</span>, <span class="hljs-literal">Истина</span>, <span class="hljs-literal">Ложь</span>, <span class="hljs-literal">NULL</span>, <span class="hljs-literal">Неопределено</span>);
+			<span class="hljs-keyword">Перейти</span> <span class="hljs-symbol">~МеткаGOTO</span>; <span class="hljs-comment">// комментарий</span>
+			РезультатТаблицаДат = <span class="hljs-keyword">Новый</span> <span class="hljs-type">ТаблицаЗначений</span>;
+			РезультатТаблицаДат.Колонки.Добавить(<span class="hljs-string">&quot;Колонка1&quot;</span>, 
+			<span class="hljs-keyword">Новый</span> <span class="hljs-type">ОписаниеТипов</span>(<span class="hljs-string">&quot;Дата&quot;</span>, , ,
+			<span class="hljs-keyword">Новый</span> <span class="hljs-type">КвалификаторыДаты</span>(<span class="hljs-class">ЧастиДаты</span>.ДатаВремя));
+			НС = РезультатТаблицаДат.Добавить(); НС[<span class="hljs-string">&quot;Колонка1&quot;</span>] = &#x27;<span class="hljs-number">20170101120000</span>&#x27;);
+		<span class="hljs-keyword">Исключение</span>
+			<span class="hljs-built_in">ОписаниеОшибки</span> = <span class="hljs-built_in">ОписаниеОшибки</span>(); <span class="hljs-comment">// встроенная функция</span>
+			Масс = <span class="hljs-keyword">Новый</span> <span class="hljs-type">Массив</span>; <span class="hljs-comment">// встроенный тип</span>
+			<span class="hljs-keyword">Для</span> <span class="hljs-keyword">Каждого</span> Значение <span class="hljs-keyword">Из</span> Масс <span class="hljs-keyword">Цикл</span>
+				<span class="hljs-built_in">Сообщить</span>(Значение + <span class="hljs-class">Символы</span>.ПС + <span class="hljs-string">&quot;</span>
+				<span class="hljs-string">|продолжение строки&quot;</span>); <span class="hljs-comment">// продолжение многострочной строки</span>
+				<span class="hljs-keyword">Продолжить</span>; <span class="hljs-keyword">Прервать</span>;
+			<span class="hljs-keyword">КонецЦикла</span>;
+			СправочникСсылка   = <span class="hljs-built_in">Справочники</span>.Языки.НайтиПоНаименованию(<span class="hljs-string">&quot;ru&quot;</span>); <span class="hljs-comment">// встроенные типы</span>
+			СправочникОбъект   = СправочникСсылка.ПолучитьОбъект();
+			ПеречислениеСсылка = <span class="hljs-built_in">Перечисления</span>.ВидыМодификацииДанных.Изменен;
+			<span class="hljs-keyword">ВызватьИсключение</span> <span class="hljs-built_in">ОписаниеОшибки</span>;
+		<span class="hljs-keyword">КонецПопытки</span>;
+		<span class="hljs-symbol">~МеткаGOTO</span>: <span class="hljs-comment">// еще комментарий</span>
+		ВД = <span class="hljs-class">ВидДвиженияБухгалтерии</span>.Дебет;
+	<span class="hljs-function">КонецФункции</span> <span class="hljs-comment">// ТолстыйКлиентОбычноеПриложение()</span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">КонецЕсли</span></span>
\ No newline at end of file
diff --git a/test/markup/1c/default.txt b/test/markup/1c/default.txt
new file mode 100644
index 0000000000..be0d86d009
--- /dev/null
+++ b/test/markup/1c/default.txt
@@ -0,0 +1,30 @@
+#ЗагрузитьИзФайла ext_module.txt // директива 7.7
+#Если Клиент ИЛИ НаКлиенте Тогда // инструкции препроцессора
+	&НаКлиентеНаСервереБезКонтекста // директивы компиляции
+	Функция ТолстыйКлиентОбычноеПриложение(Знач Параметр1 = Неопределено, // комментарий
+		Параметр2 = "", ПараметрN = 123.45, ПарамNN) Экспорт // еще комментарий
+		Попытка
+			Результат_Булевы_Значения = Новый Структура("П1, П2", Истина, Ложь, NULL, Неопределено);
+			Перейти ~МеткаGOTO; // комментарий
+			РезультатТаблицаДат = Новый ТаблицаЗначений;
+			РезультатТаблицаДат.Колонки.Добавить("Колонка1", 
+			Новый ОписаниеТипов("Дата", , ,
+			Новый КвалификаторыДаты(ЧастиДаты.ДатаВремя));
+			НС = РезультатТаблицаДат.Добавить(); НС["Колонка1"] = '20170101120000');
+		Исключение
+			ОписаниеОшибки = ОписаниеОшибки(); // встроенная функция
+			Масс = Новый Массив; // встроенный тип
+			Для Каждого Значение Из Масс Цикл
+				Сообщить(Значение + Символы.ПС + "
+				|продолжение строки"); // продолжение многострочной строки
+				Продолжить; Прервать;
+			КонецЦикла;
+			СправочникСсылка   = Справочники.Языки.НайтиПоНаименованию("ru"); // встроенные типы
+			СправочникОбъект   = СправочникСсылка.ПолучитьОбъект();
+			ПеречислениеСсылка = Перечисления.ВидыМодификацииДанных.Изменен;
+			ВызватьИсключение ОписаниеОшибки;
+		КонецПопытки;
+		~МеткаGOTO: // еще комментарий
+		ВД = ВидДвиженияБухгалтерии.Дебет;
+	КонецФункции // ТолстыйКлиентОбычноеПриложение()
+#КонецЕсли
\ No newline at end of file
diff --git a/test/markup/ada/default.expect.txt b/test/markup/ada/default.expect.txt
new file mode 100644
index 0000000000..0adc8946b3
--- /dev/null
+++ b/test/markup/ada/default.expect.txt
@@ -0,0 +1,17 @@
+<span class="hljs-keyword">package</span> <span class="hljs-keyword">body</span> <span class="hljs-title">Sqlite.Simple </span><span class="hljs-keyword">is</span>
+
+      Foo : <span class="hljs-type">int</span> := int<span class="hljs-symbol">&#x27;Size</span>;
+      Bar : <span class="hljs-type">int</span> := long<span class="hljs-symbol">&#x27;Size</span>;
+
+      Error_Message_C : <span class="hljs-type">chars_ptr</span> := Sqlite_Errstr (Error);
+      Error_Message : <span class="hljs-type">String</span> := Null_Ignore_Value (Error_Message_C);
+   <span class="hljs-keyword">begin</span>
+
+      Named : <span class="hljs-keyword">for</span> Index <span class="hljs-keyword">in</span> Foo..Bar <span class="hljs-keyword">loop</span>
+          Put (<span class="hljs-string">&quot;Hi[]{}&quot;</span>);
+      <span class="hljs-keyword">end</span> <span class="hljs-keyword">loop</span> Named;
+
+      Foo := Bar;
+   <span class="hljs-keyword">end</span> Message;
+
+<span class="hljs-keyword">end</span> Sqlite.Simple;
diff --git a/test/markup/ada/default.txt b/test/markup/ada/default.txt
new file mode 100644
index 0000000000..09318ae0ad
--- /dev/null
+++ b/test/markup/ada/default.txt
@@ -0,0 +1,17 @@
+package body Sqlite.Simple is
+
+      Foo : int := int'Size;
+      Bar : int := long'Size;
+
+      Error_Message_C : chars_ptr := Sqlite_Errstr (Error);
+      Error_Message : String := Null_Ignore_Value (Error_Message_C);
+   begin
+
+      Named : for Index in Foo..Bar loop
+          Put ("Hi[]{}");
+      end loop Named;
+
+      Foo := Bar;
+   end Message;
+
+end Sqlite.Simple;
diff --git a/test/markup/angelscript/default.expect.txt b/test/markup/angelscript/default.expect.txt
new file mode 100644
index 0000000000..51207945be
--- /dev/null
+++ b/test/markup/angelscript/default.expect.txt
@@ -0,0 +1,62 @@
+<span class="hljs-keyword">interface</span> <span class="hljs-symbol">IInterface</span>
+{
+    <span class="hljs-built_in">void</span> DoSomething();
+}
+
+<span class="hljs-keyword">namespace</span> <span class="hljs-symbol">MyApplication</span>
+{
+    <span class="hljs-comment">/*
+     * This ia a test class.
+     */</span>
+    <span class="hljs-keyword">class</span> <span class="hljs-symbol">SomeClass</span> : <span class="hljs-symbol">IInterface</span>
+    {
+        <span class="hljs-built_in">array<span class="hljs-keyword">&lt;<span class="hljs-built_in">float</span>&gt;</span></span> m_arr;
+
+        <span class="hljs-built_in">array<span class="hljs-keyword">&lt;<span class="hljs-symbol">SomeClass@</span>&gt;</span></span> m_children;
+        <span class="hljs-built_in">array<span class="hljs-keyword">&lt;<span class="hljs-built_in">array<span class="hljs-keyword">&lt;<span class="hljs-symbol">SomeClass@</span>&gt;</span></span>&gt;</span></span> m_subChildren; <span class="hljs-comment">// Nested templates</span>
+
+        <span class="hljs-built_in">int</span> m_thing;
+
+        SomeClass()
+        {
+            <span class="hljs-comment">// Add some integers</span>
+            m_arr.insertLast(<span class="hljs-number">1.0f</span>);
+            m_arr.insertLast(<span class="hljs-number">1.75f</span>);
+            m_arr.insertLast(<span class="hljs-number">3.14159f</span>);
+            <span class="hljs-built_in">uint</span> x = <span class="hljs-number">0x7fff0000</span>;
+            <span class="hljs-built_in">int</span> y = <span class="hljs-number">9001</span>;
+            <span class="hljs-built_in">uint</span> z = <span class="hljs-number">0b10101010</span>;
+        }
+
+        <span class="hljs-built_in">int</span> get_Thing() <span class="hljs-keyword">property</span> { <span class="hljs-keyword">return</span> m_thing; }
+        <span class="hljs-built_in">void</span> set_Thing(<span class="hljs-built_in">int</span> x) <span class="hljs-keyword">property</span> { m_thing = x; }
+<span class="hljs-string">
+        [Hook x=1 y=2]</span>
+        <span class="hljs-built_in">void</span> DoSomething()
+        {
+            print(<span class="hljs-string">&quot;Something! &quot;</span> + <span class="hljs-string">&#x27;stuff.&#x27;</span>);
+            <span class="hljs-keyword">for</span> (<span class="hljs-built_in">uint</span> i = <span class="hljs-number">0</span>; i &lt; m_arr.length(); i++) {
+                print(<span class="hljs-string">&quot;  &quot;</span> + i + <span class="hljs-string">&quot;: &quot;</span> + m_arr[i]);
+            }
+        }
+
+        <span class="hljs-keyword">protected</span> <span class="hljs-built_in">void</span> SomeProtectedFunction()
+        {
+            <span class="hljs-keyword">try</span> {
+                DoSomething();
+            } <span class="hljs-keyword">catch</span> {
+                print(<span class="hljs-string">&quot;Exception while doing something!&quot;</span>);
+            }
+        }
+    }
+}
+
+<span class="hljs-built_in">void</span> Main()
+{
+    <span class="hljs-symbol">SomeClass@</span> c = SomeClass();
+    c.DoSomething();
+}
+
+<span class="hljs-built_in">string</span> multilineString = <span class="hljs-string">&quot;&quot;&quot;
+Hello world, &quot;this is a test&quot;!
+&quot;&quot;&quot;</span>;
diff --git a/test/markup/angelscript/default.txt b/test/markup/angelscript/default.txt
new file mode 100644
index 0000000000..e22f5a6151
--- /dev/null
+++ b/test/markup/angelscript/default.txt
@@ -0,0 +1,62 @@
+interface IInterface
+{
+    void DoSomething();
+}
+
+namespace MyApplication
+{
+    /*
+     * This ia a test class.
+     */
+    class SomeClass : IInterface
+    {
+        array<float> m_arr;
+
+        array<SomeClass@> m_children;
+        array<array<SomeClass@>> m_subChildren; // Nested templates
+
+        int m_thing;
+
+        SomeClass()
+        {
+            // Add some integers
+            m_arr.insertLast(1.0f);
+            m_arr.insertLast(1.75f);
+            m_arr.insertLast(3.14159f);
+            uint x = 0x7fff0000;
+            int y = 9001;
+            uint z = 0b10101010;
+        }
+
+        int get_Thing() property { return m_thing; }
+        void set_Thing(int x) property { m_thing = x; }
+
+        [Hook x=1 y=2]
+        void DoSomething()
+        {
+            print("Something! " + 'stuff.');
+            for (uint i = 0; i < m_arr.length(); i++) {
+                print("  " + i + ": " + m_arr[i]);
+            }
+        }
+
+        protected void SomeProtectedFunction()
+        {
+            try {
+                DoSomething();
+            } catch {
+                print("Exception while doing something!");
+            }
+        }
+    }
+}
+
+void Main()
+{
+    SomeClass@ c = SomeClass();
+    c.DoSomething();
+}
+
+string multilineString = """
+Hello world, "this is a test"!
+""";
diff --git a/test/markup/apache/default.expect.txt b/test/markup/apache/default.expect.txt
new file mode 100644
index 0000000000..29cd3480e0
--- /dev/null
+++ b/test/markup/apache/default.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-comment"># rewrite`s rules for wordpress pretty url</span>
+<span class="hljs-attribute"><span class="hljs-nomarkup">LoadModule</span></span> rewrite_module  modules/mod_rewrite.so
+<span class="hljs-attribute"><span class="hljs-nomarkup">RewriteCond</span></span> <span class="hljs-variable">%{REQUEST_FILENAME}</span> !-f
+<span class="hljs-attribute"><span class="hljs-nomarkup">RewriteCond</span></span> <span class="hljs-variable">%{REQUEST_FILENAME}</span> !-d
+<span class="hljs-attribute"><span class="hljs-nomarkup">RewriteRule</span></span> . index.php<span class="hljs-meta"> [NC,L]</span>
+
+<span class="hljs-attribute">ExpiresActive</span> <span class="hljs-literal">On</span>
+<span class="hljs-attribute">ExpiresByType</span> application/x-javascript  <span class="hljs-string">&quot;access plus 1 days&quot;</span>
+
+<span class="hljs-attribute"><span class="hljs-nomarkup">Order</span></span> <span class="hljs-literal">Deny</span>,<span class="hljs-literal">Allow</span>
+<span class="hljs-attribute"><span class="hljs-nomarkup">Allow</span></span> from <span class="hljs-literal">All</span>
+
+<span class="hljs-section">&lt;Location /maps/&gt;</span>
+  <span class="hljs-attribute">RewriteMap</span> map txt:map.txt
+  <span class="hljs-attribute">RewriteMap</span> lower int:tolower
+  <span class="hljs-attribute"><span class="hljs-nomarkup">RewriteCond</span></span> <span class="hljs-variable">%{REQUEST_URI}</span> ^/([^/.]+)\.html$<span class="hljs-meta"> [NC]</span>
+  <span class="hljs-attribute"><span class="hljs-nomarkup">RewriteCond</span></span> <span class="hljs-variable">${map:<span class="hljs-variable">${lower:<span class="hljs-number">%1</span>}</span>|NOT_FOUND}</span> !NOT_FOUND
+  <span class="hljs-attribute"><span class="hljs-nomarkup">RewriteRule</span></span> .? /index.php?q=<span class="hljs-variable">${map:<span class="hljs-variable">${lower:<span class="hljs-number">%1</span>}</span>}</span><span class="hljs-meta"> [NC,L]</span>
+<span class="hljs-section">&lt;/Location&gt;</span>
diff --git a/test/markup/apache/default.txt b/test/markup/apache/default.txt
new file mode 100644
index 0000000000..3bf2af4f03
--- /dev/null
+++ b/test/markup/apache/default.txt
@@ -0,0 +1,19 @@
+# rewrite`s rules for wordpress pretty url
+LoadModule rewrite_module  modules/mod_rewrite.so
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . index.php [NC,L]
+
+ExpiresActive On
+ExpiresByType application/x-javascript  "access plus 1 days"
+
+Order Deny,Allow
+Allow from All
+
+<Location /maps/>
+  RewriteMap map txt:map.txt
+  RewriteMap lower int:tolower
+  RewriteCond %{REQUEST_URI} ^/([^/.]+)\.html$ [NC]
+  RewriteCond ${map:${lower:%1}|NOT_FOUND} !NOT_FOUND
+  RewriteRule .? /index.php?q=${map:${lower:%1}} [NC,L]
+</Location>
diff --git a/test/markup/applescript/default.expect.txt b/test/markup/applescript/default.expect.txt
new file mode 100644
index 0000000000..84b65f8e17
--- /dev/null
+++ b/test/markup/applescript/default.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-keyword">repeat</span> <span class="hljs-number">5</span> <span class="hljs-keyword">times</span>
+    <span class="hljs-keyword">if</span> foo <span class="hljs-keyword">is</span> <span class="hljs-keyword">greater than</span> bar <span class="hljs-keyword">then</span>
+        <span class="hljs-built_in">display dialog</span> <span class="hljs-string">&quot;Hello there&quot;</span>
+    <span class="hljs-keyword">else</span>
+        <span class="hljs-built_in">beep</span>
+    <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>
+<span class="hljs-keyword">end</span> <span class="hljs-keyword">repeat</span>
+
+<span class="hljs-comment">(* comment <span class="hljs-comment">(*nested comment*)</span> *)</span>
+<span class="hljs-keyword">on</span> do_something(s, y)
+<span class="hljs-built_in">    return</span> {s + <span class="hljs-literal">pi</span>, y <span class="hljs-keyword">mod</span> <span class="hljs-number">4</span>}
+<span class="hljs-keyword">end</span> do_something
+
+<span class="hljs-built_in">do shell script</span> <span class="hljs-string">&quot;/bin/echo &#x27;hello&#x27;&quot;</span>
diff --git a/test/markup/applescript/default.txt b/test/markup/applescript/default.txt
new file mode 100644
index 0000000000..f0b658be14
--- /dev/null
+++ b/test/markup/applescript/default.txt
@@ -0,0 +1,14 @@
+repeat 5 times
+    if foo is greater than bar then
+        display dialog "Hello there"
+    else
+        beep
+    end if
+end repeat
+
+(* comment (*nested comment*) *)
+on do_something(s, y)
+    return {s + pi, y mod 4}
+end do_something
+
+do shell script "/bin/echo 'hello'"
diff --git a/test/markup/asciidoc/default.expect.txt b/test/markup/asciidoc/default.expect.txt
new file mode 100644
index 0000000000..a45c4c650e
--- /dev/null
+++ b/test/markup/asciidoc/default.expect.txt
@@ -0,0 +1,65 @@
+<span class="hljs-section">Hello, World!
+============</span>
+Author Name, &lt;author@domain.foo&gt;
+
+you can write text <span class="hljs-link">http://example.com</span>[<span class="hljs-string">with links</span>], optionally
+using an explicit link:<span class="hljs-link">http://example.com</span>[<span class="hljs-string">link prefix</span>].
+
+<span class="hljs-bullet">* </span>single quotes around a phrase place <span class="hljs-emphasis">&#x27;emphasis&#x27;</span>
+<span class="hljs-bullet">** </span>alternatively, you can put underlines around a phrase to add <span class="hljs-emphasis">_emphasis_</span>
+<span class="hljs-bullet">* </span>astericks around a phrase make the text <span class="hljs-strong">*bold*</span>
+<span class="hljs-bullet">* </span>pluses around a phrase make it <span class="hljs-code">+monospaced+</span>
+<span class="hljs-bullet">* </span><span class="hljs-string">`smart&#x27;</span> quotes using a leading backtick and trailing single quote
+<span class="hljs-bullet">** </span>use two of each for double <span class="hljs-string">``smart&#x27;&#x27;</span> quotes
+
+<span class="hljs-bullet">- </span>escape characters are supported
+<span class="hljs-bullet">- </span>you can escape a quote inside emphasized text like <span class="hljs-emphasis">&#x27;here\&#x27;s johnny!&#x27;</span>
+
+<span class="hljs-bullet">term:: </span>definition
+<span class="hljs-bullet"> another term:: </span>another definition
+
+<span class="hljs-comment">// this is just a comment</span>
+
+Let&#x27;s make a break.
+
+&#x27;&#x27;&#x27;
+
+<span class="hljs-comment">////
+we&#x27;ll be right with you
+
+after this brief interruption.
+////</span>
+
+<span class="hljs-section">== We&#x27;re back!</span>
+
+Want to see a image::<span class="hljs-link">images/tiger.png</span>[<span class="hljs-string">Tiger</span>]?
+
+<span class="hljs-title">.Nested highlighting</span>
+++++
+<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">this_is</span> <span class="hljs-attr">inline</span>=<span class="hljs-string">&quot;xml&quot;</span>&gt;</span></span><span class="xml"><span class="hljs-tag">&lt;/<span class="hljs-name">this_is</span>&gt;</span></span>
+++++
+
+<span class="hljs-quote">____
+asciidoc is so powerful.
+____</span>
+
+another quote:
+
+<span class="hljs-meta">[quote, Sir Arthur Conan Doyle, The Adventures of Sherlock Holmes]</span>
+<span class="hljs-quote">____
+When you have eliminated all which is impossible, then whatever remains, however improbable, must be the truth.
+____</span>
+
+<span class="hljs-section">Getting Literal
+---------------</span>
+
+<span class="hljs-code"> want to get literal? prefix a line with a space.</span>
+
+<span class="hljs-code">....
+I&#x27;ll join that party, too.
+....</span>
+
+<span class="hljs-bullet">. </span>one thing (yeah!)
+<span class="hljs-bullet">. </span>two thing <span class="hljs-code">`i can write code`</span>, and <span class="hljs-code">`more`</span> wipee!
+
+<span class="hljs-symbol">NOTE: </span>AsciiDoc is quite cool, you should try it.
\ No newline at end of file
diff --git a/test/markup/asciidoc/default.txt b/test/markup/asciidoc/default.txt
new file mode 100644
index 0000000000..2af6ee6c71
--- /dev/null
+++ b/test/markup/asciidoc/default.txt
@@ -0,0 +1,65 @@
+Hello, World!
+============
+Author Name, <author@domain.foo>
+
+you can write text http://example.com[with links], optionally
+using an explicit link:http://example.com[link prefix].
+
+* single quotes around a phrase place 'emphasis'
+** alternatively, you can put underlines around a phrase to add _emphasis_
+* astericks around a phrase make the text *bold*
+* pluses around a phrase make it +monospaced+
+* `smart' quotes using a leading backtick and trailing single quote
+** use two of each for double ``smart'' quotes
+
+- escape characters are supported
+- you can escape a quote inside emphasized text like 'here\'s johnny!'
+
+term:: definition
+ another term:: another definition
+
+// this is just a comment
+
+Let's make a break.
+
+'''
+
+////
+we'll be right with you
+
+after this brief interruption.
+////
+
+== We're back!
+
+Want to see a image::images/tiger.png[Tiger]?
+
+.Nested highlighting
+++++
+<this_is inline="xml"></this_is>
+++++
+
+____
+asciidoc is so powerful.
+____
+
+another quote:
+
+[quote, Sir Arthur Conan Doyle, The Adventures of Sherlock Holmes]
+____
+When you have eliminated all which is impossible, then whatever remains, however improbable, must be the truth.
+____
+
+Getting Literal
+---------------
+
+ want to get literal? prefix a line with a space.
+
+....
+I'll join that party, too.
+....
+
+. one thing (yeah!)
+. two thing `i can write code`, and `more` wipee!
+
+NOTE: AsciiDoc is quite cool, you should try it.
\ No newline at end of file
diff --git a/test/markup/autohotkey/default.expect.txt b/test/markup/autohotkey/default.expect.txt
new file mode 100644
index 0000000000..729accdd28
--- /dev/null
+++ b/test/markup/autohotkey/default.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-comment">; hotkeys and hotstrings</span>
+<span class="hljs-title">#a::</span>WinSet, AlwaysOnTop, Toggle, A
+<span class="hljs-title">#Space::</span>
+<span class="hljs-built_in">  MsgBox,</span> Percent sign (`%) need to be escaped.
+  Run <span class="hljs-string">&quot;C:\Program Files\some\program.exe&quot;</span>
+<span class="hljs-built_in">  Gosub,</span> label1
+<span class="hljs-keyword">return</span>
+<span class="hljs-title">::btw::</span>by the way
+<span class="hljs-comment">; volume</span>
+<span class="hljs-title">#Numpad8::</span>Send {Volume_Up}
+<span class="hljs-title">#Numpad5::</span>Send {Volume_Mute}
+<span class="hljs-title">#Numpad2::</span>Send {Volume_Down}
+
+<span class="hljs-title">label1:</span>
+  if (<span class="hljs-built_in">Clipboard</span> = <span class="hljs-string">&quot;&quot;</span>)
+  {
+<span class="hljs-built_in">    MsgBox,</span> , <span class="hljs-built_in">Clipboard</span>, Empty!
+  }
+  else
+  {
+<span class="hljs-built_in">    StringReplace,</span> temp, <span class="hljs-built_in">Clipboard</span>, old, <span class="hljs-keyword">new</span>, All
+<span class="hljs-built_in">    MsgBox,</span> , <span class="hljs-built_in">Clipboard</span>, <span class="hljs-variable">%temp%</span>
+  }
+<span class="hljs-keyword">return</span>
diff --git a/test/markup/autohotkey/default.txt b/test/markup/autohotkey/default.txt
new file mode 100644
index 0000000000..5b4a749945
--- /dev/null
+++ b/test/markup/autohotkey/default.txt
@@ -0,0 +1,24 @@
+; hotkeys and hotstrings
+#a::WinSet, AlwaysOnTop, Toggle, A
+#Space::
+  MsgBox, Percent sign (`%) need to be escaped.
+  Run "C:\Program Files\some\program.exe"
+  Gosub, label1
+return
+::btw::by the way
+; volume
+#Numpad8::Send {Volume_Up}
+#Numpad5::Send {Volume_Mute}
+#Numpad2::Send {Volume_Down}
+
+label1:
+  if (Clipboard = "")
+  {
+    MsgBox, , Clipboard, Empty!
+  }
+  else
+  {
+    StringReplace, temp, Clipboard, old, new, All
+    MsgBox, , Clipboard, %temp%
+  }
+return
diff --git a/test/markup/autoit/default.expect.txt b/test/markup/autoit/default.expect.txt
new file mode 100644
index 0000000000..2778a9cbad
--- /dev/null
+++ b/test/markup/autoit/default.expect.txt
@@ -0,0 +1,16 @@
+<span class="hljs-meta">#<span class="hljs-meta-keyword">NoTrayIcon</span></span>
+<span class="hljs-meta">#AutoIt3Wrapper_Run_Tidy=Y</span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">include</span> <span class="hljs-meta-string">&lt;Misc.au3&gt;</span></span>
+
+_Singleton(<span class="hljs-symbol">@ScriptName</span>) <span class="hljs-comment">; Allow only one instance</span>
+example(<span class="hljs-number">0</span>, <span class="hljs-number">10</span>)
+
+<span class="hljs-function"><span class="hljs-keyword">Func</span> <span class="hljs-title">example</span><span class="hljs-params">($min, $max)</span></span>
+	<span class="hljs-keyword">For</span> $i = $min <span class="hljs-keyword">To</span> $max
+		<span class="hljs-keyword">If</span> <span class="hljs-built_in">Mod</span>($i, <span class="hljs-number">2</span>) == <span class="hljs-number">0</span> <span class="hljs-keyword">Then</span>
+			<span class="hljs-built_in">MsgBox</span>(<span class="hljs-number">64</span>, <span class="hljs-string">&quot;Message&quot;</span>, $i &amp; <span class="hljs-string">&#x27; is even number!&#x27;</span>)
+		<span class="hljs-keyword">Else</span>
+			<span class="hljs-built_in">MsgBox</span>(<span class="hljs-number">64</span>, <span class="hljs-string">&quot;Message&quot;</span>, $i &amp; <span class="hljs-string">&#x27; is odd number!&#x27;</span>)
+		<span class="hljs-keyword">EndIf</span>
+	<span class="hljs-keyword">Next</span>
+<span class="hljs-keyword">EndFunc</span>   <span class="hljs-comment">;==&gt;example</span>
\ No newline at end of file
diff --git a/test/markup/autoit/default.txt b/test/markup/autoit/default.txt
new file mode 100644
index 0000000000..7946a548ba
--- /dev/null
+++ b/test/markup/autoit/default.txt
@@ -0,0 +1,16 @@
+#NoTrayIcon
+#AutoIt3Wrapper_Run_Tidy=Y
+#include <Misc.au3>
+
+_Singleton(@ScriptName) ; Allow only one instance
+example(0, 10)
+
+Func example($min, $max)
+	For $i = $min To $max
+		If Mod($i, 2) == 0 Then
+			MsgBox(64, "Message", $i & ' is even number!')
+		Else
+			MsgBox(64, "Message", $i & ' is odd number!')
+		EndIf
+	Next
+EndFunc   ;==>example
\ No newline at end of file
diff --git a/test/markup/avrasm/default.expect.txt b/test/markup/avrasm/default.expect.txt
new file mode 100644
index 0000000000..2bf5a6ea7a
--- /dev/null
+++ b/test/markup/avrasm/default.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-comment">;* Title:       Block Copy Routines</span>
+<span class="hljs-comment">;* Version:     1.1</span>
+
+<span class="hljs-meta">.include</span> <span class="hljs-string">&quot;8515def.inc&quot;</span>
+
+        <span class="hljs-keyword">rjmp</span>    RESET       <span class="hljs-comment">;reset handle</span>
+
+<span class="hljs-meta">.def</span>    flashsize=<span class="hljs-built_in">r16</span>       <span class="hljs-comment">;size of block to be copied</span>
+
+<span class="hljs-symbol">flash2ram:</span>
+        <span class="hljs-keyword">lpm</span>                 <span class="hljs-comment">;get constant</span>
+        <span class="hljs-keyword">st</span>      <span class="hljs-built_in">Y</span>+,<span class="hljs-built_in">r0</span>       <span class="hljs-comment">;store in SRAM and increment Y-pointer</span>
+        <span class="hljs-keyword">adiw</span>    <span class="hljs-built_in">ZL</span>,<span class="hljs-number">1</span>        <span class="hljs-comment">;increment Z-pointer</span>
+        <span class="hljs-keyword">dec</span>     flashsize
+        <span class="hljs-keyword">brne</span>    flash2ram   <span class="hljs-comment">;if not end of table, loop more</span>
+        <span class="hljs-keyword">ret</span>
+
+<span class="hljs-meta">.def</span>    ramtemp =<span class="hljs-built_in">r1</span>         <span class="hljs-comment">;temporary storage register</span>
+<span class="hljs-meta">.def</span>    ramsize =<span class="hljs-built_in">r16</span>        <span class="hljs-comment">;size of block to be copied</span>
diff --git a/test/markup/avrasm/default.txt b/test/markup/avrasm/default.txt
new file mode 100644
index 0000000000..d9fd70e5f3
--- /dev/null
+++ b/test/markup/avrasm/default.txt
@@ -0,0 +1,19 @@
+;* Title:       Block Copy Routines
+;* Version:     1.1
+
+.include "8515def.inc"
+
+        rjmp    RESET       ;reset handle
+
+.def    flashsize=r16       ;size of block to be copied
+
+flash2ram:
+        lpm                 ;get constant
+        st      Y+,r0       ;store in SRAM and increment Y-pointer
+        adiw    ZL,1        ;increment Z-pointer
+        dec     flashsize
+        brne    flash2ram   ;if not end of table, loop more
+        ret
+
+.def    ramtemp =r1         ;temporary storage register
+.def    ramsize =r16        ;size of block to be copied
diff --git a/test/markup/awk/default.expect.txt b/test/markup/awk/default.expect.txt
new file mode 100644
index 0000000000..a2a0a4f658
--- /dev/null
+++ b/test/markup/awk/default.expect.txt
@@ -0,0 +1,16 @@
+<span class="hljs-keyword">BEGIN</span> {
+  POPService  = <span class="hljs-string">&quot;/inet/tcp/0/emailhost/pop3&quot;</span>
+  RS = ORS = <span class="hljs-string">&quot;\r\n&quot;</span>
+  print <span class="hljs-string">&quot;user name&quot;</span>            |&amp; POPService
+  POPService                    |&amp; getline
+  print <span class="hljs-string">&quot;pass password&quot;</span>         |&amp; POPService
+  POPService                    |&amp; getline
+  print <span class="hljs-string">&quot;retr 1&quot;</span>                |&amp; POPService
+  POPService                    |&amp; getline
+  <span class="hljs-keyword">if</span> (<span class="hljs-variable">$1</span> != <span class="hljs-string">&quot;+OK&quot;</span>) <span class="hljs-keyword">exit</span>
+  print <span class="hljs-string">&quot;quit&quot;</span>                  |&amp; POPService
+  RS = <span class="hljs-string">&quot;\r\n\\.\r\n&quot;</span>
+  POPService |&amp; getline
+  print <span class="hljs-variable">$0</span>
+  close(POPService)
+}
diff --git a/test/markup/awk/default.txt b/test/markup/awk/default.txt
new file mode 100644
index 0000000000..239869c0a7
--- /dev/null
+++ b/test/markup/awk/default.txt
@@ -0,0 +1,16 @@
+BEGIN {
+  POPService  = "/inet/tcp/0/emailhost/pop3"
+  RS = ORS = "\r\n"
+  print "user name"            |& POPService
+  POPService                    |& getline
+  print "pass password"         |& POPService
+  POPService                    |& getline
+  print "retr 1"                |& POPService
+  POPService                    |& getline
+  if ($1 != "+OK") exit
+  print "quit"                  |& POPService
+  RS = "\r\n\\.\r\n"
+  POPService |& getline
+  print $0
+  close(POPService)
+}
diff --git a/test/markup/axapta/default.expect.txt b/test/markup/axapta/default.expect.txt
new file mode 100644
index 0000000000..dc645bb496
--- /dev/null
+++ b/test/markup/axapta/default.expect.txt
@@ -0,0 +1,32 @@
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">ExchRateLoadBatch</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">RunBaseBatch</span> </span>{
+  ExchRateLoad rbc;
+  <span class="hljs-built_in">container</span> currencies;
+  <span class="hljs-built_in">boolean</span> actual;
+  <span class="hljs-built_in">boolean</span> overwrite;
+  <span class="hljs-built_in">date</span> beg;
+  <span class="hljs-built_in">date</span> end;
+
+  <span class="hljs-meta">#define.CurrentVersion(5)</span>
+
+  <span class="hljs-meta">#localmacro.CurrentList</span>
+    currencies,
+    actual,
+    beg,
+    end
+  <span class="hljs-meta">#endmacro</span>
+}
+
+<span class="hljs-keyword">public</span> <span class="hljs-built_in">boolean</span> unpack(<span class="hljs-built_in">container</span> packedClass) {
+  <span class="hljs-built_in">container</span>       base;
+  <span class="hljs-built_in">boolean</span>         ret;
+  Integer         version    = runbase::getVersion(packedClass);
+
+  <span class="hljs-keyword">switch</span> (version) {
+    <span class="hljs-keyword">case</span> <span class="hljs-meta">#CurrentVersion:</span>
+      [version, <span class="hljs-meta">#CurrentList] = packedClass;</span>
+      <span class="hljs-keyword">return</span> <span class="hljs-literal">true</span>;
+    <span class="hljs-literal">default</span>:
+      <span class="hljs-keyword">return</span> <span class="hljs-literal">false</span>;
+  }
+  <span class="hljs-keyword">return</span> ret;
+}
diff --git a/test/markup/axapta/default.txt b/test/markup/axapta/default.txt
new file mode 100644
index 0000000000..100750a804
--- /dev/null
+++ b/test/markup/axapta/default.txt
@@ -0,0 +1,32 @@
+class ExchRateLoadBatch extends RunBaseBatch {
+  ExchRateLoad rbc;
+  container currencies;
+  boolean actual;
+  boolean overwrite;
+  date beg;
+  date end;
+
+  #define.CurrentVersion(5)
+
+  #localmacro.CurrentList
+    currencies,
+    actual,
+    beg,
+    end
+  #endmacro
+}
+
+public boolean unpack(container packedClass) {
+  container       base;
+  boolean         ret;
+  Integer         version    = runbase::getVersion(packedClass);
+
+  switch (version) {
+    case #CurrentVersion:
+      [version, #CurrentList] = packedClass;
+      return true;
+    default:
+      return false;
+  }
+  return ret;
+}
diff --git a/test/markup/basic/default.expect.txt b/test/markup/basic/default.expect.txt
new file mode 100644
index 0000000000..be08210c56
--- /dev/null
+++ b/test/markup/basic/default.expect.txt
@@ -0,0 +1,22 @@
+<span class="hljs-symbol">10 </span><span class="hljs-keyword">CLS</span>
+<span class="hljs-symbol">20 </span><span class="hljs-keyword">FOR</span> I = <span class="hljs-number">0</span> <span class="hljs-keyword">TO</span> <span class="hljs-number">15</span>
+<span class="hljs-symbol">22 </span><span class="hljs-keyword">FOR</span> J = <span class="hljs-number">0</span> <span class="hljs-keyword">TO</span> <span class="hljs-number">7</span>
+<span class="hljs-symbol">30 </span><span class="hljs-keyword">COLOR</span> I,J
+<span class="hljs-symbol">40 </span><span class="hljs-keyword">PRINT</span> <span class="hljs-string">&quot; ** &quot;</span>;
+<span class="hljs-symbol">45 </span><span class="hljs-keyword">NEXT</span> J
+<span class="hljs-symbol">46 </span><span class="hljs-keyword">COLOR</span> I,<span class="hljs-number">0</span>
+<span class="hljs-symbol">47 </span><span class="hljs-keyword">GOSUB</span> <span class="hljs-number">100</span>
+<span class="hljs-symbol">48 </span><span class="hljs-keyword">PRINT</span>
+<span class="hljs-symbol">50 </span><span class="hljs-keyword">NEXT</span> I
+<span class="hljs-symbol">60 </span><span class="hljs-keyword">COLOR</span> <span class="hljs-number">15</span>,<span class="hljs-number">0</span>
+<span class="hljs-symbol">99 </span><span class="hljs-keyword">END</span>
+<span class="hljs-symbol">100 </span><span class="hljs-keyword">FOR</span> T = <span class="hljs-number">65</span> <span class="hljs-keyword">TO</span> <span class="hljs-number">90</span>
+<span class="hljs-symbol">101 </span><span class="hljs-keyword">PRINT</span> <span class="hljs-keyword">CHR$</span>(T);
+<span class="hljs-symbol">102 </span><span class="hljs-keyword">NEXT</span> T
+<span class="hljs-symbol">103 </span><span class="hljs-keyword">RETURN</span>
+<span class="hljs-symbol">200 </span><span class="hljs-comment">REM Data types test</span>
+<span class="hljs-symbol">201 </span>TOTAL# = <span class="hljs-number">3.30#</span>		<span class="hljs-comment">&#x27;Double precision variable</span>
+<span class="hljs-symbol">202 </span>BALANCE! = <span class="hljs-number">3!</span>		<span class="hljs-comment">&#x27;Single precision variable</span>
+<span class="hljs-symbol">203 </span>B2! = <span class="hljs-number">12e5</span>			<span class="hljs-comment">&#x27;120000</span>
+<span class="hljs-symbol">204 </span>ITEMS% = <span class="hljs-number">10</span>			<span class="hljs-comment">&#x27;Integer variable</span>
+<span class="hljs-symbol">205 </span>HEXTEST = <span class="hljs-number">&amp;H12DB</span>	<span class="hljs-comment">&#x27;Hex value</span>
diff --git a/test/markup/basic/default.txt b/test/markup/basic/default.txt
new file mode 100644
index 0000000000..04db6debce
--- /dev/null
+++ b/test/markup/basic/default.txt
@@ -0,0 +1,22 @@
+10 CLS
+20 FOR I = 0 TO 15
+22 FOR J = 0 TO 7
+30 COLOR I,J
+40 PRINT " ** ";
+45 NEXT J
+46 COLOR I,0
+47 GOSUB 100
+48 PRINT
+50 NEXT I
+60 COLOR 15,0
+99 END
+100 FOR T = 65 TO 90
+101 PRINT CHR$(T);
+102 NEXT T
+103 RETURN
+200 REM Data types test
+201 TOTAL# = 3.30#		'Double precision variable
+202 BALANCE! = 3!		'Single precision variable
+203 B2! = 12e5			'120000
+204 ITEMS% = 10			'Integer variable
+205 HEXTEST = &H12DB	'Hex value
diff --git a/test/markup/bnf/default.expect.txt b/test/markup/bnf/default.expect.txt
new file mode 100644
index 0000000000..57d6610da7
--- /dev/null
+++ b/test/markup/bnf/default.expect.txt
@@ -0,0 +1,8 @@
+<span class="hljs-attribute">&lt;syntax&gt;</span>         ::= &lt;rule&gt; | &lt;rule&gt; &lt;syntax&gt;
+<span class="hljs-attribute">&lt;rule&gt;</span>           ::= &lt;opt-whitespace&gt; <span class="hljs-string">&quot;&lt;&quot;</span> &lt;rule-name&gt; <span class="hljs-string">&quot;&gt;&quot;</span> &lt;opt-whitespace&gt; <span class="hljs-string">&quot;::=&quot;</span> &lt;opt-whitespace&gt; &lt;expression&gt; &lt;line-end&gt;
+<span class="hljs-attribute">&lt;opt-whitespace&gt;</span> ::= <span class="hljs-string">&quot; &quot;</span> &lt;opt-whitespace&gt; | <span class="hljs-string">&quot;&quot;</span>
+<span class="hljs-attribute">&lt;expression&gt;</span>     ::= &lt;list&gt; | &lt;list&gt; &lt;opt-whitespace&gt; <span class="hljs-string">&quot;|&quot;</span> &lt;opt-whitespace&gt; &lt;expression&gt;
+<span class="hljs-attribute">&lt;line-end&gt;</span>       ::= &lt;opt-whitespace&gt; &lt;EOL&gt; | &lt;line-end&gt; &lt;line-end&gt;
+<span class="hljs-attribute">&lt;list&gt;</span>           ::= &lt;term&gt; | &lt;term&gt; &lt;opt-whitespace&gt; &lt;list&gt;
+<span class="hljs-attribute">&lt;term&gt;</span>           ::= &lt;literal&gt; | <span class="hljs-string">&quot;&lt;&quot;</span> &lt;rule-name&gt; <span class="hljs-string">&quot;&gt;&quot;</span>
+<span class="hljs-attribute">&lt;literal&gt;</span>        ::= <span class="hljs-string">&#x27;&quot;&#x27;</span> &lt;text&gt; <span class="hljs-string">&#x27;&quot;&#x27;</span> | <span class="hljs-string">&quot;&#x27;&quot;</span> &lt;text&gt; <span class="hljs-string">&quot;&#x27;&quot;</span>
diff --git a/test/markup/bnf/default.txt b/test/markup/bnf/default.txt
new file mode 100644
index 0000000000..2149c65d22
--- /dev/null
+++ b/test/markup/bnf/default.txt
@@ -0,0 +1,8 @@
+<syntax>         ::= <rule> | <rule> <syntax>
+<rule>           ::= <opt-whitespace> "<" <rule-name> ">" <opt-whitespace> "::=" <opt-whitespace> <expression> <line-end>
+<opt-whitespace> ::= " " <opt-whitespace> | ""
+<expression>     ::= <list> | <list> <opt-whitespace> "|" <opt-whitespace> <expression>
+<line-end>       ::= <opt-whitespace> <EOL> | <line-end> <line-end>
+<list>           ::= <term> | <term> <opt-whitespace> <list>
+<term>           ::= <literal> | "<" <rule-name> ">"
+<literal>        ::= '"' <text> '"' | "'" <text> "'"
diff --git a/test/markup/brainfuck/default.expect.txt b/test/markup/brainfuck/default.expect.txt
new file mode 100644
index 0000000000..7ddd595714
--- /dev/null
+++ b/test/markup/brainfuck/default.expect.txt
@@ -0,0 +1,17 @@
+++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>
+<span class="hljs-title">[</span> <span class="hljs-comment">3*10</span> <span class="hljs-comment">and</span> <span class="hljs-comment">10*10</span>
+  <span class="hljs-literal">-</span>&gt;++<span class="hljs-literal">+</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&lt;&lt;
+<span class="hljs-title">]</span>&gt;&gt;
+<span class="hljs-title">[</span> <span class="hljs-comment">filling</span> <span class="hljs-comment">cells</span>
+  <span class="hljs-literal">-</span>&gt;++&gt;&gt;++&gt;++&gt;<span class="hljs-literal">+</span>&gt;++&gt;&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++&gt;++<span class="hljs-title">[</span>&lt;<span class="hljs-comment">/</span><span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&gt;&gt;
+<span class="hljs-title">]</span>&lt;
+++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&lt;&lt;
+<span class="hljs-title">[</span> <span class="hljs-comment">rough</span> <span class="hljs-comment">codes</span> <span class="hljs-comment">correction</span> <span class="hljs-comment">loop</span>
+  <span class="hljs-literal">-</span>&gt;&gt;&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;++<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;
+<span class="hljs-title">]</span>
+<span class="hljs-comment">more</span> <span class="hljs-comment">accurate</span> <span class="hljs-comment">сodes</span> <span class="hljs-comment">correction</span>
+&gt;&gt;&gt;++&gt;
+--&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;--<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;++&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;--<span class="hljs-literal">-</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;--<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;
+++&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;++<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;--<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;++<span class="hljs-literal">+</span>
+<span class="hljs-comment">rewind</span> <span class="hljs-comment">and</span> <span class="hljs-comment">output</span>
+<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&gt;<span class="hljs-title">[</span><span class="hljs-string">.</span>&gt;<span class="hljs-title">]</span>
diff --git a/test/markup/brainfuck/default.txt b/test/markup/brainfuck/default.txt
new file mode 100644
index 0000000000..5156af02e1
--- /dev/null
+++ b/test/markup/brainfuck/default.txt
@@ -0,0 +1,17 @@
+++++++++++
+[ 3*10 and 10*10
+  ->+++>++++++++++<<
+]>>
+[ filling cells
+  ->++>>++>++>+>++>>++>++>++>++>++>++>++>++>++>++>++[</]<[<]<[<]>>
+]<
++++++++++<<
+[ rough codes correction loop
+  ->>>+>+>+>+++>+>+>+>+>+>+>+>+>+>+>+>+>+>+[<]<
+]
+more accurate сodes correction
+>>>++>
+-->+++++++>------>++++++>++>+++++++++>++++++++++>++++++++>--->++++++++++>------>++++++>
+++>+++++++++++>++++++++++++>------>+++
+rewind and output
+[<]>[.>]
diff --git a/test/markup/cal/default.expect.txt b/test/markup/cal/default.expect.txt
new file mode 100644
index 0000000000..20f52bece3
--- /dev/null
+++ b/test/markup/cal/default.expect.txt
@@ -0,0 +1,33 @@
+<span class="hljs-class"><span class="hljs-title">OBJECT</span></span> Codeunit <span class="hljs-number">11</span> Gen. Jnl.-Check Line
+{
+  OBJECT-PROPERTIES
+  {
+    Date=<span class="hljs-number">09</span>-<span class="hljs-number">09</span>-<span class="hljs-number">14</span>;
+    Time=<span class="hljs-number">12</span>:<span class="hljs-number">00</span>:<span class="hljs-number">00</span>;
+    Version List=NAVW18.<span class="hljs-number">00</span>;
+  }
+  PROPERTIES
+  {
+    TableNo=<span class="hljs-number">81</span>;
+    Permissions=TableData <span class="hljs-number">252</span>=rimd;
+    OnRun=<span class="hljs-keyword">BEGIN</span>
+            GLSetup.GET;
+            RunCheck(Rec);
+          <span class="hljs-keyword">END</span>;
+
+  }
+  CODE
+  {
+    <span class="hljs-keyword">VAR</span>
+      Text000@<span class="hljs-number">1000</span> : TextConst <span class="hljs-string">&#x27;ENU=can only be a closing date for G/L entries&#x27;</span>;
+      Text001@<span class="hljs-number">1001</span> : TextConst <span class="hljs-string">&#x27;ENU=is not within your range of allowed posting dates&#x27;</span>;
+
+    <span class="hljs-function"><span class="hljs-keyword">PROCEDURE</span> <span class="hljs-title">ErrorIfPositiveAmt</span>@2<span class="hljs-params">(GenJnlLine@1000 : Record 81)</span>;</span>
+    <span class="hljs-keyword">BEGIN</span>
+      <span class="hljs-keyword">IF</span> GenJnlLine.Amount &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">THEN</span>
+        GenJnlLine.FIELDERROR(Amount,Text008);
+    <span class="hljs-keyword">END</span>;
+
+    LOCAL <span class="hljs-function"><span class="hljs-keyword">PROCEDURE</span> <span class="hljs-title">CheckGenJnlLineDocType</span>@7<span class="hljs-params">(GenJnlLine@1001 : Record 81)</span>;</span>
+  }
+}
diff --git a/test/markup/cal/default.txt b/test/markup/cal/default.txt
new file mode 100644
index 0000000000..5eec86caf0
--- /dev/null
+++ b/test/markup/cal/default.txt
@@ -0,0 +1,33 @@
+OBJECT Codeunit 11 Gen. Jnl.-Check Line
+{
+  OBJECT-PROPERTIES
+  {
+    Date=09-09-14;
+    Time=12:00:00;
+    Version List=NAVW18.00;
+  }
+  PROPERTIES
+  {
+    TableNo=81;
+    Permissions=TableData 252=rimd;
+    OnRun=BEGIN
+            GLSetup.GET;
+            RunCheck(Rec);
+          END;
+
+  }
+  CODE
+  {
+    VAR
+      Text000@1000 : TextConst 'ENU=can only be a closing date for G/L entries';
+      Text001@1001 : TextConst 'ENU=is not within your range of allowed posting dates';
+
+    PROCEDURE ErrorIfPositiveAmt@2(GenJnlLine@1000 : Record 81);
+    BEGIN
+      IF GenJnlLine.Amount > 0 THEN
+        GenJnlLine.FIELDERROR(Amount,Text008);
+    END;
+
+    LOCAL PROCEDURE CheckGenJnlLineDocType@7(GenJnlLine@1001 : Record 81);
+  }
+}
diff --git a/test/markup/capnproto/default.expect.txt b/test/markup/capnproto/default.expect.txt
new file mode 100644
index 0000000000..b516975696
--- /dev/null
+++ b/test/markup/capnproto/default.expect.txt
@@ -0,0 +1,55 @@
+<span class="hljs-meta">@0xdbb9ad1f14bf0b36;</span>  <span class="hljs-comment"># unique file ID, generated by `capnp id`</span>
+
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">Person</span> </span>{
+  name <span class="hljs-symbol">@0</span> :<span class="hljs-built_in">Text</span>;
+  birthdate <span class="hljs-symbol">@3</span> :Date;
+
+  email <span class="hljs-symbol">@1</span> :<span class="hljs-built_in">Text</span>;
+  phones <span class="hljs-symbol">@2</span> :<span class="hljs-built_in">List</span>(PhoneNumber);
+
+  <span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">PhoneNumber</span> </span>{
+    number <span class="hljs-symbol">@0</span> :<span class="hljs-built_in">Text</span>;
+    type <span class="hljs-symbol">@1</span> :Type;
+
+    <span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-title">Type</span> </span>{
+      mobile <span class="hljs-symbol">@0</span>;
+      home <span class="hljs-symbol">@1</span>;
+      work <span class="hljs-symbol">@2</span>;
+    }
+  }
+}
+
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">Date</span> </span>{
+  year <span class="hljs-symbol">@0</span> :<span class="hljs-built_in">Int16</span>;
+  month <span class="hljs-symbol">@1</span> :<span class="hljs-built_in">UInt8</span>;
+  day <span class="hljs-symbol">@2</span> :<span class="hljs-built_in">UInt8</span>;
+  flags <span class="hljs-symbol">@3</span> :<span class="hljs-built_in">List</span>(<span class="hljs-built_in">Bool</span>) = [ <span class="hljs-literal">true</span>, <span class="hljs-literal">false</span>, <span class="hljs-literal">false</span>, <span class="hljs-literal">true</span> ];
+}
+
+<span class="hljs-class"><span class="hljs-keyword">interface</span> <span class="hljs-title">Node</span> </span>{
+  isDirectory <span class="hljs-symbol">@0</span> () -&gt; (result :<span class="hljs-built_in">Bool</span>);
+}
+
+<span class="hljs-class"><span class="hljs-keyword">interface</span> <span class="hljs-title">Directory</span> extends(Node) </span>{
+  list <span class="hljs-symbol">@0</span> () -&gt; (list: <span class="hljs-built_in">List</span>(Entry));
+  <span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">Entry</span> </span>{
+    name <span class="hljs-symbol">@0</span> :<span class="hljs-built_in">Text</span>;
+    node <span class="hljs-symbol">@1</span> :Node;
+  }
+
+  create <span class="hljs-symbol">@1</span> (name :<span class="hljs-built_in">Text</span>) -&gt; (file :File);
+  mkdir <span class="hljs-symbol">@2</span> (name :<span class="hljs-built_in">Text</span>) -&gt; (directory :Directory)
+  open <span class="hljs-symbol">@3</span> (name :<span class="hljs-built_in">Text</span>) -&gt; (node :Node);
+  delete <span class="hljs-symbol">@4</span> (name :<span class="hljs-built_in">Text</span>);
+  link <span class="hljs-symbol">@5</span> (name :<span class="hljs-built_in">Text</span>, node :Node);
+}
+
+<span class="hljs-class"><span class="hljs-keyword">interface</span> <span class="hljs-title">File</span> extends(Node) </span>{
+  size <span class="hljs-symbol">@0</span> () -&gt; (size: <span class="hljs-built_in">UInt64</span>);
+  read <span class="hljs-symbol">@1</span> (startAt :<span class="hljs-built_in">UInt64</span> = <span class="hljs-number">0</span>, amount :<span class="hljs-built_in">UInt64</span> = <span class="hljs-number">0</span>xffffffffffffffff)
+       -&gt; (data: <span class="hljs-built_in">Data</span>);
+  <span class="hljs-comment"># Default params = read entire file.</span>
+
+  write <span class="hljs-symbol">@2</span> (startAt :<span class="hljs-built_in">UInt64</span>, data :<span class="hljs-built_in">Data</span>);
+  truncate <span class="hljs-symbol">@3</span> (size :<span class="hljs-built_in">UInt64</span>);
+}
\ No newline at end of file
diff --git a/test/markup/capnproto/default.txt b/test/markup/capnproto/default.txt
new file mode 100644
index 0000000000..f57fbea093
--- /dev/null
+++ b/test/markup/capnproto/default.txt
@@ -0,0 +1,55 @@
+@0xdbb9ad1f14bf0b36;  # unique file ID, generated by `capnp id`
+
+struct Person {
+  name @0 :Text;
+  birthdate @3 :Date;
+
+  email @1 :Text;
+  phones @2 :List(PhoneNumber);
+
+  struct PhoneNumber {
+    number @0 :Text;
+    type @1 :Type;
+
+    enum Type {
+      mobile @0;
+      home @1;
+      work @2;
+    }
+  }
+}
+
+struct Date {
+  year @0 :Int16;
+  month @1 :UInt8;
+  day @2 :UInt8;
+  flags @3 :List(Bool) = [ true, false, false, true ];
+}
+
+interface Node {
+  isDirectory @0 () -> (result :Bool);
+}
+
+interface Directory extends(Node) {
+  list @0 () -> (list: List(Entry));
+  struct Entry {
+    name @0 :Text;
+    node @1 :Node;
+  }
+
+  create @1 (name :Text) -> (file :File);
+  mkdir @2 (name :Text) -> (directory :Directory)
+  open @3 (name :Text) -> (node :Node);
+  delete @4 (name :Text);
+  link @5 (name :Text, node :Node);
+}
+
+interface File extends(Node) {
+  size @0 () -> (size: UInt64);
+  read @1 (startAt :UInt64 = 0, amount :UInt64 = 0xffffffffffffffff)
+       -> (data: Data);
+  # Default params = read entire file.
+
+  write @2 (startAt :UInt64, data :Data);
+  truncate @3 (size :UInt64);
+}
\ No newline at end of file
diff --git a/test/markup/clean/default.expect.txt b/test/markup/clean/default.expect.txt
new file mode 100644
index 0000000000..e51ce442b1
--- /dev/null
+++ b/test/markup/clean/default.expect.txt
@@ -0,0 +1,30 @@
+<span class="hljs-keyword">module</span> fsieve
+
+<span class="hljs-keyword">import</span> StdClass; <span class="hljs-comment">// RWS</span>
+<span class="hljs-keyword">import</span> StdInt, StdReal
+
+NrOfPrimes :== <span class="hljs-number">3000</span>
+
+primes :: [<span class="hljs-built_in">Int</span>]
+primes = pr <span class="hljs-keyword">where</span> pr = [<span class="hljs-number">5</span> : sieve <span class="hljs-number">7</span> <span class="hljs-number">4</span> pr]
+
+sieve :: <span class="hljs-built_in">Int</span> !<span class="hljs-built_in">Int</span> [<span class="hljs-built_in">Int</span>] -&gt; [<span class="hljs-built_in">Int</span>]
+sieve g i prs
+| isPrime prs g (toInt (sqrt (toReal g))) = [g : sieve` g i prs]
+| <span class="hljs-keyword">otherwise</span>                               = sieve (g + i) (<span class="hljs-number">6</span> - i) prs
+
+sieve` :: <span class="hljs-built_in">Int</span> <span class="hljs-built_in">Int</span> [<span class="hljs-built_in">Int</span>] -&gt; [<span class="hljs-built_in">Int</span>]
+sieve` g i prs = sieve (g + i) (<span class="hljs-number">6</span> - i) prs
+
+isPrime :: [<span class="hljs-built_in">Int</span>] !<span class="hljs-built_in">Int</span> <span class="hljs-built_in">Int</span> -&gt; <span class="hljs-built_in">Bool</span>
+isPrime [f:r] pr bd
+| f&gt;bd        =  <span class="hljs-literal">True</span>
+| pr rem f==<span class="hljs-number">0</span> =  <span class="hljs-literal">False</span>
+| <span class="hljs-keyword">otherwise</span>   =  isPrime r pr bd
+
+select :: [x] <span class="hljs-built_in">Int</span> -&gt; x
+select [f:r] <span class="hljs-number">1</span> = f
+select [f:r] n = select r (n - <span class="hljs-number">1</span>)
+
+Start :: <span class="hljs-built_in">Int</span>
+Start = select [<span class="hljs-number">2</span>, <span class="hljs-number">3</span> : primes] NrOfPrimes
diff --git a/test/markup/clean/default.txt b/test/markup/clean/default.txt
new file mode 100644
index 0000000000..ecbe7b1c7b
--- /dev/null
+++ b/test/markup/clean/default.txt
@@ -0,0 +1,30 @@
+module fsieve
+
+import StdClass; // RWS
+import StdInt, StdReal
+
+NrOfPrimes :== 3000
+
+primes :: [Int]
+primes = pr where pr = [5 : sieve 7 4 pr]
+
+sieve :: Int !Int [Int] -> [Int]
+sieve g i prs
+| isPrime prs g (toInt (sqrt (toReal g))) = [g : sieve` g i prs]
+| otherwise                               = sieve (g + i) (6 - i) prs
+
+sieve` :: Int Int [Int] -> [Int]
+sieve` g i prs = sieve (g + i) (6 - i) prs
+
+isPrime :: [Int] !Int Int -> Bool
+isPrime [f:r] pr bd
+| f>bd        =  True
+| pr rem f==0 =  False
+| otherwise   =  isPrime r pr bd
+
+select :: [x] Int -> x
+select [f:r] 1 = f
+select [f:r] n = select r (n - 1)
+
+Start :: Int
+Start = select [2, 3 : primes] NrOfPrimes
diff --git a/test/markup/cmake/default.expect.txt b/test/markup/cmake/default.expect.txt
new file mode 100644
index 0000000000..638923c572
--- /dev/null
+++ b/test/markup/cmake/default.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-keyword">cmake_minimum_required</span>(VERSION <span class="hljs-number">2.8</span>.<span class="hljs-number">8</span>)
+<span class="hljs-keyword">project</span>(cmake_example)
+
+<span class="hljs-comment"># Show message on Linux platform</span>
+<span class="hljs-keyword">if</span> (<span class="hljs-variable">${CMAKE_SYSTEM_NAME}</span> <span class="hljs-keyword">MATCHES</span> Linux)
+    <span class="hljs-keyword">message</span>(<span class="hljs-string">&quot;Good choice, bro!&quot;</span>)
+<span class="hljs-keyword">endif</span>()
+
+<span class="hljs-comment"># Tell CMake to run moc when necessary:</span>
+<span class="hljs-keyword">set</span>(CMAKE_AUTOMOC <span class="hljs-keyword">ON</span>)
+<span class="hljs-comment"># As moc files are generated in the binary dir,</span>
+<span class="hljs-comment"># tell CMake to always look for includes there:</span>
+<span class="hljs-keyword">set</span>(CMAKE_INCLUDE_CURRENT_DIR <span class="hljs-keyword">ON</span>)
+
+<span class="hljs-comment"># Widgets finds its own dependencies.</span>
+<span class="hljs-keyword">find_package</span>(Qt5Widgets REQUIRED)
+
+<span class="hljs-keyword">add_executable</span>(myproject main.cpp mainwindow.cpp)
+<span class="hljs-keyword">qt5_use_modules</span>(myproject Widgets)
diff --git a/test/markup/cmake/default.txt b/test/markup/cmake/default.txt
new file mode 100644
index 0000000000..2bbea38c9d
--- /dev/null
+++ b/test/markup/cmake/default.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.8.8)
+project(cmake_example)
+
+# Show message on Linux platform
+if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
+    message("Good choice, bro!")
+endif()
+
+# Tell CMake to run moc when necessary:
+set(CMAKE_AUTOMOC ON)
+# As moc files are generated in the binary dir,
+# tell CMake to always look for includes there:
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Widgets finds its own dependencies.
+find_package(Qt5Widgets REQUIRED)
+
+add_executable(myproject main.cpp mainwindow.cpp)
+qt5_use_modules(myproject Widgets)
diff --git a/test/markup/coq/default.expect.txt b/test/markup/coq/default.expect.txt
new file mode 100644
index 0000000000..e5b93b13b4
--- /dev/null
+++ b/test/markup/coq/default.expect.txt
@@ -0,0 +1,41 @@
+<span class="hljs-keyword">Inductive</span> seq : nat -&gt; <span class="hljs-keyword">Set</span> :=
+| <span class="hljs-type">niln</span> : seq <span class="hljs-number">0</span>
+| <span class="hljs-type">consn</span> : <span class="hljs-keyword">forall</span> n : nat, nat -&gt; seq n -&gt; seq (S n).
+
+<span class="hljs-keyword">Fixpoint</span> length (n : nat) (s : seq n) {struct s} : nat :=
+  <span class="hljs-keyword">match</span> s <span class="hljs-built_in">with</span>
+  | <span class="hljs-type">niln</span> =&gt; <span class="hljs-number">0</span>
+  | <span class="hljs-type">consn</span> i <span class="hljs-keyword">_</span> s&#x27; =&gt; S (length i s&#x27;)
+  <span class="hljs-keyword">end</span>.
+
+<span class="hljs-keyword">Theorem</span> length_corr : <span class="hljs-keyword">forall</span> (n : nat) (s : seq n), length n s = n.
+<span class="hljs-keyword">Proof</span>.
+  <span class="hljs-built_in">intros</span> n s.
+
+  <span class="hljs-comment">(* reasoning by induction over s. Then, we have two new goals
+     corresponding on the case analysis about s (either it is
+     niln or some consn *)</span>
+  <span class="hljs-built_in">induction</span> s.
+
+    <span class="hljs-comment">(* We are in the case where s is void. We can reduce the
+       term: length 0 niln *)</span>
+    <span class="hljs-built_in">simpl</span>.
+
+    <span class="hljs-comment">(* We obtain the goal 0 = 0. *)</span>
+    <span class="hljs-built_in">trivial</span>.
+
+    <span class="hljs-comment">(* now, we treat the case s = consn n e s with induction
+       hypothesis IHs *)</span>
+    <span class="hljs-built_in">simpl</span>.
+
+    <span class="hljs-comment">(* The induction hypothesis has type length n s = n.
+       So we can use it to perform some rewriting in the goal: *)</span>
+    <span class="hljs-built_in">rewrite</span> IHs.
+
+    <span class="hljs-comment">(* Now the goal is the trivial equality: S n = S n *)</span>
+    <span class="hljs-built_in">trivial</span>.
+
+  <span class="hljs-comment">(* Now all sub cases are closed, we perform the ultimate
+     step: typing the term built using tactics and save it as
+     a witness of the theorem. *)</span>
+<span class="hljs-keyword">Qed</span>.
diff --git a/test/markup/coq/default.txt b/test/markup/coq/default.txt
new file mode 100644
index 0000000000..482b23e0eb
--- /dev/null
+++ b/test/markup/coq/default.txt
@@ -0,0 +1,41 @@
+Inductive seq : nat -> Set :=
+| niln : seq 0
+| consn : forall n : nat, nat -> seq n -> seq (S n).
+
+Fixpoint length (n : nat) (s : seq n) {struct s} : nat :=
+  match s with
+  | niln => 0
+  | consn i _ s' => S (length i s')
+  end.
+
+Theorem length_corr : forall (n : nat) (s : seq n), length n s = n.
+Proof.
+  intros n s.
+
+  (* reasoning by induction over s. Then, we have two new goals
+     corresponding on the case analysis about s (either it is
+     niln or some consn *)
+  induction s.
+
+    (* We are in the case where s is void. We can reduce the
+       term: length 0 niln *)
+    simpl.
+
+    (* We obtain the goal 0 = 0. *)
+    trivial.
+
+    (* now, we treat the case s = consn n e s with induction
+       hypothesis IHs *)
+    simpl.
+
+    (* The induction hypothesis has type length n s = n.
+       So we can use it to perform some rewriting in the goal: *)
+    rewrite IHs.
+
+    (* Now the goal is the trivial equality: S n = S n *)
+    trivial.
+
+  (* Now all sub cases are closed, we perform the ultimate
+     step: typing the term built using tactics and save it as
+     a witness of the theorem. *)
+Qed.
diff --git a/test/markup/crmsh/default.expect.txt b/test/markup/crmsh/default.expect.txt
new file mode 100644
index 0000000000..205914835d
--- /dev/null
+++ b/test/markup/crmsh/default.expect.txt
@@ -0,0 +1,48 @@
+<span class="hljs-keyword">node</span> <span class="hljs-title">webui</span>
+<span class="hljs-keyword">node</span> 168633611:<span class="hljs-title"> node1</span>
+<span class="hljs-keyword">rsc_template</span><span class="hljs-title"> web-server</span> apache \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">port=</span><span class="hljs-number">8000</span> \
+	<span class="hljs-keyword">op</span> <span class="hljs-literal">monitor</span> <span class="hljs-attr">interval=</span><span class="hljs-number">10s</span>
+<span class="hljs-comment"># Never use this STONITH agent in production!</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> development-stonith</span> stonith:null \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">hostlist=</span><span class="hljs-string">&quot;webui node1 node2 node3&quot;</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> proxy</span> systemd:haproxy \
+	<span class="hljs-keyword">op</span> <span class="hljs-literal">monitor</span> <span class="hljs-attr">interval=</span><span class="hljs-number">10s</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> proxy-vip</span> IPaddr2 \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">ip=</span><span class="hljs-number">10.13</span>.<span class="hljs-number">37.20</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> srv1</span> @web-server
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> srv2</span> @web-server
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> test1</span> Dummy
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> test2</span> IPaddr2 \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">ip=</span><span class="hljs-number">10.13</span>.<span class="hljs-number">37.99</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> vip1</span> IPaddr2 \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">ip=</span><span class="hljs-number">10.13</span>.<span class="hljs-number">37.21</span> \
+	<span class="hljs-keyword">op</span> <span class="hljs-literal">monitor</span> <span class="hljs-attr">interval=</span><span class="hljs-number">20s</span>
+<span class="hljs-keyword">primitive</span><span class="hljs-title"> vip2</span> IPaddr2 \
+	<span class="hljs-keyword">params</span> <span class="hljs-attr">ip=</span><span class="hljs-number">10.13</span>.<span class="hljs-number">37.22</span> \
+	<span class="hljs-keyword">op</span> <span class="hljs-literal">monitor</span> <span class="hljs-attr">interval=</span><span class="hljs-number">20s</span>
+<span class="hljs-keyword">group</span> <span class="hljs-title">g-proxy</span> proxy-vip proxy
+<span class="hljs-keyword">group</span> <span class="hljs-title">g-serv1</span> vip1 srv1
+<span class="hljs-keyword">group</span> <span class="hljs-title">g-serv2</span> vip2 srv2
+<span class="hljs-comment"># Never put the two web servers on the same node</span>
+<span class="hljs-keyword">colocation</span> <span class="hljs-title">co-serv</span> <span class="hljs-literal">-inf</span>: g-serv1 g-serv2
+<span class="hljs-comment"># Never put any web server or haproxy on webui</span>
+<span class="hljs-keyword">location</span> <span class="hljs-title">l-avoid-webui</span> { g-proxy g-serv1 g-serv2 } <span class="hljs-literal">-inf</span>: webui
+<span class="hljs-comment"># Prever to spread groups across nodes</span>
+<span class="hljs-keyword">location</span> <span class="hljs-title">l-proxy</span> g-proxy <span class="hljs-number">200</span>: node1
+<span class="hljs-keyword">location</span> <span class="hljs-title">l-serv1</span> g-serv1 <span class="hljs-number">200</span>: node2
+<span class="hljs-keyword">location</span> <span class="hljs-title">l-serv2</span> g-serv2 <span class="hljs-number">200</span>: node3
+<span class="hljs-keyword">property</span><span class="hljs-title"> cib-bootstrap-options:</span> \
+	<span class="hljs-attr">stonith-enabled=</span><span class="hljs-literal">true</span> \
+	<span class="hljs-attr">no-quorum-policy=</span>ignore \
+	<span class="hljs-attr">placement-strategy=</span>balanced \
+	<span class="hljs-attr">have-watchdog=</span><span class="hljs-literal">false</span> \
+	<span class="hljs-attr">dc-version=</span><span class="hljs-string">&quot;1.1.13-1.1.13+git20150827.e8888b9&quot;</span> \
+	<span class="hljs-attr">cluster-infrastructure=</span>corosync \
+	<span class="hljs-attr">cluster-name=</span>hacluster
+<span class="hljs-keyword">rsc_defaults</span><span class="hljs-title"> rsc-options:</span> \
+	<span class="hljs-attr">resource-stickiness=</span><span class="hljs-number">1</span> \
+	<span class="hljs-attr">migration-threshold=</span><span class="hljs-number">3</span>
+<span class="hljs-keyword">op_defaults</span><span class="hljs-title"> op-options:</span> \
+	<span class="hljs-attr">timeout=</span><span class="hljs-number">600</span> \
+	<span class="hljs-attr">record-pending=</span><span class="hljs-literal">true</span>
diff --git a/test/markup/crmsh/default.txt b/test/markup/crmsh/default.txt
new file mode 100644
index 0000000000..4e4c286c06
--- /dev/null
+++ b/test/markup/crmsh/default.txt
@@ -0,0 +1,48 @@
+node webui
+node 168633611: node1
+rsc_template web-server apache \
+	params port=8000 \
+	op monitor interval=10s
+# Never use this STONITH agent in production!
+primitive development-stonith stonith:null \
+	params hostlist="webui node1 node2 node3"
+primitive proxy systemd:haproxy \
+	op monitor interval=10s
+primitive proxy-vip IPaddr2 \
+	params ip=10.13.37.20
+primitive srv1 @web-server
+primitive srv2 @web-server
+primitive test1 Dummy
+primitive test2 IPaddr2 \
+	params ip=10.13.37.99
+primitive vip1 IPaddr2 \
+	params ip=10.13.37.21 \
+	op monitor interval=20s
+primitive vip2 IPaddr2 \
+	params ip=10.13.37.22 \
+	op monitor interval=20s
+group g-proxy proxy-vip proxy
+group g-serv1 vip1 srv1
+group g-serv2 vip2 srv2
+# Never put the two web servers on the same node
+colocation co-serv -inf: g-serv1 g-serv2
+# Never put any web server or haproxy on webui
+location l-avoid-webui { g-proxy g-serv1 g-serv2 } -inf: webui
+# Prever to spread groups across nodes
+location l-proxy g-proxy 200: node1
+location l-serv1 g-serv1 200: node2
+location l-serv2 g-serv2 200: node3
+property cib-bootstrap-options: \
+	stonith-enabled=true \
+	no-quorum-policy=ignore \
+	placement-strategy=balanced \
+	have-watchdog=false \
+	dc-version="1.1.13-1.1.13+git20150827.e8888b9" \
+	cluster-infrastructure=corosync \
+	cluster-name=hacluster
+rsc_defaults rsc-options: \
+	resource-stickiness=1 \
+	migration-threshold=3
+op_defaults op-options: \
+	timeout=600 \
+	record-pending=true
diff --git a/test/markup/csp/default.expect.txt b/test/markup/csp/default.expect.txt
new file mode 100644
index 0000000000..b8f346f918
--- /dev/null
+++ b/test/markup/csp/default.expect.txt
@@ -0,0 +1,5 @@
+<span class="hljs-attribute">Content-Security-Policy</span>:
+    <span class="hljs-keyword">default-src</span> <span class="hljs-string">&#x27;self&#x27;</span>;
+    <span class="hljs-keyword">style-src</span> <span class="hljs-string">&#x27;self&#x27;</span> css.example.com;
+    <span class="hljs-keyword">img-src</span> *.example.com;
+    <span class="hljs-keyword">script-src</span> <span class="hljs-string">&#x27;unsafe-eval&#x27;</span> <span class="hljs-string">&#x27;self&#x27;</span> js.example.com <span class="hljs-string">&#x27;nonce-Nc3n83cnSAd3wc3Sasdfn939hc3&#x27;</span>
diff --git a/test/markup/csp/default.txt b/test/markup/csp/default.txt
new file mode 100644
index 0000000000..8e68bad89e
--- /dev/null
+++ b/test/markup/csp/default.txt
@@ -0,0 +1,5 @@
+Content-Security-Policy:
+    default-src 'self';
+    style-src 'self' css.example.com;
+    img-src *.example.com;
+    script-src 'unsafe-eval' 'self' js.example.com 'nonce-Nc3n83cnSAd3wc3Sasdfn939hc3'
diff --git a/test/markup/d/default.expect.txt b/test/markup/d/default.expect.txt
new file mode 100644
index 0000000000..17840372f3
--- /dev/null
+++ b/test/markup/d/default.expect.txt
@@ -0,0 +1,44 @@
+<span class="hljs-meta">#!/usr/bin/rdmd</span>
+<span class="hljs-comment">// Computes average line length for standard input.</span>
+<span class="hljs-keyword">import</span> std.stdio;
+
+<span class="hljs-comment">/+
+  this is a <span class="hljs-comment">/+ nesting +/</span> comment
++/</span>
+
+<span class="hljs-keyword">enum</span> COMPILED_ON = <span class="hljs-keyword">__TIMESTAMP__</span>;  <span class="hljs-comment">// special token</span>
+
+<span class="hljs-keyword">enum</span> character = <span class="hljs-string">&#x27;©&#x27;</span>;
+<span class="hljs-keyword">enum</span> copy_valid = <span class="hljs-string">&#x27;&amp;copy;&#x27;</span>;
+<span class="hljs-keyword">enum</span> backslash_escaped = <span class="hljs-string">&#x27;\\&#x27;</span>;
+
+<span class="hljs-comment">// string literals</span>
+<span class="hljs-keyword">enum</span> str = <span class="hljs-string">`hello &quot;world&quot;!`</span>;
+<span class="hljs-keyword">enum</span> multiline = <span class="hljs-string">r&quot;lorem
+ipsum
+dolor&quot;</span>;  <span class="hljs-comment">// wysiwyg string, no escapes here allowed</span>
+<span class="hljs-keyword">enum</span> multiline2 = <span class="hljs-string">&quot;sit
+amet
+\&quot;adipiscing\&quot;
+elit.&quot;</span>;
+<span class="hljs-keyword">enum</span> hex = <span class="hljs-string">x&quot;66 6f 6f&quot;</span>;   <span class="hljs-comment">// same as &quot;foo&quot;</span>
+
+<span class="hljs-meta">#line 5</span>
+
+<span class="hljs-comment">// float literals</span>
+<span class="hljs-keyword">enum</span> f = [<span class="hljs-number">3.14f</span>, .<span class="hljs-number">1</span>, <span class="hljs-number">1.</span>, <span class="hljs-number">1e100</span>, <span class="hljs-number">0xc0de.01p+100</span>];
+
+<span class="hljs-keyword">static</span> <span class="hljs-keyword">if</span> (something == <span class="hljs-literal">true</span>) {
+   <span class="hljs-keyword">import</span> std.algorithm;
+}
+
+<span class="hljs-keyword">void</span> main() <span class="hljs-keyword">pure</span> <span class="hljs-keyword">nothrow</span> <span class="hljs-keyword">@safe</span> {
+    <span class="hljs-built_in">ulong</span> lines = <span class="hljs-number">0</span>;
+    <span class="hljs-built_in">double</span> sumLength = <span class="hljs-number">0</span>;
+    <span class="hljs-keyword">foreach</span> (line; stdin.byLine()) {
+        ++lines;
+        sumLength += line.length;
+    }
+    writeln(<span class="hljs-string">&quot;Average line length: &quot;</span>,
+        lines ? sumLength / lines : <span class="hljs-number">0</span>);
+}
diff --git a/test/markup/d/default.txt b/test/markup/d/default.txt
new file mode 100644
index 0000000000..92cc8d84eb
--- /dev/null
+++ b/test/markup/d/default.txt
@@ -0,0 +1,44 @@
+#!/usr/bin/rdmd
+// Computes average line length for standard input.
+import std.stdio;
+
+/+
+  this is a /+ nesting +/ comment
++/
+
+enum COMPILED_ON = __TIMESTAMP__;  // special token
+
+enum character = '©';
+enum copy_valid = '&copy;';
+enum backslash_escaped = '\\';
+
+// string literals
+enum str = `hello "world"!`;
+enum multiline = r"lorem
+ipsum
+dolor";  // wysiwyg string, no escapes here allowed
+enum multiline2 = "sit
+amet
+\"adipiscing\"
+elit.";
+enum hex = x"66 6f 6f";   // same as "foo"
+
+#line 5
+
+// float literals
+enum f = [3.14f, .1, 1., 1e100, 0xc0de.01p+100];
+
+static if (something == true) {
+   import std.algorithm;
+}
+
+void main() pure nothrow @safe {
+    ulong lines = 0;
+    double sumLength = 0;
+    foreach (line; stdin.byLine()) {
+        ++lines;
+        sumLength += line.length;
+    }
+    writeln("Average line length: ",
+        lines ? sumLength / lines : 0);
+}
diff --git a/test/markup/django/default.expect.txt b/test/markup/django/default.expect.txt
new file mode 100644
index 0000000000..da4820d864
--- /dev/null
+++ b/test/markup/django/default.expect.txt
@@ -0,0 +1,16 @@
+<span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">if</span></span> articles|<span class="hljs-name">length</span> %}</span><span class="xml">
+</span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">for</span></span> article <span class="hljs-keyword">in</span> articles %}</span><span class="xml">
+
+</span><span class="hljs-template-tag">{% <span class="hljs-name">custom</span> %}</span><span class="xml">
+
+</span><span class="hljs-comment">{# Striped table #}</span><span class="xml">
+<span class="hljs-tag">&lt;<span class="hljs-name">tr</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;</span></span></span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">cycle</span></span> odd,even %}</span><span class="xml"><span class="hljs-tag"><span class="hljs-string">&quot;</span>&gt;</span>
+  <span class="hljs-tag">&lt;<span class="hljs-name">td</span>&gt;</span></span><span class="hljs-template-variable">{{ article|<span class="hljs-name">default</span>:<span class="hljs-string">&quot;Hi... &quot;</span> }}</span><span class="xml"><span class="hljs-tag">&lt;/<span class="hljs-name">td</span>&gt;</span>
+  <span class="hljs-tag">&lt;<span class="hljs-name">td</span> </span></span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">if</span></span> article.today %}</span><span class="xml"><span class="hljs-tag"><span class="hljs-attr">class</span>=<span class="hljs-string">&quot;today&quot;</span></span></span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">endif</span></span> %}</span><span class="xml"><span class="hljs-tag">&gt;</span>
+    Published on </span><span class="hljs-template-variable">{{ article.date }}</span><span class="xml">
+  <span class="hljs-tag">&lt;/<span class="hljs-name">td</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">tr</span>&gt;</span>
+
+</span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">endfor</span></span> %}</span><span class="xml">
+</span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-name">endif</span></span> %}</span><span class="xml">
+</span>
\ No newline at end of file
diff --git a/test/markup/django/default.txt b/test/markup/django/default.txt
new file mode 100644
index 0000000000..981105ad55
--- /dev/null
+++ b/test/markup/django/default.txt
@@ -0,0 +1,15 @@
+{% if articles|length %}
+{% for article in articles %}
+
+{% custom %}
+
+{# Striped table #}
+<tr class="{% cycle odd,even %}">
+  <td>{{ article|default:"Hi... " }}</td>
+  <td {% if article.today %}class="today"{% endif %}>
+    Published on {{ article.date }}
+  </td>
+</tr>
+
+{% endfor %}
+{% endif %}
diff --git a/test/markup/dns/default.expect.txt b/test/markup/dns/default.expect.txt
new file mode 100644
index 0000000000..d302de0777
--- /dev/null
+++ b/test/markup/dns/default.expect.txt
@@ -0,0 +1,17 @@
+<span class="hljs-meta">$ORIGIN</span> example.com.    <span class="hljs-comment">; designates the start of this zone file in the namespace</span>
+<span class="hljs-meta">$TTL</span> <span class="hljs-number">1h</span>                 <span class="hljs-comment">; default expiration time of all resource records without their own TTL value</span>
+example.com.  <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">SOA</span>   ns.example.com. username.example.com. ( <span class="hljs-number">2007120710</span> <span class="hljs-number">1d</span> <span class="hljs-number">2h</span> <span class="hljs-number">4w</span> <span class="hljs-number">1h</span> )
+example.com.  <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">NS</span>    ns                    <span class="hljs-comment">; ns.example.com is a nameserver for example.com</span>
+example.com.  <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">NS</span>    ns.somewhere.example. <span class="hljs-comment">; ns.somewhere.example is a backup nameserver for example.com</span>
+example.com.  <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">MX</span>    <span class="hljs-number">10</span> mail.example.com.  <span class="hljs-comment">; mail.example.com is the mailserver for example.com</span>
+@             <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">MX</span>    <span class="hljs-number">20</span> mail2.example.com. <span class="hljs-comment">; equivalent to above line, &quot;@&quot; represents zone origin</span>
+@             <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">MX</span>    <span class="hljs-number">50</span> mail3              <span class="hljs-comment">; equivalent to above line, but using a relative host name</span>
+example.com.  <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">A</span>     <span class="hljs-number">192.0.2.1</span>             <span class="hljs-comment">; IPv4 address for example.com</span>
+              <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">AAAA</span>  <span class="hljs-number">2001:db8:10::1</span>        <span class="hljs-comment">; IPv6 address for example.com</span>
+ns            <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">A</span>     <span class="hljs-number">192.0.2.2</span>             <span class="hljs-comment">; IPv4 address for ns.example.com</span>
+              <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">AAAA</span>  <span class="hljs-number">2001:db8:10::2</span>        <span class="hljs-comment">; IPv6 address for ns.example.com</span>
+www           <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">CNAME</span> example.com.          <span class="hljs-comment">; www.example.com is an alias for example.com</span>
+wwwtest       <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">CNAME</span> www                   <span class="hljs-comment">; wwwtest.example.com is another alias for www.example.com</span>
+mail          <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">A</span>     <span class="hljs-number">192.0.2.3</span>             <span class="hljs-comment">; IPv4 address for mail.example.com</span>
+mail2         <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">A</span>     <span class="hljs-number">192.0.2.4</span>             <span class="hljs-comment">; IPv4 address for mail2.example.com</span>
+mail3         <span class="hljs-keyword">IN</span>  <span class="hljs-keyword">A</span>     <span class="hljs-number">192.0.2.5</span>             <span class="hljs-comment">; IPv4 address for mail3.example.com</span>
diff --git a/test/markup/dns/default.txt b/test/markup/dns/default.txt
new file mode 100644
index 0000000000..61d27529e1
--- /dev/null
+++ b/test/markup/dns/default.txt
@@ -0,0 +1,17 @@
+$ORIGIN example.com.    ; designates the start of this zone file in the namespace
+$TTL 1h                 ; default expiration time of all resource records without their own TTL value
+example.com.  IN  SOA   ns.example.com. username.example.com. ( 2007120710 1d 2h 4w 1h )
+example.com.  IN  NS    ns                    ; ns.example.com is a nameserver for example.com
+example.com.  IN  NS    ns.somewhere.example. ; ns.somewhere.example is a backup nameserver for example.com
+example.com.  IN  MX    10 mail.example.com.  ; mail.example.com is the mailserver for example.com
+@             IN  MX    20 mail2.example.com. ; equivalent to above line, "@" represents zone origin
+@             IN  MX    50 mail3              ; equivalent to above line, but using a relative host name
+example.com.  IN  A     192.0.2.1             ; IPv4 address for example.com
+              IN  AAAA  2001:db8:10::1        ; IPv6 address for example.com
+ns            IN  A     192.0.2.2             ; IPv4 address for ns.example.com
+              IN  AAAA  2001:db8:10::2        ; IPv6 address for ns.example.com
+www           IN  CNAME example.com.          ; www.example.com is an alias for example.com
+wwwtest       IN  CNAME www                   ; wwwtest.example.com is another alias for www.example.com
+mail          IN  A     192.0.2.3             ; IPv4 address for mail.example.com
+mail2         IN  A     192.0.2.4             ; IPv4 address for mail2.example.com
+mail3         IN  A     192.0.2.5             ; IPv4 address for mail3.example.com
diff --git a/test/markup/dts/default.expect.txt b/test/markup/dts/default.expect.txt
new file mode 100644
index 0000000000..58cc15f829
--- /dev/null
+++ b/test/markup/dts/default.expect.txt
@@ -0,0 +1,71 @@
+<span class="hljs-comment">/*
+ *  Copyright (C) 2011 - 2014 Xilinx
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */</span>
+<span class="hljs-meta-keyword">/include/</span> <span class="hljs-string">&quot;skeleton.dtsi&quot;</span>
+
+<span class="hljs-class">/ {
+	compatible = <span class="hljs-string">&quot;xlnx,zynq-7000&quot;</span>;
+
+	<span class="hljs-class">pmu </span>{
+		compatible = <span class="hljs-string">&quot;arm,cortex-a9-pmu&quot;</span>;
+		interrupts = <span class="hljs-params">&lt;<span class="hljs-number">0</span> <span class="hljs-number">5</span> <span class="hljs-number">4</span>&gt;</span>, <span class="hljs-params">&lt;<span class="hljs-number">0</span> <span class="hljs-number">6</span> <span class="hljs-number">4</span>&gt;</span>;
+		interrupt-parent = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;intc</span>&gt;</span>;
+		reg = <span class="hljs-params">&lt; <span class="hljs-number">0xf8891000</span> <span class="hljs-number">0x1000</span> <span class="hljs-number">0xf8893000</span> <span class="hljs-number">0x1000</span> &gt;</span>;
+	};</span>
+<span class="hljs-symbol">
+	regulator_vccpint:</span> <span class="hljs-class">fixedregulator@0 </span>{
+		compatible = <span class="hljs-string">&quot;regulator-fixed&quot;</span>;
+		regulator-name = <span class="hljs-string">&quot;VCCPINT&quot;</span>;
+		regulator-min-microvolt = <span class="hljs-params">&lt;<span class="hljs-number">1000000</span>&gt;</span>;
+		regulator-max-microvolt = <span class="hljs-params">&lt;<span class="hljs-number">1000000</span>&gt;</span>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+<span class="hljs-symbol">
+	amba:</span> <span class="hljs-class">amba </span>{
+		compatible = <span class="hljs-string">&quot;simple-bus&quot;</span>;
+		<span class="hljs-meta">#address-cells = &lt;1&gt;;</span>
+		<span class="hljs-meta">#size-cells = &lt;1&gt;;</span>
+		interrupt-parent = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;intc</span>&gt;</span>;
+		ranges;
+<span class="hljs-symbol">
+		adc:</span> <span class="hljs-class">adc@f8007100 </span>{
+			compatible = <span class="hljs-string">&quot;xlnx,zynq-xadc-1.00.a&quot;</span>;
+			reg = <span class="hljs-params">&lt;<span class="hljs-number">0xf8007100</span> <span class="hljs-number">0x20</span>&gt;</span>;
+			interrupts = <span class="hljs-params">&lt;<span class="hljs-number">0</span> <span class="hljs-number">7</span> <span class="hljs-number">4</span>&gt;</span>;
+			interrupt-parent = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;intc</span>&gt;</span>;
+			clocks = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;clkc</span> <span class="hljs-number">12</span>&gt;</span>;
+		};
+<span class="hljs-symbol">
+		i2c0:</span> <span class="hljs-class">i2c@e0004000 </span>{
+			compatible = <span class="hljs-string">&quot;cdns,i2c-r1p10&quot;</span>;
+			status = <span class="hljs-string">&quot;disabled&quot;</span>;
+			clocks = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;clkc</span> <span class="hljs-number">38</span>&gt;</span>;
+			interrupt-parent = <span class="hljs-params">&lt;<span class="hljs-variable">&amp;intc</span>&gt;</span>;
+			interrupts = <span class="hljs-params">&lt;<span class="hljs-number">0</span> <span class="hljs-number">25</span> <span class="hljs-number">4</span>&gt;</span>;
+			reg = <span class="hljs-params">&lt;<span class="hljs-number">0xe0004000</span> <span class="hljs-number">0x1000</span>&gt;</span>;
+			<span class="hljs-meta">#address-cells = &lt;1&gt;;</span>
+			<span class="hljs-meta">#size-cells = &lt;0&gt;;</span>
+		};
+<span class="hljs-symbol">
+		L2:</span> cache-<span class="hljs-class">controller@f8f02000 </span>{
+			compatible = <span class="hljs-string">&quot;arm,pl310-cache&quot;</span>;
+			reg = <span class="hljs-params">&lt;<span class="hljs-number">0xF8F02000</span> <span class="hljs-number">0x1000</span>&gt;</span>;
+			interrupts = <span class="hljs-params">&lt;<span class="hljs-number">0</span> <span class="hljs-number">2</span> <span class="hljs-number">4</span>&gt;</span>;
+			arm,data-latency = <span class="hljs-params">&lt;<span class="hljs-number">3</span> <span class="hljs-number">2</span> <span class="hljs-number">2</span>&gt;</span>;
+			arm,tag-latency = <span class="hljs-params">&lt;<span class="hljs-number">2</span> <span class="hljs-number">2</span> <span class="hljs-number">2</span>&gt;</span>;
+			cache-unified;
+			cache-level = <span class="hljs-params">&lt;<span class="hljs-number">2</span>&gt;</span>;
+		};
+
+	};
+};
diff --git a/test/markup/dts/default.txt b/test/markup/dts/default.txt
new file mode 100644
index 0000000000..807826f9f4
--- /dev/null
+++ b/test/markup/dts/default.txt
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (C) 2011 - 2014 Xilinx
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+/include/ "skeleton.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-7000";
+
+	pmu {
+		compatible = "arm,cortex-a9-pmu";
+		interrupts = <0 5 4>, <0 6 4>;
+		interrupt-parent = <&intc>;
+		reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
+	};
+
+	regulator_vccpint: fixedregulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "VCCPINT";
+		regulator-min-microvolt = <1000000>;
+		regulator-max-microvolt = <1000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	amba: amba {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		interrupt-parent = <&intc>;
+		ranges;
+
+		adc: adc@f8007100 {
+			compatible = "xlnx,zynq-xadc-1.00.a";
+			reg = <0xf8007100 0x20>;
+			interrupts = <0 7 4>;
+			interrupt-parent = <&intc>;
+			clocks = <&clkc 12>;
+		};
+
+		i2c0: i2c@e0004000 {
+			compatible = "cdns,i2c-r1p10";
+			status = "disabled";
+			clocks = <&clkc 38>;
+			interrupt-parent = <&intc>;
+			interrupts = <0 25 4>;
+			reg = <0xe0004000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		L2: cache-controller@f8f02000 {
+			compatible = "arm,pl310-cache";
+			reg = <0xF8F02000 0x1000>;
+			interrupts = <0 2 4>;
+			arm,data-latency = <3 2 2>;
+			arm,tag-latency = <2 2 2>;
+			cache-unified;
+			cache-level = <2>;
+		};
+
+	};
+};
diff --git a/test/markup/dust/default.expect.txt b/test/markup/dust/default.expect.txt
new file mode 100644
index 0000000000..34ca1941de
--- /dev/null
+++ b/test/markup/dust/default.expect.txt
@@ -0,0 +1,8 @@
+<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">h3</span>&gt;</span>Hours<span class="hljs-tag">&lt;/<span class="hljs-name">h3</span>&gt;</span>
+
+<span class="hljs-tag">&lt;<span class="hljs-name">ul</span>&gt;</span>
+  </span><span class="hljs-template-tag">{#<span class="hljs-name">users</span>}</span><span class="xml">
+  <span class="hljs-tag">&lt;<span class="hljs-name">li</span> </span></span><span class="hljs-template-variable">{hello}</span><span class="xml"><span class="hljs-tag">&gt;</span></span><span class="hljs-template-variable">{firstName}</span><span class="xml"><span class="hljs-tag">&lt;/<span class="hljs-name">li</span>&gt;</span></span><span class="hljs-template-variable">{~n}</span><span class="xml">
+  </span><span class="hljs-template-tag">{/<span class="hljs-name">users</span>}</span><span class="xml">
+<span class="hljs-tag">&lt;/<span class="hljs-name">ul</span>&gt;</span>
+</span>
\ No newline at end of file
diff --git a/test/markup/dust/default.txt b/test/markup/dust/default.txt
new file mode 100644
index 0000000000..11bc7eb03f
--- /dev/null
+++ b/test/markup/dust/default.txt
@@ -0,0 +1,7 @@
+<h3>Hours</h3>
+
+<ul>
+  {#users}
+  <li {hello}>{firstName}</li>{~n}
+  {/users}
+</ul>
diff --git a/test/markup/elm/default.expect.txt b/test/markup/elm/default.expect.txt
new file mode 100644
index 0000000000..eeacdd7969
--- /dev/null
+++ b/test/markup/elm/default.expect.txt
@@ -0,0 +1,22 @@
+<span class="hljs-keyword">import</span> Browser
+<span class="hljs-keyword">import</span> Html <span class="hljs-keyword">exposing</span> (div, button, text)
+<span class="hljs-keyword">import</span> Html.Events <span class="hljs-keyword">exposing</span> (onClick)
+
+<span class="hljs-keyword">type</span> <span class="hljs-type">Msg</span>
+    = <span class="hljs-type">Increment</span>
+
+<span class="hljs-title">main</span> =
+    <span class="hljs-type">Browser</span>.sandbox
+        { init = <span class="hljs-number">0</span>
+        , update = \msg model -&gt; model + <span class="hljs-number">1</span>
+        , view = view
+        }
+
+<span class="hljs-title">view</span> model =
+    div []
+        [ div [] [ text (<span class="hljs-type">String</span>.fromInt model) ]
+        , button [ onClick <span class="hljs-type">Increment</span> ] [ text <span class="hljs-string">&quot;+&quot;</span> ]
+        ]
+
+<span class="hljs-title">chars</span> =
+    <span class="hljs-type">String</span>.cons <span class="hljs-string">&#x27;C&#x27;</span> &lt;| <span class="hljs-type">String</span>.cons <span class="hljs-string">&#x27;h&#x27;</span> &lt;| <span class="hljs-string">&quot;ars&quot;</span>
diff --git a/test/markup/elm/default.txt b/test/markup/elm/default.txt
new file mode 100644
index 0000000000..5d9c384057
--- /dev/null
+++ b/test/markup/elm/default.txt
@@ -0,0 +1,22 @@
+import Browser
+import Html exposing (div, button, text)
+import Html.Events exposing (onClick)
+
+type Msg
+    = Increment
+
+main =
+    Browser.sandbox
+        { init = 0
+        , update = \msg model -> model + 1
+        , view = view
+        }
+
+view model =
+    div []
+        [ div [] [ text (String.fromInt model) ]
+        , button [ onClick Increment ] [ text "+" ]
+        ]
+
+chars =
+    String.cons 'C' <| String.cons 'h' <| "ars"
diff --git a/test/markup/erb/default.expect.txt b/test/markup/erb/default.expect.txt
new file mode 100644
index 0000000000..e50aa3b60b
--- /dev/null
+++ b/test/markup/erb/default.expect.txt
@@ -0,0 +1,11 @@
+<span class="hljs-comment">&lt;%# this is a comment %&gt;</span><span class="xml">
+
+&lt;%</span><span class="ruby"> <span class="hljs-variable">@posts</span>.each <span class="hljs-keyword">do</span> <span class="hljs-params">|post|</span> </span><span class="xml">%&gt;
+  <span class="hljs-tag">&lt;<span class="hljs-name">p</span>&gt;</span>&lt;%=</span><span class="ruby"> link_to post.title, post </span><span class="xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">p</span>&gt;</span>
+&lt;%</span><span class="ruby"> <span class="hljs-keyword">end</span> </span><span class="xml">%&gt;
+
+&lt;%-</span><span class="ruby"> available_things = things.select(&amp;<span class="hljs-symbol">:available?</span>) </span><span class="xml">-%&gt;
+&lt;%%</span><span class="ruby">- x = <span class="hljs-number">1</span> + <span class="hljs-number">2</span> -</span><span class="xml">%%&gt;
+&lt;%%</span><span class="ruby"> value = <span class="hljs-string">&#x27;real string <span class="hljs-subst">#{<span class="hljs-variable">@value</span>}</span>&#x27;</span> </span><span class="xml">%%&gt;
+&lt;%%</span><span class="ruby">= available_things.inspect </span><span class="xml">%%&gt;
+</span>
\ No newline at end of file
diff --git a/test/markup/erb/default.txt b/test/markup/erb/default.txt
new file mode 100644
index 0000000000..f7ea6203f5
--- /dev/null
+++ b/test/markup/erb/default.txt
@@ -0,0 +1,10 @@
+<%# this is a comment %>
+
+<% @posts.each do |post| %>
+  <p><%= link_to post.title, post %></p>
+<% end %>
+
+<%- available_things = things.select(&:available?) -%>
+<%%- x = 1 + 2 -%%>
+<%% value = 'real string #{@value}' %%>
+<%%= available_things.inspect %%>
diff --git a/test/markup/erlang-repl/default.expect.txt b/test/markup/erlang-repl/default.expect.txt
new file mode 100644
index 0000000000..4ed648e14d
--- /dev/null
+++ b/test/markup/erlang-repl/default.expect.txt
@@ -0,0 +1,27 @@
+<span class="hljs-meta">1&gt; </span>Str = <span class="hljs-string">&quot;abcd&quot;</span>.
+<span class="hljs-string">&quot;abcd&quot;</span>
+<span class="hljs-meta">2&gt; </span>L = test:length(Str).
+<span class="hljs-number">4</span>
+<span class="hljs-meta">3&gt; </span>Descriptor = {L, list_to_atom(Str)}.
+{<span class="hljs-number">4</span>,abcd}
+<span class="hljs-meta">4&gt; </span>L.
+<span class="hljs-number">4</span>
+<span class="hljs-meta">5&gt; </span>b().
+Descriptor = {<span class="hljs-number">4</span>,abcd}
+L = <span class="hljs-number">4</span>
+Str = <span class="hljs-string">&quot;abcd&quot;</span>
+ok
+<span class="hljs-meta">6&gt; </span>f(L).
+ok
+<span class="hljs-meta">7&gt; </span>b().
+Descriptor = {<span class="hljs-number">4</span>,abcd}
+Str = <span class="hljs-string">&quot;abcd&quot;</span>
+ok
+<span class="hljs-meta">8&gt; </span>{L, _} = Descriptor.
+{<span class="hljs-number">4</span>,abcd}
+<span class="hljs-meta">9&gt; </span>L.
+<span class="hljs-number">4</span>
+<span class="hljs-meta">10&gt; </span><span class="hljs-number">2#101</span>.
+<span class="hljs-number">5</span>
+<span class="hljs-meta">11&gt; </span><span class="hljs-number">1.85e+3</span>.
+<span class="hljs-number">1850</span>
diff --git a/test/markup/erlang-repl/default.txt b/test/markup/erlang-repl/default.txt
new file mode 100644
index 0000000000..8f2bef358f
--- /dev/null
+++ b/test/markup/erlang-repl/default.txt
@@ -0,0 +1,27 @@
+1> Str = "abcd".
+"abcd"
+2> L = test:length(Str).
+4
+3> Descriptor = {L, list_to_atom(Str)}.
+{4,abcd}
+4> L.
+4
+5> b().
+Descriptor = {4,abcd}
+L = 4
+Str = "abcd"
+ok
+6> f(L).
+ok
+7> b().
+Descriptor = {4,abcd}
+Str = "abcd"
+ok
+8> {L, _} = Descriptor.
+{4,abcd}
+9> L.
+4
+10> 2#101.
+5
+11> 1.85e+3.
+1850
diff --git a/test/markup/fix/default.expect.txt b/test/markup/fix/default.expect.txt
new file mode 100644
index 0000000000..855eec184e
--- /dev/null
+++ b/test/markup/fix/default.expect.txt
@@ -0,0 +1,4 @@
+<span class="hljs-attr">8</span>=<span class="hljs-string">FIX.4.2</span>␁<span class="hljs-attr">9</span>=<span class="hljs-string">0</span>␁<span class="hljs-attr">35</span>=<span class="hljs-string">8</span>␁<span class="hljs-attr">49</span>=<span class="hljs-string">SENDERTEST</span>␁<span class="hljs-attr">56</span>=<span class="hljs-string">TARGETTEST</span>␁<span class="hljs-attr">34</span>=<span class="hljs-string">00000001526</span>␁<span class="hljs-attr">52</span>=<span class="hljs-string">20120429-13:30:08.137</span>␁<span class="hljs-attr">1</span>=<span class="hljs-string">ABC12345</span>␁<span class="hljs-attr">11</span>=<span class="hljs-string">2012abc1234</span>␁<span class="hljs-attr">14</span>=<span class="hljs-string">100</span>␁<span class="hljs-attr">17</span>=<span class="hljs-string">201254321</span>␁<span class="hljs-attr">20</span>=<span class="hljs-string">0</span>␁<span class="hljs-attr">30</span>=<span class="hljs-string">NYSE</span>␁<span class="hljs-attr">31</span>=<span class="hljs-string">108.20</span>␁<span class="hljs-attr">32</span>=<span class="hljs-string">100</span>␁<span class="hljs-attr">38</span>=<span class="hljs-string">100</span>␁<span class="hljs-attr">39</span>=<span class="hljs-string">2</span>␁<span class="hljs-attr">40</span>=<span class="hljs-string">1</span>␁<span class="hljs-attr">47</span>=<span class="hljs-string">A</span>␁<span class="hljs-attr">54</span>=<span class="hljs-string">5</span>␁<span class="hljs-attr">55</span>=<span class="hljs-string">BRK</span>␁<span class="hljs-attr">59</span>=<span class="hljs-string">2</span>␁<span class="hljs-attr">60</span>=<span class="hljs-string">20120429-13:30:08.000</span>␁<span class="hljs-attr">65</span>=<span class="hljs-string">B</span>␁<span class="hljs-attr">76</span>=<span class="hljs-string">BROKER</span>␁<span class="hljs-attr">84</span>=<span class="hljs-string">0</span>␁<span class="hljs-attr">100</span>=<span class="hljs-string">NYSE</span>␁<span class="hljs-attr">111</span>=<span class="hljs-string">100</span>␁<span class="hljs-attr">150</span>=<span class="hljs-string">2</span>␁<span class="hljs-attr">151</span>=<span class="hljs-string">0</span>␁<span class="hljs-attr">167</span>=<span class="hljs-string">CS</span>␁<span class="hljs-attr">377</span>=<span class="hljs-string">N</span>␁<span class="hljs-attr">10000</span>=<span class="hljs-string">SampleCustomTag</span>␁<span class="hljs-attr">10</span>=<span class="hljs-string">123</span>␁<span class="hljs-attr">
+
+8</span>=<span class="hljs-string">FIX.4.2</span>
<span class="hljs-attr">9</span>=<span class="hljs-string">0</span>
<span class="hljs-attr">35</span>=<span class="hljs-string">8</span>
<span class="hljs-attr">49</span>=<span class="hljs-string">SENDERTEST</span>
<span class="hljs-attr">56</span>=<span class="hljs-string">TARGETTEST</span>
<span class="hljs-attr">34</span>=<span class="hljs-string">00000001526</span>
<span class="hljs-attr">52</span>=<span class="hljs-string">20120429-13:30:08.137</span>
<span class="hljs-attr">1</span>=<span class="hljs-string">ABC12345</span>
<span class="hljs-attr">11</span>=<span class="hljs-string">2012abc1234</span>
<span class="hljs-attr">14</span>=<span class="hljs-string">100</span>
<span class="hljs-attr">17</span>=<span class="hljs-string">201254321</span>
<span class="hljs-attr">20</span>=<span class="hljs-string">0</span>
<span class="hljs-attr">30</span>=<span class="hljs-string">NYSE</span>
<span class="hljs-attr">31</span>=<span class="hljs-string">108.20</span>
<span class="hljs-attr">32</span>=<span class="hljs-string">100</span>
<span class="hljs-attr">38</span>=<span class="hljs-string">100</span>
<span class="hljs-attr">39</span>=<span class="hljs-string">2</span>
<span class="hljs-attr">40</span>=<span class="hljs-string">1</span>
<span class="hljs-attr">47</span>=<span class="hljs-string">A</span>
<span class="hljs-attr">54</span>=<span class="hljs-string">5</span>
<span class="hljs-attr">55</span>=<span class="hljs-string">BRK</span>
<span class="hljs-attr">59</span>=<span class="hljs-string">2</span>
<span class="hljs-attr">60</span>=<span class="hljs-string">20120429-13:30:08.000</span>
<span class="hljs-attr">65</span>=<span class="hljs-string">B</span>
<span class="hljs-attr">76</span>=<span class="hljs-string">BROKER</span>
<span class="hljs-attr">84</span>=<span class="hljs-string">0</span>
<span class="hljs-attr">100</span>=<span class="hljs-string">NYSE</span>
<span class="hljs-attr">111</span>=<span class="hljs-string">100</span>
<span class="hljs-attr">150</span>=<span class="hljs-string">2</span>
<span class="hljs-attr">151</span>=<span class="hljs-string">0</span>
<span class="hljs-attr">167</span>=<span class="hljs-string">CS</span>
<span class="hljs-attr">377</span>=<span class="hljs-string">N</span>
<span class="hljs-attr">10000</span>=<span class="hljs-string">SampleCustomTag</span>
<span class="hljs-attr">10</span>=<span class="hljs-string">123
+</span>

\ No newline at end of file
diff --git a/test/markup/fix/default.txt b/test/markup/fix/default.txt
new file mode 100644
index 0000000000..e93a625456
--- /dev/null
+++ b/test/markup/fix/default.txt
@@ -0,0 +1,4 @@
+8=FIX.4.2␁9=0␁35=8␁49=SENDERTEST␁56=TARGETTEST␁34=00000001526␁52=20120429-13:30:08.137␁1=ABC12345␁11=2012abc1234␁14=100␁17=201254321␁20=0␁30=NYSE␁31=108.20␁32=100␁38=100␁39=2␁40=1␁47=A␁54=5␁55=BRK␁59=2␁60=20120429-13:30:08.000␁65=B␁76=BROKER␁84=0␁100=NYSE␁111=100␁150=2␁151=0␁167=CS␁377=N␁10000=SampleCustomTag␁10=123␁
+
+8=FIX.4.2
9=0
35=8
49=SENDERTEST
56=TARGETTEST
34=00000001526
52=20120429-13:30:08.137
1=ABC12345
11=2012abc1234
14=100
17=201254321
20=0
30=NYSE
31=108.20
32=100
38=100
39=2
40=1
47=A
54=5
55=BRK
59=2
60=20120429-13:30:08.000
65=B
76=BROKER
84=0
100=NYSE
111=100
150=2
151=0
167=CS
377=N
10000=SampleCustomTag
10=123
+

\ No newline at end of file
diff --git a/test/markup/flix/default.expect.txt b/test/markup/flix/default.expect.txt
new file mode 100644
index 0000000000..dfec7e5cbc
--- /dev/null
+++ b/test/markup/flix/default.expect.txt
@@ -0,0 +1,49 @@
+<span class="hljs-comment">/**
+ * An example of Flix for syntax highlighting.
+ */</span>
+
+<span class="hljs-comment">// Here is a namespace.</span>
+<span class="hljs-keyword">namespace</span> a.b.c {
+
+    <span class="hljs-comment">// Here are some literals.</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">b</span></span>: Bool = <span class="hljs-literal">true</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">c</span></span>: Char = <span class="hljs-string">&#x27;a&#x27;</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span></span>: Float = <span class="hljs-number">1.23</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">i</span></span>: Int = <span class="hljs-number">42</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">s</span></span>: Str = <span class="hljs-string">&quot;string&quot;</span>
+
+    <span class="hljs-comment">// Here are some relations.</span>
+    <span class="hljs-keyword">rel</span> LitStm(r: Str, c: Int)
+    <span class="hljs-keyword">rel</span> AddStm(r: Str, x: Str, y: Str)
+    <span class="hljs-keyword">rel</span> DivStm(r: Str, x: Str, y: Str)
+
+    <span class="hljs-comment">// Here is a lattice.</span>
+    <span class="hljs-keyword">lat</span> LocalVar(k: Str, v: Constant)
+
+    <span class="hljs-comment">// Here is an index.</span>
+    <span class="hljs-keyword">index</span> LitStm{{r}, {r, c}}
+
+    <span class="hljs-comment">// Here is an enum.</span>
+    <span class="hljs-keyword">enum</span> Constant {
+          <span class="hljs-keyword">case</span> Top,
+
+        <span class="hljs-keyword">case</span> Cst(Int),
+
+          <span class="hljs-keyword">case</span> Bot
+    }
+
+    <span class="hljs-comment">// Here is a function.</span>
+    <span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">leq</span></span>(e1: Constant, e2: Constant): Bool = <span class="hljs-keyword">match</span> (e1, e2) <span class="hljs-keyword">with</span> {
+        <span class="hljs-keyword">case</span> (Constant.Bot, _)                      =&gt; <span class="hljs-literal">true</span>
+        <span class="hljs-keyword">case</span> (Constant.Cst(n1), Constant.Cst(n2))   =&gt; n1 == n2
+        <span class="hljs-keyword">case</span> (_, Constant.Top)                      =&gt; <span class="hljs-literal">true</span>
+        <span class="hljs-keyword">case</span> _                                      =&gt; <span class="hljs-literal">false</span>
+    }
+
+    <span class="hljs-comment">// Here are some rules.</span>
+    LocalVar(r, alpha(c)) :- LitStm(r, c).
+
+    LocalVar(r, sum(v1, v2)) :- AddStm(r, x, y),
+                                LocalVar(x, v1),
+                                LocalVar(y, v2).
+}
diff --git a/test/markup/flix/default.txt b/test/markup/flix/default.txt
new file mode 100644
index 0000000000..77d7f1a42b
--- /dev/null
+++ b/test/markup/flix/default.txt
@@ -0,0 +1,49 @@
+/**
+ * An example of Flix for syntax highlighting.
+ */
+
+// Here is a namespace.
+namespace a.b.c {
+
+    // Here are some literals.
+    def b: Bool = true
+    def c: Char = 'a'
+    def f: Float = 1.23
+    def i: Int = 42
+    def s: Str = "string"
+
+    // Here are some relations.
+    rel LitStm(r: Str, c: Int)
+    rel AddStm(r: Str, x: Str, y: Str)
+    rel DivStm(r: Str, x: Str, y: Str)
+
+    // Here is a lattice.
+    lat LocalVar(k: Str, v: Constant)
+
+    // Here is an index.
+    index LitStm{{r}, {r, c}}
+
+    // Here is an enum.
+    enum Constant {
+          case Top,
+
+        case Cst(Int),
+
+          case Bot
+    }
+
+    // Here is a function.
+    def leq(e1: Constant, e2: Constant): Bool = match (e1, e2) with {
+        case (Constant.Bot, _)                      => true
+        case (Constant.Cst(n1), Constant.Cst(n2))   => n1 == n2
+        case (_, Constant.Top)                      => true
+        case _                                      => false
+    }
+
+    // Here are some rules.
+    LocalVar(r, alpha(c)) :- LitStm(r, c).
+
+    LocalVar(r, sum(v1, v2)) :- AddStm(r, x, y),
+                                LocalVar(x, v1),
+                                LocalVar(y, v2).
+}
diff --git a/test/markup/gams/default.expect.txt b/test/markup/gams/default.expect.txt
new file mode 100644
index 0000000000..a0427e94a1
--- /dev/null
+++ b/test/markup/gams/default.expect.txt
@@ -0,0 +1,31 @@
+<span class="hljs-keyword">SETS</span>
+    I   <span class="hljs-comment">canning plants</span>   / SEATTLE, SAN-DIEGO /
+    J   <span class="hljs-comment">markets</span>          / NEW-YORK, CHICAGO, TOPEKA / ;
+<span class="hljs-keyword">PARAMETERS</span>
+    A(I)  <span class="hljs-comment">capacity of plant i in cases</span>
+      /    SEATTLE     <span class="hljs-number">350</span>
+           SAN-DIEGO   <span class="hljs-number">600</span>  /
+    B(J)  <span class="hljs-comment">demand at market j in cases</span>
+      /    NEW-YORK    <span class="hljs-number">325</span>
+           CHICAGO     <span class="hljs-number">300</span>
+           TOPEKA      <span class="hljs-number">275</span>  / ;
+<span class="hljs-keyword">TABLE</span> D(I,J)  <span class="hljs-comment">distance in thousands of miles</span>
+                  NEW-YORK       CHICAGO      TOPEKA
+    SEATTLE          <span class="hljs-number">2.5</span>           <span class="hljs-number">1.7</span>          <span class="hljs-number">1.8</span>
+    SAN-DIEGO        <span class="hljs-number">2.5</span>           <span class="hljs-number">1.8</span>          <span class="hljs-number">1.4</span>  ;
+<span class="hljs-keyword">SCALAR</span> F  <span class="hljs-comment">freight in dollars per case per thousand miles</span>  /<span class="hljs-number">90</span>/ ;
+<span class="hljs-keyword">PARAMETER</span> C(I,J)  <span class="hljs-comment">transport cost in thousands of dollars per case</span> ;
+          C(I,J) = F * D(I,J) / <span class="hljs-number">1000</span> ;
+<span class="hljs-keyword">VARIABLES</span>
+    X(I,J)  <span class="hljs-comment">shipment quantities in cases</span>
+    Z       <span class="hljs-comment">total transportation costs in thousands of dollars</span> ;
+<span class="hljs-keyword">POSITIVE</span> <span class="hljs-keyword">VARIABLE</span> X ;
+<span class="hljs-keyword">EQUATIONS</span>
+    COST        <span class="hljs-comment">define objective function</span>
+    SUPPLY(I)   <span class="hljs-comment">observe supply limit at plant i</span>
+    DEMAND(J)   <span class="hljs-comment">satisfy demand at market j</span> ;
+<span class="hljs-function"><span class="hljs-title">COST</span></span> ..        Z  <span class="hljs-symbol">=E=</span>  <span class="hljs-keyword">SUM</span>((I,J), C(I,J)*X(I,J)) ;
+<span class="hljs-function"><span class="hljs-title">SUPPLY</span>(<span class="hljs-params">I</span>)</span> ..   <span class="hljs-keyword">SUM</span>(J, X(I,J))  <span class="hljs-symbol">=L=</span>  A(I) ;
+<span class="hljs-function"><span class="hljs-title">DEMAND</span>(<span class="hljs-params">J</span>)</span> ..   <span class="hljs-keyword">SUM</span>(I, X(I,J))  <span class="hljs-symbol">=G=</span>  B(J) ;
+<span class="hljs-keyword">MODEL</span> TRANSPORT /<span class="hljs-keyword">ALL</span>/ ;
+<span class="hljs-keyword">SOLVE</span> TRANSPORT <span class="hljs-keyword">USING</span> LP <span class="hljs-keyword">MINIMIZING</span> Z ;
diff --git a/test/markup/gams/default.txt b/test/markup/gams/default.txt
new file mode 100644
index 0000000000..9de006e4d5
--- /dev/null
+++ b/test/markup/gams/default.txt
@@ -0,0 +1,31 @@
+SETS
+    I   canning plants   / SEATTLE, SAN-DIEGO /
+    J   markets          / NEW-YORK, CHICAGO, TOPEKA / ;
+PARAMETERS
+    A(I)  capacity of plant i in cases
+      /    SEATTLE     350
+           SAN-DIEGO   600  /
+    B(J)  demand at market j in cases
+      /    NEW-YORK    325
+           CHICAGO     300
+           TOPEKA      275  / ;
+TABLE D(I,J)  distance in thousands of miles
+                  NEW-YORK       CHICAGO      TOPEKA
+    SEATTLE          2.5           1.7          1.8
+    SAN-DIEGO        2.5           1.8          1.4  ;
+SCALAR F  freight in dollars per case per thousand miles  /90/ ;
+PARAMETER C(I,J)  transport cost in thousands of dollars per case ;
+          C(I,J) = F * D(I,J) / 1000 ;
+VARIABLES
+    X(I,J)  shipment quantities in cases
+    Z       total transportation costs in thousands of dollars ;
+POSITIVE VARIABLE X ;
+EQUATIONS
+    COST        define objective function
+    SUPPLY(I)   observe supply limit at plant i
+    DEMAND(J)   satisfy demand at market j ;
+COST ..        Z  =E=  SUM((I,J), C(I,J)*X(I,J)) ;
+SUPPLY(I) ..   SUM(J, X(I,J))  =L=  A(I) ;
+DEMAND(J) ..   SUM(I, X(I,J))  =G=  B(J) ;
+MODEL TRANSPORT /ALL/ ;
+SOLVE TRANSPORT USING LP MINIMIZING Z ;
diff --git a/test/markup/gcode/default.expect.txt b/test/markup/gcode/default.expect.txt
new file mode 100644
index 0000000000..ad4d148f8c
--- /dev/null
+++ b/test/markup/gcode/default.expect.txt
@@ -0,0 +1,31 @@
+<span class="hljs-meta">O003</span> <span class="hljs-comment">(DIAMOND SQUARE)</span>
+<span class="hljs-symbol">N2</span> <span class="hljs-name">G54</span> <span class="hljs-name">G90</span> <span class="hljs-name">G49</span> <span class="hljs-name">G80</span>
+<span class="hljs-symbol">N3</span> <span class="hljs-name">M6</span> T<span class="hljs-number">1</span> <span class="hljs-comment">(1.ENDMILL)</span>
+<span class="hljs-symbol">N4</span> <span class="hljs-name">M3</span> S<span class="hljs-number">1800</span>
+<span class="hljs-symbol">N5</span> <span class="hljs-name">G0</span> X<span class="hljs-number">-.6</span> Y<span class="hljs-number">2.050</span>
+<span class="hljs-symbol">N6</span> <span class="hljs-name">G43</span>  H<span class="hljs-number">1</span>  Z<span class="hljs-number">.1</span>
+<span class="hljs-symbol">N7</span> <span class="hljs-name">G1</span> Z<span class="hljs-number">-.3</span> F<span class="hljs-number">50.</span>
+<span class="hljs-symbol">N8</span> <span class="hljs-name">G41</span> D<span class="hljs-number">1</span> Y<span class="hljs-number">1.45</span>
+<span class="hljs-symbol">N9</span> <span class="hljs-name">G1</span> X<span class="hljs-number">0</span> F<span class="hljs-number">20.</span>
+<span class="hljs-symbol">N10</span> <span class="hljs-name">G2</span> J<span class="hljs-number">-1.45</span>
+<span class="hljs-comment">(CUTTER COMP CANCEL)</span>
+<span class="hljs-symbol">N11</span> <span class="hljs-name">G1</span> Z<span class="hljs-number">-.2</span> F<span class="hljs-number">50.</span>
+<span class="hljs-symbol">N12</span> Y<span class="hljs-number">-.990</span>
+<span class="hljs-symbol">N13</span> <span class="hljs-name">G40</span>
+<span class="hljs-symbol">N14</span> <span class="hljs-name">G0</span> X<span class="hljs-number">-.6</span> Y<span class="hljs-number">1.590</span>
+<span class="hljs-symbol">N15</span> <span class="hljs-name">G0</span> Z<span class="hljs-number">.1</span>
+<span class="hljs-symbol">N16</span> <span class="hljs-name">M5</span> <span class="hljs-name">G49</span> <span class="hljs-name">G28</span> <span class="hljs-name">G91</span> Z<span class="hljs-number">0</span>
+<span class="hljs-symbol">N17</span> <span class="hljs-keyword">CALL</span> <span class="hljs-meta">O9456</span>
+<span class="hljs-symbol">N18</span> <span class="hljs-attr">#500</span>=<span class="hljs-number">0.004</span>
+<span class="hljs-symbol">N19</span> <span class="hljs-attr">#503</span>=[<span class="hljs-attr">#500</span>+<span class="hljs-attr">#501</span>]
+<span class="hljs-symbol">N20</span> <span class="hljs-attr">VC45</span>=<span class="hljs-number">0.0006</span>
+<span class="hljs-attr">VS4</span>=<span class="hljs-number">0.0007</span>
+<span class="hljs-symbol">N21</span> <span class="hljs-name">G90</span> <span class="hljs-name">G10</span> L<span class="hljs-number">20</span> P<span class="hljs-number">3</span> X<span class="hljs-number">5.</span>Y<span class="hljs-number">4.</span> Z<span class="hljs-number">6.567</span>
+<span class="hljs-symbol">N22</span> <span class="hljs-name">G0</span> X<span class="hljs-number">5000</span>
+<span class="hljs-symbol">N23</span> <span class="hljs-keyword">IF</span> [<span class="hljs-attr">#1</span> <span class="hljs-keyword">LT</span> <span class="hljs-number">0.370</span>] <span class="hljs-keyword">GOTO</span> <span class="hljs-number">49</span>
+<span class="hljs-symbol">N24</span> X<span class="hljs-number">-0.678</span> Y<span class="hljs-number">+.990</span>
+<span class="hljs-symbol">N25</span> <span class="hljs-name">G84.3</span> X<span class="hljs-number">-0.1</span>
+<span class="hljs-symbol">N26</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">COS[45]</span>
+<span class="hljs-symbol">N27</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">SIN[45]</span>
+<span class="hljs-symbol">N28</span> <span class="hljs-attr">VZOFZ</span>=<span class="hljs-number">652.9658</span>
+<span class="hljs-meta">%</span>
diff --git a/test/markup/gcode/default.txt b/test/markup/gcode/default.txt
new file mode 100644
index 0000000000..c2652462c2
--- /dev/null
+++ b/test/markup/gcode/default.txt
@@ -0,0 +1,31 @@
+O003 (DIAMOND SQUARE)
+N2 G54 G90 G49 G80
+N3 M6 T1 (1.ENDMILL)
+N4 M3 S1800
+N5 G0 X-.6 Y2.050
+N6 G43  H1  Z.1
+N7 G1 Z-.3 F50.
+N8 G41 D1 Y1.45
+N9 G1 X0 F20.
+N10 G2 J-1.45
+(CUTTER COMP CANCEL)
+N11 G1 Z-.2 F50.
+N12 Y-.990
+N13 G40
+N14 G0 X-.6 Y1.590
+N15 G0 Z.1
+N16 M5 G49 G28 G91 Z0
+N17 CALL O9456
+N18 #500=0.004
+N19 #503=[#500+#501]
+N20 VC45=0.0006
+VS4=0.0007
+N21 G90 G10 L20 P3 X5.Y4. Z6.567
+N22 G0 X5000
+N23 IF [#1 LT 0.370] GOTO 49
+N24 X-0.678 Y+.990
+N25 G84.3 X-0.1
+N26 #4=#5*COS[45]
+N27 #4=#5*SIN[45]
+N28 VZOFZ=652.9658
+%
diff --git a/test/markup/gherkin/default.expect.txt b/test/markup/gherkin/default.expect.txt
new file mode 100644
index 0000000000..2da0e9ddad
--- /dev/null
+++ b/test/markup/gherkin/default.expect.txt
@@ -0,0 +1,25 @@
+<span class="hljs-comment"># language: en</span>
+<span class="hljs-keyword">Feature</span>: Addition
+  In order to avoid silly mistakes
+  As a math idiot
+  I want to be told the sum of two numbers
+
+  <span class="hljs-meta">@this_is_a_tag</span>
+  <span class="hljs-keyword">Scenario</span> <span class="hljs-keyword">Outline</span>: Add two numbers
+    <span class="hljs-symbol">*</span> I have a calculator
+    <span class="hljs-keyword">Given</span> I have entered <span class="hljs-variable">&lt;input_1&gt;</span> into the calculator
+    <span class="hljs-keyword">And</span> I have entered <span class="hljs-variable">&lt;input_2&gt;</span> into the calculator
+    <span class="hljs-keyword">When</span> I press <span class="hljs-variable">&lt;button&gt;</span>
+    <span class="hljs-keyword">Then</span> the result should be <span class="hljs-variable">&lt;output&gt;</span> on the screen
+    <span class="hljs-keyword">And</span> I have a string like
+    <span class="hljs-string">&quot;&quot;&quot;
+    Here is
+    some
+    multiline text
+    &quot;&quot;&quot;</span>
+
+  <span class="hljs-keyword">Examples</span>:
+    |<span class="hljs-string"> input_1 </span>|<span class="hljs-string"> input_2 </span>|<span class="hljs-string"> button </span>|<span class="hljs-string"> output </span>|
+    |<span class="hljs-string"> 20      </span>|<span class="hljs-string"> 30      </span>|<span class="hljs-string"> add    </span>|<span class="hljs-string"> 50     </span>|
+    |<span class="hljs-string"> 2       </span>|<span class="hljs-string"> 5       </span>|<span class="hljs-string"> add    </span>|<span class="hljs-string"> 7      </span>|
+    |<span class="hljs-string"> 0       </span>|<span class="hljs-string"> 40      </span>|<span class="hljs-string"> add    </span>|<span class="hljs-string"> 40     </span>|
diff --git a/test/markup/gherkin/default.txt b/test/markup/gherkin/default.txt
new file mode 100644
index 0000000000..52981fd11e
--- /dev/null
+++ b/test/markup/gherkin/default.txt
@@ -0,0 +1,25 @@
+# language: en
+Feature: Addition
+  In order to avoid silly mistakes
+  As a math idiot
+  I want to be told the sum of two numbers
+
+  @this_is_a_tag
+  Scenario Outline: Add two numbers
+    * I have a calculator
+    Given I have entered <input_1> into the calculator
+    And I have entered <input_2> into the calculator
+    When I press <button>
+    Then the result should be <output> on the screen
+    And I have a string like
+    """
+    Here is
+    some
+    multiline text
+    """
+
+  Examples:
+    | input_1 | input_2 | button | output |
+    | 20      | 30      | add    | 50     |
+    | 2       | 5       | add    | 7      |
+    | 0       | 40      | add    | 40     |
diff --git a/test/markup/glsl/default.expect.txt b/test/markup/glsl/default.expect.txt
new file mode 100644
index 0000000000..927add7a61
--- /dev/null
+++ b/test/markup/glsl/default.expect.txt
@@ -0,0 +1,37 @@
+<span class="hljs-comment">// vertex shader</span>
+<span class="hljs-meta">#version 150</span>
+<span class="hljs-keyword">in</span>  <span class="hljs-type">vec2</span> in_Position;
+<span class="hljs-keyword">in</span>  <span class="hljs-type">vec3</span> in_Color;
+
+<span class="hljs-keyword">out</span> <span class="hljs-type">vec3</span> ex_Color;
+<span class="hljs-type">void</span> main(<span class="hljs-type">void</span>) {
+    <span class="hljs-built_in">gl_Position</span> = <span class="hljs-type">vec4</span>(in_Position.x, in_Position.y, <span class="hljs-number">0.0</span>, <span class="hljs-number">1.0</span>);
+    ex_Color = in_Color;
+}
+
+
+<span class="hljs-comment">// geometry shader</span>
+<span class="hljs-meta">#version 150</span>
+
+<span class="hljs-keyword">layout</span>(<span class="hljs-keyword">triangles</span>) <span class="hljs-keyword">in</span>;
+<span class="hljs-keyword">layout</span>(<span class="hljs-keyword">triangle_strip</span>, <span class="hljs-keyword">max_vertices</span> = <span class="hljs-number">3</span>) <span class="hljs-keyword">out</span>;
+
+<span class="hljs-type">void</span> main() {
+  <span class="hljs-keyword">for</span>(<span class="hljs-type">int</span> i = <span class="hljs-number">0</span>; i &lt; <span class="hljs-built_in">gl_in</span>.<span class="hljs-built_in">length</span>(); i++) {
+    <span class="hljs-built_in">gl_Position</span> = <span class="hljs-built_in">gl_in</span>[i].<span class="hljs-built_in">gl_Position</span>;
+    <span class="hljs-built_in">EmitVertex</span>();
+  }
+  <span class="hljs-built_in">EndPrimitive</span>();
+}
+
+
+<span class="hljs-comment">// fragment shader</span>
+<span class="hljs-meta">#version 150</span>
+<span class="hljs-keyword">precision</span> <span class="hljs-keyword">highp</span> <span class="hljs-type">float</span>;
+
+<span class="hljs-keyword">in</span>  <span class="hljs-type">vec3</span> ex_Color;
+<span class="hljs-keyword">out</span> <span class="hljs-type">vec4</span> <span class="hljs-built_in">gl_FragColor</span>;
+
+<span class="hljs-type">void</span> main(<span class="hljs-type">void</span>) {
+    <span class="hljs-built_in">gl_FragColor</span> = <span class="hljs-type">vec4</span>(ex_Color, <span class="hljs-number">1.0</span>);
+}
diff --git a/test/markup/glsl/default.txt b/test/markup/glsl/default.txt
new file mode 100644
index 0000000000..ddaf24645d
--- /dev/null
+++ b/test/markup/glsl/default.txt
@@ -0,0 +1,37 @@
+// vertex shader
+#version 150
+in  vec2 in_Position;
+in  vec3 in_Color;
+
+out vec3 ex_Color;
+void main(void) {
+    gl_Position = vec4(in_Position.x, in_Position.y, 0.0, 1.0);
+    ex_Color = in_Color;
+}
+
+
+// geometry shader
+#version 150
+
+layout(triangles) in;
+layout(triangle_strip, max_vertices = 3) out;
+
+void main() {
+  for(int i = 0; i < gl_in.length(); i++) {
+    gl_Position = gl_in[i].gl_Position;
+    EmitVertex();
+  }
+  EndPrimitive();
+}
+
+
+// fragment shader
+#version 150
+precision highp float;
+
+in  vec3 ex_Color;
+out vec4 gl_FragColor;
+
+void main(void) {
+    gl_FragColor = vec4(ex_Color, 1.0);
+}
diff --git a/test/markup/gml/default.expect.txt b/test/markup/gml/default.expect.txt
new file mode 100644
index 0000000000..82b6399cfc
--- /dev/null
+++ b/test/markup/gml/default.expect.txt
@@ -0,0 +1,22 @@
+<span class="hljs-comment">/// @description Collision code</span>
+<span class="hljs-comment">// standard collision handling</span>
+
+<span class="hljs-comment">// Horizontal collisions</span>
+<span class="hljs-keyword">if</span>(<span class="hljs-built_in">place_meeting</span>(<span class="hljs-symbol">x</span>+hspd, <span class="hljs-symbol">y</span>, obj_wall)) {
+	<span class="hljs-keyword">while</span>(!<span class="hljs-built_in">place_meeting</span>(<span class="hljs-symbol">x</span>+<span class="hljs-built_in">sign</span>(hspd), <span class="hljs-symbol">y</span>, obj_wall)) {
+		<span class="hljs-symbol">x</span> += <span class="hljs-built_in">sign</span>(hspd);
+	}
+	hspd = <span class="hljs-number">0</span>;
+}
+<span class="hljs-symbol">x</span> += hspd;
+
+<span class="hljs-comment">// Vertical collisions</span>
+<span class="hljs-keyword">if</span>(<span class="hljs-built_in">place_meeting</span>(<span class="hljs-symbol">x</span>, <span class="hljs-symbol">y</span>+vspd, collide_obj)) {
+	<span class="hljs-keyword">while</span>(!<span class="hljs-built_in">place_meeting</span>(<span class="hljs-symbol">x</span>, <span class="hljs-symbol">y</span>+<span class="hljs-built_in">sign</span>(vspd), collide_obj)) {
+		<span class="hljs-symbol">y</span> += <span class="hljs-built_in">sign</span>(vspd);
+	}
+	vspd = <span class="hljs-number">0</span>;
+}
+<span class="hljs-symbol">y</span> += vspd;
+
+<span class="hljs-built_in">show_debug_message</span>(<span class="hljs-string">&quot;This is a test&quot;</span>);
\ No newline at end of file
diff --git a/test/markup/gml/default.txt b/test/markup/gml/default.txt
new file mode 100644
index 0000000000..354acb9ac4
--- /dev/null
+++ b/test/markup/gml/default.txt
@@ -0,0 +1,22 @@
+/// @description Collision code
+// standard collision handling
+
+// Horizontal collisions
+if(place_meeting(x+hspd, y, obj_wall)) {
+	while(!place_meeting(x+sign(hspd), y, obj_wall)) {
+		x += sign(hspd);
+	}
+	hspd = 0;
+}
+x += hspd;
+
+// Vertical collisions
+if(place_meeting(x, y+vspd, collide_obj)) {
+	while(!place_meeting(x, y+sign(vspd), collide_obj)) {
+		y += sign(vspd);
+	}
+	vspd = 0;
+}
+y += vspd;
+
+show_debug_message("This is a test");
\ No newline at end of file
diff --git a/test/markup/gradle/default.expect.txt b/test/markup/gradle/default.expect.txt
new file mode 100644
index 0000000000..a6cae73216
--- /dev/null
+++ b/test/markup/gradle/default.expect.txt
@@ -0,0 +1,62 @@
+
+apply plugin: <span class="hljs-string">&#x27;android&#x27;</span>
+
+android {
+    compileSdkVersion <span class="hljs-number">19</span>
+    buildToolsVersion <span class="hljs-string">&quot;19.1&quot;</span>
+
+    defaultConfig {
+        minSdkVersion <span class="hljs-number">15</span>
+        targetSdkVersion <span class="hljs-number">19</span>
+        versionCode <span class="hljs-number">5</span>
+        versionName <span class="hljs-string">&quot;0.4.4&quot;</span>
+    }
+
+    compileOptions {
+        <span class="hljs-keyword">sourceCompatibility</span> JavaVersion.VERSION_1_7
+        <span class="hljs-keyword">targetCompatibility</span> JavaVersion.VERSION_1_7
+    }
+    signingConfigs {
+        release
+    }
+    buildTypes {
+        release {
+            <span class="hljs-comment">// runProguard true</span>
+            proguardFiles getDefaultProguardFile(<span class="hljs-string">&#x27;proguard-android.txt&#x27;</span>), <span class="hljs-string">&#x27;proguard-rules.txt&#x27;</span>
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+<span class="hljs-keyword">dependencies</span> {
+    <span class="hljs-keyword">compile</span> <span class="hljs-keyword">fileTree</span>(dir: <span class="hljs-string">&#x27;libs&#x27;</span>, <span class="hljs-keyword">include</span>: [<span class="hljs-string">&#x27;*.jar&#x27;</span>])
+
+    <span class="hljs-keyword">compile</span> <span class="hljs-string">&#x27;com.example:example-lib:1.0.0&#x27;</span>
+}
+
+
+<span class="hljs-keyword">def</span> propFile = <span class="hljs-keyword">file</span>(<span class="hljs-string">&#x27;../signing.properties&#x27;</span>)
+<span class="hljs-keyword">if</span>( propFile.canRead() ) {
+    <span class="hljs-keyword">def</span> Properties p = <span class="hljs-keyword">new</span> Properties()
+    p.load(<span class="hljs-keyword">new</span> FileInputStream(propFile))
+
+    <span class="hljs-keyword">if</span>( p!=<span class="hljs-keyword">null</span>
+    &amp;&amp;  p.containsKey(<span class="hljs-string">&quot;STORE_FILE&quot;</span>)
+    &amp;&amp;  p.containsKey(<span class="hljs-string">&#x27;STORE_PASSWORD&#x27;</span>)
+    &amp;&amp;  p.containsKey(<span class="hljs-string">&#x27;KEY_ALIAS&#x27;</span>)
+    &amp;&amp;  p.containsKey(<span class="hljs-string">&#x27;KEY_PASSWORD&#x27;</span>)
+    ) {
+        <span class="hljs-keyword">println</span> <span class="hljs-string">&quot;RELEASE_BUILD: Signing...&quot;</span>
+
+        android.signingConfigs.release.storeFile = <span class="hljs-keyword">file</span>( p[<span class="hljs-string">&#x27;STORE_FILE&#x27;</span>] )
+        android.signingConfigs.release.storePassword = p[<span class="hljs-string">&#x27;STORE_PASSWORD&#x27;</span>]
+        android.signingConfigs.release.keyAlias = p[<span class="hljs-string">&#x27;KEY_ALIAS&#x27;</span>]
+        android.signingConfigs.release.keyPassword = p[<span class="hljs-string">&#x27;KEY_PASSWORD&#x27;</span>]
+    } <span class="hljs-keyword">else</span> {
+        <span class="hljs-keyword">println</span> <span class="hljs-string">&quot;RELEASE_BUILD: Required properties in signing.properties are missing&quot;</span>
+        android.buildTypes.release.signingConfig = <span class="hljs-keyword">null</span>
+    }
+} <span class="hljs-keyword">else</span> {
+    <span class="hljs-keyword">println</span> <span class="hljs-string">&quot;RELEASE_BUILD: signing.properties not found&quot;</span>
+    android.buildTypes.release.signingProperties = <span class="hljs-keyword">null</span>
+}
diff --git a/test/markup/gradle/default.txt b/test/markup/gradle/default.txt
new file mode 100644
index 0000000000..e317ef0eae
--- /dev/null
+++ b/test/markup/gradle/default.txt
@@ -0,0 +1,62 @@
+
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.1"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 19
+        versionCode 5
+        versionName "0.4.4"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    signingConfigs {
+        release
+    }
+    buildTypes {
+        release {
+            // runProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+
+    compile 'com.example:example-lib:1.0.0'
+}
+
+
+def propFile = file('../signing.properties')
+if( propFile.canRead() ) {
+    def Properties p = new Properties()
+    p.load(new FileInputStream(propFile))
+
+    if( p!=null
+    &&  p.containsKey("STORE_FILE")
+    &&  p.containsKey('STORE_PASSWORD')
+    &&  p.containsKey('KEY_ALIAS')
+    &&  p.containsKey('KEY_PASSWORD')
+    ) {
+        println "RELEASE_BUILD: Signing..."
+
+        android.signingConfigs.release.storeFile = file( p['STORE_FILE'] )
+        android.signingConfigs.release.storePassword = p['STORE_PASSWORD']
+        android.signingConfigs.release.keyAlias = p['KEY_ALIAS']
+        android.signingConfigs.release.keyPassword = p['KEY_PASSWORD']
+    } else {
+        println "RELEASE_BUILD: Required properties in signing.properties are missing"
+        android.buildTypes.release.signingConfig = null
+    }
+} else {
+    println "RELEASE_BUILD: signing.properties not found"
+    android.buildTypes.release.signingProperties = null
+}
diff --git a/test/markup/haml/default.expect.txt b/test/markup/haml/default.expect.txt
new file mode 100644
index 0000000000..e6bae1d448
--- /dev/null
+++ b/test/markup/haml/default.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-meta">!!! XML</span>
+<span class="hljs-tag">%<span class="hljs-selector-tag">html</span></span>
+<span class="hljs-tag">  %<span class="hljs-selector-tag">body</span></span>
+<span class="hljs-tag">    %<span class="hljs-selector-tag">h1</span><span class="hljs-selector-class">.jumbo</span>{<span class="hljs-attr">:id</span>=&gt;<span class="hljs-string">&quot;a&quot;</span>, <span class="hljs-attr">:style</span>=&gt;<span class="hljs-string">&#x27;font-weight: normal&#x27;</span>, <span class="hljs-attr">:title</span>=&gt;title}</span> highlight.js
+<span class="hljs-comment">    /html comment</span>
+<span class="hljs-comment">    -# ignore this line</span>
+<span class="hljs-tag">    %<span class="hljs-selector-tag">ul</span>(<span class="hljs-attr">style</span>=<span class="hljs-string">&#x27;margin: 0&#x27;</span>)</span>
+    -<span class="ruby">items.each <span class="hljs-keyword">do</span> <span class="hljs-params">|i|</span>
+</span><span class="hljs-tag">      %<span class="hljs-selector-tag">i</span></span>= i
+    =<span class="ruby"> variable
+</span>    =<span class="ruby">variable2
+</span>    ~ variable3
+    ~variable4
+    The current year is #{<span class="ruby">DataTime.now.year}</span>.
diff --git a/test/markup/haml/default.txt b/test/markup/haml/default.txt
new file mode 100644
index 0000000000..fb4bab3289
--- /dev/null
+++ b/test/markup/haml/default.txt
@@ -0,0 +1,14 @@
+!!! XML
+%html
+  %body
+    %h1.jumbo{:id=>"a", :style=>'font-weight: normal', :title=>title} highlight.js
+    /html comment
+    -# ignore this line
+    %ul(style='margin: 0')
+    -items.each do |i|
+      %i= i
+    = variable
+    =variable2
+    ~ variable3
+    ~variable4
+    The current year is #{DataTime.now.year}.
diff --git a/test/markup/haxe/default.expect.txt b/test/markup/haxe/default.expect.txt
new file mode 100644
index 0000000000..438fcbfa8a
--- /dev/null
+++ b/test/markup/haxe/default.expect.txt
@@ -0,0 +1,142 @@
+<span class="hljs-keyword">package</span> my.<span class="hljs-keyword">package</span>;
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">if</span> js</span>
+<span class="hljs-keyword">import</span> js.Browser;
+<span class="hljs-meta">#<span class="hljs-meta-keyword">elseif</span> sys</span>
+<span class="hljs-keyword">import</span> Sys;
+<span class="hljs-meta">#<span class="hljs-meta-keyword">else</span></span>
+<span class="hljs-keyword">import</span> Date;
+<span class="hljs-meta">#<span class="hljs-meta-keyword">end</span></span>
+
+<span class="hljs-keyword">import</span> Lambda;
+<span class="hljs-keyword">using</span> Main.IntExtender;
+
+<span class="hljs-keyword">extern</span> <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Math</span> </span>{
+    <span class="hljs-keyword">static</span> <span class="hljs-keyword">var</span> PI(<span class="hljs-keyword">default</span>,<span class="hljs-literal">null</span>) : <span class="hljs-type">Float</span>;
+    <span class="hljs-keyword">static</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">floor</span></span>(v:<span class="hljs-type">Float</span>):<span class="hljs-type">Int</span>;
+}
+
+<span class="hljs-comment">/**
+ * Abstract forwarding
+ */</span>
+<span class="hljs-class"><span class="hljs-keyword">abstract</span> <span class="hljs-title">MyAbstract</span>(<span class="hljs-type">Int</span>) <span class="hljs-keyword">from</span> <span class="hljs-type">Int</span> <span class="hljs-keyword">to</span> <span class="hljs-type">Int</span> {</span>
+    <span class="hljs-keyword">inline</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">new</span></span>(i:<span class="hljs-type">Int</span>) {
+        <span class="hljs-built_in">this</span> = i;
+    }
+
+    <span class="hljs-meta">@:op(A * B)</span>
+    <span class="hljs-keyword">public</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">multiply</span></span>(rhs:<span class="hljs-type">MyAbstract</span>) {
+        <span class="hljs-keyword">return</span> <span class="hljs-built_in">this</span> * rhs;
+    }
+}
+
+<span class="hljs-comment">// an enum</span>
+<span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-title">Color</span> {</span>
+    Red;
+    Green;
+    Blue;
+    Rgb(r:<span class="hljs-type">Int</span>, g:<span class="hljs-type">Int</span>, b:<span class="hljs-type">Int</span>);
+}
+
+<span class="hljs-meta">@:generic</span>
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Gen</span>&lt;<span class="hljs-title">T</span>&gt; </span>{
+    <span class="hljs-keyword">var</span> v:<span class="hljs-type">T</span>;
+    <span class="hljs-keyword">public</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">new</span></span>(v:<span class="hljs-type">T</span>) {
+        <span class="hljs-built_in">this</span>.v = v;
+    }
+
+    <span class="hljs-keyword">public</span> <span class="hljs-keyword">var</span> x(<span class="hljs-keyword">get</span>, <span class="hljs-keyword">set</span>):<span class="hljs-type">T</span>;
+
+    <span class="hljs-keyword">private</span> <span class="hljs-keyword">inline</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">get_x</span></span>():<span class="hljs-type">T</span>
+        <span class="hljs-keyword">return</span> v;
+
+    <span class="hljs-keyword">private</span> <span class="hljs-keyword">inline</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">set_x</span></span>(x:<span class="hljs-type">T</span>):<span class="hljs-type">T</span>
+        <span class="hljs-keyword">return</span> v = x;
+}
+
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Main</span> <span class="hljs-keyword"><span class="hljs-keyword">extends</span> <span class="hljs-type">BaseClass</span></span> <span class="hljs-keyword"><span class="hljs-keyword">implements</span> <span class="hljs-type">SomeFunctionality</span></span> </span>{
+    <span class="hljs-keyword">var</span> callback:<span class="hljs-type">Void-&gt;Void </span>= <span class="hljs-literal">null</span>;
+    <span class="hljs-keyword">var</span> myArray:<span class="hljs-type">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt; = <span class="hljs-keyword">new</span> <span class="hljs-type">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt;();
+    <span class="hljs-keyword">var</span> arr = [<span class="hljs-number">4</span>,<span class="hljs-number">8</span>,<span class="hljs-number">0</span>,<span class="hljs-number">3</span>,<span class="hljs-number">9</span>,<span class="hljs-number">1</span>,<span class="hljs-number">5</span>,<span class="hljs-number">2</span>,<span class="hljs-number">6</span>,<span class="hljs-number">7</span>];
+
+    <span class="hljs-keyword">public</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">new</span></span>(x) {
+        <span class="hljs-keyword">super</span>(x);
+    }
+
+    <span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">main</span></span>() {
+        <span class="hljs-built_in">trace</span>(<span class="hljs-string">&#x27;What\&#x27;s up?&#x27;</span>);
+        <span class="hljs-built_in">trace</span>(<span class="hljs-string">&#x27;Hi, <span class="hljs-subst">${name}</span>!&#x27;</span>);
+
+        <span class="hljs-comment">// switch statements!</span>
+        <span class="hljs-keyword">var</span> c:<span class="hljs-type">Color </span>= Color.Green;
+        <span class="hljs-keyword">var</span> x:<span class="hljs-type">Int </span>= <span class="hljs-keyword">switch</span>(c) {
+            <span class="hljs-keyword">case</span> Red: <span class="hljs-type">0</span>;
+            <span class="hljs-keyword">case</span> Green: <span class="hljs-type">1</span>;
+            <span class="hljs-keyword">case</span> Blue: <span class="hljs-type">2</span>;
+            <span class="hljs-keyword">case</span> Rgb(r, g, b): <span class="hljs-type">3</span>;
+            <span class="hljs-keyword">case</span> <span class="hljs-literal">_</span>: <span class="hljs-type">-1</span>;
+        }
+
+        <span class="hljs-keyword">for</span>(i <span class="hljs-keyword">in</span> <span class="hljs-number">0.</span>.<span class="hljs-number">.3</span>) {
+            <span class="hljs-built_in">trace</span>(i);
+            <span class="hljs-keyword">continue</span>;
+            <span class="hljs-keyword">break</span>;
+        }
+
+        <span class="hljs-keyword">do</span> {
+            <span class="hljs-built_in">trace</span>(<span class="hljs-string">&quot;Hey-o!&quot;</span>);
+        } <span class="hljs-keyword">while</span>(<span class="hljs-literal">false</span>);
+
+        <span class="hljs-keyword">var</span> done:<span class="hljs-type">Bool </span>= <span class="hljs-literal">false</span>;
+        <span class="hljs-keyword">while</span>(!done) {
+            done = <span class="hljs-literal">true</span>;
+        }
+
+        <span class="hljs-keyword">var</span> H:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span> <span class="hljs-keyword">new</span> <span class="hljs-type">MyAbstract</span>(<span class="hljs-number">42</span>);
+        <span class="hljs-keyword">var</span> h:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span>(<span class="hljs-keyword">new</span> <span class="hljs-type">MyAbstract</span>(<span class="hljs-number">31</span>), <span class="hljs-keyword">Int</span>);
+
+        <span class="hljs-keyword">try</span> {
+            <span class="hljs-keyword">throw</span> <span class="hljs-string">&quot;error&quot;</span>;
+        }
+        <span class="hljs-keyword">catch</span>(err:<span class="hljs-type">String</span>) {
+            <span class="hljs-built_in">trace</span>(err);
+        }
+        
+        <span class="hljs-keyword">var</span> map = <span class="hljs-keyword">new</span> <span class="hljs-type">haxe</span>.ds.IntMap&lt;<span class="hljs-keyword">String</span>&gt;();
+        <span class="hljs-keyword">var</span> f = map.<span class="hljs-keyword">set</span>.bind(<span class="hljs-literal">_</span>, <span class="hljs-string">&quot;12&quot;</span>);
+    }
+
+    <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">nothing</span></span>():<span class="hljs-type">Void</span>
+        <span class="hljs-built_in">trace</span>(<span class="hljs-string">&quot;nothing!&quot;</span>);
+
+    <span class="hljs-keyword">private</span> <span class="hljs-keyword">inline</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">func</span></span>(a:<span class="hljs-type">Int</span>, b:<span class="hljs-type">Float</span>, ?c:<span class="hljs-type">String</span>, d:<span class="hljs-type">Bool</span>=<span class="hljs-literal">false</span>):<span class="hljs-type">Dynamic </span>{
+        <span class="hljs-keyword">return</span> {
+            x: <span class="hljs-type">0</span>,
+            y: <span class="hljs-type">true</span>,
+            z: <span class="hljs-type">false</span>,
+            a: <span class="hljs-type">1</span>.<span class="hljs-number">53</span>,
+            b: <span class="hljs-type">5e10</span>,
+            c: <span class="hljs-type">-12</span>,
+            h: <span class="hljs-type">null</span>
+        };
+    }
+
+
+    <span class="hljs-keyword">override</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">quicksort</span></span>( lo : <span class="hljs-type">Int</span>, hi : <span class="hljs-type">Int </span>) : <span class="hljs-type">Void </span>{
+        <span class="hljs-keyword">var</span> i = lo;
+        <span class="hljs-keyword">var</span> j = hi;
+        <span class="hljs-keyword">var</span> buf = arr;
+        <span class="hljs-keyword">var</span> p = buf[(lo+hi)&gt;&gt;<span class="hljs-number">1</span>];
+        <span class="hljs-keyword">while</span>( i &lt;= j ) {
+            <span class="hljs-keyword">while</span>( arr[i] &gt; p ) i++;
+            <span class="hljs-keyword">while</span>( arr[j] &lt; p ) j--;
+            <span class="hljs-keyword">if</span>( i &lt;= j ) {
+                <span class="hljs-keyword">var</span> t = buf[i];
+                buf[i++] = buf[j];
+                buf[j--] = t;
+            }
+        }
+        <span class="hljs-keyword">if</span>( lo &lt; j ) quicksort( lo, j );
+        <span class="hljs-keyword">if</span>( i &lt; hi ) quicksort( i, hi );
+    }
+}
\ No newline at end of file
diff --git a/test/markup/haxe/default.txt b/test/markup/haxe/default.txt
new file mode 100644
index 0000000000..7db9c96abe
--- /dev/null
+++ b/test/markup/haxe/default.txt
@@ -0,0 +1,142 @@
+package my.package;
+
+#if js
+import js.Browser;
+#elseif sys
+import Sys;
+#else
+import Date;
+#end
+
+import Lambda;
+using Main.IntExtender;
+
+extern class Math {
+    static var PI(default,null) : Float;
+    static function floor(v:Float):Int;
+}
+
+/**
+ * Abstract forwarding
+ */
+abstract MyAbstract(Int) from Int to Int {
+    inline function new(i:Int) {
+        this = i;
+    }
+
+    @:op(A * B)
+    public function multiply(rhs:MyAbstract) {
+        return this * rhs;
+    }
+}
+
+// an enum
+enum Color {
+    Red;
+    Green;
+    Blue;
+    Rgb(r:Int, g:Int, b:Int);
+}
+
+@:generic
+class Gen<T> {
+    var v:T;
+    public function new(v:T) {
+        this.v = v;
+    }
+
+    public var x(get, set):T;
+
+    private inline function get_x():T
+        return v;
+
+    private inline function set_x(x:T):T
+        return v = x;
+}
+
+class Main extends BaseClass implements SomeFunctionality {
+    var callback:Void->Void = null;
+    var myArray:Array<Float> = new Array<Float>();
+    var arr = [4,8,0,3,9,1,5,2,6,7];
+
+    public function new(x) {
+        super(x);
+    }
+
+    public static function main() {
+        trace('What\'s up?');
+        trace('Hi, ${name}!');
+
+        // switch statements!
+        var c:Color = Color.Green;
+        var x:Int = switch(c) {
+            case Red: 0;
+            case Green: 1;
+            case Blue: 2;
+            case Rgb(r, g, b): 3;
+            case _: -1;
+        }
+
+        for(i in 0...3) {
+            trace(i);
+            continue;
+            break;
+        }
+
+        do {
+            trace("Hey-o!");
+        } while(false);
+
+        var done:Bool = false;
+        while(!done) {
+            done = true;
+        }
+
+        var H:Int = cast new MyAbstract(42);
+        var h:Int = cast(new MyAbstract(31), Int);
+
+        try {
+            throw "error";
+        }
+        catch(err:String) {
+            trace(err);
+        }
+        
+        var map = new haxe.ds.IntMap<String>();
+        var f = map.set.bind(_, "12");
+    }
+
+    function nothing():Void
+        trace("nothing!");
+
+    private inline function func(a:Int, b:Float, ?c:String, d:Bool=false):Dynamic {
+        return {
+            x: 0,
+            y: true,
+            z: false,
+            a: 1.53,
+            b: 5e10,
+            c: -12,
+            h: null
+        };
+    }
+
+
+    override function quicksort( lo : Int, hi : Int ) : Void {
+        var i = lo;
+        var j = hi;
+        var buf = arr;
+        var p = buf[(lo+hi)>>1];
+        while( i <= j ) {
+            while( arr[i] > p ) i++;
+            while( arr[j] < p ) j--;
+            if( i <= j ) {
+                var t = buf[i];
+                buf[i++] = buf[j];
+                buf[j--] = t;
+            }
+        }
+        if( lo < j ) quicksort( lo, j );
+        if( i < hi ) quicksort( i, hi );
+    }
+}
\ No newline at end of file
diff --git a/test/markup/hsp/default.expect.txt b/test/markup/hsp/default.expect.txt
new file mode 100644
index 0000000000..ef4ccd5b77
--- /dev/null
+++ b/test/markup/hsp/default.expect.txt
@@ -0,0 +1,23 @@
+<span class="hljs-meta">#<span class="hljs-meta-keyword">include</span> <span class="hljs-meta-string">&quot;foo.hsp&quot;</span></span>
+
+	<span class="hljs-comment">// line comment</span>
+	message = <span class="hljs-string">&quot;Hello, World!&quot;</span>
+	message2 = <span class="hljs-string">{&quot;Multi
+	line
+	string&quot;}</span>
+	num = <span class="hljs-number">0</span>
+	<span class="hljs-keyword">mes</span> message
+	
+	<span class="hljs-keyword">input</span> num : <span class="hljs-keyword">button</span> <span class="hljs-string">&quot;sqrt&quot;</span>, *label
+	<span class="hljs-keyword">stop</span>
+	
+<span class="hljs-symbol">*label</span>
+	<span class="hljs-comment">/*
+	 block comment
+	*/</span>
+	<span class="hljs-keyword">if</span>(num &gt;= <span class="hljs-number">0</span>) {
+		<span class="hljs-keyword">dialog</span> <span class="hljs-string">&quot;sqrt(&quot;</span> + num + <span class="hljs-string">&quot;) = &quot;</span> + <span class="hljs-keyword">sqrt</span>(num)
+	} <span class="hljs-keyword">else</span> {
+		<span class="hljs-keyword">dialog</span> <span class="hljs-string">&quot;error&quot;</span>, <span class="hljs-number">1</span>
+	}
+	<span class="hljs-keyword">stop</span>
diff --git a/test/markup/hsp/default.txt b/test/markup/hsp/default.txt
new file mode 100644
index 0000000000..403bdfee30
--- /dev/null
+++ b/test/markup/hsp/default.txt
@@ -0,0 +1,23 @@
+#include "foo.hsp"
+
+	// line comment
+	message = "Hello, World!"
+	message2 = {"Multi
+	line
+	string"}
+	num = 0
+	mes message
+	
+	input num : button "sqrt", *label
+	stop
+	
+*label
+	/*
+	 block comment
+	*/
+	if(num >= 0) {
+		dialog "sqrt(" + num + ") = " + sqrt(num)
+	} else {
+		dialog "error", 1
+	}
+	stop
diff --git a/test/markup/hy/default.expect.txt b/test/markup/hy/default.expect.txt
new file mode 100644
index 0000000000..7639b1e32c
--- /dev/null
+++ b/test/markup/hy/default.expect.txt
@@ -0,0 +1,37 @@
+<span class="hljs-meta">#!/usr/bin/env hy</span>
+
+(<span class="hljs-name"><span class="hljs-builtin-name">import</span></span> os.path)
+
+(<span class="hljs-name"><span class="hljs-builtin-name">import</span></span> hy.compiler)
+(<span class="hljs-name"><span class="hljs-builtin-name">import</span></span> hy.core)
+
+
+<span class="hljs-comment">;; absolute path for Hy core</span>
+(<span class="hljs-name"><span class="hljs-builtin-name">setv</span></span> *core-path* (<span class="hljs-name">os.path.dirname</span> hy.core.--file--))
+
+
+(<span class="hljs-name"><span class="hljs-builtin-name">defn</span></span> collect-macros [collected-names opened-file]
+  (<span class="hljs-name"><span class="hljs-builtin-name">while</span></span> <span class="hljs-literal">True</span>
+    (<span class="hljs-name"><span class="hljs-builtin-name">try</span></span>
+     (<span class="hljs-name"><span class="hljs-builtin-name">let</span></span> [data (<span class="hljs-name"><span class="hljs-builtin-name">read</span></span> opened-file)]
+       (<span class="hljs-name"><span class="hljs-builtin-name">if</span></span> (<span class="hljs-name"><span class="hljs-builtin-name">and</span></span> (<span class="hljs-name"><span class="hljs-builtin-name">in</span></span> (<span class="hljs-name"><span class="hljs-builtin-name">first</span></span> data)
+                    &#x27;(<span class="hljs-name"><span class="hljs-builtin-name">defmacro</span></span> defmacro/g! defn))
+                (<span class="hljs-name"><span class="hljs-builtin-name">not</span></span> (<span class="hljs-name">.startswith</span> (<span class="hljs-name"><span class="hljs-builtin-name">second</span></span> data) <span class="hljs-string">&quot;_&quot;</span>)))
+         (<span class="hljs-name">.add</span> collected-names (<span class="hljs-name"><span class="hljs-builtin-name">second</span></span> data))))
+     (<span class="hljs-name"><span class="hljs-builtin-name">except</span></span> [e EOFError] (<span class="hljs-name"><span class="hljs-builtin-name">break</span></span>)))))
+
+
+(<span class="hljs-name"><span class="hljs-builtin-name">defmacro</span></span> core-file [filename]
+  `(<span class="hljs-name"><span class="hljs-builtin-name">open</span></span> (<span class="hljs-name">os.path.join</span> *core-path* ~filename)))
+
+
+(<span class="hljs-name"><span class="hljs-builtin-name">defmacro</span></span> contrib-file [filename]
+  `(<span class="hljs-name"><span class="hljs-builtin-name">open</span></span> (<span class="hljs-name">os.path.join</span> *core-path* <span class="hljs-string">&quot;..&quot;</span> <span class="hljs-string">&quot;contrib&quot;</span> ~filename)))
+
+
+(<span class="hljs-name"><span class="hljs-builtin-name">defn</span></span> collect-core-names []
+  (<span class="hljs-name"><span class="hljs-builtin-name">doto</span></span> (<span class="hljs-name">set</span>)
+        (<span class="hljs-name">.update</span> hy.core.language.*exports*)
+        (<span class="hljs-name">.update</span> hy.core.shadow.*exports*)
+        (<span class="hljs-name">collect-macros</span> (<span class="hljs-name">core-file</span> <span class="hljs-string">&quot;macros.hy&quot;</span>))
+        (<span class="hljs-name">collect-macros</span> (<span class="hljs-name">core-file</span> <span class="hljs-string">&quot;bootstrap.hy&quot;</span>))))
diff --git a/test/markup/hy/default.txt b/test/markup/hy/default.txt
new file mode 100644
index 0000000000..769991dbcc
--- /dev/null
+++ b/test/markup/hy/default.txt
@@ -0,0 +1,37 @@
+#!/usr/bin/env hy
+
+(import os.path)
+
+(import hy.compiler)
+(import hy.core)
+
+
+;; absolute path for Hy core
+(setv *core-path* (os.path.dirname hy.core.--file--))
+
+
+(defn collect-macros [collected-names opened-file]
+  (while True
+    (try
+     (let [data (read opened-file)]
+       (if (and (in (first data)
+                    '(defmacro defmacro/g! defn))
+                (not (.startswith (second data) "_")))
+         (.add collected-names (second data))))
+     (except [e EOFError] (break)))))
+
+
+(defmacro core-file [filename]
+  `(open (os.path.join *core-path* ~filename)))
+
+
+(defmacro contrib-file [filename]
+  `(open (os.path.join *core-path* ".." "contrib" ~filename)))
+
+
+(defn collect-core-names []
+  (doto (set)
+        (.update hy.core.language.*exports*)
+        (.update hy.core.shadow.*exports*)
+        (collect-macros (core-file "macros.hy"))
+        (collect-macros (core-file "bootstrap.hy"))))
diff --git a/test/markup/inform7/default.expect.txt b/test/markup/inform7/default.expect.txt
new file mode 100644
index 0000000000..5cea07fc9b
--- /dev/null
+++ b/test/markup/inform7/default.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-section">Book 1 - Language Definition Testing File</span>
+
+<span class="hljs-comment">[Comments in Inform 7 can be <span class="hljs-comment">[nested]</span> inside one another]</span>
+
+Syntax highlighting <span class="hljs-keyword">is</span> an action applying to one <span class="hljs-keyword">thing</span>.
+<span class="hljs-keyword">Understand</span> <span class="hljs-string">&quot;highlight <span class="hljs-subst">[something preferably codeish]</span>&quot;</span> as syntax highlighting.
+
+Code <span class="hljs-keyword">is</span> a <span class="hljs-keyword">kind</span> <span class="hljs-keyword">of</span> <span class="hljs-keyword">thing</span>. Code <span class="hljs-keyword">is</span> usually plural-named.
+
+Code can be highlighted. Code <span class="hljs-keyword">is</span> usually not highlighted.
+
+Check syntax highlighting:
+  unless the noun <span class="hljs-keyword">is</span> code:
+    <span class="hljs-keyword">say</span> <span class="hljs-string">&quot;<span class="hljs-subst">[The noun]</span> isn&#x27;t source code you can highlight.&quot;</span>;
+    <span class="hljs-keyword">rule</span> fails.
+
+Carry out syntax highlighting:
+  now the noun <span class="hljs-keyword">is</span> highlighted.
+
+<span class="hljs-section">Table of Programming Languages</span>
+language  utility
+ruby      <span class="hljs-string">&quot;Web back-end development&quot;</span>
+lua       <span class="hljs-string">&quot;Embedded scripting&quot;</span>
+erlang    <span class="hljs-string">&quot;High-concurrency server applications&quot;</span>
\ No newline at end of file
diff --git a/test/markup/inform7/default.txt b/test/markup/inform7/default.txt
new file mode 100644
index 0000000000..5c16a694a1
--- /dev/null
+++ b/test/markup/inform7/default.txt
@@ -0,0 +1,24 @@
+Book 1 - Language Definition Testing File
+
+[Comments in Inform 7 can be [nested] inside one another]
+
+Syntax highlighting is an action applying to one thing.
+Understand "highlight [something preferably codeish]" as syntax highlighting.
+
+Code is a kind of thing. Code is usually plural-named.
+
+Code can be highlighted. Code is usually not highlighted.
+
+Check syntax highlighting:
+  unless the noun is code:
+    say "[The noun] isn't source code you can highlight.";
+    rule fails.
+
+Carry out syntax highlighting:
+  now the noun is highlighted.
+
+Table of Programming Languages
+language  utility
+ruby      "Web back-end development"
+lua       "Embedded scripting"
+erlang    "High-concurrency server applications"
\ No newline at end of file
diff --git a/test/markup/irpf90/default.expect.txt b/test/markup/irpf90/default.expect.txt
new file mode 100644
index 0000000000..168a3f6785
--- /dev/null
+++ b/test/markup/irpf90/default.expect.txt
@@ -0,0 +1,37 @@
+ <span class="hljs-keyword">BEGIN_PROVIDER</span> [ <span class="hljs-keyword">integer</span>(bit_kind), psi_det_sorted_bit, (N_int,<span class="hljs-number">2</span>,psi_det_size) ]
+&amp;<span class="hljs-keyword">BEGIN_PROVIDER</span> [ <span class="hljs-keyword">double</span> <span class="hljs-keyword">precision</span>, psi_coef_sorted_bit, (psi_det_size,N_states) ]
+ <span class="hljs-keyword">implicit</span> <span class="hljs-keyword">none</span>
+ <span class="hljs-comment">BEGIN_DOC
+ ! Determinants on which we apply &lt;i|H|psi&gt; for perturbation.
+ ! They are sorted by determinants interpreted as integers. Useful
+ ! to accelerate the search of a random determinant in the wave
+ ! function.
+ END_DOC</span>
+ <span class="hljs-keyword">integer</span> :: i,j,k
+ <span class="hljs-keyword">integer</span>, <span class="hljs-keyword">allocatable</span> ::  iorder(:)
+ <span class="hljs-keyword">integer</span>*<span class="hljs-number">8</span>, <span class="hljs-keyword">allocatable</span> :: bit_tmp(:)
+ <span class="hljs-keyword">integer</span>*<span class="hljs-number">8</span>, <span class="hljs-keyword">external</span> :: det_search_key
+
+ <span class="hljs-built_in">allocate</span> ( iorder(N_det), bit_tmp(N_det) )
+
+ <span class="hljs-keyword">do</span> i=<span class="hljs-number">1</span>,N_det
+   iorder(i) = i
+   <span class="hljs-comment">!DIR$ FORCEINLINE</span>
+   bit_tmp(i) = det_search_key(psi_det(<span class="hljs-number">1</span>,<span class="hljs-number">1</span>,i),N_int)
+ <span class="hljs-keyword">enddo</span>
+ <span class="hljs-keyword">call</span> isort(bit_tmp,iorder,N_det)
+ <span class="hljs-comment">!DIR$ IVDEP</span>
+ <span class="hljs-keyword">do</span> i=<span class="hljs-number">1</span>,N_det
+  <span class="hljs-keyword">do</span> j=<span class="hljs-number">1</span>,N_int
+    psi_det_sorted_bit(j,<span class="hljs-number">1</span>,i) = psi_det(j,<span class="hljs-number">1</span>,iorder(i))
+    psi_det_sorted_bit(j,<span class="hljs-number">2</span>,i) = psi_det(j,<span class="hljs-number">2</span>,iorder(i))
+  <span class="hljs-keyword">enddo</span>
+  <span class="hljs-keyword">do</span> k=<span class="hljs-number">1</span>,N_states
+    psi_coef_sorted_bit(i,k) = psi_coef(iorder(i),k)
+  <span class="hljs-keyword">enddo</span>
+ <span class="hljs-keyword">enddo</span>
+
+ <span class="hljs-built_in">deallocate</span>(iorder, bit_tmp)
+
+<span class="hljs-keyword">END_PROVIDER</span>
+
diff --git a/test/markup/irpf90/default.txt b/test/markup/irpf90/default.txt
new file mode 100644
index 0000000000..e3619cd551
--- /dev/null
+++ b/test/markup/irpf90/default.txt
@@ -0,0 +1,37 @@
+ BEGIN_PROVIDER [ integer(bit_kind), psi_det_sorted_bit, (N_int,2,psi_det_size) ]
+&BEGIN_PROVIDER [ double precision, psi_coef_sorted_bit, (psi_det_size,N_states) ]
+ implicit none
+ BEGIN_DOC
+ ! Determinants on which we apply <i|H|psi> for perturbation.
+ ! They are sorted by determinants interpreted as integers. Useful
+ ! to accelerate the search of a random determinant in the wave
+ ! function.
+ END_DOC
+ integer :: i,j,k
+ integer, allocatable ::  iorder(:)
+ integer*8, allocatable :: bit_tmp(:)
+ integer*8, external :: det_search_key
+
+ allocate ( iorder(N_det), bit_tmp(N_det) )
+
+ do i=1,N_det
+   iorder(i) = i
+   !DIR$ FORCEINLINE
+   bit_tmp(i) = det_search_key(psi_det(1,1,i),N_int)
+ enddo
+ call isort(bit_tmp,iorder,N_det)
+ !DIR$ IVDEP
+ do i=1,N_det
+  do j=1,N_int
+    psi_det_sorted_bit(j,1,i) = psi_det(j,1,iorder(i))
+    psi_det_sorted_bit(j,2,i) = psi_det(j,2,iorder(i))
+  enddo
+  do k=1,N_states
+    psi_coef_sorted_bit(i,k) = psi_coef(iorder(i),k)
+  enddo
+ enddo
+
+ deallocate(iorder, bit_tmp)
+
+END_PROVIDER
+
diff --git a/test/markup/isbl/default.expect.txt b/test/markup/isbl/default.expect.txt
new file mode 100644
index 0000000000..30763ea4ac
--- /dev/null
+++ b/test/markup/isbl/default.expect.txt
@@ -0,0 +1,27 @@
+  <span class="hljs-comment">// Описание констант</span>
+  <span class="hljs-variable">ADD_EQUAL_NUMBER_TEMPLATE</span> = <span class="hljs-string">&quot;%s.%s = %s&quot;</span>
+  <span class="hljs-variable">EMPLOYEES_REFERENCE</span> = <span class="hljs-string">&quot;РАБ&quot;</span>
+  <span class="hljs-comment">/********************************************* 
+   *  Получить список кодов или ИД работников, *
+   *  соответствующих текущему пользователю    *
+   *********************************************/</span>
+  <span class="hljs-variable">Employees<span class="hljs-type">: IReference.РАБ</span> =</span> <span class="hljs-function"><span class="hljs-title"><span class="hljs-built_in">CreateReference</span></span>(<span class="hljs-variable">EMPLOYEES_REFERENCE</span>; 
+    <span class="hljs-title"><span class="hljs-built_in">ArrayOf</span></span>(<span class="hljs-string">&quot;Пользователь&quot;</span>; <span class="hljs-variable"><span class="hljs-built_in">SYSREQ_STATE</span></span>); <span class="hljs-title">MyFunction</span>(<span class="hljs-variable"><span class="hljs-literal">FALSE</span></span>; <span class="hljs-variable">MyParam</span> * <span class="hljs-number">0.05</span>))</span>
+  <span class="hljs-variable">Employees.Events.DisableAll</span>
+  <span class="hljs-variable">EmployeesTableName</span> = <span class="hljs-variable">Employees.TableName</span>
+  <span class="hljs-variable">EmployeesUserWhereID</span> = <span class="hljs-variable">Employees.AddWhere</span>(<span class="hljs-function"><span class="hljs-title"><span class="hljs-built_in">Format</span></span>(<span class="hljs-variable">ADD_EQUAL_NUMBER_TEMPLATE</span>; 
+    <span class="hljs-title"><span class="hljs-built_in">ArrayOf</span></span>(<span class="hljs-variable">EmployeesTableName</span>; <span class="hljs-variable">Employees.Requisites</span>(<span class="hljs-string">&quot;Пользователь&quot;</span>).SQLFieldName; 
+    <span class="hljs-variable"><span class="hljs-class">EDocuments</span>.CurrentUser.ID</span>)))</span>
+  <span class="hljs-variable">Employees.Open</span>()
+  <span class="hljs-variable"><span class="hljs-class">Result</span></span> = <span class="hljs-function"><span class="hljs-title"><span class="hljs-built_in">CreateStringList</span></span>()</span>
+  <span class="hljs-variable"><span class="hljs-keyword">foreach</span></span> <span class="hljs-variable">Employee</span> <span class="hljs-variable"><span class="hljs-keyword">in</span></span> <span class="hljs-variable">Employees</span>
+    <span class="hljs-variable"><span class="hljs-keyword">if</span></span> <span class="hljs-variable">IsResultCode</span>
+      <span class="hljs-variable"><span class="hljs-class">Result</span>.Add</span>(<span class="hljs-variable">Employee.<span class="hljs-built_in">SYSREQ_CODE</span></span>)
+    <span class="hljs-variable"><span class="hljs-keyword">else</span></span>
+      <span class="hljs-variable"><span class="hljs-class">Result</span>.Add</span>(<span class="hljs-variable">Employee.<span class="hljs-built_in">SYSREQ_ID</span></span>)
+    <span class="hljs-variable"><span class="hljs-keyword">endif</span></span>  
+  <span class="hljs-variable"><span class="hljs-keyword">endforeach</span></span>
+  <span class="hljs-variable">Employees.Close</span>()
+  <span class="hljs-variable">Employees.DelWhere</span>(<span class="hljs-variable">EmployeesUserWhereID</span>)
+  <span class="hljs-variable">Employees.Events.EnableAll</span>
+  <span class="hljs-variable">Employees</span> = <span class="hljs-variable"><span class="hljs-literal">nil</span></span>
\ No newline at end of file
diff --git a/test/markup/isbl/default.txt b/test/markup/isbl/default.txt
new file mode 100644
index 0000000000..af8272b08d
--- /dev/null
+++ b/test/markup/isbl/default.txt
@@ -0,0 +1,27 @@
+  // Описание констант
+  ADD_EQUAL_NUMBER_TEMPLATE = "%s.%s = %s"
+  EMPLOYEES_REFERENCE = "РАБ"
+  /********************************************* 
+   *  Получить список кодов или ИД работников, *
+   *  соответствующих текущему пользователю    *
+   *********************************************/
+  Employees: IReference.РАБ = CreateReference(EMPLOYEES_REFERENCE; 
+    ArrayOf("Пользователь"; SYSREQ_STATE); MyFunction(FALSE; MyParam * 0.05))
+  Employees.Events.DisableAll
+  EmployeesTableName = Employees.TableName
+  EmployeesUserWhereID = Employees.AddWhere(Format(ADD_EQUAL_NUMBER_TEMPLATE; 
+    ArrayOf(EmployeesTableName; Employees.Requisites("Пользователь").SQLFieldName; 
+    EDocuments.CurrentUser.ID)))
+  Employees.Open()
+  Result = CreateStringList()
+  foreach Employee in Employees
+    if IsResultCode
+      Result.Add(Employee.SYSREQ_CODE)
+    else
+      Result.Add(Employee.SYSREQ_ID)
+    endif  
+  endforeach
+  Employees.Close()
+  Employees.DelWhere(EmployeesUserWhereID)
+  Employees.Events.EnableAll
+  Employees = nil
\ No newline at end of file
diff --git a/test/markup/jboss-cli/default.expect.txt b/test/markup/jboss-cli/default.expect.txt
new file mode 100644
index 0000000000..2a788dc629
--- /dev/null
+++ b/test/markup/jboss-cli/default.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-keyword">jms-queue</span> add <span class="hljs-params">--queue-address=myQueue</span> <span class="hljs-params">--entries=queue/myQueue</span>
+
+<span class="hljs-keyword">deploy</span> <span class="hljs-string">/path/to/file.war</span>
+
+<span class="hljs-string">/system-property=prop1</span><span class="hljs-function">:add</span><span class="hljs-params">(<span class="hljs-attr">value</span>=value1)</span>
+
+
+
+<span class="hljs-string">/extension=org.jboss.as.modcluster</span><span class="hljs-function">:add</span>
+
+<span class="hljs-string">./foo=bar</span><span class="hljs-function">:remove</span>
+
+<span class="hljs-string">/subsystem=security/security-domain=demo-realm/authentication=classic</span><span class="hljs-function">:add</span>
+
+<span class="hljs-string">/subsystem=security/security-domain=demo-realm/authentication=classic/login-module=UsersRoles</span><span class="hljs-function">:add</span><span class="hljs-params">( \
+    <span class="hljs-attr">code</span>=UsersRoles, \
+    <span class="hljs-attr">flag</span>=required, \
+    <span class="hljs-attr">module-options</span>=  { \
+         <span class="hljs-attr">usersProperties</span>=auth/demo-users.properties, \
+         <span class="hljs-attr">rolesProperties</span> =auth/demo-roles.properties,  \
+         <span class="hljs-attr">hashAlgorithm</span>= MD5, \
+         <span class="hljs-attr">hashCharset</span>=&quot;UTF-8&quot;  \
+    } \
+)</span>
diff --git a/test/markup/jboss-cli/default.txt b/test/markup/jboss-cli/default.txt
new file mode 100644
index 0000000000..5df733fe54
--- /dev/null
+++ b/test/markup/jboss-cli/default.txt
@@ -0,0 +1,24 @@
+jms-queue add --queue-address=myQueue --entries=queue/myQueue
+
+deploy /path/to/file.war
+
+/system-property=prop1:add(value=value1)
+
+
+
+/extension=org.jboss.as.modcluster:add
+
+./foo=bar:remove
+
+/subsystem=security/security-domain=demo-realm/authentication=classic:add
+
+/subsystem=security/security-domain=demo-realm/authentication=classic/login-module=UsersRoles:add( \
+    code=UsersRoles, \
+    flag=required, \
+    module-options=  { \
+         usersProperties=auth/demo-users.properties, \
+         rolesProperties =auth/demo-roles.properties,  \
+         hashAlgorithm= MD5, \
+         hashCharset="UTF-8"  \
+    } \
+)
diff --git a/test/markup/julia-repl/default.expect.txt b/test/markup/julia-repl/default.expect.txt
new file mode 100644
index 0000000000..b9d255be81
--- /dev/null
+++ b/test/markup/julia-repl/default.expect.txt
@@ -0,0 +1,36 @@
+<span class="hljs-meta">julia&gt;</span><span class="julia"> <span class="hljs-keyword">function</span> foo(x) x + <span class="hljs-number">1</span> <span class="hljs-keyword">end</span>
+</span>foo (generic function with 1 method)
+
+<span class="hljs-meta">julia&gt;</span><span class="julia"> foo(<span class="hljs-number">42</span>)
+</span>43
+
+<span class="hljs-meta">julia&gt;</span><span class="julia"> foo(<span class="hljs-number">42</span>) === <span class="hljs-number">43.</span>
+</span>false
+
+
+Here we match all three lines of code:
+
+<span class="hljs-meta">julia&gt;</span><span class="julia"> <span class="hljs-keyword">function</span> foo(x::<span class="hljs-built_in">Float64</span>)
+           <span class="hljs-number">42.</span> - x
+       <span class="hljs-keyword">end</span>
+</span>foo (generic function with 2 methods)
+
+<span class="hljs-meta">julia&gt;</span><span class="julia"> <span class="hljs-keyword">for</span> x <span class="hljs-keyword">in</span> <span class="hljs-built_in">Any</span>[<span class="hljs-number">1</span>, <span class="hljs-number">2</span>, <span class="hljs-number">3.4</span>]
+          println(<span class="hljs-string">&quot;foo(<span class="hljs-variable">$x</span>) = <span class="hljs-subst">$(foo(x)</span>)&quot;</span>)
+       <span class="hljs-keyword">end</span>
+</span>foo(1) = 2
+foo(2) = 3
+foo(3.4) = 38.6
+
+
+... unless it is not properly indented:
+
+<span class="hljs-meta">julia&gt;</span><span class="julia"> <span class="hljs-keyword">function</span> foo(x)
+</span>    x + 1
+end
+
+
+Ordinary Julia code does not get highlighted:
+
+Pkg.add(&quot;Combinatorics&quot;)
+abstract type Foo end
diff --git a/test/markup/julia-repl/default.txt b/test/markup/julia-repl/default.txt
new file mode 100644
index 0000000000..d7ffa8c9e8
--- /dev/null
+++ b/test/markup/julia-repl/default.txt
@@ -0,0 +1,36 @@
+julia> function foo(x) x + 1 end
+foo (generic function with 1 method)
+
+julia> foo(42)
+43
+
+julia> foo(42) === 43.
+false
+
+
+Here we match all three lines of code:
+
+julia> function foo(x::Float64)
+           42. - x
+       end
+foo (generic function with 2 methods)
+
+julia> for x in Any[1, 2, 3.4]
+          println("foo($x) = $(foo(x))")
+       end
+foo(1) = 2
+foo(2) = 3
+foo(3.4) = 38.6
+
+
+... unless it is not properly indented:
+
+julia> function foo(x)
+    x + 1
+end
+
+
+Ordinary Julia code does not get highlighted:
+
+Pkg.add("Combinatorics")
+abstract type Foo end
diff --git a/test/markup/julia/default.expect.txt b/test/markup/julia/default.expect.txt
new file mode 100644
index 0000000000..2b89d7f732
--- /dev/null
+++ b/test/markup/julia/default.expect.txt
@@ -0,0 +1,99 @@
+<span class="hljs-comment">### Types</span>
+
+<span class="hljs-keyword">struct</span> Plus
+    f::typeof(+)
+<span class="hljs-keyword">end</span>
+
+<span class="hljs-keyword">mutable struct</span> Mut
+    mutable::A          <span class="hljs-comment"># mutable should not be highlighted (not followed by struct)</span>
+    primitive::B        <span class="hljs-comment"># primitive should not be highlighted (not followed by type)</span>
+<span class="hljs-keyword">end</span>
+
+<span class="hljs-keyword">primitive type</span> Prim <span class="hljs-number">8</span> <span class="hljs-keyword">end</span>
+
+<span class="hljs-keyword">abstract type</span> Abstr <span class="hljs-keyword">end</span>
+
+<span class="hljs-comment">### Modules</span>
+
+<span class="hljs-keyword">module</span> M
+
+<span class="hljs-keyword">using</span> X
+<span class="hljs-keyword">import</span> Y
+
+<span class="hljs-keyword">export</span> a, b, c
+
+<span class="hljs-keyword">end</span> <span class="hljs-comment"># module</span>
+
+<span class="hljs-keyword">baremodule</span> Bare
+<span class="hljs-keyword">end</span>
+
+
+<span class="hljs-comment">### Miscellaneous</span>
+
+<span class="hljs-comment"># Some things new for Julia &gt;1.0</span>
+<span class="hljs-keyword">function</span> f(x::<span class="hljs-built_in">Union</span>{<span class="hljs-built_in">String</span>,<span class="hljs-built_in">Missing</span>,<span class="hljs-built_in">Nothing</span>}, y::<span class="hljs-built_in">Tuple</span>{<span class="hljs-built_in">Float64</span>,<span class="hljs-built_in">ComplexF64</span>})
+    <span class="hljs-keyword">if</span> x === <span class="hljs-literal">nothing</span>
+        println(<span class="hljs-literal">devnull</span>, <span class="hljs-string">&quot;nothing&quot;</span>)
+    <span class="hljs-keyword">elseif</span> x === <span class="hljs-literal">missing</span>
+        println(<span class="hljs-literal">stderr</span>, <span class="hljs-string">&quot;missing&quot;</span>)
+    <span class="hljs-keyword">else</span>
+        println(<span class="hljs-literal">stdout</span>, x)
+    <span class="hljs-keyword">end</span>
+<span class="hljs-keyword">end</span>
+
+f(x::<span class="hljs-built_in">UndefInitializer</span> = <span class="hljs-literal">undef</span>) = <span class="hljs-built_in">Regex</span>(<span class="hljs-string">&quot;^hello, world\$&quot;</span>)
+
+<span class="hljs-comment"># where, infix isa, UnionAll</span>
+<span class="hljs-keyword">function</span> F{T}(x::T) <span class="hljs-keyword">where</span> T
+    <span class="hljs-keyword">for</span> i <span class="hljs-keyword">in</span> x
+        i <span class="hljs-keyword">isa</span> <span class="hljs-built_in">UnionAll</span> &amp;&amp; <span class="hljs-keyword">return</span>
+    <span class="hljs-keyword">end</span>
+<span class="hljs-keyword">end</span>
+
+<span class="hljs-comment">#=
+Multi
+Line
+Comment
+=#</span>
+<span class="hljs-keyword">function</span> method0(x, y::<span class="hljs-built_in">Int</span>; version::<span class="hljs-built_in">VersionNumber</span>=<span class="hljs-string">v&quot;0.1.2&quot;</span>)
+    <span class="hljs-string">&quot;&quot;&quot;
+    Triple
+    Quoted
+    String
+    &quot;&quot;&quot;</span>
+
+    <span class="hljs-meta">@assert</span> <span class="hljs-literal">π</span> &gt; e
+
+    s = <span class="hljs-number">1.2</span>
+    変数 = <span class="hljs-string">&quot;variable&quot;</span>
+
+    <span class="hljs-keyword">if</span> s * <span class="hljs-number">100_000</span> ≥ <span class="hljs-number">5.2e+10</span> &amp;&amp; <span class="hljs-literal">true</span> || x === <span class="hljs-literal">nothing</span>
+        s = <span class="hljs-number">1.</span> + <span class="hljs-number">.5</span><span class="hljs-literal">im</span>
+    <span class="hljs-keyword">elseif</span> <span class="hljs-number">1</span> ∈ [<span class="hljs-number">1</span>, <span class="hljs-number">2</span>, <span class="hljs-number">3</span>]
+        println(<span class="hljs-string">&quot;s is <span class="hljs-variable">$s</span> and 変数 is <span class="hljs-variable">$変数</span>&quot;</span>)
+    <span class="hljs-keyword">else</span>
+        x = [<span class="hljs-number">1</span> <span class="hljs-number">2</span> <span class="hljs-number">3</span>; <span class="hljs-number">4</span> <span class="hljs-number">5</span> <span class="hljs-number">6</span>]
+        <span class="hljs-meta">@show</span> x&#x27;
+    <span class="hljs-keyword">end</span>
+
+    <span class="hljs-keyword">local</span> var = rand(<span class="hljs-number">10</span>)
+    <span class="hljs-keyword">global</span> g = <span class="hljs-number">44</span>
+    var[<span class="hljs-number">1</span>:<span class="hljs-number">5</span>]
+    var[<span class="hljs-number">5</span>:<span class="hljs-keyword">end</span>-<span class="hljs-number">1</span>]
+    var[<span class="hljs-keyword">end</span>]
+
+    opt = <span class="hljs-string">&quot;-la&quot;</span>
+    run(<span class="hljs-string">`ls <span class="hljs-variable">$opt</span>`</span>)
+
+    <span class="hljs-keyword">try</span>
+        <span class="hljs-keyword">ccall</span>(:lib, (<span class="hljs-built_in">Ptr</span>{Void},), <span class="hljs-built_in">Ref</span>{<span class="hljs-literal">C_NULL</span>})
+    <span class="hljs-keyword">catch</span>
+        throw(<span class="hljs-built_in">ArgumentError</span>(<span class="hljs-string">&quot;wat&quot;</span>))
+    <span class="hljs-keyword">finally</span>
+        warn(<span class="hljs-string">&quot;god save the queen&quot;</span>)
+    <span class="hljs-keyword">end</span>
+
+    <span class="hljs-string">&#x27;\u2200&#x27;</span> != <span class="hljs-string">&#x27;T&#x27;</span>
+
+    <span class="hljs-keyword">return</span> <span class="hljs-number">5</span>s / <span class="hljs-number">2</span>
+<span class="hljs-keyword">end</span>
diff --git a/test/markup/julia/default.txt b/test/markup/julia/default.txt
new file mode 100644
index 0000000000..a20262df03
--- /dev/null
+++ b/test/markup/julia/default.txt
@@ -0,0 +1,99 @@
+### Types
+
+struct Plus
+    f::typeof(+)
+end
+
+mutable struct Mut
+    mutable::A          # mutable should not be highlighted (not followed by struct)
+    primitive::B        # primitive should not be highlighted (not followed by type)
+end
+
+primitive type Prim 8 end
+
+abstract type Abstr end
+
+### Modules
+
+module M
+
+using X
+import Y
+
+export a, b, c
+
+end # module
+
+baremodule Bare
+end
+
+
+### Miscellaneous
+
+# Some things new for Julia >1.0
+function f(x::Union{String,Missing,Nothing}, y::Tuple{Float64,ComplexF64})
+    if x === nothing
+        println(devnull, "nothing")
+    elseif x === missing
+        println(stderr, "missing")
+    else
+        println(stdout, x)
+    end
+end
+
+f(x::UndefInitializer = undef) = Regex("^hello, world\$")
+
+# where, infix isa, UnionAll
+function F{T}(x::T) where T
+    for i in x
+        i isa UnionAll && return
+    end
+end
+
+#=
+Multi
+Line
+Comment
+=#
+function method0(x, y::Int; version::VersionNumber=v"0.1.2")
+    """
+    Triple
+    Quoted
+    String
+    """
+
+    @assert π > e
+
+    s = 1.2
+    変数 = "variable"
+
+    if s * 100_000 ≥ 5.2e+10 && true || x === nothing
+        s = 1. + .5im
+    elseif 1 ∈ [1, 2, 3]
+        println("s is $s and 変数 is $変数")
+    else
+        x = [1 2 3; 4 5 6]
+        @show x'
+    end
+
+    local var = rand(10)
+    global g = 44
+    var[1:5]
+    var[5:end-1]
+    var[end]
+
+    opt = "-la"
+    run(`ls $opt`)
+
+    try
+        ccall(:lib, (Ptr{Void},), Ref{C_NULL})
+    catch
+        throw(ArgumentError("wat"))
+    finally
+        warn("god save the queen")
+    end
+
+    '\u2200' != 'T'
+
+    return 5s / 2
+end
diff --git a/test/markup/leaf/default.expect.txt b/test/markup/leaf/default.expect.txt
new file mode 100644
index 0000000000..2b18b07def
--- /dev/null
+++ b/test/markup/leaf/default.expect.txt
@@ -0,0 +1,21 @@
+<span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-title">empty</span><span class="hljs-params">(<span class="hljs-variable">friends</span>)</span></span> {
+    Try adding some friends!
+} <span class="hljs-function"><span class="hljs-keyword">##</span><span class="hljs-title">loop</span><span class="hljs-params">(<span class="hljs-variable">friends</span>, <span class="hljs-string">&quot;friend&quot;</span>)</span></span> {
+    &lt;li&gt; <span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-params">(<span class="hljs-variable">friend</span>.<span class="hljs-variable">name</span>)</span></span> &lt;/li&gt;
+}
+
+<span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-title">someTag</span><span class="hljs-params">(<span class="hljs-variable">parameter</span>.<span class="hljs-variable">list</span>, <span class="hljs-variable">goes</span>, <span class="hljs-string">&quot;here&quot;</span>)</span></span> {
+    This is an optional body here
+}
+
+<span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-title">index</span><span class="hljs-params">(<span class="hljs-variable">friends</span>, <span class="hljs-string">&quot;0&quot;</span>)</span></span> {
+    Hello, <span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-params">(<span class="hljs-variable">self</span>)</span></span>!
+} <span class="hljs-function"><span class="hljs-keyword">##</span><span class="hljs-title">else</span><span class="hljs-params">()</span></span> {
+    Nobody&#x27;s there!
+}
+
+<span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-params">()</span></span>
+
+<span class="hljs-function"><span class="hljs-keyword">#</span><span class="hljs-title">raw</span><span class="hljs-params">()</span></span> {
+    &lt;li&gt; Hello &lt;/li&gt;
+}
diff --git a/test/markup/leaf/default.txt b/test/markup/leaf/default.txt
new file mode 100644
index 0000000000..5c47e88daa
--- /dev/null
+++ b/test/markup/leaf/default.txt
@@ -0,0 +1,21 @@
+#empty(friends) {
+    Try adding some friends!
+} ##loop(friends, "friend") {
+    <li> #(friend.name) </li>
+}
+
+#someTag(parameter.list, goes, "here") {
+    This is an optional body here
+}
+
+#index(friends, "0") {
+    Hello, #(self)!
+} ##else() {
+    Nobody's there!
+}
+
+#()
+
+#raw() {
+    <li> Hello </li>
+}
diff --git a/test/markup/livecodeserver/default.expect.txt b/test/markup/livecodeserver/default.expect.txt
new file mode 100644
index 0000000000..eaf3dd2f6b
--- /dev/null
+++ b/test/markup/livecodeserver/default.expect.txt
@@ -0,0 +1,30 @@
+<span class="hljs-meta">&lt;?rev</span>
+
+<span class="hljs-built_in">global</span> <span class="hljs-variable">gControllerHandlers</span>, <span class="hljs-variable">gData</span>
+<span class="hljs-built_in">local</span> <span class="hljs-variable">sTest</span>
+<span class="hljs-built_in">put</span> <span class="hljs-string">&quot;blog,index&quot;</span> <span class="hljs-keyword">into</span> <span class="hljs-variable">gControllerHandlers</span>
+
+
+<span class="hljs-keyword">command</span> <span class="hljs-title">blog</span>
+  <span class="hljs-comment">-- simple comment</span>
+  <span class="hljs-built_in">put</span> <span class="hljs-string">&quot;Hello World!&quot;</span> <span class="hljs-keyword">into</span> <span class="hljs-variable">sTest</span>
+  <span class="hljs-comment"># ANOTHER COMMENT</span>
+  <span class="hljs-built_in">put</span> <span class="hljs-string">&quot;form,url,asset&quot;</span> <span class="hljs-keyword">into</span> <span class="hljs-variable">tHelpers</span>
+  <span class="hljs-title">rigLoadHelper</span> <span class="hljs-variable">tHelpers</span>
+<span class="hljs-function"><span class="hljs-keyword">end</span> <span class="hljs-title">blog</span></span>
+
+<span class="hljs-comment">/*Hello
+block comment!*/</span>
+
+<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">myFunction</span></span>
+  <span class="hljs-keyword">if</span> <span class="hljs-keyword">the</span> <span class="hljs-built_in">secs</span> &gt; <span class="hljs-number">2000000000</span> <span class="hljs-keyword">then</span>
+    <span class="hljs-built_in">put</span> <span class="hljs-string">&quot;Welcome to the future!&quot;</span>
+  <span class="hljs-keyword">else</span>
+    <span class="hljs-literal">return</span> <span class="hljs-string">&quot;something&quot;</span>
+  <span class="hljs-keyword">end if</span>
+<span class="hljs-function"><span class="hljs-keyword">end</span> <span class="hljs-title">myFunction</span></span>
+
+
+<span class="hljs-comment">--| END OF blog.lc</span>
+<span class="hljs-comment">--| Location: ./system/application/controllers/blog.lc</span>
+<span class="hljs-comment">----------------------------------------------------------------------</span>
diff --git a/test/markup/livecodeserver/default.txt b/test/markup/livecodeserver/default.txt
new file mode 100644
index 0000000000..8c04e63ec2
--- /dev/null
+++ b/test/markup/livecodeserver/default.txt
@@ -0,0 +1,30 @@
+<?rev
+
+global gControllerHandlers, gData
+local sTest
+put "blog,index" into gControllerHandlers
+
+
+command blog
+  -- simple comment
+  put "Hello World!" into sTest
+  # ANOTHER COMMENT
+  put "form,url,asset" into tHelpers
+  rigLoadHelper tHelpers
+end blog
+
+/*Hello
+block comment!*/
+
+function myFunction
+  if the secs > 2000000000 then
+    put "Welcome to the future!"
+  else
+    return "something"
+  end if
+end myFunction
+
+
+--| END OF blog.lc
+--| Location: ./system/application/controllers/blog.lc
+----------------------------------------------------------------------
diff --git a/test/markup/livescript/default.expect.txt b/test/markup/livescript/default.expect.txt
new file mode 100644
index 0000000000..253ee2843f
--- /dev/null
+++ b/test/markup/livescript/default.expect.txt
@@ -0,0 +1,66 @@
+<span class="hljs-comment"># take the first n objects from a list</span>
+<span class="hljs-function"><span class="hljs-title">take</span> = <span class="hljs-params">(n, [x, ...xs]:<span class="hljs-keyword">list</span>)</span> --&gt;</span>
+  | n &lt;= <span class="hljs-number">0</span>     =&gt; []
+  | empty <span class="hljs-keyword">list</span> =&gt; []
+  | <span class="hljs-keyword">otherwise</span>  =&gt; [x] ++ take n - <span class="hljs-number">1</span>, xs
+
+take <span class="hljs-number">2</span>, [<span class="hljs-number">1</span>, <span class="hljs-number">2</span>, <span class="hljs-number">3</span>, <span class="hljs-number">4</span>, <span class="hljs-number">5</span>]
+
+<span class="hljs-comment"># Curried functions</span>
+take-three = take <span class="hljs-number">3</span>
+take-three [<span class="hljs-number">6</span>, <span class="hljs-number">7</span>, <span class="hljs-number">8</span>, <span class="hljs-number">9</span>, <span class="hljs-number">10</span>]
+
+<span class="hljs-comment"># Function composition</span>
+last-three = reverse &gt;&gt; take-three &gt;&gt; reverse
+last-three [<span class="hljs-number">1</span> <span class="hljs-keyword">to</span> <span class="hljs-number">8</span>]
+
+<span class="hljs-comment"># List comprehensions and piping</span>
+<span class="hljs-keyword">const</span> t1 =
+  * id: <span class="hljs-number">1</span>
+    name: <span class="hljs-string">&#x27;george&#x27;</span>
+  * id: <span class="hljs-number">2</span>
+    name: <span class="hljs-string">&#x27;mike&#x27;</span>
+  * id: <span class="hljs-number">3</span>
+    name: <span class="hljs-string">&#x27;donald&#x27;</span>
+
+<span class="hljs-keyword">const</span> t2 =
+  * id: <span class="hljs-number">2</span>
+    age: <span class="hljs-number">21</span>
+  * id: <span class="hljs-number">1</span>
+    age: <span class="hljs-number">20</span>
+  * id: <span class="hljs-number">3</span>
+    age: <span class="hljs-number">26</span>
+[{id:id1, name, age}
+  <span class="hljs-keyword">for</span> {id:id1, name} <span class="hljs-keyword">in</span> t1
+  <span class="hljs-keyword">for</span> {id:id2, age} <span class="hljs-keyword">in</span> t2
+  where id1 <span class="hljs-keyword">is</span> id2]
+  |&gt; sort-<span class="hljs-keyword">by</span> <span class="hljs-string">\id</span>
+  |&gt; <span class="hljs-built_in">JSON</span>.stringify
+
+~<span class="hljs-keyword">function</span> add x, y
+  @result = x + y
+
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">A</span></span>
+  <span class="hljs-function"><span class="hljs-params">(num)</span> -&gt;</span>
+    @x = num
+  property: <span class="hljs-number">1</span>
+  method: <span class="hljs-function"><span class="hljs-params">(y)</span> -&gt;</span>
+    @x + @property + y
+
+a = <span class="hljs-keyword">new</span> A <span class="hljs-number">3</span>
+a.x        <span class="hljs-comment">#=&gt; 3</span>
+a.property <span class="hljs-comment">#=&gt; 1</span>
+a.method <span class="hljs-number">6</span> <span class="hljs-comment">#=&gt; 10</span>
+
+<span class="hljs-function"><span class="hljs-title">f</span> = !-&gt;</span> <span class="hljs-number">2</span>
+<span class="hljs-function"><span class="hljs-title">g</span> = <span class="hljs-params">(x)</span> !-&gt;</span> x + <span class="hljs-number">2</span>
+
+result = <span class="hljs-keyword">switch</span> <span class="hljs-string">&#x27;test&#x27;</span>
+<span class="hljs-keyword">case</span> <span class="hljs-string">&#x27;blatant&#x27;</span>
+  <span class="hljs-string">&#x27;effort&#x27;</span>
+  <span class="hljs-keyword">fallthrough</span>
+<span class="hljs-keyword">case</span> <span class="hljs-string">&#x27;at&#x27;</span>
+  <span class="hljs-string">&#x27;increasing&#x27;</span>
+  <span class="hljs-keyword">fallthrough</span>
+<span class="hljs-keyword">case</span> <span class="hljs-string">&#x27;relevance&#x27;</span>
+  <span class="hljs-literal">void</span>
diff --git a/test/markup/livescript/default.txt b/test/markup/livescript/default.txt
new file mode 100644
index 0000000000..d7cb8f42c4
--- /dev/null
+++ b/test/markup/livescript/default.txt
@@ -0,0 +1,66 @@
+# take the first n objects from a list
+take = (n, [x, ...xs]:list) -->
+  | n <= 0     => []
+  | empty list => []
+  | otherwise  => [x] ++ take n - 1, xs
+
+take 2, [1, 2, 3, 4, 5]
+
+# Curried functions
+take-three = take 3
+take-three [6, 7, 8, 9, 10]
+
+# Function composition
+last-three = reverse >> take-three >> reverse
+last-three [1 to 8]
+
+# List comprehensions and piping
+const t1 =
+  * id: 1
+    name: 'george'
+  * id: 2
+    name: 'mike'
+  * id: 3
+    name: 'donald'
+
+const t2 =
+  * id: 2
+    age: 21
+  * id: 1
+    age: 20
+  * id: 3
+    age: 26
+[{id:id1, name, age}
+  for {id:id1, name} in t1
+  for {id:id2, age} in t2
+  where id1 is id2]
+  |> sort-by \id
+  |> JSON.stringify
+
+~function add x, y
+  @result = x + y
+
+class A
+  (num) ->
+    @x = num
+  property: 1
+  method: (y) ->
+    @x + @property + y
+
+a = new A 3
+a.x        #=> 3
+a.property #=> 1
+a.method 6 #=> 10
+
+f = !-> 2
+g = (x) !-> x + 2
+
+result = switch 'test'
+case 'blatant'
+  'effort'
+  fallthrough
+case 'at'
+  'increasing'
+  fallthrough
+case 'relevance'
+  void
diff --git a/test/markup/llvm/default.expect.txt b/test/markup/llvm/default.expect.txt
new file mode 100644
index 0000000000..8d09a4bc77
--- /dev/null
+++ b/test/markup/llvm/default.expect.txt
@@ -0,0 +1,61 @@
+<span class="hljs-comment">; ModuleID = &#x27;test.c&#x27;</span>
+<span class="hljs-keyword">target</span> <span class="hljs-keyword">datalayout</span> <span class="hljs-operator">=</span> <span class="hljs-string">&quot;e-m:e-i64:64-f80:128-n8:16:32:64-S128&quot;</span>
+<span class="hljs-keyword">target</span> <span class="hljs-keyword">triple</span> <span class="hljs-operator">=</span> <span class="hljs-string">&quot;x86_64-unknown-linux-gnu&quot;</span>
+
+<span class="hljs-variable">%struct._IO_FILE</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">type</span> { <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_marker</span>*<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_FILE</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i64</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i16</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span><span class="hljs-punctuation">,</span> [<span class="hljs-number">1</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i64</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i64</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> [<span class="hljs-number">20</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>] }
+<span class="hljs-variable">%struct._IO_marker</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">type</span> { <span class="hljs-variable">%struct._IO_marker</span>*<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_FILE</span>*<span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> }
+<span class="hljs-variable">%struct.what</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">type</span> { <span class="hljs-type">i8</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i16</span> }
+
+<span class="hljs-title">@.str</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">unnamed_addr</span> <span class="hljs-keyword">constant</span> [<span class="hljs-number">6</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>] <span class="hljs-keyword">c</span><span class="hljs-string">&quot;foo()\00&quot;</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">1</span>
+<span class="hljs-title">@e_long</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">common</span> <span class="hljs-keyword">global</span> <span class="hljs-type">i64</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+<span class="hljs-title">@g_double</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">common</span> <span class="hljs-keyword">global</span> <span class="hljs-keyword">double</span> <span class="hljs-number">0.000000e+00</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+<span class="hljs-title">@.str.1</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">unnamed_addr</span> <span class="hljs-keyword">constant</span> [<span class="hljs-number">7</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>] <span class="hljs-keyword">c</span><span class="hljs-string">&quot;oooooh\00&quot;</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">1</span>
+<span class="hljs-title">@func_ptr</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">common</span> <span class="hljs-keyword">global</span> <span class="hljs-type">i32</span> (...)* <span class="hljs-keyword">null</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+<span class="hljs-title">@stderr</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">external</span> <span class="hljs-keyword">global</span> <span class="hljs-variable">%struct._IO_FILE</span>*<span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+
+<span class="hljs-comment">; Function Attrs: nounwind uwtable</span>
+<span class="hljs-keyword">define</span> <span class="hljs-type">i32</span> <span class="hljs-title">@foo</span>() <span class="hljs-variable">#0</span> {
+  <span class="hljs-variable">%1</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">call</span> <span class="hljs-type">i32</span> <span class="hljs-title">@puts</span>(<span class="hljs-type">i8</span>* <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> ([<span class="hljs-number">6</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]<span class="hljs-punctuation">,</span> [<span class="hljs-number">6</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]* <span class="hljs-title">@.str</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>))
+  <span class="hljs-keyword">ret</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>
+}
+
+<span class="hljs-keyword">declare</span> <span class="hljs-type">i32</span> <span class="hljs-title">@puts</span>(<span class="hljs-type">i8</span>*) <span class="hljs-variable">#1</span>
+
+<span class="hljs-comment">; Function Attrs: nounwind uwtable</span>
+<span class="hljs-keyword">define</span> <span class="hljs-type">i32</span> <span class="hljs-title">@main</span>(<span class="hljs-type">i32</span> <span class="hljs-variable">%argc</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>** <span class="hljs-variable">%argv</span>) <span class="hljs-variable">#0</span> {
+  <span class="hljs-variable">%1</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">alloca</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">4</span>
+  <span class="hljs-variable">%2</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">alloca</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">4</span>
+  <span class="hljs-variable">%3</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">alloca</span> <span class="hljs-type">i8</span>**<span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+
+<span class="hljs-comment">; &lt;label&gt;:7                                       ; preds = %0</span>
+  <span class="hljs-variable">%8</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> <span class="hljs-variable">%struct.what</span><span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct.what</span>* <span class="hljs-variable">%X</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i8</span> <span class="hljs-number">1</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>* <span class="hljs-variable">%8</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">2</span>
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i8</span> <span class="hljs-number">49</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>* <span class="hljs-variable">%b_char</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">1</span>
+  <span class="hljs-variable">%9</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> <span class="hljs-variable">%struct.what</span><span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct.what</span>* <span class="hljs-variable">%X</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">1</span>
+  <span class="hljs-keyword">store</span> <span class="hljs-keyword">double</span> <span class="hljs-number">1.000000e+01</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">double</span>* <span class="hljs-title">@g_double</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i8</span>* <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> ([<span class="hljs-number">7</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]<span class="hljs-punctuation">,</span> [<span class="hljs-number">7</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]* <span class="hljs-title">@.str.1</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>)<span class="hljs-punctuation">,</span> <span class="hljs-type">i8</span>** <span class="hljs-variable">%cp_char_ptr</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i32</span> (...)* <span class="hljs-keyword">bitcast</span> (<span class="hljs-type">i32</span> ()* <span class="hljs-title">@foo</span> <span class="hljs-keyword">to</span> <span class="hljs-type">i32</span> (...)*)<span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> (...)** <span class="hljs-title">@func_ptr</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+  <span class="hljs-variable">%10</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">call</span> <span class="hljs-type">i32</span> <span class="hljs-title">@puts</span>(<span class="hljs-type">i8</span>* <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> ([<span class="hljs-number">8</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]<span class="hljs-punctuation">,</span> [<span class="hljs-number">8</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]* <span class="hljs-title">@.str.2</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>))
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i32</span> <span class="hljs-number">10</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span>* <span class="hljs-variable">%1</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">4</span>
+  <span class="hljs-keyword">br</span> label <span class="hljs-variable">%66</span>
+
+<span class="hljs-comment">; &lt;label&gt;:63                                      ; preds = %11</span>
+  <span class="hljs-variable">%64</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">load</span> <span class="hljs-variable">%struct._IO_FILE</span>*<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_FILE</span>** <span class="hljs-title">@stderr</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">8</span>
+  <span class="hljs-variable">%65</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">call</span> <span class="hljs-type">i32</span> <span class="hljs-title">@fputs</span>(<span class="hljs-type">i8</span>* <span class="hljs-keyword">getelementptr</span> <span class="hljs-keyword">inbounds</span> ([<span class="hljs-number">11</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]<span class="hljs-punctuation">,</span> [<span class="hljs-number">11</span> <span class="hljs-keyword">x</span> <span class="hljs-type">i8</span>]* <span class="hljs-title">@.str.9</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span> <span class="hljs-number">0</span>)<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_FILE</span>* <span class="hljs-variable">%64</span>)
+  <span class="hljs-keyword">store</span> <span class="hljs-type">i32</span> <span class="hljs-number">-1</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span>* <span class="hljs-variable">%1</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">4</span>
+  <span class="hljs-keyword">br</span> label <span class="hljs-variable">%66</span>
+
+<span class="hljs-comment">; &lt;label&gt;:66                                      ; preds = %63, %46, %7</span>
+  <span class="hljs-variable">%67</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">load</span> <span class="hljs-type">i32</span><span class="hljs-punctuation">,</span> <span class="hljs-type">i32</span>* <span class="hljs-variable">%1</span><span class="hljs-punctuation">,</span> <span class="hljs-keyword">align</span> <span class="hljs-number">4</span>
+  <span class="hljs-keyword">ret</span> <span class="hljs-type">i32</span> <span class="hljs-variable">%67</span>
+}
+
+<span class="hljs-keyword">declare</span> <span class="hljs-type">i32</span> <span class="hljs-title">@printf</span>(<span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> ...) <span class="hljs-variable">#1</span>
+
+<span class="hljs-keyword">declare</span> <span class="hljs-type">i32</span> <span class="hljs-title">@fputs</span>(<span class="hljs-type">i8</span>*<span class="hljs-punctuation">,</span> <span class="hljs-variable">%struct._IO_FILE</span>*) <span class="hljs-variable">#1</span>
+
+<span class="hljs-keyword">attributes</span> <span class="hljs-variable">#0</span> <span class="hljs-operator">=</span> { <span class="hljs-keyword">nounwind</span> <span class="hljs-keyword">uwtable</span> <span class="hljs-string">&quot;disable-tail-calls&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> <span class="hljs-string">&quot;less-precise-fpmad&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> <span class="hljs-string">&quot;no-frame-pointer-elim&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;true&quot;</span> <span class="hljs-string">&quot;no-frame-pointer-elim-non-leaf&quot;</span> <span class="hljs-string">&quot;no-infs-fp-math&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> <span class="hljs-string">&quot;no-nans-fp-math&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> <span class="hljs-string">&quot;stack-protector-buffer-size&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;8&quot;</span> <span class="hljs-string">&quot;target-cpu&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;x86-64&quot;</span> <span class="hljs-string">&quot;target-features&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;+fxsr,+mmx,+sse,+sse2&quot;</span> <span class="hljs-string">&quot;unsafe-fp-math&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> <span class="hljs-string">&quot;use-soft-float&quot;</span><span class="hljs-operator">=</span><span class="hljs-string">&quot;false&quot;</span> }
+
+<span class="hljs-title">!llvm.ident</span> <span class="hljs-operator">=</span> !{<span class="hljs-title">!0</span>}
+
+<span class="hljs-title">!0</span> <span class="hljs-operator">=</span> !{!<span class="hljs-string">&quot;clang version 3.8.0 (tags/RELEASE_380/final)&quot;</span>}
diff --git a/test/markup/llvm/default.txt b/test/markup/llvm/default.txt
new file mode 100644
index 0000000000..ac4cd237c1
--- /dev/null
+++ b/test/markup/llvm/default.txt
@@ -0,0 +1,61 @@
+; ModuleID = 'test.c'
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+%struct._IO_FILE = type { i32, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, %struct._IO_marker*, %struct._IO_FILE*, i32, i32, i64, i16, i8, [1 x i8], i8*, i64, i8*, i8*, i8*, i8*, i64, i32, [20 x i8] }
+%struct._IO_marker = type { %struct._IO_marker*, %struct._IO_FILE*, i32 }
+%struct.what = type { i8, i16 }
+
+@.str = private unnamed_addr constant [6 x i8] c"foo()\00", align 1
+@e_long = common global i64 0, align 8
+@g_double = common global double 0.000000e+00, align 8
+@.str.1 = private unnamed_addr constant [7 x i8] c"oooooh\00", align 1
+@func_ptr = common global i32 (...)* null, align 8
+@stderr = external global %struct._IO_FILE*, align 8
+
+; Function Attrs: nounwind uwtable
+define i32 @foo() #0 {
+  %1 = call i32 @puts(i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0))
+  ret i32 0
+}
+
+declare i32 @puts(i8*) #1
+
+; Function Attrs: nounwind uwtable
+define i32 @main(i32 %argc, i8** %argv) #0 {
+  %1 = alloca i32, align 4
+  %2 = alloca i32, align 4
+  %3 = alloca i8**, align 8
+
+; <label>:7                                       ; preds = %0
+  %8 = getelementptr inbounds %struct.what, %struct.what* %X, i32 0, i32 0
+  store i8 1, i8* %8, align 2
+  store i8 49, i8* %b_char, align 1
+  %9 = getelementptr inbounds %struct.what, %struct.what* %X, i32 0, i32 1
+  store double 1.000000e+01, double* @g_double, align 8
+  store i8* getelementptr inbounds ([7 x i8], [7 x i8]* @.str.1, i32 0, i32 0), i8** %cp_char_ptr, align 8
+  store i32 (...)* bitcast (i32 ()* @foo to i32 (...)*), i32 (...)** @func_ptr, align 8
+  %10 = call i32 @puts(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str.2, i32 0, i32 0))
+  store i32 10, i32* %1, align 4
+  br label %66
+
+; <label>:63                                      ; preds = %11
+  %64 = load %struct._IO_FILE*, %struct._IO_FILE** @stderr, align 8
+  %65 = call i32 @fputs(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str.9, i32 0, i32 0), %struct._IO_FILE* %64)
+  store i32 -1, i32* %1, align 4
+  br label %66
+
+; <label>:66                                      ; preds = %63, %46, %7
+  %67 = load i32, i32* %1, align 4
+  ret i32 %67
+}
+
+declare i32 @printf(i8*, ...) #1
+
+declare i32 @fputs(i8*, %struct._IO_FILE*) #1
+
+attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.ident = !{!0}
+
+!0 = !{!"clang version 3.8.0 (tags/RELEASE_380/final)"}
diff --git a/test/markup/lsl/default.expect.txt b/test/markup/lsl/default.expect.txt
new file mode 100644
index 0000000000..cccf9a134c
--- /dev/null
+++ b/test/markup/lsl/default.expect.txt
@@ -0,0 +1,12 @@
+<span class="hljs-section">default</span>
+{
+    <span class="hljs-section">state_entry</span>()
+    {
+        <span class="hljs-built_in">llSay</span>(<span class="hljs-literal">PUBLIC_CHANNEL</span>, <span class="hljs-string">&quot;Hello, Avatar!&quot;</span>);
+    }
+
+    <span class="hljs-section">touch_start</span>(<span class="hljs-type">integer</span> num_detected)
+    {
+        <span class="hljs-built_in">llSay</span>(<span class="hljs-literal">PUBLIC_CHANNEL</span>, <span class="hljs-string">&quot;Touched.&quot;</span>);
+    }
+}
diff --git a/test/markup/lsl/default.txt b/test/markup/lsl/default.txt
new file mode 100644
index 0000000000..f9784707c4
--- /dev/null
+++ b/test/markup/lsl/default.txt
@@ -0,0 +1,12 @@
+default
+{
+    state_entry()
+    {
+        llSay(PUBLIC_CHANNEL, "Hello, Avatar!");
+    }
+
+    touch_start(integer num_detected)
+    {
+        llSay(PUBLIC_CHANNEL, "Touched.");
+    }
+}
diff --git a/test/markup/lua/default.expect.txt b/test/markup/lua/default.expect.txt
new file mode 100644
index 0000000000..45f2764814
--- /dev/null
+++ b/test/markup/lua/default.expect.txt
@@ -0,0 +1,32 @@
+<span class="hljs-comment">--[[
+Simple signal/slot implementation
+]]</span>
+<span class="hljs-keyword">local</span> signal_mt = {
+    <span class="hljs-built_in">__index</span> = {
+        register = <span class="hljs-built_in">table</span>.<span class="hljs-built_in">insert</span>
+    }
+}
+<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">signal_mt.__index:emit</span><span class="hljs-params">(... <span class="hljs-comment">--[[ Comment in params ]]</span>)</span></span>
+    <span class="hljs-keyword">for</span> _, slot <span class="hljs-keyword">in</span> <span class="hljs-built_in">ipairs</span>(<span class="hljs-built_in">self</span>) <span class="hljs-keyword">do</span>
+        slot(<span class="hljs-built_in">self</span>, ...)
+    <span class="hljs-keyword">end</span>
+<span class="hljs-keyword">end</span>
+<span class="hljs-keyword">local</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">create_signal</span><span class="hljs-params">()</span></span>
+    <span class="hljs-keyword">return</span> <span class="hljs-built_in">setmetatable</span>({}, signal_mt)
+<span class="hljs-keyword">end</span>
+
+<span class="hljs-comment">-- Signal test</span>
+<span class="hljs-keyword">local</span> signal = create_signal()
+signal:register(<span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(signal, ...)</span></span>
+    <span class="hljs-built_in">print</span>(...)
+<span class="hljs-keyword">end</span>)
+signal:emit(<span class="hljs-string">&#x27;Answer to Life, the Universe, and Everything:&#x27;</span>, <span class="hljs-number">42</span>)
+
+<span class="hljs-comment">--[==[ [=[ [[
+Nested ]]
+multi-line ]=]
+comment ]==]</span>
+<span class="hljs-string">[==[ Nested
+[=[ multi-line
+[[ string
+]] ]=] ]==]</span>
diff --git a/test/markup/lua/default.txt b/test/markup/lua/default.txt
new file mode 100644
index 0000000000..58174ee6bc
--- /dev/null
+++ b/test/markup/lua/default.txt
@@ -0,0 +1,32 @@
+--[[
+Simple signal/slot implementation
+]]
+local signal_mt = {
+    __index = {
+        register = table.insert
+    }
+}
+function signal_mt.__index:emit(... --[[ Comment in params ]])
+    for _, slot in ipairs(self) do
+        slot(self, ...)
+    end
+end
+local function create_signal()
+    return setmetatable({}, signal_mt)
+end
+
+-- Signal test
+local signal = create_signal()
+signal:register(function(signal, ...)
+    print(...)
+end)
+signal:emit('Answer to Life, the Universe, and Everything:', 42)
+
+--[==[ [=[ [[
+Nested ]]
+multi-line ]=]
+comment ]==]
+[==[ Nested
+[=[ multi-line
+[[ string
+]] ]=] ]==]
diff --git a/test/markup/makefile/default.expect.txt b/test/markup/makefile/default.expect.txt
new file mode 100644
index 0000000000..df0f17e2f6
--- /dev/null
+++ b/test/markup/makefile/default.expect.txt
@@ -0,0 +1,13 @@
+<span class="hljs-comment"># Makefile</span>
+
+BUILDDIR      = _build
+EXTRAS       ?= <span class="hljs-variable">$(BUILDDIR)</span>/extras
+
+<span class="hljs-meta"><span class="hljs-meta-keyword">.PHONY</span>: main clean</span>
+
+<span class="hljs-section">main:</span>
+	@echo <span class="hljs-string">&quot;Building main facility...&quot;</span>
+	build_main <span class="hljs-variable">$(BUILDDIR)</span>
+
+<span class="hljs-section">clean:</span>
+	rm -rf <span class="hljs-variable">$(BUILDDIR)</span>/*
diff --git a/test/markup/makefile/default.txt b/test/markup/makefile/default.txt
new file mode 100644
index 0000000000..cd1ec79d5e
--- /dev/null
+++ b/test/markup/makefile/default.txt
@@ -0,0 +1,13 @@
+# Makefile
+
+BUILDDIR      = _build
+EXTRAS       ?= $(BUILDDIR)/extras
+
+.PHONY: main clean
+
+main:
+	@echo "Building main facility..."
+	build_main $(BUILDDIR)
+
+clean:
+	rm -rf $(BUILDDIR)/*
diff --git a/test/markup/mathematica/default.expect.txt b/test/markup/mathematica/default.expect.txt
new file mode 100644
index 0000000000..e582cdb261
--- /dev/null
+++ b/test/markup/mathematica/default.expect.txt
@@ -0,0 +1,79 @@
+<span class="hljs-comment">(* Real-world example from StackExchange *)</span>
+<span class="hljs-variable">xkcdStyle</span> <span class="hljs-operator">=</span> <span class="hljs-punctuation">{</span><span class="hljs-built_in">FontFamily</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-string">&quot;Comic Sans MS&quot;</span><span class="hljs-operator">,</span> <span class="hljs-number">16</span><span class="hljs-punctuation">}</span><span class="hljs-operator">;</span>
+
+<span class="hljs-variable">xkcdLabel</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-type">str_String</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-type">x1_</span><span class="hljs-operator">,</span> <span class="hljs-type">y1_</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-type">xo_</span><span class="hljs-operator">,</span> <span class="hljs-type">yo_</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:=</span> <span class="hljs-built_in">Module</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-variable">x2</span><span class="hljs-operator">,</span> <span class="hljs-variable">y2</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span>
+  <span class="hljs-variable">x2</span> <span class="hljs-operator">=</span> <span class="hljs-variable">x1</span> <span class="hljs-operator">+</span> <span class="hljs-variable">xo</span><span class="hljs-operator">;</span> <span class="hljs-variable">y2</span> <span class="hljs-operator">=</span> <span class="hljs-variable">y1</span> <span class="hljs-operator">+</span> <span class="hljs-variable">yo</span><span class="hljs-operator">;</span>
+  <span class="hljs-punctuation">{</span>
+    <span class="hljs-built_in">Inset</span><span class="hljs-punctuation">[</span>
+      <span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-variable">str</span><span class="hljs-operator">,</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+      <span class="hljs-punctuation">{</span><span class="hljs-variable">x2</span><span class="hljs-operator">,</span> <span class="hljs-variable">y2</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span>
+      <span class="hljs-punctuation">{</span><span class="hljs-number">1.2</span><span class="hljs-operator">*</span><span class="hljs-built_in">Sign</span><span class="hljs-punctuation">[</span><span class="hljs-variable">x1</span> <span class="hljs-operator">-</span> <span class="hljs-variable">x2</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Sign</span><span class="hljs-punctuation">[</span><span class="hljs-variable">y1</span> <span class="hljs-operator">-</span> <span class="hljs-variable">y2</span><span class="hljs-punctuation">]</span> <span class="hljs-built_in">Boole</span><span class="hljs-punctuation">[</span><span class="hljs-variable">x1</span> <span class="hljs-operator">==</span> <span class="hljs-variable">x2</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">}</span>
+    <span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+    <span class="hljs-built_in">Thick</span><span class="hljs-operator">,</span>
+    <span class="hljs-built_in">BezierCurve</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-punctuation">{</span><span class="hljs-number">0.9</span><span class="hljs-operator">*</span><span class="hljs-variable">x1</span> <span class="hljs-operator">+</span> <span class="hljs-number">0.1</span><span class="hljs-operator">*</span><span class="hljs-variable">x2</span><span class="hljs-operator">,</span> <span class="hljs-number">0.9</span><span class="hljs-operator">*</span><span class="hljs-variable">y1</span> <span class="hljs-operator">+</span> <span class="hljs-number">0.1</span><span class="hljs-operator">*</span><span class="hljs-variable">y2</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-variable">x1</span><span class="hljs-operator">,</span> <span class="hljs-variable">y2</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-variable">x2</span><span class="hljs-operator">,</span> <span class="hljs-variable">y2</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span>
+  <span class="hljs-punctuation">}</span>
+<span class="hljs-punctuation">]</span><span class="hljs-operator">;</span>
+
+<span class="hljs-variable">xkcdRules</span> <span class="hljs-operator">=</span> <span class="hljs-punctuation">{</span>
+  <span class="hljs-built_in">EdgeForm</span><span class="hljs-punctuation">[</span><span class="hljs-variable">ef</span> <span class="hljs-operator">:</span> <span class="hljs-built_in">Except</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">None</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-built_in">EdgeForm</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Flatten</span><span class="hljs-operator">@</span><span class="hljs-punctuation">{</span><span class="hljs-variable">ef</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Thick</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Black</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+  <span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-type">x_</span><span class="hljs-operator">,</span> <span class="hljs-type">st_</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-variable">x</span><span class="hljs-operator">,</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+  <span class="hljs-built_in">Pane</span><span class="hljs-punctuation">[</span><span class="hljs-type">s_String</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-built_in">Pane</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-variable">s</span><span class="hljs-operator">,</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+  <span class="hljs-punctuation">{</span><span class="hljs-type">h_Hue</span><span class="hljs-operator">,</span> <span class="hljs-type">l_Line</span><span class="hljs-punctuation">}</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-punctuation">{</span><span class="hljs-built_in">Thickness</span><span class="hljs-punctuation">[</span><span class="hljs-number">0.02</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span> <span class="hljs-built_in">White</span><span class="hljs-operator">,</span> <span class="hljs-variable">l</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Thick</span><span class="hljs-operator">,</span> <span class="hljs-variable">h</span><span class="hljs-operator">,</span> <span class="hljs-variable">l</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span>
+  <span class="hljs-built_in">Grid</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-punctuation">{</span><span class="hljs-type">g_Graphics</span><span class="hljs-operator">,</span> <span class="hljs-type">s_String</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-built_in">Grid</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-punctuation">{</span><span class="hljs-variable">g</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-variable">s</span><span class="hljs-operator">,</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+  <span class="hljs-built_in">Rule</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">PlotLabel</span><span class="hljs-operator">,</span> <span class="hljs-type">lab_</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:&gt;</span> <span class="hljs-built_in">Rule</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">PlotLabel</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Style</span><span class="hljs-punctuation">[</span><span class="hljs-variable">lab</span><span class="hljs-operator">,</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span>
+<span class="hljs-punctuation">}</span><span class="hljs-operator">;</span>
+
+<span class="hljs-variable">xkcdShow</span><span class="hljs-punctuation">[</span><span class="hljs-type">plot_</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:=</span> <span class="hljs-built_in">Show</span><span class="hljs-punctuation">[</span><span class="hljs-variable">plot</span><span class="hljs-operator">,</span> <span class="hljs-built_in">AxesStyle</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-built_in">Thick</span><span class="hljs-operator">,</span> <span class="hljs-built_in">LabelStyle</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">/.</span> <span class="hljs-variable">xkcdRules</span><span class="hljs-operator">;</span>
+<span class="hljs-variable">xkcdShow</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Labeled</span><span class="hljs-punctuation">[</span><span class="hljs-type">plot_</span><span class="hljs-operator">,</span> <span class="hljs-type">rest__</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:=</span> <span class="hljs-built_in">Labeled</span><span class="hljs-punctuation">[</span>
+  <span class="hljs-built_in">Show</span><span class="hljs-punctuation">[</span><span class="hljs-variable">plot</span><span class="hljs-operator">,</span> <span class="hljs-built_in">AxesStyle</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-built_in">Thick</span><span class="hljs-operator">,</span> <span class="hljs-built_in">LabelStyle</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-variable">xkcdStyle</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span> <span class="hljs-variable">rest</span> <span class="hljs-punctuation">]</span> <span class="hljs-operator">/.</span> <span class="hljs-variable">xkcdRules</span><span class="hljs-operator">;</span>
+
+<span class="hljs-variable">xkcdDistort</span><span class="hljs-punctuation">[</span><span class="hljs-type">plot_</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:=</span> <span class="hljs-built_in">Module</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-variable">r</span><span class="hljs-operator">,</span> <span class="hljs-variable">ix</span><span class="hljs-operator">,</span> <span class="hljs-variable">iy</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span>
+  <span class="hljs-variable">r</span> <span class="hljs-operator">=</span> <span class="hljs-built_in">ImagePad</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Rasterize</span><span class="hljs-operator">@</span><span class="hljs-variable">plot</span><span class="hljs-operator">,</span> <span class="hljs-number">10</span><span class="hljs-operator">,</span> <span class="hljs-built_in">Padding</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-built_in">White</span><span class="hljs-punctuation">]</span><span class="hljs-operator">;</span>
+  <span class="hljs-punctuation">{</span><span class="hljs-variable">ix</span><span class="hljs-operator">,</span> <span class="hljs-variable">iy</span><span class="hljs-punctuation">}</span> <span class="hljs-operator">=</span> <span class="hljs-built_in">Table</span><span class="hljs-punctuation">[</span>
+    <span class="hljs-built_in">RandomImage</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-operator">-</span><span class="hljs-number">1</span><span class="hljs-operator">,</span> <span class="hljs-number">1</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span> <span class="hljs-built_in">ImageDimensions</span><span class="hljs-operator">@</span><span class="hljs-variable">r</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">~</span> <span class="hljs-built_in">ImageConvolve</span> <span class="hljs-operator">~</span> <span class="hljs-built_in">GaussianMatrix</span><span class="hljs-punctuation">[</span><span class="hljs-number">10</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+    <span class="hljs-punctuation">{</span><span class="hljs-number">2</span><span class="hljs-punctuation">}</span>
+  <span class="hljs-punctuation">]</span><span class="hljs-operator">;</span>
+  <span class="hljs-built_in">ImagePad</span><span class="hljs-punctuation">[</span>
+    <span class="hljs-built_in">ImageTransformation</span><span class="hljs-punctuation">[</span><span class="hljs-variable">r</span><span class="hljs-operator">,</span> <span class="hljs-type">#</span> <span class="hljs-operator">+</span> <span class="hljs-number">15</span> <span class="hljs-punctuation">{</span><span class="hljs-built_in">ImageValue</span><span class="hljs-punctuation">[</span><span class="hljs-variable">ix</span><span class="hljs-operator">,</span> <span class="hljs-type">#</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span> <span class="hljs-built_in">ImageValue</span><span class="hljs-punctuation">[</span><span class="hljs-variable">iy</span><span class="hljs-operator">,</span> <span class="hljs-type">#</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">}</span> <span class="hljs-operator">&amp;,</span> <span class="hljs-built_in">DataRange</span> <span class="hljs-operator">-&gt;</span> <span class="hljs-built_in">Full</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span>
+    <span class="hljs-operator">-</span><span class="hljs-number">5</span>
+  <span class="hljs-punctuation">]</span>
+<span class="hljs-punctuation">]</span><span class="hljs-operator">;</span>
+<span class="hljs-variable">xkcdConvert</span><span class="hljs-punctuation">[</span><span class="hljs-type">plot_</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">:=</span> <span class="hljs-variable">xkcdDistort</span><span class="hljs-punctuation">[</span><span class="hljs-variable">xkcdShow</span><span class="hljs-punctuation">[</span><span class="hljs-variable">plot</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span><span class="hljs-operator">;</span>
+<span class="hljs-variable">xkcdConvert</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Plot</span><span class="hljs-punctuation">[</span><span class="hljs-built_in">Sin</span><span class="hljs-punctuation">[</span><span class="hljs-variable">x</span><span class="hljs-punctuation">]</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-variable">x</span><span class="hljs-operator">,</span> <span class="hljs-number">0</span><span class="hljs-operator">,</span> <span class="hljs-number">4</span> <span class="hljs-built_in">Pi</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span>
+
+<span class="hljs-comment">(* Features *)</span>
+
+<span class="hljs-comment">(* The Wolfram Language supports a variety of different number input forms *)</span>
+<span class="hljs-comment">(* All numbers below are correct numbers! *)</span>
+
+<span class="hljs-variable">numbers</span> <span class="hljs-operator">=</span> <span class="hljs-punctuation">{</span>
+    <span class="hljs-number">123</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">123.123</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">2^^101.101</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">35^^WolframLanguage</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">16^^dead.Beef</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">123`</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">1.381`</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">16^^9fe.c3`7</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">3.0`+7</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">3`7</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">3.000000000000000000000`7</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">3.000000000000000000`-7</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">3.98`5*^3</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">16^^dead.beef``+4*^-3</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">0.0000000001*^10</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">35^^small*^-10</span><span class="hljs-operator">,</span>
+    <span class="hljs-number">10000000000*^-10</span>
+<span class="hljs-punctuation">}</span>
+
+<span class="hljs-comment">(* Named Characters are matched as normal symbols *)</span>
+<span class="hljs-punctuation">{</span> <span class="hljs-variable">\[Gamma]</span><span class="hljs-operator">,</span>  <span class="hljs-variable">\[CapitalEAcute]</span><span class="hljs-operator">,</span> <span class="hljs-variable">\[DoubleLeftRightArrow]</span><span class="hljs-operator">,</span> <span class="hljs-variable">\[FormalEpsilon]</span><span class="hljs-operator">,</span> <span class="hljs-variable">my</span><span class="hljs-variable">\[CapitalEAcute]</span><span class="hljs-variable">Variable</span> <span class="hljs-punctuation">}</span>
+
+<span class="hljs-comment">(* Patterns and Slots *)</span>
+<span class="hljs-variable">xkcdLabel</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">{</span><span class="hljs-type">str_String</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-type">x1_Integer</span><span class="hljs-operator">,</span> <span class="hljs-type">y1_Real</span><span class="hljs-punctuation">}</span><span class="hljs-operator">,</span> <span class="hljs-punctuation">{</span><span class="hljs-type">_Real</span><span class="hljs-operator">,</span> <span class="hljs-type">_List</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">}</span><span class="hljs-punctuation">]</span>
+<span class="hljs-built_in">If</span><span class="hljs-punctuation">[</span><span class="hljs-type">#</span> <span class="hljs-operator">&gt;</span> <span class="hljs-number">5</span><span class="hljs-operator">,</span> <span class="hljs-type">#</span><span class="hljs-operator">,</span> <span class="hljs-type">##</span> <span class="hljs-operator">&amp;</span><span class="hljs-punctuation">[</span><span class="hljs-punctuation">]</span><span class="hljs-punctuation">]</span> <span class="hljs-operator">&amp;</span> <span class="hljs-operator">/@</span> <span class="hljs-built_in">Range</span><span class="hljs-punctuation">[</span><span class="hljs-number">10</span><span class="hljs-punctuation">]</span>
+
+<span class="hljs-comment">(* Usage and other messages, In/Out *)</span>
+<span class="hljs-built_in">In</span><span class="hljs-punctuation">[</span><span class="hljs-number">1</span><span class="hljs-punctuation">]</span><span class="hljs-operator">:=</span> <span class="hljs-variable">func</span><span class="hljs-string">::usage</span> <span class="hljs-operator">=</span> <span class="hljs-string">&quot;A Usage message&quot;</span>
+<span class="hljs-built_in">Out</span><span class="hljs-punctuation">[</span><span class="hljs-number">1</span><span class="hljs-punctuation">]</span><span class="hljs-operator">=</span> <span class="hljs-string">&quot;A Usage message&quot;</span>
+
diff --git a/test/markup/mathematica/default.txt b/test/markup/mathematica/default.txt
new file mode 100644
index 0000000000..04243a4ab2
--- /dev/null
+++ b/test/markup/mathematica/default.txt
@@ -0,0 +1,79 @@
+(* Real-world example from StackExchange *)
+xkcdStyle = {FontFamily -> "Comic Sans MS", 16};
+
+xkcdLabel[{str_String, {x1_, y1_}, {xo_, yo_}}] := Module[{x2, y2},
+  x2 = x1 + xo; y2 = y1 + yo;
+  {
+    Inset[
+      Style[str, xkcdStyle],
+      {x2, y2},
+      {1.2*Sign[x1 - x2], Sign[y1 - y2] Boole[x1 == x2]}
+    ],
+    Thick,
+    BezierCurve[{{0.9*x1 + 0.1*x2, 0.9*y1 + 0.1*y2}, {x1, y2}, {x2, y2}}]
+  }
+];
+
+xkcdRules = {
+  EdgeForm[ef : Except[None]] :> EdgeForm[Flatten@{ef, Thick, Black}],
+  Style[x_, st_] :> Style[x, xkcdStyle],
+  Pane[s_String] :> Pane[Style[s, xkcdStyle]],
+  {h_Hue, l_Line} :> {Thickness[0.02], White, l, Thick, h, l},
+  Grid[{{g_Graphics, s_String}}] :> Grid[{{g, Style[s, xkcdStyle]}}],
+  Rule[PlotLabel, lab_] :> Rule[PlotLabel, Style[lab, xkcdStyle]]
+};
+
+xkcdShow[plot_] := Show[plot, AxesStyle -> Thick, LabelStyle -> xkcdStyle] /. xkcdRules;
+xkcdShow[Labeled[plot_, rest__]] := Labeled[
+  Show[plot, AxesStyle -> Thick, LabelStyle -> xkcdStyle], rest ] /. xkcdRules;
+
+xkcdDistort[plot_] := Module[{r, ix, iy},
+  r = ImagePad[Rasterize@plot, 10, Padding -> White];
+  {ix, iy} = Table[
+    RandomImage[{-1, 1}, ImageDimensions@r] ~ ImageConvolve ~ GaussianMatrix[10],
+    {2}
+  ];
+  ImagePad[
+    ImageTransformation[r, # + 15 {ImageValue[ix, #], ImageValue[iy, #]} &, DataRange -> Full],
+    -5
+  ]
+];
+xkcdConvert[plot_] := xkcdDistort[xkcdShow[plot]];
+xkcdConvert[Plot[Sin[x], {x, 0, 4 Pi}]]
+
+(* Features *)
+
+(* The Wolfram Language supports a variety of different number input forms *)
+(* All numbers below are correct numbers! *)
+
+numbers = {
+    123,
+    123.123,
+    2^^101.101,
+    35^^WolframLanguage,
+    16^^dead.Beef,
+    123`,
+    1.381`,
+    16^^9fe.c3`7,
+    3.0`+7,
+    3`7,
+    3.000000000000000000000`7,
+    3.000000000000000000`-7,
+    3.98`5*^3,
+    16^^dead.beef``+4*^-3,
+    0.0000000001*^10,
+    35^^small*^-10,
+    10000000000*^-10
+}
+
+(* Named Characters are matched as normal symbols *)
+{ \[Gamma],  \[CapitalEAcute], \[DoubleLeftRightArrow], \[FormalEpsilon], my\[CapitalEAcute]Variable }
+
+(* Patterns and Slots *)
+xkcdLabel[{str_String, {x1_Integer, y1_Real}, {_Real, _List}}]
+If[# > 5, #, ## &[]] & /@ Range[10]
+
+(* Usage and other messages, In/Out *)
+In[1]:= func::usage = "A Usage message"
+Out[1]= "A Usage message"
+
diff --git a/test/markup/mel/default.expect.txt b/test/markup/mel/default.expect.txt
new file mode 100644
index 0000000000..b3d7c35817
--- /dev/null
+++ b/test/markup/mel/default.expect.txt
@@ -0,0 +1,25 @@
+<span class="hljs-keyword">proc</span> <span class="hljs-keyword">string</span>[] getSelectedLights()
+
+{
+  <span class="hljs-keyword">string</span> $selectedLights[];
+
+  <span class="hljs-keyword">string</span> $select[] = <span class="hljs-string">`ls -sl -dag -leaf`</span>;
+
+  <span class="hljs-keyword">for</span> ( $shape <span class="hljs-keyword">in</span> $select )
+  {
+    <span class="hljs-comment">// Determine if this is a light.</span>
+    <span class="hljs-comment">//</span>
+    <span class="hljs-keyword">string</span> $class[] = <span class="hljs-keyword">getClassification</span>( <span class="hljs-string">`nodeType $shape`</span> );
+
+
+    <span class="hljs-keyword">if</span> ( ( <span class="hljs-string">`size $class`</span> ) &gt; <span class="hljs-number">0</span> &amp;&amp; ( <span class="hljs-string">&quot;light&quot;</span> == $class[<span class="hljs-number">0</span>] ) )
+    {
+      $selectedLights[ <span class="hljs-string">`size $selectedLights`</span> ] = $shape;
+    }
+  }
+
+  <span class="hljs-comment">// Result is an array of all lights included in</span>
+
+  <span class="hljs-comment">// current selection list.</span>
+  <span class="hljs-keyword">return</span> $selectedLights;
+}
diff --git a/test/markup/mel/default.txt b/test/markup/mel/default.txt
new file mode 100644
index 0000000000..d8abe7e9e2
--- /dev/null
+++ b/test/markup/mel/default.txt
@@ -0,0 +1,25 @@
+proc string[] getSelectedLights()
+
+{
+  string $selectedLights[];
+
+  string $select[] = `ls -sl -dag -leaf`;
+
+  for ( $shape in $select )
+  {
+    // Determine if this is a light.
+    //
+    string $class[] = getClassification( `nodeType $shape` );
+
+
+    if ( ( `size $class` ) > 0 && ( "light" == $class[0] ) )
+    {
+      $selectedLights[ `size $selectedLights` ] = $shape;
+    }
+  }
+
+  // Result is an array of all lights included in
+
+  // current selection list.
+  return $selectedLights;
+}
diff --git a/test/markup/mercury/default.expect.txt b/test/markup/mercury/default.expect.txt
new file mode 100644
index 0000000000..38e947d5cc
--- /dev/null
+++ b/test/markup/mercury/default.expect.txt
@@ -0,0 +1,24 @@
+<span class="hljs-comment">% &quot;Hello World&quot; in Mercury.</span>
+:- <span class="hljs-keyword">module</span> hello.
+
+
+:- <span class="hljs-keyword">interface</span>.
+:- <span class="hljs-keyword">import_module</span> io.
+
+:- <span class="hljs-keyword">pred</span> main(io::di, io::uo) <span class="hljs-keyword">is</span> <span class="hljs-keyword">det</span>.
+
+
+:- <span class="hljs-keyword">implementation</span>.
+
+main(!IO) :-
+    io.write_string(<span class="hljs-string">&quot;Hello, world\n&quot;</span>, !IO).
+
+:- <span class="hljs-keyword">pred</span> filter(<span class="hljs-keyword">pred</span>(T), list(T), list(T), list(T) ).
+:- <span class="hljs-keyword">mode</span> filter(in(<span class="hljs-keyword">pred</span>(in) <span class="hljs-keyword">is</span> <span class="hljs-keyword">semidet</span>), in, out, out ) <span class="hljs-keyword">is</span> <span class="hljs-keyword">det</span>.
+
+filter(_, [], [], []).
+filter(P, [X | Xs], Ys, Zs) :-
+    filter(P, Xs, Ys0, Zs0),
+    ( <span class="hljs-built_in">if</span> P(X)   <span class="hljs-built_in">then</span>    Ys <span class="hljs-built_in">=</span> [X | Ys0],   Zs <span class="hljs-built_in">=</span> Zs0
+                <span class="hljs-built_in">else</span>    Ys <span class="hljs-built_in">=</span> Ys0      ,   Zs <span class="hljs-built_in">=</span> [X | Zs0]
+    ).
diff --git a/test/markup/mercury/default.txt b/test/markup/mercury/default.txt
new file mode 100644
index 0000000000..10aa1732bd
--- /dev/null
+++ b/test/markup/mercury/default.txt
@@ -0,0 +1,24 @@
+% "Hello World" in Mercury.
+:- module hello.
+
+
+:- interface.
+:- import_module io.
+
+:- pred main(io::di, io::uo) is det.
+
+
+:- implementation.
+
+main(!IO) :-
+    io.write_string("Hello, world\n", !IO).
+
+:- pred filter(pred(T), list(T), list(T), list(T) ).
+:- mode filter(in(pred(in) is semidet), in, out, out ) is det.
+
+filter(_, [], [], []).
+filter(P, [X | Xs], Ys, Zs) :-
+    filter(P, Xs, Ys0, Zs0),
+    ( if P(X)   then    Ys = [X | Ys0],   Zs = Zs0
+                else    Ys = Ys0      ,   Zs = [X | Zs0]
+    ).
diff --git a/test/markup/mipsasm/default.expect.txt b/test/markup/mipsasm/default.expect.txt
new file mode 100644
index 0000000000..ddc27ddf75
--- /dev/null
+++ b/test/markup/mipsasm/default.expect.txt
@@ -0,0 +1,22 @@
+<span class="hljs-meta">.text</span>
+<span class="hljs-meta">.global</span> AckermannFunc
+
+<span class="hljs-comment"># Preconditions:</span>
+<span class="hljs-comment">#   1st parameter ($a0) m</span>
+<span class="hljs-comment">#   2nd parameter ($a1) n</span>
+<span class="hljs-comment"># Postconditions:</span>
+<span class="hljs-comment">#   result in ($v0) = value of A(m,n)</span>
+<span class="hljs-symbol">
+AckermannFunc:</span>
+            <span class="hljs-keyword">addi </span>   $<span class="hljs-built_in">sp</span>,   $<span class="hljs-built_in">sp</span>, -<span class="hljs-number">8</span>
+            <span class="hljs-keyword">sw </span>     $<span class="hljs-built_in">s0</span>, <span class="hljs-number">4</span>($<span class="hljs-built_in">sp</span>)
+            <span class="hljs-keyword">sw </span>     $<span class="hljs-built_in">ra</span>, <span class="hljs-number">0</span>($<span class="hljs-built_in">sp</span>)
+
+            <span class="hljs-comment"># move the parameter registers to temporary  - no, only when nec.</span>
+<span class="hljs-symbol">
+LABEL_IF:</span>   <span class="hljs-keyword">bne </span>    $<span class="hljs-built_in">a0</span>, $<span class="hljs-built_in">zero</span>, LABEL_ELSE_IF
+
+            <span class="hljs-keyword">addi </span>   $<span class="hljs-built_in">v0</span>, $<span class="hljs-built_in">a1</span>, <span class="hljs-number">1</span>
+
+            <span class="hljs-comment"># jump to LABEL_DONE</span>
+            <span class="hljs-keyword">j </span>LABEL_DONE
diff --git a/test/markup/mipsasm/default.txt b/test/markup/mipsasm/default.txt
new file mode 100644
index 0000000000..d30bd8565c
--- /dev/null
+++ b/test/markup/mipsasm/default.txt
@@ -0,0 +1,22 @@
+.text
+.global AckermannFunc
+
+# Preconditions:
+#   1st parameter ($a0) m
+#   2nd parameter ($a1) n
+# Postconditions:
+#   result in ($v0) = value of A(m,n)
+
+AckermannFunc:
+            addi    $sp,   $sp, -8
+            sw      $s0, 4($sp)
+            sw      $ra, 0($sp)
+
+            # move the parameter registers to temporary  - no, only when nec.
+
+LABEL_IF:   bne     $a0, $zero, LABEL_ELSE_IF
+
+            addi    $v0, $a1, 1
+
+            # jump to LABEL_DONE
+            j LABEL_DONE
diff --git a/test/markup/mizar/default.expect.txt b/test/markup/mizar/default.expect.txt
new file mode 100644
index 0000000000..3a66384bef
--- /dev/null
+++ b/test/markup/mizar/default.expect.txt
@@ -0,0 +1,86 @@
+<span class="hljs-comment">::: ## Lambda calculus</span>
+
+<span class="hljs-keyword">environ</span>
+
+  <span class="hljs-keyword">vocabularies</span> LAMBDA,
+      NUMBERS,
+      NAT_1, XBOOLE_0, SUBSET_1, FINSEQ_1, XXREAL_0, CARD_1,
+      ARYTM_1, ARYTM_3, TARSKI, RELAT_1, ORDINAL4, FUNCOP_1;
+
+  <span class="hljs-comment">:: etc...</span>
+
+<span class="hljs-keyword">begin</span>
+
+<span class="hljs-keyword">reserve</span> D <span class="hljs-keyword">for</span> DecoratedTree,
+        p,q,r <span class="hljs-keyword">for</span> FinSequence <span class="hljs-keyword">of</span> NAT,
+        x <span class="hljs-keyword">for</span> <span class="hljs-keyword">set</span>;
+
+<span class="hljs-keyword">definition</span>
+  <span class="hljs-keyword">let</span> D;
+
+  <span class="hljs-keyword">attr</span> D <span class="hljs-keyword">is</span> LambdaTerm-like <span class="hljs-keyword">means</span>
+    (dom D qua Tree) <span class="hljs-keyword">is</span> finite &amp;
+<span class="hljs-comment">::&gt;                          *143,306</span>
+    <span class="hljs-keyword">for</span> r <span class="hljs-keyword">st</span> r <span class="hljs-keyword">in</span> dom D <span class="hljs-keyword">holds</span>
+      r <span class="hljs-keyword">is</span> FinSequence <span class="hljs-keyword">of</span> {0,1} &amp;
+      r^&lt;*0*&gt; <span class="hljs-keyword">in</span> dom D <span class="hljs-keyword">implies</span> D.r = 0;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-keyword">registration</span>
+  <span class="hljs-keyword">cluster</span> LambdaTerm-like <span class="hljs-keyword">for</span> DecoratedTree <span class="hljs-keyword">of</span> NAT;
+  <span class="hljs-keyword">existence</span>;
+<span class="hljs-comment">::&gt;       *4</span>
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-keyword">definition</span>
+  <span class="hljs-keyword">mode</span> LambdaTerm <span class="hljs-keyword">is</span> LambdaTerm-like DecoratedTree <span class="hljs-keyword">of</span> NAT;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-comment">::: Then we extend this ordinary one-step beta reduction, that is,</span>
+<span class="hljs-comment">:::  any subterm is also allowed to reduce.</span>
+<span class="hljs-keyword">definition</span>
+  <span class="hljs-keyword">let</span> M,N;
+
+  <span class="hljs-keyword">pred</span> M beta N <span class="hljs-keyword">means</span>
+    <span class="hljs-keyword">ex</span> p <span class="hljs-keyword">st</span>
+      M|p beta_shallow N|p &amp;
+      <span class="hljs-keyword">for</span> q <span class="hljs-keyword">st</span> <span class="hljs-keyword">not</span> p is_a_prefix_of q <span class="hljs-keyword">holds</span>
+        [r,x] <span class="hljs-keyword">in</span> M <span class="hljs-keyword">iff</span> [r,x] <span class="hljs-keyword">in</span> N;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-keyword">theorem</span> Th4:
+  ProperPrefixes (v^&lt;*x*&gt;) = ProperPrefixes v \/ {v}
+<span class="hljs-keyword">proof</span>
+  <span class="hljs-keyword">thus</span> ProperPrefixes (v^&lt;*x*&gt;) c= ProperPrefixes v \/ {v}
+  <span class="hljs-keyword">proof</span>
+    <span class="hljs-keyword">let</span> y;
+    <span class="hljs-keyword">assume</span> y <span class="hljs-keyword">in</span> ProperPrefixes (v^&lt;*x*&gt;);
+    <span class="hljs-keyword">then</span> <span class="hljs-keyword">consider</span> v1 <span class="hljs-keyword">such</span> <span class="hljs-keyword">that</span>
+A1: y = v1 <span class="hljs-keyword">and</span>
+A2: v1 is_a_proper_prefix_of v^&lt;*x*&gt; <span class="hljs-keyword">by</span> TREES_1:def 2;
+ v1 is_a_prefix_of v &amp; v1 &lt;&gt; v <span class="hljs-keyword">or</span> v1 = v <span class="hljs-keyword">by</span> A2,TREES_1:9;
+<span class="hljs-keyword">then</span>
+ v1 is_a_proper_prefix_of v <span class="hljs-keyword">or</span> v1 <span class="hljs-keyword">in</span> {v} <span class="hljs-keyword">by</span> TARSKI:def 1,XBOOLE_0:def 8;
+<span class="hljs-keyword">then</span>  y <span class="hljs-keyword">in</span> ProperPrefixes v <span class="hljs-keyword">or</span> y <span class="hljs-keyword">in</span> {v} <span class="hljs-keyword">by</span> A1,TREES_1:def 2;
+    <span class="hljs-keyword">hence</span> <span class="hljs-keyword">thesis</span> <span class="hljs-keyword">by</span> XBOOLE_0:def 3;
+  <span class="hljs-keyword">end</span>;
+  <span class="hljs-keyword">let</span> y;
+  <span class="hljs-keyword">assume</span> y <span class="hljs-keyword">in</span> ProperPrefixes v \/ {v};
+<span class="hljs-keyword">then</span> A3: y <span class="hljs-keyword">in</span> ProperPrefixes v <span class="hljs-keyword">or</span> y <span class="hljs-keyword">in</span> {v} <span class="hljs-keyword">by</span> XBOOLE_0:def 3;
+A4: <span class="hljs-keyword">now</span>
+    <span class="hljs-keyword">assume</span> y <span class="hljs-keyword">in</span> ProperPrefixes v;
+    <span class="hljs-keyword">then</span> <span class="hljs-keyword">consider</span> v1 <span class="hljs-keyword">such</span> <span class="hljs-keyword">that</span>
+A5: y = v1 <span class="hljs-keyword">and</span>
+A6: v1 is_a_proper_prefix_of v <span class="hljs-keyword">by</span> TREES_1:def 2;
+ v is_a_prefix_of v^&lt;*x*&gt; <span class="hljs-keyword">by</span> TREES_1:1;
+<span class="hljs-keyword">then</span>  v1 is_a_proper_prefix_of v^&lt;*x*&gt; <span class="hljs-keyword">by</span> A6,XBOOLE_1:58;
+    <span class="hljs-keyword">hence</span> <span class="hljs-keyword">thesis</span> <span class="hljs-keyword">by</span> A5,TREES_1:def 2;
+  <span class="hljs-keyword">end</span>;
+ v^{} = v <span class="hljs-keyword">by</span> FINSEQ_1:34;
+  <span class="hljs-keyword">then</span>
+ v is_a_prefix_of v^&lt;*x*&gt; &amp; v &lt;&gt; v^&lt;*x*&gt; <span class="hljs-keyword">by</span> FINSEQ_1:33,TREES_1:1;
+<span class="hljs-keyword">then</span>  v is_a_proper_prefix_of v^&lt;*x*&gt; <span class="hljs-keyword">by</span> XBOOLE_0:def 8;
+<span class="hljs-keyword">then</span>  y <span class="hljs-keyword">in</span> ProperPrefixes v <span class="hljs-keyword">or</span> y = v &amp; v <span class="hljs-keyword">in</span> ProperPrefixes (v^&lt;*x*&gt;)
+  <span class="hljs-keyword">by</span> A3,TARSKI:def 1,TREES_1:def 2;
+  <span class="hljs-keyword">hence</span> <span class="hljs-keyword">thesis</span> <span class="hljs-keyword">by</span> A4;
+<span class="hljs-keyword">end</span>;
\ No newline at end of file
diff --git a/test/markup/mizar/default.txt b/test/markup/mizar/default.txt
new file mode 100644
index 0000000000..87b2d993c8
--- /dev/null
+++ b/test/markup/mizar/default.txt
@@ -0,0 +1,86 @@
+::: ## Lambda calculus
+
+environ
+
+  vocabularies LAMBDA,
+      NUMBERS,
+      NAT_1, XBOOLE_0, SUBSET_1, FINSEQ_1, XXREAL_0, CARD_1,
+      ARYTM_1, ARYTM_3, TARSKI, RELAT_1, ORDINAL4, FUNCOP_1;
+
+  :: etc...
+
+begin
+
+reserve D for DecoratedTree,
+        p,q,r for FinSequence of NAT,
+        x for set;
+
+definition
+  let D;
+
+  attr D is LambdaTerm-like means
+    (dom D qua Tree) is finite &
+::>                          *143,306
+    for r st r in dom D holds
+      r is FinSequence of {0,1} &
+      r^<*0*> in dom D implies D.r = 0;
+end;
+
+registration
+  cluster LambdaTerm-like for DecoratedTree of NAT;
+  existence;
+::>       *4
+end;
+
+definition
+  mode LambdaTerm is LambdaTerm-like DecoratedTree of NAT;
+end;
+
+::: Then we extend this ordinary one-step beta reduction, that is,
+:::  any subterm is also allowed to reduce.
+definition
+  let M,N;
+
+  pred M beta N means
+    ex p st
+      M|p beta_shallow N|p &
+      for q st not p is_a_prefix_of q holds
+        [r,x] in M iff [r,x] in N;
+end;
+
+theorem Th4:
+  ProperPrefixes (v^<*x*>) = ProperPrefixes v \/ {v}
+proof
+  thus ProperPrefixes (v^<*x*>) c= ProperPrefixes v \/ {v}
+  proof
+    let y;
+    assume y in ProperPrefixes (v^<*x*>);
+    then consider v1 such that
+A1: y = v1 and
+A2: v1 is_a_proper_prefix_of v^<*x*> by TREES_1:def 2;
+ v1 is_a_prefix_of v & v1 <> v or v1 = v by A2,TREES_1:9;
+then
+ v1 is_a_proper_prefix_of v or v1 in {v} by TARSKI:def 1,XBOOLE_0:def 8;
+then  y in ProperPrefixes v or y in {v} by A1,TREES_1:def 2;
+    hence thesis by XBOOLE_0:def 3;
+  end;
+  let y;
+  assume y in ProperPrefixes v \/ {v};
+then A3: y in ProperPrefixes v or y in {v} by XBOOLE_0:def 3;
+A4: now
+    assume y in ProperPrefixes v;
+    then consider v1 such that
+A5: y = v1 and
+A6: v1 is_a_proper_prefix_of v by TREES_1:def 2;
+ v is_a_prefix_of v^<*x*> by TREES_1:1;
+then  v1 is_a_proper_prefix_of v^<*x*> by A6,XBOOLE_1:58;
+    hence thesis by A5,TREES_1:def 2;
+  end;
+ v^{} = v by FINSEQ_1:34;
+  then
+ v is_a_prefix_of v^<*x*> & v <> v^<*x*> by FINSEQ_1:33,TREES_1:1;
+then  v is_a_proper_prefix_of v^<*x*> by XBOOLE_0:def 8;
+then  y in ProperPrefixes v or y = v & v in ProperPrefixes (v^<*x*>)
+  by A3,TARSKI:def 1,TREES_1:def 2;
+  hence thesis by A4;
+end;
\ No newline at end of file
diff --git a/test/markup/mojolicious/default.expect.txt b/test/markup/mojolicious/default.expect.txt
new file mode 100644
index 0000000000..5ff4831ff1
--- /dev/null
+++ b/test/markup/mojolicious/default.expect.txt
@@ -0,0 +1,21 @@
+<span class="perl">%layout <span class="hljs-string">&#x27;bootstrap&#x27;</span>;</span><span class="xml">
+</span><span class="perl">% title <span class="hljs-string">&quot;Import your subs&quot;</span>;</span><span class="xml">
+</span><span class="perl">%= form_for <span class="hljs-string">&#x27;/settings/import&#x27;</span> =&gt; (<span class="hljs-string">method =&gt;</span> <span class="hljs-string">&#x27;post&#x27;</span>, <span class="hljs-string">enctype =&gt;</span> <span class="hljs-string">&#x27;multipart/form-data&#x27;</span>) =&gt; begin</span><span class="xml">
+</span><span class="perl">     %= file_field <span class="hljs-string">&#x27;opmlfile&#x27;</span> =&gt; <span class="hljs-string">multiple =&gt;</span> <span class="hljs-string">&#x27;true&#x27;</span></span><span class="xml">
+</span><span class="perl">     %= submit_button <span class="hljs-string">&#x27;Import&#x27;</span>, <span class="hljs-string">&#x27;class&#x27;</span> =&gt; <span class="hljs-string">&#x27;btn&#x27;</span></span><span class="xml">
+</span><span class="perl">% end</span><span class="xml">
+<span class="hljs-tag">&lt;<span class="hljs-name">div</span>&gt;</span>
+</span><span class="perl">% <span class="hljs-keyword">if</span> ($subs) {</span><span class="xml">
+<span class="hljs-tag">&lt;<span class="hljs-name">dl</span>&gt;</span>
+</span><span class="perl">% <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> $item (@$subs) {</span><span class="xml">
+</span><span class="perl">% <span class="hljs-keyword">my</span> ($dir, $align) = ($item-&gt;{rtl}) ? (<span class="hljs-string">&#x27;rtl&#x27;</span>, <span class="hljs-string">&#x27;right&#x27;</span>) : (<span class="hljs-string">&#x27;ltr&#x27;</span>, <span class="hljs-string">&#x27;left&#x27;</span>);</span><span class="xml">
+<span class="hljs-tag">&lt;<span class="hljs-name">dt</span> <span class="hljs-attr">align</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="perl"> $align </span><span class="xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="perl"> $item-&gt;{<span class="hljs-string">&#x27;xmlUrl&#x27;</span>} </span><span class="xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">i</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;icon-rss&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">i</span>&gt;</span> rss<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">dir</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="perl"> $dir </span><span class="xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="perl"> $item-&gt;{htmlUrl} </span><span class="xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span>&lt;%==</span><span class="perl"> $item-&gt;{title} </span><span class="xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">dt</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">dd</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">b</span>&gt;</span>Categories<span class="hljs-tag">&lt;/<span class="hljs-name">b</span>&gt;</span>
+</span><span class="perl">%= <span class="hljs-keyword">join</span> <span class="hljs-string">q{, }</span>, <span class="hljs-keyword">sort</span> @{ $item-&gt;{categories} || [] };</span><span class="xml">
+<span class="hljs-tag">&lt;/<span class="hljs-name">dd</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">dl</span>&gt;</span>
+</span><span class="perl">% }</span><span class="xml">
+<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
+</span>
\ No newline at end of file
diff --git a/test/markup/mojolicious/default.txt b/test/markup/mojolicious/default.txt
new file mode 100644
index 0000000000..2cd9426f3e
--- /dev/null
+++ b/test/markup/mojolicious/default.txt
@@ -0,0 +1,20 @@
+%layout 'bootstrap';
+% title "Import your subs";
+%= form_for '/settings/import' => (method => 'post', enctype => 'multipart/form-data') => begin
+     %= file_field 'opmlfile' => multiple => 'true'
+     %= submit_button 'Import', 'class' => 'btn'
+% end
+<div>
+% if ($subs) {
+<dl>
+% for my $item (@$subs) {
+% my ($dir, $align) = ($item->{rtl}) ? ('rtl', 'right') : ('ltr', 'left');
+<dt align="<%= $align %>"><a href="<%= $item->{'xmlUrl'} %>"><i class="icon-rss"></i> rss</a>
+<a dir="<%= $dir %>" href="<%= $item->{htmlUrl} %>"><%== $item->{title} %></a>
+</dt>
+<dd><b>Categories</b>
+%= join q{, }, sort @{ $item->{categories} || [] };
+</dd>
+</dl>
+% }
+</div>
diff --git a/test/markup/monkey/default.expect.txt b/test/markup/monkey/default.expect.txt
new file mode 100644
index 0000000000..8dfd03e961
--- /dev/null
+++ b/test/markup/monkey/default.expect.txt
@@ -0,0 +1,37 @@
+<span class="hljs-meta">#IMAGE_FILES=&quot;*.png|*.jpg&quot;</span><span class="hljs-meta">
+#SOUND_FILES=&quot;*.wav|*.ogg&quot;</span><span class="hljs-meta">
+#MUSIC_FILES=&quot;*.wav|*.ogg&quot;</span><span class="hljs-meta">
+#BINARY_FILES=&quot;*.bin|*.dat&quot;</span>
+
+<span class="hljs-keyword">Import</span> mojo
+
+<span class="hljs-comment">&#x27; The main class which expends Mojo&#x27;s &#x27;App&#x27; class:</span>
+<span class="hljs-class"><span class="hljs-keyword">Class</span> <span class="hljs-title">GameApp</span> <span class="hljs-keyword">Extends</span> <span class="hljs-title">App</span></span>
+    <span class="hljs-keyword">Field</span> player:Player
+
+    <span class="hljs-function"><span class="hljs-keyword">Method</span> <span class="hljs-title">OnCreate</span>:</span>Int()
+        <span class="hljs-keyword">Local</span> img:Image = LoadImage(<span class="hljs-string">&quot;player.png&quot;</span>)
+        <span class="hljs-built_in">Self</span>.player = <span class="hljs-keyword">New</span> Player()
+        SetUpdateRate(<span class="hljs-number">60</span>)
+
+        <span class="hljs-keyword">Return</span> <span class="hljs-number">0</span>
+    <span class="hljs-keyword">End</span>
+
+    <span class="hljs-function"><span class="hljs-keyword">Method</span> <span class="hljs-title">OnUpdate</span>:</span>Int()
+        player.x += <span class="hljs-built_in">HALFPI</span>
+
+        <span class="hljs-keyword">If</span> (player.x &gt; <span class="hljs-number">100</span>) <span class="hljs-keyword">Then</span>
+            player.x = <span class="hljs-number">0</span>
+        <span class="hljs-keyword">Endif</span>
+
+        <span class="hljs-keyword">Return</span> <span class="hljs-number">0</span>
+    <span class="hljs-keyword">End</span>
+
+    <span class="hljs-function"><span class="hljs-keyword">Method</span> <span class="hljs-title">OnRender</span>:</span>Int()
+        Cls(<span class="hljs-number">32</span>, <span class="hljs-number">64</span>, <span class="hljs-number">128</span>)
+        player.Draw()
+
+        player = <span class="hljs-literal">Null</span>
+        <span class="hljs-keyword">Return</span> <span class="hljs-number">0</span>
+    <span class="hljs-keyword">End</span>
+<span class="hljs-keyword">End</span>
diff --git a/test/markup/monkey/default.txt b/test/markup/monkey/default.txt
new file mode 100644
index 0000000000..4db94a751f
--- /dev/null
+++ b/test/markup/monkey/default.txt
@@ -0,0 +1,37 @@
+#IMAGE_FILES="*.png|*.jpg"
+#SOUND_FILES="*.wav|*.ogg"
+#MUSIC_FILES="*.wav|*.ogg"
+#BINARY_FILES="*.bin|*.dat"
+
+Import mojo
+
+' The main class which expends Mojo's 'App' class:
+Class GameApp Extends App
+    Field player:Player
+
+    Method OnCreate:Int()
+        Local img:Image = LoadImage("player.png")
+        Self.player = New Player()
+        SetUpdateRate(60)
+
+        Return 0
+    End
+
+    Method OnUpdate:Int()
+        player.x += HALFPI
+
+        If (player.x > 100) Then
+            player.x = 0
+        Endif
+
+        Return 0
+    End
+
+    Method OnRender:Int()
+        Cls(32, 64, 128)
+        player.Draw()
+
+        player = Null
+        Return 0
+    End
+End
diff --git a/test/markup/moonscript/default.expect.txt b/test/markup/moonscript/default.expect.txt
new file mode 100644
index 0000000000..3a6b888517
--- /dev/null
+++ b/test/markup/moonscript/default.expect.txt
@@ -0,0 +1,37 @@
+<span class="hljs-built_in">print</span> <span class="hljs-string">&quot;I am <span class="hljs-subst">#{<span class="hljs-built_in">math</span>.random! * <span class="hljs-number">100</span>}</span>% sure.&quot;</span>
+<span class="hljs-function">
+<span class="hljs-title">my_function</span> = <span class="hljs-params">(name=<span class="hljs-string">&quot;something&quot;</span>, height=<span class="hljs-number">100</span>)</span> -&gt;</span>
+  <span class="hljs-built_in">print</span> <span class="hljs-string">&quot;Hello I am&quot;</span>, name
+  <span class="hljs-built_in">print</span> <span class="hljs-string">&quot;My height is&quot;</span>, height
+
+my_function <span class="hljs-name">dance</span>: <span class="hljs-string">&quot;Tango&quot;</span>, <span class="hljs-name">partner</span>: <span class="hljs-string">&quot;none&quot;</span>
+
+my_func <span class="hljs-number">5</span>,<span class="hljs-number">4</span>,<span class="hljs-number">3</span>,      <span class="hljs-comment">-- multi-line arguments</span>
+  <span class="hljs-number">8</span>,<span class="hljs-number">9</span>,<span class="hljs-number">10</span>
+
+<span class="hljs-built_in">table</span> = {
+  <span class="hljs-name">name</span>: <span class="hljs-string">&quot;Bill&quot;</span>,
+  <span class="hljs-name">age</span>: <span class="hljs-number">200</span>,
+  [<span class="hljs-string">&quot;favorite food&quot;</span>]: <span class="hljs-string">&quot;rice&quot;</span>,
+  :keyvalue,
+  [<span class="hljs-number">1</span>+<span class="hljs-number">7</span>]: <span class="hljs-string">&#x27;eight&#x27;</span>
+}
+
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Inventory</span></span>
+  <span class="hljs-name">new</span>: <span class="hljs-function">=&gt;</span>
+    @items = {}
+
+  <span class="hljs-name">add_item</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> =&gt;</span>
+    <span class="hljs-keyword">if</span> @items[name]
+      @items[name] += <span class="hljs-number">1</span>
+    <span class="hljs-keyword">else</span>
+      @items[name] = <span class="hljs-number">1</span>
+
+inv = Inventory!
+inv\add_item <span class="hljs-string">&quot;t-shirt&quot;</span>
+inv\add_item <span class="hljs-string">&quot;pants&quot;</span>
+
+<span class="hljs-keyword">import</span>
+  assert_csrf
+  require_login
+  <span class="hljs-keyword">from</span> <span class="hljs-built_in">require</span> <span class="hljs-string">&quot;helpers&quot;</span>
diff --git a/test/markup/moonscript/default.txt b/test/markup/moonscript/default.txt
new file mode 100644
index 0000000000..8d455d4771
--- /dev/null
+++ b/test/markup/moonscript/default.txt
@@ -0,0 +1,37 @@
+print "I am #{math.random! * 100}% sure."
+
+my_function = (name="something", height=100) ->
+  print "Hello I am", name
+  print "My height is", height
+
+my_function dance: "Tango", partner: "none"
+
+my_func 5,4,3,      -- multi-line arguments
+  8,9,10
+
+table = {
+  name: "Bill",
+  age: 200,
+  ["favorite food"]: "rice",
+  :keyvalue,
+  [1+7]: 'eight'
+}
+
+class Inventory
+  new: =>
+    @items = {}
+
+  add_item: (name) =>
+    if @items[name]
+      @items[name] += 1
+    else
+      @items[name] = 1
+
+inv = Inventory!
+inv\add_item "t-shirt"
+inv\add_item "pants"
+
+import
+  assert_csrf
+  require_login
+  from require "helpers"
diff --git a/test/markup/n1ql/default.expect.txt b/test/markup/n1ql/default.expect.txt
new file mode 100644
index 0000000000..7810388422
--- /dev/null
+++ b/test/markup/n1ql/default.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-keyword">SELECT</span> *
+<span class="hljs-keyword">FROM</span> <span class="hljs-symbol">`beer-sample`</span>
+<span class="hljs-keyword">WHERE</span> brewery_id <span class="hljs-keyword">IS</span> <span class="hljs-keyword">NOT</span> <span class="hljs-literal">MISSING</span> <span class="hljs-keyword">AND</span> <span class="hljs-built_in">type</span>=<span class="hljs-string">&quot;beer&quot;</span>
+<span class="hljs-keyword">LIMIT</span> <span class="hljs-number">1</span>;
+
+<span class="hljs-keyword">UPSERT</span> <span class="hljs-keyword">INTO</span> product (<span class="hljs-keyword">KEY</span>, <span class="hljs-keyword">VALUE</span>) <span class="hljs-keyword">VALUES</span> (
+    <span class="hljs-string">&quot;odwalla-juice1&quot;</span>, {
+        <span class="hljs-string">&quot;productId&quot;</span>: <span class="hljs-string">&quot;odwalla-juice1&quot;</span>,
+        <span class="hljs-string">&quot;unitPrice&quot;</span>: <span class="hljs-number">5.40</span>,
+        <span class="hljs-string">&quot;type&quot;</span>: <span class="hljs-string">&quot;product&quot;</span>,
+        <span class="hljs-string">&quot;color&quot;</span>:<span class="hljs-string">&quot;red&quot;</span>
+    }
+) <span class="hljs-keyword">RETURNING</span> *;
+
+<span class="hljs-keyword">INFER</span> <span class="hljs-symbol">`beer-sample`</span> <span class="hljs-keyword">WITH</span> {
+    <span class="hljs-string">&quot;sample_size&quot;</span>: <span class="hljs-number">10000</span>,
+    <span class="hljs-string">&quot;num_sample_values&quot;</span>: <span class="hljs-number">1</span>,
+    <span class="hljs-string">&quot;similarity_metric&quot;</span>: <span class="hljs-number">0.0</span>
+};
diff --git a/test/markup/n1ql/default.txt b/test/markup/n1ql/default.txt
new file mode 100644
index 0000000000..8c26f53cbf
--- /dev/null
+++ b/test/markup/n1ql/default.txt
@@ -0,0 +1,19 @@
+SELECT *
+FROM `beer-sample`
+WHERE brewery_id IS NOT MISSING AND type="beer"
+LIMIT 1;
+
+UPSERT INTO product (KEY, VALUE) VALUES (
+    "odwalla-juice1", {
+        "productId": "odwalla-juice1",
+        "unitPrice": 5.40,
+        "type": "product",
+        "color":"red"
+    }
+) RETURNING *;
+
+INFER `beer-sample` WITH {
+    "sample_size": 10000,
+    "num_sample_values": 1,
+    "similarity_metric": 0.0
+};
diff --git a/test/markup/nginx/default.expect.txt b/test/markup/nginx/default.expect.txt
new file mode 100644
index 0000000000..f4fce54343
--- /dev/null
+++ b/test/markup/nginx/default.expect.txt
@@ -0,0 +1,47 @@
+<span class="hljs-attribute">user</span>  www www;
+<span class="hljs-attribute">worker_processes</span>  <span class="hljs-number">2</span>;
+<span class="hljs-attribute">pid</span> /var/run/nginx.pid;
+<span class="hljs-attribute">error_log</span>  /var/log/nginx.error_log  <span class="hljs-literal">debug</span> | <span class="hljs-literal">info</span> | <span class="hljs-literal">notice</span> | <span class="hljs-literal">warn</span> | <span class="hljs-literal">error</span> | <span class="hljs-literal">crit</span>;
+
+<span class="hljs-section">events</span> {
+    <span class="hljs-attribute">connections</span>   <span class="hljs-number">2000</span>;
+    <span class="hljs-attribute">use</span> <span class="hljs-literal">kqueue</span> | <span class="hljs-literal">rtsig</span> | <span class="hljs-literal">epoll</span> | <span class="hljs-literal">/dev/poll</span> | <span class="hljs-literal">select</span> | <span class="hljs-literal">poll</span>;
+}
+
+<span class="hljs-section">http</span> {
+    <span class="hljs-attribute">log_format</span> main      <span class="hljs-string">&#x27;$remote_addr - $remote_user [$time_local] &#x27;</span>
+                         <span class="hljs-string">&#x27;&quot;$request&quot; $status $bytes_sent &#x27;</span>
+                         <span class="hljs-string">&#x27;&quot;$http_referer&quot; &quot;$http_user_agent&quot; &#x27;</span>
+                         <span class="hljs-string">&#x27;&quot;$gzip_ratio&quot;&#x27;</span>;
+
+    <span class="hljs-attribute">send_timeout</span> <span class="hljs-number">3m</span>;
+    <span class="hljs-attribute">client_header_buffer_size</span> <span class="hljs-number">1k</span>;
+
+    <span class="hljs-attribute">gzip</span> <span class="hljs-literal">on</span>;
+    <span class="hljs-attribute">gzip_min_length</span> <span class="hljs-number">1100</span>;
+
+    <span class="hljs-comment">#lingering_time 30;</span>
+
+    <span class="hljs-section">server</span> {
+        <span class="hljs-attribute">server_name</span>   one.example.com  www.one.example.com;
+        <span class="hljs-attribute">access_log</span>   /var/log/nginx.access_log  main;
+
+        <span class="hljs-attribute">rewrite</span> (.*) /index.php?page=<span class="hljs-variable">$1</span> <span class="hljs-literal">break</span>;
+
+        <span class="hljs-attribute">location</span> / {
+            <span class="hljs-attribute">proxy_pass</span>         http://127.0.0.1/;
+            <span class="hljs-attribute">proxy_redirect</span>     <span class="hljs-literal">off</span>;
+            <span class="hljs-attribute">proxy_set_header</span>   Host             $host;
+            <span class="hljs-attribute">proxy_set_header</span>   X-Real-IP        $remote_addr;
+            <span class="hljs-attribute">charset</span>            koi8-r;
+        }
+
+        <span class="hljs-attribute">location</span> /api/ {
+            <span class="hljs-attribute">fastcgi_pass</span> <span class="hljs-number">127.0.0.1:9000</span>;
+        }
+
+        <span class="hljs-attribute">location</span> <span class="hljs-regexp">~* \.(jpg|jpeg|gif)$</span> {
+            <span class="hljs-attribute">root</span>         /spool/www;
+        }
+    }
+}
diff --git a/test/markup/nginx/default.txt b/test/markup/nginx/default.txt
new file mode 100644
index 0000000000..adf4b7e92e
--- /dev/null
+++ b/test/markup/nginx/default.txt
@@ -0,0 +1,47 @@
+user  www www;
+worker_processes  2;
+pid /var/run/nginx.pid;
+error_log  /var/log/nginx.error_log  debug | info | notice | warn | error | crit;
+
+events {
+    connections   2000;
+    use kqueue | rtsig | epoll | /dev/poll | select | poll;
+}
+
+http {
+    log_format main      '$remote_addr - $remote_user [$time_local] '
+                         '"$request" $status $bytes_sent '
+                         '"$http_referer" "$http_user_agent" '
+                         '"$gzip_ratio"';
+
+    send_timeout 3m;
+    client_header_buffer_size 1k;
+
+    gzip on;
+    gzip_min_length 1100;
+
+    #lingering_time 30;
+
+    server {
+        server_name   one.example.com  www.one.example.com;
+        access_log   /var/log/nginx.access_log  main;
+
+        rewrite (.*) /index.php?page=$1 break;
+
+        location / {
+            proxy_pass         http://127.0.0.1/;
+            proxy_redirect     off;
+            proxy_set_header   Host             $host;
+            proxy_set_header   X-Real-IP        $remote_addr;
+            charset            koi8-r;
+        }
+
+        location /api/ {
+            fastcgi_pass 127.0.0.1:9000;
+        }
+
+        location ~* \.(jpg|jpeg|gif)$ {
+            root         /spool/www;
+        }
+    }
+}
diff --git a/test/markup/nim/default.expect.txt b/test/markup/nim/default.expect.txt
new file mode 100644
index 0000000000..f69a2192a9
--- /dev/null
+++ b/test/markup/nim/default.expect.txt
@@ -0,0 +1,21 @@
+<span class="hljs-keyword">import</span> module1, module2, module3
+<span class="hljs-keyword">from</span> module4 <span class="hljs-keyword">import</span> <span class="hljs-keyword">nil</span>
+
+<span class="hljs-keyword">type</span>
+  <span class="hljs-type">TFoo</span> = <span class="hljs-keyword">object</span> <span class="hljs-comment">## Doc comment</span>
+    a: <span class="hljs-built_in">int32</span>
+  <span class="hljs-type">PFoo</span> = <span class="hljs-keyword">ref</span> <span class="hljs-type">TFoo</span>
+
+<span class="hljs-keyword">proc</span> do_stuff314(param_1: <span class="hljs-type">TFoo</span>, par2am: <span class="hljs-keyword">var</span> <span class="hljs-type">PFoo</span>): <span class="hljs-type">PFoo</span> <span class="hljs-meta">{.exportc: &quot;dostuff&quot; .}</span> =
+  <span class="hljs-comment"># Regular comment</span>
+  <span class="hljs-keyword">discard</span> <span class="hljs-string">&quot;&quot;&quot;
+  dfag
+sdfg&quot;&quot;
+&quot;&quot;&quot;</span>
+  <span class="hljs-literal">result</span> = <span class="hljs-keyword">nil</span>
+
+<span class="hljs-keyword">method</span> abc(a: <span class="hljs-type">TFoo</span>) = <span class="hljs-keyword">discard</span> <span class="hljs-number">1u32</span> + <span class="hljs-number">0xabcdefABCDEFi32</span> + <span class="hljs-number">0o01234567i8</span> + <span class="hljs-number">0b010</span>
+
+<span class="hljs-keyword">discard</span> <span class="hljs-string">rawstring&quot;asdf&quot;&quot;adfa&quot;</span>
+<span class="hljs-keyword">var</span> normalstring = <span class="hljs-string">&quot;asdf&quot;</span>
+<span class="hljs-keyword">let</span> a: <span class="hljs-built_in">uint32</span> = <span class="hljs-number">0xFFaF&#x27;u32</span>
diff --git a/test/markup/nim/default.txt b/test/markup/nim/default.txt
new file mode 100644
index 0000000000..32cb9cc16f
--- /dev/null
+++ b/test/markup/nim/default.txt
@@ -0,0 +1,21 @@
+import module1, module2, module3
+from module4 import nil
+
+type
+  TFoo = object ## Doc comment
+    a: int32
+  PFoo = ref TFoo
+
+proc do_stuff314(param_1: TFoo, par2am: var PFoo): PFoo {.exportc: "dostuff" .} =
+  # Regular comment
+  discard """
+  dfag
+sdfg""
+"""
+  result = nil
+
+method abc(a: TFoo) = discard 1u32 + 0xabcdefABCDEFi32 + 0o01234567i8 + 0b010
+
+discard rawstring"asdf""adfa"
+var normalstring = "asdf"
+let a: uint32 = 0xFFaF'u32
diff --git a/test/markup/nix/default.expect.txt b/test/markup/nix/default.expect.txt
new file mode 100644
index 0000000000..97d6b3cb6a
--- /dev/null
+++ b/test/markup/nix/default.expect.txt
@@ -0,0 +1,24 @@
+{ stdenv, foo, bar ? <span class="hljs-literal">false</span>, ... }:
+
+<span class="hljs-comment">/*
+ * foo
+ */</span>
+
+<span class="hljs-keyword">let</span>
+  <span class="hljs-attr">a</span> = <span class="hljs-number">1</span>; <span class="hljs-comment"># just a comment</span>
+  <span class="hljs-attr">b</span> = <span class="hljs-literal">null</span>;
+  <span class="hljs-attr">c</span> = <span class="hljs-built_in">toString</span> <span class="hljs-number">10</span>;
+<span class="hljs-keyword">in</span> stdenv.mkDerivation <span class="hljs-keyword">rec</span> {
+  <span class="hljs-attr">name</span> = <span class="hljs-string">&quot;foo-<span class="hljs-subst">${version}</span>&quot;</span>;
+  <span class="hljs-attr">version</span> = <span class="hljs-string">&quot;1.3&quot;</span>;
+
+  <span class="hljs-attr">configureFlags</span> = [ <span class="hljs-string">&quot;--with-foo2&quot;</span> ] ++ stdenv.lib.optional bar <span class="hljs-string">&quot;--with-foo=<span class="hljs-subst">${ <span class="hljs-keyword">with</span> stdenv.lib; foo }</span>&quot;</span>
+
+  <span class="hljs-attr">postInstall</span> = <span class="hljs-string">&#x27;&#x27;
+    <span class="hljs-subst">${ <span class="hljs-keyword">if</span> <span class="hljs-literal">true</span> <span class="hljs-keyword">then</span> <span class="hljs-string">&quot;--<span class="hljs-subst">${test}</span>&quot;</span> <span class="hljs-keyword">else</span> <span class="hljs-literal">false</span> }</span>
+  &#x27;&#x27;</span>;
+
+  <span class="hljs-attr">meta</span> = <span class="hljs-keyword">with</span> stdenv.lib; {
+    <span class="hljs-attr">homepage</span> = https://nixos.org;
+  };
+}
diff --git a/test/markup/nix/default.txt b/test/markup/nix/default.txt
new file mode 100644
index 0000000000..ae8b8f7531
--- /dev/null
+++ b/test/markup/nix/default.txt
@@ -0,0 +1,24 @@
+{ stdenv, foo, bar ? false, ... }:
+
+/*
+ * foo
+ */
+
+let
+  a = 1; # just a comment
+  b = null;
+  c = toString 10;
+in stdenv.mkDerivation rec {
+  name = "foo-${version}";
+  version = "1.3";
+
+  configureFlags = [ "--with-foo2" ] ++ stdenv.lib.optional bar "--with-foo=${ with stdenv.lib; foo }"
+
+  postInstall = ''
+    ${ if true then "--${test}" else false }
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://nixos.org;
+  };
+}
diff --git a/test/markup/nsis/default.expect.txt b/test/markup/nsis/default.expect.txt
new file mode 100644
index 0000000000..d3e453a2b0
--- /dev/null
+++ b/test/markup/nsis/default.expect.txt
@@ -0,0 +1,37 @@
+<span class="hljs-comment">/*
+  NSIS Scheme
+  for highlight.js
+*/</span>
+
+<span class="hljs-comment">; Includes</span>
+<span class="hljs-keyword">!include</span> MUI2.nsh
+
+<span class="hljs-comment">; Defines</span>
+<span class="hljs-keyword">!define</span> x64 <span class="hljs-string">&quot;true&quot;</span>
+
+<span class="hljs-comment">; Settings</span>
+<span class="hljs-keyword">Name</span> <span class="hljs-string">&quot;installer_name&quot;</span>
+<span class="hljs-keyword">OutFile</span> <span class="hljs-string">&quot;installer_name.exe&quot;</span>
+<span class="hljs-keyword">RequestExecutionLevel</span> <span class="hljs-literal">user</span>
+<span class="hljs-keyword">CRCCheck</span> <span class="hljs-literal">on</span>
+
+<span class="hljs-keyword">!if</span>def <span class="hljs-variable">${x64}</span>
+  <span class="hljs-keyword">InstallDir</span> <span class="hljs-string">&quot;<span class="hljs-variable">$PROGRAMFILES64</span>\installer_name&quot;</span>
+<span class="hljs-keyword">!else</span>
+  <span class="hljs-keyword">InstallDir</span> <span class="hljs-string">&quot;<span class="hljs-variable">$PROGRAMFILES</span>\installer_name&quot;</span>
+<span class="hljs-keyword">!endif</span>
+
+<span class="hljs-comment">; Pages</span>
+<span class="hljs-keyword">!insertmacro</span> MUI_PAGE_INSTFILES
+
+<span class="hljs-comment">; Sections</span>
+<span class="hljs-function"><span class="hljs-keyword">Section</span> &quot;section_name&quot; section_index</span>
+  <span class="hljs-class">nsExec::ExecToLog</span> <span class="hljs-string">&quot;calc.exe&quot;</span>
+SectionEnd
+
+<span class="hljs-comment">; Functions</span>
+<span class="hljs-function"><span class="hljs-keyword">Function</span> .onInit</span>
+  <span class="hljs-keyword">DetailPrint</span> <span class="hljs-string">&quot;The install button reads <span class="hljs-variable">$(^InstallBtn)</span>&quot;</span>
+  <span class="hljs-keyword">DetailPrint</span> <span class="hljs-string">&#x27;Here comes a<span class="hljs-meta">$\n</span><span class="hljs-meta">$\r</span>line-break!&#x27;</span>
+  <span class="hljs-keyword">DetailPrint</span> <span class="hljs-string">`Escape the dollar-sign: <span class="hljs-meta">$$</span>`</span>
+FunctionEnd
diff --git a/test/markup/nsis/default.txt b/test/markup/nsis/default.txt
new file mode 100644
index 0000000000..b6e228cf3d
--- /dev/null
+++ b/test/markup/nsis/default.txt
@@ -0,0 +1,37 @@
+/*
+  NSIS Scheme
+  for highlight.js
+*/
+
+; Includes
+!include MUI2.nsh
+
+; Defines
+!define x64 "true"
+
+; Settings
+Name "installer_name"
+OutFile "installer_name.exe"
+RequestExecutionLevel user
+CRCCheck on
+
+!ifdef ${x64}
+  InstallDir "$PROGRAMFILES64\installer_name"
+!else
+  InstallDir "$PROGRAMFILES\installer_name"
+!endif
+
+; Pages
+!insertmacro MUI_PAGE_INSTFILES
+
+; Sections
+Section "section_name" section_index
+  nsExec::ExecToLog "calc.exe"
+SectionEnd
+
+; Functions
+Function .onInit
+  DetailPrint "The install button reads $(^InstallBtn)"
+  DetailPrint 'Here comes a$\n$\rline-break!'
+  DetailPrint `Escape the dollar-sign: $$`
+FunctionEnd
diff --git a/test/markup/openscad/default.expect.txt b/test/markup/openscad/default.expect.txt
new file mode 100644
index 0000000000..0b2df0370f
--- /dev/null
+++ b/test/markup/openscad/default.expect.txt
@@ -0,0 +1,15 @@
+<span class="hljs-meta"><span class="hljs-meta-keyword">use</span> &lt;write.scad&gt;</span>
+<span class="hljs-meta"><span class="hljs-meta-keyword">include</span> &lt;../common/base.scad&gt;</span>
+
+<span class="hljs-comment">//draw a foobar</span>
+<span class="hljs-function"><span class="hljs-keyword">module</span> <span class="hljs-title">foobar</span><span class="hljs-params">()</span>{</span>
+    <span class="hljs-built_in">translate</span>([<span class="hljs-number">0</span>,-<span class="hljs-number">10</span>,<span class="hljs-number">0</span>])
+    <span class="hljs-built_in">difference</span>(){
+        <span class="hljs-built_in">cube</span>([<span class="hljs-number">5</span>,<span class="hljs-number">10.04</span>,<span class="hljs-number">15</span>]);
+        <span class="hljs-built_in">sphere</span>(r=<span class="hljs-number">10</span>,<span class="hljs-keyword">$fn</span>=<span class="hljs-number">100</span>);
+    }
+}
+
+foobar();
+#<span class="hljs-built_in">cube</span> ([<span class="hljs-number">5</span>,<span class="hljs-number">5</span>,<span class="hljs-number">5</span>]);
+<span class="hljs-built_in">echo</span>(<span class="hljs-string">&quot;done&quot;</span>);
\ No newline at end of file
diff --git a/test/markup/openscad/default.txt b/test/markup/openscad/default.txt
new file mode 100644
index 0000000000..706ee13197
--- /dev/null
+++ b/test/markup/openscad/default.txt
@@ -0,0 +1,15 @@
+use <write.scad>
+include <../common/base.scad>
+
+//draw a foobar
+module foobar(){
+    translate([0,-10,0])
+    difference(){
+        cube([5,10.04,15]);
+        sphere(r=10,$fn=100);
+    }
+}
+
+foobar();
+#cube ([5,5,5]);
+echo("done");
\ No newline at end of file
diff --git a/test/markup/oxygene/default.expect.txt b/test/markup/oxygene/default.expect.txt
new file mode 100644
index 0000000000..ed31804143
--- /dev/null
+++ b/test/markup/oxygene/default.expect.txt
@@ -0,0 +1,56 @@
+<span class="hljs-keyword">namespace</span> LinkedList;
+
+<span class="hljs-keyword">interface</span>
+
+<span class="hljs-keyword">uses</span>
+  System.Text;
+
+<span class="hljs-keyword">type</span>
+  List&lt;T&gt; = <span class="hljs-keyword">public</span> <span class="hljs-keyword">class</span>
+    <span class="hljs-keyword">where</span> T <span class="hljs-keyword">is</span> Object;
+  <span class="hljs-keyword">private</span>
+    <span class="hljs-function"><span class="hljs-keyword">method</span> <span class="hljs-title">AppendToString</span><span class="hljs-params">(aBuilder: StringBuilder)</span>;</span>
+  <span class="hljs-keyword">public</span>
+    <span class="hljs-function"><span class="hljs-keyword">constructor</span><span class="hljs-params">(aData: T)</span>;</span>
+    <span class="hljs-function"><span class="hljs-keyword">constructor</span><span class="hljs-params">(aData: T; aNext: List&lt;T&gt;)</span>;</span>
+    <span class="hljs-keyword">property</span> Next: List&lt;T&gt;;
+    <span class="hljs-keyword">property</span> Data: T;
+
+    <span class="hljs-function"><span class="hljs-keyword">method</span> <span class="hljs-title">ToString</span>:</span> string; <span class="hljs-keyword">override</span>;
+  <span class="hljs-keyword">end</span>;
+
+<span class="hljs-keyword">implementation</span>
+
+<span class="hljs-function"><span class="hljs-keyword">constructor</span> <span class="hljs-title">List</span>&lt;<span class="hljs-title">T</span>&gt;<span class="hljs-params">(aData: T)</span>;</span>
+<span class="hljs-keyword">begin</span>
+  Data := aData;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-function"><span class="hljs-keyword">constructor</span> <span class="hljs-title">List</span>&lt;<span class="hljs-title">T</span>&gt;<span class="hljs-params">(aData: T; aNext: List&lt;T&gt;)</span>;</span>
+<span class="hljs-keyword">begin</span>
+  <span class="hljs-function"><span class="hljs-keyword">constructor</span><span class="hljs-params">(aData)</span>;</span>
+  Next := aNext;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-function"><span class="hljs-keyword">method</span> <span class="hljs-title">List</span>&lt;<span class="hljs-title">T</span>&gt;.<span class="hljs-title">ToString</span>:</span> string;
+<span class="hljs-keyword">begin</span>
+  <span class="hljs-keyword">with</span> lBuilder := <span class="hljs-keyword">new</span> StringBuilder <span class="hljs-keyword">do</span> <span class="hljs-keyword">begin</span>
+    AppendToString(lBuilder);
+    <span class="hljs-keyword">result</span> := lBuilder.ToString();
+  <span class="hljs-keyword">end</span>;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-function"><span class="hljs-keyword">method</span> <span class="hljs-title">List</span>&lt;<span class="hljs-title">T</span>&gt;.<span class="hljs-title">AppendToString</span><span class="hljs-params">(aBuilder: StringBuilder)</span>;</span>
+<span class="hljs-keyword">begin</span>
+  <span class="hljs-keyword">if</span> assigned(Data) <span class="hljs-keyword">then</span>
+    aBuilder.Append(Data.ToString)
+  <span class="hljs-keyword">else</span>
+    aBuilder.Append(<span class="hljs-string">&#x27;nil&#x27;</span>);
+
+  <span class="hljs-keyword">if</span> assigned(Next) <span class="hljs-keyword">then</span> <span class="hljs-keyword">begin</span>
+    aBuilder.Append(<span class="hljs-string">&#x27;, &#x27;</span>);
+    Next.AppendToString(aBuilder);
+  <span class="hljs-keyword">end</span>;
+<span class="hljs-keyword">end</span>;
+
+<span class="hljs-keyword">end</span>.
diff --git a/test/markup/oxygene/default.txt b/test/markup/oxygene/default.txt
new file mode 100644
index 0000000000..49b337b6fa
--- /dev/null
+++ b/test/markup/oxygene/default.txt
@@ -0,0 +1,56 @@
+namespace LinkedList;
+
+interface
+
+uses
+  System.Text;
+
+type
+  List<T> = public class
+    where T is Object;
+  private
+    method AppendToString(aBuilder: StringBuilder);
+  public
+    constructor(aData: T);
+    constructor(aData: T; aNext: List<T>);
+    property Next: List<T>;
+    property Data: T;
+
+    method ToString: string; override;
+  end;
+
+implementation
+
+constructor List<T>(aData: T);
+begin
+  Data := aData;
+end;
+
+constructor List<T>(aData: T; aNext: List<T>);
+begin
+  constructor(aData);
+  Next := aNext;
+end;
+
+method List<T>.ToString: string;
+begin
+  with lBuilder := new StringBuilder do begin
+    AppendToString(lBuilder);
+    result := lBuilder.ToString();
+  end;
+end;
+
+method List<T>.AppendToString(aBuilder: StringBuilder);
+begin
+  if assigned(Data) then
+    aBuilder.Append(Data.ToString)
+  else
+    aBuilder.Append('nil');
+
+  if assigned(Next) then begin
+    aBuilder.Append(', ');
+    Next.AppendToString(aBuilder);
+  end;
+end;
+
+end.
diff --git a/test/markup/parser3/default.expect.txt b/test/markup/parser3/default.expect.txt
new file mode 100644
index 0000000000..b597ade13b
--- /dev/null
+++ b/test/markup/parser3/default.expect.txt
@@ -0,0 +1,35 @@
+<span class="hljs-meta">@CLASS</span><span class="xml">
+base
+
+</span><span class="hljs-meta">@USE</span><span class="xml">
+module.p
+
+</span><span class="hljs-meta">@BASE</span><span class="xml">
+class
+
+</span><span class="hljs-comment"># Comment for code</span><span class="xml">
+</span><span class="hljs-title">@create[aParam1;aParam2][local1;local2]</span><span class="xml">
+  </span><span class="hljs-keyword">^connect</span><span class="xml">[mysql://host/database?ClientCharset=windows</span><span class="hljs-number">-1251</span><span class="xml">]
+  </span><span class="hljs-keyword">^for</span><span class="xml">[i](</span><span class="hljs-number">1</span><span class="xml">;</span><span class="hljs-number">10</span><span class="xml">){
+    <span class="hljs-tag">&lt;<span class="hljs-name">p</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;paragraph&quot;</span>&gt;</span></span><span class="hljs-keyword">^eval</span><span class="xml">(</span><span class="hljs-variable">$i</span><span class="xml">+</span><span class="hljs-number">10</span><span class="xml">)<span class="hljs-tag">&lt;/<span class="hljs-name">p</span>&gt;</span>
+    </span><span class="hljs-keyword">^connect</span><span class="xml">[mysql://host/database]{
+      </span><span class="hljs-variable">$tab</span><span class="xml">[</span><span class="hljs-keyword">^table::sql</span><span class="xml">{select * from `table` where a=&#x27;</span><span class="hljs-number">1</span><span class="xml">&#x27;}]
+      </span><span class="hljs-variable">$var_Name</span><span class="xml">[some</span><span class="hljs-variable">${value}</span><span class="xml">]
+    }
+  }
+
+  </span><span class="hljs-comment">^rem{
+    Multiline comment with code: $var
+    ^while(true)<span class="hljs-comment">{
+      ^for[i](1;10)<span class="hljs-comment">{
+        ^sleep[]
+      }</span>
+    }</span>
+  }</span><span class="xml">
+  </span><span class="hljs-keyword">^taint</span><span class="xml">[</span><span class="hljs-number">^#0A</span><span class="xml">]
+
+</span><span class="hljs-title">@GET_base[]</span><span class="xml">
+</span><span class="hljs-comment">## Comment for code</span><span class="xml">
+  # Isn&#x27;t comment
+  </span><span class="hljs-variable">$result</span><span class="xml">[</span><span class="hljs-variable">$.hash_item1</span><span class="xml">[one] </span><span class="hljs-variable">$.hash_item2</span><span class="xml">[two]]
+</span>
\ No newline at end of file
diff --git a/test/markup/parser3/default.txt b/test/markup/parser3/default.txt
new file mode 100644
index 0000000000..65374a396f
--- /dev/null
+++ b/test/markup/parser3/default.txt
@@ -0,0 +1,34 @@
+@CLASS
+base
+
+@USE
+module.p
+
+@BASE
+class
+
+# Comment for code
+@create[aParam1;aParam2][local1;local2]
+  ^connect[mysql://host/database?ClientCharset=windows-1251]
+  ^for[i](1;10){
+    <p class="paragraph">^eval($i+10)</p>
+    ^connect[mysql://host/database]{
+      $tab[^table::sql{select * from `table` where a='1'}]
+      $var_Name[some${value}]
+    }
+  }
+
+  ^rem{
+    Multiline comment with code: $var
+    ^while(true){
+      ^for[i](1;10){
+        ^sleep[]
+      }
+    }
+  }
+  ^taint[^#0A]
+
+@GET_base[]
+## Comment for code
+  # Isn't comment
+  $result[$.hash_item1[one] $.hash_item2[two]]
diff --git a/test/markup/perl/default.expect.txt b/test/markup/perl/default.expect.txt
new file mode 100644
index 0000000000..b156d6c37f
--- /dev/null
+++ b/test/markup/perl/default.expect.txt
@@ -0,0 +1,42 @@
+<span class="hljs-comment"># loads object</span>
+<span class="hljs-function"><span class="hljs-keyword">sub</span> <span class="hljs-title">load</span>
+</span>{
+  <span class="hljs-keyword">my</span> $flds = $c-&gt;db_load($id,@_) || <span class="hljs-keyword">do</span> {
+    Carp::carp <span class="hljs-string">&quot;Can`t load (class: $c, id: $id): &#x27;$!&#x27;&quot;</span>; <span class="hljs-keyword">return</span> <span class="hljs-keyword">undef</span>
+  };
+  <span class="hljs-keyword">my</span> $o = $c-&gt;_perl_new();
+  $id12 = $id / <span class="hljs-number">24</span> / <span class="hljs-number">3600</span>;
+  $o-&gt;{<span class="hljs-string">&#x27;ID&#x27;</span>} = $id12 + <span class="hljs-number">123</span>;
+  <span class="hljs-comment">#$o-&gt;{&#x27;SHCUT&#x27;} = $flds-&gt;{&#x27;SHCUT&#x27;};</span>
+  <span class="hljs-keyword">my</span> $p = $o-&gt;props;
+  <span class="hljs-keyword">my</span> $vt;
+  $string =~ <span class="hljs-regexp">m/^sought_text$/</span>;
+  $items = <span class="hljs-keyword">split</span> <span class="hljs-regexp">//</span>, <span class="hljs-string">&#x27;abc&#x27;</span>;
+  $string //= <span class="hljs-string">&quot;bar&quot;</span>;
+  <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> $key (<span class="hljs-keyword">keys</span> %$p)
+  {
+    <span class="hljs-keyword">if</span>(${$vt.<span class="hljs-string">&#x27;::property&#x27;</span>}) {
+      $o-&gt;{$key . <span class="hljs-string">&#x27;_real&#x27;</span>} = $flds-&gt;{$key};
+      <span class="hljs-keyword">tie</span> $o-&gt;{$key}, <span class="hljs-string">&#x27;CMSBuilder::Property&#x27;</span>, $o, $key;
+    }
+  }
+  $o-&gt;save <span class="hljs-keyword">if</span> <span class="hljs-keyword">delete</span> $o-&gt;{<span class="hljs-string">&#x27;_save_after_load&#x27;</span>};
+
+  <span class="hljs-comment"># GH-117</span>
+  <span class="hljs-keyword">my</span> $g = <span class="hljs-keyword">glob</span>(<span class="hljs-string">&quot;/usr/bin/*&quot;</span>);
+
+  <span class="hljs-keyword">return</span> $o;
+}
+
+<span class="mojolicious"><span class="hljs-meta">__DATA__</span><span class="xml">
+</span></span><span class="hljs-comment">@@ layouts/default.html.ep</span><span class="mojolicious"><span class="xml">
+<span class="hljs-meta">&lt;!DOCTYPE <span class="hljs-meta-keyword">html</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">html</span>&gt;</span>
+  <span class="hljs-tag">&lt;<span class="hljs-name">head</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">title</span>&gt;</span>&lt;%=</span><span class="perl"> title </span><span class="xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">title</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">head</span>&gt;</span>
+  <span class="hljs-tag">&lt;<span class="hljs-name">body</span>&gt;</span>&lt;%=</span><span class="perl"> content </span><span class="xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">body</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">html</span>&gt;</span>
+</span><span class="hljs-meta">__END__</span></span>
+
+<span class="hljs-comment">=head1 NAME
+POD till the end of file
+</span>
\ No newline at end of file
diff --git a/test/markup/perl/default.txt b/test/markup/perl/default.txt
new file mode 100644
index 0000000000..3b08442d07
--- /dev/null
+++ b/test/markup/perl/default.txt
@@ -0,0 +1,41 @@
+# loads object
+sub load
+{
+  my $flds = $c->db_load($id,@_) || do {
+    Carp::carp "Can`t load (class: $c, id: $id): '$!'"; return undef
+  };
+  my $o = $c->_perl_new();
+  $id12 = $id / 24 / 3600;
+  $o->{'ID'} = $id12 + 123;
+  #$o->{'SHCUT'} = $flds->{'SHCUT'};
+  my $p = $o->props;
+  my $vt;
+  $string =~ m/^sought_text$/;
+  $items = split //, 'abc';
+  $string //= "bar";
+  for my $key (keys %$p)
+  {
+    if(${$vt.'::property'}) {
+      $o->{$key . '_real'} = $flds->{$key};
+      tie $o->{$key}, 'CMSBuilder::Property', $o, $key;
+    }
+  }
+  $o->save if delete $o->{'_save_after_load'};
+
+  # GH-117
+  my $g = glob("/usr/bin/*");
+
+  return $o;
+}
+
+__DATA__
+@@ layouts/default.html.ep
+<!DOCTYPE html>
+<html>
+  <head><title><%= title %></title></head>
+  <body><%= content %></body>
+</html>
+__END__
+
+=head1 NAME
+POD till the end of file
diff --git a/test/markup/pf/default.expect.txt b/test/markup/pf/default.expect.txt
new file mode 100644
index 0000000000..7aaf588ffe
--- /dev/null
+++ b/test/markup/pf/default.expect.txt
@@ -0,0 +1,43 @@
+<span class="hljs-comment"># from the PF FAQ: http://www.openbsd.org/faq/pf/example1.html</span>
+
+<span class="hljs-comment"># macros</span>
+
+int_if=<span class="hljs-string">&quot;xl0&quot;</span>
+
+tcp_services=<span class="hljs-string">&quot;{ 22, 113 }&quot;</span>
+icmp_types=<span class="hljs-string">&quot;echoreq&quot;</span>
+
+comp3=<span class="hljs-string">&quot;192.168.0.3&quot;</span>
+
+<span class="hljs-comment"># options</span>
+
+<span class="hljs-built_in">set</span> <span class="hljs-keyword">block-policy</span> return
+<span class="hljs-built_in">set</span> <span class="hljs-keyword">loginterface</span> <span class="hljs-literal">egress</span>
+<span class="hljs-built_in">set</span> <span class="hljs-keyword">skip</span> <span class="hljs-keyword">on</span> lo
+
+<span class="hljs-comment"># FTP Proxy rules</span>
+
+<span class="hljs-built_in">anchor</span> <span class="hljs-string">&quot;ftp-proxy/*&quot;</span>
+
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">quick</span> <span class="hljs-keyword">on</span> <span class="hljs-variable">$int_if</span> <span class="hljs-keyword">inet</span> <span class="hljs-keyword">proto</span> tcp <span class="hljs-keyword">to</span> <span class="hljs-literal">any</span> <span class="hljs-keyword">port</span> ftp \
+    <span class="hljs-keyword">divert-to</span> <span class="hljs-number">127.0</span>.<span class="hljs-number">0.1</span> <span class="hljs-keyword">port</span> <span class="hljs-number">8021</span>
+
+<span class="hljs-comment"># match rules</span>
+
+<span class="hljs-built_in">match</span> <span class="hljs-keyword">out</span> <span class="hljs-keyword">on</span> <span class="hljs-literal">egress</span> <span class="hljs-keyword">inet</span> <span class="hljs-keyword">from</span> !(<span class="hljs-literal">egress</span>:network) <span class="hljs-keyword">to</span> <span class="hljs-literal">any</span> <span class="hljs-keyword">nat-to</span> (<span class="hljs-literal">egress</span>:<span class="hljs-number">0</span>)
+
+<span class="hljs-comment"># filter rules</span>
+
+<span class="hljs-built_in">block</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">log</span>
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">out</span> <span class="hljs-keyword">quick</span>
+
+<span class="hljs-built_in">antispoof</span> <span class="hljs-keyword">quick</span> <span class="hljs-keyword">for</span> { lo <span class="hljs-variable">$int_if</span> }
+
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">on</span> <span class="hljs-literal">egress</span> <span class="hljs-keyword">inet</span> <span class="hljs-keyword">proto</span> tcp <span class="hljs-keyword">from</span> <span class="hljs-literal">any</span> <span class="hljs-keyword">to</span> (<span class="hljs-literal">egress</span>) \
+    <span class="hljs-keyword">port</span> <span class="hljs-variable">$tcp_services</span>
+
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">on</span> <span class="hljs-literal">egress</span> <span class="hljs-keyword">inet</span> <span class="hljs-keyword">proto</span> tcp <span class="hljs-keyword">to</span> (<span class="hljs-literal">egress</span>) <span class="hljs-keyword">port</span> <span class="hljs-number">80</span> <span class="hljs-keyword">rdr-to</span> <span class="hljs-variable">$comp3</span>
+
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">inet</span> <span class="hljs-keyword">proto</span> icmp <span class="hljs-literal">all</span> <span class="hljs-keyword">icmp-type</span> <span class="hljs-variable">$icmp_types</span>
+
+<span class="hljs-built_in">pass</span> <span class="hljs-keyword">in</span> <span class="hljs-keyword">on</span> <span class="hljs-variable">$int_if</span>
diff --git a/test/markup/pf/default.txt b/test/markup/pf/default.txt
new file mode 100644
index 0000000000..3fc2e6311e
--- /dev/null
+++ b/test/markup/pf/default.txt
@@ -0,0 +1,43 @@
+# from the PF FAQ: http://www.openbsd.org/faq/pf/example1.html
+
+# macros
+
+int_if="xl0"
+
+tcp_services="{ 22, 113 }"
+icmp_types="echoreq"
+
+comp3="192.168.0.3"
+
+# options
+
+set block-policy return
+set loginterface egress
+set skip on lo
+
+# FTP Proxy rules
+
+anchor "ftp-proxy/*"
+
+pass in quick on $int_if inet proto tcp to any port ftp \
+    divert-to 127.0.0.1 port 8021
+
+# match rules
+
+match out on egress inet from !(egress:network) to any nat-to (egress:0)
+
+# filter rules
+
+block in log
+pass out quick
+
+antispoof quick for { lo $int_if }
+
+pass in on egress inet proto tcp from any to (egress) \
+    port $tcp_services
+
+pass in on egress inet proto tcp to (egress) port 80 rdr-to $comp3
+
+pass in inet proto icmp all icmp-type $icmp_types
+
+pass in on $int_if
diff --git a/test/markup/php-template/default.expect.txt b/test/markup/php-template/default.expect.txt
new file mode 100644
index 0000000000..51fb9aaae8
--- /dev/null
+++ b/test/markup/php-template/default.expect.txt
@@ -0,0 +1,9 @@
+<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">html</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">html</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">body</span>&gt;</span>
+</span><span class="php"><span class="hljs-meta">&lt;?php</span>
+<span class="hljs-comment"># Here echo command is used to print</span>
+<span class="hljs-keyword">echo</span> <span class="hljs-string">&quot;Hello, world!&quot;</span>;
+<span class="hljs-meta">?&gt;</span></span><span class="xml">
+<span class="hljs-tag">&lt;/<span class="hljs-name">body</span>&gt;</span>
+</span>
\ No newline at end of file
diff --git a/test/markup/php-template/default.txt b/test/markup/php-template/default.txt
new file mode 100644
index 0000000000..d01ad4a791
--- /dev/null
+++ b/test/markup/php-template/default.txt
@@ -0,0 +1,8 @@
+<html>
+</html>
+<body>
+<?php
+# Here echo command is used to print
+echo "Hello, world!";
+?>
+</body>
diff --git a/test/markup/plaintext/default.expect.txt b/test/markup/plaintext/default.expect.txt
new file mode 100644
index 0000000000..87ef5b00e2
--- /dev/null
+++ b/test/markup/plaintext/default.expect.txt
@@ -0,0 +1,6 @@
+ id | description
+----+-------------
+  1 | one
+  2 | two
+  3 | three
+(3 rows)
diff --git a/test/markup/plaintext/default.txt b/test/markup/plaintext/default.txt
new file mode 100644
index 0000000000..87ef5b00e2
--- /dev/null
+++ b/test/markup/plaintext/default.txt
@@ -0,0 +1,6 @@
+ id | description
+----+-------------
+  1 | one
+  2 | two
+  3 | three
+(3 rows)
diff --git a/test/markup/processing/default.expect.txt b/test/markup/processing/default.expect.txt
new file mode 100644
index 0000000000..aff42637ac
--- /dev/null
+++ b/test/markup/processing/default.expect.txt
@@ -0,0 +1,17 @@
+<span class="hljs-keyword">import</span> java.util.LinkedList;
+<span class="hljs-keyword">import</span> java.awt.Point;
+
+<span class="hljs-keyword">PGraphics</span> pg;
+<span class="hljs-keyword">String</span> load;
+
+<span class="hljs-keyword">void</span> <span class="hljs-title">setup</span>() {
+  <span class="hljs-built_in">size</span>(<span class="hljs-built_in">displayWidth</span>, <span class="hljs-built_in">displayHeight</span>, <span class="hljs-literal">P3D</span>);
+  pg = <span class="hljs-built_in">createGraphics</span>(<span class="hljs-built_in">displayWidth</span>*<span class="hljs-number">2</span>,<span class="hljs-built_in">displayHeight</span>,<span class="hljs-literal">P2D</span>);
+  pg.<span class="hljs-built_in">beginDraw</span>();
+  pg.<span class="hljs-built_in">background</span>(<span class="hljs-number">255</span>,<span class="hljs-number">255</span>,<span class="hljs-number">255</span>);
+  <span class="hljs-comment">//pg.smooth(8);</span>
+  pg.endDraw();
+}
+<span class="hljs-keyword">void</span> <span class="hljs-title">draw</span>(){
+  <span class="hljs-built_in">background</span>(<span class="hljs-number">255</span>);
+}
diff --git a/test/markup/processing/default.txt b/test/markup/processing/default.txt
new file mode 100644
index 0000000000..de894d9af3
--- /dev/null
+++ b/test/markup/processing/default.txt
@@ -0,0 +1,17 @@
+import java.util.LinkedList;
+import java.awt.Point;
+
+PGraphics pg;
+String load;
+
+void setup() {
+  size(displayWidth, displayHeight, P3D);
+  pg = createGraphics(displayWidth*2,displayHeight,P2D);
+  pg.beginDraw();
+  pg.background(255,255,255);
+  //pg.smooth(8);
+  pg.endDraw();
+}
+void draw(){
+  background(255);
+}
diff --git a/test/markup/profile/default.expect.txt b/test/markup/profile/default.expect.txt
new file mode 100644
index 0000000000..58a10b62d7
--- /dev/null
+++ b/test/markup/profile/default.expect.txt
@@ -0,0 +1,8 @@
+       <span class="hljs-number">261917242</span> function calls in <span class="hljs-number">686.251</span> CPU seconds
+
+       <span class="hljs-keyword">ncalls</span>  <span class="hljs-keyword">tottime</span>  <span class="hljs-keyword">filename</span>:lineno(function)
+       <span class="hljs-number">152824</span>  <span class="hljs-number">513.894</span>  {method <span class="hljs-string">&#x27;sort&#x27;</span> of <span class="hljs-string">&#x27;list&#x27;</span> objects}
+    <span class="hljs-number">129590630</span>   <span class="hljs-number">83.894</span>  rrule.py:<span class="hljs-number">842</span>(<span class="hljs-string">__cmp__</span>)
+    <span class="hljs-number">129590630</span>   <span class="hljs-number">82.439</span>  {cmp}
+       <span class="hljs-number">153900</span>    <span class="hljs-number">1.296</span>  rrule.py:<span class="hljs-number">399</span>(<span class="hljs-string">_iter</span>)
+<span class="hljs-number">304393</span>/<span class="hljs-number">151570</span>    <span class="hljs-number">0.963</span>  rrule.py:<span class="hljs-number">102</span>(<span class="hljs-string">_iter_cached</span>)
diff --git a/test/markup/profile/default.txt b/test/markup/profile/default.txt
new file mode 100644
index 0000000000..252e00638b
--- /dev/null
+++ b/test/markup/profile/default.txt
@@ -0,0 +1,8 @@
+       261917242 function calls in 686.251 CPU seconds
+
+       ncalls  tottime  filename:lineno(function)
+       152824  513.894  {method 'sort' of 'list' objects}
+    129590630   83.894  rrule.py:842(__cmp__)
+    129590630   82.439  {cmp}
+       153900    1.296  rrule.py:399(_iter)
+304393/151570    0.963  rrule.py:102(_iter_cached)
diff --git a/test/markup/prolog/default.expect.txt b/test/markup/prolog/default.expect.txt
new file mode 100644
index 0000000000..1e6c35482a
--- /dev/null
+++ b/test/markup/prolog/default.expect.txt
@@ -0,0 +1,11 @@
+mergesort([],[]). <span class="hljs-comment">% special case</span>
+mergesort([<span class="hljs-symbol">A</span>],[<span class="hljs-symbol">A</span>]).
+mergesort([<span class="hljs-symbol">A</span>,<span class="hljs-symbol">B</span>|<span class="hljs-symbol">R</span>],<span class="hljs-symbol">S</span>) :-
+   split([<span class="hljs-symbol">A</span>,<span class="hljs-symbol">B</span>|<span class="hljs-symbol">R</span>],<span class="hljs-symbol">L1</span>,<span class="hljs-symbol">L2</span>),
+   mergesort(<span class="hljs-symbol">L1</span>,<span class="hljs-symbol">S1</span>),
+   mergesort(<span class="hljs-symbol">L2</span>,<span class="hljs-symbol">S2</span>),
+   merge(<span class="hljs-symbol">S1</span>,<span class="hljs-symbol">S2</span>,<span class="hljs-symbol">S</span>).
+
+split([],[],[]).
+split([<span class="hljs-symbol">A</span>],[<span class="hljs-symbol">A</span>],[]).
+split([<span class="hljs-symbol">A</span>,<span class="hljs-symbol">B</span>|<span class="hljs-symbol">R</span>],[<span class="hljs-symbol">A</span>|<span class="hljs-symbol">Ra</span>],[<span class="hljs-symbol">B</span>|<span class="hljs-symbol">Rb</span>]) :-  split(<span class="hljs-symbol">R</span>,<span class="hljs-symbol">Ra</span>,<span class="hljs-symbol">Rb</span>).
diff --git a/test/markup/prolog/default.txt b/test/markup/prolog/default.txt
new file mode 100644
index 0000000000..57b453b4d6
--- /dev/null
+++ b/test/markup/prolog/default.txt
@@ -0,0 +1,11 @@
+mergesort([],[]). % special case
+mergesort([A],[A]).
+mergesort([A,B|R],S) :-
+   split([A,B|R],L1,L2),
+   mergesort(L1,S1),
+   mergesort(L2,S2),
+   merge(S1,S2,S).
+
+split([],[],[]).
+split([A],[A],[]).
+split([A,B|R],[A|Ra],[B|Rb]) :-  split(R,Ra,Rb).
diff --git a/test/markup/puppet/default.expect.txt b/test/markup/puppet/default.expect.txt
new file mode 100644
index 0000000000..652d476593
--- /dev/null
+++ b/test/markup/puppet/default.expect.txt
@@ -0,0 +1,33 @@
+<span class="hljs-comment"># EC2 sample</span>
+
+<span class="hljs-keyword">class</span> <span class="hljs-title">ec2utils</span> {
+
+    <span class="hljs-comment"># This must include the path to the Amazon EC2 tools</span>
+    <span class="hljs-variable">$ec2path</span> = [<span class="hljs-string">&quot;/usr/bin&quot;</span>, <span class="hljs-string">&quot;/bin&quot;</span>, <span class="hljs-string">&quot;/usr/sbin&quot;</span>, <span class="hljs-string">&quot;/sbin&quot;</span>,
+                <span class="hljs-string">&quot;/opt/ec2/ec2-api-tools/bin&quot;</span>,
+                <span class="hljs-string">&quot;/opt/ec2/aws-elb-tools/bin&quot;</span>]
+
+    <span class="hljs-keyword">define</span> <span class="hljs-section">elasticip</span> (<span class="hljs-variable">$instanceid</span>, <span class="hljs-variable">$ip</span>)
+    {
+        <span class="hljs-keyword">exec</span> { <span class="hljs-string">&quot;ec2-associate-address-<span class="hljs-variable">$name</span>&quot;</span>:
+            <span class="hljs-attr">logoutput</span>   =&gt; on_failure,
+            <span class="hljs-attr">environment</span> =&gt; <span class="hljs-variable">$ec2utils::ec2env</span>,
+            <span class="hljs-attr">path</span>        =&gt; <span class="hljs-variable">$ec2utils::ec2path</span>,
+            <span class="hljs-attr">command</span>     =&gt; <span class="hljs-string">&quot;ec2assocaddr <span class="hljs-variable">$ip</span> \
+                                         -i <span class="hljs-variable">$instanceid</span>&quot;</span>,
+            <span class="hljs-comment"># Only do this when necessary</span>
+            <span class="hljs-attr">unless</span> =&gt; <span class="hljs-string">&quot;test `ec2daddr <span class="hljs-variable">$ip</span> | awk &#x27;{print \$3}&#x27;` == <span class="hljs-variable">$instanceid</span>&quot;</span>,
+        }
+    }
+
+    <span class="hljs-keyword">mount</span> { <span class="hljs-string">&quot;<span class="hljs-variable">$mountpoint</span>&quot;</span>:
+        <span class="hljs-attr">device</span>  =&gt; <span class="hljs-variable">$devicetomount</span>,
+        <span class="hljs-attr">ensure</span>  =&gt; <span class="hljs-literal">mounted</span>,
+        <span class="hljs-attr">fstype</span>  =&gt; <span class="hljs-variable">$fstype</span>,
+        <span class="hljs-attr">options</span> =&gt; <span class="hljs-variable">$mountoptions</span>,
+        <span class="hljs-attr">require</span> =&gt; [ Exec[<span class="hljs-string">&quot;ec2-attach-volume-<span class="hljs-variable">$name</span>&quot;</span>],
+                     File[<span class="hljs-string">&quot;<span class="hljs-variable">$mountpoint</span>&quot;</span>]
+        ],
+    }
+
+}
diff --git a/test/markup/puppet/default.txt b/test/markup/puppet/default.txt
new file mode 100644
index 0000000000..7f22820b8b
--- /dev/null
+++ b/test/markup/puppet/default.txt
@@ -0,0 +1,33 @@
+# EC2 sample
+
+class ec2utils {
+
+    # This must include the path to the Amazon EC2 tools
+    $ec2path = ["/usr/bin", "/bin", "/usr/sbin", "/sbin",
+                "/opt/ec2/ec2-api-tools/bin",
+                "/opt/ec2/aws-elb-tools/bin"]
+
+    define elasticip ($instanceid, $ip)
+    {
+        exec { "ec2-associate-address-$name":
+            logoutput   => on_failure,
+            environment => $ec2utils::ec2env,
+            path        => $ec2utils::ec2path,
+            command     => "ec2assocaddr $ip \
+                                         -i $instanceid",
+            # Only do this when necessary
+            unless => "test `ec2daddr $ip | awk '{print \$3}'` == $instanceid",
+        }
+    }
+
+    mount { "$mountpoint":
+        device  => $devicetomount,
+        ensure  => mounted,
+        fstype  => $fstype,
+        options => $mountoptions,
+        require => [ Exec["ec2-attach-volume-$name"],
+                     File["$mountpoint"]
+        ],
+    }
+
+}
diff --git a/test/markup/purebasic/default.expect.txt b/test/markup/purebasic/default.expect.txt
new file mode 100644
index 0000000000..48cce5c815
--- /dev/null
+++ b/test/markup/purebasic/default.expect.txt
@@ -0,0 +1,29 @@
+<span class="hljs-comment">; PureBASIC 5 - Syntax Highlighting Example</span>
+
+<span class="hljs-keyword">Enumeration</span> Test 3 <span class="hljs-keyword">Step</span> 10
+  <span class="hljs-symbol">#Constant_One</span> <span class="hljs-comment">; Will be 3</span>
+  <span class="hljs-symbol">#Constant_Two</span> <span class="hljs-comment">; Will be 13</span>
+<span class="hljs-keyword">EndEnumeration</span>
+
+A.i = <span class="hljs-symbol">#Constant_One</span>
+B = A + 3
+
+STRING.s = SomeProcedure(<span class="hljs-string">&quot;Hello World&quot;</span>, 2, <span class="hljs-symbol">#Empty$</span>, <span class="hljs-symbol">#Null$</span>)
+ESCAPED_STRING$ = <span class="hljs-string">~&quot;An escaped (\\) string!\nNewline...&quot;</span>
+
+FixedString.s{5} = <span class="hljs-string">&quot;12345&quot;</span>
+
+<span class="hljs-keyword">Macro</span> XCase(Type, Text)
+  Type<span class="hljs-symbol">#Case</span>(Text)
+<span class="hljs-keyword">EndMacro</span>
+
+StrangeProcedureCall (<span class="hljs-string">&quot;This command is split &quot;</span> +
+                      <span class="hljs-string">&quot;over two lines&quot;</span>) <span class="hljs-comment">; Line continuation example</span>
+
+<span class="hljs-keyword">If</span> B &gt; 3 : X$ = <span class="hljs-string">&quot;Concatenation of commands&quot;</span> : <span class="hljs-keyword">Else</span> : X$ = <span class="hljs-string">&quot;Using colons&quot;</span> : <span class="hljs-keyword">EndIf</span>
+
+<span class="hljs-function"><span class="hljs-keyword">Declare</span><span class="hljs-type">.s</span> <span class="hljs-title">Attach</span></span>(String1$, String2$)
+
+<span class="hljs-function"><span class="hljs-keyword">Procedure</span><span class="hljs-type">.s</span> <span class="hljs-title">Attach</span></span>(String1$, String2$)
+  <span class="hljs-keyword">ProcedureReturn</span> String1$+<span class="hljs-string">&quot; &quot;</span>+String2$
+<span class="hljs-keyword">EndProcedure</span> 
diff --git a/test/markup/purebasic/default.txt b/test/markup/purebasic/default.txt
new file mode 100644
index 0000000000..b722b550dc
--- /dev/null
+++ b/test/markup/purebasic/default.txt
@@ -0,0 +1,29 @@
+; PureBASIC 5 - Syntax Highlighting Example
+
+Enumeration Test 3 Step 10
+  #Constant_One ; Will be 3
+  #Constant_Two ; Will be 13
+EndEnumeration
+
+A.i = #Constant_One
+B = A + 3
+
+STRING.s = SomeProcedure("Hello World", 2, #Empty$, #Null$)
+ESCAPED_STRING$ = ~"An escaped (\\) string!\nNewline..."
+
+FixedString.s{5} = "12345"
+
+Macro XCase(Type, Text)
+  Type#Case(Text)
+EndMacro
+
+StrangeProcedureCall ("This command is split " +
+                      "over two lines") ; Line continuation example
+
+If B > 3 : X$ = "Concatenation of commands" : Else : X$ = "Using colons" : EndIf
+
+Declare.s Attach(String1$, String2$)
+
+Procedure.s Attach(String1$, String2$)
+  ProcedureReturn String1$+" "+String2$
+EndProcedure 
diff --git a/test/markup/q/default.expect.txt b/test/markup/q/default.expect.txt
new file mode 100644
index 0000000000..86b9e52d68
--- /dev/null
+++ b/test/markup/q/default.expect.txt
@@ -0,0 +1,9 @@
+<span class="hljs-keyword">select</span> time, price <span class="hljs-keyword">by</span> date,stock <span class="hljs-keyword">from</span> quote <span class="hljs-built_in">where</span> price=(<span class="hljs-built_in">max</span>;price)<span class="hljs-built_in">fby</span> stock
+data:<span class="hljs-built_in">raze</span> <span class="hljs-built_in">value</span> <span class="hljs-built_in">flip</span> trade
+<span class="hljs-keyword">select</span> vwap:size <span class="hljs-built_in">wavg</span> price <span class="hljs-keyword">by</span> <span class="hljs-number">5</span> <span class="hljs-built_in">xbar</span> time.minute <span class="hljs-keyword">from</span> aapl <span class="hljs-built_in">where</span> date within (.z.d<span class="hljs-number">-10</span>;.z.d)
+f1:{[x;y;z] <span class="hljs-built_in">show</span> (x;y+z);<span class="hljs-built_in">sum</span> <span class="hljs-number">1</span> <span class="hljs-number">2</span> <span class="hljs-number">3</span>}
+.z.pc:{[handle] <span class="hljs-built_in">show</span> <span class="hljs-number">-3</span>!(<span class="hljs-type">`long</span>$.z.p;<span class="hljs-string">&quot;Closed&quot;</span>;handle)}
+<span class="hljs-comment">// random normal distribution, e.g. nor 10</span>
+nor:{$[x=<span class="hljs-number">2</span>*n:x div <span class="hljs-number">2</span>;<span class="hljs-built_in">raze</span> sqrt[<span class="hljs-number">-2</span>*log n?<span class="hljs-number">1</span>f]*/:(<span class="hljs-built_in">sin</span>;<span class="hljs-built_in">cos</span>)@\:(<span class="hljs-number">2</span>*pi)*n?<span class="hljs-number">1</span>f;<span class="hljs-number">-1</span>_.z.s <span class="hljs-number">1</span>+x]}
+
+mode:{<span class="hljs-built_in">where</span> g=<span class="hljs-built_in">max</span> g:<span class="hljs-built_in">count</span> <span class="hljs-built_in">each</span> <span class="hljs-built_in">group</span> x}		<span class="hljs-comment">// mode function</span>
\ No newline at end of file
diff --git a/test/markup/q/default.txt b/test/markup/q/default.txt
new file mode 100644
index 0000000000..6e9e3d9018
--- /dev/null
+++ b/test/markup/q/default.txt
@@ -0,0 +1,9 @@
+select time, price by date,stock from quote where price=(max;price)fby stock
+data:raze value flip trade
+select vwap:size wavg price by 5 xbar time.minute from aapl where date within (.z.d-10;.z.d)
+f1:{[x;y;z] show (x;y+z);sum 1 2 3}
+.z.pc:{[handle] show -3!(`long$.z.p;"Closed";handle)}
+// random normal distribution, e.g. nor 10
+nor:{$[x=2*n:x div 2;raze sqrt[-2*log n?1f]*/:(sin;cos)@\:(2*pi)*n?1f;-1_.z.s 1+x]}
+
+mode:{where g=max g:count each group x}		// mode function
\ No newline at end of file
diff --git a/test/markup/qml/default.expect.txt b/test/markup/qml/default.expect.txt
new file mode 100644
index 0000000000..ea63ced5f5
--- /dev/null
+++ b/test/markup/qml/default.expect.txt
@@ -0,0 +1,49 @@
+<span class="hljs-comment">/****************************************************************************
+** QML with Highlight.js                                                  **/</span>
+<span class="hljs-keyword">import</span> QtQuick <span class="hljs-number">2.5</span> <span class="hljs-comment">// good version</span>
+
+<span class="hljs-title">Window</span> {
+    <span class="hljs-attribute">id:</span><span class="hljs-string"> root</span>
+    <span class="hljs-attribute">width</span>: <span class="hljs-number">1024</span>; <span class="hljs-attribute">height</span>: <span class="hljs-number">600</span>
+    <span class="hljs-attribute">color</span>: <span class="hljs-string">&quot;black&quot;</span>
+    <span class="hljs-keyword">property</span><span class="hljs-string"> int highestZ</span>: <span class="hljs-number">0</span> <span class="hljs-comment">// 0 is lowest, +infinity is highest</span>
+    <span class="hljs-keyword">property</span><span class="hljs-string"> real defaultSize </span>= <span class="hljs-number">200.1</span>
+    <span class="hljs-keyword">signal</span><span class="hljs-string"> activated</span>(<span class="hljs-built_in">real</span> xPosition, <span class="hljs-built_in">real</span> yPosition)
+    <span class="hljs-comment">// show the file picker</span>
+    <span class="hljs-title">FileDialog</span> {
+        <span class="hljs-attribute">id:</span><span class="hljs-string">fileDialog</span> <span class="hljs-comment">// an id in a comment should not be detected</span>
+        <span class="hljs-attribute">title</span>: <span class="hljs-string">&quot;Choose a folder with some images&quot;</span>
+        <span class="hljs-attribute">onAccepted</span>: folderModel.folder = fileUrl + <span class="hljs-string">&quot;/&quot;</span> <span class="hljs-comment">// if this is on property</span>
+    }
+    <span class="hljs-title">Flickable</span> {
+        <span class="hljs-attribute">id:</span><span class="hljs-string"> flickableproperty</span>
+        <span class="hljs-attribute">contentHeight</span>: height * surfaceViewportRatio
+        <span class="hljs-keyword">property</span><span class="hljs-string"> real zRestore</span>: <span class="hljs-number">0</span>
+        <span class="hljs-built_in">Behavior</span> <span class="hljs-keyword">on</span> <span class="hljs-title">scale</span> { <span class="hljs-title">NumberAnimation</span> { <span class="hljs-attribute">duration</span>: <span class="hljs-number">200</span> } }
+        <span class="hljs-title">Repeater</span> {
+            <span class="hljs-attribute">model</span>: <span class="hljs-title">FolderListModel</span> {
+                <span class="hljs-attribute">id:</span><span class="hljs-string"> folderModel</span>
+                <span class="hljs-attribute">nameFilters</span>: [<span class="hljs-string">&quot;*.png&quot;</span>, <span class="hljs-string">&quot;*.jpg&quot;</span>, <span class="hljs-string">&quot;*.gif&quot;</span>]
+            }
+            <span class="hljs-attribute">Component.onCompleted</span>: {
+                <span class="hljs-keyword">var</span> x;
+                x = <span class="hljs-built_in">Math</span>.random() * root.width - width / <span class="hljs-number">2</span>
+                rotation = <span class="hljs-built_in">Math</span>.random() * <span class="hljs-number">13</span> - <span class="hljs-number">6</span>
+                <span class="hljs-keyword">if</span> (pinch.scale &gt; <span class="hljs-number">0</span>) {
+                    photoFrame.rotation = <span class="hljs-number">0</span>;
+                    photoFrame.scale = <span class="hljs-built_in">Math</span>.min(root.width, root.height) / <span class="hljs-built_in">Math</span>.max(image.sourceSize.width, image.sourceSize.height) * <span class="hljs-number">0.85</span>
+                } <span class="hljs-title">else</span> {
+                    photoFrame.rotation = pinch.previousAngle
+                    photoFrame.scale = pinch.previousScale
+                }
+            }
+            <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">setFrameColor</span>(<span class="hljs-params"></span>) </span>{
+                <span class="hljs-keyword">if</span> (currentFrame)
+                    currentFrame.border.color = <span class="hljs-string">&quot;black&quot;</span>;
+                currentFrame = photoFrame;
+            }
+        }
+    }
+    <span class="hljs-title">Timer</span> { <span class="hljs-attribute">id:</span><span class="hljs-string"> fadeTimer</span>; <span class="hljs-attribute">interval</span>: <span class="hljs-number">1000</span>; <span class="hljs-attribute">onTriggered</span>: { hfade.start(); vfade.start() } }
+    <span class="hljs-attribute">Component.onCompleted</span>: fileDialog.open()
+}
diff --git a/test/markup/qml/default.txt b/test/markup/qml/default.txt
new file mode 100644
index 0000000000..79a888c1c6
--- /dev/null
+++ b/test/markup/qml/default.txt
@@ -0,0 +1,49 @@
+/****************************************************************************
+** QML with Highlight.js                                                  **/
+import QtQuick 2.5 // good version
+
+Window {
+    id: root
+    width: 1024; height: 600
+    color: "black"
+    property int highestZ: 0 // 0 is lowest, +infinity is highest
+    property real defaultSize = 200.1
+    signal activated(real xPosition, real yPosition)
+    // show the file picker
+    FileDialog {
+        id:fileDialog // an id in a comment should not be detected
+        title: "Choose a folder with some images"
+        onAccepted: folderModel.folder = fileUrl + "/" // if this is on property
+    }
+    Flickable {
+        id: flickableproperty
+        contentHeight: height * surfaceViewportRatio
+        property real zRestore: 0
+        Behavior on scale { NumberAnimation { duration: 200 } }
+        Repeater {
+            model: FolderListModel {
+                id: folderModel
+                nameFilters: ["*.png", "*.jpg", "*.gif"]
+            }
+            Component.onCompleted: {
+                var x;
+                x = Math.random() * root.width - width / 2
+                rotation = Math.random() * 13 - 6
+                if (pinch.scale > 0) {
+                    photoFrame.rotation = 0;
+                    photoFrame.scale = Math.min(root.width, root.height) / Math.max(image.sourceSize.width, image.sourceSize.height) * 0.85
+                } else {
+                    photoFrame.rotation = pinch.previousAngle
+                    photoFrame.scale = pinch.previousScale
+                }
+            }
+            function setFrameColor() {
+                if (currentFrame)
+                    currentFrame.border.color = "black";
+                currentFrame = photoFrame;
+            }
+        }
+    }
+    Timer { id: fadeTimer; interval: 1000; onTriggered: { hfade.start(); vfade.start() } }
+    Component.onCompleted: fileDialog.open()
+}
diff --git a/test/markup/rib/default.expect.txt b/test/markup/rib/default.expect.txt
new file mode 100644
index 0000000000..462fa4fa59
--- /dev/null
+++ b/test/markup/rib/default.expect.txt
@@ -0,0 +1,25 @@
+<span class="hljs-keyword">FrameBegin</span> <span class="hljs-number">0</span>
+<span class="hljs-keyword">Display</span> <span class="hljs-string">&quot;Scene&quot;</span> <span class="hljs-string">&quot;framebuffer&quot;</span> <span class="hljs-string">&quot;rgb&quot;</span>
+<span class="hljs-keyword">Option</span> <span class="hljs-string">&quot;searchpath&quot;</span> <span class="hljs-string">&quot;shader&quot;</span> <span class="hljs-string">&quot;+&amp;:/home/kew&quot;</span>
+<span class="hljs-keyword">Option</span> <span class="hljs-string">&quot;trace&quot;</span> <span class="hljs-string">&quot;int maxdepth&quot;</span> [<span class="hljs-number">4</span>]
+<span class="hljs-keyword">Attribute</span> <span class="hljs-string">&quot;visibility&quot;</span> <span class="hljs-string">&quot;trace&quot;</span> [<span class="hljs-number">1</span>]
+<span class="hljs-keyword">Attribute</span> <span class="hljs-string">&quot;irradiance&quot;</span> <span class="hljs-string">&quot;maxerror&quot;</span> [<span class="hljs-number">0.1</span>]
+<span class="hljs-keyword">Attribute</span> <span class="hljs-string">&quot;visibility&quot;</span> <span class="hljs-string">&quot;transmission&quot;</span> <span class="hljs-string">&quot;opaque&quot;</span>
+<span class="hljs-keyword">Format</span> <span class="hljs-number">640</span> <span class="hljs-number">480</span> <span class="hljs-number">1.0</span>
+<span class="hljs-keyword">ShadingRate</span> <span class="hljs-number">2</span>
+<span class="hljs-keyword">PixelFilter</span> <span class="hljs-string">&quot;catmull-rom&quot;</span> <span class="hljs-number">1</span> <span class="hljs-number">1</span>
+<span class="hljs-keyword">PixelSamples</span> <span class="hljs-number">4</span> <span class="hljs-number">4</span>
+<span class="hljs-keyword">Projection</span> <span class="hljs-string">&quot;perspective&quot;</span> <span class="hljs-string">&quot;fov&quot;</span> <span class="hljs-number">49.5502811377</span>
+<span class="hljs-keyword">Scale</span> <span class="hljs-number">1</span> <span class="hljs-number">1</span> <span class="hljs-number">-1</span>
+
+<span class="hljs-keyword">WorldBegin</span>
+
+<span class="hljs-keyword">ReadArchive</span> <span class="hljs-string">&quot;Lamp.002_Light/instance.rib&quot;</span>
+<span class="hljs-keyword">Surface</span> <span class="hljs-string">&quot;plastic&quot;</span>
+<span class="hljs-keyword">ReadArchive</span> <span class="hljs-string">&quot;Cube.004_Mesh/instance.rib&quot;</span>
+<span class="hljs-comment"># ReadArchive &quot;Sphere.010_Mesh/instance.rib&quot;</span>
+<span class="hljs-comment"># ReadArchive &quot;Sphere.009_Mesh/instance.rib&quot;</span>
+<span class="hljs-keyword">ReadArchive</span> <span class="hljs-string">&quot;Sphere.006_Mesh/instance.rib&quot;</span>
+
+<span class="hljs-keyword">WorldEnd</span>
+<span class="hljs-keyword">FrameEnd</span>
diff --git a/test/markup/rib/default.txt b/test/markup/rib/default.txt
new file mode 100644
index 0000000000..ff23469d29
--- /dev/null
+++ b/test/markup/rib/default.txt
@@ -0,0 +1,25 @@
+FrameBegin 0
+Display "Scene" "framebuffer" "rgb"
+Option "searchpath" "shader" "+&:/home/kew"
+Option "trace" "int maxdepth" [4]
+Attribute "visibility" "trace" [1]
+Attribute "irradiance" "maxerror" [0.1]
+Attribute "visibility" "transmission" "opaque"
+Format 640 480 1.0
+ShadingRate 2
+PixelFilter "catmull-rom" 1 1
+PixelSamples 4 4
+Projection "perspective" "fov" 49.5502811377
+Scale 1 1 -1
+
+WorldBegin
+
+ReadArchive "Lamp.002_Light/instance.rib"
+Surface "plastic"
+ReadArchive "Cube.004_Mesh/instance.rib"
+# ReadArchive "Sphere.010_Mesh/instance.rib"
+# ReadArchive "Sphere.009_Mesh/instance.rib"
+ReadArchive "Sphere.006_Mesh/instance.rib"
+
+WorldEnd
+FrameEnd
diff --git a/test/markup/roboconf/default.expect.txt b/test/markup/roboconf/default.expect.txt
new file mode 100644
index 0000000000..1bb94fc5f1
--- /dev/null
+++ b/test/markup/roboconf/default.expect.txt
@@ -0,0 +1,54 @@
+<span class="hljs-comment"># This is a comment</span>
+<span class="hljs-keyword">import</span> toto.graph;
+
+<span class="hljs-comment">##</span>
+<span class="hljs-comment"># Facet</span>
+<span class="hljs-comment">##</span>
+<span class="hljs-keyword">facet</span> VM {
+	<span class="hljs-attribute">installer</span>: iaas;
+}
+
+<span class="hljs-comment"># Components</span>
+VM_ec2 {
+	<span class="hljs-attribute">facets</span>: VM;
+	<span class="hljs-attribute">children</span>: cluster-node, mysql;
+}
+
+VM_openstack {
+	<span class="hljs-attribute">facets</span>: VM;
+	<span class="hljs-attribute">children</span>: cluster-node, mysql;
+}
+
+cluster-node {
+	<span class="hljs-attribute">alias</span>: a cluster node;
+	<span class="hljs-attribute">installer</span>: puppet;
+	<span class="hljs-attribute">exports</span>: ip, port, optional-property1, optional_property2;
+	<span class="hljs-attribute">imports</span>: cluster-node<span class="hljs-variable">.ip</span> <span class="hljs-keyword">(optional)</span>, cluster-node<span class="hljs-variable">.port</span> <span class="hljs-keyword">(optional)</span>, mysql<span class="hljs-variable">.ip</span>, mysql<span class="hljs-variable">.port</span>;
+}
+
+mysql {
+	<span class="hljs-attribute">alias</span>: a MySQL database;
+	<span class="hljs-attribute">installer</span>: puppet;
+	<span class="hljs-attribute">exports</span>: ip, port;
+}
+
+<span class="hljs-comment">##</span>
+<span class="hljs-comment"># Normally, instances are defined in another file...</span>
+<span class="hljs-comment">##</span>
+<span class="hljs-keyword">instance</span> <span class="hljs-keyword">of</span> VM_ec2 {
+	<span class="hljs-attribute">name</span>: VM_;
+	<span class="hljs-attribute">count</span>: 3;
+	<span class="hljs-attribute">my-instance-property</span>: whatever;
+	
+	<span class="hljs-keyword">instance</span> <span class="hljs-keyword">of</span> cluster-node {
+		<span class="hljs-attribute">name</span>: cluster node;		<span class="hljs-comment"># An in-line comment</span>
+	}
+}
+
+<span class="hljs-keyword">instance</span> <span class="hljs-keyword">of</span> VM_openstack {
+	<span class="hljs-attribute">name</span>: VM_database;
+	
+	<span class="hljs-keyword">instance</span> <span class="hljs-keyword">of</span> mysql {
+		<span class="hljs-attribute">name</span>: mysql;
+	}
+}
diff --git a/test/markup/roboconf/default.txt b/test/markup/roboconf/default.txt
new file mode 100644
index 0000000000..23c7a848f9
--- /dev/null
+++ b/test/markup/roboconf/default.txt
@@ -0,0 +1,54 @@
+# This is a comment
+import toto.graph;
+
+##
+# Facet
+##
+facet VM {
+	installer: iaas;
+}
+
+# Components
+VM_ec2 {
+	facets: VM;
+	children: cluster-node, mysql;
+}
+
+VM_openstack {
+	facets: VM;
+	children: cluster-node, mysql;
+}
+
+cluster-node {
+	alias: a cluster node;
+	installer: puppet;
+	exports: ip, port, optional-property1, optional_property2;
+	imports: cluster-node.ip (optional), cluster-node.port (optional), mysql.ip, mysql.port;
+}
+
+mysql {
+	alias: a MySQL database;
+	installer: puppet;
+	exports: ip, port;
+}
+
+##
+# Normally, instances are defined in another file...
+##
+instance of VM_ec2 {
+	name: VM_;
+	count: 3;
+	my-instance-property: whatever;
+	
+	instance of cluster-node {
+		name: cluster node;		# An in-line comment
+	}
+}
+
+instance of VM_openstack {
+	name: VM_database;
+	
+	instance of mysql {
+		name: mysql;
+	}
+}
diff --git a/test/markup/routeros/default.expect.txt b/test/markup/routeros/default.expect.txt
new file mode 100644
index 0000000000..6afea7cb40
--- /dev/null
+++ b/test/markup/routeros/default.expect.txt
@@ -0,0 +1,17 @@
+<span class="hljs-comment"># Берем список DNS серверов из /ip dns</span>
+ # Проверяем их доступность, 
+<span class="hljs-comment"># и только рабочие прописываем в настройки DHCP сервера</span>
+<span class="hljs-keyword">:global</span> ActiveDNSServers []
+<span class="hljs-keyword">:local</span> PingResult 0
+<span class="hljs-keyword">:foreach</span> serv <span class="hljs-keyword">in</span>=[<span class="hljs-built_in">/ip dns </span><span class="hljs-builtin-name">get</span> servers] <span class="hljs-keyword">do</span>={
+  <span class="hljs-keyword">:do</span> {:<span class="hljs-builtin-name">set</span> PingResult [ping <span class="hljs-variable">$serv</span> <span class="hljs-attribute">count</span>=3]} <span class="hljs-keyword">on-error</span>={:<span class="hljs-builtin-name">set</span> PingResult 0}
+  <span class="hljs-keyword">:if</span> (<span class="hljs-variable">$PingResult</span>=3) <span class="hljs-keyword">do</span>={ :<span class="hljs-builtin-name">set</span> ActiveDNSServers (<span class="hljs-variable">$ActiveDNSServers</span>,<span class="hljs-variable">$serv</span>) }
+<span class="hljs-comment"># отладочный вывод в журнал </span>
+  <span class="hljs-keyword">:log</span> <span class="hljs-builtin-name">info</span> <span class="hljs-string">&quot;Server: <span class="hljs-variable">$serv</span>, Ping-result: <span class="hljs-variable">$PingResult</span>&quot;</span>;
+}
+
+<span class="hljs-built_in">/ip dhcp-server network </span><span class="hljs-builtin-name">set</span> [<span class="hljs-builtin-name">find</span> <span class="hljs-attribute">address</span>=192.168.254.0/24] <span class="hljs-attribute">dns-server</span>=<span class="hljs-variable">$ActiveDNSServers</span>
+
+<span class="hljs-comment">#---   FIX TTL  ----</span>
+<span class="hljs-built_in">/ip firewall mangle </span><span class="hljs-attribute">chain</span>=postrouting <span class="hljs-attribute">action</span>=change-ttl <span class="hljs-attribute">new-ttl</span>=set:128 <span class="hljs-attribute">comment</span>=<span class="hljs-string">&quot;NAT hide&quot;</span> 
+
diff --git a/test/markup/routeros/default.txt b/test/markup/routeros/default.txt
new file mode 100644
index 0000000000..0c364ae761
--- /dev/null
+++ b/test/markup/routeros/default.txt
@@ -0,0 +1,17 @@
+# Берем список DNS серверов из /ip dns
+ # Проверяем их доступность, 
+# и только рабочие прописываем в настройки DHCP сервера
+:global ActiveDNSServers []
+:local PingResult 0
+:foreach serv in=[/ip dns get servers] do={
+  :do {:set PingResult [ping $serv count=3]} on-error={:set PingResult 0}
+  :if ($PingResult=3) do={ :set ActiveDNSServers ($ActiveDNSServers,$serv) }
+# отладочный вывод в журнал 
+  :log info "Server: $serv, Ping-result: $PingResult";
+}
+
+/ip dhcp-server network set [find address=192.168.254.0/24] dns-server=$ActiveDNSServers
+
+#---   FIX TTL  ----
+/ip firewall mangle chain=postrouting action=change-ttl new-ttl=set:128 comment="NAT hide" 
+
diff --git a/test/markup/rsl/default.expect.txt b/test/markup/rsl/default.expect.txt
new file mode 100644
index 0000000000..c6eb9d4e8c
--- /dev/null
+++ b/test/markup/rsl/default.expect.txt
@@ -0,0 +1,15 @@
+<span class="hljs-meta">#define TEST_DEFINE 3.14</span>
+<span class="hljs-comment">/*  plastic surface shader
+ *
+ *  Pixie is:
+ *  (c) Copyright 1999-2003 Okan Arikan. All rights reserved.
+ */</span>
+
+<span class="hljs-class"><span class="hljs-keyword">surface</span> plastic (</span><span class="hljs-keyword">float</span> Ka = <span class="hljs-number">1</span>, Kd = <span class="hljs-number">0.5</span>, Ks = <span class="hljs-number">0.5</span>, roughness = <span class="hljs-number">0.1</span>;
+                 <span class="hljs-keyword">color</span> specularcolor = <span class="hljs-number">1</span>;) {
+  <span class="hljs-keyword">normal</span> Nf = <span class="hljs-built_in">faceforward</span> (<span class="hljs-built_in">normalize</span>(N),I);
+  Ci = Cs * (Ka*<span class="hljs-built_in">ambient</span>() + Kd*<span class="hljs-built_in">diffuse</span>(Nf)) + specularcolor * Ks *
+       <span class="hljs-built_in">specular</span>(Nf,-<span class="hljs-built_in">normalize</span>(I),roughness);
+  Oi = Os;
+  Ci *= Oi;
+}
diff --git a/test/markup/rsl/default.txt b/test/markup/rsl/default.txt
new file mode 100644
index 0000000000..3cc4a0f4e4
--- /dev/null
+++ b/test/markup/rsl/default.txt
@@ -0,0 +1,15 @@
+#define TEST_DEFINE 3.14
+/*  plastic surface shader
+ *
+ *  Pixie is:
+ *  (c) Copyright 1999-2003 Okan Arikan. All rights reserved.
+ */
+
+surface plastic (float Ka = 1, Kd = 0.5, Ks = 0.5, roughness = 0.1;
+                 color specularcolor = 1;) {
+  normal Nf = faceforward (normalize(N),I);
+  Ci = Cs * (Ka*ambient() + Kd*diffuse(Nf)) + specularcolor * Ks *
+       specular(Nf,-normalize(I),roughness);
+  Oi = Os;
+  Ci *= Oi;
+}
diff --git a/test/markup/ruleslanguage/default.expect.txt b/test/markup/ruleslanguage/default.expect.txt
new file mode 100644
index 0000000000..984ea100c1
--- /dev/null
+++ b/test/markup/ruleslanguage/default.expect.txt
@@ -0,0 +1,36 @@
+<span class="hljs-comment">//This is a comment</span>
+<span class="hljs-keyword">ABORT</span> <span class="hljs-string">&quot;You experienced an abort.&quot;</span>;
+<span class="hljs-keyword">WARN</span> <span class="hljs-string">&quot;THIS IS A WARNING&quot;</span>;
+<span class="hljs-keyword">CALL</span> <span class="hljs-string">&quot;RIDER_X&quot;</span>;
+<span class="hljs-keyword">DONE</span>;
+<span class="hljs-keyword">FOR</span> <span class="hljs-keyword">EACH</span> X <span class="hljs-keyword">IN</span> <span class="hljs-keyword">CSV_FILE</span> <span class="hljs-string">&quot;d:\lodestar\user\d377.lse&quot;</span>
+ <span class="hljs-keyword">LEAVE</span> <span class="hljs-keyword">FOR</span>;
+<span class="hljs-keyword">END</span> <span class="hljs-keyword">FOR</span>;
+<span class="hljs-keyword">IF</span> ((BILL_KW = <span class="hljs-number">0</span>) <span class="hljs-keyword">AND</span> (KW &gt; <span class="hljs-number">0</span>)) <span class="hljs-keyword">THEN</span>
+<span class="hljs-keyword">END</span> <span class="hljs-keyword">IF</span>;
+<span class="hljs-keyword">INCLUDE</span> <span class="hljs-string">&quot;R1&quot;</span>;
+<span class="hljs-keyword">LEAVE</span> <span class="hljs-keyword">RIDER</span>;
+<span class="hljs-keyword">SELECT</span> <span class="hljs-keyword">BILL_PERIOD</span>
+   <span class="hljs-keyword">WHEN</span> <span class="hljs-string">&quot;WINTER&quot;</span>
+      <span class="hljs-keyword">BLOCK</span> KWH
+      <span class="hljs-keyword">FROM</span> <span class="hljs-number">0</span> <span class="hljs-keyword">TO</span> <span class="hljs-number">400</span> <span class="hljs-keyword">CHARGE</span> $<span class="hljs-number">0.03709</span>
+      <span class="hljs-keyword">FROM</span> <span class="hljs-number">400</span> <span class="hljs-keyword">CHARGE</span> $<span class="hljs-number">0.03000</span>
+      <span class="hljs-keyword">TOTAL</span> $ENERGY_CHARGE_WIN;
+   <span class="hljs-keyword">WHEN</span> <span class="hljs-string">&quot;SUMMER&quot;</span>
+      $VOLTAGE_DISCOUNT_SUM = $<span class="hljs-number">0.00</span>
+   <span class="hljs-keyword">OTHERWISE</span>
+      $VOLTAGE_DISCOUNT_SUM = $<span class="hljs-number">1.00</span>
+<span class="hljs-keyword">END</span> <span class="hljs-keyword">SELECT</span>;
+<span class="hljs-comment">/* Report top five peaks */</span>
+<span class="hljs-keyword">LABEL</span> PK.NM <span class="hljs-string">&quot;Peak Number&quot;</span>;
+<span class="hljs-keyword">SAVE_UPDATE</span> MV <span class="hljs-keyword">TO</span> <span class="hljs-keyword">TABLE</span> <span class="hljs-string">&quot;METERVALUE&quot;</span>;
+
+<span class="hljs-keyword">FOR</span> <span class="hljs-keyword">EACH</span> INX <span class="hljs-keyword">IN</span> <span class="hljs-keyword">ARRAYUPPERBOUND</span>(<span class="hljs-literal">#MYARRAY</span>[])
+  <span class="hljs-literal">#MYARRAY</span>[INX].VALUE = <span class="hljs-number">2</span>;
+  <span class="hljs-keyword">CLEAR</span> <span class="hljs-literal">#MYARRAY</span>[];
+<span class="hljs-keyword">END</span> <span class="hljs-keyword">FOR</span>
+
+<span class="hljs-comment">//Interval Data</span>
+HNDL_1_ADD_EDI = <span class="hljs-keyword">INTDADDATTRIBUTE</span>(HNDL_1, <span class="hljs-string">&quot;EDI_TRANSACTION&quot;</span>, EDI_ID);
+HNDL_1_ADD_VAL_MSG = <span class="hljs-keyword">INTDADDVMSG</span>(HNDL_1,<span class="hljs-string">&quot;Missing (Status Code 9) values found&quot;</span>);
+EMPTY_HNDL = <span class="hljs-keyword">INTDCREATEHANDLE</span>(<span class="hljs-string">&#x27;05/03/2006 00:00:00&#x27;</span>, <span class="hljs-string">&#x27;05/03/2006 23:59:59&#x27;</span>, <span class="hljs-number">3600</span>, <span class="hljs-string">&quot;Y&quot;</span>, <span class="hljs-string">&quot;0&quot;</span>, <span class="hljs-string">&quot; &quot;</span>);
diff --git a/test/markup/ruleslanguage/default.txt b/test/markup/ruleslanguage/default.txt
new file mode 100644
index 0000000000..566d03e1b7
--- /dev/null
+++ b/test/markup/ruleslanguage/default.txt
@@ -0,0 +1,36 @@
+//This is a comment
+ABORT "You experienced an abort.";
+WARN "THIS IS A WARNING";
+CALL "RIDER_X";
+DONE;
+FOR EACH X IN CSV_FILE "d:\lodestar\user\d377.lse"
+ LEAVE FOR;
+END FOR;
+IF ((BILL_KW = 0) AND (KW > 0)) THEN
+END IF;
+INCLUDE "R1";
+LEAVE RIDER;
+SELECT BILL_PERIOD
+   WHEN "WINTER"
+      BLOCK KWH
+      FROM 0 TO 400 CHARGE $0.03709
+      FROM 400 CHARGE $0.03000
+      TOTAL $ENERGY_CHARGE_WIN;
+   WHEN "SUMMER"
+      $VOLTAGE_DISCOUNT_SUM = $0.00
+   OTHERWISE
+      $VOLTAGE_DISCOUNT_SUM = $1.00
+END SELECT;
+/* Report top five peaks */
+LABEL PK.NM "Peak Number";
+SAVE_UPDATE MV TO TABLE "METERVALUE";
+
+FOR EACH INX IN ARRAYUPPERBOUND(#MYARRAY[])
+  #MYARRAY[INX].VALUE = 2;
+  CLEAR #MYARRAY[];
+END FOR
+
+//Interval Data
+HNDL_1_ADD_EDI = INTDADDATTRIBUTE(HNDL_1, "EDI_TRANSACTION", EDI_ID);
+HNDL_1_ADD_VAL_MSG = INTDADDVMSG(HNDL_1,"Missing (Status Code 9) values found");
+EMPTY_HNDL = INTDCREATEHANDLE('05/03/2006 00:00:00', '05/03/2006 23:59:59', 3600, "Y", "0", " ");
diff --git a/test/markup/sas/default.expect.txt b/test/markup/sas/default.expect.txt
new file mode 100644
index 0000000000..d13a233eed
--- /dev/null
+++ b/test/markup/sas/default.expect.txt
@@ -0,0 +1,48 @@
+<span class="hljs-comment">/**********************************************************************
+ * Program: example.sas
+ * Purpose: SAS Example for HighlightJS Plug-in
+ **********************************************************************/</span>
+
+<span class="hljs-built_in">%put</span> Started at <span class="hljs-built_in">%sysfunc</span><span class="hljs-meta">(putn(</span><span class="hljs-built_in">%sysfunc</span><span class="hljs-meta">(datetime(</span>)), datetime.));
+<span class="hljs-meta">options</span>
+    errors = 20  <span class="hljs-comment">/* Maximum number of prints of repeat errors */</span>
+    fullstimer   <span class="hljs-comment">/* Detailed timer after each step execution  */</span>
+;
+
+<span class="hljs-built_in">%let</span> maindir = /path/to/maindir;
+<span class="hljs-built_in">%let</span> outdir  = <span class="hljs-variable">&amp;maindir</span>/<span class="hljs-meta">out</span>.;
+
+<span class="hljs-meta">systask</span> command <span class="hljs-string">&quot;mkdir -p &amp;outdir.&quot;</span> wait;
+<span class="hljs-meta">libname</span> main <span class="hljs-string">&quot;&amp;maindir&quot;</span> access = readonly;
+<span class="hljs-keyword">
+data </span>testing;
+    <span class="hljs-meta">input</span> name $ number <span class="hljs-meta">delimiter</span> = <span class="hljs-string">&quot;,&quot;</span>;
+<span class="hljs-emphasis">    datalines;
+    John,1
+    Mary,2
+    Jane,3
+    ;</span>
+    <span class="hljs-meta">if</span> number &gt; 1 <span class="hljs-meta">then</span> final = 0;
+    <span class="hljs-meta">else</span> <span class="hljs-meta">do</span>;
+        final = 1;
+    <span class="hljs-meta">end</span>;
+<span class="hljs-keyword">run;</span>
+
+<span class="hljs-built_in">%macro</span> testMacro(positional, named = value);
+    <span class="hljs-built_in">%put</span> positional = <span class="hljs-variable">&amp;positional.</span>;
+    <span class="hljs-built_in">%put</span> named      = <span class="hljs-variable">&amp;named.</span>;
+<span class="hljs-built_in">%mend</span> testMacro;
+<span class="hljs-name">%testMacro</span>(positional, named = value);
+
+<span class="hljs-meta">dm</span> <span class="hljs-string">&#x27;clear log output odsresults&#x27;</span>;
+<span class="hljs-keyword">
+proc datasets </span>lib = work kill noprint; quit;
+<span class="hljs-meta">libname</span> <span class="hljs-literal">_all_</span> clear;
+<span class="hljs-keyword">
+data </span><span class="hljs-literal">_null_</span>;
+    <span class="hljs-meta">set</span> sashelp.macro(
+        <span class="hljs-meta">keep</span>  = name
+        <span class="hljs-meta">where</span> = (scope = <span class="hljs-string">&quot;global&quot;</span>);
+    );
+    <span class="hljs-meta">call</span> symdel(name);
+<span class="hljs-keyword">run;</span>
diff --git a/test/markup/sas/default.txt b/test/markup/sas/default.txt
new file mode 100644
index 0000000000..fa11f18a61
--- /dev/null
+++ b/test/markup/sas/default.txt
@@ -0,0 +1,48 @@
+/**********************************************************************
+ * Program: example.sas
+ * Purpose: SAS Example for HighlightJS Plug-in
+ **********************************************************************/
+
+%put Started at %sysfunc(putn(%sysfunc(datetime()), datetime.));
+options
+    errors = 20  /* Maximum number of prints of repeat errors */
+    fullstimer   /* Detailed timer after each step execution  */
+;
+
+%let maindir = /path/to/maindir;
+%let outdir  = &maindir/out.;
+
+systask command "mkdir -p &outdir." wait;
+libname main "&maindir" access = readonly;
+
+data testing;
+    input name $ number delimiter = ",";
+    datalines;
+    John,1
+    Mary,2
+    Jane,3
+    ;
+    if number > 1 then final = 0;
+    else do;
+        final = 1;
+    end;
+run;
+
+%macro testMacro(positional, named = value);
+    %put positional = &positional.;
+    %put named      = &named.;
+%mend testMacro;
+%testMacro(positional, named = value);
+
+dm 'clear log output odsresults';
+
+proc datasets lib = work kill noprint; quit;
+libname _all_ clear;
+
+data _null_;
+    set sashelp.macro(
+        keep  = name
+        where = (scope = "global");
+    );
+    call symdel(name);
+run;
diff --git a/test/markup/scilab/default.expect.txt b/test/markup/scilab/default.expect.txt
new file mode 100644
index 0000000000..bc030e118f
--- /dev/null
+++ b/test/markup/scilab/default.expect.txt
@@ -0,0 +1,14 @@
+<span class="hljs-comment">// A comment</span>
+<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">I</span> = <span class="hljs-title">foo</span><span class="hljs-params">(dims, varargin)</span></span>
+  d=[<span class="hljs-number">1</span>; matrix(dims(<span class="hljs-number">1</span>:$<span class="hljs-number">-1</span>),<span class="hljs-number">-1</span>,<span class="hljs-number">1</span>)]
+  <span class="hljs-keyword">for</span> i=<span class="hljs-number">1</span>:<span class="hljs-built_in">size</span>(varargin)
+    <span class="hljs-keyword">if</span> varargin(i)==[] <span class="hljs-keyword">then</span>
+       I=[],
+       <span class="hljs-keyword">return</span>;
+    <span class="hljs-keyword">end</span>
+  <span class="hljs-keyword">end</span>
+<span class="hljs-keyword">endfunction</span>
+
+b = <span class="hljs-built_in">cos</span>(a) + <span class="hljs-built_in">cosh</span>(a);
+bar_matrix = [ <span class="hljs-string">&quot;Hello&quot;</span>, <span class="hljs-string">&quot;world&quot;</span> ];
+foo_matrix = [<span class="hljs-number">1</span>, <span class="hljs-number">2</span>, <span class="hljs-number">3</span>; <span class="hljs-number">4</span>, <span class="hljs-number">5</span>, <span class="hljs-number">6</span>];
diff --git a/test/markup/scilab/default.txt b/test/markup/scilab/default.txt
new file mode 100644
index 0000000000..3f466c884b
--- /dev/null
+++ b/test/markup/scilab/default.txt
@@ -0,0 +1,14 @@
+// A comment
+function I = foo(dims, varargin)
+  d=[1; matrix(dims(1:$-1),-1,1)]
+  for i=1:size(varargin)
+    if varargin(i)==[] then
+       I=[],
+       return;
+    end
+  end
+endfunction
+
+b = cos(a) + cosh(a);
+bar_matrix = [ "Hello", "world" ];
+foo_matrix = [1, 2, 3; 4, 5, 6];
diff --git a/test/markup/scss/default.expect.txt b/test/markup/scss/default.expect.txt
new file mode 100644
index 0000000000..d5e235d6e8
--- /dev/null
+++ b/test/markup/scss/default.expect.txt
@@ -0,0 +1,73 @@
+<span class="hljs-keyword">@import</span> <span class="hljs-string">&quot;compass/reset&quot;</span>;
+
+<span class="hljs-comment">// variables</span>
+<span class="hljs-variable">$colorGreen</span>: <span class="hljs-number">#008000</span>;
+<span class="hljs-variable">$colorGreenDark</span>: darken(<span class="hljs-variable">$colorGreen</span>, <span class="hljs-number">10</span>);
+
+<span class="hljs-keyword">@mixin</span> container {
+    <span class="hljs-attribute">max-width</span>: <span class="hljs-number">980px</span>;
+}
+
+<span class="hljs-comment">// mixins with parameters</span>
+<span class="hljs-keyword">@mixin</span> button(<span class="hljs-variable">$color</span>:green) {
+    <span class="hljs-keyword">@if</span> (<span class="hljs-variable">$color</span> == green) {
+        <span class="hljs-attribute">background-color</span>: <span class="hljs-number">#008000</span>;
+    }
+    <span class="hljs-keyword">@else</span> if (<span class="hljs-variable">$color</span> == red) {
+        <span class="hljs-attribute">background-color</span>: <span class="hljs-number">#B22222</span>;
+    }
+}
+
+<span class="hljs-selector-tag">button</span> {
+    <span class="hljs-keyword">@include</span> button(red);
+}
+
+<span class="hljs-selector-tag">div</span>,
+<span class="hljs-selector-class">.navbar</span>,
+<span class="hljs-selector-id">#header</span>,
+<span class="hljs-selector-tag">input</span><span class="hljs-selector-attr">[type=&quot;input&quot;]</span> {
+    <span class="hljs-attribute">font-family</span>: <span class="hljs-string">&quot;Helvetica Neue&quot;</span>, Arial, sans-serif;
+    <span class="hljs-attribute">width</span>: auto;
+    <span class="hljs-attribute">margin</span>: <span class="hljs-number">0</span> auto;
+    <span class="hljs-attribute">display</span>: block;
+}
+
+<span class="hljs-selector-class">.row-12</span> &gt; <span class="hljs-selector-attr">[class*=&quot;spans&quot;]</span> {
+    <span class="hljs-attribute">border-left</span>: <span class="hljs-number">1px</span> solid <span class="hljs-number">#B5C583</span>;
+}
+
+<span class="hljs-comment">// nested definitions</span>
+<span class="hljs-selector-tag">ul</span> {
+    <span class="hljs-attribute">width</span>: <span class="hljs-number">100%</span>;
+    <span class="hljs-attribute">padding</span>: {
+        left: <span class="hljs-number">5px</span>; <span class="hljs-attribute">right</span>: <span class="hljs-number">5px</span>;
+    }
+  <span class="hljs-selector-tag">li</span> {
+      <span class="hljs-attribute">float</span>: left; <span class="hljs-attribute">margin-right</span>: <span class="hljs-number">10px</span>;
+      <span class="hljs-selector-class">.home</span> {
+          <span class="hljs-attribute">background</span>: url(<span class="hljs-string">&#x27;http://placehold.it/20&#x27;</span>) scroll no-repeat <span class="hljs-number">0</span> <span class="hljs-number">0</span>;
+    }
+  }
+}
+
+<span class="hljs-selector-class">.banner</span> {
+    <span class="hljs-keyword">@extend</span> .container;
+}
+
+<span class="hljs-selector-tag">a</span> {
+  <span class="hljs-attribute">color</span>: <span class="hljs-variable">$colorGreen</span>;
+  &amp;<span class="hljs-selector-pseudo">:hover</span> { <span class="hljs-attribute">color</span>: <span class="hljs-variable">$colorGreenDark</span>; }
+  &amp;<span class="hljs-selector-pseudo">:visited</span> { <span class="hljs-attribute">color</span>: <span class="hljs-number">#c458cb</span>; }
+}
+
+<span class="hljs-keyword">@for</span> <span class="hljs-variable">$i</span> from <span class="hljs-number">1</span> through <span class="hljs-number">5</span> {
+    <span class="hljs-selector-class">.span</span>#{<span class="hljs-variable">$i</span>} {
+        <span class="hljs-attribute">width</span>: <span class="hljs-number">20px</span>*<span class="hljs-variable">$i</span>;
+    }
+}
+
+<span class="hljs-keyword">@mixin</span> mobile {
+  <span class="hljs-keyword">@media</span> screen <span class="hljs-keyword">and</span> (max-width : <span class="hljs-number">600px</span>) {
+    <span class="hljs-keyword">@content</span>;
+  }
+}
\ No newline at end of file
diff --git a/test/markup/scss/default.txt b/test/markup/scss/default.txt
new file mode 100644
index 0000000000..3e6b880f1b
--- /dev/null
+++ b/test/markup/scss/default.txt
@@ -0,0 +1,73 @@
+@import "compass/reset";
+
+// variables
+$colorGreen: #008000;
+$colorGreenDark: darken($colorGreen, 10);
+
+@mixin container {
+    max-width: 980px;
+}
+
+// mixins with parameters
+@mixin button($color:green) {
+    @if ($color == green) {
+        background-color: #008000;
+    }
+    @else if ($color == red) {
+        background-color: #B22222;
+    }
+}
+
+button {
+    @include button(red);
+}
+
+div,
+.navbar,
+#header,
+input[type="input"] {
+    font-family: "Helvetica Neue", Arial, sans-serif;
+    width: auto;
+    margin: 0 auto;
+    display: block;
+}
+
+.row-12 > [class*="spans"] {
+    border-left: 1px solid #B5C583;
+}
+
+// nested definitions
+ul {
+    width: 100%;
+    padding: {
+        left: 5px; right: 5px;
+    }
+  li {
+      float: left; margin-right: 10px;
+      .home {
+          background: url('http://placehold.it/20') scroll no-repeat 0 0;
+    }
+  }
+}
+
+.banner {
+    @extend .container;
+}
+
+a {
+  color: $colorGreen;
+  &:hover { color: $colorGreenDark; }
+  &:visited { color: #c458cb; }
+}
+
+@for $i from 1 through 5 {
+    .span#{$i} {
+        width: 20px*$i;
+    }
+}
+
+@mixin mobile {
+  @media screen and (max-width : 600px) {
+    @content;
+  }
+}
\ No newline at end of file
diff --git a/test/markup/smali/default.expect.txt b/test/markup/smali/default.expect.txt
new file mode 100644
index 0000000000..efd7f5f80c
--- /dev/null
+++ b/test/markup/smali/default.expect.txt
@@ -0,0 +1,75 @@
+<span class="hljs-keyword">.class</span><span class="hljs-keyword"> public</span> <span class="hljs-class">Lcom/test/Preferences;</span>
+<span class="hljs-keyword">.super</span> <span class="hljs-class">Landroid/preference/PreferenceActivity;</span>
+<span class="hljs-keyword">.source</span> <span class="hljs-string">&quot;Preferences.java&quot;</span>
+
+
+<span class="hljs-comment"># instance fields</span>
+<span class="hljs-keyword">.field</span><span class="hljs-keyword"> private</span> PACKAGE_NAME:<span class="hljs-class">Ljava/lang/String;</span>
+
+
+<span class="hljs-comment"># direct methods</span>
+<span class="hljs-keyword">.method</span><span class="hljs-keyword"> public</span><span class="hljs-keyword"> constructor</span> &lt;init&gt;()V
+<span class="hljs-keyword">    .registers</span> 1
+<span class="hljs-keyword">    .annotation</span> build <span class="hljs-class">Landroid/annotation/SuppressLint;</span>
+        value = {
+            <span class="hljs-string">&quot;InlinedApi&quot;</span>
+        }<span class="hljs-keyword">
+    .end annotation</span>
+
+<span class="hljs-keyword">    .prologue</span>
+<span class="hljs-keyword">    .line</span> 25
+   <span class="hljs-built_in"> invoke-direct </span>{p0}, <span class="hljs-class">Landroid/preference/PreferenceActivity;</span>-&gt;&lt;init&gt;()V
+
+   <span class="hljs-built_in"> const-string </span>v4, <span class="hljs-string">&quot;ASDF!&quot;</span>
+
+<span class="hljs-keyword">    .line</span> 156<span class="hljs-keyword">
+    .end local</span> v0           <span class="hljs-comment">#customOther:Landroid/preference/Preference;</span><span class="hljs-keyword">
+    .end local</span> v1           <span class="hljs-comment">#customRate:Landroid/preference/Preference;</span><span class="hljs-keyword">
+    .end local</span> v2           <span class="hljs-comment">#hideApp:Landroid/preference/Preference;</span>
+   <span class="hljs-keyword"> :cond_56</span>
+
+<span class="hljs-keyword">        .line</span> 135
+   <span class="hljs-built_in"> invoke-static </span>{p1}, <span class="hljs-class">Lcom/google/ads/AdActivity;</span>-&gt;b(<span class="hljs-class">Lcom/google/ads/internal/d;</span>)<span class="hljs-class">Lcom/google/ads/internal/d;</span>
+
+<span class="hljs-keyword">    .line</span> 140
+   <span class="hljs-keyword"> :cond_e</span>
+   <span class="hljs-built_in"> monitor-exit </span>v1
+   <span class="hljs-keyword"> :try_end_f</span>
+<span class="hljs-keyword">    .catchall</span> {:try_start_5 ..<span class="hljs-keyword"> :try_end_f</span>}<span class="hljs-keyword"> :catchall_30</span>
+
+<span class="hljs-keyword">    .line</span> 143
+   <span class="hljs-built_in"> invoke-virtual </span>{p1}, <span class="hljs-class">Lcom/google/ads/internal/d;</span>-&gt;g()<span class="hljs-class">Lcom/google/ads/m;</span>
+
+   <span class="hljs-built_in"> move-result-object </span>v0
+
+   <span class="hljs-built_in"> iget-object </span>v0, v0, <span class="hljs-class">Lcom/google/ads/m;</span>-&gt;c:<span class="hljs-class">Lcom/google/ads/util/i$d;</span>
+
+   <span class="hljs-built_in"> invoke-virtual </span>{v0}, <span class="hljs-class">Lcom/google/ads/util/i$d;</span>-&gt;a()<span class="hljs-class">Ljava/lang/Object;</span>
+
+   <span class="hljs-built_in"> move-result-object </span>v0
+
+   <span class="hljs-built_in"> check-cast </span>v0, <span class="hljs-class">Landroid/app/Activity;</span>
+
+<span class="hljs-keyword">    .line</span> 144
+   <span class="hljs-built_in"> if-nez </span>v0,<span class="hljs-keyword"> :cond_33</span>
+
+<span class="hljs-keyword">    .line</span> 145
+   <span class="hljs-built_in"> const-string </span>v0, <span class="hljs-string">&quot;activity was null while launching an AdActivity.&quot;</span>
+
+   <span class="hljs-built_in"> invoke-static </span>{v0}, <span class="hljs-class">Lcom/google/ads/util/b;</span>-&gt;e(<span class="hljs-class">Ljava/lang/String;</span>)V
+
+<span class="hljs-keyword">    .line</span> 160
+   <span class="hljs-keyword"> :goto_22</span>
+   <span class="hljs-built_in"> return-void
+</span>
+<span class="hljs-keyword">    .line</span> 136
+   <span class="hljs-keyword"> :cond_23</span>
+   <span class="hljs-keyword"> :try_start_23</span>
+   <span class="hljs-built_in"> invoke-static </span>{}, <span class="hljs-class">Lcom/google/ads/AdActivity;</span>-&gt;c()<span class="hljs-class">Lcom/google/ads/internal/d;</span>
+
+   <span class="hljs-built_in"> move-result-object </span>v0
+
+   <span class="hljs-built_in"> if-eq </span>v0, p1,<span class="hljs-keyword"> :cond_e</span>
+
+   <span class="hljs-built_in"> return-void
+</span><span class="hljs-keyword">.end method</span>
diff --git a/test/markup/smali/default.txt b/test/markup/smali/default.txt
new file mode 100644
index 0000000000..f706526d53
--- /dev/null
+++ b/test/markup/smali/default.txt
@@ -0,0 +1,75 @@
+.class public Lcom/test/Preferences;
+.super Landroid/preference/PreferenceActivity;
+.source "Preferences.java"
+
+
+# instance fields
+.field private PACKAGE_NAME:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>()V
+    .registers 1
+    .annotation build Landroid/annotation/SuppressLint;
+        value = {
+            "InlinedApi"
+        }
+    .end annotation
+
+    .prologue
+    .line 25
+    invoke-direct {p0}, Landroid/preference/PreferenceActivity;-><init>()V
+
+    const-string v4, "ASDF!"
+
+    .line 156
+    .end local v0           #customOther:Landroid/preference/Preference;
+    .end local v1           #customRate:Landroid/preference/Preference;
+    .end local v2           #hideApp:Landroid/preference/Preference;
+    :cond_56
+
+        .line 135
+    invoke-static {p1}, Lcom/google/ads/AdActivity;->b(Lcom/google/ads/internal/d;)Lcom/google/ads/internal/d;
+
+    .line 140
+    :cond_e
+    monitor-exit v1
+    :try_end_f
+    .catchall {:try_start_5 .. :try_end_f} :catchall_30
+
+    .line 143
+    invoke-virtual {p1}, Lcom/google/ads/internal/d;->g()Lcom/google/ads/m;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/google/ads/m;->c:Lcom/google/ads/util/i$d;
+
+    invoke-virtual {v0}, Lcom/google/ads/util/i$d;->a()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/app/Activity;
+
+    .line 144
+    if-nez v0, :cond_33
+
+    .line 145
+    const-string v0, "activity was null while launching an AdActivity."
+
+    invoke-static {v0}, Lcom/google/ads/util/b;->e(Ljava/lang/String;)V
+
+    .line 160
+    :goto_22
+    return-void
+
+    .line 136
+    :cond_23
+    :try_start_23
+    invoke-static {}, Lcom/google/ads/AdActivity;->c()Lcom/google/ads/internal/d;
+
+    move-result-object v0
+
+    if-eq v0, p1, :cond_e
+
+    return-void
+.end method
diff --git a/test/markup/smalltalk/default.expect.txt b/test/markup/smalltalk/default.expect.txt
new file mode 100644
index 0000000000..87e66f6f35
--- /dev/null
+++ b/test/markup/smalltalk/default.expect.txt
@@ -0,0 +1,39 @@
+<span class="hljs-type">Object</span>&gt;&gt;method: num
+    <span class="hljs-comment">&quot;comment 123&quot;</span>
+    | var1 var2 |
+    (<span class="hljs-number">1</span> to: num) do: [:i | |var| ^i].
+    <span class="hljs-type">Klass</span> with: var1.
+    <span class="hljs-type">Klass</span> new.
+    arr := #(<span class="hljs-string">&#x27;123&#x27;</span> <span class="hljs-number">123.345</span> <span class="hljs-symbol">#hello</span> Transcript var <span class="hljs-string">$@</span>).
+    arr := #().
+    var2 = arr at: <span class="hljs-number">3.</span>
+    ^ <span class="hljs-keyword">self</span> abc
+
+heapExample
+    <span class="hljs-comment">&quot;HeapTest new heapExample&quot;</span>
+    <span class="hljs-comment">&quot;Multiline
+    decription&quot;</span>
+    | n rnd array time sorted |
+    n := <span class="hljs-number">5000.</span>
+    <span class="hljs-comment">&quot;# of elements to sort&quot;</span>
+    rnd := <span class="hljs-type">Random</span> new.
+    array := (<span class="hljs-number">1</span> to: n)
+                collect: [:i | rnd next].
+    <span class="hljs-comment">&quot;First, the heap version&quot;</span>
+    time := <span class="hljs-type">Time</span>
+                millisecondsToRun: [sorted := <span class="hljs-type">Heap</span> withAll: array.
+    <span class="hljs-number">1</span>
+        to: n
+        do: [:i |
+            sorted removeFirst.
+            sorted add: rnd next]].
+    <span class="hljs-type">Transcript</span> cr; show: <span class="hljs-string">&#x27;Time for Heap: &#x27;</span> , time printString , <span class="hljs-string">&#x27; msecs&#x27;</span>.
+    <span class="hljs-comment">&quot;The quicksort version&quot;</span>
+    time := <span class="hljs-type">Time</span>
+                millisecondsToRun: [sorted := <span class="hljs-type">SortedCollection</span> withAll: array.
+    <span class="hljs-number">1</span>
+        to: n
+        do: [:i |
+            sorted removeFirst.
+            sorted add: rnd next]].
+    <span class="hljs-type">Transcript</span> cr; show: <span class="hljs-string">&#x27;Time for SortedCollection: &#x27;</span> , time printString , <span class="hljs-string">&#x27; msecs&#x27;</span>
diff --git a/test/markup/smalltalk/default.txt b/test/markup/smalltalk/default.txt
new file mode 100644
index 0000000000..7c960a72f8
--- /dev/null
+++ b/test/markup/smalltalk/default.txt
@@ -0,0 +1,39 @@
+Object>>method: num
+    "comment 123"
+    | var1 var2 |
+    (1 to: num) do: [:i | |var| ^i].
+    Klass with: var1.
+    Klass new.
+    arr := #('123' 123.345 #hello Transcript var $@).
+    arr := #().
+    var2 = arr at: 3.
+    ^ self abc
+
+heapExample
+    "HeapTest new heapExample"
+    "Multiline
+    decription"
+    | n rnd array time sorted |
+    n := 5000.
+    "# of elements to sort"
+    rnd := Random new.
+    array := (1 to: n)
+                collect: [:i | rnd next].
+    "First, the heap version"
+    time := Time
+                millisecondsToRun: [sorted := Heap withAll: array.
+    1
+        to: n
+        do: [:i |
+            sorted removeFirst.
+            sorted add: rnd next]].
+    Transcript cr; show: 'Time for Heap: ' , time printString , ' msecs'.
+    "The quicksort version"
+    time := Time
+                millisecondsToRun: [sorted := SortedCollection withAll: array.
+    1
+        to: n
+        do: [:i |
+            sorted removeFirst.
+            sorted add: rnd next]].
+    Transcript cr; show: 'Time for SortedCollection: ' , time printString , ' msecs'
diff --git a/test/markup/sml/default.expect.txt b/test/markup/sml/default.expect.txt
new file mode 100644
index 0000000000..79fdfd06ef
--- /dev/null
+++ b/test/markup/sml/default.expect.txt
@@ -0,0 +1,26 @@
+<span class="hljs-keyword">structure</span> <span class="hljs-type">List</span> : <span class="hljs-type">LIST</span> =
+  <span class="hljs-keyword">struct</span>
+
+    <span class="hljs-keyword">val</span> <span class="hljs-keyword">op</span> +  = <span class="hljs-type">InlineT</span>.<span class="hljs-type">DfltInt</span>.+
+
+    <span class="hljs-keyword">datatype</span> <span class="hljs-built_in">list</span> = <span class="hljs-keyword">datatype</span> <span class="hljs-built_in">list</span>
+
+    <span class="hljs-keyword">exception</span> <span class="hljs-type">Empty</span> = <span class="hljs-type">Empty</span>
+
+    <span class="hljs-keyword">fun</span> last <span class="hljs-literal">[]</span> = <span class="hljs-keyword">raise</span> <span class="hljs-type">Empty</span>
+      | last [x] = x
+      | last (_::r) = last r
+
+  <span class="hljs-keyword">fun</span> loop (<span class="hljs-literal">[]</span>, <span class="hljs-literal">[]</span>) = <span class="hljs-type">EQUAL</span>
+    | loop (<span class="hljs-literal">[]</span>, _) = <span class="hljs-type">LESS</span>
+    | loop (_, <span class="hljs-literal">[]</span>) = <span class="hljs-type">GREATER</span>
+    | loop (x :: xs, y :: ys) =
+      (<span class="hljs-keyword">case</span> compare (x, y) <span class="hljs-keyword">of</span>
+     <span class="hljs-type">EQUAL</span> =&gt; loop (xs, ys)
+         | unequal =&gt; unequal)
+    <span class="hljs-keyword">in</span>
+  loop
+    <span class="hljs-keyword">end</span>
+
+  <span class="hljs-keyword">end</span> <span class="hljs-comment">(* structure List *)</span>
+
diff --git a/test/markup/sml/default.txt b/test/markup/sml/default.txt
new file mode 100644
index 0000000000..954c561bc1
--- /dev/null
+++ b/test/markup/sml/default.txt
@@ -0,0 +1,26 @@
+structure List : LIST =
+  struct
+
+    val op +  = InlineT.DfltInt.+
+
+    datatype list = datatype list
+
+    exception Empty = Empty
+
+    fun last [] = raise Empty
+      | last [x] = x
+      | last (_::r) = last r
+
+  fun loop ([], []) = EQUAL
+    | loop ([], _) = LESS
+    | loop (_, []) = GREATER
+    | loop (x :: xs, y :: ys) =
+      (case compare (x, y) of
+     EQUAL => loop (xs, ys)
+         | unequal => unequal)
+    in
+  loop
+    end
+
+  end (* structure List *)
+
diff --git a/test/markup/sqf/default.expect.txt b/test/markup/sqf/default.expect.txt
new file mode 100644
index 0000000000..8b9f2c518c
--- /dev/null
+++ b/test/markup/sqf/default.expect.txt
@@ -0,0 +1,16 @@
+<span class="hljs-comment">/***
+	Arma Scripting File
+	Edition: 1.66
+***/</span>
+
+<span class="hljs-comment">// Enable eating to improve health.</span>
+<span class="hljs-variable">_unit</span> <span class="hljs-built_in">addAction</span> [<span class="hljs-string">&quot;Eat Energy Bar&quot;</span>, {
+    <span class="hljs-keyword">if</span> (<span class="hljs-variable">_this</span> <span class="hljs-built_in">getVariable</span> [<span class="hljs-string">&quot;EB_NumActivation&quot;</span>, <span class="hljs-number">0</span>] &gt; <span class="hljs-number">0</span>) <span class="hljs-keyword">then</span> {
+        <span class="hljs-variable">_this</span> <span class="hljs-built_in">setDamage</span> (<span class="hljs-number">0</span> <span class="hljs-built_in">max</span> (<span class="hljs-built_in">damage</span> <span class="hljs-variable">_this</span> - <span class="hljs-number">0.25</span>));
+    } <span class="hljs-keyword">else</span> {
+        <span class="hljs-built_in">hint</span> <span class="hljs-string">&quot;You have eaten it all&quot;</span>;
+    };
+    <span class="hljs-comment">// 4 - means something...</span>
+    Z_obj_vip = <span class="hljs-literal">nil</span>;
+    [<span class="hljs-variable">_boat</span>, [<span class="hljs-string">&quot;Black&quot;</span>, <span class="hljs-number">1</span>], <span class="hljs-literal">true</span>] <span class="hljs-built_in">call</span> <span class="hljs-title">BIS_fnc_initVehicle</span>;
+}];
diff --git a/test/markup/sqf/default.txt b/test/markup/sqf/default.txt
new file mode 100644
index 0000000000..8a4905061b
--- /dev/null
+++ b/test/markup/sqf/default.txt
@@ -0,0 +1,16 @@
+/***
+	Arma Scripting File
+	Edition: 1.66
+***/
+
+// Enable eating to improve health.
+_unit addAction ["Eat Energy Bar", {
+    if (_this getVariable ["EB_NumActivation", 0] > 0) then {
+        _this setDamage (0 max (damage _this - 0.25));
+    } else {
+        hint "You have eaten it all";
+    };
+    // 4 - means something...
+    Z_obj_vip = nil;
+    [_boat, ["Black", 1], true] call BIS_fnc_initVehicle;
+}];
diff --git a/test/markup/stan/default.expect.txt b/test/markup/stan/default.expect.txt
new file mode 100644
index 0000000000..6a32c43433
--- /dev/null
+++ b/test/markup/stan/default.expect.txt
@@ -0,0 +1,39 @@
+<span class="hljs-comment">// Multivariate Regression Example</span>
+<span class="hljs-comment">// Taken from stan-reference-2.8.0.pdf p.66</span>
+
+<span class="hljs-title">data</span> {
+  <span class="hljs-keyword">int</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">0</span>&gt; N;             <span class="hljs-comment">// num individuals</span>
+  <span class="hljs-keyword">int</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">1</span>&gt; K;             <span class="hljs-comment">// num ind predictors</span>
+  <span class="hljs-keyword">int</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">1</span>&gt; J;             <span class="hljs-comment">// num groups</span>
+  <span class="hljs-keyword">int</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">1</span>&gt; L;             <span class="hljs-comment">// num group predictors</span>
+  <span class="hljs-keyword">int</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">1</span>,<span class="hljs-keyword">upper</span>=J&gt; jj[N]; <span class="hljs-comment">// group for individual</span>
+  <span class="hljs-keyword">matrix</span>[N,K] x;              <span class="hljs-comment">// individual predictors</span>
+  <span class="hljs-keyword">row_vector</span>[L] u[J];         <span class="hljs-comment">// group predictors</span>
+  <span class="hljs-keyword">vector</span>[N] y;                <span class="hljs-comment">// outcomes</span>
+}
+<span class="hljs-title">parameters</span> {
+  <span class="hljs-keyword">corr_matrix</span>[K] Omega;       <span class="hljs-comment">// prior correlation</span>
+  <span class="hljs-keyword">vector</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">0</span>&gt;[K] tau;     <span class="hljs-comment">// prior scale</span>
+  <span class="hljs-keyword">matrix</span>[L,K] gamma;          <span class="hljs-comment">// group coeffs</span>
+  <span class="hljs-keyword">vector</span>[K] beta[J];          <span class="hljs-comment">// indiv coeffs by group</span>
+  <span class="hljs-keyword">real</span>&lt;<span class="hljs-keyword">lower</span>=<span class="hljs-number">0</span>&gt; sigma;        <span class="hljs-comment">// prediction error scale</span>
+}
+<span class="hljs-title">model</span> {
+  tau ~ <span class="hljs-keyword">cauchy</span>(<span class="hljs-number">0</span>,<span class="hljs-number">2.5</span>);
+  Omega ~ <span class="hljs-keyword">lkj_corr</span>(<span class="hljs-number">2</span>);
+  <span class="hljs-built_in">to_vector</span>(gamma) ~ <span class="hljs-keyword">normal</span>(<span class="hljs-number">0</span>, <span class="hljs-number">5</span>);
+  {
+    <span class="hljs-keyword">row_vector</span>[K] u_gamma[J];
+    <span class="hljs-keyword">for</span> (j <span class="hljs-keyword">in</span> <span class="hljs-number">1</span>:J)
+      u_gamma[j] &lt;- u[j] * gamma;
+    beta ~ <span class="hljs-keyword">multi_normal</span>(u_gamma, <span class="hljs-built_in">quad_form_diag</span>(Omega, tau));
+  }
+  {
+    <span class="hljs-keyword">vector</span>[N] x_beta_jj;
+    <span class="hljs-keyword">for</span> (n <span class="hljs-keyword">in</span> <span class="hljs-number">1</span>:N)
+      x_beta_jj[n] &lt;- x[n] * beta[jj[n]];
+    y ~ <span class="hljs-keyword">normal</span>(x_beta_jj, sigma);
+  }
+}
+
+<span class="hljs-comment"># Note: Octothorpes indicate comments, too!</span>
diff --git a/test/markup/stan/default.txt b/test/markup/stan/default.txt
new file mode 100644
index 0000000000..99e56c45ec
--- /dev/null
+++ b/test/markup/stan/default.txt
@@ -0,0 +1,39 @@
+// Multivariate Regression Example
+// Taken from stan-reference-2.8.0.pdf p.66
+
+data {
+  int<lower=0> N;             // num individuals
+  int<lower=1> K;             // num ind predictors
+  int<lower=1> J;             // num groups
+  int<lower=1> L;             // num group predictors
+  int<lower=1,upper=J> jj[N]; // group for individual
+  matrix[N,K] x;              // individual predictors
+  row_vector[L] u[J];         // group predictors
+  vector[N] y;                // outcomes
+}
+parameters {
+  corr_matrix[K] Omega;       // prior correlation
+  vector<lower=0>[K] tau;     // prior scale
+  matrix[L,K] gamma;          // group coeffs
+  vector[K] beta[J];          // indiv coeffs by group
+  real<lower=0> sigma;        // prediction error scale
+}
+model {
+  tau ~ cauchy(0,2.5);
+  Omega ~ lkj_corr(2);
+  to_vector(gamma) ~ normal(0, 5);
+  {
+    row_vector[K] u_gamma[J];
+    for (j in 1:J)
+      u_gamma[j] <- u[j] * gamma;
+    beta ~ multi_normal(u_gamma, quad_form_diag(Omega, tau));
+  }
+  {
+    vector[N] x_beta_jj;
+    for (n in 1:N)
+      x_beta_jj[n] <- x[n] * beta[jj[n]];
+    y ~ normal(x_beta_jj, sigma);
+  }
+}
+
+# Note: Octothorpes indicate comments, too!
diff --git a/test/markup/step21/default.expect.txt b/test/markup/step21/default.expect.txt
new file mode 100644
index 0000000000..8d7bc5bcb2
--- /dev/null
+++ b/test/markup/step21/default.expect.txt
@@ -0,0 +1,33 @@
+<span class="hljs-meta">ISO-10303-21;</span>
+<span class="hljs-keyword">HEADER</span>;
+FILE_DESCRIPTION((<span class="hljs-string">&#x27;&#x27;</span>),<span class="hljs-string">&#x27;2;1&#x27;</span>);
+FILE_NAME(<span class="hljs-string">&#x27;CUBE_4SQUARE&#x27;</span>,<span class="hljs-string">&#x27;2013-11-29T&#x27;</span>,(<span class="hljs-string">&#x27;acook&#x27;</span>),(<span class="hljs-string">&#x27;&#x27;</span>),
+<span class="hljs-string">&#x27;SOMETHINGCAD BY SOME CORPORATION, 2012130&#x27;</span>,
+<span class="hljs-string">&#x27;SOMETHINGCAD BY SOME CORPORATION, 2012130&#x27;</span>,<span class="hljs-string">&#x27;&#x27;</span>);
+FILE_SCHEMA((<span class="hljs-string">&#x27;CONFIG_CONTROL_DESIGN&#x27;</span>));
+<span class="hljs-keyword">ENDSEC</span>;
+<span class="hljs-comment">/* file written by SomethingCAD */</span>
+<span class="hljs-keyword">DATA</span>;
+<span class="hljs-symbol">#1</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">1.E0</span>,<span class="hljs-number">0.E0</span>,<span class="hljs-number">0.E0</span>));
+<span class="hljs-symbol">#2</span>=VECTOR(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#1</span>,<span class="hljs-number">4.E0</span>);
+<span class="hljs-symbol">#3</span>=CARTESIAN_POINT(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">-2.E0</span>,<span class="hljs-number">-2.E0</span>,<span class="hljs-number">-2.E0</span>));
+<span class="hljs-symbol">#4</span>=LINE(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#3</span>,<span class="hljs-symbol">#2</span>);
+<span class="hljs-symbol">#5</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">0.E0</span>,<span class="hljs-number">1.E0</span>,<span class="hljs-number">0.E0</span>));
+<span class="hljs-symbol">#6</span>=VECTOR(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#5</span>,<span class="hljs-number">4.E0</span>);
+<span class="hljs-symbol">#7</span>=CARTESIAN_POINT(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">2.E0</span>,<span class="hljs-number">-2.E0</span>,<span class="hljs-number">-2.E0</span>));
+<span class="hljs-symbol">#8</span>=LINE(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#7</span>,<span class="hljs-symbol">#6</span>);
+<span class="hljs-symbol">#9</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">-1.E0</span>,<span class="hljs-number">0.E0</span>,<span class="hljs-number">0.E0</span>));
+<span class="hljs-symbol">#10</span>=VECTOR(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#9</span>,<span class="hljs-number">4.E0</span>);
+<span class="hljs-symbol">#11</span>=CARTESIAN_POINT(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">2.E0</span>,<span class="hljs-number">2.E0</span>,<span class="hljs-number">-2.E0</span>));
+<span class="hljs-symbol">#12</span>=LINE(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#11</span>,<span class="hljs-symbol">#10</span>);
+<span class="hljs-symbol">#13</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">0.E0</span>,<span class="hljs-number">-1.E0</span>,<span class="hljs-number">0.E0</span>));
+<span class="hljs-symbol">#14</span>=VECTOR(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#13</span>,<span class="hljs-number">4.E0</span>);
+<span class="hljs-symbol">#15</span>=CARTESIAN_POINT(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">-2.E0</span>,<span class="hljs-number">2.E0</span>,<span class="hljs-number">-2.E0</span>));
+<span class="hljs-symbol">#16</span>=LINE(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#15</span>,<span class="hljs-symbol">#14</span>);
+<span class="hljs-symbol">#17</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">0.E0</span>,<span class="hljs-number">0.E0</span>,<span class="hljs-number">1.E0</span>));
+<span class="hljs-symbol">#18</span>=VECTOR(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#17</span>,<span class="hljs-number">4.E0</span>);
+<span class="hljs-symbol">#19</span>=CARTESIAN_POINT(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">-2.E0</span>,<span class="hljs-number">-2.E0</span>,<span class="hljs-number">-2.E0</span>));
+<span class="hljs-symbol">#20</span>=LINE(<span class="hljs-string">&#x27;&#x27;</span>,<span class="hljs-symbol">#19</span>,<span class="hljs-symbol">#18</span>);
+<span class="hljs-symbol">#21</span>=DIRECTION(<span class="hljs-string">&#x27;&#x27;</span>,(<span class="hljs-number">0.E0</span>,<span class="hljs-number">0.E0</span>,<span class="hljs-number">1.E0</span>));
+<span class="hljs-keyword">ENDSEC</span>;
+<span class="hljs-meta">END-ISO-10303-21;</span>
diff --git a/test/markup/step21/default.txt b/test/markup/step21/default.txt
new file mode 100644
index 0000000000..f066fc8651
--- /dev/null
+++ b/test/markup/step21/default.txt
@@ -0,0 +1,33 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((''),'2;1');
+FILE_NAME('CUBE_4SQUARE','2013-11-29T',('acook'),(''),
+'SOMETHINGCAD BY SOME CORPORATION, 2012130',
+'SOMETHINGCAD BY SOME CORPORATION, 2012130','');
+FILE_SCHEMA(('CONFIG_CONTROL_DESIGN'));
+ENDSEC;
+/* file written by SomethingCAD */
+DATA;
+#1=DIRECTION('',(1.E0,0.E0,0.E0));
+#2=VECTOR('',#1,4.E0);
+#3=CARTESIAN_POINT('',(-2.E0,-2.E0,-2.E0));
+#4=LINE('',#3,#2);
+#5=DIRECTION('',(0.E0,1.E0,0.E0));
+#6=VECTOR('',#5,4.E0);
+#7=CARTESIAN_POINT('',(2.E0,-2.E0,-2.E0));
+#8=LINE('',#7,#6);
+#9=DIRECTION('',(-1.E0,0.E0,0.E0));
+#10=VECTOR('',#9,4.E0);
+#11=CARTESIAN_POINT('',(2.E0,2.E0,-2.E0));
+#12=LINE('',#11,#10);
+#13=DIRECTION('',(0.E0,-1.E0,0.E0));
+#14=VECTOR('',#13,4.E0);
+#15=CARTESIAN_POINT('',(-2.E0,2.E0,-2.E0));
+#16=LINE('',#15,#14);
+#17=DIRECTION('',(0.E0,0.E0,1.E0));
+#18=VECTOR('',#17,4.E0);
+#19=CARTESIAN_POINT('',(-2.E0,-2.E0,-2.E0));
+#20=LINE('',#19,#18);
+#21=DIRECTION('',(0.E0,0.E0,1.E0));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/markup/stylus/default.expect.txt b/test/markup/stylus/default.expect.txt
new file mode 100644
index 0000000000..1d4ec2a710
--- /dev/null
+++ b/test/markup/stylus/default.expect.txt
@@ -0,0 +1,28 @@
+@import <span class="hljs-string">&quot;nib&quot;</span>
+
+<span class="hljs-comment">// variables</span>
+<span class="hljs-variable">$green</span> = <span class="hljs-number">#008000</span>
+<span class="hljs-variable">$green_dark</span> = darken(<span class="hljs-variable">$green</span>, <span class="hljs-number">10</span>)
+
+<span class="hljs-comment">// mixin/function</span>
+<span class="hljs-function"><span class="hljs-title">container</span><span class="hljs-params">()</span></span>
+  <span class="hljs-attribute">max-width</span> <span class="hljs-number">980px</span>
+
+<span class="hljs-comment">// mixin/function with parameters</span>
+<span class="hljs-function"><span class="hljs-title">buttonBG</span><span class="hljs-params">(<span class="hljs-variable">$color</span> = green)</span></span>
+  <span class="hljs-keyword">if</span> <span class="hljs-variable">$color</span> == green
+    <span class="hljs-attribute">background-color</span> <span class="hljs-number">#008000</span>
+  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> <span class="hljs-variable">$color</span> == red
+    <span class="hljs-attribute">background-color</span> <span class="hljs-number">#B22222</span>
+
+<span class="hljs-selector-tag">button</span>
+  buttonBG(red)
+
+<span class="hljs-selector-class">.blue-button</span>
+  buttonBG(blue)
+
+<span class="hljs-selector-id">#content</span>, <span class="hljs-selector-class">.content</span>
+  <span class="hljs-attribute">font</span> Tahoma, Chunkfive, sans-serif
+  <span class="hljs-attribute">background</span> url(<span class="hljs-string">&#x27;hatch.png&#x27;</span>)
+  <span class="hljs-attribute">color</span> <span class="hljs-number">#F0F0F0</span> !important
+  <span class="hljs-attribute">width</span> <span class="hljs-number">100%</span>
diff --git a/test/markup/stylus/default.txt b/test/markup/stylus/default.txt
new file mode 100644
index 0000000000..896578549b
--- /dev/null
+++ b/test/markup/stylus/default.txt
@@ -0,0 +1,28 @@
+@import "nib"
+
+// variables
+$green = #008000
+$green_dark = darken($green, 10)
+
+// mixin/function
+container()
+  max-width 980px
+
+// mixin/function with parameters
+buttonBG($color = green)
+  if $color == green
+    background-color #008000
+  else if $color == red
+    background-color #B22222
+
+button
+  buttonBG(red)
+
+.blue-button
+  buttonBG(blue)
+
+#content, .content
+  font Tahoma, Chunkfive, sans-serif
+  background url('hatch.png')
+  color #F0F0F0 !important
+  width 100%
diff --git a/test/markup/taggerscript/default.expect.txt b/test/markup/taggerscript/default.expect.txt
new file mode 100644
index 0000000000..cfeaf38fbc
--- /dev/null
+++ b/test/markup/taggerscript/default.expect.txt
@@ -0,0 +1,12 @@
+<span class="hljs-keyword">$if</span>(<span class="hljs-keyword">$is_video</span>(),video,<span class="hljs-keyword">$if</span>(<span class="hljs-keyword">$is_lossless</span>(),lossless,lossy))/
+<span class="hljs-keyword">$if</span>(<span class="hljs-keyword">$is_video</span>(),
+<span class="hljs-comment">$noop(Video track)</span>
+<span class="hljs-keyword">$if</span>(<span class="hljs-keyword">$ne</span>(<span class="hljs-variable">%album%</span>,[non-album tracks]),
+<span class="hljs-keyword">$if2</span>(<span class="hljs-variable">%albumartist%</span>,<span class="hljs-variable">%artist%</span>) - <span class="hljs-variable">%album%</span><span class="hljs-keyword">$if</span>(<span class="hljs-variable">%discsubtitle%</span>, - <span class="hljs-variable">%discsubtitle%</span>)/<span class="hljs-variable">%_discandtracknumber%</span><span class="hljs-variable">%title%</span>,
+Music Videos/<span class="hljs-variable">%artist%</span>/<span class="hljs-variable">%artist%</span> - <span class="hljs-variable">%title%</span>),
+<span class="hljs-keyword">$if</span>(<span class="hljs-keyword">$eq</span>(<span class="hljs-variable">%compilation%</span>,1),
+<span class="hljs-comment">$noop(Various Artist albums)</span>
+<span class="hljs-keyword">$firstalphachar</span>(<span class="hljs-keyword">$if2</span>(<span class="hljs-variable">%albumartistsort%</span>,<span class="hljs-variable">%artistsort%</span>))/<span class="hljs-keyword">$if2</span>(<span class="hljs-variable">%albumartist%</span>,<span class="hljs-variable">%artist%</span>)/<span class="hljs-variable">%album%</span><span class="hljs-keyword">$if</span>(<span class="hljs-variable">%_releasecomment%</span>, <span class="hljs-symbol">\(</span><span class="hljs-variable">%_releasecomment%</span><span class="hljs-symbol">\)</span>,)/<span class="hljs-variable">%_discandtracknumber%</span><span class="hljs-variable">%artist%</span> - <span class="hljs-variable">%title%</span>,
+<span class="hljs-comment">$noop(Single Artist Albums)</span>
+<span class="hljs-keyword">$firstalphachar</span>(<span class="hljs-keyword">$if2</span>(<span class="hljs-variable">%albumartistsort%</span>,<span class="hljs-variable">%artistsort%</span>))/<span class="hljs-keyword">$if2</span>(<span class="hljs-variable">%albumartist%</span>,<span class="hljs-variable">%artist%</span>)/<span class="hljs-variable">%album%</span><span class="hljs-keyword">$if</span>(<span class="hljs-variable">%_releasecomment%</span>, <span class="hljs-symbol">\(</span><span class="hljs-variable">%_releasecomment%</span><span class="hljs-symbol">\)</span>,)/<span class="hljs-variable">%_discandtracknumber%</span><span class="hljs-variable">%title%</span>
+))
diff --git a/test/markup/taggerscript/default.txt b/test/markup/taggerscript/default.txt
new file mode 100644
index 0000000000..ce91f79e9e
--- /dev/null
+++ b/test/markup/taggerscript/default.txt
@@ -0,0 +1,12 @@
+$if($is_video(),video,$if($is_lossless(),lossless,lossy))/
+$if($is_video(),
+$noop(Video track)
+$if($ne(%album%,[non-album tracks]),
+$if2(%albumartist%,%artist%) - %album%$if(%discsubtitle%, - %discsubtitle%)/%_discandtracknumber%%title%,
+Music Videos/%artist%/%artist% - %title%),
+$if($eq(%compilation%,1),
+$noop(Various Artist albums)
+$firstalphachar($if2(%albumartistsort%,%artistsort%))/$if2(%albumartist%,%artist%)/%album%$if(%_releasecomment%, \(%_releasecomment%\),)/%_discandtracknumber%%artist% - %title%,
+$noop(Single Artist Albums)
+$firstalphachar($if2(%albumartistsort%,%artistsort%))/$if2(%albumartist%,%artist%)/%album%$if(%_releasecomment%, \(%_releasecomment%\),)/%_discandtracknumber%%title%
+))
diff --git a/test/markup/tcl/default.expect.txt b/test/markup/tcl/default.expect.txt
new file mode 100644
index 0000000000..2d12c9ee86
--- /dev/null
+++ b/test/markup/tcl/default.expect.txt
@@ -0,0 +1,26 @@
+<span class="hljs-keyword">package</span> json
+
+<span class="hljs-keyword">source</span> helper.tcl
+<span class="hljs-comment"># randomness verified by a die throw</span>
+<span class="hljs-keyword">set</span> ::rand <span class="hljs-number">4</span>
+
+<span class="hljs-keyword">proc</span><span class="hljs-title"> give::recursive::count</span> {base p} { <span class="hljs-comment">; # 2 mandatory params</span>
+    <span class="hljs-keyword">while</span> {$p &gt; <span class="hljs-number">0</span>} {
+        <span class="hljs-keyword">set</span> result [<span class="hljs-keyword">expr</span> $result * $base]; <span class="hljs-keyword">incr</span> p <span class="hljs-number">-1</span>
+    }
+    <span class="hljs-keyword">return</span> $result
+}
+
+<span class="hljs-keyword">set</span> a {a}; <span class="hljs-keyword">set</span> b <span class="hljs-string">&quot;bcdef&quot;</span>; <span class="hljs-keyword">set</span> lst [<span class="hljs-keyword">list</span> <span class="hljs-string">&quot;item&quot;</span>]
+<span class="hljs-keyword">puts</span> [<span class="hljs-keyword">llength</span> $a$b]
+
+<span class="hljs-keyword">set</span> ::my::tid($id) $::my::tid(def)
+<span class="hljs-keyword">lappend</span> lst $arr($idx) $::my::arr($idx) $ar(key)
+<span class="hljs-keyword">lreplace</span> ::my::tid($id) <span class="hljs-number">4</span> <span class="hljs-number">4</span>
+<span class="hljs-keyword">puts</span> $::rand ${::rand} ${::AWESOME::component::variable}
+
+<span class="hljs-keyword">puts</span> <span class="hljs-string">&quot;$x + $y is\t [expr $x + $y]&quot;</span>
+
+<span class="hljs-keyword">proc</span><span class="hljs-title"> isprime</span> x {
+    <span class="hljs-keyword">expr</span> {$x&gt;<span class="hljs-number">1</span> &amp;&amp; ![<span class="hljs-keyword">regexp</span> {^(oo+?)\<span class="hljs-number">1</span>+$} [<span class="hljs-keyword">string</span> repeat o $x]]}
+}
diff --git a/test/markup/tcl/default.txt b/test/markup/tcl/default.txt
new file mode 100644
index 0000000000..f84ee04251
--- /dev/null
+++ b/test/markup/tcl/default.txt
@@ -0,0 +1,26 @@
+package json
+
+source helper.tcl
+# randomness verified by a die throw
+set ::rand 4
+
+proc give::recursive::count {base p} { ; # 2 mandatory params
+    while {$p > 0} {
+        set result [expr $result * $base]; incr p -1
+    }
+    return $result
+}
+
+set a {a}; set b "bcdef"; set lst [list "item"]
+puts [llength $a$b]
+
+set ::my::tid($id) $::my::tid(def)
+lappend lst $arr($idx) $::my::arr($idx) $ar(key)
+lreplace ::my::tid($id) 4 4
+puts $::rand ${::rand} ${::AWESOME::component::variable}
+
+puts "$x + $y is\t [expr $x + $y]"
+
+proc isprime x {
+    expr {$x>1 && ![regexp {^(oo+?)\1+$} [string repeat o $x]]}
+}
diff --git a/test/markup/thrift/default.expect.txt b/test/markup/thrift/default.expect.txt
new file mode 100644
index 0000000000..a23a20e2fd
--- /dev/null
+++ b/test/markup/thrift/default.expect.txt
@@ -0,0 +1,40 @@
+<span class="hljs-keyword">namespace</span> * thrift.test
+
+<span class="hljs-comment">/**
+ * Docstring!
+ */</span>
+<span class="hljs-class"><span class="hljs-keyword">enum</span> <span class="hljs-title">Numberz</span>
+</span>{
+  ONE = <span class="hljs-number">1</span>,
+  TWO,
+  THREE,
+  FIVE = <span class="hljs-number">5</span>,
+  SIX,
+  EIGHT = <span class="hljs-number">8</span>
+}
+
+<span class="hljs-keyword">const</span> Numberz myNumberz = Numberz.ONE;
+<span class="hljs-comment">// the following is expected to fail:</span>
+<span class="hljs-comment">// const Numberz urNumberz = ONE;</span>
+
+<span class="hljs-keyword">typedef</span> <span class="hljs-built_in">i64</span> UserId
+
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">Msg</span>
+</span>{
+  <span class="hljs-number">1</span>: <span class="hljs-built_in">string</span> message,
+  <span class="hljs-number">2</span>: <span class="hljs-built_in">i32</span> type
+}
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">NestedListsI32x2</span>
+</span>{
+  <span class="hljs-number">1</span>: list&lt;list&lt;<span class="hljs-keyword">i32</span>&gt;&gt; integerlist
+}
+<span class="hljs-class"><span class="hljs-keyword">struct</span> <span class="hljs-title">NestedListsI32x3</span>
+</span>{
+  <span class="hljs-number">1</span>: list&lt;list&lt;list&lt;<span class="hljs-keyword">i32</span>&gt;&gt;&gt; integerlist
+}
+<span class="hljs-class"><span class="hljs-keyword">service</span> <span class="hljs-title">ThriftTest</span>
+</span>{
+  <span class="hljs-keyword">void</span>        testVoid(),
+  <span class="hljs-built_in">string</span>      testString(<span class="hljs-number">1</span>: <span class="hljs-built_in">string</span> thing),
+  <span class="hljs-keyword">oneway</span> <span class="hljs-keyword">void</span> testInit()
+}
\ No newline at end of file
diff --git a/test/markup/thrift/default.txt b/test/markup/thrift/default.txt
new file mode 100644
index 0000000000..fe2c6cd51d
--- /dev/null
+++ b/test/markup/thrift/default.txt
@@ -0,0 +1,40 @@
+namespace * thrift.test
+
+/**
+ * Docstring!
+ */
+enum Numberz
+{
+  ONE = 1,
+  TWO,
+  THREE,
+  FIVE = 5,
+  SIX,
+  EIGHT = 8
+}
+
+const Numberz myNumberz = Numberz.ONE;
+// the following is expected to fail:
+// const Numberz urNumberz = ONE;
+
+typedef i64 UserId
+
+struct Msg
+{
+  1: string message,
+  2: i32 type
+}
+struct NestedListsI32x2
+{
+  1: list<list<i32>> integerlist
+}
+struct NestedListsI32x3
+{
+  1: list<list<list<i32>>> integerlist
+}
+service ThriftTest
+{
+  void        testVoid(),
+  string      testString(1: string thing),
+  oneway void testInit()
+}
\ No newline at end of file
diff --git a/test/markup/tp/default.expect.txt b/test/markup/tp/default.expect.txt
new file mode 100644
index 0000000000..7c23232530
--- /dev/null
+++ b/test/markup/tp/default.expect.txt
@@ -0,0 +1,156 @@
+<span class="hljs-keyword">/PROG</span>  ALL
+<span class="hljs-keyword">/ATTR</span>
+OWNER		= MNEDITOR;
+COMMENT		= <span class="hljs-string">&quot;&quot;</span>;
+PROG_SIZE	= <span class="hljs-number">3689</span>;
+CREATE		= DATE <span class="hljs-number">14</span><span class="hljs-number">-05</span><span class="hljs-number">-13</span>  TIME <span class="hljs-number">17</span>:<span class="hljs-number">03</span>:<span class="hljs-number">06</span>;
+MODIFIED	= DATE <span class="hljs-number">14</span><span class="hljs-number">-05</span><span class="hljs-number">-13</span>  TIME <span class="hljs-number">17</span>:<span class="hljs-number">21</span>:<span class="hljs-number">44</span>;
+FILE_NAME	= ;
+VERSION		= <span class="hljs-number">0</span>;
+LINE_COUNT	= <span class="hljs-number">118</span>;
+MEMORY_SIZE	= <span class="hljs-number">4365</span>;
+PROTECT		= READ_WRITE;
+TCD:  STACK_SIZE	= <span class="hljs-number">0</span>,
+      TASK_PRIORITY	= <span class="hljs-number">50</span>,
+      TIME_SLICE	= <span class="hljs-number">0</span>,
+      BUSY_LAMP_OFF	= <span class="hljs-number">0</span>,
+      ABORT_REQUEST	= <span class="hljs-number">0</span>,
+      PAUSE_REQUEST	= <span class="hljs-number">0</span>;
+DEFAULT_GROUP	= <span class="hljs-number">1</span>,*,*,*,*;
+CONTROL_CODE	= <span class="hljs-number">00000000</span> <span class="hljs-number">00000000</span>;
+<span class="hljs-keyword">/MN</span>
+  <span class="hljs-comment">! motion ;</span>
+J <span class="hljs-built_in">P[<span class="hljs-number">1</span><span class="hljs-symbol">:test point</span>]</span> <span class="hljs-number">100</span>% <span class="hljs-keyword">FINE</span>    ;
+J <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100</span><span class="hljs-number">.0</span>sec <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+J <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100msec</span> <span class="hljs-keyword">CNT</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100</span>/sec <span class="hljs-keyword">FINE</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100cm/min</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100</span><span class="hljs-number">.0</span>inch/min <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100deg/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+  <span class="hljs-comment">! indirect speed ;</span>
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>sec <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+  <span class="hljs-comment">! indirect indirect ;</span>
+L <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span> <span class="hljs-built_in">R[<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>]</span>msec <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+  <span class="hljs-comment">! indirect destination ;</span>
+L <span class="hljs-built_in">PR[<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>]</span> <span class="hljs-literal">max_speed</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span>    ;
+   ;
+  <span class="hljs-comment">! assignment ;</span>
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">R[<span class="hljs-number">2</span>]</span>    ;
+  <span class="hljs-comment">! indirect assignment ;</span>
+  <span class="hljs-built_in">R[<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>]</span>=<span class="hljs-built_in">R[<span class="hljs-number">2</span>]</span> ;
+  <span class="hljs-comment">! system variables ;</span>
+  <span class="hljs-variable">$foo</span>=<span class="hljs-variable">$bar</span>[<span class="hljs-number">100</span>].<span class="hljs-variable">$baz</span> ;
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-variable">$FOO</span>.<span class="hljs-variable">$BAR</span> ;
+    ;
+  <span class="hljs-comment">! various keyword assignments ;</span>
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">LPOS</span>    ;
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">JPOS</span>    ;
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">UFRAME[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">UTOOL[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span>    ;
+  <span class="hljs-built_in">PR[<span class="hljs-number">1</span>,<span class="hljs-number">1</span><span class="hljs-symbol">:component</span>]</span>=<span class="hljs-number">5</span>    ;
+  <span class="hljs-built_in">SR[<span class="hljs-number">1</span><span class="hljs-symbol">:string reg</span>]</span>=<span class="hljs-built_in">SR[<span class="hljs-number">2</span>]</span>+<span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span>    ;
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">SO[<span class="hljs-number">1</span><span class="hljs-symbol">:Cycle start</span>]</span> <span class="hljs-keyword">DIV</span> <span class="hljs-built_in">SI[<span class="hljs-number">2</span><span class="hljs-symbol">:Remote</span>]</span>    ;
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">UO[<span class="hljs-number">1</span><span class="hljs-symbol">:Cmd enabled</span>]</span> <span class="hljs-keyword">MOD</span> <span class="hljs-built_in">UI[<span class="hljs-number">1</span><span class="hljs-symbol">:*IMSTP</span>]</span>    ;
+  <span class="hljs-comment">! mixed logic ;</span>
+  <span class="hljs-built_in">DO[<span class="hljs-number">1</span>]</span>=(<span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span> <span class="hljs-keyword">AND</span> <span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span> <span class="hljs-keyword">AND</span> <span class="hljs-built_in">F[<span class="hljs-number">1</span>]</span> <span class="hljs-keyword">OR</span> <span class="hljs-built_in">TIMER[<span class="hljs-number">1</span>]</span>&gt;<span class="hljs-built_in">TIMER_OVERFLOW[<span class="hljs-number">1</span>]</span>) ;
+  <span class="hljs-built_in">F[<span class="hljs-number">1</span>]</span>=(<span class="hljs-literal">ON</span>) ;
+  <span class="hljs-built_in">JOINT_MAX_SPEED[<span class="hljs-number">1</span>]</span>=<span class="hljs-number">5</span> ;
+  <span class="hljs-keyword">LINEAR_MAX_SPEED</span>=<span class="hljs-number">5</span> ;
+  <span class="hljs-keyword">SKIP</span> <span class="hljs-keyword">CONDITION</span> <span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">OFF</span>-   ;
+  <span class="hljs-built_in">PAYLOAD[<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>]</span> ;
+  <span class="hljs-keyword">OFFSET</span> <span class="hljs-keyword">CONDITION</span> <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>    ;
+  <span class="hljs-keyword">UFRAME_NUM</span>=<span class="hljs-number">1</span> ;
+  <span class="hljs-keyword">UTOOL_NUM</span>=<span class="hljs-number">1</span> ;
+  <span class="hljs-built_in">UFRAME[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">UTOOL[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">RSR[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">ENABLE</span> ;
+  <span class="hljs-built_in">RSR[<span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span>]</span>=<span class="hljs-literal">DISABLE</span> ;
+  <span class="hljs-built_in">UALM[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">TIMER[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">START</span> ;
+  <span class="hljs-built_in">TIMER[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">STOP</span> ;
+  <span class="hljs-built_in">TIMER[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">RESET</span> ;
+  <span class="hljs-keyword">OVERRIDE</span>=<span class="hljs-number">50</span>% ;
+  <span class="hljs-keyword">TOOL_OFFSET</span> <span class="hljs-keyword">CONDITION</span> <span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>    ;
+  <span class="hljs-keyword">LOCK</span> <span class="hljs-keyword">PREG</span> ;
+  <span class="hljs-keyword">UNLOCK</span> <span class="hljs-keyword">PREG</span> ;
+  <span class="hljs-keyword">COL</span> <span class="hljs-keyword">DETECT</span> <span class="hljs-literal">ON</span> ;
+  <span class="hljs-keyword">COL</span> <span class="hljs-keyword">DETECT</span> <span class="hljs-literal">OFF</span> ;
+  <span class="hljs-keyword">COL</span> <span class="hljs-keyword">GUARD</span> <span class="hljs-keyword">ADJUST</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-keyword">COL</span> <span class="hljs-keyword">GUARD</span> <span class="hljs-keyword">ADJUST</span> <span class="hljs-number">50</span> ;
+  <span class="hljs-keyword">MONITOR</span> TEST ;
+  <span class="hljs-keyword">MONITOR</span> <span class="hljs-keyword">END</span> TEST ;
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-keyword">STRLEN</span> <span class="hljs-built_in">SR[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-built_in">SR[<span class="hljs-number">1</span>]</span>=<span class="hljs-keyword">SUBSTR</span> <span class="hljs-built_in">SR[<span class="hljs-number">2</span>]</span>,<span class="hljs-built_in">R[<span class="hljs-number">3</span>]</span>,<span class="hljs-built_in">R[<span class="hljs-number">4</span>]</span> ;
+  <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-keyword">FINDSTR</span> <span class="hljs-built_in">SR[<span class="hljs-number">1</span>]</span>,<span class="hljs-built_in">SR[<span class="hljs-number">2</span>]</span> ;
+  <span class="hljs-built_in">DIAG_REC[<span class="hljs-number">1</span>,<span class="hljs-number">5</span>,<span class="hljs-number">2</span>]</span> ;
+   ;
+  <span class="hljs-comment">! program calls ;</span>
+  <span class="hljs-keyword">CALL</span> TEST ;
+  <span class="hljs-keyword">CALL</span> TEST(<span class="hljs-number">1</span>,<span class="hljs-string">&#x27;string&#x27;</span>,<span class="hljs-built_in">SR[<span class="hljs-number">1</span>]</span>,<span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span>) ;
+  <span class="hljs-keyword">RUN</span> TEST ;
+  <span class="hljs-keyword">RUN</span> TEST(<span class="hljs-number">1</span>,<span class="hljs-string">&#x27;string&#x27;</span>,<span class="hljs-built_in">SR[<span class="hljs-number">1</span>]</span>,<span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span>) ;
+   ;
+  <span class="hljs-comment">! conditionals ;</span>
+  <span class="hljs-keyword">IF</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-number">1</span>,<span class="hljs-keyword">JMP</span> <span class="hljs-built_in">LBL[<span class="hljs-number">5</span>]</span> ;
+  <span class="hljs-keyword">IF</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">AR[<span class="hljs-number">1</span>]</span>,<span class="hljs-keyword">CALL</span> TEST ;
+  <span class="hljs-keyword">IF</span> (<span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span>),<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=(<span class="hljs-number">5</span>) ;
+  <span class="hljs-keyword">SELECT</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-number">1</span>,<span class="hljs-keyword">JMP</span> <span class="hljs-built_in">LBL[<span class="hljs-number">5</span>]</span> ;
+         =<span class="hljs-number">2</span>,<span class="hljs-keyword">CALL</span> TEST ;
+         <span class="hljs-keyword">ELSE</span>,<span class="hljs-keyword">JMP</span> <span class="hljs-built_in">LBL[<span class="hljs-number">100</span>]</span> ;
+  <span class="hljs-keyword">FOR</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>=<span class="hljs-number">1</span> <span class="hljs-keyword">TO</span> <span class="hljs-built_in">R[<span class="hljs-number">2</span>]</span> ;
+  <span class="hljs-keyword">ENDFOR</span> ;
+   ;
+  <span class="hljs-comment">! wait statement ;</span>
+  <span class="hljs-keyword">WAIT</span>   <span class="hljs-number">1</span><span class="hljs-number">.00</span>(sec) ;
+  <span class="hljs-keyword">WAIT</span> <span class="hljs-built_in">R[<span class="hljs-number">5</span>]</span> ;
+  <span class="hljs-keyword">WAIT</span> <span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">ON</span>    ;
+  <span class="hljs-keyword">WAIT</span> <span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">ON</span>+    ;
+  <span class="hljs-keyword">WAIT</span> <span class="hljs-keyword">ERR_NUM</span>=<span class="hljs-number">1</span>    ;
+  <span class="hljs-keyword">WAIT</span> (<span class="hljs-built_in">DI[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">ON</span>) ;
+   ;
+  <span class="hljs-comment">! jumps and labels ;</span>
+  <span class="hljs-keyword">JMP</span> <span class="hljs-built_in">LBL[<span class="hljs-number">1</span>]</span> ;
+  <span class="hljs-keyword">JMP</span> <span class="hljs-built_in">LBL[<span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>]</span> ;
+  <span class="hljs-built_in">LBL[<span class="hljs-number">100</span>]</span> ;
+  <span class="hljs-built_in">LBL[<span class="hljs-number">100</span><span class="hljs-symbol">:TEST</span>]</span> ;
+   ;
+  <span class="hljs-comment">! statements ;</span>
+  <span class="hljs-keyword">PAUSE</span> ;
+  <span class="hljs-keyword">ABORT</span> ;
+  <span class="hljs-keyword">ERROR_PROG</span>=ALL ;
+  <span class="hljs-built_in">RESUME_PROG[<span class="hljs-number">1</span>]</span>=TEST ;
+  <span class="hljs-keyword">END</span> ;
+  <span class="hljs-built_in">MESSAGE[ASDF]</span> ;
+   ;
+  <span class="hljs-comment">! comments ;</span>
+  <span class="hljs-comment">--eg:ASDFASDFASDF ;</span>
+  <span class="hljs-comment">// L P[9] 100mm/sec CNT100 ACC100    ;</span>
+   ;
+  <span class="hljs-comment">! motion modifiers ;</span>
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">ACC</span><span class="hljs-number">100</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">ACC</span> <span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Skip</span>,<span class="hljs-built_in">LBL[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">BREAK</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Offset</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">PSPD</span><span class="hljs-number">50</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Offset</span>,<span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">INC</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">RT_LD</span><span class="hljs-built_in">R[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">AP_LD</span><span class="hljs-number">50</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Tool_Offset</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Tool_Offset</span>,<span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">Skip</span>,<span class="hljs-built_in">LBL[<span class="hljs-number">1</span>]</span>,<span class="hljs-built_in">PR[<span class="hljs-number">1</span>]</span>=<span class="hljs-literal">LPOS</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">TB</span> <span class="hljs-built_in">R[<span class="hljs-number">5</span>]</span>sec,<span class="hljs-keyword">CALL</span> ALL    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">TA</span>   <span class="hljs-number">0</span><span class="hljs-number">.00</span>sec,<span class="hljs-built_in">AO[<span class="hljs-number">1</span>]</span>=<span class="hljs-built_in">R[<span class="hljs-number">5</span>]</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">DB</span>    <span class="hljs-number">0</span><span class="hljs-number">.0</span>mm,<span class="hljs-keyword">CALL</span> ALL    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">PTH</span>    ;
+L <span class="hljs-built_in">P[<span class="hljs-number">1</span>]</span> <span class="hljs-number">100mm/sec</span> <span class="hljs-keyword">CNT</span><span class="hljs-number">100</span> <span class="hljs-keyword">VOFFSET</span>,<span class="hljs-built_in">VR[<span class="hljs-number">1</span>]</span> ;
+<span class="hljs-keyword">/POS</span>
+<span class="hljs-built_in">P[<span class="hljs-number">1</span><span class="hljs-symbol">:&quot;test&quot;</span>]</span>{
+   <span class="hljs-keyword">GP</span><span class="hljs-number">1</span>:
+	<span class="hljs-keyword">UF</span> : <span class="hljs-number">0</span>, <span class="hljs-keyword">UT</span> : <span class="hljs-number">1</span>,		<span class="hljs-keyword">CONFIG</span> : <span class="hljs-string">&#x27;&#x27;</span>,
+	<span class="hljs-keyword">X</span> =   <span class="hljs-number">550</span><span class="hljs-number">.000</span>  mm,	<span class="hljs-keyword">Y</span> =     <span class="hljs-number">0</span><span class="hljs-number">.000</span>  mm,	<span class="hljs-keyword">Z</span> =  <span class="hljs-number">-685.000</span>  mm,
+	<span class="hljs-keyword">W</span> =   <span class="hljs-number">180</span><span class="hljs-number">.000</span> deg,	<span class="hljs-keyword">P</span> =     <span class="hljs-number">0</span><span class="hljs-number">.000</span> deg,	<span class="hljs-keyword">R</span> =     <span class="hljs-number">0</span><span class="hljs-number">.000</span> deg
+};
+<span class="hljs-keyword">/END</span>
diff --git a/test/markup/tp/default.txt b/test/markup/tp/default.txt
new file mode 100644
index 0000000000..e88134c4de
--- /dev/null
+++ b/test/markup/tp/default.txt
@@ -0,0 +1,156 @@
+/PROG  ALL
+/ATTR
+OWNER		= MNEDITOR;
+COMMENT		= "";
+PROG_SIZE	= 3689;
+CREATE		= DATE 14-05-13  TIME 17:03:06;
+MODIFIED	= DATE 14-05-13  TIME 17:21:44;
+FILE_NAME	= ;
+VERSION		= 0;
+LINE_COUNT	= 118;
+MEMORY_SIZE	= 4365;
+PROTECT		= READ_WRITE;
+TCD:  STACK_SIZE	= 0,
+      TASK_PRIORITY	= 50,
+      TIME_SLICE	= 0,
+      BUSY_LAMP_OFF	= 0,
+      ABORT_REQUEST	= 0,
+      PAUSE_REQUEST	= 0;
+DEFAULT_GROUP	= 1,*,*,*,*;
+CONTROL_CODE	= 00000000 00000000;
+/MN
+  ! motion ;
+J P[1:test point] 100% FINE    ;
+J P[1] 100.0sec CNT100    ;
+J P[1] 100msec CNT R[1]    ;
+L P[1] 100/sec FINE    ;
+L P[1] 100cm/min CNT100    ;
+L P[1] 100.0inch/min CNT100    ;
+L P[1] 100deg/sec CNT100    ;
+  ! indirect speed ;
+L P[1] R[1]sec CNT100    ;
+  ! indirect indirect ;
+L PR[1] R[R[1]]msec CNT100    ;
+  ! indirect destination ;
+L PR[R[1]] max_speed CNT100    ;
+   ;
+  ! assignment ;
+  R[1]=R[2]    ;
+  ! indirect assignment ;
+  R[R[1]]=R[2] ;
+  ! system variables ;
+  $foo=$bar[100].$baz ;
+  R[1]=$FOO.$BAR ;
+    ;
+  ! various keyword assignments ;
+  PR[1]=LPOS    ;
+  PR[1]=JPOS    ;
+  PR[1]=UFRAME[1] ;
+  PR[1]=UTOOL[1] ;
+  PR[1]=P[1]    ;
+  PR[1,1:component]=5    ;
+  SR[1:string reg]=SR[2]+AR[1]    ;
+  R[1]=SO[1:Cycle start] DIV SI[2:Remote]    ;
+  R[1]=UO[1:Cmd enabled] MOD UI[1:*IMSTP]    ;
+  ! mixed logic ;
+  DO[1]=(DI[1] AND AR[1] AND F[1] OR TIMER[1]>TIMER_OVERFLOW[1]) ;
+  F[1]=(ON) ;
+  JOINT_MAX_SPEED[1]=5 ;
+  LINEAR_MAX_SPEED=5 ;
+  SKIP CONDITION DI[1]=OFF-   ;
+  PAYLOAD[R[1]] ;
+  OFFSET CONDITION PR[1]    ;
+  UFRAME_NUM=1 ;
+  UTOOL_NUM=1 ;
+  UFRAME[1]=PR[1] ;
+  UTOOL[1]=PR[1] ;
+  RSR[1]=ENABLE ;
+  RSR[AR[1]]=DISABLE ;
+  UALM[1] ;
+  TIMER[1]=START ;
+  TIMER[1]=STOP ;
+  TIMER[1]=RESET ;
+  OVERRIDE=50% ;
+  TOOL_OFFSET CONDITION PR[1]    ;
+  LOCK PREG ;
+  UNLOCK PREG ;
+  COL DETECT ON ;
+  COL DETECT OFF ;
+  COL GUARD ADJUST R[1] ;
+  COL GUARD ADJUST 50 ;
+  MONITOR TEST ;
+  MONITOR END TEST ;
+  R[1]=STRLEN SR[1] ;
+  SR[1]=SUBSTR SR[2],R[3],R[4] ;
+  R[1]=FINDSTR SR[1],SR[2] ;
+  DIAG_REC[1,5,2] ;
+   ;
+  ! program calls ;
+  CALL TEST ;
+  CALL TEST(1,'string',SR[1],AR[1]) ;
+  RUN TEST ;
+  RUN TEST(1,'string',SR[1],AR[1]) ;
+   ;
+  ! conditionals ;
+  IF R[1]=1,JMP LBL[5] ;
+  IF R[1]=AR[1],CALL TEST ;
+  IF (DI[1]),R[1]=(5) ;
+  SELECT R[1]=1,JMP LBL[5] ;
+         =2,CALL TEST ;
+         ELSE,JMP LBL[100] ;
+  FOR R[1]=1 TO R[2] ;
+  ENDFOR ;
+   ;
+  ! wait statement ;
+  WAIT   1.00(sec) ;
+  WAIT R[5] ;
+  WAIT DI[1]=ON    ;
+  WAIT DI[1]=ON+    ;
+  WAIT ERR_NUM=1    ;
+  WAIT (DI[1]=ON) ;
+   ;
+  ! jumps and labels ;
+  JMP LBL[1] ;
+  JMP LBL[R[1]] ;
+  LBL[100] ;
+  LBL[100:TEST] ;
+   ;
+  ! statements ;
+  PAUSE ;
+  ABORT ;
+  ERROR_PROG=ALL ;
+  RESUME_PROG[1]=TEST ;
+  END ;
+  MESSAGE[ASDF] ;
+   ;
+  ! comments ;
+  --eg:ASDFASDFASDF ;
+  // L P[9] 100mm/sec CNT100 ACC100    ;
+   ;
+  ! motion modifiers ;
+L P[1] 100mm/sec CNT100 ACC100    ;
+L P[1] 100mm/sec CNT100 ACC R[1]    ;
+L P[1] 100mm/sec CNT100 Skip,LBL[1]    ;
+L P[1] 100mm/sec CNT100 BREAK    ;
+L P[1] 100mm/sec CNT100 Offset    ;
+L P[1] 100mm/sec CNT100 PSPD50    ;
+L P[1] 100mm/sec CNT100 Offset,PR[1]    ;
+L P[1] 100mm/sec CNT100 INC    ;
+L P[1] 100mm/sec CNT100 RT_LDR[1]    ;
+L P[1] 100mm/sec CNT100 AP_LD50    ;
+L P[1] 100mm/sec CNT100 Tool_Offset    ;
+L P[1] 100mm/sec CNT100 Tool_Offset,PR[1]    ;
+L P[1] 100mm/sec CNT100 Skip,LBL[1],PR[1]=LPOS    ;
+L P[1] 100mm/sec CNT100 TB R[5]sec,CALL ALL    ;
+L P[1] 100mm/sec CNT100 TA   0.00sec,AO[1]=R[5]    ;
+L P[1] 100mm/sec CNT100 DB    0.0mm,CALL ALL    ;
+L P[1] 100mm/sec CNT100 PTH    ;
+L P[1] 100mm/sec CNT100 VOFFSET,VR[1] ;
+/POS
+P[1:"test"]{
+   GP1:
+	UF : 0, UT : 1,		CONFIG : '',
+	X =   550.000  mm,	Y =     0.000  mm,	Z =  -685.000  mm,
+	W =   180.000 deg,	P =     0.000 deg,	R =     0.000 deg
+};
+/END
diff --git a/test/markup/vala/default.expect.txt b/test/markup/vala/default.expect.txt
new file mode 100644
index 0000000000..ce90b2b45f
--- /dev/null
+++ b/test/markup/vala/default.expect.txt
@@ -0,0 +1,46 @@
+<span class="hljs-keyword">using</span> <span class="hljs-built_in">DBus</span>;
+
+<span class="hljs-class"><span class="hljs-keyword">namespace</span> <span class="hljs-title">Test</span> </span>{
+  <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Foo</span> : <span class="hljs-title">Object</span> </span>{
+    <span class="hljs-keyword">public</span> <span class="hljs-keyword">signal</span> <span class="hljs-keyword">void</span> some_event ();   <span class="hljs-comment">// definition of the signal</span>
+    <span class="hljs-keyword">public</span> <span class="hljs-keyword">void</span> method () {
+      some_event ();                    <span class="hljs-comment">// emitting the signal (callbacks get invoked)</span>
+    }
+  }
+}
+
+<span class="hljs-comment">/* defining a class */</span>
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Track</span> : <span class="hljs-title">GLib</span>.<span class="hljs-title">Object</span>, <span class="hljs-title">Test</span>.<span class="hljs-title">Foo</span> </span>{              <span class="hljs-comment">/* subclassing &#x27;GLib.Object&#x27; */</span>
+  <span class="hljs-keyword">public</span> <span class="hljs-keyword">double</span> mass;                  <span class="hljs-comment">/* a public field */</span>
+  <span class="hljs-keyword">public</span> <span class="hljs-keyword">double</span> name { <span class="hljs-keyword">get</span>; <span class="hljs-keyword">set</span>; }     <span class="hljs-comment">/* a public property */</span>
+  <span class="hljs-keyword">private</span> <span class="hljs-keyword">bool</span> terminated = <span class="hljs-literal">false</span>;     <span class="hljs-comment">/* a private field */</span>
+  <span class="hljs-keyword">public</span> <span class="hljs-keyword">void</span> terminate() {            <span class="hljs-comment">/* a public method */</span>
+    terminated = <span class="hljs-literal">true</span>;
+  }
+}
+
+<span class="hljs-keyword">const</span> ALL_UPPER_CASE = <span class="hljs-string">&quot;you should follow this convention&quot;</span>;
+
+<span class="hljs-keyword">var</span> t = <span class="hljs-keyword">new</span> Track();      <span class="hljs-comment">// same as: Track t = new Track();</span>
+<span class="hljs-keyword">var</span> s = <span class="hljs-string">&quot;hello&quot;</span>;          <span class="hljs-comment">// same as: string s = &quot;hello&quot;;</span>
+<span class="hljs-keyword">var</span> l = <span class="hljs-keyword">new</span> List&lt;<span class="hljs-keyword">int</span>&gt;();       <span class="hljs-comment">// same as: List&lt;int&gt; l = new List&lt;int&gt;();</span>
+<span class="hljs-keyword">var</span> i = <span class="hljs-number">10</span>;               <span class="hljs-comment">// same as: int i = 10;</span>
+
+
+<span class="hljs-meta">#if (ololo)</span>
+Regex regex = /foo/;
+<span class="hljs-meta">#endif</span>
+
+<span class="hljs-comment">/*
+ * Entry point can be outside class
+ */</span>
+<span class="hljs-keyword">void</span> main () {
+  <span class="hljs-keyword">var</span> long_string = <span class="hljs-string">&quot;&quot;&quot;
+    Example of &quot;verbatim string&quot;.
+    Same as in @&quot;string&quot; in C#
+  &quot;&quot;&quot;</span>
+  <span class="hljs-keyword">var</span> foo = <span class="hljs-keyword">new</span> Foo ();
+  foo.some_event.connect (callback_a);      <span class="hljs-comment">// connecting the callback functions</span>
+  foo.some_event.connect (callback_b);
+  foo.method ();
+}
diff --git a/test/markup/vala/default.txt b/test/markup/vala/default.txt
new file mode 100644
index 0000000000..aed0468299
--- /dev/null
+++ b/test/markup/vala/default.txt
@@ -0,0 +1,46 @@
+using DBus;
+
+namespace Test {
+  class Foo : Object {
+    public signal void some_event ();   // definition of the signal
+    public void method () {
+      some_event ();                    // emitting the signal (callbacks get invoked)
+    }
+  }
+}
+
+/* defining a class */
+class Track : GLib.Object, Test.Foo {              /* subclassing 'GLib.Object' */
+  public double mass;                  /* a public field */
+  public double name { get; set; }     /* a public property */
+  private bool terminated = false;     /* a private field */
+  public void terminate() {            /* a public method */
+    terminated = true;
+  }
+}
+
+const ALL_UPPER_CASE = "you should follow this convention";
+
+var t = new Track();      // same as: Track t = new Track();
+var s = "hello";          // same as: string s = "hello";
+var l = new List<int>();       // same as: List<int> l = new List<int>();
+var i = 10;               // same as: int i = 10;
+
+
+#if (ololo)
+Regex regex = /foo/;
+#endif
+
+/*
+ * Entry point can be outside class
+ */
+void main () {
+  var long_string = """
+    Example of "verbatim string".
+    Same as in @"string" in C#
+  """
+  var foo = new Foo ();
+  foo.some_event.connect (callback_a);      // connecting the callback functions
+  foo.some_event.connect (callback_b);
+  foo.method ();
+}
diff --git a/test/markup/vbnet/default.expect.txt b/test/markup/vbnet/default.expect.txt
new file mode 100644
index 0000000000..0a4ea92e19
--- /dev/null
+++ b/test/markup/vbnet/default.expect.txt
@@ -0,0 +1,42 @@
+Import System
+Import System.IO
+<span class="hljs-meta">#Const DEBUG = True</span>
+
+<span class="hljs-keyword">Namespace</span> Highlighter.Test
+  <span class="hljs-comment"><span class="hljs-doctag">&#x27;&#x27;&#x27;</span> <span class="hljs-doctag">&lt;summary&gt;</span>This is an example class.<span class="hljs-doctag">&lt;/summary&gt;</span></span>
+  <span class="hljs-keyword">Public</span> <span class="hljs-keyword">Class</span> Program
+    <span class="hljs-keyword">Protected</span> <span class="hljs-keyword">Shared</span> hello <span class="hljs-keyword">As</span> <span class="hljs-built_in">Integer</span> = <span class="hljs-number">3</span>
+    <span class="hljs-keyword">Private</span> <span class="hljs-keyword">Const</span> ABC <span class="hljs-keyword">As</span> <span class="hljs-built_in">Boolean</span> = <span class="hljs-literal">False</span>
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">Region</span> &quot;Code&quot;</span>
+    <span class="hljs-comment">&#x27; Cheers!</span>
+    &lt;STAThread()&gt; _
+    <span class="hljs-keyword">Public</span> <span class="hljs-keyword">Shared</span> <span class="hljs-keyword">Sub</span> Main(<span class="hljs-keyword">ByVal</span> args() <span class="hljs-keyword">As</span> <span class="hljs-built_in">String</span>, <span class="hljs-keyword">ParamArray</span> arr <span class="hljs-keyword">As</span> <span class="hljs-built_in">Object</span>) <span class="hljs-keyword">Handles</span> Form1.Click
+      <span class="hljs-keyword">On</span> <span class="hljs-keyword">Error</span> <span class="hljs-keyword">Resume</span> <span class="hljs-keyword">Next</span>
+      <span class="hljs-keyword">If</span> ABC <span class="hljs-keyword">Then</span>
+        <span class="hljs-keyword">While</span> ABC : Console.WriteLine() : <span class="hljs-keyword">End</span> <span class="hljs-keyword">While</span>
+        <span class="hljs-keyword">For</span> i <span class="hljs-keyword">As</span> <span class="hljs-built_in">Long</span> = <span class="hljs-number">0</span> <span class="hljs-keyword">To</span> <span class="hljs-number">1000</span> <span class="hljs-keyword">Step</span> <span class="hljs-number">123</span>
+          <span class="hljs-keyword">Try</span>
+            System.Windows.Forms.MessageBox.Show(<span class="hljs-built_in">CInt</span>(<span class="hljs-string">&quot;1&quot;</span>).ToString())
+          <span class="hljs-keyword">Catch</span> ex <span class="hljs-keyword">As</span> Exception       <span class="hljs-comment">&#x27; What are you doing? Well...</span>
+            <span class="hljs-keyword">Dim</span> exp = <span class="hljs-built_in">CType</span>(ex, IOException)
+            <span class="hljs-keyword">REM</span> ORZ
+            <span class="hljs-keyword">Return</span>
+          <span class="hljs-keyword">End</span> <span class="hljs-keyword">Try</span>
+        <span class="hljs-keyword">Next</span>
+      <span class="hljs-keyword">Else</span>
+        <span class="hljs-keyword">Dim</span> l <span class="hljs-keyword">As</span> <span class="hljs-keyword">New</span> System.Collections.List&lt;<span class="hljs-built_in">String</span>&gt;()
+        <span class="hljs-keyword">SyncLock</span> l
+          <span class="hljs-keyword">If</span> <span class="hljs-built_in">TypeOf</span> l <span class="hljs-keyword">Is</span> <span class="hljs-built_in">Decimal</span> <span class="hljs-keyword">And</span> l <span class="hljs-keyword">IsNot</span> <span class="hljs-literal">Nothing</span> <span class="hljs-keyword">Then</span>
+            <span class="hljs-keyword">RemoveHandler</span> button1.Paint, <span class="hljs-keyword">delegate</span>
+          <span class="hljs-keyword">End</span> <span class="hljs-keyword">If</span>
+          <span class="hljs-keyword">Dim</span> d = <span class="hljs-keyword">New</span> System.Threading.Thread(<span class="hljs-keyword">AddressOf</span> ThreadProc)
+          <span class="hljs-keyword">Dim</span> a = <span class="hljs-keyword">New</span> Action(<span class="hljs-keyword">Sub</span>(x, y) x + y)
+          <span class="hljs-keyword">Static</span> u = <span class="hljs-keyword">From</span> x <span class="hljs-keyword">As</span> <span class="hljs-built_in">String</span> <span class="hljs-keyword">In</span> l <span class="hljs-keyword">Select</span> x.Substring(<span class="hljs-number">2</span>, <span class="hljs-number">4</span>) <span class="hljs-keyword">Where</span> x.Length &gt; <span class="hljs-number">0</span>
+        <span class="hljs-keyword">End</span> <span class="hljs-keyword">SyncLock</span>
+        <span class="hljs-keyword">Do</span> : Laugh() : <span class="hljs-keyword">Loop</span> <span class="hljs-keyword">Until</span> hello = <span class="hljs-number">4</span>
+      <span class="hljs-keyword">End</span> <span class="hljs-keyword">If</span>
+    <span class="hljs-keyword">End</span> <span class="hljs-keyword">Sub</span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">End</span> <span class="hljs-meta-keyword">Region</span></span>
+  <span class="hljs-keyword">End</span> <span class="hljs-keyword">Class</span>
+<span class="hljs-keyword">End</span> <span class="hljs-keyword">Namespace</span>
diff --git a/test/markup/vbnet/default.txt b/test/markup/vbnet/default.txt
new file mode 100644
index 0000000000..00ac1520e0
--- /dev/null
+++ b/test/markup/vbnet/default.txt
@@ -0,0 +1,42 @@
+Import System
+Import System.IO
+#Const DEBUG = True
+
+Namespace Highlighter.Test
+  ''' <summary>This is an example class.</summary>
+  Public Class Program
+    Protected Shared hello As Integer = 3
+    Private Const ABC As Boolean = False
+
+#Region "Code"
+    ' Cheers!
+    <STAThread()> _
+    Public Shared Sub Main(ByVal args() As String, ParamArray arr As Object) Handles Form1.Click
+      On Error Resume Next
+      If ABC Then
+        While ABC : Console.WriteLine() : End While
+        For i As Long = 0 To 1000 Step 123
+          Try
+            System.Windows.Forms.MessageBox.Show(CInt("1").ToString())
+          Catch ex As Exception       ' What are you doing? Well...
+            Dim exp = CType(ex, IOException)
+            REM ORZ
+            Return
+          End Try
+        Next
+      Else
+        Dim l As New System.Collections.List<String>()
+        SyncLock l
+          If TypeOf l Is Decimal And l IsNot Nothing Then
+            RemoveHandler button1.Paint, delegate
+          End If
+          Dim d = New System.Threading.Thread(AddressOf ThreadProc)
+          Dim a = New Action(Sub(x, y) x + y)
+          Static u = From x As String In l Select x.Substring(2, 4) Where x.Length > 0
+        End SyncLock
+        Do : Laugh() : Loop Until hello = 4
+      End If
+    End Sub
+#End Region
+  End Class
+End Namespace
diff --git a/test/markup/vbscript-html/default.expect.txt b/test/markup/vbscript-html/default.expect.txt
new file mode 100644
index 0000000000..7c00d6b4b0
--- /dev/null
+++ b/test/markup/vbscript-html/default.expect.txt
@@ -0,0 +1,8 @@
+<span class="xml"><span class="hljs-tag">&lt;<span class="hljs-name">body</span>&gt;</span>
+</span><span class="vbscript">&lt;%
+<span class="hljs-keyword">If</span> i &lt;  <span class="hljs-number">10</span> <span class="hljs-keyword">Then</span>
+  <span class="hljs-built_in">response</span>.write(<span class="hljs-string">&quot;Good morning!&quot;</span>)
+<span class="hljs-keyword">End</span> <span class="hljs-keyword">If</span>
+%&gt;</span><span class="xml">
+<span class="hljs-tag">&lt;/<span class="hljs-name">body</span>&gt;</span>
+</span>
\ No newline at end of file
diff --git a/test/markup/vbscript-html/default.txt b/test/markup/vbscript-html/default.txt
new file mode 100644
index 0000000000..6627356d7f
--- /dev/null
+++ b/test/markup/vbscript-html/default.txt
@@ -0,0 +1,7 @@
+<body>
+<%
+If i <  10 Then
+  response.write("Good morning!")
+End If
+%>
+</body>
diff --git a/test/markup/vbscript/default.expect.txt b/test/markup/vbscript/default.expect.txt
new file mode 100644
index 0000000000..60734966cb
--- /dev/null
+++ b/test/markup/vbscript/default.expect.txt
@@ -0,0 +1,29 @@
+<span class="hljs-comment">&#x27; creating configuration storage and initializing with default values</span>
+<span class="hljs-keyword">Set</span> cfg = <span class="hljs-built_in">CreateObject</span>(<span class="hljs-string">&quot;Scripting.Dictionary&quot;</span>)
+
+<span class="hljs-comment">&#x27; reading ini file</span>
+<span class="hljs-keyword">for</span> i = <span class="hljs-number">0</span> <span class="hljs-keyword">to</span> <span class="hljs-built_in">ubound</span>(ini_strings)
+    s = <span class="hljs-built_in">trim</span>(ini_strings(i))
+
+    <span class="hljs-comment">&#x27; skipping empty strings and comments</span>
+    <span class="hljs-keyword">if</span> <span class="hljs-built_in">mid</span>(s, <span class="hljs-number">1</span>, <span class="hljs-number">1</span>) &lt;&gt; <span class="hljs-string">&quot;#&quot;</span> <span class="hljs-keyword">and</span> <span class="hljs-built_in">len</span>(s) &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span>
+      <span class="hljs-comment">&#x27; obtaining key and value</span>
+      parts = <span class="hljs-built_in">split</span>(s, <span class="hljs-string">&quot;=&quot;</span>, <span class="hljs-number">-1</span>, <span class="hljs-number">1</span>)
+
+      <span class="hljs-keyword">if</span> <span class="hljs-built_in">ubound</span>(parts)+<span class="hljs-number">1</span> = <span class="hljs-number">2</span> <span class="hljs-keyword">then</span>
+        parts(<span class="hljs-number">0</span>) = <span class="hljs-built_in">trim</span>(parts(<span class="hljs-number">0</span>))
+        parts(<span class="hljs-number">1</span>) = <span class="hljs-built_in">trim</span>(parts(<span class="hljs-number">1</span>))
+
+        <span class="hljs-comment">&#x27; reading configuration and filenames</span>
+        <span class="hljs-keyword">select</span> <span class="hljs-keyword">case</span> <span class="hljs-built_in">lcase</span>(parts(<span class="hljs-number">0</span>))
+          <span class="hljs-keyword">case</span> <span class="hljs-string">&quot;uncompressed&quot;&quot;_postfix&quot;</span> cfg.item(<span class="hljs-string">&quot;uncompressed&quot;&quot;_postfix&quot;</span>) = parts(<span class="hljs-number">1</span>)
+          <span class="hljs-keyword">case</span> <span class="hljs-string">&quot;f&quot;</span>
+                    options = <span class="hljs-built_in">split</span>(parts(<span class="hljs-number">1</span>), <span class="hljs-string">&quot;|&quot;</span>, <span class="hljs-number">-1</span>, <span class="hljs-number">1</span>)
+                    <span class="hljs-keyword">if</span> <span class="hljs-built_in">ubound</span>(options)+<span class="hljs-number">1</span> = <span class="hljs-number">2</span> <span class="hljs-keyword">then</span>
+                      <span class="hljs-comment">&#x27; 0: filename,  1: options</span>
+                      ff.add <span class="hljs-built_in">trim</span>(options(<span class="hljs-number">0</span>)), <span class="hljs-built_in">trim</span>(options(<span class="hljs-number">1</span>))
+                    <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>
+        <span class="hljs-keyword">end</span> <span class="hljs-keyword">select</span>
+      <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>
+    <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>
+<span class="hljs-keyword">next</span>
\ No newline at end of file
diff --git a/test/markup/vbscript/default.txt b/test/markup/vbscript/default.txt
new file mode 100644
index 0000000000..0982529b4b
--- /dev/null
+++ b/test/markup/vbscript/default.txt
@@ -0,0 +1,29 @@
+' creating configuration storage and initializing with default values
+Set cfg = CreateObject("Scripting.Dictionary")
+
+' reading ini file
+for i = 0 to ubound(ini_strings)
+    s = trim(ini_strings(i))
+
+    ' skipping empty strings and comments
+    if mid(s, 1, 1) <> "#" and len(s) > 0 then
+      ' obtaining key and value
+      parts = split(s, "=", -1, 1)
+
+      if ubound(parts)+1 = 2 then
+        parts(0) = trim(parts(0))
+        parts(1) = trim(parts(1))
+
+        ' reading configuration and filenames
+        select case lcase(parts(0))
+          case "uncompressed""_postfix" cfg.item("uncompressed""_postfix") = parts(1)
+          case "f"
+                    options = split(parts(1), "|", -1, 1)
+                    if ubound(options)+1 = 2 then
+                      ' 0: filename,  1: options
+                      ff.add trim(options(0)), trim(options(1))
+                    end if
+        end select
+      end if
+    end if
+next
\ No newline at end of file
diff --git a/test/markup/vhdl/default.expect.txt b/test/markup/vhdl/default.expect.txt
new file mode 100644
index 0000000000..016cace6a8
--- /dev/null
+++ b/test/markup/vhdl/default.expect.txt
@@ -0,0 +1,41 @@
+<span class="hljs-comment">/*
+ * RS-trigger with assynch. reset
+ */</span>
+
+<span class="hljs-keyword">library</span> ieee;
+<span class="hljs-keyword">use</span> ieee.std_logic_1164.<span class="hljs-keyword">all</span>;
+
+<span class="hljs-keyword">entity</span> RS_trigger <span class="hljs-keyword">is</span>
+    <span class="hljs-keyword">generic</span> (T: <span class="hljs-built_in">Time</span> := <span class="hljs-number">0</span>ns);
+    <span class="hljs-keyword">port</span> ( R, S  : <span class="hljs-keyword">in</span>  <span class="hljs-built_in">std_logic</span>;
+           Q, nQ : <span class="hljs-keyword">out</span> <span class="hljs-built_in">std_logic</span>;
+           reset, clock : <span class="hljs-keyword">in</span>  <span class="hljs-built_in">std_logic</span> );
+<span class="hljs-keyword">end</span> RS_trigger;
+
+<span class="hljs-keyword">architecture</span> behaviour <span class="hljs-keyword">of</span> RS_trigger <span class="hljs-keyword">is</span>
+    <span class="hljs-keyword">signal</span> QT: <span class="hljs-built_in">std_logic</span>; <span class="hljs-comment">-- Q(t)</span>
+<span class="hljs-keyword">begin</span>
+    <span class="hljs-keyword">process</span>(clock, reset) <span class="hljs-keyword">is</span>
+        <span class="hljs-keyword">subtype</span> RS <span class="hljs-keyword">is</span> <span class="hljs-built_in">std_logic_vector</span> (<span class="hljs-number">1</span> <span class="hljs-keyword">downto</span> <span class="hljs-number">0</span>);
+    <span class="hljs-keyword">begin</span>
+        <span class="hljs-keyword">if</span> reset = <span class="hljs-string">&#x27;0&#x27;</span> <span class="hljs-keyword">then</span>
+            QT &lt;= <span class="hljs-string">&#x27;0&#x27;</span>;
+        <span class="hljs-keyword">else</span>
+            <span class="hljs-keyword">if</span> rising_edge(C) <span class="hljs-keyword">then</span>
+                <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> (R<span class="hljs-symbol">&#x27;stable</span>(T) <span class="hljs-keyword">and</span> S<span class="hljs-symbol">&#x27;stable</span>(T)) <span class="hljs-keyword">then</span>
+                    QT &lt;= <span class="hljs-string">&#x27;X&#x27;</span>;
+                <span class="hljs-keyword">else</span>
+                    <span class="hljs-keyword">case</span> RS&#x27;(R&amp;S) <span class="hljs-keyword">is</span>
+                        <span class="hljs-keyword">when</span> <span class="hljs-string">&quot;01&quot;</span> =&gt; QT &lt;= <span class="hljs-string">&#x27;1&#x27;</span>;
+                        <span class="hljs-keyword">when</span> <span class="hljs-string">&quot;10&quot;</span> =&gt; QT &lt;= <span class="hljs-string">&#x27;0&#x27;</span>;
+                        <span class="hljs-keyword">when</span> <span class="hljs-string">&quot;11&quot;</span> =&gt; QT &lt;= <span class="hljs-string">&#x27;X&#x27;</span>;
+                        <span class="hljs-keyword">when</span> <span class="hljs-keyword">others</span> =&gt; <span class="hljs-keyword">null</span>;
+                    <span class="hljs-keyword">end</span> <span class="hljs-keyword">case</span>;
+                <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>;
+            <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>;
+        <span class="hljs-keyword">end</span> <span class="hljs-keyword">if</span>;
+    <span class="hljs-keyword">end</span> <span class="hljs-keyword">process</span>;
+
+    Q  &lt;= QT;
+    nQ &lt;= <span class="hljs-keyword">not</span> QT;
+<span class="hljs-keyword">end</span> <span class="hljs-keyword">architecture</span> behaviour;
diff --git a/test/markup/vhdl/default.txt b/test/markup/vhdl/default.txt
new file mode 100644
index 0000000000..3e7edc0445
--- /dev/null
+++ b/test/markup/vhdl/default.txt
@@ -0,0 +1,41 @@
+/*
+ * RS-trigger with assynch. reset
+ */
+
+library ieee;
+use ieee.std_logic_1164.all;
+
+entity RS_trigger is
+    generic (T: Time := 0ns);
+    port ( R, S  : in  std_logic;
+           Q, nQ : out std_logic;
+           reset, clock : in  std_logic );
+end RS_trigger;
+
+architecture behaviour of RS_trigger is
+    signal QT: std_logic; -- Q(t)
+begin
+    process(clock, reset) is
+        subtype RS is std_logic_vector (1 downto 0);
+    begin
+        if reset = '0' then
+            QT <= '0';
+        else
+            if rising_edge(C) then
+                if not (R'stable(T) and S'stable(T)) then
+                    QT <= 'X';
+                else
+                    case RS'(R&S) is
+                        when "01" => QT <= '1';
+                        when "10" => QT <= '0';
+                        when "11" => QT <= 'X';
+                        when others => null;
+                    end case;
+                end if;
+            end if;
+        end if;
+    end process;
+
+    Q  <= QT;
+    nQ <= not QT;
+end architecture behaviour;
diff --git a/test/markup/xl/default.expect.txt b/test/markup/xl/default.expect.txt
new file mode 100644
index 0000000000..d3675fcea2
--- /dev/null
+++ b/test/markup/xl/default.expect.txt
@@ -0,0 +1,28 @@
+<span class="hljs-keyword">import</span> <span class="hljs-built_in">Animate</span>
+<span class="hljs-keyword">import</span> SeasonsGreetingsTheme
+<span class="hljs-keyword">import</span> <span class="hljs-string">&quot;myhelper.xl&quot;</span>
+<span class="hljs-built_in">theme</span> <span class="hljs-string">&quot;SeasonsGreetings&quot;</span>
+<span class="hljs-function"><span class="hljs-title">function</span> X:<span class="hljs-keyword">real</span> -&gt;</span> <span class="hljs-built_in">sin</span>(X*<span class="hljs-number">0.5</span>) + <span class="hljs-number">16#0.002</span>
+<span class="hljs-built_in">page</span> <span class="hljs-string">&quot;A nice car&quot;</span>,
+<span class="hljs-comment">// --------------------------------------</span>
+<span class="hljs-comment">//    Display car model on a pedestal</span>
+<span class="hljs-comment">// --------------------------------------</span>
+    <span class="hljs-built_in">clear_color</span> <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-number">1</span>
+    <span class="hljs-function"><span class="hljs-title">hand_scale</span> -&gt;</span> <span class="hljs-number">0.3</span>
+
+    <span class="hljs-comment">// Display the background image</span>
+    <span class="hljs-built_in">background</span> -<span class="hljs-number">4000</span>,
+        <span class="hljs-built_in">locally</span>
+            disable_depth_test
+            <span class="hljs-function"><span class="hljs-title">corridor</span> N:<span class="hljs-keyword">integer</span> -&gt;</span>
+                <span class="hljs-built_in">locally</span>
+                    rotatez <span class="hljs-number">60</span> * N
+                    translatex <span class="hljs-number">1000</span>
+                    rotatey <span class="hljs-number">90</span>
+                    <span class="hljs-built_in">color</span> <span class="hljs-string">&quot;white&quot;</span>
+                    <span class="hljs-built_in">texture</span> <span class="hljs-string">&quot;stars.png&quot;</span>
+                    <span class="hljs-built_in">texture_wrap</span> <span class="hljs-literal">true</span>, <span class="hljs-literal">true</span>
+                    <span class="hljs-built_in">texture_transform</span>
+                        translate (<span class="hljs-built_in">time</span> + N) * <span class="hljs-number">0.02</span> <span class="hljs-built_in">mod</span> <span class="hljs-number">1</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>
+                        scale <span class="hljs-number">0.2</span>, <span class="hljs-number">0.3</span>, <span class="hljs-number">0.3</span>
+                    <span class="hljs-built_in">rectangle</span> <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-number">100000</span>, <span class="hljs-number">1154</span>
diff --git a/test/markup/xl/default.txt b/test/markup/xl/default.txt
new file mode 100644
index 0000000000..93f64ad31f
--- /dev/null
+++ b/test/markup/xl/default.txt
@@ -0,0 +1,28 @@
+import Animate
+import SeasonsGreetingsTheme
+import "myhelper.xl"
+theme "SeasonsGreetings"
+function X:real -> sin(X*0.5) + 16#0.002
+page "A nice car",
+// --------------------------------------
+//    Display car model on a pedestal
+// --------------------------------------
+    clear_color 0, 0, 0, 1
+    hand_scale -> 0.3
+
+    // Display the background image
+    background -4000,
+        locally
+            disable_depth_test
+            corridor N:integer ->
+                locally
+                    rotatez 60 * N
+                    translatex 1000
+                    rotatey 90
+                    color "white"
+                    texture "stars.png"
+                    texture_wrap true, true
+                    texture_transform
+                        translate (time + N) * 0.02 mod 1, 0, 0
+                        scale 0.2, 0.3, 0.3
+                    rectangle 0, 0, 100000, 1154

From b4b5bf0578644e348d19e052381cade92dc8e385 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 17 Nov 2020 00:49:55 -0500
Subject: [PATCH 173/223] chore(docs) add Slack invite link

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3a1be89561..5e4745b9f9 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![latest version](https://badgen.net/npm/v/highlight.js?label=latest)](https://www.npmjs.com/package/highlight.js)
 [![beta](https://badgen.net/npm/v/highlight.js/beta)](https://www.npmjs.com/package/highlight.js)
+[![slack](https://badgen.net/badge/icon/slack?icon=slack&label&color=pink)](https://join.slack.com/t/highlightjs/shared_invite/zt-jatdlkw4-h3LdjU5rC23t7aQ6zqoxzw)
 [![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/master/LICENSE)
 [![install size](https://badgen.net/packagephobia/install/highlight.js?label=npm+install)](https://packagephobia.now.sh/result?p=highlight.js)
 ![minified](https://img.shields.io/github/size/highlightjs/cdn-release/build/highlight.min.js?label=minified)

From f0c4a36796262132a3559b2f7800bfea85484b8a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 17 Nov 2020 00:54:04 -0500
Subject: [PATCH 174/223] (chore) eslint --fix against most grammars (#2853)

This doesn't include all grammars because I focused on those that we're in flux from other PRs.
---
 .eslintrc.js                    |  38 +-
 src/languages/abnf.js           | 116 ++---
 src/languages/accesslog.js      |  22 +-
 src/languages/actionscript.js   |  36 +-
 src/languages/ada.js            | 291 +++++++------
 src/languages/apache.js         |  54 ++-
 src/languages/applescript.js    |  31 +-
 src/languages/arcade.js         | 104 +++--
 src/languages/armasm.js         | 114 +++--
 src/languages/asciidoc.js       |  53 +--
 src/languages/aspectj.js        | 140 +++---
 src/languages/autohotkey.js     |  44 +-
 src/languages/autoit.js         | 246 ++++++-----
 src/languages/avrasm.js         |  16 +-
 src/languages/awk.js            |  34 +-
 src/languages/axapta.js         |  15 +-
 src/languages/basic.js          |  36 +-
 src/languages/bnf.js            |   6 +-
 src/languages/brainfuck.js      |   2 +-
 src/languages/cal.js            |  64 +--
 src/languages/capnproto.js      |  28 +-
 src/languages/ceylon.js         |  24 +-
 src/languages/clean.js          |  12 +-
 src/languages/clojure-repl.js   |  18 +-
 src/languages/cmake.js          |   3 +-
 src/languages/coffeescript.js   | 116 +++--
 src/languages/coq.js            |   4 +-
 src/languages/cos.js            | 121 +++---
 src/languages/crmsh.js          |  25 +-
 src/languages/csp.js            |  21 +-
 src/languages/d.js              | 109 ++---
 src/languages/dart.js           |  48 ++-
 src/languages/delphi.js         |  83 ++--
 src/languages/diff.js           |  60 ++-
 src/languages/django.js         |  35 +-
 src/languages/dns.js            |  13 +-
 src/languages/dockerfile.js     |   3 +-
 src/languages/dos.js            |  23 +-
 src/languages/dsconfig.js       |  33 +-
 src/languages/dts.js            |  62 ++-
 src/languages/dust.js           |  30 +-
 src/languages/ebnf.js           |  71 ++--
 src/languages/elixir.js         | 188 +++++---
 src/languages/elm.js            |  70 ++-
 src/languages/erb.js            |   4 +-
 src/languages/erlang-repl.js    |   4 +-
 src/languages/erlang.js         |  78 ++--
 src/languages/excel.js          |  29 +-
 src/languages/fix.js            |  33 +-
 src/languages/flix.js           |  79 ++--
 src/languages/fortran.js        |  30 +-
 src/languages/fsharp.js         |  16 +-
 src/languages/gams.js           |  72 ++--
 src/languages/gauss.js          | 114 ++---
 src/languages/gcode.js          | 131 +++---
 src/languages/gherkin.js        |  11 +-
 src/languages/glsl.js           |   5 +-
 src/languages/gml.js            |   7 +-
 src/languages/go.js             |  19 +-
 src/languages/golo.js           |  31 +-
 src/languages/gradle.js         |   2 +-
 src/languages/handlebars.js     |  53 ++-
 src/languages/haskell.js        | 113 +++--
 src/languages/haxe.js           | 131 ++++--
 src/languages/hsp.js            |  18 +-
 src/languages/htmlbars.js       |  10 +-
 src/languages/inform7.js        |  18 +-
 src/languages/ini.js            |  78 ++--
 src/languages/irpf90.js         |  32 +-
 src/languages/isbl.js           | 354 +++++++++-------
 src/languages/jboss-cli.js      |  30 +-
 src/languages/json.js           |  39 +-
 src/languages/kotlin.js         | 148 ++++---
 src/languages/lasso.js          |  54 ++-
 src/languages/ldif.js           |  21 +-
 src/languages/leaf.js           |   9 +-
 src/languages/livecodeserver.js |  43 +-
 src/languages/livescript.js     | 102 +++--
 src/languages/lua.js            |  30 +-
 src/languages/makefile.js       |  45 +-
 src/languages/markdown.js       | 125 ++++--
 src/languages/mathematica.js    |   9 +-
 src/languages/maxima.js         | 729 ++++++++++++++++----------------
 src/languages/mel.js            |   5 +-
 src/languages/mercury.js        |  64 ++-
 src/languages/mipsasm.js        |  33 +-
 src/languages/mojolicious.js    |   7 +-
 src/languages/monkey.js         |  29 +-
 src/languages/moonscript.js     |  82 ++--
 src/languages/nginx.js          |  73 +++-
 src/languages/nim.js            |  38 +-
 src/languages/nix.js            |  28 +-
 src/languages/node-repl.js      |  43 +-
 src/languages/nsis.js           |  64 +--
 src/languages/objectivec.js     |  48 ++-
 src/languages/openscad.js       | 122 +++---
 src/languages/oxygene.js        |  72 ++--
 src/languages/parser3.js        |  11 +-
 src/languages/pf.js             |  14 +-
 src/languages/pgsql.js          | 532 ++++++++++++++---------
 src/languages/php-template.js   |  32 +-
 src/languages/plaintext.js      |  13 +-
 src/languages/pony.js           |  30 +-
 src/languages/powershell.js     | 251 +++++++----
 src/languages/profile.js        |  17 +-
 src/languages/prolog.js         |  43 +-
 src/languages/puppet.js         |  81 ++--
 src/languages/purebasic.js      |  16 +-
 src/languages/python-repl.js    |  17 +-
 src/languages/q.js              |  41 +-
 src/languages/qml.js            | 139 +++---
 src/languages/reasonml.js       |  88 ++--
 src/languages/roboconf.js       |  13 +-
 src/languages/routeros.js       |  30 +-
 src/languages/rsl.js            |   9 +-
 src/languages/ruleslanguage.js  |  91 ++--
 src/languages/rust.js           |  70 ++-
 src/languages/sas.js            | 243 +++++------
 src/languages/scala.js          |  54 ++-
 src/languages/scilab.js         |  37 +-
 src/languages/shell.js          |   4 +-
 src/languages/smali.js          | 101 ++++-
 src/languages/smalltalk.js      |  18 +-
 src/languages/sml.js            |  15 +-
 src/languages/sqf.js            |  37 +-
 src/languages/stan.js           | 518 ++++++++++++++++++-----
 src/languages/stata.js          |  15 +-
 src/languages/step21.js         |  28 +-
 src/languages/subunit.js        |  29 +-
 src/languages/taggerscript.js   |  20 +-
 src/languages/tap.js            |  29 +-
 src/languages/thrift.js         |  16 +-
 src/languages/tp.js             |  18 +-
 src/languages/vala.js           |  14 +-
 src/languages/vbnet.js          |  26 +-
 src/languages/vbscript-html.js  |   3 +-
 src/languages/verilog.js        |  53 ++-
 src/languages/vhdl.js           |  22 +-
 src/languages/vim.js            |  43 +-
 src/languages/x86asm.js         |  31 +-
 src/languages/xl.js             |  66 +--
 src/languages/xml.js            | 171 +++++---
 src/languages/xquery.js         | 182 ++++----
 src/languages/zephir.js         |  55 ++-
 144 files changed, 5896 insertions(+), 3716 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index ed767149c7..3d7e7b9bf1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,6 +22,7 @@ module.exports = {
     "@typescript-eslint"
   ],
   rules: {
+    "no-var": 1,
     "init-declarations": ["error", "always"],
     "array-callback-return": "error",
     "block-scoped-var": "error",
@@ -32,7 +33,7 @@ module.exports = {
     // for now ignore diff between types of quoting
     quotes: "off",
     // this is the style we are already using
-    "operator-linebreak": ["error", "before", { overrides: { "?": "after", ":": "after", "+": "after" } }],
+    "operator-linebreak": ["error", "before", { overrides: { "=": "after", "?": "after", ":": "after", "+": "after" } }],
     // sometimes we declare variables with extra spacing
     indent: ["error", 2, { VariableDeclarator: 2 }],
     // seems like a good idea not to use explicit undefined
@@ -53,15 +54,32 @@ module.exports = {
       files: ["src/languages/*.js"],
       rules: {
         "no-unused-expressions": "off",
-        // languages are all over the map and we don't want to
-        // do a mass edit so turn off the most egregious rule violations
-        indent: "off",
-        "comma-dangle": "off",
-        "array-bracket-spacing": "off",
-        "object-curly-spacing": "off",
-        "key-spacing": "off",
-        "object-curly-newline": "off",
-        "object-property-newline": "off"
+        // // languages are all over the map and we don't want to
+        // // do a mass edit so turn off the most egregious rule violations
+        // indent: "off",
+        "camelcase": 0,
+        "no-control-regex": 0,
+        "no-useless-escape": 0,
+        "comma-dangle": 1,
+        "array-bracket-spacing": ["error", "always"
+        //   {
+        //     objectsInArrays: true
+          // }
+        ],
+        // "object-curly-spacing": 1,
+        // "key-spacing": "off",
+        // "array-bracket-spacing": [1],
+        "array-bracket-newline": [1, {
+          multiline: true,
+          minItems: 2
+        }],
+        "array-element-newline": 1,
+        "object-curly-newline": [1, {
+          minProperties: 1
+        }],
+        "object-property-newline": [2,
+          { allowAllPropertiesOnSameLine: false }
+        ]
       }
     }
   ]
diff --git a/src/languages/abnf.js b/src/languages/abnf.js
index 505a35426f..7b3a3e3fbd 100644
--- a/src/languages/abnf.js
+++ b/src/languages/abnf.js
@@ -6,70 +6,70 @@ Website: https://tools.ietf.org/html/rfc5234
 
 /** @type LanguageFn */
 export default function(hljs) {
-    var regexes = {
-        ruleDeclaration: "^[a-zA-Z][a-zA-Z0-9-]*",
-        unexpectedChars: "[!@#$^&',?+~`|:]"
-    };
+  const regexes = {
+    ruleDeclaration: "^[a-zA-Z][a-zA-Z0-9-]*",
+    unexpectedChars: "[!@#$^&',?+~`|:]"
+  };
 
-    var keywords = [
-        "ALPHA",
-        "BIT",
-        "CHAR",
-        "CR",
-        "CRLF",
-        "CTL",
-        "DIGIT",
-        "DQUOTE",
-        "HEXDIG",
-        "HTAB",
-        "LF",
-        "LWSP",
-        "OCTET",
-        "SP",
-        "VCHAR",
-        "WSP"
-    ];
+  const keywords = [
+    "ALPHA",
+    "BIT",
+    "CHAR",
+    "CR",
+    "CRLF",
+    "CTL",
+    "DIGIT",
+    "DQUOTE",
+    "HEXDIG",
+    "HTAB",
+    "LF",
+    "LWSP",
+    "OCTET",
+    "SP",
+    "VCHAR",
+    "WSP"
+  ];
 
-    var commentMode = hljs.COMMENT(";", "$");
+  const commentMode = hljs.COMMENT(";", "$");
 
-    var terminalBinaryMode = {
-        className: "symbol",
-        begin: /%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/
-    };
+  const terminalBinaryMode = {
+    className: "symbol",
+    begin: /%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/
+  };
 
-    var terminalDecimalMode = {
-        className: "symbol",
-        begin: /%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/
-    };
+  const terminalDecimalMode = {
+    className: "symbol",
+    begin: /%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/
+  };
 
-    var terminalHexadecimalMode = {
-        className: "symbol",
-        begin: /%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/,
-    };
+  const terminalHexadecimalMode = {
+    className: "symbol",
+    begin: /%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/
+  };
 
-    var caseSensitivityIndicatorMode = {
-        className: "symbol",
-        begin: /%[si]/
-    };
+  const caseSensitivityIndicatorMode = {
+    className: "symbol",
+    begin: /%[si]/
+  };
 
-    var ruleDeclarationMode = {
-        className: "attribute",
-        begin: regexes.ruleDeclaration + '(?=\\s*=)',
-    };
+  const ruleDeclarationMode = {
+    className: "attribute",
+    begin: regexes.ruleDeclaration + '(?=\\s*=)'
+  };
 
-    return {
-      name: 'Augmented Backus-Naur Form',
-      illegal: regexes.unexpectedChars,
-      keywords: keywords.join(" "),
-      contains: [
-          ruleDeclarationMode,
-          commentMode,
-          terminalBinaryMode,
-          terminalDecimalMode,
-          terminalHexadecimalMode,
-          caseSensitivityIndicatorMode,
-          hljs.QUOTE_STRING_MODE,
-          hljs.NUMBER_MODE
-      ]
-    };
+  return {
+    name: 'Augmented Backus-Naur Form',
+    illegal: regexes.unexpectedChars,
+    keywords: keywords.join(" "),
+    contains: [
+      ruleDeclarationMode,
+      commentMode,
+      terminalBinaryMode,
+      terminalDecimalMode,
+      terminalHexadecimalMode,
+      caseSensitivityIndicatorMode,
+      hljs.QUOTE_STRING_MODE,
+      hljs.NUMBER_MODE
+    ]
+  };
 }
diff --git a/src/languages/accesslog.js b/src/languages/accesslog.js
index 7826f8631e..f22bec7289 100644
--- a/src/languages/accesslog.js
+++ b/src/languages/accesslog.js
@@ -5,12 +5,12 @@
  Website: https://httpd.apache.org/docs/2.4/logs.html#accesslog
  */
 
- /** @type LanguageFn */
+/** @type LanguageFn */
 export default function(hljs) {
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
-  var HTTP_VERBS = [
+  const HTTP_VERBS = [
     "GET", "POST", "HEAD", "PUT", "DELETE", "CONNECT", "OPTIONS", "PATCH", "TRACE"
-  ]
+  ];
   return {
     name: 'Apache Access Log',
     contains: [
@@ -18,7 +18,7 @@ export default function(hljs) {
       {
         className: 'number',
         begin: '^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b',
-        relevance:5
+        relevance: 5
       },
       // Other numbers
       {
@@ -29,13 +29,14 @@ export default function(hljs) {
       // Requests
       {
         className: 'string',
-        begin: '"(' + HTTP_VERBS.join("|") + ')', end: '"',
+        begin: '"(' + HTTP_VERBS.join("|") + ')',
+        end: '"',
         keywords: HTTP_VERBS.join(" "),
         illegal: '\\n',
         relevance: 5,
         contains: [{
           begin: 'HTTP/[12]\\.\\d',
-          relevance:5
+          relevance: 5
         }]
       },
       // Dates
@@ -50,21 +51,24 @@ export default function(hljs) {
       },
       {
         className: 'string',
-        begin: /\[/, end: /\]/,
+        begin: /\[/,
+        end: /\]/,
         illegal: '\\n',
         relevance: 0
       },
       // User agent / relevance boost
       {
         className: 'string',
-        begin: '"Mozilla/\\d\\.\\d \\\(', end: '"',
+        begin: '"Mozilla/\\d\\.\\d \\(',
+        end: '"',
         illegal: '\\n',
         relevance: 3
       },
       // Strings
       {
         className: 'string',
-        begin: '"', end: '"',
+        begin: '"',
+        end: '"',
         illegal: '\\n',
         relevance: 0
       }
diff --git a/src/languages/actionscript.js b/src/languages/actionscript.js
index 991a1b72a1..a60097747b 100644
--- a/src/languages/actionscript.js
+++ b/src/languages/actionscript.js
@@ -6,12 +6,13 @@ Category: scripting
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var IDENT_RE = '[a-zA-Z_$][a-zA-Z0-9_$]*';
-  var IDENT_FUNC_RETURN_TYPE_RE = '([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)';
+  const IDENT_RE = '[a-zA-Z_$][a-zA-Z0-9_$]*';
+  const IDENT_FUNC_RETURN_TYPE_RE = '([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)';
 
-  var AS3_REST_ARG_MODE = {
+  const AS3_REST_ARG_MODE = {
     className: 'rest_arg',
-    begin: '[.]{3}', end: IDENT_RE,
+    begin: '[.]{3}',
+    end: IDENT_RE,
     relevance: 10
   };
 
@@ -34,33 +35,38 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'class',
-        beginKeywords: 'package', end: /\{/,
+        beginKeywords: 'package',
+        end: /\{/,
         contains: [hljs.TITLE_MODE]
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface',
+        end: /\{/,
+        excludeEnd: true,
         contains: [
-          {
-            beginKeywords: 'extends implements'
-          },
+          { beginKeywords: 'extends implements' },
           hljs.TITLE_MODE
         ]
       },
       {
         className: 'meta',
-        beginKeywords: 'import include', end: ';',
-        keywords: {'meta-keyword': 'import include'}
+        beginKeywords: 'import include',
+        end: ';',
+        keywords: { 'meta-keyword': 'import include' }
       },
       {
         className: 'function',
-        beginKeywords: 'function', end: '[{;]', excludeEnd: true,
+        beginKeywords: 'function',
+        end: '[{;]',
+        excludeEnd: true,
         illegal: '\\S',
         contains: [
           hljs.TITLE_MODE,
           {
             className: 'params',
-            begin: '\\(', end: '\\)',
+            begin: '\\(',
+            end: '\\)',
             contains: [
               hljs.APOS_STRING_MODE,
               hljs.QUOTE_STRING_MODE,
@@ -69,9 +75,7 @@ export default function(hljs) {
               AS3_REST_ARG_MODE
             ]
           },
-          {
-            begin: ':\\s*' + IDENT_FUNC_RETURN_TYPE_RE
-          }
+          { begin: ':\\s*' + IDENT_FUNC_RETURN_TYPE_RE }
         ]
       },
       hljs.METHOD_GUARD
diff --git a/src/languages/ada.js b/src/languages/ada.js
index 093fc8a662..7f7a2f14f2 100644
--- a/src/languages/ada.js
+++ b/src/languages/ada.js
@@ -19,66 +19,67 @@ Description: Ada is a general-purpose programming language that has great suppor
 
 /** @type LanguageFn */
 export default function(hljs) {
-    // Regular expression for Ada numeric literals.
-    // stolen form the VHDL highlighter
+  // Regular expression for Ada numeric literals.
+  // stolen form the VHDL highlighter
 
-    // Decimal literal:
-    var INTEGER_RE = '\\d(_|\\d)*';
-    var EXPONENT_RE = '[eE][-+]?' + INTEGER_RE;
-    var DECIMAL_LITERAL_RE = INTEGER_RE + '(\\.' + INTEGER_RE + ')?' + '(' + EXPONENT_RE + ')?';
+  // Decimal literal:
+  const INTEGER_RE = '\\d(_|\\d)*';
+  const EXPONENT_RE = '[eE][-+]?' + INTEGER_RE;
+  const DECIMAL_LITERAL_RE = INTEGER_RE + '(\\.' + INTEGER_RE + ')?' + '(' + EXPONENT_RE + ')?';
 
-    // Based literal:
-    var BASED_INTEGER_RE = '\\w+';
-    var BASED_LITERAL_RE = INTEGER_RE + '#' + BASED_INTEGER_RE + '(\\.' + BASED_INTEGER_RE + ')?' + '#' + '(' + EXPONENT_RE + ')?';
+  // Based literal:
+  const BASED_INTEGER_RE = '\\w+';
+  const BASED_LITERAL_RE = INTEGER_RE + '#' + BASED_INTEGER_RE + '(\\.' + BASED_INTEGER_RE + ')?' + '#' + '(' + EXPONENT_RE + ')?';
 
-    var NUMBER_RE = '\\b(' + BASED_LITERAL_RE + '|' + DECIMAL_LITERAL_RE + ')';
+  const NUMBER_RE = '\\b(' + BASED_LITERAL_RE + '|' + DECIMAL_LITERAL_RE + ')';
 
-    // Identifier regex
-    var ID_REGEX = '[A-Za-z](_?[A-Za-z0-9.])*';
+  // Identifier regex
+  const ID_REGEX = '[A-Za-z](_?[A-Za-z0-9.])*';
 
-    // bad chars, only allowed in literals
-    var BAD_CHARS = `[]\\{\\}%#'"`;
+  // bad chars, only allowed in literals
+  const BAD_CHARS = `[]\\{\\}%#'"`;
 
-    // Ada doesn't have block comments, only line comments
-    var COMMENTS = hljs.COMMENT('--', '$');
+  // Ada doesn't have block comments, only line comments
+  const COMMENTS = hljs.COMMENT('--', '$');
 
-    // variable declarations of the form
-    // Foo : Bar := Baz;
-    // where only Bar will be highlighted
-    var VAR_DECLS = {
-        // TODO: These spaces are not required by the Ada syntax
-        // however, I have yet to see handwritten Ada code where
-        // someone does not put spaces around :
-        begin: '\\s+:\\s+', end: '\\s*(:=|;|\\)|=>|$)',
-        // endsWithParent: true,
-        // returnBegin: true,
-        illegal: BAD_CHARS,
-        contains: [
-            {
-                // workaround to avoid highlighting
-                // named loops and declare blocks
-                beginKeywords: 'loop for declare others',
-                endsParent: true,
-            },
-            {
-                // properly highlight all modifiers
-                className: 'keyword',
-                beginKeywords: 'not null constant access function procedure in out aliased exception'
-            },
-            {
-                className: 'type',
-                begin: ID_REGEX,
-                endsParent: true,
-                relevance: 0,
-            }
-        ]
-    };
+  // variable declarations of the form
+  // Foo : Bar := Baz;
+  // where only Bar will be highlighted
+  const VAR_DECLS = {
+    // TODO: These spaces are not required by the Ada syntax
+    // however, I have yet to see handwritten Ada code where
+    // someone does not put spaces around :
+    begin: '\\s+:\\s+',
+    end: '\\s*(:=|;|\\)|=>|$)',
+    // endsWithParent: true,
+    // returnBegin: true,
+    illegal: BAD_CHARS,
+    contains: [
+      {
+        // workaround to avoid highlighting
+        // named loops and declare blocks
+        beginKeywords: 'loop for declare others',
+        endsParent: true
+      },
+      {
+        // properly highlight all modifiers
+        className: 'keyword',
+        beginKeywords: 'not null constant access function procedure in out aliased exception'
+      },
+      {
+        className: 'type',
+        begin: ID_REGEX,
+        endsParent: true,
+        relevance: 0
+      }
+    ]
+  };
 
-    return {
-        name: 'Ada',
-        case_insensitive: true,
-        keywords: {
-            keyword:
+  return {
+    name: 'Ada',
+    case_insensitive: true,
+    keywords: {
+      keyword:
                 'abort else new return abs elsif not reverse abstract end ' +
                 'accept entry select access exception of separate aliased exit or some ' +
                 'all others subtype and for out synchronized array function overriding ' +
@@ -86,98 +87,106 @@ export default function(hljs) {
                 'body private then if procedure type case in protected constant interface ' +
                 'is raise use declare range delay limited record when delta loop rem while ' +
                 'digits renames with do mod requeue xor',
-            literal:
-                'True False',
-        },
-        contains: [
-            COMMENTS,
-            // strings "foobar"
-            {
-                className: 'string',
-                begin: /"/, end: /"/,
-                contains: [{begin: /""/, relevance: 0}]
-            },
-            // characters ''
-            {
-                // character literals always contain one char
-                className: 'string',
-                begin: /'.'/
-            },
-            {
-                // number literals
-                className: 'number',
-                begin: NUMBER_RE,
-                relevance: 0
-            },
-            {
-                // Attributes
-                className: 'symbol',
-                begin: "'" + ID_REGEX,
-            },
-            {
-                // package definition, maybe inside generic
-                className: 'title',
-                begin: '(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?', end: '(is|$)',
-                keywords: 'package body',
-                excludeBegin: true,
-                excludeEnd: true,
-                illegal: BAD_CHARS
-            },
-            {
-                // function/procedure declaration/definition
-                // maybe inside generic
-                begin: '(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+', end: '(\\bis|\\bwith|\\brenames|\\)\\s*;)',
-                keywords: 'overriding function procedure with is renames return',
-                // we need to re-match the 'function' keyword, so that
-                // the title mode below matches only exactly once
-                returnBegin: true,
-                contains:
+      literal:
+                'True False'
+    },
+    contains: [
+      COMMENTS,
+      // strings "foobar"
+      {
+        className: 'string',
+        begin: /"/,
+        end: /"/,
+        contains: [{
+          begin: /""/,
+          relevance: 0
+        }]
+      },
+      // characters ''
+      {
+        // character literals always contain one char
+        className: 'string',
+        begin: /'.'/
+      },
+      {
+        // number literals
+        className: 'number',
+        begin: NUMBER_RE,
+        relevance: 0
+      },
+      {
+        // Attributes
+        className: 'symbol',
+        begin: "'" + ID_REGEX
+      },
+      {
+        // package definition, maybe inside generic
+        className: 'title',
+        begin: '(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?',
+        end: '(is|$)',
+        keywords: 'package body',
+        excludeBegin: true,
+        excludeEnd: true,
+        illegal: BAD_CHARS
+      },
+      {
+        // function/procedure declaration/definition
+        // maybe inside generic
+        begin: '(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+',
+        end: '(\\bis|\\bwith|\\brenames|\\)\\s*;)',
+        keywords: 'overriding function procedure with is renames return',
+        // we need to re-match the 'function' keyword, so that
+        // the title mode below matches only exactly once
+        returnBegin: true,
+        contains:
                 [
-                    COMMENTS,
-                    {
-                        // name of the function/procedure
-                        className: 'title',
-                        begin: '(\\bwith\\s+)?\\b(function|procedure)\\s+',
-                        end: '(\\(|\\s+|$)',
-                        excludeBegin: true,
-                        excludeEnd: true,
-                        illegal: BAD_CHARS
-                    },
-                    // 'self'
-                    // // parameter types
-                    VAR_DECLS,
-                    {
-                        // return type
-                        className: 'type',
-                        begin: '\\breturn\\s+', end: '(\\s+|;|$)',
-                        keywords: 'return',
-                        excludeBegin: true,
-                        excludeEnd: true,
-                        // we are done with functions
-                        endsParent: true,
-                        illegal: BAD_CHARS
+                  COMMENTS,
+                  {
+                    // name of the function/procedure
+                    className: 'title',
+                    begin: '(\\bwith\\s+)?\\b(function|procedure)\\s+',
+                    end: '(\\(|\\s+|$)',
+                    excludeBegin: true,
+                    excludeEnd: true,
+                    illegal: BAD_CHARS
+                  },
+                  // 'self'
+                  // // parameter types
+                  VAR_DECLS,
+                  {
+                    // return type
+                    className: 'type',
+                    begin: '\\breturn\\s+',
+                    end: '(\\s+|;|$)',
+                    keywords: 'return',
+                    excludeBegin: true,
+                    excludeEnd: true,
+                    // we are done with functions
+                    endsParent: true,
+                    illegal: BAD_CHARS
 
-                    },
+                  }
                 ]
-            },
-            {
-                // new type declarations
-                // maybe inside generic
-                className: 'type',
-                begin: '\\b(sub)?type\\s+', end: '\\s+',
-                keywords: 'type',
-                excludeBegin: true,
-                illegal: BAD_CHARS
-            },
+      },
+      {
+        // new type declarations
+        // maybe inside generic
+        className: 'type',
+        begin: '\\b(sub)?type\\s+',
+        end: '\\s+',
+        keywords: 'type',
+        excludeBegin: true,
+        illegal: BAD_CHARS
+      },
 
-            // see comment above the definition
-            VAR_DECLS,
+      // see comment above the definition
+      VAR_DECLS
 
-            // no markup
-            // relevance boosters for small snippets
-            // {begin: '\\s*=>\\s*'},
-            // {begin: '\\s*:=\\s*'},
-            // {begin: '\\s+:=\\s+'},
-        ]
-    };
+      // no markup
+      // relevance boosters for small snippets
+      // {begin: '\\s*=>\\s*'},
+      // {begin: '\\s*:=\\s*'},
+      // {begin: '\\s+:=\\s+'},
+    ]
+  };
 }
diff --git a/src/languages/apache.js b/src/languages/apache.js
index 9c8fd7db6c..bc9493b1db 100644
--- a/src/languages/apache.js
+++ b/src/languages/apache.js
@@ -9,13 +9,19 @@ Category: common, config
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var NUMBER_REF = {className: 'number', begin: '[\\$%]\\d+'};
-  var NUMBER = {className: 'number', begin: '\\d+'};
-  var IP_ADDRESS = {
+  const NUMBER_REF = {
+    className: 'number',
+    begin: '[\\$%]\\d+'
+  };
+  const NUMBER = {
+    className: 'number',
+    begin: '\\d+'
+  };
+  const IP_ADDRESS = {
     className: "number",
     begin: '\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?'
   };
-  var PORT_NUMBER = {
+  const PORT_NUMBER = {
     className: "number",
     begin: ":\\d{1,5}"
   };
@@ -25,42 +31,44 @@ export default function(hljs) {
     case_insensitive: true,
     contains: [
       hljs.HASH_COMMENT_MODE,
-      {className: 'section', begin: '</?', end: '>',
-      contains: [
-        IP_ADDRESS,
-        PORT_NUMBER,
-        // low relevance prevents us from claming XML/HTML where this rule would
-        // match strings inside of XML tags
-        hljs.inherit(hljs.QUOTE_STRING_MODE, { relevance:0 })
-      ]
-    },
+      {
+        className: 'section',
+        begin: '</?',
+        end: '>',
+        contains: [
+          IP_ADDRESS,
+          PORT_NUMBER,
+          // low relevance prevents us from claming XML/HTML where this rule would
+          // match strings inside of XML tags
+          hljs.inherit(hljs.QUOTE_STRING_MODE, { relevance: 0 })
+        ]
+      },
       {
         className: 'attribute',
         begin: /\w+/,
         relevance: 0,
         // keywords aren’t needed for highlighting per se, they only boost relevance
         // for a very generally defined mode (starts with a word, ends with line-end
-        keywords: {
-          nomarkup:
+        keywords: { nomarkup:
             'order deny allow setenv rewriterule rewriteengine rewritecond documentroot ' +
             'sethandler errordocument loadmodule options header listen serverroot ' +
-            'servername'
-        },
+            'servername' },
         starts: {
           end: /$/,
           relevance: 0,
-          keywords: {
-            literal: 'on off all deny allow'
-          },
+          keywords: { literal: 'on off all deny allow' },
           contains: [
             {
               className: 'meta',
-              begin: '\\s\\[', end: '\\]$'
+              begin: '\\s\\[',
+              end: '\\]$'
             },
             {
               className: 'variable',
-              begin: '[\\$%]\\{', end: '\\}',
-              contains: ['self', NUMBER_REF]
+              begin: '[\\$%]\\{',
+              end: '\\}',
+              contains: ['self',
+                NUMBER_REF]
             },
             IP_ADDRESS,
             NUMBER,
diff --git a/src/languages/applescript.js b/src/languages/applescript.js
index 339f9b906d..493116909d 100644
--- a/src/languages/applescript.js
+++ b/src/languages/applescript.js
@@ -7,21 +7,31 @@ Website: https://developer.apple.com/library/archive/documentation/AppleScript/C
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: ''});
-  var PARAMS = {
+  const STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+    illegal: ''
+  });
+  const PARAMS = {
     className: 'params',
-    begin: '\\(', end: '\\)',
-    contains: ['self', hljs.C_NUMBER_MODE, STRING]
+    begin: '\\(',
+    end: '\\)',
+    contains: [
+      'self',
+      hljs.C_NUMBER_MODE,
+      STRING
+    ]
   };
-  var COMMENT_MODE_1 = hljs.COMMENT('--', '$');
-  var COMMENT_MODE_2 = hljs.COMMENT(
+  const COMMENT_MODE_1 = hljs.COMMENT('--', '$');
+  const COMMENT_MODE_2 = hljs.COMMENT(
     '\\(\\*',
     '\\*\\)',
     {
-      contains: ['self', COMMENT_MODE_1] //allow nesting
+      contains: [
+        'self', // allow nesting
+        COMMENT_MODE_1
+      ]
     }
   );
-  var COMMENTS = [
+  const COMMENTS = [
     COMMENT_MODE_1,
     COMMENT_MODE_2,
     hljs.HASH_COMMENT_MODE
@@ -86,7 +96,10 @@ export default function(hljs) {
       {
         beginKeywords: 'on',
         illegal: '[${=;\\n]',
-        contains: [hljs.UNDERSCORE_TITLE_MODE, PARAMS]
+        contains: [
+          hljs.UNDERSCORE_TITLE_MODE,
+          PARAMS
+        ]
       }
     ].concat(COMMENTS),
     illegal: '//|->|=>|\\[\\['
diff --git a/src/languages/arcade.js b/src/languages/arcade.js
index 8370158ebb..d65c55a1a8 100644
--- a/src/languages/arcade.js
+++ b/src/languages/arcade.js
@@ -8,8 +8,8 @@
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var IDENT_RE = '[A-Za-z_][0-9A-Za-z_]*';
-  var KEYWORDS = {
+  const IDENT_RE = '[A-Za-z_][0-9A-Za-z_]*';
+  const KEYWORDS = {
     keyword:
       'if for while var new function do return void else break',
     literal:
@@ -27,28 +27,36 @@ export default function(hljs) {
       'TrackGeometryWindow TrackIndex TrackStartTime TrackWindow TypeOf Union UrlEncode Variance ' +
       'Weekday When Within Year '
   };
-  var SYMBOL = {
+  const SYMBOL = {
     className: 'symbol',
     begin: '\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+'
   };
-  var NUMBER = {
+  const NUMBER = {
     className: 'number',
     variants: [
-      { begin: '\\b(0[bB][01]+)' },
-      { begin: '\\b(0[oO][0-7]+)' },
-      { begin: hljs.C_NUMBER_RE }
+      {
+        begin: '\\b(0[bB][01]+)'
+      },
+      {
+        begin: '\\b(0[oO][0-7]+)'
+      },
+      {
+        begin: hljs.C_NUMBER_RE
+      }
     ],
     relevance: 0
   };
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
-    begin: '\\$\\{', end: '\\}',
+    begin: '\\$\\{',
+    end: '\\}',
     keywords: KEYWORDS,
     contains: [] // defined later
   };
-  var TEMPLATE_STRING = {
+  const TEMPLATE_STRING = {
     className: 'string',
-    begin: '`', end: '`',
+    begin: '`',
+    end: '`',
     contains: [
       hljs.BACKSLASH_ESCAPE,
       SUBST
@@ -61,7 +69,7 @@ export default function(hljs) {
     NUMBER,
     hljs.REGEXP_MODE
   ];
-  var PARAMS_CONTAINS = SUBST.contains.concat([
+  const PARAMS_CONTAINS = SUBST.contains.concat([
     hljs.C_BLOCK_COMMENT_MODE,
     hljs.C_LINE_COMMENT_MODE
   ]);
@@ -79,14 +87,18 @@ export default function(hljs) {
       SYMBOL,
       NUMBER,
       { // object attr container
-        begin: /[{,]\s*/, relevance: 0,
-        contains: [
-          {
-            begin: IDENT_RE + '\\s*:', returnBegin: true,
-            relevance: 0,
-            contains: [{className: 'attr', begin: IDENT_RE, relevance: 0}]
-          }
-        ]
+        begin: /[{,]\s*/,
+        relevance: 0,
+        contains: [{
+          begin: IDENT_RE + '\\s*:',
+          returnBegin: true,
+          relevance: 0,
+          contains: [{
+            className: 'attr',
+            begin: IDENT_RE,
+            relevance: 0
+          }]
+        }]
       },
       { // "value" container
         begin: '(' + hljs.RE_STARTERS_RE + '|\\b(return)\\b)\\s*',
@@ -97,39 +109,45 @@ export default function(hljs) {
           hljs.REGEXP_MODE,
           {
             className: 'function',
-            begin: '(\\(.*?\\)|' + IDENT_RE + ')\\s*=>', returnBegin: true,
+            begin: '(\\(.*?\\)|' + IDENT_RE + ')\\s*=>',
+            returnBegin: true,
             end: '\\s*=>',
-            contains: [
-              {
-                className: 'params',
-                variants: [
-                  {
-                    begin: IDENT_RE
-                  },
-                  {
-                    begin: /\(\s*\)/,
-                  },
-                  {
-                    begin: /\(/, end: /\)/,
-                    excludeBegin: true, excludeEnd: true,
-                    keywords: KEYWORDS,
-                    contains: PARAMS_CONTAINS
-                  }
-                ]
-              }
-            ]
+            contains: [{
+              className: 'params',
+              variants: [
+                {
+                  begin: IDENT_RE
+                },
+                {
+                  begin: /\(\s*\)/
+                },
+                {
+                  begin: /\(/,
+                  end: /\)/,
+                  excludeBegin: true,
+                  excludeEnd: true,
+                  keywords: KEYWORDS,
+                  contains: PARAMS_CONTAINS
+                }
+              ]
+            }]
           }
         ],
         relevance: 0
       },
       {
         className: 'function',
-        beginKeywords: 'function', end: /\{/, excludeEnd: true,
+        beginKeywords: 'function',
+        end: /\{/,
+        excludeEnd: true,
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE}),
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: IDENT_RE
+          }),
           {
             className: 'params',
-            begin: /\(/, end: /\)/,
+            begin: /\(/,
+            end: /\)/,
             excludeBegin: true,
             excludeEnd: true,
             contains: PARAMS_CONTAINS
diff --git a/src/languages/armasm.js b/src/languages/armasm.js
index eadcaf077d..33a4026c57 100644
--- a/src/languages/armasm.js
+++ b/src/languages/armasm.js
@@ -7,16 +7,21 @@ Category: assembler
 
 /** @type LanguageFn */
 export default function(hljs) {
-    //local labels: %?[FB]?[AT]?\d{1,2}\w+
+  // local labels: %?[FB]?[AT]?\d{1,2}\w+
 
   const COMMENT = {
     variants: [
-      hljs.COMMENT('^[ \\t]*(?=#)', '$', {relevance: 0, excludeBegin: true }),
-      hljs.COMMENT('[;@]', '$', {relevance: 0}),
+      hljs.COMMENT('^[ \\t]*(?=#)', '$', {
+        relevance: 0,
+        excludeBegin: true
+      }),
+      hljs.COMMENT('[;@]', '$', {
+        relevance: 0
+      }),
       hljs.C_LINE_COMMENT_MODE,
-      hljs.C_BLOCK_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE
     ]
-  }
+  };
 
   return {
     name: 'ARM Assembly',
@@ -25,26 +30,26 @@ export default function(hljs) {
     keywords: {
       $pattern: '\\.?' + hljs.IDENT_RE,
       meta:
-        //GNU preprocs
-        '.2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg '+
-        //ARM directives
+        // GNU preprocs
+        '.2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ' +
+        // ARM directives
         'ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ',
       built_in:
-        'r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 '+ //standard registers
-        'pc lr sp ip sl sb fp '+ //typical regs plus backward compatibility
-        'a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 '+ //more regs and fp
-        'p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 '+ //coprocessor regs
-        'c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 '+ //more coproc
-        'q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 '+ //advanced SIMD NEON regs
+        'r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 ' + // standard registers
+        'pc lr sp ip sl sb fp ' + // typical regs plus backward compatibility
+        'a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 ' + // more regs and fp
+        'p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 ' + // coprocessor regs
+        'c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 ' + // more coproc
+        'q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 ' + // advanced SIMD NEON regs
 
-        //program status registers
-        'cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf '+
-        'spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf '+
+        // program status registers
+        'cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf ' +
+        'spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf ' +
 
-        //NEON and VFP registers
-        's0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 '+
-        's16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 '+
-        'd0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 '+
+        // NEON and VFP registers
+        's0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 ' +
+        's16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 ' +
+        'd0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 ' +
         'd16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 ' +
 
         '{PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @'
@@ -52,24 +57,24 @@ export default function(hljs) {
     contains: [
       {
         className: 'keyword',
-        begin: '\\b('+     //mnemonics
-            'adc|'+
-            '(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|'+
-            'and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|'+
-            'bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|'+
-            'setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|'+
-            'ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|'+
-            'mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|'+
-            'mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|'+
-            'mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|'+
-            'rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|'+
-            'stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|'+
-            '[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|'+
-            'wfe|wfi|yield'+
-        ')'+
-        '(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?'+ //condition codes
-        '[sptrx]?' +                                             //legal postfixes
-        '(?=\\s)'                                                // followed by space
+        begin: '\\b(' + // mnemonics
+            'adc|' +
+            '(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|' +
+            'and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|' +
+            'bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|' +
+            'setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|' +
+            'ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|' +
+            'mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|' +
+            'mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|' +
+            'mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|' +
+            'rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|' +
+            'stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|' +
+            '[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|' +
+            'wfe|wfi|yield' +
+        ')' +
+        '(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?' + // condition codes
+        '[sptrx]?' + // legal postfixes
+        '(?=\\s)' // followed by space
       },
       COMMENT,
       hljs.QUOTE_STRING_MODE,
@@ -81,26 +86,41 @@ export default function(hljs) {
       },
       {
         className: 'title',
-        begin: '\\|', end: '\\|',
+        begin: '\\|',
+        end: '\\|',
         illegal: '\\n',
         relevance: 0
       },
       {
         className: 'number',
         variants: [
-            {begin: '[#$=]?0x[0-9a-f]+'}, //hex
-            {begin: '[#$=]?0b[01]+'},     //bin
-            {begin: '[#$=]\\d+'},        //literal
-            {begin: '\\b\\d+'}           //bare number
+          { // hex
+            begin: '[#$=]?0x[0-9a-f]+'
+          },
+          { // bin
+            begin: '[#$=]?0b[01]+'
+          },
+          { // literal
+            begin: '[#$=]\\d+'
+          },
+          { // bare number
+            begin: '\\b\\d+'
+          }
         ],
         relevance: 0
       },
       {
         className: 'symbol',
         variants: [
-            {begin: '^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:'}, //GNU ARM syntax
-            {begin: '^[a-z_\\.\\$][a-z0-9_\\.\\$]+'}, //ARM syntax
-            {begin: '[=#]\\w+' }  //label reference
+          { // GNU ARM syntax
+            begin: '^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:'
+          },
+          { // ARM syntax
+            begin: '^[a-z_\\.\\$][a-z0-9_\\.\\$]+'
+          },
+          { // label reference
+            begin: '[=#]\\w+'
+          }
         ],
         relevance: 0
       }
diff --git a/src/languages/asciidoc.js b/src/languages/asciidoc.js
index 1962bb0930..e24b5194a0 100644
--- a/src/languages/asciidoc.js
+++ b/src/languages/asciidoc.js
@@ -18,8 +18,8 @@ export default function(hljs) {
         '^/{4,}\\n',
         '\\n/{4,}$',
         // can also be done as...
-        //'^/{4,}$',
-        //'^/{4,}$',
+        // '^/{4,}$',
+        // '^/{4,}$',
         {
           relevance: 10
         }
@@ -48,8 +48,12 @@ export default function(hljs) {
         className: 'section',
         relevance: 10,
         variants: [
-          {begin: '^(={1,5}) .+?( \\1)?$'},
-          {begin: '^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$'},
+          {
+            begin: '^(={1,5}) .+?( \\1)?$'
+          },
+          {
+            begin: '^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$'
+          }
         ]
       },
       // document attributes
@@ -84,13 +88,12 @@ export default function(hljs) {
       {
         begin: '^\\+{4,}\\n',
         end: '\\n\\+{4,}$',
-        contains: [
-          {
-            begin: '<', end: '>',
-            subLanguage: 'xml',
-            relevance: 0
-          }
-        ],
+        contains: [{
+          begin: '<',
+          end: '>',
+          subLanguage: 'xml',
+          relevance: 0
+        }],
         relevance: 10
       },
       // lists (can only capture indicators)
@@ -111,12 +114,10 @@ export default function(hljs) {
         begin: '\\B\\*(?![\\*\\s])',
         end: '(\\n{2}|\\*)',
         // allow escaped asterisk followed by word char
-        contains: [
-          {
-            begin: '\\\\*\\w',
-            relevance: 0
-          }
-        ]
+        contains: [{
+          begin: '\\\\*\\w',
+          relevance: 0
+        }]
       },
       // inline emphasis
       {
@@ -125,12 +126,10 @@ export default function(hljs) {
         begin: '\\B\'(?![\'\\s])',
         end: '(\\n{2}|\')',
         // allow escaped single quote followed by word char
-        contains: [
-          {
-            begin: '\\\\\'\\w',
-            relevance: 0
-          }
-        ],
+        contains: [{
+          begin: '\\\\\'\\w',
+          relevance: 0
+        }],
         relevance: 0
       },
       // inline emphasis (alt)
@@ -145,8 +144,12 @@ export default function(hljs) {
       {
         className: 'string',
         variants: [
-          {begin: "``.+?''"},
-          {begin: "`.+?'"}
+          {
+            begin: "``.+?''"
+          },
+          {
+            begin: "`.+?'"
+          }
         ]
       },
       // inline code snippets (TODO should get same treatment as strong and emphasis)
diff --git a/src/languages/aspectj.js b/src/languages/aspectj.js
index 5b5d5740da..56c0547f38 100644
--- a/src/languages/aspectj.js
+++ b/src/languages/aspectj.js
@@ -7,34 +7,35 @@ Description: Syntax Highlighting for the AspectJ Language which is a general-pur
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var KEYWORDS =
-    'false synchronized int abstract float private char boolean static null if const ' +
+  const KEYWORDS = 'false synchronized int abstract float private char boolean static null if const ' +
     'for true while long throw strictfp finally protected import native final return void ' +
     'enum else extends implements break transient new catch instanceof byte super volatile case ' +
     'assert short package default double public try this switch continue throws privileged ' +
     'aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization ' +
     'staticinitialization withincode target within execution getWithinTypeName handler ' +
-    'thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents '+
+    'thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents ' +
     'warning error soft precedence thisAspectInstance';
-  var SHORTKEYS = 'get set args call';
+  const SHORTKEYS = 'get set args call';
+
   return {
     name: 'AspectJ',
-    keywords : KEYWORDS,
-    illegal : /<\/|#/,
-    contains : [
+    keywords: KEYWORDS,
+    illegal: /<\/|#/,
+    contains: [
       hljs.COMMENT(
         '/\\*\\*',
         '\\*/',
         {
-          relevance : 0,
-          contains : [
+          relevance: 0,
+          contains: [
             {
               // eat up @'s in emails to prevent them to be recognized as doctags
-              begin: /\w+@/, relevance: 0
+              begin: /\w+@/,
+              relevance: 0
             },
             {
-              className : 'doctag',
-              begin : '@[A-Za-z]+'
+              className: 'doctag',
+              begin: '@[A-Za-z]+'
             }
           ]
         }
@@ -44,63 +45,63 @@ export default function(hljs) {
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
       {
-        className : 'class',
-        beginKeywords : 'aspect',
-        end : /[{;=]/,
-        excludeEnd : true,
-        illegal : /[:;"\[\]]/,
-        contains : [
+        className: 'class',
+        beginKeywords: 'aspect',
+        end: /[{;=]/,
+        excludeEnd: true,
+        illegal: /[:;"\[\]]/,
+        contains: [
           {
-            beginKeywords : 'extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton'
+            beginKeywords: 'extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton'
           },
           hljs.UNDERSCORE_TITLE_MODE,
           {
-            begin : /\([^\)]*/,
-            end : /[)]+/,
-            keywords : KEYWORDS + ' ' + SHORTKEYS,
-            excludeEnd : false
+            begin: /\([^\)]*/,
+            end: /[)]+/,
+            keywords: KEYWORDS + ' ' + SHORTKEYS,
+            excludeEnd: false
           }
         ]
       },
       {
-        className : 'class',
-        beginKeywords : 'class interface',
-        end : /[{;=]/,
-        excludeEnd : true,
+        className: 'class',
+        beginKeywords: 'class interface',
+        end: /[{;=]/,
+        excludeEnd: true,
         relevance: 0,
-        keywords : 'class interface',
-        illegal : /[:"\[\]]/,
-        contains : [
-          {beginKeywords : 'extends implements'},
+        keywords: 'class interface',
+        illegal: /[:"\[\]]/,
+        contains: [
+          {
+            beginKeywords: 'extends implements'
+          },
           hljs.UNDERSCORE_TITLE_MODE
         ]
       },
       {
         // AspectJ Constructs
-        beginKeywords : 'pointcut after before around throwing returning',
-        end : /[)]/,
-        excludeEnd : false,
-        illegal : /["\[\]]/,
-        contains : [
-          {
-            begin : hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-            returnBegin : true,
-            contains : [hljs.UNDERSCORE_TITLE_MODE]
-          }
-        ]
+        beginKeywords: 'pointcut after before around throwing returning',
+        end: /[)]/,
+        excludeEnd: false,
+        illegal: /["\[\]]/,
+        contains: [{
+          begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+          returnBegin: true,
+          contains: [hljs.UNDERSCORE_TITLE_MODE]
+        }]
       },
       {
-        begin : /[:]/,
-        returnBegin : true,
-        end : /[{;]/,
+        begin: /[:]/,
+        returnBegin: true,
+        end: /[{;]/,
         relevance: 0,
-        excludeEnd : false,
-        keywords : KEYWORDS,
-        illegal : /["\[\]]/,
-        contains : [
+        excludeEnd: false,
+        keywords: KEYWORDS,
+        illegal: /["\[\]]/,
+        contains: [
           {
-            begin : hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-            keywords : KEYWORDS + ' ' + SHORTKEYS,
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+            keywords: KEYWORDS + ' ' + SHORTKEYS,
             relevance: 0
           },
           hljs.QUOTE_STRING_MODE
@@ -108,30 +109,31 @@ export default function(hljs) {
       },
       {
         // this prevents 'new Name(...), or throw ...' from being recognized as a function definition
-        beginKeywords : 'new throw',
-        relevance : 0
+        beginKeywords: 'new throw',
+        relevance: 0
       },
       {
         // the function class is a bit different for AspectJ compared to the Java language
-        className : 'function',
-        begin : /\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,
-        returnBegin : true,
-        end : /[{;=]/,
-        keywords : KEYWORDS,
-        excludeEnd : true,
-        contains : [
+        className: 'function',
+        begin: /\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,
+        returnBegin: true,
+        end: /[{;=]/,
+        keywords: KEYWORDS,
+        excludeEnd: true,
+        contains: [
           {
-            begin : hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-            returnBegin : true,
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+            returnBegin: true,
             relevance: 0,
-            contains : [hljs.UNDERSCORE_TITLE_MODE]
+            contains: [hljs.UNDERSCORE_TITLE_MODE]
           },
           {
-            className : 'params',
-            begin : /\(/, end : /\)/,
+            className: 'params',
+            begin: /\(/,
+            end: /\)/,
             relevance: 0,
-            keywords : KEYWORDS,
-            contains : [
+            keywords: KEYWORDS,
+            contains: [
               hljs.APOS_STRING_MODE,
               hljs.QUOTE_STRING_MODE,
               hljs.C_NUMBER_MODE,
@@ -145,8 +147,8 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         // annotation is also used in this language
-        className : 'meta',
-        begin : '@[A-Za-z]+'
+        className: 'meta',
+        begin: '@[A-Za-z]+'
       }
     ]
   };
diff --git a/src/languages/autohotkey.js b/src/languages/autohotkey.js
index 1efe3c6192..30165aa25e 100644
--- a/src/languages/autohotkey.js
+++ b/src/languages/autohotkey.js
@@ -7,7 +7,7 @@ Category: scripting
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var BACKTICK_ESCAPE = {
+  const BACKTICK_ESCAPE = {
     begin: '`[\\s\\S]'
   };
 
@@ -18,12 +18,16 @@ export default function(hljs) {
     keywords: {
       keyword: 'Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group',
       literal: 'true false NOT AND OR',
-      built_in: 'ComSpec Clipboard ClipboardAll ErrorLevel',
+      built_in: 'ComSpec Clipboard ClipboardAll ErrorLevel'
     },
     contains: [
       BACKTICK_ESCAPE,
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [BACKTICK_ESCAPE]}),
-      hljs.COMMENT(';', '$', {relevance: 0}),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        contains: [BACKTICK_ESCAPE]
+      }),
+      hljs.COMMENT(';', '$', {
+        relevance: 0
+      }),
       hljs.C_BLOCK_COMMENT_MODE,
       {
         className: 'number',
@@ -31,29 +35,41 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        className: 'variable', //subst would be the most accurate however fails the point of highlighting. variable is comparably the most accurate that actually has some effect
+        // subst would be the most accurate however fails the point of
+        // highlighting. variable is comparably the most accurate that actually
+        // has some effect
+        className: 'variable',
         begin: '%[a-zA-Z0-9#_$@]+%'
       },
       {
         className: 'built_in',
         begin: '^\\s*\\w+\\s*(,|%)'
-        //I don't really know if this is totally relevant
+        // I don't really know if this is totally relevant
       },
       {
-        className: 'title', //symbol would be most accurate however is highlighted just like built_in and that makes up a lot of AutoHotkey code
-		                        //meaning that it would fail to highlight anything
+        // symbol would be most accurate however is highlighted just like
+        // built_in and that makes up a lot of AutoHotkey code meaning that it
+        // would fail to highlight anything
+        className: 'title',
         variants: [
-          {begin: '^[^\\n";]+::(?!=)'},
-          {begin: '^[^\\n";]+:(?!=)', relevance: 0} // zero relevance as it catches a lot of things
-                                                    // followed by a single ':' in many languages
+          {
+            begin: '^[^\\n";]+::(?!=)'
+          },
+          {
+            begin: '^[^\\n";]+:(?!=)',
+            // zero relevance as it catches a lot of things
+            // followed by a single ':' in many languages
+            relevance: 0
+          }
         ]
       },
       {
         className: 'meta',
-        begin: '^\\s*#\\w+', end:'$',
+        begin: '^\\s*#\\w+',
+        end: '$',
         relevance: 0
       },
-	    {
+      {
         className: 'built_in',
         begin: 'A_[a-zA-Z0-9]+'
       },
@@ -62,5 +78,5 @@ export default function(hljs) {
         begin: ',\\s*,'
       }
     ]
-  }
+  };
 }
diff --git a/src/languages/autoit.js b/src/languages/autoit.js
index f5ecd57cf9..844d44ae9c 100644
--- a/src/languages/autoit.js
+++ b/src/languages/autoit.js
@@ -7,138 +7,158 @@ Category: scripting
 
 /** @type LanguageFn */
 export default function(hljs) {
-    var KEYWORDS = 'ByRef Case Const ContinueCase ContinueLoop ' +
+  const KEYWORDS = 'ByRef Case Const ContinueCase ContinueLoop ' +
         'Default Dim Do Else ElseIf EndFunc EndIf EndSelect ' +
         'EndSwitch EndWith Enum Exit ExitLoop For Func ' +
         'Global If In Local Next ReDim Return Select Static ' +
-        'Step Switch Then To Until Volatile WEnd While With',
+        'Step Switch Then To Until Volatile WEnd While With';
 
-        LITERAL = 'True False And Null Not Or',
+  const LITERAL = 'True False And Null Not Or';
 
-        BUILT_IN =
-          'Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait',
+  const BUILT_IN
+          = 'Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait';
 
-        COMMENT = {
-            variants: [
-              hljs.COMMENT(';', '$', {relevance: 0}),
-              hljs.COMMENT('#cs', '#ce'),
-              hljs.COMMENT('#comments-start', '#comments-end')
-            ]
-        },
+  const COMMENT = {
+    variants: [
+      hljs.COMMENT(';', '$', {
+        relevance: 0
+      }),
+      hljs.COMMENT('#cs', '#ce'),
+      hljs.COMMENT('#comments-start', '#comments-end')
+    ]
+  };
 
-        VARIABLE = {
-            begin: '\\$[A-z0-9_]+'
-        },
+  const VARIABLE = {
+    begin: '\\$[A-z0-9_]+'
+  };
+
+  const STRING = {
+    className: 'string',
+    variants: [
+      {
+        begin: /"/,
+        end: /"/,
+        contains: [{
+          begin: /""/,
+          relevance: 0
+        }]
+      },
+      {
+        begin: /'/,
+        end: /'/,
+        contains: [{
+          begin: /''/,
+          relevance: 0
+        }]
+      }
+    ]
+  };
+
+  const NUMBER = {
+    variants: [
+      hljs.BINARY_NUMBER_MODE,
+      hljs.C_NUMBER_MODE
+    ]
+  };
 
-        STRING = {
-            className: 'string',
-            variants: [{
+  const PREPROCESSOR = {
+    className: 'meta',
+    begin: '#',
+    end: '$',
+    keywords: {
+      'meta-keyword': 'comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin'
+    },
+    contains: [
+      {
+        begin: /\\\n/,
+        relevance: 0
+      },
+      {
+        beginKeywords: 'include',
+        keywords: {
+          'meta-keyword': 'include'
+        },
+        end: '$',
+        contains: [
+          STRING,
+          {
+            className: 'meta-string',
+            variants: [
+              {
+                begin: '<',
+                end: '>'
+              },
+              {
                 begin: /"/,
                 end: /"/,
                 contains: [{
-                    begin: /""/,
-                    relevance: 0
+                  begin: /""/,
+                  relevance: 0
                 }]
-            }, {
+              },
+              {
                 begin: /'/,
                 end: /'/,
                 contains: [{
-                    begin: /''/,
-                    relevance: 0
+                  begin: /''/,
+                  relevance: 0
                 }]
-            }]
-        },
-
-        NUMBER = {
-            variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]
-        },
-
-        PREPROCESSOR = {
-            className: 'meta',
-            begin: '#',
-            end: '$',
-            keywords: {'meta-keyword': 'comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin'},
-            contains: [{
-                    begin: /\\\n/,
-                    relevance: 0
-                }, {
-                    beginKeywords: 'include',
-                    keywords: {'meta-keyword': 'include'},
-                    end: '$',
-                    contains: [
-                        STRING, {
-                            className: 'meta-string',
-                            variants: [{
-                                begin: '<',
-                                end: '>'
-                            }, {
-                                begin: /"/,
-                                end: /"/,
-                                contains: [{
-                                    begin: /""/,
-                                    relevance: 0
-                                }]
-                            }, {
-                                begin: /'/,
-                                end: /'/,
-                                contains: [{
-                                    begin: /''/,
-                                    relevance: 0
-                                }]
-                            }]
-                        }
-                    ]
-                },
-                STRING,
-                COMMENT
+              }
             ]
-        },
-
-        CONSTANT = {
-            className: 'symbol',
-            // begin: '@',
-            // end: '$',
-            // keywords: 'AppDataCommonDir AppDataDir AutoItExe AutoItPID AutoItVersion AutoItX64 COM_EventObj CommonFilesDir Compiled ComputerName ComSpec CPUArch CR CRLF DesktopCommonDir DesktopDepth DesktopDir DesktopHeight DesktopRefresh DesktopWidth DocumentsCommonDir error exitCode exitMethod extended FavoritesCommonDir FavoritesDir GUI_CtrlHandle GUI_CtrlId GUI_DragFile GUI_DragId GUI_DropId GUI_WinHandle HomeDrive HomePath HomeShare HotKeyPressed HOUR IPAddress1 IPAddress2 IPAddress3 IPAddress4 KBLayout LF LocalAppDataDir LogonDNSDomain LogonDomain LogonServer MDAY MIN MON MSEC MUILang MyDocumentsDir NumParams OSArch OSBuild OSLang OSServicePack OSType OSVersion ProgramFilesDir ProgramsCommonDir ProgramsDir ScriptDir ScriptFullPath ScriptLineNumber ScriptName SEC StartMenuCommonDir StartMenuDir StartupCommonDir StartupDir SW_DISABLE SW_ENABLE SW_HIDE SW_LOCK SW_MAXIMIZE SW_MINIMIZE SW_RESTORE SW_SHOW SW_SHOWDEFAULT SW_SHOWMAXIMIZED SW_SHOWMINIMIZED SW_SHOWMINNOACTIVE SW_SHOWNA SW_SHOWNOACTIVATE SW_SHOWNORMAL SW_UNLOCK SystemDir TAB TempDir TRAY_ID TrayIconFlashing TrayIconVisible UserName UserProfileDir WDAY WindowsDir WorkingDir YDAY YEAR',
-            // relevance: 5
-            begin: '@[A-z0-9_]+'
-        },
+          }
+        ]
+      },
+      STRING,
+      COMMENT
+    ]
+  };
 
-        FUNCTION = {
-            className: 'function',
-            beginKeywords: 'Func',
-            end: '$',
-            illegal: '\\$|\\[|%',
-            contains: [
-                hljs.UNDERSCORE_TITLE_MODE, {
-                    className: 'params',
-                    begin: '\\(',
-                    end: '\\)',
-                    contains: [
-                        VARIABLE,
-                        STRING,
-                        NUMBER
-                    ]
-                }
-            ]
-        };
+  const CONSTANT = {
+    className: 'symbol',
+    // begin: '@',
+    // end: '$',
+    // keywords: 'AppDataCommonDir AppDataDir AutoItExe AutoItPID AutoItVersion AutoItX64 COM_EventObj CommonFilesDir Compiled ComputerName ComSpec CPUArch CR CRLF DesktopCommonDir DesktopDepth DesktopDir DesktopHeight DesktopRefresh DesktopWidth DocumentsCommonDir error exitCode exitMethod extended FavoritesCommonDir FavoritesDir GUI_CtrlHandle GUI_CtrlId GUI_DragFile GUI_DragId GUI_DropId GUI_WinHandle HomeDrive HomePath HomeShare HotKeyPressed HOUR IPAddress1 IPAddress2 IPAddress3 IPAddress4 KBLayout LF LocalAppDataDir LogonDNSDomain LogonDomain LogonServer MDAY MIN MON MSEC MUILang MyDocumentsDir NumParams OSArch OSBuild OSLang OSServicePack OSType OSVersion ProgramFilesDir ProgramsCommonDir ProgramsDir ScriptDir ScriptFullPath ScriptLineNumber ScriptName SEC StartMenuCommonDir StartMenuDir StartupCommonDir StartupDir SW_DISABLE SW_ENABLE SW_HIDE SW_LOCK SW_MAXIMIZE SW_MINIMIZE SW_RESTORE SW_SHOW SW_SHOWDEFAULT SW_SHOWMAXIMIZED SW_SHOWMINIMIZED SW_SHOWMINNOACTIVE SW_SHOWNA SW_SHOWNOACTIVATE SW_SHOWNORMAL SW_UNLOCK SystemDir TAB TempDir TRAY_ID TrayIconFlashing TrayIconVisible UserName UserProfileDir WDAY WindowsDir WorkingDir YDAY YEAR',
+    // relevance: 5
+    begin: '@[A-z0-9_]+'
+  };
 
-    return {
-        name: 'AutoIt',
-        case_insensitive: true,
-        illegal: /\/\*/,
-        keywords: {
-            keyword: KEYWORDS,
-            built_in: BUILT_IN,
-            literal: LITERAL
-        },
+  const FUNCTION = {
+    className: 'function',
+    beginKeywords: 'Func',
+    end: '$',
+    illegal: '\\$|\\[|%',
+    contains: [
+      hljs.UNDERSCORE_TITLE_MODE,
+      {
+        className: 'params',
+        begin: '\\(',
+        end: '\\)',
         contains: [
-            COMMENT,
-            VARIABLE,
-            STRING,
-            NUMBER,
-            PREPROCESSOR,
-            CONSTANT,
-            FUNCTION
+          VARIABLE,
+          STRING,
+          NUMBER
         ]
-    }
+      }
+    ]
+  };
+
+  return {
+    name: 'AutoIt',
+    case_insensitive: true,
+    illegal: /\/\*/,
+    keywords: {
+      keyword: KEYWORDS,
+      built_in: BUILT_IN,
+      literal: LITERAL
+    },
+    contains: [
+      COMMENT,
+      VARIABLE,
+      STRING,
+      NUMBER,
+      PREPROCESSOR,
+      CONSTANT,
+      FUNCTION
+    ]
+  };
 }
diff --git a/src/languages/avrasm.js b/src/languages/avrasm.js
index de2c7a46d9..72eebcfe89 100644
--- a/src/languages/avrasm.js
+++ b/src/languages/avrasm.js
@@ -56,12 +56,20 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
-        begin: '\'', end: '[^\\\\]\'',
+        begin: '\'',
+        end: '[^\\\\]\'',
         illegal: '[^\\\\][^\']'
       },
-      {className: 'symbol',  begin: '^[A-Za-z0-9_.$]+:'},
-      {className: 'meta', begin: '#', end: '$'},
-      {  // substitution within a macro
+      {
+        className: 'symbol',
+        begin: '^[A-Za-z0-9_.$]+:'
+      },
+      {
+        className: 'meta',
+        begin: '#',
+        end: '$'
+      },
+      { // substitution within a macro
         className: 'subst',
         begin: '@[0-9]+'
       }
diff --git a/src/languages/awk.js b/src/languages/awk.js
index f2b424154e..c0a7503912 100644
--- a/src/languages/awk.js
+++ b/src/languages/awk.js
@@ -7,39 +7,49 @@ Description: language definition for Awk scripts
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     variants: [
-      {begin: /\$[\w\d#@][\w\d_]*/},
-      {begin: /\$\{(.*?)\}/}
+      {
+        begin: /\$[\w\d#@][\w\d_]*/
+      },
+      {
+        begin: /\$\{(.*?)\}/
+      }
     ]
   };
-  var KEYWORDS = 'BEGIN END if else while do for in break continue delete next nextfile function func exit|10';
-  var STRING = {
+  const KEYWORDS = 'BEGIN END if else while do for in break continue delete next nextfile function func exit|10';
+  const STRING = {
     className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE],
     variants: [
       {
-        begin: /(u|b)?r?'''/, end: /'''/,
+        begin: /(u|b)?r?'''/,
+        end: /'''/,
         relevance: 10
       },
       {
-        begin: /(u|b)?r?"""/, end: /"""/,
+        begin: /(u|b)?r?"""/,
+        end: /"""/,
         relevance: 10
       },
       {
-        begin: /(u|r|ur)'/, end: /'/,
+        begin: /(u|r|ur)'/,
+        end: /'/,
         relevance: 10
       },
       {
-        begin: /(u|r|ur)"/, end: /"/,
+        begin: /(u|r|ur)"/,
+        end: /"/,
         relevance: 10
       },
       {
-        begin: /(b|br)'/, end: /'/
+        begin: /(b|br)'/,
+        end: /'/
       },
       {
-        begin: /(b|br)"/, end: /"/
+        begin: /(b|br)"/,
+        end: /"/
       },
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE
@@ -57,5 +67,5 @@ export default function(hljs) {
       hljs.HASH_COMMENT_MODE,
       hljs.NUMBER_MODE
     ]
-  }
+  };
 }
diff --git a/src/languages/axapta.js b/src/languages/axapta.js
index 297a23a118..cf8dce3b95 100644
--- a/src/languages/axapta.js
+++ b/src/languages/axapta.js
@@ -32,7 +32,7 @@ export default function(hljs) {
     'default',
     'false',
     'null',
-    'true',
+    'true'
   ];
 
   const NORMAL_KEYWORDS = [
@@ -135,7 +135,7 @@ export default function(hljs) {
     'validtimestate',
     'void',
     'where',
-    'while',
+    'while'
   ];
 
   const KEYWORDS = {
@@ -156,14 +156,19 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'meta',
-        begin: '#', end: '$'
+        begin: '#',
+        end: '$'
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface',
+        end: /\{/,
+        excludeEnd: true,
         illegal: ':',
         contains: [
-          {beginKeywords: 'extends implements'},
+          {
+            beginKeywords: 'extends implements'
+          },
           hljs.UNDERSCORE_TITLE_MODE
         ]
       }
diff --git a/src/languages/basic.js b/src/languages/basic.js
index 9143058f5f..1689236341 100644
--- a/src/languages/basic.js
+++ b/src/languages/basic.js
@@ -13,25 +13,29 @@ export default function(hljs) {
     illegal: '^\.',
     // Support explicitly typed variables that end with $%! or #.
     keywords: {
-        $pattern: '[a-zA-Z][a-zA-Z0-9_$%!#]*',
-        keyword:
-          'ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE ' +
-          'CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ ' +
-          'DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ ' +
-          'EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO ' +
-          'HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON ' +
-          'OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET ' +
-          'MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION ' +
-          'BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET ' +
-          'PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET ' +
-          'RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP ' +
-          'SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE ' +
-          'WEND WIDTH WINDOW WRITE XOR'
+      $pattern: '[a-zA-Z][a-zA-Z0-9_$%!#]*',
+      keyword:
+        'ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE ' +
+        'CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ ' +
+        'DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ ' +
+        'EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO ' +
+        'HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON ' +
+        'OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET ' +
+        'MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION ' +
+        'BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET ' +
+        'PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET ' +
+        'RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP ' +
+        'SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE ' +
+        'WEND WIDTH WINDOW WRITE XOR'
     },
     contains: [
       hljs.QUOTE_STRING_MODE,
-      hljs.COMMENT('REM', '$', {relevance: 10}),
-      hljs.COMMENT('\'', '$', {relevance: 0}),
+      hljs.COMMENT('REM', '$', {
+        relevance: 10
+      }),
+      hljs.COMMENT('\'', '$', {
+        relevance: 0
+      }),
       {
         // Match line numbers
         className: 'symbol',
diff --git a/src/languages/bnf.js b/src/languages/bnf.js
index d4edc03bc6..30f0ecd921 100644
--- a/src/languages/bnf.js
+++ b/src/languages/bnf.js
@@ -12,7 +12,8 @@ export default function(hljs) {
       // Attribute
       {
         className: 'attribute',
-        begin: /</, end: />/
+        begin: /</,
+        end: />/
       },
       // Specific
       {
@@ -20,7 +21,8 @@ export default function(hljs) {
         end: /$/,
         contains: [
           {
-            begin: /</, end: />/
+            begin: /</,
+            end: />/
           },
           // Common
           hljs.C_LINE_COMMENT_MODE,
diff --git a/src/languages/brainfuck.js b/src/languages/brainfuck.js
index c10cdb1afc..3634b094b0 100644
--- a/src/languages/brainfuck.js
+++ b/src/languages/brainfuck.js
@@ -6,7 +6,7 @@ Website: https://esolangs.org/wiki/Brainfuck
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var LITERAL = {
+  const LITERAL = {
     className: 'literal',
     begin: /[+-]/,
     relevance: 0
diff --git a/src/languages/cal.js b/src/languages/cal.js
index ab7342e2b7..94cee44a0c 100644
--- a/src/languages/cal.js
+++ b/src/languages/cal.js
@@ -7,11 +7,11 @@ Website: https://docs.microsoft.com/en-us/dynamics-nav/programming-in-c-al
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var KEYWORDS =
+  const KEYWORDS =
     'div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to ' +
     'until while with var';
-  var LITERALS = 'false true';
-  var COMMENT_MODES = [
+  const LITERALS = 'false true';
+  const COMMENT_MODES = [
     hljs.C_LINE_COMMENT_MODE,
     hljs.COMMENT(
       /\{/,
@@ -28,58 +28,72 @@ export default function(hljs) {
       }
     )
   ];
-  var STRING = {
+  const STRING = {
     className: 'string',
-    begin: /'/, end: /'/,
-    contains: [{begin: /''/}]
+    begin: /'/,
+    end: /'/,
+    contains: [{
+      begin: /''/
+    }]
   };
-  var CHAR_STRING = {
-    className: 'string', begin: /(#\d+)+/
+  const CHAR_STRING = {
+    className: 'string',
+    begin: /(#\d+)+/
   };
-  var DATE = {
-      className: 'number',
-      begin: '\\b\\d+(\\.\\d+)?(DT|D|T)',
-      relevance: 0
+  const DATE = {
+    className: 'number',
+    begin: '\\b\\d+(\\.\\d+)?(DT|D|T)',
+    relevance: 0
   };
-  var DBL_QUOTED_VARIABLE = {
-      className: 'string', // not a string technically but makes sense to be highlighted in the same style
-      begin: '"',
-      end: '"'
+  const DBL_QUOTED_VARIABLE = {
+    className: 'string', // not a string technically but makes sense to be highlighted in the same style
+    begin: '"',
+    end: '"'
   };
 
-  var PROCEDURE = {
+  const PROCEDURE = {
     className: 'function',
-    beginKeywords: 'procedure', end: /[:;]/,
+    beginKeywords: 'procedure',
+    end: /[:;]/,
     keywords: 'procedure|10',
     contains: [
       hljs.TITLE_MODE,
       {
         className: 'params',
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         keywords: KEYWORDS,
-        contains: [STRING, CHAR_STRING]
+        contains: [
+          STRING,
+          CHAR_STRING
+        ]
       }
     ].concat(COMMENT_MODES)
   };
 
-  var OBJECT = {
+  const OBJECT = {
     className: 'class',
     begin: 'OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)',
     returnBegin: true,
     contains: [
       hljs.TITLE_MODE,
-        PROCEDURE
+      PROCEDURE
     ]
   };
 
   return {
     name: 'C/AL',
     case_insensitive: true,
-    keywords: { keyword: KEYWORDS, literal: LITERALS },
+    keywords: {
+      keyword: KEYWORDS,
+      literal: LITERALS
+    },
     illegal: /\/\*/,
     contains: [
-      STRING, CHAR_STRING,
-      DATE, DBL_QUOTED_VARIABLE,
+      STRING,
+      CHAR_STRING,
+      DATE,
+      DBL_QUOTED_VARIABLE,
       hljs.NUMBER_MODE,
       OBJECT,
       PROCEDURE
diff --git a/src/languages/capnproto.js b/src/languages/capnproto.js
index 5fea8fc84f..f2aad50803 100644
--- a/src/languages/capnproto.js
+++ b/src/languages/capnproto.js
@@ -35,23 +35,27 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'struct enum', end: /\{/,
+        beginKeywords: 'struct enum',
+        end: /\{/,
         illegal: /\n/,
-        contains: [
-          hljs.inherit(hljs.TITLE_MODE, {
-            starts: {endsWithParent: true, excludeEnd: true} // hack: eating everything after the first title
-          })
-        ]
+        contains: [hljs.inherit(hljs.TITLE_MODE, {
+          starts: {
+            endsWithParent: true,
+            excludeEnd: true
+          } // hack: eating everything after the first title
+        })]
       },
       {
         className: 'class',
-        beginKeywords: 'interface', end: /\{/,
+        beginKeywords: 'interface',
+        end: /\{/,
         illegal: /\n/,
-        contains: [
-          hljs.inherit(hljs.TITLE_MODE, {
-            starts: {endsWithParent: true, excludeEnd: true} // hack: eating everything after the first title
-          })
-        ]
+        contains: [hljs.inherit(hljs.TITLE_MODE, {
+          starts: {
+            endsWithParent: true,
+            excludeEnd: true
+          } // hack: eating everything after the first title
+        })]
       }
     ]
   };
diff --git a/src/languages/ceylon.js b/src/languages/ceylon.js
index 63dfee608c..9f26313413 100644
--- a/src/languages/ceylon.js
+++ b/src/languages/ceylon.js
@@ -7,25 +7,28 @@ Website: https://ceylon-lang.org
 /** @type LanguageFn */
 export default function(hljs) {
   // 2.3. Identifiers and keywords
-  var KEYWORDS =
+  const KEYWORDS =
     'assembly module package import alias class interface object given value ' +
     'assign void function new of extends satisfies abstracts in out return ' +
     'break continue throw assert dynamic if else switch case for while try ' +
     'catch finally then let this outer super is exists nonempty';
   // 7.4.1 Declaration Modifiers
-  var DECLARATION_MODIFIERS =
+  const DECLARATION_MODIFIERS =
     'shared abstract formal default actual variable late native deprecated ' +
     'final sealed annotation suppressWarnings small';
   // 7.4.2 Documentation
-  var DOCUMENTATION =
+  const DOCUMENTATION =
     'doc by license see throws tagged';
-  var SUBST = {
-    className: 'subst', excludeBegin: true, excludeEnd: true,
-    begin: /``/, end: /``/,
+  const SUBST = {
+    className: 'subst',
+    excludeBegin: true,
+    excludeEnd: true,
+    begin: /``/,
+    end: /``/,
     keywords: KEYWORDS,
     relevance: 10
   };
-  var EXPRESSIONS = [
+  const EXPRESSIONS = [
     {
       // verbatim string
       className: 'string',
@@ -36,7 +39,8 @@ export default function(hljs) {
     {
       // string literal or template
       className: 'string',
-      begin: '"', end: '"',
+      begin: '"',
+      end: '"',
       contains: [SUBST]
     },
     {
@@ -63,7 +67,9 @@ export default function(hljs) {
     illegal: '\\$[^01]|#[^0-9a-fA-F]',
     contains: [
       hljs.C_LINE_COMMENT_MODE,
-      hljs.COMMENT('/\\*', '\\*/', {contains: ['self']}),
+      hljs.COMMENT('/\\*', '\\*/', {
+        contains: ['self']
+      }),
       {
         // compiler annotation
         className: 'meta',
diff --git a/src/languages/clean.js b/src/languages/clean.js
index f756675f02..a6d9768e32 100644
--- a/src/languages/clean.js
+++ b/src/languages/clean.js
@@ -9,7 +9,11 @@ Website: http://clean.cs.ru.nl
 export default function(hljs) {
   return {
     name: 'Clean',
-    aliases: ['clean','icl','dcl'],
+    aliases: [
+      'clean',
+      'icl',
+      'dcl'
+    ],
     keywords: {
       keyword:
         'if let in with where case of class instance otherwise ' +
@@ -22,14 +26,14 @@ export default function(hljs) {
         'True False'
     },
     contains: [
-
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
       hljs.C_NUMBER_MODE,
-
-      {begin: '->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>'} // relevance booster
+      { // relevance booster
+        begin: '->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>'
+      }
     ]
   };
 }
diff --git a/src/languages/clojure-repl.js b/src/languages/clojure-repl.js
index 6cc1146c6e..f7518e1f4e 100644
--- a/src/languages/clojure-repl.js
+++ b/src/languages/clojure-repl.js
@@ -11,15 +11,13 @@ Category: lisp
 export default function(hljs) {
   return {
     name: 'Clojure REPL',
-    contains: [
-      {
-        className: 'meta',
-        begin: /^([\w.-]+|\s*#_)?=>/,
-        starts: {
-          end: /$/,
-          subLanguage: 'clojure'
-        }
+    contains: [{
+      className: 'meta',
+      begin: /^([\w.-]+|\s*#_)?=>/,
+      starts: {
+        end: /$/,
+        subLanguage: 'clojure'
       }
-    ]
-  }
+    }]
+  };
 }
diff --git a/src/languages/cmake.js b/src/languages/cmake.js
index f7ff736942..1cae9b15b2 100644
--- a/src/languages/cmake.js
+++ b/src/languages/cmake.js
@@ -51,7 +51,8 @@ export default function(hljs) {
     contains: [
       {
         className: 'variable',
-        begin: /\$\{/, end: /\}/
+        begin: /\$\{/,
+        end: /\}/
       },
       hljs.HASH_COMMENT_MODE,
       hljs.QUOTE_STRING_MODE,
diff --git a/src/languages/coffeescript.js b/src/languages/coffeescript.js
index e5c360d161..e5b4e67735 100644
--- a/src/languages/coffeescript.js
+++ b/src/languages/coffeescript.js
@@ -11,17 +11,17 @@ import * as ECMAScript from './lib/ecmascript.js';
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var COFFEE_BUILT_INS = [
+  const COFFEE_BUILT_INS = [
     'npm',
     'print'
   ];
-  var COFFEE_LITERALS = [
+  const COFFEE_LITERALS = [
     'yes',
     'no',
     'on',
     'off'
   ];
-  var COFFEE_KEYWORDS = [
+  const COFFEE_KEYWORDS = [
     'then',
     'unless',
     'until',
@@ -34,47 +34,63 @@ export default function(hljs) {
     'isnt',
     'not'
   ];
-  var NOT_VALID_KEYWORDS = [
+  const NOT_VALID_KEYWORDS = [
     "var",
     "const",
     "let",
     "function",
     "static"
   ];
-  var excluding = (list) =>
+  const excluding = (list) =>
     (kw) => !list.includes(kw);
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword: ECMAScript.KEYWORDS.concat(COFFEE_KEYWORDS).filter(excluding(NOT_VALID_KEYWORDS)).join(" "),
     literal: ECMAScript.LITERALS.concat(COFFEE_LITERALS).join(" "),
     built_in: ECMAScript.BUILT_INS.concat(COFFEE_BUILT_INS).join(" ")
   };
-  var JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
-  var SUBST = {
+  const JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+  const SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /\}/,
+    begin: /#\{/,
+    end: /\}/,
     keywords: KEYWORDS
   };
-  var EXPRESSIONS = [
+  const EXPRESSIONS = [
     hljs.BINARY_NUMBER_MODE,
-    hljs.inherit(hljs.C_NUMBER_MODE, {starts: {end: '(\\s*/)?', relevance: 0}}), // a number tries to eat the following slash to prevent treating it as a regexp
+    hljs.inherit(hljs.C_NUMBER_MODE, {
+      starts: {
+        end: '(\\s*/)?',
+        relevance: 0
+      }
+    }), // a number tries to eat the following slash to prevent treating it as a regexp
     {
       className: 'string',
       variants: [
         {
-          begin: /'''/, end: /'''/,
+          begin: /'''/,
+          end: /'''/,
           contains: [hljs.BACKSLASH_ESCAPE]
         },
         {
-          begin: /'/, end: /'/,
+          begin: /'/,
+          end: /'/,
           contains: [hljs.BACKSLASH_ESCAPE]
         },
         {
-          begin: /"""/, end: /"""/,
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST]
+          begin: /"""/,
+          end: /"""/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST
+          ]
         },
         {
-          begin: /"/, end: /"/,
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST]
+          begin: /"/,
+          end: /"/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST
+          ]
         }
       ]
     },
@@ -82,8 +98,12 @@ export default function(hljs) {
       className: 'regexp',
       variants: [
         {
-          begin: '///', end: '///',
-          contains: [SUBST, hljs.HASH_COMMENT_MODE]
+          begin: '///',
+          end: '///',
+          contains: [
+            SUBST,
+            hljs.HASH_COMMENT_MODE
+          ]
         },
         {
           begin: '//[gim]{0,3}(?=\\W)',
@@ -101,28 +121,35 @@ export default function(hljs) {
     },
     {
       subLanguage: 'javascript',
-      excludeBegin: true, excludeEnd: true,
+      excludeBegin: true,
+      excludeEnd: true,
       variants: [
         {
-          begin: '```', end: '```',
+          begin: '```',
+          end: '```'
         },
         {
-          begin: '`', end: '`',
+          begin: '`',
+          end: '`'
         }
       ]
     }
   ];
   SUBST.contains = EXPRESSIONS;
 
-  var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: JS_IDENT_RE});
-  var PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
-  var PARAMS = {
+  const TITLE = hljs.inherit(hljs.TITLE_MODE, {
+    begin: JS_IDENT_RE
+  });
+  const PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
+  const PARAMS = {
     className: 'params',
-    begin: '\\([^\\(]', returnBegin: true,
+    begin: '\\([^\\(]',
+    returnBegin: true,
     /* We need another contained nameless mode to not have every nested
     pair of parens to be called "params" */
     contains: [{
-      begin: /\(/, end: /\)/,
+      begin: /\(/,
+      end: /\)/,
       keywords: KEYWORDS,
       contains: ['self'].concat(EXPRESSIONS)
     }]
@@ -130,7 +157,11 @@ export default function(hljs) {
 
   return {
     name: 'CoffeeScript',
-    aliases: ['coffee', 'cson', 'iced'],
+    aliases: [
+      'coffee',
+      'cson',
+      'iced'
+    ],
     keywords: KEYWORDS,
     illegal: /\/\*/,
     contains: EXPRESSIONS.concat([
@@ -138,22 +169,25 @@ export default function(hljs) {
       hljs.HASH_COMMENT_MODE,
       {
         className: 'function',
-        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE, end: '[-=]>',
+        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE,
+        end: '[-=]>',
         returnBegin: true,
-        contains: [TITLE, PARAMS]
+        contains: [
+          TITLE,
+          PARAMS
+        ]
       },
       {
         // anonymous function start
         begin: /[:\(,=]\s*/,
         relevance: 0,
-        contains: [
-          {
-            className: 'function',
-            begin: PARAMS_RE, end: '[-=]>',
-            returnBegin: true,
-            contains: [PARAMS]
-          }
-        ]
+        contains: [{
+          className: 'function',
+          begin: PARAMS_RE,
+          end: '[-=]>',
+          returnBegin: true,
+          contains: [PARAMS]
+        }]
       },
       {
         className: 'class',
@@ -171,8 +205,10 @@ export default function(hljs) {
         ]
       },
       {
-        begin: JS_IDENT_RE + ':', end: ':',
-        returnBegin: true, returnEnd: true,
+        begin: JS_IDENT_RE + ':',
+        end: ':',
+        returnBegin: true,
+        returnEnd: true,
         relevance: 0
       }
     ])
diff --git a/src/languages/coq.js b/src/languages/coq.js
index 8f8a4e573d..622b13e2fd 100644
--- a/src/languages/coq.js
+++ b/src/languages/coq.js
@@ -69,7 +69,9 @@ export default function(hljs) {
         begin: '\\|\\s*',
         end: '\\w+'
       },
-      {begin: /[-=]>/} // relevance booster
+      { // relevance booster
+        begin: /[-=]>/
+      }
     ]
   };
 }
diff --git a/src/languages/cos.js b/src/languages/cos.js
index 48ae01b58e..4410b859f5 100644
--- a/src/languages/cos.js
+++ b/src/languages/cos.js
@@ -6,29 +6,26 @@ Website: https://cedocs.intersystems.com/latest/csp/docbook/DocBook.UI.Page.cls
 */
 
 /** @type LanguageFn */
-export default function cos (hljs) {
-
-  var STRINGS = {
+export default function cos(hljs) {
+  const STRINGS = {
     className: 'string',
-    variants: [
-      {
-        begin: '"',
-        end: '"',
-        contains: [{ // escaped
-          begin: "\"\"",
-          relevance: 0
-        }]
-      }
-    ]
+    variants: [{
+      begin: '"',
+      end: '"',
+      contains: [{ // escaped
+        begin: "\"\"",
+        relevance: 0
+      }]
+    }]
   };
 
-  var NUMBERS = {
+  const NUMBERS = {
     className: "number",
     begin: "\\b(\\d+(\\.\\d*)?|\\.\\d+)",
     relevance: 0
   };
 
-  var COS_KEYWORDS =
+  const COS_KEYWORDS =
     'property parameter class classmethod clientmethod extends as break ' +
     'catch close continue do d|0 else elseif for goto halt hang h|0 if job ' +
     'j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 ' +
@@ -37,47 +34,50 @@ export default function cos (hljs) {
     'zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit ' +
     'zsync ascii';
 
-    // registered function - no need in them due to all functions are highlighted,
-    // but I'll just leave this here.
+  // registered function - no need in them due to all functions are highlighted,
+  // but I'll just leave this here.
 
-    //"$bit", "$bitcount",
-    //"$bitfind", "$bitlogic", "$case", "$char", "$classmethod", "$classname",
-    //"$compile", "$data", "$decimal", "$double", "$extract", "$factor",
-    //"$find", "$fnumber", "$get", "$increment", "$inumber", "$isobject",
-    //"$isvaliddouble", "$isvalidnum", "$justify", "$length", "$list",
-    //"$listbuild", "$listdata", "$listfind", "$listfromstring", "$listget",
-    //"$listlength", "$listnext", "$listsame", "$listtostring", "$listvalid",
-    //"$locate", "$match", "$method", "$name", "$nconvert", "$next",
-    //"$normalize", "$now", "$number", "$order", "$parameter", "$piece",
-    //"$prefetchoff", "$prefetchon", "$property", "$qlength", "$qsubscript",
-    //"$query", "$random", "$replace", "$reverse", "$sconvert", "$select",
-    //"$sortbegin", "$sortend", "$stack", "$text", "$translate", "$view",
-    //"$wascii", "$wchar", "$wextract", "$wfind", "$wiswide", "$wlength",
-    //"$wreverse", "$xecute", "$zabs", "$zarccos", "$zarcsin", "$zarctan",
-    //"$zcos", "$zcot", "$zcsc", "$zdate", "$zdateh", "$zdatetime",
-    //"$zdatetimeh", "$zexp", "$zhex", "$zln", "$zlog", "$zpower", "$zsec",
-    //"$zsin", "$zsqr", "$ztan", "$ztime", "$ztimeh", "$zboolean",
-    //"$zconvert", "$zcrc", "$zcyc", "$zdascii", "$zdchar", "$zf",
-    //"$ziswide", "$zlascii", "$zlchar", "$zname", "$zposition", "$zqascii",
-    //"$zqchar", "$zsearch", "$zseek", "$zstrip", "$zwascii", "$zwchar",
-    //"$zwidth", "$zwpack", "$zwbpack", "$zwunpack", "$zwbunpack", "$zzenkaku",
-    //"$change", "$mv", "$mvat", "$mvfmt", "$mvfmts", "$mviconv",
-    //"$mviconvs", "$mvinmat", "$mvlover", "$mvoconv", "$mvoconvs", "$mvraise",
-    //"$mvtrans", "$mvv", "$mvname", "$zbitand", "$zbitcount", "$zbitfind",
-    //"$zbitget", "$zbitlen", "$zbitnot", "$zbitor", "$zbitset", "$zbitstr",
-    //"$zbitxor", "$zincrement", "$znext", "$zorder", "$zprevious", "$zsort",
-    //"device", "$ecode", "$estack", "$etrap", "$halt", "$horolog",
-    //"$io", "$job", "$key", "$namespace", "$principal", "$quit", "$roles",
-    //"$storage", "$system", "$test", "$this", "$tlevel", "$username",
-    //"$x", "$y", "$za", "$zb", "$zchild", "$zeof", "$zeos", "$zerror",
-    //"$zhorolog", "$zio", "$zjob", "$zmode", "$znspace", "$zparent", "$zpi",
-    //"$zpos", "$zreference", "$zstorage", "$ztimestamp", "$ztimezone",
-    //"$ztrap", "$zversion"
+  // "$bit", "$bitcount",
+  // "$bitfind", "$bitlogic", "$case", "$char", "$classmethod", "$classname",
+  // "$compile", "$data", "$decimal", "$double", "$extract", "$factor",
+  // "$find", "$fnumber", "$get", "$increment", "$inumber", "$isobject",
+  // "$isvaliddouble", "$isvalidnum", "$justify", "$length", "$list",
+  // "$listbuild", "$listdata", "$listfind", "$listfromstring", "$listget",
+  // "$listlength", "$listnext", "$listsame", "$listtostring", "$listvalid",
+  // "$locate", "$match", "$method", "$name", "$nconvert", "$next",
+  // "$normalize", "$now", "$number", "$order", "$parameter", "$piece",
+  // "$prefetchoff", "$prefetchon", "$property", "$qlength", "$qsubscript",
+  // "$query", "$random", "$replace", "$reverse", "$sconvert", "$select",
+  // "$sortbegin", "$sortend", "$stack", "$text", "$translate", "$view",
+  // "$wascii", "$wchar", "$wextract", "$wfind", "$wiswide", "$wlength",
+  // "$wreverse", "$xecute", "$zabs", "$zarccos", "$zarcsin", "$zarctan",
+  // "$zcos", "$zcot", "$zcsc", "$zdate", "$zdateh", "$zdatetime",
+  // "$zdatetimeh", "$zexp", "$zhex", "$zln", "$zlog", "$zpower", "$zsec",
+  // "$zsin", "$zsqr", "$ztan", "$ztime", "$ztimeh", "$zboolean",
+  // "$zconvert", "$zcrc", "$zcyc", "$zdascii", "$zdchar", "$zf",
+  // "$ziswide", "$zlascii", "$zlchar", "$zname", "$zposition", "$zqascii",
+  // "$zqchar", "$zsearch", "$zseek", "$zstrip", "$zwascii", "$zwchar",
+  // "$zwidth", "$zwpack", "$zwbpack", "$zwunpack", "$zwbunpack", "$zzenkaku",
+  // "$change", "$mv", "$mvat", "$mvfmt", "$mvfmts", "$mviconv",
+  // "$mviconvs", "$mvinmat", "$mvlover", "$mvoconv", "$mvoconvs", "$mvraise",
+  // "$mvtrans", "$mvv", "$mvname", "$zbitand", "$zbitcount", "$zbitfind",
+  // "$zbitget", "$zbitlen", "$zbitnot", "$zbitor", "$zbitset", "$zbitstr",
+  // "$zbitxor", "$zincrement", "$znext", "$zorder", "$zprevious", "$zsort",
+  // "device", "$ecode", "$estack", "$etrap", "$halt", "$horolog",
+  // "$io", "$job", "$key", "$namespace", "$principal", "$quit", "$roles",
+  // "$storage", "$system", "$test", "$this", "$tlevel", "$username",
+  // "$x", "$y", "$za", "$zb", "$zchild", "$zeof", "$zeos", "$zerror",
+  // "$zhorolog", "$zio", "$zjob", "$zmode", "$znspace", "$zparent", "$zpi",
+  // "$zpos", "$zreference", "$zstorage", "$ztimestamp", "$ztimezone",
+  // "$ztrap", "$zversion"
 
   return {
     name: 'Caché Object Script',
     case_insensitive: true,
-    aliases: ["cos", "cls"],
+    aliases: [
+      "cos",
+      "cls"
+    ],
     keywords: COS_KEYWORDS,
     contains: [
       NUMBERS,
@@ -86,7 +86,8 @@ export default function cos (hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       {
         className: "comment",
-        begin: /;/, end: "$",
+        begin: /;/,
+        end: "$",
         relevance: 0
       },
       { // Functions and user-defined functions: write $ztime(60*60*3), $$myFunc(10), $$^Val(1)
@@ -109,22 +110,26 @@ export default function cos (hljs) {
         className: "keyword",
         begin: /##class|##super|#define|#dim/
       },
-
       // sub-languages: are not fully supported by hljs by 11/15/2015
       // left for the future implementation.
       {
-        begin: /&sql\(/,    end: /\)/,
-        excludeBegin: true, excludeEnd: true,
+        begin: /&sql\(/,
+        end: /\)/,
+        excludeBegin: true,
+        excludeEnd: true,
         subLanguage: "sql"
       },
       {
-        begin: /&(js|jscript|javascript)</, end: />/,
-        excludeBegin: true, excludeEnd: true,
+        begin: /&(js|jscript|javascript)</,
+        end: />/,
+        excludeBegin: true,
+        excludeEnd: true,
         subLanguage: "javascript"
       },
       {
         // this brakes first and last tag, but this is the only way to embed a valid html
-        begin: /&html<\s*</, end: />\s*>/,
+        begin: /&html<\s*</,
+        end: />\s*>/,
         subLanguage: "xml"
       }
     ]
diff --git a/src/languages/crmsh.js b/src/languages/crmsh.js
index b7033d31db..6e1b277810 100644
--- a/src/languages/crmsh.js
+++ b/src/languages/crmsh.js
@@ -8,27 +8,24 @@ Category: config
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var RESOURCES = 'primitive rsc_template';
-
-  var COMMANDS = 'group clone ms master location colocation order fencing_topology ' +
+  const RESOURCES = 'primitive rsc_template';
+  const COMMANDS = 'group clone ms master location colocation order fencing_topology ' +
       'rsc_ticket acl_target acl_group user role ' +
       'tag xml';
-
-  var PROPERTY_SETS = 'property rsc_defaults op_defaults';
-
-  var KEYWORDS = 'params meta operations op rule attributes utilization';
-
-  var OPERATORS = 'read write deny defined not_defined in_range date spec in ' +
+  const PROPERTY_SETS = 'property rsc_defaults op_defaults';
+  const KEYWORDS = 'params meta operations op rule attributes utilization';
+  const OPERATORS = 'read write deny defined not_defined in_range date spec in ' +
       'ref reference attribute type xpath version and or lt gt tag ' +
       'lte gte eq ne \\';
-
-  var TYPES = 'number string';
-
-  var LITERALS = 'Master Started Slave Stopped start promote demote stop monitor true false';
+  const TYPES = 'number string';
+  const LITERALS = 'Master Started Slave Stopped start promote demote stop monitor true false';
 
   return {
     name: 'crmsh',
-    aliases: ['crm', 'pcmk'],
+    aliases: [
+      'crm',
+      'pcmk'
+    ],
     case_insensitive: true,
     keywords: {
       keyword: KEYWORDS + ' ' + OPERATORS + ' ' + TYPES,
diff --git a/src/languages/csp.js b/src/languages/csp.js
index 930c381f3c..8cc0909903 100644
--- a/src/languages/csp.js
+++ b/src/languages/csp.js
@@ -16,17 +16,20 @@ export default function(hljs) {
       $pattern: '[a-zA-Z][a-zA-Z0-9_-]*',
       keyword: 'base-uri child-src connect-src default-src font-src form-action ' +
         'frame-ancestors frame-src img-src media-src object-src plugin-types ' +
-        'report-uri sandbox script-src style-src',
+        'report-uri sandbox script-src style-src'
     },
     contains: [
-    {
-      className: 'string',
-      begin: "'", end: "'"
-    },
-    {
-      className: 'attribute',
-      begin: '^Content', end: ':', excludeEnd: true,
-    },
+      {
+        className: 'string',
+        begin: "'",
+        end: "'"
+      },
+      {
+        className: 'attribute',
+        begin: '^Content',
+        end: ':',
+        excludeEnd: true
+      }
     ]
   };
 }
diff --git a/src/languages/d.js b/src/languages/d.js
index 9f1d8be95e..239fb59a41 100644
--- a/src/languages/d.js
+++ b/src/languages/d.js
@@ -30,7 +30,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_KEYWORDS = {
+  const D_KEYWORDS = {
     $pattern: hljs.UNDERSCORE_IDENT_RE,
     keyword:
       'abstract alias align asm assert auto body break byte case cast catch class ' +
@@ -54,31 +54,31 @@ export default function(hljs) {
    *
    * @type {String}
    */
-  var decimal_integer_re = '(0|[1-9][\\d_]*)',
-    decimal_integer_nosus_re = '(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)',
-    binary_integer_re = '0[bB][01_]+',
-    hexadecimal_digits_re = '([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)',
-    hexadecimal_integer_re = '0[xX]' + hexadecimal_digits_re,
+  const decimal_integer_re = '(0|[1-9][\\d_]*)';
+  const decimal_integer_nosus_re = '(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)';
+  const binary_integer_re = '0[bB][01_]+';
+  const hexadecimal_digits_re = '([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)';
+  const hexadecimal_integer_re = '0[xX]' + hexadecimal_digits_re;
 
-    decimal_exponent_re = '([eE][+-]?' + decimal_integer_nosus_re + ')',
-    decimal_float_re = '(' + decimal_integer_nosus_re + '(\\.\\d*|' + decimal_exponent_re + ')|' +
+  const decimal_exponent_re = '([eE][+-]?' + decimal_integer_nosus_re + ')';
+  const decimal_float_re = '(' + decimal_integer_nosus_re + '(\\.\\d*|' + decimal_exponent_re + ')|' +
                 '\\d+\\.' + decimal_integer_nosus_re + decimal_integer_nosus_re + '|' +
                 '\\.' + decimal_integer_re + decimal_exponent_re + '?' +
-              ')',
-    hexadecimal_float_re = '(0[xX](' +
-                  hexadecimal_digits_re + '\\.' + hexadecimal_digits_re + '|'+
+              ')';
+  const hexadecimal_float_re = '(0[xX](' +
+                  hexadecimal_digits_re + '\\.' + hexadecimal_digits_re + '|' +
                   '\\.?' + hexadecimal_digits_re +
-                 ')[pP][+-]?' + decimal_integer_nosus_re + ')',
+                 ')[pP][+-]?' + decimal_integer_nosus_re + ')';
 
-    integer_re = '(' +
+  const integer_re = '(' +
       decimal_integer_re + '|' +
-      binary_integer_re  + '|' +
-       hexadecimal_integer_re   +
-    ')',
+      binary_integer_re + '|' +
+       hexadecimal_integer_re +
+    ')';
 
-    float_re = '(' +
+  const float_re = '(' +
       hexadecimal_float_re + '|' +
-      decimal_float_re  +
+      decimal_float_re +
     ')';
 
   /**
@@ -86,31 +86,31 @@ export default function(hljs) {
    *
    * @type {String}
    */
-  var escape_sequence_re = '\\\\(' +
-              '[\'"\\?\\\\abfnrtv]|' +  // common escapes
-              'u[\\dA-Fa-f]{4}|' +     // four hex digit unicode codepoint
-              '[0-7]{1,3}|' +       // one to three octal digit ascii char code
-              'x[\\dA-Fa-f]{2}|' +    // two hex digit ascii char code
-              'U[\\dA-Fa-f]{8}' +      // eight hex digit unicode codepoint
+  const escape_sequence_re = '\\\\(' +
+              '[\'"\\?\\\\abfnrtv]|' + // common escapes
+              'u[\\dA-Fa-f]{4}|' + // four hex digit unicode codepoint
+              '[0-7]{1,3}|' + // one to three octal digit ascii char code
+              'x[\\dA-Fa-f]{2}|' + // two hex digit ascii char code
+              'U[\\dA-Fa-f]{8}' + // eight hex digit unicode codepoint
               ')|' +
-              '&[a-zA-Z\\d]{2,};';      // named character entity
+              '&[a-zA-Z\\d]{2,};'; // named character entity
 
   /**
    * D integer number literals
    *
    * @type {Object}
    */
-  var D_INTEGER_MODE = {
+  const D_INTEGER_MODE = {
     className: 'number',
-      begin: '\\b' + integer_re + '(L|u|U|Lu|LU|uL|UL)?',
-      relevance: 0
+    begin: '\\b' + integer_re + '(L|u|U|Lu|LU|uL|UL)?',
+    relevance: 0
   };
 
   /**
    * [D_FLOAT_MODE description]
    * @type {Object}
    */
-  var D_FLOAT_MODE = {
+  const D_FLOAT_MODE = {
     className: 'number',
     begin: '\\b(' +
         float_re + '([fF]|L|i|[fF]i|Li)?|' +
@@ -124,9 +124,10 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_CHARACTER_MODE = {
+  const D_CHARACTER_MODE = {
     className: 'string',
-    begin: '\'(' + escape_sequence_re + '|.)', end: '\'',
+    begin: '\'(' + escape_sequence_re + '|.)',
+    end: '\'',
     illegal: '.'
   };
 
@@ -135,7 +136,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_ESCAPE_SEQUENCE = {
+  const D_ESCAPE_SEQUENCE = {
     begin: escape_sequence_re,
     relevance: 0
   };
@@ -145,7 +146,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_STRING_MODE = {
+  const D_STRING_MODE = {
     className: 'string',
     begin: '"',
     contains: [D_ESCAPE_SEQUENCE],
@@ -157,7 +158,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_WYSIWYG_DELIMITED_STRING_MODE = {
+  const D_WYSIWYG_DELIMITED_STRING_MODE = {
     className: 'string',
     begin: '[rq]"',
     end: '"[cwd]?',
@@ -169,7 +170,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_ALTERNATE_WYSIWYG_STRING_MODE = {
+  const D_ALTERNATE_WYSIWYG_STRING_MODE = {
     className: 'string',
     begin: '`',
     end: '`[cwd]?'
@@ -180,7 +181,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_HEX_STRING_MODE = {
+  const D_HEX_STRING_MODE = {
     className: 'string',
     begin: 'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',
     relevance: 10
@@ -191,7 +192,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_TOKEN_STRING_MODE = {
+  const D_TOKEN_STRING_MODE = {
     className: 'string',
     begin: 'q"\\{',
     end: '\\}"'
@@ -202,7 +203,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_HASHBANG_MODE = {
+  const D_HASHBANG_MODE = {
     className: 'meta',
     begin: '^#!',
     end: '$',
@@ -214,7 +215,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_SPECIAL_TOKEN_SEQUENCE_MODE = {
+  const D_SPECIAL_TOKEN_SEQUENCE_MODE = {
     className: 'meta',
     begin: '#(line)',
     end: '$',
@@ -226,7 +227,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_ATTRIBUTE_MODE = {
+  const D_ATTRIBUTE_MODE = {
     className: 'keyword',
     begin: '@[a-zA-Z_][a-zA-Z_\\d]*'
   };
@@ -236,7 +237,7 @@ export default function(hljs) {
    *
    * @type {Object}
    */
-  var D_NESTING_COMMENT_MODE = hljs.COMMENT(
+  const D_NESTING_COMMENT_MODE = hljs.COMMENT(
     '\\/\\+',
     '\\+\\/',
     {
@@ -250,19 +251,19 @@ export default function(hljs) {
     keywords: D_KEYWORDS,
     contains: [
       hljs.C_LINE_COMMENT_MODE,
-        hljs.C_BLOCK_COMMENT_MODE,
-        D_NESTING_COMMENT_MODE,
-        D_HEX_STRING_MODE,
-        D_STRING_MODE,
-        D_WYSIWYG_DELIMITED_STRING_MODE,
-        D_ALTERNATE_WYSIWYG_STRING_MODE,
-        D_TOKEN_STRING_MODE,
-        D_FLOAT_MODE,
-        D_INTEGER_MODE,
-        D_CHARACTER_MODE,
-        D_HASHBANG_MODE,
-        D_SPECIAL_TOKEN_SEQUENCE_MODE,
-        D_ATTRIBUTE_MODE
+      hljs.C_BLOCK_COMMENT_MODE,
+      D_NESTING_COMMENT_MODE,
+      D_HEX_STRING_MODE,
+      D_STRING_MODE,
+      D_WYSIWYG_DELIMITED_STRING_MODE,
+      D_ALTERNATE_WYSIWYG_STRING_MODE,
+      D_TOKEN_STRING_MODE,
+      D_FLOAT_MODE,
+      D_INTEGER_MODE,
+      D_CHARACTER_MODE,
+      D_HASHBANG_MODE,
+      D_SPECIAL_TOKEN_SEQUENCE_MODE,
+      D_ATTRIBUTE_MODE
     ]
   };
 }
diff --git a/src/languages/dart.js b/src/languages/dart.js
index 0ceceda46b..238423de78 100644
--- a/src/languages/dart.js
+++ b/src/languages/dart.js
@@ -7,12 +7,13 @@ Website: https://dart.dev
 Category: scripting
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   const SUBST = {
     className: 'subst',
     variants: [{
       begin: '\\$[A-Za-z0-9_]+'
-    }],
+    }]
   };
 
   const BRACED_SUBST = {
@@ -21,12 +22,13 @@ export default function(hljs) {
       begin: /\$\{/,
       end: /\}/
     }],
-    keywords: 'true false null this is new super',
+    keywords: 'true false null this is new super'
   };
 
   const STRING = {
     className: 'string',
-    variants: [{
+    variants: [
+      {
         begin: 'r\'\'\'',
         end: '\'\'\''
       },
@@ -47,29 +49,46 @@ export default function(hljs) {
       {
         begin: '\'\'\'',
         end: '\'\'\'',
-        contains: [hljs.BACKSLASH_ESCAPE, SUBST, BRACED_SUBST]
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST,
+          BRACED_SUBST
+        ]
       },
       {
         begin: '"""',
         end: '"""',
-        contains: [hljs.BACKSLASH_ESCAPE, SUBST, BRACED_SUBST]
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST,
+          BRACED_SUBST
+        ]
       },
       {
         begin: '\'',
         end: '\'',
         illegal: '\\n',
-        contains: [hljs.BACKSLASH_ESCAPE, SUBST, BRACED_SUBST]
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST,
+          BRACED_SUBST
+        ]
       },
       {
         begin: '"',
         end: '"',
         illegal: '\\n',
-        contains: [hljs.BACKSLASH_ESCAPE, SUBST, BRACED_SUBST]
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST,
+          BRACED_SUBST
+        ]
       }
     ]
   };
   BRACED_SUBST.contains = [
-    hljs.C_NUMBER_MODE, STRING
+    hljs.C_NUMBER_MODE,
+    STRING
   ];
 
   const BUILT_IN_TYPES = [
@@ -100,7 +119,7 @@ export default function(hljs) {
     'num',
     // dart:html
     'Element',
-    'ElementList',
+    'ElementList'
   ];
   const NULLABLE_BUILT_IN_TYPES = BUILT_IN_TYPES.map((e) => `${e}?`);
 
@@ -122,8 +141,8 @@ export default function(hljs) {
           'document',
           'querySelector',
           'querySelectorAll',
-          'window',
-      ]).join(' '),
+          'window'
+        ]).join(' '),
     $pattern: /[A-Za-z][A-Za-z0-9_]*\??/
   };
 
@@ -136,7 +155,7 @@ export default function(hljs) {
         '/\\*\\*',
         '\\*/', {
           subLanguage: 'markdown',
-          relevance:0
+          relevance: 0
         }
       ),
       hljs.COMMENT(
@@ -146,7 +165,7 @@ export default function(hljs) {
             subLanguage: 'markdown',
             begin: '.',
             end: '$',
-            relevance:0
+            relevance: 0
           }]
         }
       ),
@@ -157,7 +176,8 @@ export default function(hljs) {
         beginKeywords: 'class interface',
         end: /\{/,
         excludeEnd: true,
-        contains: [{
+        contains: [
+          {
             beginKeywords: 'extends implements'
           },
           hljs.UNDERSCORE_TITLE_MODE
diff --git a/src/languages/delphi.js b/src/languages/delphi.js
index 334dddaae4..5f1dbfdc29 100644
--- a/src/languages/delphi.js
+++ b/src/languages/delphi.js
@@ -5,7 +5,7 @@ Website: https://www.embarcadero.com/products/delphi
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var KEYWORDS =
+  const KEYWORDS =
     'exports register file shl array record property for mod while set ally label uses raise not ' +
     'stored class safecall var interface or private static exit index inherited to else stdcall ' +
     'override shr asm far resourcestring finalization packed virtual out and protected library do ' +
@@ -17,74 +17,103 @@ export default function(hljs) {
     'unimplemented dynamic export far16 forward generic helper implements interrupt iochecks ' +
     'local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat ' +
     'specialize strict unaligned varargs ';
-  var COMMENT_MODES = [
+  const COMMENT_MODES = [
     hljs.C_LINE_COMMENT_MODE,
-    hljs.COMMENT(/\{/, /\}/, {relevance: 0}),
-    hljs.COMMENT(/\(\*/, /\*\)/, {relevance: 10})
+    hljs.COMMENT(/\{/, /\}/, {
+      relevance: 0
+    }),
+    hljs.COMMENT(/\(\*/, /\*\)/, {
+      relevance: 10
+    })
   ];
-  var DIRECTIVE = {
+  const DIRECTIVE = {
     className: 'meta',
     variants: [
-      {begin: /\{\$/, end: /\}/},
-      {begin: /\(\*\$/, end: /\*\)/}
+      {
+        begin: /\{\$/,
+        end: /\}/
+      },
+      {
+        begin: /\(\*\$/,
+        end: /\*\)/
+      }
     ]
   };
-  var STRING = {
+  const STRING = {
     className: 'string',
-    begin: /'/, end: /'/,
-    contains: [{begin: /''/}]
+    begin: /'/,
+    end: /'/,
+    contains: [{
+      begin: /''/
+    }]
   };
-  var NUMBER = {
+  const NUMBER = {
     className: 'number',
     relevance: 0,
     // Source: https://www.freepascal.org/docs-html/ref/refse6.html
     variants: [
       {
         // Hexadecimal notation, e.g., $7F.
-        begin: '\\$[0-9A-Fa-f]+',
+        begin: '\\$[0-9A-Fa-f]+'
       },
       {
         // Octal notation, e.g., &42.
-        begin: '&[0-7]+',
+        begin: '&[0-7]+'
       },
       {
         // Binary notation, e.g., %1010.
-        begin: '%[01]+',
+        begin: '%[01]+'
       }
     ]
   };
-  var CHAR_STRING = {
-    className: 'string', begin: /(#\d+)+/
+  const CHAR_STRING = {
+    className: 'string',
+    begin: /(#\d+)+/
   };
-  var CLASS = {
-    begin: hljs.IDENT_RE + '\\s*=\\s*class\\s*\\(', returnBegin: true,
-    contains: [
-      hljs.TITLE_MODE
-    ]
+  const CLASS = {
+    begin: hljs.IDENT_RE + '\\s*=\\s*class\\s*\\(',
+    returnBegin: true,
+    contains: [hljs.TITLE_MODE]
   };
-  var FUNCTION = {
+  const FUNCTION = {
     className: 'function',
-    beginKeywords: 'function constructor destructor procedure', end: /[:;]/,
+    beginKeywords: 'function constructor destructor procedure',
+    end: /[:;]/,
     keywords: 'function constructor|10 destructor|10 procedure|10',
     contains: [
       hljs.TITLE_MODE,
       {
         className: 'params',
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         keywords: KEYWORDS,
-        contains: [STRING, CHAR_STRING, DIRECTIVE].concat(COMMENT_MODES)
+        contains: [
+          STRING,
+          CHAR_STRING,
+          DIRECTIVE
+        ].concat(COMMENT_MODES)
       },
       DIRECTIVE
     ].concat(COMMENT_MODES)
   };
   return {
     name: 'Delphi',
-    aliases: ['dpr', 'dfm', 'pas', 'pascal', 'freepascal', 'lazarus', 'lpr', 'lfm'],
+    aliases: [
+      'dpr',
+      'dfm',
+      'pas',
+      'pascal',
+      'freepascal',
+      'lazarus',
+      'lpr',
+      'lfm'
+    ],
     case_insensitive: true,
     keywords: KEYWORDS,
     illegal: /"|\$[G-Zg-z]|\/\*|<\/|\|/,
     contains: [
-      STRING, CHAR_STRING,
+      STRING,
+      CHAR_STRING,
       hljs.NUMBER_MODE,
       NUMBER,
       CLASS,
diff --git a/src/languages/diff.js b/src/languages/diff.js
index b56d94d380..f64d78d769 100644
--- a/src/languages/diff.js
+++ b/src/languages/diff.js
@@ -16,35 +16,67 @@ export default function(hljs) {
         className: 'meta',
         relevance: 10,
         variants: [
-          {begin: /^@@ +-\d+,\d+ +\+\d+,\d+ +@@/},
-          {begin: /^\*\*\* +\d+,\d+ +\*\*\*\*$/},
-          {begin: /^--- +\d+,\d+ +----$/}
+          {
+            begin: /^@@ +-\d+,\d+ +\+\d+,\d+ +@@/
+          },
+          {
+            begin: /^\*\*\* +\d+,\d+ +\*\*\*\*$/
+          },
+          {
+            begin: /^--- +\d+,\d+ +----$/
+          }
         ]
       },
       {
         className: 'comment',
         variants: [
-          {begin: /Index: /, end: /$/},
-          {begin: /^index/, end: /$/},
-          {begin: /={3,}/, end: /$/},
-          {begin: /^-{3}/, end: /$/},
-          {begin: /^\*{3} /, end: /$/},
-          {begin: /^\+{3}/, end: /$/},
-          {begin: /^\*{15}$/ },
-          {begin: /^diff --git/, end: /$/},
+          {
+            begin: /Index: /,
+            end: /$/
+          },
+          {
+            begin: /^index/,
+            end: /$/
+          },
+          {
+            begin: /={3,}/,
+            end: /$/
+          },
+          {
+            begin: /^-{3}/,
+            end: /$/
+          },
+          {
+            begin: /^\*{3} /,
+            end: /$/
+          },
+          {
+            begin: /^\+{3}/,
+            end: /$/
+          },
+          {
+            begin: /^\*{15}$/
+          },
+          {
+            begin: /^diff --git/,
+            end: /$/
+          }
         ]
       },
       {
         className: 'addition',
-        begin: /^\+/, end: /$/
+        begin: /^\+/,
+        end: /$/
       },
       {
         className: 'deletion',
-        begin: /^-/, end: /$/
+        begin: /^-/,
+        end: /$/
       },
       {
         className: 'addition',
-        begin: /^!/, end: /$/
+        begin: /^!/,
+        end: /$/
       }
     ]
   };
diff --git a/src/languages/django.js b/src/languages/django.js
index ba9fa57285..07b351fa08 100644
--- a/src/languages/django.js
+++ b/src/languages/django.js
@@ -8,8 +8,9 @@ Website: https://www.djangoproject.com
 Category: template
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var FILTER = {
+  const FILTER = {
     begin: /\|[A-Za-z]+:?/,
     keywords: {
       name:
@@ -38,13 +39,13 @@ export default function(hljs) {
       hljs.COMMENT(/\{#/, /#\}/),
       {
         className: 'template-tag',
-        begin: /\{%/, end: /%\}/,
-        contains: [
-          {
-            className: 'name',
-            begin: /\w+/,
-            keywords: {
-              name:
+        begin: /\{%/,
+        end: /%\}/,
+        contains: [{
+          className: 'name',
+          begin: /\w+/,
+          keywords: {
+            name:
                 'comment endcomment load templatetag ifchanged endifchanged if endif firstof for ' +
                 'endfor ifnotequal endifnotequal widthratio extends include spaceless ' +
                 'endspaceless regroup ifequal endifequal ssi now with cycle url filter ' +
@@ -54,19 +55,19 @@ export default function(hljs) {
                 'get_current_language_bidi get_language_info get_language_info_list localize ' +
                 'endlocalize localtime endlocaltime timezone endtimezone get_current_timezone ' +
                 'verbatim'
-            },
-            starts: {
-              endsWithParent: true,
-              keywords: 'in by as',
-              contains: [FILTER],
-              relevance: 0
-            }
+          },
+          starts: {
+            endsWithParent: true,
+            keywords: 'in by as',
+            contains: [FILTER],
+            relevance: 0
           }
-        ]
+        }]
       },
       {
         className: 'template-variable',
-        begin: /\{\{/, end: /\}\}/,
+        begin: /\{\{/,
+        end: /\}\}/,
         contains: [FILTER]
       }
     ]
diff --git a/src/languages/dns.js b/src/languages/dns.js
index aa4f29a612..4746c712da 100644
--- a/src/languages/dns.js
+++ b/src/languages/dns.js
@@ -9,14 +9,19 @@ Website: https://en.wikipedia.org/wiki/Zone_file
 export default function(hljs) {
   return {
     name: 'DNS Zone',
-    aliases: ['bind', 'zone'],
+    aliases: [
+      'bind',
+      'zone'
+    ],
     keywords: {
       keyword:
         'IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX ' +
         'LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT'
     },
     contains: [
-      hljs.COMMENT(';', '$', {relevance: 0}),
+      hljs.COMMENT(';', '$', {
+        relevance: 0
+      }),
       {
         className: 'meta',
         begin: /^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/
@@ -31,7 +36,9 @@ export default function(hljs) {
         className: 'number',
         begin: '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b'
       },
-      hljs.inherit(hljs.NUMBER_MODE, {begin: /\b\d+[dhwm]?/})
+      hljs.inherit(hljs.NUMBER_MODE, {
+        begin: /\b\d+[dhwm]?/
+      })
     ]
   };
 }
diff --git a/src/languages/dockerfile.js b/src/languages/dockerfile.js
index a156e3022d..6aaf013bef 100644
--- a/src/languages/dockerfile.js
+++ b/src/languages/dockerfile.js
@@ -7,6 +7,7 @@ Website: https://docs.docker.com/engine/reference/builder/
 Category: config
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'Dockerfile',
@@ -27,5 +28,5 @@ export default function(hljs) {
       }
     ],
     illegal: '</'
-  }
+  };
 }
diff --git a/src/languages/dos.js b/src/languages/dos.js
index 9981a0371b..13fa4f13ed 100644
--- a/src/languages/dos.js
+++ b/src/languages/dos.js
@@ -5,21 +5,25 @@ Contributors: Anton Kochkov <anton.kochkov@gmail.com>
 Website: https://en.wikipedia.org/wiki/Batch_file
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var COMMENT = hljs.COMMENT(
+  const COMMENT = hljs.COMMENT(
     /^\s*@?rem\b/, /$/,
     {
       relevance: 10
     }
   );
-  var LABEL = {
+  const LABEL = {
     className: 'symbol',
     begin: '^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)',
     relevance: 0
   };
   return {
     name: 'Batch file (DOS)',
-    aliases: ['bat', 'cmd'],
+    aliases: [
+      'bat',
+      'cmd'
+    ],
     case_insensitive: true,
     illegal: /\/\*/,
     keywords: {
@@ -39,18 +43,23 @@ export default function(hljs) {
     },
     contains: [
       {
-        className: 'variable', begin: /%%[^ ]|%[^ ]+?%|![^ ]+?!/
+        className: 'variable',
+        begin: /%%[^ ]|%[^ ]+?%|![^ ]+?!/
       },
       {
         className: 'function',
-        begin: LABEL.begin, end: 'goto:eof',
+        begin: LABEL.begin,
+        end: 'goto:eof',
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'}),
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'
+          }),
           COMMENT
         ]
       },
       {
-        className: 'number', begin: '\\b\\d+',
+        className: 'number',
+        begin: '\\b\\d+',
         relevance: 0
       },
       COMMENT
diff --git a/src/languages/dsconfig.js b/src/languages/dsconfig.js
index b9fc0ce6c4..666c31076c 100644
--- a/src/languages/dsconfig.js
+++ b/src/languages/dsconfig.js
@@ -4,23 +4,29 @@
  Contributors: Jacob Childress <jacobc@gmail.com>
  Category: enterprise, config
  */
+
+ /** @type LanguageFn */
 export default function(hljs) {
-  var QUOTED_PROPERTY = {
+  const QUOTED_PROPERTY = {
     className: 'string',
-    begin: /"/, end: /"/
+    begin: /"/,
+    end: /"/
   };
-  var APOS_PROPERTY = {
+  const APOS_PROPERTY = {
     className: 'string',
-    begin: /'/, end: /'/
+    begin: /'/,
+    end: /'/
   };
-  var UNQUOTED_PROPERTY = {
+  const UNQUOTED_PROPERTY = {
     className: 'string',
-    begin: /[\w\-?]+:\w+/, end: /\W/,
+    begin: /[\w\-?]+:\w+/,
+    end: /\W/,
     relevance: 0
   };
-  var VALUELESS_PROPERTY = {
+  const VALUELESS_PROPERTY = {
     className: 'string',
-    begin: /\w+-?\w+/, end: /\W/,
+    begin: /\w+-?\w+/,
+    end: /\W/,
     relevance: 0
   };
 
@@ -29,19 +35,24 @@ export default function(hljs) {
     contains: [
       {
         className: 'keyword',
-        begin: '^dsconfig', end: /\s/, excludeEnd: true,
+        begin: '^dsconfig',
+        end: /\s/,
+        excludeEnd: true,
         relevance: 10
       },
       {
         className: 'built_in',
         begin: /(list|create|get|set|delete)-(\w+)/,
-        end: /\s/, excludeEnd: true,
+        end: /\s/,
+        excludeEnd: true,
         illegal: '!@#$%^&*()',
         relevance: 10
       },
       {
         className: 'built_in',
-        begin: /--(\w+)/, end: /\s/, excludeEnd: true
+        begin: /--(\w+)/,
+        end: /\s/,
+        excludeEnd: true
       },
       QUOTED_PROPERTY,
       APOS_PROPERTY,
diff --git a/src/languages/dts.js b/src/languages/dts.js
index fa312b3fdc..543235fb72 100644
--- a/src/languages/dts.js
+++ b/src/languages/dts.js
@@ -6,47 +6,66 @@ Website: https://elinux.org/Device_Tree_Reference
 Category: config
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var STRINGS = {
+  const STRINGS = {
     className: 'string',
     variants: [
-      hljs.inherit(hljs.QUOTE_STRING_MODE, { begin: '((u8?|U)|L)?"' }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        begin: '((u8?|U)|L)?"'
+      }),
       {
-        begin: '(u8?|U)?R"', end: '"',
+        begin: '(u8?|U)?R"',
+        end: '"',
         contains: [hljs.BACKSLASH_ESCAPE]
       },
       {
-        begin: '\'\\\\?.', end: '\'',
+        begin: '\'\\\\?.',
+        end: '\'',
         illegal: '.'
       }
     ]
   };
 
-  var NUMBERS = {
+  const NUMBERS = {
     className: 'number',
     variants: [
-      { begin: '\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)' },
-      { begin: hljs.C_NUMBER_RE }
+      {
+        begin: '\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)'
+      },
+      {
+        begin: hljs.C_NUMBER_RE
+      }
     ],
     relevance: 0
   };
 
-  var PREPROCESSOR = {
+  const PREPROCESSOR = {
     className: 'meta',
-    begin: '#', end: '$',
-    keywords: {'meta-keyword': 'if else elif endif define undef ifdef ifndef'},
+    begin: '#',
+    end: '$',
+    keywords: {
+      'meta-keyword': 'if else elif endif define undef ifdef ifndef'
+    },
     contains: [
       {
-        begin: /\\\n/, relevance: 0
+        begin: /\\\n/,
+        relevance: 0
       },
       {
-        beginKeywords: 'include', end: '$',
-        keywords: {'meta-keyword': 'include'},
+        beginKeywords: 'include',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'include'
+        },
         contains: [
-          hljs.inherit(STRINGS, {className: 'meta-string'}),
+          hljs.inherit(STRINGS, {
+            className: 'meta-string'
+          }),
           {
             className: 'meta-string',
-            begin: '<', end: '>',
+            begin: '<',
+            end: '>',
             illegal: '\\n'
           }
         ]
@@ -57,22 +76,22 @@ export default function(hljs) {
     ]
   };
 
-  var DTS_REFERENCE = {
+  const DTS_REFERENCE = {
     className: 'variable',
     begin: /&[a-z\d_]*\b/
   };
 
-  var DTS_KEYWORD = {
+  const DTS_KEYWORD = {
     className: 'meta-keyword',
     begin: '/[a-z][a-z\\d-]*/'
   };
 
-  var DTS_LABEL = {
+  const DTS_LABEL = {
     className: 'symbol',
     begin: '^\\s*[a-zA-Z_][a-zA-Z\\d_]*:'
   };
 
-  var DTS_CELL_PROPERTY = {
+  const DTS_CELL_PROPERTY = {
     className: 'params',
     begin: '<',
     end: '>',
@@ -82,7 +101,7 @@ export default function(hljs) {
     ]
   };
 
-  var DTS_NODE = {
+  const DTS_NODE = {
     className: 'class',
     begin: /[a-zA-Z_][a-zA-Z\d_@]*\s\{/,
     end: /[{;=]/,
@@ -90,7 +109,7 @@ export default function(hljs) {
     excludeEnd: true
   };
 
-  var DTS_ROOT_NODE = {
+  const DTS_ROOT_NODE = {
     className: 'class',
     begin: '/\\s*\\{',
     end: /\};/,
@@ -130,4 +149,3 @@ export default function(hljs) {
     ]
   };
 }
-
diff --git a/src/languages/dust.js b/src/languages/dust.js
index 4765a57f6b..3ff312324c 100644
--- a/src/languages/dust.js
+++ b/src/languages/dust.js
@@ -7,8 +7,9 @@ Website: https://www.dustjs.com
 Category: template
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var EXPRESSION_KEYWORDS = 'if eq ne lt lte gt gte select default math sep';
+  const EXPRESSION_KEYWORDS = 'if eq ne lt lte gt gte select default math sep';
   return {
     name: 'Dust',
     aliases: ['dst'],
@@ -17,23 +18,24 @@ export default function(hljs) {
     contains: [
       {
         className: 'template-tag',
-        begin: /\{[#\/]/, end: /\}/, illegal: /;/,
-        contains: [
-          {
-            className: 'name',
-            begin: /[a-zA-Z\.-]+/,
-            starts: {
-              endsWithParent: true, relevance: 0,
-              contains: [
-                hljs.QUOTE_STRING_MODE
-              ]
-            }
+        begin: /\{[#\/]/,
+        end: /\}/,
+        illegal: /;/,
+        contains: [{
+          className: 'name',
+          begin: /[a-zA-Z\.-]+/,
+          starts: {
+            endsWithParent: true,
+            relevance: 0,
+            contains: [hljs.QUOTE_STRING_MODE]
           }
-        ]
+        }]
       },
       {
         className: 'template-variable',
-        begin: /\{/, end: /\}/, illegal: /;/,
+        begin: /\{/,
+        end: /\}/,
+        illegal: /;/,
         keywords: EXPRESSION_KEYWORDS
       }
     ]
diff --git a/src/languages/ebnf.js b/src/languages/ebnf.js
index 45d8186fdd..b5816e96b6 100644
--- a/src/languages/ebnf.js
+++ b/src/languages/ebnf.js
@@ -4,43 +4,48 @@ Author: Alex McKibben <alex@nullscope.net>
 Website: https://en.wikipedia.org/wiki/Extended_Backus–Naur_form
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-    var commentMode = hljs.COMMENT(/\(\*/, /\*\)/);
+  const commentMode = hljs.COMMENT(/\(\*/, /\*\)/);
 
-    var nonTerminalMode = {
-        className: "attribute",
-        begin: /^[ ]*[a-zA-Z][a-zA-Z_-]*([\s_-]+[a-zA-Z][a-zA-Z]*)*/
-    };
+  const nonTerminalMode = {
+    className: "attribute",
+    begin: /^[ ]*[a-zA-Z][a-zA-Z_-]*([\s_-]+[a-zA-Z][a-zA-Z]*)*/
+  };
 
-    var specialSequenceMode = {
-        className: "meta",
-        begin: /\?.*\?/
-    };
+  const specialSequenceMode = {
+    className: "meta",
+    begin: /\?.*\?/
+  };
 
-    var ruleBodyMode = {
-        begin: /=/, end: /[.;]/,
-        contains: [
-            commentMode,
-            specialSequenceMode,
-            {
-              // terminals
-              className: 'string',
-              variants: [
-                hljs.APOS_STRING_MODE,
-                hljs.QUOTE_STRING_MODE,
-                {begin: '`', end: '`'},
-              ]
-            },
+  const ruleBodyMode = {
+    begin: /=/,
+    end: /[.;]/,
+    contains: [
+      commentMode,
+      specialSequenceMode,
+      {
+        // terminals
+        className: 'string',
+        variants: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE,
+          {
+            begin: '`',
+            end: '`'
+          }
         ]
-    };
+      }
+    ]
+  };
 
-    return {
-        name: 'Extended Backus-Naur Form',
-        illegal: /\S/,
-        contains: [
-            commentMode,
-            nonTerminalMode,
-            ruleBodyMode
-        ]
-    };
+  return {
+    name: 'Extended Backus-Naur Form',
+    illegal: /\S/,
+    contains: [
+      commentMode,
+      nonTerminalMode,
+      ruleBodyMode
+    ]
+  };
 }
diff --git a/src/languages/elixir.js b/src/languages/elixir.js
index cac524f04a..76a1c9a92c 100644
--- a/src/languages/elixir.js
+++ b/src/languages/elixir.js
@@ -6,101 +6,168 @@ Category: functional
 Website: https://elixir-lang.org
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var ELIXIR_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_.]*(!|\\?)?';
-  var ELIXIR_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
-  var ELIXIR_KEYWORDS = {
+  const ELIXIR_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_.]*(!|\\?)?';
+  const ELIXIR_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
+  const ELIXIR_KEYWORDS = {
     $pattern: ELIXIR_IDENT_RE,
     keyword: 'and false then defined module in return redo retry end for true self when ' +
     'next until do begin unless nil break not case cond alias while ensure or ' +
     'include use alias fn quote require import with|0'
   };
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /\}/,
+    begin: /#\{/,
+    end: /\}/,
     keywords: ELIXIR_KEYWORDS
   };
-  var NUMBER = {
+  const NUMBER = {
     className: 'number',
     begin: '(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)',
     relevance: 0
   };
-  var SIGIL_DELIMITERS = '[/|([{<"\']';
-  var LOWERCASE_SIGIL = {
+  const SIGIL_DELIMITERS = '[/|([{<"\']';
+  const LOWERCASE_SIGIL = {
     className: 'string',
     begin: '~[a-z]' + '(?=' + SIGIL_DELIMITERS + ')',
     contains: [
       {
-        endsParent:true,
-        contains: [{
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST],
-          variants: [
-            { begin: /"/, end: /"/ },
-            { begin: /'/, end: /'/ },
-            { begin: /\//, end: /\// },
-            { begin: /\|/, end: /\|/ },
-            { begin: /\(/, end: /\)/ },
-            { begin: /\[/, end: /\]/ },
-            { begin: /\{/, end: /\}/ },
-            { begin: /</, end: />/ }
-          ]
-        }]
-      },
-    ],
+        endsParent: true,
+        contains: [
+          {
+            contains: [
+              hljs.BACKSLASH_ESCAPE,
+              SUBST
+            ],
+            variants: [
+              {
+                begin: /"/,
+                end: /"/
+              },
+              {
+                begin: /'/,
+                end: /'/
+              },
+              {
+                begin: /\//,
+                end: /\//
+              },
+              {
+                begin: /\|/,
+                end: /\|/
+              },
+              {
+                begin: /\(/,
+                end: /\)/
+              },
+              {
+                begin: /\[/,
+                end: /\]/
+              },
+              {
+                begin: /\{/,
+                end: /\}/
+              },
+              {
+                begin: /</,
+                end: />/
+              }
+            ]
+          }
+        ]
+      }
+    ]
   };
 
-  var UPCASE_SIGIL = {
+  const UPCASE_SIGIL = {
     className: 'string',
     begin: '~[A-Z]' + '(?=' + SIGIL_DELIMITERS + ')',
     contains: [
-      { begin: /"/, end: /"/ },
-      { begin: /'/, end: /'/ },
-      { begin: /\//, end: /\// },
-      { begin: /\|/, end: /\|/ },
-      { begin: /\(/, end: /\)/ },
-      { begin: /\[/, end: /\]/ },
-      { begin: /\{/, end: /\}/ },
-      { begin: /</, end: />/ }
+      {
+        begin: /"/,
+        end: /"/
+      },
+      {
+        begin: /'/,
+        end: /'/
+      },
+      {
+        begin: /\//,
+        end: /\//
+      },
+      {
+        begin: /\|/,
+        end: /\|/
+      },
+      {
+        begin: /\(/,
+        end: /\)/
+      },
+      {
+        begin: /\[/,
+        end: /\]/
+      },
+      {
+        begin: /\{/,
+        end: /\}/
+      },
+      {
+        begin: /</,
+        end: />/
+      }
     ]
   };
 
-  var STRING = {
+  const STRING = {
     className: 'string',
-    contains: [hljs.BACKSLASH_ESCAPE, SUBST],
+    contains: [
+      hljs.BACKSLASH_ESCAPE,
+      SUBST
+    ],
     variants: [
       {
-        begin: /"""/, end: /"""/,
+        begin: /"""/,
+        end: /"""/
       },
       {
-        begin: /'''/, end: /'''/,
+        begin: /'''/,
+        end: /'''/
       },
       {
-        begin: /~S"""/, end: /"""/,
+        begin: /~S"""/,
+        end: /"""/,
         contains: []
       },
       {
-        begin: /~S"/, end: /"/,
+        begin: /~S"/,
+        end: /"/,
         contains: []
       },
       {
-        begin: /~S'''/, end: /'''/,
+        begin: /~S'''/,
+        end: /'''/,
         contains: []
       },
       {
-        begin: /~S'/, end: /'/,
+        begin: /~S'/,
+        end: /'/,
         contains: []
       },
       {
-        begin: /'/, end: /'/
+        begin: /'/,
+        end: /'/
       },
       {
-        begin: /"/, end: /"/
-      },
+        begin: /"/,
+        end: /"/
+      }
     ]
   };
-  var FUNCTION = {
+  const FUNCTION = {
     className: 'function',
-    beginKeywords: 'def defp defmacro', end: /\B\b/, // the mode is ended by the title
+    beginKeywords: 'def defp defmacro',
+    end: /\B\b/, // the mode is ended by the title
     contains: [
       hljs.inherit(hljs.TITLE_MODE, {
         begin: ELIXIR_IDENT_RE,
@@ -108,11 +175,12 @@ export default function(hljs) {
       })
     ]
   };
-  var CLASS = hljs.inherit(FUNCTION, {
+  const CLASS = hljs.inherit(FUNCTION, {
     className: 'class',
-    beginKeywords: 'defimpl defmodule defprotocol defrecord', end: /\bdo\b|$|;/
+    beginKeywords: 'defimpl defmodule defprotocol defrecord',
+    end: /\bdo\b|$|;/
   });
-  var ELIXIR_DEFAULT_CONTAINS = [
+  const ELIXIR_DEFAULT_CONTAINS = [
     STRING,
     UPCASE_SIGIL,
     LOWERCASE_SIGIL,
@@ -125,7 +193,12 @@ export default function(hljs) {
     {
       className: 'symbol',
       begin: ':(?![\\s:])',
-      contains: [STRING, {begin: ELIXIR_METHOD_RE}],
+      contains: [
+        STRING,
+        {
+          begin: ELIXIR_METHOD_RE
+        }
+      ],
       relevance: 0
     },
     {
@@ -150,20 +223,23 @@ export default function(hljs) {
           // /:
           begin: /\/: (?=\d+\s*[,\]])/,
           relevance: 0,
-          contains: [
-            NUMBER
-          ]
+          contains: [NUMBER]
         },
         {
           className: 'regexp',
           illegal: '\\n',
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST],
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST
+          ],
           variants: [
             {
-              begin: '/', end: '/[a-z]*'
+              begin: '/',
+              end: '/[a-z]*'
             },
             {
-              begin: '%r\\[', end: '\\][a-z]*'
+              begin: '%r\\[',
+              end: '\\][a-z]*'
             }
           ]
         }
diff --git a/src/languages/elm.js b/src/languages/elm.js
index 60e626a03e..5f163211a0 100644
--- a/src/languages/elm.js
+++ b/src/languages/elm.js
@@ -5,8 +5,9 @@ Website: https://elm-lang.org
 Category: functional
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var COMMENT = {
+  const COMMENT = {
     variants: [
       hljs.COMMENT('--', '$'),
       hljs.COMMENT(
@@ -19,29 +20,35 @@ export default function(hljs) {
     ]
   };
 
-  var CONSTRUCTOR = {
+  const CONSTRUCTOR = {
     className: 'type',
     begin: '\\b[A-Z][\\w\']*', // TODO: other constructors (built-in, infix).
     relevance: 0
   };
 
-  var LIST = {
-    begin: '\\(', end: '\\)',
+  const LIST = {
+    begin: '\\(',
+    end: '\\)',
     illegal: '"',
     contains: [
-      {className: 'type', begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'},
+      {
+        className: 'type',
+        begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'
+      },
       COMMENT
     ]
   };
 
-  var RECORD = {
-    begin: /\{/, end: /\}/,
+  const RECORD = {
+    begin: /\{/,
+    end: /\}/,
     contains: LIST.contains
   };
 
-  var CHARACTER = {
+  const CHARACTER = {
     className: 'string',
-    begin: '\'\\\\?.', end: '\'',
+    begin: '\'\\\\?.',
+    end: '\'',
     illegal: '.'
   };
 
@@ -55,28 +62,47 @@ export default function(hljs) {
       // Top-level constructions.
 
       {
-        beginKeywords: 'port effect module', end: 'exposing',
+        beginKeywords: 'port effect module',
+        end: 'exposing',
         keywords: 'port effect module where command subscription exposing',
-        contains: [LIST, COMMENT],
+        contains: [
+          LIST,
+          COMMENT
+        ],
         illegal: '\\W\\.|;'
       },
       {
-        begin: 'import', end: '$',
+        begin: 'import',
+        end: '$',
         keywords: 'import as exposing',
-        contains: [LIST, COMMENT],
+        contains: [
+          LIST,
+          COMMENT
+        ],
         illegal: '\\W\\.|;'
       },
       {
-        begin: 'type', end: '$',
+        begin: 'type',
+        end: '$',
         keywords: 'type alias',
-        contains: [CONSTRUCTOR, LIST, RECORD, COMMENT]
+        contains: [
+          CONSTRUCTOR,
+          LIST,
+          RECORD,
+          COMMENT
+        ]
       },
       {
-        beginKeywords: 'infix infixl infixr', end: '$',
-        contains: [hljs.C_NUMBER_MODE, COMMENT]
+        beginKeywords: 'infix infixl infixr',
+        end: '$',
+        contains: [
+          hljs.C_NUMBER_MODE,
+          COMMENT
+        ]
       },
       {
-        begin: 'port', end: '$',
+        begin: 'port',
+        end: '$',
         keywords: 'port',
         contains: [COMMENT]
       },
@@ -87,10 +113,14 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       hljs.C_NUMBER_MODE,
       CONSTRUCTOR,
-      hljs.inherit(hljs.TITLE_MODE, {begin: '^[_a-z][\\w\']*'}),
+      hljs.inherit(hljs.TITLE_MODE, {
+        begin: '^[_a-z][\\w\']*'
+      }),
       COMMENT,
 
-      {begin: '->|<-'} // No markup, relevance booster
+      {
+        begin: '->|<-'
+      } // No markup, relevance booster
     ],
     illegal: /;/
   };
diff --git a/src/languages/erb.js b/src/languages/erb.js
index 297ca15666..02cf17fdb7 100644
--- a/src/languages/erb.js
+++ b/src/languages/erb.js
@@ -8,6 +8,7 @@ Website: https://ruby-doc.org/stdlib-2.6.5/libdoc/erb/rdoc/ERB.html
 Category: template
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'ERB',
@@ -15,7 +16,8 @@ export default function(hljs) {
     contains: [
       hljs.COMMENT('<%#', '%>'),
       {
-        begin: '<%[%=-]?', end: '[%-]?%>',
+        begin: '<%[%=-]?',
+        end: '[%-]?%>',
         subLanguage: 'ruby',
         excludeBegin: true,
         excludeEnd: true
diff --git a/src/languages/erlang-repl.js b/src/languages/erlang-repl.js
index 5d1e6679e9..df3eecf83b 100644
--- a/src/languages/erlang-repl.js
+++ b/src/languages/erlang-repl.js
@@ -5,6 +5,7 @@ Website: https://www.erlang.org
 Category: functional
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'Erlang REPL',
@@ -17,7 +18,8 @@ export default function(hljs) {
     },
     contains: [
       {
-        className: 'meta', begin: '^[0-9]+> ',
+        className: 'meta',
+        begin: '^[0-9]+> ',
         relevance: 10
       },
       hljs.COMMENT('%', '$'),
diff --git a/src/languages/erlang.js b/src/languages/erlang.js
index d507dbef84..1ec4d7c5f4 100644
--- a/src/languages/erlang.js
+++ b/src/languages/erlang.js
@@ -6,10 +6,11 @@ Website: https://www.erlang.org
 Category: functional
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
-  var BASIC_ATOM_RE = '[a-z\'][a-zA-Z0-9_\']*';
-  var FUNCTION_NAME_RE = '(' + BASIC_ATOM_RE + ':' + BASIC_ATOM_RE + '|' + BASIC_ATOM_RE + ')';
-  var ERLANG_RESERVED = {
+  const BASIC_ATOM_RE = '[a-z\'][a-zA-Z0-9_\']*';
+  const FUNCTION_NAME_RE = '(' + BASIC_ATOM_RE + ':' + BASIC_ATOM_RE + '|' + BASIC_ATOM_RE + ')';
+  const ERLANG_RESERVED = {
     keyword:
       'after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if ' +
       'let not of orelse|10 query receive rem try when xor',
@@ -17,45 +18,50 @@ export default function(hljs) {
       'false true'
   };
 
-  var COMMENT = hljs.COMMENT('%', '$');
-  var NUMBER = {
+  const COMMENT = hljs.COMMENT('%', '$');
+  const NUMBER = {
     className: 'number',
     begin: '\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)',
     relevance: 0
   };
-  var NAMED_FUN = {
+  const NAMED_FUN = {
     begin: 'fun\\s+' + BASIC_ATOM_RE + '/\\d+'
   };
-  var FUNCTION_CALL = {
-    begin: FUNCTION_NAME_RE + '\\(', end: '\\)',
+  const FUNCTION_CALL = {
+    begin: FUNCTION_NAME_RE + '\\(',
+    end: '\\)',
     returnBegin: true,
     relevance: 0,
     contains: [
       {
-        begin: FUNCTION_NAME_RE, relevance: 0
+        begin: FUNCTION_NAME_RE,
+        relevance: 0
       },
       {
-        begin: '\\(', end: '\\)', endsWithParent: true,
+        begin: '\\(',
+        end: '\\)',
+        endsWithParent: true,
         returnEnd: true,
         relevance: 0
         // "contains" defined later
       }
     ]
   };
-  var TUPLE = {
-    begin: /\{/, end: /\}/,
+  const TUPLE = {
+    begin: /\{/,
+    end: /\}/,
     relevance: 0
     // "contains" defined later
   };
-  var VAR1 = {
+  const VAR1 = {
     begin: '\\b_([A-Z][A-Za-z0-9_]*)?',
     relevance: 0
   };
-  var VAR2 = {
+  const VAR2 = {
     begin: '[A-Z][a-zA-Z0-9_]*',
     relevance: 0
   };
-  var RECORD_ACCESS = {
+  const RECORD_ACCESS = {
     begin: '#' + hljs.UNDERSCORE_IDENT_RE,
     relevance: 0,
     returnBegin: true,
@@ -65,31 +71,36 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: /\{/, end: /\}/,
+        begin: /\{/,
+        end: /\}/,
         relevance: 0
         // "contains" defined later
       }
     ]
   };
 
-  var BLOCK_STATEMENTS = {
-    beginKeywords: 'fun receive if try case', end: 'end',
+  const BLOCK_STATEMENTS = {
+    beginKeywords: 'fun receive if try case',
+    end: 'end',
     keywords: ERLANG_RESERVED
   };
   BLOCK_STATEMENTS.contains = [
     COMMENT,
     NAMED_FUN,
-    hljs.inherit(hljs.APOS_STRING_MODE, {className: ''}),
+    hljs.inherit(hljs.APOS_STRING_MODE, {
+      className: ''
+    }),
     BLOCK_STATEMENTS,
     FUNCTION_CALL,
     hljs.QUOTE_STRING_MODE,
     NUMBER,
     TUPLE,
-    VAR1, VAR2,
+    VAR1,
+    VAR2,
     RECORD_ACCESS
   ];
 
-  var BASIC_MODES = [
+  const BASIC_MODES = [
     COMMENT,
     NAMED_FUN,
     BLOCK_STATEMENTS,
@@ -97,16 +108,18 @@ export default function(hljs) {
     hljs.QUOTE_STRING_MODE,
     NUMBER,
     TUPLE,
-    VAR1, VAR2,
+    VAR1,
+    VAR2,
     RECORD_ACCESS
   ];
   FUNCTION_CALL.contains[1].contains = BASIC_MODES;
   TUPLE.contains = BASIC_MODES;
   RECORD_ACCESS.contains[1].contains = BASIC_MODES;
 
-  var PARAMS = {
+  const PARAMS = {
     className: 'params',
-    begin: '\\(', end: '\\)',
+    begin: '\\(',
+    end: '\\)',
     contains: BASIC_MODES
   };
   return {
@@ -117,12 +130,15 @@ export default function(hljs) {
     contains: [
       {
         className: 'function',
-        begin: '^' + BASIC_ATOM_RE + '\\s*\\(', end: '->',
+        begin: '^' + BASIC_ATOM_RE + '\\s*\\(',
+        end: '->',
         returnBegin: true,
         illegal: '\\(|#|//|/\\*|\\\\|:|;',
         contains: [
           PARAMS,
-          hljs.inherit(hljs.TITLE_MODE, {begin: BASIC_ATOM_RE})
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: BASIC_ATOM_RE
+          })
         ],
         starts: {
           end: ';|\\.',
@@ -132,7 +148,8 @@ export default function(hljs) {
       },
       COMMENT,
       {
-        begin: '^-', end: '\\.',
+        begin: '^-',
+        end: '\\.',
         relevance: 0,
         excludeEnd: true,
         returnBegin: true,
@@ -147,9 +164,12 @@ export default function(hljs) {
       NUMBER,
       hljs.QUOTE_STRING_MODE,
       RECORD_ACCESS,
-      VAR1, VAR2,
+      VAR1,
+      VAR2,
       TUPLE,
-      {begin: /\.$/} // relevance booster
+      {
+        begin: /\.$/
+      } // relevance booster
     ]
   };
 }
diff --git a/src/languages/excel.js b/src/languages/excel.js
index 9ce2df2677..a7169db050 100644
--- a/src/languages/excel.js
+++ b/src/languages/excel.js
@@ -5,21 +5,27 @@ Description: Excel formulae
 Website: https://products.office.com/en-us/excel/
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'Excel formulae',
-    aliases: ['xlsx', 'xls'],
+    aliases: [
+      'xlsx',
+      'xls'
+    ],
     case_insensitive: true,
     // built-in functions imported from https://web.archive.org/web/20160513042710/https://support.office.com/en-us/article/Excel-functions-alphabetical-b3944572-255d-4efb-bb96-c6d90033e188
     keywords: {
-        $pattern: /[a-zA-Z][\w\.]*/,
-        built_in: 'ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST'
+      $pattern: /[a-zA-Z][\w\.]*/,
+      built_in: 'ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST'
     },
     contains: [
       {
         /* matches a beginning equal sign found in Excel formula examples */
         begin: /^=/,
-        end: /[^=]/, returnEnd: true, illegal: /=/, /* only allow single equal sign at front of line */
+        end: /[^=]/,
+        returnEnd: true,
+        illegal: /=/, /* only allow single equal sign at front of line */
         relevance: 10
       },
       /* technically, there can be more than 2 letters in column names, but this prevents conflict with some keywords */
@@ -27,7 +33,8 @@ export default function(hljs) {
         /* matches a reference to a single cell */
         className: 'symbol',
         begin: /\b[A-Z]{1,2}\d+\b/,
-        end: /[^\d]/, excludeEnd: true,
+        end: /[^\d]/,
+        excludeEnd: true,
         relevance: 0
       },
       {
@@ -44,12 +51,12 @@ export default function(hljs) {
         relevance: 0
       },
       /* Excel formula comments are done by putting the comment in a function call to N() */
-      hljs.COMMENT(/\bN\(/,/\)/,
-      {
-        excludeBegin: true,
-        excludeEnd: true,
-        illegal: /\n/
-      })
+      hljs.COMMENT(/\bN\(/, /\)/,
+        {
+          excludeBegin: true,
+          excludeEnd: true,
+          illegal: /\n/
+        })
     ]
   };
 }
diff --git a/src/languages/fix.js b/src/languages/fix.js
index fe4d3444e9..340fce9464 100644
--- a/src/languages/fix.js
+++ b/src/languages/fix.js
@@ -3,31 +3,32 @@ Language: FIX
 Author: Brent Bradbury <brent@brentium.com>
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   return {
     name: 'FIX',
-    contains: [
-    {
+    contains: [{
       begin: /[^\u2401\u0001]+/,
       end: /[\u2401\u0001]/,
       excludeEnd: true,
       returnBegin: true,
       returnEnd: false,
       contains: [
-      {
-        begin: /([^\u2401\u0001=]+)/,
-        end: /=([^\u2401\u0001=]+)/,
-        returnEnd: true,
-        returnBegin: false,
-        className: 'attr'
-      },
-      {
-        begin: /=/,
-        end: /([\u2401\u0001])/,
-        excludeEnd: true,
-        excludeBegin: true,
-        className: 'string'
-      }]
+        {
+          begin: /([^\u2401\u0001=]+)/,
+          end: /=([^\u2401\u0001=]+)/,
+          returnEnd: true,
+          returnBegin: false,
+          className: 'attr'
+        },
+        {
+          begin: /=/,
+          end: /([\u2401\u0001])/,
+          excludeEnd: true,
+          excludeBegin: true,
+          className: 'string'
+        }
+      ]
     }],
     case_insensitive: true
   };
diff --git a/src/languages/flix.js b/src/languages/flix.js
index a1ae6d286a..639212a9d9 100644
--- a/src/languages/flix.js
+++ b/src/languages/flix.js
@@ -5,48 +5,47 @@
  Website: https://flix.dev/
  */
 
-export default function (hljs) {
+ /** @type LanguageFn */
+export default function(hljs) {
+  const CHAR = {
+    className: 'string',
+    begin: /'(.|\\[xXuU][a-zA-Z0-9]+)'/
+  };
 
-    var CHAR = {
-        className: 'string',
-        begin: /'(.|\\[xXuU][a-zA-Z0-9]+)'/
-    };
+  const STRING = {
+    className: 'string',
+    variants: [{
+      begin: '"',
+      end: '"'
+    }]
+  };
 
-    var STRING = {
-        className: 'string',
-        variants: [
-            {
-                begin: '"', end: '"'
-            }
-        ]
-    };
+  const NAME = {
+    className: 'title',
+    begin: /[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/
+  };
 
-    var NAME = {
-        className: 'title',
-        begin: /[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/
-    };
+  const METHOD = {
+    className: 'function',
+    beginKeywords: 'def',
+    end: /[:={\[(\n;]/,
+    excludeEnd: true,
+    contains: [NAME]
+  };
 
-    var METHOD = {
-        className: 'function',
-        beginKeywords: 'def',
-        end: /[:={\[(\n;]/,
-        excludeEnd: true,
-        contains: [NAME]
-    };
-
-    return {
-        name: 'Flix',
-        keywords: {
-            literal: 'true false',
-            keyword: 'case class def else enum if impl import in lat rel index let match namespace switch type yield with'
-        },
-        contains: [
-            hljs.C_LINE_COMMENT_MODE,
-            hljs.C_BLOCK_COMMENT_MODE,
-            CHAR,
-            STRING,
-            METHOD,
-            hljs.C_NUMBER_MODE
-        ]
-    };
+  return {
+    name: 'Flix',
+    keywords: {
+      literal: 'true false',
+      keyword: 'case class def else enum if impl import in lat rel index let match namespace switch type yield with'
+    },
+    contains: [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      CHAR,
+      STRING,
+      METHOD,
+      hljs.C_NUMBER_MODE
+    ]
+  };
 }
diff --git a/src/languages/fortran.js b/src/languages/fortran.js
index 86a27b9f01..3a1c3b74bf 100644
--- a/src/languages/fortran.js
+++ b/src/languages/fortran.js
@@ -5,18 +5,26 @@ Website: https://en.wikipedia.org/wiki/Fortran
 Category: scientific
 */
 
+/** @type LanguageFn */
 export default function(hljs) {
   const PARAMS = {
     className: 'params',
-    begin: '\\(', end: '\\)'
+    begin: '\\(',
+    end: '\\)'
   };
 
   const COMMENT = {
     variants: [
-      hljs.COMMENT('!', '$', {relevance: 0}),
+      hljs.COMMENT('!', '$', {
+        relevance: 0
+      }),
       // allow FORTRAN 77 style comments
-      hljs.COMMENT('^C[ ]', '$', {relevance: 0}),
-      hljs.COMMENT('^C$', '$', {relevance: 0})
+      hljs.COMMENT('^C[ ]', '$', {
+        relevance: 0
+      }),
+      hljs.COMMENT('^C$', '$', {
+        relevance: 0
+      })
     ]
   };
 
@@ -31,7 +39,10 @@ export default function(hljs) {
     className: 'function',
     beginKeywords: 'subroutine function program',
     illegal: '[${=\\n]',
-    contains: [hljs.UNDERSCORE_TITLE_MODE, PARAMS]
+    contains: [
+      hljs.UNDERSCORE_TITLE_MODE,
+      PARAMS
+    ]
   };
 
   const STRING = {
@@ -78,7 +89,7 @@ export default function(hljs) {
       'set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer ' +
       'dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ' +
       'ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode ' +
-      'is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of '  +
+      'is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of ' +
       'acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 ' +
       'atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits ' +
       'bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr ' +
@@ -87,7 +98,10 @@ export default function(hljs) {
   return {
     name: 'Fortran',
     case_insensitive: true,
-    aliases: ['f90', 'f95'],
+    aliases: [
+      'f90',
+      'f95'
+    ],
     keywords: KEYWORDS,
     illegal: /\/\*/,
     contains: [
@@ -97,7 +111,7 @@ export default function(hljs) {
       // as Fortran 77 style comments
       {
         begin: /^C\s*=(?!=)/,
-        relevance: 0,
+        relevance: 0
       },
       COMMENT,
       NUMBER
diff --git a/src/languages/fsharp.js b/src/languages/fsharp.js
index 25298a3f15..fd94969fba 100644
--- a/src/languages/fsharp.js
+++ b/src/languages/fsharp.js
@@ -39,9 +39,11 @@ export default function(hljs) {
         className: 'string',
         begin: '@"',
         end: '"',
-        contains: [{
-          begin: '""'
-        }]
+        contains: [
+          {
+            begin: '""'
+          }
+        ]
       },
       {
         className: 'string',
@@ -70,12 +72,12 @@ export default function(hljs) {
       {
         className: 'symbol',
         begin: '\\B(\'[A-Za-z])\\b',
-        contains: [
-          hljs.BACKSLASH_ESCAPE
-        ]
+        contains: [hljs.BACKSLASH_ESCAPE]
       },
       hljs.C_LINE_COMMENT_MODE,
-      hljs.inherit(hljs.QUOTE_STRING_MODE, { illegal: null }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        illegal: null
+      }),
       hljs.C_NUMBER_MODE
     ]
   };
diff --git a/src/languages/gams.js b/src/languages/gams.js
index 0aeb0c23ad..2fceeff5a7 100644
--- a/src/languages/gams.js
+++ b/src/languages/gams.js
@@ -8,15 +8,16 @@
  Category: scientific
  */
 
-export default function (hljs) {
-  var KEYWORDS = {
+export default function(hljs) {
+  const KEYWORDS = {
     keyword:
       'abort acronym acronyms alias all and assign binary card diag display ' +
       'else eq file files for free ge gt if integer le loop lt maximizing ' +
       'minimizing model models ne negative no not option options or ord ' +
       'positive prod put putpage puttl repeat sameas semicont semiint smax ' +
       'smin solve sos1 sos2 sum system table then until using while xor yes',
-    literal: 'eps inf na',
+    literal:
+      'eps inf na',
     built_in:
       'abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy ' +
       'cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact ' +
@@ -33,29 +34,40 @@ export default function (hljs) {
       'licenseLevel licenseStatus maxExecError sleep timeClose timeComp ' +
       'timeElapsed timeExec timeStart'
   };
-  var PARAMS = {
+  const PARAMS = {
     className: 'params',
-    begin: /\(/, end: /\)/,
+    begin: /\(/,
+    end: /\)/,
     excludeBegin: true,
-    excludeEnd: true,
+    excludeEnd: true
   };
-  var SYMBOLS = {
+  const SYMBOLS = {
     className: 'symbol',
     variants: [
-      {begin: /=[lgenxc]=/},
-      {begin: /\$/},
+      {
+        begin: /=[lgenxc]=/
+      },
+      {
+        begin: /\$/
+      }
     ]
   };
-  var QSTR = { // One-line quoted comment string
+  const QSTR = { // One-line quoted comment string
     className: 'comment',
     variants: [
-      {begin: '\'', end: '\''},
-      {begin: '"', end: '"'},
+      {
+        begin: '\'',
+        end: '\''
+      },
+      {
+        begin: '"',
+        end: '"'
+      }
     ],
     illegal: '\\n',
     contains: [hljs.BACKSLASH_ESCAPE]
   };
-  var ASSIGNMENT = {
+  const ASSIGNMENT = {
     begin: '/',
     end: '/',
     keywords: KEYWORDS,
@@ -65,10 +77,10 @@ export default function (hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.QUOTE_STRING_MODE,
       hljs.APOS_STRING_MODE,
-      hljs.C_NUMBER_MODE,
-    ],
+      hljs.C_NUMBER_MODE
+    ]
   };
-  var DESCTEXT = { // Parameter/set/variable description text
+  const DESCTEXT = { // Parameter/set/variable description text
     begin: /[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,
     excludeBegin: true,
     end: '$',
@@ -80,8 +92,8 @@ export default function (hljs) {
         className: 'comment',
         begin: /([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+/,
         relevance: 0
-      },
-    ],
+      }
+    ]
   };
 
   return {
@@ -99,7 +111,7 @@ export default function (hljs) {
         contains: [
           {
             className: 'meta-keyword',
-            begin: '^\\$[a-z0-9]+',
+            begin: '^\\$[a-z0-9]+'
           }
         ]
       },
@@ -121,7 +133,7 @@ export default function (hljs) {
           hljs.QUOTE_STRING_MODE,
           hljs.APOS_STRING_MODE,
           ASSIGNMENT,
-          DESCTEXT,
+          DESCTEXT
         ]
       },
       { // table environment
@@ -132,14 +144,14 @@ export default function (hljs) {
           { // table header row
             beginKeywords: 'table',
             end: '$',
-            contains: [DESCTEXT],
+            contains: [DESCTEXT]
           },
           hljs.COMMENT('^\\*', '$'),
           hljs.C_LINE_COMMENT_MODE,
           hljs.C_BLOCK_COMMENT_MODE,
           hljs.QUOTE_STRING_MODE,
           hljs.APOS_STRING_MODE,
-          hljs.C_NUMBER_MODE,
+          hljs.C_NUMBER_MODE
           // Table does not contain DESCTEXT or ASSIGNMENT
         ]
       },
@@ -149,16 +161,16 @@ export default function (hljs) {
         begin: /^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,
         returnBegin: true,
         contains: [
-              { // Function title
-                className: 'title',
-                begin: /^[a-z0-9_]+/,
-              },
-              PARAMS,
-              SYMBOLS,
-            ],
+          { // Function title
+            className: 'title',
+            begin: /^[a-z0-9_]+/
+          },
+          PARAMS,
+          SYMBOLS
+        ]
       },
       hljs.C_NUMBER_MODE,
-      SYMBOLS,
+      SYMBOLS
     ]
   };
 }
diff --git a/src/languages/gauss.js b/src/languages/gauss.js
index 391bab0a37..3099521bdd 100644
--- a/src/languages/gauss.js
+++ b/src/languages/gauss.js
@@ -6,8 +6,8 @@ Website: https://www.aptech.com
 Category: scientific
 */
 export default function(hljs) {
-  var KEYWORDS = {
-    keyword:  'bool break call callexe checkinterrupt clear clearg closeall cls comlog compile ' +
+  const KEYWORDS = {
+    keyword: 'bool break call callexe checkinterrupt clear clearg closeall cls comlog compile ' +
               'continue create debug declare delete disable dlibrary dllcall do dos ed edit else ' +
               'elseif enable end endfor endif endp endo errorlog errorlogat expr external fn ' +
               'for format goto gosub graph if keyword let lib library line load loadarray loadexe ' +
@@ -109,36 +109,43 @@ export default function(hljs) {
              'DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR'
   };
 
+  const AT_COMMENT_MODE = hljs.COMMENT('@', '@');
 
-  var AT_COMMENT_MODE = hljs.COMMENT('@', '@');
-
-  var PREPROCESSOR =
+  const PREPROCESSOR =
   {
     className: 'meta',
-    begin: '#', end: '$',
-    keywords: {'meta-keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'},
+    begin: '#',
+    end: '$',
+    keywords: {
+      'meta-keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'
+    },
     contains: [
       {
-        begin: /\\\n/, relevance: 0
+        begin: /\\\n/,
+        relevance: 0
       },
       {
-        beginKeywords: 'include', end: '$',
-        keywords: {'meta-keyword': 'include'},
+        beginKeywords: 'include',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'include'
+        },
         contains: [
           {
             className: 'meta-string',
-            begin: '"', end: '"',
+            begin: '"',
+            end: '"',
             illegal: '\\n'
           }
         ]
       },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
-      AT_COMMENT_MODE,
+      AT_COMMENT_MODE
     ]
   };
 
-  var STRUCT_TYPE =
+  const STRUCT_TYPE =
   {
     begin: /\bstruct\s+/,
     end: /\s/,
@@ -147,16 +154,17 @@ export default function(hljs) {
       {
         className: "type",
         begin: hljs.UNDERSCORE_IDENT_RE,
-        relevance: 0,
-      },
-    ],
+        relevance: 0
+      }
+    ]
   };
 
   // only for definitions
-  var PARSE_PARAMS = [
+  const PARSE_PARAMS = [
     {
       className: 'params',
-      begin: /\(/, end: /\)/,
+      begin: /\(/,
+      end: /\)/,
       excludeBegin: true,
       excludeEnd: true,
       endsWithParent: true,
@@ -164,31 +172,31 @@ export default function(hljs) {
       contains: [
         { // dots
           className: 'literal',
-          begin: /\.\.\./,
+          begin: /\.\.\./
         },
         hljs.C_NUMBER_MODE,
         hljs.C_BLOCK_COMMENT_MODE,
         AT_COMMENT_MODE,
-        STRUCT_TYPE,
+        STRUCT_TYPE
       ]
     }
   ];
 
-  var FUNCTION_DEF =
+  const FUNCTION_DEF =
   {
     className: "title",
     begin: hljs.UNDERSCORE_IDENT_RE,
-    relevance: 0,
+    relevance: 0
   };
 
-  var DEFINITION = function (beginKeywords, end, inherits) {
-    var mode = hljs.inherit(
+  const DEFINITION = function(beginKeywords, end, inherits) {
+    const mode = hljs.inherit(
       {
         className: "function",
         beginKeywords: beginKeywords,
         end: end,
         excludeEnd: true,
-        contains: [].concat(PARSE_PARAMS),
+        contains: [].concat(PARSE_PARAMS)
       },
       inherits || {}
     );
@@ -199,47 +207,51 @@ export default function(hljs) {
     return mode;
   };
 
-  var BUILT_IN_REF =
+  const BUILT_IN_REF =
   { // these are explicitly named internal function calls
     className: 'built_in',
-    begin: '\\b(' + KEYWORDS.built_in.split(' ').join('|') + ')\\b',
+    begin: '\\b(' + KEYWORDS.built_in.split(' ').join('|') + ')\\b'
   };
 
-  var STRING_REF =
+  const STRING_REF =
   {
     className: 'string',
-    begin: '"', end: '"',
+    begin: '"',
+    end: '"',
     contains: [hljs.BACKSLASH_ESCAPE],
-    relevance: 0,
+    relevance: 0
   };
 
-  var FUNCTION_REF =
+  const FUNCTION_REF =
   {
-    //className: "fn_ref",
+    // className: "fn_ref",
     begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
     returnBegin: true,
     keywords: KEYWORDS,
     relevance: 0,
     contains: [
       {
-        beginKeywords: KEYWORDS.keyword,
+        beginKeywords: KEYWORDS.keyword
       },
       BUILT_IN_REF,
       { // ambiguously named function calls get a relevance of 0
         className: 'built_in',
         begin: hljs.UNDERSCORE_IDENT_RE,
-        relevance: 0,
-      },
-    ],
+        relevance: 0
+      }
+    ]
   };
 
-  var FUNCTION_REF_PARAMS =
+  const FUNCTION_REF_PARAMS =
   {
-    //className: "fn_ref_params",
+    // className: "fn_ref_params",
     begin: /\(/,
     end: /\)/,
     relevance: 0,
-    keywords: { built_in: KEYWORDS.built_in, literal: KEYWORDS.literal },
+    keywords: {
+      built_in: KEYWORDS.built_in,
+      literal: KEYWORDS.literal
+    },
     contains: [
       hljs.C_NUMBER_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
@@ -247,8 +259,8 @@ export default function(hljs) {
       BUILT_IN_REF,
       FUNCTION_REF,
       STRING_REF,
-      'self',
-    ],
+      'self'
+    ]
   };
 
   FUNCTION_REF.contains.push(FUNCTION_REF_PARAMS);
@@ -268,31 +280,35 @@ export default function(hljs) {
       PREPROCESSOR,
       {
         className: 'keyword',
-        begin: /\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/,
+        begin: /\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/
       },
       DEFINITION('proc keyword', ';'),
       DEFINITION('fn', '='),
       {
         beginKeywords: 'for threadfor',
         end: /;/,
-        //end: /\(/,
+        // end: /\(/,
         relevance: 0,
         contains: [
           hljs.C_BLOCK_COMMENT_MODE,
           AT_COMMENT_MODE,
-          FUNCTION_REF_PARAMS,
-        ],
+          FUNCTION_REF_PARAMS
+        ]
       },
       { // custom method guard
         // excludes method names from keyword processing
         variants: [
-          { begin: hljs.UNDERSCORE_IDENT_RE + '\\.' + hljs.UNDERSCORE_IDENT_RE, },
-          { begin: hljs.UNDERSCORE_IDENT_RE + '\\s*=', },
+          {
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\.' + hljs.UNDERSCORE_IDENT_RE
+          },
+          {
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*='
+          }
         ],
-        relevance: 0,
+        relevance: 0
       },
       FUNCTION_REF,
-      STRUCT_TYPE,
+      STRUCT_TYPE
     ]
   };
 }
diff --git a/src/languages/gcode.js b/src/languages/gcode.js
index 2e6c70a85f..cdac312c64 100644
--- a/src/languages/gcode.js
+++ b/src/languages/gcode.js
@@ -6,70 +6,77 @@
  */
 
 export default function(hljs) {
-    var GCODE_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
-    var GCODE_CLOSE_RE = '%';
-    var GCODE_KEYWORDS = {
-      $pattern: GCODE_IDENT_RE,
-      keyword: 'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT ' +
+  const GCODE_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
+  const GCODE_CLOSE_RE = '%';
+  const GCODE_KEYWORDS = {
+    $pattern: GCODE_IDENT_RE,
+    keyword: 'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT ' +
       'EQ LT GT NE GE LE OR XOR'
-    };
-    var GCODE_START = {
-        className: 'meta',
-        begin: '([O])([0-9]+)'
-    };
-    var GCODE_CODE = [
-        hljs.C_LINE_COMMENT_MODE,
-        hljs.C_BLOCK_COMMENT_MODE,
-        hljs.COMMENT(/\(/, /\)/),
-        hljs.inherit(hljs.C_NUMBER_MODE, {begin: '([-+]?([0-9]*\\.?[0-9]+\\.?))|' + hljs.C_NUMBER_RE}),
-        hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-        hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
-        {
-            className: 'name',
-            begin: '([G])([0-9]+\\.?[0-9]?)'
-        },
-        {
-            className: 'name',
-            begin: '([M])([0-9]+\\.?[0-9]?)'
-        },
-        {
-            className: 'attr',
-            begin: '(VC|VS|#)',
-            end: '(\\d+)'
-        },
+  };
+  const GCODE_START = {
+    className: 'meta',
+    begin: '([O])([0-9]+)'
+  };
+  const GCODE_CODE = [
+    hljs.C_LINE_COMMENT_MODE,
+    hljs.C_BLOCK_COMMENT_MODE,
+    hljs.COMMENT(/\(/, /\)/),
+    hljs.inherit(hljs.C_NUMBER_MODE, {
+      begin: '([-+]?([0-9]*\\.?[0-9]+\\.?))|' + hljs.C_NUMBER_RE
+    }),
+    hljs.inherit(hljs.APOS_STRING_MODE, {
+      illegal: null
+    }),
+    hljs.inherit(hljs.QUOTE_STRING_MODE, {
+      illegal: null
+    }),
+    {
+      className: 'name',
+      begin: '([G])([0-9]+\\.?[0-9]?)'
+    },
+    {
+      className: 'name',
+      begin: '([M])([0-9]+\\.?[0-9]?)'
+    },
+    {
+      className: 'attr',
+      begin: '(VC|VS|#)',
+      end: '(\\d+)'
+    },
+    {
+      className: 'attr',
+      begin: '(VZOFX|VZOFY|VZOFZ)'
+    },
+    {
+      className: 'built_in',
+      begin: '(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)',
+      end: '([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])'
+    },
+    {
+      className: 'symbol',
+      variants: [
         {
-            className: 'attr',
-            begin: '(VZOFX|VZOFY|VZOFZ)'
-        },
-        {
-            className: 'built_in',
-            begin: '(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)',
-            end: '([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])'
-        },
-        {
-            className: 'symbol',
-            variants: [
-                {
-                    begin: 'N', end: '\\d+',
-                    illegal: '\\W'
-                }
-            ]
+          begin: 'N',
+          end: '\\d+',
+          illegal: '\\W'
         }
-    ];
+      ]
+    }
+  ];
 
-    return {
-        name: 'G-code (ISO 6983)',
-        aliases: ['nc'],
-        // Some implementations (CNC controls) of G-code are interoperable with uppercase and lowercase letters seamlessly.
-        // However, most prefer all uppercase and uppercase is customary.
-        case_insensitive: true,
-        keywords: GCODE_KEYWORDS,
-        contains: [
-            {
-                className: 'meta',
-                begin: GCODE_CLOSE_RE
-            },
-            GCODE_START
-        ].concat(GCODE_CODE)
-    };
+  return {
+    name: 'G-code (ISO 6983)',
+    aliases: ['nc'],
+    // Some implementations (CNC controls) of G-code are interoperable with uppercase and lowercase letters seamlessly.
+    // However, most prefer all uppercase and uppercase is customary.
+    case_insensitive: true,
+    keywords: GCODE_KEYWORDS,
+    contains: [
+      {
+        className: 'meta',
+        begin: GCODE_CLOSE_RE
+      },
+      GCODE_START
+    ].concat(GCODE_CODE)
+  };
 }
diff --git a/src/languages/gherkin.js b/src/languages/gherkin.js
index 9de8b11472..8c558abf23 100644
--- a/src/languages/gherkin.js
+++ b/src/languages/gherkin.js
@@ -5,7 +5,7 @@
  Website: https://cucumber.io/docs/gherkin/
  */
 
-export default function (hljs) {
+export default function(hljs) {
   return {
     name: 'Gherkin',
     aliases: ['feature'],
@@ -21,7 +21,8 @@ export default function (hljs) {
         begin: '@[^@\\s]+'
       },
       {
-        begin: '\\|', end: '\\|\\w*$',
+        begin: '\\|',
+        end: '\\|\\w*$',
         contains: [
           {
             className: 'string',
@@ -31,12 +32,14 @@ export default function (hljs) {
       },
       {
         className: 'variable',
-        begin: '<', end: '>'
+        begin: '<',
+        end: '>'
       },
       hljs.HASH_COMMENT_MODE,
       {
         className: 'string',
-        begin: '"""', end: '"""'
+        begin: '"""',
+        end: '"""'
       },
       hljs.QUOTE_STRING_MODE
     ]
diff --git a/src/languages/glsl.js b/src/languages/glsl.js
index bf417a2d3e..c7bfa085bb 100644
--- a/src/languages/glsl.js
+++ b/src/languages/glsl.js
@@ -19,7 +19,7 @@ export default function(hljs) {
         'flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant ' +
         'invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y ' +
         'local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left ' +
-        'out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f '+
+        'out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f ' +
         'r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict ' +
         'rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 ' +
         'rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 ' +
@@ -118,7 +118,8 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'meta',
-        begin: '#', end: '$'
+        begin: '#',
+        end: '$'
       }
     ]
   };
diff --git a/src/languages/gml.js b/src/languages/gml.js
index 1042d2b1da..e4326ccdbd 100644
--- a/src/languages/gml.js
+++ b/src/languages/gml.js
@@ -7,7 +7,7 @@ Category: scripting
 */
 
 export default function(hljs) {
-  var GML_KEYWORDS = {
+  const GML_KEYWORDS = {
     keyword: 'begin end if then else while do for break continue with until ' +
       'repeat exit and or xor not return mod div switch case default var ' +
       'globalvar enum #macro #region #endregion',
@@ -866,7 +866,10 @@ export default function(hljs) {
 
   return {
     name: 'GML',
-    aliases: ['gml', 'GML'],
+    aliases: [
+      'gml',
+      'GML'
+    ],
     case_insensitive: false, // language is case-insensitive
     keywords: GML_KEYWORDS,
 
diff --git a/src/languages/go.js b/src/languages/go.js
index 7244a662f8..925ad421f4 100644
--- a/src/languages/go.js
+++ b/src/languages/go.js
@@ -8,7 +8,7 @@ Category: common, system
 */
 
 export default function(hljs) {
-  var GO_KEYWORDS = {
+  const GO_KEYWORDS = {
     keyword:
       'break default func interface select case map struct chan else goto package switch ' +
       'const fallthrough if range type continue for import return var go defer ' +
@@ -32,13 +32,19 @@ export default function(hljs) {
         variants: [
           hljs.QUOTE_STRING_MODE,
           hljs.APOS_STRING_MODE,
-          {begin: '`', end: '`'},
+          {
+            begin: '`',
+            end: '`'
+          }
         ]
       },
       {
         className: 'number',
         variants: [
-          {begin: hljs.C_NUMBER_RE + '[i]', relevance: 1},
+          {
+            begin: hljs.C_NUMBER_RE + '[i]',
+            relevance: 1
+          },
           hljs.C_NUMBER_MODE
         ]
       },
@@ -47,12 +53,15 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        beginKeywords: 'func', end: '\\s*(\\{|$)', excludeEnd: true,
+        beginKeywords: 'func',
+        end: '\\s*(\\{|$)',
+        excludeEnd: true,
         contains: [
           hljs.TITLE_MODE,
           {
             className: 'params',
-            begin: /\(/, end: /\)/,
+            begin: /\(/,
+            end: /\)/,
             keywords: GO_KEYWORDS,
             illegal: /["']/
           }
diff --git a/src/languages/golo.js b/src/languages/golo.js
index 5389b1807d..9de228053b 100644
--- a/src/languages/golo.js
+++ b/src/languages/golo.js
@@ -6,25 +6,26 @@ Website: http://golo-lang.org/
 */
 
 export default function(hljs) {
-    return {
-      name: 'Golo',
-      keywords: {
-        keyword:
+  return {
+    name: 'Golo',
+    keywords: {
+      keyword:
           'println readln print import module function local return let var ' +
           'while for foreach times in case when match with break continue ' +
           'augment augmentation each find filter reduce ' +
           'if then else otherwise try catch finally raise throw orIfNull ' +
           'DynamicObject|10 DynamicVariable struct Observable map set vector list array',
-        literal:
+      literal:
           'true false null'
-      },
-      contains: [
-        hljs.HASH_COMMENT_MODE,
-        hljs.QUOTE_STRING_MODE,
-        hljs.C_NUMBER_MODE,
-        {
-          className: 'meta', begin: '@[A-Za-z]+'
-        }
-      ]
-    }
+    },
+    contains: [
+      hljs.HASH_COMMENT_MODE,
+      hljs.QUOTE_STRING_MODE,
+      hljs.C_NUMBER_MODE,
+      {
+        className: 'meta',
+        begin: '@[A-Za-z]+'
+      }
+    ]
+  };
 }
diff --git a/src/languages/gradle.js b/src/languages/gradle.js
index 8cce34b2c6..cdca7587bb 100644
--- a/src/languages/gradle.js
+++ b/src/languages/gradle.js
@@ -38,5 +38,5 @@ export default function(hljs) {
       hljs.REGEXP_MODE
 
     ]
-  }
+  };
 }
diff --git a/src/languages/handlebars.js b/src/languages/handlebars.js
index a1ed102941..092662504d 100644
--- a/src/languages/handlebars.js
+++ b/src/languages/handlebars.js
@@ -7,7 +7,7 @@ Website: https://handlebarsjs.com
 Category: template
 */
 
-import * as regex from '../lib/regex.js'
+import * as regex from '../lib/regex.js';
 
 export default function(hljs) {
   const BUILT_INS = {
@@ -57,11 +57,11 @@ export default function(hljs) {
   // this regex matches literal segments like ' abc ' or [ abc ] as well as helpers and paths
   // like a/b, ./abc/cde, and abc.bcd
 
-  const DOUBLE_QUOTED_ID_REGEX=/".*?"/;
-  const SINGLE_QUOTED_ID_REGEX=/'.*?'/;
-  const BRACKET_QUOTED_ID_REGEX=/\[.*?\]/;
-  const PLAIN_ID_REGEX=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/;
-  const PATH_DELIMITER_REGEX=/\.|\//;
+  const DOUBLE_QUOTED_ID_REGEX = /".*?"/;
+  const SINGLE_QUOTED_ID_REGEX = /'.*?'/;
+  const BRACKET_QUOTED_ID_REGEX = /\[.*?\]/;
+  const PLAIN_ID_REGEX = /[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/;
+  const PATH_DELIMITER_REGEX = /\.|\//;
 
   const IDENTIFIER_REGEX = regex.concat(
     '(',
@@ -119,7 +119,9 @@ export default function(hljs) {
   const BLOCK_PARAMS = {
     // parameters of the form '{{#with x as | y |}}...{{/with}}'
     begin: /as\s+\|/,
-    keywords: { keyword: 'as' },
+    keywords: {
+      keyword: 'as'
+    },
     end: /\|/,
     contains: [
       {
@@ -149,19 +151,17 @@ export default function(hljs) {
     className: 'name',
     keywords: BUILT_INS,
     starts: hljs.inherit(HELPER_PARAMETERS, {
-      end: /\)/,
+      end: /\)/
     })
   });
 
-  SUB_EXPRESSION.contains = [
-    SUB_EXPRESSION_CONTENTS
-  ];
+  SUB_EXPRESSION.contains = [SUB_EXPRESSION_CONTENTS];
 
   const OPENING_BLOCK_MUSTACHE_CONTENTS = hljs.inherit(HELPER_NAME_OR_PATH_EXPRESSION, {
     keywords: BUILT_INS,
     className: 'name',
     starts: hljs.inherit(HELPER_PARAMETERS, {
-      end: /\}\}/,
+      end: /\}\}/
     })
   });
 
@@ -174,16 +174,27 @@ export default function(hljs) {
     className: 'name',
     keywords: BUILT_INS,
     starts: hljs.inherit(HELPER_PARAMETERS, {
-      end: /\}\}/,
+      end: /\}\}/
     })
   });
 
-  const ESCAPE_MUSTACHE_WITH_PRECEEDING_BACKSLASH = {begin: /\\\{\{/, skip: true};
-  const PREVENT_ESCAPE_WITH_ANOTHER_PRECEEDING_BACKSLASH = {begin: /\\\\(?=\{\{)/, skip: true};
+  const ESCAPE_MUSTACHE_WITH_PRECEEDING_BACKSLASH = {
+    begin: /\\\{\{/,
+    skip: true
+  };
+  const PREVENT_ESCAPE_WITH_ANOTHER_PRECEEDING_BACKSLASH = {
+    begin: /\\\\(?=\{\{)/,
+    skip: true
+  };
 
   return {
     name: 'Handlebars',
-    aliases: ['hbs', 'html.hbs', 'html.handlebars', 'htmlbars'],
+    aliases: [
+      'hbs',
+      'html.hbs',
+      'html.handlebars',
+      'htmlbars'
+    ],
     case_insensitive: true,
     subLanguage: 'xml',
     contains: [
@@ -197,7 +208,11 @@ export default function(hljs) {
         begin: /\{\{\{\{(?!\/)/,
         end: /\}\}\}\}/,
         contains: [OPENING_BLOCK_MUSTACHE_CONTENTS],
-        starts: {end: /\{\{\{\{\//, returnEnd: true, subLanguage: 'xml'}
+        starts: {
+          end: /\{\{\{\{\//,
+          returnEnd: true,
+          subLanguage: 'xml'
+        }
       },
       {
         // close raw block
@@ -211,7 +226,7 @@ export default function(hljs) {
         className: 'template-tag',
         begin: /\{\{#/,
         end: /\}\}/,
-        contains: [OPENING_BLOCK_MUSTACHE_CONTENTS],
+        contains: [OPENING_BLOCK_MUSTACHE_CONTENTS]
       },
       {
         className: 'template-tag',
@@ -230,7 +245,7 @@ export default function(hljs) {
         className: 'template-tag',
         begin: /\{\{\//,
         end: /\}\}/,
-        contains: [CLOSING_BLOCK_MUSTACHE_CONTENTS],
+        contains: [CLOSING_BLOCK_MUSTACHE_CONTENTS]
       },
       {
         // template variable or helper-call that is NOT html-escaped
diff --git a/src/languages/haskell.js b/src/languages/haskell.js
index 5c9417adc9..b9ddd36c6e 100644
--- a/src/languages/haskell.js
+++ b/src/languages/haskell.js
@@ -7,7 +7,7 @@ Category: functional
 */
 
 export default function(hljs) {
-  var COMMENT = {
+  const COMMENT = {
     variants: [
       hljs.COMMENT('--', '$'),
       hljs.COMMENT(
@@ -20,36 +20,45 @@ export default function(hljs) {
     ]
   };
 
-  var PRAGMA = {
+  const PRAGMA = {
     className: 'meta',
-    begin: /\{-#/, end: /#-\}/
+    begin: /\{-#/,
+    end: /#-\}/
   };
 
-  var PREPROCESSOR = {
+  const PREPROCESSOR = {
     className: 'meta',
-    begin: '^#', end: '$'
+    begin: '^#',
+    end: '$'
   };
 
-  var CONSTRUCTOR = {
+  const CONSTRUCTOR = {
     className: 'type',
     begin: '\\b[A-Z][\\w\']*', // TODO: other constructors (build-in, infix).
     relevance: 0
   };
 
-  var LIST = {
-    begin: '\\(', end: '\\)',
+  const LIST = {
+    begin: '\\(',
+    end: '\\)',
     illegal: '"',
     contains: [
       PRAGMA,
       PREPROCESSOR,
-      {className: 'type', begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'},
-      hljs.inherit(hljs.TITLE_MODE, {begin: '[_a-z][\\w\']*'}),
+      {
+        className: 'type',
+        begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'
+      },
+      hljs.inherit(hljs.TITLE_MODE, {
+        begin: '[_a-z][\\w\']*'
+      }),
       COMMENT
     ]
   };
 
-  var RECORD = {
-    begin: /\{/, end: /\}/,
+  const RECORD = {
+    begin: /\{/,
+    end: /\}/,
     contains: LIST.contains
   };
 
@@ -62,55 +71,85 @@ export default function(hljs) {
       'infix infixl infixr foreign export ccall stdcall cplusplus ' +
       'jvm dotnet safe unsafe family forall mdo proc rec',
     contains: [
-
       // Top-level constructions.
-
       {
-        beginKeywords: 'module', end: 'where',
+        beginKeywords: 'module',
+        end: 'where',
         keywords: 'module where',
-        contains: [LIST, COMMENT],
+        contains: [
+          LIST,
+          COMMENT
+        ],
         illegal: '\\W\\.|;'
       },
       {
-        begin: '\\bimport\\b', end: '$',
+        begin: '\\bimport\\b',
+        end: '$',
         keywords: 'import qualified as hiding',
-        contains: [LIST, COMMENT],
+        contains: [
+          LIST,
+          COMMENT
+        ],
         illegal: '\\W\\.|;'
       },
-
       {
         className: 'class',
-        begin: '^(\\s*)?(class|instance)\\b', end: 'where',
+        begin: '^(\\s*)?(class|instance)\\b',
+        end: 'where',
         keywords: 'class family instance where',
-        contains: [CONSTRUCTOR, LIST, COMMENT]
+        contains: [
+          CONSTRUCTOR,
+          LIST,
+          COMMENT
+        ]
       },
       {
         className: 'class',
-        begin: '\\b(data|(new)?type)\\b', end: '$',
+        begin: '\\b(data|(new)?type)\\b',
+        end: '$',
         keywords: 'data family type newtype deriving',
-        contains: [PRAGMA, CONSTRUCTOR, LIST, RECORD, COMMENT]
+        contains: [
+          PRAGMA,
+          CONSTRUCTOR,
+          LIST,
+          RECORD,
+          COMMENT
+        ]
       },
       {
-        beginKeywords: 'default', end: '$',
-        contains: [CONSTRUCTOR, LIST, COMMENT]
+        beginKeywords: 'default',
+        end: '$',
+        contains: [
+          CONSTRUCTOR,
+          LIST,
+          COMMENT
+        ]
       },
       {
-        beginKeywords: 'infix infixl infixr', end: '$',
-        contains: [hljs.C_NUMBER_MODE, COMMENT]
+        beginKeywords: 'infix infixl infixr',
+        end: '$',
+        contains: [
+          hljs.C_NUMBER_MODE,
+          COMMENT
+        ]
       },
       {
-        begin: '\\bforeign\\b', end: '$',
+        begin: '\\bforeign\\b',
+        end: '$',
         keywords: 'foreign import export ccall stdcall cplusplus jvm ' +
                   'dotnet safe unsafe',
-        contains: [CONSTRUCTOR, hljs.QUOTE_STRING_MODE, COMMENT]
+        contains: [
+          CONSTRUCTOR,
+          hljs.QUOTE_STRING_MODE,
+          COMMENT
+        ]
       },
       {
         className: 'meta',
-        begin: '#!\\/usr\\/bin\\/env\ runhaskell', end: '$'
+        begin: '#!\\/usr\\/bin\\/env\ runhaskell',
+        end: '$'
       },
-
       // "Whitespaces".
-
       PRAGMA,
       PREPROCESSOR,
 
@@ -120,11 +159,13 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       hljs.C_NUMBER_MODE,
       CONSTRUCTOR,
-      hljs.inherit(hljs.TITLE_MODE, {begin: '^[_a-z][\\w\']*'}),
-
+      hljs.inherit(hljs.TITLE_MODE, {
+        begin: '^[_a-z][\\w\']*'
+      }),
       COMMENT,
-
-      {begin: '->|<-'} // No markup, relevance booster
+      { // No markup, relevance booster
+        begin: '->|<-'
+      }
     ]
   };
 }
diff --git a/src/languages/haxe.js b/src/languages/haxe.js
index 7c04449a02..4a4f72b4bb 100644
--- a/src/languages/haxe.js
+++ b/src/languages/haxe.js
@@ -7,10 +7,10 @@ Website: https://haxe.org
 */
 
 export default function(hljs) {
-  var IDENT_RE = '[a-zA-Z_$][a-zA-Z0-9_$]*';
-  var IDENT_FUNC_RETURN_TYPE_RE = '([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)';
+  const IDENT_RE = '[a-zA-Z_$][a-zA-Z0-9_$]*';
+  const IDENT_FUNC_RETURN_TYPE_RE = '([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)';
 
-  var HAXE_BASIC_TYPES = 'Int Float String Bool Dynamic Void Array ';
+  const HAXE_BASIC_TYPES = 'Int Float String Bool Dynamic Void Array ';
 
   return {
     name: 'Haxe',
@@ -26,15 +26,21 @@ export default function(hljs) {
         'true false null _'
     },
     contains: [
-      { className: 'string', // interpolate-able strings
-        begin: '\'', end: '\'',
+      {
+        className: 'string', // interpolate-able strings
+        begin: '\'',
+        end: '\'',
         contains: [
           hljs.BACKSLASH_ESCAPE,
-          { className: 'subst', // interpolation
-            begin: '\\$\\{', end: '\\}'
+          {
+            className: 'subst', // interpolation
+            begin: '\\$\\{',
+            end: '\\}'
           },
-          { className: 'subst', // interpolation
-            begin: '\\$', end: /\W\}/
+          {
+            className: 'subst', // interpolation
+            begin: '\\$',
+            end: /\W\}/
           }
         ]
       },
@@ -42,46 +48,72 @@ export default function(hljs) {
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.C_NUMBER_MODE,
-      { className: 'meta', // compiler meta
-        begin: '@:', end: '$'
+      {
+        className: 'meta', // compiler meta
+        begin: '@:',
+        end: '$'
       },
-      { className: 'meta', // compiler conditionals
-        begin: '#', end: '$',
-        keywords: {'meta-keyword': 'if else elseif end error'}
+      {
+        className: 'meta', // compiler conditionals
+        begin: '#',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'if else elseif end error'
+        }
       },
-      { className: 'type', // function types
-        begin: ':[ \t]*', end: '[^A-Za-z0-9_ \t\\->]',
-        excludeBegin: true, excludeEnd: true,
+      {
+        className: 'type', // function types
+        begin: ':[ \t]*',
+        end: '[^A-Za-z0-9_ \t\\->]',
+        excludeBegin: true,
+        excludeEnd: true,
         relevance: 0
       },
-      { className: 'type', // types
-        begin: ':[ \t]*', end: '\\W',
-        excludeBegin: true, excludeEnd: true
+      {
+        className: 'type', // types
+        begin: ':[ \t]*',
+        end: '\\W',
+        excludeBegin: true,
+        excludeEnd: true
       },
-      { className: 'type', // instantiation
-        begin: 'new *', end: '\\W',
-        excludeBegin: true, excludeEnd: true
+      {
+        className: 'type', // instantiation
+        begin: 'new *',
+        end: '\\W',
+        excludeBegin: true,
+        excludeEnd: true
       },
-      { className: 'class', // enums
-        beginKeywords: 'enum', end: '\\{',
-        contains: [
-          hljs.TITLE_MODE
-        ]
+      {
+        className: 'class', // enums
+        beginKeywords: 'enum',
+        end: '\\{',
+        contains: [hljs.TITLE_MODE]
       },
-      { className: 'class', // abstracts
-        beginKeywords: 'abstract', end: '[\\{$]',
+      {
+        className: 'class', // abstracts
+        beginKeywords: 'abstract',
+        end: '[\\{$]',
         contains: [
-          { className: 'type',
-            begin: '\\(', end: '\\)',
-            excludeBegin: true, excludeEnd: true
+          {
+            className: 'type',
+            begin: '\\(',
+            end: '\\)',
+            excludeBegin: true,
+            excludeEnd: true
           },
-          { className: 'type',
-            begin: 'from +', end: '\\W',
-            excludeBegin: true, excludeEnd: true
+          {
+            className: 'type',
+            begin: 'from +',
+            end: '\\W',
+            excludeBegin: true,
+            excludeEnd: true
           },
-          { className: 'type',
-            begin: 'to +', end: '\\W',
-            excludeBegin: true, excludeEnd: true
+          {
+            className: 'type',
+            begin: 'to +',
+            end: '\\W',
+            excludeBegin: true,
+            excludeEnd: true
           },
           hljs.TITLE_MODE
         ],
@@ -89,11 +121,15 @@ export default function(hljs) {
           keyword: 'abstract from to'
         }
       },
-      { className: 'class', // classes
-        begin: '\\b(class|interface) +', end: '[\\{$]',  excludeEnd: true,
+      {
+        className: 'class', // classes
+        begin: '\\b(class|interface) +',
+        end: '[\\{$]',
+        excludeEnd: true,
         keywords: 'class interface',
         contains: [
-          { className: 'keyword',
+          {
+            className: 'keyword',
             begin: '\\b(extends|implements) +',
             keywords: 'extends implements',
             contains: [
@@ -107,12 +143,13 @@ export default function(hljs) {
           hljs.TITLE_MODE
         ]
       },
-      { className: 'function',
-        beginKeywords: 'function', end: '\\(', excludeEnd: true,
+      {
+        className: 'function',
+        beginKeywords: 'function',
+        end: '\\(',
+        excludeEnd: true,
         illegal: '\\S',
-        contains: [
-          hljs.TITLE_MODE
-        ]
+        contains: [hljs.TITLE_MODE]
       }
     ],
     illegal: /<\//
diff --git a/src/languages/hsp.js b/src/languages/hsp.js
index 3487a2d91a..68649b2ae3 100644
--- a/src/languages/hsp.js
+++ b/src/languages/hsp.js
@@ -22,19 +22,27 @@ export default function(hljs) {
       {
         // multi-line string
         className: 'string',
-        begin: /\{"/, end: /"\}/,
+        begin: /\{"/,
+        end: /"\}/,
         contains: [hljs.BACKSLASH_ESCAPE]
       },
 
-      hljs.COMMENT(';', '$', {relevance: 0}),
+      hljs.COMMENT(';', '$', {
+        relevance: 0
+      }),
 
       {
         // pre-processor
         className: 'meta',
-        begin: '#', end: '$',
-        keywords: {'meta-keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'},
+        begin: '#',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'
+        },
         contains: [
-          hljs.inherit(hljs.QUOTE_STRING_MODE, {className: 'meta-string'}),
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {
+            className: 'meta-string'
+          }),
           hljs.NUMBER_MODE,
           hljs.C_NUMBER_MODE,
           hljs.C_LINE_COMMENT_MODE,
diff --git a/src/languages/htmlbars.js b/src/languages/htmlbars.js
index caca6d4dad..4a5dddd64b 100644
--- a/src/languages/htmlbars.js
+++ b/src/languages/htmlbars.js
@@ -19,12 +19,12 @@ TODO: Remove in version 11.0.
 */
 
 // compile time dependency on handlebars
-import handlebars from "./handlebars.js"
+import handlebars from "./handlebars.js";
 
 export default function(hljs) {
-  const definition = handlebars(hljs)
+  const definition = handlebars(hljs);
 
-  definition.name = "HTMLbars"
+  definition.name = "HTMLbars";
 
   // HACK: This lets handlebars do the auto-detection if it's been loaded (by
   // default the build script will load in alphabetical order) and if not (perhaps
@@ -35,8 +35,8 @@ export default function(hljs) {
   // content and will need to change their setup to only require handlebars, but
   // I don't consider this a breaking change
   if (hljs.getLanguage("handlebars")) {
-    definition.disableAutodetect = true
+    definition.disableAutodetect = true;
   }
 
-  return definition
+  return definition;
 }
diff --git a/src/languages/inform7.js b/src/languages/inform7.js
index f1c14646b1..ef4a0f0bd7 100644
--- a/src/languages/inform7.js
+++ b/src/languages/inform7.js
@@ -6,8 +6,8 @@ Website: http://inform7.com
 */
 
 export default function(hljs) {
-  var START_BRACKET = '\\[';
-  var END_BRACKET = '\\]';
+  const START_BRACKET = '\\[';
+  const END_BRACKET = '\\]';
   return {
     name: 'Inform 7',
     aliases: ['i7'],
@@ -28,12 +28,14 @@ export default function(hljs) {
     contains: [
       {
         className: 'string',
-        begin: '"', end: '"',
+        begin: '"',
+        end: '"',
         relevance: 0,
         contains: [
           {
             className: 'subst',
-            begin: START_BRACKET, end: END_BRACKET
+            begin: START_BRACKET,
+            end: END_BRACKET
           }
         ]
       },
@@ -49,14 +51,16 @@ export default function(hljs) {
         end: ':',
         contains: [
           {
-            //Rule name
-            begin: '\\(This', end: '\\)'
+            // Rule name
+            begin: '\\(This',
+            end: '\\)'
           }
         ]
       },
       {
         className: 'comment',
-        begin: START_BRACKET, end: END_BRACKET,
+        begin: START_BRACKET,
+        end: END_BRACKET,
         contains: ['self']
       }
     ]
diff --git a/src/languages/ini.js b/src/languages/ini.js
index 32b9547053..d59c8635b5 100644
--- a/src/languages/ini.js
+++ b/src/languages/ini.js
@@ -9,42 +9,71 @@ Website: https://github.com/toml-lang/toml
 import * as regex from '../lib/regex.js';
 
 export default function(hljs) {
-  var NUMBERS = {
+  const NUMBERS = {
     className: 'number',
     relevance: 0,
     variants: [
-      { begin: /([+-]+)?[\d]+_[\d_]+/ },
-      { begin: hljs.NUMBER_RE }
+      {
+        begin: /([+-]+)?[\d]+_[\d_]+/
+      },
+      {
+        begin: hljs.NUMBER_RE
+      }
     ]
   };
-  var COMMENTS = hljs.COMMENT();
+  const COMMENTS = hljs.COMMENT();
   COMMENTS.variants = [
-    {begin: /;/, end: /$/},
-    {begin: /#/, end: /$/},
+    {
+      begin: /;/,
+      end: /$/
+    },
+    {
+      begin: /#/,
+      end: /$/
+    }
   ];
-  var VARIABLES = {
+  const VARIABLES = {
     className: 'variable',
     variants: [
-      { begin: /\$[\w\d"][\w\d_]*/ },
-      { begin: /\$\{(.*?)\}/ }
+      {
+        begin: /\$[\w\d"][\w\d_]*/
+      },
+      {
+        begin: /\$\{(.*?)\}/
+      }
     ]
   };
-  var LITERALS = {
+  const LITERALS = {
     className: 'literal',
     begin: /\bon|off|true|false|yes|no\b/
   };
-  var STRINGS = {
+  const STRINGS = {
     className: "string",
     contains: [hljs.BACKSLASH_ESCAPE],
     variants: [
-      { begin: "'''", end: "'''", relevance: 10 },
-      { begin: '"""', end: '"""', relevance: 10 },
-      { begin: '"', end: '"' },
-      { begin: "'", end: "'" }
+      {
+        begin: "'''",
+        end: "'''",
+        relevance: 10
+      },
+      {
+        begin: '"""',
+        end: '"""',
+        relevance: 10
+      },
+      {
+        begin: '"',
+        end: '"'
+      },
+      {
+        begin: "'",
+        end: "'"
+      }
     ]
   };
-  var ARRAY = {
-    begin: /\[/, end: /\]/,
+  const ARRAY = {
+    begin: /\[/,
+    end: /\]/,
     contains: [
       COMMENTS,
       LITERALS,
@@ -53,16 +82,16 @@ export default function(hljs) {
       NUMBERS,
       'self'
     ],
-    relevance:0
+    relevance: 0
   };
 
-  var BARE_KEY = /[A-Za-z0-9_-]+/;
-  var QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
-  var QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
-  var ANY_KEY = regex.either(
+  const BARE_KEY = /[A-Za-z0-9_-]+/;
+  const QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
+  const QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
+  const ANY_KEY = regex.either(
     BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE
   );
-  var DOTTED_KEY = regex.concat(
+  const DOTTED_KEY = regex.concat(
     ANY_KEY, '(\\s*\\.\\s*', ANY_KEY, ')*',
     regex.lookahead(/\s*=\s*[^#\s]/)
   );
@@ -76,7 +105,8 @@ export default function(hljs) {
       COMMENTS,
       {
         className: 'section',
-        begin: /\[+/, end: /\]+/
+        begin: /\[+/,
+        end: /\]+/
       },
       {
         begin: DOTTED_KEY,
diff --git a/src/languages/irpf90.js b/src/languages/irpf90.js
index 877f246066..76ef4bcb1f 100644
--- a/src/languages/irpf90.js
+++ b/src/languages/irpf90.js
@@ -7,12 +7,13 @@ Category: scientific
 */
 
 export default function(hljs) {
-  var PARAMS = {
+  const PARAMS = {
     className: 'params',
-    begin: '\\(', end: '\\)'
+    begin: '\\(',
+    end: '\\)'
   };
 
-  var F_KEYWORDS = {
+  const F_KEYWORDS = {
     literal: '.False. .True.',
     keyword: 'kind do while private call intrinsic where elsewhere ' +
       'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then ' +
@@ -50,7 +51,7 @@ export default function(hljs) {
       'set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer ' +
       'dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ' +
       'ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode ' +
-      'is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of '  +
+      'is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of ' +
       'acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 ' +
       'atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits ' +
       'bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr ' +
@@ -64,16 +65,29 @@ export default function(hljs) {
     keywords: F_KEYWORDS,
     illegal: /\/\*/,
     contains: [
-      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'string', relevance: 0}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {className: 'string', relevance: 0}),
+      hljs.inherit(hljs.APOS_STRING_MODE, {
+        className: 'string',
+        relevance: 0
+      }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        className: 'string',
+        relevance: 0
+      }),
       {
         className: 'function',
         beginKeywords: 'subroutine function program',
         illegal: '[${=\\n]',
-        contains: [hljs.UNDERSCORE_TITLE_MODE, PARAMS]
+        contains: [
+          hljs.UNDERSCORE_TITLE_MODE,
+          PARAMS
+        ]
       },
-      hljs.COMMENT('!', '$', {relevance: 0}),
-      hljs.COMMENT('begin_doc', 'end_doc', {relevance: 10}),
+      hljs.COMMENT('!', '$', {
+        relevance: 0
+      }),
+      hljs.COMMENT('begin_doc', 'end_doc', {
+        relevance: 10
+      }),
       {
         className: 'number',
         // regex in both fortran and irpf90 should match
diff --git a/src/languages/isbl.js b/src/languages/isbl.js
index 33e5287c7d..8eb2dc85b5 100644
--- a/src/languages/isbl.js
+++ b/src/languages/isbl.js
@@ -7,18 +7,18 @@ Category: enterprise
 
 export default function(hljs) {
   // Определение идентификаторов
-  var UNDERSCORE_IDENT_RE = "[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*";
+  const UNDERSCORE_IDENT_RE = "[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*";
 
   // Определение имен функций
-  var FUNCTION_NAME_IDENT_RE = "[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*";
+  const FUNCTION_NAME_IDENT_RE = "[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*";
 
   // keyword : ключевые слова
-  var KEYWORD =
+  const KEYWORD =
     "and и else иначе endexcept endfinally endforeach конецвсе endif конецесли endwhile конецпока " +
     "except exitfor finally foreach все if если in в not не or или try while пока ";
 
   // SYSRES Constants
-  var sysres_constants =
+  const sysres_constants =
     "SYSRES_CONST_ACCES_RIGHT_TYPE_EDIT " +
     "SYSRES_CONST_ACCES_RIGHT_TYPE_FULL " +
     "SYSRES_CONST_ACCES_RIGHT_TYPE_VIEW " +
@@ -795,24 +795,24 @@ export default function(hljs) {
     "SYSRES_CONST_YES_VALUE ";
 
   // Base constant
-  var base_constants = "CR FALSE nil NO_VALUE NULL TAB TRUE YES_VALUE ";
+  const base_constants = "CR FALSE nil NO_VALUE NULL TAB TRUE YES_VALUE ";
 
   // Base group name
-  var base_group_name_constants =
+  const base_group_name_constants =
     "ADMINISTRATORS_GROUP_NAME CUSTOMIZERS_GROUP_NAME DEVELOPERS_GROUP_NAME SERVICE_USERS_GROUP_NAME ";
 
   // Decision block properties
-  var decision_block_properties_constants =
+  const decision_block_properties_constants =
     "DECISION_BLOCK_FIRST_OPERAND_PROPERTY DECISION_BLOCK_NAME_PROPERTY DECISION_BLOCK_OPERATION_PROPERTY " +
     "DECISION_BLOCK_RESULT_TYPE_PROPERTY DECISION_BLOCK_SECOND_OPERAND_PROPERTY ";
 
   // File extension
-  var file_extension_constants =
+  const file_extension_constants =
     "ANY_FILE_EXTENTION COMPRESSED_DOCUMENT_EXTENSION EXTENDED_DOCUMENT_EXTENSION " +
     "SHORT_COMPRESSED_DOCUMENT_EXTENSION SHORT_EXTENDED_DOCUMENT_EXTENSION ";
 
   // Job block properties
-  var job_block_properties_constants =
+  const job_block_properties_constants =
     "JOB_BLOCK_ABORT_DEADLINE_PROPERTY " +
     "JOB_BLOCK_AFTER_FINISH_EVENT " +
     "JOB_BLOCK_AFTER_QUERY_PARAMETERS_EVENT " +
@@ -836,14 +836,14 @@ export default function(hljs) {
     "JOB_BLOCK_SUBJECT_PROPERTY ";
 
   // Language code
-  var language_code_constants = "ENGLISH_LANGUAGE_CODE RUSSIAN_LANGUAGE_CODE ";
+  const language_code_constants = "ENGLISH_LANGUAGE_CODE RUSSIAN_LANGUAGE_CODE ";
 
   // Launching external applications
-  var launching_external_applications_constants =
+  const launching_external_applications_constants =
     "smHidden smMaximized smMinimized smNormal wmNo wmYes ";
 
   // Link kind
-  var link_kind_constants =
+  const link_kind_constants =
     "COMPONENT_TOKEN_LINK_KIND " +
     "DOCUMENT_LINK_KIND " +
     "EDOCUMENT_LINK_KIND " +
@@ -853,11 +853,11 @@ export default function(hljs) {
     "TASK_LINK_KIND ";
 
   // Lock type
-  var lock_type_constants =
+  const lock_type_constants =
     "COMPONENT_TOKEN_LOCK_TYPE EDOCUMENT_VERSION_LOCK_TYPE ";
 
   // Monitor block properties
-  var monitor_block_properties_constants =
+  const monitor_block_properties_constants =
     "MONITOR_BLOCK_AFTER_FINISH_EVENT " +
     "MONITOR_BLOCK_BEFORE_START_EVENT " +
     "MONITOR_BLOCK_DEADLINE_PROPERTY " +
@@ -869,7 +869,7 @@ export default function(hljs) {
     "MONITOR_BLOCK_SEARCH_SCRIPT_PROPERTY ";
 
   // Notice block properties
-  var notice_block_properties_constants =
+  const notice_block_properties_constants =
     "NOTICE_BLOCK_AFTER_FINISH_EVENT " +
     "NOTICE_BLOCK_ATTACHMENT_PROPERTY " +
     "NOTICE_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY " +
@@ -885,7 +885,7 @@ export default function(hljs) {
     "NOTICE_BLOCK_SUBJECT_PROPERTY ";
 
   // Object events
-  var object_events_constants =
+  const object_events_constants =
     "dseAfterCancel " +
     "dseAfterClose " +
     "dseAfterDelete " +
@@ -917,13 +917,13 @@ export default function(hljs) {
     "SELECTION_END_ROUTE_EVENT ";
 
   // Object params
-  var object_params_constants =
+  const object_params_constants =
     "CURRENT_PERIOD_IS_REQUIRED " +
     "PREVIOUS_CARD_TYPE_NAME " +
     "SHOW_RECORD_PROPERTIES_FORM ";
 
   // Other
-  var other_constants =
+  const other_constants =
     "ACCESS_RIGHTS_SETTING_DIALOG_CODE " +
     "ADMINISTRATOR_USER_CODE " +
     "ANALYTIC_REPORT_TYPE " +
@@ -992,7 +992,7 @@ export default function(hljs) {
     "REPEAT_PROCESS_CURRENT_OBJECT_EXCEPTION_NAME ";
 
   // Privileges
-  var privileges_constants =
+  const privileges_constants =
     "PRIVILEGE_COMPONENT_FULL_ACCESS " +
     "PRIVILEGE_DEVELOPMENT_EXPORT " +
     "PRIVILEGE_DEVELOPMENT_IMPORT " +
@@ -1013,7 +1013,7 @@ export default function(hljs) {
     "PRIVILEGES_PSEUDOREFERENCE_CODE ";
 
   // Pseudoreference code
-  var pseudoreference_code_constants =
+  const pseudoreference_code_constants =
     "ACCESS_TYPES_PSEUDOREFERENCE_CODE " +
     "ALL_AVAILABLE_COMPONENTS_PSEUDOREFERENCE_CODE " +
     "ALL_AVAILABLE_PRIVILEGES_PSEUDOREFERENCE_CODE " +
@@ -1035,27 +1035,27 @@ export default function(hljs) {
     "VIEWERS_PSEUDOREFERENCE_CODE ";
 
   // Requisite ISBCertificateType values
-  var requisite_ISBCertificateType_values_constants =
+  const requisite_ISBCertificateType_values_constants =
     "CERTIFICATE_TYPE_ENCRYPT " +
     "CERTIFICATE_TYPE_SIGN " +
     "CERTIFICATE_TYPE_SIGN_AND_ENCRYPT ";
 
   // Requisite ISBEDocStorageType values
-  var requisite_ISBEDocStorageType_values_constants =
+  const requisite_ISBEDocStorageType_values_constants =
     "STORAGE_TYPE_FILE " +
     "STORAGE_TYPE_NAS_CIFS " +
     "STORAGE_TYPE_SAPERION " +
     "STORAGE_TYPE_SQL_SERVER ";
 
   // Requisite CompType2 values
-  var requisite_compType2_values_constants =
+  const requisite_compType2_values_constants =
     "COMPTYPE2_REQUISITE_DOCUMENTS_VALUE " +
     "COMPTYPE2_REQUISITE_TASKS_VALUE " +
     "COMPTYPE2_REQUISITE_FOLDERS_VALUE " +
     "COMPTYPE2_REQUISITE_REFERENCES_VALUE ";
 
   // Requisite name
-  var requisite_name_constants =
+  const requisite_name_constants =
     "SYSREQ_CODE " +
     "SYSREQ_COMPTYPE2 " +
     "SYSREQ_CONST_AVAILABLE_FOR_WEB " +
@@ -1268,10 +1268,10 @@ export default function(hljs) {
     "SYSREQ_WORK_RULES_FOLDER_ID ";
 
   // Result
-  var result_constants = "RESULT_VAR_NAME RESULT_VAR_NAME_ENG ";
+  const result_constants = "RESULT_VAR_NAME RESULT_VAR_NAME_ENG ";
 
   // Rule identification
-  var rule_identification_constants =
+  const rule_identification_constants =
     "AUTO_NUMERATION_RULE_ID " +
     "CANT_CHANGE_ID_REQUISITE_RULE_ID " +
     "CANT_CHANGE_OURFIRM_REQUISITE_RULE_ID " +
@@ -1293,7 +1293,7 @@ export default function(hljs) {
     "SET_OURFIRM_REQUISITE_RULE_ID ";
 
   // Script block properties
-  var script_block_properties_constants =
+  const script_block_properties_constants =
     "SCRIPT_BLOCK_AFTER_FINISH_EVENT " +
     "SCRIPT_BLOCK_BEFORE_START_EVENT " +
     "SCRIPT_BLOCK_EXECUTION_RESULTS_PROPERTY " +
@@ -1301,7 +1301,7 @@ export default function(hljs) {
     "SCRIPT_BLOCK_SCRIPT_PROPERTY ";
 
   // Subtask block properties
-  var subtask_block_properties_constants =
+  const subtask_block_properties_constants =
     "SUBTASK_BLOCK_ABORT_DEADLINE_PROPERTY " +
     "SUBTASK_BLOCK_AFTER_FINISH_EVENT " +
     "SUBTASK_BLOCK_ASSIGN_PARAMS_EVENT " +
@@ -1334,7 +1334,7 @@ export default function(hljs) {
     "SUBTASK_BLOCK_WAIT_FOR_TASK_COMPLETE_PROPERTY ";
 
   // System component
-  var system_component_constants =
+  const system_component_constants =
     "SYSCOMP_CONTROL_JOBS " +
     "SYSCOMP_FOLDERS " +
     "SYSCOMP_JOBS " +
@@ -1342,7 +1342,7 @@ export default function(hljs) {
     "SYSCOMP_TASKS ";
 
   // System dialogs
-  var system_dialogs_constants =
+  const system_dialogs_constants =
     "SYSDLG_CREATE_EDOCUMENT " +
     "SYSDLG_CREATE_EDOCUMENT_VERSION " +
     "SYSDLG_CURRENT_PERIOD " +
@@ -1363,7 +1363,7 @@ export default function(hljs) {
     "SYSDLG_SIGN_MULTIPLE_EDOCUMENTS ";
 
   // System reference names
-  var system_reference_names_constants =
+  const system_reference_names_constants =
     "SYSREF_ACCESS_RIGHTS_TYPES " +
     "SYSREF_ADMINISTRATION_HISTORY " +
     "SYSREF_ALL_AVAILABLE_COMPONENTS " +
@@ -1443,13 +1443,13 @@ export default function(hljs) {
     "SYSREF_WORKING_TIME_CALENDARS ";
 
   // Table name
-  var table_name_constants =
+  const table_name_constants =
     "ACCESS_RIGHTS_TABLE_NAME " +
     "EDMS_ACCESS_TABLE_NAME " +
     "EDOC_TYPES_TABLE_NAME ";
 
   // Test
-  var test_constants =
+  const test_constants =
     "TEST_DEV_DB_NAME " +
     "TEST_DEV_SYSTEM_CODE " +
     "TEST_EDMS_DB_NAME " +
@@ -1464,7 +1464,7 @@ export default function(hljs) {
     "TEST_SQL_SERVER_NAME ";
 
   // Using the dialog windows
-  var using_the_dialog_windows_constants =
+  const using_the_dialog_windows_constants =
     "ATTENTION_CAPTION " +
     "cbsCommandLinks " +
     "cbsDefault " +
@@ -1475,13 +1475,13 @@ export default function(hljs) {
     "mrOk ";
 
   // Using the document
-  var using_the_document_constants =
+  const using_the_document_constants =
     "EDOC_VERSION_ACTIVE_STAGE_CODE " +
     "EDOC_VERSION_DESIGN_STAGE_CODE " +
     "EDOC_VERSION_OBSOLETE_STAGE_CODE ";
 
   // Using the EA and encryption
-  var using_the_EA_and_encryption_constants =
+  const using_the_EA_and_encryption_constants =
     "cpDataEnciphermentEnabled " +
     "cpDigitalSignatureEnabled " +
     "cpID " +
@@ -1494,11 +1494,11 @@ export default function(hljs) {
     "cpValidToDate ";
 
   // Using the ISBL-editor
-  var using_the_ISBL_editor_constants =
+  const using_the_ISBL_editor_constants =
     "ISBL_SYNTAX " + "NO_SYNTAX " + "XML_SYNTAX ";
 
   // Wait block properties
-  var wait_block_properties_constants =
+  const wait_block_properties_constants =
     "WAIT_BLOCK_AFTER_FINISH_EVENT " +
     "WAIT_BLOCK_BEFORE_START_EVENT " +
     "WAIT_BLOCK_DEADLINE_PROPERTY " +
@@ -1507,7 +1507,7 @@ export default function(hljs) {
     "WAIT_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY ";
 
   // SYSRES Common
-  var sysres_common_constants =
+  const sysres_common_constants =
     "SYSRES_COMMON " +
     "SYSRES_CONST " +
     "SYSRES_MBFUNC " +
@@ -1519,7 +1519,7 @@ export default function(hljs) {
     "SYSRES_SYSCOMP ";
 
   // Константы ==> built_in
-  var CONSTANTS =
+  const CONSTANTS =
     sysres_constants +
     base_constants +
     base_group_name_constants +
@@ -1558,10 +1558,10 @@ export default function(hljs) {
     sysres_common_constants;
 
   // enum TAccountType
-  var TAccountType = "atUser atGroup atRole ";
+  const TAccountType = "atUser atGroup atRole ";
 
   // enum TActionEnabledMode
-  var TActionEnabledMode =
+  const TActionEnabledMode =
     "aemEnabledAlways " +
     "aemDisabledAlways " +
     "aemEnabledOnBrowse " +
@@ -1569,13 +1569,13 @@ export default function(hljs) {
     "aemDisabledOnBrowseEmpty ";
 
   // enum TAddPosition
-  var TAddPosition = "apBegin apEnd ";
+  const TAddPosition = "apBegin apEnd ";
 
   // enum TAlignment
-  var TAlignment = "alLeft alRight ";
+  const TAlignment = "alLeft alRight ";
 
   // enum TAreaShowMode
-  var TAreaShowMode =
+  const TAreaShowMode =
     "asmNever " +
     "asmNoButCustomize " +
     "asmAsLastTime " +
@@ -1583,19 +1583,19 @@ export default function(hljs) {
     "asmAlways ";
 
   // enum TCertificateInvalidationReason
-  var TCertificateInvalidationReason = "cirCommon cirRevoked ";
+  const TCertificateInvalidationReason = "cirCommon cirRevoked ";
 
   // enum TCertificateType
-  var TCertificateType = "ctSignature ctEncode ctSignatureEncode ";
+  const TCertificateType = "ctSignature ctEncode ctSignatureEncode ";
 
   // enum TCheckListBoxItemState
-  var TCheckListBoxItemState = "clbUnchecked clbChecked clbGrayed ";
+  const TCheckListBoxItemState = "clbUnchecked clbChecked clbGrayed ";
 
   // enum TCloseOnEsc
-  var TCloseOnEsc = "ceISB ceAlways ceNever ";
+  const TCloseOnEsc = "ceISB ceAlways ceNever ";
 
   // enum TCompType
-  var TCompType =
+  const TCompType =
     "ctDocument " +
     "ctReference " +
     "ctScript " +
@@ -1611,13 +1611,13 @@ export default function(hljs) {
     "ctControlJob ";
 
   // enum TConditionFormat
-  var TConditionFormat = "cfInternal cfDisplay ";
+  const TConditionFormat = "cfInternal cfDisplay ";
 
   // enum TConnectionIntent
-  var TConnectionIntent = "ciUnspecified ciWrite ciRead ";
+  const TConnectionIntent = "ciUnspecified ciWrite ciRead ";
 
   // enum TContentKind
-  var TContentKind =
+  const TContentKind =
     "ckFolder " +
     "ckEDocument " +
     "ckTask " +
@@ -1630,7 +1630,7 @@ export default function(hljs) {
     "ckDialog ";
 
   // enum TControlType
-  var TControlType =
+  const TControlType =
     "ctISBLEditor " +
     "ctBevel " +
     "ctButton " +
@@ -1667,7 +1667,7 @@ export default function(hljs) {
     "ctBitButton ";
 
   // enum TCriterionContentType
-  var TCriterionContentType =
+  const TCriterionContentType =
     "cctDate " +
     "cctInteger " +
     "cctNumeric " +
@@ -1677,10 +1677,10 @@ export default function(hljs) {
     "cctText ";
 
   // enum TCultureType
-  var TCultureType = "cltInternal cltPrimary cltGUI ";
+  const TCultureType = "cltInternal cltPrimary cltGUI ";
 
   // enum TDataSetEventType
-  var TDataSetEventType =
+  const TDataSetEventType =
     "dseBeforeOpen " +
     "dseAfterOpen " +
     "dseBeforeClose " +
@@ -1709,25 +1709,25 @@ export default function(hljs) {
     "dseOnAnyRequisiteChange ";
 
   // enum TDataSetState
-  var TDataSetState = "dssEdit dssInsert dssBrowse dssInActive ";
+  const TDataSetState = "dssEdit dssInsert dssBrowse dssInActive ";
 
   // enum TDateFormatType
-  var TDateFormatType = "dftDate dftShortDate dftDateTime dftTimeStamp ";
+  const TDateFormatType = "dftDate dftShortDate dftDateTime dftTimeStamp ";
 
   // enum TDateOffsetType
-  var TDateOffsetType = "dotDays dotHours dotMinutes dotSeconds ";
+  const TDateOffsetType = "dotDays dotHours dotMinutes dotSeconds ";
 
   // enum TDateTimeKind
-  var TDateTimeKind = "dtkndLocal dtkndUTC ";
+  const TDateTimeKind = "dtkndLocal dtkndUTC ";
 
   // enum TDeaAccessRights
-  var TDeaAccessRights = "arNone arView arEdit arFull ";
+  const TDeaAccessRights = "arNone arView arEdit arFull ";
 
   // enum TDocumentDefaultAction
-  var TDocumentDefaultAction = "ddaView ddaEdit ";
+  const TDocumentDefaultAction = "ddaView ddaEdit ";
 
   // enum TEditMode
-  var TEditMode =
+  const TEditMode =
     "emLock " +
     "emEdit " +
     "emSign " +
@@ -1776,47 +1776,47 @@ export default function(hljs) {
     "emReEncode ";
 
   // enum TEditorCloseObservType
-  var TEditorCloseObservType = "ecotFile ecotProcess ";
+  const TEditorCloseObservType = "ecotFile ecotProcess ";
 
   // enum TEdmsApplicationAction
-  var TEdmsApplicationAction = "eaGet eaCopy eaCreate eaCreateStandardRoute ";
+  const TEdmsApplicationAction = "eaGet eaCopy eaCreate eaCreateStandardRoute ";
 
   // enum TEDocumentLockType
-  var TEDocumentLockType = "edltAll edltNothing edltQuery ";
+  const TEDocumentLockType = "edltAll edltNothing edltQuery ";
 
   // enum TEDocumentStepShowMode
-  var TEDocumentStepShowMode = "essmText essmCard ";
+  const TEDocumentStepShowMode = "essmText essmCard ";
 
   // enum TEDocumentStepVersionType
-  var TEDocumentStepVersionType = "esvtLast esvtLastActive esvtSpecified ";
+  const TEDocumentStepVersionType = "esvtLast esvtLastActive esvtSpecified ";
 
   // enum TEDocumentStorageFunction
-  var TEDocumentStorageFunction = "edsfExecutive edsfArchive ";
+  const TEDocumentStorageFunction = "edsfExecutive edsfArchive ";
 
   // enum TEDocumentStorageType
-  var TEDocumentStorageType = "edstSQLServer edstFile ";
+  const TEDocumentStorageType = "edstSQLServer edstFile ";
 
   // enum TEDocumentVersionSourceType
-  var TEDocumentVersionSourceType =
+  const TEDocumentVersionSourceType =
     "edvstNone edvstEDocumentVersionCopy edvstFile edvstTemplate edvstScannedFile ";
 
   // enum TEDocumentVersionState
-  var TEDocumentVersionState = "vsDefault vsDesign vsActive vsObsolete ";
+  const TEDocumentVersionState = "vsDefault vsDesign vsActive vsObsolete ";
 
   // enum TEncodeType
-  var TEncodeType = "etNone etCertificate etPassword etCertificatePassword ";
+  const TEncodeType = "etNone etCertificate etPassword etCertificatePassword ";
 
   // enum TExceptionCategory
-  var TExceptionCategory = "ecException ecWarning ecInformation ";
+  const TExceptionCategory = "ecException ecWarning ecInformation ";
 
   // enum TExportedSignaturesType
-  var TExportedSignaturesType = "estAll estApprovingOnly ";
+  const TExportedSignaturesType = "estAll estApprovingOnly ";
 
   // enum TExportedVersionType
-  var TExportedVersionType = "evtLast evtLastActive evtQuery ";
+  const TExportedVersionType = "evtLast evtLastActive evtQuery ";
 
   // enum TFieldDataType
-  var TFieldDataType =
+  const TFieldDataType =
     "fdtString " +
     "fdtNumeric " +
     "fdtInteger " +
@@ -1827,7 +1827,7 @@ export default function(hljs) {
     "fdtLargeInteger ";
 
   // enum TFolderType
-  var TFolderType =
+  const TFolderType =
     "ftInbox " +
     "ftOutbox " +
     "ftFavorites " +
@@ -1839,13 +1839,13 @@ export default function(hljs) {
     "ftSearch ";
 
   // enum TGridRowHeight
-  var TGridRowHeight = "grhAuto " + "grhX1 " + "grhX2 " + "grhX3 ";
+  const TGridRowHeight = "grhAuto " + "grhX1 " + "grhX2 " + "grhX3 ";
 
   // enum THyperlinkType
-  var THyperlinkType = "hltText " + "hltRTF " + "hltHTML ";
+  const THyperlinkType = "hltText " + "hltRTF " + "hltHTML ";
 
   // enum TImageFileFormat
-  var TImageFileFormat =
+  const TImageFileFormat =
     "iffBMP " +
     "iffJPEG " +
     "iffMultiPageTIFF " +
@@ -1854,17 +1854,17 @@ export default function(hljs) {
     "iffPNG ";
 
   // enum TImageMode
-  var TImageMode = "im8bGrayscale " + "im24bRGB " + "im1bMonochrome ";
+  const TImageMode = "im8bGrayscale " + "im24bRGB " + "im1bMonochrome ";
 
   // enum TImageType
-  var TImageType = "itBMP " + "itJPEG " + "itWMF " + "itPNG ";
+  const TImageType = "itBMP " + "itJPEG " + "itWMF " + "itPNG ";
 
   // enum TInplaceHintKind
-  var TInplaceHintKind =
+  const TInplaceHintKind =
     "ikhInformation " + "ikhWarning " + "ikhError " + "ikhNoIcon ";
 
   // enum TISBLContext
-  var TISBLContext =
+  const TISBLContext =
     "icUnknown " +
     "icScript " +
     "icFunction " +
@@ -1917,22 +1917,22 @@ export default function(hljs) {
     "icProcessMessageHandler ";
 
   // enum TItemShow
-  var TItemShow = "isShow " + "isHide " + "isByUserSettings ";
+  const TItemShow = "isShow " + "isHide " + "isByUserSettings ";
 
   // enum TJobKind
-  var TJobKind = "jkJob " + "jkNotice " + "jkControlJob ";
+  const TJobKind = "jkJob " + "jkNotice " + "jkControlJob ";
 
   // enum TJoinType
-  var TJoinType = "jtInner " + "jtLeft " + "jtRight " + "jtFull " + "jtCross ";
+  const TJoinType = "jtInner " + "jtLeft " + "jtRight " + "jtFull " + "jtCross ";
 
   // enum TLabelPos
-  var TLabelPos = "lbpAbove " + "lbpBelow " + "lbpLeft " + "lbpRight ";
+  const TLabelPos = "lbpAbove " + "lbpBelow " + "lbpLeft " + "lbpRight ";
 
   // enum TLicensingType
-  var TLicensingType = "eltPerConnection " + "eltPerUser ";
+  const TLicensingType = "eltPerConnection " + "eltPerUser ";
 
   // enum TLifeCycleStageFontColor
-  var TLifeCycleStageFontColor =
+  const TLifeCycleStageFontColor =
     "sfcUndefined " +
     "sfcBlack " +
     "sfcGreen " +
@@ -1942,10 +1942,10 @@ export default function(hljs) {
     "sfcLilac ";
 
   // enum TLifeCycleStageFontStyle
-  var TLifeCycleStageFontStyle = "sfsItalic " + "sfsStrikeout " + "sfsNormal ";
+  const TLifeCycleStageFontStyle = "sfsItalic " + "sfsStrikeout " + "sfsNormal ";
 
   // enum TLockableDevelopmentComponentType
-  var TLockableDevelopmentComponentType =
+  const TLockableDevelopmentComponentType =
     "ldctStandardRoute " +
     "ldctWizard " +
     "ldctScript " +
@@ -1959,15 +1959,15 @@ export default function(hljs) {
     "ldctServerEvents ";
 
   // enum TMaxRecordCountRestrictionType
-  var TMaxRecordCountRestrictionType =
+  const TMaxRecordCountRestrictionType =
     "mrcrtNone " + "mrcrtUser " + "mrcrtMaximal " + "mrcrtCustom ";
 
   // enum TRangeValueType
-  var TRangeValueType =
+  const TRangeValueType =
     "vtEqual " + "vtGreaterOrEqual " + "vtLessOrEqual " + "vtRange ";
 
   // enum TRelativeDate
-  var TRelativeDate =
+  const TRelativeDate =
     "rdYesterday " +
     "rdToday " +
     "rdTomorrow " +
@@ -1980,10 +1980,10 @@ export default function(hljs) {
     "rdLastMonth ";
 
   // enum TReportDestination
-  var TReportDestination = "rdWindow " + "rdFile " + "rdPrinter ";
+  const TReportDestination = "rdWindow " + "rdFile " + "rdPrinter ";
 
   // enum TReqDataType
-  var TReqDataType =
+  const TReqDataType =
     "rdtString " +
     "rdtNumeric " +
     "rdtInteger " +
@@ -1997,32 +1997,32 @@ export default function(hljs) {
     "rdtDocument ";
 
   // enum TRequisiteEventType
-  var TRequisiteEventType = "reOnChange " + "reOnChangeValues ";
+  const TRequisiteEventType = "reOnChange " + "reOnChangeValues ";
 
   // enum TSBTimeType
-  var TSBTimeType = "ttGlobal " + "ttLocal " + "ttUser " + "ttSystem ";
+  const TSBTimeType = "ttGlobal " + "ttLocal " + "ttUser " + "ttSystem ";
 
   // enum TSearchShowMode
-  var TSearchShowMode =
+  const TSearchShowMode =
     "ssmBrowse " + "ssmSelect " + "ssmMultiSelect " + "ssmBrowseModal ";
 
   // enum TSelectMode
-  var TSelectMode = "smSelect " + "smLike " + "smCard ";
+  const TSelectMode = "smSelect " + "smLike " + "smCard ";
 
   // enum TSignatureType
-  var TSignatureType = "stNone " + "stAuthenticating " + "stApproving ";
+  const TSignatureType = "stNone " + "stAuthenticating " + "stApproving ";
 
   // enum TSignerContentType
-  var TSignerContentType = "sctString " + "sctStream ";
+  const TSignerContentType = "sctString " + "sctStream ";
 
   // enum TStringsSortType
-  var TStringsSortType = "sstAnsiSort " + "sstNaturalSort ";
+  const TStringsSortType = "sstAnsiSort " + "sstNaturalSort ";
 
   // enum TStringValueType
-  var TStringValueType = "svtEqual " + "svtContain ";
+  const TStringValueType = "svtEqual " + "svtContain ";
 
   // enum TStructuredObjectAttributeType
-  var TStructuredObjectAttributeType =
+  const TStructuredObjectAttributeType =
     "soatString " +
     "soatNumeric " +
     "soatInteger " +
@@ -2046,13 +2046,13 @@ export default function(hljs) {
     "soatUnknown ";
 
   // enum TTaskAbortReason
-  var TTaskAbortReason = "tarAbortByUser " + "tarAbortByWorkflowException ";
+  const TTaskAbortReason = "tarAbortByUser " + "tarAbortByWorkflowException ";
 
   // enum TTextValueType
-  var TTextValueType = "tvtAllWords " + "tvtExactPhrase " + "tvtAnyWord ";
+  const TTextValueType = "tvtAllWords " + "tvtExactPhrase " + "tvtAnyWord ";
 
   // enum TUserObjectStatus
-  var TUserObjectStatus =
+  const TUserObjectStatus =
     "usNone " +
     "usCompleted " +
     "usRedSquare " +
@@ -2064,7 +2064,7 @@ export default function(hljs) {
     "usFollowUp ";
 
   // enum TUserType
-  var TUserType =
+  const TUserType =
     "utUnknown " +
     "utUser " +
     "utDeveloper " +
@@ -2073,22 +2073,22 @@ export default function(hljs) {
     "utDisconnected ";
 
   // enum TValuesBuildType
-  var TValuesBuildType =
+  const TValuesBuildType =
     "btAnd " + "btDetailAnd " + "btOr " + "btNotOr " + "btOnly ";
 
   // enum TViewMode
-  var TViewMode = "vmView " + "vmSelect " + "vmNavigation ";
+  const TViewMode = "vmView " + "vmSelect " + "vmNavigation ";
 
   // enum TViewSelectionMode
-  var TViewSelectionMode =
+  const TViewSelectionMode =
     "vsmSingle " + "vsmMultiple " + "vsmMultipleCheck " + "vsmNoSelection ";
 
   // enum TWizardActionType
-  var TWizardActionType =
+  const TWizardActionType =
     "wfatPrevious " + "wfatNext " + "wfatCancel " + "wfatFinish ";
 
   // enum TWizardFormElementProperty
-  var TWizardFormElementProperty =
+  const TWizardFormElementProperty =
     "wfepUndefined " +
     "wfepText3 " +
     "wfepText6 " +
@@ -2109,11 +2109,11 @@ export default function(hljs) {
     "wfepRadioGroupColumn3 ";
 
   // enum TWizardFormElementType
-  var TWizardFormElementType =
+  const TWizardFormElementType =
     "wfetQueryParameter " + "wfetText " + "wfetDelimiter " + "wfetLabel ";
 
   // enum TWizardParamType
-  var TWizardParamType =
+  const TWizardParamType =
     "wptString " +
     "wptInteger " +
     "wptNumeric " +
@@ -2134,7 +2134,7 @@ export default function(hljs) {
     "wptDate ";
 
   // enum TWizardStepResult
-  var TWizardStepResult =
+  const TWizardStepResult =
     "wsrComplete " +
     "wsrGoNext " +
     "wsrGoPrevious " +
@@ -2143,7 +2143,7 @@ export default function(hljs) {
     "wsrGoFinal ";
 
   // enum TWizardStepType
-  var TWizardStepType =
+  const TWizardStepType =
     "wstForm " +
     "wstEDocument " +
     "wstTaskCard " +
@@ -2151,10 +2151,10 @@ export default function(hljs) {
     "wstFinal ";
 
   // enum TWorkAccessType
-  var TWorkAccessType = "waAll " + "waPerformers " + "waManual ";
+  const TWorkAccessType = "waAll " + "waPerformers " + "waManual ";
 
   // enum TWorkflowBlockType
-  var TWorkflowBlockType =
+  const TWorkflowBlockType =
     "wsbStart " +
     "wsbFinish " +
     "wsbNotice " +
@@ -2169,7 +2169,7 @@ export default function(hljs) {
     "wsbPause ";
 
   // enum TWorkflowDataType
-  var TWorkflowDataType =
+  const TWorkflowDataType =
     "wdtInteger " +
     "wdtFloat " +
     "wdtString " +
@@ -2206,13 +2206,13 @@ export default function(hljs) {
     "wdtAccountCollection ";
 
   // enum TWorkImportance
-  var TWorkImportance = "wiLow " + "wiNormal " + "wiHigh ";
+  const TWorkImportance = "wiLow " + "wiNormal " + "wiHigh ";
 
   // enum TWorkRouteType
-  var TWorkRouteType = "wrtSoft " + "wrtHard ";
+  const TWorkRouteType = "wrtSoft " + "wrtHard ";
 
   // enum TWorkState
-  var TWorkState =
+  const TWorkState =
     "wsInit " +
     "wsRunning " +
     "wsDone " +
@@ -2221,11 +2221,11 @@ export default function(hljs) {
     "wsContinued ";
 
   // enum TWorkTextBuildingMode
-  var TWorkTextBuildingMode =
+  const TWorkTextBuildingMode =
     "wtmFull " + "wtmFromCurrent " + "wtmOnlyCurrent ";
 
   // Перечисления
-  var ENUMS =
+  const ENUMS =
     TAccountType +
     TActionEnabledMode +
     TAddPosition +
@@ -2316,7 +2316,7 @@ export default function(hljs) {
     TWorkTextBuildingMode;
 
   // Системные функции ==> SYSFUNCTIONS
-  var system_functions =
+  const system_functions =
     "AddSubString " +
     "AdjustLineBreaks " +
     "AmountInWords " +
@@ -2751,7 +2751,7 @@ export default function(hljs) {
     "ЦПодстр ";
 
   // Предопределенные переменные ==> built_in
-  var predefined_variables =
+  const predefined_variables =
     "AltState " +
     "Application " +
     "CallType " +
@@ -2799,7 +2799,7 @@ export default function(hljs) {
     "РеквЗнач ";
 
   // Интерфейсы ==> type
-  var interfaces =
+  const interfaces =
     "IApplication " +
     "IAccessRights " +
     "IAccountRepository " +
@@ -3049,114 +3049,142 @@ export default function(hljs) {
     "SBCrypto ";
 
   // built_in : встроенные или библиотечные объекты (константы, перечисления)
-  var BUILTIN = CONSTANTS + ENUMS;
+  const BUILTIN = CONSTANTS + ENUMS;
 
   // class: встроенные наборы значений, системные объекты, фабрики
-  var CLASS = predefined_variables;
+  const CLASS = predefined_variables;
 
   // literal : примитивные типы
-  var LITERAL = "null true false nil ";
+  const LITERAL = "null true false nil ";
 
   // number : числа
-  var NUMBERS = {
+  const NUMBERS = {
     className: "number",
     begin: hljs.NUMBER_RE,
-    relevance: 0,
+    relevance: 0
   };
 
   // string : строки
-  var STRINGS = {
+  const STRINGS = {
     className: "string",
-    variants: [{ begin: '"', end: '"' }, { begin: "'", end: "'" }],
+    variants: [
+      {
+        begin: '"',
+        end: '"'
+      },
+      {
+        begin: "'",
+        end: "'"
+      }
+    ]
   };
 
   // Токены
-  var DOCTAGS = {
+  const DOCTAGS = {
     className: "doctag",
     begin: "\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",
-    relevance: 0,
+    relevance: 0
   };
 
   // Однострочный комментарий
-  var ISBL_LINE_COMMENT_MODE = {
+  const ISBL_LINE_COMMENT_MODE = {
     className: "comment",
     begin: "//",
     end: "$",
     relevance: 0,
-    contains: [hljs.PHRASAL_WORDS_MODE, DOCTAGS],
+    contains: [
+      hljs.PHRASAL_WORDS_MODE,
+      DOCTAGS
+    ]
   };
 
   // Многострочный комментарий
-  var ISBL_BLOCK_COMMENT_MODE = {
+  const ISBL_BLOCK_COMMENT_MODE = {
     className: "comment",
     begin: "/\\*",
     end: "\\*/",
     relevance: 0,
-    contains: [hljs.PHRASAL_WORDS_MODE, DOCTAGS],
+    contains: [
+      hljs.PHRASAL_WORDS_MODE,
+      DOCTAGS
+    ]
   };
 
   // comment : комментарии
-  var COMMENTS = {
-    variants: [ISBL_LINE_COMMENT_MODE, ISBL_BLOCK_COMMENT_MODE],
+  const COMMENTS = {
+    variants: [
+      ISBL_LINE_COMMENT_MODE,
+      ISBL_BLOCK_COMMENT_MODE
+    ]
   };
 
   // keywords : ключевые слова
-  var KEYWORDS = {
+  const KEYWORDS = {
     $pattern: UNDERSCORE_IDENT_RE,
     keyword: KEYWORD,
     built_in: BUILTIN,
     class: CLASS,
-    literal: LITERAL,
+    literal: LITERAL
   };
 
   // methods : методы
-  var METHODS = {
+  const METHODS = {
     begin: "\\.\\s*" + hljs.UNDERSCORE_IDENT_RE,
     keywords: KEYWORDS,
-    relevance: 0,
+    relevance: 0
   };
 
   // type : встроенные типы
-  var TYPES = {
+  const TYPES = {
     className: "type",
     begin: ":[ \\t]*(" + interfaces.trim().replace(/\s/g, "|") + ")",
     end: "[ \\t]*=",
-    excludeEnd: true,
+    excludeEnd: true
   };
 
   // variables : переменные
-  var VARIABLES = {
+  const VARIABLES = {
     className: "variable",
     keywords: KEYWORDS,
     begin: UNDERSCORE_IDENT_RE,
     relevance: 0,
-    contains: [TYPES, METHODS],
+    contains: [
+      TYPES,
+      METHODS
+    ]
   };
 
   // Имена функций
-  var FUNCTION_TITLE = FUNCTION_NAME_IDENT_RE + "\\(";
+  const FUNCTION_TITLE = FUNCTION_NAME_IDENT_RE + "\\(";
 
-  var TITLE_MODE = {
+  const TITLE_MODE = {
     className: "title",
     keywords: {
       $pattern: UNDERSCORE_IDENT_RE,
-      built_in: system_functions,
+      built_in: system_functions
     },
     begin: FUNCTION_TITLE,
     end: "\\(",
     returnBegin: true,
-    excludeEnd: true,
+    excludeEnd: true
   };
 
   // function : функции
-  var FUNCTIONS = {
+  const FUNCTIONS = {
     className: "function",
     begin: FUNCTION_TITLE,
     end: "\\)$",
     returnBegin: true,
     keywords: KEYWORDS,
     illegal: "[\\[\\]\\|\\$\\?%,~#@]",
-    contains: [TITLE_MODE, METHODS, VARIABLES, STRINGS, NUMBERS, COMMENTS],
+    contains: [
+      TITLE_MODE,
+      METHODS,
+      VARIABLES,
+      STRINGS,
+      NUMBERS,
+      COMMENTS
+    ]
   };
 
   return {
@@ -3172,7 +3200,7 @@ export default function(hljs) {
       VARIABLES,
       STRINGS,
       NUMBERS,
-      COMMENTS,
-    ],
+      COMMENTS
+    ]
   };
 }
diff --git a/src/languages/jboss-cli.js b/src/languages/jboss-cli.js
index 6def5bbb3a..488740cd3b 100644
--- a/src/languages/jboss-cli.js
+++ b/src/languages/jboss-cli.js
@@ -6,31 +6,37 @@
  Category: config
  */
 
-export default function (hljs) {
-  var PARAM = {
-    begin: /[\w-]+ *=/, returnBegin: true,
+export default function(hljs) {
+  const PARAM = {
+    begin: /[\w-]+ *=/,
+    returnBegin: true,
     relevance: 0,
-    contains: [{className: 'attr', begin: /[\w-]+/}]
+    contains: [
+      {
+        className: 'attr',
+        begin: /[\w-]+/
+      }
+    ]
   };
-  var PARAMSBLOCK = {
+  const PARAMSBLOCK = {
     className: 'params',
     begin: /\(/,
     end: /\)/,
     contains: [PARAM],
-    relevance : 0
+    relevance: 0
   };
-  var OPERATION = {
+  const OPERATION = {
     className: 'function',
     begin: /:[\w\-.]+/,
     relevance: 0
   };
-  var PATH = {
+  const PATH = {
     className: 'string',
-    begin: /\B(([\/.])[\w\-.\/=]+)+/,
+    begin: /\B(([\/.])[\w\-.\/=]+)+/
   };
-  var COMMAND_PARAMS = {
+  const COMMAND_PARAMS = {
     className: 'params',
-    begin: /--[\w\-=\/]+/,
+    begin: /--[\w\-=\/]+/
   };
   return {
     name: 'JBoss CLI',
@@ -51,5 +57,5 @@ export default function (hljs) {
       PATH,
       PARAMSBLOCK
     ]
-  }
+  };
 }
diff --git a/src/languages/json.js b/src/languages/json.js
index f8779a4221..f52656bf56 100644
--- a/src/languages/json.js
+++ b/src/languages/json.js
@@ -7,42 +7,51 @@ Category: common, protocols
 */
 
 export default function(hljs) {
-  var LITERALS = {literal: 'true false null'};
-  var ALLOWED_COMMENTS = [
+  const LITERALS = {
+    literal: 'true false null'
+  };
+  const ALLOWED_COMMENTS = [
     hljs.C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE
-  ]
-  var TYPES = [
+  ];
+  const TYPES = [
     hljs.QUOTE_STRING_MODE,
     hljs.C_NUMBER_MODE
   ];
-  var VALUE_CONTAINER = {
-    end: ',', endsWithParent: true, excludeEnd: true,
+  const VALUE_CONTAINER = {
+    end: ',',
+    endsWithParent: true,
+    excludeEnd: true,
     contains: TYPES,
     keywords: LITERALS
   };
-  var OBJECT = {
-    begin: /\{/, end: /\}/,
+  const OBJECT = {
+    begin: /\{/,
+    end: /\}/,
     contains: [
       {
         className: 'attr',
-        begin: /"/, end: /"/,
+        begin: /"/,
+        end: /"/,
         contains: [hljs.BACKSLASH_ESCAPE],
-        illegal: '\\n',
+        illegal: '\\n'
       },
-      hljs.inherit(VALUE_CONTAINER, {begin: /:/})
+      hljs.inherit(VALUE_CONTAINER, {
+        begin: /:/
+      })
     ].concat(ALLOWED_COMMENTS),
     illegal: '\\S'
   };
-  var ARRAY = {
-    begin: '\\[', end: '\\]',
+  const ARRAY = {
+    begin: '\\[',
+    end: '\\]',
     contains: [hljs.inherit(VALUE_CONTAINER)], // inherit is a workaround for a bug that makes shared modes with endsWithParent compile only the ending of one of the parents
     illegal: '\\S'
   };
   TYPES.push(OBJECT, ARRAY);
   ALLOWED_COMMENTS.forEach(function(rule) {
-    TYPES.push(rule)
-  })
+    TYPES.push(rule);
+  });
   return {
     name: 'JSON',
     contains: TYPES,
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index 6de5532d04..78eabf6eed 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -6,9 +6,8 @@
  Category: common
  */
 
-
 export default function(hljs) {
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword:
       'abstract as val var vararg get set class object open private protected public noinline ' +
       'crossinline dynamic final enum if else do while for when throw try catch finally ' +
@@ -20,7 +19,7 @@ export default function(hljs) {
     literal:
       'true false null'
   };
-  var KEYWORDS_WITH_LABEL = {
+  const KEYWORDS_WITH_LABEL = {
     className: 'keyword',
     begin: /\b(break|continue|return|this)\b/,
     starts: {
@@ -32,52 +31,71 @@ export default function(hljs) {
       ]
     }
   };
-  var LABEL = {
-    className: 'symbol', begin: hljs.UNDERSCORE_IDENT_RE + '@'
+  const LABEL = {
+    className: 'symbol',
+    begin: hljs.UNDERSCORE_IDENT_RE + '@'
   };
 
   // for string templates
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
-    begin: /\$\{/, end: /\}/, contains: [hljs.C_NUMBER_MODE]
+    begin: /\$\{/,
+    end: /\}/,
+    contains: [ hljs.C_NUMBER_MODE ]
   };
-  var VARIABLE = {
-    className: 'variable', begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
+  const VARIABLE = {
+    className: 'variable',
+    begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
   };
-  var STRING = {
+  const STRING = {
     className: 'string',
     variants: [
       {
-        begin: '"""', end: '"""(?=[^"])',
-        contains: [VARIABLE, SUBST]
+        begin: '"""',
+        end: '"""(?=[^"])',
+        contains: [
+          VARIABLE,
+          SUBST
+        ]
       },
       // Can't use built-in modes easily, as we want to use STRING in the meta
       // context as 'meta-string' and there's no syntax to remove explicitly set
       // classNames in built-in modes.
       {
-        begin: '\'', end: '\'',
+        begin: '\'',
+        end: '\'',
         illegal: /\n/,
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
-        begin: '"', end: '"',
+        begin: '"',
+        end: '"',
         illegal: /\n/,
-        contains: [hljs.BACKSLASH_ESCAPE, VARIABLE, SUBST]
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          VARIABLE,
+          SUBST
+        ]
       }
     ]
   };
   SUBST.contains.push(STRING);
 
-  var ANNOTATION_USE_SITE = {
-    className: 'meta', begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
+  const ANNOTATION_USE_SITE = {
+    className: 'meta',
+    begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
   };
-  var ANNOTATION = {
-    className: 'meta', begin: '@' + hljs.UNDERSCORE_IDENT_RE,
+  const ANNOTATION = {
+    className: 'meta',
+    begin: '@' + hljs.UNDERSCORE_IDENT_RE,
     contains: [
       {
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         contains: [
-          hljs.inherit(STRING, {className: 'meta-string'})
+          hljs.inherit(STRING, {
+            className: 'meta-string'
+          })
         ]
       }
     ]
@@ -86,7 +104,7 @@ export default function(hljs) {
   // https://kotlinlang.org/docs/reference/whatsnew11.html#underscores-in-numeric-literals
   // According to the doc above, the number mode of kotlin is the same as java 8,
   // so the code below is copied from java.js
-  var KOTLIN_NUMBER_RE = '\\b' +
+  const KOTLIN_NUMBER_RE = '\\b' +
     '(' +
       '0[bB]([01]+[01_]+[01]+|[01]+)' + // 0b...
       '|' +
@@ -100,43 +118,50 @@ export default function(hljs) {
       '([eE][-+]?\\d+)?' + // octal, decimal, float
     ')' +
     '[lLfF]?';
-  var KOTLIN_NUMBER_MODE = {
+  const KOTLIN_NUMBER_MODE = {
     className: 'number',
     begin: KOTLIN_NUMBER_RE,
     relevance: 0
   };
-  var KOTLIN_NESTED_COMMENT = hljs.COMMENT(
+  const KOTLIN_NESTED_COMMENT = hljs.COMMENT(
     '/\\*', '\\*/',
-    { contains: [ hljs.C_BLOCK_COMMENT_MODE ] }
+    {
+      contains: [ hljs.C_BLOCK_COMMENT_MODE ]
+    }
   );
-  var KOTLIN_PAREN_TYPE = {
+  const KOTLIN_PAREN_TYPE = {
     variants: [
-	  { className: 'type',
-	    begin: hljs.UNDERSCORE_IDENT_RE
-	  },
-	  { begin: /\(/, end: /\)/,
-	    contains: [] //defined later
-	  }
-	]
+      {
+        className: 'type',
+        begin: hljs.UNDERSCORE_IDENT_RE
+      },
+      {
+        begin: /\(/,
+        end: /\)/,
+        contains: [] // defined later
+      }
+    ]
   };
-  var KOTLIN_PAREN_TYPE2 = KOTLIN_PAREN_TYPE;
+  const KOTLIN_PAREN_TYPE2 = KOTLIN_PAREN_TYPE;
   KOTLIN_PAREN_TYPE2.variants[1].contains = [ KOTLIN_PAREN_TYPE ];
   KOTLIN_PAREN_TYPE.variants[1].contains = [ KOTLIN_PAREN_TYPE2 ];
 
   return {
     name: 'Kotlin',
-    aliases: ['kt'],
+    aliases: [ 'kt' ],
     keywords: KEYWORDS,
-    contains : [
+    contains: [
       hljs.COMMENT(
         '/\\*\\*',
         '\\*/',
         {
-          relevance : 0,
-          contains : [{
-            className : 'doctag',
-            begin : '@[A-Za-z]+'
-          }]
+          relevance: 0,
+          contains: [
+            {
+              className: 'doctag',
+              begin: '@[A-Za-z]+'
+            }
+          ]
         }
       ),
       hljs.C_LINE_COMMENT_MODE,
@@ -147,7 +172,8 @@ export default function(hljs) {
       ANNOTATION,
       {
         className: 'function',
-        beginKeywords: 'fun', end: '[(]|$',
+        beginKeywords: 'fun',
+        end: '[(]|$',
         returnBegin: true,
         excludeEnd: true,
         keywords: KEYWORDS,
@@ -155,24 +181,30 @@ export default function(hljs) {
         relevance: 5,
         contains: [
           {
-            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(', returnBegin: true,
+            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+            returnBegin: true,
             relevance: 0,
-            contains: [hljs.UNDERSCORE_TITLE_MODE]
+            contains: [ hljs.UNDERSCORE_TITLE_MODE ]
           },
           {
             className: 'type',
-            begin: /</, end: />/, keywords: 'reified',
+            begin: /</,
+            end: />/,
+            keywords: 'reified',
             relevance: 0
           },
           {
             className: 'params',
-            begin: /\(/, end: /\)/,
+            begin: /\(/,
+            end: /\)/,
             endsParent: true,
             keywords: KEYWORDS,
             relevance: 0,
             contains: [
               {
-                begin: /:/, end: /[=,\/]/, endsWithParent: true,
+                begin: /:/,
+                end: /[=,\/]/,
+                endsWithParent: true,
                 contains: [
                   KOTLIN_PAREN_TYPE,
                   hljs.C_LINE_COMMENT_MODE,
@@ -193,20 +225,29 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface trait', end: /[:\{(]|$/, // remove 'trait' when removed from KEYWORDS
+        beginKeywords: 'class interface trait', // remove 'trait' when removed from KEYWORDS
+        end: /[:\{(]|$/,
         excludeEnd: true,
         illegal: 'extends implements',
         contains: [
-          {beginKeywords: 'public protected internal private constructor'},
+          {
+            beginKeywords: 'public protected internal private constructor'
+          },
           hljs.UNDERSCORE_TITLE_MODE,
           {
             className: 'type',
-            begin: /</, end: />/, excludeBegin: true, excludeEnd: true,
+            begin: /</,
+            end: />/,
+            excludeBegin: true,
+            excludeEnd: true,
             relevance: 0
           },
           {
             className: 'type',
-            begin: /[,:]\s*/, end: /[<\(,]|$/, excludeBegin: true, returnEnd: true
+            begin: /[,:]\s*/,
+            end: /[<\(,]|$/,
+            excludeBegin: true,
+            returnEnd: true
           },
           ANNOTATION_USE_SITE,
           ANNOTATION
@@ -215,7 +256,8 @@ export default function(hljs) {
       STRING,
       {
         className: 'meta',
-        begin: "^#!/usr/bin/env", end: '$',
+        begin: "^#!/usr/bin/env",
+        end: '$',
         illegal: '\n'
       },
       KOTLIN_NUMBER_MODE
diff --git a/src/languages/lasso.js b/src/languages/lasso.js
index eb3439a938..cab25dcc04 100644
--- a/src/languages/lasso.js
+++ b/src/languages/lasso.js
@@ -6,10 +6,10 @@ Website: http://www.lassosoft.com/What-Is-Lasso
 */
 
 export default function(hljs) {
-  var LASSO_IDENT_RE = '[a-zA-Z_][\\w.]*';
-  var LASSO_ANGLE_RE = '<\\?(lasso(script)?|=)';
-  var LASSO_CLOSE_RE = '\\]|\\?>';
-  var LASSO_KEYWORDS = {
+  const LASSO_IDENT_RE = '[a-zA-Z_][\\w.]*';
+  const LASSO_ANGLE_RE = '<\\?(lasso(script)?|=)';
+  const LASSO_CLOSE_RE = '\\]|\\?>';
+  const LASSO_KEYWORDS = {
     $pattern: LASSO_IDENT_RE + '|&[lg]t;',
     literal:
       'true false none minimal full all void and or not ' +
@@ -37,14 +37,14 @@ export default function(hljs) {
       'require returnhome skip split_thread sum take thread to trait type ' +
       'where with yield yieldhome'
   };
-  var HTML_COMMENT = hljs.COMMENT(
+  const HTML_COMMENT = hljs.COMMENT(
     '<!--',
     '-->',
     {
       relevance: 0
     }
   );
-  var LASSO_NOPROCESS = {
+  const LASSO_NOPROCESS = {
     className: 'meta',
     begin: '\\[noprocess\\]',
     starts: {
@@ -53,23 +53,30 @@ export default function(hljs) {
       contains: [HTML_COMMENT]
     }
   };
-  var LASSO_START = {
+  const LASSO_START = {
     className: 'meta',
     begin: '\\[/noprocess|' + LASSO_ANGLE_RE
   };
-  var LASSO_DATAMEMBER = {
+  const LASSO_DATAMEMBER = {
     className: 'symbol',
     begin: '\'' + LASSO_IDENT_RE + '\''
   };
-  var LASSO_CODE = [
+  const LASSO_CODE = [
     hljs.C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
-    hljs.inherit(hljs.C_NUMBER_MODE, {begin: hljs.C_NUMBER_RE + '|(-?infinity|NaN)\\b'}),
-    hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-    hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
+    hljs.inherit(hljs.C_NUMBER_MODE, {
+      begin: hljs.C_NUMBER_RE + '|(-?infinity|NaN)\\b'
+    }),
+    hljs.inherit(hljs.APOS_STRING_MODE, {
+      illegal: null
+    }),
+    hljs.inherit(hljs.QUOTE_STRING_MODE, {
+      illegal: null
+    }),
     {
       className: 'string',
-      begin: '`', end: '`'
+      begin: '`',
+      end: '`'
     },
     { // variables
       variants: [
@@ -77,14 +84,16 @@ export default function(hljs) {
           begin: '[#$]' + LASSO_IDENT_RE
         },
         {
-          begin: '#', end: '\\d+',
+          begin: '#',
+          end: '\\d+',
           illegal: '\\W'
         }
       ]
     },
     {
       className: 'type',
-      begin: '::\\s*', end: LASSO_IDENT_RE,
+      begin: '::\\s*',
+      end: LASSO_IDENT_RE,
       illegal: '\\W'
     },
     {
@@ -107,15 +116,21 @@ export default function(hljs) {
     {
       className: 'class',
       beginKeywords: 'define',
-      returnEnd: true, end: '\\(|=>',
+      returnEnd: true,
+      end: '\\(|=>',
       contains: [
-        hljs.inherit(hljs.TITLE_MODE, {begin: LASSO_IDENT_RE + '(=(?!>))?|[-+*/%](?!>)'})
+        hljs.inherit(hljs.TITLE_MODE, {
+          begin: LASSO_IDENT_RE + '(=(?!>))?|[-+*/%](?!>)'
+        })
       ]
     }
   ];
   return {
     name: 'Lasso',
-    aliases: ['ls', 'lassoscript'],
+    aliases: [
+      'ls',
+      'lassoscript'
+    ],
     case_insensitive: true,
     keywords: LASSO_KEYWORDS,
     contains: [
@@ -161,7 +176,8 @@ export default function(hljs) {
       },
       {
         className: 'meta',
-        begin: '^#!', end:'lasso9$',
+        begin: '^#!',
+        end: 'lasso9$',
         relevance: 10
       }
     ].concat(LASSO_CODE)
diff --git a/src/languages/ldif.js b/src/languages/ldif.js
index fac612aa05..bf67db3f0e 100644
--- a/src/languages/ldif.js
+++ b/src/languages/ldif.js
@@ -10,18 +10,29 @@ export default function(hljs) {
     contains: [
       {
         className: 'attribute',
-        begin: '^dn', end: ': ', excludeEnd: true,
-        starts: {end: '$', relevance: 0},
+        begin: '^dn',
+        end: ': ',
+        excludeEnd: true,
+        starts: {
+          end: '$',
+          relevance: 0
+        },
         relevance: 10
       },
       {
         className: 'attribute',
-        begin: '^\\w', end: ': ', excludeEnd: true,
-        starts: {end: '$', relevance: 0}
+        begin: '^\\w',
+        end: ': ',
+        excludeEnd: true,
+        starts: {
+          end: '$',
+          relevance: 0
+        }
       },
       {
         className: 'literal',
-        begin: '^-', end: '$'
+        begin: '^-',
+        end: '$'
       },
       hljs.HASH_COMMENT_MODE
     ]
diff --git a/src/languages/leaf.js b/src/languages/leaf.js
index 05f7644898..0bb9b2c7e1 100644
--- a/src/languages/leaf.js
+++ b/src/languages/leaf.js
@@ -4,17 +4,17 @@ Author: Hale Chan <halechan@qq.com>
 Description: Based on the Leaf reference from https://vapor.github.io/documentation/guide/leaf.html.
 */
 
-export default function (hljs) {
+export default function(hljs) {
   return {
     name: 'Leaf',
     contains: [
       {
         className: 'function',
         begin: '#+' + '[A-Za-z_0-9]*' + '\\(',
-        end:/ \{/,
+        end: / \{/,
         returnBegin: true,
         excludeEnd: true,
-        contains : [
+        contains: [
           {
             className: 'keyword',
             begin: '#+'
@@ -25,7 +25,8 @@ export default function (hljs) {
           },
           {
             className: 'params',
-            begin: '\\(', end: '\\)',
+            begin: '\\(',
+            end: '\\)',
             endsParent: true,
             contains: [
               {
diff --git a/src/languages/livecodeserver.js b/src/languages/livecodeserver.js
index be53aff79b..f273a6b73e 100644
--- a/src/languages/livecodeserver.js
+++ b/src/languages/livecodeserver.js
@@ -8,27 +8,37 @@ Category: enterprise
 */
 
 export default function(hljs) {
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     variants: [
-      {begin: '\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)'},
-      {begin: '\\$_[A-Z]+'}
+      {
+        begin: '\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)'
+      },
+      {
+        begin: '\\$_[A-Z]+'
+      }
     ],
     relevance: 0
   };
-  var COMMENT_MODES = [
+  const COMMENT_MODES = [
     hljs.C_BLOCK_COMMENT_MODE,
     hljs.HASH_COMMENT_MODE,
     hljs.COMMENT('--', '$'),
     hljs.COMMENT('[^:]//', '$')
   ];
-  var TITLE1 = hljs.inherit(hljs.TITLE_MODE, {
+  const TITLE1 = hljs.inherit(hljs.TITLE_MODE, {
     variants: [
-      {begin: '\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*'},
-      {begin: '\\b_[a-z0-9\\-]+'}
+      {
+        begin: '\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*'
+      },
+      {
+        begin: '\\b_[a-z0-9\\-]+'
+      }
     ]
   });
-  var TITLE2 = hljs.inherit(hljs.TITLE_MODE, {begin: '\\b([A-Za-z0-9_\\-]+)\\b'});
+  const TITLE2 = hljs.inherit(hljs.TITLE_MODE, {
+    begin: '\\b([A-Za-z0-9_\\-]+)\\b'
+  });
   return {
     name: 'LiveCode',
     case_insensitive: false,
@@ -115,7 +125,8 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        beginKeywords: 'function', end: '$',
+        beginKeywords: 'function',
+        end: '$',
         contains: [
           VARIABLE,
           TITLE2,
@@ -128,7 +139,8 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        begin: '\\bend\\s+', end: '$',
+        begin: '\\bend\\s+',
+        end: '$',
         keywords: 'end',
         contains: [
           TITLE2,
@@ -137,7 +149,8 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        beginKeywords: 'command on', end: '$',
+        beginKeywords: 'command on',
+        end: '$',
         contains: [
           VARIABLE,
           TITLE2,
@@ -155,8 +168,12 @@ export default function(hljs) {
             begin: '<\\?(rev|lc|livecode)',
             relevance: 10
           },
-          { begin: '<\\?' },
-          { begin: '\\?>' }
+          {
+            begin: '<\\?'
+          },
+          {
+            begin: '\\?>'
+          }
         ]
       },
       hljs.APOS_STRING_MODE,
diff --git a/src/languages/livescript.js b/src/languages/livescript.js
index 6d5f4abf15..4e86129237 100644
--- a/src/languages/livescript.js
+++ b/src/languages/livescript.js
@@ -11,11 +11,11 @@ Category: scripting
 import * as ECMAScript from './lib/ecmascript.js';
 
 export default function(hljs) {
-  var LIVESCRIPT_BUILT_INS = [
+  const LIVESCRIPT_BUILT_INS = [
     'npm',
     'print'
   ];
-  var LIVESCRIPT_LITERALS = [
+  const LIVESCRIPT_LITERALS = [
     'yes',
     'no',
     'on',
@@ -24,7 +24,7 @@ export default function(hljs) {
     'that',
     'void'
   ];
-  var LIVESCRIPT_KEYWORDS = [
+  const LIVESCRIPT_KEYWORDS = [
     'then',
     'unless',
     'until',
@@ -55,52 +55,72 @@ export default function(hljs) {
     '__bind',
     '__indexOf'
   ];
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword: ECMAScript.KEYWORDS.concat(LIVESCRIPT_KEYWORDS).join(" "),
     literal: ECMAScript.LITERALS.concat(LIVESCRIPT_LITERALS).join(" "),
     built_in: ECMAScript.BUILT_INS.concat(LIVESCRIPT_BUILT_INS).join(" ")
   };
-  var JS_IDENT_RE = '[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
-  var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: JS_IDENT_RE});
-  var SUBST = {
+  const JS_IDENT_RE = '[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
+  const TITLE = hljs.inherit(hljs.TITLE_MODE, {
+    begin: JS_IDENT_RE
+  });
+  const SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /\}/,
+    begin: /#\{/,
+    end: /\}/,
     keywords: KEYWORDS
   };
-  var SUBST_SIMPLE = {
+  const SUBST_SIMPLE = {
     className: 'subst',
-    begin: /#[A-Za-z$_]/, end: /(?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
+    begin: /#[A-Za-z$_]/,
+    end: /(?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
     keywords: KEYWORDS
   };
-  var EXPRESSIONS = [
+  const EXPRESSIONS = [
     hljs.BINARY_NUMBER_MODE,
     {
       className: 'number',
       begin: '(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)',
       relevance: 0,
-      starts: {end: '(\\s*/)?', relevance: 0} // a number tries to eat the following slash to prevent treating it as a regexp
+      starts: {
+        end: '(\\s*/)?',
+        relevance: 0
+      } // a number tries to eat the following slash to prevent treating it as a regexp
     },
     {
       className: 'string',
       variants: [
         {
-          begin: /'''/, end: /'''/,
+          begin: /'''/,
+          end: /'''/,
           contains: [hljs.BACKSLASH_ESCAPE]
         },
         {
-          begin: /'/, end: /'/,
+          begin: /'/,
+          end: /'/,
           contains: [hljs.BACKSLASH_ESCAPE]
         },
         {
-          begin: /"""/, end: /"""/,
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST, SUBST_SIMPLE]
+          begin: /"""/,
+          end: /"""/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST,
+            SUBST_SIMPLE
+          ]
         },
         {
-          begin: /"/, end: /"/,
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST, SUBST_SIMPLE]
+          begin: /"/,
+          end: /"/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST,
+            SUBST_SIMPLE
+          ]
         },
         {
-          begin: /\\/, end: /(\s|$)/,
+          begin: /\\/,
+          end: /(\s|$)/,
           excludeEnd: true
         }
       ]
@@ -109,8 +129,12 @@ export default function(hljs) {
       className: 'regexp',
       variants: [
         {
-          begin: '//', end: '//[gim]*',
-          contains: [SUBST, hljs.HASH_COMMENT_MODE]
+          begin: '//',
+          end: '//[gim]*',
+          contains: [
+            SUBST,
+            hljs.HASH_COMMENT_MODE
+          ]
         },
         {
           // regex can't start with space to parse x / 2 / 3 as two divisions
@@ -123,28 +147,32 @@ export default function(hljs) {
       begin: '@' + JS_IDENT_RE
     },
     {
-      begin: '``', end: '``',
-      excludeBegin: true, excludeEnd: true,
+      begin: '``',
+      end: '``',
+      excludeBegin: true,
+      excludeEnd: true,
       subLanguage: 'javascript'
     }
   ];
   SUBST.contains = EXPRESSIONS;
 
-  var PARAMS = {
+  const PARAMS = {
     className: 'params',
-    begin: '\\(', returnBegin: true,
+    begin: '\\(',
+    returnBegin: true,
     /* We need another contained nameless mode to not have every nested
     pair of parens to be called "params" */
     contains: [
       {
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         keywords: KEYWORDS,
         contains: ['self'].concat(EXPRESSIONS)
       }
     ]
   };
 
-  var SYMBOLS = {
+  const SYMBOLS = {
     begin: '(#=>|=>|\\|>>|-?->|!->)'
   };
 
@@ -159,17 +187,23 @@ export default function(hljs) {
       SYMBOLS, // relevance booster
       {
         className: 'function',
-        contains: [TITLE, PARAMS],
+        contains: [
+          TITLE,
+          PARAMS
+        ],
         returnBegin: true,
         variants: [
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B->\\*?', end: '->\\*?'
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B->\\*?',
+            end: '->\\*?'
           },
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?', end: '[-~]{1,2}>\\*?'
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?',
+            end: '[-~]{1,2}>\\*?'
           },
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?', end: '!?[-~]{1,2}>\\*?'
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?',
+            end: '!?[-~]{1,2}>\\*?'
           }
         ]
       },
@@ -189,8 +223,10 @@ export default function(hljs) {
         ]
       },
       {
-        begin: JS_IDENT_RE + ':', end: ':',
-        returnBegin: true, returnEnd: true,
+        begin: JS_IDENT_RE + ':',
+        end: ':',
+        returnBegin: true,
+        returnEnd: true,
         relevance: 0
       }
     ])
diff --git a/src/languages/lua.js b/src/languages/lua.js
index 48bb928b04..96123ad547 100644
--- a/src/languages/lua.js
+++ b/src/languages/lua.js
@@ -7,13 +7,14 @@ Website: https://www.lua.org
 */
 
 export default function(hljs) {
-  var OPENING_LONG_BRACKET = '\\[=*\\[';
-  var CLOSING_LONG_BRACKET = '\\]=*\\]';
-  var LONG_BRACKETS = {
-    begin: OPENING_LONG_BRACKET, end: CLOSING_LONG_BRACKET,
+  const OPENING_LONG_BRACKET = '\\[=*\\[';
+  const CLOSING_LONG_BRACKET = '\\]=*\\]';
+  const LONG_BRACKETS = {
+    begin: OPENING_LONG_BRACKET,
+    end: CLOSING_LONG_BRACKET,
     contains: ['self']
   };
-  var COMMENTS = [
+  const COMMENTS = [
     hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
     hljs.COMMENT(
       '--' + OPENING_LONG_BRACKET,
@@ -31,14 +32,14 @@ export default function(hljs) {
       literal: "true false nil",
       keyword: "and break do else elseif end for goto if in local not or repeat return then until while",
       built_in:
-        //Metatags and globals:
+        // Metatags and globals:
         '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len ' +
         '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert ' +
-        //Standard methods and properties:
+        // Standard methods and properties:
         'collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring ' +
         'module next pairs pcall print rawequal rawget rawset require select setfenv ' +
         'setmetatable tonumber tostring type unpack xpcall arg self ' +
-        //Library methods and properties (one line per library):
+        // Library methods and properties (one line per library):
         'coroutine resume yield status wrap create running debug getupvalue ' +
         'debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv ' +
         'io lines write close flush open output type read stderr stdin input stdout popen tmpfile ' +
@@ -50,12 +51,16 @@ export default function(hljs) {
     contains: COMMENTS.concat([
       {
         className: 'function',
-        beginKeywords: 'function', end: '\\)',
+        beginKeywords: 'function',
+        end: '\\)',
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'}),
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'
+          }),
           {
             className: 'params',
-            begin: '\\(', endsWithParent: true,
+            begin: '\\(',
+            endsWithParent: true,
             contains: COMMENTS
           }
         ].concat(COMMENTS)
@@ -65,7 +70,8 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
-        begin: OPENING_LONG_BRACKET, end: CLOSING_LONG_BRACKET,
+        begin: OPENING_LONG_BRACKET,
+        end: CLOSING_LONG_BRACKET,
         contains: [LONG_BRACKETS],
         relevance: 5
       }
diff --git a/src/languages/makefile.js b/src/languages/makefile.js
index 2f021eb406..ec30eb22bf 100644
--- a/src/languages/makefile.js
+++ b/src/languages/makefile.js
@@ -8,64 +8,69 @@ Category: common
 
 export default function(hljs) {
   /* Variables: simple (eg $(var)) and special (eg $@) */
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     variants: [
       {
         begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
-        contains: [hljs.BACKSLASH_ESCAPE],
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
         begin: /\$[@%<?\^\+\*]/
-      },
+      }
     ]
   };
   /* Quoted string with variables inside */
-  var QUOTE_STRING = {
+  const QUOTE_STRING = {
     className: 'string',
-    begin: /"/, end: /"/,
+    begin: /"/,
+    end: /"/,
     contains: [
       hljs.BACKSLASH_ESCAPE,
-      VARIABLE,
+      VARIABLE
     ]
   };
   /* Function: $(func arg,...) */
-  var FUNC = {
+  const FUNC = {
     className: 'variable',
-    begin: /\$\([\w-]+\s/, end: /\)/,
+    begin: /\$\([\w-]+\s/,
+    end: /\)/,
     keywords: {
       built_in:
         'subst patsubst strip findstring filter filter-out sort ' +
         'word wordlist firstword lastword dir notdir suffix basename ' +
         'addsuffix addprefix join wildcard realpath abspath error warning ' +
-        'shell origin flavor foreach if or and call eval file value',
+        'shell origin flavor foreach if or and call eval file value'
     },
-    contains: [
-      VARIABLE,
-    ]
+    contains: [ VARIABLE ]
   };
   /* Variable assignment */
-  var ASSIGNMENT = {
+  const ASSIGNMENT = {
     begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)'
   };
   /* Meta targets (.PHONY) */
-  var META = {
+  const META = {
     className: 'meta',
-    begin: /^\.PHONY:/, end: /$/,
+    begin: /^\.PHONY:/,
+    end: /$/,
     keywords: {
       $pattern: /[\.\w]+/,
       'meta-keyword': '.PHONY'
     }
   };
   /* Targets */
-  var TARGET = {
+  const TARGET = {
     className: 'section',
-    begin: /^[^\s]+:/, end: /$/,
-    contains: [VARIABLE,]
+    begin: /^[^\s]+:/,
+    end: /$/,
+    contains: [ VARIABLE ]
   };
   return {
     name: 'Makefile',
-    aliases: ['mk', 'mak'],
+    aliases: [
+      'mk',
+      'mak'
+    ],
     keywords: {
       $pattern: /[\w-]+/,
       keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif ' +
@@ -78,7 +83,7 @@ export default function(hljs) {
       FUNC,
       ASSIGNMENT,
       META,
-      TARGET,
+      TARGET
     ]
   };
 }
diff --git a/src/languages/markdown.js b/src/languages/markdown.js
index 7cd7a02f3c..daa3611b96 100644
--- a/src/languages/markdown.js
+++ b/src/languages/markdown.js
@@ -10,29 +10,46 @@ import * as regex from '../lib/regex.js';
 
 export default function(hljs) {
   const INLINE_HTML = {
-    begin: /<\/?[A-Za-z_]/, end: '>',
+    begin: /<\/?[A-Za-z_]/,
+    end: '>',
     subLanguage: 'xml',
     relevance: 0
   };
   const HORIZONTAL_RULE = {
-    begin: '^[-\\*]{3,}', end: '$'
+    begin: '^[-\\*]{3,}',
+    end: '$'
   };
   const CODE = {
     className: 'code',
     variants: [
       // TODO: fix to allow these to work with sublanguage also
-      { begin: '(`{3,})(.|\\n)*?\\1`*[ ]*', },
-      { begin: '(~{3,})(.|\\n)*?\\1~*[ ]*', },
+      {
+        begin: '(`{3,})(.|\\n)*?\\1`*[ ]*'
+      },
+      {
+        begin: '(~{3,})(.|\\n)*?\\1~*[ ]*'
+      },
       // needed to allow markdown as a sublanguage to work
-      { begin: '```', end: '```+[ ]*$' },
-      { begin: '~~~', end: '~~~+[ ]*$' },
-      { begin: '`.+?`' },
+      {
+        begin: '```',
+        end: '```+[ ]*$'
+      },
+      {
+        begin: '~~~',
+        end: '~~~+[ ]*$'
+      },
+      {
+        begin: '`.+?`'
+      },
       {
         begin: '(?=^( {4}|\\t))',
         // use contains to gobble up multiple lines to allow the block to be whatever size
         // but only have a single open/close tag vs one per line
         contains: [
-          { begin: '^( {4}|\\t)', end: '(\\n)$' }
+          {
+            begin: '^( {4}|\\t)',
+            end: '(\\n)$'
+          }
         ],
         relevance: 0
       }
@@ -50,12 +67,15 @@ export default function(hljs) {
     contains: [
       {
         className: 'symbol',
-        begin: /\[/, end: /\]/,
-        excludeBegin: true, excludeEnd: true
+        begin: /\[/,
+        end: /\]/,
+        excludeBegin: true,
+        excludeEnd: true
       },
       {
         className: 'link',
-        begin: /:\s*/, end: /$/,
+        begin: /:\s*/,
+        end: /$/,
         excludeBegin: true
       }
     ]
@@ -65,35 +85,53 @@ export default function(hljs) {
     variants: [
       // too much like nested array access in so many languages
       // to have any real relevance
-      { begin: /\[.+?\]\[.*?\]/, relevance: 0 },
+      {
+        begin: /\[.+?\]\[.*?\]/,
+        relevance: 0
+      },
       // popular internet URLs
-      { begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/, relevance: 2 },
-      { begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/), relevance: 2 },
+      {
+        begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+        relevance: 2
+      },
+      {
+        begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+        relevance: 2
+      },
       // relative urls
-      { begin: /\[.+?\]\([./?&#].*?\)/, relevance: 1 },
+      {
+        begin: /\[.+?\]\([./?&#].*?\)/,
+        relevance: 1
+      },
       // whatever else, lower relevance (might not be a link at all)
-      { begin: /\[.+?\]\(.*?\)/, relevance: 0 }
+      {
+        begin: /\[.+?\]\(.*?\)/,
+        relevance: 0
+      }
     ],
     returnBegin: true,
     contains: [
       {
         className: 'string',
         relevance: 0,
-        begin: '\\[', end: '\\]',
+        begin: '\\[',
+        end: '\\]',
         excludeBegin: true,
-        returnEnd: true,
+        returnEnd: true
       },
       {
         className: 'link',
         relevance: 0,
-        begin: '\\]\\(', end: '\\)',
+        begin: '\\]\\(',
+        end: '\\)',
         excludeBegin: true,
         excludeEnd: true
       },
       {
         className: 'symbol',
         relevance: 0,
-        begin: '\\]\\[', end: '\\]',
+        begin: '\\]\\[',
+        end: '\\]',
         excludeBegin: true,
         excludeEnd: true
       }
@@ -103,22 +141,35 @@ export default function(hljs) {
     className: 'strong',
     contains: [],
     variants: [
-      {begin: /_{2}/, end: /_{2}/ },
-      {begin: /\*{2}/, end: /\*{2}/ }
+      {
+        begin: /_{2}/,
+        end: /_{2}/
+      },
+      {
+        begin: /\*{2}/,
+        end: /\*{2}/
+      }
     ]
   };
   const ITALIC = {
     className: 'emphasis',
     contains: [],
     variants: [
-      { begin: /\*(?!\*)/, end: /\*/ },
-      { begin: /_(?!_)/, end: /_/, relevance: 0},
+      {
+        begin: /\*(?!\*)/,
+        end: /\*/
+      },
+      {
+        begin: /_(?!_)/,
+        end: /_/,
+        relevance: 0
+      }
     ]
   };
   BOLD.contains.push(ITALIC);
   ITALIC.contains.push(BOLD);
 
-  var CONTAINABLE = [
+  let CONTAINABLE = [
     INLINE_HTML,
     LINK
   ];
@@ -126,7 +177,7 @@ export default function(hljs) {
   BOLD.contains = BOLD.contains.concat(CONTAINABLE);
   ITALIC.contains = ITALIC.contains.concat(CONTAINABLE);
 
-  CONTAINABLE = CONTAINABLE.concat(BOLD,ITALIC);
+  CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
 
   const HEADER = {
     className: 'section',
@@ -135,14 +186,20 @@ export default function(hljs) {
         begin: '^#{1,6}',
         end: '$',
         contains: CONTAINABLE
-       },
+      },
       {
         begin: '(?=^.+?\\n[=-]{2,}$)',
         contains: [
-          { begin: '^[=-]*$' },
-          { begin: '^', end: "\\n", contains: CONTAINABLE },
+          {
+            begin: '^[=-]*$'
+          },
+          {
+            begin: '^',
+            end: "\\n",
+            contains: CONTAINABLE
+          }
         ]
-       }
+      }
     ]
   };
 
@@ -150,12 +207,16 @@ export default function(hljs) {
     className: 'quote',
     begin: '^>\\s+',
     contains: CONTAINABLE,
-    end: '$',
+    end: '$'
   };
 
   return {
     name: 'Markdown',
-    aliases: ['md', 'mkdown', 'mkd'],
+    aliases: [
+      'md',
+      'mkdown',
+      'mkd'
+    ],
     contains: [
       HEADER,
       INLINE_HTML,
diff --git a/src/languages/mathematica.js b/src/languages/mathematica.js
index a32e28bed1..a556d5ef07 100644
--- a/src/languages/mathematica.js
+++ b/src/languages/mathematica.js
@@ -116,7 +116,10 @@ export default function(hljs) {
 
   return {
     name: 'Mathematica',
-    aliases: ['mma', 'wl'],
+    aliases: [
+      'mma',
+      'wl'
+    ],
     classNameAliases: {
       brace: 'punctuation',
       pattern: 'type',
@@ -127,7 +130,9 @@ export default function(hljs) {
       'message-name': 'string'
     },
     contains: [
-      hljs.COMMENT(/\(\*/, /\*\)/, {contains: ['self']}),
+      hljs.COMMENT(/\(\*/, /\*\)/, {
+        contains: [ 'self' ]
+      }),
       PATTERNS,
       SLOTS,
       MESSAGES,
diff --git a/src/languages/maxima.js b/src/languages/maxima.js
index 39751032f2..19f026132b 100644
--- a/src/languages/maxima.js
+++ b/src/languages/maxima.js
@@ -6,363 +6,365 @@ Category: scientific
 */
 
 export default function(hljs) {
-  var KEYWORDS = 'if then else elseif for thru do while unless step in and or not';
-  var LITERALS = 'true false unknown inf minf ind und %e %i %pi %phi %gamma';
-  var BUILTIN_FUNCTIONS =
-        ' abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate'
-      + ' addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix'
-      + ' adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type'
-      + ' alias allroots alphacharp alphanumericp amortization %and annuity_fv'
-      + ' annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2'
-      + ' applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply'
-      + ' arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger'
-      + ' asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order'
-      + ' asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method'
-      + ' av average_degree backtrace bars barsplot barsplot_description base64 base64_decode'
-      + ' bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx'
-      + ' bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify'
-      + ' bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized'
-      + ' bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp'
-      + ' bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition'
-      + ' block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description'
-      + ' break bug_report build_info|10 buildq build_sample burn cabs canform canten'
-      + ' cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli'
-      + ' cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform'
-      + ' cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel'
-      + ' cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial'
-      + ' cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson'
-      + ' cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay'
-      + ' ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic'
-      + ' cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2'
-      + ' charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps'
-      + ' chinese cholesky christof chromatic_index chromatic_number cint circulant_graph'
-      + ' clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph'
-      + ' clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse'
-      + ' collectterms columnop columnspace columnswap columnvector combination combine'
-      + ' comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph'
-      + ' complete_graph complex_number_p components compose_functions concan concat'
-      + ' conjugate conmetderiv connected_components connect_vertices cons constant'
-      + ' constantp constituent constvalue cont2part content continuous_freq contortion'
-      + ' contour_plot contract contract_edge contragrad contrib_ode convert coord'
-      + ' copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1'
-      + ' covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline'
-      + ' ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph'
-      + ' cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate'
-      + ' declare declare_constvalue declare_dimensions declare_fundamental_dimensions'
-      + ' declare_fundamental_units declare_qty declare_translated declare_unit_conversion'
-      + ' declare_units declare_weights decsym defcon define define_alt_display define_variable'
-      + ' defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten'
-      + ' delta demo demoivre denom depends derivdegree derivlist describe desolve'
-      + ' determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag'
-      + ' diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export'
-      + ' dimacs_import dimension dimensionless dimensions dimensions_as_list direct'
-      + ' directory discrete_freq disjoin disjointp disolate disp dispcon dispform'
-      + ' dispfun dispJordan display disprule dispterms distrib divide divisors divsum'
-      + ' dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart'
-      + ' draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring'
-      + ' edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth'
-      + ' einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome'
-      + ' ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using'
-      + ' ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi'
-      + ' ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp'
-      + ' equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors'
-      + ' euler ev eval_string evenp every evolution evolution2d evundiff example exp'
-      + ' expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci'
-      + ' expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li'
-      + ' expintegral_shi expintegral_si explicit explose exponentialize express expt'
-      + ' exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum'
-      + ' factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements'
-      + ' fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge'
-      + ' file_search file_type fillarray findde find_root find_root_abs find_root_error'
-      + ' find_root_rel first fix flatten flength float floatnump floor flower_snark'
-      + ' flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran'
-      + ' fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp'
-      + ' foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s'
-      + ' from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp'
-      + ' fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units'
-      + ' fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized'
-      + ' gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide'
-      + ' gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym'
-      + ' geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean'
-      + ' geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string'
-      + ' get_pixel get_plot_option get_tex_environment get_tex_environment_default'
-      + ' get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close'
-      + ' gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum'
-      + ' gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import'
-      + ' graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery'
-      + ' graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph'
-      + ' grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path'
-      + ' hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite'
-      + ' hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description'
-      + ' hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph'
-      + ' icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy'
-      + ' ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart'
-      + ' imetric implicit implicit_derivative implicit_plot indexed_tensor indices'
-      + ' induced_subgraph inferencep inference_result infix info_display init_atensor'
-      + ' init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions'
-      + ' integrate intersect intersection intervalp intopois intosum invariant1 invariant2'
-      + ' inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc'
-      + ' inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns'
-      + ' inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint'
-      + ' invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph'
-      + ' is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate'
-      + ' isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph'
-      + ' items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc'
-      + ' jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd'
-      + ' jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill'
-      + ' killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis'
-      + ' kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform'
-      + ' kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete'
-      + ' kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace'
-      + ' kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2'
-      + ' kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson'
-      + ' kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange'
-      + ' laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp'
-      + ' lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length'
-      + ' let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit'
-      + ' Lindstedt linear linearinterpol linear_program linear_regression line_graph'
-      + ' linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials'
-      + ' listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry'
-      + ' log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst'
-      + ' lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact'
-      + ' lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub'
-      + ' lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma'
-      + ' make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country'
-      + ' make_polygon make_random_state make_rgb_picture makeset make_string_input_stream'
-      + ' make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom'
-      + ' maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display'
-      + ' mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker'
-      + ' max max_clique max_degree max_flow maximize_lp max_independent_set max_matching'
-      + ' maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform'
-      + ' mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete'
-      + ' mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic'
-      + ' mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t'
-      + ' mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull'
-      + ' median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree'
-      + ' min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor'
-      + ' minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton'
-      + ' mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions'
-      + ' multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff'
-      + ' multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary'
-      + ' natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext'
-      + ' newdet new_graph newline newton new_variable next_prime nicedummies niceindices'
-      + ' ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp'
-      + ' nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst'
-      + ' nthroot nullity nullspace num numbered_boundaries numberp number_to_octets'
-      + ' num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai'
-      + ' nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin'
-      + ' oid_to_octets op opena opena_binary openr openr_binary openw openw_binary'
-      + ' operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless'
-      + ' orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap'
-      + ' out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface'
-      + ' parg parGosper parse_string parse_timedate part part2cont partfrac partition'
-      + ' partition_set partpol path_digraph path_graph pathname_directory pathname_name'
-      + ' pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform'
-      + ' pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete'
-      + ' pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal'
-      + ' pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal'
-      + ' pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t'
-      + ' pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph'
-      + ' petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding'
-      + ' playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff'
-      + ' poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar'
-      + ' polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion'
-      + ' poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal'
-      + ' poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal'
-      + ' poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation'
-      + ' poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm'
-      + ' poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form'
-      + ' poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part'
-      + ' poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension'
-      + ' poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod'
-      + ' powerseries powerset prefix prev_prime primep primes principal_components'
-      + ' print printf printfile print_graph printpois printprops prodrac product properties'
-      + ' propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct'
-      + ' puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp'
-      + ' quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile'
-      + ' quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2'
-      + ' quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f'
-      + ' quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel'
-      + ' quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal'
-      + ' quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t'
-      + ' quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t'
-      + ' quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan'
-      + ' radius random random_bernoulli random_beta random_binomial random_bipartite_graph'
-      + ' random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform'
-      + ' random_exp random_f random_gamma random_general_finite_discrete random_geometric'
-      + ' random_graph random_graph1 random_gumbel random_hypergeometric random_laplace'
-      + ' random_logistic random_lognormal random_negative_binomial random_network'
-      + ' random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto'
-      + ' random_permutation random_poisson random_rayleigh random_regular_graph random_student_t'
-      + ' random_tournament random_tree random_weibull range rank rat ratcoef ratdenom'
-      + ' ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump'
-      + ' ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array'
-      + ' read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline'
-      + ' read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate'
-      + ' realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar'
-      + ' rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus'
-      + ' rem remainder remarray rembox remcomps remcon remcoord remfun remfunction'
-      + ' remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions'
-      + ' remove_fundamental_units remove_plot_option remove_vertex rempart remrule'
-      + ' remsym remvalue rename rename_file reset reset_displays residue resolvante'
-      + ' resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein'
-      + ' resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer'
-      + ' rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann'
-      + ' rinvariant risch rk rmdir rncombine romberg room rootscontract round row'
-      + ' rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i'
-      + ' scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description'
-      + ' scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second'
-      + ' sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight'
-      + ' setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state'
-      + ' set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications'
-      + ' set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path'
-      + ' show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform'
-      + ' simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert'
-      + ' sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial'
-      + ' skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp'
-      + ' skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric'
-      + ' skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic'
-      + ' skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t'
-      + ' skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t'
-      + ' skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph'
-      + ' smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve'
-      + ' solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export'
-      + ' sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1'
-      + ' spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition'
-      + ' sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus'
-      + ' ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot'
-      + ' starplot_description status std std1 std_bernoulli std_beta std_binomial'
-      + ' std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma'
-      + ' std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace'
-      + ' std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t'
-      + ' std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull'
-      + ' stemplot stirling stirling1 stirling2 strim striml strimr string stringout'
-      + ' stringp strong_components struve_h struve_l sublis sublist sublist_indices'
-      + ' submatrix subsample subset subsetp subst substinpart subst_parallel substpart'
-      + ' substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext'
-      + ' symbolp symmdifference symmetricp system take_channel take_inference tan'
-      + ' tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract'
-      + ' tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference'
-      + ' test_normality test_proportion test_proportions_difference test_rank_sum'
-      + ' test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display'
-      + ' texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter'
-      + ' toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep'
-      + ' totalfourier totient tpartpol trace tracematrix trace_options transform_sample'
-      + ' translate translate_file transpose treefale tree_reduce treillis treinat'
-      + ' triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate'
-      + ' truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph'
-      + ' truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget'
-      + ' ultraspherical underlying_graph undiff union unique uniteigenvectors unitp'
-      + ' units unit_step unitvector unorder unsum untellrat untimer'
-      + ' untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli'
-      + ' var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform'
-      + ' var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel'
-      + ' var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial'
-      + ' var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson'
-      + ' var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp'
-      + ' verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance'
-      + ' vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle'
-      + ' vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j'
-      + ' wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian'
-      + ' xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta'
-      + ' zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors'
-      + ' zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table'
-      + ' absboxchar activecontexts adapt_depth additive adim aform algebraic'
-      + ' algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic'
-      + ' animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar'
-      + ' asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top'
-      + ' azimuth background background_color backsubst berlefact bernstein_explicit'
-      + ' besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest'
-      + ' border boundaries_array box boxchar breakup %c capping cauchysum cbrange'
-      + ' cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics'
-      + ' colorbox columns commutative complex cone context contexts contour contour_levels'
-      + ' cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp'
-      + ' cube current_let_rule_package cylinder data_file_name debugmode decreasing'
-      + ' default_let_rule_package delay dependencies derivabbrev derivsubst detout'
-      + ' diagmetric diff dim dimensions dispflag display2d|10 display_format_internal'
-      + ' distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor'
-      + ' doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules'
-      + ' dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart'
-      + ' edge_color edge_coloring edge_partition edge_type edge_width %edispflag'
-      + ' elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer'
-      + ' epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type'
-      + ' %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand'
-      + ' expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine'
-      + ' factlim factorflag factorial_expand factors_only fb feature features'
-      + ' file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10'
-      + ' file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color'
-      + ' fill_density filled_func fixed_vertices flipflag float2bf font font_size'
-      + ' fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim'
-      + ' gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command'
-      + ' gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command'
-      + ' gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command'
-      + ' gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble'
-      + ' gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args'
-      + ' Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both'
-      + ' head_length head_type height hypergeometric_representation %iargs ibase'
-      + ' icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form'
-      + ' ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval'
-      + ' infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued'
-      + ' integrate_use_rootsof integration_constant integration_constant_counter interpolate_color'
-      + ' intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr'
-      + ' julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment'
-      + ' label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max'
-      + ' leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear'
-      + ' linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params'
-      + ' linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname'
-      + ' loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx'
-      + ' logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros'
-      + ' mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult'
-      + ' matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10'
-      + ' maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint'
-      + ' maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp'
-      + ' mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver'
-      + ' modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag'
-      + ' newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc'
-      + ' noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np'
-      + ' npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties'
-      + ' opsubst optimprefix optionset orientation origin orthopoly_returns_intervals'
-      + ' outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution'
-      + ' %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart'
-      + ' png_file pochhammer_max_index points pointsize point_size points_joined point_type'
-      + ' poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm'
-      + ' poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list'
-      + ' poly_secondary_elimination_order poly_top_reduction_only posfun position'
-      + ' powerdisp pred prederror primep_number_of_tests product_use_gamma program'
-      + ' programmode promote_float_to_bigfloat prompt proportional_axes props psexpand'
-      + ' ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof'
-      + ' ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann'
-      + ' ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw'
-      + ' refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs'
-      + ' rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy'
-      + ' same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck'
-      + ' setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width'
-      + ' show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type'
-      + ' show_vertices show_weight simp simplified_output simplify_products simpproduct'
-      + ' simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn'
-      + ' solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag'
-      + ' stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda'
-      + ' subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric'
-      + ' tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials'
-      + ' tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch'
-      + ' tr track transcompile transform transform_xy translate_fast_arrays transparent'
-      + ' transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex'
-      + ' tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign'
-      + ' trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars'
-      + ' tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode'
-      + ' tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes'
-      + ' ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble'
-      + ' usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition'
-      + ' vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface'
-      + ' wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel'
-      + ' xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate'
-      + ' xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel'
-      + ' xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width'
-      + ' ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis'
-      + ' ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis'
-      + ' yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob'
-      + ' zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest';
-  var SYMBOLS = '_ __ %|0 %%|0';
+  const KEYWORDS =
+    'if then else elseif for thru do while unless step in and or not';
+  const LITERALS =
+    'true false unknown inf minf ind und %e %i %pi %phi %gamma';
+  const BUILTIN_FUNCTIONS =
+    ' abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate' +
+    ' addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix' +
+    ' adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type' +
+    ' alias allroots alphacharp alphanumericp amortization %and annuity_fv' +
+    ' annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2' +
+    ' applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply' +
+    ' arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger' +
+    ' asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order' +
+    ' asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method' +
+    ' av average_degree backtrace bars barsplot barsplot_description base64 base64_decode' +
+    ' bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx' +
+    ' bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify' +
+    ' bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized' +
+    ' bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp' +
+    ' bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition' +
+    ' block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description' +
+    ' break bug_report build_info|10 buildq build_sample burn cabs canform canten' +
+    ' cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli' +
+    ' cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform' +
+    ' cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel' +
+    ' cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial' +
+    ' cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson' +
+    ' cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay' +
+    ' ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic' +
+    ' cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2' +
+    ' charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps' +
+    ' chinese cholesky christof chromatic_index chromatic_number cint circulant_graph' +
+    ' clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph' +
+    ' clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse' +
+    ' collectterms columnop columnspace columnswap columnvector combination combine' +
+    ' comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph' +
+    ' complete_graph complex_number_p components compose_functions concan concat' +
+    ' conjugate conmetderiv connected_components connect_vertices cons constant' +
+    ' constantp constituent constvalue cont2part content continuous_freq contortion' +
+    ' contour_plot contract contract_edge contragrad contrib_ode convert coord' +
+    ' copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1' +
+    ' covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline' +
+    ' ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph' +
+    ' cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate' +
+    ' declare declare_constvalue declare_dimensions declare_fundamental_dimensions' +
+    ' declare_fundamental_units declare_qty declare_translated declare_unit_conversion' +
+    ' declare_units declare_weights decsym defcon define define_alt_display define_variable' +
+    ' defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten' +
+    ' delta demo demoivre denom depends derivdegree derivlist describe desolve' +
+    ' determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag' +
+    ' diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export' +
+    ' dimacs_import dimension dimensionless dimensions dimensions_as_list direct' +
+    ' directory discrete_freq disjoin disjointp disolate disp dispcon dispform' +
+    ' dispfun dispJordan display disprule dispterms distrib divide divisors divsum' +
+    ' dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart' +
+    ' draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring' +
+    ' edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth' +
+    ' einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome' +
+    ' ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using' +
+    ' ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi' +
+    ' ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp' +
+    ' equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors' +
+    ' euler ev eval_string evenp every evolution evolution2d evundiff example exp' +
+    ' expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci' +
+    ' expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li' +
+    ' expintegral_shi expintegral_si explicit explose exponentialize express expt' +
+    ' exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum' +
+    ' factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements' +
+    ' fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge' +
+    ' file_search file_type fillarray findde find_root find_root_abs find_root_error' +
+    ' find_root_rel first fix flatten flength float floatnump floor flower_snark' +
+    ' flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran' +
+    ' fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp' +
+    ' foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s' +
+    ' from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp' +
+    ' fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units' +
+    ' fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized' +
+    ' gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide' +
+    ' gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym' +
+    ' geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean' +
+    ' geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string' +
+    ' get_pixel get_plot_option get_tex_environment get_tex_environment_default' +
+    ' get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close' +
+    ' gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum' +
+    ' gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import' +
+    ' graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery' +
+    ' graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph' +
+    ' grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path' +
+    ' hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite' +
+    ' hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description' +
+    ' hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph' +
+    ' icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy' +
+    ' ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart' +
+    ' imetric implicit implicit_derivative implicit_plot indexed_tensor indices' +
+    ' induced_subgraph inferencep inference_result infix info_display init_atensor' +
+    ' init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions' +
+    ' integrate intersect intersection intervalp intopois intosum invariant1 invariant2' +
+    ' inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc' +
+    ' inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns' +
+    ' inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint' +
+    ' invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph' +
+    ' is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate' +
+    ' isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph' +
+    ' items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc' +
+    ' jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd' +
+    ' jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill' +
+    ' killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis' +
+    ' kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform' +
+    ' kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete' +
+    ' kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace' +
+    ' kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2' +
+    ' kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson' +
+    ' kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange' +
+    ' laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp' +
+    ' lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length' +
+    ' let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit' +
+    ' Lindstedt linear linearinterpol linear_program linear_regression line_graph' +
+    ' linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials' +
+    ' listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry' +
+    ' log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst' +
+    ' lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact' +
+    ' lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub' +
+    ' lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma' +
+    ' make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country' +
+    ' make_polygon make_random_state make_rgb_picture makeset make_string_input_stream' +
+    ' make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom' +
+    ' maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display' +
+    ' mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker' +
+    ' max max_clique max_degree max_flow maximize_lp max_independent_set max_matching' +
+    ' maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform' +
+    ' mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete' +
+    ' mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic' +
+    ' mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t' +
+    ' mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull' +
+    ' median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree' +
+    ' min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor' +
+    ' minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton' +
+    ' mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions' +
+    ' multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff' +
+    ' multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary' +
+    ' natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext' +
+    ' newdet new_graph newline newton new_variable next_prime nicedummies niceindices' +
+    ' ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp' +
+    ' nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst' +
+    ' nthroot nullity nullspace num numbered_boundaries numberp number_to_octets' +
+    ' num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai' +
+    ' nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin' +
+    ' oid_to_octets op opena opena_binary openr openr_binary openw openw_binary' +
+    ' operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless' +
+    ' orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap' +
+    ' out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface' +
+    ' parg parGosper parse_string parse_timedate part part2cont partfrac partition' +
+    ' partition_set partpol path_digraph path_graph pathname_directory pathname_name' +
+    ' pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform' +
+    ' pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete' +
+    ' pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal' +
+    ' pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal' +
+    ' pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t' +
+    ' pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph' +
+    ' petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding' +
+    ' playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff' +
+    ' poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar' +
+    ' polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion' +
+    ' poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal' +
+    ' poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal' +
+    ' poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation' +
+    ' poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm' +
+    ' poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form' +
+    ' poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part' +
+    ' poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension' +
+    ' poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod' +
+    ' powerseries powerset prefix prev_prime primep primes principal_components' +
+    ' print printf printfile print_graph printpois printprops prodrac product properties' +
+    ' propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct' +
+    ' puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp' +
+    ' quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile' +
+    ' quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2' +
+    ' quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f' +
+    ' quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel' +
+    ' quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal' +
+    ' quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t' +
+    ' quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t' +
+    ' quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan' +
+    ' radius random random_bernoulli random_beta random_binomial random_bipartite_graph' +
+    ' random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform' +
+    ' random_exp random_f random_gamma random_general_finite_discrete random_geometric' +
+    ' random_graph random_graph1 random_gumbel random_hypergeometric random_laplace' +
+    ' random_logistic random_lognormal random_negative_binomial random_network' +
+    ' random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto' +
+    ' random_permutation random_poisson random_rayleigh random_regular_graph random_student_t' +
+    ' random_tournament random_tree random_weibull range rank rat ratcoef ratdenom' +
+    ' ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump' +
+    ' ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array' +
+    ' read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline' +
+    ' read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate' +
+    ' realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar' +
+    ' rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus' +
+    ' rem remainder remarray rembox remcomps remcon remcoord remfun remfunction' +
+    ' remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions' +
+    ' remove_fundamental_units remove_plot_option remove_vertex rempart remrule' +
+    ' remsym remvalue rename rename_file reset reset_displays residue resolvante' +
+    ' resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein' +
+    ' resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer' +
+    ' rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann' +
+    ' rinvariant risch rk rmdir rncombine romberg room rootscontract round row' +
+    ' rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i' +
+    ' scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description' +
+    ' scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second' +
+    ' sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight' +
+    ' setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state' +
+    ' set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications' +
+    ' set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path' +
+    ' show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform' +
+    ' simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert' +
+    ' sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial' +
+    ' skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp' +
+    ' skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric' +
+    ' skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic' +
+    ' skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t' +
+    ' skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t' +
+    ' skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph' +
+    ' smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve' +
+    ' solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export' +
+    ' sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1' +
+    ' spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition' +
+    ' sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus' +
+    ' ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot' +
+    ' starplot_description status std std1 std_bernoulli std_beta std_binomial' +
+    ' std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma' +
+    ' std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace' +
+    ' std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t' +
+    ' std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull' +
+    ' stemplot stirling stirling1 stirling2 strim striml strimr string stringout' +
+    ' stringp strong_components struve_h struve_l sublis sublist sublist_indices' +
+    ' submatrix subsample subset subsetp subst substinpart subst_parallel substpart' +
+    ' substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext' +
+    ' symbolp symmdifference symmetricp system take_channel take_inference tan' +
+    ' tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract' +
+    ' tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference' +
+    ' test_normality test_proportion test_proportions_difference test_rank_sum' +
+    ' test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display' +
+    ' texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter' +
+    ' toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep' +
+    ' totalfourier totient tpartpol trace tracematrix trace_options transform_sample' +
+    ' translate translate_file transpose treefale tree_reduce treillis treinat' +
+    ' triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate' +
+    ' truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph' +
+    ' truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget' +
+    ' ultraspherical underlying_graph undiff union unique uniteigenvectors unitp' +
+    ' units unit_step unitvector unorder unsum untellrat untimer' +
+    ' untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli' +
+    ' var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform' +
+    ' var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel' +
+    ' var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial' +
+    ' var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson' +
+    ' var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp' +
+    ' verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance' +
+    ' vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle' +
+    ' vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j' +
+    ' wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian' +
+    ' xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta' +
+    ' zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors' +
+    ' zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table' +
+    ' absboxchar activecontexts adapt_depth additive adim aform algebraic' +
+    ' algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic' +
+    ' animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar' +
+    ' asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top' +
+    ' azimuth background background_color backsubst berlefact bernstein_explicit' +
+    ' besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest' +
+    ' border boundaries_array box boxchar breakup %c capping cauchysum cbrange' +
+    ' cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics' +
+    ' colorbox columns commutative complex cone context contexts contour contour_levels' +
+    ' cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp' +
+    ' cube current_let_rule_package cylinder data_file_name debugmode decreasing' +
+    ' default_let_rule_package delay dependencies derivabbrev derivsubst detout' +
+    ' diagmetric diff dim dimensions dispflag display2d|10 display_format_internal' +
+    ' distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor' +
+    ' doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules' +
+    ' dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart' +
+    ' edge_color edge_coloring edge_partition edge_type edge_width %edispflag' +
+    ' elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer' +
+    ' epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type' +
+    ' %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand' +
+    ' expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine' +
+    ' factlim factorflag factorial_expand factors_only fb feature features' +
+    ' file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10' +
+    ' file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color' +
+    ' fill_density filled_func fixed_vertices flipflag float2bf font font_size' +
+    ' fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim' +
+    ' gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command' +
+    ' gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command' +
+    ' gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command' +
+    ' gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble' +
+    ' gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args' +
+    ' Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both' +
+    ' head_length head_type height hypergeometric_representation %iargs ibase' +
+    ' icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form' +
+    ' ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval' +
+    ' infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued' +
+    ' integrate_use_rootsof integration_constant integration_constant_counter interpolate_color' +
+    ' intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr' +
+    ' julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment' +
+    ' label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max' +
+    ' leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear' +
+    ' linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params' +
+    ' linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname' +
+    ' loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx' +
+    ' logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros' +
+    ' mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult' +
+    ' matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10' +
+    ' maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint' +
+    ' maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp' +
+    ' mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver' +
+    ' modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag' +
+    ' newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc' +
+    ' noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np' +
+    ' npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties' +
+    ' opsubst optimprefix optionset orientation origin orthopoly_returns_intervals' +
+    ' outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution' +
+    ' %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart' +
+    ' png_file pochhammer_max_index points pointsize point_size points_joined point_type' +
+    ' poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm' +
+    ' poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list' +
+    ' poly_secondary_elimination_order poly_top_reduction_only posfun position' +
+    ' powerdisp pred prederror primep_number_of_tests product_use_gamma program' +
+    ' programmode promote_float_to_bigfloat prompt proportional_axes props psexpand' +
+    ' ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof' +
+    ' ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann' +
+    ' ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw' +
+    ' refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs' +
+    ' rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy' +
+    ' same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck' +
+    ' setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width' +
+    ' show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type' +
+    ' show_vertices show_weight simp simplified_output simplify_products simpproduct' +
+    ' simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn' +
+    ' solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag' +
+    ' stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda' +
+    ' subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric' +
+    ' tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials' +
+    ' tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch' +
+    ' tr track transcompile transform transform_xy translate_fast_arrays transparent' +
+    ' transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex' +
+    ' tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign' +
+    ' trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars' +
+    ' tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode' +
+    ' tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes' +
+    ' ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble' +
+    ' usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition' +
+    ' vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface' +
+    ' wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel' +
+    ' xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate' +
+    ' xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel' +
+    ' xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width' +
+    ' ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis' +
+    ' ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis' +
+    ' yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob' +
+    ' zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest';
+  const SYMBOLS = '_ __ %|0 %%|0';
 
   return {
     name: 'Maxima',
@@ -371,14 +373,14 @@ export default function(hljs) {
       keyword: KEYWORDS,
       literal: LITERALS,
       built_in: BUILTIN_FUNCTIONS,
-      symbol: SYMBOLS,
+      symbol: SYMBOLS
     },
     contains: [
       {
         className: 'comment',
         begin: '/\\*',
         end: '\\*/',
-        contains: ['self']
+        contains: [ 'self' ]
       },
       hljs.QUOTE_STRING_MODE,
       {
@@ -388,7 +390,7 @@ export default function(hljs) {
           {
             // float number w/ exponent
             // hmm, I wonder if we ought to include other exponent markers?
-            begin: '\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b',
+            begin: '\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b'
           },
           {
             // bigfloat number
@@ -398,17 +400,16 @@ export default function(hljs) {
           {
             // float number w/out exponent
             // Doesn't seem to recognize floats which start with '.'
-            begin: '\\b(\\.\\d+|\\d+\\.\\d+)\\b',
+            begin: '\\b(\\.\\d+|\\d+\\.\\d+)\\b'
           },
           {
             // integer in base up to 36
             // Doesn't seem to recognize integers which end with '.'
-            begin: '\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b',
+            begin: '\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b'
           }
         ]
       }
     ],
     illegal: /@/
-  }
+  };
 }
-
diff --git a/src/languages/mel.js b/src/languages/mel.js
index 42a71377cd..ae69816b76 100644
--- a/src/languages/mel.js
+++ b/src/languages/mel.js
@@ -220,8 +220,9 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
-        begin: '`', end: '`',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        begin: '`',
+        end: '`',
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       { // eats variables
         begin: /[$%@](\^\w\b|#\w+|[^\s\w{]|\{\w+\}|\w+)/
diff --git a/src/languages/mercury.js b/src/languages/mercury.js
index ece8023bd4..c878d7871f 100644
--- a/src/languages/mercury.js
+++ b/src/languages/mercury.js
@@ -6,7 +6,7 @@ Website: https://www.mercurylang.org
 */
 
 export default function(hljs) {
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword:
       'module use_module import_module include_module end_module initialise ' +
       'mutable initialize finalize finalise interface implementation pred ' +
@@ -35,16 +35,20 @@ export default function(hljs) {
       'semidet_true semidet_false semidet_fail impure_true impure semipure'
   };
 
-  var COMMENT = hljs.COMMENT('%', '$');
+  const COMMENT = hljs.COMMENT('%', '$');
 
-  var NUMCODE = {
+  const NUMCODE = {
     className: 'number',
     begin: "0'.\\|0[box][0-9a-fA-F]*"
   };
 
-  var ATOM = hljs.inherit(hljs.APOS_STRING_MODE, {relevance: 0});
-  var STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {relevance: 0});
-  var STRING_FMT = {
+  const ATOM = hljs.inherit(hljs.APOS_STRING_MODE, {
+    relevance: 0
+  });
+  const STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+    relevance: 0
+  });
+  const STRING_FMT = {
     className: 'subst',
     begin: '\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]',
     relevance: 0
@@ -52,28 +56,48 @@ export default function(hljs) {
   STRING.contains = STRING.contains.slice(); // we need our own copy of contains
   STRING.contains.push(STRING_FMT);
 
-  var IMPLICATION = {
+  const IMPLICATION = {
     className: 'built_in',
     variants: [
-      {begin: '<=>'},
-      {begin: '<=', relevance: 0},
-      {begin: '=>', relevance: 0},
-      {begin: '/\\\\'},
-      {begin: '\\\\/'}
+      {
+        begin: '<=>'
+      },
+      {
+        begin: '<=',
+        relevance: 0
+      },
+      {
+        begin: '=>',
+        relevance: 0
+      },
+      {
+        begin: '/\\\\'
+      },
+      {
+        begin: '\\\\/'
+      }
     ]
   };
 
-  var HEAD_BODY_CONJUNCTION = {
+  const HEAD_BODY_CONJUNCTION = {
     className: 'built_in',
     variants: [
-      {begin: ':-\\|-->'},
-      {begin: '=', relevance: 0}
+      {
+        begin: ':-\\|-->'
+      },
+      {
+        begin: '=',
+        relevance: 0
+      }
     ]
   };
 
   return {
     name: 'Mercury',
-    aliases: ['m', 'moo'],
+    aliases: [
+      'm',
+      'moo'
+    ],
     keywords: KEYWORDS,
     contains: [
       IMPLICATION,
@@ -84,8 +108,12 @@ export default function(hljs) {
       hljs.NUMBER_MODE,
       ATOM,
       STRING,
-      {begin: /:-/}, // relevance booster
-      {begin: /\.$/} // relevance booster
+      { // relevance booster
+        begin: /:-/
+      },
+      { // relevance booster
+        begin: /\.$/
+      }
     ]
   };
 }
diff --git a/src/languages/mipsasm.js b/src/languages/mipsasm.js
index 6c76ed6da7..bd099d29e2 100644
--- a/src/languages/mipsasm.js
+++ b/src/languages/mipsasm.js
@@ -7,15 +7,15 @@ Category: assembler
 */
 
 export default function(hljs) {
-    //local labels: %?[FB]?[AT]?\d{1,2}\w+
+  // local labels: %?[FB]?[AT]?\d{1,2}\w+
   return {
     name: 'MIPS Assembly',
     case_insensitive: true,
-    aliases: ['mips'],
+    aliases: [ 'mips' ],
     keywords: {
       $pattern: '\\.?' + hljs.IDENT_RE,
       meta:
-        //GNU preprocs
+        // GNU preprocs
         '.2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ',
       built_in:
         '$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 ' + // integer registers
@@ -33,7 +33,7 @@ export default function(hljs) {
     contains: [
       {
         className: 'keyword',
-        begin: '\\b('+     //mnemonics
+        begin: '\\b(' + // mnemonics
             // 32-bit integer instructions
             'addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|' +
             'bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(\\.hb)?|jr(\\.hb)?|lbu?|lhu?|' +
@@ -52,7 +52,7 @@ export default function(hljs) {
             // system control instructions
             'break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|' +
             'rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|' +
-            'tlti?u?|tnei?|wait|wrpgpr'+
+            'tlti?u?|tnei?|wait|wrpgpr' +
         ')',
         end: '\\s'
       },
@@ -68,24 +68,35 @@ export default function(hljs) {
       },
       {
         className: 'title',
-        begin: '\\|', end: '\\|',
+        begin: '\\|',
+        end: '\\|',
         illegal: '\\n',
         relevance: 0
       },
       {
         className: 'number',
         variants: [
-            {begin: '0x[0-9a-f]+'}, //hex
-            {begin: '\\b-?\\d+'}           //bare number
+          { // hex
+            begin: '0x[0-9a-f]+'
+          },
+          { // bare number
+            begin: '\\b-?\\d+'
+          }
         ],
         relevance: 0
       },
       {
         className: 'symbol',
         variants: [
-            {begin: '^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:'}, //GNU MIPS syntax
-            {begin: '^\\s*[0-9]+:'}, // numbered local labels
-            {begin: '[0-9]+[bf]' }  // number local label reference (backwards, forwards)
+          { // GNU MIPS syntax
+            begin: '^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:'
+          },
+          { // numbered local labels
+            begin: '^\\s*[0-9]+:'
+          },
+          { // number local label reference (backwards, forwards)
+            begin: '[0-9]+[bf]'
+          }
         ],
         relevance: 0
       }
diff --git a/src/languages/mojolicious.js b/src/languages/mojolicious.js
index 6ead3a629d..8e8ccd5228 100644
--- a/src/languages/mojolicious.js
+++ b/src/languages/mojolicious.js
@@ -15,12 +15,13 @@ export default function(hljs) {
         className: 'meta',
         begin: '^__(END|DATA)__$'
       },
-    // mojolicious line
+      // mojolicious line
       {
-        begin: "^\\s*%{1,2}={0,2}", end: '$',
+        begin: "^\\s*%{1,2}={0,2}",
+        end: '$',
         subLanguage: 'perl'
       },
-    // mojolicious block
+      // mojolicious block
       {
         begin: "<%{1,2}={0,2}",
         end: "={0,1}%>",
diff --git a/src/languages/monkey.js b/src/languages/monkey.js
index 713d4f6102..244f69a425 100644
--- a/src/languages/monkey.js
+++ b/src/languages/monkey.js
@@ -6,8 +6,9 @@ Website: https://blitzresearch.itch.io/monkey2
 */
 
 export default function(hljs) {
-  var NUMBER = {
-    className: 'number', relevance: 0,
+  const NUMBER = {
+    className: 'number',
+    relevance: 0,
     variants: [
       {
         begin: '[$][a-fA-F0-9]+'
@@ -42,15 +43,15 @@ export default function(hljs) {
       ),
       {
         className: 'function',
-        beginKeywords: 'function method', end: '[(=:]|$',
+        beginKeywords: 'function method',
+        end: '[(=:]|$',
         illegal: /\n/,
-        contains: [
-          hljs.UNDERSCORE_TITLE_MODE
-        ]
+        contains: [ hljs.UNDERSCORE_TITLE_MODE ]
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: '$',
+        beginKeywords: 'class interface',
+        end: '$',
         contains: [
           {
             beginKeywords: 'extends implements'
@@ -64,19 +65,23 @@ export default function(hljs) {
       },
       {
         className: 'meta',
-        begin: '\\s*#', end: '$',
-        keywords: {'meta-keyword': 'if else elseif endif end then'}
+        begin: '\\s*#',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'if else elseif endif end then'
+        }
       },
       {
         className: 'meta',
         begin: '^\\s*strict\\b'
       },
       {
-        beginKeywords: 'alias', end: '=',
-        contains: [hljs.UNDERSCORE_TITLE_MODE]
+        beginKeywords: 'alias',
+        end: '=',
+        contains: [ hljs.UNDERSCORE_TITLE_MODE ]
       },
       hljs.QUOTE_STRING_MODE,
       NUMBER
     ]
-  }
+  };
 }
diff --git a/src/languages/moonscript.js b/src/languages/moonscript.js
index b66d0105f7..edb6947209 100644
--- a/src/languages/moonscript.js
+++ b/src/languages/moonscript.js
@@ -8,7 +8,7 @@ Category: scripting
 */
 
 export default function(hljs) {
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword:
       // Moonscript keywords
       'if then not for in while do return else elseif break continue switch and or ' +
@@ -21,25 +21,36 @@ export default function(hljs) {
       'select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug ' +
       'io math os package string table'
   };
-  var JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
-  var SUBST = {
+  const JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+  const SUBST = {
     className: 'subst',
-    begin: /#\{/, end: /\}/,
+    begin: /#\{/,
+    end: /\}/,
     keywords: KEYWORDS
   };
-  var EXPRESSIONS = [
+  const EXPRESSIONS = [
     hljs.inherit(hljs.C_NUMBER_MODE,
-      {starts: {end: '(\\s*/)?', relevance: 0}}), // a number tries to eat the following slash to prevent treating it as a regexp
+      {
+        starts: {
+          end: '(\\s*/)?',
+          relevance: 0
+        }
+      }), // a number tries to eat the following slash to prevent treating it as a regexp
     {
       className: 'string',
       variants: [
         {
-          begin: /'/, end: /'/,
-          contains: [hljs.BACKSLASH_ESCAPE]
+          begin: /'/,
+          end: /'/,
+          contains: [ hljs.BACKSLASH_ESCAPE ]
         },
         {
-          begin: /"/, end: /"/,
-          contains: [hljs.BACKSLASH_ESCAPE, SUBST]
+          begin: /"/,
+          end: /"/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            SUBST
+          ]
         }
       ]
     },
@@ -56,32 +67,42 @@ export default function(hljs) {
   ];
   SUBST.contains = EXPRESSIONS;
 
-  var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: JS_IDENT_RE});
-  var PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
-  var PARAMS = {
+  const TITLE = hljs.inherit(hljs.TITLE_MODE, {
+    begin: JS_IDENT_RE
+  });
+  const PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
+  const PARAMS = {
     className: 'params',
-    begin: '\\([^\\(]', returnBegin: true,
+    begin: '\\([^\\(]',
+    returnBegin: true,
     /* We need another contained nameless mode to not have every nested
     pair of parens to be called "params" */
-    contains: [{
-      begin: /\(/, end: /\)/,
-      keywords: KEYWORDS,
-      contains: ['self'].concat(EXPRESSIONS)
-    }]
+    contains: [
+      {
+        begin: /\(/,
+        end: /\)/,
+        keywords: KEYWORDS,
+        contains: [ 'self' ].concat(EXPRESSIONS)
+      }
+    ]
   };
 
   return {
     name: 'MoonScript',
-    aliases: ['moon'],
+    aliases: [ 'moon' ],
     keywords: KEYWORDS,
     illegal: /\/\*/,
     contains: EXPRESSIONS.concat([
       hljs.COMMENT('--', '$'),
       {
-        className: 'function',  // function: -> =>
-        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE, end: '[-=]>',
+        className: 'function', // function: -> =>
+        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE,
+        end: '[-=]>',
         returnBegin: true,
-        contains: [TITLE, PARAMS]
+        contains: [
+          TITLE,
+          PARAMS
+        ]
       },
       {
         begin: /[\(,:=]\s*/, // anonymous function start
@@ -89,9 +110,10 @@ export default function(hljs) {
         contains: [
           {
             className: 'function',
-            begin: PARAMS_RE, end: '[-=]>',
+            begin: PARAMS_RE,
+            end: '[-=]>',
             returnBegin: true,
-            contains: [PARAMS]
+            contains: [ PARAMS ]
           }
         ]
       },
@@ -105,15 +127,17 @@ export default function(hljs) {
             beginKeywords: 'extends',
             endsWithParent: true,
             illegal: /[:="\[\]]/,
-            contains: [TITLE]
+            contains: [ TITLE ]
           },
           TITLE
         ]
       },
       {
-        className: 'name',    // table
-        begin: JS_IDENT_RE + ':', end: ':',
-        returnBegin: true, returnEnd: true,
+        className: 'name', // table
+        begin: JS_IDENT_RE + ':',
+        end: ':',
+        returnBegin: true,
+        returnEnd: true,
         relevance: 0
       }
     ])
diff --git a/src/languages/nginx.js b/src/languages/nginx.js
index f32a2173fa..c6bddb6b64 100644
--- a/src/languages/nginx.js
+++ b/src/languages/nginx.js
@@ -7,15 +7,22 @@ Website: https://www.nginx.com
 */
 
 export default function(hljs) {
-  var VAR = {
+  const VAR = {
     className: 'variable',
     variants: [
-      {begin: /\$\d+/},
-      {begin: /\$\{/, end: /\}/},
-      {begin: /[$@]/ + hljs.UNDERSCORE_IDENT_RE}
+      {
+        begin: /\$\d+/
+      },
+      {
+        begin: /\$\{/,
+        end: /\}/
+      },
+      {
+        begin: /[$@]/ + hljs.UNDERSCORE_IDENT_RE
+      }
     ]
   };
-  var DEFAULT = {
+  const DEFAULT = {
     endsWithParent: true,
     keywords: {
       $pattern: '[a-z/_]+',
@@ -29,28 +36,55 @@ export default function(hljs) {
       hljs.HASH_COMMENT_MODE,
       {
         className: 'string',
-        contains: [hljs.BACKSLASH_ESCAPE, VAR],
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          VAR
+        ],
         variants: [
-          {begin: /"/, end: /"/},
-          {begin: /'/, end: /'/}
+          {
+            begin: /"/,
+            end: /"/
+          },
+          {
+            begin: /'/,
+            end: /'/
+          }
         ]
       },
       // this swallows entire URLs to avoid detecting numbers within
       {
-        begin: '([a-z]+):/', end: '\\s', endsWithParent: true, excludeEnd: true,
-        contains: [VAR]
+        begin: '([a-z]+):/',
+        end: '\\s',
+        endsWithParent: true,
+        excludeEnd: true,
+        contains: [ VAR ]
       },
       {
         className: 'regexp',
-        contains: [hljs.BACKSLASH_ESCAPE, VAR],
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          VAR
+        ],
         variants: [
-          {begin: "\\s\\^", end: "\\s|\\{|;", returnEnd: true},
+          {
+            begin: "\\s\\^",
+            end: "\\s|\\{|;",
+            returnEnd: true
+          },
           // regexp locations (~, ~*)
-          {begin: "~\\*?\\s+", end: "\\s|\\{|;", returnEnd: true},
+          {
+            begin: "~\\*?\\s+",
+            end: "\\s|\\{|;",
+            returnEnd: true
+          },
           // *.example.com
-          {begin: "\\*(\\.[a-z\\-]+)+"},
+          {
+            begin: "\\*(\\.[a-z\\-]+)+"
+          },
           // sub.example.*
-          {begin: "([a-z\\-]+\\.)+\\*"}
+          {
+            begin: "([a-z\\-]+\\.)+\\*"
+          }
         ]
       },
       // IP
@@ -70,11 +104,12 @@ export default function(hljs) {
 
   return {
     name: 'Nginx config',
-    aliases: ['nginxconf'],
+    aliases: [ 'nginxconf' ],
     contains: [
       hljs.HASH_COMMENT_MODE,
       {
-        begin: hljs.UNDERSCORE_IDENT_RE + '\\s+\\{', returnBegin: true,
+        begin: hljs.UNDERSCORE_IDENT_RE + '\\s+\\{',
+        returnBegin: true,
         end: /\{/,
         contains: [
           {
@@ -85,7 +120,9 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: hljs.UNDERSCORE_IDENT_RE + '\\s', end: ';|\\{', returnBegin: true,
+        begin: hljs.UNDERSCORE_IDENT_RE + '\\s',
+        end: ';|\\{',
+        returnBegin: true,
         contains: [
           {
             className: 'attribute',
diff --git a/src/languages/nim.js b/src/languages/nim.js
index 6c7e56bc87..3ff52fff3a 100644
--- a/src/languages/nim.js
+++ b/src/languages/nim.js
@@ -8,7 +8,7 @@ Category: system
 export default function(hljs) {
   return {
     name: 'Nim',
-    aliases: ['nim'],
+    aliases: [ 'nim' ],
     keywords: {
       keyword:
         'addr and as asm bind block break case cast const continue converter ' +
@@ -26,17 +26,24 @@ export default function(hljs) {
         'cschar cshort cint csize clonglong cfloat cdouble clongdouble ' +
         'cuchar cushort cuint culonglong cstringarray semistatic'
     },
-    contains: [ {
+    contains: [
+      {
         className: 'meta', // Actually pragma
         begin: /\{\./,
         end: /\.\}/,
         relevance: 10
-      }, {
+      },
+      {
         className: 'string',
         begin: /[a-zA-Z]\w*"/,
         end: /"/,
-        contains: [{begin: /""/}]
-      }, {
+        contains: [
+          {
+            begin: /""/
+          }
+        ]
+      },
+      {
         className: 'string',
         begin: /([a-zA-Z]\w*)?"""/,
         end: /"""/
@@ -46,17 +53,26 @@ export default function(hljs) {
         className: 'type',
         begin: /\b[A-Z]\w+\b/,
         relevance: 0
-      }, {
+      },
+      {
         className: 'number',
         relevance: 0,
         variants: [
-          {begin: /\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},
-          {begin: /\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},
-          {begin: /\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},
-          {begin: /\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}
+          {
+            begin: /\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/
+          },
+          {
+            begin: /\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/
+          },
+          {
+            begin: /\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/
+          },
+          {
+            begin: /\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/
+          }
         ]
       },
       hljs.HASH_COMMENT_MODE
     ]
-  }
+  };
 }
diff --git a/src/languages/nix.js b/src/languages/nix.js
index e36f760e1e..e1bddc2362 100644
--- a/src/languages/nix.js
+++ b/src/languages/nix.js
@@ -5,9 +5,8 @@ Description: Nix functional language
 Website: http://nixos.org/nix
 */
 
-
 export default function(hljs) {
-  var NIX_KEYWORDS = {
+  const NIX_KEYWORDS = {
     keyword:
       'rec with let in inherit assert if else then',
     literal:
@@ -16,14 +15,15 @@ export default function(hljs) {
       'import abort baseNameOf dirOf isNull builtins map removeAttrs throw ' +
       'toString derivation'
   };
-  var ANTIQUOTE = {
+  const ANTIQUOTE = {
     className: 'subst',
     begin: /\$\{/,
     end: /\}/,
     keywords: NIX_KEYWORDS
   };
-  var ATTRS = {
-    begin: /[a-zA-Z0-9-_]+(\s*=)/, returnBegin: true,
+  const ATTRS = {
+    begin: /[a-zA-Z0-9-_]+(\s*=)/,
+    returnBegin: true,
     relevance: 0,
     contains: [
       {
@@ -32,15 +32,21 @@ export default function(hljs) {
       }
     ]
   };
-  var STRING = {
+  const STRING = {
     className: 'string',
-    contains: [ANTIQUOTE],
+    contains: [ ANTIQUOTE ],
     variants: [
-      {begin: "''", end: "''"},
-      {begin: '"', end: '"'}
+      {
+        begin: "''",
+        end: "''"
+      },
+      {
+        begin: '"',
+        end: '"'
+      }
     ]
   };
-  var EXPRESSIONS = [
+  const EXPRESSIONS = [
     hljs.NUMBER_MODE,
     hljs.HASH_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
@@ -50,7 +56,7 @@ export default function(hljs) {
   ANTIQUOTE.contains = EXPRESSIONS;
   return {
     name: 'Nix',
-    aliases: ["nixos"],
+    aliases: [ "nixos" ],
     keywords: NIX_KEYWORDS,
     contains: EXPRESSIONS
   };
diff --git a/src/languages/node-repl.js b/src/languages/node-repl.js
index 1de130f204..55a849db3b 100644
--- a/src/languages/node-repl.js
+++ b/src/languages/node-repl.js
@@ -7,24 +7,29 @@ Category: scripting
 
 /** @type LanguageFn */
 export default function(hljs) {
-    return {
-      name: 'Node REPL',
-      contains: [
-        {
-          className: 'meta',
+  return {
+    name: 'Node REPL',
+    contains: [
+      {
+        className: 'meta',
+        starts: {
+          // a space separates the REPL prefix from the actual code
+          // this is purely for cleaner HTML output
+          end: / |$/,
           starts: {
-            // a space separates the REPL prefix from the actual code
-            // this is purely for cleaner HTML output
-            end: / |$/,
-            starts: {
-              end: '$', subLanguage: 'javascript'
-            }
-          },
-          variants: [
-            { begin: /^>(?=[ ]|$)/ },
-            { begin: /^\.\.\.(?=[ ]|$)/ }
-          ]
+            end: '$',
+            subLanguage: 'javascript'
+          }
         },
-      ]
-    }
-  }
+        variants: [
+          {
+            begin: /^>(?=[ ]|$)/
+          },
+          {
+            begin: /^\.\.\.(?=[ ]|$)/
+          }
+        ]
+      }
+    ]
+  };
+}
diff --git a/src/languages/nsis.js b/src/languages/nsis.js
index 17cfc950b1..59956cbfaf 100644
--- a/src/languages/nsis.js
+++ b/src/languages/nsis.js
@@ -6,75 +6,78 @@ Website: https://nsis.sourceforge.io/Main_Page
 */
 
 export default function(hljs) {
-  var CONSTANTS = {
+  const CONSTANTS = {
     className: 'variable',
     begin: /\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/
   };
 
-  var DEFINES = {
+  const DEFINES = {
     // ${defines}
     className: 'variable',
     begin: /\$+\{[\w.:-]+\}/
   };
 
-  var VARIABLES = {
+  const VARIABLES = {
     // $variables
     className: 'variable',
     begin: /\$+\w+/,
     illegal: /\(\)\{\}/
   };
 
-  var LANGUAGES = {
+  const LANGUAGES = {
     // $(language_strings)
     className: 'variable',
     begin: /\$+\([\w^.:-]+\)/
   };
 
-  var PARAMETERS = {
+  const PARAMETERS = {
     // command parameters
     className: 'params',
     begin: '(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)'
   };
 
-  var COMPILER = {
+  const COMPILER = {
     // !compiler_flags
     className: 'keyword',
     begin: /!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/
   };
 
-  var METACHARS = {
+  const METACHARS = {
     // $\n, $\r, $\t, $$
     className: 'meta',
     begin: /\$(\\[nrt]|\$)/
   };
 
-  var PLUGINS = {
+  const PLUGINS = {
     // plug::ins
     className: 'class',
     begin: /\w+::\w+/
   };
 
-    var STRING = {
-      className: 'string',
-      variants: [
-        {
-          begin: '"', end: '"'
-        },
-        {
-          begin: '\'', end: '\''
-        },
-        {
-          begin: '`', end: '`'
-        }
-      ],
-      illegal: /\n/,
-      contains: [
-        METACHARS,
-        CONSTANTS,
-        DEFINES,
-        VARIABLES,
-        LANGUAGES
-      ]
+  const STRING = {
+    className: 'string',
+    variants: [
+      {
+        begin: '"',
+        end: '"'
+      },
+      {
+        begin: '\'',
+        end: '\''
+      },
+      {
+        begin: '`',
+        end: '`'
+      }
+    ],
+    illegal: /\n/,
+    contains: [
+      METACHARS,
+      CONSTANTS,
+      DEFINES,
+      VARIABLES,
+      LANGUAGES
+    ]
   };
 
   return {
@@ -98,7 +101,8 @@ export default function(hljs) {
       ),
       {
         className: 'function',
-        beginKeywords: 'Function PageEx Section SectionGroup', end: '$'
+        beginKeywords: 'Function PageEx Section SectionGroup',
+        end: '$'
       },
       STRING,
       COMPILER,
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index 9aaa4a5055..bb79180c6a 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -7,12 +7,12 @@ Category: common
 */
 
 export default function(hljs) {
-  var API_CLASS = {
+  const API_CLASS = {
     className: 'built_in',
-    begin: '\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+',
+    begin: '\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+'
   };
-  var IDENTIFIER_RE = /[a-zA-Z@][a-zA-Z0-9_]*/;
-  var OBJC_KEYWORDS = {
+  const IDENTIFIER_RE = /[a-zA-Z@][a-zA-Z0-9_]*/;
+  const OBJC_KEYWORDS = {
     $pattern: IDENTIFIER_RE,
     keyword:
       'int float while char export sizeof typedef const struct for union ' +
@@ -42,13 +42,19 @@ export default function(hljs) {
     built_in:
       'BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once'
   };
-  var CLASS_KEYWORDS = {
+  const CLASS_KEYWORDS = {
     $pattern: IDENTIFIER_RE,
     keyword: '@interface @class @protocol @implementation'
   };
   return {
     name: 'Objective-C',
-    aliases: ['mm', 'objc', 'obj-c', 'obj-c++', 'objective-c++'],
+    aliases: [
+      'mm',
+      'objc',
+      'obj-c',
+      'obj-c++',
+      'objective-c++'
+    ],
     keywords: OBJC_KEYWORDS,
     illegal: '</',
     contains: [
@@ -62,15 +68,17 @@ export default function(hljs) {
         className: 'string',
         variants: [
           {
-            begin: '@"', end: '"',
+            begin: '@"',
+            end: '"',
             illegal: '\\n',
-            contains: [hljs.BACKSLASH_ESCAPE]
+            contains: [ hljs.BACKSLASH_ESCAPE ]
           }
         ]
       },
       {
         className: 'meta',
-        begin: /#\s*[a-z]+\b/, end: /$/,
+        begin: /#\s*[a-z]+\b/,
+        end: /$/,
         keywords: {
           'meta-keyword':
             'if else elif endif define undef warning error line ' +
@@ -78,13 +86,17 @@ export default function(hljs) {
         },
         contains: [
           {
-            begin: /\\\n/, relevance: 0
+            begin: /\\\n/,
+            relevance: 0
           },
-          hljs.inherit(hljs.QUOTE_STRING_MODE, {className: 'meta-string'}),
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {
+            className: 'meta-string'
+          }),
           {
             className: 'meta-string',
-            begin: /<.*?>/, end: /$/,
-            illegal: '\\n',
+            begin: /<.*?>/,
+            end: /$/,
+            illegal: '\\n'
           },
           hljs.C_LINE_COMMENT_MODE,
           hljs.C_BLOCK_COMMENT_MODE
@@ -92,14 +104,14 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        begin: '(' + CLASS_KEYWORDS.keyword.split(' ').join('|') + ')\\b', end: /(\{|$)/, excludeEnd: true,
+        begin: '(' + CLASS_KEYWORDS.keyword.split(' ').join('|') + ')\\b',
+        end: /(\{|$)/,
+        excludeEnd: true,
         keywords: CLASS_KEYWORDS,
-        contains: [
-          hljs.UNDERSCORE_TITLE_MODE
-        ]
+        contains: [ hljs.UNDERSCORE_TITLE_MODE ]
       },
       {
-        begin: '\\.'+hljs.UNDERSCORE_IDENT_RE,
+        begin: '\\.' + hljs.UNDERSCORE_IDENT_RE,
         relevance: 0
       }
     ]
diff --git a/src/languages/openscad.js b/src/languages/openscad.js
index ff1f19b635..e03a2a6361 100644
--- a/src/languages/openscad.js
+++ b/src/languages/openscad.js
@@ -7,59 +7,73 @@ Category: scientific
 */
 
 export default function(hljs) {
-	var SPECIAL_VARS = {
-		className: 'keyword',
-		begin: '\\$(f[asn]|t|vp[rtd]|children)'
-	},
-	LITERALS = {
-		className: 'literal',
-		begin: 'false|true|PI|undef'
-	},
-	NUMBERS = {
-		className: 'number',
-		begin: '\\b\\d+(\\.\\d+)?(e-?\\d+)?', //adds 1e5, 1e-10
-		relevance: 0
-	},
-	STRING = hljs.inherit(hljs.QUOTE_STRING_MODE,{illegal: null}),
-	PREPRO = {
-		className: 'meta',
-		keywords: {'meta-keyword': 'include use'},
-		begin: 'include|use <',
-		end: '>'
-	},
-	PARAMS = {
-		className: 'params',
-		begin: '\\(', end: '\\)',
-		contains: ['self', NUMBERS, STRING, SPECIAL_VARS, LITERALS]
-	},
-	MODIFIERS = {
-		begin: '[*!#%]',
-		relevance: 0
-	},
-	FUNCTIONS = {
-		className: 'function',
-		beginKeywords: 'module function',
-		end: /=|\{/,
-		contains: [PARAMS, hljs.UNDERSCORE_TITLE_MODE]
-	};
+  const SPECIAL_VARS = {
+    className: 'keyword',
+    begin: '\\$(f[asn]|t|vp[rtd]|children)'
+  };
+  const LITERALS = {
+    className: 'literal',
+    begin: 'false|true|PI|undef'
+  };
+  const NUMBERS = {
+    className: 'number',
+    begin: '\\b\\d+(\\.\\d+)?(e-?\\d+)?', // adds 1e5, 1e-10
+    relevance: 0
+  };
+  const STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+    illegal: null
+  });
+  const PREPRO = {
+    className: 'meta',
+    keywords: {
+      'meta-keyword': 'include use'
+    },
+    begin: 'include|use <',
+    end: '>'
+  };
+  const PARAMS = {
+    className: 'params',
+    begin: '\\(',
+    end: '\\)',
+    contains: [
+      'self',
+      NUMBERS,
+      STRING,
+      SPECIAL_VARS,
+      LITERALS
+    ]
+  };
+  const MODIFIERS = {
+    begin: '[*!#%]',
+    relevance: 0
+  };
+  const FUNCTIONS = {
+    className: 'function',
+    beginKeywords: 'module function',
+    end: /=|\{/,
+    contains: [
+      PARAMS,
+      hljs.UNDERSCORE_TITLE_MODE
+    ]
+  };
 
-	return {
-		name: 'OpenSCAD',
-		aliases: ['scad'],
-		keywords: {
-			keyword: 'function module include use for intersection_for if else \\%',
-			literal: 'false true PI undef',
-			built_in: 'circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign'
-		},
-		contains: [
-			hljs.C_LINE_COMMENT_MODE,
-			hljs.C_BLOCK_COMMENT_MODE,
-			NUMBERS,
-			PREPRO,
-			STRING,
-			SPECIAL_VARS,
-			MODIFIERS,
-			FUNCTIONS
-		]
-	}
+  return {
+    name: 'OpenSCAD',
+    aliases: [ 'scad' ],
+    keywords: {
+      keyword: 'function module include use for intersection_for if else \\%',
+      literal: 'false true PI undef',
+      built_in: 'circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign'
+    },
+    contains: [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      NUMBERS,
+      PREPRO,
+      STRING,
+      SPECIAL_VARS,
+      MODIFIERS,
+      FUNCTIONS
+    ]
+  };
 }
diff --git a/src/languages/oxygene.js b/src/languages/oxygene.js
index 0eda124f94..6eaef0d295 100644
--- a/src/languages/oxygene.js
+++ b/src/languages/oxygene.js
@@ -6,52 +6,65 @@ Website: https://www.elementscompiler.com/elements/default.aspx
 */
 
 export default function(hljs) {
-  var OXYGENE_KEYWORDS = {
+  const OXYGENE_KEYWORDS = {
     $pattern: /\.?\w+/,
-    keyword: 'abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue '+
-    'create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false '+
-    'final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited '+
-    'inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of '+
-    'old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly '+
-    'record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple '+
-    'type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal '+
-    'register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained'
+    keyword:
+      'abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue ' +
+      'create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false ' +
+      'final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited ' +
+      'inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of ' +
+      'old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly ' +
+      'record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple ' +
+      'type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal ' +
+      'register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained'
   };
-  var CURLY_COMMENT = hljs.COMMENT(
+  const CURLY_COMMENT = hljs.COMMENT(
     /\{/,
     /\}/,
     {
       relevance: 0
     }
   );
-  var PAREN_COMMENT = hljs.COMMENT(
+  const PAREN_COMMENT = hljs.COMMENT(
     '\\(\\*',
     '\\*\\)',
     {
       relevance: 10
     }
   );
-  var STRING = {
+  const STRING = {
     className: 'string',
-    begin: '\'', end: '\'',
-    contains: [{begin: '\'\''}]
+    begin: '\'',
+    end: '\'',
+    contains: [
+      {
+        begin: '\'\''
+      }
+    ]
   };
-  var CHAR_STRING = {
-    className: 'string', begin: '(#\\d+)+'
+  const CHAR_STRING = {
+    className: 'string',
+    begin: '(#\\d+)+'
   };
-  var FUNCTION = {
+  const FUNCTION = {
     className: 'function',
-    beginKeywords: 'function constructor destructor procedure method', end: '[:;]',
+    beginKeywords: 'function constructor destructor procedure method',
+    end: '[:;]',
     keywords: 'function constructor|10 destructor|10 procedure|10 method|10',
     contains: [
       hljs.TITLE_MODE,
       {
         className: 'params',
-        begin: '\\(', end: '\\)',
+        begin: '\\(',
+        end: '\\)',
         keywords: OXYGENE_KEYWORDS,
-        contains: [STRING, CHAR_STRING]
+        contains: [
+          STRING,
+          CHAR_STRING
+        ]
       },
-      CURLY_COMMENT, PAREN_COMMENT
+      CURLY_COMMENT,
+      PAREN_COMMENT
     ]
   };
   return {
@@ -60,17 +73,24 @@ export default function(hljs) {
     keywords: OXYGENE_KEYWORDS,
     illegal: '("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',
     contains: [
-      CURLY_COMMENT, PAREN_COMMENT, hljs.C_LINE_COMMENT_MODE,
-      STRING, CHAR_STRING,
+      CURLY_COMMENT,
+      PAREN_COMMENT,
+      hljs.C_LINE_COMMENT_MODE,
+      STRING,
+      CHAR_STRING,
       hljs.NUMBER_MODE,
       FUNCTION,
       {
         className: 'class',
-        begin: '=\\bclass\\b', end: 'end;',
+        begin: '=\\bclass\\b',
+        end: 'end;',
         keywords: OXYGENE_KEYWORDS,
         contains: [
-          STRING, CHAR_STRING,
-          CURLY_COMMENT, PAREN_COMMENT, hljs.C_LINE_COMMENT_MODE,
+          STRING,
+          CHAR_STRING,
+          CURLY_COMMENT,
+          PAREN_COMMENT,
+          hljs.C_LINE_COMMENT_MODE,
           FUNCTION
         ]
       }
diff --git a/src/languages/parser3.js b/src/languages/parser3.js
index e300fc4109..737d9248d5 100644
--- a/src/languages/parser3.js
+++ b/src/languages/parser3.js
@@ -7,16 +7,17 @@ Category: template
 */
 
 export default function(hljs) {
-  var CURLY_SUBCOMMENT = hljs.COMMENT(
+  const CURLY_SUBCOMMENT = hljs.COMMENT(
     /\{/,
     /\}/,
     {
-      contains: ['self']
+      contains: [ 'self' ]
     }
   );
   return {
     name: 'Parser3',
-    subLanguage: 'xml', relevance: 0,
+    subLanguage: 'xml',
+    relevance: 0,
     contains: [
       hljs.COMMENT('^#', '$'),
       hljs.COMMENT(
@@ -24,9 +25,7 @@ export default function(hljs) {
         /\}/,
         {
           relevance: 10,
-          contains: [
-            CURLY_SUBCOMMENT
-          ]
+          contains: [ CURLY_SUBCOMMENT ]
         }
       ),
       {
diff --git a/src/languages/pf.js b/src/languages/pf.js
index 6c16cac0b0..301050fbd4 100644
--- a/src/languages/pf.js
+++ b/src/languages/pf.js
@@ -7,22 +7,24 @@ Category: config
 */
 
 export default function(hljs) {
-  var MACRO = {
+  const MACRO = {
     className: 'variable',
     begin: /\$[\w\d#@][\w\d_]*/
   };
-  var TABLE = {
+  const TABLE = {
     className: 'variable',
-    begin: /<(?!\/)/, end: />/
+    begin: /<(?!\/)/,
+    end: />/
   };
-  var QUOTE_STRING = {
+  const QUOTE_STRING = {
     className: 'string',
-    begin: /"/, end: /"/
+    begin: /"/,
+    end: /"/
   };
 
   return {
     name: 'Packet Filter config',
-    aliases: ['pf.conf'],
+    aliases: [ 'pf.conf' ],
     keywords: {
       $pattern: /[a-z0-9_<>-]+/,
       built_in: /* block match pass are "actions" in pf.conf(5), the rest are
diff --git a/src/languages/pgsql.js b/src/languages/pgsql.js
index 78a0744924..9858da526f 100644
--- a/src/languages/pgsql.js
+++ b/src/languages/pgsql.js
@@ -17,12 +17,12 @@ Description:
 */
 
 export default function(hljs) {
-  var COMMENT_MODE = hljs.COMMENT('--', '$');
-  var UNQUOTED_IDENT = '[a-zA-Z_][a-zA-Z_0-9$]*';
-  var DOLLAR_STRING = '\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$';
-  var LABEL = '<<\\s*' + UNQUOTED_IDENT + '\\s*>>';
+  const COMMENT_MODE = hljs.COMMENT('--', '$');
+  const UNQUOTED_IDENT = '[a-zA-Z_][a-zA-Z_0-9$]*';
+  const DOLLAR_STRING = '\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$';
+  const LABEL = '<<\\s*' + UNQUOTED_IDENT + '\\s*>>';
 
-  var SQL_KW =
+  const SQL_KW =
     // https://www.postgresql.org/docs/11/static/sql-keywords-appendix.html
     // https://www.postgresql.org/docs/11/static/sql-commands.html
     // SQL commands (starting words)
@@ -68,16 +68,16 @@ export default function(hljs) {
     // actually literals, but look better this way (due to IS TRUE, IS FALSE, ISNULL etc)
     'TRUE FALSE NAN INFINITY ';
 
-  var ROLE_ATTRS = // only those not in keywrods already
+  const ROLE_ATTRS = // only those not in keywrods already
     'SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT ' +
     'LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ';
 
-  var PLPGSQL_KW =
+  const PLPGSQL_KW =
     'ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS ' +
     'STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT ' +
     'OPEN ';
 
-  var TYPES =
+  const TYPES =
     // https://www.postgresql.org/docs/11/static/datatype.html
     'BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR ' +
     'CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 ' +
@@ -93,20 +93,20 @@ export default function(hljs) {
     // OID-types
     'OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 ' +
     'REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ';// +
-    // some types from standard extensions
-    'HSTORE|10 LO LTREE|10 ';
+  // some types from standard extensions
+  'HSTORE|10 LO LTREE|10 ';
 
-  var TYPES_RE =
+  const TYPES_RE =
     TYPES.trim()
-         .split(' ')
-         .map( function(val) { return val.split('|')[0]; } )
-         .join('|');
+      .split(' ')
+      .map(function(val) { return val.split('|')[0]; })
+      .join('|');
 
-  var SQL_BI =
+  const SQL_BI =
     'CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP ' +
     'CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC ';
 
-  var PLPGSQL_BI =
+  const PLPGSQL_BI =
     'FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 ' +
     'TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ' +
     // get diagnostics
@@ -114,7 +114,7 @@ export default function(hljs) {
     'PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 ' +
     'PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 ';
 
-  var PLPGSQL_EXCEPTIONS =
+  const PLPGSQL_EXCEPTIONS =
     // exceptions https://www.postgresql.org/docs/current/static/errcodes-appendix.html
     'SQLSTATE SQLERRM|10 ' +
     'SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING ' +
@@ -192,7 +192,7 @@ export default function(hljs) {
     'RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED ' +
     'INDEX_CORRUPTED ';
 
-  var FUNCTIONS =
+  const FUNCTIONS =
     // https://www.postgresql.org/docs/11/static/functions-aggregate.html
     'ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG ' +
     'JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG ' +
@@ -283,224 +283,348 @@ export default function(hljs) {
     //
     'GROUPING CAST ';
 
-    var FUNCTIONS_RE =
+  const FUNCTIONS_RE =
       FUNCTIONS.trim()
-               .split(' ')
-               .map( function(val) { return val.split('|')[0]; } )
-               .join('|');
+        .split(' ')
+        .map(function(val) { return val.split('|')[0]; })
+        .join('|');
 
-    return {
-        name: 'PostgreSQL',
-        aliases: ['postgres','postgresql'],
-        case_insensitive: true,
-        keywords: {
-          keyword:
+  return {
+    name: 'PostgreSQL',
+    aliases: [
+      'postgres',
+      'postgresql'
+    ],
+    case_insensitive: true,
+    keywords: {
+      keyword:
             SQL_KW + PLPGSQL_KW + ROLE_ATTRS,
-          built_in:
-            SQL_BI + PLPGSQL_BI + PLPGSQL_EXCEPTIONS,
-        },
-        // Forbid some cunstructs from other languages to improve autodetect. In fact
-        // "[a-z]:" is legal (as part of array slice), but improbabal.
-        illegal: /:==|\W\s*\(\*|(^|\s)\$[a-z]|\{\{|[a-z]:\s*$|\.\.\.|TO:|DO:/,
-        contains: [
-          // special handling of some words, which are reserved only in some contexts
-          {
-            className: 'keyword',
-            variants: [
-              { begin: /\bTEXT\s*SEARCH\b/ },
-              { begin: /\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/ },
-              { begin: /\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/ },
-              { begin: /\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/ },
-              { begin: /\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/ },
-              { begin: /\bNULLS\s+(FIRST|LAST)\b/ },
-              { begin: /\bEVENT\s+TRIGGER\b/ },
-              { begin: /\b(MAPPING|OR)\s+REPLACE\b/ },
-              { begin: /\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/ },
-              { begin: /\b(SHARE|EXCLUSIVE)\s+MODE\b/ },
-              { begin: /\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/ },
-              { begin: /\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/ },
-              { begin: /\bPRESERVE\s+ROWS\b/ },
-              { begin: /\bDISCARD\s+PLANS\b/ },
-              { begin: /\bREFERENCING\s+(OLD|NEW)\b/ },
-              { begin: /\bSKIP\s+LOCKED\b/ },
-              { begin: /\bGROUPING\s+SETS\b/ },
-              { begin: /\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/ },
-              { begin: /\b(WITH|WITHOUT)\s+HOLD\b/ },
-              { begin: /\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/ },
-              { begin: /\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/ },
-              { begin: /\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/ },
-              { begin: /\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/ },
-              { begin: /\bIS\s+(NOT\s+)?UNKNOWN\b/ },
-              { begin: /\bSECURITY\s+LABEL\b/ },
-              { begin: /\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/ },
-              { begin: /\bWITH\s+(NO\s+)?DATA\b/ },
-              { begin: /\b(FOREIGN|SET)\s+DATA\b/ },
-              { begin: /\bSET\s+(CATALOG|CONSTRAINTS)\b/ },
-              { begin: /\b(WITH|FOR)\s+ORDINALITY\b/ },
-              { begin: /\bIS\s+(NOT\s+)?DOCUMENT\b/ },
-              { begin: /\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/ },
-              { begin: /\b(STRIP|PRESERVE)\s+WHITESPACE\b/ },
-              { begin: /\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/ },
-              { begin: /\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/ },
-              { begin: /\bAT\s+TIME\s+ZONE\b/ },
-              { begin: /\bGRANTED\s+BY\b/ },
-              { begin: /\bRETURN\s+(QUERY|NEXT)\b/ },
-              { begin: /\b(ATTACH|DETACH)\s+PARTITION\b/ },
-              { begin: /\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/ },
-              { begin: /\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/ },
-              { begin: /\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/ }
-            ]
-          },
-          // functions named as keywords, followed by '('
-          {
-            begin: /\b(FORMAT|FAMILY|VERSION)\s*\(/,
-            //keywords: { built_in: 'FORMAT FAMILY VERSION' }
-          },
-          // INCLUDE ( ... ) in index_parameters in CREATE TABLE
-          {
-            begin: /\bINCLUDE\s*\(/,
-            keywords: 'INCLUDE'
-          },
-          // not highlight RANGE if not in frame_clause (not 100% correct, but seems satisfactory)
-          {
-            begin: /\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/
-          },
-          // disable highlighting in commands CREATE AGGREGATE/COLLATION/DATABASE/OPERTOR/TEXT SEARCH .../TYPE
-          // and in PL/pgSQL RAISE ... USING
-          {
-            begin: /\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/
-          },
-          // PG_smth; HAS_some_PRIVILEGE
-          {
-            //className: 'built_in',
-            begin: /\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,
-            relevance: 10
+      built_in:
+            SQL_BI + PLPGSQL_BI + PLPGSQL_EXCEPTIONS
+    },
+    // Forbid some cunstructs from other languages to improve autodetect. In fact
+    // "[a-z]:" is legal (as part of array slice), but improbabal.
+    illegal: /:==|\W\s*\(\*|(^|\s)\$[a-z]|\{\{|[a-z]:\s*$|\.\.\.|TO:|DO:/,
+    contains: [
+      // special handling of some words, which are reserved only in some contexts
+      {
+        className: 'keyword',
+        variants: [
+          {
+            begin: /\bTEXT\s*SEARCH\b/
           },
-          // extract
           {
-            begin: /\bEXTRACT\s*\(/,
-            end: /\bFROM\b/,
-            returnEnd: true,
-            keywords: {
-              //built_in: 'EXTRACT',
-              type:     'CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS ' +
-                        'MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR ' +
-                        'TIMEZONE_MINUTE WEEK YEAR'
-            }
+            begin: /\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/
           },
-          // xmlelement, xmlpi - special NAME
           {
-            begin: /\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,
-            keywords: {
-              //built_in: 'XMLELEMENT XMLPI',
-              keyword:  'NAME'
-            }
+            begin: /\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/
           },
-          // xmlparse, xmlserialize
           {
-            begin: /\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,
-            keywords: {
-              //built_in: 'XMLPARSE XMLSERIALIZE',
-              keyword:  'DOCUMENT CONTENT'
-            }
+            begin: /\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/
           },
-          // Sequences. We actually skip everything between CACHE|INCREMENT|MAXVALUE|MINVALUE and
-          // nearest following numeric constant. Without with trick we find a lot of "keywords"
-          // in 'avrasm' autodetection test...
           {
-            beginKeywords: 'CACHE INCREMENT MAXVALUE MINVALUE',
-            end: hljs.C_NUMBER_RE,
-            returnEnd: true,
-            keywords: 'BY CACHE INCREMENT MAXVALUE MINVALUE'
+            begin: /\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/
           },
-          // WITH|WITHOUT TIME ZONE as part of datatype
           {
-            className: 'type',
-            begin: /\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/
+            begin: /\bNULLS\s+(FIRST|LAST)\b/
           },
-          // INTERVAL optional fields
           {
-            className: 'type',
-            begin: /\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/
+            begin: /\bEVENT\s+TRIGGER\b/
           },
-          // Pseudo-types which allowed only as return type
           {
-            begin: /\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,
-            keywords: {
-              keyword: 'RETURNS',
-              type: 'LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER'
-            }
+            begin: /\b(MAPPING|OR)\s+REPLACE\b/
           },
-          // Known functions - only when followed by '('
           {
-            begin: '\\b(' + FUNCTIONS_RE + ')\\s*\\('
-            //keywords: { built_in: FUNCTIONS }
+            begin: /\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/
           },
-          // Types
           {
-            begin: '\\.(' + TYPES_RE + ')\\b' // prevent highlight as type, say, 'oid' in 'pgclass.oid'
+            begin: /\b(SHARE|EXCLUSIVE)\s+MODE\b/
           },
           {
-            begin: '\\b(' + TYPES_RE + ')\\s+PATH\\b', // in XMLTABLE
-            keywords: {
-              keyword: 'PATH', // hopefully no one would use PATH type in XMLTABLE...
-              type: TYPES.replace('PATH ','')
-            }
+            begin: /\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/
           },
           {
-            className: 'type',
-            begin: '\\b(' + TYPES_RE + ')\\b'
+            begin: /\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/
           },
-          // Strings, see https://www.postgresql.org/docs/11/static/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS
           {
-            className: 'string',
-            begin: '\'', end: '\'',
-            contains: [{begin: '\'\''}]
+            begin: /\bPRESERVE\s+ROWS\b/
           },
           {
-            className: 'string',
-            begin: '(e|E|u&|U&)\'', end: '\'',
-            contains: [{begin: '\\\\.'}],
-            relevance: 10
+            begin: /\bDISCARD\s+PLANS\b/
+          },
+          {
+            begin: /\bREFERENCING\s+(OLD|NEW)\b/
+          },
+          {
+            begin: /\bSKIP\s+LOCKED\b/
+          },
+          {
+            begin: /\bGROUPING\s+SETS\b/
+          },
+          {
+            begin: /\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/
+          },
+          {
+            begin: /\b(WITH|WITHOUT)\s+HOLD\b/
+          },
+          {
+            begin: /\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/
+          },
+          {
+            begin: /\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/
+          },
+          {
+            begin: /\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/
+          },
+          {
+            begin: /\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/
+          },
+          {
+            begin: /\bIS\s+(NOT\s+)?UNKNOWN\b/
+          },
+          {
+            begin: /\bSECURITY\s+LABEL\b/
+          },
+          {
+            begin: /\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/
+          },
+          {
+            begin: /\bWITH\s+(NO\s+)?DATA\b/
+          },
+          {
+            begin: /\b(FOREIGN|SET)\s+DATA\b/
+          },
+          {
+            begin: /\bSET\s+(CATALOG|CONSTRAINTS)\b/
+          },
+          {
+            begin: /\b(WITH|FOR)\s+ORDINALITY\b/
+          },
+          {
+            begin: /\bIS\s+(NOT\s+)?DOCUMENT\b/
+          },
+          {
+            begin: /\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/
+          },
+          {
+            begin: /\b(STRIP|PRESERVE)\s+WHITESPACE\b/
+          },
+          {
+            begin: /\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/
+          },
+          {
+            begin: /\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/
+          },
+          {
+            begin: /\bAT\s+TIME\s+ZONE\b/
+          },
+          {
+            begin: /\bGRANTED\s+BY\b/
+          },
+          {
+            begin: /\bRETURN\s+(QUERY|NEXT)\b/
           },
-          hljs.END_SAME_AS_BEGIN({
-            begin: DOLLAR_STRING,
-            end: DOLLAR_STRING,
-            contains: [
-              {
-                // actually we want them all except SQL; listed are those with known implementations
-                // and XML + JSON just in case
-                subLanguage: ['pgsql','perl','python','tcl','r','lua','java','php','ruby','bash','scheme','xml','json'],
-                endsWithParent: true
-              }
-            ]
-          }),
-          // identifiers in quotes
-          {
-            begin: '"', end: '"',
-            contains: [{begin: '""'}]
-          },
-          // numbers
-          hljs.C_NUMBER_MODE,
-          // comments
-          hljs.C_BLOCK_COMMENT_MODE,
-          COMMENT_MODE,
-          // PL/pgSQL staff
-          // %ROWTYPE, %TYPE, $n
-          {
-            className: 'meta',
-            variants: [
-              {begin: '%(ROW)?TYPE', relevance: 10}, // %TYPE, %ROWTYPE
-              {begin: '\\$\\d+'},                    // $n
-              {begin: '^#\\w', end: '$'}             // #compiler option
-            ]
-          },
-          // <<labeles>>
-          {
-            className: 'symbol',
-            begin: LABEL,
+          {
+            begin: /\b(ATTACH|DETACH)\s+PARTITION\b/
+          },
+          {
+            begin: /\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/
+          },
+          {
+            begin: /\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/
+          },
+          {
+            begin: /\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/
+          }
+        ]
+      },
+      // functions named as keywords, followed by '('
+      {
+        begin: /\b(FORMAT|FAMILY|VERSION)\s*\(/
+        // keywords: { built_in: 'FORMAT FAMILY VERSION' }
+      },
+      // INCLUDE ( ... ) in index_parameters in CREATE TABLE
+      {
+        begin: /\bINCLUDE\s*\(/,
+        keywords: 'INCLUDE'
+      },
+      // not highlight RANGE if not in frame_clause (not 100% correct, but seems satisfactory)
+      {
+        begin: /\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/
+      },
+      // disable highlighting in commands CREATE AGGREGATE/COLLATION/DATABASE/OPERTOR/TEXT SEARCH .../TYPE
+      // and in PL/pgSQL RAISE ... USING
+      {
+        begin: /\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/
+      },
+      // PG_smth; HAS_some_PRIVILEGE
+      {
+        // className: 'built_in',
+        begin: /\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,
+        relevance: 10
+      },
+      // extract
+      {
+        begin: /\bEXTRACT\s*\(/,
+        end: /\bFROM\b/,
+        returnEnd: true,
+        keywords: {
+          // built_in: 'EXTRACT',
+          type: 'CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS ' +
+                        'MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR ' +
+                        'TIMEZONE_MINUTE WEEK YEAR'
+        }
+      },
+      // xmlelement, xmlpi - special NAME
+      {
+        begin: /\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,
+        keywords: {
+          // built_in: 'XMLELEMENT XMLPI',
+          keyword: 'NAME'
+        }
+      },
+      // xmlparse, xmlserialize
+      {
+        begin: /\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,
+        keywords: {
+          // built_in: 'XMLPARSE XMLSERIALIZE',
+          keyword: 'DOCUMENT CONTENT'
+        }
+      },
+      // Sequences. We actually skip everything between CACHE|INCREMENT|MAXVALUE|MINVALUE and
+      // nearest following numeric constant. Without with trick we find a lot of "keywords"
+      // in 'avrasm' autodetection test...
+      {
+        beginKeywords: 'CACHE INCREMENT MAXVALUE MINVALUE',
+        end: hljs.C_NUMBER_RE,
+        returnEnd: true,
+        keywords: 'BY CACHE INCREMENT MAXVALUE MINVALUE'
+      },
+      // WITH|WITHOUT TIME ZONE as part of datatype
+      {
+        className: 'type',
+        begin: /\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/
+      },
+      // INTERVAL optional fields
+      {
+        className: 'type',
+        begin: /\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/
+      },
+      // Pseudo-types which allowed only as return type
+      {
+        begin: /\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,
+        keywords: {
+          keyword: 'RETURNS',
+          type: 'LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER'
+        }
+      },
+      // Known functions - only when followed by '('
+      {
+        begin: '\\b(' + FUNCTIONS_RE + ')\\s*\\('
+        // keywords: { built_in: FUNCTIONS }
+      },
+      // Types
+      {
+        begin: '\\.(' + TYPES_RE + ')\\b' // prevent highlight as type, say, 'oid' in 'pgclass.oid'
+      },
+      {
+        begin: '\\b(' + TYPES_RE + ')\\s+PATH\\b', // in XMLTABLE
+        keywords: {
+          keyword: 'PATH', // hopefully no one would use PATH type in XMLTABLE...
+          type: TYPES.replace('PATH ', '')
+        }
+      },
+      {
+        className: 'type',
+        begin: '\\b(' + TYPES_RE + ')\\b'
+      },
+      // Strings, see https://www.postgresql.org/docs/11/static/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS
+      {
+        className: 'string',
+        begin: '\'',
+        end: '\'',
+        contains: [
+          {
+            begin: '\'\''
+          }
+        ]
+      },
+      {
+        className: 'string',
+        begin: '(e|E|u&|U&)\'',
+        end: '\'',
+        contains: [
+          {
+            begin: '\\\\.'
+          }
+        ],
+        relevance: 10
+      },
+      hljs.END_SAME_AS_BEGIN({
+        begin: DOLLAR_STRING,
+        end: DOLLAR_STRING,
+        contains: [
+          {
+            // actually we want them all except SQL; listed are those with known implementations
+            // and XML + JSON just in case
+            subLanguage: [
+              'pgsql',
+              'perl',
+              'python',
+              'tcl',
+              'r',
+              'lua',
+              'java',
+              'php',
+              'ruby',
+              'bash',
+              'scheme',
+              'xml',
+              'json'
+            ],
+            endsWithParent: true
+          }
+        ]
+      }),
+      // identifiers in quotes
+      {
+        begin: '"',
+        end: '"',
+        contains: [
+          {
+            begin: '""'
+          }
+        ]
+      },
+      // numbers
+      hljs.C_NUMBER_MODE,
+      // comments
+      hljs.C_BLOCK_COMMENT_MODE,
+      COMMENT_MODE,
+      // PL/pgSQL staff
+      // %ROWTYPE, %TYPE, $n
+      {
+        className: 'meta',
+        variants: [
+          { // %TYPE, %ROWTYPE
+            begin: '%(ROW)?TYPE',
             relevance: 10
+          },
+          { // $n
+            begin: '\\$\\d+'
+          },
+          { // #compiler option
+            begin: '^#\\w',
+            end: '$'
           }
         ]
+      },
+      // <<labeles>>
+      {
+        className: 'symbol',
+        begin: LABEL,
+        relevance: 10
+      }
+    ]
   };
 }
diff --git a/src/languages/php-template.js b/src/languages/php-template.js
index dfebbf6be5..b26e75f835 100644
--- a/src/languages/php-template.js
+++ b/src/languages/php-template.js
@@ -18,11 +18,33 @@ export default function(hljs) {
         contains: [
           // We don't want the php closing tag ?> to close the PHP block when
           // inside any of the following blocks:
-          {begin: '/\\*', end: '\\*/', skip: true},
-          {begin: 'b"', end: '"', skip: true},
-          {begin: 'b\'', end: '\'', skip: true},
-          hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null, className: null, contains: null, skip: true}),
-          hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null, className: null, contains: null, skip: true})
+          {
+            begin: '/\\*',
+            end: '\\*/',
+            skip: true
+          },
+          {
+            begin: 'b"',
+            end: '"',
+            skip: true
+          },
+          {
+            begin: 'b\'',
+            end: '\'',
+            skip: true
+          },
+          hljs.inherit(hljs.APOS_STRING_MODE, {
+            illegal: null,
+            className: null,
+            contains: null,
+            skip: true
+          }),
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {
+            illegal: null,
+            className: null,
+            contains: null,
+            skip: true
+          })
         ]
       }
     ]
diff --git a/src/languages/plaintext.js b/src/languages/plaintext.js
index ab7a700efb..f4f5985173 100644
--- a/src/languages/plaintext.js
+++ b/src/languages/plaintext.js
@@ -6,9 +6,12 @@ Category: common
 */
 
 export default function(hljs) {
-    return {
-        name: 'Plain text',
-        aliases: ['text', 'txt'],
-        disableAutodetect: true
-    };
+  return {
+    name: 'Plain text',
+    aliases: [
+      'text',
+      'txt'
+    ],
+    disableAutodetect: true
+  };
 }
diff --git a/src/languages/pony.js b/src/languages/pony.js
index 8f13eb87a9..87a6ad375c 100644
--- a/src/languages/pony.js
+++ b/src/languages/pony.js
@@ -7,7 +7,7 @@ Website: https://www.ponylang.io
 */
 
 export default function(hljs) {
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword:
       'actor addressof and as be break class compile_error compile_intrinsic ' +
       'consume continue delegate digestof do else elseif embed end error ' +
@@ -20,36 +20,40 @@ export default function(hljs) {
       'this false true'
   };
 
-  var TRIPLE_QUOTE_STRING_MODE = {
+  const TRIPLE_QUOTE_STRING_MODE = {
     className: 'string',
-    begin: '"""', end: '"""',
+    begin: '"""',
+    end: '"""',
     relevance: 10
   };
 
-  var QUOTE_STRING_MODE = {
+  const QUOTE_STRING_MODE = {
     className: 'string',
-    begin: '"', end: '"',
-    contains: [hljs.BACKSLASH_ESCAPE]
+    begin: '"',
+    end: '"',
+    contains: [ hljs.BACKSLASH_ESCAPE ]
   };
 
-  var SINGLE_QUOTE_CHAR_MODE = {
+  const SINGLE_QUOTE_CHAR_MODE = {
     className: 'string',
-    begin: '\'', end: '\'',
-    contains: [hljs.BACKSLASH_ESCAPE],
+    begin: '\'',
+    end: '\'',
+    contains: [ hljs.BACKSLASH_ESCAPE ],
     relevance: 0
   };
 
-  var TYPE_NAME = {
+  const TYPE_NAME = {
     className: 'type',
     begin: '\\b_?[A-Z][\\w]*',
     relevance: 0
   };
 
-  var PRIMED_NAME = {
-    begin: hljs.IDENT_RE + '\'', relevance: 0
+  const PRIMED_NAME = {
+    begin: hljs.IDENT_RE + '\'',
+    relevance: 0
   };
 
-  var NUMBER_MODE = {
+  const NUMBER_MODE = {
     className: 'number',
     begin: '(-?)(\\b0[xX][a-fA-F0-9]+|\\b0[bB][01]+|(\\b\\d+(_\\d+)?(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)',
     relevance: 0
diff --git a/src/languages/powershell.js b/src/languages/powershell.js
index 98523c0d82..3d10a7404f 100644
--- a/src/languages/powershell.js
+++ b/src/languages/powershell.js
@@ -7,13 +7,25 @@ Website: https://docs.microsoft.com/en-us/powershell/
 */
 
 export default function(hljs) {
-
-  var TYPES =
-    ["string", "char", "byte", "int", "long", "bool",  "decimal",  "single",
-     "double", "DateTime", "xml", "array", "hashtable", "void"];
+  const TYPES = [
+    "string",
+    "char",
+    "byte",
+    "int",
+    "long",
+    "bool",
+    "decimal",
+    "single",
+    "double",
+    "DateTime",
+    "xml",
+    "array",
+    "hashtable",
+    "void"
+  ];
 
   // https://msdn.microsoft.com/en-us/library/ms714428(v=vs.85).aspx
-  var VALID_VERBS =
+  const VALID_VERBS =
     'Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|' +
     'Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|' +
     'Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|' +
@@ -26,7 +38,7 @@ export default function(hljs) {
     'Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|' +
     'Unprotect|Use|ForEach|Sort|Tee|Where';
 
-  var COMPARISON_OPERATORS =
+  const COMPARISON_OPERATORS =
     '-and|-as|-band|-bnot|-bor|-bxor|-casesensitive|-ccontains|-ceq|-cge|-cgt|' +
     '-cle|-clike|-clt|-cmatch|-cne|-cnotcontains|-cnotlike|-cnotmatch|-contains|' +
     '-creplace|-csplit|-eq|-exact|-f|-file|-ge|-gt|-icontains|-ieq|-ige|-igt|' +
@@ -35,66 +47,91 @@ export default function(hljs) {
     '-notcontains|-notin|-notlike|-notmatch|-or|-regex|-replace|-shl|-shr|' +
     '-split|-wildcard|-xor';
 
-  var KEYWORDS = {
+  const KEYWORDS = {
     $pattern: /-?[A-z\.\-]+\b/,
-    keyword: 'if else foreach return do while until elseif begin for trap data dynamicparam ' +
-    'end break throw param continue finally in switch exit filter try process catch ' +
-    'hidden static parameter',
+    keyword:
+      'if else foreach return do while until elseif begin for trap data dynamicparam ' +
+      'end break throw param continue finally in switch exit filter try process catch ' +
+      'hidden static parameter',
     // "echo" relevance has been set to 0 to avoid auto-detect conflicts with shell transcripts
-    built_in: 'ac asnp cat cd CFS chdir clc clear clhy cli clp cls clv cnsn compare copy cp ' +
-    'cpi cpp curl cvpa dbp del diff dir dnsn ebp echo|0 epal epcsv epsn erase etsn exsn fc fhx ' +
-    'fl ft fw gal gbp gc gcb gci gcm gcs gdr gerr ghy gi gin gjb gl gm gmo gp gps gpv group ' +
-    'gsn gsnp gsv gtz gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi ' +
-    'iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo npssc nsn nv ogv oh ' +
-    'popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp ' +
-    'rujb rv rvpa rwmi sajb sal saps sasv sbp sc scb select set shcm si sl sleep sls sort sp ' +
-    'spjb spps spsv start stz sujb sv swmi tee trcm type wget where wjb write'
+    built_in:
+      'ac asnp cat cd CFS chdir clc clear clhy cli clp cls clv cnsn compare copy cp ' +
+      'cpi cpp curl cvpa dbp del diff dir dnsn ebp echo|0 epal epcsv epsn erase etsn exsn fc fhx ' +
+      'fl ft fw gal gbp gc gcb gci gcm gcs gdr gerr ghy gi gin gjb gl gm gmo gp gps gpv group ' +
+      'gsn gsnp gsv gtz gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi ' +
+      'iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo npssc nsn nv ogv oh ' +
+      'popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp ' +
+      'rujb rv rvpa rwmi sajb sal saps sasv sbp sc scb select set shcm si sl sleep sls sort sp ' +
+      'spjb spps spsv start stz sujb sv swmi tee trcm type wget where wjb write'
     // TODO: 'validate[A-Z]+' can't work in keywords
   };
 
-  var TITLE_NAME_RE = /\w[\w\d]*((-)[\w\d]+)*/;
+  const TITLE_NAME_RE = /\w[\w\d]*((-)[\w\d]+)*/;
 
-  var BACKTICK_ESCAPE = {
+  const BACKTICK_ESCAPE = {
     begin: '`[\\s\\S]',
     relevance: 0
   };
 
-  var VAR = {
+  const VAR = {
     className: 'variable',
     variants: [
-      { begin: /\$\B/ },
-      { className: 'keyword', begin: /\$this/ },
-      { begin: /\$[\w\d][\w\d_:]*/ }
+      {
+        begin: /\$\B/
+      },
+      {
+        className: 'keyword',
+        begin: /\$this/
+      },
+      {
+        begin: /\$[\w\d][\w\d_:]*/
+      }
     ]
   };
 
-  var LITERAL = {
+  const LITERAL = {
     className: 'literal',
     begin: /\$(null|true|false)\b/
   };
 
-  var QUOTE_STRING = {
+  const QUOTE_STRING = {
     className: "string",
-    variants: [{ begin: /"/, end: /"/ }, { begin: /@"/, end: /^"@/ }],
+    variants: [
+      {
+        begin: /"/,
+        end: /"/
+      },
+      {
+        begin: /@"/,
+        end: /^"@/
+      }
+    ],
     contains: [
       BACKTICK_ESCAPE,
       VAR,
       {
         className: 'variable',
-        begin: /\$[A-z]/, end: /[^A-z]/
+        begin: /\$[A-z]/,
+        end: /[^A-z]/
       }
     ]
   };
 
-  var APOS_STRING = {
+  const APOS_STRING = {
     className: 'string',
     variants: [
-      { begin: /'/, end: /'/ },
-      { begin: /@'/, end: /^'@/ }
+      {
+        begin: /'/,
+        end: /'/
+      },
+      {
+        begin: /@'/,
+        end: /^'@/
+      }
     ]
   };
 
-  var PS_HELPTAGS = {
+  const PS_HELPTAGS = {
     className: "doctag",
     variants: [
       /* no paramater help tags */
@@ -102,119 +139,171 @@ export default function(hljs) {
         begin: /\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/
       },
       /* one parameter help tags */
-      { begin: /\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/ }
+      {
+        begin: /\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/
+      }
     ]
   };
 
-  var PS_COMMENT = hljs.inherit(
+  const PS_COMMENT = hljs.inherit(
     hljs.COMMENT(null, null),
     {
       variants: [
         /* single-line comment */
-        { begin: /#/, end: /$/ },
+        {
+          begin: /#/,
+          end: /$/
+        },
         /* multi-line comment */
-        { begin: /<#/, end: /#>/ }
+        {
+          begin: /<#/,
+          end: /#>/
+        }
       ],
-      contains: [PS_HELPTAGS]
+      contains: [ PS_HELPTAGS ]
     }
   );
 
-  var CMDLETS = {
+  const CMDLETS = {
     className: 'built_in',
     variants: [
-      { begin: '('.concat(VALID_VERBS, ')+(-)[\\w\\d]+') }
+      {
+        begin: '('.concat(VALID_VERBS, ')+(-)[\\w\\d]+')
+      }
     ]
   };
 
-  var PS_CLASS = {
+  const PS_CLASS = {
     className: 'class',
-    beginKeywords: 'class enum', end: /\s*[{]/, excludeEnd: true,
+    beginKeywords: 'class enum',
+    end: /\s*[{]/,
+    excludeEnd: true,
     relevance: 0,
-    contains: [hljs.TITLE_MODE]
+    contains: [ hljs.TITLE_MODE ]
   };
 
-  var PS_FUNCTION = {
+  const PS_FUNCTION = {
     className: 'function',
-    begin: /function\s+/, end: /\s*\{|$/,
+    begin: /function\s+/,
+    end: /\s*\{|$/,
     excludeEnd: true,
     returnBegin: true,
     relevance: 0,
     contains: [
-      { begin: "function", relevance: 0, className: "keyword" },
-      { className: "title",
-        begin: TITLE_NAME_RE, relevance:0 },
-      { begin: /\(/, end: /\)/, className: "params",
+      {
+        begin: "function",
+        relevance: 0,
+        className: "keyword"
+      },
+      {
+        className: "title",
+        begin: TITLE_NAME_RE,
+        relevance: 0
+      },
+      {
+        begin: /\(/,
+        end: /\)/,
+        className: "params",
         relevance: 0,
-        contains: [VAR] }
+        contains: [ VAR ]
+      }
       // CMDLETS
     ]
   };
 
   // Using statment, plus type, plus assembly name.
-  var PS_USING = {
-    begin: /using\s/, end: /$/,
+  const PS_USING = {
+    begin: /using\s/,
+    end: /$/,
     returnBegin: true,
     contains: [
       QUOTE_STRING,
       APOS_STRING,
-      { className: 'keyword', begin: /(using|assembly|command|module|namespace|type)/ }
+      {
+        className: 'keyword',
+        begin: /(using|assembly|command|module|namespace|type)/
+      }
     ]
   };
 
   // Comperison operators & function named parameters.
-  var PS_ARGUMENTS = {
+  const PS_ARGUMENTS = {
     variants: [
       // PS literals are pretty verbose so it's a good idea to accent them a bit.
-      { className: 'operator', begin: '('.concat(COMPARISON_OPERATORS, ')\\b') },
-      { className: 'literal', begin: /(-)[\w\d]+/, relevance:0 }
+      {
+        className: 'operator',
+        begin: '('.concat(COMPARISON_OPERATORS, ')\\b')
+      },
+      {
+        className: 'literal',
+        begin: /(-)[\w\d]+/,
+        relevance: 0
+      }
     ]
   };
 
-  var STATIC_MEMBER = {
+  const STATIC_MEMBER = {
     className: 'selector-tag',
-    begin: /::\w+\b/, end: /$/,
+    begin: /::\w+\b/,
+    end: /$/,
     returnBegin: true,
     contains: [
-      { className: 'attribute', begin: /\w+/, endsParent: true }
+      {
+        className: 'attribute',
+        begin: /\w+/,
+        endsParent: true
+      }
     ]
   };
 
-  var HASH_SIGNS = {
+  const HASH_SIGNS = {
     className: 'selector-tag',
     begin: /@\B/,
     relevance: 0
   };
 
-  var PS_NEW_OBJECT_TYPE = {
+  const PS_NEW_OBJECT_TYPE = {
     className: 'built_in',
-    begin: /New-Object\s+\w/, end: /$/,
+    begin: /New-Object\s+\w/,
+    end: /$/,
     returnBegin: true,
     contains: [
-      { begin: /New-Object\s+/, relevance: 0 },
-      { className: 'meta', begin: /([\w\.])+/, endsParent: true }
+      {
+        begin: /New-Object\s+/,
+        relevance: 0
+      },
+      {
+        className: 'meta',
+        begin: /([\w\.])+/,
+        endsParent: true
+      }
     ]
   };
 
   // It's a very general rule so I'll narrow it a bit with some strict boundaries
   // to avoid any possible false-positive collisions!
-  var PS_METHODS = {
+  const PS_METHODS = {
     className: 'function',
-    begin: /\[.*\]\s*[\w]+[ ]??\(/, end: /$/,
+    begin: /\[.*\]\s*[\w]+[ ]??\(/,
+    end: /$/,
     returnBegin: true,
     relevance: 0,
     contains: [
       {
-        className: 'keyword', begin: '('.concat(
-        KEYWORDS.keyword.toString().replace(/\s/g, '|'
-        ), ')\\b'),
+        className: 'keyword',
+        begin: '('.concat(
+          KEYWORDS.keyword.toString().replace(/\s/g, '|'
+          ), ')\\b'),
         endsParent: true,
         relevance: 0
       },
-      hljs.inherit(hljs.TITLE_MODE, { endsParent: true })
+      hljs.inherit(hljs.TITLE_MODE, {
+        endsParent: true
+      })
     ]
   };
 
-  var GENTLEMANS_SET = [
+  const GENTLEMANS_SET = [
     // STATIC_MEMBER,
     PS_METHODS,
     PS_COMMENT,
@@ -229,16 +318,25 @@ export default function(hljs) {
     HASH_SIGNS
   ];
 
-  var PS_TYPE = {
-    begin: /\[/, end: /\]/,
+  const PS_TYPE = {
+    begin: /\[/,
+    end: /\]/,
     excludeBegin: true,
     excludeEnd: true,
     relevance: 0,
     contains: [].concat(
       'self',
       GENTLEMANS_SET,
-      { begin: "(" + TYPES.join("|") + ")", className: "built_in", relevance:0 },
-      { className: 'type', begin: /[\.\w\d]+/, relevance: 0 }
+      {
+        begin: "(" + TYPES.join("|") + ")",
+        className: "built_in",
+        relevance: 0
+      },
+      {
+        className: 'type',
+        begin: /[\.\w\d]+/,
+        relevance: 0
+      }
     )
   };
 
@@ -246,7 +344,10 @@ export default function(hljs) {
 
   return {
     name: 'PowerShell',
-    aliases: ["ps", "ps1"],
+    aliases: [
+      "ps",
+      "ps1"
+    ],
     case_insensitive: true,
     keywords: KEYWORDS,
     contains: GENTLEMANS_SET.concat(
diff --git a/src/languages/profile.js b/src/languages/profile.js
index df2f005308..a7c504d434 100644
--- a/src/languages/profile.js
+++ b/src/languages/profile.js
@@ -10,25 +10,30 @@ export default function(hljs) {
     contains: [
       hljs.C_NUMBER_MODE,
       {
-        begin: '[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}', end: ':',
+        begin: '[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}',
+        end: ':',
         excludeEnd: true
       },
       {
-        begin: '(ncalls|tottime|cumtime)', end: '$',
+        begin: '(ncalls|tottime|cumtime)',
+        end: '$',
         keywords: 'ncalls tottime|10 cumtime|10 filename',
         relevance: 10
       },
       {
-        begin: 'function calls', end: '$',
-        contains: [hljs.C_NUMBER_MODE],
+        begin: 'function calls',
+        end: '$',
+        contains: [ hljs.C_NUMBER_MODE ],
         relevance: 10
       },
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
-        begin: '\\(', end: '\\)$',
-        excludeBegin: true, excludeEnd: true,
+        begin: '\\(',
+        end: '\\)$',
+        excludeBegin: true,
+        excludeEnd: true,
         relevance: 0
       }
     ]
diff --git a/src/languages/prolog.js b/src/languages/prolog.js
index 33695ad090..0f6a05ac88 100644
--- a/src/languages/prolog.js
+++ b/src/languages/prolog.js
@@ -6,65 +6,70 @@ Website: https://en.wikipedia.org/wiki/Prolog
 */
 
 export default function(hljs) {
-
-  var ATOM = {
+  const ATOM = {
 
     begin: /[a-z][A-Za-z0-9_]*/,
     relevance: 0
   };
 
-  var VAR = {
+  const VAR = {
 
     className: 'symbol',
     variants: [
-      {begin: /[A-Z][a-zA-Z0-9_]*/},
-      {begin: /_[A-Za-z0-9_]*/},
+      {
+        begin: /[A-Z][a-zA-Z0-9_]*/
+      },
+      {
+        begin: /_[A-Za-z0-9_]*/
+      }
     ],
     relevance: 0
   };
 
-  var PARENTED = {
+  const PARENTED = {
 
     begin: /\(/,
     end: /\)/,
     relevance: 0
   };
 
-  var LIST = {
+  const LIST = {
 
     begin: /\[/,
     end: /\]/
   };
 
-  var LINE_COMMENT = {
+  const LINE_COMMENT = {
 
     className: 'comment',
-    begin: /%/, end: /$/,
-    contains: [hljs.PHRASAL_WORDS_MODE]
+    begin: /%/,
+    end: /$/,
+    contains: [ hljs.PHRASAL_WORDS_MODE ]
   };
 
-  var BACKTICK_STRING = {
+  const BACKTICK_STRING = {
 
     className: 'string',
-    begin: /`/, end: /`/,
-    contains: [hljs.BACKSLASH_ESCAPE]
+    begin: /`/,
+    end: /`/,
+    contains: [ hljs.BACKSLASH_ESCAPE ]
   };
 
-  var CHAR_CODE = {
+  const CHAR_CODE = {
     className: 'string', // 0'a etc.
     begin: /0'(\\'|.)/
   };
 
-  var SPACE_CODE = {
+  const SPACE_CODE = {
     className: 'string',
     begin: /0'\\s/ // 0'\s
   };
 
-  var PRED_OP = { // relevance booster
+  const PRED_OP = { // relevance booster
     begin: /:-/
   };
 
-  var inner = [
+  const inner = [
 
     ATOM,
     VAR,
@@ -87,7 +92,9 @@ export default function(hljs) {
   return {
     name: 'Prolog',
     contains: inner.concat([
-      {begin: /\.$/} // relevance booster
+      { // relevance booster
+        begin: /\.$/
+      }
     ])
   };
 }
diff --git a/src/languages/puppet.js b/src/languages/puppet.js
index c2f9fc2775..1b99cbc9b9 100644
--- a/src/languages/puppet.js
+++ b/src/languages/puppet.js
@@ -6,20 +6,19 @@ Category: config
 */
 
 export default function(hljs) {
-
-  var PUPPET_KEYWORDS = {
+  const PUPPET_KEYWORDS = {
     keyword:
     /* language keywords */
       'and case default else elsif false if in import enherits node or true undef unless main settings $string ',
     literal:
     /* metaparameters */
       'alias audit before loglevel noop require subscribe tag ' +
-    /* normal attributes */
+      /* normal attributes */
       'owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check ' +
-      'en_address ip_address realname command environment hour monute month monthday special target weekday '+
+      'en_address ip_address realname command environment hour monute month monthday special target weekday ' +
       'creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore ' +
       'links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source ' +
-      'souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid '+
+      'souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ' +
       'ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel ' +
       'native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options ' +
       'device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use ' +
@@ -33,56 +32,78 @@ export default function(hljs) {
     built_in:
     /* core facts */
       'architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers ' +
-      'domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces '+
+      'domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ' +
       'ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion ' +
       'kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease ' +
       'lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major ' +
-      'macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease '+
-      'operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion '+
-      'rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced '+
-      'selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime '+
+      'macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease ' +
+      'operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion ' +
+      'rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced ' +
+      'selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime ' +
       'uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version'
   };
 
-  var COMMENT = hljs.COMMENT('#', '$');
+  const COMMENT = hljs.COMMENT('#', '$');
 
-  var IDENT_RE = '([A-Za-z_]|::)(\\w|::)*';
+  const IDENT_RE = '([A-Za-z_]|::)(\\w|::)*';
 
-  var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE});
+  const TITLE = hljs.inherit(hljs.TITLE_MODE, {
+    begin: IDENT_RE
+  });
 
-  var VARIABLE = {className: 'variable', begin: '\\$' + IDENT_RE};
+  const VARIABLE = {
+    className: 'variable',
+    begin: '\\$' + IDENT_RE
+  };
 
-  var STRING = {
+  const STRING = {
     className: 'string',
-    contains: [hljs.BACKSLASH_ESCAPE, VARIABLE],
+    contains: [
+      hljs.BACKSLASH_ESCAPE,
+      VARIABLE
+    ],
     variants: [
-      {begin: /'/, end: /'/},
-      {begin: /"/, end: /"/}
+      {
+        begin: /'/,
+        end: /'/
+      },
+      {
+        begin: /"/,
+        end: /"/
+      }
     ]
   };
 
   return {
     name: 'Puppet',
-    aliases: ['pp'],
+    aliases: [ 'pp' ],
     contains: [
       COMMENT,
       VARIABLE,
       STRING,
       {
-        beginKeywords: 'class', end: '\\{|;',
+        beginKeywords: 'class',
+        end: '\\{|;',
         illegal: /=/,
-        contains: [TITLE, COMMENT]
+        contains: [
+          TITLE,
+          COMMENT
+        ]
       },
       {
-        beginKeywords: 'define', end: /\{/,
+        beginKeywords: 'define',
+        end: /\{/,
         contains: [
           {
-            className: 'section', begin: hljs.IDENT_RE, endsParent: true
+            className: 'section',
+            begin: hljs.IDENT_RE,
+            endsParent: true
           }
         ]
       },
       {
-        begin: hljs.IDENT_RE + '\\s+\\{', returnBegin: true,
+        begin: hljs.IDENT_RE + '\\s+\\{',
+        returnBegin: true,
         end: /\S/,
         contains: [
           {
@@ -90,19 +111,21 @@ export default function(hljs) {
             begin: hljs.IDENT_RE
           },
           {
-            begin: /\{/, end: /\}/,
+            begin: /\{/,
+            end: /\}/,
             keywords: PUPPET_KEYWORDS,
             relevance: 0,
             contains: [
               STRING,
               COMMENT,
               {
-                begin:'[a-zA-Z_]+\\s*=>',
-                returnBegin: true, end: '=>',
+                begin: '[a-zA-Z_]+\\s*=>',
+                returnBegin: true,
+                end: '=>',
                 contains: [
                   {
                     className: 'attr',
-                    begin: hljs.IDENT_RE,
+                    begin: hljs.IDENT_RE
                   }
                 ]
               },
@@ -118,5 +141,5 @@ export default function(hljs) {
         relevance: 0
       }
     ]
-  }
+  };
 }
diff --git a/src/languages/purebasic.js b/src/languages/purebasic.js
index 96f13c6a91..d5f864ef04 100644
--- a/src/languages/purebasic.js
+++ b/src/languages/purebasic.js
@@ -9,12 +9,13 @@ Website: https://www.purebasic.com
 // Base deafult colors in PB IDE: background: #FFFFDF; foreground: #000000;
 
 export default function(hljs) {
-  var STRINGS = { // PB IDE color: #0080FF (Azure Radiance)
+  const STRINGS = { // PB IDE color: #0080FF (Azure Radiance)
     className: 'string',
-    begin: '(~)?"', end: '"',
+    begin: '(~)?"',
+    end: '"',
     illegal: '\\n'
   };
-  var CONSTANTS = { // PB IDE color: #924B72 (Cannon Pink)
+  const CONSTANTS = { // PB IDE color: #924B72 (Cannon Pink)
     //  "#" + a letter or underscore + letters, digits or underscores + (optional) "$"
     className: 'symbol',
     begin: '#[a-zA-Z_]\\w*\\$?'
@@ -22,7 +23,10 @@ export default function(hljs) {
 
   return {
     name: 'PureBASIC',
-    aliases: ['pb', 'pbi'],
+    aliases: [
+      'pb',
+      'pbi'
+    ],
     keywords: // PB IDE color: #006666 (Blue Stone) + Bold
       // Keywords from all version of PureBASIC 5.00 upward ...
       'Align And Array As Break CallDebugger Case CompilerCase CompilerDefault ' +
@@ -42,7 +46,9 @@ export default function(hljs) {
       'UseModule Wend While With XIncludeFile XOr',
     contains: [
       // COMMENTS | PB IDE color: #00AAAA (Persian Green)
-      hljs.COMMENT(';', '$', {relevance: 0}),
+      hljs.COMMENT(';', '$', {
+        relevance: 0
+      }),
 
       { // PROCEDURES DEFINITIONS
         className: 'function',
diff --git a/src/languages/python-repl.js b/src/languages/python-repl.js
index ceb92d9574..7746c5c5c0 100644
--- a/src/languages/python-repl.js
+++ b/src/languages/python-repl.js
@@ -7,7 +7,7 @@ Category: common
 
 export default function(hljs) {
   return {
-    aliases: ['pycon'],
+    aliases: [ 'pycon' ],
     contains: [
       {
         className: 'meta',
@@ -16,14 +16,19 @@ export default function(hljs) {
           // this is purely for cleaner HTML output
           end: / |$/,
           starts: {
-            end: '$', subLanguage: 'python'
+            end: '$',
+            subLanguage: 'python'
           }
         },
         variants: [
-          { begin: /^>>>(?=[ ]|$)/ },
-          { begin: /^\.\.\.(?=[ ]|$)/ }
+          {
+            begin: /^>>>(?=[ ]|$)/
+          },
+          {
+            begin: /^\.\.\.(?=[ ]|$)/
+          }
         ]
-      },
+      }
     ]
-  }
+  };
 }
diff --git a/src/languages/q.js b/src/languages/q.js
index 5765429fa6..7b02be211a 100644
--- a/src/languages/q.js
+++ b/src/languages/q.js
@@ -5,26 +5,31 @@ Description: Q is a vector-based functional paradigm programming language built
 Author: Sergey Vidyuk <svidyuk@gmail.com>
 Website: https://kx.com/connect-with-us/developers/
 */
+
 export default function(hljs) {
-  var Q_KEYWORDS = {
-  $pattern: /(`?)[A-Za-z0-9_]+\b/,
-  keyword:
-    'do while select delete by update from',
-  literal:
-    '0b 1b',
-  built_in:
-    'neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum',
-  type:
-    '`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid'
+  const KEYWORDS = {
+    $pattern: /(`?)[A-Za-z0-9_]+\b/,
+    keyword:
+      'do while select delete by update from',
+    literal:
+      '0b 1b',
+    built_in:
+      'neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum',
+    type:
+      '`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid'
   };
+
   return {
-  name: 'Q',
-  aliases:['k', 'kdb'],
-  keywords: Q_KEYWORDS,
-  contains: [
-  hljs.C_LINE_COMMENT_MODE,
-    hljs.QUOTE_STRING_MODE,
-    hljs.C_NUMBER_MODE
-     ]
+    name: 'Q',
+    aliases: [
+      'k',
+      'kdb'
+    ],
+    keywords: KEYWORDS,
+    contains: [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.QUOTE_STRING_MODE,
+      hljs.C_NUMBER_MODE
+    ]
   };
 }
diff --git a/src/languages/qml.js b/src/languages/qml.js
index e61f9863ec..b96c415770 100644
--- a/src/languages/qml.js
+++ b/src/languages/qml.js
@@ -11,70 +11,70 @@ Category: scripting
 import * as regex from '../lib/regex.js';
 
 export default function(hljs) {
-  var KEYWORDS = {
-      keyword:
-        'in of on if for while finally var new function do return void else break catch ' +
-        'instanceof with throw case default try this switch continue typeof delete ' +
-        'let yield const export super debugger as async await import',
-      literal:
-        'true false null undefined NaN Infinity',
-      built_in:
-        'eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent ' +
-        'encodeURI encodeURIComponent escape unescape Object Function Boolean Error ' +
-        'EvalError InternalError RangeError ReferenceError StopIteration SyntaxError ' +
-        'TypeError URIError Number Math Date String RegExp Array Float32Array ' +
-        'Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array ' +
-        'Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require ' +
-        'module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect ' +
-        'Behavior bool color coordinate date double enumeration font geocircle georectangle ' +
-        'geoshape int list matrix4x4 parent point quaternion real rect ' +
-        'size string url variant vector2d vector3d vector4d ' +
-        'Promise'
-    };
+  const KEYWORDS = {
+    keyword:
+      'in of on if for while finally var new function do return void else break catch ' +
+      'instanceof with throw case default try this switch continue typeof delete ' +
+      'let yield const export super debugger as async await import',
+    literal:
+      'true false null undefined NaN Infinity',
+    built_in:
+      'eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent ' +
+      'encodeURI encodeURIComponent escape unescape Object Function Boolean Error ' +
+      'EvalError InternalError RangeError ReferenceError StopIteration SyntaxError ' +
+      'TypeError URIError Number Math Date String RegExp Array Float32Array ' +
+      'Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array ' +
+      'Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require ' +
+      'module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect ' +
+      'Behavior bool color coordinate date double enumeration font geocircle georectangle ' +
+      'geoshape int list matrix4x4 parent point quaternion real rect ' +
+      'size string url variant vector2d vector3d vector4d ' +
+      'Promise'
+  };
 
-  var QML_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9\\._]*';
+  const QML_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9\\._]*';
 
   // Isolate property statements. Ends at a :, =, ;, ,, a comment or end of line.
   // Use property class.
-  var PROPERTY = {
-      className: 'keyword',
-      begin: '\\bproperty\\b',
-      starts: {
-        className: 'string',
-        end: '(:|=|;|,|//|/\\*|$)',
-        returnEnd: true
-      }
+  const PROPERTY = {
+    className: 'keyword',
+    begin: '\\bproperty\\b',
+    starts: {
+      className: 'string',
+      end: '(:|=|;|,|//|/\\*|$)',
+      returnEnd: true
+    }
   };
 
   // Isolate signal statements. Ends at a ) a comment or end of line.
   // Use property class.
-  var SIGNAL = {
-      className: 'keyword',
-      begin: '\\bsignal\\b',
-      starts: {
-        className: 'string',
-        end: '(\\(|:|=|;|,|//|/\\*|$)',
-        returnEnd: true
-      }
+  const SIGNAL = {
+    className: 'keyword',
+    begin: '\\bsignal\\b',
+    starts: {
+      className: 'string',
+      end: '(\\(|:|=|;|,|//|/\\*|$)',
+      returnEnd: true
+    }
   };
 
   // id: is special in QML. When we see id: we want to mark the id: as attribute and
   // emphasize the token following.
-  var ID_ID = {
-      className: 'attribute',
-      begin: '\\bid\\s*:',
-      starts: {
-        className: 'string',
-        end: QML_IDENT_RE,
-        returnEnd: false
-      }
+  const ID_ID = {
+    className: 'attribute',
+    begin: '\\bid\\s*:',
+    starts: {
+      className: 'string',
+      end: QML_IDENT_RE,
+      returnEnd: false
+    }
   };
 
   // Find QML object attribute. An attribute is a QML identifier followed by :.
   // Unfortunately it's hard to know where it ends, as it may contain scalars,
   // objects, object definitions, or javascript. The true end is either when the parent
   // ends or the next attribute is detected.
-  var QML_ATTRIBUTE = {
+  const QML_ATTRIBUTE = {
     begin: QML_IDENT_RE + '\\s*:',
     returnBegin: true,
     contains: [
@@ -91,18 +91,21 @@ export default function(hljs) {
 
   // Find QML object. A QML object is a QML identifier followed by { and ends at the matching }.
   // All we really care about is finding IDENT followed by { and just mark up the IDENT and ignore the {.
-  var QML_OBJECT = {
-    begin: regex.concat(QML_IDENT_RE, /\s*\{/), end: /\{/,
+  const QML_OBJECT = {
+    begin: regex.concat(QML_IDENT_RE, /\s*\{/),
+    end: /\{/,
     returnBegin: true,
     relevance: 0,
     contains: [
-      hljs.inherit(hljs.TITLE_MODE, {begin: QML_IDENT_RE})
+      hljs.inherit(hljs.TITLE_MODE, {
+        begin: QML_IDENT_RE
+      })
     ]
   };
 
   return {
     name: 'QML',
-    aliases: ['qt'],
+    aliases: [ 'qt' ],
     case_insensitive: false,
     keywords: KEYWORDS,
     contains: [
@@ -114,12 +117,14 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       { // template string
         className: 'string',
-        begin: '`', end: '`',
+        begin: '`',
+        end: '`',
         contains: [
           hljs.BACKSLASH_ESCAPE,
           {
             className: 'subst',
-            begin: '\\$\\{', end: '\\}'
+            begin: '\\$\\{',
+            end: '\\}'
           }
         ]
       },
@@ -128,9 +133,15 @@ export default function(hljs) {
       {
         className: 'number',
         variants: [
-          { begin: '\\b(0[bB][01]+)' },
-          { begin: '\\b(0[oO][0-7]+)' },
-          { begin: hljs.C_NUMBER_RE }
+          {
+            begin: '\\b(0[bB][01]+)'
+          },
+          {
+            begin: '\\b(0[oO][0-7]+)'
+          },
+          {
+            begin: hljs.C_NUMBER_RE
+          }
         ],
         relevance: 0
       },
@@ -142,7 +153,8 @@ export default function(hljs) {
           hljs.C_BLOCK_COMMENT_MODE,
           hljs.REGEXP_MODE,
           { // E4X / JSX
-            begin: /</, end: />\s*[);\]]/,
+            begin: /</,
+            end: />\s*[);\]]/,
             relevance: 0,
             subLanguage: 'xml'
           }
@@ -153,12 +165,17 @@ export default function(hljs) {
       PROPERTY,
       {
         className: 'function',
-        beginKeywords: 'function', end: /\{/, excludeEnd: true,
+        beginKeywords: 'function',
+        end: /\{/,
+        excludeEnd: true,
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: /[A-Za-z$_][0-9A-Za-z$_]*/}),
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: /[A-Za-z$_][0-9A-Za-z$_]*/
+          }),
           {
             className: 'params',
-            begin: /\(/, end: /\)/,
+            begin: /\(/,
+            end: /\)/,
             excludeBegin: true,
             excludeEnd: true,
             contains: [
@@ -170,7 +187,9 @@ export default function(hljs) {
         illegal: /\[|%/
       },
       {
-        begin: '\\.' + hljs.IDENT_RE, relevance: 0 // hack: prevents detection of keywords after dots
+        // hack: prevents detection of keywords after dots
+        begin: '\\.' + hljs.IDENT_RE,
+        relevance: 0
       },
       ID_ID,
       QML_ATTRIBUTE,
diff --git a/src/languages/reasonml.js b/src/languages/reasonml.js
index cbe629f506..b67c568712 100644
--- a/src/languages/reasonml.js
+++ b/src/languages/reasonml.js
@@ -6,29 +6,39 @@ Author: Gidi Meir Morris <oss@gidi.io>
 Category: functional
 */
 export default function(hljs) {
-  function orReValues(ops){
+  function orReValues(ops) {
     return ops
-    .map(function(op) {
-      return op
-        .split('')
-        .map(function(char) {
-          return '\\' + char;
-        })
-        .join('');
-    })
-    .join('|');
+      .map(function(op) {
+        return op
+          .split('')
+          .map(function(char) {
+            return '\\' + char;
+          })
+          .join('');
+      })
+      .join('|');
   }
 
-  var RE_IDENT = '~?[a-z$_][0-9a-zA-Z$_]*';
-  var RE_MODULE_IDENT = '`?[A-Z$_][0-9a-zA-Z$_]*';
+  const RE_IDENT = '~?[a-z$_][0-9a-zA-Z$_]*';
+  const RE_MODULE_IDENT = '`?[A-Z$_][0-9a-zA-Z$_]*';
 
-  var RE_PARAM_TYPEPARAM = '\'?[a-z$_][0-9a-z$_]*';
-  var RE_PARAM_TYPE = '\s*:\s*[a-z$_][0-9a-z$_]*(\(\s*(' + RE_PARAM_TYPEPARAM + '\s*(,' + RE_PARAM_TYPEPARAM + ')*)?\s*\))?';
-  var RE_PARAM = RE_IDENT + '(' + RE_PARAM_TYPE + ')?(' + RE_PARAM_TYPE + ')?';
-  var RE_OPERATOR = "(" + orReValues(['||', '++', '**', '+.', '*', '/', '*.', '/.', '...']) + "|\\|>|&&|==|===)";
-  var RE_OPERATOR_SPACED = "\\s+" + RE_OPERATOR + "\\s+";
+  const RE_PARAM_TYPEPARAM = '\'?[a-z$_][0-9a-z$_]*';
+  const RE_PARAM_TYPE = '\s*:\s*[a-z$_][0-9a-z$_]*(\(\s*(' + RE_PARAM_TYPEPARAM + '\s*(,' + RE_PARAM_TYPEPARAM + ')*)?\s*\))?';
+  const RE_PARAM = RE_IDENT + '(' + RE_PARAM_TYPE + ')?(' + RE_PARAM_TYPE + ')?';
+  const RE_OPERATOR = "(" + orReValues([
+    '||',
+    '++',
+    '**',
+    '+.',
+    '*',
+    '/',
+    '*.',
+    '/.',
+    '...'
+  ]) + "|\\|>|&&|==|===)";
+  const RE_OPERATOR_SPACED = "\\s+" + RE_OPERATOR + "\\s+";
 
-  var KEYWORDS = {
+  const KEYWORDS = {
     keyword:
       'and as asr assert begin class constraint do done downto else end exception external ' +
       'for fun function functor if in include inherit initializer ' +
@@ -40,12 +50,12 @@ export default function(hljs) {
       'true false'
   };
 
-  var RE_NUMBER = '\\b(0[xX][a-fA-F0-9_]+[Lln]?|' +
+  const RE_NUMBER = '\\b(0[xX][a-fA-F0-9_]+[Lln]?|' +
     '0[oO][0-7_]+[Lln]?|' +
     '0[bB][01_]+[Lln]?|' +
     '[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)';
 
-  var NUMBER_MODE = {
+  const NUMBER_MODE = {
     className: 'number',
     relevance: 0,
     variants: [
@@ -58,12 +68,12 @@ export default function(hljs) {
     ]
   };
 
-  var OPERATOR_MODE = {
+  const OPERATOR_MODE = {
     className: 'operator',
     relevance: 0,
     begin: RE_OPERATOR
   };
-  var LIST_CONTENTS_MODES = [
+  const LIST_CONTENTS_MODES = [
     {
       className: 'identifier',
       relevance: 0,
@@ -73,12 +83,13 @@ export default function(hljs) {
     NUMBER_MODE
   ];
 
-  var MODULE_ACCESS_CONTENTS = [
+  const MODULE_ACCESS_CONTENTS = [
     hljs.QUOTE_STRING_MODE,
     OPERATOR_MODE,
     {
       className: 'module',
-      begin: "\\b" + RE_MODULE_IDENT, returnBegin: true,
+      begin: "\\b" + RE_MODULE_IDENT,
+      returnBegin: true,
       end: "\.",
       contains: [
         {
@@ -90,10 +101,11 @@ export default function(hljs) {
     }
   ];
 
-  var PARAMS_CONTENTS = [
+  const PARAMS_CONTENTS = [
     {
       className: 'module',
-      begin: "\\b" + RE_MODULE_IDENT, returnBegin: true,
+      begin: "\\b" + RE_MODULE_IDENT,
+      returnBegin: true,
       end: "\.",
       relevance: 0,
       contains: [
@@ -106,7 +118,7 @@ export default function(hljs) {
     }
   ];
 
-  var PARAMS_MODE = {
+  const PARAMS_MODE = {
     begin: RE_IDENT,
     end: '(,|\\n|\\))',
     relevance: 0,
@@ -123,7 +135,7 @@ export default function(hljs) {
     ]
   };
 
-  var FUNCTION_BLOCK_MODE = {
+  const FUNCTION_BLOCK_MODE = {
     className: 'function',
     relevance: 0,
     keywords: KEYWORDS,
@@ -144,7 +156,7 @@ export default function(hljs) {
                 begin: RE_PARAM
               },
               {
-                begin: /\(\s*\)/,
+                begin: /\(\s*\)/
               }
             ]
           }
@@ -159,9 +171,7 @@ export default function(hljs) {
           {
             className: 'params',
             relevance: 0,
-            variants: [
-              PARAMS_MODE
-            ]
+            variants: [ PARAMS_MODE ]
           }
         ]
       },
@@ -172,7 +182,7 @@ export default function(hljs) {
   };
   MODULE_ACCESS_CONTENTS.push(FUNCTION_BLOCK_MODE);
 
-  var CONSTRUCTOR_MODE = {
+  const CONSTRUCTOR_MODE = {
     className: 'constructor',
     begin: RE_MODULE_IDENT + '\\(',
     end: '\\)',
@@ -188,7 +198,7 @@ export default function(hljs) {
     ]
   };
 
-  var PATTERN_MATCH_BLOCK_MODE = {
+  const PATTERN_MATCH_BLOCK_MODE = {
     className: 'pattern-match',
     begin: '\\|',
     returnBegin: true,
@@ -206,7 +216,7 @@ export default function(hljs) {
     ]
   };
 
-  var MODULE_ACCESS_MODE = {
+  const MODULE_ACCESS_MODE = {
     className: 'module-access',
     keywords: KEYWORDS,
     returnBegin: true,
@@ -239,11 +249,13 @@ export default function(hljs) {
 
   return {
     name: 'ReasonML',
-    aliases: ['re'],
+    aliases: [ 're' ],
     keywords: KEYWORDS,
     illegal: '(:-|:=|\\$\\{|\\+=)',
     contains: [
-      hljs.COMMENT('/\\*', '\\*/', { illegal: '^(#,\\/\\/)' }),
+      hljs.COMMENT('/\\*', '\\*/', {
+        illegal: '^(#,\\/\\/)'
+      }),
       {
         className: 'character',
         begin: '\'(\\\\[^\']+|[^\'])\'',
@@ -260,7 +272,7 @@ export default function(hljs) {
         className: 'literal',
         begin: '\\[\\|',
         end: '\\|\\]',
-        relevance:  0,
+        relevance: 0,
         contains: LIST_CONTENTS_MODES
       },
       {
diff --git a/src/languages/roboconf.js b/src/languages/roboconf.js
index e4457af933..c915d4ab0e 100644
--- a/src/languages/roboconf.js
+++ b/src/languages/roboconf.js
@@ -7,11 +7,13 @@ Category: config
 */
 
 export default function(hljs) {
-  var IDENTIFIER = '[a-zA-Z-_][^\\n{]+\\{';
+  const IDENTIFIER = '[a-zA-Z-_][^\\n{]+\\{';
 
-  var PROPERTY = {
+  const PROPERTY = {
     className: 'attribute',
-    begin: /[a-zA-Z-_]+/, end: /\s*:/, excludeEnd: true,
+    begin: /[a-zA-Z-_]+/,
+    end: /\s*:/,
+    excludeEnd: true,
     starts: {
       end: ';',
       relevance: 0,
@@ -30,7 +32,10 @@ export default function(hljs) {
 
   return {
     name: 'Roboconf',
-    aliases: ['graph', 'instances'],
+    aliases: [
+      'graph',
+      'instances'
+    ],
     case_insensitive: true,
     keywords: 'import',
     contains: [
diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index b3c6a64132..bbe5c3ac90 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -36,8 +36,12 @@ export default function(hljs) {
   const VAR = {
     className: 'variable',
     variants: [
-      { begin: /\$[\w\d#@][\w\d_]*/ },
-      { begin: /\$\{(.*?)\}/ }
+      {
+        begin: /\$[\w\d#@][\w\d_]*/
+      },
+      {
+        begin: /\$\{(.*?)\}/
+      }
     ]
   };
 
@@ -52,7 +56,7 @@ export default function(hljs) {
         className: 'variable',
         begin: /\$\(/,
         end: /\)/,
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       }
     ]
   };
@@ -68,7 +72,10 @@ export default function(hljs) {
 
   return {
     name: 'Microtik RouterOS script',
-    aliases: ['routeros', 'mikrotik'],
+    aliases: [
+      'routeros',
+      'mikrotik'
+    ],
     case_insensitive: true,
     keywords: {
       $pattern: /:?[\w-]+/,
@@ -78,9 +85,18 @@ export default function(hljs) {
     contains: [
       { // illegal syntax
         variants: [
-          { begin: /\/\*/, end: /\*\// },          // -- comment
-          { begin: /\/\//, end: /$/ },             // Stan comment
-          { begin: /<\//, end: />/ },              // HTML tags
+          { // -- comment
+            begin: /\/\*/,
+            end: /\*\//
+          },
+          { // Stan comment
+            begin: /\/\//,
+            end: /$/
+          },
+          { // HTML tags
+            begin: /<\//,
+            end: />/
+          }
         ],
         illegal: /./
       },
diff --git a/src/languages/rsl.js b/src/languages/rsl.js
index 6dbca51329..d5de88eab1 100644
--- a/src/languages/rsl.js
+++ b/src/languages/rsl.js
@@ -30,14 +30,17 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'meta',
-        begin: '#', end: '$'
+        begin: '#',
+        end: '$'
       },
       {
         className: 'class',
-        beginKeywords: 'surface displacement light volume imager', end: '\\('
+        beginKeywords: 'surface displacement light volume imager',
+        end: '\\('
       },
       {
-        beginKeywords: 'illuminate illuminance gather', end: '\\('
+        beginKeywords: 'illuminate illuminance gather',
+        end: '\\('
       }
     ]
   };
diff --git a/src/languages/ruleslanguage.js b/src/languages/ruleslanguage.js
index 12368949fe..664d8bdef5 100644
--- a/src/languages/ruleslanguage.js
+++ b/src/languages/ruleslanguage.js
@@ -10,46 +10,48 @@ export default function(hljs) {
   return {
     name: 'Oracle Rules Language',
     keywords: {
-       keyword: 'BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE ' +
-         'INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 ' +
-         'INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 ' +
-         'INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 ' +
-         'INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 ' +
-         'INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 ' +
-         'INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 ' +
-         'INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 ' +
-         'INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 ' +
-         'INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 ' +
-         'INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 ' +
-         'INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 ' +
-         'INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 ' +
-         'INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 ' +
-         'INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 ' +
-         'MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER ' +
-         'OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE ' +
-         'NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH ' +
-         'IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND ' +
-         'UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ' +
-         'ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE ' +
-         'GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE ' +
-         'SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING ' +
-         'DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF ' +
-         'MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY ' +
-         'YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE ' +
-         'COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR ' +
-         'READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ' +
-         'ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE ' +
-         'EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE ' +
-         'SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL ' +
-         'COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN ' +
-         'MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING ' +
-         'FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM ' +
-         'NUMDAYS READ_DATE STAGING',
-       built_in: 'IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML ' +
-         'DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT ' +
-         'DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE ' +
-         'DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT ' +
-         'DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME'
+      keyword:
+        'BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE ' +
+        'INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 ' +
+        'INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 ' +
+        'INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 ' +
+        'INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 ' +
+        'INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 ' +
+        'INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 ' +
+        'INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 ' +
+        'INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 ' +
+        'INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 ' +
+        'INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 ' +
+        'INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 ' +
+        'INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 ' +
+        'INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 ' +
+        'INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 ' +
+        'MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER ' +
+        'OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE ' +
+        'NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH ' +
+        'IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND ' +
+        'UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ' +
+        'ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE ' +
+        'GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE ' +
+        'SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING ' +
+        'DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF ' +
+        'MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY ' +
+        'YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE ' +
+        'COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR ' +
+        'READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ' +
+        'ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE ' +
+        'EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE ' +
+        'SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL ' +
+        'COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN ' +
+        'MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING ' +
+        'FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM ' +
+        'NUMDAYS READ_DATE STAGING',
+      built_in:
+        'IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML ' +
+        'DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT ' +
+        'DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE ' +
+        'DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT ' +
+        'DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME'
     },
     contains: [
       hljs.C_LINE_COMMENT_MODE,
@@ -60,8 +62,13 @@ export default function(hljs) {
       {
         className: 'literal',
         variants: [
-          {begin: '#\\s+[a-zA-Z .]*', relevance: 0}, // looks like #-comment
-          {begin: '#[a-zA-Z .]+'}
+          { // looks like #-comment
+            begin: '#\\s+[a-zA-Z .]*',
+            relevance: 0
+          },
+          {
+            begin: '#[a-zA-Z .]+'
+          }
         ]
       }
     ]
diff --git a/src/languages/rust.js b/src/languages/rust.js
index 7b429d96a6..39f3ef163c 100644
--- a/src/languages/rust.js
+++ b/src/languages/rust.js
@@ -7,13 +7,13 @@ Category: common, system
 */
 
 export default function(hljs) {
-  var NUM_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
-  var KEYWORDS =
+  const NUM_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
+  const KEYWORDS =
     'abstract as async await become box break const continue crate do dyn ' +
     'else enum extern false final fn for if impl in let loop macro match mod ' +
     'move mut override priv pub ref return self Self static struct super ' +
     'trait true try type typeof unsafe unsized use virtual where while yield';
-  var BUILTINS =
+  const BUILTINS =
     // functions
     'drop ' +
     // types
@@ -35,7 +35,7 @@ export default function(hljs) {
     'unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!';
   return {
     name: 'Rust',
-    aliases: ['rs'],
+    aliases: [ 'rs' ],
     keywords: {
       $pattern: hljs.IDENT_RE + '!?',
       keyword:
@@ -48,13 +48,22 @@ export default function(hljs) {
     illegal: '</',
     contains: [
       hljs.C_LINE_COMMENT_MODE,
-      hljs.COMMENT('/\\*', '\\*/', {contains: ['self']}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {begin: /b?"/, illegal: null}),
+      hljs.COMMENT('/\\*', '\\*/', {
+        contains: [ 'self' ]
+      }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        begin: /b?"/,
+        illegal: null
+      }),
       {
         className: 'string',
         variants: [
-           { begin: /r(#*)"(.|\n)*?"\1(?!#)/ },
-           { begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/ }
+          {
+            begin: /r(#*)"(.|\n)*?"\1(?!#)/
+          },
+          {
+            begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/
+          }
         ]
       },
       {
@@ -64,10 +73,17 @@ export default function(hljs) {
       {
         className: 'number',
         variants: [
-          { begin: '\\b0b([01_]+)' + NUM_SUFFIX },
-          { begin: '\\b0o([0-7_]+)' + NUM_SUFFIX },
-          { begin: '\\b0x([A-Fa-f0-9_]+)' + NUM_SUFFIX },
-          { begin: '\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)' +
+          {
+            begin: '\\b0b([01_]+)' + NUM_SUFFIX
+          },
+          {
+            begin: '\\b0o([0-7_]+)' + NUM_SUFFIX
+          },
+          {
+            begin: '\\b0x([A-Fa-f0-9_]+)' + NUM_SUFFIX
+          },
+          {
+            begin: '\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)' +
                    NUM_SUFFIX
           }
         ],
@@ -75,38 +91,50 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        beginKeywords: 'fn', end: '(\\(|<)', excludeEnd: true,
-        contains: [hljs.UNDERSCORE_TITLE_MODE]
+        beginKeywords: 'fn',
+        end: '(\\(|<)',
+        excludeEnd: true,
+        contains: [ hljs.UNDERSCORE_TITLE_MODE ]
       },
       {
         className: 'meta',
-        begin: '#!?\\[', end: '\\]',
+        begin: '#!?\\[',
+        end: '\\]',
         contains: [
           {
             className: 'meta-string',
-            begin: /"/, end: /"/
+            begin: /"/,
+            end: /"/
           }
         ]
       },
       {
         className: 'class',
-        beginKeywords: 'type', end: ';',
+        beginKeywords: 'type',
+        end: ';',
         contains: [
-          hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {endsParent: true})
+          hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {
+            endsParent: true
+          })
         ],
         illegal: '\\S'
       },
       {
         className: 'class',
-        beginKeywords: 'trait enum struct union', end: /\{/,
+        beginKeywords: 'trait enum struct union',
+        end: /\{/,
         contains: [
-          hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {endsParent: true})
+          hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {
+            endsParent: true
+          })
         ],
         illegal: '[\\w\\d]'
       },
       {
         begin: hljs.IDENT_RE + '::',
-        keywords: {built_in: BUILTINS}
+        keywords: {
+          built_in: BUILTINS
+        }
       },
       {
         begin: '->'
diff --git a/src/languages/sas.js b/src/languages/sas.js
index a14677283e..bbe30e41c7 100644
--- a/src/languages/sas.js
+++ b/src/languages/sas.js
@@ -5,128 +5,131 @@ Description: Syntax Highlighting for SAS
 */
 
 export default function(hljs) {
+  // Data step and PROC SQL statements
+  const SAS_KEYWORDS =
+    'do if then else end until while ' +
+    '' +
+    'abort array attrib by call cards cards4 catname continue ' +
+    'datalines datalines4 delete delim delimiter display dm drop ' +
+    'endsas error file filename footnote format goto in infile ' +
+    'informat input keep label leave length libname link list ' +
+    'lostcard merge missing modify options output out page put ' +
+    'redirect remove rename replace retain return select set skip ' +
+    'startsas stop title update waitsas where window x systask ' +
+    '' +
+    'add and alter as cascade check create delete describe ' +
+    'distinct drop foreign from group having index insert into in ' +
+    'key like message modify msgtype not null on or order primary ' +
+    'references reset restrict select set table unique update ' +
+    'validate view where';
 
-    // Data step and PROC SQL statements
-    var SAS_KEYWORDS = ''+
-        'do if then else end until while '+
-        ''+
-        'abort array attrib by call cards cards4 catname continue '+
-        'datalines datalines4 delete delim delimiter display dm drop '+
-        'endsas error file filename footnote format goto in infile '+
-        'informat input keep label leave length libname link list '+
-        'lostcard merge missing modify options output out page put '+
-        'redirect remove rename replace retain return select set skip '+
-        'startsas stop title update waitsas where window x systask '+
-        ''+
-        'add and alter as cascade check create delete describe '+
-        'distinct drop foreign from group having index insert into in '+
-        'key like message modify msgtype not null on or order primary '+
-        'references reset restrict select set table unique update '+
-        'validate view where';
+  // Built-in SAS functions
+  const SAS_FUN =
+    'abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|' +
+    'betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|' +
+    'cexist|cinv|close|cnonct|collate|compbl|compound|' +
+    'compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|' +
+    'daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|' +
+    'datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|' +
+    'depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|' +
+    'digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|' +
+    'dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|' +
+    'fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|' +
+    'filename|fileref|finfo|finv|fipname|fipnamel|' +
+    'fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|' +
+    'fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|' +
+    'fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|' +
+    'hms|hosthelp|hour|ibessel|index|indexc|indexw|input|' +
+    'inputc|inputn|int|intck|intnx|intrr|irr|jbessel|' +
+    'juldate|kurtosis|lag|lbound|left|length|lgamma|' +
+    'libname|libref|log|log10|log2|logpdf|logpmf|logsdf|' +
+    'lowcase|max|mdy|mean|min|minute|mod|month|mopen|' +
+    'mort|n|netpv|nmiss|normal|note|npv|open|ordinal|' +
+    'pathname|pdf|peek|peekc|pmf|point|poisson|poke|' +
+    'probbeta|probbnml|probchi|probf|probgam|probhypr|' +
+    'probit|probnegb|probnorm|probt|put|putc|putn|qtr|' +
+    'quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|' +
+    'ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|' +
+    'rewind|right|round|saving|scan|sdf|second|sign|' +
+    'sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|' +
+    'stfips|stname|stnamel|substr|sum|symget|sysget|' +
+    'sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|' +
+    'tinv|tnonct|today|translate|tranwrd|trigamma|' +
+    'trim|trimn|trunc|uniform|upcase|uss|var|varfmt|' +
+    'varinfmt|varlabel|varlen|varname|varnum|varray|' +
+    'varrayx|vartype|verify|vformat|vformatd|vformatdx|' +
+    'vformatn|vformatnx|vformatw|vformatwx|vformatx|' +
+    'vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|' +
+    'vinformatn|vinformatnx|vinformatw|vinformatwx|' +
+    'vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|' +
+    'vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|' +
+    'zipnamel|zipstate';
 
-    // Built-in SAS functions
-    var SAS_FUN = ''+
-        'abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|'+
-        'betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|'+
-        'cexist|cinv|close|cnonct|collate|compbl|compound|'+
-        'compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|'+
-        'daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|'+
-        'datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|'+
-        'depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|'+
-        'digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|'+
-        'dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|'+
-        'fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|'+
-        'filename|fileref|finfo|finv|fipname|fipnamel|'+
-        'fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|'+
-        'fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|'+
-        'fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|'+
-        'hms|hosthelp|hour|ibessel|index|indexc|indexw|input|'+
-        'inputc|inputn|int|intck|intnx|intrr|irr|jbessel|'+
-        'juldate|kurtosis|lag|lbound|left|length|lgamma|'+
-        'libname|libref|log|log10|log2|logpdf|logpmf|logsdf|'+
-        'lowcase|max|mdy|mean|min|minute|mod|month|mopen|'+
-        'mort|n|netpv|nmiss|normal|note|npv|open|ordinal|'+
-        'pathname|pdf|peek|peekc|pmf|point|poisson|poke|'+
-        'probbeta|probbnml|probchi|probf|probgam|probhypr|'+
-        'probit|probnegb|probnorm|probt|put|putc|putn|qtr|'+
-        'quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|'+
-        'ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|'+
-        'rewind|right|round|saving|scan|sdf|second|sign|'+
-        'sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|'+
-        'stfips|stname|stnamel|substr|sum|symget|sysget|'+
-        'sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|'+
-        'tinv|tnonct|today|translate|tranwrd|trigamma|'+
-        'trim|trimn|trunc|uniform|upcase|uss|var|varfmt|'+
-        'varinfmt|varlabel|varlen|varname|varnum|varray|'+
-        'varrayx|vartype|verify|vformat|vformatd|vformatdx|'+
-        'vformatn|vformatnx|vformatw|vformatwx|vformatx|'+
-        'vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|'+
-        'vinformatn|vinformatnx|vinformatw|vinformatwx|'+
-        'vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|'+
-        'vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|'+
-        'zipnamel|zipstate';
+  // Built-in macro functions
+  const SAS_MACRO_FUN =
+    'bquote|nrbquote|cmpres|qcmpres|compstor|' +
+    'datatyp|display|do|else|end|eval|global|goto|' +
+    'if|index|input|keydef|label|left|length|let|' +
+    'local|lowcase|macro|mend|nrbquote|nrquote|' +
+    'nrstr|put|qcmpres|qleft|qlowcase|qscan|' +
+    'qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|' +
+    'substr|superq|syscall|sysevalf|sysexec|sysfunc|' +
+    'sysget|syslput|sysprod|sysrc|sysrput|then|to|' +
+    'trim|unquote|until|upcase|verify|while|window';
 
-    // Built-in macro functions
-    var SAS_MACRO_FUN = 'bquote|nrbquote|cmpres|qcmpres|compstor|'+
-        'datatyp|display|do|else|end|eval|global|goto|'+
-        'if|index|input|keydef|label|left|length|let|'+
-        'local|lowcase|macro|mend|nrbquote|nrquote|'+
-        'nrstr|put|qcmpres|qleft|qlowcase|qscan|'+
-        'qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|'+
-        'substr|superq|syscall|sysevalf|sysexec|sysfunc|'+
-        'sysget|syslput|sysprod|sysrc|sysrput|then|to|'+
-        'trim|unquote|until|upcase|verify|while|window';
-
-    return {
-        name: 'SAS',
-        aliases: ['sas', 'SAS'],
-        case_insensitive: true, // SAS is case-insensitive
-        keywords: {
-            literal:
-                'null missing _all_ _automatic_ _character_ _infile_ '+
-                '_n_ _name_ _null_ _numeric_ _user_ _webout_',
-            meta:
-                SAS_KEYWORDS
-        },
-        contains: [
-            {
-                // Distinct highlight for proc <proc>, data, run, quit
-                className: 'keyword',
-                begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s;]/
-            },
-            {
-                // Macro variables
-                className: 'variable',
-                begin: /&[a-zA-Z_&][a-zA-Z0-9_]*\.?/
-            },
-            {
-                // Special emphasis for datalines|cards
-                className: 'emphasis',
-                begin: /^\s*datalines|cards.*;/,
-                end: /^\s*;\s*$/
-            },
-            {   // Built-in macro variables take precedence
-                className: 'built_in',
-                begin: '%(' + SAS_MACRO_FUN + ')'
-            },
-            {
-                // User-defined macro functions highlighted after
-                className: 'name',
-                begin: /%[a-zA-Z_][a-zA-Z_0-9]*/
-            },
-            {
-                className: 'meta',
-                begin: '[^%](' + SAS_FUN + ')[\(]'
-            },
-            {
-                className: 'string',
-                variants: [
-                    hljs.APOS_STRING_MODE,
-                    hljs.QUOTE_STRING_MODE
-                ]
-            },
-            hljs.COMMENT('\\*', ';'),
-            hljs.C_BLOCK_COMMENT_MODE
+  return {
+    name: 'SAS',
+    aliases: [
+      'sas',
+      'SAS'
+    ],
+    case_insensitive: true, // SAS is case-insensitive
+    keywords: {
+      literal:
+        'null missing _all_ _automatic_ _character_ _infile_ ' +
+        '_n_ _name_ _null_ _numeric_ _user_ _webout_',
+      meta:
+        SAS_KEYWORDS
+    },
+    contains: [
+      {
+        // Distinct highlight for proc <proc>, data, run, quit
+        className: 'keyword',
+        begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s;]/
+      },
+      {
+        // Macro variables
+        className: 'variable',
+        begin: /&[a-zA-Z_&][a-zA-Z0-9_]*\.?/
+      },
+      {
+        // Special emphasis for datalines|cards
+        className: 'emphasis',
+        begin: /^\s*datalines|cards.*;/,
+        end: /^\s*;\s*$/
+      },
+      { // Built-in macro variables take precedence
+        className: 'built_in',
+        begin: '%(' + SAS_MACRO_FUN + ')'
+      },
+      {
+        // User-defined macro functions highlighted after
+        className: 'name',
+        begin: /%[a-zA-Z_][a-zA-Z_0-9]*/
+      },
+      {
+        className: 'meta',
+        begin: '[^%](' + SAS_FUN + ')[\(]'
+      },
+      {
+        className: 'string',
+        variants: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE
         ]
-    };
+      },
+      hljs.COMMENT('\\*', ';'),
+      hljs.C_BLOCK_COMMENT_MODE
+    ]
+  };
 }
diff --git a/src/languages/scala.js b/src/languages/scala.js
index c8336fa1c3..817d834512 100644
--- a/src/languages/scala.js
+++ b/src/languages/scala.js
@@ -7,63 +7,75 @@ Website: https://www.scala-lang.org
 */
 
 export default function(hljs) {
-
-  var ANNOTATION = { className: 'meta', begin: '@[A-Za-z]+' };
+  const ANNOTATION = {
+    className: 'meta',
+    begin: '@[A-Za-z]+'
+  };
 
   // used in strings for escaping/interpolation/substitution
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
     variants: [
-      {begin: '\\$[A-Za-z0-9_]+'},
-      {begin: /\$\{/, end: /\}/}
+      {
+        begin: '\\$[A-Za-z0-9_]+'
+      },
+      {
+        begin: /\$\{/,
+        end: /\}/
+      }
     ]
   };
 
-  var STRING = {
+  const STRING = {
     className: 'string',
     variants: [
       {
-        begin: '"', end: '"',
+        begin: '"',
+        end: '"',
         illegal: '\\n',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
-        begin: '"""', end: '"""',
+        begin: '"""',
+        end: '"""',
         relevance: 10
       },
       {
-        begin: '[a-z]+"', end: '"',
+        begin: '[a-z]+"',
+        end: '"',
         illegal: '\\n',
-        contains: [hljs.BACKSLASH_ESCAPE, SUBST]
+        contains: [ hljs.BACKSLASH_ESCAPE,
+          SUBST ]
       },
       {
         className: 'string',
-        begin: '[a-z]+"""', end: '"""',
-        contains: [SUBST],
+        begin: '[a-z]+"""',
+        end: '"""',
+        contains: [ SUBST ],
         relevance: 10
       }
     ]
 
   };
 
-  var SYMBOL = {
+  const SYMBOL = {
     className: 'symbol',
     begin: '\'\\w[\\w\\d_]*(?!\')'
   };
 
-  var TYPE = {
+  const TYPE = {
     className: 'type',
     begin: '\\b[A-Z][A-Za-z0-9_]*',
     relevance: 0
   };
 
-  var NAME = {
+  const NAME = {
     className: 'title',
     begin: /[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,
     relevance: 0
   };
 
-  var CLASS = {
+  const CLASS = {
     className: 'class',
     beginKeywords: 'class object trait type',
     end: /[:={\[\n;]/,
@@ -81,7 +93,7 @@ export default function(hljs) {
         excludeBegin: true,
         excludeEnd: true,
         relevance: 0,
-        contains: [TYPE]
+        contains: [ TYPE ]
       },
       {
         className: 'params',
@@ -90,18 +102,18 @@ export default function(hljs) {
         excludeBegin: true,
         excludeEnd: true,
         relevance: 0,
-        contains: [TYPE]
+        contains: [ TYPE ]
       },
       NAME
     ]
   };
 
-  var METHOD = {
+  const METHOD = {
     className: 'function',
     beginKeywords: 'def',
     end: /[:={\[(\n;]/,
     excludeEnd: true,
-    contains: [NAME]
+    contains: [ NAME ]
   };
 
   return {
diff --git a/src/languages/scilab.js b/src/languages/scilab.js
index 9e03c9d536..3703b424d2 100644
--- a/src/languages/scilab.js
+++ b/src/languages/scilab.js
@@ -8,52 +8,59 @@ Category: scientific
 */
 
 export default function(hljs) {
-
-  var COMMON_CONTAINS = [
+  const COMMON_CONTAINS = [
     hljs.C_NUMBER_MODE,
     {
       className: 'string',
-      begin: '\'|\"', end: '\'|\"',
-      contains: [hljs.BACKSLASH_ESCAPE, {begin: '\'\''}]
+      begin: '\'|\"',
+      end: '\'|\"',
+      contains: [ hljs.BACKSLASH_ESCAPE,
+        {
+          begin: '\'\''
+        } ]
     }
   ];
 
   return {
     name: 'Scilab',
-    aliases: ['sci'],
+    aliases: [ 'sci' ],
     keywords: {
       $pattern: /%?\w+/,
-      keyword: 'abort break case clear catch continue do elseif else endfunction end for function '+
+      keyword: 'abort break case clear catch continue do elseif else endfunction end for function ' +
         'global if pause return resume select try then while',
       literal:
         '%f %F %t %T %pi %eps %inf %nan %e %i %z %s',
       built_in: // Scilab has more than 2000 functions. Just list the most commons
-       'abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error '+
-       'exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty '+
-       'isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log '+
-       'max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real '+
-       'round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan '+
+       'abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error ' +
+       'exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty ' +
+       'isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log ' +
+       'max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real ' +
+       'round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan ' +
        'type typename warning zeros matrix'
     },
     illegal: '("|#|/\\*|\\s+/\\w+)',
     contains: [
       {
         className: 'function',
-        beginKeywords: 'function', end: '$',
+        beginKeywords: 'function',
+        end: '$',
         contains: [
           hljs.UNDERSCORE_TITLE_MODE,
           {
             className: 'params',
-            begin: '\\(', end: '\\)'
+            begin: '\\(',
+            end: '\\)'
           }
         ]
       },
       {
-        begin: '[a-zA-Z_][a-zA-Z_0-9]*(\'+[\\.\']*|[\\.\']+)', end: '',
+        begin: '[a-zA-Z_][a-zA-Z_0-9]*(\'+[\\.\']*|[\\.\']+)',
+        end: '',
         relevance: 0
       },
       {
-        begin: '\\[', end: '\\]\'*[\\.\']*',
+        begin: '\\[',
+        end: '\\]\'*[\\.\']*',
         relevance: 0,
         contains: COMMON_CONTAINS
       },
diff --git a/src/languages/shell.js b/src/languages/shell.js
index 2c713da19d..63acc5e1e0 100644
--- a/src/languages/shell.js
+++ b/src/languages/shell.js
@@ -10,7 +10,7 @@ Audit: 2020
 export default function(hljs) {
   return {
     name: 'Shell Session',
-    aliases: ['console'],
+    aliases: [ 'console' ],
     contains: [
       {
         className: 'meta',
@@ -24,5 +24,5 @@ export default function(hljs) {
         }
       }
     ]
-  }
+  };
 }
diff --git a/src/languages/smali.js b/src/languages/smali.js
index b23072f5aa..716b7559b2 100644
--- a/src/languages/smali.js
+++ b/src/languages/smali.js
@@ -6,16 +6,77 @@ Website: https://github.com/JesusFreke/smali
 */
 
 export default function(hljs) {
-  var smali_instr_low_prio = ['add', 'and', 'cmp', 'cmpg', 'cmpl', 'const', 'div', 'double', 'float', 'goto', 'if', 'int', 'long', 'move', 'mul', 'neg', 'new', 'nop', 'not', 'or', 'rem', 'return', 'shl', 'shr', 'sput', 'sub', 'throw', 'ushr', 'xor'];
-  var smali_instr_high_prio = ['aget', 'aput', 'array', 'check', 'execute', 'fill', 'filled', 'goto/16', 'goto/32', 'iget', 'instance', 'invoke', 'iput', 'monitor', 'packed', 'sget', 'sparse'];
-  var smali_keywords = ['transient', 'constructor', 'abstract', 'final', 'synthetic', 'public', 'private', 'protected', 'static', 'bridge', 'system'];
+  const smali_instr_low_prio = [
+    'add',
+    'and',
+    'cmp',
+    'cmpg',
+    'cmpl',
+    'const',
+    'div',
+    'double',
+    'float',
+    'goto',
+    'if',
+    'int',
+    'long',
+    'move',
+    'mul',
+    'neg',
+    'new',
+    'nop',
+    'not',
+    'or',
+    'rem',
+    'return',
+    'shl',
+    'shr',
+    'sput',
+    'sub',
+    'throw',
+    'ushr',
+    'xor'
+  ];
+  const smali_instr_high_prio = [
+    'aget',
+    'aput',
+    'array',
+    'check',
+    'execute',
+    'fill',
+    'filled',
+    'goto/16',
+    'goto/32',
+    'iget',
+    'instance',
+    'invoke',
+    'iput',
+    'monitor',
+    'packed',
+    'sget',
+    'sparse'
+  ];
+  const smali_keywords = [
+    'transient',
+    'constructor',
+    'abstract',
+    'final',
+    'synthetic',
+    'public',
+    'private',
+    'protected',
+    'static',
+    'bridge',
+    'system'
+  ];
   return {
     name: 'Smali',
-    aliases: ['smali'],
+    aliases: [ 'smali' ],
     contains: [
       {
         className: 'string',
-        begin: '"', end: '"',
+        begin: '"',
+        end: '"',
         relevance: 0
       },
       hljs.COMMENT(
@@ -28,26 +89,36 @@ export default function(hljs) {
       {
         className: 'keyword',
         variants: [
-          {begin: '\\s*\\.end\\s[a-zA-Z0-9]*'},
-          {begin: '^[ ]*\\.[a-zA-Z]*', relevance: 0},
-          {begin: '\\s:[a-zA-Z_0-9]*', relevance: 0},
-          {begin: '\\s(' + smali_keywords.join('|') + ')'}
+          {
+            begin: '\\s*\\.end\\s[a-zA-Z0-9]*'
+          },
+          {
+            begin: '^[ ]*\\.[a-zA-Z]*',
+            relevance: 0
+          },
+          {
+            begin: '\\s:[a-zA-Z_0-9]*',
+            relevance: 0
+          },
+          {
+            begin: '\\s(' + smali_keywords.join('|') + ')'
+          }
         ]
       },
       {
         className: 'built_in',
-        variants : [
+        variants: [
           {
-            begin: '\\s('+smali_instr_low_prio.join('|')+')\\s'
+            begin: '\\s(' + smali_instr_low_prio.join('|') + ')\\s'
           },
           {
-            begin: '\\s('+smali_instr_low_prio.join('|')+')((-|/)[a-zA-Z0-9]+)+\\s',
+            begin: '\\s(' + smali_instr_low_prio.join('|') + ')((-|/)[a-zA-Z0-9]+)+\\s',
             relevance: 10
           },
           {
-            begin: '\\s('+smali_instr_high_prio.join('|')+')((-|/)[a-zA-Z0-9]+)*\\s',
+            begin: '\\s(' + smali_instr_high_prio.join('|') + ')((-|/)[a-zA-Z0-9]+)*\\s',
             relevance: 10
-          },
+          }
         ]
       },
       {
@@ -56,7 +127,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: '[vp][0-9]+',
+        begin: '[vp][0-9]+'
       }
     ]
   };
diff --git a/src/languages/smalltalk.js b/src/languages/smalltalk.js
index bd578dd492..fa926d1128 100644
--- a/src/languages/smalltalk.js
+++ b/src/languages/smalltalk.js
@@ -6,18 +6,18 @@ Website: https://en.wikipedia.org/wiki/Smalltalk
 */
 
 export default function(hljs) {
-  var VAR_IDENT_RE = '[a-z][a-zA-Z0-9_]*';
-  var CHAR = {
+  const VAR_IDENT_RE = '[a-z][a-zA-Z0-9_]*';
+  const CHAR = {
     className: 'string',
     begin: '\\$.{1}'
   };
-  var SYMBOL = {
+  const SYMBOL = {
     className: 'symbol',
     begin: '#' + hljs.UNDERSCORE_IDENT_RE
   };
   return {
     name: 'Smalltalk',
-    aliases: ['st'],
+    aliases: [ 'st' ],
     keywords: 'self super nil true false thisContext', // only 6
     contains: [
       hljs.COMMENT('"', '"'),
@@ -39,12 +39,16 @@ export default function(hljs) {
         // explosion under V8. It effectively means `| var1 var2 ... |` with
         // whitespace adjacent to `|` being optional.
         begin: '\\|[ ]*' + VAR_IDENT_RE + '([ ]+' + VAR_IDENT_RE + ')*[ ]*\\|',
-        returnBegin: true, end: /\|/,
+        returnBegin: true,
+        end: /\|/,
         illegal: /\S/,
-        contains: [{begin: '(\\|[ ]*)?' + VAR_IDENT_RE}]
+        contains: [ {
+          begin: '(\\|[ ]*)?' + VAR_IDENT_RE
+        } ]
       },
       {
-        begin: '#\\(', end: '\\)',
+        begin: '#\\(',
+        end: '\\)',
         contains: [
           hljs.APOS_STRING_MODE,
           CHAR,
diff --git a/src/languages/sml.js b/src/languages/sml.js
index 1d14b7a4ec..1c5d6d2774 100644
--- a/src/languages/sml.js
+++ b/src/languages/sml.js
@@ -9,7 +9,7 @@ Category: functional
 export default function(hljs) {
   return {
     name: 'SML (Standard ML)',
-    aliases: ['ml'],
+    aliases: [ 'ml' ],
     keywords: {
       $pattern: '[a-z_]\\w*!?',
       keyword:
@@ -35,7 +35,7 @@ export default function(hljs) {
         '\\(\\*',
         '\\*\\)',
         {
-          contains: ['self']
+          contains: [ 'self' ]
         }
       ),
       { /* type variable */
@@ -52,11 +52,16 @@ export default function(hljs) {
         begin: '\\b[A-Z][\\w\']*',
         relevance: 0
       },
-      { /* don't color identifiers, but safely catch all identifiers with '*/
+      { /* don't color identifiers, but safely catch all identifiers with ' */
         begin: '[a-z_]\\w*\'[\\w\']*'
       },
-      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'string', relevance: 0}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
+      hljs.inherit(hljs.APOS_STRING_MODE, {
+        className: 'string',
+        relevance: 0
+      }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        illegal: null
+      }),
       {
         className: 'number',
         begin:
diff --git a/src/languages/sqf.js b/src/languages/sqf.js
index da37dab248..8db3c34ccc 100644
--- a/src/languages/sqf.js
+++ b/src/languages/sqf.js
@@ -9,54 +9,65 @@ Category: scripting
 
 export default function(hljs) {
   // In SQF, a variable start with _
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     begin: /\b_+[a-zA-Z_]\w*/
   };
 
   // In SQF, a function should fit myTag_fnc_myFunction pattern
   // https://community.bistudio.com/wiki/Functions_Library_(Arma_3)#Adding_a_Function
-  var FUNCTION = {
+  const FUNCTION = {
     className: 'title',
     begin: /[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/
   };
 
   // In SQF strings, quotes matching the start are escaped by adding a consecutive.
   // Example of single escaped quotes: " "" " and  ' '' '.
-  var STRINGS = {
+  const STRINGS = {
     className: 'string',
     variants: [
       {
         begin: '"',
         end: '"',
-        contains: [{begin: '""', relevance: 0}]
+        contains: [ {
+          begin: '""',
+          relevance: 0
+        } ]
       },
       {
         begin: '\'',
         end: '\'',
-        contains: [{begin: '\'\'', relevance: 0}]
+        contains: [ {
+          begin: '\'\'',
+          relevance: 0
+        } ]
       }
     ]
   };
 
   // list of keywords from:
   // https://community.bistudio.com/wiki/PreProcessor_Commands
-  var PREPROCESSOR = {
+  const PREPROCESSOR = {
     className: 'meta',
-    begin: /#\s*[a-z]+\b/, end: /$/,
+    begin: /#\s*[a-z]+\b/,
+    end: /$/,
     keywords: {
       'meta-keyword':
         'define undef ifdef ifndef else endif include'
     },
     contains: [
       {
-        begin: /\\\n/, relevance: 0
+        begin: /\\\n/,
+        relevance: 0
       },
-      hljs.inherit(STRINGS, {className: 'meta-string'}),
+      hljs.inherit(STRINGS, {
+        className: 'meta-string'
+      }),
       {
         className: 'meta-string',
-        begin: /<[^\n>]*>/, end: /$/,
-        illegal: '\\n',
+        begin: /<[^\n>]*>/,
+        end: /$/,
+        illegal: '\\n'
       },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE
@@ -65,7 +76,7 @@ export default function(hljs) {
 
   return {
     name: 'SQF',
-    aliases: ['sqf'],
+    aliases: [ 'sqf' ],
     case_insensitive: true,
     keywords: {
       keyword:
@@ -420,7 +431,7 @@ export default function(hljs) {
       literal:
         'blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak ' +
         'locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic ' +
-        'sideUnknown taskNull teamMemberNull true west',
+        'sideUnknown taskNull teamMemberNull true west'
     },
     contains: [
       hljs.C_LINE_COMMENT_MODE,
diff --git a/src/languages/stan.js b/src/languages/stan.js
index b3a8a499d8..f7b7cc925a 100644
--- a/src/languages/stan.js
+++ b/src/languages/stan.js
@@ -8,7 +8,7 @@ Category: scientific
 
 export default function(hljs) {
   // variable names cannot conflict with block identifiers
-  var BLOCKS = [
+  const BLOCKS = [
     'functions',
     'model',
     'data',
@@ -17,7 +17,7 @@ export default function(hljs) {
     'transformed',
     'generated'
   ];
-  var STATEMENTS = [
+  const STATEMENTS = [
     'for',
     'in',
     'if',
@@ -27,7 +27,7 @@ export default function(hljs) {
     'continue',
     'return'
   ];
-  var SPECIAL_FUNCTIONS = [
+  const SPECIAL_FUNCTIONS = [
     'print',
     'reject',
     'increment_log_prob|10',
@@ -36,7 +36,7 @@ export default function(hljs) {
     'integrate_ode_bdf|10',
     'algebra_solver'
   ];
-  var VAR_TYPES = [
+  const VAR_TYPES = [
     'int',
     'real',
     'vector',
@@ -52,107 +52,425 @@ export default function(hljs) {
     'cov_matrix|10',
     'void'
   ];
-  var FUNCTIONS = [
-    'Phi', 'Phi_approx', 'abs', 'acos', 'acosh', 'algebra_solver', 'append_array',
-    'append_col', 'append_row', 'asin', 'asinh', 'atan', 'atan2', 'atanh',
-    'bernoulli_cdf', 'bernoulli_lccdf', 'bernoulli_lcdf', 'bernoulli_logit_lpmf',
-    'bernoulli_logit_rng', 'bernoulli_lpmf', 'bernoulli_rng', 'bessel_first_kind',
-    'bessel_second_kind', 'beta_binomial_cdf', 'beta_binomial_lccdf',
-    'beta_binomial_lcdf', 'beta_binomial_lpmf', 'beta_binomial_rng', 'beta_cdf',
-    'beta_lccdf', 'beta_lcdf', 'beta_lpdf', 'beta_rng', 'binary_log_loss',
-    'binomial_cdf', 'binomial_coefficient_log', 'binomial_lccdf', 'binomial_lcdf',
-    'binomial_logit_lpmf', 'binomial_lpmf', 'binomial_rng', 'block',
-    'categorical_logit_lpmf', 'categorical_logit_rng', 'categorical_lpmf',
-    'categorical_rng', 'cauchy_cdf', 'cauchy_lccdf', 'cauchy_lcdf', 'cauchy_lpdf',
-    'cauchy_rng', 'cbrt', 'ceil', 'chi_square_cdf', 'chi_square_lccdf',
-    'chi_square_lcdf', 'chi_square_lpdf', 'chi_square_rng', 'cholesky_decompose',
-    'choose', 'col', 'cols', 'columns_dot_product', 'columns_dot_self', 'cos',
-    'cosh', 'cov_exp_quad', 'crossprod', 'csr_extract_u', 'csr_extract_v',
-    'csr_extract_w', 'csr_matrix_times_vector', 'csr_to_dense_matrix',
-    'cumulative_sum', 'determinant', 'diag_matrix', 'diag_post_multiply',
-    'diag_pre_multiply', 'diagonal', 'digamma', 'dims', 'dirichlet_lpdf',
-    'dirichlet_rng', 'distance', 'dot_product', 'dot_self',
-    'double_exponential_cdf', 'double_exponential_lccdf', 'double_exponential_lcdf',
-    'double_exponential_lpdf', 'double_exponential_rng', 'e', 'eigenvalues_sym',
-    'eigenvectors_sym', 'erf', 'erfc', 'exp', 'exp2', 'exp_mod_normal_cdf',
-    'exp_mod_normal_lccdf', 'exp_mod_normal_lcdf', 'exp_mod_normal_lpdf',
-    'exp_mod_normal_rng', 'expm1', 'exponential_cdf', 'exponential_lccdf',
-    'exponential_lcdf', 'exponential_lpdf', 'exponential_rng', 'fabs',
-    'falling_factorial', 'fdim', 'floor', 'fma', 'fmax', 'fmin', 'fmod',
-    'frechet_cdf', 'frechet_lccdf', 'frechet_lcdf', 'frechet_lpdf', 'frechet_rng',
-    'gamma_cdf', 'gamma_lccdf', 'gamma_lcdf', 'gamma_lpdf', 'gamma_p', 'gamma_q',
-    'gamma_rng', 'gaussian_dlm_obs_lpdf', 'get_lp', 'gumbel_cdf', 'gumbel_lccdf',
-    'gumbel_lcdf', 'gumbel_lpdf', 'gumbel_rng', 'head', 'hypergeometric_lpmf',
-    'hypergeometric_rng', 'hypot', 'inc_beta', 'int_step', 'integrate_ode',
-    'integrate_ode_bdf', 'integrate_ode_rk45', 'inv', 'inv_Phi',
-    'inv_chi_square_cdf', 'inv_chi_square_lccdf', 'inv_chi_square_lcdf',
-    'inv_chi_square_lpdf', 'inv_chi_square_rng', 'inv_cloglog', 'inv_gamma_cdf',
-    'inv_gamma_lccdf', 'inv_gamma_lcdf', 'inv_gamma_lpdf', 'inv_gamma_rng',
-    'inv_logit', 'inv_sqrt', 'inv_square', 'inv_wishart_lpdf', 'inv_wishart_rng',
-    'inverse', 'inverse_spd', 'is_inf', 'is_nan', 'lbeta', 'lchoose', 'lgamma',
-    'lkj_corr_cholesky_lpdf', 'lkj_corr_cholesky_rng', 'lkj_corr_lpdf',
-    'lkj_corr_rng', 'lmgamma', 'lmultiply', 'log', 'log10', 'log1m', 'log1m_exp',
-    'log1m_inv_logit', 'log1p', 'log1p_exp', 'log2', 'log_determinant',
-    'log_diff_exp', 'log_falling_factorial', 'log_inv_logit', 'log_mix',
-    'log_rising_factorial', 'log_softmax', 'log_sum_exp', 'logistic_cdf',
-    'logistic_lccdf', 'logistic_lcdf', 'logistic_lpdf', 'logistic_rng', 'logit',
-    'lognormal_cdf', 'lognormal_lccdf', 'lognormal_lcdf', 'lognormal_lpdf',
-    'lognormal_rng', 'machine_precision', 'matrix_exp', 'max', 'mdivide_left_spd',
-    'mdivide_left_tri_low', 'mdivide_right_spd', 'mdivide_right_tri_low', 'mean',
-    'min', 'modified_bessel_first_kind', 'modified_bessel_second_kind',
-    'multi_gp_cholesky_lpdf', 'multi_gp_lpdf', 'multi_normal_cholesky_lpdf',
-    'multi_normal_cholesky_rng', 'multi_normal_lpdf', 'multi_normal_prec_lpdf',
-    'multi_normal_rng', 'multi_student_t_lpdf', 'multi_student_t_rng',
-    'multinomial_lpmf', 'multinomial_rng', 'multiply_log',
-    'multiply_lower_tri_self_transpose', 'neg_binomial_2_cdf',
-    'neg_binomial_2_lccdf', 'neg_binomial_2_lcdf', 'neg_binomial_2_log_lpmf',
-    'neg_binomial_2_log_rng', 'neg_binomial_2_lpmf', 'neg_binomial_2_rng',
-    'neg_binomial_cdf', 'neg_binomial_lccdf', 'neg_binomial_lcdf',
-    'neg_binomial_lpmf', 'neg_binomial_rng', 'negative_infinity', 'normal_cdf',
-    'normal_lccdf', 'normal_lcdf', 'normal_lpdf', 'normal_rng', 'not_a_number',
-    'num_elements', 'ordered_logistic_lpmf', 'ordered_logistic_rng', 'owens_t',
-    'pareto_cdf', 'pareto_lccdf', 'pareto_lcdf', 'pareto_lpdf', 'pareto_rng',
-    'pareto_type_2_cdf', 'pareto_type_2_lccdf', 'pareto_type_2_lcdf',
-    'pareto_type_2_lpdf', 'pareto_type_2_rng', 'pi', 'poisson_cdf', 'poisson_lccdf',
-    'poisson_lcdf', 'poisson_log_lpmf', 'poisson_log_rng', 'poisson_lpmf',
-    'poisson_rng', 'positive_infinity', 'pow', 'print', 'prod', 'qr_Q', 'qr_R',
-    'quad_form', 'quad_form_diag', 'quad_form_sym', 'rank', 'rayleigh_cdf',
-    'rayleigh_lccdf', 'rayleigh_lcdf', 'rayleigh_lpdf', 'rayleigh_rng', 'reject',
-    'rep_array', 'rep_matrix', 'rep_row_vector', 'rep_vector', 'rising_factorial',
-    'round', 'row', 'rows', 'rows_dot_product', 'rows_dot_self',
-    'scaled_inv_chi_square_cdf', 'scaled_inv_chi_square_lccdf',
-    'scaled_inv_chi_square_lcdf', 'scaled_inv_chi_square_lpdf',
-    'scaled_inv_chi_square_rng', 'sd', 'segment', 'sin', 'singular_values', 'sinh',
-    'size', 'skew_normal_cdf', 'skew_normal_lccdf', 'skew_normal_lcdf',
-    'skew_normal_lpdf', 'skew_normal_rng', 'softmax', 'sort_asc', 'sort_desc',
-    'sort_indices_asc', 'sort_indices_desc', 'sqrt', 'sqrt2', 'square',
-    'squared_distance', 'step', 'student_t_cdf', 'student_t_lccdf',
-    'student_t_lcdf', 'student_t_lpdf', 'student_t_rng', 'sub_col', 'sub_row',
-    'sum', 'tail', 'tan', 'tanh', 'target', 'tcrossprod', 'tgamma', 'to_array_1d',
-    'to_array_2d', 'to_matrix', 'to_row_vector', 'to_vector', 'trace',
-    'trace_gen_quad_form', 'trace_quad_form', 'trigamma', 'trunc', 'uniform_cdf',
-    'uniform_lccdf', 'uniform_lcdf', 'uniform_lpdf', 'uniform_rng', 'variance',
-    'von_mises_lpdf', 'von_mises_rng', 'weibull_cdf', 'weibull_lccdf',
-    'weibull_lcdf', 'weibull_lpdf', 'weibull_rng', 'wiener_lpdf', 'wishart_lpdf',
+  const FUNCTIONS = [
+    'Phi',
+    'Phi_approx',
+    'abs',
+    'acos',
+    'acosh',
+    'algebra_solver',
+    'append_array',
+    'append_col',
+    'append_row',
+    'asin',
+    'asinh',
+    'atan',
+    'atan2',
+    'atanh',
+    'bernoulli_cdf',
+    'bernoulli_lccdf',
+    'bernoulli_lcdf',
+    'bernoulli_logit_lpmf',
+    'bernoulli_logit_rng',
+    'bernoulli_lpmf',
+    'bernoulli_rng',
+    'bessel_first_kind',
+    'bessel_second_kind',
+    'beta_binomial_cdf',
+    'beta_binomial_lccdf',
+    'beta_binomial_lcdf',
+    'beta_binomial_lpmf',
+    'beta_binomial_rng',
+    'beta_cdf',
+    'beta_lccdf',
+    'beta_lcdf',
+    'beta_lpdf',
+    'beta_rng',
+    'binary_log_loss',
+    'binomial_cdf',
+    'binomial_coefficient_log',
+    'binomial_lccdf',
+    'binomial_lcdf',
+    'binomial_logit_lpmf',
+    'binomial_lpmf',
+    'binomial_rng',
+    'block',
+    'categorical_logit_lpmf',
+    'categorical_logit_rng',
+    'categorical_lpmf',
+    'categorical_rng',
+    'cauchy_cdf',
+    'cauchy_lccdf',
+    'cauchy_lcdf',
+    'cauchy_lpdf',
+    'cauchy_rng',
+    'cbrt',
+    'ceil',
+    'chi_square_cdf',
+    'chi_square_lccdf',
+    'chi_square_lcdf',
+    'chi_square_lpdf',
+    'chi_square_rng',
+    'cholesky_decompose',
+    'choose',
+    'col',
+    'cols',
+    'columns_dot_product',
+    'columns_dot_self',
+    'cos',
+    'cosh',
+    'cov_exp_quad',
+    'crossprod',
+    'csr_extract_u',
+    'csr_extract_v',
+    'csr_extract_w',
+    'csr_matrix_times_vector',
+    'csr_to_dense_matrix',
+    'cumulative_sum',
+    'determinant',
+    'diag_matrix',
+    'diag_post_multiply',
+    'diag_pre_multiply',
+    'diagonal',
+    'digamma',
+    'dims',
+    'dirichlet_lpdf',
+    'dirichlet_rng',
+    'distance',
+    'dot_product',
+    'dot_self',
+    'double_exponential_cdf',
+    'double_exponential_lccdf',
+    'double_exponential_lcdf',
+    'double_exponential_lpdf',
+    'double_exponential_rng',
+    'e',
+    'eigenvalues_sym',
+    'eigenvectors_sym',
+    'erf',
+    'erfc',
+    'exp',
+    'exp2',
+    'exp_mod_normal_cdf',
+    'exp_mod_normal_lccdf',
+    'exp_mod_normal_lcdf',
+    'exp_mod_normal_lpdf',
+    'exp_mod_normal_rng',
+    'expm1',
+    'exponential_cdf',
+    'exponential_lccdf',
+    'exponential_lcdf',
+    'exponential_lpdf',
+    'exponential_rng',
+    'fabs',
+    'falling_factorial',
+    'fdim',
+    'floor',
+    'fma',
+    'fmax',
+    'fmin',
+    'fmod',
+    'frechet_cdf',
+    'frechet_lccdf',
+    'frechet_lcdf',
+    'frechet_lpdf',
+    'frechet_rng',
+    'gamma_cdf',
+    'gamma_lccdf',
+    'gamma_lcdf',
+    'gamma_lpdf',
+    'gamma_p',
+    'gamma_q',
+    'gamma_rng',
+    'gaussian_dlm_obs_lpdf',
+    'get_lp',
+    'gumbel_cdf',
+    'gumbel_lccdf',
+    'gumbel_lcdf',
+    'gumbel_lpdf',
+    'gumbel_rng',
+    'head',
+    'hypergeometric_lpmf',
+    'hypergeometric_rng',
+    'hypot',
+    'inc_beta',
+    'int_step',
+    'integrate_ode',
+    'integrate_ode_bdf',
+    'integrate_ode_rk45',
+    'inv',
+    'inv_Phi',
+    'inv_chi_square_cdf',
+    'inv_chi_square_lccdf',
+    'inv_chi_square_lcdf',
+    'inv_chi_square_lpdf',
+    'inv_chi_square_rng',
+    'inv_cloglog',
+    'inv_gamma_cdf',
+    'inv_gamma_lccdf',
+    'inv_gamma_lcdf',
+    'inv_gamma_lpdf',
+    'inv_gamma_rng',
+    'inv_logit',
+    'inv_sqrt',
+    'inv_square',
+    'inv_wishart_lpdf',
+    'inv_wishart_rng',
+    'inverse',
+    'inverse_spd',
+    'is_inf',
+    'is_nan',
+    'lbeta',
+    'lchoose',
+    'lgamma',
+    'lkj_corr_cholesky_lpdf',
+    'lkj_corr_cholesky_rng',
+    'lkj_corr_lpdf',
+    'lkj_corr_rng',
+    'lmgamma',
+    'lmultiply',
+    'log',
+    'log10',
+    'log1m',
+    'log1m_exp',
+    'log1m_inv_logit',
+    'log1p',
+    'log1p_exp',
+    'log2',
+    'log_determinant',
+    'log_diff_exp',
+    'log_falling_factorial',
+    'log_inv_logit',
+    'log_mix',
+    'log_rising_factorial',
+    'log_softmax',
+    'log_sum_exp',
+    'logistic_cdf',
+    'logistic_lccdf',
+    'logistic_lcdf',
+    'logistic_lpdf',
+    'logistic_rng',
+    'logit',
+    'lognormal_cdf',
+    'lognormal_lccdf',
+    'lognormal_lcdf',
+    'lognormal_lpdf',
+    'lognormal_rng',
+    'machine_precision',
+    'matrix_exp',
+    'max',
+    'mdivide_left_spd',
+    'mdivide_left_tri_low',
+    'mdivide_right_spd',
+    'mdivide_right_tri_low',
+    'mean',
+    'min',
+    'modified_bessel_first_kind',
+    'modified_bessel_second_kind',
+    'multi_gp_cholesky_lpdf',
+    'multi_gp_lpdf',
+    'multi_normal_cholesky_lpdf',
+    'multi_normal_cholesky_rng',
+    'multi_normal_lpdf',
+    'multi_normal_prec_lpdf',
+    'multi_normal_rng',
+    'multi_student_t_lpdf',
+    'multi_student_t_rng',
+    'multinomial_lpmf',
+    'multinomial_rng',
+    'multiply_log',
+    'multiply_lower_tri_self_transpose',
+    'neg_binomial_2_cdf',
+    'neg_binomial_2_lccdf',
+    'neg_binomial_2_lcdf',
+    'neg_binomial_2_log_lpmf',
+    'neg_binomial_2_log_rng',
+    'neg_binomial_2_lpmf',
+    'neg_binomial_2_rng',
+    'neg_binomial_cdf',
+    'neg_binomial_lccdf',
+    'neg_binomial_lcdf',
+    'neg_binomial_lpmf',
+    'neg_binomial_rng',
+    'negative_infinity',
+    'normal_cdf',
+    'normal_lccdf',
+    'normal_lcdf',
+    'normal_lpdf',
+    'normal_rng',
+    'not_a_number',
+    'num_elements',
+    'ordered_logistic_lpmf',
+    'ordered_logistic_rng',
+    'owens_t',
+    'pareto_cdf',
+    'pareto_lccdf',
+    'pareto_lcdf',
+    'pareto_lpdf',
+    'pareto_rng',
+    'pareto_type_2_cdf',
+    'pareto_type_2_lccdf',
+    'pareto_type_2_lcdf',
+    'pareto_type_2_lpdf',
+    'pareto_type_2_rng',
+    'pi',
+    'poisson_cdf',
+    'poisson_lccdf',
+    'poisson_lcdf',
+    'poisson_log_lpmf',
+    'poisson_log_rng',
+    'poisson_lpmf',
+    'poisson_rng',
+    'positive_infinity',
+    'pow',
+    'print',
+    'prod',
+    'qr_Q',
+    'qr_R',
+    'quad_form',
+    'quad_form_diag',
+    'quad_form_sym',
+    'rank',
+    'rayleigh_cdf',
+    'rayleigh_lccdf',
+    'rayleigh_lcdf',
+    'rayleigh_lpdf',
+    'rayleigh_rng',
+    'reject',
+    'rep_array',
+    'rep_matrix',
+    'rep_row_vector',
+    'rep_vector',
+    'rising_factorial',
+    'round',
+    'row',
+    'rows',
+    'rows_dot_product',
+    'rows_dot_self',
+    'scaled_inv_chi_square_cdf',
+    'scaled_inv_chi_square_lccdf',
+    'scaled_inv_chi_square_lcdf',
+    'scaled_inv_chi_square_lpdf',
+    'scaled_inv_chi_square_rng',
+    'sd',
+    'segment',
+    'sin',
+    'singular_values',
+    'sinh',
+    'size',
+    'skew_normal_cdf',
+    'skew_normal_lccdf',
+    'skew_normal_lcdf',
+    'skew_normal_lpdf',
+    'skew_normal_rng',
+    'softmax',
+    'sort_asc',
+    'sort_desc',
+    'sort_indices_asc',
+    'sort_indices_desc',
+    'sqrt',
+    'sqrt2',
+    'square',
+    'squared_distance',
+    'step',
+    'student_t_cdf',
+    'student_t_lccdf',
+    'student_t_lcdf',
+    'student_t_lpdf',
+    'student_t_rng',
+    'sub_col',
+    'sub_row',
+    'sum',
+    'tail',
+    'tan',
+    'tanh',
+    'target',
+    'tcrossprod',
+    'tgamma',
+    'to_array_1d',
+    'to_array_2d',
+    'to_matrix',
+    'to_row_vector',
+    'to_vector',
+    'trace',
+    'trace_gen_quad_form',
+    'trace_quad_form',
+    'trigamma',
+    'trunc',
+    'uniform_cdf',
+    'uniform_lccdf',
+    'uniform_lcdf',
+    'uniform_lpdf',
+    'uniform_rng',
+    'variance',
+    'von_mises_lpdf',
+    'von_mises_rng',
+    'weibull_cdf',
+    'weibull_lccdf',
+    'weibull_lcdf',
+    'weibull_lpdf',
+    'weibull_rng',
+    'wiener_lpdf',
+    'wishart_lpdf',
     'wishart_rng'
   ];
-  var DISTRIBUTIONS = [
-    'bernoulli', 'bernoulli_logit', 'beta', 'beta_binomial', 'binomial',
-    'binomial_logit', 'categorical', 'categorical_logit', 'cauchy', 'chi_square',
-    'dirichlet', 'double_exponential', 'exp_mod_normal', 'exponential', 'frechet',
-    'gamma', 'gaussian_dlm_obs', 'gumbel', 'hypergeometric', 'inv_chi_square',
-    'inv_gamma', 'inv_wishart', 'lkj_corr', 'lkj_corr_cholesky', 'logistic',
-    'lognormal', 'multi_gp', 'multi_gp_cholesky', 'multi_normal',
-    'multi_normal_cholesky', 'multi_normal_prec', 'multi_student_t', 'multinomial',
-    'neg_binomial', 'neg_binomial_2', 'neg_binomial_2_log', 'normal',
-    'ordered_logistic', 'pareto', 'pareto_type_2', 'poisson', 'poisson_log',
-    'rayleigh', 'scaled_inv_chi_square', 'skew_normal', 'student_t', 'uniform',
-    'von_mises', 'weibull', 'wiener', 'wishart'
+  const DISTRIBUTIONS = [
+    'bernoulli',
+    'bernoulli_logit',
+    'beta',
+    'beta_binomial',
+    'binomial',
+    'binomial_logit',
+    'categorical',
+    'categorical_logit',
+    'cauchy',
+    'chi_square',
+    'dirichlet',
+    'double_exponential',
+    'exp_mod_normal',
+    'exponential',
+    'frechet',
+    'gamma',
+    'gaussian_dlm_obs',
+    'gumbel',
+    'hypergeometric',
+    'inv_chi_square',
+    'inv_gamma',
+    'inv_wishart',
+    'lkj_corr',
+    'lkj_corr_cholesky',
+    'logistic',
+    'lognormal',
+    'multi_gp',
+    'multi_gp_cholesky',
+    'multi_normal',
+    'multi_normal_cholesky',
+    'multi_normal_prec',
+    'multi_student_t',
+    'multinomial',
+    'neg_binomial',
+    'neg_binomial_2',
+    'neg_binomial_2_log',
+    'normal',
+    'ordered_logistic',
+    'pareto',
+    'pareto_type_2',
+    'poisson',
+    'poisson_log',
+    'rayleigh',
+    'scaled_inv_chi_square',
+    'skew_normal',
+    'student_t',
+    'uniform',
+    'von_mises',
+    'weibull',
+    'wiener',
+    'wishart'
   ];
 
   return {
     name: 'Stan',
-    aliases: ['stanfuncs'],
+    aliases: [ 'stanfuncs' ],
     keywords: {
       $pattern: hljs.IDENT_RE,
       title: BLOCKS.join(' '),
@@ -224,5 +542,5 @@ export default function(hljs) {
         relevance: 0
       }
     ]
-  }
+  };
 }
diff --git a/src/languages/stata.js b/src/languages/stata.js
index 08e431eb74..4f0b0a70ed 100644
--- a/src/languages/stata.js
+++ b/src/languages/stata.js
@@ -14,10 +14,13 @@ Category: scientific
 export default function(hljs) {
   return {
     name: 'Stata',
-    aliases: ['do', 'ado'],
+    aliases: [
+      'do',
+      'ado'
+    ],
     case_insensitive: true,
     keywords: 'if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5',
-        contains: [
+    contains: [
       {
         className: 'symbol',
         begin: /`[a-zA-Z0-9_]+'/
@@ -29,8 +32,12 @@ export default function(hljs) {
       {
         className: 'string',
         variants: [
-          {begin: '`"[^\r\n]*?"\''},
-          {begin: '"[^\r\n"]*"'}
+          {
+            begin: '`"[^\r\n]*?"\''
+          },
+          {
+            begin: '"[^\r\n"]*"'
+          }
         ]
       },
 
diff --git a/src/languages/step21.js b/src/languages/step21.js
index 562f919137..3362d957eb 100644
--- a/src/languages/step21.js
+++ b/src/languages/step21.js
@@ -6,17 +6,17 @@ Website: https://en.wikipedia.org/wiki/ISO_10303-21
 */
 
 export default function(hljs) {
-  var STEP21_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
-  var STEP21_KEYWORDS = {
+  const STEP21_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
+  const STEP21_KEYWORDS = {
     $pattern: STEP21_IDENT_RE,
     keyword: 'HEADER ENDSEC DATA'
   };
-  var STEP21_START = {
+  const STEP21_START = {
     className: 'meta',
     begin: 'ISO-10303-21;',
     relevance: 10
   };
-  var STEP21_CLOSE = {
+  const STEP21_CLOSE = {
     className: 'meta',
     begin: 'END-ISO-10303-21;',
     relevance: 10
@@ -24,7 +24,11 @@ export default function(hljs) {
 
   return {
     name: 'STEP Part 21',
-    aliases: ['p21', 'step', 'stp'],
+    aliases: [
+      'p21',
+      'step',
+      'stp'
+    ],
     case_insensitive: true, // STEP 21 is case insensitive in theory, in practice all non-comments are capitalized.
     keywords: STEP21_KEYWORDS,
     contains: [
@@ -34,17 +38,23 @@ export default function(hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.COMMENT('/\\*\\*!', '\\*/'),
       hljs.C_NUMBER_MODE,
-      hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
+      hljs.inherit(hljs.APOS_STRING_MODE, {
+        illegal: null
+      }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        illegal: null
+      }),
       {
         className: 'string',
-        begin: "'", end: "'"
+        begin: "'",
+        end: "'"
       },
       {
         className: 'symbol',
         variants: [
           {
-            begin: '#', end: '\\d+',
+            begin: '#',
+            end: '\\d+',
             illegal: '\\W'
           }
         ]
diff --git a/src/languages/subunit.js b/src/languages/subunit.js
index 68313215b6..f0ca3c6ffa 100644
--- a/src/languages/subunit.js
+++ b/src/languages/subunit.js
@@ -5,27 +5,36 @@ Website: https://pypi.org/project/python-subunit/
 */
 
 export default function(hljs) {
-  var DETAILS = {
+  const DETAILS = {
     className: 'string',
-    begin: '\\[\n(multipart)?', end: '\\]\n'
+    begin: '\\[\n(multipart)?',
+    end: '\\]\n'
   };
-  var TIME = {
+  const TIME = {
     className: 'string',
     begin: '\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}\.\\d+Z'
   };
-  var PROGRESSVALUE = {
+  const PROGRESSVALUE = {
     className: 'string',
     begin: '(\\+|-)\\d+'
   };
-  var KEYWORDS = {
+  const KEYWORDS = {
     className: 'keyword',
     relevance: 10,
     variants: [
-      { begin: '^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?' },
-      { begin: '^progress(:?)(\\s+)?(pop|push)?' },
-      { begin: '^tags:' },
-      { begin: '^time:' }
-    ],
+      {
+        begin: '^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?'
+      },
+      {
+        begin: '^progress(:?)(\\s+)?(pop|push)?'
+      },
+      {
+        begin: '^tags:'
+      },
+      {
+        begin: '^time:'
+      }
+    ]
   };
   return {
     name: 'SubUnit',
diff --git a/src/languages/taggerscript.js b/src/languages/taggerscript.js
index 41521df26f..c1caa33401 100644
--- a/src/languages/taggerscript.js
+++ b/src/languages/taggerscript.js
@@ -5,35 +5,35 @@ Description: Syntax Highlighting for the Tagger Script as used by MusicBrainz Pi
 Website: https://picard.musicbrainz.org
  */
 export default function(hljs) {
-
-  var COMMENT = {
+  const COMMENT = {
     className: 'comment',
     begin: /\$noop\(/,
     end: /\)/,
-    contains: [{
+    contains: [ {
       begin: /\(/,
       end: /\)/,
-      contains: ['self', {
-        begin: /\\./
-      }]
-    }],
+      contains: [ 'self',
+        {
+          begin: /\\./
+        } ]
+    } ],
     relevance: 10
   };
 
-  var FUNCTION = {
+  const FUNCTION = {
     className: 'keyword',
     begin: /\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,
     end: /\(/,
     excludeEnd: true
   };
 
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     begin: /%[_a-zA-Z0-9:]*/,
     end: '%'
   };
 
-  var ESCAPE_SEQUENCE = {
+  const ESCAPE_SEQUENCE = {
     className: 'symbol',
     begin: /\\./
   };
diff --git a/src/languages/tap.js b/src/languages/tap.js
index 0365cb1ebb..99fa07a8c1 100644
--- a/src/languages/tap.js
+++ b/src/languages/tap.js
@@ -16,29 +16,38 @@ export default function(hljs) {
       {
         className: 'meta',
         variants: [
-          { begin: '^TAP version (\\d+)$' },
-          { begin: '^1\\.\\.(\\d+)$' }
-        ],
+          {
+            begin: '^TAP version (\\d+)$'
+          },
+          {
+            begin: '^1\\.\\.(\\d+)$'
+          }
+        ]
       },
       // YAML block
       {
-        begin: /---$/, end: '\\.\\.\\.$',
+        begin: /---$/,
+        end: '\\.\\.\\.$',
         subLanguage: 'yaml',
         relevance: 0
       },
-	  // testcase number
+      // testcase number
       {
         className: 'number',
         begin: ' (\\d+) '
       },
-	  // testcase status and description
+      // testcase status and description
       {
         className: 'symbol',
         variants: [
-          { begin: '^ok' },
-          { begin: '^not ok' }
-        ],
-      },
+          {
+            begin: '^ok'
+          },
+          {
+            begin: '^not ok'
+          }
+        ]
+      }
     ]
   };
 }
diff --git a/src/languages/thrift.js b/src/languages/thrift.js
index a2652c123d..9338e06e2a 100644
--- a/src/languages/thrift.js
+++ b/src/languages/thrift.js
@@ -7,7 +7,7 @@ Category: protocols
 */
 
 export default function(hljs) {
-  var BUILT_IN_TYPES = 'bool byte i16 i32 i64 double string binary';
+  const BUILT_IN_TYPES = 'bool byte i16 i32 i64 double string binary';
   return {
     name: 'Thrift',
     keywords: {
@@ -25,18 +25,24 @@ export default function(hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       {
         className: 'class',
-        beginKeywords: 'struct enum service exception', end: /\{/,
+        beginKeywords: 'struct enum service exception',
+        end: /\{/,
         illegal: /\n/,
         contains: [
           hljs.inherit(hljs.TITLE_MODE, {
-            starts: {endsWithParent: true, excludeEnd: true} // hack: eating everything after the first title
+            // hack: eating everything after the first title
+            starts: {
+              endsWithParent: true,
+              excludeEnd: true
+            }
           })
         ]
       },
       {
-        begin: '\\b(set|list|map)\\s*<', end: '>',
+        begin: '\\b(set|list|map)\\s*<',
+        end: '>',
         keywords: BUILT_IN_TYPES,
-        contains: ['self']
+        contains: [ 'self' ]
       }
     ]
   };
diff --git a/src/languages/tp.js b/src/languages/tp.js
index eec5fdde2c..babad4a6e0 100644
--- a/src/languages/tp.js
+++ b/src/languages/tp.js
@@ -4,30 +4,31 @@ Author: Jay Strybis <jay.strybis@gmail.com>
 Description: FANUC TP programming language (TPP).
 */
 
-
 export default function(hljs) {
-  var TPID = {
+  const TPID = {
     className: 'number',
     begin: '[1-9][0-9]*', /* no leading zeros */
     relevance: 0
   };
-  var TPLABEL = {
+  const TPLABEL = {
     className: 'symbol',
     begin: ':[^\\]]+'
   };
-  var TPDATA = {
+  const TPDATA = {
     className: 'built_in',
     begin: '(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|' +
-    'TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[', end: '\\]',
+    'TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[',
+    end: '\\]',
     contains: [
       'self',
       TPID,
       TPLABEL
     ]
   };
-  var TPIO = {
+  const TPIO = {
     className: 'built_in',
-    begin: '(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[', end: '\\]',
+    begin: '(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[',
+    end: '\\]',
     contains: [
       'self',
       TPID,
@@ -79,7 +80,8 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'string',
-        begin: '\'', end: '\''
+        begin: '\'',
+        end: '\''
       },
       hljs.C_NUMBER_MODE,
       {
diff --git a/src/languages/vala.js b/src/languages/vala.js
index 2ca8243e31..1c71113391 100644
--- a/src/languages/vala.js
+++ b/src/languages/vala.js
@@ -31,17 +31,18 @@ export default function(hljs) {
     contains: [
       {
         className: 'class',
-        beginKeywords: 'class interface namespace', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface namespace',
+        end: /\{/,
+        excludeEnd: true,
         illegal: '[^,:\\n\\s\\.]',
-        contains: [
-          hljs.UNDERSCORE_TITLE_MODE
-        ]
+        contains: [ hljs.UNDERSCORE_TITLE_MODE ]
       },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       {
         className: 'string',
-        begin: '"""', end: '"""',
+        begin: '"""',
+        end: '"""',
         relevance: 5
       },
       hljs.APOS_STRING_MODE,
@@ -49,7 +50,8 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'meta',
-        begin: '^#', end: '$',
+        begin: '^#',
+        end: '$',
         relevance: 2
       }
     ]
diff --git a/src/languages/vbnet.js b/src/languages/vbnet.js
index 8346a80c37..8862b5e9ad 100644
--- a/src/languages/vbnet.js
+++ b/src/languages/vbnet.js
@@ -8,7 +8,7 @@ Website: https://docs.microsoft.com/en-us/dotnet/visual-basic/getting-started/
 export default function(hljs) {
   return {
     name: 'Visual Basic .NET',
-    aliases: ['vb'],
+    aliases: [ 'vb' ],
     case_insensitive: true,
     keywords: {
       keyword:
@@ -24,7 +24,7 @@ export default function(hljs) {
         'select set shadows shared skip static step stop structure strict sub synclock ' + /* s */
         'take text then throw to try unicode until using when where while widening with withevents writeonly xor yield', /* t-y */
       built_in:
-        'boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype ' +  /* b-c */
+        'boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype ' + /* b-c */
         'date decimal directcast double gettype getxmlnamespace iif integer long object ' + /* d-o */
         'sbyte short single string trycast typeof uinteger ulong ushort', /* s-u */
       literal:
@@ -32,7 +32,13 @@ export default function(hljs) {
     },
     illegal: '//|\\{|\\}|endif|gosub|variant|wend|^\\$ ', /* reserved deprecated keywords */
     contains: [
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [{begin: '""'}]}),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        contains: [
+          {
+            begin: '""'
+          }
+        ]
+      }),
       hljs.COMMENT(
         '\'',
         '$',
@@ -42,12 +48,13 @@ export default function(hljs) {
             {
               className: 'doctag',
               begin: '\'\'\'|<!--|-->',
-              contains: [hljs.PHRASAL_WORDS_MODE]
+              contains: [ hljs.PHRASAL_WORDS_MODE ]
             },
             {
               className: 'doctag',
-              begin: '</?', end: '>',
-              contains: [hljs.PHRASAL_WORDS_MODE]
+              begin: '</?',
+              end: '>',
+              contains: [ hljs.PHRASAL_WORDS_MODE ]
             }
           ]
         }
@@ -55,8 +62,11 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE,
       {
         className: 'meta',
-        begin: '#', end: '$',
-        keywords: {'meta-keyword': 'if else elseif end region externalsource'}
+        begin: '#',
+        end: '$',
+        keywords: {
+          'meta-keyword': 'if else elseif end region externalsource'
+        }
       }
     ]
   };
diff --git a/src/languages/vbscript-html.js b/src/languages/vbscript-html.js
index 527d7daadb..ea0537da0e 100644
--- a/src/languages/vbscript-html.js
+++ b/src/languages/vbscript-html.js
@@ -13,7 +13,8 @@ export default function(hljs) {
     subLanguage: 'xml',
     contains: [
       {
-        begin: '<%', end: '%>',
+        begin: '<%',
+        end: '%>',
         subLanguage: 'vbscript'
       }
     ]
diff --git a/src/languages/verilog.js b/src/languages/verilog.js
index cb88958636..fa242a556b 100644
--- a/src/languages/verilog.js
+++ b/src/languages/verilog.js
@@ -7,7 +7,7 @@ Website: http://www.verilog.com
 */
 
 export default function(hljs) {
-  var SV_KEYWORDS = {
+  const SV_KEYWORDS = {
     $pattern: /[\w\$]+/,
     keyword:
       'accept_on alias always always_comb always_ff always_latch and assert assign ' +
@@ -66,10 +66,15 @@ export default function(hljs) {
       '$swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb ' +
       '$fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat ' +
       '$sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror'
-    };
+  };
+
   return {
     name: 'Verilog',
-    aliases: ['v', 'sv', 'svh'],
+    aliases: [
+      'v',
+      'sv',
+      'svh'
+    ],
     case_insensitive: false,
     keywords: SV_KEYWORDS,
     contains: [
@@ -78,31 +83,47 @@ export default function(hljs) {
       hljs.QUOTE_STRING_MODE,
       {
         className: 'number',
-        contains: [hljs.BACKSLASH_ESCAPE],
+        contains: [ hljs.BACKSLASH_ESCAPE ],
         variants: [
-          {begin: '\\b((\\d+\'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)'},
-          {begin: '\\B((\'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)'},
-          {begin: '\\b([0-9_])+', relevance: 0}
+          {
+            begin: '\\b((\\d+\'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)'
+          },
+          {
+            begin: '\\B((\'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)'
+          },
+          {
+            begin: '\\b([0-9_])+',
+            relevance: 0
+          }
         ]
       },
       /* parameters to instances */
       {
         className: 'variable',
         variants: [
-          {begin: '#\\((?!parameter).+\\)'},
-          {begin: '\\.\\w+', relevance: 0},
+          {
+            begin: '#\\((?!parameter).+\\)'
+          },
+          {
+            begin: '\\.\\w+',
+            relevance: 0
+          }
         ]
       },
       {
         className: 'meta',
-        begin: '`', end: '$',
-        keywords: {'meta-keyword': 'define __FILE__ ' +
-          '__LINE__ begin_keywords celldefine default_nettype define ' +
-          'else elsif end_keywords endcelldefine endif ifdef ifndef ' +
-          'include line nounconnected_drive pragma resetall timescale ' +
-          'unconnected_drive undef undefineall'},
+        begin: '`',
+        end: '$',
+        keywords: {
+          'meta-keyword':
+            'define __FILE__ ' +
+            '__LINE__ begin_keywords celldefine default_nettype define ' +
+            'else elsif end_keywords endcelldefine endif ifdef ifndef ' +
+            'include line nounconnected_drive pragma resetall timescale ' +
+            'unconnected_drive undef undefineall'
+        },
         relevance: 0
       }
     ]
-  }; // return
+  };
 }
diff --git a/src/languages/vhdl.js b/src/languages/vhdl.js
index 3b38be6009..c65679b79f 100644
--- a/src/languages/vhdl.js
+++ b/src/languages/vhdl.js
@@ -10,14 +10,14 @@ export default function(hljs) {
   // Regular expression for VHDL numeric literals.
 
   // Decimal literal:
-  var INTEGER_RE = '\\d(_|\\d)*';
-  var EXPONENT_RE = '[eE][-+]?' + INTEGER_RE;
-  var DECIMAL_LITERAL_RE = INTEGER_RE + '(\\.' + INTEGER_RE + ')?' + '(' + EXPONENT_RE + ')?';
+  const INTEGER_RE = '\\d(_|\\d)*';
+  const EXPONENT_RE = '[eE][-+]?' + INTEGER_RE;
+  const DECIMAL_LITERAL_RE = INTEGER_RE + '(\\.' + INTEGER_RE + ')?' + '(' + EXPONENT_RE + ')?';
   // Based literal:
-  var BASED_INTEGER_RE = '\\w+';
-  var BASED_LITERAL_RE = INTEGER_RE + '#' + BASED_INTEGER_RE + '(\\.' + BASED_INTEGER_RE + ')?' + '#' + '(' + EXPONENT_RE + ')?';
+  const BASED_INTEGER_RE = '\\w+';
+  const BASED_LITERAL_RE = INTEGER_RE + '#' + BASED_INTEGER_RE + '(\\.' + BASED_INTEGER_RE + ')?' + '#' + '(' + EXPONENT_RE + ')?';
 
-  var NUMBER_RE = '\\b(' + BASED_LITERAL_RE + '|' + DECIMAL_LITERAL_RE + ')';
+  const NUMBER_RE = '\\b(' + BASED_LITERAL_RE + '|' + DECIMAL_LITERAL_RE + ')';
 
   return {
     name: 'VHDL',
@@ -41,12 +41,12 @@ export default function(hljs) {
         'std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed ' +
         'real_vector time_vector',
       literal:
-        'false true note warning error failure ' +  // severity_level
-        'line text side width'                      // textio
+        'false true note warning error failure ' + // severity_level
+        'line text side width' // textio
     },
     illegal: /\{/,
     contains: [
-      hljs.C_BLOCK_COMMENT_MODE,      // VHDL-2008 block commenting.
+      hljs.C_BLOCK_COMMENT_MODE, // VHDL-2008 block commenting.
       hljs.COMMENT('--', '$'),
       hljs.QUOTE_STRING_MODE,
       {
@@ -57,12 +57,12 @@ export default function(hljs) {
       {
         className: 'string',
         begin: '\'(U|X|0|1|Z|W|L|H|-)\'',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
         className: 'symbol',
         begin: '\'[A-Za-z](_?[A-Za-z0-9])*',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       }
     ]
   };
diff --git a/src/languages/vim.js b/src/languages/vim.js
index 5b2af2c9b7..a36edd2a12 100644
--- a/src/languages/vim.js
+++ b/src/languages/vim.js
@@ -13,25 +13,25 @@ export default function(hljs) {
       $pattern: /[!#@\w]+/,
       keyword:
         // express version except: ! & * < = > !! # @ @@
-        'N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope '+
-        'cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc '+
-        'ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 '+
-        'profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor '+
-        'so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew '+
-        'tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ '+
+        'N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope ' +
+        'cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ' +
+        'ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 ' +
+        'profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor ' +
+        'so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew ' +
+        'tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ ' +
         // full version
-        'Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload '+
-        'bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap '+
-        'cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor '+
-        'endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap '+
-        'imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview '+
-        'lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap '+
-        'nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext '+
-        'ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding '+
-        'scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace '+
-        'startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious '+'trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew '+
+        'Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload ' +
+        'bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap ' +
+        'cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor ' +
+        'endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap ' +
+        'imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview ' +
+        'lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap ' +
+        'nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ' +
+        'ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding ' +
+        'scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace ' +
+        'startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious ' + 'trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew ' +
         'vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank',
-      built_in: //built in func
+      built_in: // built in func
         'synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv ' +
         'complete_check add getwinposx getqflist getwinposy screencol ' +
         'clearmatches empty extend getcmdpos mzeval garbagecollect setreg ' +
@@ -73,7 +73,8 @@ export default function(hljs) {
       hljs.NUMBER_MODE,
       {
         className: 'string',
-        begin: '\'', end: '\'',
+        begin: '\'',
+        end: '\'',
         illegal: '\\n'
       },
 
@@ -99,13 +100,15 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        beginKeywords: 'function function!', end: '$',
+        beginKeywords: 'function function!',
+        end: '$',
         relevance: 0,
         contains: [
           hljs.TITLE_MODE,
           {
             className: 'params',
-            begin: '\\(', end: '\\)'
+            begin: '\\(',
+            end: '\\)'
           }
         ]
       },
diff --git a/src/languages/x86asm.js b/src/languages/x86asm.js
index f01c639d9a..80cd074477 100644
--- a/src/languages/x86asm.js
+++ b/src/languages/x86asm.js
@@ -92,13 +92,20 @@ export default function(hljs) {
           },
 
           // Hex number in $
-          { begin: '\\$[0-9][0-9A-Fa-f]*', relevance: 0 },
+          {
+            begin: '\\$[0-9][0-9A-Fa-f]*',
+            relevance: 0
+          },
 
           // Number in H,D,T,Q,O,B,Y suffix
-          { begin: '\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b' },
+          {
+            begin: '\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b'
+          },
 
           // Number in X,D,T,Q,O,B,Y prefix
-          { begin: '\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b'}
+          {
+            begin: '\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b'
+          }
         ]
       },
       // Double quote string
@@ -107,9 +114,15 @@ export default function(hljs) {
         className: 'string',
         variants: [
           // Single-quoted string
-          { begin: '\'', end: '[^\\\\]\'' },
+          {
+            begin: '\'',
+            end: '[^\\\\]\''
+          },
           // Backquoted string
-          { begin: '`', end: '[^\\\\]`' }
+          {
+            begin: '`',
+            end: '[^\\\\]`'
+          }
         ],
         relevance: 0
       },
@@ -117,9 +130,13 @@ export default function(hljs) {
         className: 'symbol',
         variants: [
           // Global label and local label
-          { begin: '^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)' },
+          {
+            begin: '^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)'
+          },
           // Macro-local label
-          { begin: '^\\s*%%[A-Za-z0-9_$#@~.?]*:' }
+          {
+            begin: '^\\s*%%[A-Za-z0-9_$#@~.?]*:'
+          }
         ],
         relevance: 0
       },
diff --git a/src/languages/xl.js b/src/languages/xl.js
index f45d464a60..1878b961ff 100644
--- a/src/languages/xl.js
+++ b/src/languages/xl.js
@@ -6,11 +6,11 @@ Website: http://xlr.sf.net
 */
 
 export default function(hljs) {
-  var BUILTIN_MODULES =
+  const BUILTIN_MODULES =
     'ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo ' +
     'StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts';
 
-  var XL_KEYWORDS = {
+  const XL_KEYWORDS = {
     $pattern: /[a-zA-Z][a-zA-Z0-9_?]*/,
     keyword:
       'if then else do while until for loop import with is as where when by data constant ' +
@@ -30,51 +30,61 @@ export default function(hljs) {
       BUILTIN_MODULES
   };
 
-  var DOUBLE_QUOTE_TEXT = {
+  const DOUBLE_QUOTE_TEXT = {
     className: 'string',
-    begin: '"', end: '"', illegal: '\\n'
+    begin: '"',
+    end: '"',
+    illegal: '\\n'
   };
-  var SINGLE_QUOTE_TEXT = {
+  const SINGLE_QUOTE_TEXT = {
     className: 'string',
-    begin: '\'', end: '\'', illegal: '\\n'
+    begin: '\'',
+    end: '\'',
+    illegal: '\\n'
   };
-  var LONG_TEXT = {
+  const LONG_TEXT = {
     className: 'string',
-    begin: '<<', end: '>>'
+    begin: '<<',
+    end: '>>'
   };
-  var BASED_NUMBER = {
+  const BASED_NUMBER = {
     className: 'number',
     begin: '[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?'
   };
-  var IMPORT = {
-    beginKeywords: 'import', end: '$',
+  const IMPORT = {
+    beginKeywords: 'import',
+    end: '$',
     keywords: XL_KEYWORDS,
-    contains: [DOUBLE_QUOTE_TEXT]
+    contains: [ DOUBLE_QUOTE_TEXT ]
   };
-  var FUNCTION_DEFINITION = {
+  const FUNCTION_DEFINITION = {
     className: 'function',
-    begin: /[a-z][^\n]*->/, returnBegin: true, end: /->/,
+    begin: /[a-z][^\n]*->/,
+    returnBegin: true,
+    end: /->/,
     contains: [
-      hljs.inherit(hljs.TITLE_MODE, {starts: {
-        endsWithParent: true,
-        keywords: XL_KEYWORDS
-      }})
+      hljs.inherit(hljs.TITLE_MODE, {
+        starts: {
+          endsWithParent: true,
+          keywords: XL_KEYWORDS
+        }
+      })
     ]
   };
   return {
     name: 'XL',
-    aliases: ['tao'],
+    aliases: [ 'tao' ],
     keywords: XL_KEYWORDS,
     contains: [
-    hljs.C_LINE_COMMENT_MODE,
-    hljs.C_BLOCK_COMMENT_MODE,
-    DOUBLE_QUOTE_TEXT,
-    SINGLE_QUOTE_TEXT,
-    LONG_TEXT,
-    FUNCTION_DEFINITION,
-    IMPORT,
-    BASED_NUMBER,
-    hljs.NUMBER_MODE
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      DOUBLE_QUOTE_TEXT,
+      SINGLE_QUOTE_TEXT,
+      LONG_TEXT,
+      FUNCTION_DEFINITION,
+      IMPORT,
+      BASED_NUMBER,
+      hljs.NUMBER_MODE
     ]
   };
 }
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 7bc1379b6b..432c3ccd55 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -9,26 +9,33 @@ import * as regex from '../lib/regex.js';
 /** @type LanguageFn */
 export default function(hljs) {
   // Element names can contain letters, digits, hyphens, underscores, and periods
-  var TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
-  var XML_IDENT_RE = '[A-Za-z0-9\\._:-]+';
-  var XML_ENTITIES = {
+  const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+  const XML_IDENT_RE = '[A-Za-z0-9\\._:-]+';
+  const XML_ENTITIES = {
     className: 'symbol',
     begin: '&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;'
   };
-  var XML_META_KEYWORDS = {
-	  begin: '\\s',
-	  contains:[
-	    {
-	      className: 'meta-keyword',
-	      begin: '#?[a-z_][a-z1-9_-]+',
-	      illegal: '\\n',
+  const XML_META_KEYWORDS = {
+    begin: '\\s',
+    contains: [
+      {
+        className: 'meta-keyword',
+        begin: '#?[a-z_][a-z1-9_-]+',
+        illegal: '\\n'
       }
-	  ]
+    ]
   };
-  var XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {begin: '\\(', end: '\\)'});
-  var APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {className: 'meta-string'});
-  var QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {className: 'meta-string'});
-  var TAG_INTERNALS = {
+  const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
+    begin: '\\(',
+    end: '\\)'
+  });
+  const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {
+    className: 'meta-string'
+  });
+  const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+    className: 'meta-string'
+  });
+  const TAG_INTERNALS = {
     endsWithParent: true,
     illegal: /</,
     relevance: 0,
@@ -46,9 +53,19 @@ export default function(hljs) {
             className: 'string',
             endsParent: true,
             variants: [
-              {begin: /"/, end: /"/, contains: [XML_ENTITIES]},
-              {begin: /'/, end: /'/, contains: [XML_ENTITIES]},
-              {begin: /[^\s"'=<>`]+/}
+              {
+                begin: /"/,
+                end: /"/,
+                contains: [ XML_ENTITIES ]
+              },
+              {
+                begin: /'/,
+                end: /'/,
+                contains: [ XML_ENTITIES ]
+              },
+              {
+                begin: /[^\s"'=<>`]+/
+              }
             ]
           }
         ]
@@ -57,34 +74,48 @@ export default function(hljs) {
   };
   return {
     name: 'HTML, XML',
-    aliases: ['html', 'xhtml', 'rss', 'atom', 'xjb', 'xsd', 'xsl', 'plist', 'wsf', 'svg'],
+    aliases: [
+      'html',
+      'xhtml',
+      'rss',
+      'atom',
+      'xjb',
+      'xsd',
+      'xsl',
+      'plist',
+      'wsf',
+      'svg'
+    ],
     case_insensitive: true,
     contains: [
       {
         className: 'meta',
-        begin: '<![a-z]', end: '>',
+        begin: '<![a-z]',
+        end: '>',
         relevance: 10,
         contains: [
-				  XML_META_KEYWORDS,
-				  QUOTE_META_STRING_MODE,
-				  APOS_META_STRING_MODE,
-					XML_META_PAR_KEYWORDS,
-					{
-					  begin: '\\[', end: '\\]',
-					  contains:[
-						  {
-					      className: 'meta',
-					      begin: '<![a-z]', end: '>',
-					      contains: [
-					        XML_META_KEYWORDS,
-					        XML_META_PAR_KEYWORDS,
-					        QUOTE_META_STRING_MODE,
-					        APOS_META_STRING_MODE
-						    ]
-			        }
-					  ]
-				  }
-				]
+          XML_META_KEYWORDS,
+          QUOTE_META_STRING_MODE,
+          APOS_META_STRING_MODE,
+          XML_META_PAR_KEYWORDS,
+          {
+            begin: '\\[',
+            end: '\\]',
+            contains: [
+              {
+                className: 'meta',
+                begin: '<![a-z]',
+                end: '>',
+                contains: [
+                  XML_META_KEYWORDS,
+                  XML_META_PAR_KEYWORDS,
+                  QUOTE_META_STRING_MODE,
+                  APOS_META_STRING_MODE
+                ]
+              }
+            ]
+          }
+        ]
       },
       hljs.COMMENT(
         '<!--',
@@ -94,13 +125,16 @@ export default function(hljs) {
         }
       ),
       {
-        begin: '<!\\[CDATA\\[', end: '\\]\\]>',
+        begin: '<!\\[CDATA\\[',
+        end: '\\]\\]>',
         relevance: 10
       },
       XML_ENTITIES,
       {
         className: 'meta',
-        begin: /<\?xml/, end: /\?>/, relevance: 10
+        begin: /<\?xml/,
+        end: /\?>/,
+        relevance: 10
       },
       {
         className: 'tag',
@@ -110,29 +144,44 @@ export default function(hljs) {
         ending braket. The '$' is needed for the lexeme to be recognized
         by hljs.subMode() that tests lexemes outside the stream.
         */
-        begin: '<style(?=\\s|>)', end: '>',
-        keywords: {name: 'style'},
-        contains: [TAG_INTERNALS],
+        begin: '<style(?=\\s|>)',
+        end: '>',
+        keywords: {
+          name: 'style'
+        },
+        contains: [ TAG_INTERNALS ],
         starts: {
-          end: '</style>', returnEnd: true,
-          subLanguage: ['css', 'xml']
+          end: '</style>',
+          returnEnd: true,
+          subLanguage: [
+            'css',
+            'xml'
+          ]
         }
       },
       {
         className: 'tag',
         // See the comment in the <style tag about the lookahead pattern
-        begin: '<script(?=\\s|>)', end: '>',
-        keywords: {name: 'script'},
-        contains: [TAG_INTERNALS],
+        begin: '<script(?=\\s|>)',
+        end: '>',
+        keywords: {
+          name: 'script'
+        },
+        contains: [ TAG_INTERNALS ],
         starts: {
-          end: /<\/script>/, returnEnd: true,
-          subLanguage: ['javascript', 'handlebars', 'xml']
+          end: /<\/script>/,
+          returnEnd: true,
+          subLanguage: [
+            'javascript',
+            'handlebars',
+            'xml'
+          ]
         }
       },
       // we need this for now for jSX
       {
         className: 'tag',
-        begin: /<>|<\/>/,
+        begin: /<>|<\/>/
       },
       // open tag
       {
@@ -148,12 +197,14 @@ export default function(hljs) {
           ))
         ),
         end: /\/?>/,
-        contains: [{
-          className: 'name',
-          begin: TAG_NAME_RE,
-          relevance: 0,
-          starts: TAG_INTERNALS
-        }]
+        contains: [
+          {
+            className: 'name',
+            begin: TAG_NAME_RE,
+            relevance: 0,
+            starts: TAG_INTERNALS
+          }
+        ]
       },
       // close tag
       {
@@ -175,7 +226,7 @@ export default function(hljs) {
             relevance: 0
           }
         ]
-      },
+      }
     ]
   };
 }
diff --git a/src/languages/xquery.js b/src/languages/xquery.js
index e7d1323a21..c34adcf255 100644
--- a/src/languages/xquery.js
+++ b/src/languages/xquery.js
@@ -10,138 +10,159 @@ Category: functional
 
 export default function(hljs) {
   // see https://www.w3.org/TR/xquery/#id-terminal-delimitation
-  var KEYWORDS = 'module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit ' +
-  'declare import option function validate variable ' +
-  'for at in let where order group by return if then else ' +
-  'tumbling sliding window start when only end previous next stable ' +
-  'ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch ' +
-  'and or to union intersect instance of treat as castable cast map array ' +
-  'delete insert into replace value rename copy modify update';
+  const KEYWORDS =
+    'module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit ' +
+    'declare import option function validate variable ' +
+    'for at in let where order group by return if then else ' +
+    'tumbling sliding window start when only end previous next stable ' +
+    'ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch ' +
+    'and or to union intersect instance of treat as castable cast map array ' +
+    'delete insert into replace value rename copy modify update';
 
   // Node Types (sorted by inheritance)
   // atomic types (sorted by inheritance)
-  var TYPE = 'item document-node node attribute document element comment namespace namespace-node processing-instruction text construction ' +
-  'xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration';
+  const TYPE =
+    'item document-node node attribute document element comment namespace namespace-node processing-instruction text construction ' +
+    'xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration';
 
-  var LITERAL = 'eq ne lt le gt ge is ' +
+  const LITERAL =
+    'eq ne lt le gt ge is ' +
     'self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: ' +
     'NaN';
 
   // functions (TODO: find regex for op: without breaking build)
-  var BUILT_IN = {
+  const BUILT_IN = {
     className: 'built_in',
-    variants: [{
-      begin: /\barray:/,
-      end: /(?:append|filter|flatten|fold-(?:left|right)|for-each(?:-pair)?|get|head|insert-before|join|put|remove|reverse|size|sort|subarray|tail)\b/
-    }, {
-      begin: /\bmap:/,
-      end: /(?:contains|entry|find|for-each|get|keys|merge|put|remove|size)\b/
-    }, {
-      begin: /\bmath:/,
-      end: /(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/
-    }, {
-      begin: /\bop:/,
-      end: /\(/,
-      excludeEnd: true
-    }, {
-      begin: /\bfn:/,
-      end: /\(/,
-      excludeEnd: true
-    },
-// do not highlight inbuilt strings as variable or xml element names
-    {
-      begin: /[^<\/\$:'"-]\b(?:abs|accumulator-(?:after|before)|adjust-(?:date(?:Time)?|time)-to-timezone|analyze-string|apply|available-(?:environment-variables|system-properties)|avg|base-uri|boolean|ceiling|codepoints?-(?:equal|to-string)|collation-key|collection|compare|concat|contains(?:-token)?|copy-of|count|current(?:-)?(?:date(?:Time)?|time|group(?:ing-key)?|output-uri|merge-(?:group|key))?data|dateTime|days?-from-(?:date(?:Time)?|duration)|deep-equal|default-(?:collation|language)|distinct-values|document(?:-uri)?|doc(?:-available)?|element-(?:available|with-id)|empty|encode-for-uri|ends-with|environment-variable|error|escape-html-uri|exactly-one|exists|false|filter|floor|fold-(?:left|right)|for-each(?:-pair)?|format-(?:date(?:Time)?|time|integer|number)|function-(?:arity|available|lookup|name)|generate-id|has-children|head|hours-from-(?:dateTime|duration|time)|id(?:ref)?|implicit-timezone|in-scope-prefixes|index-of|innermost|insert-before|iri-to-uri|json-(?:doc|to-xml)|key|lang|last|load-xquery-module|local-name(?:-from-QName)?|(?:lower|upper)-case|matches|max|minutes-from-(?:dateTime|duration|time)|min|months?-from-(?:date(?:Time)?|duration)|name(?:space-uri-?(?:for-prefix|from-QName)?)?|nilled|node-name|normalize-(?:space|unicode)|not|number|one-or-more|outermost|parse-(?:ietf-date|json)|path|position|(?:prefix-from-)?QName|random-number-generator|regex-group|remove|replace|resolve-(?:QName|uri)|reverse|root|round(?:-half-to-even)?|seconds-from-(?:dateTime|duration|time)|snapshot|sort|starts-with|static-base-uri|stream-available|string-?(?:join|length|to-codepoints)?|subsequence|substring-?(?:after|before)?|sum|system-property|tail|timezone-from-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type-available|unordered|unparsed-(?:entity|text)?-?(?:public-id|uri|available|lines)?|uri-collection|xml-to-json|years?-from-(?:date(?:Time)?|duration)|zero-or-one)\b/,
-    }, {
-      begin: /\blocal:/,
-      end: /\(/,
-      excludeEnd: true
-    }, {
-      begin: /\bzip:/,
-      end: /(?:zip-file|(?:xml|html|text|binary)-entry| (?:update-)?entries)\b/
-    }, {
-      begin: /\b(?:util|db|functx|app|xdmp|xmldb):/,
-      end: /\(/,
-      excludeEnd: true
-    }
-  ]
+    variants: [
+      {
+        begin: /\barray:/,
+        end: /(?:append|filter|flatten|fold-(?:left|right)|for-each(?:-pair)?|get|head|insert-before|join|put|remove|reverse|size|sort|subarray|tail)\b/
+      },
+      {
+        begin: /\bmap:/,
+        end: /(?:contains|entry|find|for-each|get|keys|merge|put|remove|size)\b/
+      },
+      {
+        begin: /\bmath:/,
+        end: /(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/
+      },
+      {
+        begin: /\bop:/,
+        end: /\(/,
+        excludeEnd: true
+      },
+      {
+        begin: /\bfn:/,
+        end: /\(/,
+        excludeEnd: true
+      },
+      // do not highlight inbuilt strings as variable or xml element names
+      {
+        begin: /[^<\/\$:'"-]\b(?:abs|accumulator-(?:after|before)|adjust-(?:date(?:Time)?|time)-to-timezone|analyze-string|apply|available-(?:environment-variables|system-properties)|avg|base-uri|boolean|ceiling|codepoints?-(?:equal|to-string)|collation-key|collection|compare|concat|contains(?:-token)?|copy-of|count|current(?:-)?(?:date(?:Time)?|time|group(?:ing-key)?|output-uri|merge-(?:group|key))?data|dateTime|days?-from-(?:date(?:Time)?|duration)|deep-equal|default-(?:collation|language)|distinct-values|document(?:-uri)?|doc(?:-available)?|element-(?:available|with-id)|empty|encode-for-uri|ends-with|environment-variable|error|escape-html-uri|exactly-one|exists|false|filter|floor|fold-(?:left|right)|for-each(?:-pair)?|format-(?:date(?:Time)?|time|integer|number)|function-(?:arity|available|lookup|name)|generate-id|has-children|head|hours-from-(?:dateTime|duration|time)|id(?:ref)?|implicit-timezone|in-scope-prefixes|index-of|innermost|insert-before|iri-to-uri|json-(?:doc|to-xml)|key|lang|last|load-xquery-module|local-name(?:-from-QName)?|(?:lower|upper)-case|matches|max|minutes-from-(?:dateTime|duration|time)|min|months?-from-(?:date(?:Time)?|duration)|name(?:space-uri-?(?:for-prefix|from-QName)?)?|nilled|node-name|normalize-(?:space|unicode)|not|number|one-or-more|outermost|parse-(?:ietf-date|json)|path|position|(?:prefix-from-)?QName|random-number-generator|regex-group|remove|replace|resolve-(?:QName|uri)|reverse|root|round(?:-half-to-even)?|seconds-from-(?:dateTime|duration|time)|snapshot|sort|starts-with|static-base-uri|stream-available|string-?(?:join|length|to-codepoints)?|subsequence|substring-?(?:after|before)?|sum|system-property|tail|timezone-from-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type-available|unordered|unparsed-(?:entity|text)?-?(?:public-id|uri|available|lines)?|uri-collection|xml-to-json|years?-from-(?:date(?:Time)?|duration)|zero-or-one)\b/
+      },
+      {
+        begin: /\blocal:/,
+        end: /\(/,
+        excludeEnd: true
+      },
+      {
+        begin: /\bzip:/,
+        end: /(?:zip-file|(?:xml|html|text|binary)-entry| (?:update-)?entries)\b/
+      },
+      {
+        begin: /\b(?:util|db|functx|app|xdmp|xmldb):/,
+        end: /\(/,
+        excludeEnd: true
+      }
+    ]
   };
 
-  var TITLE = {
+  const TITLE = {
     className: 'title',
     begin: /\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,
     end: /;/
   };
 
-  var VAR = {
+  const VAR = {
     className: 'variable',
     begin: /[$][\w\-:]+/
   };
 
-  var NUMBER = {
+  const NUMBER = {
     className: 'number',
     begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
     relevance: 0
   };
 
-  var STRING = {
+  const STRING = {
     className: 'string',
-    variants: [{
+    variants: [
+      {
         begin: /"/,
         end: /"/,
-        contains: [{
-          begin: /""/,
-          relevance: 0
-        }]
+        contains: [
+          {
+            begin: /""/,
+            relevance: 0
+          }
+        ]
       },
       {
         begin: /'/,
         end: /'/,
-        contains: [{
-          begin: /''/,
-          relevance: 0
-        }]
+        contains: [
+          {
+            begin: /''/,
+            relevance: 0
+          }
+        ]
       }
     ]
   };
 
-  var ANNOTATION = {
+  const ANNOTATION = {
     className: 'meta',
     begin: /%[\w\-:]+/
   };
 
-  var COMMENT = {
+  const COMMENT = {
     className: 'comment',
     begin: '\\(:',
     end: ':\\)',
     relevance: 10,
-    contains: [{
-      className: 'doctag',
-      begin: '@\\w+'
-    }]
+    contains: [
+      {
+        className: 'doctag',
+        begin: '@\\w+'
+      }
+    ]
   };
 
   // see https://www.w3.org/TR/xquery/#id-computedConstructors
   // mocha: computed_inbuilt
   // see https://www.regexpal.com/?fam=99749
-  var COMPUTED = {
+  const COMPUTED = {
     beginKeywords: 'element attribute comment document processing-instruction',
     end: /\{/,
     excludeEnd: true
   };
 
   // mocha: direct_method
-    var DIRECT = {
-      begin: /<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,
-      end: /(\/[\w\._:\-]+>)/,
-      subLanguage: 'xml',
-      contains: [{
+  const DIRECT = {
+    begin: /<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,
+    end: /(\/[\w\._:\-]+>)/,
+    subLanguage: 'xml',
+    contains: [
+      {
         begin: /\{/,
         end: /\}/,
         subLanguage: 'xquery'
-      }, 'self']
-    };
+      },
+      'self'
+    ]
+  };
 
-  var CONTAINS = [
+  const CONTAINS = [
     VAR,
     BUILT_IN,
     STRING,
@@ -153,15 +174,18 @@ export default function(hljs) {
     DIRECT
   ];
 
-    var METHOD = {
-      begin: /\{/,
-      end: /\}/,
-      contains: CONTAINS
-    };
+  const METHOD = {
+    begin: /\{/,
+    end: /\}/,
+    contains: CONTAINS
+  };
 
   return {
     name: 'XQuery',
-    aliases: ['xpath', 'xq'],
+    aliases: [
+      'xpath',
+      'xq'
+    ],
     case_insensitive: false,
     illegal: /(proc)|(abstract)|(extends)|(until)|(#)/,
     keywords: {
diff --git a/src/languages/zephir.js b/src/languages/zephir.js
index 03f790fcc4..baedd9422b 100644
--- a/src/languages/zephir.js
+++ b/src/languages/zephir.js
@@ -6,17 +6,26 @@
  */
 
 export default function(hljs) {
-  var STRING = {
+  const STRING = {
     className: 'string',
-    contains: [hljs.BACKSLASH_ESCAPE],
+    contains: [ hljs.BACKSLASH_ESCAPE ],
     variants: [
-      hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null})
+      hljs.inherit(hljs.APOS_STRING_MODE, {
+        illegal: null
+      }),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {
+        illegal: null
+      })
     ]
   };
-  var TITLE_MODE = hljs.UNDERSCORE_TITLE_MODE;
-  var NUMBER = {variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]};
-  var KEYWORDS =
+  const TITLE_MODE = hljs.UNDERSCORE_TITLE_MODE;
+  const NUMBER = {
+    variants: [
+      hljs.BINARY_NUMBER_MODE,
+      hljs.C_NUMBER_MODE
+    ]
+  };
+  const KEYWORDS =
     // classes and objects
     'namespace class interface use extends ' +
     'function return ' +
@@ -45,7 +54,7 @@ export default function(hljs) {
 
   return {
     name: 'Zephir',
-    aliases: ['zep'],
+    aliases: [ 'zep' ],
     keywords: KEYWORDS,
     contains: [
       hljs.C_LINE_COMMENT_MODE,
@@ -63,8 +72,9 @@ export default function(hljs) {
       ),
       {
         className: 'string',
-        begin: '<<<[\'"]?\\w+[\'"]?$', end: '^\\w+;',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        begin: '<<<[\'"]?\\w+[\'"]?$',
+        end: '^\\w+;',
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
         // swallow composed identifiers to avoid parsing them as keywords
@@ -72,13 +82,16 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        beginKeywords: 'function fn', end: /[;{]/, excludeEnd: true,
+        beginKeywords: 'function fn',
+        end: /[;{]/,
+        excludeEnd: true,
         illegal: '\\$|\\[|%',
         contains: [
           TITLE_MODE,
           {
             className: 'params',
-            begin: '\\(', end: '\\)',
+            begin: '\\(',
+            end: '\\)',
             keywords: KEYWORDS,
             contains: [
               'self',
@@ -91,21 +104,27 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface',
+        end: /\{/,
+        excludeEnd: true,
         illegal: /[:\(\$"]/,
         contains: [
-          {beginKeywords: 'extends implements'},
+          {
+            beginKeywords: 'extends implements'
+          },
           TITLE_MODE
         ]
       },
       {
-        beginKeywords: 'namespace', end: ';',
+        beginKeywords: 'namespace',
+        end: ';',
         illegal: /[\.']/,
-        contains: [TITLE_MODE]
+        contains: [ TITLE_MODE ]
       },
       {
-        beginKeywords: 'use', end: ';',
-        contains: [TITLE_MODE]
+        beginKeywords: 'use',
+        end: ';',
+        contains: [ TITLE_MODE ]
       },
       {
         begin: '=>' // No markup, just a relevance booster

From c91fadd112139c6a26026c099802c0a1fdbfcede Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 17 Nov 2020 06:44:25 -0500
Subject: [PATCH 175/223] chore(deps) bump deep-freeze to get build bug fix

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e95bef2389..2c5c7657f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -898,9 +898,9 @@
       "dev": true
     },
     "deep-freeze-es6": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-1.3.1.tgz",
-      "integrity": "sha512-h3SrxRF46NCBuk5GLPUk7ceLQ+DgixZ60DzHMCgCcgC12xs7d6zAGa00FKpXrv5YC7Vi4oo0RHL9Q2Gthg77lg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-1.4.1.tgz",
+      "integrity": "sha512-WnyM4ZCzpHtziy7LxnpQPGS+mfZDQvFpmH3LGqmyUfzwBLkvNTwbn+mTwSNTQoLQTHiN85qZqprRZdYwU3xN/Q==",
       "dev": true
     },
     "deep-is": {
diff --git a/package.json b/package.json
index 311b83c7b2..c2d01c2609 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "cli-table": "^0.3.1",
     "colors": "^1.1.2",
     "commander": "^6.2.0",
-    "deep-freeze-es6": "^1.3.1",
+    "deep-freeze-es6": "^1.4.1",
     "del": "^6.0.0",
     "dependency-resolver": "^2.0.1",
     "eslint": "^7.12.1",

From ee2832779e97b3c77da55a538e261b671651e768 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 18 Nov 2020 13:41:39 -0500
Subject: [PATCH 176/223] chore(docs) update maintainer guide

---
 docs/maintainers-guide.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/maintainers-guide.rst b/docs/maintainers-guide.rst
index a690982162..950fde17d3 100644
--- a/docs/maintainers-guide.rst
+++ b/docs/maintainers-guide.rst
@@ -16,11 +16,11 @@ Release process
 
 Releases (minor) typically happen on a 6-week schedule.
 
-For major/minor releases you'll be releasing from ``master``.  For patch releases you'll be releasing from a stable branch, such as ``9-16-stable``.  This allows ongoing development of new features to continue in isolation (in master) without those changes leaking into patch releases (which should focus only on fixing breaking changes).
+For major/minor releases you'll be releasing from ``master``.  For patch releases you'll be releasing from a stable branch, such as ``10-stable``.  This allows ongoing development of new features to continue in isolation (in master) without those changes leaking into patch releases (which should focus only on fixing breaking changes).
 
 The goal being that minor version series always get more stable over time and that patch releases do not add features.
 
-* For patch releases: First switch to the associated stable branch (i.e., ``9-16-stable``)
+* For patch releases: First switch to the associated stable branch (i.e., ``10-stable``)
 
 * Update CHANGES.md with everything interesting since the last update.
 
@@ -30,12 +30,15 @@ The goal being that minor version series always get more stable over time and th
   * ``version`` attribute in package.json
   * ``version`` attribute in package-lock.json (run `npm install`)
   * ``release`` variable in docs/conf.py
+  * All mentions of version number in the README
 
-* Commit the version changes and tag the commit with the version number (``9.16.2``, no "v" prefix or anything like that)
+* Commit the version changes and tag the commit with the version number (``10.4.0``, no "v" prefix or anything like that)
 
-* For major/minor releases: Create a new ``[major]-[minor]-stable`` branch such as ``9-16-stable``
+* For major/minor releases: Create (or push push) the ``[major]-stable`` branch such as ``10-stable``
 
-* Push the commit and the tags (``git push && git push --tags``)
+IE, the ``10-stable`` branch should always point to the latest stable release in the 10 series.
+
+* Push the commit the tag (``git push && git push 10.4.0``)
 
 
 Pushing the tag triggers the update process which can be monitored at http://highlightjs.org/api/release/

From 4055826e7a66c960565c4f56fcc62616c6451fad Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 18 Nov 2020 13:58:34 -0500
Subject: [PATCH 177/223] 10.4.0 release

---
 CHANGES.md                 | 12 ++++--------
 README.md                  | 16 ++++++++--------
 SECURITY.md                | 10 ++++------
 docs/conf.py               |  2 +-
 docs/maintainers-guide.rst |  1 +
 package-lock.json          |  2 +-
 package.json               |  2 +-
 7 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index afdeb16cd9..887ddc8e33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,6 @@
-## Version 10.4.0-beta1
+## Version 10.4.0
 
-Parser:
-
-- enh(parser) use negative look-ahead for `beginKeywords` support (#2813) [Josh Goebel][]
+A largish release with many improvements and fixes from quite a few different contributors.  Enjoy!
 
 Deprecations:
 
@@ -12,6 +10,8 @@ Deprecations:
 
 Parser:
 
+- enh(parser) use negative look-ahead for `beginKeywords` support (#2813) [Josh Goebel][]
+- enh(grammars) allow `classNameAliases` for more complex grammars [Josh Goebel][]
 - fix(vue): Language name now appears in CSS class (#2807) [Michael Rush][]
 - (chore) Clean up all regexs to be UTF-8 compliant/ready (#2759) [Josh Goebel][]
 
@@ -60,10 +60,6 @@ Dev Improvements:
 - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][]
 - fix(dev) the Vue.js plugin no longer throws an exception when hljs is not in the global namespace [Kyle Brown][]
 
-Parser:
-
-- enh(grammars) allow `classNameAliases` for more complex grammars [Josh Goebel][]
-
 New themes:
 
 - *StackOverflow Dark* by [Jan Pilzer][]
diff --git a/README.md b/README.md
index 5e4745b9f9..111ee9181a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Please read [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/
 
 ##### Support for older versions
 
-Please see [OLD_VERSIONS.md](https://github.com/highlightjs/highlight.js/blob/master/OLD_VERSIONS.md) for support information.
+Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/master/SECURITY.md) for support information.
 
 ## Getting Started
 
@@ -244,26 +244,26 @@ A prebuilt version of highlight.js bundled with many common languages is hosted
 
 ```html
 <link rel="stylesheet"
-      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/styles/default.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/highlight.min.js"></script>
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/languages/go.min.js"></script>
 ```
 
 **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release))
 
 ```html
 <link rel="stylesheet"
-      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/styles/default.min.css">
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/highlight.min.js"></script>
+      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/styles/default.min.css">
+<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/highlight.min.js"></script>
 ```
 
 **unpkg** ([link](https://unpkg.com/browse/@highlightjs/cdn-assets/))
 
 ```html
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/styles/default.min.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/highlight.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/styles/default.min.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/highlight.min.js"></script>
 ```
 
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be
diff --git a/SECURITY.md b/SECURITY.md
index b6d96ba069..6a29f68bbd 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,16 +2,14 @@
 
 ## Supported Versions
 
-Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library.  Problems with prior minor releases are often solved by upgrading to the most recent minor release.  Prior major release will only receive critical security updates (when feasible).
+Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library.  Problems with prior minor releases are often resolved by upgrading to the most recent minor release.  Prior major release will only receive critical security updates (when feasible).
 
-| Version  |     | Status  |
+| Version  | Supported    | Status  |
 | :-----:  | :-: | :------ |
-| 10.3.x   | :white_check_mark: |  The 10.x series recieves regular updates, new features & bug fixes. |
-| <= 10.2.x  | :x: | *Please upgrade to a more recent release.* |
+| 10.4.x   | :white_check_mark: |  The 10.x series recieves regular updates, new features & bug fixes. |
+| <= 10.3.x  | :x: | *Please upgrade to the latest 10.x release.* |
 | 9.18.x   | :closed_lock_with_key: | Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
 | <= 9.17.x | :x: | Obsolete. |
-| 8.x      | :x: | Obsolete. |
-| 7.x      | :x: | Obsolete. |
 | Older    | :x: | Obsolete. |
 
 ### Version 9
diff --git a/docs/conf.py b/docs/conf.py
index 1094886b3f..70f4fe120c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = '10.4.0-beta1'
+release = '10.4.0'
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/docs/maintainers-guide.rst b/docs/maintainers-guide.rst
index 950fde17d3..8b16073a77 100644
--- a/docs/maintainers-guide.rst
+++ b/docs/maintainers-guide.rst
@@ -31,6 +31,7 @@ The goal being that minor version series always get more stable over time and th
   * ``version`` attribute in package-lock.json (run `npm install`)
   * ``release`` variable in docs/conf.py
   * All mentions of version number in the README
+  * Update ``SECURITY.md`` version table
 
 * Commit the version changes and tag the commit with the version number (``10.4.0``, no "v" prefix or anything like that)
 
diff --git a/package-lock.json b/package-lock.json
index 2c5c7657f9..ac10403957 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.4.0-beta1",
+  "version": "10.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c2d01c2609..ae9512e143 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.4.0-beta1",
+  "version": "10.4.0",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"

From 175304d40554cfe25b89f3c99b53b6b8af2fef34 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 01:27:37 -0500
Subject: [PATCH 178/223] enh(tests) analyze regex for catastrophic
 backtracking

---
 CHANGES.md                 |  78 ++++++++++++++
 package-lock.json          |   9 ++
 package.json               |   1 +
 test/index.js              |   3 +
 test/regex/index.js        | 209 +++++++++++++++++++++++++++++++++++++
 test/regex/lib/analysis.js |  87 +++++++++++++++
 test/regex/lib/util.js     | 107 +++++++++++++++++++
 7 files changed, 494 insertions(+)
 create mode 100644 test/regex/index.js
 create mode 100644 test/regex/lib/analysis.js
 create mode 100644 test/regex/lib/util.js

diff --git a/CHANGES.md b/CHANGES.md
index 887ddc8e33..eab24c41a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,81 @@
+## Version 10.5.0 preparation
+
+New Languages:
+
+- Added 3rd party Red & Rebol grammar to SUPPORTED_LANGUAGES (#2872) [Oldes Huhuman][]
+
+Language improvements:
+
+- enh(makefile): Add `make` as an alias (#2883) [tripleee][]
+
+Grammar improvements:
+
+- enh(vb) Large rework of VB.net grammar (#2808) [Jan Pilzer][]
+  - Adds support for Date data types, see (#2775)
+  - Adds support for `REM` comments and fixes `'''` doctags (#2875) (#2851)
+    - Custom number mode to support VB.net specific number flags
+    - Hex (&H), Oct (&O), and binary (&B) prefixes
+    - Separating digits with underscores: 90_946
+  - Type suffixes: 123UI (unsigned integer)
+  - Improves directives detection and adds support for `Enable`, `Disable`, and `Then` keywords
+  - Adds more markup tests
+- fix(javascript) Empty block-comments break highlighting (#2896) [Jan Pilzer][]
+- enh(dart) Fix empty block-comments from breaking highlighting (#2898) [Jan Pilzer][]
+- enh(dart) Fix empty doc-comment eating next line [Jan Pilzer][]
+
+[Jan Pilzer]: https://github.com/Hirse
+[Oldes Huhuman]: https://github.com/Oldes
+[Josh Goebel]: https://github.com/joshgoebel
+[tripleee]: https://github.com/tripleee
+
+
+## Version 10.4.1 (tentative)
+
+Security
+
+- (fix) Exponential backtracking fixes for: [Josh Goebel][]
+  - cpp
+  - handlebars
+  - gams
+  - perl
+  - jboss-cli
+  - r
+  - erlang-repl
+  - powershell
+  - routeros
+- (fix) Polynomial backtracking fixes for: [Josh Goebel][]
+  - asciidoc
+  - reasonml
+  - latex
+  - kotlin
+  - gcode
+  - d
+  - aspectj
+  - moonscript
+  - coffeescript/livescript
+  - csharp
+  - scilab
+  - crystal
+  - elixir
+  - basic
+  - ebnf
+  - ruby
+  - fortran/irpf90
+  - livecodeserver
+  - yaml
+  - x86asm
+  - dsconfig
+  - markdown
+  - ruleslanguage
+  - xquery
+  - sqf
+
+Very grateful to [Michael Schmidt][] for all the help.
+
+[Michael Schmidt]: https://github.com/RunDevelopment
+[Josh Goebel]: https://github.com/joshgoebel
+
+
 ## Version 10.4.0
 
 A largish release with many improvements and fixes from quite a few different contributors.  Enjoy!
diff --git a/package-lock.json b/package-lock.json
index ac10403957..f8e215cf11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2792,6 +2792,15 @@
         }
       }
     },
+    "refa": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/refa/-/refa-0.4.1.tgz",
+      "integrity": "sha512-rdnT/f2p8aMPSTG7d7RCjKdymAnFXiByt2ULDjGdX7eFQaHgnwqfk0o2aSxUBxgkrh0DUk7wkQkujQPTgXqHpw==",
+      "dev": true,
+      "requires": {
+        "regexpp": "^3.1.0"
+      }
+    },
     "regexpp": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
diff --git a/package.json b/package.json
index ae9512e143..bcc275298e 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "jsdom": "^16.4.0",
     "lodash": "^4.17.20",
     "mocha": "^8.2.1",
+    "refa": "^0.4.1",
     "rollup": "^2.33.1",
     "should": "^13.2.3",
     "terser": "^5.3.8",
diff --git a/test/index.js b/test/index.js
index 57923ed69c..62a78cdad6 100644
--- a/test/index.js
+++ b/test/index.js
@@ -19,6 +19,9 @@ require('./detect');
 // theses highlighting errors from cropping up again.
 require('./markup');
 
+// check regex for fatal issues like exponential backtracking, etc
+require('./regex');
+
 // Tests meant for the browser only. Using the `test/fixtures/index.html` file
 // along with `jsdom` these tests check for things like: custom markup already
 // existing in the code being highlighted, blocks that disable highlighting,
diff --git a/test/regex/index.js b/test/regex/index.js
new file mode 100644
index 0000000000..ab45d74bef
--- /dev/null
+++ b/test/regex/index.js
@@ -0,0 +1,209 @@
+'use strict';
+
+const hljs = require('../../build');
+const { BFS, parseRegex, regexFor } = require('./lib/util.js');
+const { visitRegExpAST } = require('regexpp');
+const { JS, Words, NFA, CharSet } = require('refa');
+const { firstOf, underAStar, isFirstMatch, isAlwaysZeroWidth} = require('./lib/analysis.js');
+
+hljs.debugMode();
+
+/**
+ * A map for a regex pattern to whether or not it it vulnerable to exponential backtracking.
+ *
+ * @type {Record<string, boolean>}
+ */
+const expBacktrackingCache = {};
+
+function retrieveRules(language, { name }) {
+  // first we need to get the language compiled so we have
+  // access to the raw regex
+  hljs.highlight(name, "");
+  return regexFor(language, { context: name, depth: 0 });
+}
+
+function forEachPattern(list, fn) {
+  const errors = [];
+  for (const rule of list) {
+    // console.log(rule)
+    const ast = parseRegex(rule.re);
+    fn({
+      ast,
+      pattern: rule.re,
+      rulePath: rule.path,
+      reportError: message => errors.push(message)
+    });
+  };
+  if (errors.length > 0) {
+    throw new Error(errors.map(e => String(e.message || e)).join('\n\n'));
+  }
+}
+
+function testLanguage(languageName) {
+  const language = hljs.getLanguage(languageName);
+  const rules = retrieveRules(language, { name: languageName });
+  count += rules.length;
+  describe(languageName, function() {
+    it("have a name", function() {
+      language.name.should.not.equal(undefined);
+    });
+
+    // it('should not match the empty string', function () {
+    //   forEachPattern(rules, ({ pattern, rulePath }) => {
+    //     ''.should.not.match(pattern, `${rulePath}: ${pattern} should not match the empty string.\n\n` +
+    //       `Patterns that do match the empty string can potentially cause infinitely many empty tokens. ` +
+    //       `Make sure that all patterns always consume at least one character.`);
+    //   });
+    // });
+
+    it(`has ${rules.length} regex matchers`, () => {} );
+
+    it('should not use octal escapes', function() {
+      forEachPattern(rules, ({ ast, rulePath, reportError }) => {
+        visitRegExpAST(ast.pattern, {
+          onCharacterEnter(node) {
+            if (/^\\(?:[1-9]|\d{2,})$/.test(node.raw)) {
+              reportError(`${rulePath}: Octal escape ${node.raw}.\n\n` +
+                `Octal escapes can be confused with backreferences, so please do not use them.\n` +
+                `To fix this, use a different escape method. ` +
+                `Note that this could also be an invalid backreference, so be sure to carefully analyse the pattern.`);
+            }
+          }
+        });
+      });
+    });
+
+    it('should not cause exponential backtracking', function () {
+      forEachPattern(rules, ({ pattern, ast, rulePath, reportError }) => {
+        const patternStr = String(pattern);
+        if (expBacktrackingCache[patternStr] === false) {
+          // we know that the pattern won't cause exp backtracking because we checked before
+          return;
+        }
+
+        const parser = JS.Parser.fromAst(ast);
+        /**
+         * Parses the given element and creates its NFA.
+         *
+         * @param {import("refa").JS.ParsableElement} element
+         * @returns {NFA}
+         */
+        function toNFA(element, debug = false) {
+          const { expression, maxCharacter } = parser.parseElement(element, {
+            backreferences: "resolve",
+            lookarounds: "disable",
+          });
+          return NFA.fromRegex(expression, { maxCharacter });
+        }
+
+        /**
+         * Checks whether the alternatives of the given node are disjoint. If the alternatives are not disjoint
+         * and the give node is a descendant of an effective Kleene star, then an error will be thrown.
+         *
+         * @param {CapturingGroup | Group | LookaroundAssertion} node
+         * @returns {void}
+         */
+        function checkDisjointAlternatives(node) {
+          if (!underAStar(node) || node.alternatives.length < 2) {
+            return;
+          }
+
+          const alternatives = node.alternatives;
+
+          const total = toNFA(alternatives[0]);
+          total.removeEmptyWord();
+          for (let i = 1, l = alternatives.length; i < l; i++) {
+            const a = alternatives[i];
+            const current = toNFA(a);
+            current.removeEmptyWord();
+
+            if (!total.isDisjointWith(current)) {
+              reportError(`${rulePath}: The alternative \`${a.raw}\` is not disjoint with at least one previous alternative.`
+                + ` This will cause exponential backtracking.`
+                + `\n\nTo fix this issue, you have to rewrite the ${node.type} \`${node.raw}\`.`
+                + ` The goal is that all of its alternatives are disjoint.`
+                + ` This means that if a (sub-)string is matched by the ${node.type}, then only one of its alternatives can match the (sub-)string.`
+                + `\n\nExample: \`(?:[ab]|\\w|::)+\``
+                + `\nThe alternatives of the group are not disjoint because the string "a" can be matched by both \`[ab]\` and \`\\w\`.`
+                + ` In this example, the pattern by easily fixed because the \`[ab]\` is a subset of the \`\\w\`, so its enough to remove the \`[ab]\` alternative to get \`(?:\\w|::)+\` as the fixed pattern.`
+                + `\nIn the real world, patterns can be a lot harder to fix.`
+                + ` If you are trying to make the tests pass for a pull request but can\'t fix the issue yourself, then make the pull request (or commit) anyway.`
+                + ` A maintainer will help you.`
+                + `\n\nFull pattern:\n${pattern}`);
+            } else if (i !== l - 1) {
+              total.union(current);
+            }
+          }
+        }
+
+        visitRegExpAST(ast.pattern, {
+          onCapturingGroupLeave: checkDisjointAlternatives,
+          onGroupLeave: checkDisjointAlternatives,
+          onAssertionLeave(node) {
+            if (node.kind === "lookahead" || node.kind === "lookbehind") {
+              checkDisjointAlternatives(node);
+            }
+          },
+
+          onQuantifierLeave(node) {
+            if (node.max < 10) {
+              return; // not a star
+            }
+            if (node.element.type !== "CapturingGroup" && node.element.type !== "Group") {
+              return; // not a group
+            }
+
+            // The idea here is the following:
+            //
+            // We have found a part `A*` of the regex (`A` is assumed to not accept the empty word). Let `I` be
+            // the intersection of `A` and `A{2,}`. If `I` is not empty, then there exists a non-empty word `w`
+            // that is accepted by both `A` and `A{2,}`. That means that there exists some `m>1` for which `w`
+            // is accepted by `A{m}`.
+            // This means that there are at least two ways `A*` can accept `w`. It can be accepted as `A` or as
+            // `A{m}`. Hence there are at least 2^n ways for `A*` to accept the word `w{n}`. This is the main
+            // requirement for exponential backtracking.
+            //
+            // This is actually only a crude approximation for the real analysis that would have to be done. We
+            // would actually have to check the intersection `A{p}` and `A{p+1,}` for all p>0. However, in most
+            // cases, the approximation is good enough.
+
+            const nfa = toNFA(node.element, true);
+            nfa.removeEmptyWord();
+            const twoStar = nfa.copy();
+            twoStar.quantify(2, Infinity);
+
+            if (!nfa.isDisjointWith(twoStar)) {
+              const example = Words.fromUnicodeToString(firstOf(NFA.intersectionWords(nfa, twoStar)));
+
+              reportError(`${rulePath}: The quantifier \`${node.raw}\` ambiguous for all words ${JSON.stringify(example)}.repeat(n) for any n>1.`
+                + ` This will cause exponential backtracking.`
+                + `\n\nTo fix this issue, you have to rewrite the element (let's call it E) of the quantifier.`
+                + ` The goal is modify E such that it is disjoint with repetitions of itself.`
+                + ` This means that if a (sub-)string is matched by E, then it must not be possible for E{2}, E{3}, E{4}, etc. to match that (sub-)string.`
+                + `\n\nExample: \`(?:\\w+|::)+\``
+                + `\nThe problem lies in \`\\w+\` because \`\\w+\` and \`(?:\\w+){2}\` are not disjoint as the string "aa" is fully matched by both.`
+                + ` In this example, the pattern by easily fixed by changing \`\\w+\` to \`\\w\`.`
+                + `\nIn the real world, patterns can be a lot harder to fix.`
+                + ` If you are trying to make the tests pass for a pull request but can\'t fix the issue yourself, then make the pull request (or commit) anyway.`
+                + ` A maintainer will help you.`
+                + `\n\nFull pattern:\n${pattern}`);
+            }
+          },
+        });
+
+        expBacktrackingCache[patternStr] = false;
+      });
+    });
+
+  });
+}
+
+let count = 0;
+const languages = hljs.listLanguages();
+for (const language of languages) {
+  testLanguage(language);
+}
+
+describe("COMBINED: All grammars", () => {
+  it(`has ${count} total regex`, () => {});
+});
diff --git a/test/regex/lib/analysis.js b/test/regex/lib/analysis.js
new file mode 100644
index 0000000000..3b14fbcb4a
--- /dev/null
+++ b/test/regex/lib/analysis.js
@@ -0,0 +1,87 @@
+/**
+ * Returns whether the given element will always have zero width meaning that it doesn't consume characters.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+function isAlwaysZeroWidth(element) {
+  switch (element.type) {
+    case 'Assertion':
+      // assertions == ^, $, \b, lookarounds
+      return true;
+    case 'Quantifier':
+      return element.max === 0 || isAlwaysZeroWidth(element.element);
+    case 'CapturingGroup':
+    case 'Group':
+      // every element in every alternative has to be of zero length
+      return element.alternatives.every(alt => alt.elements.every(isAlwaysZeroWidth));
+    case 'Backreference':
+      // on if the group referred to is of zero length
+      return isAlwaysZeroWidth(element.resolved);
+    default:
+      return false; // what's left are characters
+  }
+}
+
+/**
+ * Returns whether the given element will always at the start of the whole match.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+function isFirstMatch(element) {
+  const parent = element.parent;
+  switch (parent.type) {
+    case 'Alternative':
+      // all elements before this element have to of zero length
+      if (!parent.elements.slice(0, parent.elements.indexOf(element)).every(isAlwaysZeroWidth)) {
+        return false;
+      }
+      const grandParent = parent.parent;
+      if (grandParent.type === 'Pattern') {
+        return true;
+      } else {
+        return isFirstMatch(grandParent);
+      }
+
+    case 'Quantifier':
+      if (parent.max >= 2) {
+        return false;
+      } else {
+        return isFirstMatch(parent);
+      }
+
+    default:
+      throw new Error(`Internal error: The given node should not be a '${element.type}'.`);
+  }
+}
+
+/**
+ * Returns whether the given node either is or is a child of what is effectively a Kleene star.
+ *
+ * @param {import("regexpp/ast").Node} node
+ * @returns {boolean}
+ */
+function underAStar(node) {
+  if (node.type === "Quantifier" && node.max > 10) {
+    return true;
+  } else if (node.parent) {
+    return underAStar(node.parent);
+  } else {
+    return false;
+  }
+}
+
+/**
+ * @param {Iterable<T>} iter
+ * @returns {T | undefined}
+ * @template T
+ */
+function firstOf(iter) {
+  for (const item of iter) {
+    return item;
+  }
+  return undefined;
+}
+
+module.exports = { firstOf, underAStar, isFirstMatch, isAlwaysZeroWidth};
diff --git a/test/regex/lib/util.js b/test/regex/lib/util.js
new file mode 100644
index 0000000000..f323a37264
--- /dev/null
+++ b/test/regex/lib/util.js
@@ -0,0 +1,107 @@
+/* eslint-disable no-undefined */
+
+const { RegExpParser } = require('regexpp');
+
+/**
+ * @typedef {import("regexpp/ast").Pattern} Pattern
+ * @typedef {import("regexpp/ast").Flags} Flags
+ * @typedef {{ pattern: Pattern, flags: Flags }} LiteralAST
+ */
+
+const parser = new RegExpParser({ strict: false, ecmaVersion: 6 });
+/** @type {Map<string, LiteralAST>} */
+const astCache = new Map();
+
+// exclude our common "match anything" matchers
+function matchAny(re) {
+  return re.source === "\\B|\\b";
+}
+
+function regexFor(mode, { context, depth }) {
+  if (mode.analyzed) return [];
+  mode.analyzed = true;
+
+  let list = [];
+  if (mode.beginRe && !matchAny(mode.beginRe)) list.push({ path: `${context}/begin`, re: mode.beginRe });
+  if (mode.endRe && !matchAny(mode.endRe)) list.push({ path: `${context}/end`, re: mode.endRe });
+  if (mode.illegalRe) list.push({ path: `${context}/illegal`, re: mode.illegalRe });
+  if (mode.keywordPatternRe && mode.keywordPatternRe.source !== "\\w+") {
+    list.push({ path: `${context}/$keyword_pattern`, re: mode.keywordPatternRe });
+  }
+  if (mode.contains.length) {
+    mode.contains.forEach((mode, i) => {
+      const nodeName = `[${i}]${mode.className || ""}`;
+      const modes = regexFor(mode, { context: `${context}/${nodeName}`, depth: depth + 1 });
+      list = [...list, ...modes];
+    });
+  }
+  if (mode.starts) {
+    const nodeName = "$starts";
+    const modes = regexFor(mode.starts, { context: `${context}/${nodeName}`, depth: depth + 1 });
+    list = [...list, ...modes];
+  }
+  return list;
+}
+
+/**
+ * Performs a breadth-first search on the given start element.
+ *
+ * @param {any} start
+ * @param {(path: { key: string, value: any }[]) => void} callback
+ */
+const BFS = (start, callback) => {
+  const visited = new Set();
+  /** @type {{ key: string, value: any }[][]} */
+  let toVisit = [
+    [{ key: null, value: start }]
+  ];
+
+  callback(toVisit[0]);
+
+  while (toVisit.length > 0) {
+    /** @type {{ key: string, value: any }[][]} */
+    const newToVisit = [];
+
+    for (const path of toVisit) {
+      const obj = path[path.length - 1].value;
+      if (!visited.has(obj)) {
+        visited.add(obj);
+
+        for (const key in obj) {
+          const value = obj[key];
+
+          path.push({ key, value });
+          callback(path);
+
+          if (Array.isArray(value) || Object.prototype.toString.call(value) === '[object Object]') {
+            newToVisit.push([...path]);
+          }
+
+          path.pop();
+        }
+      }
+    }
+
+    toVisit = newToVisit;
+  }
+};
+
+/**
+ * Returns the AST of a given pattern.
+ *
+ * @param {RegExp} regex
+ * @returns {LiteralAST}
+ */
+const parseRegex = (regex) => {
+  const key = regex.toString();
+  let literal = astCache.get(key);
+  if (literal === undefined) {
+    const flags = parser.parseFlags(regex.flags, undefined);
+    const pattern = parser.parsePattern(regex.source, undefined, undefined, flags.unicode);
+    literal = { pattern, flags };
+    astCache.set(key, literal);
+  }
+  return literal;
+};
+
+module.exports = { BFS, regexFor, parseRegex };

From e206daf7492e48b14338b203e9137958d56fefc0 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Tue, 24 Nov 2020 01:23:34 -0500
Subject: [PATCH 179/223] allow testing individual languages

---
 test/regex/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/regex/index.js b/test/regex/index.js
index ab45d74bef..e261a45f6a 100644
--- a/test/regex/index.js
+++ b/test/regex/index.js
@@ -199,7 +199,11 @@ function testLanguage(languageName) {
 }
 
 let count = 0;
-const languages = hljs.listLanguages();
+let languages = hljs.listLanguages();
+if (process.env.ONLY_LANG) {
+  languages = [process.env.ONLY_LANG];
+}
+
 for (const language of languages) {
   testLanguage(language);
 }

From 99ac6deea67e0d10c32666e2d76e653bc88bd0c5 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 01:53:51 -0500
Subject: [PATCH 180/223] fix(routeros) resolve potential exponential
 backtracking issue

---
 src/languages/routeros.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index bbe5c3ac90..372d96cd8d 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -22,7 +22,7 @@ export default function(hljs) {
 
   const LITERALS = 'true false yes no nothing nil null';
 
-  const OBJECTS = 'traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw';
+  const OBJECTS = 'traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw';
 
   // print parameters
   // Several parameters are available for print command:

From 6fd1c2de296963734906cf7e626b4587a4950566 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 01:55:53 -0500
Subject: [PATCH 181/223] fix(powershell) resolve potential exponential
 backtracking issue

---
 src/languages/powershell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/powershell.js b/src/languages/powershell.js
index 3d10a7404f..dd7b4a64d4 100644
--- a/src/languages/powershell.js
+++ b/src/languages/powershell.js
@@ -31,7 +31,7 @@ export default function(hljs) {
     'Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|' +
     'Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|' +
     'ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|' +
-    'Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|' +
+    'Limit|Merge|Out|Publish|Restore|Save|Sync|Unpublish|Update|' +
     'Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|' +
     'Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|' +
     'Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|' +

From eb0bb0cd751e1cd88c87114f5e7a422207104423 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 02:02:33 -0500
Subject: [PATCH 182/223] fix(erlang-repl) resolve backtracking issue

---
 src/languages/erlang-repl.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/languages/erlang-repl.js b/src/languages/erlang-repl.js
index df3eecf83b..97f9642e14 100644
--- a/src/languages/erlang-repl.js
+++ b/src/languages/erlang-repl.js
@@ -5,6 +5,8 @@ Website: https://www.erlang.org
 Category: functional
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
   return {
@@ -31,7 +33,11 @@ export default function(hljs) {
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
       {
-        begin: '\\?(::)?([A-Z]\\w*(::)?)+'
+        begin: regex.concat(
+          /\?(::)?/,
+          /([A-Z]\w*)/, // at least one identifier
+          /((::)[A-Z]\w*)*/ // perhaps more
+        )
       },
       {
         begin: '->'

From bc2e4d93fd1b82c08aba2f0e31964f4fa5a69c79 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 02:13:09 -0500
Subject: [PATCH 183/223] fix(r) resolve backtracking issue

---
 src/languages/r.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/r.js b/src/languages/r.js
index 1c22f62ba4..2b7f8e07da 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -97,7 +97,7 @@ export default function(hljs) {
                   className: 'variable',
                   variants: [
                     { begin: IDENT_RE },
-                    { begin: /`(?:\\.|[^`])+`/ }
+                    { begin: /`(?:\\.|[^`\\])+`/ }
                   ],
                   endsParent: true
                 }

From c47fd803a0aa77eb227371892fb725610e0591b7 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 02:19:48 -0500
Subject: [PATCH 184/223] fix(jboss-cli) resolve backtracking issue

---
 src/languages/jboss-cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/jboss-cli.js b/src/languages/jboss-cli.js
index 488740cd3b..e2ca0d25bc 100644
--- a/src/languages/jboss-cli.js
+++ b/src/languages/jboss-cli.js
@@ -32,7 +32,7 @@ export default function(hljs) {
   };
   const PATH = {
     className: 'string',
-    begin: /\B(([\/.])[\w\-.\/=]+)+/
+    begin: /\B([\/.])[\w\-.\/=]+/
   };
   const COMMAND_PARAMS = {
     className: 'params',

From e517a139681285a732a64d25a49adc604e451941 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 02:21:26 -0500
Subject: [PATCH 185/223] (lint) perl

---
 src/languages/perl.js | 98 +++++++++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 35 deletions(-)

diff --git a/src/languages/perl.js b/src/languages/perl.js
index 881e5fbcd1..80bdf2571a 100644
--- a/src/languages/perl.js
+++ b/src/languages/perl.js
@@ -9,7 +9,7 @@ import * as regex from '../lib/regex.js';
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var PERL_KEYWORDS = {
+  const PERL_KEYWORDS = {
     $pattern: /[\w.]+/,
     keyword: 'getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ' +
     'ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime ' +
@@ -31,29 +31,42 @@ export default function(hljs) {
     'ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe ' +
     'atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when'
   };
-  var SUBST = {
+  const SUBST = {
     className: 'subst',
-    begin: '[$@]\\{', end: '\\}',
+    begin: '[$@]\\{',
+    end: '\\}',
     keywords: PERL_KEYWORDS
   };
-  var METHOD = {
-    begin: /->\{/, end: /\}/
+  const METHOD = {
+    begin: /->\{/,
+    end: /\}/
     // contains defined later
   };
-  var VAR = {
+  const VAR = {
     variants: [
-      {begin: /\$\d/},
-      {begin: regex.concat(
-        /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
-        // negative look-ahead tries to avoid matching patterns that are not
-        // Perl at all like $ident$, @ident@, etc.
-        `(?![A-Za-z])(?![@$%])`
-        )},
-      {begin: /[$%@][^\s\w{]/, relevance: 0}
+      {
+        begin: /\$\d/
+      },
+      {
+        begin: regex.concat(
+          /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+          // negative look-ahead tries to avoid matching patterns that are not
+          // Perl at all like $ident$, @ident@, etc.
+          `(?![A-Za-z])(?![@$%])`
+        )
+      },
+      {
+        begin: /[$%@][^\s\w{]/,
+        relevance: 0
+      }
     ]
   };
-  var STRING_CONTAINS = [hljs.BACKSLASH_ESCAPE, SUBST, VAR];
-  var PERL_DEFAULT_CONTAINS = [
+  const STRING_CONTAINS = [
+    hljs.BACKSLASH_ESCAPE,
+    SUBST,
+    VAR
+  ];
+  const PERL_DEFAULT_CONTAINS = [
     VAR,
     hljs.HASH_COMMENT_MODE,
     hljs.COMMENT(
@@ -69,39 +82,48 @@ export default function(hljs) {
       contains: STRING_CONTAINS,
       variants: [
         {
-          begin: 'q[qwxr]?\\s*\\(', end: '\\)',
+          begin: 'q[qwxr]?\\s*\\(',
+          end: '\\)',
           relevance: 5
         },
         {
-          begin: 'q[qwxr]?\\s*\\[', end: '\\]',
+          begin: 'q[qwxr]?\\s*\\[',
+          end: '\\]',
           relevance: 5
         },
         {
-          begin: 'q[qwxr]?\\s*\\{', end: '\\}',
+          begin: 'q[qwxr]?\\s*\\{',
+          end: '\\}',
           relevance: 5
         },
         {
-          begin: 'q[qwxr]?\\s*\\|', end: '\\|',
+          begin: 'q[qwxr]?\\s*\\|',
+          end: '\\|',
           relevance: 5
         },
         {
-          begin: 'q[qwxr]?\\s*<', end: '>',
+          begin: 'q[qwxr]?\\s*<',
+          end: '>',
           relevance: 5
         },
         {
-          begin: 'qw\\s+q', end: 'q',
+          begin: 'qw\\s+q',
+          end: 'q',
           relevance: 5
         },
         {
-          begin: '\'', end: '\'',
-          contains: [hljs.BACKSLASH_ESCAPE]
+          begin: '\'',
+          end: '\'',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
         },
         {
-          begin: '"', end: '"'
+          begin: '"',
+          end: '"'
         },
         {
-          begin: '`', end: '`',
-          contains: [hljs.BACKSLASH_ESCAPE]
+          begin: '`',
+          end: '`',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
         },
         {
           begin: /\{\w+\}/,
@@ -133,17 +155,20 @@ export default function(hljs) {
         },
         {
           className: 'regexp',
-          begin: '(m|qr)?/', end: '/[a-z]*',
-          contains: [hljs.BACKSLASH_ESCAPE],
+          begin: '(m|qr)?/',
+          end: '/[a-z]*',
+          contains: [ hljs.BACKSLASH_ESCAPE ],
           relevance: 0 // allows empty "//" which is a common comment delimiter in other languages
         }
       ]
     },
     {
       className: 'function',
-      beginKeywords: 'sub', end: '(\\s*\\(.*?\\))?[;{]', excludeEnd: true,
+      beginKeywords: 'sub',
+      end: '(\\s*\\(.*?\\))?[;{]',
+      excludeEnd: true,
       relevance: 5,
-      contains: [hljs.TITLE_MODE]
+      contains: [ hljs.TITLE_MODE ]
     },
     {
       begin: '-\\w\\b',
@@ -155,9 +180,9 @@ export default function(hljs) {
       subLanguage: 'mojolicious',
       contains: [
         {
-            begin: "^@@.*",
-            end: "$",
-            className: "comment"
+          begin: "^@@.*",
+          end: "$",
+          className: "comment"
         }
       ]
     }
@@ -167,7 +192,10 @@ export default function(hljs) {
 
   return {
     name: 'Perl',
-    aliases: ['pl', 'pm'],
+    aliases: [
+      'pl',
+      'pm'
+    ],
     keywords: PERL_KEYWORDS,
     contains: PERL_DEFAULT_CONTAINS
   };

From 853c299eaba6659d1807151237e4f06cb26cfc28 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 02:47:08 -0500
Subject: [PATCH 186/223] fix(perl) resolve exponential backtracking issue

---
 src/languages/perl.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/languages/perl.js b/src/languages/perl.js
index 80bdf2571a..c688199789 100644
--- a/src/languages/perl.js
+++ b/src/languages/perl.js
@@ -9,6 +9,8 @@ import * as regex from '../lib/regex.js';
 
 /** @type LanguageFn */
 export default function(hljs) {
+  // https://perldoc.perl.org/perlre#Modifiers
+  const REGEX_MODIFIERS = /[dualxmsipn]{0,12}/; // aa and xx are valid, making max length 12
   const PERL_KEYWORDS = {
     $pattern: /[\w.]+/,
     keyword: 'getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ' +
@@ -150,13 +152,24 @@ export default function(hljs) {
         hljs.HASH_COMMENT_MODE,
         {
           className: 'regexp',
-          begin: '(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*',
+          begin: regex.concat(
+            /(s|tr|y)/,
+            /\//,
+            /(\\.|[^\\\/])*/,
+            /\//,
+            /(\\.|[^\\\/])*/,
+            /\//,
+            REGEX_MODIFIERS,
+          ),
           relevance: 10
         },
         {
           className: 'regexp',
-          begin: '(m|qr)?/',
-          end: '/[a-z]*',
+          begin: /(m|qr)?\//,
+          end: regex.concat(
+            /\//,
+            REGEX_MODIFIERS
+          ),
           contains: [ hljs.BACKSLASH_ESCAPE ],
           relevance: 0 // allows empty "//" which is a common comment delimiter in other languages
         }

From 45e253dc19c4ac280b57714f4f091425bfcdfa72 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 03:05:03 -0500
Subject: [PATCH 187/223] fix(gams) resolve exponential backtracking issue

---
 src/languages/gams.js | 11 ++++++++++-
 src/lib/regex.js      |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/languages/gams.js b/src/languages/gams.js
index 2fceeff5a7..fc926c4b8f 100644
--- a/src/languages/gams.js
+++ b/src/languages/gams.js
@@ -8,6 +8,9 @@
  Category: scientific
  */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
   const KEYWORDS = {
     keyword:
@@ -80,6 +83,7 @@ export default function(hljs) {
       hljs.C_NUMBER_MODE
     ]
   };
+  const COMMENT_WORD = /[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+/;
   const DESCTEXT = { // Parameter/set/variable description text
     begin: /[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,
     excludeBegin: true,
@@ -90,7 +94,12 @@ export default function(hljs) {
       ASSIGNMENT,
       {
         className: 'comment',
-        begin: /([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+/,
+        // one comment word, then possibly more
+        begin: regex.concat(
+          COMMENT_WORD,
+          // [ ] because \s would be too broad (matching newlines)
+          regex.anyNumberOfTimes(regex.concat(/[ ]+/, COMMENT_WORD))
+        ),
         relevance: 0
       }
     ]
diff --git a/src/lib/regex.js b/src/lib/regex.js
index 1667752918..db62fcf12b 100644
--- a/src/lib/regex.js
+++ b/src/lib/regex.js
@@ -25,6 +25,14 @@ export function lookahead(re) {
   return concat('(?=', re, ')');
 }
 
+/**
+ * @param {RegExp | string } re
+ * @returns {string}
+ */
+export function anyNumberOfTimes(re) {
+  return concat('(', re, ')*');
+}
+
 /**
  * @param {RegExp | string } re
  * @returns {string}

From 8c7e613e4b37af9695b1ce7acf1d69ec29a41274 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 03:09:35 -0500
Subject: [PATCH 188/223] (lint) c-like

---
 src/languages/c-like.js | 170 ++++++++++++++++++++++++++--------------
 1 file changed, 109 insertions(+), 61 deletions(-)

diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index 50bd0632ff..36dafaebfa 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -20,56 +20,69 @@ export default function(hljs) {
   // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
   // not include such support nor can we be sure all the grammars depending
   // on it would desire this behavior
-  var C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {
-    contains: [{begin: /\\\n/}]
+  const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {
+    contains: [
+      {
+        begin: /\\\n/
+      }
+    ]
   });
-  var DECLTYPE_AUTO_RE = 'decltype\\(auto\\)'
-  var NAMESPACE_RE = '[a-zA-Z_]\\w*::'
-  var TEMPLATE_ARGUMENT_RE = '<.*?>';
-  var FUNCTION_TYPE_RE = '(' +
+  const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
+  const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
+  const TEMPLATE_ARGUMENT_RE = '<.*?>';
+  const FUNCTION_TYPE_RE = '(' +
     DECLTYPE_AUTO_RE + '|' +
-    optional(NAMESPACE_RE) +'[a-zA-Z_]\\w*' + optional(TEMPLATE_ARGUMENT_RE) +
+    optional(NAMESPACE_RE) + '[a-zA-Z_]\\w*' + optional(TEMPLATE_ARGUMENT_RE) +
   ')';
-  var CPP_PRIMITIVE_TYPES = {
+  const CPP_PRIMITIVE_TYPES = {
     className: 'keyword',
     begin: '\\b[a-z\\d_]*_t\\b'
   };
 
   // https://en.cppreference.com/w/cpp/language/escape
   // \\ \x \xFF \u2837 \u00323747 \374
-  var CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)'
-  var STRINGS = {
+  const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
+  const STRINGS = {
     className: 'string',
     variants: [
       {
-        begin: '(u8?|U|L)?"', end: '"',
+        begin: '(u8?|U|L)?"',
+        end: '"',
         illegal: '\\n',
-        contains: [hljs.BACKSLASH_ESCAPE]
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
-        begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)", end: '\'',
+        begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)",
+        end: '\'',
         illegal: '.'
       },
       hljs.END_SAME_AS_BEGIN({
         begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
-        end: /\)([^()\\ ]{0,16})"/,
+        end: /\)([^()\\ ]{0,16})"/
       })
     ]
   };
 
-  var NUMBERS = {
+  const NUMBERS = {
     className: 'number',
     variants: [
-      { begin: '\\b(0b[01\']+)' },
-      { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)(u|U|l|L|ul|UL|f|F|b|B)' },
-      { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      {
+        begin: '\\b(0b[01\']+)'
+      },
+      {
+        begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)(u|U|l|L|ul|UL|f|F|b|B)'
+      },
+      {
+        begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)'
+      }
     ],
     relevance: 0
   };
 
-  var PREPROCESSOR =       {
+  const PREPROCESSOR = {
     className: 'meta',
-    begin: /#\s*[a-z]+\b/, end: /$/,
+    begin: /#\s*[a-z]+\b/,
+    end: /$/,
     keywords: {
       'meta-keyword':
         'if else elif endif define undef warning error line ' +
@@ -77,28 +90,32 @@ export default function(hljs) {
     },
     contains: [
       {
-        begin: /\\\n/, relevance: 0
+        begin: /\\\n/,
+        relevance: 0
       },
-      hljs.inherit(STRINGS, {className: 'meta-string'}),
+      hljs.inherit(STRINGS, {
+        className: 'meta-string'
+      }),
       {
         className: 'meta-string',
-        begin: /<.*?>/, end: /$/,
-        illegal: '\\n',
+        begin: /<.*?>/,
+        end: /$/,
+        illegal: '\\n'
       },
       C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE
     ]
   };
 
-  var TITLE_MODE = {
+  const TITLE_MODE = {
     className: 'title',
     begin: optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
 
-  var FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+  const FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
 
-  var CPP_KEYWORDS = {
+  const CPP_KEYWORDS = {
     keyword: 'int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof ' +
       'dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace ' +
       'unsigned long volatile static protected bool template mutable if public friend ' +
@@ -123,7 +140,7 @@ export default function(hljs) {
     literal: 'true false nullptr NULL'
   };
 
-  var EXPRESSION_CONTAINS = [
+  const EXPRESSION_CONTAINS = [
     PREPROCESSOR,
     CPP_PRIMITIVE_TYPES,
     C_LINE_COMMENT_MODE,
@@ -132,31 +149,42 @@ export default function(hljs) {
     STRINGS
   ];
 
-  var EXPRESSION_CONTEXT = {
+  const EXPRESSION_CONTEXT = {
     // This mode covers expression context where we can't expect a function
     // definition and shouldn't highlight anything that looks like one:
     // `return some()`, `else if()`, `(x*sum(1, 2))`
     variants: [
-      {begin: /=/, end: /;/},
-      {begin: /\(/, end: /\)/},
-      {beginKeywords: 'new throw return else', end: /;/}
+      {
+        begin: /=/,
+        end: /;/
+      },
+      {
+        begin: /\(/,
+        end: /\)/
+      },
+      {
+        beginKeywords: 'new throw return else',
+        end: /;/
+      }
     ],
     keywords: CPP_KEYWORDS,
     contains: EXPRESSION_CONTAINS.concat([
       {
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         keywords: CPP_KEYWORDS,
-        contains: EXPRESSION_CONTAINS.concat(['self']),
+        contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
         relevance: 0
       }
     ]),
     relevance: 0
   };
 
-  var FUNCTION_DECLARATION = {
+  const FUNCTION_DECLARATION = {
     className: 'function',
     begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
-    returnBegin: true, end: /[{;=]/,
+    returnBegin: true,
+    end: /[{;=]/,
     excludeEnd: true,
     keywords: CPP_KEYWORDS,
     illegal: /[^\w\s\*&:<>]/,
@@ -165,16 +193,18 @@ export default function(hljs) {
       { // to prevent it from being confused as the function title
         begin: DECLTYPE_AUTO_RE,
         keywords: CPP_KEYWORDS,
-        relevance: 0,
+        relevance: 0
       },
       {
-        begin: FUNCTION_TITLE, returnBegin: true,
-        contains: [TITLE_MODE],
+        begin: FUNCTION_TITLE,
+        returnBegin: true,
+        contains: [ TITLE_MODE ],
         relevance: 0
       },
       {
         className: 'params',
-        begin: /\(/, end: /\)/,
+        begin: /\(/,
+        end: /\)/,
         keywords: CPP_KEYWORDS,
         relevance: 0,
         contains: [
@@ -185,7 +215,8 @@ export default function(hljs) {
           CPP_PRIMITIVE_TYPES,
           // Count matching parentheses.
           {
-            begin: /\(/, end: /\)/,
+            begin: /\(/,
+            end: /\)/,
             keywords: CPP_KEYWORDS,
             relevance: 0,
             contains: [
@@ -207,7 +238,17 @@ export default function(hljs) {
   };
 
   return {
-    aliases: ['c', 'cc', 'h', 'c++', 'h++', 'hpp', 'hh', 'hxx', 'cxx'],
+    aliases: [
+      'c',
+      'cc',
+      'h',
+      'c++',
+      'h++',
+      'hpp',
+      'hh',
+      'hxx',
+      'cxx'
+    ],
     keywords: CPP_KEYWORDS,
     // the base c-like language will NEVER be auto-detected, rather the
     // derivitives: c, c++, arduino turn auto-detect back on for themselves
@@ -218,25 +259,32 @@ export default function(hljs) {
       FUNCTION_DECLARATION,
       EXPRESSION_CONTAINS,
       [
-      PREPROCESSOR,
-      { // containers: ie, `vector <int> rooms (9);`
-        begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<', end: '>',
-        keywords: CPP_KEYWORDS,
-        contains: ['self', CPP_PRIMITIVE_TYPES]
-      },
-      {
-        begin: hljs.IDENT_RE + '::',
-        keywords: CPP_KEYWORDS
-      },
-      {
-        className: 'class',
-        beginKeywords: 'enum class struct union', end: /[{;:<>=]/,
-        contains: [
-          { beginKeywords: "final class struct" },
-          hljs.TITLE_MODE
-        ]
-      }
-    ]),
+        PREPROCESSOR,
+        { // containers: ie, `vector <int> rooms (9);`
+          begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<',
+          end: '>',
+          keywords: CPP_KEYWORDS,
+          contains: [
+            'self',
+            CPP_PRIMITIVE_TYPES
+          ]
+        },
+        {
+          begin: hljs.IDENT_RE + '::',
+          keywords: CPP_KEYWORDS
+        },
+        {
+          className: 'class',
+          beginKeywords: 'enum class struct union',
+          end: /[{;:<>=]/,
+          contains: [
+            {
+              beginKeywords: "final class struct"
+            },
+            hljs.TITLE_MODE
+          ]
+        }
+      ]),
     exports: {
       preprocessor: PREPROCESSOR,
       strings: STRINGS,

From 3309f5f2124b064695d859d531986ba8649edea6 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 08:11:38 -0500
Subject: [PATCH 189/223] fix(handlebars) resolve exponential backtracking
 issue

---
 src/languages/handlebars.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/languages/handlebars.js b/src/languages/handlebars.js
index 092662504d..16218111ac 100644
--- a/src/languages/handlebars.js
+++ b/src/languages/handlebars.js
@@ -57,20 +57,25 @@ export default function(hljs) {
   // this regex matches literal segments like ' abc ' or [ abc ] as well as helpers and paths
   // like a/b, ./abc/cde, and abc.bcd
 
-  const DOUBLE_QUOTED_ID_REGEX = /".*?"/;
-  const SINGLE_QUOTED_ID_REGEX = /'.*?'/;
-  const BRACKET_QUOTED_ID_REGEX = /\[.*?\]/;
+  const DOUBLE_QUOTED_ID_REGEX = /""|"[^"]+"/;
+  const SINGLE_QUOTED_ID_REGEX = /''|'[^']+'/;
+  const BRACKET_QUOTED_ID_REGEX = /\[\]|\[[^\]]+\]/;
   const PLAIN_ID_REGEX = /[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/;
-  const PATH_DELIMITER_REGEX = /\.|\//;
+  const PATH_DELIMITER_REGEX = /(\.|\/)/;
+  const ANY_ID = regex.either(
+    DOUBLE_QUOTED_ID_REGEX,
+    SINGLE_QUOTED_ID_REGEX,
+    BRACKET_QUOTED_ID_REGEX,
+    PLAIN_ID_REGEX
+    );
 
   const IDENTIFIER_REGEX = regex.concat(
-    '(',
-    SINGLE_QUOTED_ID_REGEX, '|',
-    DOUBLE_QUOTED_ID_REGEX, '|',
-    BRACKET_QUOTED_ID_REGEX, '|',
-    PLAIN_ID_REGEX, '|',
-    PATH_DELIMITER_REGEX,
-    ')+'
+    regex.optional(/\.|\.\/|\//), // relative or absolute path
+    ANY_ID,
+    regex.anyNumberOfTimes(regex.concat(
+      PATH_DELIMITER_REGEX,
+      ANY_ID
+    ))
   );
 
   // identifier followed by a equal-sign (without the equal sign)

From ca565217ee7df4af4c28bca8392bcf1b1563ac36 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 20 Nov 2020 08:47:16 -0500
Subject: [PATCH 190/223] fix(cpp) resolve exponential backtracking issue

---
 src/languages/c-like.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/languages/c-like.js b/src/languages/c-like.js
index 36dafaebfa..5363076eb1 100644
--- a/src/languages/c-like.js
+++ b/src/languages/c-like.js
@@ -12,11 +12,10 @@ change in v10 and don't have to change the requirements again later.
 See: https://github.com/highlightjs/highlight.js/issues/2146
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
-  function optional(s) {
-    return '(?:' + s + ')?';
-  }
   // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
   // not include such support nor can we be sure all the grammars depending
   // on it would desire this behavior
@@ -29,10 +28,11 @@ export default function(hljs) {
   });
   const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
   const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
-  const TEMPLATE_ARGUMENT_RE = '<.*?>';
+  const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
   const FUNCTION_TYPE_RE = '(' +
     DECLTYPE_AUTO_RE + '|' +
-    optional(NAMESPACE_RE) + '[a-zA-Z_]\\w*' + optional(TEMPLATE_ARGUMENT_RE) +
+    regex.optional(NAMESPACE_RE) +
+    '[a-zA-Z_]\\w*' + regex.optional(TEMPLATE_ARGUMENT_RE) +
   ')';
   const CPP_PRIMITIVE_TYPES = {
     className: 'keyword',
@@ -109,11 +109,11 @@ export default function(hljs) {
 
   const TITLE_MODE = {
     className: 'title',
-    begin: optional(NAMESPACE_RE) + hljs.IDENT_RE,
+    begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
 
-  const FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+  const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
 
   const CPP_KEYWORDS = {
     keyword: 'int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof ' +
@@ -189,7 +189,6 @@ export default function(hljs) {
     keywords: CPP_KEYWORDS,
     illegal: /[^\w\s\*&:<>]/,
     contains: [
-
       { // to prevent it from being confused as the function title
         begin: DECLTYPE_AUTO_RE,
         keywords: CPP_KEYWORDS,

From 815f84f1fd6a3c4d809a7b4e550851a84e7ac4fa Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 09:17:47 -0500
Subject: [PATCH 191/223] fix(sqf) fix poly backtracking issue

- The `_` case should already be  handled by `_+`
---
 src/languages/sqf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/sqf.js b/src/languages/sqf.js
index 8db3c34ccc..e8712a598a 100644
--- a/src/languages/sqf.js
+++ b/src/languages/sqf.js
@@ -11,7 +11,7 @@ export default function(hljs) {
   // In SQF, a variable start with _
   const VARIABLE = {
     className: 'variable',
-    begin: /\b_+[a-zA-Z_]\w*/
+    begin: /\b_+[a-zA-Z]\w*/
   };
 
   // In SQF, a function should fit myTag_fnc_myFunction pattern

From 73b08a062e13d92c2cb9853d5c122cd70fc8dd8c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 09:32:46 -0500
Subject: [PATCH 192/223] fix(xquery) fix poly backtracking issue

---
 src/languages/xquery.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/xquery.js b/src/languages/xquery.js
index c34adcf255..f3eae61cb1 100644
--- a/src/languages/xquery.js
+++ b/src/languages/xquery.js
@@ -149,7 +149,7 @@ export default function(hljs) {
 
   // mocha: direct_method
   const DIRECT = {
-    begin: /<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,
+    begin: /<([\w\._:\-]+)(\s+\S*=('|").*('|"))?>/,
     end: /(\/[\w\._:\-]+>)/,
     subLanguage: 'xml',
     contains: [

From 47f1dc2ef802da1a6de7a4565874d3a3a35afdaa Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 09:43:38 -0500
Subject: [PATCH 193/223] fix(ruleslanguage) fix poly backtracking issue

The extra expression here does not matter since it was purely
optional (`*`).  The important thing is gobbling up the `#` to prevent
it from stealing relevance.  And `\s+` gets that done on it's own.
---
 src/languages/ruleslanguage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/ruleslanguage.js b/src/languages/ruleslanguage.js
index 664d8bdef5..7a7007c3c0 100644
--- a/src/languages/ruleslanguage.js
+++ b/src/languages/ruleslanguage.js
@@ -63,7 +63,7 @@ export default function(hljs) {
         className: 'literal',
         variants: [
           { // looks like #-comment
-            begin: '#\\s+[a-zA-Z .]*',
+            begin: '#\\s+',
             relevance: 0
           },
           {

From 56850efa9ee764dff1503c8397291ce997cd2cc1 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 09:51:23 -0500
Subject: [PATCH 194/223] fix(markdown) fix poly backtracking issue

- Fix poly backtracking with code blocks
---
 src/languages/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/markdown.js b/src/languages/markdown.js
index daa3611b96..99e90aea86 100644
--- a/src/languages/markdown.js
+++ b/src/languages/markdown.js
@@ -24,10 +24,10 @@ export default function(hljs) {
     variants: [
       // TODO: fix to allow these to work with sublanguage also
       {
-        begin: '(`{3,})(.|\\n)*?\\1`*[ ]*'
+        begin: '(`{3,})[^`](.|\\n)*?\\1`*[ ]*'
       },
       {
-        begin: '(~{3,})(.|\\n)*?\\1~*[ ]*'
+        begin: '(~{3,})[^~](.|\\n)*?\\1~*[ ]*'
       },
       // needed to allow markdown as a sublanguage to work
       {

From 57e8debee80311fc8dfcb3e8d5e21f6714deaba9 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:14:00 -0500
Subject: [PATCH 195/223] fix(dsconfig) fix poly backtracking issue

Not 100% sure what the original intent of \S was since it seems that
valueless properties wouldn't have a trailing `:` and why should we
include the letter after as part of the match?

That means that now there is an edge case that we handle slightly
differently

property:"quoted value"

The `:` will not be highlighted (as it was before).  This is a
problem for another day when someone who knows about dsconfig
shows up.
---
 src/languages/dsconfig.js               |  4 ++--
 test/markup/dsconfig/default.expect.txt | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/languages/dsconfig.js b/src/languages/dsconfig.js
index 666c31076c..eeff8d7edb 100644
--- a/src/languages/dsconfig.js
+++ b/src/languages/dsconfig.js
@@ -25,8 +25,8 @@ export default function(hljs) {
   };
   const VALUELESS_PROPERTY = {
     className: 'string',
-    begin: /\w+-?\w+/,
-    end: /\W/,
+    begin: /\w+(\-\w+)*/,
+    end: /(?=\W)/,
     relevance: 0
   };
 
diff --git a/test/markup/dsconfig/default.expect.txt b/test/markup/dsconfig/default.expect.txt
index 2ba24df5e9..bcb6aad8ba 100644
--- a/test/markup/dsconfig/default.expect.txt
+++ b/test/markup/dsconfig/default.expect.txt
@@ -14,11 +14,11 @@
   <span class="hljs-built_in">--set</span> <span class="hljs-string">enabled:true </span><span class="hljs-built_in">--set</span> <span class="hljs-string">evaluation-order-index:100 </span>\
   <span class="hljs-built_in">--set</span> <span class="hljs-string">&#x27;connection-criteria:User.1 Connection Criteria&#x27;</span> \
 <span class="hljs-comment"># Property without value</span>
-  <span class="hljs-built_in">--reset</span> <span class="hljs-string">maximum-concurrent-</span><span class="hljs-string">connections
-</span><span class="hljs-comment"># Unquoted property, quoted property value</span>
+  <span class="hljs-built_in">--reset</span> <span class="hljs-string">maximum-concurrent-connections</span>
+<span class="hljs-comment"># Unquoted property, quoted property value</span>
 <span class="hljs-keyword">dsconfig</span> <span class="hljs-built_in">set-access-control-handler-prop</span> \
- <span class="hljs-built_in">--add</span> <span class="hljs-string">global-aci:</span><span class="hljs-string">&#x27;(target=&quot;ldap:///cn=config&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the config tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span> \
- <span class="hljs-built_in">--add</span> <span class="hljs-string">global-aci:</span><span class="hljs-string">&#x27;(target=&quot;ldap:///cn=monitor&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the monitor tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span> \
- <span class="hljs-built_in">--remove</span> <span class="hljs-string">global-aci:</span><span class="hljs-string">&#x27;(target=&quot;ldap:///cn=alerts&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the alerts tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span>
+ <span class="hljs-built_in">--add</span> <span class="hljs-string">global-aci</span>:<span class="hljs-string">&#x27;(target=&quot;ldap:///cn=config&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the config tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span> \
+ <span class="hljs-built_in">--add</span> <span class="hljs-string">global-aci</span>:<span class="hljs-string">&#x27;(target=&quot;ldap:///cn=monitor&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the monitor tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span> \
+ <span class="hljs-built_in">--remove</span> <span class="hljs-string">global-aci</span>:<span class="hljs-string">&#x27;(target=&quot;ldap:///cn=alerts&quot;)(targetattr=&quot;*&quot;)(version 3.0; acl &quot;Allow access to the alerts tree by cn=admin,c=us&quot;; allow(all) groupdn=&quot;ldap:///cn=directory administrators,ou=groups,c=us&quot;;)&#x27;</span>
 <span class="hljs-comment"># No continuation</span>
 <span class="hljs-keyword">dsconfig</span> <span class="hljs-built_in">delete-log-publisher</span> <span class="hljs-built_in">--publisher-name</span> <span class="hljs-string">&quot;File-Based Error Logger&quot;</span>

From aab852fd4b1fba83198e13d5328455078df17d3c Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:21:06 -0500
Subject: [PATCH 196/223] fix(x86asm) fix poly backtracking issue

---
 src/languages/x86asm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/x86asm.js b/src/languages/x86asm.js
index 80cd074477..8d7fd886dc 100644
--- a/src/languages/x86asm.js
+++ b/src/languages/x86asm.js
@@ -87,7 +87,7 @@ export default function(hljs) {
           // Float number and x87 BCD
           {
             begin: '\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|' +
-                   '(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b',
+                   '(0[Xx])?[0-9][0-9_]*(\\.[0-9_]*)?(?:[pP](?:[+-]?[0-9_]+)?)?)\\b',
             relevance: 0
           },
 

From 3367b897011b517be67eca9051113ffe910c804d Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:43:15 -0500
Subject: [PATCH 197/223] fix(yaml) fix poly backtracking issue

---
 src/languages/yaml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/yaml.js b/src/languages/yaml.js
index 35f9105670..d490528677 100644
--- a/src/languages/yaml.js
+++ b/src/languages/yaml.js
@@ -102,7 +102,7 @@ export default function(hljs) {
       // Indentation of subsequent lines must be the same to
       // be considered part of the block
       className: 'string',
-      begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^\\n]+\\n(\\2[^\\n]+\\n?)*'
+      begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\n?)*'
     },
     { // Ruby/Rails erb
       begin: '<%[%=-]?',

From b66806bf5a8d3c0c58f7457328b8d1e4da8a7dcf Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:45:50 -0500
Subject: [PATCH 198/223] fix(livecodeserver) fix poly backtracking issue

---
 src/languages/livecodeserver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/livecodeserver.js b/src/languages/livecodeserver.js
index f273a6b73e..f897dad994 100644
--- a/src/languages/livecodeserver.js
+++ b/src/languages/livecodeserver.js
@@ -29,7 +29,7 @@ export default function(hljs) {
   const TITLE1 = hljs.inherit(hljs.TITLE_MODE, {
     variants: [
       {
-        begin: '\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*'
+        begin: '\\b_*rig[A-Z][A-Za-z0-9_\\-]*'
       },
       {
         begin: '\\b_[a-z0-9\\-]+'

From 124df868a90735110e3036a39545f31e23e3f76a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:57:06 -0500
Subject: [PATCH 199/223] fix(fortran) fix poly backtracking issue

---
 src/languages/fortran.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/languages/fortran.js b/src/languages/fortran.js
index 3a1c3b74bf..1db47ab626 100644
--- a/src/languages/fortran.js
+++ b/src/languages/fortran.js
@@ -5,6 +5,8 @@ Website: https://en.wikipedia.org/wiki/Fortran
 Category: scientific
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
   const PARAMS = {
@@ -28,10 +30,21 @@ export default function(hljs) {
     ]
   };
 
+  const OPTIONAL_NUMBER_SUFFIX = /(_[a-z_\d]+)?/;
+  const OPTIONAL_NUMBER_EXP = /([de][+-]?\d+)?/;
   const NUMBER = {
     className: 'number',
-    // regex in both fortran and irpf90 should match
-    begin: '(?=\\b|\\+|-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
+    variants: [
+      {
+        begin: regex.concat(/\b\d+/, /\.(\d*)/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      },
+      {
+        begin: regex.concat(/\b\d+/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      },
+      {
+        begin: regex.concat(/\.\d+/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      }
+    ],
     relevance: 0
   };
 

From 21ea9ef4a1df37b04ddf02812ff07a272b0173a9 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 10:59:18 -0500
Subject: [PATCH 200/223] fix(fortran/irpf90) fix poly backtracking issue

---
 src/languages/fortran.js |  1 +
 src/languages/irpf90.js  | 29 +++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/languages/fortran.js b/src/languages/fortran.js
index 1db47ab626..0bd5d0012e 100644
--- a/src/languages/fortran.js
+++ b/src/languages/fortran.js
@@ -30,6 +30,7 @@ export default function(hljs) {
     ]
   };
 
+  // regex in both fortran and irpf90 should match
   const OPTIONAL_NUMBER_SUFFIX = /(_[a-z_\d]+)?/;
   const OPTIONAL_NUMBER_EXP = /([de][+-]?\d+)?/;
   const NUMBER = {
diff --git a/src/languages/irpf90.js b/src/languages/irpf90.js
index 76ef4bcb1f..914c58dd39 100644
--- a/src/languages/irpf90.js
+++ b/src/languages/irpf90.js
@@ -6,6 +6,9 @@ Website: http://irpf90.ups-tlse.fr
 Category: scientific
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
   const PARAMS = {
     className: 'params',
@@ -13,6 +16,25 @@ export default function(hljs) {
     end: '\\)'
   };
 
+  // regex in both fortran and irpf90 should match
+  const OPTIONAL_NUMBER_SUFFIX = /(_[a-z_\d]+)?/;
+  const OPTIONAL_NUMBER_EXP = /([de][+-]?\d+)?/;
+  const NUMBER = {
+    className: 'number',
+    variants: [
+      {
+        begin: regex.concat(/\b\d+/, /\.(\d*)/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      },
+      {
+        begin: regex.concat(/\b\d+/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      },
+      {
+        begin: regex.concat(/\.\d+/, OPTIONAL_NUMBER_EXP, OPTIONAL_NUMBER_SUFFIX)
+      }
+    ],
+    relevance: 0
+  };
+
   const F_KEYWORDS = {
     literal: '.False. .True.',
     keyword: 'kind do while private call intrinsic where elsewhere ' +
@@ -88,12 +110,7 @@ export default function(hljs) {
       hljs.COMMENT('begin_doc', 'end_doc', {
         relevance: 10
       }),
-      {
-        className: 'number',
-        // regex in both fortran and irpf90 should match
-        begin: '(?=\\b|\\+|-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?',
-        relevance: 0
-      }
+      NUMBER
     ]
   };
 }

From c731f926aaef125213401496b7f1b645e941b104 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 11:07:08 -0500
Subject: [PATCH 201/223] fix(ruby) fix poly backtracking issues

- Fix poly backtracking issue with RVM_PROMPT.
- Fix poly backtracking issue with heredocs.
---
 src/languages/ruby.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index 47763bf9e3..cf6dc8c88d 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -72,7 +72,7 @@ export default function(hljs) {
         begin: /\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/
       },
       { // heredocs
-        begin: /<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,
+        begin: /<<[-~]?'?(\w+)\n(?:[^\n]*\n)*?\s*\1\b/,
         returnBegin: true,
         contains: [
           { begin: /<<[-~]?'?/ },
@@ -201,7 +201,7 @@ export default function(hljs) {
   var SIMPLE_PROMPT = "[>?]>";
   // irb(main):001:0>
   var DEFAULT_PROMPT = "[\\w#]+\\(\\w+\\):\\d+:\\d+>";
-  var RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>";
+  var RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>";
 
   var IRB_DEFAULT = [
     {

From f80ea35c80bdf8a9d79fe5ffb21d049649dbc12f Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 11:23:34 -0500
Subject: [PATCH 202/223] fix(ebnf) fix poly backtracking issue

---
 src/languages/ebnf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/ebnf.js b/src/languages/ebnf.js
index b5816e96b6..78550ac8b3 100644
--- a/src/languages/ebnf.js
+++ b/src/languages/ebnf.js
@@ -10,7 +10,7 @@ export default function(hljs) {
 
   const nonTerminalMode = {
     className: "attribute",
-    begin: /^[ ]*[a-zA-Z][a-zA-Z_-]*([\s_-]+[a-zA-Z][a-zA-Z]*)*/
+    begin: /^[ ]*[a-zA-Z]+([\s_-]+[a-zA-Z]+)*/
   };
 
   const specialSequenceMode = {

From 42a1d9bc73dcdcb9ce6d86a63ff9ad38a6801762 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 11:40:30 -0500
Subject: [PATCH 203/223] fix(basic) fix poly backtracking issue

---
 src/languages/basic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/basic.js b/src/languages/basic.js
index 1689236341..59606d7555 100644
--- a/src/languages/basic.js
+++ b/src/languages/basic.js
@@ -45,7 +45,7 @@ export default function(hljs) {
       {
         // Match typed numeric constants (1000, 12.34!, 1.2e5, 1.5#, 1.2D2)
         className: 'number',
-        begin: '\\b([0-9]+[0-9edED\.]*[#\!]?)',
+        begin: '\\b\\d+(\\.\\d+)?([edED]\\d+)?[#\!]?',
         relevance: 0
       },
       {

From 3a218643d259ef1b8d91cd2371c9b60ede58c763 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 11:42:39 -0500
Subject: [PATCH 204/223] fix(elixir) fix poly backtracking issue

---
 src/languages/elixir.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/elixir.js b/src/languages/elixir.js
index 76a1c9a92c..a584b37a18 100644
--- a/src/languages/elixir.js
+++ b/src/languages/elixir.js
@@ -24,7 +24,7 @@ export default function(hljs) {
   };
   const NUMBER = {
     className: 'number',
-    begin: '(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)',
+    begin: '(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(\\.[0-9_]+([eE][-+]?[0-9]+)?)?)',
     relevance: 0
   };
   const SIGIL_DELIMITERS = '[/|([{<"\']';

From 3abbf11a4c9f101206d57387db6a7bd9be5807bc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 11:50:22 -0500
Subject: [PATCH 205/223] fix(crystal) fix poly backtracking issue

---
 src/languages/crystal.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/crystal.js b/src/languages/crystal.js
index 7f4c5b0834..1e5cbdabbf 100644
--- a/src/languages/crystal.js
+++ b/src/languages/crystal.js
@@ -6,8 +6,8 @@ Website: https://crystal-lang.org
 
 /** @type LanguageFn */
 export default function(hljs) {
-  var INT_SUFFIX = '(_*[ui](8|16|32|64|128))?';
-  var FLOAT_SUFFIX = '(_*f(32|64))?';
+  var INT_SUFFIX = '(_?[ui](8|16|32|64|128))?';
+  var FLOAT_SUFFIX = '(_?f(32|64))?';
   var CRYSTAL_IDENT_RE = '[a-zA-Z_]\\w*[!?=]?';
   var CRYSTAL_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?';
   var CRYSTAL_PATH_RE = '[A-Za-z_]\\w*(::\\w+)*(\\?|!)?';
@@ -177,7 +177,7 @@ export default function(hljs) {
         { begin: '\\b0b([01_]+)' + INT_SUFFIX },
         { begin: '\\b0o([0-7_]+)' + INT_SUFFIX },
         { begin: '\\b0x([A-Fa-f0-9_]+)' + INT_SUFFIX },
-        { begin: '\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?' + FLOAT_SUFFIX + '(?!_)' },
+        { begin: '\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_?[-+]?[0-9_]*)?' + FLOAT_SUFFIX + '(?!_)' },
         { begin: '\\b([1-9][0-9_]*|0)' + INT_SUFFIX }
       ],
       relevance: 0

From e202642a2f4f11e18922a996b151aea2f615eebc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 12:01:32 -0500
Subject: [PATCH 206/223] fix(scilab) fix poly backtracking issue

---
 src/languages/scilab.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/languages/scilab.js b/src/languages/scilab.js
index 3703b424d2..b45ce3929d 100644
--- a/src/languages/scilab.js
+++ b/src/languages/scilab.js
@@ -53,14 +53,15 @@ export default function(hljs) {
           }
         ]
       },
+      // seems to be a guard against [ident]' or [ident].
+      // perhaps to prevent attributes from flagging as keywords?
       {
-        begin: '[a-zA-Z_][a-zA-Z_0-9]*(\'+[\\.\']*|[\\.\']+)',
-        end: '',
+        begin: '[a-zA-Z_][a-zA-Z_0-9]*[\\.\']+',
         relevance: 0
       },
       {
         begin: '\\[',
-        end: '\\]\'*[\\.\']*',
+        end: '\\][\\.\']*',
         relevance: 0,
         contains: COMMON_CONTAINS
       },

From 3f7b045fee5786dd64ed25349f5c96221452898b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 12:09:47 -0500
Subject: [PATCH 207/223] fix(csharp) fix poly backtracking issue

---
 src/languages/csharp.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index 7e002ee832..7c12f93445 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -325,7 +325,7 @@ export default function(hljs) {
       },
       {
         className: 'function',
-        begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
+        begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<.+>\\s*)?\\(', returnBegin: true,
         end: /\s*[{;=]/, excludeEnd: true,
         keywords: KEYWORDS,
         contains: [
@@ -335,7 +335,7 @@ export default function(hljs) {
             relevance: 0
           },
           {
-            begin: hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
+            begin: hljs.IDENT_RE + '\\s*(<.+>\\s*)?\\(', returnBegin: true,
             contains: [
               hljs.TITLE_MODE,
               GENERIC_MODIFIER

From dbd96bddf35119c8115ec2c805702376fe682113 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 12:37:35 -0500
Subject: [PATCH 208/223] fix(coffee/livescript) fix poly backtracking issue

- Fix issue with optional params for anonymous functions
---
 src/languages/coffeescript.js | 6 +++---
 src/languages/livescript.js   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/languages/coffeescript.js b/src/languages/coffeescript.js
index e5b4e67735..1fc1e1d513 100644
--- a/src/languages/coffeescript.js
+++ b/src/languages/coffeescript.js
@@ -140,7 +140,7 @@ export default function(hljs) {
   const TITLE = hljs.inherit(hljs.TITLE_MODE, {
     begin: JS_IDENT_RE
   });
-  const PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
+  const POSSIBLE_PARAMS_RE = '(\\(.*\\)\\s*)?\\B[-=]>';
   const PARAMS = {
     className: 'params',
     begin: '\\([^\\(]',
@@ -169,7 +169,7 @@ export default function(hljs) {
       hljs.HASH_COMMENT_MODE,
       {
         className: 'function',
-        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE,
+        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + POSSIBLE_PARAMS_RE,
         end: '[-=]>',
         returnBegin: true,
         contains: [
@@ -183,7 +183,7 @@ export default function(hljs) {
         relevance: 0,
         contains: [{
           className: 'function',
-          begin: PARAMS_RE,
+          begin: POSSIBLE_PARAMS_RE,
           end: '[-=]>',
           returnBegin: true,
           contains: [PARAMS]
diff --git a/src/languages/livescript.js b/src/languages/livescript.js
index 4e86129237..0567172d8e 100644
--- a/src/languages/livescript.js
+++ b/src/languages/livescript.js
@@ -194,15 +194,15 @@ export default function(hljs) {
         returnBegin: true,
         variants: [
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B->\\*?',
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\)\\s*)?\\B->\\*?',
             end: '->\\*?'
           },
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?',
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\)\\s*)?\\B[-~]{1,2}>\\*?',
             end: '[-~]{1,2}>\\*?'
           },
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?',
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\)\\s*)?\\B!?[-~]{1,2}>\\*?',
             end: '!?[-~]{1,2}>\\*?'
           }
         ]

From 923a408dc6fc40e7d32467d946bc149190d7ce34 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 12:46:03 -0500
Subject: [PATCH 209/223] fix(moonscript) fix poly backtracking issue

---
 src/languages/moonscript.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/moonscript.js b/src/languages/moonscript.js
index edb6947209..1713e375fc 100644
--- a/src/languages/moonscript.js
+++ b/src/languages/moonscript.js
@@ -70,7 +70,7 @@ export default function(hljs) {
   const TITLE = hljs.inherit(hljs.TITLE_MODE, {
     begin: JS_IDENT_RE
   });
-  const PARAMS_RE = '(\\(.*\\))?\\s*\\B[-=]>';
+  const POSSIBLE_PARAMS_RE = '(\\(.*\\)\\s*)?\\B[-=]>';
   const PARAMS = {
     className: 'params',
     begin: '\\([^\\(]',
@@ -96,7 +96,7 @@ export default function(hljs) {
       hljs.COMMENT('--', '$'),
       {
         className: 'function', // function: -> =>
-        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + PARAMS_RE,
+        begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + POSSIBLE_PARAMS_RE,
         end: '[-=]>',
         returnBegin: true,
         contains: [
@@ -110,7 +110,7 @@ export default function(hljs) {
         contains: [
           {
             className: 'function',
-            begin: PARAMS_RE,
+            begin: POSSIBLE_PARAMS_RE,
             end: '[-=]>',
             returnBegin: true,
             contains: [ PARAMS ]

From 0fc3b32a8262a06e0ebff66963b975459d07983a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 12:54:02 -0500
Subject: [PATCH 210/223] fix(aspectj) fix poly backtracking issue

---
 src/languages/aspectj.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/aspectj.js b/src/languages/aspectj.js
index 56c0547f38..00d8f8f82c 100644
--- a/src/languages/aspectj.js
+++ b/src/languages/aspectj.js
@@ -115,7 +115,7 @@ export default function(hljs) {
       {
         // the function class is a bit different for AspectJ compared to the Java language
         className: 'function',
-        begin: /\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,
+        begin: /\w+ +\w+(\.\w+)?\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,
         returnBegin: true,
         end: /[{;=]/,
         keywords: KEYWORDS,

From 7c6fc77b59d5d3ad4843a93b949beb28a8052fab Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 13:20:10 -0500
Subject: [PATCH 211/223] fix(d) fix poly backtracking issue

---
 src/languages/d.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/d.js b/src/languages/d.js
index 239fb59a41..c691632efc 100644
--- a/src/languages/d.js
+++ b/src/languages/d.js
@@ -62,7 +62,7 @@ export default function(hljs) {
 
   const decimal_exponent_re = '([eE][+-]?' + decimal_integer_nosus_re + ')';
   const decimal_float_re = '(' + decimal_integer_nosus_re + '(\\.\\d*|' + decimal_exponent_re + ')|' +
-                '\\d+\\.' + decimal_integer_nosus_re + decimal_integer_nosus_re + '|' +
+                '\\d+\\.' + decimal_integer_nosus_re + '|' +
                 '\\.' + decimal_integer_re + decimal_exponent_re + '?' +
               ')';
   const hexadecimal_float_re = '(0[xX](' +

From 0c601c3f8788001e41e9eec248ab85a7dcb2a1f3 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 13:34:20 -0500
Subject: [PATCH 212/223] fix(gcode) fix poly backtracking issue

---
 src/languages/gcode.js               | 12 ++++++++----
 test/markup/gcode/default.expect.txt |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/languages/gcode.js b/src/languages/gcode.js
index cdac312c64..0e39a596ff 100644
--- a/src/languages/gcode.js
+++ b/src/languages/gcode.js
@@ -17,13 +17,14 @@ export default function(hljs) {
     className: 'meta',
     begin: '([O])([0-9]+)'
   };
+  const NUMBER = hljs.inherit(hljs.C_NUMBER_MODE, {
+    begin: '([-+]?((\\.\\d+)|(\\d+)(\\.\\d*)?))|' + hljs.C_NUMBER_RE
+  });
   const GCODE_CODE = [
     hljs.C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
     hljs.COMMENT(/\(/, /\)/),
-    hljs.inherit(hljs.C_NUMBER_MODE, {
-      begin: '([-+]?([0-9]*\\.?[0-9]+\\.?))|' + hljs.C_NUMBER_RE
-    }),
+    NUMBER,
     hljs.inherit(hljs.APOS_STRING_MODE, {
       illegal: null
     }),
@@ -50,7 +51,10 @@ export default function(hljs) {
     {
       className: 'built_in',
       begin: '(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)',
-      end: '([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])'
+      contains: [
+        NUMBER
+      ],
+      end: '\\]'
     },
     {
       className: 'symbol',
diff --git a/test/markup/gcode/default.expect.txt b/test/markup/gcode/default.expect.txt
index ad4d148f8c..500e8514c4 100644
--- a/test/markup/gcode/default.expect.txt
+++ b/test/markup/gcode/default.expect.txt
@@ -25,7 +25,7 @@
 <span class="hljs-symbol">N23</span> <span class="hljs-keyword">IF</span> [<span class="hljs-attr">#1</span> <span class="hljs-keyword">LT</span> <span class="hljs-number">0.370</span>] <span class="hljs-keyword">GOTO</span> <span class="hljs-number">49</span>
 <span class="hljs-symbol">N24</span> X<span class="hljs-number">-0.678</span> Y<span class="hljs-number">+.990</span>
 <span class="hljs-symbol">N25</span> <span class="hljs-name">G84.3</span> X<span class="hljs-number">-0.1</span>
-<span class="hljs-symbol">N26</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">COS[45]</span>
-<span class="hljs-symbol">N27</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">SIN[45]</span>
+<span class="hljs-symbol">N26</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">COS[<span class="hljs-number">45</span>]</span>
+<span class="hljs-symbol">N27</span> <span class="hljs-attr">#4</span>=<span class="hljs-attr">#5</span>*<span class="hljs-built_in">SIN[<span class="hljs-number">45</span>]</span>
 <span class="hljs-symbol">N28</span> <span class="hljs-attr">VZOFZ</span>=<span class="hljs-number">652.9658</span>
 <span class="hljs-meta">%</span>

From dee643412790aab34c8462d4cf25f05f44aac509 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 13:43:57 -0500
Subject: [PATCH 213/223] fix(kotlin) fix poly backtracking issue

No explanation for what this `illegal` is trying to accomplish to
without that data, just remove it.
---
 src/languages/kotlin.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index 78eabf6eed..aec81c6325 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -177,7 +177,6 @@ export default function(hljs) {
         returnBegin: true,
         excludeEnd: true,
         keywords: KEYWORDS,
-        illegal: /fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,
         relevance: 5,
         contains: [
           {

From 02ca487e8ca4d56f2cbd1b738eae8f814688b5eb Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Fri, 27 Nov 2020 14:03:48 -0500
Subject: [PATCH 214/223] fix(kotlin) fix poly backtracking issue

- Use same numeric mode rules as for Java
---
 src/languages/java.js     | 38 +++-----------------------------------
 src/languages/kotlin.js   | 22 +++-------------------
 src/languages/lib/java.js | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 54 deletions(-)
 create mode 100644 src/languages/lib/java.js

diff --git a/src/languages/java.js b/src/languages/java.js
index 9b7c83fb7a..8cf86c43cc 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -5,6 +5,8 @@ Category: common, enterprise
 Website: https://www.java.com/
 */
 
+import { NUMERIC } from "./lib/java.js";
+
 export default function(hljs) {
   var JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
   var GENERIC_IDENT_RE = JAVA_IDENT_RE + '(<' + JAVA_IDENT_RE + '(\\s*,\\s*' + JAVA_IDENT_RE + ')*>)?';
@@ -25,41 +27,7 @@ export default function(hljs) {
       },
     ]
   };
-
-  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
-  var decimalDigits = '[0-9](_*[0-9])*';
-  var frac = `\\.(${decimalDigits})`;
-  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
-  var NUMBER = {
-    className: 'number',
-    variants: [
-      // DecimalFloatingPointLiteral
-      // including ExponentPart
-      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
-        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
-      // excluding ExponentPart
-      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
-      { begin: `(${frac})[fFdD]?\\b` },
-      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
-
-      // HexadecimalFloatingPointLiteral
-      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
-        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
-
-      // DecimalIntegerLiteral
-      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
-
-      // HexIntegerLiteral
-      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
-
-      // OctalIntegerLiteral
-      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
-
-      // BinaryIntegerLiteral
-      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
-    ],
-    relevance: 0
-  };
+  const NUMBER = NUMERIC;
 
   return {
     name: 'Java',
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index aec81c6325..16b8ef785e 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -6,6 +6,8 @@
  Category: common
  */
 
+import { NUMERIC } from "./lib/java.js";
+
 export default function(hljs) {
   const KEYWORDS = {
     keyword:
@@ -104,25 +106,7 @@ export default function(hljs) {
   // https://kotlinlang.org/docs/reference/whatsnew11.html#underscores-in-numeric-literals
   // According to the doc above, the number mode of kotlin is the same as java 8,
   // so the code below is copied from java.js
-  const KOTLIN_NUMBER_RE = '\\b' +
-    '(' +
-      '0[bB]([01]+[01_]+[01]+|[01]+)' + // 0b...
-      '|' +
-      '0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)' + // 0x...
-      '|' +
-      '(' +
-        '([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?' +
-        '|' +
-        '\\.([\\d]+[\\d_]+[\\d]+|[\\d]+)' +
-      ')' +
-      '([eE][-+]?\\d+)?' + // octal, decimal, float
-    ')' +
-    '[lLfF]?';
-  const KOTLIN_NUMBER_MODE = {
-    className: 'number',
-    begin: KOTLIN_NUMBER_RE,
-    relevance: 0
-  };
+  const KOTLIN_NUMBER_MODE = NUMERIC;
   const KOTLIN_NESTED_COMMENT = hljs.COMMENT(
     '/\\*', '\\*/',
     {
diff --git a/src/languages/lib/java.js b/src/languages/lib/java.js
new file mode 100644
index 0000000000..f855643461
--- /dev/null
+++ b/src/languages/lib/java.js
@@ -0,0 +1,35 @@
+
+// https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+var decimalDigits = '[0-9](_*[0-9])*';
+var frac = `\\.(${decimalDigits})`;
+var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+export var NUMERIC = {
+  className: 'number',
+  variants: [
+    // DecimalFloatingPointLiteral
+    // including ExponentPart
+    { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+      `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+    // excluding ExponentPart
+    { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+    { begin: `(${frac})[fFdD]?\\b` },
+    { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+    // HexadecimalFloatingPointLiteral
+    { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+      `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+    // DecimalIntegerLiteral
+    { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+    // HexIntegerLiteral
+    { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+    // OctalIntegerLiteral
+    { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+    // BinaryIntegerLiteral
+    { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+  ],
+  relevance: 0
+};

From fdec037a569c9f06592dd17304b07640365573b7 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 2 Dec 2020 14:06:23 -0500
Subject: [PATCH 215/223] fix(asciidoc) fix poly backtracking issue

---
 src/languages/asciidoc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/asciidoc.js b/src/languages/asciidoc.js
index e24b5194a0..5d4df1a450 100644
--- a/src/languages/asciidoc.js
+++ b/src/languages/asciidoc.js
@@ -172,7 +172,7 @@ export default function(hljs) {
       },
       // images and links
       {
-        begin: '(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]',
+        begin: '(link:)?(http|https|ftp|file|irc|image:?):\\S+?\\[[^[]*?\\]',
         returnBegin: true,
         contains: [
           {

From d9f1cdb9924a1f22fc145711a499962a76477ac7 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 2 Dec 2020 14:37:43 -0500
Subject: [PATCH 216/223] fix(javascript/typescript) fix poly backtracking
 issue

- Fix poly backtracking issue in gnarly `()` counting regex
---
 src/languages/javascript.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 3372b917bf..f56817ba55 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -282,8 +282,8 @@ export default function(hljs) {
             '[^()]*(\\(' +
             '[^()]*(\\(' +
             '[^()]*' +
-            '\\))*[^()]*' +
-            '\\))*[^()]*' +
+            '\\)[^()]*)*' +
+            '\\)[^()]*)*' +
             '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>',
             returnBegin: true,
             end: '\\s*=>',
@@ -373,8 +373,8 @@ export default function(hljs) {
           '[^()]*(\\(' +
             '[^()]*(\\(' +
               '[^()]*' +
-            '\\))*[^()]*' +
-          '\\))*[^()]*' +
+            '\\)[^()]*)*' +
+          '\\)[^()]*)*' +
           '\\)\\s*\\{', // end parens
         returnBegin:true,
         contains: [

From d496052534bb4317373991098d15ddd5ccb8f566 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 2 Dec 2020 14:40:23 -0500
Subject: [PATCH 217/223] fix(latex) fix poly backtracking issue

---
 src/languages/latex.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/latex.js b/src/languages/latex.js
index 0cadd1a09e..47b0636de8 100644
--- a/src/languages/latex.js
+++ b/src/languages/latex.js
@@ -172,7 +172,7 @@ export default function(hljs) {
   const BEGIN_ENV = function(envname, starts_mode) {
     return hljs.inherit(
       {
-        begin: '\\\\begin(?=\\s*\\r?\\n?\\s*\\{' + envname + '\\})',
+        begin: '\\\\begin(?=[ \t]*(\\r?\\n[ \t]*)?\\{' + envname + '\\})',
         keywords: {$pattern: /\\[a-zA-Z]+/, keyword: '\\begin'},
         relevance: 0,
       },

From fa46dd181d3fc37d43847aa253176c88d3d1e640 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 2 Dec 2020 14:49:14 -0500
Subject: [PATCH 218/223] fix(reasonml) fix poly backtracking issue

- fix typo/bug with using `s` vs `\s` (string vs regex mistake)
- simply `[pattern]?[pattern]?` to just `[pattern]{0,2}`
- fix ambiguous `\s*` poly issues
---
 src/languages/reasonml.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/reasonml.js b/src/languages/reasonml.js
index b67c568712..648d621cb0 100644
--- a/src/languages/reasonml.js
+++ b/src/languages/reasonml.js
@@ -23,8 +23,8 @@ export default function(hljs) {
   const RE_MODULE_IDENT = '`?[A-Z$_][0-9a-zA-Z$_]*';
 
   const RE_PARAM_TYPEPARAM = '\'?[a-z$_][0-9a-z$_]*';
-  const RE_PARAM_TYPE = '\s*:\s*[a-z$_][0-9a-z$_]*(\(\s*(' + RE_PARAM_TYPEPARAM + '\s*(,' + RE_PARAM_TYPEPARAM + ')*)?\s*\))?';
-  const RE_PARAM = RE_IDENT + '(' + RE_PARAM_TYPE + ')?(' + RE_PARAM_TYPE + ')?';
+  const RE_PARAM_TYPE = '\\s*:\\s*[a-z$_][0-9a-z$_]*(\\(\\s*(' + RE_PARAM_TYPEPARAM + '\\s*(,' + RE_PARAM_TYPEPARAM + '\\s*)*)?\\))?';
+  const RE_PARAM = RE_IDENT + '(' + RE_PARAM_TYPE + '){0,2}';
   const RE_OPERATOR = "(" + orReValues([
     '||',
     '++',

From fb0a62650c39bc6b9c9365657ce4f912d50523fc Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 2 Dec 2020 15:23:16 -0500
Subject: [PATCH 219/223] enh(ci): Add tests for polynomial regex issues

---
 test/regex/index.js | 198 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 196 insertions(+), 2 deletions(-)

diff --git a/test/regex/index.js b/test/regex/index.js
index e261a45f6a..426568ba4f 100644
--- a/test/regex/index.js
+++ b/test/regex/index.js
@@ -15,6 +15,13 @@ hljs.debugMode();
  */
 const expBacktrackingCache = {};
 
+/**
+ * A map for a regex pattern to whether or not it it vulnerable to polynomial backtracking.
+ *
+ * @type {Record<string, boolean>}
+ */
+const polyBacktrackingCache = {};
+
 function retrieveRules(language, { name }) {
   // first we need to get the language compiled so we have
   // access to the raw regex
@@ -56,7 +63,7 @@ function testLanguage(languageName) {
     //   });
     // });
 
-    it(`has ${rules.length} regex matchers`, () => {} );
+    it(`have ${rules.length} regex matchers`, () => {} );
 
     it('should not use octal escapes', function() {
       forEachPattern(rules, ({ ast, rulePath, reportError }) => {
@@ -194,7 +201,194 @@ function testLanguage(languageName) {
         expBacktrackingCache[patternStr] = false;
       });
     });
+    it('should not cause polynomial backtracking', function () {
+      forEachPattern(rules, ({ pattern, ast, rulePath, reportError }) => {
+        const patternStr = String(pattern);
+        if (polyBacktrackingCache[patternStr] === false) {
+          // we know that the pattern won't cause poly backtracking because we checked before
+          return;
+        }
+
+        const EMPTY = ast.flags.unicode ? CharSet.empty(0x10FFFF) : CharSet.empty(0xFFFF);
+
+        /**
+         * @param {Node} node
+         * @returns {CharSet}
+         */
+        function toCharSet(node) {
+          switch (node.type) {
+            case "Alternative": {
+              if (node.elements.length === 1) {
+                return toCharSet(node.elements[0]);
+              }
+              return EMPTY;
+            }
+            case "CapturingGroup":
+            case "Group": {
+              let total = EMPTY;
+              for (const item of node.alternatives) {
+                total = total.union(toCharSet(item));
+              }
+              return total;
+            }
+            case "Character":
+              return JS.createCharSet([node.value], ast.flags);
+            case "CharacterClass": {
+              const value = JS.createCharSet(node.elements.map(x => {
+                if (x.type === "CharacterSet") {
+                  return x;
+                } else if (x.type === "Character") {
+                  return x.value;
+                } else {
+                  return { min: x.min.value, max: x.max.value };
+                }
+              }), ast.flags);
+              if (node.negate) {
+                return value.negate();
+              } else {
+                return value;
+              }
+            }
+            case "CharacterSet":
+              return JS.createCharSet([node], ast.flags);
+
+            default:
+              return EMPTY;
+          }
+        }
+
+        /**
+         * @param {Element} from
+         * @returns {Element | null}
+         */
+        function getAfter(from) {
+          const parent = from.parent;
+          if (parent.type === "Quantifier") {
+            return getAfter(parent);
+          } else if (parent.type === "Alternative") {
+            const index = parent.elements.indexOf(from);
+            const after = parent.elements[index + 1];
+            if (after) {
+              return after;
+            } else {
+              const grandParent = parent.parent;
+              if (grandParent.type === "Pattern") {
+                return null;
+              } else {
+                return getAfter(grandParent);
+              }
+            }
+          } else {
+            throw Error("Unreachable");
+          }
+        }
+
+        visitRegExpAST(ast.pattern, {
+          onQuantifierLeave(node) {
+            if (node.max !== Infinity) {
+              return;
+            }
+            const char = toCharSet(node.element);
+            tryReachUntil(getAfter(node), char, null);
+
+            /**
+             * @param {Quantifier} quantifier
+             * @param {CharSet} char
+             */
+            function assertNoPoly(quantifier, char) {
+              if (quantifier.max === Infinity) {
+                const qChar = toCharSet(quantifier.element);
+                if (qChar && !qChar.isDisjointWith(char)) {
+                  const intersection = qChar.intersect(char);
+                  const literal = JS.toLiteral({
+                    type: "Concatenation",
+                    elements: [
+                      { type: "CharacterClass", characters: intersection }
+                    ]
+                  })
+                  const lang = `/${literal.source}/${literal.flags}`;
+
+                  const rangeStr = patternStr.substring(node.start + 1, quantifier.end + 1);
+                  const rangeHighlight = `^${"~".repeat(node.end - node.start - 1)}${" ".repeat(quantifier.start - node.end)}^${"~".repeat(quantifier.end - quantifier.start - 1)}`;
+
+                  reportError(`${rulePath}: Polynomial backtracking. By repeating any character that matches ${lang}, an attack string can be created.\n\n    ${rangeStr}\n    ${rangeHighlight}\n\nFull pattern:\n${patternStr}\n${" ".repeat(node.start + 1)}${rangeHighlight}`);
+                }
+              }
+            }
 
+            /**
+             * @param {Element | null | undefined} element
+             * @param {CharSet} char
+             * @param {Element | null | undefined} until
+             * @returns {CharSet}
+             */
+            function tryReachUntil(element, char, until) {
+              if (!element || element == until || char.isEmpty) {
+                return char;
+              }
+
+              const after = getAfter(element);
+
+              if (element.type === "Quantifier") {
+                assertNoPoly(element, char);
+              }
+
+              return tryReachUntil(after, goInto(element, after, char), until);
+            }
+
+            /**
+             * @param {Element} element
+             * @param {Element} after
+             * @param {CharSet} char
+             * @returns {CharSet}
+             */
+            function goInto(element, after, char) {
+              switch (element.type) {
+                case "Assertion": {
+                  if (element.kind === "lookahead" || element.kind === "lookbehind") {
+                    for (const alt of element.alternatives) {
+                      if (alt.elements.length > 0) {
+                        tryReachUntil(alt.elements[0], char, after);
+                      }
+                    }
+                  }
+                  return EMPTY;
+                }
+                case "Group":
+                case "CapturingGroup": {
+                  let total = EMPTY;
+                  for (const alt of element.alternatives) {
+                    if (alt.elements.length > 0) {
+                      total = total.union(tryReachUntil(alt.elements[0], char, after));
+                    } else {
+                      total = char;
+                    }
+                  }
+                  return total;
+                }
+                case "Character":
+                case "CharacterClass":
+                case "CharacterSet": {
+                  return char.intersect(toCharSet(element));
+                }
+                case "Quantifier": {
+                  if (element.min === 0) {
+                    goInto(element.element, after, char);
+                    return char;
+                  } else {
+                    return goInto(element.element, after, char);
+                  }
+                }
+                default:
+                  return EMPTY;
+              }
+            }
+          },
+        });
+
+        polyBacktrackingCache[patternStr] = false;
+      });
+    });
   });
 }
 
@@ -209,5 +403,5 @@ for (const language of languages) {
 }
 
 describe("COMBINED: All grammars", () => {
-  it(`has ${count} total regex`, () => {});
+  it(`have ${count} total regex`, () => {});
 });

From aa0fb850c24e94081bc65687010d41e1b7dda28a Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Wed, 18 Nov 2020 10:29:20 -0500
Subject: [PATCH 220/223] chore(docs) Version 9 has reached EOL.

---
 SECURITY.md | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 6a29f68bbd..10637672a5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,19 +2,15 @@
 
 ## Supported Versions
 
-Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library.  Problems with prior minor releases are often resolved by upgrading to the most recent minor release.  Prior major release will only receive critical security updates (when feasible).
+Due to both time and resource constrains the Highlight.js core team only fully supports the current major/minor release of the library.  Problems with minor releases are often resolved by upgrading to the most recent release.
 
-| Version  | Supported    | Status  |
+| Version  | Supported  | Status  |
 | :-----:  | :-: | :------ |
-| 10.4.x   | :white_check_mark: |  The 10.x series recieves regular updates, new features & bug fixes. |
-| <= 10.3.x  | :x: | *Please upgrade to the latest 10.x release.* |
-| 9.18.x   | :closed_lock_with_key: | Security updates only.  See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
-| <= 9.17.x | :x: | Obsolete. |
-| Older    | :x: | Obsolete. |
-
-### Version 9
-
-Support for IE11 is really the only reason anyone should still prefer version 9. It's recommended that everyone else upgrade.
+| 10.4.x   | :white_check_mark: &nbsp; :closed_lock_with_key: |  The 10.x series recieves regular updates, new features & bug fixes. |
+| <= 10.3.x  | :x: | *Please upgrade to a more recent 10.x release.* |
+| 9.18.4   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
+| <= 9.18.3 | :x: | No longer supported.  Known vulnerabities. |
+| <= 8.x    | :x: | Obsolete. |
 
 
 ## Reporting a Vulnerability

From 68509fc6301f5bb504d33766c45dd64253512e4b Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 19 Nov 2020 14:16:10 -0500
Subject: [PATCH 221/223] chore(docs) bump SECURITY mention to 9.18.5

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 10637672a5..3dc475fdc3 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,7 +8,7 @@ Due to both time and resource constrains the Highlight.js core team only fully s
 | :-----:  | :-: | :------ |
 | 10.4.x   | :white_check_mark: &nbsp; :closed_lock_with_key: |  The 10.x series recieves regular updates, new features & bug fixes. |
 | <= 10.3.x  | :x: | *Please upgrade to a more recent 10.x release.* |
-| 9.18.4   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
+| 9.18.5   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
 | <= 9.18.3 | :x: | No longer supported.  Known vulnerabities. |
 | <= 8.x    | :x: | Obsolete. |
 

From 065f65f41e803ef80a334f7d30da30e7bc653801 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 3 Dec 2020 08:15:49 -0500
Subject: [PATCH 222/223] chore(release) allow release script to handle
 production releases

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33deace552..31bdad66c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,8 +5,7 @@ on:
     tags:
       - "*beta*"
       - "*pre*"
-      # uncomment this later when we're ready for production releases
-      # - "1[0-9]+.[0-9]+.[0-9]+"
+      - "1[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
   prerelease:

From e96b915af70d1c3f014b732c10e7cd077f22b9c3 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Thu, 3 Dec 2020 08:14:01 -0500
Subject: [PATCH 223/223] bump 10.4.1

---
 CHANGES.md        | 33 +--------------------------------
 README.md         | 14 +++++++-------
 SECURITY.md       |  4 ++--
 docs/conf.py      |  2 +-
 package-lock.json |  2 +-
 package.json      |  2 +-
 6 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index eab24c41a3..c570079808 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,35 +1,4 @@
-## Version 10.5.0 preparation
-
-New Languages:
-
-- Added 3rd party Red & Rebol grammar to SUPPORTED_LANGUAGES (#2872) [Oldes Huhuman][]
-
-Language improvements:
-
-- enh(makefile): Add `make` as an alias (#2883) [tripleee][]
-
-Grammar improvements:
-
-- enh(vb) Large rework of VB.net grammar (#2808) [Jan Pilzer][]
-  - Adds support for Date data types, see (#2775)
-  - Adds support for `REM` comments and fixes `'''` doctags (#2875) (#2851)
-    - Custom number mode to support VB.net specific number flags
-    - Hex (&H), Oct (&O), and binary (&B) prefixes
-    - Separating digits with underscores: 90_946
-  - Type suffixes: 123UI (unsigned integer)
-  - Improves directives detection and adds support for `Enable`, `Disable`, and `Then` keywords
-  - Adds more markup tests
-- fix(javascript) Empty block-comments break highlighting (#2896) [Jan Pilzer][]
-- enh(dart) Fix empty block-comments from breaking highlighting (#2898) [Jan Pilzer][]
-- enh(dart) Fix empty doc-comment eating next line [Jan Pilzer][]
-
-[Jan Pilzer]: https://github.com/Hirse
-[Oldes Huhuman]: https://github.com/Oldes
-[Josh Goebel]: https://github.com/joshgoebel
-[tripleee]: https://github.com/tripleee
-
-
-## Version 10.4.1 (tentative)
+## Version 10.4.1
 
 Security
 
diff --git a/README.md b/README.md
index 111ee9181a..be891b02c3 100644
--- a/README.md
+++ b/README.md
@@ -244,26 +244,26 @@ A prebuilt version of highlight.js bundled with many common languages is hosted
 
 ```html
 <link rel="stylesheet"
-      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/default.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/highlight.min.js"></script>
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/languages/go.min.js"></script>
 ```
 
 **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release))
 
 ```html
 <link rel="stylesheet"
-      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/styles/default.min.css">
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/highlight.min.js"></script>
+      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.1/build/styles/default.min.css">
+<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.1/build/highlight.min.js"></script>
 ```
 
 **unpkg** ([link](https://unpkg.com/browse/@highlightjs/cdn-assets/))
 
 ```html
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/styles/default.min.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/highlight.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.4.1/styles/default.min.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@10.4.1/highlight.min.js"></script>
 ```
 
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be
diff --git a/SECURITY.md b/SECURITY.md
index 3dc475fdc3..76821036ba 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,8 @@ Due to both time and resource constrains the Highlight.js core team only fully s
 
 | Version  | Supported  | Status  |
 | :-----:  | :-: | :------ |
-| 10.4.x   | :white_check_mark: &nbsp; :closed_lock_with_key: |  The 10.x series recieves regular updates, new features & bug fixes. |
-| <= 10.3.x  | :x: | *Please upgrade to a more recent 10.x release.* |
+| 10.4.1   | :white_check_mark: &nbsp; :closed_lock_with_key: |  The 10.x series recieves regular updates, new features & bug fixes. |
+| <= 10.4.0  | :x: | Known vulnerabities.  *Please upgrade to a more recent 10.x release.* |
 | 9.18.5   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
 | <= 9.18.3 | :x: | No longer supported.  Known vulnerabities. |
 | <= 8.x    | :x: | Obsolete. |
diff --git a/docs/conf.py b/docs/conf.py
index 70f4fe120c..76c0dc9f46 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = '10.4.0'
+release = '10.4.1'
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/package-lock.json b/package-lock.json
index f8e215cf11..2e9c6866df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "highlight.js",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bcc275298e..1d3ec5c807 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "maniac@softwaremaniacs.org"