coderay 1.0.3 → 1.0.4

data/lib/coderay/scanners/css.rb

@@ -35,7 +35,7 @@ module Scanners
       
       reldimensions = %w[em ex px]
       absdimensions = %w[in cm mm pt pc]
-      Unit = Regexp.union(*(reldimensions + absdimensions))
+      Unit = Regexp.union(*(reldimensions + absdimensions + %w[s]))
       
       Dimension = /#{Num}#{Unit}/
       
@@ -50,10 +50,14 @@ module Scanners
     
   protected
     
+    def setup
+      @state = :initial
+      @value_expected = nil
+    end
+    
     def scan_tokens encoder, options
-      
-      value_expected = nil
-      states = [:initial]
+      states = Array(options[:state] || @state)
+      value_expected = @value_expected
       
       until eos?
         
@@ -127,11 +131,9 @@ module Scanners
           
         elsif match = scan(/\}/)
           value_expected = false
+          encoder.text_token match, :operator
           if states.last == :block || states.last == :media
-            encoder.text_token match, :operator
             states.pop
-          else
-            encoder.text_token match, :error
           end
           
         elsif match = scan(/#{RE::String}/o)
@@ -183,6 +185,11 @@ module Scanners
         
       end
       
+      if options[:keep_state]
+        @state = states
+        @value_expected = value_expected
+      end
+      
       encoder
     end
     

data/lib/coderay/version.rb

@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderay
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Fast and easy syntax highlighting for selected languages, written in
   Ruby. Comes with RedCloth integration and LOC counter.