From d686105bda06d05b7b7310d9ba9ad3f1e23c2cbf Mon Sep 17 00:00:00 2001 From: Sean Kerr Date: Wed, 9 Jan 2013 09:24:43 -0500 Subject: Fixed blockquote plugin (author alone would not show up without title) --- plugins/blockquote.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/blockquote.rb b/plugins/blockquote.rb index 62e7d143..a5efde78 100644 --- a/plugins/blockquote.rb +++ b/plugins/blockquote.rb @@ -21,6 +21,7 @@ module Jekyll class Blockquote < Liquid::Block FullCiteWithTitle = /(\S.*)\s+(https?:\/\/)(\S+)\s+(.+)/i FullCite = /(\S.*)\s+(https?:\/\/)(\S+)/i + AuthorTitle = /([^,]+),([^,]+)/ Author = /(.+)/ def initialize(tag_name, markup, tokens) @@ -34,13 +35,11 @@ module Jekyll elsif markup =~ FullCite @by = $1 @source = $2 + $3 + elsif markup =~ AuthorTitle + @by = $1 + @title = $2.titlecase elsif markup =~ Author - if $1 =~ /([^,]+),([^,]+)/ - @by = $1 - @title = $2.titlecase - else - @by = $1 - end + @by = $1 end super end -- cgit v1.2.1