--- a/libinterp/corefcn/Cell.h	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/Cell.h	Mon Oct 28 19:51:46 2013 -0700
@@ -89,7 +89,7 @@
                const octave_value& fill_val = Matrix ());
 
   Cell reshape (const dim_vector& new_dims) const
-    { return Array<octave_value>::reshape (new_dims); }
+  { return Array<octave_value>::reshape (new_dims); }
 
   octave_idx_type nnz (void) const;
 
@@ -145,6 +145,6 @@
 
 template<>
 inline Cell octave_value_extract<Cell> (const octave_value& v)
-  { return v.cell_value (); }
+{ return v.cell_value (); }
 
 #endif

--- a/libinterp/corefcn/__contourc__.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/__contourc__.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -164,7 +164,7 @@
         }
 
       // Find stop edge.
-      // FIXME -- perhaps this should use a while loop?
+      // FIXME: perhaps this should use a while loop?
       for (unsigned int k = 1; k <= 4; k++)
         {
           if (start_edge == 0 || start_edge == 2)
@@ -298,7 +298,7 @@
 }
 
 DEFUN (__contourc__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels})\n\
 Undocumented internal function.\n\
 @end deftypefn")

--- a/libinterp/corefcn/__dispatch__.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/__dispatch__.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -40,7 +40,7 @@
 #include "variables.h"
 
 DEFUN (__dispatch__, args, nargout,
-  "Undocumented internal function")
+       "Undocumented internal function")
 {
   octave_value retval;
 

--- a/libinterp/corefcn/__lin_interpn__.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/__lin_interpn__.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -268,7 +268,7 @@
 //This function only performs linear interpolation.
 
 DEFUN (__lin_interpn__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{vi} =} __lin_interpn__ (@var{x1}, @var{x2}, @dots{}, @var{xn}, @var{v}, @var{y1}, @var{y2}, @dots{}, @var{yn})\n\
 Undocumented internal function.\n\
 @end deftypefn")

--- a/libinterp/corefcn/__pchip_deriv__.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -51,7 +51,7 @@
 // for piecewise polynomials.
 
 DEFUN (__pchip_deriv__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __pchip_deriv__ (@var{x}, @var{y}, @var{dim})\n\
 Undocumented internal function.\n\
 @end deftypefn")

--- a/libinterp/corefcn/__qp__.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/__qp__.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -230,7 +230,7 @@
 
           octave_idx_type dimZ = n - rank;
 
-          // FIXME -- still remain to handle the case of
+          // FIXME: still remain to handle the case of
           // non-full rank active set matrix.
 
           // Computing the Y matrix (orthogonal to Z)
@@ -480,7 +480,7 @@
 }
 
 DEFUN (__qp__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{x}, @var{lambda}, @var{info}, @var{iter}] =} __qp__ (@var{x0}, @var{H}, @var{q}, @var{Aeq}, @var{beq}, @var{Ain}, @var{bin}, @var{maxit})\n\
 Undocumented internal function.\n\
 @end deftypefn")

--- a/libinterp/corefcn/balance.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/balance.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -47,7 +47,7 @@
 #include "utils.h"
 
 DEFUN (balance, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{AA} =} balance (@var{A})\n\
 @deftypefnx {Built-in Function} {@var{AA} =} balance (@var{A}, @var{opt})\n\
 @deftypefnx {Built-in Function} {[@var{DD}, @var{AA}] =} balance (@var{A}, @var{opt})\n\
@@ -110,11 +110,11 @@
       return retval;
     }
 
-  bool isfloat = args(0).is_single_type () ||
-    (! AEPcase && args(1).is_single_type ());
+  bool isfloat = args(0).is_single_type ()
+                 || (! AEPcase && args(1).is_single_type ());
 
-  bool complex_case = (args(0).is_complex_type () ||
-                       (! AEPcase && args(1).is_complex_type ()));
+  bool complex_case = args(0).is_complex_type ()
+                      || (! AEPcase && args(1).is_complex_type ());
 
   // Extract argument 1 parameter for both AEP and GEP.
   Matrix aa;

--- a/libinterp/corefcn/besselj.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/besselj.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -128,7 +128,8 @@
                     }
                   else
                     {
-                      FloatComplexNDArray x = x_arg.float_complex_array_value ();
+                      FloatComplexNDArray x
+                        = x_arg.float_complex_array_value ();
 
                       if (! error_state)
                         {
@@ -211,7 +212,8 @@
                         }
                       else
                         {
-                          FloatComplexNDArray x = x_arg.float_complex_array_value ();
+                          FloatComplexNDArray x
+                            = x_arg.float_complex_array_value ();
 
                           if (! error_state)
                             {
@@ -377,7 +379,7 @@
 }
 
 DEFUN (besselj, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {[@var{j}, @var{ierr}] =} besselj (@var{alpha}, @var{x}, @var{opt})\n\
 @deftypefnx {Built-in Function} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
 @deftypefnx {Built-in Function} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
@@ -451,7 +453,7 @@
 }
 
 DEFUN (bessely, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
@@ -460,7 +462,7 @@
 }
 
 DEFUN (besseli, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
@@ -469,7 +471,7 @@
 }
 
 DEFUN (besselk, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{k}, @var{ierr}] =} besselk (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
@@ -478,7 +480,7 @@
 }
 
 DEFUN (besselh, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{h}, @var{ierr}] =} besselh (@var{alpha}, @var{k}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
@@ -522,7 +524,7 @@
 }
 
 DEFUN (airy, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{a}, @var{ierr}] =} airy (@var{k}, @var{z}, @var{opt})\n\
 Compute Airy functions of the first and second kind, and their\n\
 derivatives.\n\

--- a/libinterp/corefcn/betainc.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/betainc.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -36,7 +36,7 @@
 //        be placed elsewhere in the Octave code hierarchy.
 
 DEFUN (betainc, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} betainc (@var{x}, @var{a}, @var{b})\n\
 Return the regularized incomplete Beta function,\n\
 @tex\n\
@@ -330,7 +330,7 @@
 */
 
 DEFUN (betaincinv, args, ,
-    "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} betaincinv (@var{y}, @var{a}, @var{b})\n\
 Compute the inverse of the incomplete Beta function, i.e., @var{x} such that\n\
 \n\

--- a/libinterp/corefcn/bitfcns.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/bitfcns.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -48,26 +48,26 @@
 #include <functional>
 
 #if !defined (HAVE_CXX_BITWISE_OP_TEMPLATES)
-namespace std 
+namespace std
 {
   template <typename T>
-  struct bit_and 
+  struct bit_and
   {
-  public: 
+  public:
     T operator() (const T & op1, const T & op2) const { return (op1 & op2); }
   };
 
   template <typename T>
-  struct bit_or 
+  struct bit_or
   {
-  public: 
+  public:
     T operator() (const T & op1, const T & op2) const { return (op1 | op2); }
   };
 
   template <typename T>
-  struct bit_xor 
+  struct bit_xor
   {
-  public: 
+  public:
     T operator() (const T & op1, const T & op2) const { return (op1 ^ op2); }
   };
 }
@@ -345,7 +345,7 @@
 }
 
 DEFUN (bitand, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} bitand (@var{x}, @var{y})\n\
 Return the bitwise AND of non-negative integers.\n\
 @var{x}, @var{y} must be in the range [0,bitmax]\n\
@@ -356,7 +356,7 @@
 }
 
 DEFUN (bitor, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} bitor (@var{x}, @var{y})\n\
 Return the bitwise OR of non-negative integers.\n\
 @var{x}, @var{y} must be in the range [0,bitmax]\n\
@@ -367,7 +367,7 @@
 }
 
 DEFUN (bitxor, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} bitxor (@var{x}, @var{y})\n\
 Return the bitwise XOR of non-negative integers.\n\
 @var{x}, @var{y} must be in the range [0,bitmax]\n\
@@ -496,7 +496,7 @@
   while (0)
 
 DEFUN (bitshift, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} bitshift (@var{a}, @var{k})\n\
 @deftypefnx {Built-in Function} {} bitshift (@var{a}, @var{k}, @var{n})\n\
 Return a @var{k} bit shift of @var{n}-digit unsigned\n\
@@ -543,7 +543,7 @@
         {
           if (nargin == 3)
             {
-              // FIXME -- for compatibility, we should accept an array
+              // FIXME: for compatibility, we should accept an array
               // or a scalar as the third argument.
               if (args(2).numel () > 1)
                 error ("bitshift: N must be a scalar integer");
@@ -583,27 +583,32 @@
         DO_SBITSHIFT (int64, nbits < 64 ? nbits : 64);
       else if (cname == "double")
         {
-          static const int bits_in_mantissa = std::numeric_limits<double>::digits;
+          static const int bits_in_mantissa
+            = std::numeric_limits<double>::digits;
+
           nbits = (nbits < bits_in_mantissa ? nbits : bits_in_mantissa);
           int64_t mask = max_mantissa_value<double> ();
           if (nbits < bits_in_mantissa)
             mask = mask >> (bits_in_mantissa - nbits);
           else if (nbits < 1)
             mask = 0;
-          int bits_in_type = sizeof (double) * std::numeric_limits<unsigned char>::digits;
+          int bits_in_type = sizeof (double)
+                             * std::numeric_limits<unsigned char>::digits;
           NDArray m = m_arg.array_value ();
           DO_BITSHIFT ( );
         }
       else if (cname == "single")
         {
-          static const int bits_in_mantissa = std::numeric_limits<float>::digits;
+          static const int bits_in_mantissa
+            = std::numeric_limits<float>::digits;
           nbits = (nbits < bits_in_mantissa ? nbits : bits_in_mantissa);
           int64_t mask = max_mantissa_value<float> ();
           if (nbits < bits_in_mantissa)
             mask = mask >> (bits_in_mantissa - nbits);
           else if (nbits < 1)
             mask = 0;
-          int bits_in_type = sizeof (float) * std::numeric_limits<unsigned char>::digits;
+          int bits_in_type = sizeof (float)
+                             * std::numeric_limits<unsigned char>::digits;
           FloatNDArray m = m_arg.float_array_value ();
           DO_BITSHIFT (Float);
         }
@@ -617,7 +622,7 @@
 }
 
 DEFUN (bitmax, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} bitmax ()\n\
 @deftypefnx {Built-in Function} {} bitmax (\"double\")\n\
 @deftypefnx {Built-in Function} {} bitmax (\"single\")\n\
@@ -652,7 +657,7 @@
 }
 
 DEFUN (flintmax, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} flintmax ()\n\
 @deftypefnx {Built-in Function} {} flintmax (\"double\")\n\
 @deftypefnx {Built-in Function} {} flintmax (\"single\")\n\
@@ -687,7 +692,7 @@
 }
 
 DEFUN (intmax, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} intmax (@var{type})\n\
 Return the largest integer that can be represented in an integer type.\n\
 The variable @var{type} can be\n\
@@ -757,7 +762,7 @@
 }
 
 DEFUN (intmin, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} intmin (@var{type})\n\
 Return the smallest integer that can be represented in an integer type.\n\
 The variable @var{type} can be\n\
@@ -827,7 +832,7 @@
 }
 
 DEFUN (sizemax, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} sizemax ()\n\
 Return the largest value allowed for the size of an array.\n\
 If Octave is compiled with 64-bit indexing, the result is of class int64,\n\

--- a/libinterp/corefcn/bsxfun.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/bsxfun.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -89,7 +89,8 @@
   return bsxfun_builtin_unknown;
 }
 
-typedef octave_value (*bsxfun_handler) (const octave_value&, const octave_value&);
+typedef octave_value (*bsxfun_handler) (const octave_value&,
+                                        const octave_value&);
 
 // Static table of handlers.
 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types];
@@ -112,7 +113,8 @@
   return octave_value (bsxfun_rel (xa, ya));
 }
 
-// Pow needs a special handler for reals because of the potentially complex result.
+// pow() needs a special handler for reals
+// because of the potentially complex result.
 template <class NDA, class CNDA>
 static octave_value
 do_bsxfun_real_pow (const octave_value& x, const octave_value& y)
@@ -172,8 +174,10 @@
   bsxfun_handler_table[bsxfun_builtin_power][btyp_float] =
     do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>;
 
-  REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray, bsxfun_pow);
-  REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_float_complex, FloatComplexNDArray, bsxfun_pow);
+  REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray,
+                       bsxfun_pow);
+  REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_float_complex,
+                       FloatComplexNDArray, bsxfun_pow);
 
   // For chars, we want just relational handlers.
   REGISTER_REL_HANDLER (bsxfun_builtin_eq, btyp_char, charNDArray, bsxfun_eq);
@@ -273,7 +277,7 @@
 }
 
 #if 0
-// FIXME -- this function is not used; is it OK to delete it?
+// FIXME: this function is not used; is it OK to delete it?
 static void
 update_index (octave_value_list& idx, const dim_vector& dv, octave_idx_type i)
 {
@@ -310,7 +314,7 @@
 }
 
 DEFUN (bsxfun, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} bsxfun (@var{f}, @var{A}, @var{B})\n\
 The binary singleton expansion function applier performs broadcasting,\n\
 that is, applies a binary function @var{f} element-by-element to two\n\
@@ -343,23 +347,26 @@
           if (func.is_undefined ())
             error ("bsxfun: invalid function name: %s", name.c_str ());
         }
-      else if (! (args(0).is_function_handle () || args(0).is_inline_function ()))
+      else if (! (args(0).is_function_handle ()
+               || args(0).is_inline_function ()))
         error ("bsxfun: F must be a string or function handle");
 
       const octave_value A = args (1);
       const octave_value B = args (2);
 
       if (func.is_builtin_function ()
-          || (func.is_function_handle () && ! A.is_object () && ! B.is_object ()))
+          || (func.is_function_handle ()
+              && ! A.is_object () && ! B.is_object ()))
         {
-          // This may break if the default behavior is overriden. But if you override
-          // arithmetic operators for builtin classes, you should expect mayhem
-          // anyway (constant folding etc). Querying is_overloaded may not be
-          // exactly what we need here.
+          // This may break if the default behavior is overriden.  But if you
+          // override arithmetic operators for builtin classes, you should
+          // expect mayhem anyway (constant folding etc).  Querying
+          // is_overloaded() may not be exactly what we need here.
           octave_function *fcn_val = func.function_value ();
           if (fcn_val)
             {
-              octave_value tmp = maybe_optimized_builtin (fcn_val->name (), A, B);
+              octave_value tmp = maybe_optimized_builtin (fcn_val->name (),
+                                                          A, B);
               if (tmp.is_defined ())
                 retval(0) = tmp;
             }
@@ -374,7 +381,7 @@
           octave_idx_type nd = nda;
 
           if (nda > ndb)
-              dvb.resize (nda, 1);
+            dvb.resize (nda, 1);
           else if (nda < ndb)
             {
               dva.resize (ndb, 1);
@@ -395,8 +402,10 @@
               dvc.resize (nd);
 
               for (octave_idx_type i = 0; i < nd; i++)
-                dvc (i) = (dva (i) < 1  ? dva (i) : (dvb (i) < 1 ? dvb (i) :
-                      (dva (i) > dvb (i) ? dva (i) : dvb (i))));
+                dvc (i) = (dva (i) < 1 ? dva (i)
+                                       : (dvb (i) < 1 ? dvb (i)
+                                                      : (dva (i) > dvb (i)
+                                                        ? dva (i) : dvb (i))));
 
               if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1)
                 {
@@ -453,7 +462,8 @@
                       if (maybe_update_column (Bc, B, dvb, dvc, i, idxB))
                         inputs (1) = Bc;
 
-                      octave_value_list tmp = func.do_multi_index_op (1, inputs);
+                      octave_value_list tmp = func.do_multi_index_op (1,
+                                                                      inputs);
 
                       if (error_state)
                         break;
@@ -493,7 +503,8 @@
                                   if (tmp(0).is_real_type ())
                                     {
                                       have_FloatNDArray = true;
-                                      result_FloatNDArray = tmp(0).float_array_value ();
+                                      result_FloatNDArray
+                                        = tmp(0).float_array_value ();
                                       result_FloatNDArray.resize (dvc);
                                     }
                                   else
@@ -571,7 +582,8 @@
                                   result_FloatComplexNDArray =
                                     FloatComplexNDArray (result_FloatNDArray);
                                   result_FloatComplexNDArray.insert
-                                    (tmp(0).float_complex_array_value (), ra_idx);
+                                    (tmp(0).float_complex_array_value (),
+                                     ra_idx);
                                   have_FloatNDArray = false;
                                   have_FloatComplexNDArray = true;
                                 }

--- a/libinterp/corefcn/c-file-ptr-stream.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/c-file-ptr-stream.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -45,7 +45,7 @@
   buf_close ();
 }
 
-// FIXME -- I'm sure there is room for improvement here...
+// FIXME: I'm sure there is room for improvement here...
 
 c_file_ptr_buf::int_type
 c_file_ptr_buf::overflow (int_type c)
@@ -92,8 +92,8 @@
 c_file_ptr_buf::pbackfail (int_type c)
 {
 #if defined (CXX_ISO_COMPLIANT_LIBRARY)
-  return (c != traits_type::eof () && f) ? ungetc (c, f) :
-    traits_type::not_eof (c);
+  return (c != traits_type::eof () && f) ? ungetc (c, f)
+                                         : traits_type::not_eof (c);
 #else
   return (c != EOF && f) ? ungetc (c, f) : EOF;
 #endif
@@ -217,7 +217,7 @@
   buf_close ();
 }
 
-// FIXME -- I'm sure there is room for improvement here...
+// FIXME: I'm sure there is room for improvement here...
 
 c_zfile_ptr_buf::int_type
 c_zfile_ptr_buf::overflow (int_type c)
@@ -264,8 +264,8 @@
 c_zfile_ptr_buf::pbackfail (int_type c)
 {
 #if defined (CXX_ISO_COMPLIANT_LIBRARY)
-  return (c != traits_type::eof () && f) ? gzungetc (c, f) :
-    traits_type::not_eof (c);
+  return (c != traits_type::eof () && f) ? gzungetc (c, f)
+                                         : traits_type::not_eof (c);
 #else
   return (c != EOF && f) ? gzungetc (c, f) : EOF;
 #endif
@@ -336,7 +336,7 @@
 int
 c_zfile_ptr_buf::flush (void)
 {
-  // FIXME -- do we need something more complex here, passing
+  // FIXME: do we need something more complex here, passing
   // something other than 0 for the second argument to gzflush and
   // checking the return value, etc.?
 

--- a/libinterp/corefcn/c-file-ptr-stream.h	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/c-file-ptr-stream.h	Mon Oct 28 19:51:46 2013 -0700
@@ -44,7 +44,7 @@
 
   c_file_ptr_buf (FILE *f_arg, close_fcn cf_arg = file_close)
     : std::streambuf (), f (f_arg), cf (cf_arg)
-    { }
+  { }
 
   ~c_file_ptr_buf (void);
 
@@ -99,8 +99,7 @@
   c_file_ptr_buf& operator = (const c_file_ptr_buf&);
 };
 
-// FIXME -- the following three classes could probably share
-// some code...
+// FIXME: the following three classes could probably share some code...
 
 template <typename STREAM_T, typename FILE_T, typename BUF_T>
 class
@@ -118,7 +117,7 @@
   void stream_close (void) { if (buf) buf->buf_close (); }
 
   int seek (off_t offset, int origin)
-    { return buf ? buf->seek (offset, origin) : -1; }
+  { return buf ? buf->seek (offset, origin) : -1; }
 
   off_t tell (void) { return buf ? buf->tell () : -1; }
 
@@ -135,9 +134,12 @@
   c_file_ptr_stream& operator = (const c_file_ptr_stream&);
 };
 
-typedef c_file_ptr_stream<std::istream, FILE *, c_file_ptr_buf> i_c_file_ptr_stream;
-typedef c_file_ptr_stream<std::ostream, FILE *, c_file_ptr_buf> o_c_file_ptr_stream;
-typedef c_file_ptr_stream<std::iostream, FILE *, c_file_ptr_buf> io_c_file_ptr_stream;
+typedef c_file_ptr_stream<std::istream, FILE *, c_file_ptr_buf>
+  i_c_file_ptr_stream;
+typedef c_file_ptr_stream<std::ostream, FILE *, c_file_ptr_buf>
+  o_c_file_ptr_stream;
+typedef c_file_ptr_stream<std::iostream, FILE *, c_file_ptr_buf>
+  io_c_file_ptr_stream;
 
 #ifdef HAVE_ZLIB
 
@@ -162,7 +164,7 @@
 
   c_zfile_ptr_buf (gzFile f_arg, close_fcn cf_arg = file_close)
     : std::streambuf (), f (f_arg), cf (cf_arg)
-    { }
+  { }
 
   ~c_zfile_ptr_buf (void);
 
@@ -193,7 +195,7 @@
   int file_number () const { return -1; }
 
   int seek (off_t offset, int origin)
-    { return f ? gzseek (f, offset, origin) >= 0 : -1; }
+  { return f ? gzseek (f, offset, origin) >= 0 : -1; }
 
   off_t tell (void) { return f ? gztell (f) : -1; }
 
@@ -218,9 +220,12 @@
   c_zfile_ptr_buf& operator = (const c_zfile_ptr_buf&);
 };
 
-typedef c_file_ptr_stream<std::istream, gzFile, c_zfile_ptr_buf> i_c_zfile_ptr_stream;
-typedef c_file_ptr_stream<std::ostream, gzFile, c_zfile_ptr_buf> o_c_zfile_ptr_stream;
-typedef c_file_ptr_stream<std::iostream, gzFile, c_zfile_ptr_buf> io_c_zfile_ptr_stream;
+typedef c_file_ptr_stream<std::istream, gzFile, c_zfile_ptr_buf>
+  i_c_zfile_ptr_stream;
+typedef c_file_ptr_stream<std::ostream, gzFile, c_zfile_ptr_buf>
+  o_c_zfile_ptr_stream;
+typedef c_file_ptr_stream<std::iostream, gzFile, c_zfile_ptr_buf>
+  io_c_zfile_ptr_stream;
 
 #endif
 

--- a/libinterp/corefcn/cellfun.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/cellfun.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -70,13 +70,15 @@
                  octave_value& error_handler)
 {
   octave_value_list tmp;
-  try {
-    tmp = func.do_multi_index_op (nargout, inputlist);
-  }
-  catch (octave_execution_exception) {
-    if (error_handler.is_defined ())
-      error_state = 1;
-  }
+  try
+    {
+      tmp = func.do_multi_index_op (nargout, inputlist);
+    }
+  catch (octave_execution_exception)
+    {
+      if (error_handler.is_defined ())
+        error_state = 1;
+    }
 
   if (error_state)
     {
@@ -85,7 +87,9 @@
           octave_scalar_map msg;
           msg.assign ("identifier", last_error_id ());
           msg.assign ("message", last_error_message ());
-          msg.assign ("index", static_cast<double> (count + static_cast<octave_idx_type>(1)));
+          msg.assign ("index",
+                      static_cast<double> (count
+                                           + static_cast<octave_idx_type>(1)));
 
           octave_value_list errlist = inputlist;
           errlist.prepend (msg);
@@ -264,7 +268,7 @@
 }
 
 DEFUN (cellfun, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} cellfun (@var{name}, @var{C})\n\
 @deftypefnx {Built-in Function} {} cellfun (\"size\", @var{C}, @var{k})\n\
 @deftypefnx {Built-in Function} {} cellfun (\"isclass\", @var{C}, @var{class})\n\
@@ -1038,7 +1042,7 @@
 // handle the nargout = 0 case.
 
 DEFUN (arrayfun, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Function File} {} arrayfun (@var{func}, @var{A})\n\
 @deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A})\n\
 @deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A}, @var{b}, @dots{})\n\
