[devdocsgjs/main: 883/1867] Fix merge conflict




commit 0574de681292f3874d3b339e8f0cc09c83f44494
Merge: c88ae2c1 ec252ca6
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Fri Aug 23 22:44:18 2019 +0200

    Fix merge conflict

 CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md   |    0
 .github/CONTRIBUTING.md                            |   15 +-
 .github/PULL_REQUEST_TEMPLATE.md                   |   31 +
 PULL_REQUEST_TEMPLATE.md                           |   11 -
 assets/javascripts/lib/page.coffee                 |    2 +
 assets/javascripts/models/entry.coffee             |    2 +
 .../javascripts/templates/pages/about_tmpl.coffee  |   66 +-
 .../templates/pages/settings_tmpl.coffee           |    2 +-
 assets/javascripts/vendor/prism.js                 | 1218 ++++++++++++--------
 assets/stylesheets/application.css.scss            |    6 +-
 .../stylesheets/components/_environment.scss.erb   |    3 +
 assets/stylesheets/pages/_mkdocs.scss              |   11 +
 assets/stylesheets/pages/_octave.scss              |    9 +
 assets/stylesheets/pages/_rxjs.scss                |   24 +
 docs/maintainers.md                                |    5 +-
 .../filters/django_rest_framework/clean_html.rb    |   30 +
 lib/docs/filters/django_rest_framework/entries.rb  |   59 +
 lib/docs/filters/elixir/entries.rb                 |    4 +
 lib/docs/filters/gcc/clean_html.rb                 |   13 +
 lib/docs/filters/jest/entries.rb                   |   14 +-
 lib/docs/filters/julia/clean_html.rb               |    1 +
 lib/docs/filters/julia/entries.rb                  |   11 +-
 lib/docs/filters/mkdocs/clean_html.rb              |   17 +
 lib/docs/filters/octave/clean_html.rb              |   46 +
 lib/docs/filters/octave/entries.rb                 |   22 +
 lib/docs/filters/pony/clean_html.rb                |   16 +
 lib/docs/filters/pony/entries.rb                   |   35 +
 lib/docs/filters/rust/clean_html.rb                |    8 +-
 lib/docs/filters/rxjs/clean_html.rb                |  139 +++
 lib/docs/filters/rxjs/entries.rb                   |   29 +
 lib/docs/filters/trio/clean_html.rb                |   58 +
 lib/docs/filters/trio/entries.rb                   |   48 +
 lib/docs/filters/vue/clean_html.rb                 |    9 +
 lib/docs/filters/vue/entries.rb                    |   19 +-
 lib/docs/filters/vuex/clean_html.rb                |   17 +
 lib/docs/filters/vuex/entries.rb                   |   69 ++
 lib/docs/filters/yarn/clean_html.rb                |    3 +
 lib/docs/scrapers/ansible.rb                       |   10 +-
 lib/docs/scrapers/git.rb                           |    6 +-
 lib/docs/scrapers/gnu/gcc.rb                       |   30 +-
 lib/docs/scrapers/jest.rb                          |    8 +-
 lib/docs/scrapers/julia.rb                         |   24 +-
 lib/docs/scrapers/mkdocs/django_rest_framework.rb  |   29 +
 lib/docs/scrapers/mkdocs/mkdocs.rb                 |   19 +
 lib/docs/scrapers/octave.rb                        |   38 +
 lib/docs/scrapers/pony.rb                          |   27 +
 lib/docs/scrapers/rdoc/ruby.rb                     |    4 +
 lib/docs/scrapers/rust.rb                          |   10 +-
 lib/docs/scrapers/rxjs.rb                          |   94 ++
 lib/docs/scrapers/trio.rb                          |   31 +
 lib/docs/scrapers/vue.rb                           |    4 +-
 lib/docs/scrapers/vuex.rb                          |   27 +
 lib/docs/scrapers/yarn.rb                          |    2 +-
 public/icons/docs/django_rest_framework/16.png     |  Bin 0 -> 1166 bytes
 public/icons/docs/django_rest_framework/16 2x png  |  Bin 0 -> 4254 bytes
 public/icons/docs/django_rest_framework/SOURCE     |    1 +
 public/icons/docs/godot/16.png                     |  Bin 751 -> 642 bytes
 public/icons/docs/godot/16 2x png                  |  Bin 1585 -> 1415 bytes
 public/icons/docs/octave/16.png                    |  Bin 0 -> 1310 bytes
 public/icons/docs/octave/16 2x png                 |  Bin 0 -> 1940 bytes
 public/icons/docs/octave/SOURCE                    |    1 +
 public/icons/docs/pony/16.png                      |  Bin 0 -> 1360 bytes
 public/icons/docs/pony/16 2x png                   |  Bin 0 -> 1979 bytes
 public/icons/docs/pony/SOURCE                      |    1 +
 public/icons/docs/rxjs/16.png                      |  Bin 0 -> 1521 bytes
 public/icons/docs/rxjs/16 2x png                   |  Bin 0 -> 5084 bytes
 public/icons/docs/rxjs/SOURCE                      |    1 +
 public/icons/docs/trio/16.png                      |  Bin 0 -> 794 bytes
 public/icons/docs/trio/16 2x png                   |  Bin 0 -> 1805 bytes
 public/icons/docs/trio/SOURCE                      |    1 +
 public/icons/docs/vuex/16.png                      |  Bin 0 -> 534 bytes
 public/icons/docs/vuex/16 2x png                   |  Bin 0 -> 1244 bytes
 public/icons/docs/vuex/SOURCE                      |    1 +
 views/service-worker.js.erb                        |   13 +-
 74 files changed, 1895 insertions(+), 559 deletions(-)
---
diff --cc assets/javascripts/vendor/prism.js
index 50b344be,9e886921..b87e3a37
--- a/assets/javascripts/vendor/prism.js
+++ b/assets/javascripts/vendor/prism.js
@@@ -1,12 -1,12 +1,12 @@@
- /* PrismJS 1.15.0
- 
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+django+elixir+markup-templating+erlang+go+groovy+java+json+kotlin+lua+crystal+nginx+nim+perl+php+sql+scss+python+jsx+typescript+rust+yaml
 */
+ /* PrismJS 1.17.1
 
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+java+php+json+julia+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml
 */
