rouge 0.0.5 → 0.0.6

data/lib/rouge.rb

@@ -25,6 +25,7 @@ load load_dir.join('rouge/lexers/css.rb')
 load load_dir.join('rouge/lexers/html.rb')
 
 load load_dir.join('rouge/lexers/tcl.rb')
+load load_dir.join('rouge/lexers/python.rb')
 
 load load_dir.join('rouge/formatter.rb')
 load load_dir.join('rouge/formatters/html.rb')
@@ -32,3 +33,4 @@ load load_dir.join('rouge/formatters/html.rb')
 load load_dir.join('rouge/theme.rb')
 load load_dir.join('rouge/themes/thankful_eyes.rb')
 load load_dir.join('rouge/themes/colorful.rb')
+load load_dir.join('rouge/themes/base16.rb')

data/lib/rouge/lexer.rb

@@ -255,7 +255,15 @@ module Rouge
         stack.last
       end
 
+      MAX_STEPS = 200000
       def scan(re, &b)
+        @steps ||= 0
+        @steps += 1
+
+        if @steps >= MAX_STEPS
+          raise "too many scans near: #{scanner.peek(20)}..."
+        end
+
         scanner.scan(re)
 
         if scanner.matched?

data/lib/rouge/lexers/css.rb

@@ -64,7 +64,7 @@ module Rouge
         upper-alpha upper-latin upper-roman uppercase url
         visible w-resize wait wider x-fast x-high x-large x-loud
         x-low x-small x-soft xx-large xx-small yes
-      ).join('|')
+      )
 
       builtins = %w(
         indigo gold firebrick indianred yellow darkolivegreen
@@ -92,7 +92,7 @@ module Rouge
         lightslategray lawngreen lightgreen tomato hotpink
         lightyellow lavenderblush linen mediumaquamarine green
         blueviolet peachpuff
-      ).join('|')
+      )
 
       state :root do
         mixin :basics
@@ -148,9 +148,17 @@ module Rouge
       state :stanza do
         mixin :basics
         rule /}/, 'Punctuation', :pop!
