aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Kerr <sean@code-box.org>2013-01-09 09:24:43 -0500
committerBrandon Mathis <brandon@imathis.com>2013-01-12 16:38:19 -0600
commitd686105bda06d05b7b7310d9ba9ad3f1e23c2cbf (patch)
treed093cb7416602fe3d35d41628526c2a5154dccd4
parentd774630d3eb77a1efa7eb6636b147b9b4cc97028 (diff)
downloadmy_new_personal_website-d686105bda06d05b7b7310d9ba9ad3f1e23c2cbf.tar.xz
my_new_personal_website-d686105bda06d05b7b7310d9ba9ad3f1e23c2cbf.zip
Fixed blockquote plugin (author alone would not show up without title)
Diffstat (limited to '')
-rw-r--r--plugins/blockquote.rb11
1 files changed, 5 insertions, 6 deletions
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