highlight_js-rails 0.0.2 → 7.1.0

data/vendor/assets/javascripts/highlight_js/languages/python.js

@@ -2,70 +2,83 @@
 Language: Python
 */
 
-hljs.LANGUAGES.python = function() {
-  var STR1 = {
-    className: 'string',
-    begin: '(u|b)?r?\'\'\'', end: '\'\'\'',
-    relevance: 10
-  };
-  var STR2 = {
-    className: 'string',
-    begin: '(u|b)?r?"""', end: '"""',
-    relevance: 10
-  };
-  var STR3 = {
-    className: 'string',
-    begin: '(u|r|ur|b|br)\'', end: '\'',
-    contains: [hljs.BACKSLASH_ESCAPE],
-    relevance: 10
-  };
-  var STR4 = {
-    className: 'string',
-    begin: '(u|r|ur|b|br)"', end: '"',
-    contains: [hljs.BACKSLASH_ESCAPE],
-    relevance: 10
-  };
+hljs.LANGUAGES['python'] = function(hljs) {
+  var STRINGS = [
+    {
+      className: 'string',
+      begin: '(u|b)?r?\'\'\'', end: '\'\'\'',
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '(u|b)?r?"""', end: '"""',
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '(u|r|ur)\'', end: '\'',
+      contains: [hljs.BACKSLASH_ESCAPE],
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '(u|r|ur)"', end: '"',
+      contains: [hljs.BACKSLASH_ESCAPE],
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '(b|br)\'', end: '\'',
+      contains: [hljs.BACKSLASH_ESCAPE]
+    },
+    {
+      className: 'string',
+      begin: '(b|br)"', end: '"',
+      contains: [hljs.BACKSLASH_ESCAPE]
+    }
+  ].concat([
+    hljs.APOS_STRING_MODE,
+    hljs.QUOTE_STRING_MODE
+  ]);
   var TITLE = {
     className: 'title', begin: hljs.UNDERSCORE_IDENT_RE
   };
   var PARAMS = {
     className: 'params',
     begin: '\\(', end: '\\)',
-    contains: [STR1, STR2, STR3, STR4, hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE]
+    contains: ['self', hljs.C_NUMBER_MODE].concat(STRINGS)
+  };
+  var FUNC_CLASS_PROTO = {
+    beginWithKeyword: true, end: ':',
+    illegal: '[${=;\\n]',
+    contains: [TITLE, PARAMS],
+    relevance: 10
   };
 
   return {
     defaultMode: {
       keywords: {
-        'keyword': {'and': 1, 'elif': 1, 'is': 1, 'global': 1, 'as': 1, 'in': 1, 'if': 1, 'from': 1, 'raise': 1, 'for': 1, 'except': 1, 'finally': 1, 'print': 1, 'import': 1, 'pass': 1, 'return': 1, 'exec': 1, 'else': 1, 'break': 1, 'not': 1, 'with': 1, 'class': 1, 'assert': 1, 'yield': 1, 'try': 1, 'while': 1, 'continue': 1, 'del': 1, 'or': 1, 'def': 1, 'lambda': 1, 'nonlocal': 10},
-        'built_in': {'None': 1, 'True': 1, 'False': 1, 'Ellipsis': 1, 'NotImplemented': 1}
+        keyword:
+          'and elif is global as in if from raise for except finally print import pass return ' +
+          'exec else break not with class assert yield try while continue del or def lambda ' +
+          'nonlocal|10',
+        built_in:
+          'None True False Ellipsis NotImplemented'
       },
       illegal: '(</|->|\\?)',
-      contains: [
+      contains: STRINGS.concat([
         hljs.HASH_COMMENT_MODE,
-        STR1, STR2, STR3, STR4, hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE,
-        {
-          className: 'function',
-          begin: '\\bdef ', end: ':',
-          illegal: '$',
-          keywords: {'def': 1},
-          contains: [TITLE, PARAMS],
-          relevance: 10
-        },
-        {
-          className: 'class',
-          begin: '\\bclass ', end: ':',
-          illegal: '[${]',
-          keywords: {'class': 1},
-          contains: [TITLE, PARAMS],
-          relevance: 10
-        },
+        hljs.inherit(FUNC_CLASS_PROTO, {className: 'function', keywords: 'def'}),
+        hljs.inherit(FUNC_CLASS_PROTO, {className: 'class', keywords: 'class'}),
         hljs.C_NUMBER_MODE,
         {
           className: 'decorator',
           begin: '@', end: '$'
+        },
+        {
+          begin: '\\b(print|exec)\\(' // don’t highlight keywords-turned-functions in Python 3
         }
-      ]
+      ])
     }
   };
-}();
+}(hljs);

