rouge 0.3.6 → 0.3.7

data/bin/rougify

@@ -2,6 +2,7 @@
 
 require 'pathname'
 ROOT_DIR = Pathname.new(__FILE__).dirname.parent
+$:.push(ROOT_DIR.join('lib'))
 load ROOT_DIR.join('lib/rouge.rb')
 load ROOT_DIR.join('lib/rouge/cli.rb')
 

data/lib/rouge/formatters/html.rb

@@ -12,6 +12,7 @@ module Rouge
       def initialize(opts={})
         @css_class = opts[:css_class] || 'highlight'
         @line_numbers = opts.fetch(:line_numbers) { false }
+        @wrap = opts.fetch(:wrap, true)
       end
 
       # @yield the html output.
@@ -24,11 +25,11 @@ module Rouge
       end
 
       def stream_untableized(tokens, &b)
-        yield "<pre class=#{@css_class.inspect}>"
+        yield "<pre class=#{@css_class.inspect}>" if @wrap
         tokens.each do |tok, val|
           span(tok, val, &b)
         end
-        yield '</pre>'
+        yield '</pre>' if @wrap
       end
 
       def stream_tableized(tokens, &b)
@@ -48,7 +49,7 @@ module Rouge
           %<<div class="lineno">#{x+1}</div>>
         end.join
 
-        yield "<pre class=#{@css_class.inspect}>"
+        yield "<pre class=#{@css_class.inspect}>" if @wrap
         yield "<table><tbody><tr>"
 
         # the "gl" class applies the style for Generic.Lineno
@@ -61,7 +62,7 @@ module Rouge
         yield '</td>'
 
         yield '</tr></tbody></table>'
-        yield '</pre>'
+        yield '</pre>' if @wrap
       end
 
     private

data/lib/rouge/lexers/css.rb

@@ -195,7 +195,7 @@ module Rouge
         rule /url\(.*?\)/, 'Literal.String.Other'
         rule /#[0-9a-f]{1,6}/i, 'Literal.Number' # colors
         rule /#{number}(?:em|px|%|pt|pc|in|mm|m|ex|s)?\b/, 'Literal.Number'
-        rule /[\[\]():\/.]/, 'Punctuation'
+        rule /[\[\]():\/.,]/, 'Punctuation'
         rule /"(\\\\|\\"|[^"])*"/, 'Literal.String.Single'
         rule /'(\\\\|\\'|[^'])*'/, 'Literal.String.Double'
         rule(identifier) do |m|

data/lib/rouge/lexers/php.rb

@@ -65,7 +65,7 @@ module Rouge
       state :php do
         rule /\?>/, 'Comment.Preproc', :pop!
         # heredocs
-        rule /<<<('?)([a-z_]\w*)\1\n.*?\n\2;?\n/im, 'String'
+        rule /<<<('?)([a-z_]\w*)\1\n.*?\n\2;?\n/im, 'Literal.String.Heredoc'
         rule /\s+/, 'Text'
         rule /#.*?\n/, 'Comment.Single'
         rule %r(//.*?\n), 'Comment.Single'
@@ -136,7 +136,7 @@ module Rouge
         rule /[^\\{$"]+/, 'Literal.String.Double'
         rule /\\([nrt\"$\\]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})/,
           'Literal.String.Escape'
-        rule /\$[a-zA-Z_][a-zA-Z0-9_]*(\[\S+\]|->[a-zA-Z_][a-zA-Z0-9_]*)?/
+        rule /\$[a-zA-Z_][a-zA-Z0-9_]*(\[\S+\]|->[a-zA-Z_][a-zA-Z0-9_]*)?/, 'Name.Variable'
 
         lsi = 'Literal.String.Interpol'
         rule /\{\$\{/, lsi, :interp_double

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.3.6"
+    "0.3.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime