X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7ab84dcfe52a37b93e6faa49895ae963a3b5d0d1..c3e7194db09540287cbe4cff7800e111339f0459:/IkiWiki/Plugin/highlight.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index d4ade0a7b..04c554ac4 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -1,17 +1,23 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::highlight;
 
+# This has been tested with highlight 2.16 and highlight 3.2+svn19.
+# In particular version 3.2 won't work. It detects the different
+# versions by the presence of the the highlight::DataDir class.
+
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
 
+my $data_dir;
+
 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 () {
@@ -45,13 +51,34 @@ sub getsetup () {
 }
 
 sub checkconfig () {
+	eval q{use highlight};
+	if (highlight::DataDir->can('new')) {
+		$data_dir=new highlight::DataDir();
+		$data_dir->searchDataDir("");
+	} else {
+		$data_dir=undef;
+	}
+
 	if (! exists $config{filetypes_conf}) {
-		$config{filetypes_conf}="/etc/highlight/filetypes.conf";
+	  if (! $data_dir ) {
+		$config{filetypes_conf}= "/etc/highlight/filetypes.conf";
+	      } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
+		# 3.14 +
+		$config{filetypes_conf}=
+		  $data_dir -> getFiletypesConfPath("filetypes");
+	      } 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}) {
-		$config{langdefdir}="/usr/share/highlight/langDefs";
+		$config{langdefdir}= "/usr/share/highlight/langDefs";
+
 	}
-	if (exists $config{tohighlight}) {
+	if (exists $config{tohighlight} && read_filetypes()) {
 		foreach my $file (split ' ', $config{tohighlight}) {
 			my @opts = $file=~s/^\.// ?
 				(keepextension => 1) :
@@ -70,7 +97,7 @@ sub checkconfig () {
 				id => $file,
 				call => sub {
 					my %params=@_;
-				       	highlight($langfile, $params{content});
+				       	highlight($langfile, $file, $params{content});
 				},
 				longname => sprintf(gettext("Source code: %s"), $file),
 				@opts,
@@ -79,7 +106,7 @@ sub checkconfig () {
 	}
 }
 
-sub htmlizefallback {
+sub htmlizeformat {
 	my $format=lc shift;
 	my $langfile=ext2langfile($format);
 
@@ -87,7 +114,7 @@ sub htmlizefallback {
 		return;
 	}
 
-	return Encode::decode_utf8(highlight($langfile, shift));
+	return Encode::decode_utf8(highlight($langfile, $format, shift));
 }
 
 my %ext2lang;
@@ -96,29 +123,59 @@ my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
-	open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!");
-	while (<IN>) {
-		chomp;
-		if (/^\$ext\((.*)\)=(.*)$/) {
-			$ext2lang{$_}=$1 foreach $1, split ' ', $2;
+	my $f;
+	if (!open($f, $config{filetypes_conf})) {
+		warn($config{filetypes_conf}.": ".$!);
+		return 0;
+	};
+
+	local $/=undef;
+	my $config=<$f>;
+	close $f;
+
+	# highlight >= 3.2 format (bind-style)
+	while ($config=~m/Lang\s*=\s*\"([^"]+)\"[,\s]+Extensions\s*=\s*{([^}]+)}/sg) {
+		my $lang=$1;
+		foreach my $bit (split ',', $2) {
+			$bit=~s/.*"(.*)".*/$1/s;
+			$ext2lang{$bit}=$lang;
 		}
 	}
-	close IN;
-	$filetypes_read=1;
+
+	# highlight < 3.2 format
+	if (! keys %ext2lang) {
+		foreach (split("\n", $config)) {
+			if (/^\$ext\((.*)\)=(.*)$/) {
+				$ext2lang{$_}=$1 foreach $1, split ' ', $2;
+			}
+		}
+	}
+
+	return $filetypes_read=1;
 }
 
 
+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;
 
-	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 "$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.
@@ -133,6 +190,7 @@ sub ext2langfile ($) {
 # Interface to the highlight C library.
 sub highlight ($$) {
 	my $langfile=shift;
+	my $extorfile=shift;
 	my $input=shift;
 
 	eval q{use highlight};
@@ -143,11 +201,19 @@ sub highlight ($$) {
 
 	my $gen;
 	if (! exists $highlighters{$langfile}) {
-		$gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
+		no warnings 'once';
+		$gen = highlight::CodeGenerator::getInstance($highlight::XHTML);
+		use warnings;
 		$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
+		if ($data_dir){
+			# new style, requires a real theme, but has no effect
+			$gen->initTheme($data_dir->getThemePath("seashell.theme"));
+		} else {
+			# old style, anything works.
+			$gen->initTheme("/dev/null");
+		}
+		$gen->loadLanguage($langfile); # must come after initTheme
 		$gen->setEncoding("utf-8");
 		$highlighters{$langfile}=$gen;
 	}
@@ -155,7 +221,7 @@ sub highlight ($$) {
 		$gen=$highlighters{$langfile};
 	}
 
-	return $gen->generateString($input);
+	return "<div class=\"highlight-$extorfile\">".$gen->generateString($input)."</div>";
 }
 
 1