Mercurial > octave-nkf

changeset 10994:9e1270a84a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphics.cc: Replace pagetype property value custom with <custom>.
author Ben Abbott <bpabbott@mac.com>
date Sat, 18 Sep 2010 16:19:31 -0400
parents 061bd86a0bf3
children e81914f3921f
files src/ChangeLog src/graphics.cc
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Sep 18 15:25:44 2010 -0400
+++ b/src/ChangeLog	Sat Sep 18 16:19:31 2010 -0400
@@ -1,3 +1,7 @@
+2010-09-18  Ben Abbott <bpabbott@mac.com>
+
+	* graphics.cc: Replace pagetype property value custom with <custom>.
+
 2010-09-16  David Bateman  <dbateman@free.fr>
 
 	* graphics.cc (static Matrix screen_size_pixels (void), static Matrix
--- a/src/graphics.cc	Sat Sep 18 15:25:44 2010 -0400
+++ b/src/graphics.cc	Sat Sep 18 16:19:31 2010 -0400
@@ -2819,7 +2819,7 @@
       caseless_str punits = v.string_value ();
       if (! error_state)
         {
-          if (punits.compare ("normalized") && typ.compare ("custom"))
+          if (punits.compare ("normalized") && typ.compare ("<custom>"))
             error ("set: can't set the paperunits to normalized when the papertype is custom");
           else
             {
@@ -2843,7 +2843,7 @@
       caseless_str punits = get_paperunits ();
       if (! error_state)
         {
-          if (punits.compare ("normalized") && typ.compare ("custom"))
+          if (punits.compare ("normalized") && typ.compare ("<custom>"))
             error ("set: can't set the paperunits to normalized when the papertype is custom");
           else
             {
@@ -3027,7 +3027,7 @@
   caseless_str punits = get_paperunits ();
   caseless_str typ = get_papertype ();
 
-  if (typ.compare ("custom"))
+  if (typ.compare ("<custom>"))
     {
       if (old_paperunits.compare ("centimeters"))
         {
@@ -3068,7 +3068,7 @@
 {
   caseless_str typ = get_papertype ();
 
-  if (! typ.compare ("custom"))
+  if (! typ.compare ("<custom>"))
     // Call papersize.set rather than set_papersize to avoid loops between 
     // update_papersize and update_papertype
     papersize.set (octave_value (papersize_from_type (get_paperunits (), typ)));
@@ -3077,7 +3077,7 @@
 void
 figure::properties::update_papersize (void)
 {
-  papertype.set ("custom");
+  papertype.set ("<custom>");
 }
 
 void