highlight_js-rails 0.0.2 → 7.1.0

data/AUTHORS.en.txt

@@ -21,7 +21,7 @@ Contributors:
 - MajestiC <majestic2k@gmail.com>
 - Vasily Polovnyov <vast@whiteants.net>
 - Vladimir Epifanov <voldmar@voldmar.ru>
-- Alexander Makarov (http://rmcreative.ru/)
+- Alexander Makarov <sam@rmcreative.ru>
 - Vah <vahtenberg@gmail.com>
 - Shuen-Huei Guan <drake.guan@gmail.com>
 - Jason Diamond <jason@diamond.name>
@@ -35,7 +35,7 @@ Contributors:
 - Vladimir Moskva <vladmos@gmail.com>
 - Loren Segal <lsegal@soen.ca>
 - Andrew Fedorov <dmmdrs@mail.ru>
-- Igor Kalnitsky <igor.kalnitsky@gmail.com>
+- Igor Kalnitsky <igor@kalnitsky.org>
 - Jeremy Hull <sourdrums@gmail.com>
 - Valerii Hiora <valerii.hiora@gmail.com>
 - Nikolay Zakharov <nikolay.desh@gmail.com>
@@ -44,3 +44,21 @@ Contributors:
 - Antono Vasiljev <self@antono.info>
 - Stephan Kountso <steplg@gmail.com>
 - pumbur <pumbur@pumbur.net>
+- John Crepezzi <john.crepezzi@gmail.com>
+- Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
+- Alexander Myadzel <myadzel@gmail.com>
+- Evgeny Stepanischev <imbolk@gmail.com>
+- Dmytrii Nagirniak <dnagir@gmail.com>
+- Oleg Efimov <efimovov@gmail.com>
+- Luigi Maselli <grigio.org@gmail.com>
+- Denis Bardadym <bardadymchik@gmail.com>
+- Aahan Krish <geekpanth3r@gmail.com>
+- Ilya Baryshev <baryshev@gmail.com>
+- Aleksandar Ruzicic <aleksandar@ruzicic.info>
+- Joe Cheng <joe@rstudio.org>
+- Angel G. Olloqui <angelgarcia.mail@gmail.com>
+- Jason Tate <adminz@web-cms-designs.com>
+- Sergey Tikhomirov <me@stikhomirov.com>
+- Marc Fornos <marc.fornos@gmail.com>
+- Yoshihide Jimbo <yjimbo@gmail.com>
+- Casey Duncan <casey.duncan@gmail.com>

data/AUTHORS.ru.txt

@@ -21,7 +21,7 @@ URL:   http://softwaremaniacs.org/soft/highlight/
 - MajestiC <majestic2k@gmail.com>
 - Василий Половнёв <vast@whiteants.net>
 - Владимир Епифанов <voldmar@voldmar.ru>
-- Александр Макаров (http://rmcreative.ru/)
+- Александр Макаров <sam@rmcreative.ru>
 - Vah <vahtenberg@gmail.com>
 - Шуэн-Хуэй Гуан <drake.guan@gmail.com>
 - Джейсон Даймонд <jason@diamond.name>
@@ -35,7 +35,7 @@ URL:   http://softwaremaniacs.org/soft/highlight/
 - Владимир Москва <vladmos@gmail.com>
 - Лорен Сегал <lsegal@soen.ca>
 - Андрей Фёдоров <dmmdrs@mail.ru>
-- Игорь Кальницкий <igor.kalnitsky@gmail.com>
+- Игорь Кальницкий <igor@kalnitsky.org>
 - Джереми Халл <sourdrums@gmail.com>
 - Валерий Хиора <valerii.hiora@gmail.com>
 - Николай Захаров <nikolay.desh@gmail.com>
@@ -44,3 +44,21 @@ URL:   http://softwaremaniacs.org/soft/highlight/
 - Антоно Васильев <self@antono.info>
 - Степан Кунцьо <steplg@gmail.com>
 - pumbur <pumbur@pumbur.net>
+- Джон Крепецци <john.crepezzi@gmail.com>
+- Андрей Власовских <andrey.vlasovskikh@gmail.com>
+- Александр Мядзель <myadzel@gmail.com>
+- Евгений Степанищев <imbolk@gmail.com>
+- Дмитрий Нагирняк <dnagir@gmail.com>
+- Олег Ефимов <efimovov@gmail.com>
+- Луиджи Мазелли <grigio.org@gmail.com>
+- Денис Бардадым <bardadymchik@gmail.com>
+- Аахан Криш <geekpanth3r@gmail.com>
+- Илья Барышев <baryshev@gmail.com>
+- Александр Ружичич <aleksandar@ruzicic.info>
+- Джо Ченг <joe@rstudio.org>
+- Анхель Ойоки <angelgarcia.mail@gmail.com>
+- Джейсон Тейт <adminz@web-cms-designs.com>
+- Сергей Тихомиров <me@stikhomirov.com>
+- Марк Форнос <marc.fornos@gmail.com>
+- Йошихиде Джимбо <yjimbo@gmail.com>
+- Кейси Данкан <casey.duncan@gmail.com>

data/classref.txt

@@ -39,7 +39,6 @@ Ruby ("ruby"):
   title            name of a function or a class inside a header
   parent           name of a parent class
   symbol           symbol
-  instancevar      instance variable
 
 Perl ("perl"):
 
@@ -124,6 +123,18 @@ CSS ("css"):
   params           everything between "(" and ")" within a function
   important        "!important" symbol
 
+Markdown ("markdown"):
+
+  header            header
+  bullet            list bullet
+  emphasis          emphasis
+  strong            strong emphasis
+  blockquote        blockquote
+  code              code
+  horizontal_rule   horizontal rule
+  link_label        link label
+  link_url          link url
+
 Django ("django"):
 
   keyword          HTML tag in HTML, default tags and default filters in templates
@@ -138,7 +149,15 @@ Django ("django"):
   filter           filter from "|" till the next filter or the end of tag
   argument         filter argument
 
-Javascript ("javascript"):
+JSON ("json"):
+
+  number           number
+  literal          "true", "false" and "null"
+  string           string value
+  attribute        name of an object property
+  value            value of an object property
+
+JavaScript ("javascript"):
 
   keyword          keyword
   comment          comment
@@ -148,7 +167,36 @@ Javascript ("javascript"):
   regexp           regular expression
   function         header of a function
   title            name of a function inside a header
-  params           everything inside parentheses in a function's header
+  params           parentheses and everything inside them in a function's header
+
+CoffeeScript ("coffeescript"):
+
+  keyword          keyword
+  comment          comment
+  number           number
+  literal          special literal: "true", "false" and "null"
+  string           string
+  regexp           regular expression
+  function         header of a function
+  title            name of a function variable inside a header
+  params           parentheses and everything inside them in a function's header
+
+ActionScript ("actionscript"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keywords
+  literal          literal
+  reserved         reserved keyword
+  title            name of declaration (package, class or function)
+  preprocessor     preprocessor directive (import, include)
+  type             type of returned value (for functions)
+  package          package (named or not)
+  class            class/interface
+  function         function
+  param            params of function
+  rest_arg         rest argument of function
 
 VBScript ("vbscript"):
 
@@ -158,6 +206,14 @@ VBScript ("vbscript"):
   comment          comment
   built_in         built-in function
 
+HTTP ("http"):
+
+  request          first line of a request
+  status           first line of a response
+  attribute        header name
+  string           header value or query string in a request line
+  number           status code
+
 Lua ("lua"):
 
   keyword          keyword
@@ -212,6 +268,7 @@ Objective C ("objectivec"):
   comment          comment
   preprocessor     preprocessor directive
   class            interface/implementation, protocol and forward class declaration
+  variable         properties and struct accesors
 
 Vala ("vala"):
 
@@ -231,6 +288,15 @@ C# ("cs"):
   comment          commment
   xmlDocTag        xmldoc tag ("///", "<!--", "-->", "<..>")
 
+D language ("d"):
+
+  comment          comment
+  string           string constant
+  number           number
+  keyword          language keywords (including @attributes)
+  constant         true false null
+  built_in         built-in plain types (int, string etc.)
+
 RenderMan RSL ("rsl"):
 
   keyword          keyword
@@ -291,6 +357,16 @@ Lisp ("lisp"):
   body             remainder of the non-quoted list
   quoted           quoted list, both "(quote .. )" and "'(..)"
 
+Clojure ("clojure"):
+
+  comment          comments and hints
+  string           string
+  number           number
+  collection       collections
+  attribute        :keyword
+  title            function name (built-in or user defined)
+  built_in         built-in function name
+
 Ini ("ini"):
 
   title            title of a section
@@ -311,12 +387,13 @@ Apache ("apache"):
 
 Nginx ("nginx"):
 
-  keyword          keyword
+  title            directive title
   string           string
   number           number
   comment          comment
   built_in         built-in constant
   variable         $-variable
+  regexp           regexp
 
 Diff ("diff"):
 
@@ -394,6 +471,8 @@ VHDL ("vhdl")
   string           string
   comment          commment
   literal          signal logical value
+  typename         typename
+  attribute        signal attribute
 
 Parser3 ("parser3"):
 
@@ -416,13 +495,13 @@ TeX ("tex"):
 Haskell ("haskell"):
 
   keyword          keyword
-  built_in         built-in typeclass/functions (Bool, Int)
   number           number
   string           string
   comment          comment
   class            type classes and other data types
   title            function name
-  label            type class name
+  type             type class name
+  typedef          definition of types (type, newtype, data)
 
 Erlang ("erlang"):
 
@@ -435,3 +514,40 @@ Erlang ("erlang"):
   variable         variable (starts with capital letter or with _)
   pp.keywords      module's attribute (-attribute)
   function_name    atom or atom:atom in case of function call
+
+Rust ("rust"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keyword
+  title            name of declaration
+  preprocessor     preprocessor directive
+
+Matlab ("matlab"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keyword
+  title            function name
+  function         function
+  param            params of function
+
+R ("r"):
+
+  comment          comment
+  string           string constant
+  number           number
+  keyword          language keywords (function, if) plus "structural"
+                   functions (attach, require, setClass)
+  literal          special literal: TRUE, FALSE, NULL, NA, etc.
+
+OpenGL Shading Language ("glsl"):
+
+  comment          comment
+  number           number
+  preprocessor     preprocessor directive
+  keyword          keyword
+  built_in         GLSL built-in functions and variables
+  literal          true false

data/lib/highlight_js/version.rb

@@ -1,5 +1,5 @@
 module HighlightJs
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "7.1.0"
   end
 end

data/vendor/assets/javascripts/highlight_js/highlight.js

@@ -28,6 +28,8 @@ var hljs = new function() {
     }
   }
 
+  var is_old_IE = (typeof navigator !== 'undefined' && /MSIE [678]/.test(navigator.userAgent));
+
   function blockText(block, ignoreNewLines) {
     var result = '';
     for (var i = 0; i < block.childNodes.length; i++)
@@ -40,14 +42,13 @@ var hljs = new function() {
         result += '\n';
       else
         result += blockText(block.childNodes[i]);
-    // Thank you, MSIE...
-    if (/MSIE [678]/.test(navigator.userAgent))
+    if (is_old_IE)
       result = result.replace(/\r/g, '\n');
     return result;
   }
 
   function blockLanguage(block) {
-    var classes = block.className.split(/\s+/)
+    var classes = block.className.split(/\s+/);
     classes = classes.concat(block.parentNode.className.split(/\s+/));
     for (var i = 0; i < classes.length; i++) {
       var class_ = classes[i].replace(/^language-/, '');
@@ -61,19 +62,19 @@ var hljs = new function() {
 
   function nodeStream(node) {
     var result = [];
-    (function (node, offset) {
+    (function _nodeStream(node, offset) {
       for (var i = 0; i < node.childNodes.length; i++) {
         if (node.childNodes[i].nodeType == 3)
           offset += node.childNodes[i].nodeValue.length;
         else if (node.childNodes[i].nodeName == 'BR')
-          offset += 1
-        else {
+          offset += 1;
+        else if (node.childNodes[i].nodeType == 1) {
           result.push({
             event: 'start',
             offset: offset,
             node: node.childNodes[i]
           });
-          offset = arguments.callee(node.childNodes[i], offset)
+          offset = _nodeStream(node.childNodes[i], offset);
           result.push({
             event: 'stop',
             offset: offset,
@@ -123,8 +124,8 @@ var hljs = new function() {
       for (var i = 0; i < node.attributes.length; i++) {
         var attribute = node.attributes[i];
         result += ' ' + attribute.nodeName.toLowerCase();
-        if (attribute.nodeValue != undefined && attribute.nodeValue != false && attribute.nodeValue != null) {
-          result += '="' + escape(attribute.nodeValue) + '"';
+        if (attribute.value !== undefined && attribute.value !== false && attribute.value !== null) {
+          result += '="' + escape(attribute.value) + '"';
         }
       }
       return result + '>';
@@ -138,10 +139,10 @@ var hljs = new function() {
         result += open(current.node);
         nodeStack.push(current.node);
       } else if (current.event == 'stop') {
-        var i = nodeStack.length;
+        var node, i = nodeStack.length;
         do {
           i--;
-          var node = nodeStack[i];
+          node = nodeStack[i];
           result += ('</' + node.nodeName.toLowerCase() + '>');
         } while (node != current.node);
         nodeStack.splice(i, 1);
@@ -151,40 +152,56 @@ var hljs = new function() {
         }
       }
     }
-    result += value.substr(processed);
-    return result;
+    return result + escape(value.substr(processed));
   }
 
   /* Initialization */
 
-  function compileModes() {
+  function compileModes(language_name) {
 
     function compileMode(mode, language, is_default) {
       if (mode.compiled)
         return;
 
+      var keywords = []; // used later with beginWithKeyword but filled as a side-effect of keywords compilation
+      if (mode.keywords) {
+        var compiled_keywords = {};
+
+        function flatten(className, str) {
+          var group = str.split(' ');
+          for (var i = 0; i < group.length; i++) {
+            var pair = group[i].split('|');
+            compiled_keywords[pair[0]] = [className, pair[1] ? Number(pair[1]) : 1];
+            keywords.push(pair[0]);
+          }
+        }
+
+        mode.lexemsRe = langRe(language, mode.lexems || hljs.IDENT_RE, true);
+        if (typeof mode.keywords == 'string') { // string
+          flatten('keyword', mode.keywords)
+        } else {
+          for (var className in mode.keywords) {
+            if (!mode.keywords.hasOwnProperty(className))
+              continue;
+            flatten(className, mode.keywords[className]);
+          }
+        }
+        mode.keywords = compiled_keywords;
+      }
       if (!is_default) {
+        if (mode.beginWithKeyword) {
+          mode.begin = '\\b(' + keywords.join('|') + ')\\s';
+        }
         mode.beginRe = langRe(language, mode.begin ? mode.begin : '\\B|\\b');
         if (!mode.end && !mode.endsWithParent)
-          mode.end = '\\B|\\b'
+          mode.end = '\\B|\\b';
         if (mode.end)
           mode.endRe = langRe(language, mode.end);
       }
       if (mode.illegal)
         mode.illegalRe = langRe(language, mode.illegal);
-      if (mode.relevance == undefined)
+      if (mode.relevance === undefined)
         mode.relevance = 1;
-      if (mode.keywords)
-        mode.lexemsRe = langRe(language, mode.lexems || hljs.IDENT_RE, true);
-      for (var key in mode.keywords) {
-        if (!mode.keywords.hasOwnProperty(key))
-          continue;
-        if (mode.keywords[key] instanceof Object)
-          mode.keywordGroups = mode.keywords;
-        else
-          mode.keywordGroups = {'keyword': mode.keywords};
-        break;
-      }
       if (!mode.contains) {
         mode.contains = [];
       }
@@ -192,20 +209,20 @@ var hljs = new function() {
       // (see lisp where quoted_list contains quoted_list)
       mode.compiled = true;
       for (var i = 0; i < mode.contains.length; i++) {
+        if (mode.contains[i] == 'self') {
+          mode.contains[i] = mode;
+        }
         compileMode(mode.contains[i], language, false);
       }
       if (mode.starts) {
         compileMode(mode.starts, language, false);
       }
     }
-
-    for (var i in languages) {
-      if (!languages.hasOwnProperty(i))
-        continue;
-      compileMode(languages[i].defaultMode, languages[i], true);
-    }
+    compileMode(languages[language_name].defaultMode, languages[language_name], true);
   }
 
+  var compiled_languages = {};
+
   /*
   Core highlighting function. Accepts a language name and a string with the
   code to highlight. Returns an object with the following properties:
@@ -216,14 +233,15 @@ var hljs = new function() {
 
   */
   function highlight(language_name, value) {
-    if (!compileModes.called) {
-      compileModes();
-      compileModes.called = true;
+    if (!compiled_languages[language_name]) {
+      compileModes(language_name);
+      compiled_languages[language_name] = true;
     }
 
     function subMode(lexem, mode) {
       for (var i = 0; i < mode.contains.length; i++) {
-        if (mode.contains[i].beginRe.test(lexem)) {
+        var match = mode.contains[i].beginRe.exec(lexem);
+        if (match && match.index == 0) {
           return mode.contains[i];
         }
       }
@@ -240,7 +258,7 @@ var hljs = new function() {
     }
 
     function isIllegal(lexem, mode) {
-      return mode.illegalRe && mode.illegalRe.test(lexem);
+      return mode.illegal && mode.illegalRe.test(lexem);
     }
 
     function compileTerminators(mode, language) {
@@ -262,69 +280,81 @@ var hljs = new function() {
         terminators.push(mode.illegal);
       }
 
-      return langRe(language, '(' + terminators.join('|') + ')', true);
+      return terminators.length ? langRe(language, terminators.join('|'), true) : null;
     }
 
     function eatModeChunk(value, index) {
       var mode = modes[modes.length - 1];
-      if (!mode.terminators) {
+      if (mode.terminators === undefined) {
         mode.terminators = compileTerminators(mode, language);
       }
-      mode.terminators.lastIndex = index;
-      var match = mode.terminators.exec(value);
-      if (match)
-        return [value.substr(index, match.index - index), match[0], false];
-      else
-        return [value.substr(index), '', true];
+      var match;
+      if (mode.terminators) {
+        mode.terminators.lastIndex = index;
+        match = mode.terminators.exec(value);
+      }
+      return match ? [value.substr(index, match.index - index), match[0], false] : [value.substr(index), '', true];
     }
 
     function keywordMatch(mode, match) {
-      var match_str = language.case_insensitive ? match[0].toLowerCase() : match[0]
-      for (var className in mode.keywordGroups) {
-        if (!mode.keywordGroups.hasOwnProperty(className))
-          continue;
-        var value = mode.keywordGroups[className].hasOwnProperty(match_str);
-        if (value)
-          return [className, value];
-      }
+      var match_str = language.case_insensitive ? match[0].toLowerCase() : match[0];
+      var value = mode.keywords[match_str];
+      if (value && value instanceof Array)
+          return value;
       return false;
     }
 
     function processKeywords(buffer, mode) {
+      buffer = escape(buffer);
       if (!mode.keywords)
-        return escape(buffer);
+        return buffer;
       var result = '';
       var last_index = 0;
       mode.lexemsRe.lastIndex = 0;
       var match = mode.lexemsRe.exec(buffer);
       while (match) {
-        result += escape(buffer.substr(last_index, match.index - last_index));
+        result += buffer.substr(last_index, match.index - last_index);
         var keyword_match = keywordMatch(mode, match);
         if (keyword_match) {
           keyword_count += keyword_match[1];
-          result += '<span class="'+ keyword_match[0] +'">' + escape(match[0]) + '</span>';
+          result += '<span class="'+ keyword_match[0] +'">' + match[0] + '</span>';
         } else {
-          result += escape(match[0]);
+          result += match[0];
         }
         last_index = mode.lexemsRe.lastIndex;
         match = mode.lexemsRe.exec(buffer);
       }
-      result += escape(buffer.substr(last_index, buffer.length - last_index));
-      return result;
+      return result + buffer.substr(last_index);
     }
 
-    function processBuffer(buffer, mode) {
-      if (mode.subLanguage && languages[mode.subLanguage]) {
-        var result = highlight(mode.subLanguage, buffer);
+    function processSubLanguage(buffer, mode) {
+      var result;
+      if (mode.subLanguage == '') {
+        result = highlightAuto(buffer);
+      } else {
+        result = highlight(mode.subLanguage, buffer);
+      }
+      // Counting embedded language score towards the host language may be disabled
+      // with zeroing the containing mode relevance. Usecase in point is Markdown that
+      // allows XML everywhere and makes every XML snippet to have a much larger Markdown
+      // score.
+      if (mode.relevance > 0) {
         keyword_count += result.keyword_count;
-        return result.value;
+        relevance += result.relevance;
+      }
+      return '<span class="' + result.language  + '">' + result.value + '</span>';
+    }
+
+    function processBuffer(buffer, mode) {
+      if (mode.subLanguage && languages[mode.subLanguage] || mode.subLanguage == '') {
+        return processSubLanguage(buffer, mode);
       } else {
         return processKeywords(buffer, mode);
       }
     }
 
     function startNewMode(mode, lexem) {
-      var markup = mode.className?'<span class="' + mode.className + '">':'';
+      var markup = mode.className? '<span class="' + mode.className + '">': '';
       if (mode.returnBegin) {
         result += markup;
         mode.buffer = '';
@@ -388,30 +418,29 @@ var hljs = new function() {
     var keyword_count = 0;
     var result = '';
     try {
-      var index = 0;
+      var mode_info, index = 0;
       language.defaultMode.buffer = '';
       do {
-        var mode_info = eatModeChunk(value, index);
+        mode_info = eatModeChunk(value, index);
         var return_lexem = processModeInfo(mode_info[0], mode_info[1], mode_info[2]);
         index += mode_info[0].length;
         if (!return_lexem) {
           index += mode_info[1].length;
         }
       } while (!mode_info[2]);
-      if(modes.length > 1)
-        throw 'Illegal';
       return {
         relevance: relevance,
         keyword_count: keyword_count,
-        value: result
-      }
+        value: result,
+        language: language_name
+      };
     } catch (e) {
       if (e == 'Illegal') {
         return {
           relevance: 0,
           keyword_count: 0,
           value: escape(value)
-        }
+        };
       } else {
         throw e;
       }
@@ -467,7 +496,7 @@ var hljs = new function() {
     if (tabReplace) {
       value = value.replace(/^((<[^>]+>|\t)+)/gm, function(match, p1, offset, s) {
         return p1.replace(/\t/g, tabReplace);
-      })
+      });
     }
     if (useBR) {
       value = value.replace(/\n/g, '<br>');
@@ -482,17 +511,18 @@ var hljs = new function() {
   function highlightBlock(block, tabReplace, useBR) {
     var text = blockText(block, useBR);
     var language = blockLanguage(block);
+    var result, pre;
     if (language == 'no-highlight')
         return;
     if (language) {
-      var result = highlight(language, text);
+      result = highlight(language, text);
     } else {
-      var result = highlightAuto(text);
+      result = highlightAuto(text);
       language = result.language;
     }
     var original = nodeStream(block);
     if (original.length) {
-      var pre = document.createElement('pre');
+      pre = document.createElement('pre');
       pre.innerHTML = result.value;
       result.value = mergeStreams(original, nodeStream(pre), text);
     }
@@ -502,10 +532,10 @@ var hljs = new function() {
     if (!class_name.match('(\\s|^)(language-)?' + language + '(\\s|$)')) {
       class_name = class_name ? (class_name + ' ' + language) : language;
     }
-    if (/MSIE [678]/.test(navigator.userAgent) && block.tagName == 'CODE' && block.parentNode.tagName == 'PRE') {
+    if (is_old_IE && block.tagName == 'CODE' && block.parentNode.tagName == 'PRE') {
       // This is for backwards compatibility only. IE needs this strange
       // hack becasue it cannot just cleanly replace <code> block contents.
-      var pre = block.parentNode;
+      pre = block.parentNode;
       var container = document.createElement('div');
       container.innerHTML = '<pre><code>' + result.value + '</code></pre>';
       block = container.firstChild.firstChild;
@@ -573,12 +603,13 @@ var hljs = new function() {
   this.IDENT_RE = '[a-zA-Z][a-zA-Z0-9_]*';
   this.UNDERSCORE_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_]*';
   this.NUMBER_RE = '\\b\\d+(\\.\\d+)?';
-  this.C_NUMBER_RE = '\\b(0x[A-Za-z0-9]+|\\d+(\\.\\d+)?)';
+  this.C_NUMBER_RE = '(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+  this.BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
   this.RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
 
   // Common modes
   this.BACKSLASH_ESCAPE = {
-    begin: '\\\\.', relevance: 0
+    begin: '\\\\[\\s\\S]', relevance: 0
   };
   this.APOS_STRING_MODE = {
     className: 'string',
@@ -616,6 +647,11 @@ var hljs = new function() {
     begin: this.C_NUMBER_RE,
     relevance: 0
   };
+  this.BINARY_NUMBER_MODE = {
+    className: 'number',
+    begin: this.BINARY_NUMBER_RE,
+    relevance: 0
+  };
 
   // Utility functions
   this.inherit = function(parent, obj) {