rouge 0.1.1 → 0.1.2

data/lib/rouge/lexers/make.rb

@@ -28,14 +28,6 @@ module Rouge
       start { @shell.reset! }
 
       state :root do
-        rule /^(?:[\t ]+.*\n|\n)+/ do
-          delegate @shell
-        end
-
-        # rule /\$\((?:.*\\\n|.*\n)+/ do
-        #   delegate Shell
-        # end
-
         rule /\s+/, 'Text'
 
         rule /#.*?\n/, 'Comment'
@@ -93,8 +85,23 @@ module Rouge
       state :shell do
         # macro interpolation
         rule /\$\(\s*[a-z_]\w*\s*\)/i, 'Name.Variable'
-        rule(/.+?(?=\$\(|\)|\n)/m) { delegate @shell }
-        rule(/\$\(|\)|\n/) { delegate @shell }
+        # $(shell ...)
+        rule /(\$\()(\s*)(shell)(\s+)/m do
+          group 'Name.Function'; group 'Text'
+          group 'Name.Builtin'; group 'Text'
+          push :shell_expr
+        end
+
+        rule(/\\./m) { delegate @shell }
+        stop = /\$\(|\(|\)|\n|\\/
+        rule(/.+?(?=#{stop})/m) { delegate @shell }
+        rule(stop) { delegate @shell }
+      end
+
+      state :shell_expr do
+        rule(/\(/) { delegate @shell; push }
+        rule /\)/, 'Name.Variable', :pop!
+        mixin :shell
       end
 
       state :shell_line do

data/lib/rouge/lexers/shell.rb

@@ -82,7 +82,7 @@ module Rouge
 
         rule /;/, 'Text'
         rule /\s+/, 'Text'
-        rule /[^=\s{}()$"\'`\\<]+/, 'Text'
+        rule /[^=\*\s{}()$"\'`\\<]+/, 'Text'
         rule /\d+(?= |\Z)/, 'Number'
         rule /</, 'Text'
         mixin :interp

data/lib/rouge/plugins/redcarpet.rb

@@ -28,6 +28,13 @@ module Rouge
           Lexer.find(name)
         end || Lexers::Text
 
+        # XXX HACK: Redcarpet strips hard tabs out of code blocks,
+        # so we assume you're not using leading spaces that aren't tabs,
+        # and just replace them here.
+        if lexer_class.tag == 'make'
+          code.gsub! /^    /, "\t"
+        end
+
         lexer = lexer_class.new(opts)
         formatter = Formatters::HTML.new(:css_class => "highlight #{lexer_class.tag}")
 

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.1.1"
+    "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor