@@ -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