ref new tip from softwaresite page

[git.ikiwiki.info.git] / IkiWiki / Plugin / highlight.pm

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 4c02f6c236e4feca4f6113e73f793bee683fef2c..e517ac5c06aa425771dcac7256a8e3127da8d3bb 100644 (file)
--- 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 warnings;
 use strict;
 use IkiWiki 3.00;

+use Encode;

 
 # locations of highlight's files
 my $filetypes="/etc/highlight/filetypes.conf";
 
 # locations of highlight's files
 my $filetypes="/etc/highlight/filetypes.conf";


@@ -22,6 +23,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1, # format plugin
                plugin => {
                        safe => 1,
                        rebuild => 1, # format plugin

+                       section => "format",

                },
                tohighlight => {
                        type => "string",
                },
                tohighlight => {
                        type => "string",


@@ -69,7 +71,7 @@ sub htmlizefallback {
                return;
        }
 
                return;
        }
 

-       return highlight($langfile, shift);
+       return Encode::decode_utf8(highlight($langfile, shift));

 }
 
 my %ext2lang;
 }
 
 my %ext2lang;


@@ -78,7 +80,7 @@ my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {

-       open (IN, $filetypes);
+       open (IN, $filetypes) || error("$filetypes: $!");

        while (<IN>) {
                chomp;
                if (/^\$ext\((.*)\)=(.*)$/) {
        while (<IN>) {
                chomp;
                if (/^\$ext\((.*)\)=(.*)$/) {


@@ -128,8 +130,8 @@ sub highlight ($$) {
                $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
                $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>

-               $gen->initLanguage($langfile);

                $gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
                $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;
        }
                $gen->setEncoding("utf-8");
                $highlighters{$langfile}=$gen;
        }