rouge 0.2.5 → 0.2.6

data/lib/rouge/cli.rb

@@ -64,6 +64,7 @@ module Rouge
     end
 
     desc 'style THEME', 'render THEME as css'
+    option :scope, :desc => "a css selector to scope the styles to"
     def style(theme_name='thankful_eyes')
       theme = Theme.find(theme_name)
       raise "unknown theme: #{theme_name}" unless theme

data/lib/rouge/formatters/html.rb

@@ -11,30 +11,74 @@ module Rouge
       # A css class to be used for the generated <pre> tag.
       def initialize(opts={})
         @css_class = opts[:css_class] || 'highlight'
+        @line_numbers = opts.fetch(:line_numbers) { false }
       end
 
       # @yield the html output.
       def stream(tokens, &b)
+        if @line_numbers
+          stream_tableized(tokens, &b)
+        else
+          stream_untableized(tokens, &b)
+        end
+      end
+
+      def stream_untableized(tokens, &b)
         yield "<pre class=#{@css_class.inspect}>"
         tokens.each do |tok, val|
-          # TODO: properly html-encode val
-          val = CGI.escape_html(val)
-
-          case tok.shortname
-          when ''
-            yield val
-          when nil
-            raise "unknown token: #{tok.inspect}"
-          else
-            yield '<span class='
-            yield tok.shortname.inspect
-            yield '>'
-            yield val
-            yield '</span>'
-          end
+          span(tok, val, &b)
         end
         yield '</pre>'
       end
+
+      def stream_tableized(tokens, &b)
+        num_lines = 0
+        code = ''
+
+        tokens.each do |tok, val|
+          num_lines += val.scan(/\n/).size
+          span(tok, val) { |str| code << str }
+        end
+
+        # generate a string of newline-separated line numbers for the gutter
+        numbers = num_lines.times.map do |x|
+          %<<div class="lineno">#{x+1}</div>>
+        end.join
+
+        yield "<pre class=#{@css_class.inspect}>"
+        yield "<table><tbody><tr>"
+
+        # the "gl" class applies the style for Generic.Lineno
+        yield '<td class="gutter gl">'
+        yield numbers
+        yield '</td>'
+
+        yield '<td class="code">'
+        yield code
+        yield '</td>'
+
+        yield '</tr></tbody></table>'
+        yield '</pre>'
+      end
+
+    private
+      def span(tok, val, &b)
+        # TODO: properly html-encode val
+        val = CGI.escape_html(val)
+
+        case tok.shortname
+        when ''
+          yield val
+        when nil
+          raise "unknown token: #{tok.inspect}"
+        else
+          yield '<span class='
+          yield tok.shortname.inspect
+          yield '>'
+          yield val
+          yield '</span>'
+        end
+      end
     end
   end
 end

data/lib/rouge/lexer.rb

@@ -259,7 +259,9 @@ module Rouge
     # @example
     #   debug { "hello, world!" }
     def debug(&b)
-      puts(b.call) if option :debug
+      @debug = option(:debug) unless instance_variable_defined?(:@debug)
+
+      puts(b.call) if @debug
     end
 
     # @abstract

data/lib/rouge/lexers/coffeescript.rb

@@ -36,7 +36,6 @@ module Rouge
       end
 
       id = /[$a-zA-Z_][a-zA-Z0-9_]*/
-      lval = /@?#{id}([.]#{id})*/
 
       state :comments_and_whitespace do
         rule /\s+/m, 'Text'
@@ -45,7 +44,11 @@ module Rouge
       end
 
       state :multiline_regex do
+        # this order is important, so that #{ isn't interpreted
+        # as a comment
+        mixin :has_interpolation
         mixin :comments_and_whitespace
