dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap out albino for pygments.rb

This commit is contained in:
Tom Bell 2012-05-31 15:51:34 -04:00
parent 7d88f72409
commit b2a1d61c04
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jekyll.gemspec
View File

@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('directory_watcher', "~> 1.1") s.add_runtime_dependency('directory_watcher', "~> 1.1")
s.add_runtime_dependency('maruku', "~> 0.5") s.add_runtime_dependency('maruku', "~> 0.5")
s.add_runtime_dependency('kramdown', "~> 0.13.4") s.add_runtime_dependency('kramdown', "~> 0.13.4")
s.add_runtime_dependency('albino', "~> 1.3") s.add_runtime_dependency('pygments.rb', "~> 0.2.12")
s.add_development_dependency('rake', "~> 0.9") s.add_development_dependency('rake', "~> 0.9")
s.add_development_dependency('rdoc', "~> 3.11") s.add_development_dependency('rdoc', "~> 3.11")

2
lib/jekyll.rb
View File

@ -24,7 +24,7 @@ require 'English'
# 3rd party # 3rd party
require 'liquid' require 'liquid'
require 'maruku' require 'maruku'
require 'albino' require 'pygments'
# internal requires # internal requires
require 'jekyll/core_ext' require 'jekyll/core_ext'

8
lib/jekyll/tags/highlight.rb
View File

@ -48,7 +48,13 @@ module Jekyll
end end
def render_pygments(context, code) def render_pygments(context, code)
output = add_code_tags(Albino.new(code, @lang).to_s(@options), @lang) @options[:encoding] = 'utf-8'
output = add_code_tags(
Pygments.highlight(code, :lexer => @lang, :options => @options),
@lang
)
output = context["pygments_prefix"] + output if context["pygments_prefix"] output = context["pygments_prefix"] + output if context["pygments_prefix"]
output = output + context["pygments_suffix"] if context["pygments_suffix"] output = output + context["pygments_suffix"] if context["pygments_suffix"]
output output