diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2012-01-21 13:57:46 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2012-01-21 13:57:46 +0100 |
| commit | 6f3922f4938184d524ba990f0fa3d81531fd9b1e (patch) | |
| tree | 2353ddf173e2415d3949cc231df681a4054e19da /lib/coderay/scanners | |
| parent | d18141d4d2a06435ef30f1e64dfaf810686940df (diff) | |
| parent | 185c4222c4be23cec40b3a91bb8ae481aff398bc (diff) | |
| download | coderay-6f3922f4938184d524ba990f0fa3d81531fd9b1e.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Diffstat (limited to 'lib/coderay/scanners')
| -rw-r--r-- | lib/coderay/scanners/css.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb index 34eaecb..7b731ef 100644 --- a/lib/coderay/scanners/css.rb +++ b/lib/coderay/scanners/css.rb @@ -144,7 +144,7 @@ module Scanners encoder.end_group :string elsif match = scan(/#{RE::Function}/o) - encoder.begin_group :string + encoder.begin_group :function start = match[/^\w+\(/] encoder.text_token start, :delimiter if match[-1] == ?) @@ -153,7 +153,7 @@ module Scanners else encoder.text_token match[start.size..-1], :content end - encoder.end_group :string + encoder.end_group :function elsif match = scan(/(?: #{RE::Dimension} | #{RE::Percentage} | #{RE::Num} )/ox) encoder.text_token match, :float |