From bdf468637c157ff120594c674717b9a27dbc0f3f Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Mon, 16 Feb 2009 21:19:43 +0000
Subject: [PATCH] patch-one from Ryan Schmidt

Attached is a patch that I believe brings over the useful changes from 2006-06-10 perl webdot while leaving out the typo and not removing the useful comment. I also moved the doubled slash fix and changed it slightly, and in the regex that removes the initial slash from the PATH_INFO, I made it clear that we want to remove the first slash only if it occurs at the beginning of the string. (That threw me off the search for the doubled slash issue for awhile.)
---
 contrib/webdot.cgi | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/contrib/webdot.cgi b/contrib/webdot.cgi
index e2f247743..09c0d3d64 100755
--- a/contrib/webdot.cgi
+++ b/contrib/webdot.cgi
@@ -91,6 +91,7 @@ my %KnownTypes = (
 	epsi =>   'application/postscript',
 	pdf =>    'application/pdf',
 	map =>    'text/plain',
+	cmapx =>  'text/plain',
 	txt =>    'text/plain',
 	src =>    'text/plain',
 	svg =>    'image/svg+xml',
@@ -209,7 +210,21 @@ sub up_doc {
 		$cmd = "$EPSIfilter < $tmpfile > $tagfile";
 		return unless (run_under_lock($tagfh, $cmd));
 	} elsif ($tag eq 'pdf') {
-		$cmd = "$GS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$tagfile $tmpfile";
+		# need BoundingBox
+		my @box;
+		open(EPS, "<$tmpfile") or
+			trouble "webdot: Cannot open $tmpfile for reading", return;
+		while(<EPS>) {
+			if(/^%%BoundingBox:\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s*$/) {
+				@box = ($1, $2, $3, $4);
+				last;
+			}
+		}
+		unless( @box ) {
+			trouble "webdot: I didn't find a valid boundingbox in $tmpfile";
+			return;
+		}
+		$cmd = "$GS -dDEVICEWIDTHPOINTS=$box[2] -dDEVICEHEIGHTPOINTS=$box[3] -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$tagfile $tmpfile";
 		return unless (run_under_lock($tagfh, $cmd));
 	}
     }
@@ -237,7 +252,8 @@ sub get_dot {
 	    trouble("Unknown tag type $tag from $url\n");
 	    return;
 	}
-	($base = $url) =~ s%[/:]%-%g;	# remember to make safe for PC's
+	$base = $url;
+	$base =~ s%[/:]%-%g;	# remember to make safe for PC's
 	# trouble("I see: '$base' '$url' '$layouter' '$tag' \n"); return;
 	up_doc($base, $url, $layouter, $tag);
     } else {
@@ -262,7 +278,8 @@ EOF
 sub main {
     my $arg;
     if ($arg = ($ENV{'PATH_INFO'})) {
-	    $arg =~ s:/::;
+	    $arg =~ s%^/%%;			# strip initial slash
+	    $arg =~ s%(^[^:]+:/)([^/])%$1/$2%;	# reinstate double slash before hostname if web server removed it
 	}
 	else  {
 		$arg = $ARGV[0];
-- 
2.40.0