Added a comment

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

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 4c02f6c236e4feca4f6113e73f793bee683fef2c..d4ade0a7b3f788c71472c82b1e359b5572731d74 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -4,10 +4,7 @@ package IkiWiki::Plugin::highlight;
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use warnings;
 use strict;
 use IkiWiki 3.00;

-
-# locations of highlight's files
-my $filetypes="/etc/highlight/filetypes.conf";
-my $langdefdir="/usr/share/highlight/langDefs";
+use Encode;

 
 sub import {
        hook(type => "getsetup", id => "highlight",  call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "highlight",  call => \&getsetup);


@@ -22,6 +19,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",


@@ -30,9 +28,29 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

+               filetypes_conf => {
+                       type => "string",
+                       example => "/etc/highlight/filetypes.conf",
+                       description => "location of highlight's filetypes.conf",
+                       safe => 0,
+                       rebuild => undef,
+               },
+               langdefdir => {
+                       type => "string",
+                       example => "/usr/share/highlight/langDefs",
+                       description => "location of highlight's langDefs directory",
+                       safe => 0,
+                       rebuild => undef,
+               },

 }
 
 sub checkconfig () {
 }
 
 sub checkconfig () {

+       if (! exists $config{filetypes_conf}) {
+               $config{filetypes_conf}="/etc/highlight/filetypes.conf";
+       }
+       if (! exists $config{langdefdir}) {
+               $config{langdefdir}="/usr/share/highlight/langDefs";
+       }

        if (exists $config{tohighlight}) {
                foreach my $file (split ' ', $config{tohighlight}) {
                        my @opts = $file=~s/^\.// ?
        if (exists $config{tohighlight}) {
                foreach my $file (split ' ', $config{tohighlight}) {
                        my @opts = $file=~s/^\.// ?


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

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

 }
 
 my %ext2lang;
 }
 
 my %ext2lang;


@@ -78,7 +96,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, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!");

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


@@ -95,12 +113,12 @@ sub read_filetypes () {
 sub ext2langfile ($) {
        my $ext=shift;
 
 sub ext2langfile ($) {
        my $ext=shift;
 

-       my $langfile="$langdefdir/$ext.lang";
+       my $langfile="$config{langdefdir}/$ext.lang";

        return $langfile if exists $highlighters{$langfile};
 
        read_filetypes() unless $filetypes_read;
        if (exists $ext2lang{$ext}) {
        return $langfile if exists $highlighters{$langfile};
 
        read_filetypes() unless $filetypes_read;
        if (exists $ext2lang{$ext}) {

-               return "$langdefdir/$ext2lang{$ext}.lang";
+               return "$config{langdefdir}/$ext2lang{$ext}.lang";

        }
        # If a language only has one common extension, it will not
        # be listed in filetypes, so check the langfile.
        }
        # If a language only has one common extension, it will not
        # be listed in filetypes, so check the langfile.


@@ -128,8 +146,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;
        }