X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f398ad035b973608d380c9939ea845d8e2a0cdc2..5c6eb167b8e69e0607330f06c893a73dfe1c675a:/IkiWiki/Plugin/highlight.pm

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index e517ac5c0..872537c72 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -6,16 +6,12 @@ use strict;
 use IkiWiki 3.00;
 use Encode;
 
-# locations of highlight's files
-my $filetypes="/etc/highlight/filetypes.conf";
-my $langdefdir="/usr/share/highlight/langDefs";
-
 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);
+	hook(type => "htmlizeformat", id => "highlight", 
+		call => \&htmlizeformat, last => 1);
 }
 
 sub getsetup () {
@@ -32,9 +28,29 @@ sub getsetup () {
 			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 () {
+	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/^\.// ?
@@ -58,12 +74,13 @@ sub checkconfig () {
 				},
 				longname => sprintf(gettext("Source code: %s"), $file),
 				@opts,
+				last => 1,
 			);
 		}
 	}
 }
 
-sub htmlizefallback {
+sub htmlizeformat {
 	my $format=lc shift;
 	my $langfile=ext2langfile($format);
 
@@ -80,7 +97,7 @@ my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
-	open (IN, $filetypes) || error("$filetypes: $!");
+	open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!");
 	while (<IN>) {
 		chomp;
 		if (/^\$ext\((.*)\)=(.*)$/) {
@@ -97,12 +114,12 @@ sub read_filetypes () {
 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 "$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.