-        rule /(?:#{keywords})\s*:/m, 'Keyword', :stanza_value
-        rule /(?:#{builtins})\s*:/m, 'Name.Builtin', :stanza_value
-        rule /#{identifier}\s*:/m, 'Name', :stanza_value
+        rule /(#{identifier}\s*):/m do |m|
+          if keywords.include? m[1]
+            token 'Keyword'
+          elsif builtins.include? m[1]
+            token 'Name.Builtin'
+          else
+            token 'Name'
+          end
+
+          push :stanza_value
+        end
       end
 
       state :stanza_value do

data/lib/rouge/lexers/python.rb

@@ -0,0 +1,181 @@
+module Rouge
+  module Lexers
+    class Python < RegexLexer
+      tag 'python'
+      aliases 'py'
+      extensions 'py'
+
+      keywords = %w(
+        assert break continue del elif else except exec
+        finally for global if lambda pass print raise
+        return try while yield as with
+      )
+
+      builtins = %w(
+        __import__ abs all any apply basestring bin bool buffer
+        bytearray bytes callable chr classmethod cmp coerce compile
+        complex delattr dict dir divmod enumerate eval execfile exit
+        file filter float frozenset getattr globals hasattr hash hex id
+        input int intern isinstance issubclass iter len list locals
+        long map max min next object oct open ord pow property range
+        raw_input reduce reload repr reversed round set setattr slice
+        sorted staticmethod str sum super tuple type unichr unicode
+        vars xrange zip
+      )
+
+      builtins_pseudo = %w(self None Ellipsis NotImplemented False True)
+
+      exceptions = %w(
+        ArithmeticError AssertionError AttributeError
+        BaseException DeprecationWarning EOFError EnvironmentError
+        Exception FloatingPointError FutureWarning GeneratorExit IOError
+        ImportError ImportWarning IndentationError IndexError KeyError
+        KeyboardInterrupt LookupError MemoryError NameError
+        NotImplemented NotImplementedError OSError OverflowError
+        OverflowWarning PendingDeprecationWarning ReferenceError
+        RuntimeError RuntimeWarning StandardError StopIteration
+        SyntaxError SyntaxWarning SystemError SystemExit TabError
+        TypeError UnboundLocalError UnicodeDecodeError
+        UnicodeEncodeError UnicodeError UnicodeTranslateError
+        UnicodeWarning UserWarning ValueError VMSError Warning
+        WindowsError ZeroDivisionError
+      )
+
+      identifier =        /[a-z_][a-z0-9_]*/i
+      dotted_identifier = /[a-z_.][a-z0-9_.]*/i
+      state :root do
+        rule /\n+/m, 'Text'
+        rule /^(\s*)([rRuU]{,2}""".*?""")/m do
+          group 'Text'
+          group 'Literal.String.Doc'
+        end
+
+        rule /[^\S\n]+/, 'Text'
+        rule /#.*$/, 'Comment'
+        rule /[\[\]{}:(),;]/, 'Punctuation'
+        rule /\\\n/, 'Text'
+        rule /\\/, 'Text'
+
+        rule /(in|is|and|or|not)\b/, 'Operator.Word'
+        rule /!=|==|<<|>>|[-~+\/*%=<>&^|.]/, 'Operator'
+
+        rule /(?:#{keywords.join('|')})\b/, 'Keyword'
+
+        rule /(def)((?:\s|\\\s)+)/ do
+          group 'Keyword' # def
+          group 'Text' # whitespae
+          push :funcname
+        end
+
+        rule /(class)((?:\s|\\\s)+)/ do
+          group 'Keyword'
+          group 'Text'
+          push :classname
+        end
+
+        rule /(from)((?:\s|\\\s)+)/ do
+          group 'Keyword.Namespace'
+          group 'Text'
+          push :fromimport
+        end
+
+        rule /(import)((?:\s|\\\s)+)/ do
+          group 'Keyword.Namespace'
+          group 'Text'
+          push :import
+        end
+
+        # using negative lookbehind so we don't match property names
+        rule /(?<!\.)(?:#{builtins.join('|')})/, 'Name.Builtin'
+        rule /(?<!\.)(?:#{builtins_pseudo.join('|')})/, 'Name.Builtin.Pseudo'
+
+        # TODO: not in python 3
+        rule /`.*?`/, 'Literal.String.Backtick'
+        rule /(?:r|ur|ru)"""/i, 'Literal.String', :tdqs
+        rule /(?:r|ur|ru)'''/i, 'Literal.String', :tsqs
+        rule /(?:r|ur|ru)"/i,   'Literal.String', :dqs
+        rule /(?:r|ur|ru)'/i,   'Literal.String', :sqs
+        rule /u?"""/i,          'Literal.String', :escape_tdqs
+        rule /u?'''/i,          'Literal.String', :escape_tsqs
+        rule /u?"/i,            'Literal.String', :escape_dqs
+        rule /u?'/i,            'Literal.String', :escape_sqs
+
+        rule /@#{dotted_identifier}/i, 'Name.Decorator'
+        rule identifier, 'Name'
+
+        rule /(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?/i, 'Literal.Number.Float'
+        rule /\d+e[+-]?[0-9]+/i, 'Literal.Number.Float'
+        rule /0[0-7]+/, 'Literal.Number.Oct'
+        rule /0x[a-f0-9]+/i, 'Literal.Number.Hex'
+        rule /\d+L/, 'Literal.Number.Integer.Long'
+        rule /\d+/, 'Literal.Number.Integer'
+      end
+
+      state :funcname do
+        rule identifier, 'Name.Function', :pop!
+      end
+
+      state :classname do
+        rule identifier, 'Name.Class', :pop!
+      end
+
+      state :import do
+        # non-line-terminating whitespace
+        rule /(?:[ \t]|\\\n)+/, 'Text'
+
+        rule /as\b/, 'Keyword.Namespace'
+        rule /,/, 'Operator'
+        rule dotted_identifier, 'Name.Namespace'
+        rule(//) { pop! } # anything else -> go back
+      end
+
+      state :fromimport do
+        # non-line-terminating whitespace
+        rule /(?:[ \t]|\\\n)+/, 'Text'
+
+        rule /import\b/, 'Keyword.Namespace', :pop!
+        rule dotted_identifier, 'Name.Namespace'
+      end
+
+      state :strings do
+        rule /%(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, 'Literal.String.Interpol'
+        rule /[^\\'"%\n]+/, 'Literal.String'
+      end
+
+      state :nl do
+        rule /\n/, 'Literal.String'
+      end
+
+      state :dqs do
+        rule /"/, 'Literal.String', :pop!
+        rule /\\\\|\\"|\\\n/, 'Literal.String.Escape'
+        mixin :strings
+      end
+
+      state :sqs do
+        rule /'/, 'Literal.String', :pop!
+        rule /\\\\|\\'|\\\n/, 'Literal.String.Escape'
+        mixin :strings
+      end
+
+      state :tdqs do
+        rule /"""/, 'Literal.String', :pop!
+        mixin :strings
+        mixin :nl
+      end
+
+      state :tsqs do
+        rule /'''/, 'Literal.String', :pop!
+        mixin :strings
+        mixin :nl
+      end
+
+      %w(tdqs tsqs dqs sqs).each do |qtype|
+        state :"escape_#{qtype}" do
+          mixin :escape
+          mixin :"#{qtype}"
+        end
+      end
+    end
+  end
+end

data/lib/rouge/theme.rb

@@ -1,14 +1,54 @@
 module Rouge
   class Theme
+    class InheritableHash < Hash
+      def initialize(parent=nil)
+        @parent = parent
+      end
+
+      def [](k)
+        _sup = super
+        return _sup if own_keys.include?(k)
+
+        _sup || parent[k]
+      end
+
+      def parent
+        @parent ||= {}
+      end
+
+      def include?(k)
+        super or parent.include?(k)
+      end
+
+      def each(&b)
+        keys.each do |k|
+          b.call(k, self[k])
+        end
+      end
+
+      alias own_keys keys
+      def keys
+        keys = own_keys.concat(parent.keys)
+        keys.uniq!
+        keys
+      end
+    end
+
     class Style < Hash
+      def initialize(theme, hsh={})
+        super()
+        @theme = theme
+        merge!(hsh)
+      end
+
       def render(selector, &b)
         return enum_for(:render, selector).to_a.join("\n") unless b
 
         return if empty?
 
         yield "#{selector} {"
-        yield "  color: #{self[:fg]};" if self[:fg]
-        yield "  background-color: #{self[:bg]};" if self[:bg]
+        yield "  color: #{@theme.palette(self[:fg])};" if self[:fg]
+        yield "  background-color: #{@theme.palette(self[:bg])};" if self[:bg]
         yield "  font-weight: bold;" if self[:bold]
         yield "  font-style: italic;" if self[:italic]
         yield "  text-decoration: underline;" if self[:underline]
@@ -19,16 +59,40 @@ module Rouge
 
         yield "}"
       end
+
     end
 
-    class << self
-      def styles
-        @styles ||= {}
+    def styles
+      @styles ||= self.class.styles.dup
+    end
+
+    @palette = {}
+    def self.palette(arg={})
+      @palette ||= InheritableHash.new(superclass.palette)
+
+      if arg.is_a? Hash
+        @palette.merge! arg
+        @palette
+      else
+        case arg
+        when /#[0-9a-f]+/i
+          arg
+        else
+          @palette[arg] or raise "not in palette: #{arg.inspect}"
+        end
       end
+    end
 
+    @styles = {}
+    def self.styles
+      @styles ||= InheritableHash.new(superclass.styles)
+    end
+
+    class << self
       def style(*tokens)
-        style = Style.new
-        style.merge!(tokens.pop) if tokens.last.is_a? Hash
+        style = tokens.last.is_a?(Hash) ? tokens.pop : {}
+
+        style = Style.new(self, style)
 
         tokens.each do |tok|
           styles[tok.to_s] = style
@@ -39,7 +103,7 @@ module Rouge
         return @name if n.nil?
 
         @name = n.to_s
-        registry[@name] = self
+        Theme.registry[@name] = self
       end
 
       def find(n)
@@ -52,6 +116,27 @@ module Rouge
     end
   end
 
+  module HasModes
+    def mode(arg=:absent)
+      return @mode if arg == :absent
+
+      @modes ||= {}
+      @modes[arg] ||= get_mode(arg)
+    end
+
+    def get_mode(mode)
+      return self if self.mode == mode
+
+      new_name = "#{self.name}.#{mode}"
+      Class.new(self) { name(new_name); mode!(mode) }
+    end
+
+    def mode!(arg)
+      @mode = arg
+      send("make_#{arg}!")
+    end
+  end
+
   class CSSTheme < Theme
     def initialize(opts={})
       @scope = opts[:scope] || '.highlight'
@@ -60,7 +145,7 @@ module Rouge
     def render(&b)
       return enum_for(:render).to_a.join("\n") unless b
 
-      self.class.styles.each do |tokname, style|
+      styles.each do |tokname, style|
         style.render(css_selector(Token[tokname]), &b)
       end
     end
@@ -92,7 +177,7 @@ module Rouge
 
       yield tok
       tok.sub_tokens.each_value do |st|
-        next if self.class.styles.include? st.name
+        next if styles[st.name]
 
         inflate_token(st, &b)
       end

data/lib/rouge/themes/base16.rb

@@ -0,0 +1,128 @@
+module Rouge
+  module Themes
+    # default base16 theme
+    # by Chris Kempson (http://chriskempson.com)
+    class Base16 < CSSTheme
+      name 'base16'
+
+      palette base00: "#151515"
+      palette base01: "#202020"
+      palette base02: "#303030"
+      palette base03: "#505050"
+      palette base04: "#b0b0b0"
+      palette base05: "#d0d0d0"
+      palette base06: "#e0e0e0"
+      palette base07: "#f5f5f5"
+      palette base08: "#ac4142"
+      palette base09: "#d28445"
+      palette base0A: "#f4bf75"
+      palette base0B: "#90a959"
+      palette base0C: "#75b5aa"
+      palette base0D: "#6a9fb5"
+      palette base0E: "#aa759f"
+      palette base0F: "#8f5536"
+
+      extend HasModes
+
+      def self.light!
+        mode :dark # indicate that there is a dark variant
+        mode! :light
+      end
+
+      def self.dark!
+        mode :light # indicate that there is a light variant
+        mode! :dark
+      end
+
+      def self.make_dark!
+        style 'Text', :fg => :base05, :bg => :base00
+      end
+
+      def self.make_light!
+        style 'Text', :fg => :base02
+      end
+
+      light!
+
+      style 'Error', :fg => :base00, :bg => :base08
+      style 'Comment', :fg => :base03
+
+      style 'Comment.Preproc',
+            'Name.Tag', :fg => :base0A
+
+      style 'Operator',
+            'Punctuation', :fg => :base05
+
+      style 'Generic.Inserted', :fg => :base0B
+      style 'Generic.Removed', :fg => :base08
+      style 'Generic.Heading', :fg => :base0D, :bg => :base00, :bold => true
+
+      style 'Keyword', :fg => :base0E
+      style 'Keyword.Constant',
+            'Keyword.Type', :fg => :base09
+
+      style 'Keyword.Declaration', :fg => :base09
+
+      style 'Literal.String', :fg => :base0B
+      style 'Literal.String.Regex', :fg => :base0C
+
+      style 'Literal.String.Interpol',
+            'Literal.String.Escape', :fg => :base0F
+
+      style 'Name.Namespace',
+            'Name.Class',
+            'Name.Constant', :fg => :base0A
+
+      style 'Name.Attribute', :fg => :base0D
+
+      style 'Literal.Number',
+            'Literal.String.Symbol', :fg => :base0B
+
+      class Solarized < Base16
+        name 'base16.solarized'
+        light!
+        # author "Ethan Schoonover (http://ethanschoonover.com/solarized)"
+
+        palette base00: "#002b36"
+        palette base01: "#073642"
+        palette base02: "#586e75"
+        palette base03: "#657b83"
+        palette base04: "#839496"
+        palette base05: "#93a1a1"
+        palette base06: "#eee8d5"
+        palette base07: "#fdf6e3"
+        palette base08: "#dc322f"
+        palette base09: "#cb4b16"
+        palette base0A: "#b58900"
+        palette base0B: "#859900"
+        palette base0C: "#2aa198"
+        palette base0D: "#268bd2"
+        palette base0E: "#6c71c4"
+        palette base0F: "#d33682"
+      end
+
+      class Monokai < Base16
+        name 'base16.monokai'
+        dark!
+
+        # author "Wimer Hazenberg (http://www.monokai.nl)"
+        palette base00: "#272822"
+        palette base01: "#383830"
+        palette base02: "#49483e"
+        palette base03: "#75715e"
+        palette base04: "#a59f85"
+        palette base05: "#f8f8f2"
+        palette base06: "#f5f4f1"
+        palette base07: "#f9f8f5"
+        palette base08: "#f92672"
+        palette base09: "#fd971f"
+        palette base0A: "#f4bf75"
+        palette base0B: "#a6e22e"
+        palette base0C: "#a1efe4"
+        palette base0D: "#66d9ef"
+        palette base0E: "#ae81ff"
+        palette base0F: "#cc6633"
+      end
+    end
+  end
+end

data/lib/rouge/themes/colorful.rb

@@ -2,62 +2,64 @@ module Rouge
   module Themes
     # stolen from pygments
     class Colorful < CSSTheme
-        style 'Text',                      :fg => "#bbbbbb", :bg => 'black'
-
-        style 'Comment',                   :fg => "#888"
-        style 'Comment.Preproc',           :fg => "#579"
-        style 'Comment.Special',           :fg => "#cc0000", :bold => true
-
-        style 'Keyword',                   :fg => "#080", :bold => true
-        style 'Keyword.Pseudo',            :fg => "#038"
-        style 'Keyword.Type',              :fg => "#339"
-
-        style 'Operator',                  :fg => "#333"
-        style 'Operator.Word',             :fg => "#000", :bold => true
-
-        style 'Name.Builtin',              :fg => "#007020"
-        style 'Name.Function',             :fg => "#06B", :bold => true
-        style 'Name.Class',                :fg => "#B06", :bold => true
-        style 'Name.Namespace',            :fg => "#0e84b5", :bold => true
-        style 'Name.Exception',            :fg => "#F00", :bold => true
-        style 'Name.Variable',             :fg => "#963"
-        style 'Name.Variable.Instance',    :fg => "#33B"
-        style 'Name.Variable.Class',       :fg => "#369"
-        style 'Name.Variable.Global',      :fg => "#d70", :bold => true
-        style 'Name.Constant',             :fg => "#036", :bold => true
-        style 'Name.Label',                :fg => "#970", :bold => true
-        style 'Name.Entity',               :fg => "#800", :bold => true
-        style 'Name.Attribute',            :fg => "#00C"
-        style 'Name.Tag',                  :fg => "#070"
-        style 'Name.Decorator',            :fg => "#555", :bold => true
-
-        style 'Literal.String',            :bg => "#fff0f0"
-        style 'Literal.String.Char',       :fg => "#04D"
-        style 'Literal.String.Doc',        :fg => "#D42"
-        style 'Literal.String.Interpol',   :bg => "#eee"
-        style 'Literal.String.Escape',     :fg => "#666", :bold => true
-        style 'Literal.String.Regex',      :fg => "#000", :bg => "#fff0ff"
-        style 'Literal.String.Symbol',     :fg => "#A60"
-        style 'Literal.String.Other',      :fg => "#D20"
-
-        style 'Literal.Number',            :fg => "#60E", :bold => true
-        style 'Literal.Number.Integer',    :fg => "#00D", :bold => true
-        style 'Literal.Number.Float',      :fg => "#60E", :bold => true
-        style 'Literal.Number.Hex',        :fg => "#058", :bold => true
-        style 'Literal.Number.Oct',        :fg => "#40E", :bold => true
-
-        style 'Generic.Heading',           :fg => "#000080", :bold => true
-        style 'Generic.Subheading',        :fg => "#800080", :bold => true
-        style 'Generic.Deleted',           :fg => "#A00000"
-        style 'Generic.Inserted',          :fg => "#00A000"
-        style 'Generic.Error',             :fg => "#FF0000"
-        style 'Generic.Emph',              :italic => true
-        style 'Generic.Strong',            :bold => true
-        style 'Generic.Prompt',            :fg => "#c65d09", :bold => true
-        style 'Generic.Output',            :fg => "#888"
-        style 'Generic.Traceback',         :fg => "#04D"
-
-        style 'Error',                     :fg => "#F00", :bg => "#FAA"
+      name 'colorful'
+
+      style 'Text',                      :fg => "#bbbbbb", :bg => 'black'
+
+      style 'Comment',                   :fg => "#888"
+      style 'Comment.Preproc',           :fg => "#579"
+      style 'Comment.Special',           :fg => "#cc0000", :bold => true
+
+      style 'Keyword',                   :fg => "#080", :bold => true
+      style 'Keyword.Pseudo',            :fg => "#038"
+      style 'Keyword.Type',              :fg => "#339"
+
+      style 'Operator',                  :fg => "#333"
+      style 'Operator.Word',             :fg => "#000", :bold => true
+
+      style 'Name.Builtin',              :fg => "#007020"
+      style 'Name.Function',             :fg => "#06B", :bold => true
+      style 'Name.Class',                :fg => "#B06", :bold => true
+      style 'Name.Namespace',            :fg => "#0e84b5", :bold => true
+      style 'Name.Exception',            :fg => "#F00", :bold => true
+      style 'Name.Variable',             :fg => "#963"
+      style 'Name.Variable.Instance',    :fg => "#33B"
+      style 'Name.Variable.Class',       :fg => "#369"
+      style 'Name.Variable.Global',      :fg => "#d70", :bold => true
+      style 'Name.Constant',             :fg => "#036", :bold => true
+      style 'Name.Label',                :fg => "#970", :bold => true
+      style 'Name.Entity',               :fg => "#800", :bold => true
+      style 'Name.Attribute',            :fg => "#00C"
+      style 'Name.Tag',                  :fg => "#070"
+      style 'Name.Decorator',            :fg => "#555", :bold => true
+
+      style 'Literal.String',            :bg => "#fff0f0"
+      style 'Literal.String.Char',       :fg => "#04D"
+      style 'Literal.String.Doc',        :fg => "#D42"
+      style 'Literal.String.Interpol',   :bg => "#eee"
+      style 'Literal.String.Escape',     :fg => "#666", :bold => true
+      style 'Literal.String.Regex',      :fg => "#000", :bg => "#fff0ff"
+      style 'Literal.String.Symbol',     :fg => "#A60"
+      style 'Literal.String.Other',      :fg => "#D20"
+
+      style 'Literal.Number',            :fg => "#60E", :bold => true
+      style 'Literal.Number.Integer',    :fg => "#00D", :bold => true
+      style 'Literal.Number.Float',      :fg => "#60E", :bold => true
+      style 'Literal.Number.Hex',        :fg => "#058", :bold => true
+      style 'Literal.Number.Oct',        :fg => "#40E", :bold => true
+
+      style 'Generic.Heading',           :fg => "#000080", :bold => true
+      style 'Generic.Subheading',        :fg => "#800080", :bold => true
+      style 'Generic.Deleted',           :fg => "#A00000"
+      style 'Generic.Inserted',          :fg => "#00A000"
+      style 'Generic.Error',             :fg => "#FF0000"
+      style 'Generic.Emph',              :italic => true
+      style 'Generic.Strong',            :bold => true
+      style 'Generic.Prompt',            :fg => "#c65d09", :bold => true
+      style 'Generic.Output',            :fg => "#888"
+      style 'Generic.Traceback',         :fg => "#04D"
+
+      style 'Error',                     :fg => "#F00", :bg => "#FAA"
     end
   end
 end

data/lib/rouge/themes/thankful_eyes.rb

@@ -1,45 +1,47 @@
 module Rouge
   module Themes
     class ThankfulEyes < CSSTheme
+      name 'thankful_eyes'
+
       # pallette, from GTKSourceView's ThankfulEyes
-      cool_as_ice =    '#6c8b9f'
-      slate_blue =     '#4e5d62'
-      eggshell_cloud = '#dee5e7'
-      krasna =         '#122b3b'
-      aluminum1 =      '#fefeec'
-      scarletred2 =    '#cc0000'
-      butter3 =        '#c4a000'
-      go_get_it =      '#b2fd6d'
-      chilly =         '#a8e1fe'
-      unicorn =        '#faf6e4'
-      sandy =          '#f6dd62'
-      pink_merengue =  '#f696db'
-      dune =           '#fff0a6'
-      backlit =        '#4df4ff'
-      schrill =        '#ffb000'
+      palette :cool_as_ice    => '#6c8b9f'
+      palette :slate_blue     => '#4e5d62'
+      palette :eggshell_cloud => '#dee5e7'
+      palette :krasna         => '#122b3b'
+      palette :aluminum1      => '#fefeec'
+      palette :scarletred2    => '#cc0000'
+      palette :butter3        => '#c4a000'
+      palette :go_get_it      => '#b2fd6d'
+      palette :chilly         => '#a8e1fe'
+      palette :unicorn        => '#faf6e4'
+      palette :sandy          => '#f6dd62'
+      palette :pink_merengue  => '#f696db'
+      palette :dune           => '#fff0a6'
+      palette :backlit        => '#4df4ff'
+      palette :schrill        => '#ffb000'
 
-      style 'Text', :fg => unicorn, :bg => krasna
+      style 'Text', :fg => :unicorn, :bg => :krasna
 
-      style 'Comment', :fg => cool_as_ice
+      style 'Comment', :fg => :cool_as_ice
       style 'Error',
-            'Generic.Error', :fg => aluminum1, :bg => scarletred2
-      style 'Keyword', :fg => sandy, :bold => true
+            'Generic.Error', :fg => :aluminum1, :bg => :scarletred2
+      style 'Keyword', :fg => :sandy, :bold => true
       style 'Operator',
-            'Punctuation', :fg => backlit, :bold => true
+            'Punctuation', :fg => :backlit, :bold => true
       style 'Comment.Preproc',
             'Comment.Multiline',
             'Comment.Single',
-            'Comment.Special', :fg => cool_as_ice, :italic => true
-      style 'Generic.Deleted', :fg => scarletred2
-      style 'Generic.Inserted', :fg => go_get_it
+            'Comment.Special', :fg => :cool_as_ice, :italic => true
+      style 'Generic.Deleted', :fg => :scarletred2
+      style 'Generic.Inserted', :fg => :go_get_it
       style 'Generic.Emph', :italic => true
       style 'Generic.Subheading', :fg => '#800080', :bold => true
       style 'Generic.Traceback', :fg => '#0040D0'
-      style 'Keyword.Constant', :fg => pink_merengue, :bold => true
+      style 'Keyword.Constant', :fg => :pink_merengue, :bold => true
       style 'Keyword.Namespace',
             'Keyword.Pseudo',
             'Keyword.Reserved',
-            'Generic.Heading', :fg => schrill, :bold => true
+            'Generic.Heading', :fg => :schrill, :bold => true
       style 'Keyword.Type',
             'Name.Constant',
             'Name.Class',
@@ -47,21 +49,21 @@ module Rouge
             'Name.Namespace',
             'Name.Builtin.Pseudo',
             'Name.Exception',
-            'Name.Tag', :fg => go_get_it, :bold => true
-      style 'Literal.Number', :fg => pink_merengue, :bold => true
-      style 'Literal.String', :fg => dune, :bold => true
+            'Name.Tag', :fg => :go_get_it, :bold => true
+      style 'Literal.Number', :fg => :pink_merengue, :bold => true
+      style 'Literal.String', :fg => :dune, :bold => true
       style 'Literal.String.Escape',
             'Literal.String.Char',
             'Literal.String.Interpol',
             'Literal.String.Other',
-            'Literal.String.Symbol', :fg => backlit, :bold => true
-      style 'Name.Builtin', :fg => sandy
+            'Literal.String.Symbol', :fg => :backlit, :bold => true
+      style 'Name.Builtin', :fg => :sandy
       style 'Name.Entity', :fg => '#999999', :bold => true
       style 'Text.Whitespace', :fg => '#BBBBBB'
       style 'Name.Variable',
             'Name.Function',
             'Name.Label',
-            'Name.Attribute', :fg => chilly
+            'Name.Attribute', :fg => :chilly
     end
   end
 end

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.0.5"
+    "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- lib/rouge/lexers/python.rb
 - lib/rouge/lexers/shell.rb
 - lib/rouge/lexers/javascript.rb
 - lib/rouge/lexers/diff.rb
@@ -29,6 +30,7 @@ files:
 - lib/rouge/plugins/redcarpet.rb
 - lib/rouge/themes/thankful_eyes.rb
 - lib/rouge/themes/colorful.rb
+- lib/rouge/themes/base16.rb
 - lib/rouge/token.rb
 - lib/rouge/formatters/html.rb
 - lib/rouge/version.rb