aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--plugins/backtick_code_block.rb6
-rw-r--r--plugins/code_block.rb1
-rw-r--r--plugins/pullquote.rb13
3 files changed, 13 insertions, 7 deletions
diff --git a/plugins/backtick_code_block.rb b/plugins/backtick_code_block.rb
index 6243de6f..40e7900b 100644
--- a/plugins/backtick_code_block.rb
+++ b/plugins/backtick_code_block.rb
@@ -10,7 +10,7 @@ module BacktickCodeBlock
@lang = nil
@url = nil
@title = nil
- input.gsub /^`{3} *([^\n]+)?\n(.+?)\n`{3}/m do
+ input.gsub(/^`{3} *([^\n]+)?\n(.+?)\n`{3}/m) do
@options = $1 || ''
str = $2
@@ -22,8 +22,8 @@ module BacktickCodeBlock
@caption = "<figcaption><span>#{$2}</span></figcaption>"
end
- if str.match(/\A {4}/)
- str = str.gsub /^ {4}/, ''
+ if str.match(/\A( {4}|\t)/)
+ str = str.gsub(/^( {4}|\t)/, '')
end
if @lang.nil? || @lang == 'plain'
code = tableize_code(str.gsub('<','&lt;').gsub('>','&gt;'))
diff --git a/plugins/code_block.rb b/plugins/code_block.rb
index bf89feab..e175d445 100644
--- a/plugins/code_block.rb
+++ b/plugins/code_block.rb
@@ -90,6 +90,7 @@ module Jekyll
source = safe_wrap(source)
source = context['pygments_prefix'] + source if context['pygments_prefix']
source = source + context['pygments_suffix'] if context['pygments_suffix']
+ source
end
end
end
diff --git a/plugins/pullquote.rb b/plugins/pullquote.rb
index 03e307a7..cf8d22f1 100644
--- a/plugins/pullquote.rb
+++ b/plugins/pullquote.rb
@@ -1,10 +1,10 @@
#
# Author: Brandon Mathis
-# Based on the sematic pullquote technique by Maykel Loomans at http://miekd.com/articles/pull-quotes-with-html5-and-css/
+# Based on the semantic pullquote technique by Maykel Loomans at http://miekd.com/articles/pull-quotes-with-html5-and-css/
#
# Outputs a span with a data-pullquote attribute set from the marked pullquote. Example:
#
-# {% pullquote %}
+# {% pullquote %}
# When writing longform posts, I find it helpful to include pullquotes, which help those scanning a post discern whether or not a post is helpful.
# It is important to note, {" pullquotes are merely visual in presentation and should not appear twice in the text. "} That is why it is prefered
# to use a CSS only technique for styling pullquotes.
@@ -13,15 +13,20 @@
# <p>
# <span data-pullquote="pullquotes are merely visual in presentation and should not appear twice in the text.">
# When writing longform posts, I find it helpful to include pullquotes, which help those scanning a post discern whether or not a post is helpful.
-# It is important to note, pullquotes are merely visual in presentation and should not appear twice in the text. This is why a CSS only approach # for styling pullquotes is prefered.
+# It is important to note, pullquotes are merely visual in presentation and should not appear twice in the text. This is why a CSS only approach
+# for styling pullquotes is prefered.
# </span>
# </p>
#
+# {% pullquote left %} will create a left-aligned pullquote instead.
+#
+# Note: this plugin now creates pullquotes with the class of pullquote-right by default
module Jekyll
class PullquoteTag < Liquid::Block
def initialize(tag_name, markup, tokens)
+ @align = (markup =~ /left/i) ? "left" : "right"
super
end
@@ -29,7 +34,7 @@ module Jekyll
output = super
if output.join =~ /\{"\s*(.+)\s*"\}/
@quote = $1
- "<span class='has-pullquote' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
+ "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
else
return "Surround your pullquote like this {\" text to be quoted \"}"
end