Mercurial > octave

diff scripts/plot/util/print.m @ 27069:0a62d9a6aa2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Place Octave's warning and error IDs in to the "Octave" namespace (bug #56213). * oct-stream.cc (textscan_format_list::parse_char_class), ov-ch-mat.cc (octave_char_matrix::map): Use "Octave" namespace with initial capital rather than "octave" lowercase in warning_with_id. * fminbnd.m (guarded_eval), fminunc.m (guarded_eval), fsolve.m (guarded_eval): Place error IDs in to "Octave" namespace. * print.m (epstool, fig2dev, latexstandalone, lpr, pstoedit): Place error IDs in to "Octave" namespace. * __print_parse_opts__.m (convert2points): Place error IDs in to "Octave" namespace. * fzero.m, __ghostscript__.m, __gnuplot_print__.m, __opengl_print__.m, splinefit.m, strjoin.m, strsplit.m: Place error IDs in to "Octave" namespace.
author Rik <rik@octave.org>
date Thu, 25 Apr 2019 08:48:19 -0700
parents 2bf6dcb1563c
children 2c9795736894
line wrap: on
line diff
--- a/scripts/plot/util/print.m	Wed Apr 24 21:21:06 2019 -0700
+++ b/scripts/plot/util/print.m	Thu Apr 25 08:48:19 2019 -0700
@@ -770,7 +770,7 @@
   persistent epsdevice;
   if (dos_shell && isempty (epsdevice))
     if (isempty (opts.ghostscript.binary))
-      error ("print:nogs",
+      error ("Octave:print:nogs",
              "print: 'gs' (Ghostscript) is required for specified output format, but binary is not available in PATH");
     endif
 
@@ -821,7 +821,7 @@
   if (! isempty (opts.preview) || opts.tight)
 
     if (isempty (opts.epstool_binary))
-      error ("print:noepstool", "print: 'epstool' is required for specified output format, but binary is not available in PATH");
+      error ("Octave:print:noepstool", "print: 'epstool' is required for specified output format, but binary is not available in PATH");
     endif
 
     if (opts.tight)
@@ -837,7 +837,7 @@
         case "pict"
           cmd = sprintf ("--add-%s-preview --mac-single", opts.preview);
         otherwise
-          error ("print:invalidpreview",
+          error ("Octave:print:invalidpreview",
                  "print: epstool cannot include preview for format '%s'",
                  opts.preview);
       endswitch
@@ -872,7 +872,7 @@
     endif
     if (! isempty (cleanup))
       if (pipeout && dos_shell)
-        error ("print:epstoolpipe",
+        error ("Octave:print:epstoolpipe",
                "print: cannot pipe output of 'epstool' for DOS shell");
       elseif (pipeout)
         cmd = sprintf ("( %s %s )", cmd, cleanup);
@@ -928,7 +928,7 @@
   endif
 
   if (isempty (opts.fig2dev_binary))
-    error ("print:nofig2dev", "print: 'fig2dev' is required for specified output format, but binary is not available in PATH");
+    error ("Octave:print:nofig2dev", "print: 'fig2dev' is required for specified output format, but binary is not available in PATH");
   endif
 
   dos_shell = (ispc () && ! isunix ());
@@ -976,13 +976,13 @@
 
   fid = fopen (latexfile, "r");
   if (fid < 0)
-    error ("print:erroropeningfile",
+    error ("Octave:print:erroropeningfile",
            "print: error opening file '%s'", latexfile);
   endif
   latex = fscanf (fid, "%c", Inf);
   status = fclose (fid);
   if (status != 0)
-    error ("print:errorclosingfile",
+    error ("Octave:print:errorclosingfile",
            "print: error closing file '%s'", latexfile);
   endif
   ## FIXME: should this be fixed in GL2PS?
@@ -996,11 +996,11 @@
     fprintf (fid, "%s\n", postpend{:});
     status = fclose (fid);
     if (status != 0)
-      error ("print:errorclosingfile",
+      error ("Octave:print:errorclosingfile",
              "print: error closing file '%s'", latexfile);
     endif
   else
-    error ("print:erroropeningfile",
+    error ("Octave:print:erroropeningfile",
            "print: error opening file '%s'", latexfile);
   endif
 
@@ -1021,7 +1021,7 @@
       cmd = sprintf ("%s %s", cmd, opts.printer);
     endif
   elseif (isempty (opts.lpr_binary))
-    error ("print:nolpr", "print: 'lpr' not found in PATH");
+    error ("Octave:print:nolpr", "print: 'lpr' not found in PATH");
   endif
   if (opts.debug)
     fprintf ("lpr command: '%s'\n", cmd);
@@ -1036,7 +1036,7 @@
   endif
 
   if (isempty (opts.pstoedit_binary))
-    error ("print:nopstoedit", ...
+    error ("Octave:print:nopstoedit", ...
            "print: 'pstoedit' is required for specified output format, but binary is not available in PATH");
   endif