Mercurial > octave-nkf

changeset 17847:3a0075793fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow format bank to work for mixed +/- values * pr-output.cc (set_real_format, set_real_matrix_format, set_complex_format, set complex_matrix_format): Set minimum field width to 5.
author John W. Eaton <jwe@octave.org>
date Mon, 04 Nov 2013 14:32:19 -0500
parents 42453dcfa95e
children 60b63193a33f
files libinterp/corefcn/pr-output.cc
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc	Mon Nov 04 10:38:32 2013 -0800
+++ b/libinterp/corefcn/pr-output.cc	Mon Nov 04 14:32:19 2013 -0500
@@ -553,9 +553,9 @@
     }
   else if (bank_format)
     {
-      fw = digits < 0 ? 4 : digits + 3;
-      if (inf_or_nan && fw < 4)
-        fw = 4;
+      fw = digits < 0 ? 5 : digits + 4;
+      if (inf_or_nan && fw < 5)
+        fw = 5;
       rd = 2;
     }
   else if (hex_format)
@@ -679,9 +679,9 @@
   else if (bank_format)
     {
       int digits = x_max > x_min ? x_max : x_min;
-      fw = digits <= 0 ? 4 : digits + 3;
-      if (inf_or_nan && fw < 4)
-        fw = 4;
+      fw = digits <= 0 ? 5 : digits + 4;
+      if (inf_or_nan && fw < 5)
+        fw = 5;
       rd = 2;
     }
   else if (hex_format)
@@ -843,9 +843,9 @@
     {
       int digits = r_x;
       i_fw = 0;
-      r_fw = digits <= 0 ? 4 : digits + 3;
-      if (inf_or_nan && r_fw < 4)
-        r_fw = 4;
+      r_fw = digits <= 0 ? 5 : digits + 4;
+      if (inf_or_nan && r_fw < 5)
+        r_fw = 5;
       rd = 2;
     }
   else if (hex_format)
@@ -1043,9 +1043,9 @@
     {
       int digits = r_x_max > r_x_min ? r_x_max : r_x_min;
       i_fw = 0;
-      r_fw = digits <= 0 ? 4 : digits + 3;
-      if (inf_or_nan && r_fw < 4)
-        r_fw = 4;
+      r_fw = digits <= 0 ? 5 : digits + 4;
+      if (inf_or_nan && r_fw < 5)
+        r_fw = 5;
       rd = 2;
     }
   else if (hex_format)