highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations.
parent
af1e2e6420
commit
7ab84dcfe5
|
@ -6,10 +6,6 @@ use strict;
|
||||||
use IkiWiki 3.00;
|
use IkiWiki 3.00;
|
||||||
use Encode;
|
use Encode;
|
||||||
|
|
||||||
# locations of highlight's files
|
|
||||||
my $filetypes="/etc/highlight/filetypes.conf";
|
|
||||||
my $langdefdir="/usr/share/highlight/langDefs";
|
|
||||||
|
|
||||||
sub import {
|
sub import {
|
||||||
hook(type => "getsetup", id => "highlight", call => \&getsetup);
|
hook(type => "getsetup", id => "highlight", call => \&getsetup);
|
||||||
hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
|
hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
|
||||||
|
@ -32,9 +28,29 @@ sub getsetup () {
|
||||||
safe => 1,
|
safe => 1,
|
||||||
rebuild => 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 () {
|
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}) {
|
if (exists $config{tohighlight}) {
|
||||||
foreach my $file (split ' ', $config{tohighlight}) {
|
foreach my $file (split ' ', $config{tohighlight}) {
|
||||||
my @opts = $file=~s/^\.// ?
|
my @opts = $file=~s/^\.// ?
|
||||||
|
@ -80,7 +96,7 @@ my %highlighters;
|
||||||
|
|
||||||
# Parse highlight's config file to get extension => language mappings.
|
# Parse highlight's config file to get extension => language mappings.
|
||||||
sub read_filetypes () {
|
sub read_filetypes () {
|
||||||
open (IN, $filetypes) || error("$filetypes: $!");
|
open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!");
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
chomp;
|
chomp;
|
||||||
if (/^\$ext\((.*)\)=(.*)$/) {
|
if (/^\$ext\((.*)\)=(.*)$/) {
|
||||||
|
@ -97,12 +113,12 @@ sub read_filetypes () {
|
||||||
sub ext2langfile ($) {
|
sub ext2langfile ($) {
|
||||||
my $ext=shift;
|
my $ext=shift;
|
||||||
|
|
||||||
my $langfile="$langdefdir/$ext.lang";
|
my $langfile="$config{langdefdir}/$ext.lang";
|
||||||
return $langfile if exists $highlighters{$langfile};
|
return $langfile if exists $highlighters{$langfile};
|
||||||
|
|
||||||
read_filetypes() unless $filetypes_read;
|
read_filetypes() unless $filetypes_read;
|
||||||
if (exists $ext2lang{$ext}) {
|
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
|
# If a language only has one common extension, it will not
|
||||||
# be listed in filetypes, so check the langfile.
|
# be listed in filetypes, so check the langfile.
|
||||||
|
|
|
@ -11,6 +11,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
|
||||||
* style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
|
* style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
|
||||||
* htmlscrubber: Do not scrub url anchors that contain colons.
|
* htmlscrubber: Do not scrub url anchors that contain colons.
|
||||||
* Danish translation update. Closes: #594673
|
* 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
|
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400
|
||||||
|
|
||||||
|
|
|
@ -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).
|
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]]
|
||||||
|
|
Loading…
Reference in New Issue