3 files changed, 21 insertions, 4 deletions
diff --git a/Build/source/extra/epstopdf/Makefile b/Build/source/extra/epstopdf/Makefile
index ba0f6624978..cec3602cdd3 100644
--- a/Build/source/extra/epstopdf/Makefile
+++ b/Build/source/extra/epstopdf/Makefile
@@ -11,6 +11,7 @@ default: check
 # making sure we don't crash.
 check: check-help check-version \
        check-help-r \
+       check-nogs \
        check-restricted-gscmd \
        check-filter check-filter-outfile check-write-error check-gscmd \
        check-simple check-atend check-binary check-bin2 \
@@ -26,6 +27,11 @@ check-version:
 check-help-r: $(re2p_script)
 	$(re2p_script) --help | grep restricted  # should have default=true
 
+check-nogs:
+	$(e2p) --no-gs test-simple.eps >test-simple.out
+# the two files should be different:
+	cmp -s test-simple.eps test-simple.out || exit 0
+	
 $(re2p_script):
 	ln -s epstopdf.pl $@
 
diff --git a/Build/source/extra/epstopdf/epstopdf.1 b/Build/source/extra/epstopdf/epstopdf.1
index d5f0ab9ac43..019548a26f4 100644
--- a/Build/source/extra/epstopdf/epstopdf.1
+++ b/Build/source/extra/epstopdf/epstopdf.1
@@ -31,7 +31,9 @@ scan ExactBoundingBox (default: off).
 read standard input and (unless \fB--outfile\fP is given) write standard
 output(default: off).
 .IP "\fB--\fP[\fBno\fP]\fBgs\fP"
-run Ghostscript (default: on).
+run Ghostscript (default: on).  With \fB--nogs\fP, output (to standard
+output by default) the PostScript that would normally be converted; that
+is, the input PostScript as modified by \fBepstopdf\fP.
 .IP "\fB--\fP[\fBno\fP]\fBhires\fP"
 scan HiresBoundingBox (default: off).
 .IP "\fB--gscmd\fP=\fIval\fP"
diff --git a/Build/source/extra/epstopdf/epstopdf.pl b/Build/source/extra/epstopdf/epstopdf.pl
index b2412e4d789..9c5ba9de049 100755
--- a/Build/source/extra/epstopdf/epstopdf.pl
+++ b/Build/source/extra/epstopdf/epstopdf.pl
@@ -46,6 +46,9 @@ use strict;
 #
 # emacs-page
 # History
+#  2010/05/09
+#    * make --nogs dump edited PostScript to stdout by default
+#      (report from Reinhard Kotucha).
 #  2010/03/19 v2.15 (Karl Berry)
 #    * let --outfile override --filter again.
 #    * recognize MSWin64 as well as MSWin32, just in case.
@@ -334,7 +337,7 @@ if (! $OutputFilename) {
     }
   } else {
     debug "No Ghostscript: will write standard output";
-    $OutputFilename = "-"; # no ghostscript, write to standard output
+    $OutputFilename = "-";
   }
 }
 debug "Output filename:", $OutputFilename;
@@ -408,8 +411,14 @@ if ($::opt_gs) {
   $outname = $GS;
 }
 else {
-  open($OUT, '>', $OutputFilename) or error "Cannot write \"$OutputFilename\"";
-  $outname = $OutputFilename;
+  debug "No Ghostscript: opening $OutputFilename";
+  if ($OutputFilename eq "-") {
+    $OUT = *STDOUT;
+  } else {
+    open($OUT, '>', $OutputFilename)
+    || error ("Cannot write \"$OutputFilename\": $!");
+    $outname = $OutputFilename;
+  }
 }
 binmode $OUT;