# HG changeset patch
# User Rik <rik@octave.org>
# Date 1451421663 28800
# Node ID b9d4c3615e899bf6ff42d497a1e8b7b474763030
# Parent  7f4c6d594e3db696a721a98c20873afd27a96ed5
maint: Capitalize D for dimension in messages and comments.
"N-d" => "N-D", "1-d" => "1-D", "2-d" => "2-D"

* data.cc, ls-oct-text.cc, xdiv.cc, xpow.cc, ov-str-mat.cc, op-bm-bm.cc,
op-cell.cc, op-cm-cm.cc, op-fcm-fcm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc,
op-str-str.cc, op-struct.cc, Array.cc, Sparse.cc, mx-base.h, mx-op-decl.h,
mx-op-defs.h: Capitalize D for dimension in messages and comments.

diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/corefcn/data.cc
--- a/libinterp/corefcn/data.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/corefcn/data.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -6691,7 +6691,7 @@
     error ("__sort_rows_idx__: sparse matrices not yet supported");
 
   if (arg.ndims () != 2)
-    error ("__sort_rows_idx__: needs a 2-dimensional object");
+    error ("__sort_rows_idx__: needs a 2-D object");
 
   Array<octave_idx_type> idx = arg.sort_rows_idx (smode);
 
@@ -6773,7 +6773,7 @@
         error ("issorted: sparse matrices not yet supported");
 
       if (arg.ndims () != 2)
-        error ("issorted: A must be a 2-dimensional object");
+        error ("issorted: A must be a 2-D object");
 
       retval = arg.is_sorted_rows (smode) != UNSORTED;
     }
@@ -6830,7 +6830,7 @@
 %!error <second argument must be a string> issorted (1, 2)
 %!error <second argument must be a string> issorted (1, {"rows"})
 %!error <sparse matrices not yet supported> issorted (sparse ([1 2 3]), "rows")
-%!error <A must be a 2-dimensional object> issorted (rand (2,2,2), "rows")
+%!error <A must be a 2-D object> issorted (rand (2,2,2), "rows")
 %!error <needs a vector> issorted (ones (2,2))
 */
 
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/corefcn/ls-oct-text.cc
--- a/libinterp/corefcn/ls-oct-text.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/corefcn/ls-oct-text.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -342,8 +342,8 @@
 // Maybe this should be a static function in tree-plot.cc?
 
 // If TC is matrix, save it on stream OS in a format useful for
-// making a 3-dimensional plot with gnuplot.  If PARAMETRIC is
-// TRUE, assume a parametric 3-dimensional plot will be generated.
+// making a 3-D plot with gnuplot.  If PARAMETRIC is TRUE,
+// assume a parametric 3-D plot will be generated.
 
 bool
 save_three_d (std::ostream& os, const octave_value& tc, bool parametric)
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/corefcn/xdiv.cc
--- a/libinterp/corefcn/xdiv.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/corefcn/xdiv.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -279,9 +279,9 @@
 //
 //          op2 \ op1:   s   cs
 //               +--   +---+----+
-//   N-d array         | 1 |  3 |
+//   N-D array         | 1 |  3 |
 //                     +---+----+
-//   complex N-d array | 2 |  4 |
+//   complex N-D array | 2 |  4 |
 //                     +---+----+
 
 NDArray
@@ -580,9 +580,9 @@
 //
 //          op2 \ op1:   s   cs
 //               +--   +---+----+
-//   N-d array         | 1 |  3 |
+//   N-D array         | 1 |  3 |
 //                     +---+----+
-//   complex N-d array | 2 |  4 |
+//   complex N-D array | 2 |  4 |
 //                     +---+----+
 
 FloatNDArray
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/corefcn/xpow.cc
--- a/libinterp/corefcn/xpow.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/corefcn/xpow.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -1105,7 +1105,7 @@
   return result;
 }
 
-// Safer pow functions that work elementwise for N-d arrays.
+// Safer pow functions that work elementwise for N-D arrays.
 //
 //       op2 \ op1:   s   nd  cs   cnd
 //            +--   +---+---+----+----+
@@ -2471,7 +2471,7 @@
   return result;
 }
 
