1 files changed, 65 insertions, 67 deletions
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
index d23262b..69a96e5 100755
--- a/lib/coderay/token_kinds.rb
+++ b/lib/coderay/token_kinds.rb
@@ -10,77 +10,75 @@ module CodeRay
   TokenKinds.compare_by_identity if TokenKinds.respond_to? :compare_by_identity
   
   TokenKinds.update(  # :nodoc:
-    :annotation => 'at',
-    :attribute_name => 'an',
-    :attribute_value => 'av',
-    :bin => 'bi',
-    :char => 'ch',
-    :class => 'cl',
-    :class_variable => 'cv',
-    :color => 'cr',
-    :comment => 'c',
-    :complex => 'cm',
-    :constant => 'co',
-    :content => 'k',
-    :decorator => 'de',
-    :definition => 'df',
-    :delimiter => 'dl',
-    :directive => 'di',
-    :doc => 'do',
-    :doctype => 'dt',
-    :doc_string => 'ds',
-    :entity => 'en',
-    :error => 'er',
-    :escape => 'e',
-    :exception => 'ex',
-    :filename => 'filename',
-    :float => 'fl',
-    :function => 'fu',
-    :global_variable => 'gv',
-    :hex => 'hx',
-    :imaginary => 'cm',
-    :important => 'im',
-    :include => 'ic',
-    :inline => 'il',
-    :inline_delimiter => 'idl',
-    :instance_variable => 'iv',
-    :integer => 'i',
-    :interpreted => 'in',
-    :key => 'ke',
-    :keyword => 'kw',
-    :label => 'la',
-    :local_variable => 'lv',
-    :modifier => 'mod',
-    :namespace => 'ns',
-    :oct => 'oc',
-    :predefined => 'pd',
-    :preprocessor => 'pp',
-    :predefined_constant => 'pc',
-    :predefined_type => 'pt',
-    :pseudo_class => 'ps',
-    :regexp => 'rx',
-    :reserved => 'r',
-    :shell => 'sh',
-    :string => 's',
-    :symbol => 'sy',
-    :tag => 'ta',
-    :tag_special => 'ts',
-    :type => 'ty',
-    :value => 'vl',
-    :variable => 'v',
+    :annotation          => 'annotation',
+    :attribute_name      => 'attribute-name',
+    :attribute_value     => 'attribute-value',
+    :binary              => 'bin',
+    :char                => 'char',
+    :class               => 'class',
+    :class_variable      => 'class-variable',
+    :color               => 'color',
+    :comment             => 'comment',
+    :complex             => 'complex',
+    :constant            => 'constant',
+    :content             => 'content',
+    :decorator           => 'decorator',
+    :definition          => 'definition',
+    :delimiter           => 'delimiter',
+    :directive           => 'directive',
+    :doc                 => 'doc',
+    :doctype             => 'doctype',
+    :doc_string          => 'doc-string',
+    :entity              => 'entity',
+    :error               => 'error',
+    :escape              => 'escape',
+    :exception           => 'exception',
+    :filename            => 'filename',
+    :float               => 'float',
+    :function            => 'function',
+    :global_variable     => 'global-variable',
+    :hex                 => 'hex',
+    :imaginary           => 'imaginary',
+    :important           => 'important',
+    :include             => 'include',
+    :inline              => 'inline',
+    :inline_delimiter    => 'inline-delimiter',
+    :instance_variable   => 'instance-variable',
+    :integer             => 'integer',
+    :key                 => 'key',
+    :keyword             => 'keyword',
+    :label               => 'label',
+    :local_variable      => 'local-variable',
+    :modifier            => 'modifier',
+    :namespace           => 'namespace',
+    :octal               => 'octal',
+    :predefined          => 'predefined',
+    :predefined_constant => 'predefined-constant',
+    :predefined_type     => 'predefined-type',
+    :preprocessor        => 'preprocessor',
+    :pseudo_class        => 'pseudo-class',
+    :regexp              => 'regexp',
+    :reserved            => 'reserved',
+    :shell               => 'shell',
+    :string              => 'string',
+    :symbol              => 'symbol',
+    :tag                 => 'tag',
+    :type                => 'type',
+    :value               => 'value',
+    :variable            => 'variable',
     
-    :insert => 'ins',
-    :delete => 'del',
-    :change => 'chg',
-    :head => 'head',
+    :change              => 'change',
+    :delete              => 'delete',
+    :head                => 'head',
+    :insert              => 'insert',
     
-    :eyecatcher => 'eye',
+    :eyecatcher          => 'eyecatcher',
     
-    :ident => false, # 'id'
-    :operator => false,  # 'op'
+    :ident               => false,
+    :operator            => false,
     
-    :space => false,  # 'sp'
-    :plain => false
+    :space               => false,
+    :plain               => false
   )
   
   TokenKinds[:method]    = TokenKinds[:function]