# HG changeset patch
# User Rik <rik@octave.org>
# Date 1586647579 25200
# Node ID 63f5c721cfde6a2510f77659f9ebeb07a3893a33
# Parent  ab60e78d235cfddbcc05bf31142691bb28d32b9a# Parent  c3dd445fcc2f02e68a11f832119c60f91170bb7a
maint: merge stable to default.

diff -r ab60e78d235c -r 63f5c721cfde scripts/plot/util/print.m
--- a/scripts/plot/util/print.m	Sat Apr 11 16:06:19 2020 -0700
+++ b/scripts/plot/util/print.m	Sat Apr 11 16:26:19 2020 -0700
@@ -890,8 +890,16 @@
       cmd = "";
     endif
     if (! isempty (cmd))
-      cmd = sprintf ("%s --quiet %s %s %s ", opts.epstool_binary,
-                     cmd, filein, fileout);
+      if (dos_shell)
+        ## ghostscript expects double, not single, quotes
+        fileout(fileout == "'") = '"';
+        ## epstool implicitly uses ghostscript and it needs the command name
+        cmd = sprintf ("%s --gs %s --quiet %s %s %s ", opts.epstool_binary,
+                       opts.ghostscript.binary, cmd, filein, fileout);
+      else
+        cmd = sprintf ("%s --quiet %s %s %s ", opts.epstool_binary,
+                       cmd, filein, fileout);
+      endif
     endif
     if (pipein)
       if (dos_shell)