diff options
Diffstat (limited to '')
| -rw-r--r-- | plugins/gist_tag.rb | 2 | ||||
| -rw-r--r-- | plugins/jsfiddle.rb | 2 | ||||
| -rw-r--r-- | plugins/pygments_code.rb | 4 |
3 files changed, 4 insertions, 4 deletions
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) diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb index a80becb3..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' 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 |