data/vendor/assets/javascripts/highlight_js/languages/r.js

@@ -0,0 +1,82 @@
+/*
+Language: R
+Author: Joe Cheng <joe@rstudio.org>
+*/
+
+hljs.LANGUAGES['r'] = function(hljs) {
+  var IDENT_RE = '([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*';
+
+  return {
+    defaultMode: {
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        {
+          begin: IDENT_RE,
+          lexems: IDENT_RE,
+          keywords: {
+            keyword:
+              'function if in break next repeat else for return switch while try tryCatch|10 ' +
+              'stop warning require library attach detach source setMethod setGeneric ' +
+              'setGroupGeneric setClass ...|10',
+            literal:
+              'NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 ' +
+              'NA_complex_|10'
+          },
+          relevance: 0
+        },
+        {
+          // hex value
+          className: 'number',
+          begin: "0[xX][0-9a-fA-F]+[Li]?\\b",
+          relevance: 0
+        },
+        {
+          // explicit integer
+          className: 'number',
+          begin: "\\d+(?:[eE][+\\-]?\\d*)?L\\b",
+          relevance: 0
+        },
+        {
+          // number with trailing decimal
+          className: 'number',
+          begin: "\\d+\\.(?!\\d)(?:i\\b)?",
+          relevance: 0
+        },
+        {
+          // number
+          className: 'number',
+          begin: "\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",
+          relevance: 0
+        },
+        {
+          // number with leading decimal
+          className: 'number',
+          begin: "\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",
+          relevance: 0
+        },
+
+        {
+          // escaped identifier
+          begin: '`',
+          end: '`',
+          relevance: 0
+        },
+
+        {
+          className: 'string',
+          begin: '"',
+          end: '"',
+          contains: [hljs.BACKSLASH_ESCAPE],
+          relevance: 0
+        },
+        {
+          className: 'string',
+          begin: "'",
+          end: "'",
+          contains: [hljs.BACKSLASH_ESCAPE],
+          relevance: 0
+        }
+      ]
+    }
+  };
+}(hljs);

data/vendor/assets/javascripts/highlight_js/languages/rib.js

@@ -0,0 +1,34 @@
+/*
+Language: RenderMan RIB
+Author: Konstantin Evdokimenko <qewerty@gmail.com>
+Contributors: Shuen-Huei Guan <drake.guan@gmail.com>
+*/
+
+hljs.LANGUAGES['rib'] = function(hljs) {
+  return {
+    defaultMode: {
+      keywords:
+        'ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis ' +
+        'Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone ' +
+        'CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail ' +
+        'DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format ' +
+        'FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry ' +
+        'Hider Hyperboloid Identity Illuminate Imager Interior LightSource ' +
+        'MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte ' +
+        'MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option ' +
+        'Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples ' +
+        'PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection ' +
+        'Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ' +
+        'ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere ' +
+        'SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd ' +
+        'TransformPoints Translate TrimCurve WorldBegin WorldEnd',
+      illegal: '</',
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        hljs.C_NUMBER_MODE,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE
+      ]
+    }
+  };
+}(hljs);

data/vendor/assets/javascripts/highlight_js/languages/rsl.js

