aboutsummaryrefslogtreecommitdiff
path: root/plugins/pygments_code.rb
diff options
context:
space:
mode:
authorAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-09-27 10:53:43 +0200
committerAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-09-27 10:53:43 +0200
commit8bfd5ef3237f07125adde7043c19a3159879044a (patch)
tree6ac9b05d53cde0c5a6c837e8316683f652f3d5cf /plugins/pygments_code.rb
parentfe28c0b518e47f7929772eaaab7b0118ddcfbaad (diff)
parentf0674c69366b9172e6811036bbc5b0a29dbf6025 (diff)
downloadmy_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.tar.xz
my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.zip
Merge branch 'master' of https://github.com/imathis/octopress
Diffstat (limited to '')
-rw-r--r--plugins/pygments_code.rb4
1 files changed, 2 insertions, 2 deletions
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