# HG changeset patch
# User Rik <rik@octave.org>
# Date 1375908169 25200
# Node ID 9deb214ae9d5352edf5d9c3f147662c0e7ca81f2
# Parent  81f3b09e3e6e32cc8087f2337b2853c75c6b3d43
Use 2-D, not 2D, in error messages.

* libinterp/corefcn/cellfun.cc, libinterp/corefcn/ls-oct-ascii.cc,
libinterp/octave-value/ov-bool-sparse.cc,
libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-re-sparse.cc,
scripts/plot/private/__go_draw_axes__.m,
scripts/polynomial/private/__splinefit__.m, scripts/sparse/svds.m,
scripts/special-matrix/gallery.m: Use 2-D, not 2D, in error messages.

diff -r 81f3b09e3e6e -r 9deb214ae9d5 libinterp/corefcn/cellfun.cc
--- a/libinterp/corefcn/cellfun.cc	Wed Aug 07 13:29:34 2013 -0700
+++ b/libinterp/corefcn/cellfun.cc	Wed Aug 07 13:42:49 2013 -0700
@@ -2229,7 +2229,7 @@
       bool sparse = a.is_sparse_type ();
       if (sparse && nargin > 3)
         {
-          error ("mat2cell: sparse arguments only support 2D indexing");
+          error ("mat2cell: sparse arguments only support 2-D indexing");
           return retval;
         }
 
diff -r 81f3b09e3e6e -r 9deb214ae9d5 libinterp/corefcn/ls-oct-ascii.cc
--- a/libinterp/corefcn/ls-oct-ascii.cc	Wed Aug 07 13:29:34 2013 -0700
+++ b/libinterp/corefcn/ls-oct-ascii.cc	Wed Aug 07 13:42:49 2013 -0700
@@ -367,7 +367,7 @@
 
   if (tc.is_real_matrix ())
     {
-      os << "# 3D data...\n"
+      os << "# 3-D data...\n"
          << "# type: matrix\n"
          << "# total rows: " << nr << "\n"
          << "# total columns: " << nc << "\n";
@@ -408,7 +408,7 @@
     }
   else
     {
-      ::error ("for now, I can only save real matrices in 3D format");
+      ::error ("for now, I can only save real matrices in 3-D format");
       fail = true;
     }
 
diff -r 81f3b09e3e6e -r 9deb214ae9d5 libinterp/octave-value/ov-bool-sparse.cc
--- a/libinterp/octave-value/ov-bool-sparse.cc	Wed Aug 07 13:29:34 2013 -0700
+++ b/libinterp/octave-value/ov-bool-sparse.cc	Wed Aug 07 13:42:49 2013 -0700
@@ -273,7 +273,7 @@
     swap_bytes<4> (&tmp);
 
   if (tmp != -2) {
-    error ("load: only 2D sparse matrices are supported");
+    error ("load: only 2-D sparse matrices are supported");
     return false;
   }
 
diff -r 81f3b09e3e6e -r 9deb214ae9d5 libinterp/octave-value/ov-cx-sparse.cc
--- a/libinterp/octave-value/ov-cx-sparse.cc	Wed Aug 07 13:29:34 2013 -0700
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Wed Aug 07 13:42:49 2013 -0700
@@ -305,7 +305,7 @@
     swap_bytes<4> (&tmp);
 
   if (tmp != -2) {
-    error ("load: only 2D sparse matrices are supported");
+    error ("load: only 2-D sparse matrices are supported");
     return false;
   }
 
diff -r 81f3b09e3e6e -r 9deb214ae9d5 libinterp/octave-value/ov-re-sparse.cc
--- a/libinterp/octave-value/ov-re-sparse.cc	Wed Aug 07 13:29:34 2013 -0700
+++ b/libinterp/octave-value/ov-re-sparse.cc	Wed Aug 07 13:42:49 2013 -0700
@@ -338,7 +338,7 @@
     swap_bytes<4> (&tmp);
 
   if (tmp != -2) {
-    error ("load: only 2D sparse matrices are supported");
+    error ("load: only 2-D sparse matrices are supported");
     return false;
   }
 
diff -r 81f3b09e3e6e -r 9deb214ae9d5 scripts/plot/private/__go_draw_axes__.m
--- a/scripts/plot/private/__go_draw_axes__.m	Wed Aug 07 13:29:34 2013 -0700
+++ b/scripts/plot/private/__go_draw_axes__.m	Wed Aug 07 13:42:49 2013 -0700
@@ -652,7 +652,7 @@
              endif
              if (nd == 3)
                if (numel (xcol) > 3)
-                 error ("__go_draw_axes__: gnuplot (as of v4.2) only supports 3D filled triangular patches");
+                 error ("__go_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches");
                else
                  if (isnan (data_3d_idx))
                    data_idx++;
diff -r 81f3b09e3e6e -r 9deb214ae9d5 scripts/polynomial/private/__splinefit__.m
--- a/scripts/polynomial/private/__splinefit__.m	Wed Aug 07 13:29:34 2013 -0700
+++ b/scripts/polynomial/private/__splinefit__.m	Wed Aug 07 13:42:49 2013 -0700
@@ -387,7 +387,7 @@
 if isempty(cc)
     cc = ones(size(xc));
 elseif numel(size(cc)) ~= 2
-    error('arguments:ccsize1','Constraint coefficients cc must be 2D.')
+    error('arguments:ccsize1','Constraint coefficients cc must be 2-D.')
 elseif size(cc,2) ~= nx
     mess = 'Last dimension of cc must equal length of xc.';
     error('arguments:ccsize2',mess)
diff -r 81f3b09e3e6e -r 9deb214ae9d5 scripts/sparse/svds.m
--- a/scripts/sparse/svds.m	Wed Aug 07 13:29:34 2013 -0700
+++ b/scripts/sparse/svds.m	Wed Aug 07 13:42:49 2013 -0700
@@ -99,7 +99,7 @@
   endif
 
   if (ndims (A) > 2)
-    error ("svds: A must be a 2D matrix");
+    error ("svds: A must be a 2-D matrix");
   endif
 
   if (nargin < 4)
diff -r 81f3b09e3e6e -r 9deb214ae9d5 scripts/special-matrix/gallery.m
--- a/scripts/special-matrix/gallery.m	Wed Aug 07 13:29:34 2013 -0700
+++ b/scripts/special-matrix/gallery.m	Wed Aug 07 13:42:49 2013 -0700
@@ -802,7 +802,7 @@
   if (nargin < 1 || nargin > 2)
     error ("gallery: 1 or 2 arguments are required for compar matrix.");
   elseif (! isnumeric (A) || ndims (A) != 2)
-    error ("gallery: A must be a 2D matrix for compar matrix.");
+    error ("gallery: A must be a 2-D matrix for compar matrix.");
   elseif (! isnumeric (k) || ! isscalar (k))
     error ("gallery: K must be a numeric scalar for compar matrix.");
   endif
@@ -1630,7 +1630,7 @@
   if (nargin < 1 || nargin > 3)
     error ("gallery: 1 to 3 arguments are required for krylov matrix.");
   elseif (! isnumeric (A) || ! issquare (A) || ndims (A) != 2)
-    error ("gallery: A must be a square 2D matrix for krylov matrix.");
+    error ("gallery: A must be a square 2-D matrix for krylov matrix.");
   endif
 
   n = length (A);