From 73e540409ceb8bc18048b6a96a4b815fc303ea28 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Tue, 12 Aug 2014 10:55:23 -0500 Subject: Support octopress-hooks and octopress-date-format #1622 --- plugins/code_block.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'plugins/code_block.rb') diff --git a/plugins/code_block.rb b/plugins/code_block.rb index 46620d86..539a3475 100644 --- a/plugins/code_block.rb +++ b/plugins/code_block.rb @@ -47,8 +47,6 @@ require './plugins/raw' module Jekyll class CodeBlock < Liquid::Block - include HighlightCode - include TemplateWrapper CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i Caption = /(\S[\S\s]*)/ def initialize(tag_name, markup, tokens) @@ -79,11 +77,11 @@ module Jekyll source = "
" source += @caption if @caption if @filetype - source += "#{highlight(code, @filetype)}
" + source += "#{HighlightCode::highlight(code, @filetype)}" else - source += "#{tableize_code(code.lstrip.rstrip.gsub(/" + source += "#{HighlightCode::tableize_code(code.lstrip.rstrip.gsub(/" end - source = safe_wrap(source) + source = TemplateWrapper::safe_wrap(source) source = context['pygments_prefix'] + source if context['pygments_prefix'] source = source + context['pygments_suffix'] if context['pygments_suffix'] source -- cgit v1.2.1