X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8ae260015fa6ecd5aa39a84898f42837935c9953..66e894c8771c5a5dfbd4cb92f826d4d397b2256f:/IkiWiki/Plugin/highlight.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index f43f18628..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,7 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; -use highlight; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -13,6 +13,9 @@ my $langdefdir="/usr/share/highlight/langDefs"; sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); + # this hook is used by the format plugin + hook(type => "htmlizefallback", id => "highlight", call => + \&htmlizefallback); } sub getsetup () { @@ -23,8 +26,8 @@ sub getsetup () { }, tohighlight => { type => "string", - example => ".c, .h, .cpp, .pl, .py, Makefile:make", - description => "source files to syntax highlight", + example => ".c .h .cpp .pl .py Makefile:make", + description => "types of source files to syntax highlight", safe => 1, rebuild => 1, }, @@ -32,7 +35,7 @@ sub getsetup () { sub checkconfig () { if (exists $config{tohighlight}) { - foreach my $file (split /, /, $config{tohighlight}) { + foreach my $file (split ' ', $config{tohighlight}) { my @opts = $file=~s/^\.// ? (keepextension => 1) : (noextension => 1); @@ -59,8 +62,20 @@ sub checkconfig () { } } +sub htmlizefallback { + my $format=lc shift; + my $langfile=ext2langfile($format); + + if (! defined $langfile) { + return; + } + + 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 () { @@ -75,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; @@ -103,16 +118,27 @@ sub highlight ($$) { my $langfile=shift; my $input=shift; - 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"); + eval q{use highlight}; + if ($@) { + print STDERR gettext("warning: highlight perl module not available; falling back to pass through"); + return $input; + } + + 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