++https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+groovy+java+php+json+julia+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml
 */
  var _self = (typeof window !== 'undefined')
 -  ? window   // if in browser
 -  : (
 -    (typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
 -      ? self // if in worker
 -      : {}   // if in node js
 -  );
 +      ? window   // if in browser
 +      : (
 +              (typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
 +              ? self // if in worker
 +              : {}   // if in node js
 +      );
  
  /**
   * Prism: Lightweight, robust, elegant syntax highlighting
@@@ -14,528 -14,537 +14,537 @@@
   * @author Lea Verou http://lea.verou.me
   */
  
- var Prism = (function(){
+ var Prism = (function (_self){
  
  // Private helper vars
 -  var lang = /\blang(?:uage)?-([\w-]+)\b/i;
 -  var uniqueId = 0;
 -
 -  var _ = {
 -    manual: _self.Prism && _self.Prism.manual,
 -    disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
 -    util: {
 -      encode: function (tokens) {
 -        if (tokens instanceof Token) {
 -          return new Token(tokens.type, _.util.encode(tokens.content), tokens.alias);
 -        } else if (Array.isArray(tokens)) {
 -          return tokens.map(_.util.encode);
 -        } else {
 -          return tokens.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
 -        }
 -      },
 -
 -      type: function (o) {
 -        return Object.prototype.toString.call(o).slice(8, -1);
 -      },
 -
 -      objId: function (obj) {
 -        if (!obj['__id']) {
 -          Object.defineProperty(obj, '__id', { value: ++uniqueId });
 -        }
 -        return obj['__id'];
 -      },
 -
 -      // Deep clone a language definition (e.g. to extend it)
 -      clone: function deepClone(o, visited) {
 -        var clone, id, type = _.util.type(o);
 -        visited = visited || {};
 -
 -        switch (type) {
 -          case 'Object':
 -            id = _.util.objId(o);
 -            if (visited[id]) {
 -              return visited[id];
 -            }
 -            clone = {};
 -            visited[id] = clone;
 -
 -            for (var key in o) {
 -              if (o.hasOwnProperty(key)) {
 -                clone[key] = deepClone(o[key], visited);
 -              }
 -            }
 -
 -            return clone;
 -
 -          case 'Array':
 -            id = _.util.objId(o);
 -            if (visited[id]) {
 -              return visited[id];
 -            }
 -            clone = [];
 -            visited[id] = clone;
 -
 -            o.forEach(function (v, i) {
 -              clone[i] = deepClone(v, visited);
 -            });
 -
 -            return clone;
 -
 -          default:
 -            return o;
 -        }
 -      }
 -    },
 -
 -    languages: {
 -      extend: function (id, redef) {
 -        var lang = _.util.clone(_.languages[id]);
 -
 -        for (var key in redef) {
 -          lang[key] = redef[key];
 -        }
 -
 -        return lang;
 -      },
 -
 -      /**
 -       * Insert a token before another token in a language literal
 -       * As this needs to recreate the object (we cannot actually insert before keys in object literals),
 -       * we cannot just provide an object, we need an object and a key.
 -       * @param inside The key (or language id) of the parent
 -       * @param before The key to insert before.
 -       * @param insert Object with the key/value pairs to insert
 -       * @param root The object that contains `inside`. If equal to Prism.languages, it can be omitted.
 -       */
 -      insertBefore: function (inside, before, insert, root) {
 -        root = root || _.languages;
 -        var grammar = root[inside];
 -        var ret = {};
 -
 -        for (var token in grammar) {
 -          if (grammar.hasOwnProperty(token)) {
 -
 -            if (token == before) {
 -              for (var newToken in insert) {
 -                if (insert.hasOwnProperty(newToken)) {
 -                  ret[newToken] = insert[newToken];
 -                }
 -              }
 -            }
 -
 -            // Do not insert token which also occur in insert. See #1525
 -            if (!insert.hasOwnProperty(token)) {
 -              ret[token] = grammar[token];
 -            }
 -          }
 -        }
 -
 -        var old = root[inside];
 -        root[inside] = ret;
 -
 -        // Update references in other language definitions
 -        _.languages.DFS(_.languages, function(key, value) {
 -          if (value === old && key != inside) {
 -            this[key] = ret;
 -          }
 -        });
 -
 -        return ret;
 -      },
 -
 -      // Traverse a language definition with Depth First Search
 -      DFS: function DFS(o, callback, type, visited) {
 -        visited = visited || {};
 -
 -        var objId = _.util.objId;
 -
 -        for (var i in o) {
 -          if (o.hasOwnProperty(i)) {
 -            callback.call(o, i, o[i], type || i);
 -
 -            var property = o[i],
 -              propertyType = _.util.type(property);
 -
 -            if (propertyType === 'Object' && !visited[objId(property)]) {
 -              visited[objId(property)] = true;
 -              DFS(property, callback, null, visited);
 -            }
 -            else if (propertyType === 'Array' && !visited[objId(property)]) {
 -              visited[objId(property)] = true;
 -              DFS(property, callback, i, visited);
 -            }
 -          }
 -        }
 -      }
 -    },
 -    plugins: {},
 -
 -    highlightAll: function(async, callback) {
 -      _.highlightAllUnder(document, async, callback);
 -    },
 -
 -    highlightAllUnder: function(container, async, callback) {
 -      var env = {
 -        callback: callback,
 -        selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], 
[class*="lang-"] code'
 -      };
 -
 -      _.hooks.run('before-highlightall', env);
 -
 -      var elements = container.querySelectorAll(env.selector);
 -
 -      for (var i=0, element; element = elements[i++];) {
 -        _.highlightElement(element, async === true, env.callback);
 -      }
 -    },
 -
 -    highlightElement: function(element, async, callback) {
 -      // Find language
 -      var language = 'none', grammar, parent = element;
 -
 -      while (parent && !lang.test(parent.className)) {
 -        parent = parent.parentNode;
 -      }
 -
 -      if (parent) {
 -        language = (parent.className.match(lang) || [,'none'])[1].toLowerCase();
 -        grammar = _.languages[language];
 -      }
 -
 -      // Set language on the element, if not present
 -      element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + 
language;
 -
 -      if (element.parentNode) {
 -        // Set language on the parent, for styling
 -        parent = element.parentNode;
 -
 -        if (/pre/i.test(parent.nodeName)) {
 -          parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + 
language;
 -        }
 -      }
 -
 -      var code = element.textContent;
 -
 -      var env = {
 -        element: element,
 -        language: language,
 -        grammar: grammar,
 -        code: code
 -      };
 -
 -      var insertHighlightedCode = function (highlightedCode) {
 -        env.highlightedCode = highlightedCode;
 -
 -        _.hooks.run('before-insert', env);
 -
 -        env.element.innerHTML = env.highlightedCode;
 -
 -        _.hooks.run('after-highlight', env);
 -        _.hooks.run('complete', env);
 -        callback && callback.call(env.element);
 -      }
 -
 -      _.hooks.run('before-sanity-check', env);
 -
 -      if (!env.code) {
 -        _.hooks.run('complete', env);
 -        return;
 -      }
 -
 -      _.hooks.run('before-highlight', env);
 -
 -      if (!env.grammar) {
 -        insertHighlightedCode(_.util.encode(env.code));
 -        return;
 -      }
 -
 -      if (async && _self.Worker) {
 -        var worker = new Worker(_.filename);
 -
 -        worker.onmessage = function(evt) {
 -          insertHighlightedCode(evt.data);
 -        };
 -
 -        worker.postMessage(JSON.stringify({
 -          language: env.language,
 -          code: env.code,
 -          immediateClose: true
 -        }));
 -      }
 -      else {
 -        insertHighlightedCode(_.highlight(env.code, env.grammar, env.language));
 -      }
 -    },
 -
 -    highlight: function (text, grammar, language) {
 -      var env = {
 -        code: text,
 -        grammar: grammar,
 -        language: language
 -      };
 -      _.hooks.run('before-tokenize', env);
 -      env.tokens = _.tokenize(env.code, env.grammar);
 -      _.hooks.run('after-tokenize', env);
 -      return Token.stringify(_.util.encode(env.tokens), env.language);
 -    },
 -
 -    matchGrammar: function (text, strarr, grammar, index, startPos, oneshot, target) {
 -      for (var token in grammar) {
 -        if(!grammar.hasOwnProperty(token) || !grammar[token]) {
 -          continue;
 -        }
 -
 -        if (token == target) {
 -          return;
 -        }
 -
 -        var patterns = grammar[token];
 -        patterns = (_.util.type(patterns) === "Array") ? patterns : [patterns];
 -
 -        for (var j = 0; j < patterns.length; ++j) {
 -          var pattern = patterns[j],
 -            inside = pattern.inside,
 -            lookbehind = !!pattern.lookbehind,
 -            greedy = !!pattern.greedy,
 -            lookbehindLength = 0,
 -            alias = pattern.alias;
 -
 -          if (greedy && !pattern.pattern.global) {
 -            // Without the global flag, lastIndex won't work
 -            var flags = pattern.pattern.toString().match(/[imuy]*$/)[0];
 -            pattern.pattern = RegExp(pattern.pattern.source, flags + "g");
 -          }
 -
 -          pattern = pattern.pattern || pattern;
 -
 -          // Don’t cache length as it changes during the loop
 -          for (var i = index, pos = startPos; i < strarr.length; pos += strarr[i].length, ++i) {
 -
 -            var str = strarr[i];
 -
 -            if (strarr.length > text.length) {
 -              // Something went terribly wrong, ABORT, ABORT!
 -              return;
 -            }
 -
 -            if (str instanceof Token) {
 -              continue;
 -            }
 -
 -            if (greedy && i != strarr.length - 1) {
 -              pattern.lastIndex = pos;
 -              var match = pattern.exec(text);
 -              if (!match) {
 -                break;
 -              }
 -
 -              var from = match.index + (lookbehind ? match[1].length : 0),
 -                to = match.index + match[0].length,
 -                k = i,
 -                p = pos;
 -
 -              for (var len = strarr.length; k < len && (p < to || (!strarr[k].type && !strarr[k - 
1].greedy)); ++k) {
 -                p += strarr[k].length;
 -                // Move the index i to the element in strarr that is closest to from
 -                if (from >= p) {
 -                  ++i;
 -                  pos = p;
 -                }
 -              }
 -
 -              // If strarr[i] is a Token, then the match starts inside another Token, which is invalid
 -              if (strarr[i] instanceof Token) {
 -                continue;
 -              }
 -
 -              // Number of tokens to delete and replace with the new match
 -              delNum = k - i;
 -              str = text.slice(pos, p);
 -              match.index -= pos;
 -            } else {
 -              pattern.lastIndex = 0;
 -
 -              var match = pattern.exec(str),
 -                delNum = 1;
 -            }
 -
 -            if (!match) {
 -              if (oneshot) {
 -                break;
 -              }
 -
 -              continue;
 -            }
 -
 -            if(lookbehind) {
 -              lookbehindLength = match[1] ? match[1].length : 0;
 -            }
 -
 -            var from = match.index + lookbehindLength,
 -              match = match[0].slice(lookbehindLength),
 -              to = from + match.length,
 -              before = str.slice(0, from),
 -              after = str.slice(to);
 -
 -            var args = [i, delNum];
 -
 -            if (before) {
 -              ++i;
 -              pos += before.length;
 -              args.push(before);
 -            }
 -
 -            var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match, greedy);
 -
 -            args.push(wrapped);
 -
 -            if (after) {
 -              args.push(after);
 -            }
 -
 -            Array.prototype.splice.apply(strarr, args);
 -
 -            if (delNum != 1)
 -              _.matchGrammar(text, strarr, grammar, i, pos, true, token);
 -
 -            if (oneshot)
 -              break;
 -          }
 -        }
 -      }
 -    },
 -
 -    tokenize: function(text, grammar) {
 -      var strarr = [text];
 -
 -      var rest = grammar.rest;
 -
 -      if (rest) {
 -        for (var token in rest) {
 -          grammar[token] = rest[token];
 -        }
 -
 -        delete grammar.rest;
 -      }
 -
 -      _.matchGrammar(text, strarr, grammar, 0, 0, false);
 -
 -      return strarr;
 -    },
 -
 -    hooks: {
 -      all: {},
 -
 -      add: function (name, callback) {
 -        var hooks = _.hooks.all;
 -
 -        hooks[name] = hooks[name] || [];
 -
 -        hooks[name].push(callback);
 -      },
 -
 -      run: function (name, env) {
 -        var callbacks = _.hooks.all[name];
 -
 -        if (!callbacks || !callbacks.length) {
 -          return;
 -        }
 +var lang = /\blang(?:uage)?-([\w-]+)\b/i;
 +var uniqueId = 0;
 +
- var _ = _self.Prism = {
++var _ = {
 +      manual: _self.Prism && _self.Prism.manual,
 +      disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
 +      util: {
 +              encode: function (tokens) {
 +                      if (tokens instanceof Token) {
 +                              return new Token(tokens.type, _.util.encode(tokens.content), tokens.alias);
-                       } else if (_.util.type(tokens) === 'Array') {
++                      } else if (Array.isArray(tokens)) {
 +                              return tokens.map(_.util.encode);
 +                      } else {
 +                              return tokens.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, 
' ');
 +                      }
 +              },
 +
 +              type: function (o) {
 +                      return Object.prototype.toString.call(o).slice(8, -1);
 +              },
 +
 +              objId: function (obj) {
 +                      if (!obj['__id']) {
 +                              Object.defineProperty(obj, '__id', { value: ++uniqueId });
 +                      }
 +                      return obj['__id'];
 +              },
 +
 +              // Deep clone a language definition (e.g. to extend it)
-               clone: function (o, visited) {
-                       var type = _.util.type(o);
++              clone: function deepClone(o, visited) {
++                      var clone, id, type = _.util.type(o);
 +                      visited = visited || {};
 +
 +                      switch (type) {
 +                              case 'Object':
-                                       if (visited[_.util.objId(o)]) {
-                                               return visited[_.util.objId(o)];
++                                      id = _.util.objId(o);
++                                      if (visited[id]) {
++                                              return visited[id];
 +                                      }
-                                       var clone = {};
-                                       visited[_.util.objId(o)] = clone;
++                                      clone = {};
++                                      visited[id] = clone;
 +
 +                                      for (var key in o) {
 +                                              if (o.hasOwnProperty(key)) {
-                                                       clone[key] = _.util.clone(o[key], visited);
++                                                      clone[key] = deepClone(o[key], visited);
 +                                              }
 +                                      }
 +
 +                                      return clone;
 +
 +                              case 'Array':
-                                       if (visited[_.util.objId(o)]) {
-                                               return visited[_.util.objId(o)];
++                                      id = _.util.objId(o);
++                                      if (visited[id]) {
++                                              return visited[id];
 +                                      }
-                                       var clone = [];
-                                       visited[_.util.objId(o)] = clone;
++                                      clone = [];
++                                      visited[id] = clone;
 +
 +                                      o.forEach(function (v, i) {
-                                               clone[i] = _.util.clone(v, visited);
++                                              clone[i] = deepClone(v, visited);
 +                                      });
 +
 +                                      return clone;
-                       }
 +
-                       return o;
++                              default:
++                                      return o;
++                      }
 +              }
 +      },
 +
 +      languages: {
 +              extend: function (id, redef) {
 +                      var lang = _.util.clone(_.languages[id]);
 +
 +                      for (var key in redef) {
 +                              lang[key] = redef[key];
 +                      }
 +
 +                      return lang;
 +              },
 +
 +              /**
 +               * Insert a token before another token in a language literal
 +               * As this needs to recreate the object (we cannot actually insert before keys in object 
literals),
 +               * we cannot just provide an object, we need an object and a key.
 +               * @param inside The key (or language id) of the parent
 +               * @param before The key to insert before.
 +               * @param insert Object with the key/value pairs to insert
 +               * @param root The object that contains `inside`. If equal to Prism.languages, it can be 
omitted.
 +               */
 +              insertBefore: function (inside, before, insert, root) {
 +                      root = root || _.languages;
 +                      var grammar = root[inside];
 +                      var ret = {};
 +
 +                      for (var token in grammar) {
 +                              if (grammar.hasOwnProperty(token)) {
 +
 +                                      if (token == before) {
 +                                              for (var newToken in insert) {
 +                                                      if (insert.hasOwnProperty(newToken)) {
 +                                                              ret[newToken] = insert[newToken];
 +                                                      }
 +                                              }
 +                                      }
 +
 +                                      // Do not insert token which also occur in insert. See #1525
 +                                      if (!insert.hasOwnProperty(token)) {
 +                                              ret[token] = grammar[token];
 +                                      }
 +                              }
 +                      }
 +
 +                      var old = root[inside];
 +                      root[inside] = ret;
 +
 +                      // Update references in other language definitions
 +                      _.languages.DFS(_.languages, function(key, value) {
 +                              if (value === old && key != inside) {
 +                                      this[key] = ret;
 +                              }
 +                      });
 +
 +                      return ret;
 +              },
 +
 +              // Traverse a language definition with Depth First Search
-               DFS: function(o, callback, type, visited) {
++              DFS: function DFS(o, callback, type, visited) {
 +                      visited = visited || {};
++
++                      var objId = _.util.objId;
++
 +                      for (var i in o) {
 +                              if (o.hasOwnProperty(i)) {
 +                                      callback.call(o, i, o[i], type || i);
 +
-                                       if (_.util.type(o[i]) === 'Object' && !visited[_.util.objId(o[i])]) {
-                                               visited[_.util.objId(o[i])] = true;
-                                               _.languages.DFS(o[i], callback, null, visited);
++                                      var property = o[i],
++                                          propertyType = _.util.type(property);
++
++                                      if (propertyType === 'Object' && !visited[objId(property)]) {
++                                              visited[objId(property)] = true;
++                                              DFS(property, callback, null, visited);
 +                                      }
-                                       else if (_.util.type(o[i]) === 'Array' && 
!visited[_.util.objId(o[i])]) {
-                                               visited[_.util.objId(o[i])] = true;
-                                               _.languages.DFS(o[i], callback, i, visited);
++                                      else if (propertyType === 'Array' && !visited[objId(property)]) {
++                                              visited[objId(property)] = true;
++                                              DFS(property, callback, i, visited);
 +                                      }
 +                              }
 +                      }
 +              }
 +      },
 +      plugins: {},
 +
 +      highlightAll: function(async, callback) {
 +              _.highlightAllUnder(document, async, callback);
 +      },
 +
 +      highlightAllUnder: function(container, async, callback) {
 +              var env = {
 +                      callback: callback,
 +                      selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], 
[class*="lang-"] code'
 +              };
 +
-               _.hooks.run("before-highlightall", env);
++              _.hooks.run('before-highlightall', env);
 +
-               var elements = env.elements || container.querySelectorAll(env.selector);
++              var elements = container.querySelectorAll(env.selector);
 +
 +              for (var i=0, element; element = elements[i++];) {
 +                      _.highlightElement(element, async === true, env.callback);
 +              }
 +      },
 +
 +      highlightElement: function(element, async, callback) {
 +              // Find language
-               var language, grammar, parent = element;
++              var language = 'none', grammar, parent = element;
 +
 +              while (parent && !lang.test(parent.className)) {
 +                      parent = parent.parentNode;
 +              }
 +
 +              if (parent) {
-                       language = (parent.className.match(lang) || [,''])[1].toLowerCase();
++                      language = (parent.className.match(lang) || [,'none'])[1].toLowerCase();
 +                      grammar = _.languages[language];
 +              }
 +
 +              // Set language on the element, if not present
 +              element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + 
language;
 +
 +              if (element.parentNode) {
 +                      // Set language on the parent, for styling
 +                      parent = element.parentNode;
 +
 +                      if (/pre/i.test(parent.nodeName)) {
 +                              parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + 
' language-' + language;
 +                      }
 +              }
 +
 +              var code = element.textContent;
 +
 +              var env = {
 +                      element: element,
 +                      language: language,
 +                      grammar: grammar,
 +                      code: code
 +              };
 +
 +              var insertHighlightedCode = function (highlightedCode) {
 +                      env.highlightedCode = highlightedCode;
 +
 +                      _.hooks.run('before-insert', env);
 +
 +                      env.element.innerHTML = env.highlightedCode;
 +
 +                      _.hooks.run('after-highlight', env);
 +                      _.hooks.run('complete', env);
 +                      callback && callback.call(env.element);
 +              }
 +
 +              _.hooks.run('before-sanity-check', env);
 +
 +              if (!env.code) {
 +                      _.hooks.run('complete', env);
 +                      return;
 +              }
 +
 +              _.hooks.run('before-highlight', env);
 +
 +              if (!env.grammar) {
 +                      insertHighlightedCode(_.util.encode(env.code));
 +                      return;
 +              }
 +
 +              if (async && _self.Worker) {
 +                      var worker = new Worker(_.filename);
 +
 +                      worker.onmessage = function(evt) {
 +                              insertHighlightedCode(evt.data);
 +                      };
 +
 +                      worker.postMessage(JSON.stringify({
 +                              language: env.language,
 +                              code: env.code,
 +                              immediateClose: true
 +                      }));
 +              }
 +              else {
 +                      insertHighlightedCode(_.highlight(env.code, env.grammar, env.language));
 +              }
 +      },
 +
 +      highlight: function (text, grammar, language) {
 +              var env = {
 +                      code: text,
 +                      grammar: grammar,
 +                      language: language
 +              };
 +              _.hooks.run('before-tokenize', env);
 +              env.tokens = _.tokenize(env.code, env.grammar);
 +              _.hooks.run('after-tokenize', env);
 +              return Token.stringify(_.util.encode(env.tokens), env.language);
 +      },
 +
 +      matchGrammar: function (text, strarr, grammar, index, startPos, oneshot, target) {
-               var Token = _.Token;
- 
 +              for (var token in grammar) {
 +                      if(!grammar.hasOwnProperty(token) || !grammar[token]) {
 +                              continue;
 +                      }
 +
 +                      if (token == target) {
 +                              return;
 +                      }
 +
 +                      var patterns = grammar[token];
 +                      patterns = (_.util.type(patterns) === "Array") ? patterns : [patterns];
 +
 +                      for (var j = 0; j < patterns.length; ++j) {
 +                              var pattern = patterns[j],
 +                                      inside = pattern.inside,
 +                                      lookbehind = !!pattern.lookbehind,
 +                                      greedy = !!pattern.greedy,
 +                                      lookbehindLength = 0,
 +                                      alias = pattern.alias;
 +
 +                              if (greedy && !pattern.pattern.global) {
 +                                      // Without the global flag, lastIndex won't work
 +                                      var flags = pattern.pattern.toString().match(/[imuy]*$/)[0];
 +                                      pattern.pattern = RegExp(pattern.pattern.source, flags + "g");
 +                              }
 +
 +                              pattern = pattern.pattern || pattern;
 +
 +                              // Don’t cache length as it changes during the loop
 +                              for (var i = index, pos = startPos; i < strarr.length; pos += 
strarr[i].length, ++i) {
 +
 +                                      var str = strarr[i];
 +
 +                                      if (strarr.length > text.length) {
 +                                              // Something went terribly wrong, ABORT, ABORT!
 +                                              return;
 +                                      }
 +
 +                                      if (str instanceof Token) {
 +                                              continue;
 +                                      }
 +
 +                                      if (greedy && i != strarr.length - 1) {
 +                                              pattern.lastIndex = pos;
 +                                              var match = pattern.exec(text);
 +                                              if (!match) {
 +                                                      break;
 +                                              }
 +
 +                                              var from = match.index + (lookbehind ? match[1].length : 0),
 +                                                  to = match.index + match[0].length,
 +                                                  k = i,
 +                                                  p = pos;
 +
 +                                              for (var len = strarr.length; k < len && (p < to || 
(!strarr[k].type && !strarr[k - 1].greedy)); ++k) {
 +                                                      p += strarr[k].length;
 +                                                      // Move the index i to the element in strarr that is 
closest to from
 +                                                      if (from >= p) {
 +                                                              ++i;
 +                                                              pos = p;
 +                                                      }
 +                                              }
 +
 +                                              // If strarr[i] is a Token, then the match starts inside 
another Token, which is invalid
 +                                              if (strarr[i] instanceof Token) {
 +                                                      continue;
 +                                              }
 +
 +                                              // Number of tokens to delete and replace with the new match
 +                                              delNum = k - i;
 +                                              str = text.slice(pos, p);
 +                                              match.index -= pos;
 +                                      } else {
 +                                              pattern.lastIndex = 0;
 +
 +                                              var match = pattern.exec(str),
 +                                                      delNum = 1;
 +                                      }
 +
 +                                      if (!match) {
 +                                              if (oneshot) {
 +                                                      break;
 +                                              }
 +
 +                                              continue;
 +                                      }
 +
 +                                      if(lookbehind) {
 +                                              lookbehindLength = match[1] ? match[1].length : 0;
 +                                      }
 +
 +                                      var from = match.index + lookbehindLength,
 +                                          match = match[0].slice(lookbehindLength),
 +                                          to = from + match.length,
 +                                          before = str.slice(0, from),
 +                                          after = str.slice(to);
 +
 +                                      var args = [i, delNum];
  
 -        for (var i=0, callback; callback = callbacks[i++];) {
 -          callback(env);
 -        }
 -      }
 -    },
 +                                      if (before) {
 +                                              ++i;
 +                                              pos += before.length;
 +                                              args.push(before);
 +                                      }
  
 -    Token: Token
 -  };
 +                                      var wrapped = new Token(token, inside? _.tokenize(match, inside) : 
match, alias, match, greedy);
  
 -  _self.Prism = _;
 +                                      args.push(wrapped);
  
 -  function Token(type, content, alias, matchedStr, greedy) {
 -    this.type = type;
 -    this.content = content;
 -    this.alias = alias;
 -    // Copy of the full string this token was created from
 -    this.length = (matchedStr || "").length|0;
 -    this.greedy = !!greedy;
 -  }
 +                                      if (after) {
 +                                              args.push(after);
 +                                      }
 +
 +                                      Array.prototype.splice.apply(strarr, args);
  
 -  Token.stringify = function(o, language) {
 -    if (typeof o == 'string') {
 -      return o;
 -    }
 +                                      if (delNum != 1)
 +                                              _.matchGrammar(text, strarr, grammar, i, pos, true, token);
  
 -    if (Array.isArray(o)) {
 -      return o.map(function(element) {
 -        return Token.stringify(element, language);
 -      }).join('');
 -    }
 +                                      if (oneshot)
 +                                              break;
 +                              }
 +                      }
 +              }
 +      },
  
 -    var env = {
 -      type: o.type,
 -      content: Token.stringify(o.content, language),
 -      tag: 'span',
 -      classes: ['token', o.type],
 -      attributes: {},
 -      language: language
 -    };
 +      tokenize: function(text, grammar) {
 +              var strarr = [text];
 +
 +              var rest = grammar.rest;
 +
 +              if (rest) {
 +                      for (var token in rest) {
 +                              grammar[token] = rest[token];
 +                      }
 +
 +                      delete grammar.rest;
 +              }
  
 -    if (o.alias) {
 -      var aliases = Array.isArray(o.alias) ? o.alias : [o.alias];
 -      Array.prototype.push.apply(env.classes, aliases);
 -    }
 +              _.matchGrammar(text, strarr, grammar, 0, 0, false);
  
 -    _.hooks.run('wrap', env);
 +              return strarr;
 +      },
  
 -    var attributes = Object.keys(env.attributes).map(function(name) {
 -      return name + '="' + (env.attributes[name] || '').replace(/"/g, '&quot;') + '"';
 -    }).join(' ');
 +      hooks: {
 +              all: {},
  
 -    return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + (attributes ? ' ' + attributes : '') 
+ '>' + env.content + '</' + env.tag + '>';
 -  };
 +              add: function (name, callback) {
 +                      var hooks = _.hooks.all;
  
 -  if (!_self.document) {
 -    if (!_self.addEventListener) {
 -      // in Node.js
 -      return _;
 -    }
 +                      hooks[name] = hooks[name] || [];
  
 -    if (!_.disableWorkerMessageHandler) {
 -      // In worker
 -      _self.addEventListener('message', function (evt) {
 -        var message = JSON.parse(evt.data),
 -          lang = message.language,
 -          code = message.code,
 -          immediateClose = message.immediateClose;
 +                      hooks[name].push(callback);
 +              },
  
 -        _self.postMessage(_.highlight(code, _.languages[lang], lang));
 -        if (immediateClose) {
 -          _self.close();
 -        }
 -      }, false);
 -    }
 +              run: function (name, env) {
 +                      var callbacks = _.hooks.all[name];
  
 -    return _;
 -  }
 +                      if (!callbacks || !callbacks.length) {
 +                              return;
 +                      }
 +
 +                      for (var i=0, callback; callback = callbacks[i++];) {
 +                              callback(env);
 +                      }
 +              }
-       }
++      },
++
++      Token: Token
 +};
 +
- var Token = _.Token = function(type, content, alias, matchedStr, greedy) {
++_self.Prism = _;
++
++function Token(type, content, alias, matchedStr, greedy) {
 +      this.type = type;
 +      this.content = content;
 +      this.alias = alias;
 +      // Copy of the full string this token was created from
 +      this.length = (matchedStr || "").length|0;
 +      this.greedy = !!greedy;
- };
++}
 +
- Token.stringify = function(o, language, parent) {
++Token.stringify = function(o, language) {
 +      if (typeof o == 'string') {
 +              return o;
 +      }
 +
-       if (_.util.type(o) === 'Array') {
++      if (Array.isArray(o)) {
 +              return o.map(function(element) {
-                       return Token.stringify(element, language, o);
++                      return Token.stringify(element, language);
 +              }).join('');
 +      }
 +
 +      var env = {
 +              type: o.type,
-               content: Token.stringify(o.content, language, parent),
++              content: Token.stringify(o.content, language),
 +              tag: 'span',
 +              classes: ['token', o.type],
 +              attributes: {},
-               language: language,
-               parent: parent
++              language: language
 +      };
 +
 +      if (o.alias) {
-               var aliases = _.util.type(o.alias) === 'Array' ? o.alias : [o.alias];
++              var aliases = Array.isArray(o.alias) ? o.alias : [o.alias];
 +              Array.prototype.push.apply(env.classes, aliases);
 +      }
 +
 +      _.hooks.run('wrap', env);
 +
 +      var attributes = Object.keys(env.attributes).map(function(name) {
 +              return name + '="' + (env.attributes[name] || '').replace(/"/g, '&quot;') + '"';
 +      }).join(' ');
 +
 +      return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + (attributes ? ' ' + attributes : 
'') + '>' + env.content + '</' + env.tag + '>';
- 
 +};
 +
 +if (!_self.document) {
 +      if (!_self.addEventListener) {
 +              // in Node.js
-               return _self.Prism;
++              return _;
 +      }
 +
 +      if (!_.disableWorkerMessageHandler) {
 +              // In worker
 +              _self.addEventListener('message', function (evt) {
 +                      var message = JSON.parse(evt.data),
 +                              lang = message.language,
 +                              code = message.code,
 +                              immediateClose = message.immediateClose;
 +
 +                      _self.postMessage(_.highlight(code, _.languages[lang], lang));
 +                      if (immediateClose) {
 +                              _self.close();
 +                      }
 +              }, false);
 +      }
 +
-       return _self.Prism;
++      return _;
 +}
  
  //Get current script and highlight
 -  var script = document.currentScript || [].slice.call(document.getElementsByTagName("script")).pop();
 -
 -  if (script) {
 -    _.filename = script.src;
 -
 -    if (!_.manual && !script.hasAttribute('data-manual')) {
 -      if(document.readyState !== "loading") {
 -        if (window.requestAnimationFrame) {
 -          window.requestAnimationFrame(_.highlightAll);
 -        } else {
 -          window.setTimeout(_.highlightAll, 16);
 -        }
 -      }
 -      else {
 -        document.addEventListener('DOMContentLoaded', _.highlightAll);
 -      }
 -    }
 -  }
 -
 -  return _;
 +var script = document.currentScript || [].slice.call(document.getElementsByTagName("script")).pop();
 +
 +if (script) {
 +      _.filename = script.src;
 +
 +      if (!_.manual && !script.hasAttribute('data-manual')) {
 +              if(document.readyState !== "loading") {
 +                      if (window.requestAnimationFrame) {
 +                              window.requestAnimationFrame(_.highlightAll);
 +                      } else {
 +                              window.setTimeout(_.highlightAll, 16);
 +                      }
 +              }
 +              else {
 +                      document.addEventListener('DOMContentLoaded', _.highlightAll);
 +              }
 +      }
 +}
 +
- return _self.Prism;
++return _;
  
- })();
+ })(_self);
  
  if (typeof module !== 'undefined' && module.exports) {
 -  module.exports = Prism;
 +      module.exports = Prism;
  }
  
  // hack for components to work correctly in node.js
@@@ -544,44 -553,44 +553,44 @@@ if (typeof global !== 'undefined') 
  }
  ;
  Prism.languages.markup = {
 -  'comment': /<!--[\s\S]*?-->/,
 -  'prolog': /<\?[\s\S]+?\?>/,
 -  'doctype': /<!DOCTYPE[\s\S]+?>/i,
 -  'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 -  'tag': {
 -    pattern: 
/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/i,
 -    greedy: true,
 -    inside: {
 -      'tag': {
 -        pattern: /^<\/?[^\s>\/]+/i,
 -        inside: {
 -          'punctuation': /^<\/?/,
 -          'namespace': /^[^\s>\/:]+:/
 -        }
 -      },
 -      'attr-value': {
 -        pattern: /=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/i,
 -        inside: {
 -          'punctuation': [
 -            /^=/,
 -            {
 -              pattern: /^(\s*)["']|["']$/,
 -              lookbehind: true
 -            }
 -          ]
 -        }
 -      },
 -      'punctuation': /\/?>/,
 -      'attr-name': {
 -        pattern: /[^\s>\/]+/,
 -        inside: {
 -          'namespace': /^[^\s>\/:]+:/
 -        }
 -      }
 -
 -    }
 -  },
 -  'entity': /&#?[\da-z]{1,8};/i
 +      'comment': /<!--[\s\S]*?-->/,
 +      'prolog': /<\?[\s\S]+?\?>/,
 +      'doctype': /<!DOCTYPE[\s\S]+?>/i,
 +      'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 +      'tag': {
-               pattern: 
/<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
++              pattern: 
/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/i,
 +              greedy: true,
 +              inside: {
 +                      'tag': {
 +                              pattern: /^<\/?[^\s>\/]+/i,
 +                              inside: {
 +                                      'punctuation': /^<\/?/,
 +                                      'namespace': /^[^\s>\/:]+:/
 +                              }
 +                      },
 +                      'attr-value': {
-                               pattern: /=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+)/i,
++                              pattern: /=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/i,
 +                              inside: {
 +                                      'punctuation': [
 +                                              /^=/,
 +                                              {
-                                                       pattern: /(^|[^\\])["']/,
++                                                      pattern: /^(\s*)["']|["']$/,
 +                                                      lookbehind: true
 +                                              }
 +                                      ]
 +                              }
 +                      },
 +                      'punctuation': /\/?>/,
 +                      'attr-name': {
 +                              pattern: /[^\s>\/]+/,
 +                              inside: {
 +                                      'namespace': /^[^\s>\/:]+:/
 +                              }
 +                      }
 +
 +              }
 +      },
 +      'entity': /&#?[\da-z]{1,8};/i
  };
  
  Prism.languages.markup['tag'].inside['attr-value'].inside['entity'] =
@@@ -590,188 -599,237 +599,237 @@@
  // Plugin to make entity title show the real entity, idea by Roman Komarov
  Prism.hooks.add('wrap', function(env) {
  
 -  if (env.type === 'entity') {
 -    env.attributes['title'] = env.content.replace(/&amp;/, '&');
 -  }
 +      if (env.type === 'entity') {
 +              env.attributes['title'] = env.content.replace(/&amp;/, '&');
 +      }
  });
  
+ Object.defineProperty(Prism.languages.markup.tag, 'addInlined', {
 -  /**
 -   * Adds an inlined language to markup.
 -   *
 -   * An example of an inlined language is CSS with `<style>` tags.
 -   *
 -   * @param {string} tagName The name of the tag that contains the inlined language. This name will be 
treated as
 -   * case insensitive.
 -   * @param {string} lang The language key.
 -   * @example
 -   * addInlined('style', 'css');
 -   */
 -  value: function addInlined(tagName, lang) {
 -    var includedCdataInside = {};
 -    includedCdataInside['language-' + lang] = {
 -      pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
 -      lookbehind: true,
 -      inside: Prism.languages[lang]
 -    };
 -    includedCdataInside['cdata'] = /^<!\[CDATA\[|\]\]>$/i;
 -
 -    var inside = {
 -      'included-cdata': {
 -        pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
 -        inside: includedCdataInside
 -      }
 -    };
 -    inside['language-' + lang] = {
 -      pattern: /[\s\S]+/,
 -      inside: Prism.languages[lang]
 -    };
 -
 -    var def = {};
 -    def[tagName] = {
 -      pattern: 
RegExp(/(<__[\s\S]*?>)(?:<!\[CDATA\[[\s\S]*?\]\]>\s*|[\s\S])*?(?=<\/__>)/.source.replace(/__/g, tagName), 
'i'),
 -      lookbehind: true,
 -      greedy: true,
 -      inside: inside
 -    };
 -
 -    Prism.languages.insertBefore('markup', 'cdata', def);
 -  }
++      /**
++       * Adds an inlined language to markup.
++       *
++       * An example of an inlined language is CSS with `<style>` tags.
++       *
++       * @param {string} tagName The name of the tag that contains the inlined language. This name will be 
treated as
++       * case insensitive.
++       * @param {string} lang The language key.
++       * @example
++       * addInlined('style', 'css');
++       */
++      value: function addInlined(tagName, lang) {
++              var includedCdataInside = {};
++              includedCdataInside['language-' + lang] = {
++                      pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
++                      lookbehind: true,
++                      inside: Prism.languages[lang]
++              };
++              includedCdataInside['cdata'] = /^<!\[CDATA\[|\]\]>$/i;
++
++              var inside = {
++                      'included-cdata': {
++                              pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
++                              inside: includedCdataInside
++                      }
++              };
++              inside['language-' + lang] = {
++                      pattern: /[\s\S]+/,
++                      inside: Prism.languages[lang]
++              };
++
++              var def = {};
++              def[tagName] = {
++                      pattern: 
RegExp(/(<__[\s\S]*?>)(?:<!\[CDATA\[[\s\S]*?\]\]>\s*|[\s\S])*?(?=<\/__>)/.source.replace(/__/g, tagName), 
'i'),
++                      lookbehind: true,
++                      greedy: true,
++                      inside: inside
++              };
++
++              Prism.languages.insertBefore('markup', 'cdata', def);
++      }
+ });
+ 
  Prism.languages.xml = Prism.languages.extend('markup', {});
  Prism.languages.html = Prism.languages.markup;
  Prism.languages.mathml = Prism.languages.markup;
  Prism.languages.svg = Prism.languages.markup;
  
- Prism.languages.css = {
-       'comment': /\/\*[\s\S]*?\*\//,
-       'atrule': {
-               pattern: /@[\w-]+?[\s\S]*?(?:;|(?=\s*\{))/i,
-               inside: {
-                       'rule': /@[\w-]+/
-                       // See rest below
-               }
-       },
-       'url': /url\((?:(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
-       'selector': /[^{}\s][^{};]*?(?=\s*\{)/,
-       'string': {
-               pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
-               greedy: true
-       },
-       'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
-       'important': /!important\b/i,
-       'function': /[-a-z0-9]+(?=\()/i,
-       'punctuation': /[(){};:,]/
- };
+ (function (Prism) {
  
- Prism.languages.css['atrule'].inside.rest = Prism.languages.css;
 -  var string = /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/;
 -
 -  Prism.languages.css = {
 -    'comment': /\/\*[\s\S]*?\*\//,
 -    'atrule': {
 -      pattern: /@[\w-]+[\s\S]*?(?:;|(?=\s*\{))/,
 -      inside: {
 -        'rule': /@[\w-]+/
 -        // See rest below
 -      }
 -    },
 -    'url': {
 -      pattern: RegExp('url\\((?:' + string.source + '|[^\n\r()]*)\\)', 'i'),
 -      inside: {
 -        'function': /^url/i,
 -        'punctuation': /^\(|\)$/
 -      }
 -    },
 -    'selector': RegExp('[^{}\\s](?:[^{};"\']|' + string.source + ')*?(?=\\s*\\{)'),
 -    'string': {
 -      pattern: string,
 -      greedy: true
 -    },
 -    'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
 -    'important': /!important\b/i,
 -    'function': /[-a-z0-9]+(?=\()/i,
 -    'punctuation': /[(){};:,]/
 -  };
 -
 -  Prism.languages.css['atrule'].inside.rest = Prism.languages.css;
 -
 -  var markup = Prism.languages.markup;
 -  if (markup) {
 -    markup.tag.addInlined('style', 'css');
 -
 -    Prism.languages.insertBefore('inside', 'attr-value', {
 -      'style-attr': {
 -        pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,
 -        inside: {
 -          'attr-name': {
 -            pattern: /^\s*style/i,
 -            inside: markup.tag.inside
 -          },
 -          'punctuation': /^\s*=\s*['"]|['"]\s*$/,
 -          'attr-value': {
 -            pattern: /.+/i,
 -            inside: Prism.languages.css
 -          }
 -        },
 -        alias: 'language-css'
 -      }
 -    }, markup.tag);
 -  }
++      var string = /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/;
 +
- if (Prism.languages.markup) {
-       Prism.languages.insertBefore('markup', 'tag', {
-               'style': {
-                       pattern: /(<style[\s\S]*?>)[\s\S]*?(?=<\/style>)/i,
-                       lookbehind: true,
-                       inside: Prism.languages.css,
-                       alias: 'language-css',
++      Prism.languages.css = {
++              'comment': /\/\*[\s\S]*?\*\//,
++              'atrule': {
++                      pattern: /@[\w-]+[\s\S]*?(?:;|(?=\s*\{))/,
++                      inside: {
++                              'rule': /@[\w-]+/
++                              // See rest below
++                      }
++              },
++              'url': {
++                      pattern: RegExp('url\\((?:' + string.source + '|[^\n\r()]*)\\)', 'i'),
++                      inside: {
++                              'function': /^url/i,
++                              'punctuation': /^\(|\)$/
++                      }
++              },
++              'selector': RegExp('[^{}\\s](?:[^{};"\']|' + string.source + ')*?(?=\\s*\\{)'),
++              'string': {
++                      pattern: string,
 +                      greedy: true
-               }
-       });
++              },
++              'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
++              'important': /!important\b/i,
++              'function': /[-a-z0-9]+(?=\()/i,
++              'punctuation': /[(){};:,]/
++      };
 +
-       Prism.languages.insertBefore('inside', 'attr-value', {
-               'style-attr': {
-                       pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,
-                       inside: {
-                               'attr-name': {
-                                       pattern: /^\s*style/i,
-                                       inside: Prism.languages.markup.tag.inside
++      Prism.languages.css['atrule'].inside.rest = Prism.languages.css;
++
++      var markup = Prism.languages.markup;
++      if (markup) {
++              markup.tag.addInlined('style', 'css');
++
++              Prism.languages.insertBefore('inside', 'attr-value', {
++                      'style-attr': {
++                              pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,
++                              inside: {
++                                      'attr-name': {
++                                              pattern: /^\s*style/i,
++                                              inside: markup.tag.inside
++                                      },
++                                      'punctuation': /^\s*=\s*['"]|['"]\s*$/,
++                                      'attr-value': {
++                                              pattern: /.+/i,
++                                              inside: Prism.languages.css
++                                      }
 +                              },
-                               'punctuation': /^\s*=\s*['"]|['"]\s*$/,
-                               'attr-value': {
-                                       pattern: /.+/i,
-                                       inside: Prism.languages.css
-                               }
-                       },
-                       alias: 'language-css'
-               }
-       }, Prism.languages.markup.tag);
- }
- ;
++                              alias: 'language-css'
++                      }
++              }, markup.tag);
++      }
+ 
+ }(Prism));
+ 
  Prism.languages.clike = {
 -  'comment': [
 -    {
 -      pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
 -      lookbehind: true
 -    },
 -    {
 -      pattern: /(^|[^\\:])\/\/.*/,
 -      lookbehind: true,
 -      greedy: true
 -    }
 -  ],
 -  'string': {
 -    pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 -    greedy: true
 -  },
 -  'class-name': {
 -    pattern: 
/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i,
 -    lookbehind: true,
 -    inside: {
 -      punctuation: /[.\\]/
 -    }
 -  },
 -  'keyword': 
/\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 -  'boolean': /\b(?:true|false)\b/,
 -  'function': /\w+(?=\()/,
 -  'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,
 -  'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 -  'punctuation': /[{}[\];(),.:]/
 +      'comment': [
 +              {
 +                      pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
 +                      lookbehind: true
 +              },
 +              {
 +                      pattern: /(^|[^\\:])\/\/.*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              }
 +      ],
 +      'string': {
 +              pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 +              greedy: true
 +      },
 +      'class-name': {
 +              pattern: 
/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i,
 +              lookbehind: true,
 +              inside: {
 +                      punctuation: /[.\\]/
 +              }
 +      },
 +      'keyword': 
/\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 +      'boolean': /\b(?:true|false)\b/,
 +      'function': /\w+(?=\()/,
 +      'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,
 +      'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 +      'punctuation': /[{}[\];(),.:]/
  };
  
  Prism.languages.javascript = Prism.languages.extend('clike', {
 -  'class-name': [
 -    Prism.languages.clike['class-name'],
 -    {
 -      pattern: /(^|[^$\w\xA0-\uFFFF])[_$A-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\.(?:prototype|constructor))/,
 -      lookbehind: true
 -    }
 -  ],
 -  'keyword': [
 -    {
 -      pattern: /((?:^|})\s*)(?:catch|finally)\b/,
 -      lookbehind: true
 -    },
 -    {
 -      pattern: 
/(^|[^.])\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
 -      lookbehind: true
 -    },
 -  ],
 -  'number': 
/\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,
 -  // Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
 -  'function': /#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,
 -  'operator': 
/-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
 +      'class-name': [
 +              Prism.languages.clike['class-name'],
 +              {
 +                      pattern: 
/(^|[^$\w\xA0-\uFFFF])[_$A-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\.(?:prototype|constructor))/,
 +                      lookbehind: true
 +              }
 +      ],
 +      'keyword': [
 +              {
 +                      pattern: /((?:^|})\s*)(?:catch|finally)\b/,
 +                      lookbehind: true
 +              },
-               
/\b(?:as|async|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/
++              {
++                      pattern: 
/(^|[^.])\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
++                      lookbehind: true
++              },
 +      ],
-       'number': 
/\b(?:(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+)n?|\d+n|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
++      'number': 
/\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,
 +      // Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
-       'function': /[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\(|\.(?:apply|bind|call)\()/,
++      'function': /#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,
 +      'operator': 
/-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
  });
  
- Prism.languages.javascript['class-name'][0].pattern = 
/(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/
+ Prism.languages.javascript['class-name'][0].pattern = 
/(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/;
  
  Prism.languages.insertBefore('javascript', 'keyword', {
 -  'regex': {
 -    pattern: 
/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=\s*($|[\r\n,.;})\]]))/,
 -    lookbehind: true,
 -    greedy: true
 -  },
 -  // This must be declared before keyword because we use "function" inside the look-forward
 -  'function-variable': {
 -    pattern: 
/#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/,
 -    alias: 'function'
 -  },
 -  'parameter': [
 -    {
 -      pattern: 
/(function(?:\s+[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\))/,
 -      lookbehind: true,
 -      inside: Prism.languages.javascript
 -    },
 -    {
 -      pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=>)/i,
 -      inside: Prism.languages.javascript
 -    },
 -    {
 -      pattern: /(\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*=>)/,
 -      lookbehind: true,
 -      inside: Prism.languages.javascript
 -    },
 -    {
 -      pattern: 
/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*\{)/,
 -      lookbehind: true,
 -      inside: Prism.languages.javascript
 -    }
 -  ],
 -  'constant': /\b[A-Z](?:[A-Z_]|\dx?)*\b/
 +      'regex': {
-               pattern: 
/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})\]]))/,
++              pattern: 
/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=\s*($|[\r\n,.;})\]]))/,
 +              lookbehind: true,
 +              greedy: true
 +      },
 +      // This must be declared before keyword because we use "function" inside the look-forward
 +      'function-variable': {
-               pattern: 
/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,
++              pattern: 
/#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/,
 +              alias: 'function'
 +      },
 +      'parameter': [
 +              {
-                       pattern: 
/(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)[^\s()][^()]*?(?=\s*\))/,
++                      pattern: 
/(function(?:\s+[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\))/,
 +                      lookbehind: true,
 +                      inside: Prism.languages.javascript
 +              },
 +              {
-                       pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=>)/,
++                      pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=>)/i,
 +                      inside: Prism.languages.javascript
 +              },
 +              {
-                       pattern: /(\(\s*)[^\s()][^()]*?(?=\s*\)\s*=>)/,
++                      pattern: /(\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*=>)/,
 +                      lookbehind: true,
 +                      inside: Prism.languages.javascript
 +              },
 +              {
-                       pattern: 
/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)[^\s()][^()]*?(?=\s*\)\s*\{)/,
++                      pattern: 
/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*\{)/,
 +                      lookbehind: true,
 +                      inside: Prism.languages.javascript
 +              }
 +      ],
-       'constant': /\b[A-Z][A-Z\d_]*\b/
++      'constant': /\b[A-Z](?:[A-Z_]|\dx?)*\b/
  });
  
  Prism.languages.insertBefore('javascript', 'string', {
 -  'template-string': {
 -    pattern: /`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|(?!\${)[^\\`])*`/,
 -    greedy: true,
 -    inside: {
 -      'template-punctuation': {
 -        pattern: /^`|`$/,
 -        alias: 'string'
 -      },
 -      'interpolation': {
 -        pattern: /((?:^|[^\\])(?:\\{2})*)\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,
 -        lookbehind: true,
 -        inside: {
 -          'interpolation-punctuation': {
 -            pattern: /^\${|}$/,
 -            alias: 'punctuation'
 -          },
 -          rest: Prism.languages.javascript
 -        }
 -      },
 -      'string': /[\s\S]+/
 -    }
 -  }
 +      'template-string': {
-               pattern: /`(?:\\[\s\S]|\${[^}]+}|[^\\`])*`/,
++              pattern: /`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|(?!\${)[^\\`])*`/,
 +              greedy: true,
 +              inside: {
++                      'template-punctuation': {
++                              pattern: /^`|`$/,
++                              alias: 'string'
++                      },
 +                      'interpolation': {
-                               pattern: /\${[^}]+}/,
++                              pattern: /((?:^|[^\\])(?:\\{2})*)\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,
++                              lookbehind: true,
 +                              inside: {
 +                                      'interpolation-punctuation': {
 +                                              pattern: /^\${|}$/,
 +                                              alias: 'punctuation'
 +                                      },
 +                                      rest: Prism.languages.javascript
 +                              }
 +                      },
 +                      'string': /[\s\S]+/
 +              }
 +      }
  });
  
  if (Prism.languages.markup) {
-       Prism.languages.insertBefore('markup', 'tag', {
-               'script': {
-                       pattern: /(<script[\s\S]*?>)[\s\S]*?(?=<\/script>)/i,
-                       lookbehind: true,
-                       inside: Prism.languages.javascript,
-                       alias: 'language-javascript',
-                       greedy: true
-               }
-       });
 -  Prism.languages.markup.tag.addInlined('script', 'javascript');
++      Prism.languages.markup.tag.addInlined('script', 'javascript');
  }
  
  Prism.languages.js = Prism.languages.javascript;
@@@ -814,98 -872,215 +872,215 @@@ Prism.languages.insertBefore('c', 'stri
  delete Prism.languages.c['boolean'];
  
  (function(Prism) {
 -  // $ set | grep '^[A-Z][^[:space:]]*=' | cut -d= -f1 | tr '\n' '|'
 -  // + LC_ALL, RANDOM, REPLY, SECONDS.
 -  // + make sure PS1..4 are here as they are not always set,
 -  // - some useless things.
 -  var envVars = 
'\\b(?:BASH|BASHOPTS|BASH_ALIASES|BASH_ARGC|BASH_ARGV|BASH_CMDS|BASH_COMPLETION_COMPAT_DIR|BASH_LINENO|BASH_REMATCH|BASH_SOURCE|BASH_VERSINFO|BASH_VERSION|COLORTERM|COLUMNS|COMP_WORDBREAKS|DBUS_SESSION_BUS_ADDRESS|DEFAULTS_PATH|DESKTOP_SESSION|DIRSTACK|DISPLAY|EUID|GDMSESSION|GDM_LANG|GNOME_KEYRING_CONTROL|GNOME_KEYRING_PID|GPG_AGENT_INFO|GROUPS|HISTCONTROL|HISTFILE|HISTFILESIZE|HISTSIZE|HOME|HOSTNAME|HOSTTYPE|IFS|INSTANCE|JOB|LANG|LANGUAGE|LC_ADDRESS|LC_ALL|LC_IDENTIFICATION|LC_MEASUREMENT|LC_MONETARY|LC_NAME|LC_NUMERIC|LC_PAPER|LC_TELEPHONE|LC_TIME|LESSCLOSE|LESSOPEN|LINES|LOGNAME|LS_COLORS|MACHTYPE|MAILCHECK|MANDATORY_PATH|NO_AT_BRIDGE|OLDPWD|OPTERR|OPTIND|ORBIT_SOCKETDIR|OSTYPE|PAPERSIZE|PATH|PIPESTATUS|PPID|PS1|PS2|PS3|PS4|PWD|RANDOM|REPLY|SECONDS|SELINUX_INIT|SESSION|SESSIONTYPE|SESSION_MANAGER|SHELL|SHELLOPTS|SHLVL|SSH_AUTH_SOCK|TERM|UID|UPSTART_EVENTS|UPSTART_INSTANCE|UPSTART_JOB|UPSTART_SESSION|USER|WINDOWID|XAUTHORITY|XDG_CONFIG_DIRS|XDG_CURRENT_DESKTOP|XD
 
G_DATA_DIRS|XDG_GREETER_DATA_DIR|XDG_MENU_PREFIX|XDG_RUNTIME_DIR|XDG_SEAT|XDG_SEAT_PATH|XDG_SESSION_DESKTOP|XDG_SESSION_ID|XDG_SESSION_PATH|XDG_SESSION_TYPE|XDG_VTNR|XMODIFIERS)\\b';
 -  var insideString = {
 -    'environment': {
 -      pattern: RegExp("\\$" + envVars),
 -      alias: 'constant'
 -    },
 -    'variable': [
 -      // [0]: Arithmetic Environment
 -      {
 -        pattern: /\$?\(\([\s\S]+?\)\)/,
 -        greedy: true,
 -        inside: {
 -          // If there is a $ sign at the beginning highlight $(( and )) as variable
 -          'variable': [
 -            {
 -              pattern: /(^\$\(\([\s\S]+)\)\)/,
 -              lookbehind: true
 -            },
 -            /^\$\(\(/
 -          ],
 -          'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,
 -          // Operators according to https://www.gnu.org/software/bash/manual/bashref.html#Shell-Arithmetic
 -          'operator': 
/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,
 -          // If there is no $ sign at the beginning highlight (( and )) as punctuation
 -          'punctuation': /\(\(?|\)\)?|,|;/
 -        }
 -      },
 -      // [1]: Command Substitution
 -      {
 -        pattern: /\$\((?:\([^)]+\)|[^()])+\)|`[^`]+`/,
 -        greedy: true,
 -        inside: {
 -          'variable': /^\$\(|^`|\)$|`$/
 -        }
 -      },
 -      // [2]: Brace expansion
 -      {
 -        pattern: /\$\{[^}]+\}/,
 -        greedy: true,
 -        inside: {
 -          'operator': /:[-=?+]?|[!\/]|##?|%%?|\^\^?|,,?/,
 -          'punctuation': /[\[\]]/,
 -          'environment': {
 -            pattern: RegExp("(\\{)" + envVars),
 -            lookbehind: true,
 -            alias: 'constant'
 -          }
 -        }
 -      },
 -      /\$(?:\w+|[#?*!@$])/
 -    ],
 -    // Escape sequences from echo and printf's manuals, and escaped quotes.
 -    'entity': /\\(?:[abceEfnrtv\\"]|O?[0-7]{1,3}|x[0-9a-fA-F]{1,2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})/
 -  };
 -
 -  Prism.languages.bash = {
 -    'shebang': {
 -      pattern: /^#!\s*\/.*/,
 -      alias: 'important'
 -    },
 -    'comment': {
 -      pattern: /(^|[^"{\\$])#.*/,
 -      lookbehind: true
 -    },
 -    'function-name': [
 -      // a) function foo {
 -      // b) foo() {
 -      // c) function foo() {
 -      // but not “foo {”
 -      {
 -        // a) and c)
 -        pattern: /(\bfunction\s+)\w+(?=(?:\s*\(?:\s*\))?\s*\{)/,
 -        lookbehind: true,
 -        alias: 'function'
 -      },
 -      {
 -        // b)
 -        pattern: /\b\w+(?=\s*\(\s*\)\s*\{)/,
 -        alias: 'function'
 -      }
 -    ],
 -    // Highlight variable names as variables in for and select beginnings.
 -    'for-or-select': {
 -      pattern: /(\b(?:for|select)\s+)\w+(?=\s+in\s)/,
 -      alias: 'variable',
 -      lookbehind: true
 -    },
 -    // Highlight variable names as variables in the left-hand part
 -    // of assignments (“=” and “+=”).
 -    'assign-left': {
 -      pattern: /(^|[\s;|&]|[<>]\()\w+(?=\+?=)/,
 -      inside: {
 -        'environment': {
 -          pattern: RegExp("(^|[\\s;|&]|[<>]\\()" + envVars),
 -          lookbehind: true,
 -          alias: 'constant'
 -        }
 -      },
 -      alias: 'variable',
 -      lookbehind: true
 -    },
 -    'string': [
 -      // Support for Here-documents https://en.wikipedia.org/wiki/Here_document
 -      {
 -        pattern: /((?:^|[^<])<<-?\s*)(\w+?)\s*(?:\r?\n|\r)(?:[\s\S])*?(?:\r?\n|\r)\2/,
 -        lookbehind: true,
 -        greedy: true,
 -        inside: insideString
 -      },
 -      // Here-document with quotes around the tag
 -      // → No expansion (so no “inside”).
 -      {
 -        pattern: /((?:^|[^<])<<-?\s*)(["'])(\w+)\2\s*(?:\r?\n|\r)(?:[\s\S])*?(?:\r?\n|\r)\3/,
 -        lookbehind: true,
 -        greedy: true
 -      },
 -      // “Normal” string
 -      {
 -        pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,
 -        greedy: true,
 -        inside: insideString
 -      }
 -    ],
 -    'environment': {
 -      pattern: RegExp("\\$?" + envVars),
 -      alias: 'constant'
 -    },
 -    'variable': insideString.variable,
 -    'function': {
 -      pattern: 
/(^|[\s;|&]|[<>]\()(?:add|apropos|apt|aptitude|apt-cache|apt-get|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|bzip2|cal|cat|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|column|comm|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|env|ethtool|expand|expect|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|head|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|pnpm|popd|pr|printcap|printenv|ps|pushd|pv|quota|quot
 
acheck|quotactl|ram|rar|rcp|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|sh|shellcheck|shuf|shutdown|sleep|slocate|sort|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tac|tail|tar|tee|time|timeout|top|touch|tr|traceroute|tsort|tty|umount|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|v|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yarn|yes|zenity|zip|zsh|zypper)(?=$|[)\s;|&])/,
 -      lookbehind: true
 -    },
 -    'keyword': {
 -      pattern: 
/(^|[\s;|&]|[<>]\()(?:if|then|else|elif|fi|for|while|in|case|esac|function|select|do|done|until)(?=$|[)\s;|&])/,
 -      lookbehind: true
 -    },
 -    // https://www.gnu.org/software/bash/manual/html_node/Shell-Builtin-Commands.html
 -    'builtin': {
 -      pattern: 
/(^|[\s;|&]|[<>]\()(?:\.|:|break|cd|continue|eval|exec|exit|export|getopts|hash|pwd|readonly|return|shift|test|times|trap|umask|unset|alias|bind|builtin|caller|command|declare|echo|enable|help|let|local|logout|mapfile|printf|read|readarray|source|type|typeset|ulimit|unalias|set|shopt)(?=$|[)\s;|&])/,
 -      lookbehind: true,
 -      // Alias added to make those easier to distinguish from strings.
 -      alias: 'class-name'
 -    },
 -    'boolean': {
 -      pattern: /(^|[\s;|&]|[<>]\()(?:true|false)(?=$|[)\s;|&])/,
 -      lookbehind: true
 -    },
 -    'file-descriptor': {
 -      pattern: /\B&\d\b/,
 -      alias: 'important'
 -    },
 -    'operator': {
 -      // Lots of redirections here, but not just that.
 -      pattern: /\d?<>|>\||\+=|==?|!=?|=~|<<[<-]?|[&\d]?>>|\d?[<>]&?|&[>&]?|\|[&|]?|<=?|>=?/,
 -      inside: {
 -        'file-descriptor': {
 -          pattern: /^\d/,
 -          alias: 'important'
 -        }
 -      }
 -    },
 -    'punctuation': /\$?\(\(?|\)\)?|\.\.|[{}[\];\\]/,
 -    'number': {
 -      pattern: /(^|\s)(?:[1-9]\d*|0)(?:[.,]\d+)?\b/,
 -      lookbehind: true
 -    }
 -  };
 -
 -  /* Patterns in command substitution. */
 -  var toBeCopied = [
 -    'comment',
 -    'function-name',
 -    'for-or-select',
 -    'assign-left',
 -    'string',
 -    'environment',
 -    'function',
 -    'keyword',
 -    'builtin',
 -    'boolean',
 -    'file-descriptor',
 -    'operator',
 -    'punctuation',
 -    'number'
 -  ];
 -  var inside = insideString.variable[1].inside;
 -  for(var i = 0; i < toBeCopied.length; i++) {
 -    inside[toBeCopied[i]] = Prism.languages.bash[toBeCopied[i]];
 -  }
 -
 -  Prism.languages.shell = Prism.languages.bash;
++      // $ set | grep '^[A-Z][^[:space:]]*=' | cut -d= -f1 | tr '\n' '|'
++      // + LC_ALL, RANDOM, REPLY, SECONDS.
++      // + make sure PS1..4 are here as they are not always set,
++      // - some useless things.
++      var envVars = 
'\\b(?:BASH|BASHOPTS|BASH_ALIASES|BASH_ARGC|BASH_ARGV|BASH_CMDS|BASH_COMPLETION_COMPAT_DIR|BASH_LINENO|BASH_REMATCH|BASH_SOURCE|BASH_VERSINFO|BASH_VERSION|COLORTERM|COLUMNS|COMP_WORDBREAKS|DBUS_SESSION_BUS_ADDRESS|DEFAULTS_PATH|DESKTOP_SESSION|DIRSTACK|DISPLAY|EUID|GDMSESSION|GDM_LANG|GNOME_KEYRING_CONTROL|GNOME_KEYRING_PID|GPG_AGENT_INFO|GROUPS|HISTCONTROL|HISTFILE|HISTFILESIZE|HISTSIZE|HOME|HOSTNAME|HOSTTYPE|IFS|INSTANCE|JOB|LANG|LANGUAGE|LC_ADDRESS|LC_ALL|LC_IDENTIFICATION|LC_MEASUREMENT|LC_MONETARY|LC_NAME|LC_NUMERIC|LC_PAPER|LC_TELEPHONE|LC_TIME|LESSCLOSE|LESSOPEN|LINES|LOGNAME|LS_COLORS|MACHTYPE|MAILCHECK|MANDATORY_PATH|NO_AT_BRIDGE|OLDPWD|OPTERR|OPTIND|ORBIT_SOCKETDIR|OSTYPE|PAPERSIZE|PATH|PIPESTATUS|PPID|PS1|PS2|PS3|PS4|PWD|RANDOM|REPLY|SECONDS|SELINUX_INIT|SESSION|SESSIONTYPE|SESSION_MANAGER|SHELL|SHELLOPTS|SHLVL|SSH_AUTH_SOCK|TERM|UID|UPSTART_EVENTS|UPSTART_INSTANCE|UPSTART_JOB|UPSTART_SESSION|USER|WINDOWID|XAUTHORITY|XDG_CONFIG_DIRS|XDG_CURRENT_DESKTOP|XDG
 
_DATA_DIRS|XDG_GREETER_DATA_DIR|XDG_MENU_PREFIX|XDG_RUNTIME_DIR|XDG_SEAT|XDG_SEAT_PATH|XDG_SESSION_DESKTOP|XDG_SESSION_ID|XDG_SESSION_PATH|XDG_SESSION_TYPE|XDG_VTNR|XMODIFIERS)\\b';
 +      var insideString = {
-               variable: [
-                       // Arithmetic Environment
++              'environment': {
++                      pattern: RegExp("\\$" + envVars),
++                      alias: 'constant'
++              },
++              'variable': [
++                      // [0]: Arithmetic Environment
 +                      {
 +                              pattern: /\$?\(\([\s\S]+?\)\)/,
++                              greedy: true,
 +                              inside: {
 +                                      // If there is a $ sign at the beginning highlight $(( and )) as 
variable
-                                       variable: [{
++                                      'variable': [
++                                              {
 +                                                      pattern: /(^\$\(\([\s\S]+)\)\)/,
 +                                                      lookbehind: true
 +                                              },
 +                                              /^\$\(\(/
 +                                      ],
-                                       number: /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,
++                                      'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,
 +                                      // Operators according to 
https://www.gnu.org/software/bash/manual/bashref.html#Shell-Arithmetic
-                                       operator: 
/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,
++                                      'operator': 
/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,
 +                                      // If there is no $ sign at the beginning highlight (( and )) as 
punctuation
-                                       punctuation: /\(\(?|\)\)?|,|;/
++                                      'punctuation': /\(\(?|\)\)?|,|;/
 +                              }
 +                      },
-                       // Command Substitution
++                      // [1]: Command Substitution
 +                      {
-                               pattern: /\$\([^)]+\)|`[^`]+`/,
++                              pattern: /\$\((?:\([^)]+\)|[^()])+\)|`[^`]+`/,
 +                              greedy: true,
 +                              inside: {
-                                       variable: /^\$\(|^`|\)$|`$/
++                                      'variable': /^\$\(|^`|\)$|`$/
 +                              }
 +                      },
-                       /\$(?:[\w#?*!@]+|\{[^}]+\})/i
-               ]
++                      // [2]: Brace expansion
++                      {
++                              pattern: /\$\{[^}]+\}/,
++                              greedy: true,
++                              inside: {
++                                      'operator': /:[-=?+]?|[!\/]|##?|%%?|\^\^?|,,?/,
++                                      'punctuation': /[\[\]]/,
++                                      'environment': {
++                                              pattern: RegExp("(\\{)" + envVars),
++                                              lookbehind: true,
++                                              alias: 'constant'
++                                      }
++                              }
++                      },
++                      /\$(?:\w+|[#?*!@$])/
++              ],
++              // Escape sequences from echo and printf's manuals, and escaped quotes.
++              'entity': 
/\\(?:[abceEfnrtv\\"]|O?[0-7]{1,3}|x[0-9a-fA-F]{1,2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})/
 +      };
 +
 +      Prism.languages.bash = {
 +              'shebang': {
-                       pattern: /^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/,
++                      pattern: /^#!\s*\/.*/,
 +                      alias: 'important'
 +              },
 +              'comment': {
-                       pattern: /(^|[^"{\\])#.*/,
++                      pattern: /(^|[^"{\\$])#.*/,
++                      lookbehind: true
++              },
++              'function-name': [
++                      // a) function foo {
++                      // b) foo() {
++                      // c) function foo() {
++                      // but not “foo {”
++                      {
++                              // a) and c)
++                              pattern: /(\bfunction\s+)\w+(?=(?:\s*\(?:\s*\))?\s*\{)/,
++                              lookbehind: true,
++                              alias: 'function'
++                      },
++                      {
++                              // b)
++                              pattern: /\b\w+(?=\s*\(\s*\)\s*\{)/,
++                              alias: 'function'
++                      }
++              ],
++              // Highlight variable names as variables in for and select beginnings.
++              'for-or-select': {
++                      pattern: /(\b(?:for|select)\s+)\w+(?=\s+in\s)/,
++                      alias: 'variable',
++                      lookbehind: true
++              },
++              // Highlight variable names as variables in the left-hand part
++              // of assignments (“=” and “+=”).
++              'assign-left': {
++                      pattern: /(^|[\s;|&]|[<>]\()\w+(?=\+?=)/,
++                      inside: {
++                              'environment': {
++                                      pattern: RegExp("(^|[\\s;|&]|[<>]\\()" + envVars),
++                                      lookbehind: true,
++                                      alias: 'constant'
++                              }
++                      },
++                      alias: 'variable',
 +                      lookbehind: true
 +              },
 +              'string': [
-                       //Support for Here-Documents https://en.wikipedia.org/wiki/Here_document
++                      // Support for Here-documents https://en.wikipedia.org/wiki/Here_document
 +                      {
-                               pattern: /((?:^|[^<])<<\s*)["']?(\w+?)["']?\s*\r?\n(?:[\s\S])*?\r?\n\2/,
++                              pattern: /((?:^|[^<])<<-?\s*)(\w+?)\s*(?:\r?\n|\r)(?:[\s\S])*?(?:\r?\n|\r)\2/,
 +                              lookbehind: true,
 +                              greedy: true,
 +                              inside: insideString
 +                      },
++                      // Here-document with quotes around the tag
++                      // → No expansion (so no “inside”).
++                      {
++                              pattern: 
/((?:^|[^<])<<-?\s*)(["'])(\w+)\2\s*(?:\r?\n|\r)(?:[\s\S])*?(?:\r?\n|\r)\3/,
++                              lookbehind: true,
++                              greedy: true
++                      },
++                      // “Normal” string
 +                      {
 +                              pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,
 +                              greedy: true,
 +                              inside: insideString
 +                      }
 +              ],
++              'environment': {
++                      pattern: RegExp("\\$?" + envVars),
++                      alias: 'constant'
++              },
 +              'variable': insideString.variable,
-               // Originally based on http://ss64.com/bash/
 +              'function': {
-                       pattern: 
/(^|[\s;|&])(?:alias|apropos|apt|apt-cache|apt-get|aptitude|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|hash|head|help|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logout|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|
 
popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tail|tar|tee|test|time|timeout|times|top|touch|tr|traceroute|trap|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip|zypper)(?=$|[\s;|&])/,
++                      pattern: 
/(^|[\s;|&]|[<>]\()(?:add|apropos|apt|aptitude|apt-cache|apt-get|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|bzip2|cal|cat|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|column|comm|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|env|ethtool|expand|expect|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|head|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|pnpm|popd|pr|printcap|printenv|ps|pushd|pv|quota|quotach
 
eck|quotactl|ram|rar|rcp|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|sh|shellcheck|shuf|shutdown|sleep|slocate|sort|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tac|tail|tar|tee|time|timeout|top|touch|tr|traceroute|tsort|tty|umount|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|v|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yarn|yes|zenity|zip|zsh|zypper)(?=$|[)\s;|&])/,
 +                      lookbehind: true
 +              },
 +              'keyword': {
-                       pattern: 
/(^|[\s;|&])(?:let|:|\.|if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)(?=$|[\s;|&])/,
++                      pattern: 
/(^|[\s;|&]|[<>]\()(?:if|then|else|elif|fi|for|while|in|case|esac|function|select|do|done|until)(?=$|[)\s;|&])/,
 +                      lookbehind: true
 +              },
++              // https://www.gnu.org/software/bash/manual/html_node/Shell-Builtin-Commands.html
++              'builtin': {
++                      pattern: 
/(^|[\s;|&]|[<>]\()(?:\.|:|break|cd|continue|eval|exec|exit|export|getopts|hash|pwd|readonly|return|shift|test|times|trap|umask|unset|alias|bind|builtin|caller|command|declare|echo|enable|help|let|local|logout|mapfile|printf|read|readarray|source|type|typeset|ulimit|unalias|set|shopt)(?=$|[)\s;|&])/,
++                      lookbehind: true,
++                      // Alias added to make those easier to distinguish from strings.
++                      alias: 'class-name'
++              },
 +              'boolean': {
-                       pattern: /(^|[\s;|&])(?:true|false)(?=$|[\s;|&])/,
++                      pattern: /(^|[\s;|&]|[<>]\()(?:true|false)(?=$|[)\s;|&])/,
 +                      lookbehind: true
 +              },
-               'operator': /&&?|\|\|?|==?|!=?|<<<?|>>|<=?|>=?|=~/,
-               'punctuation': /\$?\(\(?|\)\)?|\.\.|[{}[\];]/
++              'file-descriptor': {
++                      pattern: /\B&\d\b/,
++                      alias: 'important'
++              },
++              'operator': {
++                      // Lots of redirections here, but not just that.
++                      pattern: /\d?<>|>\||\+=|==?|!=?|=~|<<[<-]?|[&\d]?>>|\d?[<>]&?|&[>&]?|\|[&|]?|<=?|>=?/,
++                      inside: {
++                              'file-descriptor': {
++                                      pattern: /^\d/,
++                                      alias: 'important'
++                              }
++                      }
++              },
++              'punctuation': /\$?\(\(?|\)\)?|\.\.|[{}[\];\\]/,
++              'number': {
++                      pattern: /(^|\s)(?:[1-9]\d*|0)(?:[.,]\d+)?\b/,
++                      lookbehind: true
++              }
 +      };
 +
++      /* Patterns in command substitution. */
++      var toBeCopied = [
++              'comment',
++              'function-name',
++              'for-or-select',
++              'assign-left',
++              'string',
++              'environment',
++              'function',
++              'keyword',
++              'builtin',
++              'boolean',
++              'file-descriptor',
++              'operator',
++              'punctuation',
++              'number'
++      ];
 +      var inside = insideString.variable[1].inside;
-       inside.string = Prism.languages.bash.string;
-       inside['function'] = Prism.languages.bash['function'];
-       inside.keyword = Prism.languages.bash.keyword;
-       inside['boolean'] = Prism.languages.bash['boolean'];
-       inside.operator = Prism.languages.bash.operator;
-       inside.punctuation = Prism.languages.bash.punctuation;
++      for(var i = 0; i < toBeCopied.length; i++) {
++              inside[toBeCopied[i]] = Prism.languages.bash[toBeCopied[i]];
++      }
 +
 +      Prism.languages.shell = Prism.languages.bash;
  })(Prism);
  
  Prism.languages.cpp = Prism.languages.extend('c', {
 -  'class-name': {
 -    pattern: /(\b(?:class|enum|struct)\s+)\w+/,
 -    lookbehind: true
 -  },
 -  'keyword': 
/\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
 -  'number': {
 -    pattern: 
/(?:\b0b[01']+|\b0x(?:[\da-f']+\.?[\da-f']*|\.[\da-f']+)(?:p[+-]?[\d']+)?|(?:\b[\d']+\.?[\d']*|\B\.[\d']+)(?:e[+-]?[\d']+)?)[ful]*/i,
 -    greedy: true
 -  },
 -  'operator': 
/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,
 -  'boolean': /\b(?:true|false)\b/
 +      'class-name': {
 +              pattern: /(\b(?:class|enum|struct)\s+)\w+/,
 +              lookbehind: true
 +      },
 +      'keyword': 
/\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
-       'boolean': /\b(?:true|false)\b/,
-       'operator': 
/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/
++      'number': {
++              pattern: 
/(?:\b0b[01']+|\b0x(?:[\da-f']+\.?[\da-f']*|\.[\da-f']+)(?:p[+-]?[\d']+)?|(?:\b[\d']+\.?[\d']*|\B\.[\d']+)(?:e[+-]?[\d']+)?)[ful]*/i,
++              greedy: true
++      },
++      'operator': 
/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,
++      'boolean': /\b(?:true|false)\b/
  });
  
  Prism.languages.insertBefore('cpp', 'string', {
@@@ -1015,141 -1190,141 +1190,141 @@@ Prism.languages.coffee = Prism.language
   *            constant, builtin, variable, symbol, regex
   */
  (function(Prism) {
 -  Prism.languages.ruby = Prism.languages.extend('clike', {
 -    'comment': [
 -      /#.*/,
 -      {
 -        pattern: /^=begin\s[\s\S]*?^=end/m,
 -        greedy: true
 -      }
 -    ],
 -    'keyword': 
/\b(?:alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|protected|private|public|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
 -  });
 -
 -  var interpolation = {
 -    pattern: /#\{[^}]+\}/,
 -    inside: {
 -      'delimiter': {
 -        pattern: /^#\{|\}$/,
 -        alias: 'tag'
 -      },
 -      rest: Prism.languages.ruby
 -    }
 -  };
 -
 -  delete Prism.languages.ruby.function;
 -
 -  Prism.languages.insertBefore('ruby', 'keyword', {
 -    'regex': [
 -      {
 -        pattern: /%r([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[gim]{0,3}/,
 -        greedy: true,
 -        inside: {
 -          'interpolation': interpolation
 -        }
 -      },
 -      {
 -        pattern: /%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,
 -        greedy: true,
 -        inside: {
 -          'interpolation': interpolation
 -        }
 -      },
 -      {
 -        // Here we need to specifically allow interpolation
 -        pattern: /%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,
 -        greedy: true,
 -        inside: {
 -          'interpolation': interpolation
 -        }
 -      },
 -      {
 -        pattern: /%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,
 -        greedy: true,
 -        inside: {
 -          'interpolation': interpolation
 -        }
 -      },
 -      {
 -        pattern: /%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,
 -        greedy: true,
 -        inside: {
 -          'interpolation': interpolation
 -        }
 -      },
 -      {
 -        pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
 -        lookbehind: true,
 -        greedy: true
 -      }
 -    ],
 -    'variable': /[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,
 -    'symbol': {
 -      pattern: /(^|[^:]):[a-zA-Z_]\w*(?:[?!]|\b)/,
 -      lookbehind: true
 -    },
 -    'method-definition': {
 -      pattern: /(\bdef\s+)[\w.]+/,
 -      lookbehind: true,
 -      inside: {
 -        'function': /\w+$/,
 -        rest: Prism.languages.ruby
 -      }
 -    }
 -  });
 -
 -  Prism.languages.insertBefore('ruby', 'number', {
 -    'builtin': 
/\b(?:Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|Fixnum|Float|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
 -    'constant': /\b[A-Z]\w*(?:[?!]|\b)/
 -  });
 -
 -  Prism.languages.ruby.string = [
 -    {
 -      pattern: /%[qQiIwWxs]?([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    },
 -    {
 -      pattern: /%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    },
 -    {
 -      // Here we need to specifically allow interpolation
 -      pattern: /%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    },
 -    {
 -      pattern: /%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    },
 -    {
 -      pattern: /%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    },
 -    {
 -      pattern: /("|')(?:#\{[^}]+\}|\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 -      greedy: true,
 -      inside: {
 -        'interpolation': interpolation
 -      }
 -    }
 -  ];
 -
 -  Prism.languages.rb = Prism.languages.ruby;
 +      Prism.languages.ruby = Prism.languages.extend('clike', {
 +              'comment': [
 +                      /#.*/,
 +                      {
-                               pattern: /^=begin(?:\r?\n|\r)(?:.*(?:\r?\n|\r))*?=end/m,
++                              pattern: /^=begin\s[\s\S]*?^=end/m,
 +                              greedy: true
 +                      }
 +              ],
 +              'keyword': 
/\b(?:alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|protected|private|public|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
 +      });
 +
 +      var interpolation = {
 +              pattern: /#\{[^}]+\}/,
 +              inside: {
 +                      'delimiter': {
 +                              pattern: /^#\{|\}$/,
 +                              alias: 'tag'
 +                      },
 +                      rest: Prism.languages.ruby
 +              }
 +      };
 +
 +      delete Prism.languages.ruby.function;
 +
 +      Prism.languages.insertBefore('ruby', 'keyword', {
 +              'regex': [
 +                      {
 +                              pattern: /%r([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[gim]{0,3}/,
 +                              greedy: true,
 +                              inside: {
 +                                      'interpolation': interpolation
 +                              }
 +                      },
 +                      {
 +                              pattern: /%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,
 +                              greedy: true,
 +                              inside: {
 +                                      'interpolation': interpolation
 +                              }
 +                      },
 +                      {
 +                              // Here we need to specifically allow interpolation
 +                              pattern: /%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,
 +                              greedy: true,
 +                              inside: {
 +                                      'interpolation': interpolation
 +                              }
 +                      },
 +                      {
 +                              pattern: /%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,
 +                              greedy: true,
 +                              inside: {
 +                                      'interpolation': interpolation
 +                              }
 +                      },
 +                      {
 +                              pattern: /%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,
 +                              greedy: true,
 +                              inside: {
 +                                      'interpolation': interpolation
 +                              }
 +                      },
 +                      {
 +                              pattern: 
/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
 +                              lookbehind: true,
 +                              greedy: true
 +                      }
 +              ],
 +              'variable': /[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,
 +              'symbol': {
 +                      pattern: /(^|[^:]):[a-zA-Z_]\w*(?:[?!]|\b)/,
 +                      lookbehind: true
 +              },
 +              'method-definition': {
 +                      pattern: /(\bdef\s+)[\w.]+/,
 +                      lookbehind: true,
 +                      inside: {
 +                              'function': /\w+$/,
 +                              rest: Prism.languages.ruby
 +                      }
 +              }
 +      });
 +
 +      Prism.languages.insertBefore('ruby', 'number', {
 +              'builtin': 
/\b(?:Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|Fixnum|Float|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
 +              'constant': /\b[A-Z]\w*(?:[?!]|\b)/
 +      });
 +
 +      Prism.languages.ruby.string = [
 +              {
 +                      pattern: /%[qQiIwWxs]?([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              },
 +              {
 +                      pattern: /%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              },
 +              {
 +                      // Here we need to specifically allow interpolation
 +                      pattern: /%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              },
 +              {
 +                      pattern: /%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              },
 +              {
 +                      pattern: /%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              },
 +              {
 +                      pattern: /("|')(?:#\{[^}]+\}|\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 +                      greedy: true,
 +                      inside: {
 +                              'interpolation': interpolation
 +                      }
 +              }
 +      ];
 +
 +      Prism.languages.rb = Prism.languages.ruby;
  }(Prism));
  
  Prism.languages.d = Prism.languages.extend('clike', {
@@@ -1235,278 -1410,267 +1410,267 @@@ Prism.languages.dart = Prism.languages.
  });
  
  Prism.languages.insertBefore('dart','function',{
 -  'metadata': {
 -    pattern: /@\w+/,
 -    alias: 'symbol'
 -  }
 +      'metadata': {
 +              pattern: /@\w+/,
 +              alias: 'symbol'
 +      }
  });
- // Django/Jinja2 syntax definition for Prism.js <http://prismjs.com> syntax highlighter.
- // Mostly it works OK but can paint code incorrectly on complex html/template tag combinations.
+ (function (Prism) {
  
- var _django_template = {
-       'property': {
-               pattern: /(?:{{|{%)[\s\S]*?(?:%}|}})/g,
-               greedy: true,
-               inside: {
-                       'string': {
-                               pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
-                               greedy: true
-                       },
-                       'keyword': 
/\b(?:\||load|verbatim|widthratio|ssi|firstof|for|url|ifchanged|csrf_token|lorem|ifnotequal|autoescape|now|templatetag|debug|cycle|ifequal|regroup|comment|filter|endfilter|if|spaceless|with|extends|block|include|else|empty|endif|endfor|as|endblock|endautoescape|endverbatim|trans|endtrans|[Tt]rue|[Ff]alse|[Nn]one|in|is|static|macro|endmacro|call|endcall|set|endset|raw|endraw)\b/,
-                       'operator' : /[-+=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,
-                       'function': 
/\b(?:_|abs|add|addslashes|attr|batch|callable|capfirst|capitalize|center|count|cut|d|date|default|default_if_none|defined|dictsort|dictsortreversed|divisibleby|e|equalto|escape|escaped|escapejs|even|filesizeformat|first|float|floatformat|force_escape|forceescape|format|get_digit|groupby|indent|int|iriencode|iterable|join|last|length|length_is|linebreaks|linebreaksbr|linenumbers|list|ljust|lower|make_list|map|mapping|number|odd|phone2numeric|pluralize|pprint|random|reject|rejectattr|removetags|replace|reverse|rjust|round|safe|safeseq|sameas|select|selectattr|sequence|slice|slugify|sort|string|stringformat|striptags|sum|time|timesince|timeuntil|title|trim|truncate|truncatechars|truncatechars_html|truncatewords|truncatewords_html|undefined|unordered_list|upper|urlencode|urlize|urlizetrunc|wordcount|wordwrap|xmlattr|yesno)\b/,
-                       'important': /\b-?\d+(?:\.\d+)?\b/,
-                       'variable': /\b\w+?\b/,
-                       'punctuation' : /[[\];(),.:]/
-               }
 -  /**
 -   * Returns the placeholder for the given language id and index.
 -   *
 -   * @param {string} language
 -   * @param {string|number} index
 -   * @returns {string}
 -   */
 -  function getPlaceholder(language, index) {
 -    return '___' + language.toUpperCase() + index + '___';
 -  }
 -
 -  Object.defineProperties(Prism.languages['markup-templating'] = {}, {
 -    buildPlaceholders: {
 -      /**
 -       * Tokenize all inline templating expressions matching `placeholderPattern`.
 -       *
 -       * If `replaceFilter` is provided, only matches of `placeholderPattern` for which `replaceFilter` 
returns
 -       * `true` will be replaced.
 -       *
 -       * @param {object} env The environment of the `before-tokenize` hook.
 -       * @param {string} language The language id.
 -       * @param {RegExp} placeholderPattern The matches of this pattern will be replaced by placeholders.
 -       * @param {(match: string) => boolean} [replaceFilter]
 -       */
 -      value: function (env, language, placeholderPattern, replaceFilter) {
 -        if (env.language !== language) {
 -          return;
 -        }
 -
 -        var tokenStack = env.tokenStack = [];
 -
 -        env.code = env.code.replace(placeholderPattern, function (match) {
 -          if (typeof replaceFilter === 'function' && !replaceFilter(match)) {
 -            return match;
 -          }
 -          var i = tokenStack.length;
 -          var placeholder;
 -
 -          // Check for existing strings
 -          while (env.code.indexOf(placeholder = getPlaceholder(language, i)) !== -1)
 -            ++i;
 -
 -          // Create a sparse array
 -          tokenStack[i] = match;
 -
 -          return placeholder;
 -        });
 -
 -        // Switch the grammar to markup
 -        env.grammar = Prism.languages.markup;
 -      }
 -    },
 -    tokenizePlaceholders: {
 -      /**
 -       * Replace placeholders with proper tokens after tokenizing.
 -       *
 -       * @param {object} env The environment of the `after-tokenize` hook.
 -       * @param {string} language The language id.
 -       */
 -      value: function (env, language) {
 -        if (env.language !== language || !env.tokenStack) {
 -          return;
 -        }
 -
 -        // Switch the grammar back
 -        env.grammar = Prism.languages[language];
 -
 -        var j = 0;
 -        var keys = Object.keys(env.tokenStack);
 -
 -        function walkTokens(tokens) {
 -          for (var i = 0; i < tokens.length; i++) {
 -            // all placeholders are replaced already
 -            if (j >= keys.length) {
 -              break;
 -            }
 -
 -            var token = tokens[i];
 -            if (typeof token === 'string' || (token.content && typeof token.content === 'string')) {
 -              var k = keys[j];
 -              var t = env.tokenStack[k];
 -              var s = typeof token === 'string' ? token : token.content;
 -              var placeholder = getPlaceholder(language, k);
 -
 -              var index = s.indexOf(placeholder);
 -              if (index > -1) {
 -                ++j;
 -
 -                var before = s.substring(0, index);
 -                var middle = new Prism.Token(language, Prism.tokenize(t, env.grammar), 'language-' + 
language, t);
 -                var after = s.substring(index + placeholder.length);
 -
 -                var replacement = [];
 -                if (before) {
 -                  replacement.push.apply(replacement, walkTokens([before]));
 -                }
 -                replacement.push(middle);
 -                if (after) {
 -                  replacement.push.apply(replacement, walkTokens([after]));
 -                }
 -
 -                if (typeof token === 'string') {
 -                  tokens.splice.apply(tokens, [i, 1].concat(replacement));
 -                } else {
 -                  token.content = replacement;
 -                }
 -              }
 -            } else if (token.content /* && typeof token.content !== 'string' */) {
 -              walkTokens(token.content);
 -            }
 -          }
 -
 -          return tokens;
 -        }
 -
 -        walkTokens(env.tokens);
 -      }
 -    }
 -  });
++      /**
++       * Returns the placeholder for the given language id and index.
++       *
++       * @param {string} language
++       * @param {string|number} index
++       * @returns {string}
++       */
++      function getPlaceholder(language, index) {
++              return '___' + language.toUpperCase() + index + '___';
 +      }
- };
 +
- Prism.languages.django = Prism.languages.extend('markup', {'comment': /(?:<!--|{#)[\s\S]*?(?:#}|-->)/});
- // Updated html tag pattern to allow template tags inside html tags
- Prism.languages.django.tag.pattern = 
/<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^>=]+))?)*\s*\/?>/i;
- Prism.languages.insertBefore('django', 'entity', _django_template);
- Prism.languages.insertBefore('inside', 'tag', _django_template, Prism.languages.django.tag);
++      Object.defineProperties(Prism.languages['markup-templating'] = {}, {
++              buildPlaceholders: {
++                      /**
++                       * Tokenize all inline templating expressions matching `placeholderPattern`.
++                       *
++                       * If `replaceFilter` is provided, only matches of `placeholderPattern` for which 
`replaceFilter` returns
++                       * `true` will be replaced.
++                       *
++                       * @param {object} env The environment of the `before-tokenize` hook.
++                       * @param {string} language The language id.
++                       * @param {RegExp} placeholderPattern The matches of this pattern will be replaced by 
placeholders.
++                       * @param {(match: string) => boolean} [replaceFilter]
++                       */
++                      value: function (env, language, placeholderPattern, replaceFilter) {
++                              if (env.language !== language) {
++                                      return;
++                              }
++
++                              var tokenStack = env.tokenStack = [];
 +
- if (Prism.languages.javascript) {
-       // Combine js code and template tags painting inside <script> blocks
-       Prism.languages.insertBefore('inside', 'string', _django_template, Prism.languages.django.script);
-       Prism.languages.django.script.inside.string.inside = _django_template;
- }
- if (Prism.languages.css) {
-       // Combine css code and template tags painting inside <style> blocks
-       Prism.languages.insertBefore('inside', 'atrule', {'tag': _django_template.property}, 
Prism.languages.django.style);
-       Prism.languages.django.style.inside.string.inside = _django_template;
- }
++                              env.code = env.code.replace(placeholderPattern, function (match) {
++                                      if (typeof replaceFilter === 'function' && !replaceFilter(match)) {
++                                              return match;
++                                      }
++                                      var i = tokenStack.length;
++                                      var placeholder;
++
++                                      // Check for existing strings
++                                      while (env.code.indexOf(placeholder = getPlaceholder(language, i)) 
!== -1)
++                                              ++i;
++
++                                      // Create a sparse array
++                                      tokenStack[i] = match;
++
++                                      return placeholder;
++                              });
++
++                              // Switch the grammar to markup
++                              env.grammar = Prism.languages.markup;
++                      }
++              },
++              tokenizePlaceholders: {
++                      /**
++                       * Replace placeholders with proper tokens after tokenizing.
++                       *
++                       * @param {object} env The environment of the `after-tokenize` hook.
++                       * @param {string} language The language id.
++                       */
++                      value: function (env, language) {
++                              if (env.language !== language || !env.tokenStack) {
++                                      return;
++                              }
++
++                              // Switch the grammar back
++                              env.grammar = Prism.languages[language];
++
++                              var j = 0;
++                              var keys = Object.keys(env.tokenStack);
++
++                              function walkTokens(tokens) {
++                                      for (var i = 0; i < tokens.length; i++) {
++                                              // all placeholders are replaced already
++                                              if (j >= keys.length) {
++                                                      break;
++                                              }
++
++                                              var token = tokens[i];
++                                              if (typeof token === 'string' || (token.content && typeof 
token.content === 'string')) {
++                                                      var k = keys[j];
++                                                      var t = env.tokenStack[k];
++                                                      var s = typeof token === 'string' ? token : 
token.content;
++                                                      var placeholder = getPlaceholder(language, k);
++
++                                                      var index = s.indexOf(placeholder);
++                                                      if (index > -1) {
++                                                              ++j;
++
++                                                              var before = s.substring(0, index);
++                                                              var middle = new Prism.Token(language, 
Prism.tokenize(t, env.grammar), 'language-' + language, t);
++                                                              var after = s.substring(index + 
placeholder.length);
++
++                                                              var replacement = [];
++                                                              if (before) {
++                                                                      replacement.push.apply(replacement, 
walkTokens([before]));
++                                                              }
++                                                              replacement.push(middle);
++                                                              if (after) {
++                                                                      replacement.push.apply(replacement, 
walkTokens([after]));
++                                                              }
++
++                                                              if (typeof token === 'string') {
++                                                                      tokens.splice.apply(tokens, [i, 
1].concat(replacement));
++                                                              } else {
++                                                                      token.content = replacement;
++                                                              }
++                                                      }
++                                              } else if (token.content /* && typeof token.content !== 
'string' */) {
++                                                      walkTokens(token.content);
++                                              }
++                                      }
++
++                                      return tokens;
++                              }
++
++                              walkTokens(env.tokens);
++                      }
++              }
++      });
  
- // Add an Jinja2 alias
- Prism.languages.jinja2 = Prism.languages.django;
+ }(Prism));
  
  Prism.languages.elixir = {
-       'comment': {
-               pattern: /#.*/m,
-               lookbehind: true
-       },
 -  'comment': /#.*/m,
 -  // ~r"""foo""" (multi-line), ~r'''foo''' (multi-line), ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), 
~r[foo], ~r{foo}, ~r<foo>
 -  'regex': {
 -    pattern: 
/~[rR](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[uismxfr]*/,
 -    greedy: true
 -  },
 -  'string': [
 -    {
 -      // ~s"""foo""" (multi-line), ~s'''foo''' (multi-line), ~s/foo/, ~s|foo|, ~s"foo", ~s'foo', ~s(foo), 
~s[foo], ~s{foo} (with interpolation care), ~s<foo>
 -      pattern: 
/~[cCsSwW](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|#\{[^}]+\}|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[csa]?/,
 -      greedy: true,
 -      inside: {
 -        // See interpolation below
 -      }
 -    },
 -    {
 -      pattern: /("""|''')[\s\S]*?\1/,
 -      greedy: true,
 -      inside: {
 -        // See interpolation below
 -      }
 -    },
 -    {
 -      // Multi-line strings are allowed
 -      pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 -      greedy: true,
 -      inside: {
 -        // See interpolation below
 -      }
 -    }
 -  ],
 -  'atom': {
 -    // Look-behind prevents bad highlighting of the :: operator
 -    pattern: /(^|[^:]):\w+/,
 -    lookbehind: true,
 -    alias: 'symbol'
 -  },
 -  // Look-ahead prevents bad highlighting of the :: operator
 -  'attr-name': /\w+:(?!:)/,
 -  'capture': {
 -    // Look-behind prevents bad highlighting of the && operator
 -    pattern: /(^|[^&])&(?:[^&\s\d()][^\s()]*|(?=\())/,
 -    lookbehind: true,
 -    alias: 'function'
 -  },
 -  'argument': {
 -    // Look-behind prevents bad highlighting of the && operator
 -    pattern: /(^|[^&])&\d+/,
 -    lookbehind: true,
 -    alias: 'variable'
 -  },
 -  'attribute': {
 -    pattern: /@\w+/,
 -    alias: 'variable'
 -  },
 -  'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
 -  'keyword': 
/\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
 -  'boolean': /\b(?:true|false|nil)\b/,
 -  'operator': [
 -    /\bin\b|&&?|\|[|>]?|\\\\|::|\.\.\.?|\+\+?|-[->]?|<[-=>]|>=|!==?|\B!|=(?:==?|[>~])?|[*\/^]/,
 -    {
 -      // We don't want to match <<
 -      pattern: /([^<])<(?!<)/,
 -      lookbehind: true
 -    },
 -    {
 -      // We don't want to match >>
 -      pattern: /([^>])>(?!>)/,
 -      lookbehind: true
 -    }
 -  ],
 -  'punctuation': /<<|>>|[.,%\[\]{}()]/
++      'comment': /#.*/m,
 +      // ~r"""foo""" (multi-line), ~r'''foo''' (multi-line), ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), 
~r[foo], ~r{foo}, ~r<foo>
 +      'regex': {
 +              pattern: 
/~[rR](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[uismxfr]*/,
 +              greedy: true
 +      },
 +      'string': [
 +              {
 +                      // ~s"""foo""" (multi-line), ~s'''foo''' (multi-line), ~s/foo/, ~s|foo|, ~s"foo", 
~s'foo', ~s(foo), ~s[foo], ~s{foo} (with interpolation care), ~s<foo>
 +                      pattern: 
/~[cCsSwW](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|#\{[^}]+\}|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[csa]?/,
 +                      greedy: true,
 +                      inside: {
 +                              // See interpolation below
 +                      }
 +              },
 +              {
 +                      pattern: /("""|''')[\s\S]*?\1/,
 +                      greedy: true,
 +                      inside: {
 +                              // See interpolation below
 +                      }
 +              },
 +              {
 +                      // Multi-line strings are allowed
 +                      pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 +                      greedy: true,
 +                      inside: {
 +                              // See interpolation below
 +                      }
 +              }
 +      ],
 +      'atom': {
 +              // Look-behind prevents bad highlighting of the :: operator
 +              pattern: /(^|[^:]):\w+/,
 +              lookbehind: true,
 +              alias: 'symbol'
 +      },
 +      // Look-ahead prevents bad highlighting of the :: operator
 +      'attr-name': /\w+:(?!:)/,
 +      'capture': {
 +              // Look-behind prevents bad highlighting of the && operator
 +              pattern: /(^|[^&])&(?:[^&\s\d()][^\s()]*|(?=\())/,
 +              lookbehind: true,
 +              alias: 'function'
 +      },
 +      'argument': {
 +              // Look-behind prevents bad highlighting of the && operator
 +              pattern: /(^|[^&])&\d+/,
 +              lookbehind: true,
 +              alias: 'variable'
 +      },
 +      'attribute': {
 +              pattern: /@\w+/,
 +              alias: 'variable'
 +      },
 +      'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
 +      'keyword': 
/\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
 +      'boolean': /\b(?:true|false|nil)\b/,
 +      'operator': [
 +              /\bin\b|&&?|\|[|>]?|\\\\|::|\.\.\.?|\+\+?|-[->]?|<[-=>]|>=|!==?|\B!|=(?:==?|[>~])?|[*\/^]/,
 +              {
 +                      // We don't want to match <<
 +                      pattern: /([^<])<(?!<)/,
 +                      lookbehind: true
 +              },
 +              {
 +                      // We don't want to match >>
 +                      pattern: /([^>])>(?!>)/,
 +                      lookbehind: true
 +              }
 +      ],
 +      'punctuation': /<<|>>|[.,%\[\]{}()]/
  };
  
  Prism.languages.elixir.string.forEach(function(o) {
 -  o.inside = {
 -    'interpolation': {
 -      pattern: /#\{[^}]+\}/,
 -      inside: {
 -        'delimiter': {
 -          pattern: /^#\{|\}$/,
 -          alias: 'punctuation'
 -        },
 -        rest: Prism.languages.elixir
 -      }
 -    }
 -  };
 +      o.inside = {
 +              'interpolation': {
 +                      pattern: /#\{[^}]+\}/,
 +                      inside: {
 +                              'delimiter': {
 +                                      pattern: /^#\{|\}$/,
 +                                      alias: 'punctuation'
 +                              },
 +                              rest: Prism.languages.elixir
 +                      }
 +              }
 +      };
  });
  
- 
- Prism.languages['markup-templating'] = {};
- 
- Object.defineProperties(Prism.languages['markup-templating'], {
-       buildPlaceholders: {
-               // Tokenize all inline templating expressions matching placeholderPattern
-               // If the replaceFilter function is provided, it will be called with every match.
-               // If it returns false, the match will not be replaced.
-               value: function (env, language, placeholderPattern, replaceFilter) {
-                       if (env.language !== language) {
-                               return;
-                       }
- 
-                       env.tokenStack = [];
- 
-                       env.code = env.code.replace(placeholderPattern, function(match) {
-                               if (typeof replaceFilter === 'function' && !replaceFilter(match)) {
-                                       return match;
-                               }
-                               var i = env.tokenStack.length;
-                               // Check for existing strings
-                               while (env.code.indexOf('___' + language.toUpperCase() + i + '___') !== -1)
-                                       ++i;
- 
-                               // Create a sparse array
-                               env.tokenStack[i] = match;
- 
-                               return '___' + language.toUpperCase() + i + '___';
-                       });
- 
-                       // Switch the grammar to markup
-                       env.grammar = Prism.languages.markup;
-               }
-       },
-       tokenizePlaceholders: {
-               // Replace placeholders with proper tokens after tokenizing
-               value: function (env, language) {
-                       if (env.language !== language || !env.tokenStack) {
-                               return;
-                       }
- 
-                       // Switch the grammar back
-                       env.grammar = Prism.languages[language];
- 
-                       var j = 0;
-                       var keys = Object.keys(env.tokenStack);
-                       var walkTokens = function (tokens) {
-                               if (j >= keys.length) {
-                                       return;
-                               }
-                               for (var i = 0; i < tokens.length; i++) {
-                                       var token = tokens[i];
-                                       if (typeof token === 'string' || (token.content && typeof 
token.content === 'string')) {
-                                               var k = keys[j];
-                                               var t = env.tokenStack[k];
-                                               var s = typeof token === 'string' ? token : token.content;
- 
-                                               var index = s.indexOf('___' + language.toUpperCase() + k + 
'___');
-                                               if (index > -1) {
-                                                       ++j;
-                                                       var before = s.substring(0, index);
-                                                       var middle = new Prism.Token(language, 
Prism.tokenize(t, env.grammar, language), 'language-' + language, t);
-                                                       var after = s.substring(index + ('___' + 
language.toUpperCase() + k + '___').length);
-                                                       var replacement;
-                                                       if (before || after) {
-                                                               replacement = [before, middle, 
after].filter(function (v) { return !!v; });
-                                                               walkTokens(replacement);
-                                                       } else {
-                                                               replacement = middle;
-                                                       }
-                                                       if (typeof token === 'string') {
-                                                               Array.prototype.splice.apply(tokens, [i, 
1].concat(replacement));
-                                                       } else {
-                                                               token.content = replacement;
-                                                       }
- 
-                                                       if (j >= keys.length) {
-                                                               break;
-                                                       }
-                                               }
-                                       } else if (token.content && typeof token.content !== 'string') {
-                                               walkTokens(token.content);
-                                       }
-                               }
-                       };
- 
-                       walkTokens(env.tokens);
-               }
-       }
- });
  Prism.languages.erlang = {
 -  'comment': /%.+/,
 -  'string': {
 -    pattern: /"(?:\\.|[^\\"\r\n])*"/,
 -    greedy: true
 -  },
 -  'quoted-function': {
 -    pattern: /'(?:\\.|[^\\'\r\n])+'(?=\()/,
 -    alias: 'function'
 -  },
 -  'quoted-atom': {
 -    pattern: /'(?:\\.|[^\\'\r\n])+'/,
 -    alias: 'atom'
 -  },
 -  'boolean': /\b(?:true|false)\b/,
 -  'keyword': /\b(?:fun|when|case|of|end|if|receive|after|try|catch)\b/,
 -  'number': [
 -    /\$\\?./,
 -    /\d+#[a-z0-9]+/i,
 -    /(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i
 -  ],
 -  'function': /\b[a-z][\w@]*(?=\()/,
 -  'variable': {
 -    // Look-behind is used to prevent wrong highlighting of atoms containing "@"
 -    pattern: /(^|[^@])(?:\b|\?)[A-Z_][\w@]*/,
 -    lookbehind: true
 -  },
 -  'operator': [
 -    
/[=\/<>:]=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,
 -    {
 -      // We don't want to match <<
 -      pattern: /(^|[^<])<(?!<)/,
 -      lookbehind: true
 -    },
 -    {
 -      // We don't want to match >>
 -      pattern: /(^|[^>])>(?!>)/,
 -      lookbehind: true
 -    }
 -  ],
 -  'atom': /\b[a-z][\w@]*/,
 -  'punctuation': /[()[\]{}:;,.#|]|<<|>>/
 +      'comment': /%.+/,
 +      'string': {
 +              pattern: /"(?:\\.|[^\\"\r\n])*"/,
 +              greedy: true
 +      },
 +      'quoted-function': {
 +              pattern: /'(?:\\.|[^\\'\r\n])+'(?=\()/,
 +              alias: 'function'
 +      },
 +      'quoted-atom': {
 +              pattern: /'(?:\\.|[^\\'\r\n])+'/,
 +              alias: 'atom'
 +      },
 +      'boolean': /\b(?:true|false)\b/,
 +      'keyword': /\b(?:fun|when|case|of|end|if|receive|after|try|catch)\b/,
 +      'number': [
 +              /\$\\?./,
 +              /\d+#[a-z0-9]+/i,
 +              /(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i
 +      ],
 +      'function': /\b[a-z][\w@]*(?=\()/,
 +      'variable': {
 +              // Look-behind is used to prevent wrong highlighting of atoms containing "@"
 +              pattern: /(^|[^@])(?:\b|\?)[A-Z_][\w@]*/,
 +              lookbehind: true
 +      },
 +      'operator': [
 +              
/[=\/<>:]=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,
 +              {
 +                      // We don't want to match <<
 +                      pattern: /(^|[^<])<(?!<)/,
 +                      lookbehind: true
 +              },
 +              {
 +                      // We don't want to match >>
 +                      pattern: /(^|[^>])>(?!>)/,
 +                      lookbehind: true
 +              }
 +      ],
 +      'atom': /\b[a-z][\w@]*/,
 +      'punctuation': /[()[\]{}:;,.#|]|<<|>>/
  
  };
  Prism.languages.go = Prism.languages.extend('clike', {
@@@ -1522,287 -1686,454 +1686,520 @@@
  });
  delete Prism.languages.go['class-name'];
  
 +Prism.languages.groovy = Prism.languages.extend('clike', {
 +      'keyword': 
/\b(?:as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,
 +      'string': [
 +              {
 +                      pattern: /("""|''')[\s\S]*?\1|(?:\$\/)(?:\$\/\$|[\s\S])*?\/\$/,
 +                      greedy: true
 +              },
 +              {
 +                      pattern: /(["'\/])(?:\\.|(?!\1)[^\\\r\n])*\1/,
 +                      greedy: true
 +              }
 +      ],
 +      'number': 
/\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,
 +      'operator': {
 +              pattern: 
/(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
 +              lookbehind: true
 +      },
 +      'punctuation': /\.+|[{}[\];(),:$]/
 +});
 +
 +Prism.languages.insertBefore('groovy', 'string', {
 +      'shebang': {
 +              pattern: /#!.+/,
 +              alias: 'comment'
 +      }
 +});
 +
 +Prism.languages.insertBefore('groovy', 'punctuation', {
 +      'spock-block': /\b(?:setup|given|when|then|and|cleanup|expect|where):/
 +});
 +
 +Prism.languages.insertBefore('groovy', 'function', {
 +      'annotation': {
 +              alias: 'punctuation',
 +              pattern: /(^|[^.])@\w+/,
 +              lookbehind: true
 +      }
 +});
 +
 +// Handle string interpolation
 +Prism.hooks.add('wrap', function(env) {
 +      if (env.language === 'groovy' && env.type === 'string') {
 +              var delimiter = env.content[0];
 +
 +              if (delimiter != "'") {
 +                      var pattern = /([^\\])(?:\$(?:\{.*?\}|[\w.]+))/;
 +                      if (delimiter === '$') {
 +                              pattern = /([^\$])(?:\$(?:\{.*?\}|[\w.]+))/;
 +                      }
 +
 +                      // To prevent double HTML-encoding we have to decode env.content first
 +                      env.content = env.content.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
 +
 +                      env.content = Prism.highlight(env.content, {
 +                              'expression': {
 +                                      pattern: pattern,
 +                                      lookbehind: true,
 +                                      inside: Prism.languages.groovy
 +                              }
 +                      });
 +
 +                      env.classes.push(delimiter === '/' ? 'regex' : 'gstring');
 +              }
 +      }
 +});
 +
  (function (Prism) {
  
 -  var keywords = 
/\b(?:abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|var|null|exports|module|open|opens|provides|requires|to|transitive|uses|with)\b/;
 -
 -  // based on the java naming conventions
 -  var className = /\b[A-Z](?:\w*[a-z]\w*)?\b/;
 -
 -  Prism.languages.java = Prism.languages.extend('clike', {
 -    'class-name': [
 -      className,
 -
 -      // variables and parameters
 -      // this to support class names (or generic parameters) which do not contain a lower case letter (also 
works for methods)
 -      /\b[A-Z]\w*(?=\s+\w+\s*[;,=())])/
 -    ],
 -    'keyword': keywords,
 -    'function': [
 -      Prism.languages.clike.function,
 -      {
 -        pattern: /(\:\:)[a-z_]\w*/,
 -        lookbehind: true
 -      }
 -    ],
 -    'number': 
/\b0b[01][01_]*L?\b|\b0x[\da-f_]*\.?[\da-f_p+-]+\b|(?:\b\d[\d_]*\.?[\d_]*|\B\.\d[\d_]*)(?:e[+-]?\d[\d_]*)?[dfl]?/i,
 -    'operator': {
 -      pattern: /(^|[^.])(?:<<=?|>>>?=?|->|([-+&|])\2|[?:~]|[-+*/%&|^!=<>]=?)/m,
 -      lookbehind: true
 -    }
 -  });
 -
 -  Prism.languages.insertBefore('java', 'class-name', {
 -    'annotation': {
 -      alias: 'punctuation',
 -      pattern: /(^|[^.])@\w+/,
 -      lookbehind: true
 -    },
 -    'namespace': {
 -      pattern: 
/(\b(?:exports|import(?:\s+static)?|module|open|opens|package|provides|requires|to|transitive|uses|with)\s+)[a-z]\w*(\.[a-z]\w*)+/,
 -      lookbehind: true,
 -      inside: {
 -        'punctuation': /\./,
 -      }
 -    },
 -    'generics': {
 -      pattern: /<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<[\w\s,.&?]*>)*>)*>)*>/,
 -      inside: {
 -        'class-name': className,
 -        'keyword': keywords,
 -        'punctuation': /[<>(),.:]/,
 -        'operator': /[?&|]/
 -      }
 -    }
 -  });
 +      var keywords = 
/\b(?:abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|var|null|exports|module|open|opens|provides|requires|to|transitive|uses|with)\b/;
 +
 +      // based on the java naming conventions
 +      var className = /\b[A-Z](?:\w*[a-z]\w*)?\b/;
 +
 +      Prism.languages.java = Prism.languages.extend('clike', {
 +              'class-name': [
 +                      className,
 +
 +                      // variables and parameters
 +                      // this to support class names (or generic parameters) which do not contain a lower 
case letter (also works for methods)
 +                      /\b[A-Z]\w*(?=\s+\w+\s*[;,=())])/
 +              ],
 +              'keyword': keywords,
 +              'function': [
 +                      Prism.languages.clike.function,
 +                      {
 +                              pattern: /(\:\:)[a-z_]\w*/,
 +                              lookbehind: true
 +                      }
 +              ],
 +              'number': 
/\b0b[01][01_]*L?\b|\b0x[\da-f_]*\.?[\da-f_p+-]+\b|(?:\b\d[\d_]*\.?[\d_]*|\B\.\d[\d_]*)(?:e[+-]?\d[\d_]*)?[dfl]?/i,
 +              'operator': {
 +                      pattern: /(^|[^.])(?:<<=?|>>>?=?|->|([-+&|])\2|[?:~]|[-+*/%&|^!=<>]=?)/m,
 +                      lookbehind: true
 +              }
 +      });
 +
 +      Prism.languages.insertBefore('java', 'class-name', {
 +              'annotation': {
 +                      alias: 'punctuation',
 +                      pattern: /(^|[^.])@\w+/,
 +                      lookbehind: true
 +              },
 +              'namespace': {
 +                      pattern: 
/(\b(?:exports|import(?:\s+static)?|module|open|opens|package|provides|requires|to|transitive|uses|with)\s+)[a-z]\w*(\.[a-z]\w*)+/,
 +                      lookbehind: true,
 +                      inside: {
 +                              'punctuation': /\./,
 +                      }
 +              },
 +              'generics': {
 +                      pattern: /<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<[\w\s,.&?]*>)*>)*>)*>/,
 +                      inside: {
 +                              'class-name': className,
 +                              'keyword': keywords,
 +                              'punctuation': /[<>(),.:]/,
 +                              'operator': /[?&|]/
 +                      }
 +              }
 +      });
  }(Prism));
  
- Prism.languages.json = {
-       'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
-       'property': {
-               pattern: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,
-               greedy: true
-       },
-       'string': {
-               pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
-               greedy: true
-       },
-       'number': /-?\d+\.?\d*(e[+-]?\d+)?/i,
-       'punctuation': /[{}[\],]/,
-       'operator': /:/,
-       'boolean': /\b(?:true|false)\b/,
-       'null': /\bnull\b/
- };
- 
- Prism.languages.jsonp = Prism.languages.json;
- 
+ /**
+  * Original by Aaron Harun: http://aahacreative.com/2012/07/31/php-syntax-highlighting-prism/
+  * Modified by Miles Johnson: http://milesj.me
+  *
+  * Supports the following:
+  *            - Extends clike syntax
+  *            - Support for PHP 5.3+ (namespaces, traits, generators, etc)
+  *            - Smarter constant and function matching
+  *
+  * Adds the following new token classes:
+  *            constant, delimiter, variable, function, package
+  */
  (function (Prism) {
-       Prism.languages.kotlin = Prism.languages.extend('clike', {
-               'keyword': {
-                       // The lookbehind prevents wrong highlighting of e.g. kotlin.properties.get
-                       pattern: 
/(^|[^.])\b(?:abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|dynamic|else|enum|expect|external|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|to|try|typealias|val|var|vararg|when|where|while)\b/,
-                       lookbehind: true
 -  Prism.languages.php = Prism.languages.extend('clike', {
 -    'keyword': 
/\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|finally|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|new|or|parent|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i,
 -    'boolean': {
 -      pattern: /\b(?:false|true)\b/i,
 -      alias: 'constant'
 -    },
 -    'constant': [
 -      /\b[A-Z_][A-Z0-9_]*\b/,
 -      /\b(?:null)\b/i,
 -    ],
 -    'comment': {
 -      pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
 -      lookbehind: true
 -    }
 -  });
 -
 -  Prism.languages.insertBefore('php', 'string', {
 -    'shell-comment': {
 -      pattern: /(^|[^\\])#.*/,
 -      lookbehind: true,
 -      alias: 'comment'
 -    }
 -  });
 -
 -  Prism.languages.insertBefore('php', 'comment', {
 -    'delimiter': {
 -      pattern: /\?>$|^<\?(?:php(?=\s)|=)?/i,
 -      alias: 'important'
 -    }
 -  });
 -
 -  Prism.languages.insertBefore('php', 'keyword', {
 -    'variable': /\$+(?:\w+\b|(?={))/i,
 -    'package': {
 -      pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
 -      lookbehind: true,
 -      inside: {
 -        punctuation: /\\/
 -      }
 -    }
 -  });
 -
 -  // Must be defined after the function pattern
 -  Prism.languages.insertBefore('php', 'operator', {
 -    'property': {
 -      pattern: /(->)[\w]+/,
 -      lookbehind: true
 -    }
 -  });
 -
 -  var string_interpolation = {
 -    pattern: /{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,
 -    lookbehind: true,
 -    inside: {
 -      rest: Prism.languages.php
 -    }
 -  };
 -
 -  Prism.languages.insertBefore('php', 'string', {
 -    'nowdoc-string': {
 -      pattern: /<<<'([^']+)'(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;/,
 -      greedy: true,
 -      alias: 'string',
 -      inside: {
 -        'delimiter': {
 -          pattern: /^<<<'[^']+'|[a-z_]\w*;$/i,
 -          alias: 'symbol',
 -          inside: {
 -            'punctuation': /^<<<'?|[';]$/
 -          }
 -        }
 -      }
 -    },
 -    'heredoc-string': {
 -      pattern: 
/<<<(?:"([^"]+)"(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;|([a-z_]\w*)(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\2;)/i,
 -      greedy: true,
 -      alias: 'string',
 -      inside: {
 -        'delimiter': {
 -          pattern: /^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,
 -          alias: 'symbol',
 -          inside: {
 -            'punctuation': /^<<<"?|[";]$/
 -          }
 -        },
 -        'interpolation': string_interpolation // See below
 -      }
 -    },
 -    'single-quoted-string': {
 -      pattern: /'(?:\\[\s\S]|[^\\'])*'/,
 -      greedy: true,
 -      alias: 'string'
 -    },
 -    'double-quoted-string': {
 -      pattern: /"(?:\\[\s\S]|[^\\"])*"/,
 -      greedy: true,
 -      alias: 'string',
 -      inside: {
 -        'interpolation': string_interpolation // See below
 -      }
 -    }
 -  });
 -  // The different types of PHP strings "replace" the C-like standard string
 -  delete Prism.languages.php['string'];
 -
 -  Prism.hooks.add('before-tokenize', function(env) {
 -    if (!/<\?/.test(env.code)) {
 -      return;
 -    }
 -
 -    var phpPattern = 
/<\?(?:[^"'/#]|\/(?![*/])|("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|(?:\/\/|#)(?:[^?\n\r]|\?(?!>))*|\/\*[\s\S]*?(?:\*\/|$))*?(?:\?>|$)/ig;
 -    Prism.languages['markup-templating'].buildPlaceholders(env, 'php', phpPattern);
 -  });
 -
 -  Prism.hooks.add('after-tokenize', function(env) {
 -    Prism.languages['markup-templating'].tokenizePlaceholders(env, 'php');
 -  });
++      Prism.languages.php = Prism.languages.extend('clike', {
++              'keyword': 
/\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|finally|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|new|or|parent|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i,
++              'boolean': {
++                      pattern: /\b(?:false|true)\b/i,
++                      alias: 'constant'
 +              },
-               'function': [
-                       /\w+(?=\s*\()/,
-                       {
-                               pattern: /(\.)\w+(?=\s*\{)/,
-                               lookbehind: true
-                       }
++              'constant': [
++                      /\b[A-Z_][A-Z0-9_]*\b/,
++                      /\b(?:null)\b/i,
 +              ],
-               'number': 
/\b(?:0[xX][\da-fA-F]+(?:_[\da-fA-F]+)*|0[bB][01]+(?:_[01]+)*|\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?(?:[eE][+-]?\d+(?:_\d+)*)?[fFL]?)\b/,
-               'operator': 
/\+[+=]?|-[-=>]?|==?=?|!(?:!|==?)?|[\/*%<>]=?|[?:]:?|\.\.|&&|\|\||\b(?:and|inv|or|shl|shr|ushr|xor)\b/
++              'comment': {
++                      pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
++                      lookbehind: true
++              }
 +      });
 +
-       delete Prism.languages.kotlin["class-name"];
- 
++      Prism.languages.insertBefore('php', 'string', {
++              'shell-comment': {
++                      pattern: /(^|[^\\])#.*/,
++                      lookbehind: true,
++                      alias: 'comment'
++              }
++      });
++
++      Prism.languages.insertBefore('php', 'comment', {
++              'delimiter': {
++                      pattern: /\?>$|^<\?(?:php(?=\s)|=)?/i,
++                      alias: 'important'
++              }
++      });
++
++      Prism.languages.insertBefore('php', 'keyword', {
++              'variable': /\$+(?:\w+\b|(?={))/i,
++              'package': {
++                      pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
++                      lookbehind: true,
++                      inside: {
++                              punctuation: /\\/
++                      }
++              }
++      });
++
++      // Must be defined after the function pattern
++      Prism.languages.insertBefore('php', 'operator', {
++              'property': {
++                      pattern: /(->)[\w]+/,
++                      lookbehind: true
++              }
++      });
++
++      var string_interpolation = {
++              pattern: /{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,
++              lookbehind: true,
++              inside: {
++                      rest: Prism.languages.php
++              }
++      };
++
++      Prism.languages.insertBefore('php', 'string', {
++              'nowdoc-string': {
++                      pattern: /<<<'([^']+)'(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;/,
++                      greedy: true,
++                      alias: 'string',
++                      inside: {
++                              'delimiter': {
++                                      pattern: /^<<<'[^']+'|[a-z_]\w*;$/i,
++                                      alias: 'symbol',
++                                      inside: {
++                                              'punctuation': /^<<<'?|[';]$/
++                                      }
++                              }
++                      }
++              },
++              'heredoc-string': {
++                      pattern: 
/<<<(?:"([^"]+)"(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;|([a-z_]\w*)(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\2;)/i,
++                      greedy: true,
++                      alias: 'string',
++                      inside: {
++                              'delimiter': {
++                                      pattern: /^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,
++                                      alias: 'symbol',
++                                      inside: {
++                                              'punctuation': /^<<<"?|[";]$/
++                                      }
++                              },
++                              'interpolation': string_interpolation // See below
++                      }
++              },
++              'single-quoted-string': {
++                      pattern: /'(?:\\[\s\S]|[^\\'])*'/,
++                      greedy: true,
++                      alias: 'string'
++              },
++              'double-quoted-string': {
++                      pattern: /"(?:\\[\s\S]|[^\\"])*"/,
++                      greedy: true,
++                      alias: 'string',
++                      inside: {
++                              'interpolation': string_interpolation // See below
++                      }
++              }
++      });
++      // The different types of PHP strings "replace" the C-like standard string
++      delete Prism.languages.php['string'];
++
++      Prism.hooks.add('before-tokenize', function(env) {
++              if (!/<\?/.test(env.code)) {
++                      return;
++              }
++
++              var phpPattern = 
/<\?(?:[^"'/#]|\/(?![*/])|("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|(?:\/\/|#)(?:[^?\n\r]|\?(?!>))*|\/\*[\s\S]*?(?:\*\/|$))*?(?:\?>|$)/ig;
++              Prism.languages['markup-templating'].buildPlaceholders(env, 'php', phpPattern);
++      });
++
++      Prism.hooks.add('after-tokenize', function(env) {
++              Prism.languages['markup-templating'].tokenizePlaceholders(env, 'php');
++      });
+ 
+ }(Prism));
+ 
+ Prism.languages.json = {
 -  'property': {
 -    pattern: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,
 -    greedy: true
 -  },
 -  'string': {
 -    pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
 -    greedy: true
 -  },
 -  'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
 -  'number': /-?\d+\.?\d*(e[+-]?\d+)?/i,
 -  'punctuation': /[{}[\],]/,
 -  'operator': /:/,
 -  'boolean': /\b(?:true|false)\b/,
 -  'null': {
 -    pattern: /\bnull\b/,
 -    alias: 'keyword'
 -  }
++      'property': {
++              pattern: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,
++              greedy: true
++      },
++      'string': {
++              pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
++              greedy: true
++      },
++      'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
++      'number': /-?\d+\.?\d*(e[+-]?\d+)?/i,
++      'punctuation': /[{}[\],]/,
++      'operator': /:/,
++      'boolean': /\b(?:true|false)\b/,
++      'null': {
++              pattern: /\bnull\b/,
++              alias: 'keyword'
++      }
+ };
+ 
+ Prism.languages.julia= {
 -  'comment': {
 -    pattern: /(^|[^\\])#.*/,
 -    lookbehind: true
 -  },
 -  'string': /("""|''')[\s\S]+?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2/,
 -  'keyword' : 
/\b(?:abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|in|let|local|macro|module|print|println|quote|return|struct|try|type|typealias|using|while)\b/,
 -  'boolean' : /\b(?:true|false)\b/,
 -  'number' : /(?:\b(?=\d)|\B(?=\.))(?:0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?/i,
 -  'operator': /[-+*^%÷&$\\]=?|\/[\/=]?|!=?=?|\|[=>]?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,
 -  'punctuation' : /[{}[\];(),.:]/,
 -  'constant': /\b(?:(?:NaN|Inf)(?:16|32|64)?)\b/
++      'comment': {
++              pattern: /(^|[^\\])#.*/,
++              lookbehind: true
++      },
++      'string': /("""|''')[\s\S]+?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2/,
++      'keyword' : 
/\b(?:abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|in|let|local|macro|module|print|println|quote|return|struct|try|type|typealias|using|while)\b/,
++      'boolean' : /\b(?:true|false)\b/,
++      'number' : /(?:\b(?=\d)|\B(?=\.))(?:0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?/i,
++      'operator': /[-+*^%÷&$\\]=?|\/[\/=]?|!=?=?|\|[=>]?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,
++      'punctuation' : /[{}[\];(),.:]/,
++      'constant': /\b(?:(?:NaN|Inf)(?:16|32|64)?)\b/
+ };
+ 
+ (function (Prism) {
 -  Prism.languages.kotlin = Prism.languages.extend('clike', {
 -    'keyword': {
 -      // The lookbehind prevents wrong highlighting of e.g. kotlin.properties.get
 -      pattern: 
/(^|[^.])\b(?:abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|dynamic|else|enum|expect|external|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|to|try|typealias|val|var|vararg|when|where|while)\b/,
 -      lookbehind: true
 -    },
 -    'function': [
 -      /\w+(?=\s*\()/,
 -      {
 -        pattern: /(\.)\w+(?=\s*\{)/,
 -        lookbehind: true
 -      }
 -    ],
 -    'number': 
/\b(?:0[xX][\da-fA-F]+(?:_[\da-fA-F]+)*|0[bB][01]+(?:_[01]+)*|\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?(?:[eE][+-]?\d+(?:_\d+)*)?[fFL]?)\b/,
 -    'operator': 
/\+[+=]?|-[-=>]?|==?=?|!(?:!|==?)?|[\/*%<>]=?|[?:]:?|\.\.|&&|\|\||\b(?:and|inv|or|shl|shr|ushr|xor)\b/
 -  });
 -
 -  delete Prism.languages.kotlin["class-name"];
 -
 -  Prism.languages.insertBefore('kotlin', 'string', {
 -    'raw-string': {
 -      pattern: /("""|''')[\s\S]*?\1/,
 -      alias: 'string'
 -      // See interpolation below
 -    }
 -  });
 -  Prism.languages.insertBefore('kotlin', 'keyword', {
 -    'annotation': {
 -      pattern: /\B@(?:\w+:)?(?:[A-Z]\w*|\[[^\]]+\])/,
 -      alias: 'builtin'
 -    }
 -  });
 -  Prism.languages.insertBefore('kotlin', 'function', {
 -    'label': {
 -      pattern: /\w+@|@\w+/,
 -      alias: 'symbol'
 -    }
 -  });
 -
 -  var interpolation = [
 -    {
 -      pattern: /\$\{[^}]+\}/,
 -      inside: {
 -        delimiter: {
 -          pattern: /^\$\{|\}$/,
 -          alias: 'variable'
 -        },
 -        rest: Prism.languages.kotlin
 -      }
 -    },
 -    {
 -      pattern: /\$\w+/,
 -      alias: 'variable'
 -    }
 -  ];
 -
 -  Prism.languages.kotlin['string'].inside = Prism.languages.kotlin['raw-string'].inside = {
 -    interpolation: interpolation
 -  };
++      Prism.languages.kotlin = Prism.languages.extend('clike', {
++              'keyword': {
++                      // The lookbehind prevents wrong highlighting of e.g. kotlin.properties.get
++                      pattern: 
/(^|[^.])\b(?:abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|dynamic|else|enum|expect|external|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|to|try|typealias|val|var|vararg|when|where|while)\b/,
++                      lookbehind: true
++              },
++              'function': [
++                      /\w+(?=\s*\()/,
++                      {
++                              pattern: /(\.)\w+(?=\s*\{)/,
++                              lookbehind: true
++                      }
++              ],
++              'number': 
/\b(?:0[xX][\da-fA-F]+(?:_[\da-fA-F]+)*|0[bB][01]+(?:_[01]+)*|\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?(?:[eE][+-]?\d+(?:_\d+)*)?[fFL]?)\b/,
++              'operator': 
/\+[+=]?|-[-=>]?|==?=?|!(?:!|==?)?|[\/*%<>]=?|[?:]:?|\.\.|&&|\|\||\b(?:and|inv|or|shl|shr|ushr|xor)\b/
++      });
++
++      delete Prism.languages.kotlin["class-name"];
++
 +      Prism.languages.insertBefore('kotlin', 'string', {
 +              'raw-string': {
 +                      pattern: /("""|''')[\s\S]*?\1/,
 +                      alias: 'string'
 +                      // See interpolation below
 +              }
 +      });
 +      Prism.languages.insertBefore('kotlin', 'keyword', {
 +              'annotation': {
 +                      pattern: /\B@(?:\w+:)?(?:[A-Z]\w*|\[[^\]]+\])/,
 +                      alias: 'builtin'
 +              }
 +      });
 +      Prism.languages.insertBefore('kotlin', 'function', {
 +              'label': {
 +                      pattern: /\w+@|@\w+/,
 +                      alias: 'symbol'
 +              }
 +      });
 +
 +      var interpolation = [
 +              {
 +                      pattern: /\$\{[^}]+\}/,
 +                      inside: {
 +                              delimiter: {
 +                                      pattern: /^\$\{|\}$/,
 +                                      alias: 'variable'
 +                              },
 +                              rest: Prism.languages.kotlin
 +                      }
 +              },
 +              {
 +                      pattern: /\$\w+/,
 +                      alias: 'variable'
 +              }
 +      ];
 +
 +      Prism.languages.kotlin['string'].inside = Prism.languages.kotlin['raw-string'].inside = {
 +              interpolation: interpolation
 +      };
  
  }(Prism));
  
- Prism.languages.lua = {
-       'comment': /^#!.+|--(?:\[(=*)\[[\s\S]*?\]\1\]|.*)/m,
-       // \z may be used to skip the following space
-       'string': {
-               pattern: 
/(["'])(?:(?!\1)[^\\\r\n]|\\z(?:\r\n|\s)|\\(?:\r\n|[\s\S]))*\1|\[(=*)\[[\s\S]*?\]\2\]/,
-               greedy: true
-       },
-       'number': 
/\b0x[a-f\d]+\.?[a-f\d]*(?:p[+-]?\d+)?\b|\b\d+(?:\.\B|\.?\d*(?:e[+-]?\d+)?\b)|\B\.\d+(?:e[+-]?\d+)?\b/i,
-       'keyword': 
/\b(?:and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,
-       'function': /(?!\d)\w+(?=\s*(?:[({]))/,
-       'operator': [
-               /[-+*%^&|#]|\/\/?|<[<=]?|>[>=]?|[=~]=?/,
-               {
-                       // Match ".." but don't break "..."
-                       pattern: /(^|[^.])\.\.(?!\.)/,
-                       lookbehind: true
-               }
-       ],
-       'punctuation': /[\[\](){},;]|\.+|:+/
- };
  (function(Prism) {
 -  Prism.languages.crystal = Prism.languages.extend('ruby', {
 -    keyword: [
 -      
/\b(?:abstract|alias|as|asm|begin|break|case|class|def|do|else|elsif|end|ensure|enum|extend|for|fun|if|include|instance_sizeof|lib|macro|module|next|of|out|pointerof|private|protected|rescue|return|require|select|self|sizeof|struct|super|then|type|typeof|uninitialized|union|unless|until|when|while|with|yield|__DIR__|__END_LINE__|__FILE__|__LINE__)\b/,
 -      {
 -        pattern: /(\.\s*)(?:is_a|responds_to)\?/,
 -        lookbehind: true
 -      }
 -    ],
 -
 -    number: 
/\b(?:0b[01_]*[01]|0o[0-7_]*[0-7]|0x[\da-fA-F_]*[\da-fA-F]|(?:\d(?:[\d_]*\d)?)(?:\.[\d_]*\d)?(?:[eE][+-]?[\d_]*\d)?)(?:_(?:[uif](?:8|16|32|64))?)?\b/
 -  });
 -
 -  Prism.languages.insertBefore('crystal', 'string', {
 -    attribute: {
 -      pattern: /@\[.+?\]/,
 -      alias: 'attr-name',
 -      inside: {
 -        delimiter: {
 -          pattern: /^@\[|\]$/,
 -          alias: 'tag'
 -        },
 -        rest: Prism.languages.crystal
 -      }
 -    },
 -
 -    expansion: [
 -      {
 -        pattern: /\{\{.+?\}\}/,
 -        inside: {
 -          delimiter: {
 -            pattern: /^\{\{|\}\}$/,
 -            alias: 'tag'
 -          },
 -          rest: Prism.languages.crystal
 -        }
 -      },
 -      {
 -        pattern: /\{%.+?%\}/,
 -        inside: {
 -          delimiter: {
 -            pattern: /^\{%|%\}$/,
 -            alias: 'tag'
 -          },
 -          rest: Prism.languages.crystal
 -        }
 -      }
 -    ]
 -  });
 +      Prism.languages.crystal = Prism.languages.extend('ruby', {
 +              keyword: [
 +                      
/\b(?:abstract|alias|as|asm|begin|break|case|class|def|do|else|elsif|end|ensure|enum|extend|for|fun|if|include|instance_sizeof|lib|macro|module|next|of|out|pointerof|private|protected|rescue|return|require|select|self|sizeof|struct|super|then|type|typeof|uninitialized|union|unless|until|when|while|with|yield|__DIR__|__END_LINE__|__FILE__|__LINE__)\b/,
 +                      {
 +                              pattern: /(\.\s*)(?:is_a|responds_to)\?/,
 +                              lookbehind: true
 +                      }
 +              ],
 +
 +              number: 
/\b(?:0b[01_]*[01]|0o[0-7_]*[0-7]|0x[\da-fA-F_]*[\da-fA-F]|(?:\d(?:[\d_]*\d)?)(?:\.[\d_]*\d)?(?:[eE][+-]?[\d_]*\d)?)(?:_(?:[uif](?:8|16|32|64))?)?\b/
 +      });
 +
 +      Prism.languages.insertBefore('crystal', 'string', {
 +              attribute: {
 +                      pattern: /@\[.+?\]/,
 +                      alias: 'attr-name',
 +                      inside: {
 +                              delimiter: {
 +                                      pattern: /^@\[|\]$/,
 +                                      alias: 'tag'
 +                              },
 +                              rest: Prism.languages.crystal
 +                      }
 +              },
 +
 +              expansion: [
 +              {
 +                      pattern: /\{\{.+?\}\}/,
 +                      inside: {
 +                              delimiter: {
 +                                      pattern: /^\{\{|\}\}$/,
 +                                      alias: 'tag'
 +                              },
 +                              rest: Prism.languages.crystal
 +                      }
 +              },
 +              {
 +                      pattern: /\{%.+?%\}/,
 +                      inside: {
 +                              delimiter: {
 +                                      pattern: /^\{%|%\}$/,
 +                                      alias: 'tag'
 +                              },
 +                              rest: Prism.languages.crystal
 +                      }
 +              }
 +              ]
 +      });
  
  }(Prism));
  
+ Prism.languages.lua = {
 -  'comment': /^#!.+|--(?:\[(=*)\[[\s\S]*?\]\1\]|.*)/m,
 -  // \z may be used to skip the following space
 -  'string': {
 -    pattern: /(["'])(?:(?!\1)[^\\\r\n]|\\z(?:\r\n|\s)|\\(?:\r\n|[\s\S]))*\1|\[(=*)\[[\s\S]*?\]\2\]/,
 -    greedy: true
 -  },
 -  'number': 
/\b0x[a-f\d]+\.?[a-f\d]*(?:p[+-]?\d+)?\b|\b\d+(?:\.\B|\.?\d*(?:e[+-]?\d+)?\b)|\B\.\d+(?:e[+-]?\d+)?\b/i,
 -  'keyword': 
/\b(?:and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,
 -  'function': /(?!\d)\w+(?=\s*(?:[({]))/,
 -  'operator': [
 -    /[-+*%^&|#]|\/\/?|<[<=]?|>[>=]?|[=~]=?/,
 -    {
 -      // Match ".." but don't break "..."
 -      pattern: /(^|[^.])\.\.(?!\.)/,
 -      lookbehind: true
 -    }
 -  ],
 -  'punctuation': /[\[\](){},;]|\.+|:+/
++      'comment': /^#!.+|--(?:\[(=*)\[[\s\S]*?\]\1\]|.*)/m,
++      // \z may be used to skip the following space
++      'string': {
++              pattern: 
/(["'])(?:(?!\1)[^\\\r\n]|\\z(?:\r\n|\s)|\\(?:\r\n|[\s\S]))*\1|\[(=*)\[[\s\S]*?\]\2\]/,
++              greedy: true
++      },
++      'number': 
/\b0x[a-f\d]+\.?[a-f\d]*(?:p[+-]?\d+)?\b|\b\d+(?:\.\B|\.?\d*(?:e[+-]?\d+)?\b)|\B\.\d+(?:e[+-]?\d+)?\b/i,
++      'keyword': 
/\b(?:and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,
++      'function': /(?!\d)\w+(?=\s*(?:[({]))/,
++      'operator': [
++              /[-+*%^&|#]|\/\/?|<[<=]?|>[>=]?|[=~]=?/,
++              {
++                      // Match ".." but don't break "..."
++                      pattern: /(^|[^.])\.\.(?!\.)/,
++                      lookbehind: true
++              }
++      ],
++      'punctuation': /[\[\](){},;]|\.+|:+/
+ };
+ // Django/Jinja2 syntax definition for Prism.js <http://prismjs.com> syntax highlighter.
+ // Mostly it works OK but can paint code incorrectly on complex html/template tag combinations.
+ 
+ (function (Prism) {
+ 
 -  Prism.languages.django = {
 -    'comment': /^{#[\s\S]*?#}$/,
 -    'tag': {
 -      pattern: /(^{%[+-]?\s*)\w+/,
 -      lookbehind: true,
 -      alias: 'keyword'
 -    },
 -    'delimiter': {
 -      pattern: /^{[{%][+-]?|[+-]?[}%]}$/,
 -      alias: 'punctuation'
 -    },
 -    'string': {
 -      pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
 -      greedy: true
 -    },
 -    'filter': {
 -      pattern: /(\|)\w+/,
 -      lookbehind: true,
 -      alias: 'function'
 -    },
 -    'test': {
 -      pattern: /(\bis\s+(?:not\s+)?)(?!not\b)\w+/,
 -      lookbehind: true,
 -      alias: 'function'
 -    },
 -    'function': /\b[a-z_]\w+(?=\s*\()/i,
 -    'keyword': /\b(?:and|as|by|else|for|if|import|in|is|loop|not|or|recursive|with|without)\b/,
 -    'operator': /[-+*/%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/,
 -    'number': /\b\d+(?:\.\d+)?\b/,
 -    'boolean': /[Tt]rue|[Ff]alse|[Nn]one/,
 -    'variable': /\b\w+?\b/,
 -    'punctuation': /[{}[\](),.:;]/
 -  };
 -
 -
 -  var pattern = /{{[\s\S]*?}}|{%[\s\S]*?%}|{#[\s\S]*?#}/g;
 -  var markupTemplating = Prism.languages['markup-templating'];
 -
 -  Prism.hooks.add('before-tokenize', function (env) {
 -    markupTemplating.buildPlaceholders(env, 'django', pattern);
 -  });
 -  Prism.hooks.add('after-tokenize', function (env) {
 -    markupTemplating.tokenizePlaceholders(env, 'django');
 -  });
 -
 -  // Add an Jinja2 alias
 -  Prism.languages.jinja2 = Prism.languages.django;
 -  Prism.hooks.add('before-tokenize', function (env) {
 -    markupTemplating.buildPlaceholders(env, 'jinja2', pattern);
 -  });
 -  Prism.hooks.add('after-tokenize', function (env) {
 -    markupTemplating.tokenizePlaceholders(env, 'jinja2');
 -  });
++      Prism.languages.django = {
++              'comment': /^{#[\s\S]*?#}$/,
++              'tag': {
++                      pattern: /(^{%[+-]?\s*)\w+/,
++                      lookbehind: true,
++                      alias: 'keyword'
++              },
++              'delimiter': {
++                      pattern: /^{[{%][+-]?|[+-]?[}%]}$/,
++                      alias: 'punctuation'
++              },
++              'string': {
++                      pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
++                      greedy: true
++              },
++              'filter': {
++                      pattern: /(\|)\w+/,
++                      lookbehind: true,
++                      alias: 'function'
++              },
++              'test': {
++                      pattern: /(\bis\s+(?:not\s+)?)(?!not\b)\w+/,
++                      lookbehind: true,
++                      alias: 'function'
++              },
++              'function': /\b[a-z_]\w+(?=\s*\()/i,
++              'keyword': /\b(?:and|as|by|else|for|if|import|in|is|loop|not|or|recursive|with|without)\b/,
++              'operator': /[-+*/%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/,
++              'number': /\b\d+(?:\.\d+)?\b/,
++              'boolean': /[Tt]rue|[Ff]alse|[Nn]one/,
++              'variable': /\b\w+?\b/,
++              'punctuation': /[{}[\](),.:;]/
++      };
++
++
++      var pattern = /{{[\s\S]*?}}|{%[\s\S]*?%}|{#[\s\S]*?#}/g;
++      var markupTemplating = Prism.languages['markup-templating'];
++
++      Prism.hooks.add('before-tokenize', function (env) {
++              markupTemplating.buildPlaceholders(env, 'django', pattern);
++      });
++      Prism.hooks.add('after-tokenize', function (env) {
++              markupTemplating.tokenizePlaceholders(env, 'django');
++      });
++
++      // Add an Jinja2 alias
++      Prism.languages.jinja2 = Prism.languages.django;
++      Prism.hooks.add('before-tokenize', function (env) {
++              markupTemplating.buildPlaceholders(env, 'jinja2', pattern);
++      });
++      Prism.hooks.add('after-tokenize', function (env) {
++              markupTemplating.tokenizePlaceholders(env, 'jinja2');
++      });
+ 
+ })(Prism);
+ 
+ Prism.languages.matlab = {
 -  'comment': [
 -    /%\{[\s\S]*?\}%/,
 -    /%.+/
 -  ],
 -  'string': {
 -    pattern: /\B'(?:''|[^'\r\n])*'/,
 -    greedy: true
 -  },
 -  // FIXME We could handle imaginary numbers as a whole
 -  'number': /(?:\b\d+\.?\d*|\B\.\d+)(?:[eE][+-]?\d+)?(?:[ij])?|\b[ij]\b/,
 -  'keyword': 
/\b(?:break|case|catch|continue|else|elseif|end|for|function|if|inf|NaN|otherwise|parfor|pause|pi|return|switch|try|while)\b/,
 -  'function': /(?!\d)\w+(?=\s*\()/,
 -  'operator': /\.?[*^\/\\']|[+\-:@]|[<>=~]=?|&&?|\|\|?/,
 -  'punctuation': /\.{3}|[.,;\[\](){}!]/
++      'comment': [
++              /%\{[\s\S]*?\}%/,
++              /%.+/
++      ],
++      'string': {
++              pattern: /\B'(?:''|[^'\r\n])*'/,
++              greedy: true
++      },
++      // FIXME We could handle imaginary numbers as a whole
++      'number': /(?:\b\d+\.?\d*|\B\.\d+)(?:[eE][+-]?\d+)?(?:[ij])?|\b[ij]\b/,
++      'keyword': 
/\b(?:break|case|catch|continue|else|elseif|end|for|function|if|inf|NaN|otherwise|parfor|pause|pi|return|switch|try|while)\b/,
++      'function': /(?!\d)\w+(?=\s*\()/,
++      'operator': /\.?[*^\/\\']|[+\-:@]|[<>=~]=?|&&?|\|\|?/,
++      'punctuation': /\.{3}|[.,;\[\](){}!]/
+ };
+ Prism.languages.typescript = Prism.languages.extend('javascript', {
 -  // From JavaScript Prism keyword list and TypeScript language spec: 
https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
 -  'keyword': 
/\b(?:abstract|as|async|await|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|is|keyof|let|module|namespace|new|null|of|package|private|protected|public|readonly|return|require|set|static|super|switch|this|throw|try|type|typeof|var|void|while|with|yield)\b/,
 -  'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
++      // From JavaScript Prism keyword list and TypeScript language spec: 
https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
++      'keyword': 
/\b(?:abstract|as|async|await|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|is|keyof|let|module|namespace|new|null|of|package|private|protected|public|readonly|return|require|set|static|super|switch|this|throw|try|type|typeof|var|void|while|with|yield)\b/,
++      'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
+ });
+ 
+ Prism.languages.ts = Prism.languages.typescript;
+ 
  Prism.languages.nginx = Prism.languages.extend('clike', {
 -  'comment': {
 -    pattern: /(^|[^"{\\])#.*/,
 -    lookbehind: true
 -  },
 -  'keyword': 
/\b(?:CONTENT_|DOCUMENT_|GATEWAY_|HTTP_|HTTPS|if_not_empty|PATH_|QUERY_|REDIRECT_|REMOTE_|REQUEST_|SCGI|SCRIPT_|SERVER_|http|events|accept_mutex|accept_mutex_delay|access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth|auth_basic|auth_basic_user_file|auth_http|auth_http_header|auth_http_timeout|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|debug_connection|debug_points|default_type|deny|devpoll_changes|devpoll_events|directio|directio_alignment|disable_symlinks|empty_gif|env|epoll_events|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_
 
size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_methods|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_purge|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_redirect_errors|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|google_perftools_profiles|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_trans
 
parency|imap_capabilities|imap_client_buffer|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|kqueue_changes|kqueue_events|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|lock_file|log_format|log_format_combined|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|multi_accept|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules
 
|perl_require|perl_set|pid|pop3_auth|pop3_capabilities|port_in_redirect|post_action|postpone_output|protocol|proxy|proxy_buffer|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_error_message|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|
 
proxy_temp_path|proxy_timeout|proxy_upstream_fail_timeout|proxy_upstream_max_fails|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|rtsig_overflow_events|rtsig_overflow_test|rtsig_overflow_threshold|rtsig_signo|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|smtp_auth|smtp_capabilities|so_keepalive|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssi_value_length|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|starttls|stub_status|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timeout|timer_resolution|try_fil
 
es|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|use|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_connections|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory|xclient|xml_entities|xslt_entities|xslt_stylesheet|xslt_types|ssl_session_tickets|ssl_stapling|ssl_stapling_verify|ssl_ecdh_curve|ssl_trusted_certificate|more_set_headers|ssl_early_data)\b/i
 +      'comment': {
 +              pattern: /(^|[^"{\\])#.*/,
 +              lookbehind: true
 +      },
 +      'keyword': 
/\b(?:CONTENT_|DOCUMENT_|GATEWAY_|HTTP_|HTTPS|if_not_empty|PATH_|QUERY_|REDIRECT_|REMOTE_|REQUEST_|SCGI|SCRIPT_|SERVER_|http|events|accept_mutex|accept_mutex_delay|access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth|auth_basic|auth_basic_user_file|auth_http|auth_http_header|auth_http_timeout|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|debug_connection|debug_points|default_type|deny|devpoll_changes|devpoll_events|directio|directio_alignment|disable_symlinks|empty_gif|env|epoll_events|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_s
 
ize|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_methods|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_purge|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_redirect_errors|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|google_perftools_profiles|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transp
 
arency|imap_capabilities|imap_client_buffer|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|kqueue_changes|kqueue_events|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|lock_file|log_format|log_format_combined|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|multi_accept|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|
 
perl_require|perl_set|pid|pop3_auth|pop3_capabilities|port_in_redirect|post_action|postpone_output|protocol|proxy|proxy_buffer|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_error_message|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|p
 
roxy_temp_path|proxy_timeout|proxy_upstream_fail_timeout|proxy_upstream_max_fails|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|rtsig_overflow_events|rtsig_overflow_test|rtsig_overflow_threshold|rtsig_signo|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|smtp_auth|smtp_capabilities|so_keepalive|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssi_value_length|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|starttls|stub_status|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timeout|timer_resolution|try_file
 
s|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|use|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_connections|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory|xclient|xml_entities|xslt_entities|xslt_stylesheet|xslt_types|ssl_session_tickets|ssl_stapling|ssl_stapling_verify|ssl_ecdh_curve|ssl_trusted_certificate|more_set_headers|ssl_early_data)\b/i
  });
  
  Prism.languages.insertBefore('nginx', 'keyword', {
@@@ -1810,423 -2141,294 +2207,294 @@@
  });
  
  Prism.languages.nim = {
 -  'comment': /#.*/,
 -  // Double-quoted strings can be prefixed by an identifier (Generalized raw string literals)
 -  // Character literals are handled specifically to prevent issues with numeric type suffixes
 -  'string': {
 -    pattern: 
/(?:(?:\b(?!\d)(?:\w|\\x[8-9a-fA-F][0-9a-fA-F])+)?(?:"""[\s\S]*?"""(?!")|"(?:\\[\s\S]|""|[^"\\])*")|'(?:\\(?:\d+|x[\da-fA-F]{2}|.)|[^'])')/,
 -    greedy: true
 -  },
 -  // The negative look ahead prevents wrong highlighting of the .. operator
 -  'number': 
/\b(?:0[xXoObB][\da-fA-F_]+|\d[\d_]*(?:(?!\.\.)\.[\d_]*)?(?:[eE][+-]?\d[\d_]*)?)(?:'?[iuf]\d*)?/,
 -  'keyword': 
/\b(?:addr|as|asm|atomic|bind|block|break|case|cast|concept|const|continue|converter|defer|discard|distinct|do|elif|else|end|enum|except|export|finally|for|from|func|generic|if|import|include|interface|iterator|let|macro|method|mixin|nil|object|out|proc|ptr|raise|ref|return|static|template|try|tuple|type|using|var|when|while|with|without|yield)\b/,
 -  'function': {
 -    pattern: /(?:(?!\d)(?:\w|\\x[8-9a-fA-F][0-9a-fA-F])+|`[^`\r\n]+`)\*?(?:\[[^\]]+\])?(?=\s*\()/,
 -    inside: {
 -      'operator': /\*$/
 -    }
 -  },
 -  // We don't want to highlight operators inside backticks
 -  'ignore': {
 -    pattern: /`[^`\r\n]+`/,
 -    inside: {
 -      'punctuation': /`/
 -    }
 -  },
 -  'operator': {
 -    // Look behind and look ahead prevent wrong highlighting of punctuations [. .] {. .} (. .)
 -    // but allow the slice operator .. to take precedence over them
 -    // One can define his own operators in Nim so all combination of operators might be an operator.
 -    pattern: 
/(^|[({\[](?=\.\.)|(?![({\[]\.).)(?:(?:[=+\-*\/<>@$~&%|!?^:\\]|\.\.|\.(?![)}\]]))+|\b(?:and|div|of|or|in|is|isnot|mod|not|notin|shl|shr|xor)\b)/m,
 -    lookbehind: true
 -  },
 -  'punctuation': /[({\[]\.|\.[)}\]]|[`(){}\[\],:]/
 +      'comment': /#.*/,
 +      // Double-quoted strings can be prefixed by an identifier (Generalized raw string literals)
 +      // Character literals are handled specifically to prevent issues with numeric type suffixes
 +      'string': {
 +              pattern: 
/(?:(?:\b(?!\d)(?:\w|\\x[8-9a-fA-F][0-9a-fA-F])+)?(?:"""[\s\S]*?"""(?!")|"(?:\\[\s\S]|""|[^"\\])*")|'(?:\\(?:\d+|x[\da-fA-F]{2}|.)|[^'])')/,
 +              greedy: true
 +      },
 +      // The negative look ahead prevents wrong highlighting of the .. operator
 +      'number': 
/\b(?:0[xXoObB][\da-fA-F_]+|\d[\d_]*(?:(?!\.\.)\.[\d_]*)?(?:[eE][+-]?\d[\d_]*)?)(?:'?[iuf]\d*)?/,
 +      'keyword': 
/\b(?:addr|as|asm|atomic|bind|block|break|case|cast|concept|const|continue|converter|defer|discard|distinct|do|elif|else|end|enum|except|export|finally|for|from|func|generic|if|import|include|interface|iterator|let|macro|method|mixin|nil|object|out|proc|ptr|raise|ref|return|static|template|try|tuple|type|using|var|when|while|with|without|yield)\b/,
 +      'function': {
 +              pattern: /(?:(?!\d)(?:\w|\\x[8-9a-fA-F][0-9a-fA-F])+|`[^`\r\n]+`)\*?(?:\[[^\]]+\])?(?=\s*\()/,
 +              inside: {
 +                      'operator': /\*$/
 +              }
 +      },
 +      // We don't want to highlight operators inside backticks
 +      'ignore': {
 +              pattern: /`[^`\r\n]+`/,
 +              inside: {
 +                      'punctuation': /`/
 +              }
 +      },
 +      'operator': {
 +              // Look behind and look ahead prevent wrong highlighting of punctuations [. .] {. .} (. .)
 +              // but allow the slice operator .. to take precedence over them
 +              // One can define his own operators in Nim so all combination of operators might be an 
operator.
 +              pattern: 
/(^|[({\[](?=\.\.)|(?![({\[]\.).)(?:(?:[=+\-*\/<>@$~&%|!?^:\\]|\.\.|\.(?![)}\]]))+|\b(?:and|div|of|or|in|is|isnot|mod|not|notin|shl|shr|xor)\b)/m,
 +              lookbehind: true
 +      },
 +      'punctuation': /[({\[]\.|\.[)}\]]|[`(){}\[\],:]/
  };
  Prism.languages.perl = {
 -  'comment': [
 -    {
 -      // POD
 -      pattern: /(^\s*)=\w+[\s\S]*?=cut.*/m,
 -      lookbehind: true
 -    },
 -    {
 -      pattern: /(^|[^\\$])#.*/,
 -      lookbehind: true
 -    }
 -  ],
 -  // TODO Could be nice to handle Heredoc too.
 -  'string': [
 -    // q/.../
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 -      greedy: true
 -    },
 -
 -    // q a...a
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 -      greedy: true
 -    },
 -
 -    // q(...)
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,
 -      greedy: true
 -    },
 -
 -    // q{...}
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,
 -      greedy: true
 -    },
 -
 -    // q[...]
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,
 -      greedy: true
 -    },
 -
 -    // q<...>
 -    {
 -      pattern: /\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,
 -      greedy: true
 -    },
 -
 -    // "...", `...`
 -    {
 -      pattern: /("|`)(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 -      greedy: true
 -    },
 -
 -    // '...'
 -    // FIXME Multi-line single-quoted strings are not supported as they would break variables containing '
 -    {
 -      pattern: /'(?:[^'\\\r\n]|\\.)*'/,
 -      greedy: true
 -    }
 -  ],
 -  'regex': [
 -    // m/.../
 -    {
 -      pattern: /\b(?:m|qr)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // m a...a
 -    {
 -      pattern: /\b(?:m|qr)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // m(...)
 -    {
 -      pattern: /\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // m{...}
 -    {
 -      pattern: /\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // m[...]
 -    {
 -      pattern: /\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // m<...>
 -    {
 -      pattern: /\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,
 -      greedy: true
 -    },
 -
 -    // The lookbehinds prevent -s from breaking
 -    // FIXME We don't handle change of separator like s(...)[...]
 -    // s/.../.../
 -    {
 -      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // s a...a...a
 -    {
 -      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // s(...)(...)
 -    {
 -      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // s{...}{...}
 -    {
 -      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // s[...][...]
 -    {
 -      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // s<...><...>
 -    {
 -      pattern: /(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,
 -      lookbehind: true,
 -      greedy: true
 -    },
 -
 -    // /.../
 -    // The look-ahead tries to prevent two divisions on
 -    // the same line from being highlighted as regex.
 -    // This does not support multi-line regex.
 -    {
 -      pattern: 
/\/(?:[^\/\\\r\n]|\\.)*\/[msixpodualngc]*(?=\s*(?:$|[\r\n,.;})&|\-+*~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/,
 -      greedy: true
 -    }
 -  ],
 -
 -  // FIXME Not sure about the handling of ::, ', and #
 -  'variable': [
 -    // ${^POSTMATCH}
 -    /[&*$@%]\{\^[A-Z]+\}/,
 -    // $^V
 -    /[&*$@%]\^[A-Z_]/,
 -    // ${...}
 -    /[&*$@%]#?(?=\{)/,
 -    // $foo
 -    /[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+)+(?:::)*/i,
 -    // $1
 -    /[&*$@%]\d+/,
 -    // $_, @_, %!
 -    // The negative lookahead prevents from breaking the %= operator
 -    /(?!%=)[$@%][!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/
 -  ],
 -  'filehandle': {
 -    // <>, <FOO>, _
 -    pattern: /<(?![<=])\S*>|\b_\b/,
 -    alias: 'symbol'
 -  },
 -  'vstring': {
 -    // v1.2, 1.2.3
 -    pattern: /v\d+(?:\.\d+)*|\d+(?:\.\d+){2,}/,
 -    alias: 'string'
 -  },
 -  'function': {
 -    pattern: /sub [a-z0-9_]+/i,
 -    inside: {
 -      keyword: /sub/
 -    }
 -  },
 -  'keyword': 
/\b(?:any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|return|say|state|sub|switch|undef|unless|until|use|when|while)\b/,
 -  'number': 
/\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0b[01](?:_?[01])*|(?:\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)\b/,
 -  'operator': 
/-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(?:lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,
 -  'punctuation': /[{}[\];(),:]/
 +      'comment': [
 +              {
 +                      // POD
 +                      pattern: /(^\s*)=\w+[\s\S]*?=cut.*/m,
 +                      lookbehind: true
 +              },
 +              {
 +                      pattern: /(^|[^\\$])#.*/,
 +                      lookbehind: true
 +              }
 +      ],
 +      // TODO Could be nice to handle Heredoc too.
 +      'string': [
 +              // q/.../
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 +                      greedy: true
 +              },
 +
 +              // q a...a
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 +                      greedy: true
 +              },
 +
 +              // q(...)
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,
 +                      greedy: true
 +              },
 +
 +              // q{...}
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,
 +                      greedy: true
 +              },
 +
 +              // q[...]
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,
 +                      greedy: true
 +              },
 +
 +              // q<...>
 +              {
 +                      pattern: /\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,
 +                      greedy: true
 +              },
 +
 +              // "...", `...`
 +              {
 +                      pattern: /("|`)(?:(?!\1)[^\\]|\\[\s\S])*\1/,
 +                      greedy: true
 +              },
 +
 +              // '...'
 +              // FIXME Multi-line single-quoted strings are not supported as they would break variables 
containing '
 +              {
 +                      pattern: /'(?:[^'\\\r\n]|\\.)*'/,
 +                      greedy: true
 +              }
 +      ],
 +      'regex': [
 +              // m/.../
 +              {
 +                      pattern: 
/\b(?:m|qr)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // m a...a
 +              {
 +                      pattern: /\b(?:m|qr)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // m(...)
 +              {
 +                      pattern: /\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // m{...}
 +              {
 +                      pattern: /\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // m[...]
 +              {
 +                      pattern: /\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // m<...>
 +              {
 +                      pattern: /\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,
 +                      greedy: true
 +              },
 +
 +              // The lookbehinds prevent -s from breaking
 +              // FIXME We don't handle change of separator like s(...)[...]
 +              // s/.../.../
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // s a...a...a
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // s(...)(...)
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // s{...}{...}
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // s[...][...]
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // s<...><...>
 +              {
 +                      pattern: 
/(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,
 +                      lookbehind: true,
 +                      greedy: true
 +              },
 +
 +              // /.../
 +              // The look-ahead tries to prevent two divisions on
 +              // the same line from being highlighted as regex.
 +              // This does not support multi-line regex.
 +              {
 +                      pattern: 
/\/(?:[^\/\\\r\n]|\\.)*\/[msixpodualngc]*(?=\s*(?:$|[\r\n,.;})&|\-+*~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/,
 +                      greedy: true
 +              }
 +      ],
 +
 +      // FIXME Not sure about the handling of ::, ', and #
 +      'variable': [
 +              // ${^POSTMATCH}
 +              /[&*$@%]\{\^[A-Z]+\}/,
 +              // $^V
 +              /[&*$@%]\^[A-Z_]/,
 +              // ${...}
 +              /[&*$@%]#?(?=\{)/,
 +              // $foo
 +              /[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+)+(?:::)*/i,
 +              // $1
 +              /[&*$@%]\d+/,
 +              // $_, @_, %!
 +              // The negative lookahead prevents from breaking the %= operator
 +              /(?!%=)[$@%][!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/
 +      ],
 +      'filehandle': {
 +              // <>, <FOO>, _
 +              pattern: /<(?![<=])\S*>|\b_\b/,
 +              alias: 'symbol'
 +      },
 +      'vstring': {
 +              // v1.2, 1.2.3
 +              pattern: /v\d+(?:\.\d+)*|\d+(?:\.\d+){2,}/,
 +              alias: 'string'
 +      },
 +      'function': {
 +              pattern: /sub [a-z0-9_]+/i,
 +              inside: {
 +                      keyword: /sub/
 +              }
 +      },
-       'keyword': 
/\b(?:any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,
++      'keyword': 
/\b(?:any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|return|say|state|sub|switch|undef|unless|until|use|when|while)\b/,
 +      'number': 
/\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0b[01](?:_?[01])*|(?:\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)\b/,
 +      'operator': 
/-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(?:lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,
 +      'punctuation': /[{}[\];(),:]/
  };
  
- /**
-  * Original by Aaron Harun: http://aahacreative.com/2012/07/31/php-syntax-highlighting-prism/
-  * Modified by Miles Johnson: http://milesj.me
-  *
-  * Supports the following:
-  *            - Extends clike syntax
-  *            - Support for PHP 5.3+ (namespaces, traits, generators, etc)
-  *            - Smarter constant and function matching
-  *
-  * Adds the following new token classes:
-  *            constant, delimiter, variable, function, package
-  */
- (function (Prism) {
-       Prism.languages.php = Prism.languages.extend('clike', {
-               'keyword': 
/\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|finally|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|new|or|parent|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i,
-               'boolean': {
-                       pattern: /\b(?:false|true)\b/i,
-                       alias: 'constant'
-               },
-               'constant': [
-                       /\b[A-Z_][A-Z0-9_]*\b/,
-                       /\b(?:null)\b/i,
-               ],
-               'comment': {
-                       pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
-                       lookbehind: true
-               }
-       });
- 
-       Prism.languages.insertBefore('php', 'string', {
-               'shell-comment': {
-                       pattern: /(^|[^\\])#.*/,
-                       lookbehind: true,
-                       alias: 'comment'
-               }
-       });
- 
-       Prism.languages.insertBefore('php', 'keyword', {
-               'delimiter': {
-                       pattern: /\?>|<\?(?:php|=)?/i,
-                       alias: 'important'
-               },
-               'variable': /\$+(?:\w+\b|(?={))/i,
-               'package': {
-                       pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
-                       lookbehind: true,
-                       inside: {
-                               punctuation: /\\/
-                       }
-               }
-       });
- 
-       // Must be defined after the function pattern
-       Prism.languages.insertBefore('php', 'operator', {
-               'property': {
-                       pattern: /(->)[\w]+/,
-                       lookbehind: true
-               }
-       });
- 
-       var string_interpolation = {
-               pattern: /{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,
-               lookbehind: true,
-               inside: {
-                       rest: Prism.languages.php
-               }
-       };
- 
-       Prism.languages.insertBefore('php', 'string', {
-               'nowdoc-string': {
-                       pattern: /<<<'([^']+)'(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;/,
-                       greedy: true,
-                       alias: 'string',
-                       inside: {
-                               'delimiter': {
-                                       pattern: /^<<<'[^']+'|[a-z_]\w*;$/i,
-                                       alias: 'symbol',
-                                       inside: {
-                                               'punctuation': /^<<<'?|[';]$/
-                                       }
-                               }
-                       }
-               },
-               'heredoc-string': {
-                       pattern: 
/<<<(?:"([^"]+)"(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;|([a-z_]\w*)(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\2;)/i,
-                       greedy: true,
-                       alias: 'string',
-                       inside: {
-                               'delimiter': {
-                                       pattern: /^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,
-                                       alias: 'symbol',
-                                       inside: {
-                                               'punctuation': /^<<<"?|[";]$/
-                                       }
-                               },
-                               'interpolation': string_interpolation // See below
-                       }
-               },
-               'single-quoted-string': {
-                       pattern: /'(?:\\[\s\S]|[^\\'])*'/,
-                       greedy: true,
-                       alias: 'string'
-               },
-               'double-quoted-string': {
-                       pattern: /"(?:\\[\s\S]|[^\\"])*"/,
-                       greedy: true,
-                       alias: 'string',
-                       inside: {
-                               'interpolation': string_interpolation // See below
-                       }
-               }
-       });
-       // The different types of PHP strings "replace" the C-like standard string
-       delete Prism.languages.php['string'];
- 
-       Prism.hooks.add('before-tokenize', function(env) {
-               if (!/(?:<\?php|<\?)/ig.test(env.code)) {
-                       return;
-               }
- 
-               var phpPattern = /(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/ig;
-               Prism.languages['markup-templating'].buildPlaceholders(env, 'php', phpPattern);
-       });
- 
-       Prism.hooks.add('after-tokenize', function(env) {
-               Prism.languages['markup-templating'].tokenizePlaceholders(env, 'php');
-       });
- 
- }(Prism));
  Prism.languages.sql = {
 -  'comment': {
 -    pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:--|\/\/|#).*)/,
 -    lookbehind: true
 -  },
 -  'variable': [
 -    {
 -      pattern: /@(["'`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,
 -      greedy: true
 -    },
 -    /@[\w.$]+/
 -  ],
 -  'string': {
 -    pattern: /(^|[^@\\])("|')(?:\\[\s\S]|(?!\2)[^\\]|\2\2)*\2/,
 -    greedy: true,
 -    lookbehind: true
 -  },
 -  'function': /\b(?:AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE)(?=\s*\()/i, 
// Should we highlight user defined functions too?
 -  'keyword': 
/\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|AUTO_INCREMENT|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR(?:ACTER|SET)?|CHECK(?:POINT)?|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMNS?|COMMENT|COMMIT(?:TED)?|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS(?:TABLE)?|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|CYCLE|DATA(?:BASES?)?|DATE(?:TIME)?|DAY|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DELIMITERS?|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE|ELSE(?:IF)?|ENABLE|ENCLOSED|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPED?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?:
 EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRAN
 
T|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|HOUR|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTERVAL|INTO|INVOKER|ISOLATION|ITERATE|JOIN|KEYS?|KILL|LANGUAGE|LAST|LEAVE|LEFT|LEVEL|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|LOOP|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MINUTE|MODE|MODIFIES|MODIFY|MONTH|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL|NATURAL|NCHAR|NEXT|NO|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREPARE|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READS?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEAT(?:ABLE)?|REPLACE|REPLICATION|REQUIRE|RESIGNAL|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SECOND|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_US
 
ER)?|SET(?:USER)?|SHARE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|SQL|START(?:ING)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED|TEXT(?:SIZE)?|THEN|TIME(?:STAMP)?|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNLOCK|UNPIVOT|UNSIGNED|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?:
 ROLLUP|IN)?|WORK|WRITE(?:TEXT)?|YEAR)\b/i,
 -  'boolean': /\b(?:TRUE|FALSE|NULL)\b/i,
 -  'number': /\b0x[\da-f]+\b|\b\d+\.?\d*|\B\.\d+\b/i,
 -  'operator': 
/[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS 
LIKE|XOR)\b/i,
 -  'punctuation': /[;[\]()`,.]/
 +      'comment': {
 +              pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:--|\/\/|#).*)/,
 +              lookbehind: true
 +      },
 +      'variable': [
 +              {
 +                      pattern: /@(["'`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,
 +                      greedy: true
 +              },
 +              /@[\w.$]+/
 +      ],
 +      'string': {
 +              pattern: /(^|[^@\\])("|')(?:\\[\s\S]|(?!\2)[^\\]|\2\2)*\2/,
 +              greedy: true,
 +              lookbehind: true
 +      },
 +      'function': 
/\b(?:AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE)(?=\s*\()/i, // Should we 
highlight user defined functions too?
 +      'keyword': 
/\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|AUTO_INCREMENT|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR(?:ACTER|SET)?|CHECK(?:POINT)?|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMNS?|COMMENT|COMMIT(?:TED)?|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS(?:TABLE)?|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|CYCLE|DATA(?:BASES?)?|DATE(?:TIME)?|DAY|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DELIMITERS?|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE|ELSE(?:IF)?|ENABLE|ENCLOSED|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPED?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?:
 EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT
 
|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|HOUR|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTERVAL|INTO|INVOKER|ISOLATION|ITERATE|JOIN|KEYS?|KILL|LANGUAGE|LAST|LEAVE|LEFT|LEVEL|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|LOOP|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MINUTE|MODE|MODIFIES|MODIFY|MONTH|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL|NATURAL|NCHAR|NEXT|NO|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREPARE|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READS?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEAT(?:ABLE)?|REPLACE|REPLICATION|REQUIRE|RESIGNAL|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SECOND|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USE
 
R)?|SET(?:USER)?|SHARE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|SQL|START(?:ING)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED|TEXT(?:SIZE)?|THEN|TIME(?:STAMP)?|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNLOCK|UNPIVOT|UNSIGNED|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?:
 ROLLUP|IN)?|WORK|WRITE(?:TEXT)?|YEAR)\b/i,
 +      'boolean': /\b(?:TRUE|FALSE|NULL)\b/i,
 +      'number': /\b0x[\da-f]+\b|\b\d+\.?\d*|\B\.\d+\b/i,
 +      'operator': 
/[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS 
LIKE|XOR)\b/i,
 +      'punctuation': /[;[\]()`,.]/
  };
  
  Prism.languages.scss = Prism.languages.extend('css', {
 -  'comment': {
 -    pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
 -    lookbehind: true
 -  },
 -  'atrule': {
 -    pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,
 -    inside: {
 -      'rule': /@[\w-]+/
 -      // See rest below
 -    }
 -  },
 -  // url, compassified
 -  'url': /(?:[-a-z]+-)?url(?=\()/i,
 -  // CSS selector regex is not appropriate for Sass
 -  // since there can be lot more things (var, @ directive, nesting..)
 -  // a selector must start at the end of a property or after a brace (end of other rules or nesting)
 -  // it can contain some characters that aren't used for defining rules or end of selector, & (parent 
selector), or interpolated variable
 -  // the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property 
(because an interpolated var
 -  // can "pass" as a selector- e.g: proper#{$erty})
 -  // this one was hard to do, so please be careful if you edit this one :)
 -  'selector': {
 -    // Initial look-ahead is used to prevent matching of blank selectors
 -    pattern: /(?=\S)[^@;{}()]?(?:[^@;{}()]|#\{\$[-\w]+\})+(?=\s*\{(?:\}|\s|[^}]+[:{][^}]+))/m,
 -    inside: {
 -      'parent': {
 -        pattern: /&/,
 -        alias: 'important'
 -      },
 -      'placeholder': /%[-\w]+/,
 -      'variable': /\$[-\w]+|#\{\$[-\w]+\}/
 -    }
 -  },
 -  'property': {
 -    pattern: /(?:[\w-]|\$[-\w]+|#\{\$[-\w]+\})+(?=\s*:)/,
 -    inside: {
 -      'variable': /\$[-\w]+|#\{\$[-\w]+\}/
 -    }
 -  }
 +      'comment': {
 +              pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
 +              lookbehind: true
 +      },
 +      'atrule': {
 +              pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,
 +              inside: {
 +                      'rule': /@[\w-]+/
 +                      // See rest below
 +              }
 +      },
 +      // url, compassified
-       'url': /(?:[-a-z]+-)*url(?=\()/i,
++      'url': /(?:[-a-z]+-)?url(?=\()/i,
 +      // CSS selector regex is not appropriate for Sass
 +      // since there can be lot more things (var, @ directive, nesting..)
 +      // a selector must start at the end of a property or after a brace (end of other rules or nesting)
 +      // it can contain some characters that aren't used for defining rules or end of selector, & (parent 
selector), or interpolated variable
 +      // the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a 
property (because an interpolated var
 +      // can "pass" as a selector- e.g: proper#{$erty})
 +      // this one was hard to do, so please be careful if you edit this one :)
 +      'selector': {
 +              // Initial look-ahead is used to prevent matching of blank selectors
 +              pattern: /(?=\S)[^@;{}()]?(?:[^@;{}()]|#\{\$[-\w]+\})+(?=\s*\{(?:\}|\s|[^}]+[:{][^}]+))/m,
 +              inside: {
 +                      'parent': {
 +                              pattern: /&/,
 +                              alias: 'important'
 +                      },
 +                      'placeholder': /%[-\w]+/,
 +                      'variable': /\$[-\w]+|#\{\$[-\w]+\}/
 +              }
 +      },
 +      'property': {
 +              pattern: /(?:[\w-]|\$[-\w]+|#\{\$[-\w]+\})+(?=\s*:)/,
 +              inside: {
 +                      'variable': /\$[-\w]+|#\{\$[-\w]+\}/
 +              }
 +      }
  });
  
  Prism.languages.insertBefore('scss', 'atrule', {
@@@ -2245,20 -2447,23 +2513,23 @@@ Prism.languages.insertBefore('scss', 'i
  });
  
  Prism.languages.insertBefore('scss', 'function', {
 -  'placeholder': {
 -    pattern: /%[-\w]+/,
 -    alias: 'selector'
 -  },
 -  'statement': {
 -    pattern: /\B!(?:default|optional)\b/i,
 -    alias: 'keyword'
 -  },
 -  'boolean': /\b(?:true|false)\b/,
 -  'null': {
 -    pattern: /\bnull\b/,
 -    alias: 'keyword'
 -  },
 -  'operator': {
 -    pattern: /(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,
 -    lookbehind: true
 -  }
 +      'placeholder': {
 +              pattern: /%[-\w]+/,
 +              alias: 'selector'
 +      },
 +      'statement': {
 +              pattern: /\B!(?:default|optional)\b/i,
 +              alias: 'keyword'
 +      },
 +      'boolean': /\b(?:true|false)\b/,
-       'null': /\bnull\b/,
++      'null': {
++              pattern: /\bnull\b/,
++              alias: 'keyword'
++      },
 +      'operator': {
 +              pattern: /(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,
 +              lookbehind: true
 +      }
  });
  
  Prism.languages.scss['atrule'].inside.rest = Prism.languages.scss;
@@@ -2329,128 -2534,128 +2600,128 @@@ Prism.languages.python['string-interpol
  Prism.languages.py = Prism.languages.python;
  (function(Prism) {
  
 -  var javascript = Prism.util.clone(Prism.languages.javascript);
 -
 -  Prism.languages.jsx = Prism.languages.extend('markup', javascript);
 -  Prism.languages.jsx.tag.pattern= 
/<\/?(?:[\w.:-]+\s*(?:\s+(?:[\w.:-]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s{'">=]+|\{(?:\{(?:\{[^}]*\}|[^{}])*\}|[^{}])+\}))?|\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}))*\s*\/?)?>/i;
 -
 -  Prism.languages.jsx.tag.inside['tag'].pattern = /^<\/?[^\s>\/]*/i;
 -  Prism.languages.jsx.tag.inside['attr-value'].pattern = 
/=(?!\{)(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">]+)/i;
 -  Prism.languages.jsx.tag.inside['tag'].inside['class-name'] = /^[A-Z]\w*(?:\.[A-Z]\w*)*$/;
 -
 -  Prism.languages.insertBefore('inside', 'attr-name', {
 -    'spread': {
 -      pattern: /\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}/,
 -      inside: {
 -        'punctuation': /\.{3}|[{}.]/,
 -        'attr-value': /\w+/
 -      }
 -    }
 -  }, Prism.languages.jsx.tag);
 -
 -  Prism.languages.insertBefore('inside', 'attr-value',{
 -    'script': {
 -      // Allow for two levels of nesting
 -      pattern: /=(\{(?:\{(?:\{[^}]*\}|[^}])*\}|[^}])+\})/i,
 -      inside: {
 -        'script-punctuation': {
 -          pattern: /^=(?={)/,
 -          alias: 'punctuation'
 -        },
 -        rest: Prism.languages.jsx
 -      },
 -      'alias': 'language-javascript'
 -    }
 -  }, Prism.languages.jsx.tag);
 +var javascript = Prism.util.clone(Prism.languages.javascript);
 +
 +Prism.languages.jsx = Prism.languages.extend('markup', javascript);
 +Prism.languages.jsx.tag.pattern= 
/<\/?(?:[\w.:-]+\s*(?:\s+(?:[\w.:-]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s{'">=]+|\{(?:\{(?:\{[^}]*\}|[^{}])*\}|[^{}])+\}))?|\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}))*\s*\/?)?>/i;
 +
 +Prism.languages.jsx.tag.inside['tag'].pattern = /^<\/?[^\s>\/]*/i;
 +Prism.languages.jsx.tag.inside['attr-value'].pattern = 
/=(?!\{)(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">]+)/i;
- Prism.languages.jsx.tag.inside['tag'].inside['class-name'] = /^[A-Z]\w*$/;
++Prism.languages.jsx.tag.inside['tag'].inside['class-name'] = /^[A-Z]\w*(?:\.[A-Z]\w*)*$/;
 +
 +Prism.languages.insertBefore('inside', 'attr-name', {
 +      'spread': {
 +              pattern: /\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}/,
 +              inside: {
 +                      'punctuation': /\.{3}|[{}.]/,
 +                      'attr-value': /\w+/
 +              }
 +      }
 +}, Prism.languages.jsx.tag);
 +
 +Prism.languages.insertBefore('inside', 'attr-value',{
 +      'script': {
 +              // Allow for two levels of nesting
 +              pattern: /=(\{(?:\{(?:\{[^}]*\}|[^}])*\}|[^}])+\})/i,
 +              inside: {
 +                      'script-punctuation': {
 +                              pattern: /^=(?={)/,
 +                              alias: 'punctuation'
 +                      },
 +                      rest: Prism.languages.jsx
 +              },
 +              'alias': 'language-javascript'
 +      }
 +}, Prism.languages.jsx.tag);
  
  // The following will handle plain text inside tags
 -  var stringifyToken = function (token) {
 -    if (!token) {
 -      return '';
 -    }
 -    if (typeof token === 'string') {
 -      return token;
 -    }
 -    if (typeof token.content === 'string') {
 -      return token.content;
 -    }
 -    return token.content.map(stringifyToken).join('');
 -  };
 -
 -  var walkTokens = function (tokens) {
 -    var openedTags = [];
 -    for (var i = 0; i < tokens.length; i++) {
 -      var token = tokens[i];
 -      var notTagNorBrace = false;
 -
 -      if (typeof token !== 'string') {
 -        if (token.type === 'tag' && token.content[0] && token.content[0].type === 'tag') {
 -          // We found a tag, now find its kind
 -
 -          if (token.content[0].content[0].content === '</') {
 -            // Closing tag
 -            if (openedTags.length > 0 && openedTags[openedTags.length - 1].tagName === 
stringifyToken(token.content[0].content[1])) {
 -              // Pop matching opening tag
 -              openedTags.pop();
 -            }
 -          } else {
 -            if (token.content[token.content.length - 1].content === '/>') {
 -              // Autoclosed tag, ignore
 -            } else {
 -              // Opening tag
 -              openedTags.push({
 -                tagName: stringifyToken(token.content[0].content[1]),
 -                openedBraces: 0
 -              });
 -            }
 -          }
 -        } else if (openedTags.length > 0 && token.type === 'punctuation' && token.content === '{') {
 -
 -          // Here we might have entered a JSX context inside a tag
 -          openedTags[openedTags.length - 1].openedBraces++;
 -
 -        } else if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces > 0 && 
token.type === 'punctuation' && token.content === '}') {
 -
 -          // Here we might have left a JSX context inside a tag
 -          openedTags[openedTags.length - 1].openedBraces--;
 -
 -        } else {
 -          notTagNorBrace = true
 -        }
 -      }
 -      if (notTagNorBrace || typeof token === 'string') {
 -        if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces === 0) {
 -          // Here we are inside a tag, and not inside a JSX context.
 -          // That's plain text: drop any tokens matched.
 -          var plainText = stringifyToken(token);
 -
 -          // And merge text with adjacent text
 -          if (i < tokens.length - 1 && (typeof tokens[i + 1] === 'string' || tokens[i + 1].type === 
'plain-text')) {
 -            plainText += stringifyToken(tokens[i + 1]);
 -            tokens.splice(i + 1, 1);
 -          }
 -          if (i > 0 && (typeof tokens[i - 1] === 'string' || tokens[i - 1].type === 'plain-text')) {
 -            plainText = stringifyToken(tokens[i - 1]) + plainText;
 -            tokens.splice(i - 1, 1);
 -            i--;
 -          }
 -
 -          tokens[i] = new Prism.Token('plain-text', plainText, null, plainText);
 -        }
 -      }
 -
 -      if (token.content && typeof token.content !== 'string') {
 -        walkTokens(token.content);
 -      }
 -    }
 -  };
 -
 -  Prism.hooks.add('after-tokenize', function (env) {
 -    if (env.language !== 'jsx' && env.language !== 'tsx') {
 -      return;
 -    }
 -    walkTokens(env.tokens);
 -  });
 +var stringifyToken = function (token) {
 +      if (!token) {
 +              return '';
 +      }
 +      if (typeof token === 'string') {
 +              return token;
 +      }
 +      if (typeof token.content === 'string') {
 +              return token.content;
 +      }
 +      return token.content.map(stringifyToken).join('');
 +};
 +
 +var walkTokens = function (tokens) {
 +      var openedTags = [];
 +      for (var i = 0; i < tokens.length; i++) {
 +              var token = tokens[i];
 +              var notTagNorBrace = false;
 +
 +              if (typeof token !== 'string') {
 +                      if (token.type === 'tag' && token.content[0] && token.content[0].type === 'tag') {
 +                              // We found a tag, now find its kind
 +
 +                              if (token.content[0].content[0].content === '</') {
 +                                      // Closing tag
 +                                      if (openedTags.length > 0 && openedTags[openedTags.length - 
1].tagName === stringifyToken(token.content[0].content[1])) {
 +                                              // Pop matching opening tag
 +                                              openedTags.pop();
 +                                      }
 +                              } else {
 +                                      if (token.content[token.content.length - 1].content === '/>') {
 +                                              // Autoclosed tag, ignore
 +                                      } else {
 +                                              // Opening tag
 +                                              openedTags.push({
 +                                                      tagName: stringifyToken(token.content[0].content[1]),
 +                                                      openedBraces: 0
 +                                              });
 +                                      }
 +                              }
 +                      } else if (openedTags.length > 0 && token.type === 'punctuation' && token.content === 
'{') {
 +
 +                              // Here we might have entered a JSX context inside a tag
 +                              openedTags[openedTags.length - 1].openedBraces++;
 +
 +                      } else if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces > 
0 && token.type === 'punctuation' && token.content === '}') {
 +
 +                              // Here we might have left a JSX context inside a tag
 +                              openedTags[openedTags.length - 1].openedBraces--;
 +
 +                      } else {
 +                              notTagNorBrace = true
 +                      }
 +              }
 +              if (notTagNorBrace || typeof token === 'string') {
 +                      if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces === 0) {
 +                              // Here we are inside a tag, and not inside a JSX context.
 +                              // That's plain text: drop any tokens matched.
 +                              var plainText = stringifyToken(token);
 +
 +                              // And merge text with adjacent text
 +                              if (i < tokens.length - 1 && (typeof tokens[i + 1] === 'string' || tokens[i + 
1].type === 'plain-text')) {
 +                                      plainText += stringifyToken(tokens[i + 1]);
 +                                      tokens.splice(i + 1, 1);
 +                              }
 +                              if (i > 0 && (typeof tokens[i - 1] === 'string' || tokens[i - 1].type === 
'plain-text')) {
 +                                      plainText = stringifyToken(tokens[i - 1]) + plainText;
 +                                      tokens.splice(i - 1, 1);
 +                                      i--;
 +                              }
 +
 +                              tokens[i] = new Prism.Token('plain-text', plainText, null, plainText);
 +                      }
 +              }
 +
 +              if (token.content && typeof token.content !== 'string') {
 +                      walkTokens(token.content);
 +              }
 +      }
 +};
 +
 +Prism.hooks.add('after-tokenize', function (env) {
 +      if (env.language !== 'jsx' && env.language !== 'tsx') {
 +              return;
 +      }
 +      walkTokens(env.tokens);
 +});
  
  }(Prism));
  
@@@ -2470,110 -2667,111 +2733,111 @@@
  */
  
  Prism.languages.rust = {
 -  'comment': [
 -    {
 -      pattern: /(^|[^\\])\/\*[\s\S]*?\*\//,
 -      lookbehind: true
 -    },
 -    {
 -      pattern: /(^|[^\\:])\/\/.*/,
 -      lookbehind: true
 -    }
 -  ],
 -  'string': [
 -    {
 -      pattern: /b?r(#*)"(?:\\.|(?!"\1)[^\\\r\n])*"\1/,
 -      greedy: true
 -    },
 -    {
 -      pattern: /b?"(?:\\.|[^\\\r\n"])*"/,
 -      greedy: true
 -    }
 -  ],
 -  'char': {
 -    pattern: /b?'(?:\\(?:x[0-7][\da-fA-F]|u{(?:[\da-fA-F]_*){1,6}|.)|[^\\\r\n\t'])'/,
 -    alias: 'string'
 -  },
 -  'lifetime-annotation': {
 -    pattern: /'[^\s>']+/,
 -    alias: 'symbol'
 -  },
 -  'keyword': 
/\b(?:abstract|alignof|as|async|await|be|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|Self|struct|super|true|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\b/,
 -
 -  'attribute': {
 -    pattern: /#!?\[.+?\]/,
 -    greedy: true,
 -    alias: 'attr-name'
 -  },
 -
 -  'function': [
 -    /\w+(?=\s*\()/,
 -    // Macros can use parens or brackets
 -    /\w+!(?=\s*\(|\[)/
 -  ],
 -  'macro-rules': {
 -    pattern: /\w+!/,
 -    alias: 'function'
 -  },
 -
 -  // Hex, oct, bin, dec numbers with visual separators and type suffix
 -  'number': 
/\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,
 -
 -  // Closure params should not be confused with bitwise OR |
 -  'closure-params': {
 -    pattern: /\|[^|]*\|(?=\s*[{-])/,
 -    inside: {
 -      'punctuation': /[|:,]/,
 -      'operator': /[&*]/
 -    }
 -  },
 -  'punctuation': /->|\.\.=|\.{1,3}|::|[{}[\];(),:]/,
 -  'operator': /[-+*\/%!^]=?|=[=>]?|&[&=]?|\|[|=]?|<<?=?|>>?=?|[@?]/
 +      'comment': [
 +              {
 +                      pattern: /(^|[^\\])\/\*[\s\S]*?\*\//,
 +                      lookbehind: true
 +              },
 +              {
 +                      pattern: /(^|[^\\:])\/\/.*/,
 +                      lookbehind: true
 +              }
 +      ],
 +      'string': [
 +              {
 +                      pattern: /b?r(#*)"(?:\\.|(?!"\1)[^\\\r\n])*"\1/,
 +                      greedy: true
 +              },
 +              {
 +                      pattern: /b?"(?:\\.|[^\\\r\n"])*"/,
 +                      greedy: true
 +              }
 +      ],
 +      'char': {
 +              pattern: /b?'(?:\\(?:x[0-7][\da-fA-F]|u{(?:[\da-fA-F]_*){1,6}|.)|[^\\\r\n\t'])'/,
 +              alias: 'string'
 +      },
 +      'lifetime-annotation': {
 +              pattern: /'[^\s>']+/,
 +              alias: 'symbol'
 +      },
-       'keyword': 
/\b(?:abstract|alignof|as|be|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|Self|struct|super|true|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\b/,
++      'keyword': 
/\b(?:abstract|alignof|as|async|await|be|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|Self|struct|super|true|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\b/,
 +
 +      'attribute': {
 +              pattern: /#!?\[.+?\]/,
 +              greedy: true,
 +              alias: 'attr-name'
 +      },
 +
 +      'function': [
 +              /\w+(?=\s*\()/,
 +              // Macros can use parens or brackets
 +              /\w+!(?=\s*\(|\[)/
 +      ],
 +      'macro-rules': {
 +              pattern: /\w+!/,
 +              alias: 'function'
 +      },
 +
 +      // Hex, oct, bin, dec numbers with visual separators and type suffix
 +      'number': 
/\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,
 +
 +      // Closure params should not be confused with bitwise OR |
 +      'closure-params': {
 +              pattern: /\|[^|]*\|(?=\s*[{-])/,
 +              inside: {
 +                      'punctuation': /[|:,]/,
 +                      'operator': /[&*]/
 +              }
 +      },
-       'punctuation': /[{}[\];(),:]|\.+|->/,
-       'operator': /[-+*\/%!^]=?|=[=>]?|@|&[&=]?|\|[|=]?|<<?=?|>>?=?/
++      'punctuation': /->|\.\.=|\.{1,3}|::|[{}[\];(),:]/,
++      'operator': /[-+*\/%!^]=?|=[=>]?|&[&=]?|\|[|=]?|<<?=?|>>?=?|[@?]/
  };
+ 
  Prism.languages.yaml = {
 -  'scalar': {
 -    pattern: /([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,
 -    lookbehind: true,
 -    alias: 'string'
 -  },
 -  'comment': /#.*/,
 -  'key': {
 -    pattern: /(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,
 -    lookbehind: true,
 -    alias: 'atrule'
 -  },
 -  'directive': {
 -    pattern: /(^[ \t]*)%.+/m,
 -    lookbehind: true,
 -    alias: 'important'
 -  },
 -  'datetime': {
 -    pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ 
\t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ 
\t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,
 -    lookbehind: true,
 -    alias: 'number'
 -  },
 -  'boolean': {
 -    pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,
 -    lookbehind: true,
 -    alias: 'important'
 -  },
 -  'null': {
 -    pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,
 -    lookbehind: true,
 -    alias: 'important'
 -  },
 -  'string': {
 -    pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|\s*#))/m,
 -    lookbehind: true,
 -    greedy: true
 -  },
 -  'number': {
 -    pattern: /([:\-,[{]\s*(?:![^\s]+)?[ 
\t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
 -    lookbehind: true
 -  },
 -  'tag': /![^\s]+/,
 -  'important': /[&*][\w]+/,
 -  'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
 +      'scalar': {
 +              pattern: /([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ 
\t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,
 +              lookbehind: true,
 +              alias: 'string'
 +      },
 +      'comment': /#.*/,
 +      'key': {
 +              pattern: /(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,
 +              lookbehind: true,
 +              alias: 'atrule'
 +      },
 +      'directive': {
 +              pattern: /(^[ \t]*)%.+/m,
 +              lookbehind: true,
 +              alias: 'important'
 +      },
 +      'datetime': {
 +              pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ 
\t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ 
\t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,
 +              lookbehind: true,
 +              alias: 'number'
 +      },
 +      'boolean': {
 +              pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,
 +              lookbehind: true,
 +              alias: 'important'
 +      },
 +      'null': {
 +              pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,
 +              lookbehind: true,
 +              alias: 'important'
 +      },
 +      'string': {
 +              pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ 
\t]*(?:$|,|]|}|\s*#))/m,
 +              lookbehind: true,
 +              greedy: true
 +      },
 +      'number': {
 +              pattern: /([:\-,[{]\s*(?:![^\s]+)?[ 
\t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
 +              lookbehind: true
 +      },
 +      'tag': /![^\s]+/,
 +      'important': /[&*][\w]+/,
 +      'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
  };
  
  Prism.languages.yml = Prism.languages.yaml;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]