From 1a1c8681a43b205f9ef8912f15f7f0f6e33ee3ea Mon Sep 17 00:00:00 2001
From: Joel Clermont <jclermont@gmail.com>
Date: Fri, 22 Mar 2013 22:57:55 -0300
Subject: Enable inline PHP syntax highlighting
Pygments has a "startinline" option which is only relevant for the PhpLexer. It allows syntax highlighting without the opening <?php tag. I believe this option is ignored for every other lexer.
Could you either set this to true by default using the proposed change? Or could this be exposed as a setting somewhere in _config.yml? I can't think of a reason someone would not want this enabled.
---
plugins/pygments_code.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'plugins')
diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb
index 87d3cd6d..8b851a3b 100644
--- a/plugins/pygments_code.rb
+++ b/plugins/pygments_code.rb
@@ -22,14 +22,14 @@ module HighlightCode
highlighted_code = File.read(path)
else
begin
- highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'})
+ highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8', :startinline => true})
rescue MentosError
raise "Pygments can't parse unknown language: #{lang}."
end
File.open(path, 'w') {|f| f.print(highlighted_code) }
end
else
- highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'})
+ highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8', :startinline => true})
end
highlighted_code
end
--
cgit v1.2.1
From 46be4c8fc4948f3050a20de59376d46276f9673e Mon Sep 17 00:00:00 2001
From: Michael Buffington <michael.buffington@gmail.com>
Date: Tue, 11 Jun 2013 15:37:15 -0700
Subject: Adjusted JsFiddle plugin to detect jsFiddle versions.
Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't
render the desired tab order properly since the regex pattern was
being capturing the /5 as part of the first of the tabs.
---
plugins/jsfiddle.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb
index a80becb3..9dcf57e8 100644
--- a/plugins/jsfiddle.rb
+++ b/plugins/jsfiddle.rb
@@ -18,7 +18,7 @@
module Jekyll
class JsFiddle < Liquid::Tag
def initialize(tag_name, markup, tokens)
- if /(?<fiddle>\w+)(?:\s+(?<sequence>[\w,]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup
+ if /(?<fiddle>\w+)(?:\s+(?<sequence>[\w,\/]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup
@fiddle = fiddle
@sequence = (sequence unless sequence == 'default') || 'js,resources,html,css,result'
@skin = (skin unless skin == 'default') || 'light'
--
cgit v1.2.1
From a2ee7a0af13216e8c68882460350680d7048bb7e Mon Sep 17 00:00:00 2001
From: Michael Buffington <michael.buffington@gmail.com>
Date: Tue, 11 Jun 2013 16:00:14 -0700
Subject: Revised the regex for JsFiddle plugin after further testing.
---
plugins/jsfiddle.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb
index 9dcf57e8..0046f9b5 100644
--- a/plugins/jsfiddle.rb
+++ b/plugins/jsfiddle.rb
@@ -18,7 +18,7 @@
module Jekyll
class JsFiddle < Liquid::Tag
def initialize(tag_name, markup, tokens)
- if /(?<fiddle>\w+)(?:\s+(?<sequence>[\w,\/]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup
+ if /(?<fiddle>\w+\/?\d?)(?:\s+(?<sequence>[\w,]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup
@fiddle = fiddle
@sequence = (sequence unless sequence == 'default') || 'js,resources,html,css,result'
@skin = (skin unless skin == 'default') || 'light'
--
cgit v1.2.1
From 3cac6b9a16cc0527661ca2de59977cac3bbede6e Mon Sep 17 00:00:00 2001
From: Marcus Young <myoung34@my.apsu.edu>
Date: Sat, 15 Jun 2013 12:58:52 -0400
Subject: The gist hashes have changed. They include letters now
---
plugins/gist_tag.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/gist_tag.rb b/plugins/gist_tag.rb
index 2549ea7a..16203450 100644
--- a/plugins/gist_tag.rb
+++ b/plugins/gist_tag.rb
@@ -21,7 +21,7 @@ module Jekyll
end
def render(context)
- if parts = @text.match(/([\d]*) (.*)/)
+ if parts = @text.match(/([a-zA-Z\d]*) (.*)/)
gist, file = parts[1].strip, parts[2].strip
script_url = script_url_for gist, file
code = get_cached_gist(gist, file) || get_gist_from_web(gist, file)
--
cgit v1.2.1