highlight.js - npm Package Compare versions

Comparing version 8.9.1 to 9.0.0

lib/highlight.js

@@ -15,3 +15,3 @@ /*
     // is loaded with others that may still expect a global hljs.
-    window.hljs = factory({});
+    self.hljs = factory({});
 
@@ -21,3 +21,3 @@ // Finally register the global hljs with AMD.
       define('hljs', [], function() {
-        return window.hljs;
+        return self.hljs;
       });
@@ -677,3 +677,3 @@ }
   hljs.NUMBER_RE = '\\b\\d+(\\.\\d+)?';
-  hljs.C_NUMBER_RE = '(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+  hljs.C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
   hljs.BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
@@ -680,0 +680,0 @@ hljs.RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';

lib/index.js

@@ -25,2 +25,3 @@ var hljs = require('./highlight');
 hljs.registerLanguage('coffeescript', require('./languages/coffeescript'));
+hljs.registerLanguage('cos', require('./languages/cos'));
 hljs.registerLanguage('cpp', require('./languages/cpp'));
@@ -62,2 +63,3 @@ hljs.registerLanguage('crmsh', require('./languages/crmsh'));
 hljs.registerLanguage('haxe', require('./languages/haxe'));
+hljs.registerLanguage('hsp', require('./languages/hsp'));
 hljs.registerLanguage('http', require('./languages/http'));
@@ -83,2 +85,3 @@ hljs.registerLanguage('inform7', require('./languages/inform7'));
 hljs.registerLanguage('mercury', require('./languages/mercury'));
+hljs.registerLanguage('mipsasm', require('./languages/mipsasm'));
 hljs.registerLanguage('mizar', require('./languages/mizar'));
@@ -142,4 +145,5 @@ hljs.registerLanguage('perl', require('./languages/perl'));
 hljs.registerLanguage('xquery', require('./languages/xquery'));
+hljs.registerLanguage('yaml', require('./languages/yaml'));
 hljs.registerLanguage('zephir', require('./languages/zephir'));
 
 module.exports = hljs;

lib/languages/1c.js

@@ -31,3 +31,3 @@ module.exports = function(hljs){
     'установитьтана установитьтапо фиксшаблон формат цел шаблон';
-  var DQUOTE =  {className: 'dquote',  begin: '""'};
+  var DQUOTE =  {begin: '""'};
   var STR_START = {
@@ -58,30 +58,23 @@ className: 'string',
         contains: [
-          hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE_RU}),
           {
-            className: 'tail',
-            endsWithParent: true,
-            contains: [
-              {
-                className: 'params',
-                begin: '\\(', end: '\\)',
-                lexemes: IDENT_RE_RU,
-                keywords: 'знач',
-                contains: [STR_START, STR_CONT]
-              },
-              {
-                className: 'export',
-                begin: 'экспорт', endsWithParent: true,
-                lexemes: IDENT_RE_RU,
-                keywords: 'экспорт',
-                contains: [hljs.C_LINE_COMMENT_MODE]
-              }
-            ]
+            begin: 'экспорт', endsWithParent: true,
+            lexemes: IDENT_RE_RU,
+            keywords: 'экспорт',
+            contains: [hljs.C_LINE_COMMENT_MODE]
           },
-          hljs.C_LINE_COMMENT_MODE
+          {
+            className: 'params',
+            begin: '\\(', end: '\\)',
+            lexemes: IDENT_RE_RU,
+            keywords: 'знач',
+            contains: [STR_START, STR_CONT]
+          },
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.inherit(hljs.TITLE_MODE, {begin: IDENT_RE_RU})
         ]
       },
-      {className: 'preprocessor', begin: '#', end: '$'},
-      {className: 'date', begin: '\'\\d{2}\\.\\d{2}\\.(\\d{2}|\\d{4})\''}
+      {className: 'meta', begin: '#', end: '$'},
+      {className: 'number', begin: '\'\\d{2}\\.\\d{2}\\.(\\d{2}|\\d{4})\''} // date
     ]
   };
 };

lib/languages/actionscript.js

@@ -28,3 +28,3 @@ module.exports = function(hljs) {
       {
-        className: 'package',
+        className: 'class',
         beginKeywords: 'package', end: '{',
@@ -44,4 +44,5 @@ contains: [hljs.TITLE_MODE]
       {
-        className: 'preprocessor',
-        beginKeywords: 'import include', end: ';'
+        className: 'meta',
+        beginKeywords: 'import include', end: ';',
+        keywords: {'meta-keyword': 'import include'}
       },
@@ -66,6 +67,3 @@ {
           {
-            className: 'type',
-            begin: ':',
-            end: IDENT_FUNC_RETURN_TYPE_RE,
-            relevance: 10
+            begin: ':\\s*' + IDENT_FUNC_RETURN_TYPE_RE
           }
@@ -72,0 +70,0 @@ ]

lib/languages/apache.js

@@ -8,5 +8,5 @@ module.exports = function(hljs) {
       hljs.HASH_COMMENT_MODE,
-      {className: 'tag', begin: '</?', end: '>'},
+      {className: 'section', begin: '</?', end: '>'},
       {
-        className: 'keyword',
+        className: 'attribute',
         begin: /\w+/,
@@ -17,3 +17,3 @@ relevance: 0,
         keywords: {
-          common:
+          nomarkup:
             'order deny allow setenv rewriterule rewriteengine rewritecond documentroot ' +
@@ -31,7 +31,7 @@ 'sethandler errordocument loadmodule options header listen serverroot ' +
             {
-              className: 'sqbracket',
+              className: 'meta',
               begin: '\\s\\[', end: '\\]$'
             },
             {
-              className: 'cbracket',
+              className: 'variable',
               begin: '[\\$%]\\{', end: '\\}',
@@ -38,0 +38,0 @@ contains: ['self', NUMBER]

lib/languages/applescript.js

@@ -36,11 +36,9 @@ module.exports = function(hljs) {
         'without',
-      constant:
+      literal:
         'AppleScript false linefeed return pi quote result space tab true',
-      type:
+      built_in:
         'alias application boolean class constant date file integer list ' +
-        'number real record string text',
-      command:
+        'number real record string text ' +
         'activate beep count delay launch log offset read round ' +
-        'run say summarize write',
-      property:
+        'run say summarize write ' +
         'character characters contents day frontmost id item length ' +
@@ -54,7 +52,3 @@ 'month name paragraph paragraphs rest reverse running time version ' +
       {
-        className: 'type',
-        begin: '\\bPOSIX file\\b'
-      },
-      {
-        className: 'command',
+        className: 'built_in',
         begin:
@@ -72,3 +66,3 @@ '\\b(clipboard info|the clipboard|info for|list (disks|folder)|' +
       {
-        className: 'constant',
+        className: 'literal',
         begin:
@@ -83,11 +77,6 @@ '\\b(text item delimiters|current application|missing value)\\b'
           '(greater|less) than( or equal)?|(starts?|ends|begins?) with|' +
-          'contained by|comes (before|after)|a (ref|reference))\\b'
+          'contained by|comes (before|after)|a (ref|reference)|POSIX file|' +
+          'POSIX path|(date|time) string|quoted form)\\b'
       },
       {
-        className: 'property',
-        begin:
-          '\\b(POSIX path|(date|time) string|quoted form)\\b'
-      },
-      {
-        className: 'function_start',
         beginKeywords: 'on',
@@ -94,0 +83,0 @@ illegal: '[${=;\\n]',

lib/languages/armasm.js

@@ -8,3 +8,8 @@ module.exports = function(hljs) {
     keywords: {
-      literal:
+      meta:
+        //GNU preprocs
+        '.2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg '+
+        //ARM directives
+        'ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ',
+      built_in:
         'r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 '+ //standard registers
@@ -25,10 +30,5 @@ 'pc lr sp ip sl sb fp '+ //typical regs plus backward compatibility
         'd0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 '+
-        'd16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 ',
-    preprocessor:
-        //GNU preprocs
-        '.2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg '+
-        //ARM directives
-        'ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ',
-    built_in:
-        '{PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @ '
+        'd16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 ' +
+
+        '{PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @'
     },
@@ -83,3 +83,3 @@ contains: [
       {
-        className: 'label',
+        className: 'symbol',
         variants: [
@@ -86,0 +86,0 @@ {begin: '^[a-z_\\.\\$][a-z0-9_\\.\\$]+'}, //ARM syntax

lib/languages/asciidoc.js

@@ -37,14 +37,12 @@ module.exports = function(hljs) {
       {
-        className: 'header',
-        begin: '^(={1,5}) .+?( \\1)?$',
-        relevance: 10
+        className: 'section',
+        relevance: 10,
+        variants: [
+          {begin: '^(={1,5}) .+?( \\1)?$'},
+          {begin: '^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$'},
+        ]
       },
-      {
-        className: 'header',
-        begin: '^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$',
-        relevance: 10
-      },
       // document attributes
       {
-        className: 'attribute',
+        className: 'meta',
         begin: '^:.+?:',
@@ -57,3 +55,3 @@ end: '\\s',
       {
-        className: 'attribute',
+        className: 'meta',
         begin: '^\\[.+?\\]$',
@@ -64,3 +62,3 @@ relevance: 0
       {
-        className: 'blockquote',
+        className: 'quote',
         begin: '^_{4,}\\n',
@@ -97,3 +95,3 @@ end: '\\n_{4,}$',
       {
-        className: 'label',
+        className: 'symbol',
         begin: '^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+',
@@ -141,3 +139,3 @@ relevance: 10
       {
-        className: 'smartquote',
+        className: 'string',
         variants: [
@@ -163,3 +161,2 @@ {begin: "``.+?''"},
       {
-        className: 'horizontal_rule',
         begin: '^\'{3,}[ \\t]*$',
@@ -174,3 +171,2 @@ relevance: 10
           {
-            //className: 'macro',
             begin: '(link|image:?):',
@@ -180,3 +176,3 @@ relevance: 0
           {
-            className: 'link_url',
+            className: 'link',
             begin: '\\w',
@@ -187,3 +183,3 @@ end: '[^\\[]+',
           {
-            className: 'link_label',
+            className: 'string',
             begin: '\\[',
@@ -190,0 +186,0 @@ end: '\\]',

lib/languages/aspectj.js

@@ -21,6 +21,12 @@ module.exports = function (hljs) {
           relevance : 0,
-          contains : [{
-            className : 'doctag',
-            begin : '@[A-Za-z]+'
-          }]
+          contains : [
+            {
+              // eat up @'s in emails to prevent them to be recognized as doctags
+              begin: /\w+@/, relevance: 0
+            },
+            {
+              className : 'doctag',
+              begin : '@[A-Za-z]+'
+            }
+          ]
         }
@@ -33,3 +39,3 @@ ),
       {
-        className : 'aspect',
+        className : 'class',
         beginKeywords : 'aspect',
@@ -134,3 +140,3 @@ end : /[{;=]/,
         // annotation is also used in this language
-        className : 'annotation',
+        className : 'meta',
         begin : '@[A-Za-z]+'
@@ -137,0 +143,0 @@ }

lib/languages/autohotkey.js

 module.exports = function(hljs) {
   var BACKTICK_ESCAPE = {
-    className: 'escape',
-    begin: '`[\\s\\S]'
+    begin: /`[\s\S]/
   };
-  var COMMENTS = hljs.COMMENT(
-    ';',
-    '$',
-    {
-      relevance: 0
-    }
-  );
-  var BUILT_IN = [
-    {
-      className: 'built_in',
-      begin: 'A_[a-zA-Z0-9]+'
-    },
-    {
-      className: 'built_in',
-      beginKeywords: 'ComSpec Clipboard ClipboardAll ErrorLevel'
-    }
-  ];
 
@@ -28,8 +10,13 @@ return {
       keyword: 'Break Continue Else Gosub If Loop Return While',
-      literal: 'A true false NOT AND OR'
+      literal: 'A true false NOT AND OR',
+      built_in: 'ComSpec Clipboard ClipboardAll ErrorLevel',
     },
-    contains: BUILT_IN.concat([
+    contains: [
+      {
+        className: 'built_in',
+        begin: 'A_[a-zA-Z0-9]+'
+      },
       BACKTICK_ESCAPE,
       hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [BACKTICK_ESCAPE]}),
-      COMMENTS,
+      hljs.COMMENT(';', '$', {relevance: 0}),
       {
@@ -41,3 +28,3 @@ className: 'number',
       {
-        className: 'var_expand', // FIXME
+        className: 'variable', // FIXME
         begin: '%', end: '%',
@@ -48,3 +35,3 @@ illegal: '\\n',
       {
-        className: 'label',
+        className: 'symbol',
         contains: [BACKTICK_ESCAPE],
@@ -59,7 +46,6 @@ variants: [
         // consecutive commas, not for highlighting but just for relevance
-        begin: ',\\s*,',
-        relevance: 10
+        begin: ',\\s*,'
       }
-    ])
+    ]
   }
 };

lib/languages/avrasm.js

@@ -28,3 +28,3 @@ module.exports = function(hljs) {
         'ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf',
-      preprocessor:
+      meta:
         '.byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list ' +
@@ -54,6 +54,6 @@ '.listmac .macro .nolist .org .set'
       },
-      {className: 'label',  begin: '^[A-Za-z0-9_.$]+:'},
-      {className: 'preprocessor', begin: '#', end: '$'},
+      {className: 'symbol',  begin: '^[A-Za-z0-9_.$]+:'},
+      {className: 'meta', begin: '#', end: '$'},
       {  // подстановка в «.macro»
-        className: 'localvars',
+        className: 'subst',
         begin: '@[0-9]+'
@@ -60,0 +60,0 @@ }

lib/languages/axapta.js

@@ -16,3 +16,3 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$'
@@ -19,0 +19,0 @@ },

lib/languages/bash.js

@@ -52,3 +52,3 @@ module.exports = function(hljs) {
         'zpty zregexparse zsocket zstyle ztcp',
-      operator:
+      _:
         '-ne -eq -lt -gt -f -d -e -s -l -a' // relevance booster
@@ -58,3 +58,3 @@ },
       {
-        className: 'shebang',
+        className: 'meta',
         begin: /^#![^\n]+sh\s*$/,
@@ -71,3 +71,2 @@ relevance: 10
       hljs.HASH_COMMENT_MODE,
-      hljs.NUMBER_MODE,
       QUOTE_STRING,
@@ -74,0 +73,0 @@ APOS_STRING,

lib/languages/cal.js

@@ -32,3 +32,3 @@ module.exports = function(hljs) {
   var DATE = {
-      className: 'date',
+      className: 'number',
       begin: '\\b\\d+(\\.\\d+)?(DT|D|T)',
@@ -38,3 +38,3 @@ relevance: 0
   var DBL_QUOTED_VARIABLE = {
-      className: 'variable',
+      className: 'string', // not a string technically but makes sense to be highlighted in the same style
       begin: '"',
@@ -41,0 +41,0 @@ end: '"'

lib/languages/capnproto.js

@@ -18,3 +18,3 @@ module.exports = function(hljs) {
       {
-        className: 'shebang',
+        className: 'meta',
         begin: /@0x[\w\d]{16};/,
@@ -24,3 +24,3 @@ illegal: /\n/
       {
-        className: 'number',
+        className: 'symbol',
         begin: /@\d+\b/
@@ -27,0 +27,0 @@ },

lib/languages/ceylon.js

@@ -15,3 +15,2 @@ module.exports = function(hljs) {
     'doc by license see throws tagged';
-  var LANGUAGE_ANNOTATIONS = DECLARATION_MODIFIERS + ' ' + DOCUMENTATION;
   var SUBST = {
@@ -54,4 +53,4 @@ className: 'subst', excludeBegin: true, excludeEnd: true,
     keywords: {
-      keyword: KEYWORDS,
-      annotation: LANGUAGE_ANNOTATIONS
+      keyword: KEYWORDS + ' ' + DECLARATION_MODIFIERS,
+      meta: DOCUMENTATION
     },
@@ -64,3 +63,3 @@ illegal: '\\$[^01]|#[^0-9a-fA-F]',
         // compiler annotation
-        className: 'annotation',
+        className: 'meta',
         begin: '@[a-z]\\w*(?:\\:\"[^\"]*\")?'
@@ -67,0 +66,0 @@ }

lib/languages/clojure-repl.js

@@ -5,3 +5,3 @@ module.exports = function(hljs) {
       {
-        className: 'prompt',
+        className: 'meta',
         begin: /^([\w.-]+|\s*#_)=>/,
@@ -8,0 +8,0 @@ starts: {

lib/languages/clojure.js

 module.exports = function(hljs) {
   var keywords = {
-    built_in:
+    'builtin-name':
       // Clojure keywords
@@ -59,3 +59,2 @@ 'def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem '+
   var COLLECTION = {
-    className: 'collection',
     begin: '[\\[\\{]', end: '[\\]\\}]'
@@ -69,7 +68,6 @@ };
   var KEY = {
-    className: 'attribute',
+    className: 'symbol',
     begin: '[:]' + SYMBOL_RE
   };
   var LIST = {
-    className: 'list',
     begin: '\\(', end: '\\)'
@@ -84,3 +82,3 @@ };
     lexemes: SYMBOL_RE,
-    className: 'keyword', begin: SYMBOL_RE,
+    className: 'name', begin: SYMBOL_RE,
     starts: BODY
@@ -87,0 +85,0 @@ };

lib/languages/cmake.js

@@ -24,4 +24,3 @@ module.exports = function(hljs) {
         'subdirs use_mangled_mesa utility_source variable_requires write_file ' +
-        'qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or',
-      operator:
+        'qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or ' +
         'equal less greater strless strgreater strequal matches'
@@ -31,3 +30,3 @@ },
       {
-        className: 'envvar',
+        className: 'variable',
         begin: '\\${', end: '}'
@@ -34,0 +33,0 @@ },

lib/languages/coffeescript.js

@@ -66,4 +66,3 @@ module.exports = function(hljs) {
     {
-      className: 'property',
-      begin: '@' + JS_IDENT_RE
+      begin: '@' + JS_IDENT_RE // relevance booster
     },
@@ -134,3 +133,2 @@ {
       {
-        className: 'attribute',
         begin: JS_IDENT_RE + ':', end: ':',
@@ -137,0 +135,0 @@ returnBegin: true, returnEnd: true,

lib/languages/cpp.js

@@ -27,10 +27,11 @@ module.exports = function(hljs) {
       { begin: hljs.C_NUMBER_RE }
-    ]
+    ],
+    relevance: 0
   };
 
   var PREPROCESSOR =       {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '#', end: '$',
-    keywords: 'if else elif endif define undef warning error line ' +
-              'pragma ifdef ifndef',
+    keywords: {'meta-keyword': 'if else elif endif define undef warning error line ' +
+                  'pragma ifdef ifndef'},
     contains: [
@@ -42,6 +43,7 @@ {
         beginKeywords: 'include', end: '$',
+        keywords: {'meta-keyword': 'include'},
         contains: [
-          STRINGS,
+          hljs.inherit(STRINGS, {className: 'meta-string'}),
           {
-            className: 'string',
+            className: 'meta-string',
             begin: '<', end: '>',
@@ -53,3 +55,2 @@ illegal: '\\n',
       STRINGS,
-      NUMBERS,
       hljs.C_LINE_COMMENT_MODE,
@@ -81,3 +82,3 @@ hljs.C_BLOCK_COMMENT_MODE
       'strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan ' +
-      'vfprintf vprintf vsprintf',
+      'vfprintf vprintf vsprintf endl initializer_list unique_ptr',
     literal: 'true false nullptr NULL'
@@ -84,0 +85,0 @@ };

lib/languages/crmsh.js

@@ -24,5 +24,3 @@ module.exports = function(hljs) {
     keywords: {
-      keyword: KEYWORDS,
-      operator: OPERATORS,
-      type: TYPES,
+      keyword: KEYWORDS + ' ' + OPERATORS + ' ' + TYPES,
       literal: LITERALS
@@ -35,3 +33,2 @@ },
         starts: {
-          className: 'identifier',
           end: '\\s*([\\w_-]+:)?',
@@ -50,4 +47,3 @@ starts: {
           starts: {
-            className: 'pragma',
-            end: '\\s*@?[\\w_][\\w_\\.:-]*',
+            end: '\\s*@?[\\w_][\\w_\\.:-]*'
           }
@@ -61,3 +57,3 @@ }
           className: 'title',
-          end: '[\\$\\w_][\\w_-]*',
+          end: '[\\$\\w_][\\w_-]*'
         }
@@ -74,3 +70,3 @@ },
       {
-        className: 'pragma',
+        className: 'meta',
         begin: '(ocf|systemd|service|lsb):[\\w_:-]+',
@@ -85,3 +81,3 @@ relevance: 0
       {
-        className: 'number',
+        className: 'literal',
         begin: '[-]?(infinity|inf)',
@@ -91,3 +87,3 @@ relevance: 0
       {
-        className: 'variable',
+        className: 'attr',
         begin: /([A-Za-z\$_\#][\w_-]+)=/,
@@ -94,0 +90,0 @@ relevance: 0

lib/languages/crystal.js

@@ -21,3 +21,3 @@ module.exports = function(hljs) {
   var EXPANSION = {
-    className: 'expansion',
+    className: 'template-variable',
     variants: [
@@ -92,3 +92,3 @@ {begin: '\\{\\{', end: '\\}\\}'},
   var ATTRIBUTE = {
-    className: 'annotation',
+    className: 'meta',
     begin: '@\\[', end: '\\]',
@@ -111,10 +111,3 @@ relevance: 5
         hljs.inherit(hljs.TITLE_MODE, {begin: '[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?'}),
-        {
-          className: 'inheritance',
-          begin: '<\\s*',
-          contains: [{
-            className: 'parent',
-            begin: '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE
-          }]
-        }
+        {begin: '<'} // relevance booster for inheritance
       ]
@@ -154,7 +147,2 @@ },
     {
-      className: 'constant',
-      begin: '(::)?(\\b[A-Z]\\w*(::)?)+',
-      relevance: 0
-    },
-    {
       className: 'symbol',
@@ -179,6 +167,2 @@ begin: hljs.UNDERSCORE_IDENT_RE + '(\\!|\\?)?:',
       relevance: 0
-    },
-    {
-      className: 'variable',
-      begin: '(\\$\\W)|((\\$|\\@\\@?|%)(\\w+))'
     }
@@ -185,0 +169,0 @@ ];

lib/languages/cs.js

@@ -27,3 +27,3 @@ module.exports = function(hljs) {
             {
-              className: 'xmlDocTag',
+              className: 'doctag',
               variants: [
@@ -47,5 +47,5 @@ {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$',
-        keywords: 'if else elif endif define undef warning error line region endregion pragma checksum'
+        keywords: {'meta-keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'}
       },
@@ -73,8 +73,3 @@ {
         contains: [
-          {
-            // Customization of hljs.TITLE_MODE that allows '.'
-            className: 'title',
-            begin: '[a-zA-Z](\\.?\\w)*',
-            relevance: 0
-          },
+          hljs.inherit(hljs.TITLE_MODE, {begin: '[a-zA-Z](\\.?\\w)*'}),
           hljs.C_LINE_COMMENT_MODE,
@@ -81,0 +76,0 @@ hljs.C_BLOCK_COMMENT_MODE

lib/languages/css.js

 module.exports = function(hljs) {
   var IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
-  var FUNCTION = {
-    className: 'function',
-    begin: IDENT_RE + '\\(',
-    returnBegin: true,
-    excludeEnd: true,
-    end: '\\('
-  };
   var RULE = {
-    className: 'rule',
     begin: /[A-Z\_\.\-]+\s*:/, returnBegin: true, end: ';', endsWithParent: true,
@@ -18,6 +10,13 @@ contains: [
         starts: {
-          className: 'value',
           endsWithParent: true, excludeEnd: true,
           contains: [
-            FUNCTION,
+            {
+              begin: /[\w-]+\s*\(/, returnBegin: true,
+              contains: [
+                {
+                  className: 'built_in',
+                  begin: /[\w-]+/
+                }
+              ]
+            },
             hljs.CSS_NUMBER_MODE,
@@ -28,6 +27,6 @@ hljs.QUOTE_STRING_MODE,
             {
-              className: 'hexcolor', begin: '#[0-9A-Fa-f]+'
+              className: 'number', begin: '#[0-9A-Fa-f]+'
             },
             {
-              className: 'important', begin: '!important'
+              className: 'meta', begin: '!important'
             }
@@ -46,9 +45,9 @@ ]
       {
-        className: 'id', begin: /\#[A-Za-z0-9_-]+/
+        className: 'selector-id', begin: /#[A-Za-z0-9_-]+/
       },
       {
-        className: 'class', begin: /\.[A-Za-z0-9_-]+/
+        className: 'selector-class', begin: /\.[A-Za-z0-9_-]+/
       },
       {
-        className: 'attr_selector',
+        className: 'selector-attr',
         begin: /\[/, end: /\]/,
@@ -58,7 +57,6 @@ illegal: '$'
       {
-        className: 'pseudo',
+        className: 'selector-pseudo',
         begin: /:(:)?[a-zA-Z0-9\_\-\+\(\)"']+/
       },
       {
-        className: 'at_rule',
         begin: '@(font-face|page)',
@@ -69,3 +67,2 @@ lexemes: '[a-z-]+',
       {
-        className: 'at_rule',
         begin: '@', end: '[{;]', // at_rule eating first "{" is a good thing
@@ -84,3 +81,2 @@ // because it doesn’t let it to be parsed as
             contains: [
-              FUNCTION,
               hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE,
@@ -93,7 +89,6 @@ hljs.CSS_NUMBER_MODE
       {
-        className: 'tag', begin: IDENT_RE,
+        className: 'selector-tag', begin: IDENT_RE,
         relevance: 0
       },
       {
-        className: 'rules',
         begin: '{', end: '}',
@@ -100,0 +95,0 @@ illegal: /\S/,

lib/languages/d.js

@@ -195,3 +195,3 @@ module.exports = /**
   var D_HASHBANG_MODE = {
-    className: 'shebang',
+    className: 'meta',
     begin: '^#!',
@@ -208,3 +208,3 @@ end: '$',
   var D_SPECIAL_TOKEN_SEQUENCE_MODE = {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '#(line)',
@@ -211,0 +211,0 @@ end: '$',

lib/languages/dart.js

@@ -51,4 +51,4 @@ module.exports = function (hljs) {
     keyword: 'assert break case catch class const continue default do else enum extends false final finally for if ' +
-      'in is new null rethrow return super switch this throw true try var void while with',
-    literal: 'abstract as dynamic export external factory get implements import library operator part set static typedef',
+      'in is new null rethrow return super switch this throw true try var void while with ' +
+      'abstract as dynamic export external factory get implements import library operator part set static typedef',
     built_in:
@@ -94,3 +94,3 @@ // dart:core
       {
-        className: 'annotation', begin: '@[A-Za-z]+'
+        className: 'meta', begin: '@[A-Za-z]+'
       },
@@ -97,0 +97,0 @@ {

lib/languages/diff.js

@@ -6,3 +6,3 @@ module.exports = function(hljs) {
       {
-        className: 'chunk',
+        className: 'meta',
         relevance: 10,
@@ -16,3 +16,3 @@ variants: [
       {
-        className: 'header',
+        className: 'comment',
         variants: [
@@ -36,3 +36,3 @@ {begin: /Index: /, end: /$/},
       {
-        className: 'change',
+        className: 'addition',
         begin: '^\\!', end: '$'
@@ -39,0 +39,0 @@ }

lib/languages/django.js

 module.exports = function(hljs) {
   var FILTER = {
-    className: 'filter',
     begin: /\|[A-Za-z]+:?/,
-    keywords:
-      'truncatewords removetags linebreaksbr yesno get_digit timesince random striptags ' +
-      'filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands ' +
-      'title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode ' +
-      'timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort ' +
-      'dictsortreversed default_if_none pluralize lower join center default ' +
-      'truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first ' +
-      'escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize ' +
-      'localtime utc timezone',
+    keywords: {
+      name:
+        'truncatewords removetags linebreaksbr yesno get_digit timesince random striptags ' +
+        'filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands ' +
+        'title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode ' +
+        'timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort ' +
+        'dictsortreversed default_if_none pluralize lower join center default ' +
+        'truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first ' +
+        'escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize ' +
+        'localtime utc timezone'
+    },
     contains: [
-      {className: 'argument', begin: /"/, end: /"/},
-      {className: 'argument', begin: /'/, end: /'/}
+      hljs.QUOTE_STRING_MODE,
+      hljs.APOS_STRING_MODE
     ]
@@ -28,18 +29,31 @@ };
       {
-        className: 'template_tag',
+        className: 'template-tag',
         begin: /\{%/, end: /%}/,
-        keywords:
-          'comment endcomment load templatetag ifchanged endifchanged if endif firstof for ' +
-          'endfor in ifnotequal endifnotequal widthratio extends include spaceless ' +
-          'endspaceless regroup by as ifequal endifequal ssi now with cycle url filter ' +
-          'endfilter debug block endblock else autoescape endautoescape csrf_token empty elif ' +
-          'endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix ' +
-          'plural get_current_language language get_available_languages ' +
-          'get_current_language_bidi get_language_info get_language_info_list localize ' +
-          'endlocalize localtime endlocaltime timezone endtimezone get_current_timezone ' +
-          'verbatim',
-        contains: [FILTER]
+        contains: [
+          {
+            className: 'name',
+            begin: /\w+/,
+            keywords: {
+              name:
+                'comment endcomment load templatetag ifchanged endifchanged if endif firstof for ' +
+                'endfor ifnotequal endifnotequal widthratio extends include spaceless ' +
+                'endspaceless regroup ifequal endifequal ssi now with cycle url filter ' +
+                'endfilter debug block endblock else autoescape endautoescape csrf_token empty elif ' +
+                'endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix ' +
+                'plural get_current_language language get_available_languages ' +
+                'get_current_language_bidi get_language_info get_language_info_list localize ' +
+                'endlocalize localtime endlocaltime timezone endtimezone get_current_timezone ' +
+                'verbatim'
+            },
+            starts: {
+              endsWithParent: true,
+              keywords: 'in by as',
+              contains: [FILTER],
+              relevance: 0
+            }
+          }
+        ]
       },
       {
-        className: 'variable',
+        className: 'template-variable',
         begin: /\{\{/, end: /}}/,
@@ -46,0 +60,0 @@ contains: [FILTER]

lib/languages/dns.js

@@ -12,4 +12,4 @@ module.exports = function(hljs) {
       {
-        className: 'operator',
-        beginKeywords: '$TTL $GENERATE $INCLUDE $ORIGIN'
+        className: 'meta',
+        begin: /^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/
       },
@@ -19,3 +19,3 @@ // IPv6
         className: 'number',
-        begin: '((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))'
+        begin: '((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b'
       },
@@ -25,6 +25,7 @@ // IPv4
         className: 'number',
-        begin: '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])'
-      }
+        begin: '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b'
+      },
+      hljs.inherit(hljs.NUMBER_MODE, {begin: /\b\d+[dhwm]?/})
     ]
   };
 };

lib/languages/dockerfile.js

@@ -5,11 +5,7 @@ module.exports = function(hljs) {
     case_insensitive: true,
-    keywords: {
-      built_ins: 'from maintainer cmd expose add copy entrypoint volume user workdir onbuild run env label'
-    },
+    keywords: 'from maintainer cmd expose add copy entrypoint volume user workdir onbuild run env label',
     contains: [
       hljs.HASH_COMMENT_MODE,
       {
-        keywords : {
-          built_in: 'run cmd entrypoint volume add copy workdir onbuild label'
-        },
+        keywords: 'run cmd entrypoint volume add copy workdir onbuild label',
         begin: /^ *(onbuild +)?(run|cmd|entrypoint|volume|add|copy|workdir|label) +/,
@@ -22,5 +18,3 @@ starts: {
       {
-        keywords: {
-          built_in: 'from maintainer expose env user onbuild'
-        },
+        keywords: 'from maintainer expose env user onbuild',
         begin: /^ *(onbuild +)?(from|maintainer|expose|env|user|onbuild) +/, end: /[^\\]\n/,
@@ -27,0 +21,0 @@ contains: [

lib/languages/dos.js

@@ -9,3 +9,3 @@ module.exports = function(hljs) {
   var LABEL = {
-    className: 'label',
+    className: 'symbol',
     begin: '^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)',
@@ -19,16 +19,19 @@ relevance: 0
     keywords: {
-      flow: 'if else goto for in do call exit not exist errorlevel defined',
-      operator: 'equ neq lss leq gtr geq',
-      keyword: 'shift cd dir echo setlocal endlocal set pause copy',
-      stream: 'prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux',
-      winutils: 'ping net ipconfig taskkill xcopy ren del',
-      built_in: 'append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color ' +
+      keyword:
+        'if else goto for in do call exit not exist errorlevel defined ' +
+        'equ neq lss leq gtr geq',
+      built_in:
+        'prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux ' +
+        'shift cd dir echo setlocal endlocal set pause copy ' +
+        'append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color ' +
         'comp compact convert date dir diskcomp diskcopy doskey erase fs ' +
         'find findstr format ftype graftabl help keyb label md mkdir mode more move path ' +
         'pause print popd pushd promt rd recover rem rename replace restore rmdir shift' +
-        'sort start subst time title tree type ver verify vol'
+        'sort start subst time title tree type ver verify vol ' +
+        // winutils
+        'ping net ipconfig taskkill xcopy ren del'
     },
     contains: [
       {
-        className: 'envvar', begin: /%%[^ ]|%[^ ]+?%|![^ ]+?!/
+        className: 'variable', begin: /%%[^ ]|%[^ ]+?%|![^ ]+?!/
       },
@@ -35,0 +38,0 @@ {

lib/languages/dust.js

@@ -9,24 +9,21 @@ module.exports = function(hljs) {
       {
-        className: 'expression',
-        begin: '{', end: '}',
-        relevance: 0,
+        className: 'template-tag',
+        begin: /\{[#\/]/, end: /\}/, illegal: /;/,
         contains: [
           {
-            className: 'begin-block', begin: '\#[a-zA-Z\-\ \.]+',
-            keywords: EXPRESSION_KEYWORDS
-          },
-          {
-            className: 'string',
-            begin: '"', end: '"'
-          },
-          {
-            className: 'end-block', begin: '\\\/[a-zA-Z\-\ \.]+',
-            keywords: EXPRESSION_KEYWORDS
-          },
-          {
-            className: 'variable', begin: '[a-zA-Z\-\.]+',
-            keywords: EXPRESSION_KEYWORDS,
-            relevance: 0
+            className: 'name',
+            begin: /[a-zA-Z\.-]+/,
+            starts: {
+              endsWithParent: true, relevance: 0,
+              contains: [
+                hljs.QUOTE_STRING_MODE
+              ]
+            }
           }
         ]
+      },
+      {
+        className: 'template-variable',
+        begin: /\{/, end: /\}/, illegal: /;/,
+        keywords: EXPRESSION_KEYWORDS
       }
@@ -33,0 +30,0 @@ ]

lib/languages/elixir.js

@@ -46,7 +46,2 @@ module.exports = function(hljs) {
     {
-      className: 'constant',
-      begin: '(\\b[A-Z_]\\w*(.)?)+',
-      relevance: 0
-    },
-    {
       className: 'symbol',
@@ -53,0 +48,0 @@ begin: ':',

lib/languages/elm.js

 module.exports = function(hljs) {
-  var COMMENT_MODES = [
-    hljs.COMMENT('--', '$'),
-    hljs.COMMENT(
-      '{-',
-      '-}',
-      {
-        contains: ['self']
-      }
-    )
-  ];
+  var COMMENT = {
+    variants: [
+      hljs.COMMENT('--', '$'),
+      hljs.COMMENT(
+        '{-',
+        '-}',
+        {
+          contains: ['self']
+        }
+      )
+    ]
+  };
 
   var CONSTRUCTOR = {
     className: 'type',
-    begin: '\\b[A-Z][\\w\']*', // TODO: other constructors (build-in, infix).
+    begin: '\\b[A-Z][\\w\']*', // TODO: other constructors (built-in, infix).
     relevance: 0
@@ -20,12 +22,11 @@ };
   var LIST = {
-    className: 'container',
     begin: '\\(', end: '\\)',
     illegal: '"',
     contains: [
-      {className: 'type', begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'}
-    ].concat(COMMENT_MODES)
+      {className: 'type', begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'},
+      COMMENT
+    ]
   };
 
   var RECORD = {
-    className: 'container',
     begin: '{', end: '}',
@@ -44,31 +45,26 @@ contains: LIST.contains
       {
-        className: 'module',
-        begin: '\\bmodule\\b', end: 'where',
+        beginKeywords: 'module', end: 'where',
         keywords: 'module where',
-        contains: [LIST].concat(COMMENT_MODES),
+        contains: [LIST, COMMENT],
         illegal: '\\W\\.|;'
       },
       {
-        className: 'import',
-        begin: '\\bimport\\b', end: '$',
-        keywords: 'import|0 as exposing',
-        contains: [LIST].concat(COMMENT_MODES),
+        begin: 'import', end: '$',
+        keywords: 'import as exposing',
+        contains: [LIST, COMMENT],
         illegal: '\\W\\.|;'
       },
       {
-        className: 'typedef',
-        begin: '\\btype\\b', end: '$',
+        begin: 'type', end: '$',
         keywords: 'type alias',
-        contains: [CONSTRUCTOR, LIST, RECORD].concat(COMMENT_MODES)
+        contains: [CONSTRUCTOR, LIST, RECORD, COMMENT]
       },
       {
-        className: 'infix',
         beginKeywords: 'infix infixl infixr', end: '$',
-        contains: [hljs.C_NUMBER_MODE].concat(COMMENT_MODES)
+        contains: [hljs.C_NUMBER_MODE, COMMENT]
       },
       {
-        className: 'foreign',
-        begin: '\\bport\\b', end: '$',
+        begin: 'port', end: '$',
         keywords: 'port',
-        contains: COMMENT_MODES
+        contains: [COMMENT]
       },
@@ -83,6 +79,7 @@
       hljs.inherit(hljs.TITLE_MODE, {begin: '^[_a-z][\\w\']*'}),
+      COMMENT,
 
       {begin: '->|<-'} // No markup, relevance booster
-    ].concat(COMMENT_MODES)
+    ]
   };
 };

lib/languages/erlang-repl.js

 module.exports = function(hljs) {
   return {
     keywords: {
-      special_functions:
+      built_in:
         'spawn spawn_link self',
-      reserved:
+      keyword:
         'after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if ' +
@@ -12,3 +12,3 @@ 'let not of or orelse|10 query receive rem try when xor'
       {
-        className: 'prompt', begin: '^[0-9]+> ',
+        className: 'meta', begin: '^[0-9]+> ',
         relevance: 10
@@ -25,15 +25,14 @@ },
       {
-        className: 'constant', begin: '\\?(::)?([A-Z]\\w*(::)?)+'
+        begin: '\\?(::)?([A-Z]\\w*(::)?)+'
       },
       {
-        className: 'arrow', begin: '->'
+        begin: '->'
       },
       {
-        className: 'ok', begin: 'ok'
+        begin: 'ok'
       },
       {
-        className: 'exclamation_mark', begin: '!'
+        begin: '!'
       },
       {
-        className: 'function_or_atom',
         begin: '(\\b[a-z\'][a-zA-Z0-9_\']*:[a-z\'][a-zA-Z0-9_\']*)|(\\b[a-z\'][a-zA-Z0-9_\']*)',
@@ -43,3 +42,2 @@ relevance: 0
       {
-        className: 'variable',
         begin: '[A-Z][a-zA-Z0-9_\']*',
@@ -46,0 +44,0 @@ relevance: 0

lib/languages/erlang.js

@@ -27,4 +27,3 @@ module.exports = function(hljs) {
       {
-        className: 'function_name', begin: FUNCTION_NAME_RE,
-        relevance: 0
+        begin: FUNCTION_NAME_RE, relevance: 0
       },
@@ -40,3 +39,2 @@ {
   var TUPLE = {
-    className: 'tuple',
     begin: '{', end: '}',
@@ -47,3 +45,2 @@ relevance: 0
   var VAR1 = {
-    className: 'variable',
     begin: '\\b_([A-Z][A-Za-z0-9_]*)?',
@@ -53,3 +50,2 @@ relevance: 0
   var VAR2 = {
-    className: 'variable',
     begin: '[A-Z][a-zA-Z0-9_]*',
@@ -64,3 +60,2 @@ relevance: 0
       {
-        className: 'record_name',
         begin: '#' + hljs.UNDERSCORE_IDENT_RE,
@@ -136,3 +131,2 @@ relevance: 0
       {
-        className: 'pp',
         begin: '^-', end: '\\.',
@@ -139,0 +133,0 @@ relevance: 0,

lib/languages/fix.js

@@ -16,3 +16,3 @@ module.exports = function(hljs) {
         returnBegin: false,
-        className: 'attribute'
+        className: 'attr'
       },
@@ -19,0 +19,0 @@ {

lib/languages/fortran.js

@@ -8,6 +8,3 @@ module.exports = function(hljs) {
   var F_KEYWORDS = {
-    constant: '.False. .True.',
-    type: 'integer real character complex logical dimension allocatable|10 parameter ' +
-      'external implicit|10 none double precision assign intent optional pointer ' +
-      'target in out common equivalence data',
+    literal: '.False. .True.',
     keyword: 'kind do while private call intrinsic where elsewhere ' +
@@ -29,3 +26,6 @@ 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then ' +
       'ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive ' +
-      'pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure',
+      'pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure ' +
+      'integer real character complex logical dimension allocatable|10 parameter ' +
+      'external implicit|10 none double precision assign intent optional pointer ' +
+      'target in out common equivalence data',
     built_in: 'alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint ' +
@@ -32,0 +32,0 @@ 'dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl ' +

lib/languages/fsharp.js

@@ -44,3 +44,3 @@ module.exports = function(hljs) {
       {
-        className: 'annotation',
+        className: 'meta',
         begin: '\\[<', end: '>\\]',
@@ -50,3 +50,3 @@ relevance: 10
       {
-        className: 'attribute',
+        className: 'symbol',
         begin: '\\B(\'[A-Za-z])\\b',
@@ -53,0 +53,0 @@ contains: [hljs.BACKSLASH_ESCAPE]

lib/languages/gams.js

@@ -14,3 +14,2 @@ module.exports = function (hljs) {
       {
-        className: 'section',
         beginKeywords: 'sets parameters variables equations',
@@ -17,0 +16,0 @@ end: ';',

lib/languages/gcode.js

 module.exports = function(hljs) {
     var GCODE_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
     var GCODE_CLOSE_RE = '\\%';
-    var GCODE_KEYWORDS = {
-        literal:
-            '',
-        built_in:
-            '',
-        keyword:
-            'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT ' +
-            'EQ LT GT NE GE LE OR XOR'
-    };
+    var GCODE_KEYWORDS =
+      'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT ' +
+      'EQ LT GT NE GE LE OR XOR';
     var GCODE_START = {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '([O])([0-9]+)'
@@ -25,11 +19,11 @@ };
         {
-            className: 'keyword',
+            className: 'name',
             begin: '([G])([0-9]+\\.?[0-9]?)'
         },
         {
-            className: 'title',
+            className: 'name',
             begin: '([M])([0-9]+\\.?[0-9]?)'
         },
         {
-            className: 'title',
+            className: 'attr',
             begin: '(VC|VS|#)',
@@ -39,3 +33,3 @@ end: '(\\d+)'
         {
-            className: 'title',
+            className: 'attr',
             begin: '(VZOFX|VZOFY|VZOFZ)'
@@ -49,3 +43,3 @@ },
         {
-            className: 'label',
+            className: 'symbol',
             variants: [
@@ -69,3 +63,3 @@ {
             {
-                className: 'preprocessor',
+                className: 'meta',
                 begin: GCODE_CLOSE_RE
@@ -72,0 +66,0 @@ },

lib/languages/gherkin.js

@@ -10,4 +10,7 @@ module.exports = function (hljs) {
       },
-      hljs.COMMENT('@[^@\r\n\t ]+', '$'),
       {
+        className: 'meta',
+        begin: '@[^@\\s]+'
+      },
+      {
         begin: '\\|', end: '\\|\\w*$',
@@ -14,0 +17,0 @@ contains: [

lib/languages/glsl.js

@@ -5,30 +5,41 @@ module.exports = function(hljs) {
       keyword:
-        'atomic_uint attribute bool break bvec2 bvec3 bvec4 case centroid coherent const continue default ' +
-        'discard dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 ' +
-        'dmat4x4 do double dvec2 dvec3 dvec4 else flat float for highp if iimage1D iimage1DArray ' +
-        'iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube ' +
-        'iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect ' +
-        'image3D imageBuffer imageCube imageCubeArray in inout int invariant isampler1D isampler1DArray ' +
-        'isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer ' +
-        'isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 layout lowp mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 ' +
-        'mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 mediump noperspective out patch precision readonly restrict ' +
-        'return sample sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray ' +
-        'sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow ' +
-        'sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow smooth ' +
-        'struct subroutine switch uimage1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray ' +
-        'uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint uniform usampler1D usampler1DArray ' +
-        'usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D usamplerBuffer ' +
-        'usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 varying vec2 vec3 vec4 void volatile while writeonly',
+        // Statements
+        'break continue discard do else for if return while' +
+        // Qualifiers
+        'attribute binding buffer ccw centroid centroid varying coherent column_major const cw ' +
+        'depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing ' +
+        'flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant ' +
+        'invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y ' +
+        'local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left ' +
+        'out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f '+
+        'r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict ' +
+        'rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 ' +
+        'rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 ' +
+        'rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip ' +
+        'triangles triangles_adjacency uniform varying vertices volatile writeonly',
+      type:
+        'atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 ' +
+        'dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray ' +
+        'iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer' +
+        'iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray ' +
+        'image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray ' +
+        'isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D ' +
+        'isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 ' +
+        'mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray ' +
+        'sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow ' +
+        'sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D ' +
+        'samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow ' +
+        'image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect ' +
+        'uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray ' +
+        'usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D ' +
+        'samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void',
       built_in:
-        'gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial ' +
-        'gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color ' +
-        'gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord ' +
-        'gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor ' +
-        'gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial ' +
-        'gl_FrontSecondaryColor gl_InstanceID gl_InvocationID gl_Layer gl_LightModel ' +
-        'gl_LightSource gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize ' +
-        'gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers ' +
-        'gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs ' +
-        'gl_MaxCombinedTextureImageUnits gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers ' +
-        'gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents ' +
+        // Constants
+        'gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes ' +
+        'gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms ' +
+        'gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers ' +
+        'gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits ' +
+        'gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize ' +
+        'gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters ' +
+        'gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors ' +
         'gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers ' +
@@ -47,36 +58,48 @@ 'gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents ' +
         'gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors ' +
-        'gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs ' +
-        'gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexTextureImageUnits ' +
-        'gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset'+
-        'gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose ' +
-        'gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse ' +
-        'gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose ' +
-        'gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 ' +
-        'gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix ' +
-        'gl_NormalScale gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn ' +
-        'gl_PerVertex gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn ' +
-        'gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose ' +
-        'gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition ' +
-        'gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor ' +
-        'gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID ' +
-        'gl_ViewportIndex gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive ' +
-        'abs acos acosh all any asin asinh atan atanh atomicCounter atomicCounterDecrement ' +
-        'atomicCounterIncrement barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ' +
-        'ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward ' +
-        'findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan ' +
-        'greaterThanEqual imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange ' +
-        'imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageStore imulExtended ' +
-        'intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt ' +
-        'isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier ' +
-        'min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 ' +
-        'packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract ' +
-        'round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj ' +
-        'shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture ' +
-        'texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj ' +
-        'texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod ' +
-        'textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod ' +
-        'textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod ' +
-        'textureProjLodOffset textureProjOffset textureQueryLod textureSize transpose trunc uaddCarry ' +
-        'uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 ' +
-        'unpackUnorm2x16 unpackUnorm4x8 usubBorrow gl_TextureMatrix gl_TextureMatrixInverse',
+        'gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms ' +
+        'gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits ' +
+        'gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset ' +
+        // Variables
+        'gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial ' +
+        'gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color ' +
+        'gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord ' +
+        'gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor ' +
+        'gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial ' +
+        'gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel ' +
+        'gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix ' +
+        'gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose ' +
+        'gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose ' +
+        'gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 ' +
+        'gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 ' +
+        'gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ ' +
+        'gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord ' +
+        'gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse ' +
+        'gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask ' +
+        'gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter ' +
+        'gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose ' +
+        'gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out ' +
+        // Functions
+        'EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin ' +
+        'asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement ' +
+        'atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier ' +
+        'bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross ' +
+        'dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB ' +
+        'floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan ' +
+        'greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap ' +
+        'imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad ' +
+        'imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset ' +
+        'interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log ' +
+        'log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer ' +
+        'memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 ' +
+        'normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 ' +
+        'packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod ' +
+        'shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh ' +
+        'smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod ' +
+        'texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod ' +
+        'texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod ' +
+        'textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset ' +
+        'textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset ' +
+        'textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod ' +
+        'textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 ' +
+        'unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow',
       literal: 'true false'
@@ -90,3 +113,3 @@ },
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$'
@@ -93,0 +116,0 @@ }

lib/languages/go.js

@@ -5,8 +5,7 @@ module.exports = function(hljs) {
       'break default func interface select case map struct chan else goto package switch ' +
-      'const fallthrough if range type continue for import return var go defer',
-    constant:
-       'true false iota nil',
-    typename:
+      'const fallthrough if range type continue for import return var go defer ' +
       'bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 ' +
       'uint16 uint32 uint64 int uint uintptr rune',
+    literal:
+       'true false iota nil',
     built_in:
@@ -16,3 +15,3 @@ 'append cap close complex copy imag len make new panic print println real recover delete'
   return {
-    aliases: ["golang"],
+    aliases: ['golang'],
     keywords: GO_KEYWORDS,
@@ -19,0 +18,0 @@ illegal: '</',

lib/languages/golo.js

@@ -8,4 +8,3 @@ module.exports = function(hljs) {
           'augment augmentation each find filter reduce ' +
-          'if then else otherwise try catch finally raise throw orIfNull',
-        typename:
+          'if then else otherwise try catch finally raise throw orIfNull ' +
           'DynamicObject|10 DynamicVariable struct Observable map set vector list array',
@@ -20,3 +19,3 @@ literal:
         {
-          className: 'annotation', begin: '@[A-Za-z]+'
+          className: 'meta', begin: '@[A-Za-z]+'
         }
@@ -23,0 +22,0 @@ ]

lib/languages/groovy.js

 module.exports = function(hljs) {
     return {
         keywords: {
-            typename: 'byte short char int long boolean float double void',
             literal : 'true false null',
             keyword:
+            'byte short char int long boolean float double void ' +
             // groovy specific keywords
@@ -21,6 +21,12 @@ 'def as in assert trait ' +
                     relevance : 0,
-                    contains : [{
-                        className : 'doctag',
-                        begin : '@[A-Za-z]+'
-                    }]
+                    contains : [
+                      {
+                          // eat up @'s in emails to prevent them to be recognized as doctags
+                          begin: /\w+@/, relevance: 0
+                      },
+                      {
+                          className : 'doctag',
+                          begin : '@[A-Za-z]+'
+                      }
+                    ]
                 }
@@ -53,3 +59,3 @@ ),
             {
-                className: 'shebang',
+                className: 'meta',
                 begin: "^#!/usr/bin/env", end: '$',
@@ -70,3 +76,3 @@ illegal: '\n'
             {
-                className: 'annotation', begin: '@[A-Za-z]+'
+                className: 'meta', begin: '@[A-Za-z]+'
             },
@@ -84,8 +90,8 @@ {
                 // highlight labeled statements
-                className: 'label', begin: '^\\s*[A-Za-z0-9_$]+:',
+                className: 'symbol', begin: '^\\s*[A-Za-z0-9_$]+:',
                 relevance: 0
             },
         ],
-        illegal: /#/
+        illegal: /#|<\//
     }
 };

lib/languages/haml.js

@@ -7,3 +7,3 @@ module.exports = // TODO support filter tags like :javascript, support inline HTML
       {
-        className: 'doctype',
+        className: 'meta',
         begin: '^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$',
@@ -32,16 +32,18 @@ relevance: 10
           {
-            className: 'title',
+            className: 'selector-tag',
             begin: '\\w+'
           },
           {
-            className: 'value',
-            begin: '[#\\.][\\w-]+'
+            className: 'selector-id',
+            begin: '#[\\w-]+'
           },
           {
+            className: 'selector-class',
+            begin: '\\.[\\w-]+'
+          },
+          {
             begin: '{\\s*',
             end: '\\s*}',
-            excludeEnd: true,
             contains: [
               {
-                //className: 'attribute',
                 begin: ':\\w+\\s*=>',
@@ -53,3 +55,3 @@ end: ',\\s+',
                   {
-                    className: 'symbol',
+                    className: 'attr',
                     begin: ':\\w+'
@@ -73,3 +75,2 @@ },
               {
-                //className: 'attribute',
                 begin: '\\w+\\s*=',
@@ -81,3 +82,3 @@ end: '\\s+',
                   {
-                    className: 'attribute',
+                    className: 'attr',
                     begin: '\\w+',
@@ -99,5 +100,3 @@ relevance: 0
       {
-        className: 'bullet',
-        begin: '^\\s*[=~]\\s*',
-        relevance: 0
+        begin: '^\\s*[=~]\\s*'
       },
@@ -104,0 +103,0 @@ {

lib/languages/handlebars.js

 module.exports = function(hljs) {
-  var EXPRESSION_KEYWORDS = 'each in with if else unless bindattr action collection debugger log outlet template unbound view yield';
+  var BUILT_INS = {'builtin-name': 'each in with if else unless bindattr action collection debugger log outlet template unbound view yield'};
   return {
@@ -8,23 +8,24 @@ aliases: ['hbs', 'html.hbs', 'html.handlebars'],
     contains: [
+    hljs.COMMENT('{{!(--)?', '(--)?}}'),
       {
-        className: 'expression',
-        begin: '{{', end: '}}',
+        className: 'template-tag',
+        begin: /\{\{[#\/]/, end: /\}\}/,
         contains: [
           {
-            className: 'begin-block', begin: '\#[a-zA-Z\-\ \.]+',
-            keywords: EXPRESSION_KEYWORDS
-          },
-          {
-            className: 'string',
-            begin: '"', end: '"'
-          },
-          {
-            className: 'end-block', begin: '\\\/[a-zA-Z\-\ \.]+',
-            keywords: EXPRESSION_KEYWORDS
-          },
-          {
-            className: 'variable', begin: '[a-zA-Z\-\.]+',
-            keywords: EXPRESSION_KEYWORDS
+            className: 'name',
+            begin: /[a-zA-Z\.-]+/,
+            keywords: BUILT_INS,
+            starts: {
+              endsWithParent: true, relevance: 0,
+              contains: [
+                hljs.QUOTE_STRING_MODE
+              ]
+            }
           }
         ]
+      },
+      {
+        className: 'template-variable',
+        begin: /\{\{/, end: /\}\}/,
+        keywords: BUILT_INS
       }
@@ -31,0 +32,0 @@ ]

lib/languages/haskell.js

 module.exports = function(hljs) {
-  var COMMENT_MODES = [
-    hljs.COMMENT('--', '$'),
-    hljs.COMMENT(
-      '{-',
-      '-}',
-      {
-        contains: ['self']
-      }
-    )
-  ];
+  var COMMENT = {
+    variants: [
+      hljs.COMMENT('--', '$'),
+      hljs.COMMENT(
+        '{-',
+        '-}',
+        {
+          contains: ['self']
+        }
+      )
+    ]
+  };
 
   var PRAGMA = {
-    className: 'pragma',
+    className: 'meta',
     begin: '{-#', end: '#-}'
@@ -19,3 +21,3 @@ };
   var PREPROCESSOR = {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '^#', end: '$'
@@ -31,3 +33,2 @@ };
   var LIST = {
-    className: 'container',
     begin: '\\(', end: '\\)',
@@ -39,8 +40,8 @@ illegal: '"',
       {className: 'type', begin: '\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?'},
-      hljs.inherit(hljs.TITLE_MODE, {begin: '[_a-z][\\w\']*'})
-    ].concat(COMMENT_MODES)
+      hljs.inherit(hljs.TITLE_MODE, {begin: '[_a-z][\\w\']*'}),
+      COMMENT
+    ]
   };
 
   var RECORD = {
-    className: 'container',
     begin: '{', end: '}',
@@ -62,13 +63,11 @@ contains: LIST.contains
       {
-        className: 'module',
-        begin: '\\bmodule\\b', end: 'where',
+        beginKeywords: 'module', end: 'where',
         keywords: 'module where',
-        contains: [LIST].concat(COMMENT_MODES),
+        contains: [LIST, COMMENT],
         illegal: '\\W\\.|;'
       },
       {
-        className: 'import',
         begin: '\\bimport\\b', end: '$',
-        keywords: 'import|0 qualified as hiding',
-        contains: [LIST].concat(COMMENT_MODES),
+        keywords: 'import qualified as hiding',
+        contains: [LIST, COMMENT],
         illegal: '\\W\\.|;'
@@ -81,29 +80,26 @@ },
         keywords: 'class family instance where',
-        contains: [CONSTRUCTOR, LIST].concat(COMMENT_MODES)
+        contains: [CONSTRUCTOR, LIST, COMMENT]
       },
       {
-        className: 'typedef',
+        className: 'class',
         begin: '\\b(data|(new)?type)\\b', end: '$',
         keywords: 'data family type newtype deriving',
-        contains: [PRAGMA, CONSTRUCTOR, LIST, RECORD].concat(COMMENT_MODES)
+        contains: [PRAGMA, CONSTRUCTOR, LIST, RECORD, COMMENT]
       },
       {
-        className: 'default',
         beginKeywords: 'default', end: '$',
-        contains: [CONSTRUCTOR, LIST].concat(COMMENT_MODES)
+        contains: [CONSTRUCTOR, LIST, COMMENT]
       },
       {
-        className: 'infix',
         beginKeywords: 'infix infixl infixr', end: '$',
-        contains: [hljs.C_NUMBER_MODE].concat(COMMENT_MODES)
+        contains: [hljs.C_NUMBER_MODE, COMMENT]
       },
       {
-        className: 'foreign',
         begin: '\\bforeign\\b', end: '$',
         keywords: 'foreign import export ccall stdcall cplusplus jvm ' +
                   'dotnet safe unsafe',
-        contains: [CONSTRUCTOR, hljs.QUOTE_STRING_MODE].concat(COMMENT_MODES)
+        contains: [CONSTRUCTOR, hljs.QUOTE_STRING_MODE, COMMENT]
       },
       {
-        className: 'shebang',
+        className: 'meta',
         begin: '#!\\/usr\\/bin\\/env\ runhaskell', end: '$'
@@ -125,5 +121,7 @@ },
 
+      COMMENT,
+
       {begin: '->|<-'} // No markup, relevance booster
-    ].concat(COMMENT_MODES)
+    ]
   };
 };

lib/languages/haxe.js

@@ -30,5 +30,5 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$',
-        keywords: 'if else elseif end error'
+        keywords: {'meta-keyword': 'if else elseif end error'}
       },
@@ -52,6 +52,3 @@ {
           {
-            className: 'type',
-            begin: ':',
-            end: IDENT_FUNC_RETURN_TYPE_RE,
-            relevance: 10
+            begin: ':\\s*' + IDENT_FUNC_RETURN_TYPE_RE
           }
@@ -58,0 +55,0 @@ ]

lib/languages/http.js

 module.exports = function(hljs) {
+  var VERSION = 'HTTP/[0-9\\.]+';
   return {
@@ -7,9 +8,7 @@ aliases: ['https'],
       {
-        className: 'status',
-        begin: '^HTTP/[0-9\\.]+', end: '$',
+        begin: '^' + VERSION, end: '$',
         contains: [{className: 'number', begin: '\\b\\d{3}\\b'}]
       },
       {
-        className: 'request',
-        begin: '^[A-Z]+ (.*?) HTTP/[0-9\\.]+$', returnBegin: true, end: '$',
+        begin: '^[A-Z]+ (.*?) ' + VERSION + '$', returnBegin: true, end: '$',
         contains: [
@@ -20,2 +19,9 @@ {
             excludeBegin: true, excludeEnd: true
+          },
+          {
+            begin: VERSION
+          },
+          {
+            className: 'keyword',
+            begin: '[A-Z]+'
           }
@@ -28,3 +34,3 @@ ]
         illegal: '\\n|\\s|=',
-        starts: {className: 'string', end: '$'}
+        starts: {end: '$', relevance: 0}
       },
@@ -31,0 +37,0 @@ {

lib/languages/inform7.js

@@ -33,3 +33,3 @@ module.exports = function(hljs) {
       {
-        className: 'title',
+        className: 'section',
         begin: /^(Volume|Book|Part|Chapter|Section|Table)\b/,
@@ -46,4 +46,3 @@ end: '$'
             //Rule name
-            begin: '\\b\\(This',
-            end: '\\)'
+            begin: '\\(This', end: '\\)'
           }
@@ -50,0 +49,0 @@ ]

lib/languages/ini.js

@@ -27,15 +27,22 @@ module.exports = function(hljs) {
       {
-        className: 'title',
+        className: 'section',
         begin: /^\s*\[+/, end: /\]+/
       },
       {
-        className: 'setting',
         begin: /^[a-z0-9\[\]_-]+\s*=\s*/, end: '$',
