X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/35b69392c823a064023165d9a3ab6b7568ec1568..154c4ea9e:/IkiWiki/Plugin/highlight.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 33d136fbf..fbe7ddff4 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -52,7 +52,7 @@ sub getsetup () { sub checkconfig () { eval q{use highlight}; - if (highlight::DataDir->can('new')){ + if (highlight::DataDir->can('new')) { $data_dir=new highlight::DataDir(); $data_dir->searchDataDir(""); } else { @@ -89,7 +89,7 @@ sub checkconfig () { id => $file, call => sub { my %params=@_; - highlight($langfile, $params{content}); + highlight($langfile, $file, $params{content}); }, longname => sprintf(gettext("Source code: %s"), $file), @opts, @@ -106,7 +106,7 @@ sub htmlizeformat { return; } - return Encode::decode_utf8(highlight($langfile, shift)); + return Encode::decode_utf8(highlight($langfile, $format, shift)); } my %ext2lang; @@ -172,6 +172,7 @@ sub ext2langfile ($) { # Interface to the highlight C library. sub highlight ($$) { my $langfile=shift; + my $extorfile=shift; my $input=shift; eval q{use highlight}; @@ -200,7 +201,7 @@ sub highlight ($$) { $gen=$highlighters{$langfile}; } - return $gen->generateString($input); + return "
".$gen->generateString($input)."
"; } 1