@@ -1156,7 +1160,7 @@
 
   if (nargin < 2)
     {
-      error_with_id ("Octave:invalid-fun-call", 
+      error_with_id ("Octave:invalid-fun-call",
                      "arrayfun: function requires at least 2 arguments");
       print_usage ();
       return retval;
@@ -1230,7 +1234,7 @@
 
       bool uniform_output = true;
       octave_value error_handler;
-      
+
       get_mapper_fun_options (args, nargin, uniform_output, error_handler);
 
       if (error_state)
@@ -1268,7 +1272,7 @@
                 {
                   if (mask[i] && inputs[i].dims () != fdims)
                     {
-                      error_with_id ("Octave:invalid-input-arg", 
+                      error_with_id ("Octave:invalid-input-arg",
                                      "arrayfun: dimensions mismatch");
                       return retval;
                     }
@@ -1316,7 +1320,7 @@
 
               if (nargout > 0 && tmp.length () < nargout)
                 {
-                  error_with_id ("Octave:invalid-fun-call", 
+                  error_with_id ("Octave:invalid-fun-call",
                                  "arrayfun: function returned fewer than nargout values");
                   return retval;
                 }
@@ -1429,7 +1433,7 @@
 
               if (nargout > 0 && tmp.length () < nargout)
                 {
-                  error_with_id ("Octave:invalid-fun-call", 
+                  error_with_id ("Octave:invalid-fun-call",
                                  "arrayfun: function returned fewer than nargout values");
                   return retval;
                 }
@@ -1461,7 +1465,7 @@
         }
     }
   else
-    error_with_id ("Octave:invalid-fun-call", 
+    error_with_id ("Octave:invalid-fun-call",
                    "arrayfun: argument NAME must be a string or function handle");
 
   return retval;
@@ -1776,7 +1780,7 @@
     }
 }
 
-// FIXME -- this is a mess, but if a size method for the object exists,
+// FIXME: this is a mess, but if a size method for the object exists,
 // we have to call it to get the size of the object instead of using the
 // internal dims method.
 
@@ -1802,7 +1806,7 @@
 {
   Cell retval;
 
-  // FIXME -- this copy is only needed because the octave_value::size
+  // FIXME: this copy is only needed because the octave_value::size
   // method is not const.
   octave_value array = obj;
 
@@ -1838,7 +1842,7 @@
 }
 
 DEFUN (num2cell, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{C} =} num2cell (@var{A})\n\
 @deftypefnx {Built-in Function} {@var{C} =} num2cell (@var{A}, @var{dim})\n\
 Convert the numeric matrix @var{A} to a cell array.  If @var{dim} is\n\
@@ -2167,7 +2171,7 @@
 }
 
 DEFUN (mat2cell, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{m}, @var{n})\n\
 @deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{d1}, @var{d2}, @dots{})\n\
 @deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{r})\n\
@@ -2247,7 +2251,8 @@
         case btyp_complex:
           {
             if (sparse)
-              retval = do_mat2cell_2d (a.sparse_complex_matrix_value (), d, nargin-1);
+              retval = do_mat2cell_2d (a.sparse_complex_matrix_value (), d,
+                                       nargin-1);
             else
               retval = do_mat2cell (a.complex_array_value (), d, nargin - 1);
             break;
@@ -2337,7 +2342,7 @@
 }
 
 DEFUN (cellslices, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{sl} =} cellslices (@var{x}, @var{lb}, @var{ub}, @var{dim})\n\
 Given an array @var{x}, this function produces a cell array of slices from\n\
 the array determined by the index vectors @var{lb}, @var{ub}, for lower and\n\
@@ -2385,41 +2390,55 @@
                 {
                   // specialize for some dense arrays.
                   if (x.is_bool_type ())
-                    retcell = do_cellslices_nda (x.bool_array_value (), lb, ub, dim);
+                    retcell = do_cellslices_nda (x.bool_array_value (),
+                                                 lb, ub, dim);
                   else if (x.is_char_matrix ())
-                    retcell = do_cellslices_nda (x.char_array_value (), lb, ub, dim);
+                    retcell = do_cellslices_nda (x.char_array_value (),
+                                                 lb, ub, dim);
                   else if (x.is_integer_type ())
                     {
                       if (x.is_int8_type ())
-                        retcell = do_cellslices_nda (x.int8_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.int8_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_int16_type ())
-                        retcell = do_cellslices_nda (x.int16_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.int16_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_int32_type ())
-                        retcell = do_cellslices_nda (x.int32_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.int32_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_int64_type ())
-                        retcell = do_cellslices_nda (x.int64_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.int64_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_uint8_type ())
-                        retcell = do_cellslices_nda (x.uint8_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.uint8_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_uint16_type ())
-                        retcell = do_cellslices_nda (x.uint16_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.uint16_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_uint32_type ())
-                        retcell = do_cellslices_nda (x.uint32_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.uint32_array_value (),
+                                                     lb, ub, dim);
                       else if (x.is_uint64_type ())
-                        retcell = do_cellslices_nda (x.uint64_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.uint64_array_value (),
+                                                     lb, ub, dim);
                     }
                   else if (x.is_complex_type ())
                     {
                       if (x.is_single_type ())
-                        retcell = do_cellslices_nda (x.float_complex_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.float_complex_array_value (),
+                                                     lb, ub, dim);
                       else
-                        retcell = do_cellslices_nda (x.complex_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.complex_array_value (),
+                                                     lb, ub, dim);
                     }
                   else
                     {
                       if (x.is_single_type ())
-                        retcell = do_cellslices_nda (x.float_array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.float_array_value (),
+                                                     lb, ub, dim);
                       else
-                        retcell = do_cellslices_nda (x.array_value (), lb, ub, dim);
+                        retcell = do_cellslices_nda (x.array_value (),
+                                                     lb, ub, dim);
                     }
                 }
               else
@@ -2458,7 +2477,7 @@
 */
 
 DEFUN (cellindexmat, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{y} =} cellindexmat (@var{x}, @var{varargin})\n\
 Given a cell array of matrices @var{x}, this function computes\n\
 \n\

--- a/libinterp/corefcn/colloc.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/colloc.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -35,7 +35,7 @@
 #include "utils.h"
 
 DEFUN (colloc, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{r}, @var{amat}, @var{bmat}, @var{q}] =} colloc (@var{n}, \"left\", \"right\")\n\
 Compute derivative and integral weight matrices for orthogonal\n\
 collocation using the subroutines given in J. Villadsen and\n\

--- a/libinterp/corefcn/comment-list.h	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/comment-list.h	Mon Oct 28 19:51:46 2013 -0700
@@ -56,15 +56,15 @@
     : txt (oc.txt), typ (oc.typ) { }
 
   octave_comment_elt& operator = (const octave_comment_elt& oc)
-    {
-      if (this != &oc)
-        {
-          txt = oc.txt;
-          typ = oc.typ;
-        }
+  {
+    if (this != &oc)
+      {
+        txt = oc.txt;
+        typ = oc.typ;
+      }
 
-      return *this;
-    }
+    return *this;
+  }
 
   std::string text (void) const { return txt; }
 
@@ -89,11 +89,11 @@
   octave_comment_list (void) { }
 
   void append (const octave_comment_elt& elt)
-    { octave_base_list<octave_comment_elt>::append (elt); }
+  { octave_base_list<octave_comment_elt>::append (elt); }
 
   void append (const std::string& s,
                octave_comment_elt::comment_type t = octave_comment_elt::unknown)
-    { append (octave_comment_elt (s, t)); }
+  { append (octave_comment_elt (s, t)); }
 
   octave_comment_list *dup (void) const;
 };

--- a/libinterp/corefcn/conv2.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/conv2.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -35,7 +35,7 @@
 enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID };
 
 DEFUN (conv2, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} conv2 (@var{A}, @var{B})\n\
 @deftypefnx {Built-in Function} {} conv2 (@var{v1}, @var{v2}, @var{m})\n\
 @deftypefnx {Built-in Function} {} conv2 (@dots{}, @var{shape})\n\
