X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8ba98ad1dcbffe32150745c98d72512a6fa6149e..031d1bf5046ab77c796477a19967e7c0c512c417:/IkiWiki/Plugin/highlight.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 90e7053d9..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -69,11 +70,12 @@ sub htmlizefallback { return; } - return highlight($langfile, shift); + return Encode::decode_utf8(highlight($langfile, shift)); } my %ext2lang; my $filetypes_read=0; +my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { @@ -88,23 +90,23 @@ sub read_filetypes () { $filetypes_read=1; } -sub langfile ($) { - return "$langdefdir/$_[0].lang"; -} # Given a filename extension, determines the language definition to # use to highlight it. sub ext2langfile ($) { my $ext=shift; + my $langfile="$langdefdir/$ext.lang"; + return $langfile if exists $highlighters{$langfile}; + read_filetypes() unless $filetypes_read; if (exists $ext2lang{$ext}) { - return langfile($ext2lang{$ext}); + return "$langdefdir/$ext2lang{$ext}.lang"; } # If a language only has one common extension, it will not # be listed in filetypes, so check the langfile. - elsif (-e langfile($ext)) { - return langfile($ext); + elsif (-e $langfile) { + return $langfile; } else { return undef; @@ -122,16 +124,21 @@ sub highlight ($$) { return $input; } - my $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML); - $gen->setFragmentCode(1); # generate html fragment - $gen->setHTMLEnclosePreTag(1); # include stylish
- $gen->initLanguage($langfile); - $gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted - $gen->setEncoding("utf-8"); + my $gen; + if (! exists $highlighters{$langfile}) { + $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML); + $gen->setFragmentCode(1); # generate html fragment + $gen->setHTMLEnclosePreTag(1); # include stylish+ $gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted + $gen->initLanguage($langfile); # must come after initTheme + $gen->setEncoding("utf-8"); + $highlighters{$langfile}=$gen; + } + else { + $gen=$highlighters{$langfile}; + } - my $output=$gen->generateString($input); - highlightc::CodeGenerator_deleteInstance($gen); - return $output; + return $gen->generateString($input); } 1