Fixed blockquote plugin (author alone would not show up without title)

This commit is contained in:
Sean Kerr 2013-01-09 09:24:43 -05:00 committed by Brandon Mathis
parent d774630d3e
commit d686105bda

View File

@ -21,6 +21,7 @@ module Jekyll
class Blockquote < Liquid::Block class Blockquote < Liquid::Block
FullCiteWithTitle = /(\S.*)\s+(https?:\/\/)(\S+)\s+(.+)/i FullCiteWithTitle = /(\S.*)\s+(https?:\/\/)(\S+)\s+(.+)/i
FullCite = /(\S.*)\s+(https?:\/\/)(\S+)/i FullCite = /(\S.*)\s+(https?:\/\/)(\S+)/i
AuthorTitle = /([^,]+),([^,]+)/
Author = /(.+)/ Author = /(.+)/
def initialize(tag_name, markup, tokens) def initialize(tag_name, markup, tokens)
@ -34,14 +35,12 @@ module Jekyll
elsif markup =~ FullCite elsif markup =~ FullCite
@by = $1 @by = $1
@source = $2 + $3 @source = $2 + $3
elsif markup =~ Author elsif markup =~ AuthorTitle
if $1 =~ /([^,]+),([^,]+)/
@by = $1 @by = $1
@title = $2.titlecase @title = $2.titlecase
else elsif markup =~ Author
@by = $1 @by = $1
end end
end
super super
end end