@@ -72,8 +72,8 @@
 
   if (nargin < 2)
     {
-     print_usage ();
-     return retval;
+      print_usage ();
+      return retval;
     }
   else if (nargin == 3)
     {
@@ -109,7 +109,7 @@
 
   if (separable)
     {
-     // If user requests separable, check first two params are vectors
+      // If user requests separable, check first two params are vectors
 
       if (! (1 == args(0).rows () || 1 == args(0).columns ())
           || ! (1 == args(1).rows () || 1 == args(1).columns ()))
@@ -291,7 +291,7 @@
 */
 
 DEFUN (convn, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{C} =} convn (@var{A}, @var{B})\n\
 @deftypefnx {Built-in Function} {@var{C} =} convn (@var{A}, @var{B}, @var{shape})\n\
 Return the n-D convolution of @var{A} and @var{B}.  The size of the result\n\
@@ -323,8 +323,8 @@
 
   if (nargin < 2 || nargin > 3)
     {
-     print_usage ();
-     return retval;
+      print_usage ();
+      return retval;
     }
   else if (nargin == 3)
     {

--- a/libinterp/corefcn/daspk.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/daspk.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -171,7 +171,7 @@
   while (0)
 
 DEFUN (daspk, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} daspk (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
 Solve the set of differential-algebraic equations\n\
 @tex\n\
@@ -310,7 +310,7 @@
                   fname.append (fcn_name);
                   fname.append (" (x, xdot, t) y = ");
                   daspk_fcn = extract_function
-                    (c(0), "daspk", fcn_name, fname, "; endfunction");
+                              (c(0), "daspk", fcn_name, fname, "; endfunction");
                 }
 
               if (daspk_fcn)
@@ -323,8 +323,8 @@
                       jname = "function jac = ";
                       jname.append (jac_name);
                       jname.append (" (x, xdot, t, cj) jac = ");
-                      daspk_jac = extract_function
-                        (c(1), "daspk", jac_name, jname, "; endfunction");
+                      daspk_jac = extract_function (c(1), "daspk", jac_name,
+                                                    jname, "; endfunction");
 
                       if (!daspk_jac)
                         {
@@ -354,8 +354,8 @@
                       fname = "function y = ";
                       fname.append (fcn_name);
                       fname.append (" (x, xdot, t) y = ");
-                      daspk_fcn = extract_function
-                        (f_arg, "daspk", fcn_name, fname, "; endfunction");
+                      daspk_fcn = extract_function (f_arg, "daspk", fcn_name,
+                                                    fname, "; endfunction");
                     }
                   while (0);
                   break;
@@ -370,8 +370,8 @@
                         fname = "function y = ";
                         fname.append (fcn_name);
                         fname.append (" (x, xdot, t) y = ");
-                        daspk_fcn = extract_function
-                          (tmp(0), "daspk", fcn_name, fname, "; endfunction");
+                        daspk_fcn = extract_function (tmp(0), "daspk", fcn_name,
+                                                      fname, "; endfunction");
 
                         if (daspk_fcn)
                           {
@@ -379,9 +379,9 @@
                             jname = "function jac = ";
                             jname.append (jac_name);
                             jname.append (" (x, xdot, t, cj) jac = ");
-                            daspk_jac = extract_function
-                              (tmp(1), "daspk", jac_name, jname,
-                               "; endfunction");
+                            daspk_jac = extract_function (tmp(1), "daspk",
+                                                          jac_name, jname,
+                                                          "; endfunction");
 
                             if (!daspk_jac)
                               {

--- a/libinterp/corefcn/dasrt.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/dasrt.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -207,7 +207,7 @@
   while (0)
 
 DEFUN (dasrt, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {[@var{x}, @var{xdot}, @var{t_out}, @var{istat}, @var{msg}] =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t})\n\
 @deftypefnx {Built-in Function} {@dots{} =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t})\n\
 @deftypefnx {Built-in Function} {@dots{} =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
@@ -397,8 +397,8 @@
               fname = "function y = ";
               fname.append (fcn_name);
               fname.append (" (x, xdot, t) y = ");
-              dasrt_f = extract_function
-                (c(0), "dasrt", fcn_name, fname, "; endfunction");
+              dasrt_f = extract_function (c(0), "dasrt", fcn_name, fname,
+                                          "; endfunction");
             }
 
           if (dasrt_f)
@@ -411,8 +411,8 @@
                   jname = "function jac = ";
                   jname.append (jac_name);
                   jname.append (" (x, xdot, t, cj) jac = ");
-                  dasrt_j = extract_function
-                    (c(1), "dasrt", jac_name, jname, "; endfunction");
+                  dasrt_j = extract_function (c(1), "dasrt", jac_name, jname,
+                                              "; endfunction");
 
                   if (!dasrt_j)
                     {
@@ -440,8 +440,8 @@
               fname = "function y = ";
               fname.append (fcn_name);
               fname.append (" (x, xdot, t) y = ");
-              dasrt_f = extract_function
-                (f_arg, "dasrt", fcn_name, fname, "; endfunction");
+              dasrt_f = extract_function (f_arg, "dasrt", fcn_name, fname,
+                                          "; endfunction");
               break;
 
             case 2:
@@ -454,8 +454,8 @@
                     fname = "function y = ";
                     fname.append (fcn_name);
                     fname.append (" (x, xdot, t) y = ");
-                    dasrt_f = extract_function
-                      (tmp(0), "dasrt", fcn_name, fname, "; endfunction");
+                    dasrt_f = extract_function (tmp(0), "dasrt", fcn_name,
+                                                fname, "; endfunction");
 
                     if (dasrt_f)
                       {
@@ -463,8 +463,8 @@
                         jname = "function jac = ";
                         jname.append (jac_name);
                         jname.append (" (x, xdot, t, cj) jac = ");
-                        dasrt_j = extract_function
-                          (tmp(1), "dasrt", jac_name, jname, "; endfunction");
+                        dasrt_j = extract_function (tmp(1), "dasrt", jac_name,
+                                                    jname, "; endfunction");
 
                         if (! dasrt_j)
                           dasrt_f = 0;
@@ -517,14 +517,13 @@
   ColumnVector stateprime (args(argp++).vector_value ());
 
   if (error_state)
-    DASRT_ABORT2
-       ("expecting time derivative of state vector as argument %d", argp);
+    DASRT_ABORT2 ("expecting time derivative of state vector as argument %d",
+                  argp);
 
   ColumnVector out_times (args(argp++).vector_value ());
 
   if (error_state)
-    DASRT_ABORT2
-        ("expecting output time vector as %s argument %d", argp);
+    DASRT_ABORT2 ("expecting output time vector as %s argument %d", argp);
 
   double tzero = out_times (0);
 
@@ -537,8 +536,7 @@
       crit_times = ColumnVector (args(argp++).vector_value ());
 
       if (error_state)
-        DASRT_ABORT2
-          ("expecting critical time vector as argument %d", argp);
+        DASRT_ABORT2 ("expecting critical time vector as argument %d", argp);
 
       crit_times_set = true;
     }

--- a/libinterp/corefcn/dassl.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/dassl.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -171,7 +171,7 @@
   while (0)
 
 DEFUN (dassl, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} dassl (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
 Solve the set of differential-algebraic equations\n\
 @tex\n\
@@ -310,8 +310,8 @@
                   fname = "function y = ";
                   fname.append (fcn_name);
                   fname.append (" (x, xdot, t) y = ");
-                  dassl_fcn = extract_function
-                    (c(0), "dassl", fcn_name, fname, "; endfunction");
+                  dassl_fcn = extract_function (c(0), "dassl", fcn_name, fname,
+                                                "; endfunction");
                 }
 
               if (dassl_fcn)
@@ -320,19 +320,19 @@
                     dassl_jac = c(1).function_value ();
                   else
                     {
-                        jac_name = unique_symbol_name ("__dassl_jac__");
-                        jname = "function jac = ";
-                        jname.append (jac_name);
-                        jname.append (" (x, xdot, t, cj) jac = ");
-                        dassl_jac = extract_function
-                          (c(1), "dassl", jac_name, jname, "; endfunction");
+                      jac_name = unique_symbol_name ("__dassl_jac__");
+                      jname = "function jac = ";
+                      jname.append (jac_name);
+                      jname.append (" (x, xdot, t, cj) jac = ");
+                      dassl_jac = extract_function (c(1), "dassl", jac_name,
+                                                    jname, "; endfunction");
 
-                        if (!dassl_jac)
-                          {
-                            if (fcn_name.length ())
-                              clear_function (fcn_name);
-                            dassl_fcn = 0;
-                          }
+                      if (!dassl_jac)
+                        {
+                          if (fcn_name.length ())
+                            clear_function (fcn_name);
+                          dassl_fcn = 0;
+                        }
                     }
                 }
             }
@@ -355,8 +355,8 @@
                       fname = "function y = ";
                       fname.append (fcn_name);
                       fname.append (" (x, xdot, t) y = ");
-                      dassl_fcn = extract_function
-                        (f_arg, "dassl", fcn_name, fname, "; endfunction");
+                      dassl_fcn = extract_function (f_arg, "dassl", fcn_name,
+                                                    fname, "; endfunction");
                     }
                   while (0);
                   break;
@@ -371,8 +371,8 @@
                         fname = "function y = ";
                         fname.append (fcn_name);
                         fname.append (" (x, xdot, t) y = ");
-                        dassl_fcn = extract_function
-                          (tmp(0), "dassl", fcn_name, fname, "; endfunction");
+                        dassl_fcn = extract_function (tmp(0), "dassl", fcn_name,
+                                                      fname, "; endfunction");
 
                         if (dassl_fcn)
                           {
@@ -380,9 +380,9 @@
                             jname = "function jac = ";
                             jname.append (jac_name);
                             jname.append (" (x, xdot, t, cj) jac = ");
-                            dassl_jac = extract_function
-                              (tmp(1), "dassl", jac_name, jname,
-                               "; endfunction");
+                            dassl_jac = extract_function (tmp(1), "dassl",
+                                                          jac_name, jname,
+                                                          "; endfunction");
 
                             if (!dassl_jac)
                               {

--- a/libinterp/corefcn/data.cc	Mon Oct 28 21:04:48 2013 -0400
+++ b/libinterp/corefcn/data.cc	Mon Oct 28 19:51:46 2013 -0700
@@ -108,7 +108,7 @@
   return retval
 
 DEFUN (all, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} all (@var{x})\n\
 @deftypefnx {Built-in Function} {} all (@var{x}, @var{dim})\n\
 For a vector argument, return true (logical 1) if all elements of the vector\n\
@@ -155,7 +155,7 @@
 */
 
 DEFUN (any, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} any (@var{x})\n\
 @deftypefnx {Built-in Function} {} any (@var{x}, @var{dim})\n\
 For a vector argument, return true (logical 1) if any element of the vector\n\
@@ -211,7 +211,7 @@
 // These mapping functions may also be useful in other places, eh?
 
 DEFUN (atan2, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} atan2 (@var{y}, @var{x})\n\
 Compute atan (@var{y} / @var{x}) for corresponding elements of @var{y}\n\
 and @var{x}.  Signal an error if @var{y} and @var{x} do not match in size\n\
@@ -351,7 +351,7 @@
 }
 
 DEFUN (hypot, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} hypot (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} hypot (@var{x}, @var{y}, @var{z}, @dots{})\n\
 Compute the element-by-element square root of the sum of the squares of\n\
@@ -414,7 +414,7 @@
 }
 
 DEFUN (log2, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Mapping Function} {} log2 (@var{x})\n\
 @deftypefnx {Mapping Function} {[@var{f}, @var{e}] =} log2 (@var{x})\n\
 Compute the base-2 logarithm of each element of @var{x}.\n\
@@ -449,7 +449,7 @@
             {
               FloatNDArray f;
               FloatNDArray x = args(0).float_array_value ();
-              // FIXME -- should E be an int value?
+              // FIXME: should E be an int value?
               FloatMatrix e;
               map_2_xlog2 (x, f, e);
               retval(1) = e;
@@ -459,7 +459,7 @@
             {
               FloatComplexNDArray f;
               FloatComplexNDArray x = args(0).float_complex_array_value ();
-              // FIXME -- should E be an int value?
+              // FIXME: should E be an int value?
               FloatNDArray e;
               map_2_xlog2 (x, f, e);
               retval(1) = e;
@@ -470,7 +470,7 @@
         {
           NDArray f;
           NDArray x = args(0).array_value ();
-          // FIXME -- should E be an int value?
+          // FIXME: should E be an int value?
           Matrix e;
           map_2_xlog2 (x, f, e);
           retval(1) = e;
@@ -480,7 +480,7 @@
         {
           ComplexNDArray f;
           ComplexNDArray x = args(0).complex_array_value ();
-          // FIXME -- should E be an int value?
+          // FIXME: should E be an int value?
           NDArray e;
           map_2_xlog2 (x, f, e);
           retval(1) = e;
@@ -514,7 +514,7 @@
 */
 
 DEFUN (rem, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Mapping Function} {} rem (@var{x}, @var{y})\n\
 @deftypefnx {Mapping Function} {} fmod (@var{x}, @var{y})\n\
 Return the remainder of the division @code{@var{x} / @var{y}}, computed\n\
@@ -577,7 +577,8 @@
             }
           else
             error ("rem: cannot combine %s and %d",
-                   args(0).class_name ().c_str (), args(1).class_name ().c_str ());
+                   args(0).class_name ().c_str (),
+                   args(1).class_name ().c_str ());
         }
       else if (args(0).is_single_type () || args(1).is_single_type ())
         {
@@ -643,7 +644,7 @@
 DEFALIAS (fmod, rem)
 
 DEFUN (mod, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} mod (@var{x}, @var{y})\n\
 Compute the modulo of @var{x} and @var{y}.  Conceptually this is given by\n\
 \n\
@@ -710,7 +711,8 @@
             }
           else
             error ("mod: cannot combine %s and %d",
-                   args(0).class_name ().c_str (), args(1).class_name ().c_str ());
+                   args(0).class_name ().c_str (),
+                   args(1).class_name ().c_str ());
         }
       else if (args(0).is_single_type () || args(1).is_single_type ())
         {
@@ -793,7 +795,7 @@
 %!assert (mod (2.1, 0.2), 0.1, eps)
 */
 
-// FIXME: Need to convert the reduction functions of this file for single precision
+// FIXME: Need to convert reduction functions of this file for single precision
 
 #define NATIVE_REDUCTION_1(FCN, TYPE, DIM) \
   (arg.is_ ## TYPE ## _type ()) \
@@ -852,7 +854,8 @@
                     } \
                   else \
                     { \
-                      SparseComplexMatrix tmp = arg.sparse_complex_matrix_value (); \
+                      SparseComplexMatrix tmp \
+                        = arg.sparse_complex_matrix_value (); \
                       \
                       if (! error_state) \
                         retval = tmp.FCN (dim); \
@@ -1024,7 +1027,8 @@
                     } \
                   else if (arg.is_single_type ()) \
                     { \
-                      FloatComplexNDArray tmp = arg.float_complex_array_value (); \
+                      FloatComplexNDArray tmp \
+                        = arg.float_complex_array_value (); \
  \
                       if (! error_state) \
                         retval = tmp.FCN (dim); \
@@ -1053,7 +1057,7 @@
   return retval
 
 DEFUN (cumprod, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} cumprod (@var{x})\n\
 @deftypefnx {Built-in Function} {} cumprod (@var{x}, @var{dim})\n\
 Cumulative product of elements along dimension @var{dim}.  If\n\
@@ -1086,7 +1090,7 @@
 */
 
 DEFUN (cumsum, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} cumsum (@var{x})\n\
 @deftypefnx {Built-in Function} {} cumsum (@var{x}, @var{dim})\n\
 @deftypefnx {Built-in Function} {} cumsum (@dots{}, \"native\")\n\
@@ -1235,7 +1239,7 @@
 */
 
 DEFUN (diag, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{M} =} diag (@var{v})\n\
 @deftypefnx {Built-in Function} {@var{M} =} diag (@var{v}, @var{k})\n\
 @deftypefnx {Built-in Function} {@var{M} =} diag (@var{v}, @var{m}, @var{n})\n\
@@ -1366,7 +1370,7 @@
 */
 
 DEFUN (prod, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} prod (@var{x})\n\
 @deftypefnx {Built-in Function} {} prod (@var{x}, @var{dim})\n\
 Product of elements along dimension @var{dim}.  If @var{dim} is\n\
@@ -1658,7 +1662,7 @@
       retval = octave_value (new octave_class (m, cname, parents));
     }
 
- done:
+done:
   return retval;
 }
 
@@ -1709,7 +1713,8 @@
             all_dq_strings_p = false;
           if (all_real_p && ! args(i).is_real_type ())
             all_real_p = false;
-          if (all_cmplx_p && ! (args(i).is_complex_type () || args(i).is_real_type ()))
+          if (all_cmplx_p && ! (args(i).is_complex_type ()
+              || args(i).is_real_type ()))
             all_cmplx_p = false;
           if (!any_sparse_p && args(i).is_sparse_type ())
             any_sparse_p = true;
@@ -1798,7 +1803,8 @@
           dim_vector  dv = args(0).dims ();
 
           // Default concatenation.
-          bool (dim_vector::*concat_rule) (const dim_vector&, int) = &dim_vector::concat;
+          bool (dim_vector::*concat_rule) (const dim_vector&, int)
+            = &dim_vector::concat;
 
           if (dim == -1 || dim == -2)
             {
@@ -2081,7 +2087,7 @@
 */
 
 DEFUN (vertcat, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} vertcat (@var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
 Return the vertical concatenation of N-D array objects, @var{array1},\n\
 @var{array2}, @dots{}, @var{arrayN} along dimension 1.\n\
@@ -2105,7 +2111,7 @@
 */
 
 DEFUN (cat, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} cat (@var{dim}, @var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
 Return the concatenation of N-D array objects, @var{array1},\n\
 @var{array2}, @dots{}, @var{arrayN} along dimension @var{dim}.\n\
@@ -2175,7 +2181,7 @@
 /*
 %!function ret = __testcat (t1, t2, tr, cmplx)
 %!  assert (cat (1, cast ([], t1), cast ([], t2)), cast ([], tr));
-%! 
+%!
 %!  assert (cat (1, cast (1, t1), cast (2, t2)), cast ([1; 2], tr));
 %!  assert (cat (1, cast (1, t1), cast ([2; 3], t2)), cast ([1; 2; 3], tr));
 %!  assert (cat (1, cast ([1; 2], t1), cast (3, t2)), cast ([1; 2; 3], tr));
@@ -2184,7 +2190,7 @@
 %!  assert (cat (2, cast (1, t1), cast ([2, 3], t2)), cast ([1, 2, 3], tr));
 %!  assert (cat (2, cast ([1, 2], t1), cast (3, t2)), cast ([1, 2, 3], tr));
 %!  assert (cat (2, cast ([1, 2], t1), cast ([3, 4], t2)), cast ([1, 2, 3, 4], tr));
-%! 
+%!
 %!  assert ([cast(1, t1); cast(2, t2)], cast ([1; 2], tr));
 %!  assert ([cast(1, t1); cast([2; 3], t2)], cast ([1; 2; 3], tr));
 %!  assert ([cast([1; 2], t1); cast(3, t2)], cast ([1; 2; 3], tr));
@@ -2193,7 +2199,7 @@
 %!  assert ([cast(1, t1), cast([2, 3], t2)], cast ([1, 2, 3], tr));
 %!  assert ([cast([1, 2], t1), cast(3, t2)], cast ([1, 2, 3], tr));
 %!  assert ([cast([1, 2], t1), cast([3, 4], t2)], cast ([1, 2, 3, 4], tr));
-%! 
+%!
 %!  if (nargin == 3 || cmplx)
 %!    assert (cat (1, cast (1i, t1), cast (2, t2)), cast ([1i; 2], tr));
 %!    assert (cat (1, cast (1i, t1), cast ([2; 3], t2)), cast ([1i; 2; 3], tr));
@@ -2203,7 +2209,7 @@
 %!    assert (cat (2, cast (1i, t1), cast ([2, 3], t2)), cast ([1i, 2, 3], tr));
 %!    assert (cat (2, cast ([1i, 2], t1), cast (3, t2)), cast ([1i, 2, 3], tr));
 %!    assert (cat (2, cast ([1i, 2], t1), cast ([3, 4], t2)), cast ([1i, 2, 3, 4], tr));
-%! 
+%!
 %!    assert ([cast(1i, t1); cast(2, t2)], cast ([1i; 2], tr));
 %!    assert ([cast(1i, t1); cast([2; 3], t2)], cast ([1i; 2; 3], tr));
 %!    assert ([cast([1i; 2], t1); cast(3, t2)], cast ([1i; 2; 3], tr));
@@ -2212,7 +2218,7 @@
 %!    assert ([cast(1i, t1), cast([2, 3], t2)], cast ([1i, 2, 3], tr));
 %!    assert ([cast([1i, 2], t1), cast(3, t2)], cast ([1i, 2, 3], tr));
 %!    assert ([cast([1i, 2], t1), cast([3, 4], t2)], cast ([1i, 2, 3, 4], tr));
-%! 
+%!
 %!    assert (cat (1, cast (1, t1), cast (2i, t2)), cast ([1; 2i], tr));
 %!    assert (cat (1, cast (1, t1), cast ([2i; 3], t2)), cast ([1; 2i; 3], tr));
 %!    assert (cat (1, cast ([1; 2], t1), cast (3i, t2)), cast ([1; 2; 3i], tr));
@@ -2221,7 +2227,7 @@
 %!    assert (cat (2, cast (1, t1), cast ([2i, 3], t2)), cast ([1, 2i, 3], tr));
 %!    assert (cat (2, cast ([1, 2], t1), cast (3i, t2)), cast ([1, 2, 3i], tr));
 %!    assert (cat (2, cast ([1, 2], t1), cast ([3i, 4], t2)), cast ([1, 2, 3i, 4], tr));
-%! 
+%!
 %!    assert ([cast(1, t1); cast(2i, t2)], cast ([1; 2i], tr));
 %!    assert ([cast(1, t1); cast([2i; 3], t2)], cast ([1; 2i; 3], tr));
 %!    assert ([cast([1; 2], t1); cast(3i, t2)], cast ([1; 2; 3i], tr));
@@ -2230,7 +2236,7 @@
 %!    assert ([cast(1, t1), cast([2i, 3], t2)], cast ([1, 2i, 3], tr));
 %!    assert ([cast([1, 2], t1), cast(3i, t2)], cast ([1, 2, 3i], tr));
 %!    assert ([cast([1, 2], t1), cast([3i, 4], t2)], cast ([1, 2, 3i, 4], tr));
-%! 
+%!
 %!    assert (cat (1, cast (1i, t1), cast (2i, t2)), cast ([1i; 2i], tr));
 %!    assert (cat (1, cast (1i, t1), cast ([2i; 3], t2)), cast ([1i; 2i; 3], tr));
 %!    assert (cat (1, cast ([1i; 2], t1), cast (3i, t2)), cast ([1i; 2; 3i], tr));
@@ -2239,7 +2245,7 @@
 %!    assert (cat (2, cast (1i, t1), cast ([2i, 3], t2)), cast ([1i, 2i, 3], tr));
 %!    assert (cat (2, cast ([1i, 2], t1), cast (3i, t2)), cast ([1i, 2, 3i], tr));
 %!    assert (cat (2, cast ([1i, 2], t1), cast ([3i, 4], t2)), cast ([1i, 2, 3i, 4], tr));
-%! 
+%!
 %!    assert ([cast(1i, t1); cast(2i, t2)], cast ([1i; 2i], tr));
 %!    assert ([cast(1i, t1); cast([2i; 3], t2)], cast ([1i; 2i; 3], tr));
 %!    assert ([cast([1i; 2], t1); cast(3i, t2)], cast ([1i; 2; 3i], tr));
@@ -2324,7 +2330,7 @@
     {
       Array<int> vec = args(1).int_vector_value ();
 
-      // FIXME -- maybe we should create an idx_vector object
+      // FIXME: maybe we should create an idx_vector object
       // here and pass that to permute?
 
       int n = vec.length ();
@@ -2344,7 +2350,7 @@
 }
 
 DEFUN (permute, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} permute (@var{A}, @var{perm})\n\
 Return the generalized transpose for an N-D array object @var{A}.\n\
 The permutation vector @var{perm} must contain the elements\n\
@@ -2356,7 +2362,7 @@
 }
 
 DEFUN (ipermute, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ipermute (@var{A}, @var{iperm})\n\
 The inverse of the @code{permute} function.  The expression\n\
 \n\
@@ -2373,7 +2379,7 @@
 }
 
 DEFUN (length, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} length (@var{a})\n\
 Return the length of the object @var{a}.\n\
 \n\
@@ -2395,7 +2401,7 @@
 }
 
 DEFUN (ndims, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ndims (@var{a})\n\
 Return the number of dimensions of @var{a}.\n\
 For any array, the result will always be larger than or equal to 2.\n\
@@ -2421,7 +2427,7 @@
 }
 
 DEFUN (numel, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} numel (@var{a})\n\
 @deftypefnx {Built-in Function} {} numel (@var{a}, @var{idx1}, @var{idx2}, @dots{})\n\
 Return the number of elements in the object @var{a}.\n\
@@ -2468,7 +2474,7 @@
 }
 
 DEFUN (size, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} size (@var{a})\n\
 @deftypefnx {Built-in Function} {} size (@var{a}, @var{dim})\n\
 Return the number of rows and columns of @var{a}.\n\
@@ -2559,7 +2565,7 @@
 }
 
 DEFUN (size_equal, args, ,
-   "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} size_equal (@var{a}, @var{b}, @dots{})\n\
 Return true if the dimensions of all arguments agree.\n\
 Trailing singleton dimensions are ignored.\n\
@@ -2593,7 +2599,7 @@
 }
 
 DEFUN (nnz, args, ,
-   "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{scalar} =} nnz (@var{a})\n\
 Return the number of non zero elements in @var{a}.\n\
 @seealso{sparse, nzmax}\n\
@@ -2610,7 +2616,7 @@
 }
 
 DEFUN (nzmax, args, ,
-   "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{scalar} =} nzmax (@var{SM})\n\
 Return the amount of storage allocated to the sparse matrix @var{SM}.\n\
 Note that Octave tends to crop unused memory at the first opportunity\n\
@@ -2631,7 +2637,7 @@
 }
 
 DEFUN (rows, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} rows (@var{a})\n\
 Return the number of rows of @var{a}.\n\
 @seealso{columns, size, length, numel, isscalar, isvector, ismatrix}\n\
@@ -2648,7 +2654,7 @@
 }
 
 DEFUN (columns, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} columns (@var{a})\n\
 Return the number of columns of @var{a}.\n\
 @seealso{rows, size, length, numel, isscalar, isvector, ismatrix}\n\
@@ -2665,7 +2671,7 @@
 }
 
 DEFUN (sum, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} sum (@var{x})\n\
 @deftypefnx {Built-in Function} {} sum (@var{x}, @var{dim})\n\
 @deftypefnx {Built-in Function} {} sum (@dots{}, \"native\")\n\
@@ -2795,7 +2801,7 @@
             MAKE_INT_BRANCH (uint32);
             MAKE_INT_BRANCH (uint64);
 #undef MAKE_INT_BRANCH
-            // GAGME: Accursed Matlab compatibility...
+              // GAGME: Accursed Matlab compatibility...
             case btyp_char:
               if (isextra)
                 retval = arg.array_value (true).xsum (dim);
@@ -2890,7 +2896,7 @@
 */
 
 DEFUN (sumsq, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} sumsq (@var{x})\n\
 @deftypefnx {Built-in Function} {} sumsq (@var{x}, @var{dim})\n\
 Sum of squares of elements along dimension @var{dim}.  If @var{dim}\n\
@@ -2929,7 +2935,7 @@
 */
 
 DEFUN (islogical, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} islogical (@var{x})\n\
 @deftypefnx {Built-in Function} {} isbool (@var{x})\n\
 Return true if @var{x} is a logical object.\n\
@@ -2963,7 +2969,7 @@
 */
 
 DEFUN (isinteger, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isinteger (@var{x})\n\
 Return true if @var{x} is an integer object (int8, uint8, int16, etc.).\n\
 Note that @w{@code{isinteger (14)}} is false because numeric constants in\n\
@@ -2982,7 +2988,7 @@
 }
 
 DEFUN (iscomplex, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} iscomplex (@var{x})\n\
 Return true if @var{x} is a complex-valued numeric object.\n\
 @seealso{isreal, isnumeric, islogical, ischar, isfloat, isa}\n\
@@ -2999,7 +3005,7 @@
 }
 
 DEFUN (isfloat, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isfloat (@var{x})\n\
 Return true if @var{x} is a floating-point numeric object.\n\
 Objects of class double or single are floating-point objects.\n\
@@ -3016,11 +3022,11 @@
   return retval;
 }
 
-// FIXME -- perhaps this should be implemented with an
+// FIXME: perhaps this should be implemented with an
 // octave_value member function?
 
 DEFUN (complex, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} complex (@var{x})\n\
 @deftypefnx {Built-in Function} {} complex (@var{re}, @var{im})\n\
 Return a complex result from real arguments.  With 1 real argument @var{x},\n\
@@ -3138,7 +3144,9 @@
                     result = SparseComplexMatrix (re_val);
                   else
                     {
-                      result = SparseComplexMatrix (re_val.rows (), re_val.cols (), Complex (0, im_val (0)));
+                      result = SparseComplexMatrix (re_val.rows (),
+                                                    re_val.cols (),
+                                                    Complex (0, im_val (0)));
                       octave_idx_type nr = re_val.rows ();
                       octave_idx_type nc = re_val.cols ();
 
@@ -3158,9 +3166,11 @@
                 {
                   if (re_val.dims () == im_val.dims ())
                     {
-                      SparseComplexMatrix result = SparseComplexMatrix (re_val)
-                        + Complex (0, 1) * SparseComplexMatrix (im_val);
-                      retval = octave_value (new octave_sparse_complex_matrix (result));
+                      SparseComplexMatrix result;
+                      result = SparseComplexMatrix (re_val)
+                               + Complex (0, 1) * SparseComplexMatrix (im_val);
+                      retval = octave_value (
+                                 new octave_sparse_complex_matrix (result));
                     }
                   else
                     error ("complex: dimension mismatch");
@@ -3178,7 +3188,9 @@
                   float im_val = im.double_value ();
 
                   if (! error_state)
-                    retval = octave_value (new octave_float_complex (FloatComplex (re_val, im_val)));
+                    retval = octave_value (
+                               new octave_float_complex (FloatComplex (re_val,
+                                                                       im_val)));
                 }
               else
                 {
@@ -3186,12 +3198,14 @@
 
                   if (! error_state)
                     {
-                      FloatComplexNDArray result (im_val.dims (), FloatComplex ());
+                      FloatComplexNDArray result (im_val.dims (),
+                                                  FloatComplex ());
 
                       for (octave_idx_type i = 0; i < im_val.numel (); i++)
                         result.xelem (i) = FloatComplex (re_val, im_val(i));
 
-                      retval = octave_value (new octave_float_complex_matrix (result));
+                      retval = octave_value (
+                                 new octave_float_complex_matrix (result));
                     }
                 }
             }
@@ -3205,12 +3219,14 @@
 
                   if (! error_state)
                     {
-                      FloatComplexNDArray result (re_val.dims (), FloatComplex ());
+                      FloatComplexNDArray result (re_val.dims (),
+                                                  FloatComplex ());
 
                       for (octave_idx_type i = 0; i < re_val.numel (); i++)
                         result.xelem (i) = FloatComplex (re_val(i), im_val);
 
-                      retval = octave_value (new octave_float_complex_matrix (result));
+                      retval = octave_value (
+                                 new octave_float_complex_matrix (result));
                     }
                 }
               else
@@ -3221,12 +3237,15 @@
                     {
                       if (re_val.dims () == im_val.dims ())
                         {
-                          FloatComplexNDArray result (re_val.dims (), FloatComplex ());
+                          FloatComplexNDArray result (re_val.dims (),
+                                                      FloatComplex ());
 
                           for (octave_idx_type i = 0; i < re_val.numel (); i++)
-                            result.xelem (i) = FloatComplex (re_val(i), im_val(i));
-
-                          retval = octave_value (new octave_float_complex_matrix (result));
+                            result.xelem (i) = FloatComplex (re_val(i),
+                                                             im_val(i));
+
+                          retval = octave_value (
+                                     new octave_float_complex_matrix (result));
                         }
                       else
                         error ("complex: dimension mismatch");
@@ -3243,7 +3262,8 @@
               double im_val = im.double_value ();
 
               if (! error_state)
-                retval = octave_value (new octave_complex (Complex (re_val, im_val)));
+                retval = octave_value (new octave_complex (Complex (re_val,
+                                                                    im_val)));
             }
           else
             {
@@ -3291,7 +3311,8 @@
                       for (octave_idx_type i = 0; i < re_val.numel (); i++)
                         result.xelem (i) = Complex (re_val(i), im_val(i));
 
-                      retval = octave_value (new octave_complex_matrix (result));
+                      retval = octave_value (
+                                 new octave_complex_matrix (result));
                     }
                   else
                     error ("complex: dimension mismatch");
@@ -3309,7 +3330,7 @@
 }
 
 DEFUN (isreal, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isreal (@var{x})\n\
 Return true if @var{x} is a non-complex matrix or scalar.\n\
 For compatibility with @sc{matlab}, this includes logical and character\n\
@@ -3328,7 +3349,7 @@
 }
 
 DEFUN (isempty, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isempty (@var{a})\n\
 Return true if @var{a} is an empty matrix (any one of its dimensions is\n\
 zero).  Otherwise, return false.\n\
@@ -3351,7 +3372,7 @@
 */
 
 DEFUN (isnumeric, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isnumeric (@var{x})\n\
 Return true if @var{x} is a numeric object, i.e., an integer, real, or\n\
 complex array.  Logical and character arrays are not considered to be\n\
@@ -3386,7 +3407,7 @@
 */
 
 DEFUN (ismatrix, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ismatrix (@var{a})\n\
 Return true if @var{a} is a numeric, logical, or character matrix.\n\
 Scalars (1x1 matrices) and vectors (@nospell{1xN} or @nospell{Nx1} matrices)\n\
@@ -3401,7 +3422,9 @@
     {
       octave_value arg = args(0);
 
-      retval = arg.is_matrix_type () || arg.is_scalar_type () || arg.is_range ();
+      retval = arg.is_matrix_type ()
+               || arg.is_scalar_type ()
+               || arg.is_range ();
     }
   else
     print_usage ();
@@ -3488,7 +3511,7 @@
 
       check_dimensions (dims, fcn);
 
-      // FIXME -- perhaps this should be made extensible by
+      // FIXME: perhaps this should be made extensible by
       // using the class name to lookup a function to call to create
       // the new value.
 
@@ -3783,7 +3806,8 @@
           switch (dt)
             {
             case oct_data_conv::dt_single:
-              retval = FloatComplexNDArray (dims, static_cast<FloatComplex> (val));
+              retval = FloatComplexNDArray (dims,
+                                            static_cast<FloatComplex> (val));
               break;
 
             case oct_data_conv::dt_double:
@@ -3853,7 +3877,7 @@
 }
 
 DEFUN (ones, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} ones (@var{n})\n\
 @deftypefnx {Built-in Function} {} ones (@var{m}, @var{n})\n\
 @deftypefnx {Built-in Function} {} ones (@var{m}, @var{n}, @var{k}, @dots{})\n\
@@ -3902,7 +3926,7 @@
 */
 
 DEFUN (zeros, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} zeros (@var{n})\n\
 @deftypefnx {Built-in Function} {} zeros (@var{m}, @var{n})\n\
 @deftypefnx {Built-in Function} {} zeros (@var{m}, @var{n}, @var{k}, @dots{})\n\
@@ -3944,7 +3968,7 @@
 */
 
 DEFUN (Inf, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @c List other form of function in documentation index\n\
 @findex inf\n\
 \n\
@@ -4001,7 +4025,7 @@
 */
 
 DEFUN (NaN, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @c List other form of function in documentation index\n\
 @findex nan\n\
 \n\
@@ -4060,7 +4084,7 @@
 */
 
 DEFUN (e, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} e\n\
 @deftypefnx {Built-in Function} {} e (@var{n})\n\
 @deftypefnx {Built-in Function} {} e (@var{n}, @var{m})\n\
@@ -4095,7 +4119,7 @@
 }
 
 DEFUN (eps, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} eps\n\
 @deftypefnx {Built-in Function} {} eps (@var{x})\n\
 @deftypefnx {Built-in Function} {} eps (@var{n}, @var{m})\n\
@@ -4136,16 +4160,16 @@
           Array<float> x = args(0).float_array_value ();
 
           if (! error_state)
-            {              
+            {
               Array<float> epsval (x.dims ());
-              
+
               for (octave_idx_type i = 0; i < x.numel (); i++)
                 {
                   float val = ::fabsf (x(i));
                   if (xisnan (val) || xisinf (val))
                     epsval(i) = lo_ieee_nan_value ();
                   else if (val < std::numeric_limits<float>::min ())
-                    epsval(i) = powf (2.0, -149e0);                  
+                    epsval(i) = powf (2.0, -149e0);
                   else
                     {
                       int expon;
@@ -4201,7 +4225,7 @@
 %!assert (eps (realmin/16), 2^(-1074))
 %!assert (eps (Inf), NaN)
 %!assert (eps (NaN), NaN)
-%!assert (eps ([1/2 1 2 realmax 0 realmin/2 realmin/16 Inf NaN]), 
+%!assert (eps ([1/2 1 2 realmax 0 realmin/2 realmin/16 Inf NaN]),
 %!             [2^(-53) 2^(-52) 2^(-51) 2^971 2^(-1074) 2^(-1074) 2^(-1074) NaN NaN])
 %!assert (eps (single (1/2)), single (2^(-24)))
 %!assert (eps (single (1)), single (2^(-23)))
@@ -4212,13 +4236,13 @@
 %!assert (eps (realmin ("single")/16), single (2^(-149)))
 %!assert (eps (single (Inf)), single (NaN))
 %!assert (eps (single (NaN)), single (NaN))
-%!assert (eps (single ([1/2 1 2 realmax("single") 0 realmin("single")/2 realmin("single")/16 Inf NaN])), 
+%!assert (eps (single ([1/2 1 2 realmax("single") 0 realmin("single")/2 realmin("single")/16 Inf NaN])),
 %!             single ([2^(-24) 2^(-23) 2^(-22) 2^104 2^(-149) 2^(-149) 2^(-149) NaN NaN]))
 
 */
 
 DEFUN (pi, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} pi\n\
 @deftypefnx {Built-in Function} {} pi (@var{n})\n\
 @deftypefnx {Built-in Function} {} pi (@var{n}, @var{m})\n\
@@ -4260,7 +4284,7 @@
 }
 
 DEFUN (realmax, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} realmax\n\
 @deftypefnx {Built-in Function} {} realmax (@var{n})\n\
 @deftypefnx {Built-in Function} {} realmax (@var{n}, @var{m})\n\
@@ -4294,7 +4318,7 @@
 }
 
 DEFUN (realmin, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} realmin\n\
 @deftypefnx {Built-in Function} {} realmin (@var{n})\n\
 @deftypefnx {Built-in Function} {} realmin (@var{n}, @var{m})\n\
@@ -4328,7 +4352,7 @@
 }
 
 DEFUN (I, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @c List other forms of function in documentation index\n\
 @findex i\n\
 @findex j\n\
@@ -4369,7 +4393,7 @@
 DEFALIAS (j, I);
 
 DEFUN (NA, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} NA\n\
 @deftypefnx {Built-in Function} {} NA (@var{n})\n\
 @deftypefnx {Built-in Function} {} NA (@var{n}, @var{m})\n\
@@ -4401,7 +4425,7 @@
 */
 
 DEFUN (false, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} false (@var{x})\n\
 @deftypefnx {Built-in Function} {} false (@var{n}, @var{m})\n\
 @deftypefnx {Built-in Function} {} false (@var{n}, @var{m}, @var{k}, @dots{})\n\
@@ -4417,7 +4441,7 @@
 }
 
 DEFUN (true, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} true (@var{x})\n\
 @deftypefnx {Built-in Function} {} true (@var{n}, @var{m})\n\
 @deftypefnx {Built-in Function} {} true (@var{n}, @var{m}, @var{k}, @dots{})\n\
@@ -4484,7 +4508,7 @@
 {
   octave_value retval;
 
-  // FIXME -- perhaps this should be made extensible by using
+  // FIXME: perhaps this should be made extensible by using
   // the class name to lookup a function to call to create the new
   // value.
 
@@ -4548,7 +4572,7 @@
 #undef INT_EYE_MATRIX
 
 DEFUN (eye, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} eye (@var{n})\n\
 @deftypefnx {Built-in Function} {} eye (@var{m}, @var{n})\n\
 @deftypefnx {Built-in Function} {} eye ([@var{m} @var{n}])\n\
@@ -4705,7 +4729,7 @@
 }
 
 DEFUN (linspace, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} linspace (@var{base}, @var{limit})\n\
 @deftypefnx {Built-in Function} {} linspace (@var{base}, @var{limit}, @var{n})\n\
 Return a row vector with @var{n} linearly spaced elements between\n\
@@ -4794,11 +4818,11 @@
 %!error linspace (1, 2, 3, 4)
 */
 
-// FIXME -- should accept dimensions as separate args for N-d
+// FIXME: should accept dimensions as separate args for N-d
 // arrays as well as 1-d and 2-d arrays.
 
 DEFUN (resize, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} resize (@var{x}, @var{m})\n\
 @deftypefnx {Built-in Function} {} resize (@var{x}, @var{m}, @var{n}, @dots{})\n\
 @deftypefnx {Built-in Function} {} resize (@var{x}, [@var{m} @var{n} @dots{}])\n\
@@ -4885,10 +4909,10 @@
   return retval;
 }
 
-// FIXME -- should use octave_idx_type for dimensions.
+// FIXME: should use octave_idx_type for dimensions.
 
 DEFUN (reshape, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} reshape (@var{A}, @var{m}, @var{n}, @dots{})\n\
 @deftypefnx {Built-in Function} {} reshape (@var{A}, [@var{m} @var{n} @dots{}])\n\
 @deftypefnx {Built-in Function} {} reshape (@var{A}, @dots{}, [], @dots{})\n\
@@ -4988,7 +5012,8 @@
               octave_idx_type size_empty_dim = a_nel / nel;
 
               if (a_nel != size_empty_dim * nel)
-                error ("reshape: SIZE is not divisible by the product of known dimensions (= %d)", nel);
+                error ("reshape: SIZE is not divisible by the product of known dimensions (= %d)",
+                       nel);
               else
                 new_dims(empty_dim-1) = size_empty_dim;
             }
@@ -5026,7 +5051,7 @@
 */
 
 DEFUN (vec, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{v} =} vec (@var{x})\n\
 @deftypefnx {Built-in Function} {@var{v} =} vec (@var{x}, @var{dim})\n\
 Return the vector obtained by stacking the columns of the matrix @var{x}\n\
@@ -5092,7 +5117,7 @@
 */
 
 DEFUN (squeeze, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} squeeze (@var{x})\n\
 Remove singleton dimensions from @var{x} and return the result.\n\
 Note that for compatibility with @sc{matlab}, all objects have\n\
@@ -5111,7 +5136,7 @@
 }
 
 DEFUN (full, args, ,
-    "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{FM} =} full (@var{SM})\n\
 Return a full storage matrix from a sparse, diagonal, permutation matrix\n\
 or a range.\n\
@@ -5131,7 +5156,7 @@
 // Compute various norms of the vector X.
 
 DEFUN (norm, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} norm (@var{A})\n\
 @deftypefnx {Built-in Function} {} norm (@var{A}, @var{p})\n\
 @deftypefnx {Built-in Function} {} norm (@var{A}, @var{p}, @var{opt})\n\
@@ -5340,7 +5365,7 @@
 
 %!test
 %! ## Test for norm returning NaN on sparse matrix (bug #30631)
-%! A = sparse (2,2); 
+%! A = sparse (2,2);
 %! A(2,1) = 1;
 %! assert (norm (A), 1);
 */
@@ -5359,7 +5384,7 @@
 }
 
 DEFUN (not, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} not (@var{x})\n\
 Return the logical NOT of @var{x}.  This function is equivalent to\n\
 @code{! x}.\n\
@@ -5370,7 +5395,7 @@
 }
 
 DEFUN (uplus, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} uplus (@var{x})\n\
 This function and @w{@tcode{+ x}} are equivalent.\n\
 @seealso{uminus, plus, minus}\n\
@@ -5380,7 +5405,7 @@
 }
 
 DEFUN (uminus, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} uminus (@var{x})\n\
 This function and @w{@tcode{- x}} are equivalent.\n\
 @seealso{uplus, minus}\n\
@@ -5390,7 +5415,7 @@
 }
 
 DEFUN (transpose, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} transpose (@var{x})\n\
 Return the transpose of @var{x}.\n\
 This function and @tcode{x.'} are equivalent.\n\
@@ -5421,7 +5446,7 @@
 */
 
 DEFUN (ctranspose, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ctranspose (@var{x})\n\
 Return the complex conjugate transpose of @var{x}.\n\
 This function and @tcode{x'} are equivalent.\n\
@@ -5483,19 +5508,19 @@
       break;
     case 2:
       retval = do_binary_op (op, args(0), args(1));
-     break;
+      break;
     default:
-     retval = do_binary_op (op, args(0), args(1));
-     for (int i = 2; i < nargin; i++)
-       retval.assign (aop, args(i));
-     break;
+      retval = do_binary_op (op, args(0), args(1));
+      for (int i = 2; i < nargin; i++)
+        retval.assign (aop, args(i));
+      break;
     }
 
   return retval;
 }
 
 DEFUN (plus, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} plus (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} plus (@var{x1}, @var{x2}, @dots{})\n\
 This function and @w{@tcode{x + y}} are equivalent.\n\
@@ -5515,7 +5540,7 @@
 }
 
 DEFUN (minus, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} minus (@var{x}, @var{y})\n\
 This function and @w{@tcode{x - y}} are equivalent.\n\
 @seealso{plus, uminus}\n\
@@ -5525,7 +5550,7 @@
 }
 
 DEFUN (mtimes, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} mtimes (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} mtimes (@var{x1}, @var{x2}, @dots{})\n\
 Return the matrix multiplication product of inputs.\n\
@@ -5546,7 +5571,7 @@
 }
 
 DEFUN (mrdivide, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} mrdivide (@var{x}, @var{y})\n\
 Return the matrix right division of @var{x} and @var{y}.\n\
 This function and @w{@tcode{x / y}} are equivalent.\n\
@@ -5557,7 +5582,7 @@
 }
 
 DEFUN (mpower, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} mpower (@var{x}, @var{y})\n\
 Return the matrix power operation of @var{x} raised to the @var{y} power.\n\
 This function and @w{@tcode{x ^ y}} are equivalent.\n\