-// Safer pow functions that work elementwise for N-d arrays.
+// Safer pow functions that work elementwise for N-D arrays.
 //
 //       op2 \ op1:   s   nd  cs   cnd
 //            +--   +---+---+----+----+
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/octave-value/ov-str-mat.cc
--- a/libinterp/octave-value/ov-str-mat.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/octave-value/ov-str-mat.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -203,13 +203,13 @@
 NDArray
 octave_char_matrix_str::array_value (bool force_string_conv) const
 {
-  CHAR_MATRIX_CONV (NDArray, , "real N-d array", array_value);
+  CHAR_MATRIX_CONV (NDArray, , "real N-D array", array_value);
 }
 
 ComplexNDArray
 octave_char_matrix_str::complex_array_value (bool force_string_conv) const
 {
-  CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-d array",
+  CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-D array",
                     complex_array_value);
 }
 
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-bm-bm.cc
--- a/libinterp/operators/op-bm-bm.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-bm-bm.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -61,7 +61,7 @@
   CAST_UNOP_ARG (const octave_bool_matrix&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.bool_matrix_value ().transpose ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-cell.cc
--- a/libinterp/operators/op-cell.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-cell.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -41,7 +41,7 @@
   CAST_UNOP_ARG (const octave_cell&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (Cell (v.cell_value ().transpose ()));
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-cm-cm.cc
--- a/libinterp/operators/op-cm-cm.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-cm-cm.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -46,7 +46,7 @@
   CAST_UNOP_ARG (const octave_complex_matrix&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.complex_matrix_value ().transpose ());
 }
@@ -56,7 +56,7 @@
   CAST_UNOP_ARG (const octave_complex_matrix&);
 
   if (v.ndims () > 2)
-    error ("complex-conjugate transpose not defined for N-d objects");
+    error ("complex-conjugate transpose not defined for N-D objects");
 
   return octave_value (v.complex_matrix_value ().hermitian ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-fcm-fcm.cc
--- a/libinterp/operators/op-fcm-fcm.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-fcm-fcm.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -46,7 +46,7 @@
   CAST_UNOP_ARG (const octave_float_complex_matrix&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.float_complex_matrix_value ().transpose ());
 }
@@ -56,7 +56,7 @@
   CAST_UNOP_ARG (const octave_float_complex_matrix&);
 
   if (v.ndims () > 2)
-    error ("complex-conjugate transpose not defined for N-d objects");
+    error ("complex-conjugate transpose not defined for N-D objects");
 
   return octave_value (v.float_complex_matrix_value ().hermitian ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-fm-fm.cc
--- a/libinterp/operators/op-fm-fm.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-fm-fm.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -46,7 +46,7 @@
   CAST_UNOP_ARG (const octave_float_matrix&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.float_matrix_value ().transpose ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-int.h
--- a/libinterp/operators/op-int.h	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-int.h	Tue Dec 29 12:41:03 2015 -0800
@@ -628,7 +628,7 @@
     CAST_UNOP_ARG (const octave_ ## TYPE ## _matrix&); \
  \
     if (v.ndims () > 2) \
-      error ("transpose not defined for N-d objects"); \
+      error ("transpose not defined for N-D objects"); \
     else \
       return octave_value (v.TYPE ## _array_value ().transpose ()); \
   } \
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-m-m.cc
--- a/libinterp/operators/op-m-m.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-m-m.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -46,7 +46,7 @@
   CAST_UNOP_ARG (const octave_matrix&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.matrix_value ().transpose ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-str-str.cc
--- a/libinterp/operators/op-str-str.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-str-str.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -39,7 +39,7 @@
   CAST_UNOP_ARG (const octave_char_matrix_str&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.char_matrix_value ().transpose (),
                        a.is_sq_string () ? '\'' : '"');
diff -r 7f4c6d594e3d -r b9d4c3615e89 libinterp/operators/op-struct.cc
--- a/libinterp/operators/op-struct.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/libinterp/operators/op-struct.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -39,7 +39,7 @@
   CAST_UNOP_ARG (const octave_struct&);
 
   if (v.ndims () > 2)
-    error ("transpose not defined for N-d objects");
+    error ("transpose not defined for N-D objects");
 
   return octave_value (v.map_value ().transpose ());
 }
diff -r 7f4c6d594e3d -r b9d4c3615e89 liboctave/array/Array.cc
--- a/liboctave/array/Array.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/liboctave/array/Array.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -389,7 +389,7 @@
 
 private:
 
-  // Recursive N-d generalized transpose
+  // Recursive N-D generalized transpose
   template <class T>
   T *do_permute (const T *src, T *dest, int lev) const
   {
@@ -564,7 +564,7 @@
 
 private:
 
-  // Recursive N-d indexing
+  // Recursive N-D indexing
   template <class T>
   T *do_index (const T *src, T *dest, int lev) const
   {
@@ -581,7 +581,7 @@
     return dest;
   }
 
-  // Recursive N-d indexed assignment
+  // Recursive N-D indexed assignment
   template <class T>
   const T *do_assign (const T *src, T *dest, int lev) const
   {
@@ -598,7 +598,7 @@
     return src;
   }
 
-  // Recursive N-d indexed assignment
+  // Recursive N-D indexed assignment
   template <class T>
   void do_fill (const T& val, T *dest, int lev) const
   {
diff -r 7f4c6d594e3d -r b9d4c3615e89 liboctave/array/Sparse.cc
--- a/liboctave/array/Sparse.cc	Tue Dec 29 11:48:45 2015 -0800
+++ b/liboctave/array/Sparse.cc	Tue Dec 29 12:41:03 2015 -0800
@@ -821,7 +821,7 @@
     {
       (*current_liboctave_warning_with_id_handler)
         ("Octave:reshape-smashes-dims",
-         "reshape: sparse reshape to N-d array smashes dims");
+         "reshape: sparse reshape to N-D array smashes dims");
 
       for (octave_idx_type i = 2; i < dims2.length (); i++)
         dims2(1) *= dims2(i);
diff -r 7f4c6d594e3d -r b9d4c3615e89 liboctave/operators/mx-base.h
--- a/liboctave/operators/mx-base.h	Tue Dec 29 11:48:45 2015 -0800
+++ b/liboctave/operators/mx-base.h	Tue Dec 29 12:41:03 2015 -0800
@@ -66,7 +66,7 @@
 #include "dSparse.h"
 #include "CSparse.h"
 
-// N-d Array classes.
+// N-D Array classes.
 
 #include "boolNDArray.h"
 #include "chNDArray.h"
diff -r 7f4c6d594e3d -r b9d4c3615e89 liboctave/operators/mx-op-decl.h
--- a/liboctave/operators/mx-op-decl.h	Tue Dec 29 11:48:45 2015 -0800
+++ b/liboctave/operators/mx-op-decl.h	Tue Dec 29 12:41:03 2015 -0800
@@ -151,7 +151,7 @@
   MM_CMP_OP_DECLS (M1, M2, API) \
   MM_BOOL_OP_DECLS (M1, M2, API)
 
-// N-d matrix by scalar operations.
+// N-D matrix by scalar operations.
 
 #define NDS_BIN_OP_DECLS(R, ND, S, API) \
   BIN_OP_DECL (R, operator +, ND, S, API); \
@@ -178,7 +178,7 @@
   NDS_CMP_OP_DECLS (ND, S, API) \
   NDS_BOOL_OP_DECLS (ND, S, API)
 
-// scalar by N-d matrix operations.
+// scalar by N-D matrix operations.
 
 #define SND_BIN_OP_DECLS(R, S, ND, API) \
   BIN_OP_DECL (R, operator +, S, ND, API); \
@@ -205,7 +205,7 @@
   SND_CMP_OP_DECLS (S, ND, API) \
   SND_BOOL_OP_DECLS (S, ND, API)
 
-// N-d matrix by N-d matrix operations.
+// N-D matrix by N-D matrix operations.
 
 #define NDND_BIN_OP_DECLS(R, ND1, ND2, API) \
   BIN_OP_DECL (R, operator +, ND1, ND2, API); \
@@ -281,7 +281,7 @@
 #define DMDM_OP_DECLS(R, DM1, DM2, API) \
   DMDM_BIN_OP_DECLS (R, DM1, DM2, API)
 
-// scalar by N-d array min/max ops
+// scalar by N-D array min/max ops
 
 #define MINMAX_DECLS(T, S, API) \
   extern API T min (S d, const T& m); \
diff -r 7f4c6d594e3d -r b9d4c3615e89 liboctave/operators/mx-op-defs.h
--- a/liboctave/operators/mx-op-defs.h	Tue Dec 29 11:48:45 2015 -0800
+++ b/liboctave/operators/mx-op-defs.h	Tue Dec 29 12:41:03 2015 -0800
@@ -211,7 +211,7 @@
   MM_BOOL_OP (mx_el_and, mx_inline_and, M1, M2) \
   MM_BOOL_OP (mx_el_or,  mx_inline_or,  M1, M2)
 
-// N-d matrix by scalar operations.
+// N-D matrix by scalar operations.
 
 #define NDS_BIN_OP(R, OP, ND, S, F) \
   R \
@@ -258,7 +258,7 @@
   NDS_BOOL_OP (mx_el_and_not, mx_inline_and_not, ND, S) \
   NDS_BOOL_OP (mx_el_or_not,  mx_inline_or_not,  ND, S)
 
-// scalar by N-d matrix operations.
+// scalar by N-D matrix operations.
 
 #define SND_BIN_OP(R, OP, S, ND, F) \
   R \
@@ -305,7 +305,7 @@
   SND_BOOL_OP (mx_el_and_not, mx_inline_and_not, S, ND) \
   SND_BOOL_OP (mx_el_or_not,  mx_inline_or_not,  S, ND)
 
-// N-d matrix by N-d matrix operations.
+// N-D matrix by N-D matrix operations.
 
 #define NDND_BIN_OP(R, OP, ND1, ND2, F) \
   R \
@@ -564,7 +564,7 @@
   DMDM_BIN_OP (R, operator -, DM1, DM2, mx_inline_sub) \
   DMDM_BIN_OP (R, product,    DM1, DM2, mx_inline_mul)
 
-// scalar by N-d array min/max ops
+// scalar by N-D array min/max ops
 
 #define SND_MINMAX_FCN(FCN, OP, T, S) \
 T \