+
         rule %r(///([gim]+\b|\B)), 'Literal.String.Regex', :pop!
         rule %r(/), 'Literal.String.Regex'
         rule %r([^/#]+), 'Literal.String.Regex'
@@ -90,7 +93,19 @@ module Rouge
 
         rule /#{id}(?=\s*:)/, 'Name.Attribute', :slash_starts_regex
 
-        rule /#{id}/, 'Name.Other', :slash_starts_regex
+        rule /#{id}/ do |m|
+          if self.class.keywords.include? m[0]
+            token 'Keyword'
+          elsif self.class.constants.include? m[0]
+            token 'Name.Constant'
+          elsif self.class.builtins.include? m[0]
+            token 'Name.Builtin'
+          else
+            token 'Name.Other'
+          end
+
+          push :slash_starts_regex
+        end
 
         rule /[{(\[;,]/, 'Punctuation', :slash_starts_regex
         rule /[})\].]/, 'Punctuation'
@@ -153,24 +168,6 @@ module Rouge
         rule /'/, 'Literal.String'
         mixin :single_strings
       end
-
-      postprocess 'Name' do |tok, val|
-        if tok.name == 'Name.Attribute'
-          if self.class.keywords.include? val
-            tok = 'Error' # keywords as attributes = nono
-          else
-            # pass. leave attributes alone.
-          end
-        elsif self.class.keywords.include? val
-          tok = 'Keyword'
-        elsif self.class.constants.include? val
-            tok = 'Name.Constant'
-        elsif self.class.builtins.include? val
-          tok = 'Name.Builtin'
-        end
-
-        token tok, val
-      end
     end
   end
 end

data/lib/rouge/lexers/sed.rb

@@ -0,0 +1,22 @@
+module Rouge
+  module Lexers
+    class Sed < Lexer
+      # TODO: add rules for this
+      class Regex < TextLexer
+        default_option :token, 'Literal.String.Regex'
+      end
+
+      state :root do
+        rule /\s+/m, 'Text'
+        rule /#.*?\n/, 'Comment'
+
+        rule /s(.)(\\.|.*?)(\1)/ do
+          token re_tok
+          push :flags
+          push :subst
+          push :regex
+        end
+      end
+    end
+  end
+end

data/lib/rouge/regex_lexer.rb

@@ -15,6 +15,16 @@ module Rouge
         @callback = callback
       end
 
+      # Does the regex start with a ^?
+      #
+      # Since Regexps are immuntable, this is cached to avoid
+      # calling Regexp#source more than once.
+      def beginning_of_line?
+        return @beginning_of_line if instance_variable_defined?(:@beginning_of_line)
+
+        @beginning_of_line = re.source[0] == ?^
+      end
+
       def inspect
         "#<Rule #{@re.inspect}>"
       end
@@ -246,6 +256,13 @@ module Rouge
         res
       when Rule
         debug { "  trying #{rule.inspect}" }
+        # XXX HACK XXX
+        # StringScanner's implementation of ^ is b0rken.
+        # see http://bugs.ruby-lang.org/issues/7092
+        # TODO: this doesn't cover cases like /(a|^b)/, but it's
+        # the most common, for now...
+        return false if rule.beginning_of_line? && !stream.beginning_of_line?
+
         scan(stream, rule.re) do
           debug { "    got #{stream[0].inspect}" }
 
@@ -270,12 +287,6 @@ module Rouge
 
     # @private
     def scan(scanner, re, &b)
-      # XXX HACK XXX
-      # StringScanner's implementation of ^ is b0rken.
-      # TODO: this doesn't cover cases like /(a|^b)/, but it's
-      # the most common, for now...
-      return false if re.source[0] == ?^ && !scanner.beginning_of_line?
-
       @null_steps ||= 0
 
       if @null_steps >= MAX_NULL_SCANS
@@ -398,3 +409,6 @@ module Rouge
     end
   end
 end
+
+class Regexp
+end

data/lib/rouge/theme.rb

@@ -132,6 +132,11 @@ module Rouge
     def render(&b)
       return enum_for(:render).to_a.join("\n") unless b
 
+      # shared styles for tableized line numbers
+      yield "#{@scope} table { border-spacing: 0; }"
+      yield "#{@scope} table td { padding: 5px; }"
+      yield "#{@scope} table .gutter { text-align: right; }"
+
       styles.each do |tokname, style|
         style.render(css_selector(Token[tokname]), &b)
       end

data/lib/rouge/themes/thankful_eyes.rb

@@ -21,6 +21,7 @@ module Rouge
       palette :schrill        => '#ffb000'
 
       style 'Text', :fg => :unicorn, :bg => :krasna
+      style 'Generic.Lineno', :fg => :eggshell_cloud, :bg => :slate_blue
 
       style 'Comment', :fg => :cool_as_ice, :italic => true
       style 'Comment.Preproc', :fg => :go_get_it, :bold => true, :italic => true

data/lib/rouge/token.rb

@@ -176,5 +176,7 @@ module Rouge
     token 'Generic.Strong',              'gs'
     token 'Generic.Subheading',          'gu'
     token 'Generic.Traceback',           'gt'
+
+    token 'Generic.Lineno',              'gl'
   end
 end

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.2.5"
+    "0.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -57,6 +57,7 @@ files:
 - lib/rouge/lexers/php/builtins.rb
 - lib/rouge/lexers/haskell.rb
 - lib/rouge/lexers/c.rb
+- lib/rouge/lexers/sed.rb
 - lib/rouge/lexers/handlebars.rb
 - lib/rouge/lexers/tex.rb
 - lib/rouge/lexers/text.rb