@@ -5568,7 +5593,7 @@
 }
 
 DEFUN (mldivide, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} mldivide (@var{x}, @var{y})\n\
 Return the matrix left division of @var{x} and @var{y}.\n\
 This function and @w{@tcode{x @xbackslashchar{} y}} are equivalent.\n\
@@ -5579,7 +5604,7 @@
 }
 
 DEFUN (lt, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} lt (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x < y}}.\n\
 @seealso{le, eq, ge, gt, ne}\n\
@@ -5589,7 +5614,7 @@
 }
 
 DEFUN (le, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} le (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x <= y}}.\n\
 @seealso{eq, ge, gt, ne, lt}\n\
@@ -5599,7 +5624,7 @@
 }
 
 DEFUN (eq, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} eq (@var{x}, @var{y})\n\
 Return true if the two inputs are equal.\n\
 This function is equivalent to @w{@code{x == y}}.\n\
@@ -5610,7 +5635,7 @@
 }
 
 DEFUN (ge, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ge (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x >= y}}.\n\
 @seealso{le, eq, gt, ne, lt}\n\
@@ -5620,7 +5645,7 @@
 }
 
 DEFUN (gt, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} gt (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x > y}}.\n\
 @seealso{le, eq, ge, ne, lt}\n\
@@ -5630,7 +5655,7 @@
 }
 
 DEFUN (ne, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ne (@var{x}, @var{y})\n\
 Return true if the two inputs are not equal.\n\
 This function is equivalent to @w{@code{x != y}}.\n\
@@ -5641,7 +5666,7 @@
 }
 
 DEFUN (times, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} times (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} times (@var{x1}, @var{x2}, @dots{})\n\
 Return the element-by-element multiplication product of inputs.\n\
