rouge 0.3.10 → 0.4.0

data/lib/rouge/formatters/html.rb

@@ -7,11 +7,24 @@ module Rouge
     class HTML < Formatter
       tag 'html'
 
-      # @option opts :css_class
-      # A css class to be used for the generated <pre> tag.
+      # @option opts [String] :css_class ('highlight')
+      # @option opts [true/false] :line_numbers (false)
+      # @option opts [Rouge::CSSTheme] :inline_theme (nil)
+      # @option opts [true/false] :wrap (true)
+      #
+      # Initialize with options.
+      #
+      # If `:inline_theme` is given, then instead of rendering the
+      # tokens as <span> tags with CSS classes, the styles according to
+      # the given theme will be inlined in "style" attributes.  This is
+      # useful for formats in which stylesheets are not available.
+      #
+      # Content will be wrapped in a `<pre>` tag with the given
+      # `:css_class` unless `:wrap` is set to `false`.
       def initialize(opts={})
         @css_class = opts[:css_class] || 'highlight'
         @line_numbers = opts.fetch(:line_numbers) { false }
+        @inline_theme = opts.fetch(:inline_theme) { nil }
         @wrap = opts.fetch(:wrap, true)
       end
 
@@ -24,6 +37,7 @@ module Rouge
         end
       end
 
+    private
       def stream_untableized(tokens, &b)
         yield "<pre class=#{@css_class.inspect}>" if @wrap
         tokens.each do |tok, val|
@@ -65,7 +79,6 @@ module Rouge
         yield '</pre>' if @wrap
       end
 
-    private
       def span(tok, val, &b)
         # TODO: properly html-encode val
         val = CGI.escape_html(val)
@@ -76,9 +89,18 @@ module Rouge
         when nil
           raise "unknown token: #{tok.inspect} for #{val.inspect}"
         else
-          yield '<span class='
-          yield tok.shortname.inspect
-          yield '>'
+          if @inline_theme
+            rules = @inline_theme.style_for(tok).rendered_rules
+
+            yield '<span style='
+            yield rules.to_a.join(';').inspect
+            yield '>'
+          else
+            yield '<span class='
+            yield tok.shortname.inspect
+            yield '>'
+          end
+
           yield val
           yield '</span>'
         end

data/lib/rouge/lexers/elixir.rb

@@ -24,7 +24,7 @@ module Rouge
         rule %r{\b(case|cond|end|bc|lc|if|unless|try|loop|receive|fn|defmodule|
              defp?|defprotocol|defimpl|defrecord|defmacrop?|defdelegate|
              defexception|exit|raise|throw|unless|after|rescue|catch|else)\b(?![?!])|
-             (?<!\.)\b(do|\-\>)\b\s*}x, 'Keyword'
+             (?<!\.)\b(do|\-\>)\b}x, 'Keyword'
         rule /\b(import|require|use|recur|quote|unquote|super|refer)\b(?![?!])/, 'Keyword.Namespace'
         rule /(?<!\.)\b(and|not|or|when|xor|in)\b/, 'Operator.Word'
         rule %r{%=|\*=|\*\*=|\+=|\-=|\^=|\|\|=|

data/lib/rouge/theme.rb

@@ -20,19 +20,22 @@ module Rouge
         return if empty?
 
         yield "#{selector} {"
-        yield "  color: #{fg};" if fg
-        yield "  background-color: #{bg};" if bg
-        yield "  font-weight: bold;" if self[:bold]
-        yield "  font-style: italic;" if self[:italic]
-        yield "  text-decoration: underline;" if self[:underline]
-
-        (self[:rules] || []).each do |rule|
+        rendered_rules.each do |rule|
           yield "  #{rule};"
         end
-
         yield "}"
       end
 
+      def rendered_rules(&b)
+        return enum_for(:rendered_rules) unless b
+        yield "color: #{fg}" if fg
+        yield "background-color: #{bg}" if bg
+        yield "font-weight: bold" if self[:bold]
+        yield "font-style: italic" if self[:italic]
+        yield "text-decoration: underline" if self[:underline]
+
+        (self[:rules] || []).each(&b)
+      end
     end
 
     def styles
@@ -142,11 +145,14 @@ module Rouge
       end
     end
 
+    def style_for(tok)
+      styles.fetch(tok.name) do
+        tok.parent ? style_for(tok.parent) : Style.new(self)
+      end
+    end
+
   private
     def css_selector(token)
-      tokens = [token]
-      parent = token.parent
-
       inflate_token(token).map do |tok|
         raise "unknown token: #{tok.inspect}" if tok.shortname.nil?
 

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.3.10"
+    "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime