Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git diffurl: Do not escape / in paths to changed files, in order to interoperate...
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
highlight.pm
diff --git
a/IkiWiki/Plugin/highlight.pm
b/IkiWiki/Plugin/highlight.pm
index 65e372db1336dbdedd6f1c5e256d4ef3b953aa2a..fbe7ddff44f0c9111b63cca96f6a58fb80ac41f8 100644
(file)
--- a/
IkiWiki/Plugin/highlight.pm
+++ b/
IkiWiki/Plugin/highlight.pm
@@
-51,13
+51,8
@@
sub getsetup () {
}
sub checkconfig () {
}
sub checkconfig () {
-
eval q{use highlight};
eval q{use highlight};
- if ($@) {
- print STDERR "Failed to load highlight. Configuring anyway.\n";
- };
-
- if (highlight::DataDir->can('new')){
+ if (highlight::DataDir->can('new')) {
$data_dir=new highlight::DataDir();
$data_dir->searchDataDir("");
} else {
$data_dir=new highlight::DataDir();
$data_dir->searchDataDir("");
} else {
@@
-94,7
+89,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,
@@
-111,7
+106,7
@@
sub htmlizeformat {
return;
}
return;
}
- return Encode::decode_utf8(highlight($langfile, shift));
+ return Encode::decode_utf8(highlight($langfile,
$format,
shift));
}
my %ext2lang;
}
my %ext2lang;
@@
-177,6
+172,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};
@@
-205,7
+201,7
@@
sub highlight ($$) {
$gen=$highlighters{$langfile};
}
$gen=$highlighters{$langfile};
}
- return
$gen->generateString($input)
;
+ return
"<div class=\"highlight-$extorfile\">".$gen->generateString($input)."</div>"
;
}
1
}
1