@@ -5662,7 +5687,7 @@
 }
 
 DEFUN (rdivide, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} rdivide (@var{x}, @var{y})\n\
 Return the element-by-element right division of @var{x} and @var{y}.\n\
 This function and @w{@tcode{x ./ y}} are equivalent.\n\
@@ -5673,7 +5698,7 @@
 }
 
 DEFUN (power, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} power (@var{x}, @var{y})\n\
 Return the element-by-element operation of @var{x} raised to the\n\
 @var{y} power.  If several complex results are possible,\n\
@@ -5689,7 +5714,7 @@
 }
 
 DEFUN (ldivide, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} ldivide (@var{x}, @var{y})\n\
 Return the element-by-element left division of @var{x} and @var{y}.\n\
 This function and @w{@tcode{x .@xbackslashchar{} y}} are equivalent.\n\
@@ -5700,7 +5725,7 @@
 }
 
 DEFUN (and, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} and (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} and (@var{x1}, @var{x2}, @dots{})\n\
 Return the logical AND of @var{x} and @var{y}.\n\
@@ -5721,7 +5746,7 @@
 }
 
 DEFUN (or, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} or (@var{x}, @var{y})\n\
 @deftypefnx {Built-in Function} {} or (@var{x1}, @var{x2}, @dots{})\n\
 Return the logical OR of @var{x} and @var{y}.\n\
