X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/618117fd1a97ad4550b3316a980e2ffcca4e409c..HEAD:/source.plp

diff --git a/source.plp b/source.plp
index 358bf84..cf22e34 100644
--- a/source.plp
+++ b/source.plp
@@ -29,7 +29,7 @@ if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
 
 Html({
 	title => "$source source code",
-	version => '1.2',
+	version => '1.3',
 	description => !$source ? 'Index of source files for this site.' : [
 		"Source code of the $source file at this site,",
 		"with syntax highlighted and references linked."
@@ -65,6 +65,7 @@ else {
 		say "<h1>Source of $href</h1>";
 	};
 
+	my $path = $source;
 	if ($source =~ m{(?:/|^)\.}) {
 		Abort("File request not permitted", '403 source not allowed');
 	}
@@ -72,20 +73,21 @@ else {
 		$source .= '.pm';
 		for (0 .. $#INC) {
 			-e ($_ = "$INC[$_]/$source") or next;
-			$source = $_;
+			$path = $_;
 			last;
 		}
 	}
-	-r $source or Abort("Requested file not found", '404 source not found');
-	my $size = (stat $source)->[7];
+	-r $path or Abort("Requested file not found", '404 source not found');
+	my $size = (stat $path)->[7];
 
 	my $cachefile = "source/$source.html";
-	if (-e $cachefile and (stat $cachefile)->[9] >= (stat $source)->[9]) {
+	if (-e $cachefile and (stat $cachefile)->[9] >= (stat $path)->[9]) {
 		say '<pre>';
-		print ReadFile($cachefile);
+		print decode_utf8(ReadFile($cachefile));
 		say '</pre>';
 		exit;
 	}
+	-e or mkdir for $cachefile =~ s{[^/]+\z}{}r; # dirname
 	open my $cache, '>', $cachefile
 		or Alert("Could not save cache", "Opening $cachefile failed: $!");;
 
@@ -96,8 +98,11 @@ else {
 			or die 'early versions are buggy under FastCGI';
 		delete $Text::VimColor::SYNTAX_TYPE{Underlined};
 		return Text::VimColor->new(
-			file => $source,
-			vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+			file => $path,
+			vim_options => [@Text::VimColor::VIM_OPTIONS,
+				'+:set enc=utf-8',
+				'+:let perl_sub_signatures=1',
+			],
 		)->marked;
 	}) {
 		my %TYPETAG = (
@@ -117,6 +122,9 @@ else {
 			# link other page sources, stylesheets, and javascript
 			$line =~ s{ ^(['"]?) \K ($incname) (?=\1$) }{ showlink($2, "/source/$2") }xe
 				if !$type || $type eq 'Constant';
+			# link relative page locations in html output
+			$line =~ s{ ^(&quot;)\K (/\w+) (?= (?:/\w+)* \1$) }{ showlink($2, "/source$2.plp") }xe
+				if $type && $type eq 'Constant';
 			# link perl module names (Xx::Xx...)
 			$line =~ s{ ^\s* \K ([A-Z]\w+(?:::\w+)+) (?![^;\s]) }{ showlink($1, "/source/$1") }xe
 				if !$type;
@@ -132,7 +140,7 @@ else {
 	}
 	else {
 		say '<pre>';
-		print EscapeHTML(decode_utf8(ReadFile($source)));
+		print EscapeHTML(decode_utf8(ReadFile($path)));
 		say '</pre>';
 	}