+        returnBegin: true,
         contains: [
           {
-            className: 'value',
-            endsWithParent: true,
-            keywords: 'on off true false yes no',
+            className: 'attr',
+            begin: /[a-z0-9\[\]_-]+/
+          },
+          {
+            begin: /=/, endsWithParent: true,
+            relevance: 0,
             contains: [
               {
+                className: 'literal',
+                begin: /\bon|off|true|false|yes|no\b/
+              },
+              {
                 className: 'variable',
@@ -53,4 +60,3 @@ variants: [
               hljs.NUMBER_MODE
-            ],
-            relevance: 0
+            ]
           }
@@ -57,0 +63,0 @@ ]

lib/languages/irpf90.js

@@ -8,6 +8,3 @@ module.exports = function(hljs) {
   var F_KEYWORDS = {
-    constant: '.False. .True.',
-    type: 'integer real character complex logical dimension allocatable|10 parameter ' +
-      'external implicit|10 none double precision assign intent optional pointer ' +
-      'target in out common equivalence data',
+    literal: '.False. .True.',
     keyword: 'kind do while private call intrinsic where elsewhere ' +
@@ -30,2 +27,5 @@ 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then ' +
       'pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure ' +
+      'integer real character complex logical dimension allocatable|10 parameter ' +
+      'external implicit|10 none double precision assign intent optional pointer ' +
+      'target in out common equivalence data ' +
       // IRPF90 special keywords
@@ -32,0 +32,0 @@ 'begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch ' +

lib/languages/java.js

 module.exports = function(hljs) {
-  var GENERIC_IDENT_RE = hljs.UNDERSCORE_IDENT_RE + '(<' + hljs.UNDERSCORE_IDENT_RE + '>)?';
+  var GENERIC_IDENT_RE = hljs.UNDERSCORE_IDENT_RE + '(<(' + hljs.UNDERSCORE_IDENT_RE + '|\\s*,\\s*)+>)?';
   var KEYWORDS =
@@ -40,6 +40,12 @@ 'false synchronized int abstract float private char boolean static null if const ' +
           relevance : 0,
-          contains : [{
-            className : 'doctag',
-            begin : '@[A-Za-z]+'
-          }]
+          contains : [
+            {
+              // eat up @'s in emails to prevent them to be recognized as doctags
+              begin: /\w+@/, relevance: 0
+            },
+            {
+              className : 'doctag',
+              begin : '@[A-Za-z]+'
+            }
+          ]
         }
@@ -96,3 +102,3 @@ ),
       {
-        className: 'annotation', begin: '@[A-Za-z]+'
+        className: 'meta', begin: '@[A-Za-z]+'
       }
@@ -99,0 +105,0 @@ ]

lib/languages/javascript.js

@@ -8,3 +8,6 @@ module.exports = function(hljs) {
         'instanceof with throw case default try this switch continue typeof delete ' +
-        'let yield const export super debugger as async await',
+        'let yield const export super debugger as async await ' +
+        // ECMAScript 6 modules import
+        'import from as'
+      ,
       literal:
@@ -24,3 +27,3 @@ 'true false null undefined NaN Infinity',
       {
-        className: 'pi',
+        className: 'meta',
         relevance: 10,
@@ -92,11 +95,2 @@ begin: /^\s*['"]use (strict|asm)['"]/
       },
-      // ECMAScript 6 modules import
-      {
-        beginKeywords: 'import', end: '[;$]',
-        keywords: 'import from as',
-        contains: [
-          hljs.APOS_STRING_MODE,
-          hljs.QUOTE_STRING_MODE
-        ]
-      },
       { // ES6 class
@@ -110,2 +104,5 @@ className: 'class',
         ]
+      },
+      {
+        beginKeywords: 'constructor', end: /\{/, excludeEnd: true
       }
@@ -112,0 +109,0 @@ ],

lib/languages/json.js

@@ -8,3 +8,2 @@ module.exports = function(hljs) {
   var VALUE_CONTAINER = {
-    className: 'value',
     end: ',', endsWithParent: true, excludeEnd: true,
@@ -18,3 +17,3 @@ contains: TYPES,
       {
-        className: 'attribute',
+        className: 'attr',
         begin: '\\s*"', end: '"\\s*:\\s*', excludeBegin: true, excludeEnd: true,
@@ -30,3 +29,3 @@ contains: [hljs.BACKSLASH_ESCAPE],
     begin: '\\[', end: '\\]',
-    contains: [hljs.inherit(VALUE_CONTAINER, {className: null})], // inherit is also a workaround for a bug that makes shared modes with endsWithParent compile only the ending of one of the parents
+    contains: [hljs.inherit(VALUE_CONTAINER)], // inherit is a workaround for a bug that makes shared modes with endsWithParent compile only the ending of one of the parents
     illegal: '\\S'
@@ -33,0 +32,0 @@ };

lib/languages/julia.js

 module.exports = function(hljs) {
   // Since there are numerous special names in Julia, it is too much trouble
   // to maintain them by hand. Hence these names (i.e. keywords, literals and
-  // built-ins) are automatically generated from Julia (v0.3.0) itself through
-  // following scripts for each.
+  // built-ins) are automatically generated from Julia (v0.3.0 and v0.4.1)
+  // itself through following scripts for each.
 
   var KEYWORDS = {
     // # keyword generator
-    // println("\"in\",")
+    // println("in")
     // for kw in Base.REPLCompletions.complete_keyword("")
-    //     println("\"$kw\",")
+    //     println(kw)
     // end
@@ -19,3 +19,4 @@ keyword:
     // # literal generator
-    // println("\"true\",\n\"false\"")
+    // println("true")
+    // println("false")
     // for name in Base.REPLCompletions.completions("", 0)[1]
@@ -27,8 +28,10 @@ //     try
     //            !isa(v, DataType) &&
+    //            !isa(v, IntrinsicFunction) &&
     //            !issubtype(typeof(v), Tuple) &&
-    //            !isa(v, UnionType) &&
+    //            !isa(v, Union) &&
     //            !isa(v, Module) &&
     //            !isa(v, TypeConstructor) &&
+    //            !isa(v, TypeVar) &&
     //            !isa(v, Colon)
-    //             println("\"$name\",")
+    //             println(name)
     //         end
@@ -38,7 +41,10 @@ //     end
     literal:
-      'true false ANY ARGS CPU_CORES C_NULL DL_LOAD_PATH DevNull ENDIAN_BOM ENV I|0 Inf Inf16 Inf32 ' +
+      // v0.3
+      'true false ARGS CPU_CORES C_NULL DL_LOAD_PATH DevNull ENDIAN_BOM ENV I|0 Inf Inf16 Inf32 ' +
       'InsertionSort JULIA_HOME LOAD_PATH MS_ASYNC MS_INVALIDATE MS_SYNC MergeSort NaN NaN16 NaN32 OS_NAME QuickSort ' +
       'RTLD_DEEPBIND RTLD_FIRST RTLD_GLOBAL RTLD_LAZY RTLD_LOCAL RTLD_NODELETE RTLD_NOLOAD RTLD_NOW RoundDown ' +
       'RoundFromZero RoundNearest RoundToZero RoundUp STDERR STDIN STDOUT VERSION WORD_SIZE catalan cglobal e|0 eu|0 ' +
-      'eulergamma golden im nothing pi γ π φ',
+      'eulergamma golden im nothing pi γ π φ ' +
+      // v0.4 (diff)
+      'Inf64 NaN64 RoundNearestTiesAway RoundNearestTiesUp ',
 
@@ -49,4 +55,4 @@ // # built_in generator:
     //         v = eval(symbol(name))
-    //         if isa(v, DataType)
-    //             println("\"$name\",")
+    //         if isa(v, DataType) || isa(v, TypeConstructor) || isa(v, TypeVar)
+    //             println(name)
     //         end
@@ -56,3 +62,4 @@ //     end
     built_in:
-      'ASCIIString AbstractArray AbstractRNG AbstractSparseArray Any ArgumentError Array Associative Base64Pipe ' +
+      // v0.3
+      'ANY ASCIIString AbstractArray AbstractRNG AbstractSparseArray Any ArgumentError Array Associative Base64Pipe ' +
       'Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError Box CFILE Cchar Cdouble Cfloat Char ' +
@@ -73,13 +80,23 @@ 'CharString Cint Clong Clonglong ClusterManager Cmd Coff_t Colon Complex Complex128 Complex32 Complex64 ' +
       'Uint Uint128 Uint16 Uint32 Uint64 Uint8 UndefRefError UndefVarError UniformScaling UnionType UnitRange ' +
-      'Unsigned Vararg VersionNumber WString WeakKeyDict WeakRef Woodbury Zip'
+      'Unsigned Vararg VersionNumber WString WeakKeyDict WeakRef Woodbury Zip ' +
+      // v0.4 (diff)
+      'AbstractChannel AbstractFloat AbstractString AssertionError Base64DecodePipe Base64EncodePipe BufferStream ' +
+      'CapturedException CartesianIndex CartesianRange Channel Cintmax_t CompositeException Cstring Cuintmax_t ' +
+      'Cwstring Date DateTime Dims Enum GenSym GlobalRef HTML InitError InvalidStateException Irrational LinSpace ' +
+      'LowerTriangular NullException Nullable OutOfMemoryError Pair PartialQuickSort Pipe RandomDevice ' +
+      'ReadOnlyMemoryError ReentrantLock Ref RemoteException SegmentationFault SerializationState SimpleVector ' +
+      'TCPSocket Text Tuple UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UnicodeError Union UpperTriangular ' +
+      'Val Void WorkerConfig AbstractMatrix AbstractSparseMatrix AbstractSparseVector AbstractVecOrMat AbstractVector ' +
+      'DenseMatrix DenseVecOrMat DenseVector Matrix SharedMatrix SharedVector StridedArray StridedMatrix ' +
+      'StridedVecOrMat StridedVector VecOrMat Vector '
   };
 
   // ref: http://julia.readthedocs.org/en/latest/manual/variables/#allowed-variable-names
-  var VARIABLE_NAME_RE = "[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*";
+  var VARIABLE_NAME_RE = '[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*';
 
   // placeholder for recursive self-reference
-  var DEFAULT = { lexemes: VARIABLE_NAME_RE, keywords: KEYWORDS };
+  var DEFAULT = { lexemes: VARIABLE_NAME_RE, keywords: KEYWORDS, illegal: /<\// };
 
   var TYPE_ANNOTATION = {
-    className: "type-annotation",
+    className: 'type',
     begin: /::/
@@ -89,3 +106,3 @@ };
   var SUBTYPE = {
-    className: "subtype",
+    className: 'type',
     begin: /<:/
@@ -96,3 +113,3 @@ };
   var NUMBER = {
-    className: "number",
+    className: 'number',
     // supported numeric literals:
@@ -110,3 +127,3 @@ //  * binary literal (e.g. 0x10)
   var CHAR = {
-    className: "char",
+    className: 'string',
     begin: /'(.|\\[xXuU][a-zA-Z0-9]+)'/
@@ -123,3 +140,3 @@ };
     className: 'variable',
-    begin: "\\$" + VARIABLE_NAME_RE
+    begin: '\\$' + VARIABLE_NAME_RE
   };
@@ -129,7 +146,7 @@
   var STRING = {
-    className: "string",
+    className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE, INTERPOLATION, INTERPOLATED_VARIABLE],
     variants: [
-      { begin: /\w*"/, end: /"\w*/ },
-      { begin: /\w*"""/, end: /"""\w*/ }
+      { begin: /\w*"""/, end: /"""\w*/, relevance: 10 },
+      { begin: /\w*"/, end: /"\w*/ }
     ]
@@ -139,3 +156,3 @@ };
   var COMMAND = {
-    className: "string",
+    className: 'string',
     contains: [hljs.BACKSLASH_ESCAPE, INTERPOLATION, INTERPOLATED_VARIABLE],
@@ -146,10 +163,10 @@ begin: '`', end: '`'
   var MACROCALL = {
-    className: "macrocall",
-    begin: "@" + VARIABLE_NAME_RE
+    className: 'meta',
+    begin: '@' + VARIABLE_NAME_RE
   };
 
   var COMMENT = {
-    className: "comment",
+    className: 'comment',
     variants: [
-      { begin: "#=", end: "=#", relevance: 10 },
+      { begin: '#=', end: '=#', relevance: 10 },
       { begin: '#', end: '$' }
@@ -156,0 +173,0 @@ ]

lib/languages/kotlin.js

 module.exports = function (hljs) {
-  var KEYWORDS = 'val var get set class trait object public open private protected ' +
+  var KEYWORDS = 'val var get set class trait object open private protected public ' +
     'final enum if else do while for when break continue throw try catch finally ' +
-    'import package is as in return fun override default companion reified inline volatile transient native';
+    'import package is as in return fun override default companion reified inline volatile transient native ' +
+    'Byte Short Char Int Long Boolean Float Double Void Unit Nothing';
 
   return {
     keywords: {
-      typename: 'Byte Short Char Int Long Boolean Float Double Void Unit Nothing',
-      literal: 'true false null',
-      keyword: KEYWORDS
+      keyword: KEYWORDS,
+      literal: 'true false null'
     },
@@ -60,3 +60,3 @@ contains : [
               {
-                className: 'typename',
+                className: 'type',
                 begin: /:\s*/, end: /\s*[=\)]/, excludeBegin: true, returnEnd: true,
@@ -84,3 +84,3 @@ relevance: 0
           {
-            className: 'typename',
+            className: 'type',
             begin: /[,:]\s*/, end: /[<\(,]|$/, excludeBegin: true, returnEnd: true
@@ -95,3 +95,3 @@ }
       {
-        className: 'shebang',
+        className: 'meta',
         begin: "^#!/usr/bin/env", end: '$',
@@ -98,0 +98,0 @@ illegal: '\n'

lib/languages/lasso.js

@@ -31,3 +31,3 @@ module.exports = function(hljs) {
       'skip split_thread sum take thread to trait type where with ' +
-      'yield yieldhome'
+      'yield yieldhome and or not'
   };
@@ -42,6 +42,5 @@ var HTML_COMMENT = hljs.COMMENT(
   var LASSO_NOPROCESS = {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '\\[noprocess\\]',
     starts: {
-      className: 'markup',
       end: '\\[/noprocess\\]',
@@ -53,7 +52,7 @@ returnEnd: true,
   var LASSO_START = {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '\\[/noprocess|' + LASSO_ANGLE_RE
   };
   var LASSO_DATAMEMBER = {
-    className: 'variable',
+    className: 'symbol',
     begin: '\'' + LASSO_IDENT_RE + '\''
@@ -75,4 +74,3 @@ };
     },
-    {
-      className: 'variable',
+    { // variables
       variants: [
@@ -89,3 +87,3 @@ {
     {
-      className: 'tag',
+      className: 'type',
       begin: '::\\s*', end: LASSO_IDENT_RE,
@@ -95,3 +93,3 @@ illegal: '\\W'
     {
-      className: 'attribute',
+      className: 'attr',
       variants: [
@@ -108,17 +106,3 @@ {
     {
-      className: 'subst',
-      variants: [
-        {
-          begin: '->\\s*',
-          contains: [LASSO_DATAMEMBER]
-        },
-        {
-          begin: '->|\\\\|&&?|\\|\\||!(?!=|>)|(and|or|not)\\b',
-          relevance: 0
-        }
-      ]
-    },
-    {
-      className: 'built_in',
-      begin: '\\.\\.?\\s*',
+      begin: /(->|\.\.?)\s*/,
       relevance: 0,
@@ -143,7 +127,6 @@ contains: [LASSO_DATAMEMBER]
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: LASSO_CLOSE_RE,
         relevance: 0,
-        starts: {
-          className: 'markup',
+        starts: { // markup
           end: '\\[|' + LASSO_ANGLE_RE,
@@ -158,3 +141,3 @@ returnEnd: true,
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '\\[no_square_brackets',
@@ -167,7 +150,6 @@ starts: {
             {
-              className: 'preprocessor',
+              className: 'meta',
               begin: LASSO_CLOSE_RE,
               relevance: 0,
               starts: {
-                className: 'markup',
                 end: '\\[noprocess\\]|' + LASSO_ANGLE_RE,
@@ -184,3 +166,3 @@ returnEnd: true,
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '\\[',
@@ -190,3 +172,3 @@ relevance: 0
       {
-        className: 'shebang',
+        className: 'meta',
         begin: '^#!.+lasso9\\b',
@@ -193,0 +175,0 @@ relevance: 10

lib/languages/less.js

@@ -18,9 +18,2 @@ module.exports = function(hljs) {
 
-  var FUNCT_MODE = function(name, ident, obj) {
-    return hljs.inherit({
-        className: name, begin: ident + '\\(', end: '\\(',
-        returnBegin: true, excludeEnd: true, relevance: 0
-    }, obj);
-  };
-
   var PARENS_MODE = {
@@ -38,7 +31,7 @@ // used only to properly balance nested parens inside mixin call, def. arg list
     hljs.CSS_NUMBER_MODE, // fixme: it does not include dot for numbers like .5em :(
-    IDENT_MODE('hexcolor', '#[0-9A-Fa-f]+\\b'),
-    FUNCT_MODE('function', '(url|data-uri)', {
+    {
+      begin: '(url|data-uri)\\(',
       starts: {className: 'string', end: '[\\)\\n]', excludeEnd: true}
-    }),
-    FUNCT_MODE('function', IDENT_RE),
+    },
+    IDENT_MODE('number', '#[0-9A-Fa-f]+\\b'),
     PARENS_MODE,
@@ -50,2 +43,6 @@ IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
       className: 'attribute', begin: IDENT_RE + '\\s*:', end: ':', returnBegin: true, excludeEnd: true
+    },
+    {
+      className: 'meta',
+      begin: '!important'
     }
@@ -74,3 +71,3 @@ );
   var AT_RULE_MODE = {
-    className: 'at_rule', // highlight only at-rule keyword
+    className: 'keyword',
     begin: '@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b',
@@ -113,10 +110,7 @@ starts: {end: '[;{}]', returnEnd: true, contains: VALUE, relevance: 0}
       IDENT_MODE('variable', '@{'  + IDENT_RE + '}'),     // otherwise it’s identified as tag
-      IDENT_MODE('tag',       INTERP_IDENT_RE + '%?', 0), // '%' for more consistent coloring of @keyframes "tags"
-      IDENT_MODE('id',       '#'   + INTERP_IDENT_RE),
-      IDENT_MODE('class',    '\\.' + INTERP_IDENT_RE, 0),
-      IDENT_MODE('keyword',  '&', 0),
-      FUNCT_MODE('pseudo',   ':not'),
-      FUNCT_MODE('keyword',  ':extend'),
-      IDENT_MODE('pseudo',   '::?' + INTERP_IDENT_RE),
-      {className: 'attr_selector', begin: '\\[', end: '\\]'},
+      IDENT_MODE('selector-tag',  INTERP_IDENT_RE + '%?', 0), // '%' for more consistent coloring of @keyframes "tags"
+      IDENT_MODE('selector-id', '#' + INTERP_IDENT_RE),
+      IDENT_MODE('selector-class', '\\.' + INTERP_IDENT_RE, 0),
+      IDENT_MODE('selector-tag',  '&', 0),
+      {className: 'selector-attr', begin: '\\[', end: '\\]'},
       {begin: '\\(', end: '\\)', contains: VALUE_WITH_RULESETS}, // argument list of parametric mixins
@@ -123,0 +117,0 @@ {begin: '!important'} // eat !important after mixin call or it will be colored as tag

lib/languages/lisp.js

@@ -6,3 +6,3 @@ module.exports = function(hljs) {
   var SHEBANG = {
-    className: 'shebang',
+    className: 'meta',
     begin: '^#!', end: '$'
@@ -32,7 +32,6 @@ };
   var VARIABLE = {
-    className: 'variable',
     begin: '\\*', end: '\\*'
   };
   var KEYWORD = {
-    className: 'keyword',
+    className: 'symbol',
     begin: '[:&]' + LISP_IDENT_RE
@@ -52,3 +51,2 @@ };
   var QUOTED = {
-    className: 'quoted',
     contains: [NUMBER, STRING, VARIABLE, KEYWORD, QUOTED_LIST, IDENT],
@@ -61,3 +59,3 @@ variants: [
         begin: '\\(quote ', end: '\\)',
-        keywords: 'quote'
+        keywords: {name: 'quote'}
       },
@@ -70,3 +68,2 @@ {
   var QUOTED_ATOM = {
-    className: 'quoted',
     variants: [
@@ -78,3 +75,2 @@ {begin: '\'' + LISP_IDENT_RE},
   var LIST = {
-    className: 'list',
     begin: '\\(\\s*', end: '\\)'
@@ -88,3 +84,3 @@ };
     {
-      className: 'keyword',
+      className: 'name',
       variants: [
@@ -91,0 +87,0 @@ {begin: LISP_IDENT_RE},

lib/languages/livecodeserver.js

 module.exports = function(hljs) {
   var VARIABLE = {
-    className: 'variable', begin: '\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+',
+    begin: '\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+',
     relevance: 0
@@ -32,4 +32,6 @@ };
         'system real4 by dateItems without char character ascending eighth whole dateTime numeric short ' +
-        'first ftp integer abbreviated abbr abbrev private case while if',
-      constant:
+        'first ftp integer abbreviated abbr abbrev private case while if ' +
+        'div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within ' +
+        'contains ends with begins the keys of keys',
+      literal:
         'SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE ' +
@@ -41,5 +43,2 @@ 'QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO ' +
         'FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK',
-      operator:
-        'div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within ' +
-        'contains ends with begins the keys of keys',
       built_in:
@@ -128,3 +127,2 @@ 'put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode ' +
       {
-        className: 'command',
         beginKeywords: 'command on', end: '$',
@@ -142,3 +140,3 @@ contains: [
       {
-        className: 'preprocessor',
+        className: 'meta',
         variants: [
@@ -145,0 +143,0 @@ {

lib/languages/livescript.js

@@ -65,3 +65,3 @@ module.exports = function(hljs) {
     {
-      className: 'pi',
+      className: 'regexp',
       variants: [
@@ -80,3 +80,2 @@ {
     {
-      className: 'property',
       begin: '@' + JS_IDENT_RE
@@ -145,3 +144,2 @@ },
       {
-        className: 'attribute',
         begin: JS_IDENT_RE + ':', end: ':',
@@ -148,0 +146,0 @@ returnBegin: true, returnEnd: true,

lib/languages/makefile.js

@@ -15,3 +15,2 @@ module.exports = function(hljs) {
         starts: {
-          className: 'constant',
           end: /\s*\W*=/, excludeEnd: true,
@@ -28,9 +27,9 @@ starts: {
       {
-        className: 'title',
+        className: 'section',
         begin: /^[\w]+:\s*$/
       },
       {
-        className: 'phony',
+        className: 'meta',
         begin: /^\.PHONY:/, end: /$/,
-        keywords: '.PHONY', lexemes: /[\.\w]+/
+        keywords: {'meta-keyword': '.PHONY'}, lexemes: /[\.\w]+/
       },
@@ -37,0 +36,0 @@ {

lib/languages/markdown.js

@@ -7,3 +7,3 @@ module.exports = function(hljs) {
       {
-        className: 'header',
+        className: 'section',
         variants: [
@@ -42,3 +42,3 @@ { begin: '^#{1,6}', end: '$' },
       {
-        className: 'blockquote',
+        className: 'quote',
         begin: '^>\\s+', end: '$'
@@ -58,3 +58,2 @@ },
       {
-        className: 'horizontal_rule',
         begin: '^[-\\*]{3,}', end: '$'
@@ -68,3 +67,3 @@ },
           {
-            className: 'link_label',
+            className: 'string',
             begin: '\\[', end: '\\]',
@@ -76,3 +75,3 @@ excludeBegin: true,
           {
-            className: 'link_url',
+            className: 'link',
             begin: '\\]\\(', end: '\\)',
@@ -82,3 +81,3 @@ excludeBegin: true, excludeEnd: true
           {
-            className: 'link_reference',
+            className: 'symbol',
             begin: '\\]\\[', end: '\\]',
@@ -95,7 +94,7 @@ excludeBegin: true, excludeEnd: true
           {
-            className: 'link_reference',
+            className: 'symbol',
             begin: '\\[', end: '\\]:',
             excludeBegin: true, excludeEnd: true,
             starts: {
-              className: 'link_url',
+              className: 'link',
               end: '$'
@@ -102,0 +101,0 @@ }

lib/languages/matlab.js

@@ -14,3 +14,3 @@ module.exports = function(hljs) {
       {
-        className: 'operator', begin: /'['\.]*/
+        begin: /'['\.]*/
       }
@@ -49,8 +49,7 @@ ]
           {
-              className: 'params',
-              begin: '\\(', end: '\\)'
-          },
-          {
-              className: 'params',
-              begin: '\\[', end: '\\]'
+            className: 'params',
+            variants: [
+              {begin: '\\(', end: '\\)'},
+              {begin: '\\[', end: '\\]'}
+            ]
           }
@@ -69,3 +68,2 @@ ]
       {
-        className: 'matrix',
         begin: '\\[', end: '\\]',
@@ -77,3 +75,2 @@ contains: COMMON_CONTAINS,
       {
-        className: 'cell',
         begin: '\\{', end: /}/,
@@ -80,0 +77,0 @@ contains: COMMON_CONTAINS,

lib/languages/mel.js

@@ -217,9 +217,4 @@ module.exports = function(hljs) {
       },
-      {
-        className: 'variable',
-        variants: [
-          {begin: '\\$\\d'},
-          {begin: '[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)'},
-          {begin: '\\*(\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)', relevance: 0}
-        ]
+      { // eats variables
+        begin: '[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)'
       },
@@ -226,0 +221,0 @@ hljs.C_LINE_COMMENT_MODE,

lib/languages/mercury.js

@@ -11,7 +11,8 @@ module.exports = function(hljs) {
       'require_cc_multi require_cc_nondet require_erroneous require_failure',
-    pragma:
+    meta:
+      // pragma
       'inline no_inline type_spec source_file fact_table obsolete memo ' +
       'loop_check minimal_model terminates does_not_terminate ' +
-      'check_termination promise_equivalent_clauses',
-    preprocessor:
+      'check_termination promise_equivalent_clauses ' +
+      // preprocessor
       'foreign_proc foreign_decl foreign_code foreign_type ' +
@@ -31,11 +32,3 @@ 'foreign_import_module foreign_export_enum foreign_export ' +
 
-  var TODO = {
-    className: 'label',
-    begin: 'XXX', end: '$', endsWithParent: true,
-    relevance: 0
-  };
-  var COMMENT = hljs.inherit(hljs.C_LINE_COMMENT_MODE, {begin: '%'});
-  var CCOMMENT = hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, {relevance: 0});
-  COMMENT.contains.push(TODO);
-  CCOMMENT.contains.push(TODO);
+  var COMMENT = hljs.COMMENT('%', '$');
 
@@ -50,3 +43,3 @@ var NUMCODE = {
   var STRING_FMT = {
-    className: 'constant',
+    className: 'subst',
     begin: '\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]',
@@ -83,3 +76,3 @@ relevance: 0
       COMMENT,
-      CCOMMENT,
+      hljs.C_BLOCK_COMMENT_MODE,
       NUMCODE,
@@ -86,0 +79,0 @@ hljs.NUMBER_MODE,

lib/languages/mojolicious.js

@@ -6,3 +6,3 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '^__(END|DATA)__$'
@@ -9,0 +9,0 @@ },

lib/languages/monkey.js

@@ -17,3 +17,4 @@ module.exports = function(hljs) {
         'eachin not abstract final select case default const local global field ' +
-        'end if then else elseif endif while wend repeat until forever for to step next return module inline throw',
+        'end if then else elseif endif while wend repeat until forever for ' +
+        'to step next return module inline throw import',
 
@@ -54,17 +55,12 @@ built_in: 'DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil ' +
       {
-        className: 'variable',
+        className: 'built_in',
         begin: '\\b(self|super)\\b'
       },
       {
-        className: 'preprocessor',
-        beginKeywords: 'import',
-        end: '$'
-      },
-      {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '\\s*#', end: '$',
-        keywords: 'if else elseif endif end then'
+        keywords: {'meta-keyword': 'if else elseif endif end then'}
       },
       {
-        className: 'pi',
+        className: 'meta',
         begin: '^\\s*strict\\b'
@@ -71,0 +67,0 @@ },

lib/languages/nginx.js

@@ -14,3 +14,3 @@ module.exports = function(hljs) {
     keywords: {
-      built_in:
+      literal:
         'on off yes no true false none blocked debug info notice warn error crit ' +
@@ -31,4 +31,4 @@ 'select break last permanent redirect kqueue rtsig epoll poll /dev/poll'
       },
+      // this swallows entire URLs to avoid detecting numbers within
       {
-        className: 'url',
         begin: '([a-z]+):/', end: '\\s', endsWithParent: true, excludeEnd: true,
@@ -70,6 +70,17 @@ contains: [VAR]
       {
+        begin: hljs.UNDERSCORE_IDENT_RE + '\\s+{', returnBegin: true,
+        end: '{',
+        contains: [
+          {
+            className: 'section',
+            begin: hljs.UNDERSCORE_IDENT_RE
+          }
+        ],
+        relevance: 0
+      },
+      {
         begin: hljs.UNDERSCORE_IDENT_RE + '\\s', end: ';|{', returnBegin: true,
         contains: [
           {
-            className: 'title',
+            className: 'attribute',
             begin: hljs.UNDERSCORE_IDENT_RE,
@@ -76,0 +87,0 @@ starts: DEFAULT

lib/languages/nimrod.js

@@ -9,3 +9,3 @@ module.exports = function(hljs) {
     contains: [ {
-        className: 'decorator', // Actually pragma
+        className: 'meta', // Actually pragma
         begin: /{\./,
@@ -30,20 +30,13 @@ end: /\.}/,
       }, {
-        className: 'type',
+        className: 'built_in',
         begin: /\b(int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|float|float32|float64|bool|char|string|cstring|pointer|expr|stmt|void|auto|any|range|array|openarray|varargs|seq|set|clong|culong|cchar|cschar|cshort|cint|csize|clonglong|cfloat|cdouble|clongdouble|cuchar|cushort|cuint|culonglong|cstringarray|semistatic)\b/
       }, {
         className: 'number',
-        begin: /\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/,
-        relevance: 0
-      }, {
-        className: 'number',
-        begin: /\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/,
-        relevance: 0
-      }, {
-        className: 'number',
-        begin: /\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/,
-        relevance: 0
-      }, {
-        className: 'number',
-        begin: /\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/,
-        relevance: 0
+        relevance: 0,
+        variants: [
+          {begin: /\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},
+          {begin: /\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},
+          {begin: /\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},
+          {begin: /\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}
+        ]
       },
@@ -50,0 +43,0 @@ hljs.HASH_COMMENT_MODE

lib/languages/nix.js

 module.exports = function(hljs) {
   var NIX_KEYWORDS = {
-    keyword: 'rec with let in inherit assert if else then',
-    constant: 'true false or and null',
+    keyword:
+      'rec with let in inherit assert if else then',
+    literal:
+      'true false or and null',
     built_in:
-      'import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation'
+      'import abort baseNameOf dirOf isNull builtins map removeAttrs throw ' +
+      'toString derivation'
   };
@@ -15,21 +18,17 @@ var ANTIQUOTE = {
   var ATTRS = {
-    className: 'variable',
-    // TODO: we have to figure out a way how to exclude \s*=
-    begin: /[a-zA-Z0-9-_]+(\s*=)/,
-    relevance: 0
-  };
-  var SINGLE_QUOTE = {
-    className: 'string',
-    begin: "''",
-    end: "''",
+    begin: /[a-zA-Z0-9-_]+(\s*=)/, returnBegin: true,
+    relevance: 0,
     contains: [
-      ANTIQUOTE
+      {
+        className: 'attr',
+        begin: /\S+/
+      }
     ]
   };
-  var DOUBLE_QUOTE = {
+  var STRING = {
     className: 'string',
-    begin: '"',
-    end: '"',
-    contains: [
-      ANTIQUOTE
+    contains: [ANTIQUOTE],
+    variants: [
+      {begin: "''", end: "''"},
+      {begin: '"', end: '"'}
     ]
@@ -41,4 +40,3 @@ };
     hljs.C_BLOCK_COMMENT_MODE,
-    SINGLE_QUOTE,
-    DOUBLE_QUOTE,
+    STRING,
     ATTRS
@@ -45,0 +43,0 @@ ];

lib/languages/nsis.js

 module.exports = function(hljs) {
   var CONSTANTS = {
-    className: 'symbol',
+    className: 'variable',
     begin: '\\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)'
@@ -9,3 +9,3 @@ };
     // ${defines}
-    className: 'constant',
+    className: 'variable',
     begin: '\\$+{[a-zA-Z0-9_]+}'
@@ -23,3 +23,3 @@ };
     // $(language_strings)
-    className: 'constant',
+    className: 'variable',
     begin: '\\$+\\([a-zA-Z0-9_]+\\)'
@@ -30,3 +30,3 @@ };
     // command parameters
-    className: 'params',
+    className: 'built_in',
     begin: '(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)'
@@ -37,3 +37,3 @@ };
     // !compiler_flags
-    className: 'constant',
+    className: 'keyword',
     begin: '\\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)'
@@ -59,3 +59,2 @@ };
           { // $\n, $\r, $\t, $$
-            className: 'symbol',
             begin: '\\$(\\\\(n|r|t)|\\$)'
@@ -87,3 +86,2 @@ },
       { // plug::ins
-        className: 'literal',
         begin: hljs.IDENT_RE + '::' + hljs.IDENT_RE
@@ -90,0 +88,0 @@ }

lib/languages/objectivec.js

 module.exports = function(hljs) {
   var API_CLASS = {
     className: 'built_in',
-    begin: '(AV|CA|CF|CG|CI|MK|MP|NS|UI)\\w+',
+    begin: '(AV|CA|CF|CG|CI|MK|MP|NS|UI|XC)\\w+',
   };
@@ -50,3 +50,3 @@ var OBJC_KEYWORDS = {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#',
@@ -56,3 +56,3 @@ end: '$',
           {
-            className: 'title',
+            className: 'meta-string',
             variants: [
@@ -74,3 +74,2 @@ { begin: '\"', end: '\"' },
       {
-        className: 'variable',
         begin: '\\.'+hljs.UNDERSCORE_IDENT_RE,
@@ -77,0 +76,0 @@ relevance: 0

lib/languages/ocaml.js

@@ -43,3 +43,3 @@ module.exports = function(hljs) {
       { /* polymorphic variant */
-        className: 'tag',
+        className: 'type',
         begin: '`[A-Z][\\w\']*'
@@ -53,5 +53,5 @@ },
       { /* don't color identifiers, but safely catch all identifiers with '*/
-        begin: '[a-z_]\\w*\'[\\w\']*'
+        begin: '[a-z_]\\w*\'[\\w\']*', relevance: 0
       },
-      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'char', relevance: 0}),
+      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'string', relevance: 0}),
       hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
@@ -58,0 +58,0 @@ {

lib/languages/openscad.js

@@ -17,4 +17,4 @@ module.exports = function(hljs) {
 	PREPRO = {
-		className: 'preprocessor',
-		keywords: 'include use',
+		className: 'meta',
+		keywords: {'meta-keyword': 'include use'},
 		begin: 'include|use <',
@@ -29,3 +29,2 @@ end: '>'
 	MODIFIERS = {
-		className: 'built_in',
 		begin: '[*!#%]',
@@ -32,0 +31,0 @@ relevance: 0

lib/languages/parser3.js

@@ -24,3 +24,3 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '^@(?:BASE|USE|CLASS|OPTIONS)$',
@@ -27,0 +27,0 @@ relevance: 10

lib/languages/perl.js

@@ -31,3 +31,2 @@ module.exports = function(hljs) {
   var VAR = {
-    className: 'variable',
     variants: [
@@ -127,8 +126,8 @@ {begin: /\$\d/},
     {
-      className: 'sub',
-      beginKeywords: 'sub', end: '(\\s*\\(.*?\\))?[;{]',
-      relevance: 5
+      className: 'function',
+      beginKeywords: 'sub', end: '(\\s*\\(.*?\\))?[;{]', excludeEnd: true,
+      relevance: 5,
+      contains: [hljs.TITLE_MODE]
     },
     {
-      className: 'operator',
       begin: '-\\w\\b',
@@ -135,0 +134,0 @@ relevance: 0

lib/languages/php.js

 module.exports = function(hljs) {
   var VARIABLE = {
-    className: 'variable', begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
+    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
   };
   var PREPROCESSOR = {
-    className: 'preprocessor', begin: /<\?(php)?|\?>/
+    className: 'meta', begin: /<\?(php)?|\?>/
   };
@@ -8,0 +8,0 @@ var STRING = {

lib/languages/powershell.js

@@ -12,2 +12,6 @@ module.exports = function(hljs) {
   };
+  var LITERAL = {
+    className: 'literal',
+    begin: /\$(null|true|false)\b/
+  };
   var QUOTE_STRING = {
@@ -36,5 +40,4 @@ className: 'string',
       keyword: 'if else foreach return function do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch',
-      literal: '$null $true $false',
       built_in: 'Add-Content Add-History Add-Member Add-PSSnapin Clear-Content Clear-Item Clear-Item Property Clear-Variable Compare-Object ConvertFrom-SecureString Convert-Path ConvertTo-Html ConvertTo-SecureString Copy-Item Copy-ItemProperty Export-Alias Export-Clixml Export-Console Export-Csv ForEach-Object Format-Custom Format-List Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-Content Get-Credential Get-Culture Get-Date Get-EventLog Get-ExecutionPolicy Get-Help Get-History Get-Host Get-Item Get-ItemProperty Get-Location Get-Member Get-PfxCertificate Get-Process Get-PSDrive Get-PSProvider Get-PSSnapin Get-Service Get-TraceSource Get-UICulture Get-Unique Get-Variable Get-WmiObject Group-Object Import-Alias Import-Clixml Import-Csv Invoke-Expression Invoke-History Invoke-Item Join-Path Measure-Command Measure-Object Move-Item Move-ItemProperty New-Alias New-Item New-ItemProperty New-Object New-PSDrive New-Service New-TimeSpan New-Variable Out-Default Out-File Out-Host Out-Null Out-Printer Out-String Pop-Location Push-Location Read-Host Remove-Item Remove-ItemProperty Remove-PSDrive Remove-PSSnapin Remove-Variable Rename-Item Rename-ItemProperty Resolve-Path Restart-Service Resume-Service Select-Object Select-String Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-Location Set-PSDebug Set-Service Set-TraceSource Set-Variable Sort-Object Split-Path Start-Service Start-Sleep Start-Transcript Stop-Process Stop-Service Stop-Transcript Suspend-Service Tee-Object Test-Path Trace-Command Update-FormatData Update-TypeData Where-Object Write-Debug Write-Error Write-Host Write-Output Write-Progress Write-Verbose Write-Warning',
-      operator: '-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace'
+      nomarkup: '-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace'
     },
@@ -46,2 +49,3 @@ contains: [
       APOS_STRING,
+      LITERAL,
       VAR
@@ -48,0 +52,0 @@ ]

lib/languages/processing.js

@@ -12,7 +12,7 @@ module.exports = function(hljs) {
         'package default double public try this switch continue throws protected public private',
-      constant: 'P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI',
-      variable: 'displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key ' +
-        'keyCode pixels focused frameCount frameRate height width',
+      literal: 'P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI',
       title: 'setup draw',
-      built_in: 'size createGraphics beginDraw createShape loadShape PShape arc ellipse line point ' +
+      built_in: 'displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key ' +
+        'keyCode pixels focused frameCount frameRate height width ' +
+        'size createGraphics beginDraw createShape loadShape PShape arc ellipse line point ' +
         'quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint ' +
@@ -19,0 +19,0 @@ 'curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex ' +

lib/languages/profile.js

@@ -6,10 +6,2 @@ module.exports = function(hljs) {
       {
-        className: 'built_in',
-        begin: '{', end: '}$',
-        excludeBegin: true, excludeEnd: true,
-        contains: [hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE],
-        relevance: 0
-      },
-      {
-        className: 'filename',
         begin: '[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}', end: ':',
@@ -19,3 +11,2 @@ excludeEnd: true
       {
-        className: 'header',
         begin: '(ncalls|tottime|cumtime)', end: '$',
@@ -26,3 +17,2 @@ keywords: 'ncalls tottime|10 cumtime|10 filename',
       {
-        className: 'summary',
         begin: 'function calls', end: '$',
@@ -35,7 +25,5 @@ contains: [hljs.C_NUMBER_MODE],
       {
-        className: 'function',
+        className: 'string',
         begin: '\\(', end: '\\)$',
-        contains: [
-          hljs.UNDERSCORE_TITLE_MODE
-        ],
+        excludeBegin: true, excludeEnd: true,
         relevance: 0
@@ -42,0 +30,0 @@ }

lib/languages/prolog.js

@@ -5,3 +5,2 @@ module.exports = function(hljs) {
 
-    className: 'atom',
     begin: /[a-z][A-Za-z0-9_]*/,
@@ -13,3 +12,3 @@ relevance: 0
 
-    className: 'name',
+    className: 'symbol',
     variants: [
@@ -16,0 +15,0 @@ {begin: /[A-Z][a-zA-Z0-9_]*/},

lib/languages/protobuf.js

@@ -30,3 +30,2 @@ module.exports = function(hljs) {
       {
-        className: 'constant',
         begin: /^\s*[A-Z_]+/,
@@ -33,0 +32,0 @@ end: /\s*=/, excludeEnd: true

lib/languages/puppet.js

@@ -72,3 +72,3 @@ module.exports = function(hljs) {
           {
-            className: 'title', begin: hljs.IDENT_RE, endsParent: true
+            className: 'section', begin: hljs.IDENT_RE, endsParent: true
           }
@@ -82,3 +82,3 @@ ]
           {
-            className: 'name',
+            className: 'keyword',
             begin: hljs.IDENT_RE
@@ -94,3 +94,10 @@ },
               {
-                begin:'[a-zA-Z_]+\\s*=>'
+                begin:'[a-zA-Z_]+\\s*=>',
+                returnBegin: true, end: '=>',
+                contains: [
+                  {
+                    className: 'attr',
+                    begin: hljs.IDENT_RE,
+                  }
+                ]
               },
@@ -97,0 +104,0 @@ {

lib/languages/python.js

 module.exports = function(hljs) {
   var PROMPT = {
-    className: 'prompt',  begin: /^(>>>|\.\.\.) /
+    className: 'meta',  begin: /^(>>>|\.\.\.) /
   };
@@ -76,3 +76,3 @@ var STRING = {
       {
-        className: 'decorator',
+        className: 'meta',
         begin: /^[\t ]*@/, end: /$/
@@ -79,0 +79,0 @@ },

lib/languages/q.js

@@ -5,7 +5,7 @@ module.exports = function(hljs) {
     'do while select delete by update from',
-  constant:
+  literal:
     '0b 1b',
   built_in:
     'neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum',
-  typename:
+  type:
     '`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid'
@@ -16,3 +16,3 @@ };
   keywords: Q_KEYWORDS,
-  lexemes: /\b(`?)[A-Za-z0-9_]+\b/,
+  lexemes: /(`?)[A-Za-z0-9_]+\b/,
   contains: [
@@ -19,0 +19,0 @@ hljs.C_LINE_COMMENT_MODE,

lib/languages/roboconf.js

 module.exports = function(hljs) {
-  var IDENTIFIER = '[a-zA-Z-_][^\n{\r\n]+\\{';
+  var IDENTIFIER = '[a-zA-Z-_][^\\n{]+\\{';
 
+  var PROPERTY = {
+    className: 'attribute',
+    begin: /[a-zA-Z-_]+/, end: /\s*:/, excludeEnd: true,
+    starts: {
+      end: ';',
+      relevance: 0,
+      contains: [
+        {
+          className: 'variable',
+          begin: /\.[a-zA-Z-_]+/
+        },
+        {
+          className: 'keyword',
+          begin: /\(optional\)/
+        }
+      ]
+    }
+  };
+
   return {
@@ -11,7 +30,7 @@ aliases: ['graph', 'instances'],
       {
-        className: 'facet',
         begin: '^facet ' + IDENTIFIER,
         end: '}',
-        keywords: 'facet installer exports children extends',
+        keywords: 'facet',
         contains: [
+          PROPERTY,
           hljs.HASH_COMMENT_MODE
@@ -23,12 +42,9 @@ ]
       {
-        className: 'instance-of',
-        begin: '^instance of ' + IDENTIFIER,
+        begin: '^\\s*instance of ' + IDENTIFIER,
         end: '}',
         keywords: 'name count channels instance-data instance-state instance of',
+        illegal: /\S/,
         contains: [
-          // Instance overridden properties
-          {
-            className: 'keyword',
-            begin: '[a-zA-Z-_]+( |\t)*:'
-          },
+          'self',
+          PROPERTY,
           hljs.HASH_COMMENT_MODE
@@ -40,15 +56,6 @@ ]
       {
-        className: 'component',
         begin: '^' + IDENTIFIER,
         end: '}',
-        lexemes: '\\(?[a-zA-Z]+\\)?',
-        keywords: 'installer exports children extends imports facets alias (optional)',
         contains: [
-          // Imported component variables
-          {
-            className: 'string',
-            begin: '\\.[a-zA-Z-_]+',
-            end: '\\s|,|;',
-            excludeEnd: true
-          },
+          PROPERTY,
           hljs.HASH_COMMENT_MODE
@@ -55,0 +62,0 @@ ]

lib/languages/rsl.js

@@ -23,11 +23,10 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$'
       },
       {
-        className: 'shader',
+        className: 'class',
         beginKeywords: 'surface displacement light volume imager', end: '\\('
       },
       {
-        className: 'shading',
         beginKeywords: 'illuminate illuminance gather', end: '\\('
@@ -34,0 +33,0 @@ }

lib/languages/ruby.js

@@ -12,3 +12,2 @@ module.exports = function(hljs) {
   var IRB_OBJECT = {
-    className: 'value',
     begin: '#<', end: '>'
@@ -63,3 +62,3 @@ };
     className: 'params',
-    begin: '\\(', end: '\\)',
+    begin: '\\(', end: '\\)', endsParent: true,
     keywords: RUBY_KEYWORDS
@@ -78,6 +77,4 @@ };
         {
-          className: 'inheritance',
           begin: '<\\s*',
           contains: [{
-            className: 'parent',
             begin: '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE
@@ -97,7 +94,2 @@ }]
     {
-      className: 'constant',
-      begin: '(::)?(\\b[A-Z]\\w*(::)?)+',
-      relevance: 0
-    },
-    {
       className: 'symbol',
@@ -119,4 +111,3 @@ begin: hljs.UNDERSCORE_IDENT_RE + '(\\!|\\?)?:',
     {
-      className: 'variable',
-      begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))'
+      begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))' // variables
     },
@@ -154,3 +145,2 @@ { // regexp container
       begin: /^\s*=>/,
-      className: 'status',
       starts: {
@@ -161,3 +151,3 @@ end: '$', contains: RUBY_DEFAULT_CONTAINS
     {
-      className: 'prompt',
+      className: 'meta',
       begin: '^('+SIMPLE_PROMPT+"|"+DEFAULT_PROMPT+'|'+RVM_PROMPT+')',
@@ -164,0 +154,0 @@ starts: {

lib/languages/ruleslanguage.js

@@ -52,3 +52,3 @@ module.exports = function(hljs) {
       {
-        className: 'array',
+        className: 'literal',
         variants: [
@@ -55,0 +55,0 @@ {begin: '#\\s+[a-zA-Z\\ \\.]*', relevance: 0}, // looks like #-comment

lib/languages/rust.js

@@ -5,2 +5,14 @@ module.exports = function(hljs) {
   BLOCK_COMMENT.contains.push('self');
+  var BUILTINS =
+    // prelude
+    'Copy Send Sized Sync Drop Fn FnMut FnOnce drop Box ToOwned Clone ' +
+    'PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator ' +
+    'Extend IntoIterator DoubleEndedIterator ExactSizeIterator Option ' +
+    'Some None Result Ok Err SliceConcatExt String ToString Vec ' +
+    // macros
+    'assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! ' +
+    'debug_assert! debug_assert_eq! env! panic! file! format! format_args! ' +
+    'include_bin! include_str! line! local_data_key! module_path! ' +
+    'option_env! print! println! select! stringify! try! unimplemented! ' +
+    'unreachable! vec! write! writeln!';
   return {
@@ -18,14 +30,6 @@ aliases: ['rs'],
         'str char bool',
+      literal:
+        'true false',
       built_in:
-        // prelude
-        'Copy Send Sized Sync Drop Fn FnMut FnOnce drop Box ToOwned Clone ' +
-        'PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator ' +
-        'Extend IntoIterator DoubleEndedIterator ExactSizeIterator Option ' +
-        'Some None Result Ok Err SliceConcatExt String ToString Vec ' +
-        // macros
-        'assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! ' +
-        'debug_assert! debug_assert_eq! env! panic! file! format! format_args! ' +
-        'include_bin! include_str! line! local_data_key! module_path! ' +
-        'option_env! print! println! select! stringify! try! unimplemented! ' +
-        'unreachable! vec! write! writeln!'
+        BUILTINS
     },
@@ -43,6 +47,9 @@ lexemes: hljs.IDENT_RE + '!?',
            { begin: /'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/ },
-           { begin: /'[a-zA-Z_][a-zA-Z0-9_]*/ }
         ]
       },
       {
+        className: 'symbol',
+        begin: /'[a-zA-Z_][a-zA-Z0-9_]*/
+      },
+      {
         className: 'number',
@@ -65,6 +72,7 @@ variants: [
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#\\!?\\[', end: '\\]'
       },
       {
+        className: 'class',
         beginKeywords: 'type', end: '(=|<)',
@@ -75,2 +83,3 @@ contains: [hljs.UNDERSCORE_TITLE_MODE],
       {
+        className: 'class',
         beginKeywords: 'trait enum', end: '{',
@@ -83,3 +92,4 @@ contains: [
       {
-        begin: hljs.IDENT_RE + '::'
+        begin: hljs.IDENT_RE + '::',
+        keywords: {built_in: BUILTINS}
       },
@@ -86,0 +96,0 @@ {

lib/languages/scala.js

 module.exports = function(hljs) {
 
-  var ANNOTATION = {
-    className: 'annotation', begin: '@[A-Za-z]+'
+  var ANNOTATION = { className: 'meta', begin: '@[A-Za-z]+' };
+
+  // used in strings for escaping/interpolation/substitution
+  var SUBST = {
+    className: 'subst',
+    variants: [
+      {begin: '\\$[A-Za-z0-9_]+'},
+      {begin: '\\${', end: '}'}
+    ]
   };
@@ -9,4 +16,25 @@
     className: 'string',
-    begin: 'u?r?"""', end: '"""',
-    relevance: 10
+    variants: [
+      {
+        begin: '"', end: '"',
+        illegal: '\\n',
+        contains: [hljs.BACKSLASH_ESCAPE]
+      },
+      {
+        begin: '"""', end: '"""',
+        relevance: 10
+      },
+      {
+        begin: '[a-z]+"', end: '"',
+        illegal: '\\n',
+        contains: [hljs.BACKSLASH_ESCAPE, SUBST]
+      },
+      {
+        className: 'string',
+        begin: '[a-z]+"""', end: '"""',
+        contains: [SUBST],
+        relevance: 10
+      }
+    ]
+
   };
@@ -34,4 +62,28 @@
     beginKeywords: 'class object trait type',
-    end: /[:={\[(\n;]/,
-    contains: [{className: 'keyword', beginKeywords: 'extends with', relevance: 10}, NAME]
+    end: /[:={\[\n;]/,
+    excludeEnd: true,
+    contains: [
+      {
+        beginKeywords: 'extends with',
+        relevance: 10
+      },
+      {
+        begin: /\[/,
+        end: /\]/,
+        excludeBegin: true,
+        excludeEnd: true,
+        relevance: 0,
+        contains: [TYPE]
+      },
+      {
+        className: 'params',
+        begin: /\(/,
+        end: /\)/,
+        excludeBegin: true,
+        excludeEnd: true,
+        relevance: 0,
+        contains: [TYPE]
+      },
+      NAME
+    ]
   };
@@ -43,2 +95,3 @@
     end: /[:={\[(\n;]/,
+    excludeEnd: true,
     contains: [NAME]
@@ -56,3 +109,2 @@ };
       STRING,
-      hljs.QUOTE_STRING_MODE,
       SYMBOL,
@@ -59,0 +111,0 @@ TYPE,

lib/languages/scheme.js

@@ -6,3 +6,3 @@ module.exports = function(hljs) {
   var BUILTINS = {
-    built_in:
+    'builtin-name':
       'case-lambda call/cc class define-class exit-handler field import ' +
@@ -44,3 +44,3 @@ 'inherit init-field interface let*-values let-values let/ec mixin ' +
   var SHEBANG = {
-    className: 'shebang',
+    className: 'meta',
     begin: '^#!',
@@ -91,3 +91,3 @@ end: '$'
   var QUOTED_IDENT = {
-    className: 'variable',
+    className: 'symbol',
     begin: '\'' + SCHEME_IDENT_RE
@@ -102,3 +102,2 @@ };
   var LIST = {
-    className: 'list',
     variants: [
@@ -110,3 +109,3 @@ { begin: '\\(', end: '\\)' },
       {
-        className: 'keyword',
+        className: 'name',
         begin: SCHEME_IDENT_RE,
@@ -113,0 +112,0 @@ lexemes: SCHEME_IDENT_RE,

lib/languages/scilab.js

@@ -14,12 +14,14 @@ module.exports = function(hljs) {
     aliases: ['sci'],
+    lexemes: /%?\w+/,
     keywords: {
-      keyword: 'abort break case clear catch continue do elseif else endfunction end for function'+
-        'global if pause return resume select try then while'+
+      keyword: 'abort break case clear catch continue do elseif else endfunction end for function '+
+        'global if pause return resume select try then while',
+      literal:
         '%f %F %t %T %pi %eps %inf %nan %e %i %z %s',
       built_in: // Scilab has more than 2000 functions. Just list the most commons
-       'abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error'+
-       'exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty'+
-       'isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log'+
-       'max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real'+
-       'round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan'+
+       'abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error '+
+       'exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty '+
+       'isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log '+
+       'max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real '+
+       'round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan '+
        'type typename warning zeros matrix'
@@ -31,4 +33,3 @@ },
         className: 'function',
-        beginKeywords: 'function endfunction', end: '$',
-        keywords: 'function endfunction|10',
+        beginKeywords: 'function', end: '$',
         contains: [
@@ -43,3 +44,2 @@ hljs.UNDERSCORE_TITLE_MODE,
       {
-        className: 'transposed_variable',
         begin: '[a-zA-Z_][a-zA-Z_0-9]*(\'+[\\.\']*|[\\.\']+)', end: '',
@@ -49,3 +49,2 @@ relevance: 0
       {
-        className: 'matrix',
         begin: '\\[', end: '\\]\'*[\\.\']*',
@@ -52,0 +51,0 @@ relevance: 0,

lib/languages/scss.js

@@ -7,11 +7,4 @@ module.exports = function(hljs) {
   };
-  var FUNCTION = {
-    className: 'function',
-    begin: IDENT_RE + '\\(',
-    returnBegin: true,
-    excludeEnd: true,
-    end: '\\('
-  };
   var HEXCOLOR = {
-    className: 'hexcolor', begin: '#[0-9A-Fa-f]+'
+    className: 'number', begin: '#[0-9A-Fa-f]+'
   };
@@ -24,6 +17,4 @@ var DEF_INTERNALS = {
     starts: {
-      className: 'value',
       endsWithParent: true, excludeEnd: true,
       contains: [
-        FUNCTION,
         HEXCOLOR,
@@ -35,3 +26,3 @@ hljs.CSS_NUMBER_MODE,
         {
-          className: 'important', begin: '!important'
+          className: 'meta', begin: '!important'
         }
@@ -47,18 +38,16 @@ ]
       hljs.C_BLOCK_COMMENT_MODE,
-      FUNCTION,
       {
-        className: 'id', begin: '\\#[A-Za-z0-9_-]+',
+        className: 'selector-id', begin: '\\#[A-Za-z0-9_-]+',
         relevance: 0
       },
       {
-        className: 'class', begin: '\\.[A-Za-z0-9_-]+',
+        className: 'selector-class', begin: '\\.[A-Za-z0-9_-]+',
         relevance: 0
       },
       {
-        className: 'attr_selector',
-        begin: '\\[', end: '\\]',
+        className: 'selector-attr', begin: '\\[', end: '\\]',
         illegal: '$'
       },
       {
-        className: 'tag', // begin: IDENT_RE, end: '[,|\\s]'
+        className: 'selector-tag', // begin: IDENT_RE, end: '[,|\\s]'
         begin: '\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b',
@@ -68,7 +57,5 @@ relevance: 0
       {
-        className: 'pseudo',
         begin: ':(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)'
       },
       {
-        className: 'pseudo',
         begin: '::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)'
@@ -83,10 +70,7 @@ },
       {
-        className: 'value',
         begin: '\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b'
       },
       {
-        className: 'value',
         begin: ':', end: ';',
         contains: [
-          FUNCTION,
           VARIABLE,
@@ -98,3 +82,3 @@ HEXCOLOR,
           {
-            className: 'important', begin: '!important'
+            className: 'meta', begin: '!important'
           }
@@ -104,7 +88,5 @@ ]
       {
-        className: 'at_rule',
         begin: '@', end: '[{;]',
         keywords: 'mixin include extend for if else each while charset import debug media page content font-face namespace warn',
         contains: [
-          FUNCTION,
           VARIABLE,
@@ -116,3 +98,2 @@ hljs.QUOTE_STRING_MODE,
           {
-            className: 'preprocessor',
             begin: '\\s[A-Za-z0-9_.-]+',
@@ -119,0 +100,0 @@ relevance: 0

lib/languages/smali.js

@@ -22,41 +22,26 @@ module.exports = function(hljs) {
         className: 'keyword',
-        begin: '\\s*\\.end\\s[a-zA-Z0-9]*',
-        relevance: 1
+        variants: [
+          {begin: '\\s*\\.end\\s[a-zA-Z0-9]*'},
+          {begin: '^[ ]*\\.[a-zA-Z]*', relevance: 0},
+          {begin: '\\s:[a-zA-Z_0-9]*', relevance: 0},
+          {begin: '\\s(' + smali_keywords.join('|') + ')'}
+        ]
       },
       {
-        className: 'keyword',
-        begin: '^[ ]*\\.[a-zA-Z]*',
-        relevance: 0
+        className: 'built_in',
+        variants : [
+          {
+            begin: '\\s('+smali_instr_low_prio.join('|')+')\\s'
+          },
+          {
+            begin: '\\s('+smali_instr_low_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)+\\s',
+            relevance: 10
+          },
+          {
+            begin: '\\s('+smali_instr_high_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)*\\s',
+            relevance: 10
+          },
+        ]
       },
       {
-        className: 'keyword',
-        begin: '\\s:[a-zA-Z_0-9]*',
-        relevance: 0
-      },
-      {
-        className: 'keyword',
-        begin: '\\s('+smali_keywords.join('|')+')',
-        relevance: 1
-      },
-      {
-        className: 'keyword',
-        begin: '\\[',
-        relevance: 0
-      },
-      {
-        className: 'instruction',
-        begin: '\\s('+smali_instr_low_prio.join('|')+')\\s',
-        relevance: 1
-      },
-      {
-        className: 'instruction',
-        begin: '\\s('+smali_instr_low_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)+\\s',
-        relevance: 10
-      },
-      {
-        className: 'instruction',
-        begin: '\\s('+smali_instr_high_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)*\\s',
-        relevance: 10
-      },
-      {
         className: 'class',
@@ -67,15 +52,3 @@ begin: 'L[^\(;:\n]*;',
       {
-        className: 'function',
-        begin: '( |->)[^(\n ;"]*\\(',
-        relevance: 0
-      },
-      {
-        className: 'function',
-        begin: '\\)',
-        relevance: 0
-      },
-      {
-        className: 'variable',
         begin: '[vp][0-9]+',
-        relevance: 0
       }
@@ -82,0 +55,0 @@ ]

lib/languages/smalltalk.js

 module.exports = function(hljs) {
   var VAR_IDENT_RE = '[a-z][a-zA-Z0-9_]*';
   var CHAR = {
-    className: 'char',
+    className: 'string',
     begin: '\\$.{1}'
@@ -18,3 +18,3 @@ };
       {
-        className: 'class',
+        className: 'type',
         begin: '\\b[A-Z][A-Za-z0-9_]*',
@@ -24,3 +24,2 @@ relevance: 0
       {
-        className: 'method',
         begin: VAR_IDENT_RE + ':',
@@ -33,3 +32,2 @@ relevance: 0
       {
-        className: 'localvars',
         // This looks more complicated than needed to avoid combinatorial
@@ -44,3 +42,2 @@ // explosion under V8. It effectively means `| var1 var2 ... |` with
       {
-        className: 'array',
         begin: '\\#\\(', end: '\\)',
@@ -47,0 +44,0 @@ contains: [

lib/languages/sml.js

@@ -37,3 +37,3 @@ module.exports = function(hljs) {
       { /* polymorphic variant */
-        className: 'tag',
+        className: 'type',
         begin: '`[A-Z][\\w\']*'
@@ -49,3 +49,3 @@ },
       },
-      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'char', relevance: 0}),
+      hljs.inherit(hljs.APOS_STRING_MODE, {className: 'string', relevance: 0}),
       hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
@@ -52,0 +52,0 @@ {

lib/languages/sqf.js

@@ -53,6 +53,6 @@ module.exports = function(hljs) {
   var PREPROCESSOR =       {
-    className: 'preprocessor',
+    className: 'meta',
     begin: '#', end: '$',
-    keywords: 'if else elif endif define undef warning error line ' +
-              'pragma ifdef ifndef',
+    keywords: {'meta-keyword': 'if else elif endif define undef warning error line ' +
+              'pragma ifdef ifndef'},
     contains: [
@@ -64,8 +64,9 @@ {
         beginKeywords: 'include', end: '$',
+        keywords: {'meta-keyword': 'include'},
         contains: [
           PREPROCESSOR_STRINGS,
           {
-            className: 'string',
+            className: 'meta-string',
             begin: '<', end: '>',
-            illegal: '\\n',
+            illegal: '\\n'
           }
@@ -72,0 +73,0 @@ ]

lib/languages/sql.js

@@ -8,3 +8,2 @@ module.exports = function(hljs) {
       {
-        className: 'operator',
         beginKeywords:
@@ -11,0 +10,0 @@ 'begin end start commit rollback savepoint lock alter create drop rename call ' +

lib/languages/stata.js

@@ -8,10 +8,10 @@ module.exports = function(hljs) {
       {
-        className: 'label',
-        variants: [
-          {begin: "\\$\\{?[a-zA-Z0-9_]+\\}?"},
-          {begin: "`[a-zA-Z0-9_]+'"}
-
-        ]
+        className: 'symbol',
+        begin: /`[a-zA-Z0-9_]+'/
       },
       {
+        className: 'variable',
+        begin: /\$\{?[a-zA-Z0-9_]+\}?/
+      },
+      {
         className: 'string',
@@ -25,3 +25,3 @@ variants: [
       {
-        className: 'literal',
+        className: 'built_in',
         variants: [
@@ -28,0 +28,0 @@ {

lib/languages/step21.js

 module.exports = function(hljs) {
   var STEP21_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
-  var STEP21_CLOSE_RE = 'END-ISO-10303-21;';
   var STEP21_KEYWORDS = {
-    literal: '',
-    built_in: '',
-    keyword:
-    'HEADER ENDSEC DATA'
+    keyword: 'HEADER ENDSEC DATA'
   };
   var STEP21_START = {
-    className: 'preprocessor',
+    className: 'meta',
     begin: 'ISO-10303-21;',
     relevance: 10
   };
-  var STEP21_CODE = [
-    hljs.C_LINE_COMMENT_MODE,
-    hljs.C_BLOCK_COMMENT_MODE,
-    hljs.COMMENT('/\\*\\*!', '\\*/'),
-    hljs.C_NUMBER_MODE,
-    hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
-    hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
-    {
-      className: 'string',
-      begin: "'", end: "'"
-    },
-    {
-      className: 'label',
-      variants: [
-        {
-          begin: '#', end: '\\d+',
-          illegal: '\\W'
-        }
-      ]
-    }
-  ];
+  var STEP21_CLOSE = {
+    className: 'meta',
+    begin: 'END-ISO-10303-21;',
+    relevance: 10
+  };
 
@@ -43,10 +23,25 @@ return {
     contains: [
+      STEP21_START,
+      STEP21_CLOSE,
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      hljs.COMMENT('/\\*\\*!', '\\*/'),
+      hljs.C_NUMBER_MODE,
+      hljs.inherit(hljs.APOS_STRING_MODE, {illegal: null}),
+      hljs.inherit(hljs.QUOTE_STRING_MODE, {illegal: null}),
       {
-        className: 'preprocessor',
-        begin: STEP21_CLOSE_RE,
-        relevance: 10
+        className: 'string',
+        begin: "'", end: "'"
       },
-      STEP21_START
-    ].concat(STEP21_CODE)
+      {
+        className: 'symbol',
+        variants: [
+          {
+            begin: '#', end: '\\d+',
+            illegal: '\\W'
+          }
+        ]
+      }
+    ]
   };
 };

lib/languages/stylus.js

@@ -9,5 +9,4 @@ module.exports = function(hljs) {
   var HEX_COLOR = {
-    className: 'hexcolor',
-    begin: '#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})',
-    relevance: 10
+    className: 'number',
+    begin: '#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})'
   };
@@ -366,3 +365,3 @@
         contains: [
-          {className: 'class', begin: '\\.[a-zA-Z][a-zA-Z0-9_-]*'}
+          {className: 'selector-class', begin: '\\.[a-zA-Z][a-zA-Z0-9_-]*'}
         ]
@@ -376,3 +375,3 @@ },
         contains: [
-          {className: 'id', begin: '\\#[a-zA-Z][a-zA-Z0-9_-]*'}
+          {className: 'selector-id', begin: '\\#[a-zA-Z][a-zA-Z0-9_-]*'}
         ]
@@ -386,3 +385,3 @@ },
         contains: [
-          {className: 'tag', begin: '\\b[a-zA-Z][a-zA-Z0-9_-]*'}
+          {className: 'selector-tag', begin: '\\b[a-zA-Z][a-zA-Z0-9_-]*'}
         ]
@@ -393,3 +392,2 @@ },
       {
-        className: 'pseudo',
         begin: '&?:?:\\b(' + PSEUDO_SELECTORS.join('|') + ')' + TAG_END
@@ -400,3 +398,2 @@ },
       {
-        className: 'at_rule',
         begin: '\@(' + AT_KEYWORDS.join('|') + ')\\b'
@@ -418,3 +415,3 @@ },
         className: 'function',
-        begin: '\\b[a-zA-Z][a-zA-Z0-9_\-]*\\(.*\\)',
+        begin: '^[a-zA-Z][a-zA-Z0-9_\-]*\\(.*\\)',
         illegal: '[\\n]',
@@ -421,0 +418,0 @@ returnBegin: true,

lib/languages/swift.js

@@ -66,3 +66,3 @@ module.exports = function(hljs) {
       {
-        className: 'func',
+        className: 'function',
         beginKeywords: 'func', end: '{', excludeEnd: true,
@@ -75,3 +75,2 @@ contains: [
           {
-            className: 'generics',
             begin: /</, end: />/,
@@ -107,3 +106,3 @@ illegal: />/
       {
-        className: 'preprocessor', // @attributes
+        className: 'meta', // @attributes
         begin: '(@warn_unused_result|@exported|@lazy|@noescape|' +
@@ -110,0 +109,0 @@ '@NSCopying|@NSManaged|@objc|@convention|@required|' +

lib/languages/tcl.js

@@ -25,3 +25,3 @@ module.exports = function(hljs) {
           {
-            className: 'symbol',
+            className: 'title',
             begin: '[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*',
@@ -35,3 +35,2 @@ end: '[ \\t\\n\\r]',
       {
-        className: 'variable',
         excludeEnd: true,
@@ -38,0 +37,0 @@ variants: [

lib/languages/tex.js

 module.exports = function(hljs) {
-  var COMMAND1 = {
-    className: 'command',
-    begin: '\\\\[a-zA-Zа-яА-я]+[\\*]?'
+  var COMMAND = {
+    className: 'tag',
+    begin: /\\/,
+    relevance: 0,
+    contains: [
+      {
+        className: 'name',
+        variants: [
+          {begin: /[a-zA-Zа-яА-я]+[*]?/},
+          {begin: /[^a-zA-Zа-яА-я0-9]/}
+        ],
+        starts: {
+          endsWithParent: true,
+          relevance: 0,
+          contains: [
+            {
+              className: 'string', // because it looks like attributes in HTML tags
+              variants: [
+                {begin: /\[/, end: /\]/},
+                {begin: /\{/, end: /\}/}
+              ]
+            },
+            {
+              begin: /\s*=\s*/, endsWithParent: true,
+              relevance: 0,
+              contains: [
+                {
+                  className: 'number',
+                  begin: /-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/
+                }
+              ]
+            }
+          ]
+        }
+      }
+    ]
   };
-  var COMMAND2 = {
-    className: 'command',
-    begin: '\\\\[^a-zA-Zа-яА-я0-9]'
-  };
-  var SPECIAL = {
-    className: 'special',
-    begin: '[{}\\[\\]\\&#~]',
-    relevance: 0
-  };
 
   return {
     contains: [
-      { // parameter
-        begin: '\\\\[a-zA-Zа-яА-я]+[\\*]? *= *-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?',
-        returnBegin: true,
-        contains: [
-          COMMAND1, COMMAND2,
-          {
-            className: 'number',
-            begin: ' *=', end: '-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?',
-            excludeBegin: true
-          }
-        ],
-        relevance: 10
-      },
-      COMMAND1, COMMAND2,
-      SPECIAL,
+      COMMAND,
       {
         className: 'formula',
-        begin: '\\$\\$', end: '\\$\\$',
-        contains: [COMMAND1, COMMAND2, SPECIAL],
-        relevance: 0
+        contains: [COMMAND],
+        relevance: 0,
+        variants: [
+          {begin: /\$\$/, end: /\$\$/},
+          {begin: /\$/, end: /\$/}
+        ]
       },
-      {
-        className: 'formula',
-        begin: '\\$', end: '\\$',
-        contains: [COMMAND1, COMMAND2, SPECIAL],
-        relevance: 0
-      },
       hljs.COMMENT(
@@ -46,0 +53,0 @@ '%',

lib/languages/tp.js

@@ -8,3 +8,3 @@ module.exports = function(hljs) {
   var TPLABEL = {
-    className: 'comment',
+    className: 'symbol',
     begin: ':[^\\]]+'
@@ -41,4 +41,4 @@ };
         'Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN ' +
-        'SUBSTR FINDSTR VOFFSET',
-      constant:
+        'SUBSTR FINDSTR VOFFSET PROG ATTR MN POS',
+      literal:
         'ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET'
@@ -45,0 +45,0 @@ },

lib/languages/twig.js

@@ -11,4 +11,4 @@ module.exports = function(hljs) {
   var FUNCTIONS = {
-    className: 'function',
     beginKeywords: FUNCTION_NAMES,
+    keywords: {name: FUNCTION_NAMES},
     relevance: 0,
@@ -21,3 +21,2 @@ contains: [
   var FILTER = {
-    className: 'filter',
     begin: /\|[A-Za-z_]+:?/,
@@ -46,11 +45,21 @@ keywords:
       {
-        className: 'template_tag',
+        className: 'template-tag',
         begin: /\{%/, end: /%}/,
-        keywords: TAGS,
-        contains: [FILTER, FUNCTIONS]
+        contains: [
+          {
+            className: 'name',
+            begin: /\w+/,
+            keywords: TAGS,
+            starts: {
+              endsWithParent: true,
+              contains: [FILTER, FUNCTIONS],
+              relevance: 0
+            }
+          }
+        ]
       },
       {
-        className: 'variable',
+        className: 'template-variable',
         begin: /\{\{/, end: /}}/,
-        contains: [FILTER, FUNCTIONS]
+        contains: ['self', FILTER, FUNCTIONS]
       }
@@ -57,0 +66,0 @@ ]

lib/languages/typescript.js

 module.exports = function(hljs) {
   var KEYWORDS = {
     keyword:
-      'in if for while finally var new function|0 do return void else break catch ' +
+      'in if for while finally var new function do return void else break catch ' +
       'instanceof with throw case default try this switch continue typeof delete ' +
@@ -25,8 +25,18 @@ 'let yield const class public private protected get set super ' +
       {
-        className: 'pi',
-        begin: /^\s*['"]use strict['"]/,
-        relevance: 0
+        className: 'meta',
+        begin: /^\s*['"]use strict['"]/
       },
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
+      { // template string
+        className: 'string',
+        begin: '`', end: '`',
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          {
+            className: 'subst',
+            begin: '\\$\\{', end: '\\}'
+          }
+        ]
+      },
       hljs.C_LINE_COMMENT_MODE,
@@ -77,12 +87,8 @@ hljs.C_BLOCK_COMMENT_MODE,
       {
-        className: 'constructor',
-        beginKeywords: 'constructor', end: /\{/, excludeEnd: true,
-        relevance: 10
+        beginKeywords: 'constructor', end: /\{/, excludeEnd: true
       },
       {
-        className: 'module',
         beginKeywords: 'module', end: /\{/, excludeEnd: true
       },
       {
-        className: 'interface',
         beginKeywords: 'interface', end: /\{/, excludeEnd: true,
@@ -89,0 +95,0 @@ keywords: 'interface extends'

lib/languages/vala.js

@@ -43,10 +43,5 @@ module.exports = function(hljs) {
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '^#', end: '$',
         relevance: 2
-      },
-      {
-        className: 'constant',
-        begin: ' [A-Z_]+ ',
-        relevance: 0
       }
@@ -53,0 +48,0 @@ ]

lib/languages/vbnet.js

@@ -35,3 +35,3 @@ module.exports = function(hljs) {
             {
-              className: 'xmlDocTag',
+              className: 'doctag',
               begin: '\'\'\'|<!--|-->',
@@ -41,3 +41,3 @@ contains: [hljs.PHRASAL_WORDS_MODE]
             {
-              className: 'xmlDocTag',
+              className: 'doctag',
               begin: '</?', end: '>',
@@ -51,5 +51,5 @@ contains: [hljs.PHRASAL_WORDS_MODE]
       {
-        className: 'preprocessor',
+        className: 'meta',
         begin: '#', end: '$',
-        keywords: 'if else elseif end region externalsource'
+        keywords: {'meta-keyword': 'if else elseif end region externalsource'}
       }
@@ -56,0 +56,0 @@ ]

lib/languages/verilog.js

@@ -14,4 +14,4 @@ module.exports = function(hljs) {
         'rtranif0 rtranif1 specify specparam table task timescale tran ' +
-        'tranif0 tranif1 wait while xnor xor',
-      typename:
+        'tranif0 tranif1 wait while xnor xor ' +
+        // types
         'highz0 highz1 integer large medium pull0 pull1 real realtime reg ' +
@@ -31,18 +31,6 @@ 'scalared signed small strong0 strong1 supply0 supply0 supply1 supply1 ' +
       },
-      /* ports in instances */
-      {
-        className: 'typename',
-        begin: '\\.\\w+',
-        relevance: 0
-      },
       /* parameters to instances */
       {
-        className: 'value',
+        className: 'variable',
         begin: '#\\((?!parameter).+\\)'
-      },
-      /* operators */
-      {
-        className: 'keyword',
-        begin: '\\+|-|\\*|/|%|<|>|=|#|`|\\!|&|\\||@|:|\\^|~|\\{|\\}',
-        relevance: 0
       }
@@ -49,0 +37,0 @@ ]

lib/languages/vhdl.js

@@ -27,3 +27,3 @@ module.exports = function(hljs) {
         'unaffected units until use variable vmode vprop vunit wait when while with xnor xor',
-      typename:
+      built_in:
         'boolean bit character severity_level integer time delay_length natural positive ' +
@@ -50,3 +50,3 @@ 'string bit_vector file_open_kind file_open_status std_ulogic std_ulogic_vector ' +
       {
-        className: 'attribute',
+        className: 'symbol',
         begin: '\'[A-Za-z](_?[A-Za-z0-9])*',
@@ -53,0 +53,0 @@ contains: [hljs.BACKSLASH_ESCAPE]

lib/languages/x86asm.js

 module.exports = function(hljs) {
   return {
     case_insensitive: true,
-    lexemes: '\\.?' + hljs.IDENT_RE,
+    lexemes: '[.%]?' + hljs.IDENT_RE,
     keywords: {
@@ -9,3 +9,3 @@ keyword:
         'aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63',
-      literal:
+      built_in:
         // Instruction pointer
@@ -46,20 +46,18 @@ 'ip eip rip ' +
         'r0h r1h r2h r3h ' +
-        'r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l',
+        'r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l ' +
 
-      pseudo:
         'db dw dd dq dt ddq do dy dz ' +
         'resb resw resd resq rest resdq reso resy resz ' +
-        'incbin equ times',
+        'incbin equ times ' +
+        'byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr',
 
-      preprocessor:
+      meta:
         '%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif ' +
-        '%ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep ' +
+        '%if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep ' +
         '%endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment ' +
         '.nolist ' +
-        'byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr ' +
         '__FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ ' +
         '__UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend ' +
-        'align alignb sectalign daz nodaz up down zero default option assume public ',
+        'align alignb sectalign daz nodaz up down zero default option assume public ' +
 
-      built_in:
         'bits use16 use32 use64 default section segment absolute extern global common cpu float ' +
@@ -114,3 +112,3 @@ '__utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ ' +
       {
-        className: 'label',
+        className: 'symbol',
         variants: [
@@ -126,3 +124,3 @@ // Global label and local label
       {
-        className: 'argument',
+        className: 'subst',
         begin: '%[0-9]+',
@@ -133,3 +131,3 @@ relevance: 0
       {
-        className: 'built_in',
+        className: 'subst',
         begin: '%!\S+',
@@ -136,0 +134,0 @@ relevance: 0

lib/languages/xl.js

@@ -7,31 +7,20 @@ module.exports = function(hljs) {
   var XL_KEYWORDS = {
-    keyword: 'if then else do while until for loop import with is as where when by data constant',
-    literal: 'true false nil',
-    type: 'integer real text name boolean symbol infix prefix postfix block tree',
-    built_in: 'in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at',
-    module: BUILTIN_MODULES,
-    id:
-      'text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle ' +
-      'fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture ' +
-      'scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle ' +
-      'circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x ' +
-      'mouse_?y mouse_buttons'
+    keyword:
+      'if then else do while until for loop import with is as where when by data constant ' +
+      'integer real text name boolean symbol infix prefix postfix block tree',
+    literal:
+      'true false nil',
+    built_in:
+      'in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin ' +
+      'acos atan exp expm1 log log2 log10 log1p pi at text_length text_range ' +
+      'text_find text_replace contains page slide basic_slide title_slide ' +
+      'title subtitle fade_in fade_out fade_at clear_color color line_color ' +
+      'line_width texture_wrap texture_transform texture scale_?x scale_?y ' +
+      'scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y ' +
+      'rotate_?z? rectangle circle ellipse sphere path line_to move_to ' +
+      'quad_to curve_to theme background contents locally time mouse_?x ' +
+      'mouse_?y mouse_buttons ' +
+      BUILTIN_MODULES
   };
 
-  var XL_CONSTANT = {
-    className: 'constant',
-    begin: '[A-Z][A-Z_0-9]+',
-    relevance: 0
-  };
-  var XL_VARIABLE = {
-    className: 'variable',
-    begin: '([A-Z][a-z_0-9]+)+',
-    relevance: 0
-  };
-  var XL_ID = {
-    className: 'id',
-    begin: '[a-z][a-z_0-9]+',
-    relevance: 0
-  };
-
   var DOUBLE_QUOTE_TEXT = {
@@ -51,13 +40,7 @@ className: 'string',
     className: 'number',
-    begin: '[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?',
-    relevance: 10
+    begin: '[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?'
   };
   var IMPORT = {
-    className: 'import',
     beginKeywords: 'import', end: '$',
-    keywords: {
-      keyword: 'import',
-      module: BUILTIN_MODULES
-    },
-    relevance: 0,
+    keywords: XL_KEYWORDS,
     contains: [DOUBLE_QUOTE_TEXT]
@@ -67,3 +50,9 @@ };
     className: 'function',
-    begin: '[a-z].*->'
+    begin: /[a-z][^\n]*->/, returnBegin: true, end: /->/,
+    contains: [
+      hljs.inherit(hljs.TITLE_MODE, {starts: {
+        endsWithParent: true,
+        keywords: XL_KEYWORDS
+      }})
+    ]
   };
@@ -82,5 +71,2 @@ return {
     IMPORT,
-    XL_CONSTANT,
-    XL_VARIABLE,
-    XL_ID,
     BASED_NUMBER,
@@ -87,0 +73,0 @@ hljs.NUMBER_MODE

lib/languages/xml.js

@@ -14,3 +14,3 @@ module.exports = function(hljs) {
       {
-        className: 'attribute',
+        className: 'attr',
         begin: XML_IDENT_RE,
@@ -24,3 +24,3 @@ relevance: 0
           {
-            className: 'value',
+            className: 'string',
             contains: [PHP],
@@ -42,3 +42,3 @@ variants: [
       {
-        className: 'doctype',
+        className: 'meta',
         begin: '<!DOCTYPE', end: '>',
@@ -56,3 +56,2 @@ relevance: 10,
       {
-        className: 'cdata',
         begin: '<\\!\\[CDATA\\[', end: '\\]\\]>',
@@ -70,7 +69,7 @@ relevance: 10
         begin: '<style(?=\\s|>|$)', end: '>',
-        keywords: {title: 'style'},
+        keywords: {name: 'style'},
         contains: [TAG_INTERNALS],
         starts: {
           end: '</style>', returnEnd: true,
-          subLanguage: 'css'
+          subLanguage: ['css', 'xml']
         }
@@ -82,7 +81,7 @@ },
         begin: '<script(?=\\s|>|$)', end: '>',
-        keywords: {title: 'script'},
+        keywords: {name: 'script'},
         contains: [TAG_INTERNALS],
         starts: {
           end: '\<\/script\>', returnEnd: true,
-          subLanguage: ['actionscript', 'javascript', 'handlebars']
+          subLanguage: ['actionscript', 'javascript', 'handlebars', 'xml']
         }
@@ -92,3 +91,3 @@ },
       {
-        className: 'pi',
+        className: 'meta',
         begin: /<\?\w+/, end: /\?>/,
@@ -102,3 +101,3 @@ relevance: 10
           {
-            className: 'title', begin: /[^ \/><\n\t]+/, relevance: 0
+            className: 'name', begin: /[^\/><\s]+/, relevance: 0
           },
@@ -105,0 +104,0 @@ TAG_INTERNALS

lib/languages/xquery.js

@@ -11,3 +11,2 @@ module.exports = function(hljs) {
   var VAR = {
-    className: 'variable',
     begin: /\$[a-zA-Z0-9\-]+/,
@@ -32,3 +31,3 @@ relevance: 5
   var ANNOTATION = {
-    className: 'decorator',
+    className: 'meta',
     begin: '%\\w+'
@@ -43,3 +42,3 @@ };
       {
-        className: 'doc', begin: '@\\w+'
+        className: 'doctag', begin: '@\\w+'
       }
@@ -46,0 +45,0 @@ ]

lib/languages/zephir.js

@@ -21,11 +21,11 @@ module.exports = function(hljs) {
     keywords:
-    'and include_once list abstract global private echo interface as static endswitch ' +
-    'array null if endwhile or const for endforeach self var let while isset public ' +
-    'protected exit foreach throw elseif include __FILE__ empty require_once do xor ' +
-    'return parent clone use __CLASS__ __LINE__ else break print eval new ' +
-    'catch __METHOD__ case exception default die require __FUNCTION__ ' +
-    'enddeclare final try switch continue endfor endif declare unset true false ' +
-    'trait goto instanceof insteadof __DIR__ __NAMESPACE__ ' +
-    'yield finally int uint long ulong char uchar double float bool boolean string' +
-    'likely unlikely',
+      'and include_once list abstract global private echo interface as static endswitch ' +
+      'array null if endwhile or const for endforeach self var let while isset public ' +
+      'protected exit foreach throw elseif include __FILE__ empty require_once do xor ' +
+      'return parent clone use __CLASS__ __LINE__ else break print eval new ' +
+      'catch __METHOD__ case exception default die require __FUNCTION__ ' +
+      'enddeclare final try switch continue endfor endif declare unset true false ' +
+      'trait goto instanceof insteadof __DIR__ __NAMESPACE__ ' +
+      'yield finally int uint long ulong char uchar double float bool boolean string' +
+      'likely unlikely',
     contains: [
@@ -32,0 +32,0 @@ hljs.C_LINE_COMMENT_MODE,

package.json

@@ -9,3 +9,3 @@ {
   "homepage": "https://highlightjs.org/",
-  "version": "8.9.1",
+  "version": "9.0.0",
   "author": {
@@ -226,3 +226,3 @@ "name": "Ivan Sagalaev",
       "name": "Sergey Tikhomirov",
-      "email": "[e-mail]"
+      "email": "[e-mail]"
     },
@@ -746,4 +746,24 @@ {
     {
-      "name": "Ladislav Prskavec:",
+      "name": "Ladislav Prskavec",
       "email": "[e-mail]"
+    },
+    {
+      "name": "Jan Kühle",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Stefan Wienert",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Nikita Savchenko",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Nebuleon Fumika",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "prince",
+      "email": "[e-mail]"
     }
@@ -761,3 +781,4 @@ ],
   "scripts": {
-    "test": "./node_modules/.bin/mocha test/"
+    "test": "./node_modules/.bin/mocha test/",
+    "test-browser": "./node_modules/.bin/mocha test/browser/"
   },
@@ -768,13 +789,14 @@ "engines": {
   "devDependencies": {
-    "bluebird": "^2.9.30",
+    "bluebird": "^3.0.1",
     "commander": "^2.3.0",
-    "del": "^1.1.1",
+    "del": "^2.0.2",
     "gear": "^0.9.4",
     "gear-lib": "^0.9.2",
-    "glob": "^5.0.5",
-    "jsdom": "3.1.2",
+    "glob": "^6.0.1",
+    "jsdom": "7.0.2",
     "lodash": "^3.3.1",
     "mocha": "^2.0.1",
-    "should": "^7.0.1"
+    "should": "^7.0.1",
+    "tiny-worker": "^1.1.1"
   }
 }

README.md

@@ -71,2 +71,30 @@ # Highlight.js
 
+
+## Web Workers
+
+You can run highlighting inside a web worker to avoid freezing the browser
+window while dealing with very big chunks of code.
+
+In your main script:
+
+```javascript
+addEventListener('load', function() {
+  var code = document.querySelector('#code');
+  var worker = new Worker('worker.js');
+  worker.onmessage = function(event) { code.innerHTML = event.data; }
+  worker.postMessage(code.textContent);
+})
+```
+
+In worker.js:
+
+```javascript
+onmessage = function(event) {
+  importScripts('<path>/highlight.pack.js');
+  var result = self.hljs.highlightAuto(event.data);
+  postMessage(result.value);
+}
+```
+
+
 ## Getting the Library
@@ -73,0 +101,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

225

increased by1.35%

Number of lines in readme file

135

increased by26.17%

Worsened metrics

Total package byte prevSize

840344

decreased by-6.71%

Dev dependency count

11

increased by10%

Lines of code

18063

decreased by-10.09%

No dependency changes