@@ -5744,7 +5769,7 @@
 static double tic_toc_timestamp = -1.0;
 
 DEFUN (tic, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} tic ()\n\
 @deftypefnx {Built-in Function} {@var{id} =} tic ()\n\
 @deftypefnx {Built-in Function} {} toc ()\n\
@@ -5813,7 +5838,7 @@
 }
 
 DEFUN (toc, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} toc ()\n\
 @deftypefnx {Built-in Function} {} toc (@var{id})\n\
 @deftypefnx {Built-in Function} {@var{val} =} toc (@dots{})\n\
@@ -5840,9 +5865,10 @@
 
               start_time
                 = (static_cast<double> (val / CLOCKS_PER_SEC)
-                   + static_cast<double> (val % CLOCKS_PER_SEC) / CLOCKS_PER_SEC);
-
-              // FIXME -- should we also check to see whether the start
+                   + static_cast<double> (val % CLOCKS_PER_SEC)
+                   / CLOCKS_PER_SEC);
+
+              // FIXME: should we also check to see whether the start
               // time is after the beginning of this Octave session?
             }
           else
@@ -5878,7 +5904,7 @@
 */
 
 DEFUN (cputime, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{total}, @var{user}, @var{system}] =} cputime ();\n\
 Return the CPU time used by your Octave session.  The first output is\n\
 the total time spent executing your process and is equal to the sum of\n\
@@ -5907,10 +5933,10 @@
   getrusage (RUSAGE_SELF, &ru);
 
   usr = static_cast<double> (ru.ru_utime.tv_sec) +
