Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

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

-use highlight;
+use Encode;

 
 # locations of highlight's files
 my $filetypes="/etc/highlight/filetypes.conf";
 
 # 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);
 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 () {
 }
 
 sub getsetup () {


@@ -23,8 +26,8 @@ sub getsetup () {
                },
                tohighlight => {
                        type => "string",
                },
                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,
                },
                        safe => 1,
                        rebuild => 1,
                },


@@ -32,7 +35,7 @@ sub getsetup () {
 
 sub checkconfig () {
        if (exists $config{tohighlight}) {
 
 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);
                        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 %ext2lang;
 my $filetypes_read=0;

+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 () {


@@ -75,23 +90,23 @@ sub read_filetypes () {
        $filetypes_read=1;
 }
 
        $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;
 
 
 # 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}) {
        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.
        }
        # 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;
        }
        else {
                return undef;


@@ -103,16 +118,27 @@ sub highlight ($$) {
        my $langfile=shift;
        my $input=shift;
 
        my $langfile=shift;
        my $input=shift;
 

-       my $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->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 <pre>
+               $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
 }
 
 1