git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
source: move highlighting setup into eval
[sheet.git]
/
source.plp
diff --git
a/source.plp
b/source.plp
index 2b133712c6a0659b16da51b75ff0e564a6337df4..1f934aea9102abf51fe3310b22bbed5215a037b1 100644
(file)
--- a/
source.plp
+++ b/
source.plp
@@
-67,21
+67,24
@@
else {
}
-r $source or die "Requested file not found\n";
}
-r $source or die "Requested file not found\n";
- if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
+ if (my $hl = eval {
+ require Text::VimColor;
+ Text::VimColor->VERSION(0.12)
+ or die 'early versions are buggy under FastCGI';
delete $Text::VimColor::SYNTAX_TYPE{Underlined};
delete $Text::VimColor::SYNTAX_TYPE{Underlined};
+ return Text::VimColor->new(
+ file => $source,
+ vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+ )->marked;
+ }) {
my %TYPETAG = (
Statement => 'strong',
Error => 'em',
Todo => 'em',
);
my %TYPETAG = (
Statement => 'strong',
Error => 'em',
Todo => 'em',
);
- my $hl = Text::VimColor->new(
- file => $source,
- vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
- );
- my $parsed = $hl->marked;
say '<pre>';
say '<pre>';
- foreach (@
$parsed
) {
+ foreach (@
{$hl}
) {
my ($type, $contents) = @{$_};
$contents = decode_utf8($contents);
my $tag = $type && ($TYPETAG{$type} || 'span');
my ($type, $contents) = @{$_};
$contents = decode_utf8($contents);
my $tag = $type && ($TYPETAG{$type} || 'span');