@@ -0,0 +1,46 @@
+/*
+Language: RenderMan RSL
+Author: Konstantin Evdokimenko <qewerty@gmail.com>
+Contributors: Shuen-Huei Guan <drake.guan@gmail.com>
+*/
+
+hljs.LANGUAGES['rsl'] = function(hljs) {
+  return {
+    defaultMode: {
+      keywords: {
+        keyword:
+          'float color point normal vector matrix while for if do return else break extern continue',
+        built_in:
+          'abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise ' +
+          'clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp ' +
+          'faceforward filterstep floor format fresnel incident length lightsource log match ' +
+          'max min mod noise normalize ntransform opposite option phong pnoise pow printf ' +
+          'ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp ' +
+          'setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan ' +
+          'texture textureinfo trace transform vtransform xcomp ycomp zcomp'
+      },
+      illegal: '</',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.QUOTE_STRING_MODE,
+        hljs.APOS_STRING_MODE,
+        hljs.C_NUMBER_MODE,
+        {
+          className: 'preprocessor',
+          begin: '#', end: '$'
+        },
+        {
+          className: 'shader',
+          beginWithKeyword: true, end: '\\(',
+          keywords: 'surface displacement light volume imager'
+        },
+        {
+          className: 'shading',
+          beginWithKeyword: true, end: '\\(',
+          keywords: 'illuminate illuminance gather'
+        }
+      ]
+    }
+  };
+}(hljs);

data/vendor/assets/javascripts/highlight_js/languages/ruby.js

@@ -4,32 +4,36 @@ Author: Anton Kovalyov <anton@kovalyov.net>
 Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>
 */
 
