From 7ab84dcfe52a37b93e6faa49895ae963a3b5d0d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 13:15:49 -0400
Subject: [PATCH] highlight: Make location of highlight's files configurable in
 setup file to allow for nonstandard installations.

---
 IkiWiki/Plugin/highlight.pm                   | 30 ++++++++++++++-----
 debian/changelog                              |  2 ++
 ...light_extension_uses_hard_coded_paths.mdwn |  2 ++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index e517ac5c0..d4ade0a7b 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -6,10 +6,6 @@ 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);
@@ -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/^\.// ?
@@ -80,7 +96,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 +113,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.
diff --git a/debian/changelog b/debian/changelog
index d5587bfce..0d36a7352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
   * htmlscrubber: Do not scrub url anchors that contain colons.
   * Danish translation update. Closes: #594673
+  * highlight: Make location of highlight's files configurable in setup
+    file to allow for nonstandard installations.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 
diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
index 1b9cb2e2d..275661fb8 100644
--- a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
+++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
@@ -1 +1,3 @@
 The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin.  This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package).
+
+> configurable now, [[done]] --[[Joey]]