Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 4e86207f101224cfb216dfbff8609ac5973bdbd5..f6908921ed6ec3ca770ffefa2f6e8f11a939d286 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -60,14 +60,22 @@ sub checkconfig () {
        }
 
        if (! exists $config{filetypes_conf}) {
        }
 
        if (! exists $config{filetypes_conf}) {

-               $config{filetypes_conf}= 
-                    ($data_dir ? $data_dir->getConfDir() : "/etc/highlight/")
-                         . "filetypes.conf";
+         if (! $data_dir ) {
+               $config{filetypes_conf}= "/etc/highlight/filetypes.conf";
+             } elsif ( $data_dir -> can('searchFile') ) {
+               # 3.18 +
+               $config{filetypes_conf}=
+                 $data_dir -> searchFile("filetypes.conf");
+             } else {
+               # 3.9 +
+               $config{filetypes_conf}=
+                 $data_dir -> getConfDir() . "/filetypes.conf";
+             }

        }
        }

+       # note that this is only used for old versions of highlight
+       # where $data_dir will not be defined.

        if (! exists $config{langdefdir}) {
        if (! exists $config{langdefdir}) {

-               $config{langdefdir}=
-                    ($data_dir ? $data_dir->getLangPath("")
-                     : "/usr/share/highlight/langDefs");
+               $config{langdefdir}= "/usr/share/highlight/langDefs";

 
        }
        if (exists $config{tohighlight} && read_filetypes()) {
 
        }
        if (exists $config{tohighlight} && read_filetypes()) {


@@ -89,7 +97,7 @@ sub checkconfig () {
                                id => $file,
                                call => sub {
                                        my %params=@_;
                                id => $file,
                                call => sub {
                                        my %params=@_;

-                                       highlight($langfile, $params{content});
+                                       highlight($langfile, $file, $params{content});

                                },
                                longname => sprintf(gettext("Source code: %s"), $file),
                                @opts,
                                },
                                longname => sprintf(gettext("Source code: %s"), $file),
                                @opts,


@@ -106,7 +114,7 @@ sub htmlizeformat {
                return;
        }
 
                return;
        }
 

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

 }
 
 my %ext2lang;
 }
 
 my %ext2lang;


@@ -147,17 +155,27 @@ sub read_filetypes () {
 }
 
 
 }
 
 

+sub searchlangdef {
+  my $lang=shift;
+
+  if ($data_dir) {
+    return $data_dir->getLangPath($lang . ".lang");
+  } else {
+    return "$config{langdefdir}/$lang.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="$config{langdefdir}/$ext.lang";
+       my $langfile=searchlangdef($ext);

        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 "$config{langdefdir}/$ext2lang{$ext}.lang";
+               return searchlangdef($ext2lang{$ext});

        }
        # 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.


@@ -172,6 +190,7 @@ sub ext2langfile ($) {
 # Interface to the highlight C library.
 sub highlight ($$) {
        my $langfile=shift;
 # Interface to the highlight C library.
 sub highlight ($$) {
        my $langfile=shift;

+       my $extorfile=shift;

        my $input=shift;
 
        eval q{use highlight};
        my $input=shift;
 
        eval q{use highlight};


@@ -182,7 +201,9 @@ sub highlight ($$) {
 
        my $gen;
        if (! exists $highlighters{$langfile}) {
 
        my $gen;
        if (! exists $highlighters{$langfile}) {

+               no warnings 'once';

                $gen = highlight::CodeGenerator::getInstance($highlight::XHTML);
                $gen = highlight::CodeGenerator::getInstance($highlight::XHTML);

+               use warnings;

                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
                if ($data_dir){
                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
                if ($data_dir){


@@ -200,7 +221,7 @@ sub highlight ($$) {
                $gen=$highlighters{$langfile};
        }
 
                $gen=$highlighters{$langfile};
        }
 

-       return $gen->generateString($input);
+       return "<div class=\"highlight-$extorfile\">".$gen->generateString($input)."</div>";

 }
 
 1
 }
 
 1