-hljs.LANGUAGES.ruby = function(){
+hljs.LANGUAGES['ruby'] = function(hljs) {
   var RUBY_IDENT_RE = '[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?';
   var RUBY_METHOD_RE = '[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?';
   var RUBY_KEYWORDS = {
-    'keyword': {'and': 1, 'false': 1, 'then': 1, 'defined': 1, 'module': 1, 'in': 1, 'return': 1, 'redo': 1, 'if': 1, 'BEGIN': 1, 'retry': 1, 'end': 1, 'for': 1, 'true': 1, 'self': 1, 'when': 1, 'next': 1, 'until': 1, 'do': 1, 'begin': 1, 'unless': 1, 'END': 1, 'rescue': 1, 'nil': 1, 'else': 1, 'break': 1, 'undef': 1, 'not': 1, 'super': 1, 'class': 1, 'case': 1, 'require': 1, 'yield': 1, 'alias': 1, 'while': 1, 'ensure': 1, 'elsif': 1, 'or': 1, 'def': 1},
-    'keymethods': {'__id__': 1, '__send__': 1, 'abort': 1, 'abs': 1, 'all?': 1, 'allocate': 1, 'ancestors': 1, 'any?': 1, 'arity': 1, 'assoc': 1, 'at': 1, 'at_exit': 1, 'autoload': 1, 'autoload?': 1, 'between?': 1, 'binding': 1, 'binmode': 1, 'block_given?': 1, 'call': 1, 'callcc': 1, 'caller': 1, 'capitalize': 1, 'capitalize!': 1, 'casecmp': 1, 'catch': 1, 'ceil': 1, 'center': 1, 'chomp': 1, 'chomp!': 1, 'chop': 1, 'chop!': 1, 'chr': 1, 'class': 1, 'class_eval': 1, 'class_variable_defined?': 1, 'class_variables': 1, 'clear': 1, 'clone': 1, 'close': 1, 'close_read': 1, 'close_write': 1, 'closed?': 1, 'coerce': 1, 'collect': 1, 'collect!': 1, 'compact': 1, 'compact!': 1, 'concat': 1, 'const_defined?': 1, 'const_get': 1, 'const_missing': 1, 'const_set': 1, 'constants': 1, 'count': 1, 'crypt': 1, 'default': 1, 'default_proc': 1, 'delete': 1, 'delete!': 1, 'delete_at': 1, 'delete_if': 1, 'detect': 1, 'display': 1, 'div': 1, 'divmod': 1, 'downcase': 1, 'downcase!': 1, 'downto': 1, 'dump': 1, 'dup': 1, 'each': 1, 'each_byte': 1, 'each_index': 1, 'each_key': 1, 'each_line': 1, 'each_pair': 1, 'each_value': 1, 'each_with_index': 1, 'empty?': 1, 'entries': 1, 'eof': 1, 'eof?': 1, 'eql?': 1, 'equal?': 1, 'eval': 1, 'exec': 1, 'exit': 1, 'exit!': 1, 'extend': 1, 'fail': 1, 'fcntl': 1, 'fetch': 1, 'fileno': 1, 'fill': 1, 'find': 1, 'find_all': 1, 'first': 1, 'flatten': 1, 'flatten!': 1, 'floor': 1, 'flush': 1, 'for_fd': 1, 'foreach': 1, 'fork': 1, 'format': 1, 'freeze': 1, 'frozen?': 1, 'fsync': 1, 'getc': 1, 'gets': 1, 'global_variables': 1, 'grep': 1, 'gsub': 1, 'gsub!': 1, 'has_key?': 1, 'has_value?': 1, 'hash': 1, 'hex': 1, 'id': 1, 'include': 1, 'include?': 1, 'included_modules': 1, 'index': 1, 'indexes': 1, 'indices': 1, 'induced_from': 1, 'inject': 1, 'insert': 1, 'inspect': 1, 'instance_eval': 1, 'instance_method': 1, 'instance_methods': 1, 'instance_of?': 1, 'instance_variable_defined?': 1, 'instance_variable_get': 1, 'instance_variable_set': 1, 'instance_variables': 1, 'integer?': 1, 'intern': 1, 'invert': 1, 'ioctl': 1, 'is_a?': 1, 'isatty': 1, 'iterator?': 1, 'join': 1, 'key?': 1, 'keys': 1, 'kind_of?': 1, 'lambda': 1, 'last': 1, 'length': 1, 'lineno': 1, 'ljust': 1, 'load': 1, 'local_variables': 1, 'loop': 1, 'lstrip': 1, 'lstrip!': 1, 'map': 1, 'map!': 1, 'match': 1, 'max': 1, 'member?': 1, 'merge': 1, 'merge!': 1, 'method': 1, 'method_defined?': 1, 'method_missing': 1, 'methods': 1, 'min': 1, 'module_eval': 1, 'modulo': 1, 'name': 1, 'nesting': 1, 'new': 1, 'next': 1, 'next!': 1, 'nil?': 1, 'nitems': 1, 'nonzero?': 1, 'object_id': 1, 'oct': 1, 'open': 1, 'pack': 1, 'partition': 1, 'pid': 1, 'pipe': 1, 'pop': 1, 'popen': 1, 'pos': 1, 'prec': 1, 'prec_f': 1, 'prec_i': 1, 'print': 1, 'printf': 1, 'private_class_method': 1, 'private_instance_methods': 1, 'private_method_defined?': 1, 'private_methods': 1, 'proc': 1, 'protected_instance_methods': 1, 'protected_method_defined?': 1, 'protected_methods': 1, 'public_class_method': 1, 'public_instance_methods': 1, 'public_method_defined?': 1, 'public_methods': 1, 'push': 1, 'putc': 1, 'puts': 1, 'quo': 1, 'raise': 1, 'rand': 1, 'rassoc': 1, 'read': 1, 'read_nonblock': 1, 'readchar': 1, 'readline': 1, 'readlines': 1, 'readpartial': 1, 'rehash': 1, 'reject': 1, 'reject!': 1, 'remainder': 1, 'reopen': 1, 'replace': 1, 'require': 1, 'respond_to?': 1, 'reverse': 1, 'reverse!': 1, 'reverse_each': 1, 'rewind': 1, 'rindex': 1, 'rjust': 1, 'round': 1, 'rstrip': 1, 'rstrip!': 1, 'scan': 1, 'seek': 1, 'select': 1, 'send': 1, 'set_trace_func': 1, 'shift': 1, 'singleton_method_added': 1, 'singleton_methods': 1, 'size': 1, 'sleep': 1, 'slice': 1, 'slice!': 1, 'sort': 1, 'sort!': 1, 'sort_by': 1, 'split': 1, 'sprintf': 1, 'squeeze': 1, 'squeeze!': 1, 'srand': 1, 'stat': 1, 'step': 1, 'store': 1, 'strip': 1, 'strip!': 1, 'sub': 1, 'sub!': 1, 'succ': 1, 'succ!': 1, 'sum': 1, 'superclass': 1, 'swapcase': 1, 'swapcase!': 1, 'sync': 1, 'syscall': 1, 'sysopen': 1, 'sysread': 1, 'sysseek': 1, 'system': 1, 'syswrite': 1, 'taint': 1, 'tainted?': 1, 'tell': 1, 'test': 1, 'throw': 1, 'times': 1, 'to_a': 1, 'to_ary': 1, 'to_f': 1, 'to_hash': 1, 'to_i': 1, 'to_int': 1, 'to_io': 1, 'to_proc': 1, 'to_s': 1, 'to_str': 1, 'to_sym': 1, 'tr': 1, 'tr!': 1, 'tr_s': 1, 'tr_s!': 1, 'trace_var': 1, 'transpose': 1, 'trap': 1, 'truncate': 1, 'tty?': 1, 'type': 1, 'ungetc': 1, 'uniq': 1, 'uniq!': 1, 'unpack': 1, 'unshift': 1, 'untaint': 1, 'untrace_var': 1, 'upcase': 1, 'upcase!': 1, 'update': 1, 'upto': 1, 'value?': 1, 'values': 1, 'values_at': 1, 'warn': 1, 'write': 1, 'write_nonblock': 1, 'zero?': 1, 'zip': 1}
+    keyword:
+      'and false then defined module in return redo if BEGIN retry end for true self when ' +
+      'next until do begin unless END rescue nil else break undef not super class case ' +
+      'require yield alias while ensure elsif or include'
   };
   var YARDOCTAG = {
     className: 'yardoctag',
     begin: '@[A-Za-z]+'
   };
-  var COMMENT1 = {
-    className: 'comment',
-    begin: '#', end: '$',
-    contains: [YARDOCTAG]
-  };
-  var COMMENT2 = {
-    className: 'comment',
-    begin: '^\\=begin', end: '^\\=end',
-    contains: [YARDOCTAG],
-    relevance: 10
-  };
-  var COMMENT3 = {
-    className: 'comment',
-    begin: '^__END__', end: '\\n$'
-  };
+  var COMMENTS = [
+    {
+      className: 'comment',
+      begin: '#', end: '$',
+      contains: [YARDOCTAG]
+    },
+    {
+      className: 'comment',
+      begin: '^\\=begin', end: '^\\=end',
+      contains: [YARDOCTAG],
+      relevance: 10
+    },
+    {
+      className: 'comment',
+      begin: '^__END__', end: '\\n$'
+    }
+  ];
   var SUBST = {
     className: 'subst',
     begin: '#\\{', end: '}',
@@ -37,71 +41,69 @@ hljs.LANGUAGES.ruby = function(){
     keywords: RUBY_KEYWORDS
   };
   var STR_CONTAINS = [hljs.BACKSLASH_ESCAPE, SUBST];
-  var STR1 = {
-    className: 'string',
-    begin: '\'', end: '\'',
-    contains: STR_CONTAINS,
-    relevance: 0
-  };
-  var STR2 = {
-    className: 'string',
-    begin: '"', end: '"',
-    contains: STR_CONTAINS,
-    relevance: 0
-  };
-  var STR3 = {
-    className: 'string',
-    begin: '%[qw]?\\(', end: '\\)',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR4 = {
-    className: 'string',
-    begin: '%[qw]?\\[', end: '\\]',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR5 = {
-    className: 'string',
-    begin: '%[qw]?{', end: '}',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR6 = {
-    className: 'string',
-    begin: '%[qw]?<', end: '>',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR7 = {
-    className: 'string',
-    begin: '%[qw]?/', end: '/',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR8 = {
-    className: 'string',
-    begin: '%[qw]?%', end: '%',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR9 = {
-    className: 'string',
-    begin: '%[qw]?-', end: '-',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
-  var STR10 = {
-    className: 'string',
-    begin: '%[qw]?\\|', end: '\\|',
-    contains: STR_CONTAINS,
-    relevance: 10
-  };
+  var STRINGS = [
+    {
+      className: 'string',
+      begin: '\'', end: '\'',
+      contains: STR_CONTAINS,
+      relevance: 0
+    },
+    {
+      className: 'string',
+      begin: '"', end: '"',
+      contains: STR_CONTAINS,
+      relevance: 0
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?\\(', end: '\\)',
+      contains: STR_CONTAINS
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?\\[', end: '\\]',
+      contains: STR_CONTAINS
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?{', end: '}',
+      contains: STR_CONTAINS
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?<', end: '>',
+      contains: STR_CONTAINS,
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?/', end: '/',
+      contains: STR_CONTAINS,
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?%', end: '%',
+      contains: STR_CONTAINS,
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?-', end: '-',
+      contains: STR_CONTAINS,
+      relevance: 10
+    },
+    {
+      className: 'string',
+      begin: '%[qw]?\\|', end: '\\|',
+      contains: STR_CONTAINS,
+      relevance: 10
+    }
+  ];
   var FUNCTION = {
     className: 'function',
-    begin: '\\bdef\\s+', end: ' |$|;',
-    lexems: RUBY_IDENT_RE,
-    keywords: RUBY_KEYWORDS,
+    beginWithKeyword: true, end: ' |$|;',
+    keywords: 'def',
     contains: [
       {
         className: 'title',
@@ -114,25 +116,15 @@ hljs.LANGUAGES.ruby = function(){
         begin: '\\(', end: '\\)',
         lexems: RUBY_IDENT_RE,
         keywords: RUBY_KEYWORDS
-      },
-      COMMENT1, COMMENT2, COMMENT3
-    ]
-  };
-  var IDENTIFIER = {
-    className: 'identifier',
-    begin: RUBY_IDENT_RE,
-    lexems: RUBY_IDENT_RE,
-    keywords: RUBY_KEYWORDS,
-    relevance: 0
+      }
+    ].concat(COMMENTS)
   };
 
-  var RUBY_DEFAULT_CONTAINS = [
-    COMMENT1, COMMENT2, COMMENT3,
-    STR1, STR2, STR3, STR4, STR5, STR6, STR7, STR8, STR9, STR10,
+  var RUBY_DEFAULT_CONTAINS = COMMENTS.concat(STRINGS.concat([
     {
       className: 'class',
-      begin: '\\b(class|module)\\b', end: '$|;',
-      keywords: {'class': 1, 'module': 1},
+      beginWithKeyword: true, end: '$|;',
+      keywords: 'class module',
       contains: [
         {
           className: 'title',
@@ -146,20 +138,19 @@ hljs.LANGUAGES.ruby = function(){
             className: 'parent',
             begin: '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE
           }]
-        },
-        COMMENT1, COMMENT2, COMMENT3
-      ]
+        }
+      ].concat(COMMENTS)
     },
     FUNCTION,
     {
       className: 'constant',
-      begin: '(::)?([A-Z]\\w*(::)?)+',
+      begin: '(::)?(\\b[A-Z]\\w*(::)?)+',
       relevance: 0
     },
     {
       className: 'symbol',
       begin: ':',
-      contains: [STR1, STR2, STR3, STR4, STR5, STR6, STR7, STR8, STR9, STR10, IDENTIFIER],
+      contains: STRINGS.concat([{begin: RUBY_IDENT_RE}]),
       relevance: 0
     },
     {
@@ -175,21 +166,19 @@ hljs.LANGUAGES.ruby = function(){
       className: 'variable',
       begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))'
     },
-    IDENTIFIER,
     { // regexp container
       begin: '(' + hljs.RE_STARTERS_RE + ')\\s*',
-      contains: [
-        COMMENT1, COMMENT2, COMMENT3,
+      contains: COMMENTS.concat([
         {
           className: 'regexp',
           begin: '/', end: '/[a-z]*',
           illegal: '\\n',
           contains: [hljs.BACKSLASH_ESCAPE]
         }
-      ],
+      ]),
       relevance: 0
     }
-  ];
+  ]));
   SUBST.contains = RUBY_DEFAULT_CONTAINS;
   FUNCTION.contains[1].contains = RUBY_DEFAULT_CONTAINS;
 
@@ -200,4 +189,4 @@ hljs.LANGUAGES.ruby = function(){
       contains: RUBY_DEFAULT_CONTAINS
     }
   };
-}();
+}(hljs);