-    static_cast<double> (ru.ru_utime.tv_usec) * 1e-6;
+        static_cast<double> (ru.ru_utime.tv_usec) * 1e-6;
 
   sys = static_cast<double> (ru.ru_stime.tv_sec) +
-    static_cast<double> (ru.ru_stime.tv_usec) * 1e-6;
+        static_cast<double> (ru.ru_stime.tv_usec) * 1e-6;
 
 #else
 
@@ -5927,14 +5953,14 @@
   seconds = ticks / CLOCKS_PER_SEC;
 
   usr = static_cast<double> (seconds) + static_cast<double>(fraction) /
-    static_cast<double>(CLOCKS_PER_SEC);
+        static_cast<double>(CLOCKS_PER_SEC);
 
   ticks = t.tms_stime + t.tms_cstime;
   fraction = ticks % CLOCKS_PER_SEC;
   seconds = ticks / CLOCKS_PER_SEC;
 
   sys = static_cast<double> (seconds) + static_cast<double>(fraction) /
-    static_cast<double>(CLOCKS_PER_SEC);
+        static_cast<double>(CLOCKS_PER_SEC);
 
 #endif
 
@@ -5946,7 +5972,7 @@
 }
 
 DEFUN (sort, args, nargout,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x})\n\
 @deftypefnx {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim})\n\
 @deftypefnx {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{mode})\n\
@@ -6095,7 +6121,7 @@
       Array<octave_idx_type> sidx;
 
       retval(0) = arg.sort (sidx, dim, smode);
-      retval(1) = idx_vector (sidx, dv(dim)); // No checking, the extent is known.
+      retval(1) = idx_vector (sidx, dv(dim)); // No checking, extent is known.
     }
   else
     retval(0) = arg.sort (dim, smode);
@@ -6285,7 +6311,7 @@
 // This function does not yet support sparse matrices.
 
 DEFUN (__sort_rows_idx__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __sort_rows_idx__ (@var{a}, @var{mode})\n\
 Undocumented internal function.\n\
 @end deftypefn\n")
@@ -6334,9 +6360,9 @@
 static sortmode
 get_sort_mode_option (const octave_value& arg, const char *argn)
 {
-  // FIXME -- we initialize to UNSORTED here to avoid a GCC warning
+  // FIXME: we initialize to UNSORTED here to avoid a GCC warning
   // about possibly using sortmode uninitialized.
-  // FIXME -- shouldn't these modes be scoped inside a class?
+  // FIXME: shouldn't these modes be scoped inside a class?
   sortmode smode = UNSORTED;
 
   std::string mode = arg.string_value ();
@@ -6356,7 +6382,7 @@
 }
 
 DEFUN (issorted, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} issorted (@var{a})\n\
 @deftypefnx {Built-in Function} {} issorted (@var{a}, @var{mode})\n\
 @deftypefnx {Built-in Function} {} issorted (@var{a}, \"rows\", @var{mode})\n\
@@ -6467,7 +6493,7 @@
 */
 
 DEFUN (nth_element, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} nth_element (@var{x}, @var{n})\n\
 @deftypefnx {Built-in Function} {} nth_element (@var{x}, @var{n}, @var{dim})\n\
 Select the n-th smallest element of a vector, using the ordering defined by\n\
@@ -6575,7 +6601,7 @@
 }
 
 DEFUN (__accumarray_sum__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __accumarray_sum__ (@var{idx}, @var{vals}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
@@ -6602,14 +6628,18 @@
           if (vals.is_single_type ())
             {
               if (vals.is_complex_type ())
-                retval = do_accumarray_sum (idx, vals.float_complex_array_value (), n);
+                retval = do_accumarray_sum (idx, 
+                                            vals.float_complex_array_value (),
+                                            n);
               else
                 retval = do_accumarray_sum (idx, vals.float_array_value (), n);
             }
           else if (vals.is_numeric_type () || vals.is_bool_type ())
             {
               if (vals.is_complex_type ())
-                retval = do_accumarray_sum (idx, vals.complex_array_value (), n);
+                retval = do_accumarray_sum (idx,
+                                            vals.complex_array_value (),
+                                            n);
               else
                 retval = do_accumarray_sum (idx, vals.array_value (), n);
             }
@@ -6676,20 +6706,23 @@
                                              zero.double_value ());
               break;
             case btyp_float:
-              retval = do_accumarray_minmax (idx, vals.float_array_value (), n, ismin,
-                                             zero.float_value ());
+              retval = do_accumarray_minmax (idx, vals.float_array_value (), n,
+                                             ismin, zero.float_value ());
               break;
             case btyp_complex:
-              retval = do_accumarray_minmax (idx, vals.complex_array_value (), n, ismin,
-                                             zero.complex_value ());
+              retval = do_accumarray_minmax (idx, vals.complex_array_value (),
+                                             n, ismin, zero.complex_value ());
               break;
             case btyp_float_complex:
-              retval = do_accumarray_minmax (idx, vals.float_complex_array_value (), n, ismin,
+              retval = do_accumarray_minmax (idx,
+                                             vals.float_complex_array_value (),
+                                             n, ismin,
                                              zero.float_complex_value ());
               break;
 #define MAKE_INT_BRANCH(X) \
             case btyp_ ## X: \
-              retval = do_accumarray_minmax (idx, vals.X ## _array_value (), n, ismin, \
+              retval = do_accumarray_minmax (idx, vals.X ## _array_value (), \
+                                             n, ismin, \
                                              zero.X ## _scalar_value ()); \
               break
 
@@ -6718,7 +6751,7 @@
 }
 
 DEFUN (__accumarray_min__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __accumarray_min__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
@@ -6727,7 +6760,7 @@
 }
 
 DEFUN (__accumarray_max__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __accumarray_max__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
@@ -6766,7 +6799,7 @@
 }
 
 DEFUN (__accumdim_sum__, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __accumdim_sum__ (@var{idx}, @var{vals}, @var{dim}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
@@ -6791,14 +6824,18 @@
           if (vals.is_single_type ())
             {
               if (vals.is_complex_type ())
-                retval = do_accumdim_sum (idx, vals.float_complex_array_value (), dim, n);
+                retval = do_accumdim_sum (idx,
+                                          vals.float_complex_array_value (),
+                                          dim, n);
               else
-                retval = do_accumdim_sum (idx, vals.float_array_value (), dim, n);
+                retval = do_accumdim_sum (idx, vals.float_array_value (),
+                                          dim, n);
             }
           else if (vals.is_numeric_type () || vals.is_bool_type ())
             {
               if (vals.is_complex_type ())
-                retval = do_accumdim_sum (idx, vals.complex_array_value (), dim, n);
+                retval = do_accumdim_sum (idx, vals.complex_array_value (),
+                                          dim, n);
               else
                 retval = do_accumdim_sum (idx, vals.array_value (), dim, n);
             }
@@ -6877,7 +6914,7 @@
     }
 
 DEFUN (merge, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\
 @deftypefnx {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\
 Merge elements of @var{true_val} and @var{false_val}, depending on the\n\
@@ -6990,7 +7027,8 @@
       while (order > 0 && k > 0)
         {
           idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
-          retval = SparseT (retval.index (col1, sl1)) - SparseT (retval.index (col2, sl2));
+          retval = SparseT (retval.index (col1, sl1))
+                 - SparseT (retval.index (col2, sl2));
           assert (retval.columns () == k-1);
           order--;
           k--;
@@ -7002,7 +7040,8 @@
       while (order > 0 && k > 0)
         {
           idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
-          retval = SparseT (retval.index (sl1, col1)) - SparseT (retval.index (sl2, col2));
+          retval = SparseT (retval.index (sl1, col1))
+                 - SparseT (retval.index (sl2, col2));
           assert (retval.rows () == k-1);
           order--;
           k--;
@@ -7077,7 +7116,8 @@
   else if (array.is_sparse_type ())
     {
       if (array.is_complex_type ())
-        retval = do_sparse_diff (array.sparse_complex_matrix_value (), order, dim);
+        retval = do_sparse_diff (array.sparse_complex_matrix_value (),
+                                 order, dim);
       else
         retval = do_sparse_diff (array.sparse_matrix_value (), order, dim);
     }
@@ -7100,7 +7140,7 @@
 }
 
 DEFUN (diff, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} diff (@var{x})\n\
 @deftypefnx {Built-in Function} {} diff (@var{x}, @var{k})\n\
 @deftypefnx {Built-in Function} {} diff (@var{x}, @var{k}, @var{dim})\n\
@@ -7217,7 +7257,7 @@
 }
 
 DEFUN (repelems, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} repelems (@var{x}, @var{r})\n\
 Construct a vector of repeated elements from @var{x}.  @var{r}\n\
 is a 2x@var{N} integer matrix specifying which elements to repeat and\n\
@@ -7311,7 +7351,7 @@
 }
 
 DEFUN (base64_encode, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{s} =} base64_encode (@var{x})\n\
 Encode a double matrix or array @var{x} into the base64 format string\n\
 @var{s}.\n\
@@ -7324,12 +7364,12 @@
 
   if (nargin != 1)
     print_usage ();
-  else 
+  else
     {
-      if (! args(0).is_numeric_type ()) 
+      if (! args(0).is_numeric_type ())
         error ("base64_encode: encoding is supported only for numeric arrays");
-      else if (args(0).is_complex_type () 
-          || args(0).is_sparse_type ())
+      else if (args(0).is_complex_type ()
+               || args(0).is_sparse_type ())
         error ("base64_encode: encoding complex or sparse data is not supported");
       else if (args(0).is_integer_type ())
         {
@@ -7367,33 +7407,33 @@
         {
           const Array<float> in = args(0).float_array_value ();
           size_t inlen;
-          inlen = in.numel () * sizeof (float) / sizeof (char); 
+          inlen = in.numel () * sizeof (float) / sizeof (char);
           const char*  inc;
-          inc = reinterpret_cast<const char*> (in.data ());  
+          inc = reinterpret_cast<const char*> (in.data ());
           char* out;
-          if (! error_state 
-              && octave_base64_encode (inc, inlen, &out))
-            {
-              retval(0) = octave_value (out);
-              ::free (out);
-            }
-        }                 
-      else
-        {
-          const Array<double> in = args(0).array_value ();
-          size_t inlen;
-          inlen = in.numel () * sizeof (double) / sizeof (char); 
-          const char*  inc;
-          inc = reinterpret_cast<const char*> (in.data ());   
-          char* out;
-          if (! error_state 
+          if (! error_state
               && octave_base64_encode (inc, inlen, &out))
             {
               retval(0) = octave_value (out);
               ::free (out);
             }
         }
-    }  
+      else
+        {
+          const Array<double> in = args(0).array_value ();
+          size_t inlen;
+          inlen = in.numel () * sizeof (double) / sizeof (char);
+          const char*  inc;
+          inc = reinterpret_cast<const char*> (in.data ());
+          char* out;
+          if (! error_state
+              && octave_base64_encode (inc, inlen, &out))
+            {
+              retval(0) = octave_value (out);
+              ::free (out);
+            }
+        }
+    }
   return retval;
 }
 
@@ -7413,7 +7453,7 @@
 */
 
 DEFUN (base64_decode, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{x} =} base64_decode (@var{s})\n\
 @deftypefnx {Built-in Function} {@var{x} =} base64_decode (@var{s}, @var{dims})\n\
 Decode the double matrix or array @var{x} from the base64 encoded string\n\
@@ -7455,19 +7495,19 @@
             res = res.reshape (dims);
 
           retval = res;
-        }        
+        }
     }
 
-  return retval; 
+  return retval;
 }
 
 /*
 %!assert (base64_decode (base64_encode (pi)), pi)
 %!
-%!test 
+%!test
 %! in   = randn (10);
 %! outv = base64_decode (base64_encode (in));
-%! outm = base64_decode (base64_encode (in), size (in)); 
+%! outm = base64_decode (base64_encode (in), size (in));
 %! assert (outv, in(:).');
 %! assert (outm, in);