source: various improvements

diff --git a/source.plp b/source.plp
index 8193de50f17e60eece31088bd9c3209c696e4a20..aad6898937242ae4ff8c0e303c69556a517bb36f 100644 (file)
--- a/source.plp
+++ b/source.plp
@@ -20,7 +20,7 @@ $header{content_type} = "text/html; charset=utf-8";
        .synConstant   { color: #008 }
        .synType,
        .synIdentifier { color: #804 }
-       .synStatement  { font-weight: bold }
+       .synStatement  { }
        .synPreProc    { }
        .synSpecial    { color: #408 }
        .synError      { font-weight: bold; background-color: #F00; color: #FFF }
@@ -33,12 +33,56 @@ $header{content_type} = "text/html; charset=utf-8";
 
 my $source = $ENV{PATH_INFO};
 $source =~ s{^/}{};
-$source ||= $0;
 print "<h1>Source of $source</h1>\n";
 
+if ($source =~ m{(?:/|^)\.}) {
+       die "File request not permitted\n";
+}
+elsif ($source =~ s{::}{/}g or !-e $source) {
+       $source .= '.pm';
+       for (0 .. $#{@INC}) {
+               -e ($_ = "$INC[$_]/$source") or next;
+               $source = $_;
+               last;
+       }
+}
+-r $source or die "Requested file not found\n";
+
 require Text::VimColor;
+delete $Text::VimColor::SYNTAX_TYPE{Underlined};
+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;
 print "<pre>\n";
-my $hl = Text::VimColor->new(file => $source);
-print $hl->html;
+foreach (@$parsed) {
+       my $tag = $_->[0] && ($TYPETAG{ $_->[0] } || 'span');
+       my $arg = '';
+       print "<$tag$arg class=\"syn$_->[0]\">" if $tag;
+       if ($_->[0] eq 'Constant' and $_->[1] =~ s/^(')([a-z0-9_.]+\.plp?)(?=\1$)//) {
+               printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
+       }
+       if (!$_->[0] and $_->[1] =~ s/^([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
+               printf '<a href="%s">%s</a>', "/source/$1", $1;
+       }
+       print Text::VimColor::_xml_escape($_->[1]);
+       print "</$tag>" if $tag;
+}
 print "</pre>\n";
+:>
+<p class="footer">
+       <a href="/" rel="home">sheet.shiar.nl</a>/source
+       <a href="git://git.shiar.nl/sheet" rel="vcs-git" title="Git repository"><:= $VERSION :></a>
+       created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
+       <a title="Licensed under the GNU Affero General Public License, version 3" rel="copyright"
+          href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPLv3</a>
+</p>
 
+</html>