Mercurial > octave-nkf

changeset 10918:811f8611995d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__print_parse_opts__.m: Fix tests.
author Ben Abbott <bpabbott@mac.com>
date Fri, 27 Aug 2010 19:38:49 -0400
parents 888c75785221
children 2a3279d11794
files scripts/ChangeLog scripts/plot/__print_parse_opts__.m
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Fri Aug 27 15:11:35 2010 -0400
+++ b/scripts/ChangeLog	Fri Aug 27 19:38:49 2010 -0400
@@ -1,3 +1,7 @@
+2010-08-27  Ben Abbott <bpabbott@mac.com>
+
+	* plot/__print_parse_opts__.m: Fix tests.
+
 2010-08-27  Jordi Gutiérrez Hermoso  <jordigh@gmail.com>
 
 	* plot/__go_draw_axes__.m (__calc_dimensions__): Delete.
--- a/scripts/plot/__print_parse_opts__.m	Fri Aug 27 15:11:35 2010 -0400
+++ b/scripts/plot/__print_parse_opts__.m	Fri Aug 27 19:38:49 2010 -0400
@@ -155,10 +155,12 @@
     endif
   endif
 
-  if (any (strcmp ({"ps", "ps2", "eps", "eps2"}, arg_st.devopt)))
-    arg_st.use_color = -1;
-  else
-    arg_st.use_color = 1;
+  if (arg_st.use_color == 0)
+    if (any (strcmp ({"ps", "ps2", "eps", "eps2"}, arg_st.devopt)))
+      arg_st.use_color = -1;
+    else
+      arg_st.use_color = 1;
+    endif
   endif
 
   if (arg_st.tight_flag)
@@ -201,7 +203,8 @@
               "pcx", "pcx", "pcx", "pgm", "pgm", ...
               "ppm", "ppm", "tex"};
 
-  if (strcmp (get (arg_st.figure, "__backend__"), "gnuplot")
+  if (isfigure (arg_st.figure)
+      && strcmp (get (arg_st.figure, "__backend__"), "gnuplot")
       && __gnuplot_has_feature__ ("epslatex_implies_eps_filesuffix"))
     suffixes(strncmp (dev_list, "epslatex", 8)) = {"eps"};
   endif