lib/rouge/lexers/markdown.rb in rouge-1.1.0 vs lib/rouge/lexers/markdown.rb in rouge-1.2.0
- old
+ new
@@ -64,23 +64,19 @@
rule %r(^
(\s*) # leading whitespace
(\[) (#{edot}+?) (\]) # the reference
(\s*) (:) # colon
)x do
- group Text
- group Punctuation; group Str::Symbol; group Punctuation
- group Text; group Punctuation
+ groups Text, Punctuation, Str::Symbol, Punctuation, Text, Punctuation
push :title
push :url
end
# links and images
rule /(!?\[)(#{edot}+?)(\])/ do
- group Punctuation
- group Name::Variable
- group Punctuation
+ groups Punctuation, Name::Variable, Punctuation
push :link
end
rule /[*][*]#{edot}*?[*][*]/, Generic::Strong
rule /__#{edot}*?__/, Generic::Strong
@@ -103,13 +99,11 @@
rule /\n/, Text
end
state :link do
rule /(\[)(#{edot}*?)(\])/ do
- group Punctuation
- group Str::Symbol
- group Punctuation
+ groups Punctuation, Str::Symbol, Punctuation
pop!
end
rule /[(]/ do
token Punctuation
@@ -125,12 +119,10 @@
state :url do
rule /[ \t]+/, Text
# the url
rule /(<)(#{edot}*?)(>)/ do
- group Name::Tag
- group Str::Other
- group Name::Tag
+ groups Name::Tag, Str::Other, Name::Tag
pop!
end
rule /\S+/, Str::Other, :pop!
end