Mercurial > octave

--- a/libinterp/build-env.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/build-env.h	Tue Aug 30 21:46:47 2016 -0700
@@ -174,3 +174,4 @@
 };

 #endif
+
--- a/libinterp/build-env.in.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/build-env.in.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -306,3 +306,4 @@
     const char *config_opts = %OCTAVE_CONF_config_opts%;
   };
 };
+
--- a/libinterp/builtins.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/builtins.h	Tue Aug 30 21:46:47 2016 -0700
@@ -30,3 +30,4 @@
 extern OCTINTERP_API void install_builtins (void);

 #endif
+
--- a/libinterp/corefcn/Cell.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/Cell.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -260,11 +260,11 @@
         ra_idx.xelem (i) = idx_arg(i).index_vector ();
       }
     catch (octave::index_exception& e)
-        {
-          // Rethrow to allow more info to be reported later.
-          e.set_pos (len, i+1);
-          throw;
-        }
+      {
+        // Rethrow to allow more info to be reported later.
+        e.set_pos (len, i+1);
+        throw;
+      }

   Array<octave_value>::delete_elements (ra_idx);
 }
@@ -354,3 +354,4 @@
 {
   return Array<octave_value>::diag (m, n);
 }
+
--- a/libinterp/corefcn/Cell.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/Cell.h	Tue Aug 30 21:46:47 2016 -0700
@@ -145,3 +145,4 @@
 { return v.cell_value (); }

 #endif
+
--- a/libinterp/corefcn/__contourc__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__contourc__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -326,3 +326,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__dispatch__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__dispatch__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -110,3 +110,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__dsearchn__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__dsearchn__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -99,3 +99,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__ilu__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__ilu__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -526,8 +526,8 @@
       cols_norm = feval ("norm", arg_list)(0).complex_vector_value ();
       arg_list.clear ();
       SparseComplexMatrix U, L;
-      ilu_crout < SparseComplexMatrix, Complex >
-                (sm_l, sm_u, L, U, cols_norm.fortran_vec () ,
+      ilu_crout <SparseComplexMatrix, Complex>
+                (sm_l, sm_u, L, U, cols_norm.fortran_vec (),
                  rows_norm.fortran_vec (), Complex (droptol), milu);

       arg_list.append (octave_value (L.cols ()));
@@ -587,7 +587,7 @@
   octave_idx_type* cidx_l = cidx_out_l.fortran_vec ();
   Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
   octave_idx_type* ridx_l = ridx_out_l.fortran_vec ();
-  Array <T> data_out_l (dim_vector (max_len_l ,1));
+  Array <T> data_out_l (dim_vector (max_len_l, 1));
   T* data_l = data_out_l.fortran_vec ();

   // Data for U
@@ -1027,7 +1027,7 @@
       arg_list.clear ();
       Array <octave_idx_type> perm (dim_vector (sm.cols (), 1));
       SparseComplexMatrix U, L;
-      ilu_tp < SparseComplexMatrix, Complex>
+      ilu_tp <SparseComplexMatrix, Complex>
               (sm, L, U, nnz_u, nnz_l, rc_norm.fortran_vec (), perm,
                Complex (droptol), Complex (thresh), milu, udiag);
--- a/libinterp/corefcn/__lin_interpn__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__lin_interpn__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -318,3 +318,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__luinc__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__luinc__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -72,7 +72,8 @@
     }
   else if (args(1).is_map ())
     {
-      octave_scalar_map map = args(1).xscalar_map_value ("luinc: OPTS must be a scalar structure");
+      octave_scalar_map map
+        = args(1).xscalar_map_value ("luinc: OPTS must be a scalar structure");

       octave_value tmp;
--- a/libinterp/corefcn/__magick_read__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__magick_read__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -761,7 +761,8 @@

   maybe_initialize_magick ();

-  const octave_scalar_map options = args(1).xscalar_map_value ("__magick_read__: OPTIONS must be a struct");
+  const octave_scalar_map options
+    = args(1).xscalar_map_value ("__magick_read__: OPTIONS must be a struct");

   octave_value_list output;

@@ -1407,7 +1408,8 @@
   const std::string filename = args(0).string_value ();
   const std::string ext = args(1).string_value ();

-  const octave_scalar_map options = args(4).xscalar_map_value ("__magick_write__: OPTIONS must be a struct");
+  const octave_scalar_map options
+    = args(4).xscalar_map_value ("__magick_write__: OPTIONS must be a struct");

   const octave_value img = args(2);
   const Matrix cmap = args(3).xmatrix_value ("__magick_write__: invalid MAP");
@@ -1526,7 +1528,8 @@
   // Note that this only needs to be set on the first frame
   imvec[0].animationIterations (options.getfield ("loopcount").uint_value ());

-  const std::string compression = options.getfield ("compression").string_value ();
+  const std::string compression
+    = options.getfield ("compression").string_value ();

 #define COMPRESS_MAGICK_IMAGE_VECTOR(GM_TYPE)                           \
   for (std::vector<Magick::Image>::size_type i = 0; i < imvec.size (); i++) \
@@ -1657,20 +1660,21 @@
     case Magick::ZipCompression:
       return octave_value ("deflate");

-      // The following are present only in recent versions of GraphicsMagick.
-      // At the moment the only use of this would be to have imfinfo report
-      // the compression method.  In the future, someone could implement
-      // the Compression option for imwrite in which case a macro in
-      // configure.ac will have to check for their presence of this.
-      // See bug #39913
-      //      case Magick::LZMACompression:
-      //        return octave_value ("lzma");
-      //      case Magick::JPEG2000Compression:
-      //        return octave_value ("jpeg2000");
-      //      case Magick::JBIG1Compression:
-      //        return octave_value ("jbig1");
-      //      case Magick::JBIG2Compression:
-      //        return octave_value ("jbig2");
+    // The following are present only in recent versions of GraphicsMagick.
+    // At the moment the only use of this would be to have imfinfo report
+    // the compression method.  In the future, someone could implement
+    // the Compression option for imwrite in which case a macro in
+    // configure.ac will have to check for their presence of this.
+    // See bug #39913
+    //      case Magick::LZMACompression:
+    //        return octave_value ("lzma");
+    //      case Magick::JPEG2000Compression:
+    //        return octave_value ("jpeg2000");
+    //      case Magick::JBIG1Compression:
+    //        return octave_value ("jbig1");
+    //      case Magick::JBIG2Compression:
+    //        return octave_value ("jbig2");
+
     default:
       return octave_value ("undefined");
     }
@@ -1695,7 +1699,7 @@
 {
   switch (magick)
     {
-      // Values come from the TIFF6 spec
+    // Values come from the TIFF6 spec
     case Magick::TopLeftOrientation:
       return octave_value (1);
     case Magick::TopRightOrientation:
@@ -2305,3 +2309,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__pchip_deriv__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -134,3 +134,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/__qp__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/__qp__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -520,3 +520,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/corefcn/balance.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/balance.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -355,3 +355,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/base-text-renderer.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/base-text-renderer.h	Tue Aug 30 21:46:47 2016 -0700
@@ -82,3 +82,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/besselj.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/besselj.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -134,8 +134,7 @@
             }
           else
             {
-              FloatComplexNDArray x
-                = x_arg.xfloat_complex_array_value ("%s: X must be a scalar or matrix", fn);
+              FloatComplexNDArray x = x_arg.xfloat_complex_array_value ("%s: X must be a scalar or matrix", fn);

               Array<octave_idx_type> ierr;
               octave_value result;
@@ -190,8 +189,7 @@
                 }
               else
                 {
-                  FloatComplexNDArray x
-                    = x_arg.xfloat_complex_array_value ("%s: X must be a scalar or matrix", fn);
+                  FloatComplexNDArray x = x_arg.xfloat_complex_array_value ("%s: X must be a scalar or matrix", fn);

                   Array<octave_idx_type> ierr;
                   octave_value result;
@@ -1161,3 +1159,4 @@
 %! assert (j, jt, -1e-9);
 %! assert (y, yt, -1e-9);
 */
+
--- a/libinterp/corefcn/bitfcns.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/bitfcns.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -601,7 +601,7 @@
       else if (nbits < 1)
         mask = 0;
       int bits_in_type = sizeof (double)
-        * std::numeric_limits<unsigned char>::digits;
+                         * std::numeric_limits<unsigned char>::digits;
       NDArray m = m_arg.array_value ();
       DO_BITSHIFT ();
     }
@@ -632,7 +632,7 @@
       else if (nbits < 1)
         mask = 0;
       int bits_in_type = sizeof (float)
-        * std::numeric_limits<unsigned char>::digits;
+                         * std::numeric_limits<unsigned char>::digits;
       FloatNDArray m = m_arg.float_array_value ();
       DO_BITSHIFT (Float);
     }
@@ -895,3 +895,4 @@

 %!error sizemax (0)
 */
+
--- a/libinterp/corefcn/bsxfun.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/bsxfun.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -821,3 +821,4 @@
 %! assert (a, zeros (0, 3));

 */
+
--- a/libinterp/corefcn/c-file-ptr-stream.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/c-file-ptr-stream.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -314,3 +314,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/c-file-ptr-stream.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/c-file-ptr-stream.h	Tue Aug 30 21:46:47 2016 -0700
@@ -224,3 +224,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/call-stack.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/call-stack.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -585,3 +585,4 @@

   symbol_table::set_scope_and_context (tmp.m_scope, tmp.m_context);
 }
+
--- a/libinterp/corefcn/call-stack.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/call-stack.h	Tue Aug 30 21:46:47 2016 -0700
@@ -476,3 +476,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/cdisplay.c	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/cdisplay.c	Tue Aug 30 21:46:47 2016 -0700
@@ -179,3 +179,4 @@

   return msg;
 }
+
--- a/libinterp/corefcn/cdisplay.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/cdisplay.h	Tue Aug 30 21:46:47 2016 -0700
@@ -38,3 +38,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/cellfun.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/cellfun.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -2390,3 +2390,4 @@

   return octave_value (y);
 }
+
--- a/libinterp/corefcn/coct-hdf5-types.c	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/coct-hdf5-types.c	Tue Aug 30 21:46:47 2016 -0700
@@ -40,3 +40,4 @@
 const octave_hdf5_id octave_H5S_ALL = H5S_ALL;

 #endif
+
--- a/libinterp/corefcn/comment-list.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/comment-list.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,3 +43,4 @@

   return new_cl;
 }
+
--- a/libinterp/corefcn/comment-list.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/comment-list.h	Tue Aug 30 21:46:47 2016 -0700
@@ -101,3 +101,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/conv2.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/conv2.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -547,3 +547,4 @@
 %!error <SHAPE type not valid> convn (1,2, "NOT_A_SHAPE")
 %!error convn (rand (3), 1, 1)
 */
+
--- a/libinterp/corefcn/daspk.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/daspk.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -293,8 +293,8 @@
               fname = "function y = ";
               fname.append (fcn_name);
               fname.append (" (x, xdot, t) y = ");
-              daspk_fcn = extract_function
-                (c(0), "daspk", fcn_name, fname, "; endfunction");
+              daspk_fcn = extract_function (c(0), "daspk", fcn_name,
+                                            fname, "; endfunction");
             }

           if (daspk_fcn)
@@ -361,9 +361,8 @@
                     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)
                       {
@@ -441,3 +440,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/dasrt.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dasrt.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -549,3 +549,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/dassl.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dassl.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -529,3 +529,4 @@

 %!error dassl_options ("foo", 1, 2)
 */
+
--- a/libinterp/corefcn/data.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/data.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1567,7 +1567,7 @@

 #undef MAKE_INT_BRANCH

-          // GAGME: Accursed Matlab compatibility...
+    // GAGME: Accursed Matlab compatibility...
     case btyp_char:
       retval = arg.array_value (true).prod (dim);
       break;
@@ -1960,7 +1960,7 @@
           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 ()))
+                                || args(i).is_real_type ()))
             all_cmplx_p = false;
           if (! any_sparse_p && args(i).is_sparse_type ())
             any_sparse_p = true;
@@ -3080,7 +3080,7 @@

 #undef MAKE_INT_BRANCH

-      // GAGME: Accursed Matlab compatibility...
+    // GAGME: Accursed Matlab compatibility...
     case btyp_char:
       if (isextra)
         retval = arg.array_value (true).xsum (dim);
@@ -3430,7 +3430,7 @@

               SparseComplexMatrix result;
               result = SparseComplexMatrix (re_val)
-                + Complex (0, 1) * SparseComplexMatrix (im_val);
+                       + Complex (0, 1) * SparseComplexMatrix (im_val);
               retval = octave_value (new octave_sparse_complex_matrix (result));
             }
         }
@@ -7385,14 +7385,14 @@
                              fval.cell_value ());
         }

-        MAKE_INT_BRANCH (int8)
-        MAKE_INT_BRANCH (int16)
-        MAKE_INT_BRANCH (int32)
-        MAKE_INT_BRANCH (int64)
-        MAKE_INT_BRANCH (uint8)
-        MAKE_INT_BRANCH (uint16)
-        MAKE_INT_BRANCH (uint32)
-        MAKE_INT_BRANCH (uint64)
+      MAKE_INT_BRANCH (int8)
+      MAKE_INT_BRANCH (int16)
+      MAKE_INT_BRANCH (int32)
+      MAKE_INT_BRANCH (int64)
+      MAKE_INT_BRANCH (uint8)
+      MAKE_INT_BRANCH (uint16)
+      MAKE_INT_BRANCH (uint32)
+      MAKE_INT_BRANCH (uint64)

       else
         error ("merge: cannot merge %s with %s with array mask",
@@ -7420,7 +7420,7 @@
         {
           idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
           retval = SparseT (retval.index (col1, sl1))
-                 - SparseT (retval.index (col2, sl2));
+                   - SparseT (retval.index (col2, sl2));
           assert (retval.columns () == k-1);
           order--;
           k--;
@@ -7433,7 +7433,7 @@
         {
           idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
           retval = SparseT (retval.index (sl1, col1))
-                 - SparseT (retval.index (sl2, col2));
+                   - SparseT (retval.index (sl2, col2));
           assert (retval.rows () == k-1);
           order--;
           k--;
@@ -7884,3 +7884,4 @@
 %!error <input was not valid base64> base64_decode ("AQ=")
 %!error <incorrect input size> base64_decode ("AQ==")
 */
+
--- a/libinterp/corefcn/data.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/data.h	Tue Aug 30 21:46:47 2016 -0700
@@ -34,3 +34,4 @@
 do_class_concat (const octave_value_list& ovl, std::string cattype, int dim);

 #endif
+
--- a/libinterp/corefcn/debug.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/debug.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -276,160 +276,160 @@
       // process the actual arguments
       switch (token)
         {
-          case dbstop_in:
-            symbol_name = args(pos).string_value ();
-            if (seen_in)
-              error ("%s: Too many function names specified -- %s",
-                     who, symbol_name.c_str ());
-            else if (seen_at || seen_if)
-              error ("%s: function name must come before line number and 'if'",
-                     who);
-            seen_in = true;
-            pos++;
-            break;
+        case dbstop_in:
+          symbol_name = args(pos).string_value ();
+          if (seen_in)
+            error ("%s: Too many function names specified -- %s",
+                   who, symbol_name.c_str ());
+          else if (seen_at || seen_if)
+            error ("%s: function name must come before line number and 'if'",
+                   who);
+          seen_in = true;
+          pos++;
+          break;

-          case dbstop_at:
-            if (seen_at)
-              error ("%s: Only one 'at' clause is allowed -- %s",
-                     who, args(pos).string_value ().c_str ());
-            else if (seen_if)
-                error ("%s: line number must come before 'if' clause\n");
-            seen_at = true;
+        case dbstop_at:
+          if (seen_at)
+            error ("%s: Only one 'at' clause is allowed -- %s",
+                   who, args(pos).string_value ().c_str ());
+          else if (seen_if)
+            error ("%s: line number must come before 'if' clause\n");
+          seen_at = true;

-            if (! seen_in)
-              {
-                // It was a line number.  Get function name from debugger.
-                if (Vdebugging)
-                  symbol_name = get_user_code ()->profiler_name ();
-                else
-                  error ("%s: function name must come before line number "
-                         "and 'if'", who);
-                seen_in = true;
-              }
-            else if (seen_if)
-              error ("%s: line number must come before 'if' clause\n");
+          if (! seen_in)
+            {
+              // It was a line number.  Get function name from debugger.
+              if (Vdebugging)
+                symbol_name = get_user_code ()->profiler_name ();
+              else
+                error ("%s: function name must come before line number "
+                       "and 'if'", who);
+              seen_in = true;
+            }
+          else if (seen_if)
+            error ("%s: line number must come before 'if' clause\n");

-            // Read a list of line numbers (or arrays thereof)
-            for ( ; pos < nargin; pos++)
-              {
-                if (args(pos).is_string ())
-                  {
-                    int line = atoi (args(pos).string_value ().c_str ());
+          // Read a list of line numbers (or arrays thereof)
+          for ( ; pos < nargin; pos++)
+            {
+              if (args(pos).is_string ())
+                {
+                  int line = atoi (args(pos).string_value ().c_str ());

-                    if (line > 0)
-                      lines[list_idx++] = line;
-                    else
-                      break;        // may be "if"
-                  }
-                else if (args(pos).is_numeric_type ())
-                  {
-                    const NDArray arg = args(pos).array_value ();
+                  if (line > 0)
+                    lines[list_idx++] = line;
+                  else
+                    break;        // may be "if"
+                }
+              else if (args(pos).is_numeric_type ())
+                {
+                  const NDArray arg = args(pos).array_value ();

-                    for (octave_idx_type j = 0; j < arg.numel (); j++)
-                      lines[list_idx++] = static_cast<int> (arg.elem (j));
-                  }
-                else
-                  error ("%s: Invalid argument type %s",
-                         args(pos).type_name ().c_str ());
-              }
-            break;
+                  for (octave_idx_type j = 0; j < arg.numel (); j++)
+                    lines[list_idx++] = static_cast<int> (arg.elem (j));
+                }
+              else
+                error ("%s: Invalid argument type %s",
+                       args(pos).type_name ().c_str ());
+            }
+          break;

-          case dbstop_if:
-            if (seen_in)    // conditional breakpoint
-              {
-                cond = "";  // remaining arguments form condition
-                for (; pos < nargin; pos++)
-                  {
-                    if (args(pos).is_string ())
-                      cond = cond + " " + args(pos).string_value ();
-                    else
-                      error ("%s: arguments to 'if' must all be strings", who);
-                  }
+        case dbstop_if:
+          if (seen_in)    // conditional breakpoint
+            {
+              cond = "";  // remaining arguments form condition
+              for (; pos < nargin; pos++)
+                {
+                  if (args(pos).is_string ())
+                    cond = cond + " " + args(pos).string_value ();
+                  else
+                    error ("%s: arguments to 'if' must all be strings", who);
+                }

-                cond = cond.substr (1);   // omit initial space
-              }
-            else    // stop on event (error, warning, interrupt, NaN/inf)
-              {
-                std::string condition = args(pos).string_value ();
-                int on_off = ! strcmp(who, "dbstop");
+              cond = cond.substr (1);   // omit initial space
+            }
+          else    // stop on event (error, warning, interrupt, NaN/inf)
+            {
+              std::string condition = args(pos).string_value ();
+              int on_off = ! strcmp(who, "dbstop");

-                // list of error/warning IDs to update
-                std::set<std::string> *id_list = NULL;
-                bool *stop_flag = NULL;         // Vdebug_on_... flag
+              // list of error/warning IDs to update
+              std::set<std::string> *id_list = NULL;
+              bool *stop_flag = NULL;         // Vdebug_on_... flag

-                if (condition == "error")
-                  {
-                    id_list = &bp_table::errors_that_stop;
-                    stop_flag = &Vdebug_on_error;
-                  }
-                else if (condition == "warning")
-                  {
-                    id_list = &bp_table::warnings_that_stop;
-                    stop_flag = &Vdebug_on_warning;
-                  }
-                else if (condition == "caught" && nargin > pos+1
-                         && args(pos+1).string_value () == "error")
-                  {
-                    id_list = &bp_table::caught_that_stop;
-                    stop_flag = &Vdebug_on_caught;
-                    pos++;
-                  }
-                else if (condition == "interrupt")
-                  {
-                    octave::Vdebug_on_interrupt = on_off;
-                  }
-                else if (condition == "naninf")
+              if (condition == "error")
+                {
+                  id_list = &bp_table::errors_that_stop;
+                  stop_flag = &Vdebug_on_error;
+                }
+              else if (condition == "warning")
+                {
+                  id_list = &bp_table::warnings_that_stop;
+                  stop_flag = &Vdebug_on_warning;
+                }
+              else if (condition == "caught" && nargin > pos+1
+                       && args(pos+1).string_value () == "error")
+                {
+                  id_list = &bp_table::caught_that_stop;
+                  stop_flag = &Vdebug_on_caught;
+                  pos++;
+                }
+              else if (condition == "interrupt")
+                {
+                  octave::Vdebug_on_interrupt = on_off;
+                }
+              else if (condition == "naninf")
 #if defined (DBSTOP_NANINF)
-                  {
-                    Vdebug_on_naninf = on_off;
-                    enable_fpe (on_off);
-                  }
+                {
+                  Vdebug_on_naninf = on_off;
+                  enable_fpe (on_off);
+                }
 #else
-                  warning ("%s: condition '%s' not yet supported",
-                           who, condition.c_str ());
+                warning ("%s: condition '%s' not yet supported",
+                         who, condition.c_str ());
 #endif
-                else
-                  error ("%s: invalid condition %s",
-                         who, condition.c_str ());
+              else
+                error ("%s: invalid condition %s",
+                       who, condition.c_str ());

-                // process ID list for "dbstop if error <error_ID>" etc
-                if (id_list != NULL)
-                  {
-                    pos++;
-                    if (pos < nargin)       // only affect a single error ID
-                      {
-                        if (! args(pos).is_string () || nargin > pos+1)
-                          error ("%s: ID must be a single string", who);
-                        else if (on_off == 1)
-                          {
-                            id_list->insert (args(pos).string_value ());
-                            *stop_flag = 1;
-                          }
-                        else
-                          {
-                            id_list->erase (args(pos).string_value ());
-                            if (id_list->empty ())
-                              *stop_flag = 0;
-                          }
-                      }
-                    else   // unqualified.  Turn all on or off
-                      {
-                        id_list->clear ();
-                        *stop_flag = on_off;
-                        if (stop_flag == &Vdebug_on_error)
-                          {
-                            // Matlab stops on both.
-                            octave::Vdebug_on_interrupt = on_off;
-                          }
-                      }
-                  }
+              // process ID list for "dbstop if error <error_ID>" etc
+              if (id_list != NULL)
+                {
+                  pos++;
+                  if (pos < nargin)       // only affect a single error ID
+                    {
+                      if (! args(pos).is_string () || nargin > pos+1)
+                        error ("%s: ID must be a single string", who);
+                      else if (on_off == 1)
+                        {
+                          id_list->insert (args(pos).string_value ());
+                          *stop_flag = 1;
+                        }
+                      else
+                        {
+                          id_list->erase (args(pos).string_value ());
+                          if (id_list->empty ())
+                            *stop_flag = 0;
+                        }
+                    }
+                  else   // unqualified.  Turn all on or off
+                    {
+                      id_list->clear ();
+                      *stop_flag = on_off;
+                      if (stop_flag == &Vdebug_on_error)
+                        {
+                          // Matlab stops on both.
+                          octave::Vdebug_on_interrupt = on_off;
+                        }
+                    }
+                }

-                pos = nargin;
-              }
-            break;
+              pos = nargin;
+            }
+          break;

-          default:      // dbstop_none should never occur
-            break;
+        default:      // dbstop_none should never occur
+          break;
         }
     }
 }
@@ -753,7 +753,8 @@
         }
     }

-  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () || Vdebugging;
+  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints ()
+                                       || Vdebugging;

   return retval;
 }
@@ -851,7 +852,8 @@
         }
     }

-  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () || Vdebugging;
+  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints ()
+                                       || Vdebugging;

   return retval;
 }
@@ -884,7 +886,8 @@
     error ("remove_all_breakpoint_in_file: "
            "unable to find function %s\n", fname.c_str ());

-  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () || Vdebugging;
+  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints ()
+                                       || Vdebugging;

   return retval;
 }
@@ -901,7 +904,8 @@
       remove_all_breakpoints_in_file (*it);
     }

-  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () || Vdebugging;
+  octave::tree_evaluator::debug_mode = bp_table::have_breakpoints ()
+                                       || Vdebugging;
 }

 std::string
@@ -967,7 +971,7 @@
                       if (cmds)
                         {
                           std::list<bp_type> bkpts
-                                             = cmds->breakpoints_and_conds ();
+                            = cmds->breakpoints_and_conds ();

                           if (! bkpts.empty ())
                             retval[bp_fname + Vfilemarker + ff->name ()] = bkpts;
@@ -1600,25 +1604,25 @@
   if (ff.empty ())
     os << "dbtype: unknown function " << name << "\n";
   else
-  {
-    std::ifstream fs (ff.c_str (), std::ios::in);
+    {
+      std::ifstream fs (ff.c_str (), std::ios::in);

-    if (! fs)
-      os << "dbtype: unable to open '" << ff << "' for reading!\n";
-    else
-    {
-      int line = 1;
-      std::string text;
+      if (! fs)
+        os << "dbtype: unable to open '" << ff << "' for reading!\n";
+      else
+        {
+          int line = 1;
+          std::string text;

-      while (std::getline (fs, text) && line <= end)
-        {
-          if (line >= start)
-            os << line << "\t" << text << "\n";
+          while (std::getline (fs, text) && line <= end)
+            {
+              if (line >= start)
+                os << line << "\t" << text << "\n";

-          line++;
+              line++;
+            }
         }
     }
-  }

   os.flush ();
 }
--- a/libinterp/corefcn/debug.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/debug.h	Tue Aug 30 21:46:47 2016 -0700
@@ -201,3 +201,4 @@
 extern std::string get_file_line (const std::string& fname, size_t line);

 #endif
+
--- a/libinterp/corefcn/defaults.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/defaults.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -609,3 +609,4 @@
 %!assert (ischar (OCTAVE_VERSION ()))
 %!error OCTAVE_VERSION (1)
 */
+
--- a/libinterp/corefcn/defaults.in.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/defaults.in.h	Tue Aug 30 21:46:47 2016 -0700
@@ -239,3 +239,4 @@
 set_image_path (const std::string& path = "");

 #endif
+
--- a/libinterp/corefcn/defun-dld.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/defun-dld.h	Tue Aug 30 21:46:47 2016 -0700
@@ -53,3 +53,4 @@
   DECLARE_FUNX (fname, args_name, nargout_name)

 #endif
+
--- a/libinterp/corefcn/defun-int.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/defun-int.h	Tue Aug 30 21:46:47 2016 -0700
@@ -129,3 +129,4 @@
   }

 #endif
+
--- a/libinterp/corefcn/defun.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/defun.h	Tue Aug 30 21:46:47 2016 -0700
@@ -65,3 +65,4 @@
 #define DEFALIAS(alias, name)

 #endif
+
--- a/libinterp/corefcn/det.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/det.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -181,7 +181,7 @@

               MAYBE_CAST (rep, octave_matrix);
               MatrixType mtype = rep ? rep -> matrix_type ()
-                : MatrixType ();
+                                     : MatrixType ();
               DET det = m.determinant (mtype, info, rcond);
               retval(0) = info == -1 ? 0.0 : det.value ();
               retval(1) = rcond;
@@ -208,7 +208,7 @@

               MAYBE_CAST (rep, octave_complex_matrix);
               MatrixType mtype = rep ? rep -> matrix_type ()
-                : MatrixType ();
+                                     : MatrixType ();
               ComplexDET det = m.determinant (mtype, info, rcond);
               retval(0) = info == -1 ? Complex (0.0) : det.value ();
               retval(1) = rcond;
@@ -230,3 +230,4 @@
 %!error det (1, 2)
 %!error <must be a square matrix> det ([1, 2; 3, 4; 5, 6])
 */
+
--- a/libinterp/corefcn/dirfns.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dirfns.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -706,3 +706,4 @@
 {
   return SET_INTERNAL_VARIABLE (confirm_recursive_rmdir);
 }
+
--- a/libinterp/corefcn/dirfns.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dirfns.h	Tue Aug 30 21:46:47 2016 -0700
@@ -35,3 +35,4 @@
 extern octave::sys::time Vlast_chdir_time;

 #endif
+
--- a/libinterp/corefcn/display.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/display.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -67,3 +67,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/display.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/display.h	Tue Aug 30 21:46:47 2016 -0700
@@ -126,3 +126,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/dlmread.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dlmread.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -506,3 +506,4 @@
 %!test
 %! unlink (file);
 */
+
--- a/libinterp/corefcn/dynamic-ld.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dynamic-ld.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -57,7 +57,8 @@

   static void append (const octave::dynamic_library& shl);

-  static void remove (octave::dynamic_library& shl, octave::dynamic_library::close_hook cl_hook = 0);
+  static void remove (octave::dynamic_library& shl,
+                      octave::dynamic_library::close_hook cl_hook = 0);

   static octave::dynamic_library find_file (const std::string& file_name);

@@ -71,7 +72,8 @@

   void do_append (const octave::dynamic_library& shl);

-  void do_remove (octave::dynamic_library& shl, octave::dynamic_library::close_hook cl_hook = 0);
+  void do_remove (octave::dynamic_library& shl,
+                  octave::dynamic_library::close_hook cl_hook = 0);

   octave::dynamic_library do_find_file (const std::string& file_name) const;

@@ -453,3 +455,4 @@
 {
   return STRINGIFY (F77_FUNC (mexfunction, MEXFUNCTION));
 }
+
--- a/libinterp/corefcn/dynamic-ld.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/dynamic-ld.h	Tue Aug 30 21:46:47 2016 -0700
@@ -52,9 +52,11 @@
             const std::string& file_name = "",
             bool relative = false);

-  static bool remove_oct (const std::string& fcn_name, octave::dynamic_library& shl);
+  static bool remove_oct (const std::string& fcn_name,
+                          octave::dynamic_library& shl);

-  static bool remove_mex (const std::string& fcn_name, octave::dynamic_library& shl);
+  static bool remove_mex (const std::string& fcn_name,
+                          octave::dynamic_library& shl);

 private:

@@ -100,3 +102,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/eig.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/eig.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -122,18 +122,18 @@
   bool AEPcase = nargin == 1 || args(1).is_string ();

   if (! AEPcase)
-  {
-    arg_b = args(1);
+    {
+      arg_b = args(1);

-    if (arg_b.is_empty ())
-      return octave_value_list (2, Matrix ());
+      if (arg_b.is_empty ())
+        return octave_value_list (2, Matrix ());

-    if (! arg_b.is_float_type ())
-      err_wrong_type_arg ("eig", arg_b);
+      if (! arg_b.is_float_type ())
+        err_wrong_type_arg ("eig", arg_b);

-    if (arg_b.rows () != arg_b.columns ())
-      err_square_matrix_required ("eig", "B");
-  }
+      if (arg_b.rows () != arg_b.columns ())
+        err_square_matrix_required ("eig", "B");
+    }

   bool qz_flag = false;
   bool chol_flag = false;
@@ -641,3 +641,4 @@
 %!error <wrong type argument>
 %!  eig ([1 2 ; 2 3], [1 2 ; 2 3], [1 2 ; 2 3])
 */
+
--- a/libinterp/corefcn/error.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/error.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1077,7 +1077,8 @@
             }
           else
             nargs(0) = "call to " + caller
-              + " with message identifier '" + arg1 + "' requires message";
+                       + " with message identifier '" + arg1
+                       + "' requires message";
         }
     }

@@ -1549,8 +1550,8 @@
               m.contents ("identifier") = ids;
               m.contents ("state") = states;

-              symbol_table::assign
-                (".saved_warning_states.", m, scope, context);
+              symbol_table::assign (".saved_warning_states.",
+                                    m, scope, context);

               // Now ignore the "local" argument and continue to
               // handle the current setting.
--- a/libinterp/corefcn/error.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/error.h	Tue Aug 30 21:46:47 2016 -0700
@@ -177,3 +177,4 @@
 extern OCTINTERP_API void interpreter_try (octave::unwind_protect&);

 #endif
+
--- a/libinterp/corefcn/errwarn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/errwarn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -183,3 +183,4 @@
 warn_wrong_type_arg (const char *name, const octave_value& tc);

 #endif
+
--- a/libinterp/corefcn/event-queue.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/event-queue.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -34,3 +34,4 @@
            "It is a bug in Octave for this to happen.  "
            "Please help improve Octave by reporting it.");
 }
+
--- a/libinterp/corefcn/event-queue.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/event-queue.h	Tue Aug 30 21:46:47 2016 -0700
@@ -124,3 +124,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/fft.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/fft.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -292,3 +292,4 @@
 %!
 %! assert (ifft (S), s, 4*N*eps ("single"));
 */
+
--- a/libinterp/corefcn/fft2.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/fft2.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -261,3 +261,4 @@
 %!
 %! assert (s, answer, 30*eps ("single"));
 */
+
--- a/libinterp/corefcn/fftn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/fftn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -162,3 +162,4 @@
 {
   return do_fftn (args, "ifftn", 1);
 }
+
--- a/libinterp/corefcn/file-io.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/file-io.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -3125,3 +3125,4 @@
 {
   return const_value ("stderr", args, stderr_file);
 }
+
--- a/libinterp/corefcn/file-io.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/file-io.h	Tue Aug 30 21:46:47 2016 -0700
@@ -36,3 +36,4 @@
 extern OCTINTERP_API void cleanup_tmp_files (void);

 #endif
+
--- a/libinterp/corefcn/filter.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/filter.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -614,3 +614,4 @@
 %! y = filter ([1 1 1], 1, x, [], 3);
 %! assert (y, y0);
 */
+
--- a/libinterp/corefcn/find.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/find.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -394,7 +394,8 @@
     {
       double val = args(1).xscalar_value ("find: N must be an integer");

-      if (val < 0 || (! octave::math::isinf (val) && val != octave::math::round (val)))
+      if (val < 0 || (! octave::math::isinf (val)
+                      && val != octave::math::round (val)))
         error ("find: N must be a non-negative integer");
       else if (! octave::math::isinf (val))
         n_to_find = val;
@@ -579,3 +580,4 @@

 %!error find ()
 */
+
--- a/libinterp/corefcn/ft-text-renderer.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ft-text-renderer.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -89,229 +89,229 @@

 namespace octave
 {
-class
-ft_manager
-{
-public:
-  static bool instance_ok (void)
+  class
+  ft_manager
   {
-    bool retval = true;
+  public:
+    static bool instance_ok (void)
+    {
+      bool retval = true;

-    if (! instance)
-      {
-        instance = new ft_manager ();
+      if (! instance)
+        {
+          instance = new ft_manager ();

-        if (instance)
-          singleton_cleanup_list::add (cleanup_instance);
-      }
+          if (instance)
+            singleton_cleanup_list::add (cleanup_instance);
+        }

-    if (! instance)
-      error ("unable to create ft_manager!");
+      if (! instance)
+        error ("unable to create ft_manager!");

-    return retval;
-  }
+      return retval;
+    }

-  static void cleanup_instance (void) { delete instance; instance = 0; }
+    static void cleanup_instance (void) { delete instance; instance = 0; }

-  static FT_Face get_font (const std::string& name, const std::string& weight,
-                           const std::string& angle, double size)
-  {
-    return (instance_ok ()
-            ? instance->do_get_font (name, weight, angle, size)
-            : 0);
-  }
+    static FT_Face get_font (const std::string& name, const std::string& weight,
+                             const std::string& angle, double size)
+    {
+      return (instance_ok ()
+              ? instance->do_get_font (name, weight, angle, size)
+              : 0);
+    }

-  static void font_destroyed (FT_Face face)
-  {
-    if (instance_ok ())
-      instance->do_font_destroyed (face);
-  }
+    static void font_destroyed (FT_Face face)
+    {
+      if (instance_ok ())
+        instance->do_font_destroyed (face);
+    }

-private:
+  private:

-  static ft_manager *instance;
+    static ft_manager *instance;

-  typedef std::pair<std::string, double> ft_key;
-  typedef std::map<ft_key, FT_Face> ft_cache;
+    typedef std::pair<std::string, double> ft_key;
+    typedef std::map<ft_key, FT_Face> ft_cache;

-  // Cache the fonts loaded by FreeType.  This cache only contains
-  // weak references to the fonts, strong references are only present
-  // in class text_renderer.
-  ft_cache cache;
+    // Cache the fonts loaded by FreeType.  This cache only contains
+    // weak references to the fonts, strong references are only present
+    // in class text_renderer.
+    ft_cache cache;

-private:
+  private:

-  // No copying!
+    // No copying!

-  ft_manager (const ft_manager&);
+    ft_manager (const ft_manager&);

-  ft_manager& operator = (const ft_manager&);
+    ft_manager& operator = (const ft_manager&);

-  ft_manager (void)
-    : library (), freetype_initialized (false), fontconfig_initialized (false)
-  {
-    if (FT_Init_FreeType (&library))
-      error ("unable to initialize FreeType library");
-    else
-      freetype_initialized = true;
+    ft_manager (void)
+      : library (), freetype_initialized (false), fontconfig_initialized (false)
+    {
+      if (FT_Init_FreeType (&library))
+        error ("unable to initialize FreeType library");
+      else
+        freetype_initialized = true;

 #if defined (HAVE_FONTCONFIG)
-    if (! FcInit ())
-      error ("unable to initialize fontconfig library");
-    else
-      fontconfig_initialized = true;
+      if (! FcInit ())
+        error ("unable to initialize fontconfig library");
+      else
+        fontconfig_initialized = true;
 #endif
-  }
+    }

-  ~ft_manager (void)
-  {
-    if (freetype_initialized)
-      FT_Done_FreeType (library);
+    ~ft_manager (void)
+    {
+      if (freetype_initialized)
+        FT_Done_FreeType (library);

 #if defined (HAVE_FONTCONFIG)
-    // FIXME: Skip the call to FcFini because it can trigger the assertion
-    //
-    //   octave: fccache.c:507: FcCacheFini: Assertion 'fcCacheChains[i] == ((void *)0)' failed.
-    //
-    // if (fontconfig_initialized)
-    //   FcFini ();
+      // FIXME: Skip the call to FcFini because it can trigger the assertion
+      //
+      //   octave: fccache.c:507: FcCacheFini: Assertion 'fcCacheChains[i] == ((void *)0)' failed.
+      //
+      // if (fontconfig_initialized)
+      //   FcFini ();
 #endif
-  }
+    }

-  FT_Face do_get_font (const std::string& name, const std::string& weight,
-                       const std::string& angle, double size)
-  {
-    FT_Face retval = 0;
+    FT_Face do_get_font (const std::string& name, const std::string& weight,
+                         const std::string& angle, double size)
+    {
+      FT_Face retval = 0;

 #if defined (HAVE_FT_REFERENCE_FACE)
-    // Look first into the font cache, then use fontconfig.  If the font
-    // is present in the cache, simply add a reference and return it.
+      // Look first into the font cache, then use fontconfig.  If the font
+      // is present in the cache, simply add a reference and return it.

-    ft_key key (name + ":" + weight + ":" + angle, size);
-    ft_cache::const_iterator it = cache.find (key);
+      ft_key key (name + ":" + weight + ":" + angle, size);
+      ft_cache::const_iterator it = cache.find (key);

-    if (it != cache.end ())
-      {
-        FT_Reference_Face (it->second);
-        return it->second;
-      }
+      if (it != cache.end ())
+        {
+          FT_Reference_Face (it->second);
+          return it->second;
+        }
 #endif

-    std::string file;
+      std::string file;

 #if defined (HAVE_FONTCONFIG)
-    if (fontconfig_initialized)
-      {
-        int fc_weight, fc_angle;
+      if (fontconfig_initialized)
+        {
+          int fc_weight, fc_angle;

-        if (weight == "bold")
-          fc_weight = FC_WEIGHT_BOLD;
-        else if (weight == "light")
-          fc_weight = FC_WEIGHT_LIGHT;
-        else if (weight == "demi")
-          fc_weight = FC_WEIGHT_DEMIBOLD;
-        else
-          fc_weight = FC_WEIGHT_NORMAL;
+          if (weight == "bold")
+            fc_weight = FC_WEIGHT_BOLD;
+          else if (weight == "light")
+            fc_weight = FC_WEIGHT_LIGHT;
+          else if (weight == "demi")
+            fc_weight = FC_WEIGHT_DEMIBOLD;
+          else
+            fc_weight = FC_WEIGHT_NORMAL;

-        if (angle == "italic")
-          fc_angle = FC_SLANT_ITALIC;
-        else if (angle == "oblique")
-          fc_angle = FC_SLANT_OBLIQUE;
-        else
-          fc_angle = FC_SLANT_ROMAN;
+          if (angle == "italic")
+            fc_angle = FC_SLANT_ITALIC;
+          else if (angle == "oblique")
+            fc_angle = FC_SLANT_OBLIQUE;
+          else
+            fc_angle = FC_SLANT_ROMAN;

-        FcPattern *pat = FcPatternCreate ();
+          FcPattern *pat = FcPatternCreate ();

-        FcPatternAddString (pat, FC_FAMILY,
-                            (reinterpret_cast<const FcChar8*>
-                             (name == "*" ? "sans" : name.c_str ())));
+          FcPatternAddString (pat, FC_FAMILY,
+                              (reinterpret_cast<const FcChar8*>
+                               (name == "*" ? "sans" : name.c_str ())));

-        FcPatternAddInteger (pat, FC_WEIGHT, fc_weight);
-        FcPatternAddInteger (pat, FC_SLANT, fc_angle);
-        FcPatternAddDouble (pat, FC_PIXEL_SIZE, size);
+          FcPatternAddInteger (pat, FC_WEIGHT, fc_weight);
+          FcPatternAddInteger (pat, FC_SLANT, fc_angle);
+          FcPatternAddDouble (pat, FC_PIXEL_SIZE, size);

-        if (FcConfigSubstitute (0, pat, FcMatchPattern))
-          {
-            FcResult res;
-            FcPattern *match;
+          if (FcConfigSubstitute (0, pat, FcMatchPattern))
+            {
+              FcResult res;
+              FcPattern *match;

-            FcDefaultSubstitute (pat);
-            match = FcFontMatch (0, pat, &res);
+              FcDefaultSubstitute (pat);
+              match = FcFontMatch (0, pat, &res);

-            // FIXME: originally, this test also required that
-            // res != FcResultNoMatch.  Is that really needed?
-            if (match)
-              {
-                unsigned char *tmp;
+              // FIXME: originally, this test also required that
+              // res != FcResultNoMatch.  Is that really needed?
+              if (match)
+                {
+                  unsigned char *tmp;

-                FcPatternGetString (match, FC_FILE, 0, &tmp);
-                file = reinterpret_cast<char*> (tmp);
-              }
-            else
-              ::warning ("could not match any font: %s-%s-%s-%g",
-                         name.c_str (), weight.c_str (), angle.c_str (),
-                         size);
+                  FcPatternGetString (match, FC_FILE, 0, &tmp);
+                  file = reinterpret_cast<char*> (tmp);
+                }
+              else
+                ::warning ("could not match any font: %s-%s-%s-%g",
+                           name.c_str (), weight.c_str (), angle.c_str (),
+                           size);

-            if (match)
-              FcPatternDestroy (match);
-          }
+              if (match)
+                FcPatternDestroy (match);
+            }

-        FcPatternDestroy (pat);
-      }
+          FcPatternDestroy (pat);
+        }
 #endif

-    if (file.empty ())
-      {
+      if (file.empty ())
+        {
 #if defined (OCTAVE_USE_WINDOWS_API)
-        file = "C:/WINDOWS/Fonts/verdana.ttf";
+          file = "C:/WINDOWS/Fonts/verdana.ttf";
 #else
-        // FIXME: find a "standard" font for UNIX platforms
+          // FIXME: find a "standard" font for UNIX platforms
 #endif
-      }
+        }

-    if (! file.empty ())
-      {
-        if (FT_New_Face (library, file.c_str (), 0, &retval))
-          ::warning ("ft_manager: unable to load font: %s", file.c_str ());
+      if (! file.empty ())
+        {
+          if (FT_New_Face (library, file.c_str (), 0, &retval))
+            ::warning ("ft_manager: unable to load font: %s", file.c_str ());
 #if defined (HAVE_FT_REFERENCE_FACE)
-        else
-          {
-            // Install a finalizer to notify ft_manager that the font is
-            // being destroyed.  The class ft_manager only keeps weak
-            // references to font objects.
+          else
+            {
+              // Install a finalizer to notify ft_manager that the font is
+              // being destroyed.  The class ft_manager only keeps weak
+              // references to font objects.

-            retval->generic.data = new ft_key (key);
-            retval->generic.finalizer = ft_face_destroyed;
+              retval->generic.data = new ft_key (key);
+              retval->generic.finalizer = ft_face_destroyed;

-            // Insert loaded font into the cache.
+              // Insert loaded font into the cache.

-            cache[key] = retval;
-          }
+              cache[key] = retval;
+            }
 #endif
-      }
+        }

-    return retval;
-  }
+      return retval;
+    }

-  void do_font_destroyed (FT_Face face)
-  {
-    if (face->generic.data)
-      {
-        ft_key *pkey = reinterpret_cast<ft_key*> (face->generic.data);
+    void do_font_destroyed (FT_Face face)
+    {
+      if (face->generic.data)
+        {
+          ft_key *pkey = reinterpret_cast<ft_key*> (face->generic.data);

-        cache.erase (*pkey);
-        delete pkey;
-        face->generic.data = 0;
-      }
-  }
+          cache.erase (*pkey);
+          delete pkey;
+          face->generic.data = 0;
+        }
+    }

-private:
-  FT_Library library;
-  bool freetype_initialized;
-  bool fontconfig_initialized;
-};
+  private:
+    FT_Library library;
+    bool freetype_initialized;
+    bool fontconfig_initialized;
+  };

-ft_manager *ft_manager::instance = 0;
+  ft_manager *ft_manager::instance = 0;

 }

@@ -347,9 +347,9 @@

     ft_text_renderer (void)
       : base_text_renderer (), font (), bbox (1, 4, 0.0), halign (0),
-      xoffset (0), line_yoffset (0), yoffset (0), mode (MODE_BBOX),
-      color (dim_vector (1, 3), 0)
-        { }
+        xoffset (0), line_yoffset (0), yoffset (0), mode (MODE_BBOX),
+        color (dim_vector (1, 3), 0)
+    { }

     ~ft_text_renderer (void) { }

@@ -1384,3 +1384,4 @@
 #endif
   }
 }
+
--- a/libinterp/corefcn/ft-text-renderer.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ft-text-renderer.h	Tue Aug 30 21:46:47 2016 -0700
@@ -34,3 +34,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/gammainc.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gammainc.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -114,13 +114,15 @@
             {
               float a = a_arg.float_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1.0f - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0f - octave::math::gammainc (x, a);
             }
           else
             {
               FloatNDArray a = a_arg.float_array_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1.0f - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0f - octave::math::gammainc (x, a);
             }
         }
       else
@@ -131,13 +133,15 @@
             {
               float a = a_arg.float_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1.0f - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0f - octave::math::gammainc (x, a);
             }
           else
             {
               FloatNDArray a = a_arg.float_array_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1.0f - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0f - octave::math::gammainc (x, a);
             }
         }
     }
@@ -151,13 +155,15 @@
             {
               double a = a_arg.double_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1. - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0 - octave::math::gammainc (x, a);
             }
           else
             {
               NDArray a = a_arg.array_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1. - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0 - octave::math::gammainc (x, a);
             }
         }
       else
@@ -168,13 +174,15 @@
             {
               double a = a_arg.double_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1. - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0 - octave::math::gammainc (x, a);
             }
           else
             {
               NDArray a = a_arg.array_value ();

-              retval = lower ? octave::math::gammainc (x, a) : 1. - octave::math::gammainc (x, a);
+              retval = lower ? octave::math::gammainc (x, a)
+                             : 1.0 - octave::math::gammainc (x, a);
             }
         }
     }
@@ -203,3 +211,4 @@
 %!        single (1)-gammainc (single (0:4), single (0.5)),
 %!        single (1e-7))
 */
+
--- a/libinterp/corefcn/gcd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gcd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -75,8 +75,10 @@
 static std::complex<FP>
 simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b)
 {
-  if (! octave::math::isinteger (a.real ()) || ! octave::math::isinteger (a.imag ())
-      || ! octave::math::isinteger (b.real ()) || ! octave::math::isinteger (b.imag ()))
+  if (! octave::math::isinteger (a.real ())
+      || ! octave::math::isinteger (a.imag ())
+      || ! octave::math::isinteger (b.real ())
+      || ! octave::math::isinteger (b.imag ()))
     error ("gcd: all complex parts must be integers");

   std::complex<FP> aa = a;
@@ -154,8 +156,10 @@
 extended_gcd (const std::complex<FP>& a, const std::complex<FP>& b,
               std::complex<FP>& x, std::complex<FP>& y)
 {
-  if (! octave::math::isinteger (a.real ()) || ! octave::math::isinteger (a.imag ())
-      || ! octave::math::isinteger (b.real ()) || ! octave::math::isinteger (b.imag ()))
+  if (! octave::math::isinteger (a.real ())
+      || ! octave::math::isinteger (a.imag ())
+      || ! octave::math::isinteger (b.real ())
+      || ! octave::math::isinteger (b.imag ()))
     error ("gcd: all complex parts must be integers");

   std::complex<FP> aa = a;
@@ -274,10 +278,10 @@
       retval = do_simple_gcd<NDArray> (a, b);
       break;

-#define MAKE_INT_BRANCH(X)                              \
-      case btyp_ ## X:                                  \
-        retval = do_simple_gcd<X ## NDArray> (a, b);    \
-        break
+#define MAKE_INT_BRANCH(X)                            \
+    case btyp_ ## X:                                  \
+      retval = do_simple_gcd<X ## NDArray> (a, b);    \
+      break

     MAKE_INT_BRANCH (int8);
     MAKE_INT_BRANCH (int16);
@@ -386,10 +390,10 @@
       retval = do_extended_gcd<NDArray> (a, b, x, y);
       break;

-#define MAKE_INT_BRANCH(X)                                      \
-      case btyp_ ## X:                                          \
-        retval = do_extended_gcd<X ## NDArray> (a, b, x, y);    \
-        break
+#define MAKE_INT_BRANCH(X)                                    \
+    case btyp_ ## X:                                          \
+      retval = do_extended_gcd<X ## NDArray> (a, b, x, y);    \
+      break

     MAKE_INT_BRANCH (int8);
     MAKE_INT_BRANCH (int16);
@@ -529,3 +533,4 @@
 %! s.a = 1;
 %! fail ("gcd (s)");
 */
+
--- a/libinterp/corefcn/getgrent.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/getgrent.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -168,3 +168,4 @@

   return ovl (static_cast<double> (status), msg);
 }
+
--- a/libinterp/corefcn/getpwent.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/getpwent.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -172,3 +172,4 @@

   return ovl (static_cast<double> (status), msg);
 }
+
--- a/libinterp/corefcn/givens.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/givens.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -174,3 +174,4 @@
 %!error givens (1)
 %!error [a,b,c] = givens (1, 1)
 */
+
--- a/libinterp/corefcn/gl-render.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gl-render.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -63,28 +63,28 @@

   // Use symbolic names for axes
   enum
-    {
-      X_AXIS,
-      Y_AXIS,
-      Z_AXIS
-    };
+  {
+    X_AXIS,
+    Y_AXIS,
+    Z_AXIS
+  };

   // Use symbolic names for color mode
   enum
-    {
-      UNIFORM,
-      FLAT,
-      INTERP,
-      TEXTURE
-    };
+  {
+    UNIFORM,
+    FLAT,
+    INTERP,
+    TEXTURE
+  };

   // Use symbolic names for lighting
   enum
-    {
-      NONE,
-      //FLAT,  // Already declared in anonymous enum for color mode
-      GOURAUD = 2
-    };
+  {
+    NONE,
+    //FLAT,  // Already declared in anonymous enum for color mode
+    GOURAUD = 2
+  };

   // Win32 API requires the CALLBACK attributes for
   // GLU callback functions.  Define it to empty on
@@ -1484,7 +1484,7 @@
         int hmax = 0;
         bool tick_along_z = nearhoriz || octave::math::isinf (fx);
         bool mirror = props.is_box () && ystate != AXE_ANY_DIR
-          && (! props.has_property ("__plotyy_axes__"));
+                      && (! props.has_property ("__plotyy_axes__"));

         // set styles when drawing only minor grid
         if (do_yminorgrid && ! do_ygrid)
@@ -1724,7 +1724,8 @@
   }

   void
-  opengl_renderer::draw_all_lights (const base_properties& props, std::list<graphics_object>& obj_list)
+  opengl_renderer::draw_all_lights (const base_properties& props,
+                                    std::list<graphics_object>& obj_list)
   {
 #if defined (HAVE_OPENGL)
     Matrix children = props.get_all_children ();
@@ -4103,3 +4104,4 @@
 #endif
   }
 }
+
--- a/libinterp/corefcn/gl-render.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gl-render.h	Tue Aug 30 21:46:47 2016 -0700
@@ -145,8 +145,10 @@

     bool is_nan_or_inf (double x, double y, double z) const
     {
-      return (octave::math::isnan (x) || octave::math::isnan (y) || octave::math::isnan (z)
-              || octave::math::isinf (x) || octave::math::isinf (y) || octave::math::isinf (z));
+      return (octave::math::isnan (x) || octave::math::isnan (y)
+              || octave::math::isnan (z)
+              || octave::math::isinf (x) || octave::math::isinf (y)
+              || octave::math::isinf (z));
     }

     octave_uint8 clip_code (double x, double y, double z) const
@@ -174,7 +176,8 @@

     void draw_axes_children (const axes::properties& props);

-    void draw_all_lights (const base_properties& props, std::list<graphics_object>& obj_list);
+    void draw_all_lights (const base_properties& props,
+                          std::list<graphics_object>& obj_list);

   private:
     // The graphics toolkit associated with the figure being rendered.
@@ -213,3 +216,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/gl2ps-print.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gl2ps-print.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -58,8 +58,8 @@

     gl2ps_renderer (FILE *_fp, const std::string& _term)
       : octave::opengl_renderer () , fp (_fp), term (_term), fontsize (),
-      fontname (), buffer_overflow (false)
-      { }
+        fontname (), buffer_overflow (false)
+    { }

     ~gl2ps_renderer (void) { }

@@ -345,9 +345,9 @@
         // Translate and rotate
         double rot = rotation * 4.0 * atan (1.0) / 180;
         coord_pix(0) += ((*p).get_x () + box(0))*cos (rot)
-          - ((*p).get_y () + box(1))*sin (rot);
+                        - ((*p).get_y () + box(1))*sin (rot);
         coord_pix(1) -= ((*p).get_y () + box(1))*cos (rot)
-          + ((*p).get_x () + box(0))*sin (rot);;
+                        + ((*p).get_x () + box(0))*sin (rot);;

         // Turn coordinates back into current gl coordinates
         ColumnVector coord =
@@ -692,12 +692,12 @@
   void
   gl2ps_renderer::draw_pixels (int w, int h, const float *data)
   {
-    // Clip data between 0 and 1 for float values
+    // Clip data between 0 and 1 for float values
     OCTAVE_LOCAL_BUFFER (float, tmp_data, 3*w*h);

     for (int i = 0; i < 3*h*w; i++)
       tmp_data[i] = (data[i] < 0.0f ? 0.0f : (data[i] > 1.0f ? 1.0f : data[i]));
-
+
     gl2psDrawPixels (w, h, 0, 0, GL_RGB, GL_FLOAT, tmp_data);
   }

@@ -847,3 +847,4 @@
 #endif
   }
 }
+
--- a/libinterp/corefcn/gl2ps-print.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gl2ps-print.h	Tue Aug 30 21:46:47 2016 -0700
@@ -43,8 +43,9 @@
              const std::string& term)
 {
   return octave::gl2ps_print (fig, stream, term);
-}
+}

 #endif

 #endif
+
--- a/libinterp/corefcn/graphics.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/graphics.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -137,7 +137,8 @@
   // a colormap_property object, we need to initialize this before main is
   // even called, so calling an interpreted function is not possible.

-  const double cmapv[] = {
+  const double cmapv[] =
+  {
     2.67004010000000e-01, 2.72651720952381e-01, 2.77106307619048e-01,
     2.80356151428571e-01, 2.82390045238095e-01, 2.83204606666667e-01,
     2.82809341428571e-01, 2.81230763333333e-01, 2.78516153333333e-01,
@@ -201,7 +202,8 @@
     2.78916748571429e-01, 2.53000856190476e-01, 2.26223670000000e-01,
     1.98879439523810e-01, 1.71494930000000e-01, 1.45037631428572e-01,
     1.21291048571429e-01, 1.03326155238095e-01, 9.53507900000000e-02,
-    1.00469958095238e-01, 1.17876387142857e-01, 1.43936200000000e-01};
+    1.00469958095238e-01, 1.17876387142857e-01, 1.43936200000000e-01
+  };

   // It would be nice if Matrix had a ctor allowing to do the
   // following without a copy
@@ -1568,7 +1570,7 @@
     }

   double dv = v.xdouble_value ("set: invalid graphics handle for property \"%s\"",
-                              get_name ().c_str ());
+                               get_name ().c_str ());

   graphics_handle gh = gh_manager::lookup (dv);

@@ -1731,7 +1733,8 @@
     }
   else if (type.compare ("handle"))
     {
-      double hv = (args.length () > 0 ? args(0).double_value () : octave::numeric_limits<double>::NaN ());
+      double hv = args.length () > 0 ? args(0).double_value ()
+                                     : octave::numeric_limits<double>::NaN ();

       graphics_handle gh (hv);

@@ -2592,7 +2595,7 @@
   graphics_handle h = octave::numeric_limits<double>::NaN ();

   double hv = ov.xdouble_value ("%s: %s must be a graphics handle",
-                               who.c_str (), pname.c_str ());
+                                who.c_str (), pname.c_str ());

   h = gh_manager::lookup (hv);

@@ -2622,7 +2625,8 @@
 {
   octave_value val = xget (0, "currentfigure");

-  return val.is_empty () ? octave::numeric_limits<double>::NaN () : val.double_value ();
+  return val.is_empty () ? octave::numeric_limits<double>::NaN ()
+                         : val.double_value ();
 }

 // This function is NOT equivalent to the scripting language function gca.
@@ -2631,7 +2635,8 @@
 {
   octave_value val = xget (gcf (), "currentaxes");

-  return val.is_empty () ? octave::numeric_limits<double>::NaN () : val.double_value ();
+  return val.is_empty () ? octave::numeric_limits<double>::NaN ()
+                         : val.double_value ();
 }

 static void
@@ -5301,10 +5306,10 @@

       if (el == 90 || el == -90)
         {
-          c_upv(0) =
-            -octave::math::signum (el) *sin (az*M_PI/180.0)*(xlimits(1)-xlimits(0))/pb(0);
-          c_upv(1) =
-            octave::math::signum (el) * cos (az*M_PI/180.0)*(ylimits(1)-ylimits(0))/pb(1);
+          c_upv(0) = -octave::math::signum (el)
+                     * sin (az*M_PI/180.0)*(xlimits(1)-xlimits(0))/pb(0);
+          c_upv(1) = octave::math::signum (el)
+                     * cos (az*M_PI/180.0)*(ylimits(1)-ylimits(0))/pb(1);
         }
       else
         c_upv(2) = 1;
@@ -5961,18 +5966,18 @@
           p = graphics_xform::xform_vector (xPlaneN, yPlane,
                                             (zpTickN + zpTick)/2);
           if (octave::math::isinf (fy))
-            p(0) += (octave::math::signum (xPlaneN - xPlane) * fx * ztickoffset);
+            p(0) += octave::math::signum (xPlaneN - xPlane) * fx * ztickoffset;
           else
-            p(1) += (octave::math::signum (yPlane - yPlaneN) * fy * ztickoffset);
+            p(1) += octave::math::signum (yPlane - yPlaneN) * fy * ztickoffset;
         }
       else
         {
           p = graphics_xform::xform_vector (xPlane, yPlaneN,
                                             (zpTickN + zpTick)/2);
           if (octave::math::isinf (fx))
-            p(1) += (octave::math::signum (yPlaneN - yPlane) * fy * ztickoffset);
+            p(1) += octave::math::signum (yPlaneN - yPlane) * fy * ztickoffset;
           else
-            p(0) += (octave::math::signum (xPlane - xPlaneN) * fx * ztickoffset);
+            p(0) += octave::math::signum (xPlane - xPlaneN) * fx * ztickoffset;
         }

       p = xform.transform (p(0), p(1), p(2), false);
@@ -6757,7 +6762,8 @@
   double min_val = xmin;
   double max_val = xmax;

-  if (octave::math::isinf (min_val) && min_val > 0 && octave::math::isinf (max_val) && max_val < 0)
+  if (octave::math::isinf (min_val) && min_val > 0
+      && octave::math::isinf (max_val) && max_val < 0)
     {
       retval = default_lim (logscale);
       return retval;
@@ -9010,7 +9016,8 @@
           && gop.get_parent () == get___myhandle__ ()
           && go.isa ("uicontrol"))
         {
-          uicontrol::properties& cop = dynamic_cast<uicontrol::properties&> (go.get_properties ());
+          uicontrol::properties& cop
+            = dynamic_cast<uicontrol::properties&> (go.get_properties ());
           const caseless_str& style = cop.get_style ();
           if (style.compare ("radiobutton") || style.compare ("togglebutton"))
             {
@@ -9648,7 +9655,8 @@
                 {
                   caseless_str cname (name);

-                  if (cname.compare ("deletefcn") || cname.compare ("createfcn")
+                  if (cname.compare ("deletefcn")
+                      || cname.compare ("createfcn")
                       || (go.isa ("figure")
                           && (cname.compare ("closerequestfcn")
                               || cname.compare ("resizefcn"))))
@@ -11782,3 +11790,4 @@

   return ovl ();
 }
+
--- a/libinterp/corefcn/graphics.in.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/graphics.in.h	Tue Aug 30 21:46:47 2016 -0700
@@ -1925,22 +1925,22 @@

 #if 0
   const string_property& as_string_property (void) const
-    { return *(dynamic_cast<string_property*> (rep)); }
+  { return *(dynamic_cast<string_property*> (rep)); }

   const radio_property& as_radio_property (void) const
-    { return *(dynamic_cast<radio_property*> (rep)); }
+  { return *(dynamic_cast<radio_property*> (rep)); }

   const color_property& as_color_property (void) const
-    { return *(dynamic_cast<color_property*> (rep)); }
+  { return *(dynamic_cast<color_property*> (rep)); }

   const double_property& as_double_property (void) const
-    { return *(dynamic_cast<double_property*> (rep)); }
+  { return *(dynamic_cast<double_property*> (rep)); }

   const bool_property& as_bool_property (void) const
-    { return *(dynamic_cast<bool_property*> (rep)); }
+  { return *(dynamic_cast<bool_property*> (rep)); }

   const handle_property& as_handle_property (void) const
-    { return *(dynamic_cast<handle_property*> (rep)); }
+  { return *(dynamic_cast<handle_property*> (rep)); }
 #endif

 private:
@@ -3987,8 +3987,8 @@
       // FIXME: Remove warning with "zero" in 4.6
       if (yaxislocation_is ("zero"))
         warning_with_id ("Octave:deprecated-property",
-            "Setting 'yaxislocation' to 'zero' is deprecated, "
-            "set to 'origin' instead.");
+                         "Setting 'yaxislocation' to 'zero' is deprecated, "
+                         "set to 'origin' instead.");
       sync_positions ();
       update_axes_layout ();
       update_ylabel_position ();
@@ -3998,8 +3998,8 @@
       // FIXME: Remove warning with "zero" in 4.6
       if (xaxislocation_is ("zero"))
         warning_with_id ("Octave:deprecated-property",
-            "Setting 'xaxislocation' to 'zero' is deprecated, "
-            "set to 'origin' instead.");
+                         "Setting 'xaxislocation' to 'zero' is deprecated, "
+                         "set to 'origin' instead.");
       sync_positions ();
       update_axes_layout ();
       update_xlabel_position ();
@@ -6452,3 +6452,4 @@
 OCTINTERP_API void close_all_figures (void);

 #endif
+
--- a/libinterp/corefcn/gripes.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gripes.h	Tue Aug 30 21:46:47 2016 -0700
@@ -233,3 +233,4 @@
 gripe_wrong_type_arg_for_unary_op (const octave_value& op);

 #endif
+
--- a/libinterp/corefcn/gsvd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/gsvd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -38,8 +38,8 @@
 gsvd_type (int nargout)
 {
   return ((nargout == 0 || nargout == 1)
-         ? gsvd<T>::Type::sigma_only
-         : (nargout > 5) ? gsvd<T>::Type::std : gsvd<T>::Type::economy);
+          ? gsvd<T>::Type::sigma_only
+          : (nargout > 5) ? gsvd<T>::Type::std : gsvd<T>::Type::economy);
 }


@@ -182,14 +182,14 @@
   if (nr == 0 || nc == 0)
     {
       if (nargout == 5)
-          retval = ovl (identity_matrix (nc, nc), identity_matrix (nc, nc),
-                        Matrix (nr, nc), identity_matrix (nr, nr),
-                        identity_matrix (nr, nr));
+        retval = ovl (identity_matrix (nc, nc), identity_matrix (nc, nc),
+                      Matrix (nr, nc), identity_matrix (nr, nr),
+                      identity_matrix (nr, nr));
       else if (nargout == 6)
-          retval = ovl (identity_matrix (nc, nc), identity_matrix (nc, nc),
-                        Matrix (nr, nc), identity_matrix (nr, nr),
-                        identity_matrix (nr, nr),
-                        identity_matrix (nr, nr));
+        retval = ovl (identity_matrix (nc, nc), identity_matrix (nc, nc),
+                      Matrix (nr, nc), identity_matrix (nr, nr),
+                      identity_matrix (nr, nr),
+                      identity_matrix (nr, nr));
       else
         retval = ovl (Matrix (0, 1));
     }
@@ -480,3 +480,4 @@
 %! assert (norm ((V'*B*X) - D2*[zeros(4, 1) R]) <= 1e-6);

 */
+
--- a/libinterp/corefcn/hash.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/hash.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -236,3 +236,4 @@
 %!error hash ("sha1")
 %!error hash ("sha512")
 */
+
--- a/libinterp/corefcn/help.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/help.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1036,3 +1036,4 @@
 {
   return SET_INTERNAL_VARIABLE (suppress_verbose_help_message);
 }
+
--- a/libinterp/corefcn/help.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/help.h	Tue Aug 30 21:46:47 2016 -0700
@@ -54,3 +54,4 @@
 extern OCTINTERP_API std::string do_which (const std::string& name);

 #endif
+
--- a/libinterp/corefcn/hess.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/hess.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -148,3 +148,4 @@
 %!error hess ([1, 2; 3, 4], 2)
 %!error <must be a square matrix> hess ([1, 2; 3, 4; 5, 6])
 */
+
--- a/libinterp/corefcn/hex2num.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/hex2num.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -293,3 +293,4 @@
 %!error num2hex (1,2)
 %!error num2hex (1j)
 */
+
--- a/libinterp/corefcn/hook-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/hook-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -41,3 +41,4 @@
   else
     error ("invalid hook function");
 }
+
--- a/libinterp/corefcn/hook-fcn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/hook-fcn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -262,3 +262,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/input.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/input.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -464,8 +464,8 @@

           if (hint == name.substr (0, hint_len))
             {
-                    // Special case: array reference forces prefix="."
-                    //               in generate_struct_completions ()
+              // Special case: array reference forces prefix="."
+              //               in generate_struct_completions ()
               if (list_index <= name_list_len && ! prefix.empty ())
                 retval = (prefix == "." ? "" : prefix) + "." + name;
               else
@@ -1583,3 +1583,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/input.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/input.h	Tue Aug 30 21:46:47 2016 -0700
@@ -293,3 +293,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/interpreter.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/interpreter.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1088,3 +1088,4 @@
       }
   }
 }
+
--- a/libinterp/corefcn/interpreter.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/interpreter.h	Tue Aug 30 21:46:47 2016 -0700
@@ -139,3 +139,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/inv.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/inv.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -238,3 +238,4 @@
 {
   return Finv (args, nargout);
 }
+
--- a/libinterp/corefcn/jit-ir.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-ir.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -843,3 +843,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/jit-ir.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-ir.h	Tue Aug 30 21:46:47 2016 -0700
@@ -1442,3 +1442,4 @@

 #endif
 #endif
+
--- a/libinterp/corefcn/jit-typeinfo.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-typeinfo.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -2242,3 +2242,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/jit-typeinfo.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-typeinfo.h	Tue Aug 30 21:46:47 2016 -0700
@@ -849,3 +849,4 @@

 #endif
 #endif
+
--- a/libinterp/corefcn/jit-util.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-util.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -49,3 +49,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/jit-util.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/jit-util.h	Tue Aug 30 21:46:47 2016 -0700
@@ -216,3 +216,4 @@

 #endif
 #endif
+
--- a/libinterp/corefcn/kron.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/kron.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -322,3 +322,4 @@
 %! expected (6, 16) = 8;
 %! assert (kron (diag ([1, 2], 2), diag ([3, 4], 2)), expected);
 */
+
--- a/libinterp/corefcn/load-path.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/load-path.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -853,7 +853,8 @@

       fcn_map_type& fm = i->second;

-      std::string full_dir_name = octave::sys::file_ops::concat (dir, "@" + class_name);
+      std::string full_dir_name
+        = octave::sys::file_ops::concat (dir, "@" + class_name);

       for (fcn_map_iterator q = fm.begin (); q != fm.end (); q++)
         {
@@ -1340,7 +1341,8 @@
         return tfile;
     }

-  if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ()) != std::string::npos)
+  if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
+      != std::string::npos)
     {
       // Given name has a directory separator, so append it to each
       // element of the load path in turn.
@@ -1491,7 +1493,8 @@
     {
       std::string file = flist[i];

-      if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ()) != std::string::npos)
+      if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
+          != std::string::npos)
         {
           if (octave::sys::env::absolute_pathname (file)
               || octave::sys::env::rooted_relative_pathname (file))
@@ -1570,7 +1573,8 @@
     {
       std::string file = flist[i];

-      if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ()) != std::string::npos)
+      if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
+          != std::string::npos)
         {
           if (octave::sys::env::absolute_pathname (file)
               || octave::sys::env::rooted_relative_pathname (file))
@@ -2565,3 +2569,4 @@

   return ovl ();
 }
+
--- a/libinterp/corefcn/load-path.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/load-path.h	Tue Aug 30 21:46:47 2016 -0700
@@ -740,3 +740,4 @@
 genpath (const std::string& dir, const string_vector& skip = "private");

 #endif
+
--- a/libinterp/corefcn/load-save.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/load-save.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1844,3 +1844,4 @@
 {
   return SET_INTERNAL_VARIABLE (save_header_format_string);
 }
+
--- a/libinterp/corefcn/load-save.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/load-save.h	Tue Aug 30 21:46:47 2016 -0700
@@ -97,3 +97,4 @@
 extern void octave_finalize_hdf5 (void);

 #endif
+
--- a/libinterp/corefcn/lookup.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/lookup.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -386,3 +386,4 @@
 %!assert (lookup ({"apple","lemon","orange"}, "potato"), 3)
 %!assert (lookup ({"orange","lemon","apple"}, "potato"), 0)
 */
+
--- a/libinterp/corefcn/ls-ascii-helper.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-ascii-helper.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -171,3 +171,4 @@

   return buf.str ();
 }
+
--- a/libinterp/corefcn/ls-ascii-helper.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-ascii-helper.h	Tue Aug 30 21:46:47 2016 -0700
@@ -38,3 +38,4 @@
 read_until_newline (std::istream& is, bool keep_newline = false);

 #endif
+
--- a/libinterp/corefcn/ls-hdf5.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-hdf5.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1071,8 +1071,8 @@

   std::string t = val.type_name ();
 #if defined (HAVE_HDF5_18)
-  data_id = H5Gcreate (loc_id, name.c_str (), octave_H5P_DEFAULT, octave_H5P_DEFAULT,
-                       octave_H5P_DEFAULT);
+  data_id = H5Gcreate (loc_id, name.c_str (), octave_H5P_DEFAULT,
+                       octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   data_id = H5Gcreate (loc_id, name.c_str (), 0);
 #endif
@@ -1090,12 +1090,15 @@
     goto error_cleanup;
 #if defined (HAVE_HDF5_18)
   data_type_id = H5Dcreate (data_id, "type",  type_id, space_id,
-                            octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                            octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                            octave_H5P_DEFAULT);
 #else
-  data_type_id = H5Dcreate (data_id, "type",  type_id, space_id, octave_H5P_DEFAULT);
+  data_type_id = H5Dcreate (data_id, "type",  type_id, space_id,
+                            octave_H5P_DEFAULT);
 #endif
-  if (data_type_id < 0 || H5Dwrite (data_type_id, type_id, octave_H5S_ALL, octave_H5S_ALL,
-                                    octave_H5P_DEFAULT, t.c_str ()) < 0)
+  if (data_type_id < 0
+      || H5Dwrite (data_type_id, type_id, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, t.c_str ()) < 0)
     goto error_cleanup;

   // Now call the real function to save the variable
@@ -1161,3 +1164,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/ls-hdf5.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-hdf5.h	Tue Aug 30 21:46:47 2016 -0700
@@ -163,3 +163,4 @@
                       const char *attr_name, void *buf);

 #endif
+
--- a/libinterp/corefcn/ls-mat-ascii.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-mat-ascii.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -410,3 +410,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/ls-mat-ascii.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-mat-ascii.h	Tue Aug 30 21:46:47 2016 -0700
@@ -37,3 +37,4 @@
                                        const std::string& filename);

 #endif
+
--- a/libinterp/corefcn/ls-mat4.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-mat4.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -572,3 +572,4 @@

   return ! os.fail ();
 }
+
--- a/libinterp/corefcn/ls-mat4.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-mat4.h	Tue Aug 30 21:46:47 2016 -0700
@@ -45,3 +45,4 @@
                       const std::string& name);

 #endif
+
--- a/libinterp/corefcn/ls-mat5.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-mat5.h	Tue Aug 30 21:46:47 2016 -0700
@@ -61,3 +61,4 @@
                           bool save_as_floats, bool compressing = false);

 #endif
+
--- a/libinterp/corefcn/ls-oct-binary.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-oct-binary.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -302,3 +302,4 @@

   return (os && success);
 }
+
--- a/libinterp/corefcn/ls-oct-binary.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-oct-binary.h	Tue Aug 30 21:46:47 2016 -0700
@@ -37,3 +37,4 @@
                   octave_value& tc, std::string& doc);

 #endif
+
--- a/libinterp/corefcn/ls-oct-text.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-oct-text.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -234,7 +234,7 @@

 std::string
 read_text_data (std::istream& is, const std::string& filename, bool& global,
-                 octave_value& tc, octave_idx_type count)
+                octave_value& tc, octave_idx_type count)
 {
   // Read name for this entry or break on EOF.

@@ -414,3 +414,4 @@
   return SET_INTERNAL_VARIABLE_WITH_LIMITS (save_precision, -1,
                                             std::numeric_limits<int>::max ());
 }
+
--- a/libinterp/corefcn/ls-oct-text.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-oct-text.h	Tue Aug 30 21:46:47 2016 -0700
@@ -49,15 +49,15 @@

 extern OCTINTERP_API std::string
 read_text_data (std::istream& is, const std::string& filename, bool& global,
-                 octave_value& tc, octave_idx_type count);
+                octave_value& tc, octave_idx_type count);

 extern OCTINTERP_API bool
 save_text_data (std::ostream& os, const octave_value& val_arg,
-                 const std::string& name, bool mark_as_global, int precision);
+                const std::string& name, bool mark_as_global, int precision);

 extern OCTINTERP_API bool
 save_text_data_for_plotting (std::ostream& os, const octave_value& t,
-                              const std::string& name);
+                             const std::string& name);

 extern OCTINTERP_API bool
 save_three_d (std::ostream& os, const octave_value& t,
@@ -189,3 +189,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/ls-utils.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-utils.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -86,3 +86,4 @@

   return st;
 }
+
--- a/libinterp/corefcn/ls-utils.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ls-utils.h	Tue Aug 30 21:46:47 2016 -0700
@@ -32,3 +32,4 @@
 get_save_type (float max_val, float min_val);

 #endif
+
--- a/libinterp/corefcn/lsode.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/lsode.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -509,3 +509,4 @@

 %!error lsode_options ("foo", 1, 2)
 */
+
--- a/libinterp/corefcn/lu.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/lu.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -216,10 +216,10 @@
                   SparseMatrix L = fact.L ();

                   if (nargout == 2)
-                      retval(0)
-                        = octave_value (P.transpose () * L,
-                            MatrixType (MatrixType::Permuted_Lower,
-                                        nr, fact.row_perm ()));
+                    retval(0)
+                      = octave_value (P.transpose () * L,
+                                      MatrixType (MatrixType::Permuted_Lower,
+                                                  nr, fact.row_perm ()));
                   else
                     {
                       retval(0) = L;
@@ -264,7 +264,9 @@
               ColumnVector Qinit (nc);
               for (octave_idx_type i = 0; i < nc; i++)
                 Qinit(i) = i;
-              octave::math::sparse_lu<SparseComplexMatrix> fact (m, Qinit, thres, false, true);
+              octave::math::sparse_lu<SparseComplexMatrix> fact (m, Qinit,
+                                                                 thres, false,
+                                                                 true);

               if (nargout < 2)
                 retval(0) = fact.Y ();
@@ -818,3 +820,4 @@
 %! assert (norm (vec (triu (U)-U), Inf) == 0);
 %! assert (norm (vec (P'*L*U - single (Ac) - single (uc)*single (vc).'), Inf) < norm (single (Ac))*1e1*eps ("single"));
 */
+
--- a/libinterp/corefcn/matrix_type.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/matrix_type.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -557,3 +557,4 @@
 %! a = matrix_type (ones (10,10), "Singular");
 %! assert (matrix_type (a), "Singular");
 */
+
--- a/libinterp/corefcn/max.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/max.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -321,11 +321,10 @@
           retval = do_minmax_red_op<charNDArray> (arg, nargout, dim, ismin);
           break;

-#define MAKE_INT_BRANCH(X)                                              \
-          case btyp_ ## X:                                              \
-            retval = do_minmax_red_op<X ## NDArray> (arg, nargout, dim, \
-                                                     ismin);            \
-            break;
+#define MAKE_INT_BRANCH(X)                                                    \
+        case btyp_ ## X:                                                      \
+          retval = do_minmax_red_op<X ## NDArray> (arg, nargout, dim, ismin); \
+          break;

         MAKE_INT_BRANCH (int8);
         MAKE_INT_BRANCH (int16);
@@ -398,10 +397,10 @@
           retval = do_minmax_bin_op<charNDArray> (argx, argy, ismin);
           break;

-#define MAKE_INT_BRANCH(X)                                              \
-          case btyp_ ## X:                                              \
-            retval = do_minmax_bin_op<X ## NDArray> (argx, argy, ismin); \
-            break;
+#define MAKE_INT_BRANCH(X)                                             \
+        case btyp_ ## X:                                               \
+          retval = do_minmax_bin_op<X ## NDArray> (argx, argy, ismin); \
+          break;

         MAKE_INT_BRANCH (int8);
         MAKE_INT_BRANCH (int16);
@@ -951,11 +950,10 @@
                                                          ismin);
       break;

-#define MAKE_INT_BRANCH(X)                                              \
-      case btyp_ ## X:                                                  \
-        retval = do_cumminmax_red_op<X ## NDArray> (arg, nargout, dim,  \
-                                                    ismin);             \
-        break;
+#define MAKE_INT_BRANCH(X)                                                   \
+    case btyp_ ## X:                                                         \
+      retval = do_cumminmax_red_op<X ## NDArray> (arg, nargout, dim, ismin); \
+      break;

       MAKE_INT_BRANCH (int8);
       MAKE_INT_BRANCH (int16);
--- a/libinterp/corefcn/mex.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/mex.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -3417,3 +3417,4 @@
         }
     }
 }
+
--- a/libinterp/corefcn/mex.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/mex.h	Tue Aug 30 21:46:47 2016 -0700
@@ -183,3 +183,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/mexproto.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/mexproto.h	Tue Aug 30 21:46:47 2016 -0700
@@ -313,3 +313,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/mgorth.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/mgorth.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -141,3 +141,4 @@
 %! endfor
 %! assert (a' * a, eye (5), 1e10);
 */
+
--- a/libinterp/corefcn/mxarray.in.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/mxarray.in.h	Tue Aug 30 21:46:47 2016 -0700
@@ -540,3 +540,4 @@

 #endif
 #endif
+
--- a/libinterp/corefcn/nproc.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/nproc.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -98,3 +98,4 @@

 %!error nproc ("no_valid_option")
 */
+
--- a/libinterp/corefcn/oct-errno.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-errno.h	Tue Aug 30 21:46:47 2016 -0700
@@ -72,3 +72,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-errno.in.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-errno.in.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -339,3 +339,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/oct-fstrm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-fstrm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -106,3 +106,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/oct-fstrm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-fstrm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -86,3 +86,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-handle.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-handle.h	Tue Aug 30 21:46:47 2016 -0700
@@ -149,3 +149,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/oct-hdf5-types.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-hdf5-types.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -64,3 +64,4 @@

   return ok;
 }
+
--- a/libinterp/corefcn/oct-hdf5-types.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-hdf5-types.h	Tue Aug 30 21:46:47 2016 -0700
@@ -51,3 +51,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/oct-hdf5.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-hdf5.h	Tue Aug 30 21:46:47 2016 -0700
@@ -42,3 +42,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/oct-hist.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-hist.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -81,7 +81,7 @@

   if (file.empty ())
     file = octave::sys::file_ops::concat (octave::sys::env::get_home_directory (),
-                             ".octave_hist");
+                                          ".octave_hist");

   return file;
 }
@@ -846,3 +846,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/oct-hist.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-hist.h	Tue Aug 30 21:46:47 2016 -0700
@@ -38,3 +38,4 @@
 extern bool input_from_tmp_history_file;

 #endif
+
--- a/libinterp/corefcn/oct-iostrm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-iostrm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -88,3 +88,4 @@
 {
   return octave_stream (new octave_ostream (arg, n));
 }
+
--- a/libinterp/corefcn/oct-iostrm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-iostrm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -154,3 +154,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-lvalue.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-lvalue.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -105,3 +105,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/oct-lvalue.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-lvalue.h	Tue Aug 30 21:46:47 2016 -0700
@@ -112,3 +112,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-map.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-map.h	Tue Aug 30 21:46:47 2016 -0700
@@ -473,3 +473,4 @@
 { return v.map_value (); }

 #endif
+
--- a/libinterp/corefcn/oct-obj.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-obj.h	Tue Aug 30 21:46:47 2016 -0700
@@ -35,3 +35,4 @@
 #include "ovl.h"

 #endif
+
--- a/libinterp/corefcn/oct-opengl.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-opengl.h	Tue Aug 30 21:46:47 2016 -0700
@@ -44,3 +44,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/oct-prcstrm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-prcstrm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -68,3 +68,4 @@
 {
   do_close ();
 }
+
--- a/libinterp/corefcn/oct-prcstrm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-prcstrm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -87,3 +87,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-procbuf.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-procbuf.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -230,3 +230,4 @@

 #endif
 }
+
--- a/libinterp/corefcn/oct-procbuf.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-procbuf.h	Tue Aug 30 21:46:47 2016 -0700
@@ -79,3 +79,4 @@
 extern void symbols_of_oct_procbuf (void);

 #endif
+
--- a/libinterp/corefcn/oct-stdstrm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-stdstrm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -178,3 +178,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/oct-stream.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-stream.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1615,10 +1615,10 @@
   public:

     enum special_conversion
-      {
-        whitespace_conversion = 1,
-        literal_conversion = 2
-      };
+    {
+      whitespace_conversion = 1,
+      literal_conversion = 2
+    };

     textscan_format_elt (const std::string& txt, int w = 0, int p = -1,
                          int bw = 0, bool dis = false, char typ = '\0',
@@ -2060,7 +2060,8 @@
     if (! text.empty ())
       {
         textscan_format_elt *elt
-          = new textscan_format_elt (text, width, prec, bitwidth, discard, type, char_class);
+          = new textscan_format_elt (text, width, prec, bitwidth, discard, type,
+                                     char_class);

         if (! discard)
           output_container.push_back (val_type);
@@ -2710,7 +2711,7 @@
       done_after = out.size () + 1;

     int valid_rows = (row == ntimes) ? ntimes
-      : (((err & 1) && (err & 8)) ? row : row+1);
+                                     : (((err & 1) && (err & 8)) ? row : row+1);
     dim_vector dv (valid_rows, 1);

     ra_idx(0) = 0;
@@ -2856,7 +2857,8 @@
       {
         int ch1 = is.peek ();
         if (ch1 == '-' || ch1 == '+' || (ch1 >= '0' && ch1 <= '9'))
-          {          // if 1.0e+$ or some such, this will set failbit, as we want
+          {
+            // if 1.0e+$ or some such, this will set failbit, as we want
             width_left--;                         // count "E"
             int exp = 0;
             int exp_sign = 1;
@@ -2969,7 +2971,8 @@
                 if (ch2 == 'f')
                   {
                     inf = true;
-                    re = (ch == '+') ? octave::numeric_limits<double>::Inf () : -octave::numeric_limits<double>::Inf ();
+                    re = (ch == '+') ? octave::numeric_limits<double>::Inf ()
+                                     : -octave::numeric_limits<double>::Inf ();
                     value = 0;
                   }
                 else
@@ -3021,7 +3024,7 @@

                 is.clear (state);
                 is.seekg (pos);        // reset to position before look-ahead
-                // FIXME: is.read could invalidate pos
+                                       // FIXME: is.read could invalidate pos

                 for (int i = 0; i < treat_as_empty.numel (); i++)
                   {
@@ -3112,7 +3115,8 @@
     std::string retval ("");
     bool done = false;
     do
-      {                               // find sequence ending with an ending char
+      {
+        // find sequence ending with an ending char
         std::string next;
         scan_caret (is, ends.c_str (), next);
         retval = retval + next;   // FIXME: could use repeated doubling of size
@@ -3305,8 +3309,8 @@
         else
           {
             double v;    // Matlab docs say 1e30 etc should be valid for %d and
-            // 1000 as a %d8 should be 127, so read as double.
-            // Some loss of precision for d64 and u64.
+                         // 1000 as a %d8 should be 127, so read as double.
+                         // Some loss of precision for d64 and u64.
             skip_whitespace (is);
             v = read_double (is, fmt);
             if (! fmt.discard && ! is.fail ())
@@ -3495,7 +3499,7 @@
         // delimiters at the start of the conversion, or can those be skipped?
         if (elem->type != textscan_format_elt::literal_conversion
             // && elem->type != '[' && elem->type != '^' && elem->type != 'c'
-            )
+           )
           skip_delim (is);

         if (is.eof ())
@@ -3510,7 +3514,8 @@
         if (this_conversion_failed)
           {
             if (is.tellg () == pos && ! conversion_failed)
-              {                 // done_after = first failure
+              {
+                // done_after = first failure
                 done_after = i; // note fail, but parse others to get empty_val
                 conversion_failed = true;
               }
@@ -3524,9 +3529,10 @@
     if (done)
       is.setstate (std::ios::eofbit);

-    return no_conversions + (is.eof () ? 2 : 0)
-      + (conversion_failed ? 4 : 0)
-      + (nothing_worked ? 8 : 0);
+    return no_conversions
+           + (is.eof () ? 2 : 0)
+           + (conversion_failed ? 4 : 0)
+           + (nothing_worked ? 8 : 0);

   }

@@ -3591,7 +3597,8 @@
         else if (param == "commentstyle")
           {
             if (args(i+1).is_string ())
-              {   // check here for names like "C++", "C", "shell", ...?
+              {
+                // check here for names like "C++", "C", "shell", ...?
                 comment_style = Cell (args(i+1));
               }
             else if (args(i+1).is_cell ())
@@ -3786,7 +3793,8 @@
                     std::string last = end_c.substr (end_c.size () - 1);
                     std::string may_match ("");
                     do
-                      {           // find sequence ending with last char
+                      {
+                        // find sequence ending with last char
                         scan_caret (is, last, dummy);
                         is.get_undelim ();        // (read LAST itself)

@@ -3833,7 +3841,7 @@

     is.clear ();
     is.seekg (pos);              // reset to position before look-ahead
-    // FIXME: pos may be corrupted by is.read
+                                 // FIXME: pos may be corrupted by is.read

     int i;
     int (*compare)(const char *, const char *, size_t);
@@ -4201,12 +4209,13 @@
                         || c2 == '6' || c2 == '7')
                       is >> std::oct >> value >> std::dec;
                     else if (c2 == '8' || c2 == '9')
-                    {
-                      // FIXME: Would like to set error state on octave stream.
-                      // See bug #46493.  But only std::istream is input to fcn
-                      // error ("internal failure to match octal format");
-                      value = 0;
-                    }
+                      {
+                        // FIXME: Would like to set error state on octave
+                        // stream.  See bug #46493.  But only std::istream is
+                        // input to fcn.
+                        // error ("internal failure to match octal format");
+                        value = 0;
+                      }
                     else
                       value = 0;
                   }
@@ -4678,8 +4687,8 @@
             {
               if (elt->type == scanf_format_elt::null
                   || (! (elt->type == scanf_format_elt::whitespace_conversion
-                        || elt->type == scanf_format_elt::literal_conversion
-                        || elt->type == '%')
+                         || elt->type == scanf_format_elt::literal_conversion
+                         || elt->type == '%')
                       && max_conv > 0 && conversion_count == max_conv))
                 {
                   // We are done, either because we have reached the end of the
@@ -6026,7 +6035,8 @@

   if (tc_count.is_defined ())
     {
-      if (tc_count.is_scalar_type () && octave::math::isinf (tc_count.scalar_value ()))
+      if (tc_count.is_scalar_type ()
+          && octave::math::isinf (tc_count.scalar_value ()))
         count = -1;
       else
         {
@@ -7577,3 +7587,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/oct-stream.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-stream.h	Tue Aug 30 21:46:47 2016 -0700
@@ -481,3 +481,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct-strstrm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-strstrm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -68,3 +68,4 @@
 {
   return octave_stream (new octave_ostrstream (arg_md, flt_fmt));
 }
+
--- a/libinterp/corefcn/oct-strstrm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct-strstrm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -176,3 +176,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/oct.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/oct.h	Tue Aug 30 21:46:47 2016 -0700
@@ -41,3 +41,4 @@
 #include "variables.h"

 #endif
+
--- a/libinterp/corefcn/octave-default-image.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/octave-default-image.h	Tue Aug 30 21:46:47 2016 -0700
@@ -286,3 +286,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/octave-link.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/octave-link.h	Tue Aug 30 21:46:47 2016 -0700
@@ -480,3 +480,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/octave-preserve-stream-state.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/octave-preserve-stream-state.h	Tue Aug 30 21:46:47 2016 -0700
@@ -53,3 +53,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/ordschur.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/ordschur.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -119,8 +119,10 @@

           F77_XFCN (ztrsen, ztrsen,
                     (F77_CONST_CHAR_ARG ("N"), F77_CONST_CHAR_ARG ("V"),
-                     sel.data (), n, F77_DBLE_CMPLX_ARG (S.fortran_vec ()), n, F77_DBLE_CMPLX_ARG (U.fortran_vec ()), n,
-                     F77_DBLE_CMPLX_ARG (w.fortran_vec ()), m, cond1, cond2, F77_DBLE_CMPLX_ARG (work.fortran_vec ()), n,
+                     sel.data (), n, F77_DBLE_CMPLX_ARG (S.fortran_vec ()), n,
+                     F77_DBLE_CMPLX_ARG (U.fortran_vec ()), n,
+                     F77_DBLE_CMPLX_ARG (w.fortran_vec ()), m, cond1, cond2,
+                     F77_DBLE_CMPLX_ARG (work.fortran_vec ()), n,
                      info));

           PREPARE_OUTPUT()
@@ -148,8 +150,10 @@

           F77_XFCN (ctrsen, ctrsen,
                     (F77_CONST_CHAR_ARG ("N"), F77_CONST_CHAR_ARG ("V"),
-                     sel.data (), n, F77_CMPLX_ARG (S.fortran_vec ()), n, F77_CMPLX_ARG (U.fortran_vec ()), n,
-                     F77_CMPLX_ARG (w.fortran_vec ()), m, cond1, cond2, F77_CMPLX_ARG (work.fortran_vec ()), n,
+                     sel.data (), n, F77_CMPLX_ARG (S.fortran_vec ()), n,
+                     F77_CMPLX_ARG (U.fortran_vec ()), n,
+                     F77_CMPLX_ARG (w.fortran_vec ()), m, cond1, cond2,
+                     F77_CMPLX_ARG (work.fortran_vec ()), n,
                      info));

           PREPARE_OUTPUT ()
@@ -207,3 +211,4 @@
 %! assert (diag (T)(3:4), diag (TS)(1:2), sqrt (eps ("single")));

 */
+
--- a/libinterp/corefcn/pager.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pager.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -721,3 +721,4 @@
 {
   return SET_NONEMPTY_INTERNAL_STRING_VARIABLE (PAGER_FLAGS);
 }
+
--- a/libinterp/corefcn/pager.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pager.h	Tue Aug 30 21:46:47 2016 -0700
@@ -150,3 +150,4 @@
 extern OCTINTERP_API void flush_octave_stdout (void);

 #endif
+
--- a/libinterp/corefcn/pinv.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pinv.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -190,3 +190,4 @@
 %! assert (diag (y), [1/3 1/2 0 0 0]');

 */
+
--- a/libinterp/corefcn/pr-output.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pr-output.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1006,14 +1006,17 @@

   bool inf_or_nan = (octave::math::isinf (c) || octave::math::isnan (c));

-  bool int_only = (octave::math::x_nint (rp) == rp && octave::math::x_nint (ip) == ip);
+  bool int_only = (octave::math::x_nint (rp) == rp
+                   && octave::math::x_nint (ip) == ip);

   double r_abs = rp < 0.0 ? -rp : rp;
   double i_abs = ip < 0.0 ? -ip : ip;

-  int r_x = (! octave::math::finite (rp) || r_abs == 0.0) ? 0 : num_digits (r_abs);
-
-  int i_x = (! octave::math::finite (ip) || i_abs == 0.0) ? 0 : num_digits (i_abs);
+  int r_x = (! octave::math::finite (rp)
+             || r_abs == 0.0) ? 0 : num_digits (r_abs);
+
+  int i_x = (! octave::math::finite (ip)
+             || i_abs == 0.0) ? 0 : num_digits (i_abs);

   int x_max, x_min;

@@ -4200,3 +4203,4 @@
   return SET_INTERNAL_VARIABLE_WITH_LIMITS (output_precision, -1,
                                             std::numeric_limits<int>::max ());
 }
+
--- a/libinterp/corefcn/pr-output.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pr-output.h	Tue Aug 30 21:46:47 2016 -0700
@@ -270,3 +270,4 @@
 extern bool Vcompact_format;

 #endif
+
--- a/libinterp/corefcn/procstream.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/procstream.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -68,3 +68,4 @@

   return status;
 }
+
--- a/libinterp/corefcn/procstream.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/procstream.h	Tue Aug 30 21:46:47 2016 -0700
@@ -162,3 +162,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/profiler.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/profiler.h	Tue Aug 30 21:46:47 2016 -0700
@@ -216,3 +216,4 @@
     }  // end of block => call pe's destructor

 #endif
+
--- a/libinterp/corefcn/psi.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/psi.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -229,3 +229,4 @@
 %!error <Z must be real value for polygamma> psi (5, 5i)

 */
+
--- a/libinterp/corefcn/pt-jit.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pt-jit.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1218,7 +1218,7 @@
     {
       octave::unwind_protect frame;
       frame.add_method (&end_context,
-                       &std::vector<jit_magic_end::context>::pop_back);
+                        &std::vector<jit_magic_end::context>::pop_back);

       jit_magic_end::context ctx (factory, object, idx, narg);
       end_context.push_back (ctx);
@@ -2605,3 +2605,4 @@
   return ovl ();
 #endif
 }
+
--- a/libinterp/corefcn/pt-jit.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/pt-jit.h	Tue Aug 30 21:46:47 2016 -0700
@@ -451,3 +451,4 @@

 #endif
 #endif
+
--- a/libinterp/corefcn/quad.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/quad.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -446,3 +446,4 @@

 %!error quad_options (1, 2, 3)
 */
+
--- a/libinterp/corefcn/quadcc.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/quadcc.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -2222,3 +2222,4 @@
 %!error (quadcc (@sin, 0, pi, 0))
 %!error (quadcc (@sin, 0, pi, 1e-6, [ i ]))
 */
+
--- a/libinterp/corefcn/qz.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/qz.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -383,7 +383,8 @@

       F77_XFCN (zggbal, ZGGBAL,
                 (F77_CONST_CHAR_ARG2 (&bal_job, 1),
-                 nn, F77_DBLE_CMPLX_ARG (caa.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()),
+                 nn, F77_DBLE_CMPLX_ARG (caa.fortran_vec ()), nn,
+                 F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()),
                  nn, ilo, ihi, lscale.fortran_vec (),
                  rscale.fortran_vec (), work.fortran_vec (), info
                  F77_CHAR_ARG_LEN (1)));
@@ -461,7 +462,8 @@
                 (F77_CONST_CHAR_ARG2 (&compq, 1),
                  F77_CONST_CHAR_ARG2 (&compz, 1),
                  nn, ilo, ihi, F77_DBLE_CMPLX_ARG (caa.fortran_vec ()),
-                 nn, F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (CQ.fortran_vec ()), nn,
+                 nn, F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()), nn,
+                 F77_DBLE_CMPLX_ARG (CQ.fortran_vec ()), nn,
                  F77_DBLE_CMPLX_ARG (CZ.fortran_vec ()), nn, info
                  F77_CHAR_ARG_LEN (1)
                  F77_CHAR_ARG_LEN (1)));
@@ -890,8 +892,10 @@
           F77_XFCN (ztgevc, ZTGEVC,
                     (F77_CONST_CHAR_ARG2 (&side, 1),
                      F77_CONST_CHAR_ARG2 (&howmny, 1),
-                     select, nn, F77_DBLE_CMPLX_ARG (caa.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()),
-                     nn, F77_DBLE_CMPLX_ARG (CVL.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (CVR.fortran_vec ()), nn, nn,
+                     select, nn, F77_DBLE_CMPLX_ARG (caa.fortran_vec ()), nn,
+                     F77_DBLE_CMPLX_ARG (cbb.fortran_vec ()),
+                     nn, F77_DBLE_CMPLX_ARG (CVL.fortran_vec ()), nn,
+                     F77_DBLE_CMPLX_ARG (CVR.fortran_vec ()), nn, nn,
                      m, F77_DBLE_CMPLX_ARG (cwork2.fortran_vec ()), rwork2.fortran_vec (), info
                      F77_CHAR_ARG_LEN (1)
                      F77_CHAR_ARG_LEN (1)));
@@ -1093,3 +1097,4 @@
 %! [AA, BB, Z2] = qz (A, B, '-');
 %! assert (Z1, Z2);
 */
+
--- a/libinterp/corefcn/rand.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/rand.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1124,11 +1124,9 @@
       // entries in the map
       for (octave_idx_type i = 0; i < m; i++)
         {
-          octave_idx_type k = i +
-            std::floor (rvec[i] * (n - i));
+          octave_idx_type k = i + std::floor (rvec[i] * (n - i));

-          // For shuffling first m entries, no need to use extra
-          // storage
+          // For shuffling first m entries, no need to use extra storage
           if (k < m)
             {
               std::swap (ivec[i], ivec[k]);
@@ -1147,8 +1145,7 @@
       // Perform the Knuth shuffle of the first m entries
       for (octave_idx_type i = 0; i < m; i++)
         {
-          octave_idx_type k = i +
-            std::floor (rvec[i] * (n - i));
+          octave_idx_type k = i + std::floor (rvec[i] * (n - i));
           std::swap (ivec[i], ivec[k]);
         }
     }
@@ -1178,3 +1175,4 @@
 %!   assert (length (unique (p)), 30);
 %! endfor
 */
+
--- a/libinterp/corefcn/rcond.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/rcond.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -103,3 +103,4 @@
 %!assert (rcond (sx*i) < eps ('single'))

 */
+
--- a/libinterp/corefcn/regexp.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/regexp.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1501,3 +1501,4 @@
 %!assert (regexprep ("\n", '\n', "X"), "X")
 %!assert (regexprep ("\n", "\n", "X"), "X")
 */
+
--- a/libinterp/corefcn/schur.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/schur.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -339,3 +339,4 @@
 %! [U, T] = rsf2csf (u,t);
 %! assert (U * T * U', A, 1e-14);
 */
+
--- a/libinterp/corefcn/sighandlers.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sighandlers.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -410,7 +410,7 @@

   sig_handler *
   set_signal_handler (const char *signame, sig_handler *handler,
-                             bool restart_syscalls)
+                      bool restart_syscalls)
   {
     return octave_set_signal_handler_by_name (signame, handler,
                                               restart_syscalls);
@@ -843,3 +843,4 @@

 %!error (sigterm_dumps_octave_core (1, 2))
 */
+
--- a/libinterp/corefcn/sighandlers.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sighandlers.h	Tue Aug 30 21:46:47 2016 -0700
@@ -131,3 +131,4 @@
 #endif

 #endif
+
--- a/libinterp/corefcn/sparse-xdiv.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sparse-xdiv.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -397,7 +397,8 @@
   octave_idx_type nr = b.rows ();
   octave_idx_type nc = b.cols ();

-  ComplexMatrix result (nr, nc, Complex (octave::numeric_limits<double>::NaN (), octave::numeric_limits<double>::NaN ()));
+  ComplexMatrix result (nr, nc, Complex (octave::numeric_limits<double>::NaN (),
+                                         octave::numeric_limits<double>::NaN ()));

   for (octave_idx_type j = 0; j < nc; j++)
     for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++)
@@ -630,3 +631,4 @@
 {
   return do_leftdiv_dm_sm<SparseComplexMatrix> (d, a);
 }
+
--- a/libinterp/corefcn/sparse-xdiv.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sparse-xdiv.h	Tue Aug 30 21:46:47 2016 -0700
@@ -99,3 +99,4 @@
                                      MatrixType&);

 #endif
+
--- a/libinterp/corefcn/sparse-xpow.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sparse-xpow.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -741,3 +741,4 @@

   return result;
 }
+
--- a/libinterp/corefcn/sparse-xpow.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sparse-xpow.h	Tue Aug 30 21:46:47 2016 -0700
@@ -57,3 +57,4 @@
                                const SparseComplexMatrix& b);

 #endif
+
--- a/libinterp/corefcn/sparse.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sparse.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -275,3 +275,4 @@
   else
     error ("spalloc: M,N,NZ must be non-negative");
 }
+
--- a/libinterp/corefcn/spparms.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/spparms.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -206,3 +206,4 @@
 %!error spparms ("ths_rel", "hello")
 %!error <KEY not found> spparms ("UNKNOWN_KEY", 1)
 */
+
--- a/libinterp/corefcn/sqrtm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sqrtm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -268,3 +268,4 @@
 %! assert (y, z);
 %! assert (err, 0);   # Yes, this one has to hold exactly
 */
+
--- a/libinterp/corefcn/str2double.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/str2double.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -411,3 +411,4 @@
 %!assert (str2double ([]), NaN)
 %!assert (str2double (char(zeros(3,0))), NaN)
 */
+
--- a/libinterp/corefcn/strfind.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/strfind.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -453,3 +453,4 @@
 %!error strrep ()
 %!error strrep ("foo", "bar", 3, 4)
 */
+
--- a/libinterp/corefcn/strfns.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/strfns.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -809,3 +809,4 @@
 %!error list_in_columns (["abc", "def"], 20, "  ", 3)
 %!error <list_in_columns: WIDTH must be an integer> list_in_columns (["abc", "def"], "a")
 */
+
--- a/libinterp/corefcn/sub2ind.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sub2ind.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -237,7 +237,7 @@
   catch (const octave::index_exception& e)
     {
       error ("ind2sub: Invalid index %s. %s", e.idx ().c_str (),
-        e.details ().c_str ());
+             e.details ().c_str ());
     }

   return retval;
@@ -282,3 +282,4 @@
 %!error <index out of range> ind2sub ([2, 2, 2], 1:9);
 %!error <Invalid index> ind2sub ([2, 2, 2], -1:8);
 */
+
--- a/libinterp/corefcn/svd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/svd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -358,3 +358,4 @@
 %! assert (V1, V2, 5*eps);
 %! svd_driver (old_driver);
 */
+
--- a/libinterp/corefcn/sylvester.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sylvester.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -165,3 +165,4 @@
 %!error <B must be a square matrix> sylvester (ones (2,2), ones (2,3), ones (2,2))
 %!error <nonconformant matrices> sylvester (ones (2,2), ones (2,2), ones (3,3))
 */
+
--- a/libinterp/corefcn/symtab.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/symtab.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1333,7 +1333,8 @@
 {
   octave_value fcn;

-  std::string full_name = "@" + dispatch_type + octave::sys::file_ops::dir_sep_str () + name;
+  std::string full_name = "@" + dispatch_type +
+                          octave::sys::file_ops::dir_sep_str () + name;
   size_t pos = full_name.find_first_of (Vfilemarker);

   if (pos != std::string::npos)
@@ -1934,3 +1935,4 @@
 %! clear bar;
 %! assert (! strcmp (which ("bar"), ""));
 */
+
--- a/libinterp/corefcn/symtab.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/symtab.h	Tue Aug 30 21:46:47 2016 -0700
@@ -2957,3 +2957,4 @@
 get_dispatch_type (const octave_value_list& args, builtin_type_t& builtin_type);

 #endif
+
--- a/libinterp/corefcn/syscalls.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/syscalls.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -59,9 +59,12 @@
 static octave_scalar_map
 mk_stat_map (const octave::sys::base_file_stat& fs)
 {
-  static bool have_rdev = octave::sys::base_file_stat::have_struct_stat_st_rdev ();
-  static bool have_blksize = octave::sys::base_file_stat::have_struct_stat_st_blksize ();
-  static bool have_blocks = octave::sys::base_file_stat::have_struct_stat_st_blocks ();
+  static bool have_rdev =
+    octave::sys::base_file_stat::have_struct_stat_st_rdev ();
+  static bool have_blksize =
+    octave::sys::base_file_stat::have_struct_stat_st_blksize ();
+  static bool have_blocks =
+    octave::sys::base_file_stat::have_struct_stat_st_blocks ();

   static double nan = octave::numeric_limits<double>::NaN ();

@@ -739,11 +742,11 @@
       FILE *ifile = fdopen (fid[0], "r");
       FILE *ofile = fdopen (fid[1], "w");

-      octave_stream is = octave_stdiostream::create ("pipe-in", ifile,
-                                                       std::ios::in);
+      octave_stream is
+        = octave_stdiostream::create ("pipe-in", ifile, std::ios::in);

-      octave_stream os = octave_stdiostream::create ("pipe-out", ofile,
-                                                       std::ios::out);
+      octave_stream os
+        = octave_stdiostream::create ("pipe-out", ofile, std::ios::out);

       return ovl (octave_stream_list::insert (is),
                   octave_stream_list::insert (os),
@@ -1594,3 +1597,4 @@
 {
   return const_value (args, octave::sys::wcontinue ());
 }
+
--- a/libinterp/corefcn/sysdep.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sysdep.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -193,7 +193,8 @@
   if (hShell != NULL)
     {
       SETCURRENTAPPID pfnSetCurrentProcessExplicitAppUserModelID =
-        reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell, "SetCurrentProcessExplicitAppUserModelID"));
+        reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell,
+                                           "SetCurrentProcessExplicitAppUserModelID"));

       if (pfnSetCurrentProcessExplicitAppUserModelID)
         pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave");
@@ -856,7 +857,8 @@
 No actual tests are performed.
 @end deftypefn */)
 {
-  octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ();
+  octave::mach_info::float_format flt_fmt =
+    octave::mach_info::native_float_format ();

   return ovl (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian
               || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
@@ -872,7 +874,8 @@
 Return the native floating point format as a string.
 @end deftypefn */)
 {
-  octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ();
+  octave::mach_info::float_format flt_fmt =
+    octave::mach_info::native_float_format ();

   return ovl (octave::mach_info::float_format_as_string (flt_fmt));
 }
@@ -968,3 +971,4 @@
 {
   return ovl (display_info::display_available ());
 }
+
--- a/libinterp/corefcn/sysdep.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/sysdep.h	Tue Aug 30 21:46:47 2016 -0700
@@ -51,3 +51,4 @@
                                               const std::string&);

 #endif
+
--- a/libinterp/corefcn/text-renderer.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/text-renderer.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -141,3 +141,4 @@
       }
   }
 }
+
--- a/libinterp/corefcn/text-renderer.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/text-renderer.h	Tue Aug 30 21:46:47 2016 -0700
@@ -213,3 +213,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/time.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/time.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -508,3 +508,4 @@

 %!error strptime ()
 */
+
--- a/libinterp/corefcn/toplev.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/toplev.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -322,102 +322,102 @@
   };

   static const conf_info_struct conf_info[] =
-    {
-      { "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },
+  {
+    { "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },

 #if defined (OCTAVE_ENABLE_64)
-      { "ENABLE_64", true },
+    { "ENABLE_64", true },
 #else
-      { "ENABLE_64", false },
+    { "ENABLE_64", false },
 #endif

 #if defined (OCTAVE_ENABLE_ATOMIC_REFCOUNT)
-      { "ENABLE_ATOMIC_REFCOUNT", true },
+    { "ENABLE_ATOMIC_REFCOUNT", true },
 #else
-      { "ENABLE_ATOMIC_REFCOUNT", false },
+    { "ENABLE_ATOMIC_REFCOUNT", false },
 #endif

 #if defined (OCTAVE_ENABLE_BOUNDS_CHECK)
-      { "ENABLE_BOUNDS_CHECK", true },
+    { "ENABLE_BOUNDS_CHECK", true },
 #else
-      { "ENABLE_BOUNDS_CHECK", false },
+    { "ENABLE_BOUNDS_CHECK", false },
 #endif

 #if defined (ENABLE_DOCS)
-      { "ENABLE_DOCS", true },
+    { "ENABLE_DOCS", true },
 #else
-      { "ENABLE_DOCS", false },
+    { "ENABLE_DOCS", false },
 #endif

 #if defined (ENABLE_DYNAMIC_LINKING)
-      { "ENABLE_DYNAMIC_LINKING", true },
+    { "ENABLE_DYNAMIC_LINKING", true },
 #else
-      { "ENABLE_DYNAMIC_LINKING", false },
+    { "ENABLE_DYNAMIC_LINKING", false },
 #endif

 #if defined (OCTAVE_ENABLE_FLOAT_TRUNCATE)
-      { "ENABLE_FLOAT_TRUNCATE", true },
+    { "ENABLE_FLOAT_TRUNCATE", true },
 #else
-      { "ENABLE_FLOAT_TRUNCATE", false },
+    { "ENABLE_FLOAT_TRUNCATE", false },
 #endif

 #if defined (ENABLE_JIT)
-      { "ENABLE_JIT", true },
+    { "ENABLE_JIT", true },
 #else
-      { "ENABLE_JIT", false },
+    { "ENABLE_JIT", false },
 #endif

 #if defined (OCTAVE_ENABLE_OPENMP)
-      { "ENABLE_OPENMP", true },
+    { "ENABLE_OPENMP", true },
 #else
-      { "ENABLE_OPENMP", false },
+    { "ENABLE_OPENMP", false },
 #endif

-      { "api_version", OCTAVE_API_VERSION },
-      { "archlibdir", subst_octave_home (OCTAVE_ARCHLIBDIR) },
-      { "bindir", subst_octave_home (OCTAVE_BINDIR) },
-      { "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE },
-      { "datadir", subst_octave_home (OCTAVE_DATADIR) },
-      { "datarootdir", subst_octave_home (OCTAVE_DATAROOTDIR) },
-      { "exec_prefix", subst_octave_home (OCTAVE_EXEC_PREFIX) },
-      { "fcnfiledir", subst_octave_home (OCTAVE_FCNFILEDIR) },
-      { "fftw_version", octave_fftw_version () },
-      { "fftwf_version", octave_fftwf_version () },
-      { "imagedir", subst_octave_home (OCTAVE_IMAGEDIR) },
-      { "includedir", subst_octave_home (OCTAVE_INCLUDEDIR) },
-      { "infodir", subst_octave_home (OCTAVE_INFODIR) },
-      { "infofile", subst_octave_home (OCTAVE_INFOFILE) },
-      { "libdir", subst_octave_home (OCTAVE_LIBDIR) },
-      { "libexecdir", subst_octave_home (OCTAVE_LIBEXECDIR) },
-      // Each library and executable has its own definition of the hg
-      // id.  We check for consistency when Octave starts so we just
-      // store and report one of them here.
-      { "hg_id", liboctinterp_hg_id () },
-      { "localapiarchlibdir", subst_octave_home (OCTAVE_LOCALAPIARCHLIBDIR) },
-      { "localapifcnfiledir", subst_octave_home (OCTAVE_LOCALAPIFCNFILEDIR) },
-      { "localapioctfiledir", subst_octave_home (OCTAVE_LOCALAPIOCTFILEDIR) },
-      { "localarchlibdir", subst_octave_home (OCTAVE_LOCALARCHLIBDIR) },
-      { "localfcnfiledir", subst_octave_home (OCTAVE_LOCALFCNFILEDIR) },
-      { "localoctfiledir", subst_octave_home (OCTAVE_LOCALOCTFILEDIR) },
-      { "localstartupfiledir", subst_octave_home (OCTAVE_LOCALSTARTUPFILEDIR) },
-      { "localverarchlibdir", subst_octave_home (OCTAVE_LOCALVERARCHLIBDIR) },
-      { "localverfcnfiledir", subst_octave_home (OCTAVE_LOCALVERFCNFILEDIR) },
-      { "localveroctfiledir", subst_octave_home (OCTAVE_LOCALVEROCTFILEDIR) },
-      { "man1dir", subst_octave_home (OCTAVE_MAN1DIR) },
-      { "man1ext", OCTAVE_MAN1EXT },
-      { "mandir", subst_octave_home (OCTAVE_MANDIR) },
-      { "octdatadir", subst_octave_home (OCTAVE_OCTDATADIR) },
-      { "octfiledir", subst_octave_home (OCTAVE_OCTFILEDIR) },
-      { "octetcdir", subst_octave_home (OCTAVE_OCTETCDIR) },
-      { "octincludedir", subst_octave_home (OCTAVE_OCTINCLUDEDIR) },
-      { "octlibdir", subst_octave_home (OCTAVE_OCTLIBDIR) },
-      { "octtestsdir", subst_octave_home (OCTAVE_OCTTESTSDIR) },
-      { "prefix", subst_octave_home (OCTAVE_PREFIX) },
-      { "release_date", OCTAVE_RELEASE_DATE },
-      { "startupfiledir", subst_octave_home (OCTAVE_STARTUPFILEDIR) },
-      { "version", OCTAVE_VERSION },
-      { 0, octave_value () }
-    };
+    { "api_version", OCTAVE_API_VERSION },
+    { "archlibdir", subst_octave_home (OCTAVE_ARCHLIBDIR) },
+    { "bindir", subst_octave_home (OCTAVE_BINDIR) },
+    { "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE },
+    { "datadir", subst_octave_home (OCTAVE_DATADIR) },
+    { "datarootdir", subst_octave_home (OCTAVE_DATAROOTDIR) },
+    { "exec_prefix", subst_octave_home (OCTAVE_EXEC_PREFIX) },
+    { "fcnfiledir", subst_octave_home (OCTAVE_FCNFILEDIR) },
+    { "fftw_version", octave_fftw_version () },
+    { "fftwf_version", octave_fftwf_version () },
+    { "imagedir", subst_octave_home (OCTAVE_IMAGEDIR) },
+    { "includedir", subst_octave_home (OCTAVE_INCLUDEDIR) },
+    { "infodir", subst_octave_home (OCTAVE_INFODIR) },
+    { "infofile", subst_octave_home (OCTAVE_INFOFILE) },
+    { "libdir", subst_octave_home (OCTAVE_LIBDIR) },
+    { "libexecdir", subst_octave_home (OCTAVE_LIBEXECDIR) },
+    // Each library and executable has its own definition of the hg
+    // id.  We check for consistency when Octave starts so we just
+    // store and report one of them here.
+    { "hg_id", liboctinterp_hg_id () },
+    { "localapiarchlibdir", subst_octave_home (OCTAVE_LOCALAPIARCHLIBDIR) },
+    { "localapifcnfiledir", subst_octave_home (OCTAVE_LOCALAPIFCNFILEDIR) },
+    { "localapioctfiledir", subst_octave_home (OCTAVE_LOCALAPIOCTFILEDIR) },
+    { "localarchlibdir", subst_octave_home (OCTAVE_LOCALARCHLIBDIR) },
+    { "localfcnfiledir", subst_octave_home (OCTAVE_LOCALFCNFILEDIR) },
+    { "localoctfiledir", subst_octave_home (OCTAVE_LOCALOCTFILEDIR) },
+    { "localstartupfiledir", subst_octave_home (OCTAVE_LOCALSTARTUPFILEDIR) },
+    { "localverarchlibdir", subst_octave_home (OCTAVE_LOCALVERARCHLIBDIR) },
+    { "localverfcnfiledir", subst_octave_home (OCTAVE_LOCALVERFCNFILEDIR) },
+    { "localveroctfiledir", subst_octave_home (OCTAVE_LOCALVEROCTFILEDIR) },
+    { "man1dir", subst_octave_home (OCTAVE_MAN1DIR) },
+    { "man1ext", OCTAVE_MAN1EXT },
+    { "mandir", subst_octave_home (OCTAVE_MANDIR) },
+    { "octdatadir", subst_octave_home (OCTAVE_OCTDATADIR) },
+    { "octfiledir", subst_octave_home (OCTAVE_OCTFILEDIR) },
+    { "octetcdir", subst_octave_home (OCTAVE_OCTETCDIR) },
+    { "octincludedir", subst_octave_home (OCTAVE_OCTINCLUDEDIR) },
+    { "octlibdir", subst_octave_home (OCTAVE_OCTLIBDIR) },
+    { "octtestsdir", subst_octave_home (OCTAVE_OCTTESTSDIR) },
+    { "prefix", subst_octave_home (OCTAVE_PREFIX) },
+    { "release_date", OCTAVE_RELEASE_DATE },
+    { "startupfiledir", subst_octave_home (OCTAVE_STARTUPFILEDIR) },
+    { "version", OCTAVE_VERSION },
+    { 0, octave_value () }
+  };

   struct build_info_struct
   {
@@ -426,141 +426,141 @@
   };

   static const build_info_struct build_info[] =
-    {
-      { "AMD_CPPFLAGS", octave::build_env::AMD_CPPFLAGS },
-      { "AMD_LDFLAGS", octave::build_env::AMD_LDFLAGS },
-      { "AMD_LIBS", octave::build_env::AMD_LIBS },
-      { "AR", octave::build_env::AR },
-      { "ARFLAGS", octave::build_env::ARFLAGS },
-      { "ARPACK_CPPFLAGS", octave::build_env::ARPACK_CPPFLAGS },
-      { "ARPACK_LDFLAGS", octave::build_env::ARPACK_LDFLAGS },
-      { "ARPACK_LIBS", octave::build_env::ARPACK_LIBS },
-      { "BLAS_LIBS", octave::build_env::BLAS_LIBS },
-      { "CAMD_CPPFLAGS", octave::build_env::CAMD_CPPFLAGS },
-      { "CAMD_LDFLAGS", octave::build_env::CAMD_LDFLAGS },
-      { "CAMD_LIBS", octave::build_env::CAMD_LIBS },
-      { "CARBON_LIBS", octave::build_env::CARBON_LIBS },
-      { "CC", octave::build_env::CC },
-      { "CCOLAMD_CPPFLAGS", octave::build_env::CCOLAMD_CPPFLAGS },
-      { "CCOLAMD_LDFLAGS", octave::build_env::CCOLAMD_LDFLAGS },
-      { "CCOLAMD_LIBS", octave::build_env::CCOLAMD_LIBS },
-      { "CFLAGS", octave::build_env::CFLAGS },
-      { "CHOLMOD_CPPFLAGS", octave::build_env::CHOLMOD_CPPFLAGS },
-      { "CHOLMOD_LDFLAGS", octave::build_env::CHOLMOD_LDFLAGS },
-      { "CHOLMOD_LIBS", octave::build_env::CHOLMOD_LIBS },
-      { "COLAMD_CPPFLAGS", octave::build_env::COLAMD_CPPFLAGS },
-      { "COLAMD_LDFLAGS", octave::build_env::COLAMD_LDFLAGS },
-      { "COLAMD_LIBS", octave::build_env::COLAMD_LIBS },
-      { "CPICFLAG", octave::build_env::CPICFLAG },
-      { "CPPFLAGS", octave::build_env::CPPFLAGS },
-      { "CURL_CPPFLAGS", octave::build_env::CURL_CPPFLAGS },
-      { "CURL_LDFLAGS", octave::build_env::CURL_LDFLAGS },
-      { "CURL_LIBS", octave::build_env::CURL_LIBS },
-      { "CXSPARSE_CPPFLAGS", octave::build_env::CXSPARSE_CPPFLAGS },
-      { "CXSPARSE_LDFLAGS", octave::build_env::CXSPARSE_LDFLAGS },
-      { "CXSPARSE_LIBS", octave::build_env::CXSPARSE_LIBS },
-      { "CXX", octave::build_env::CXX },
-      { "CXXCPP", octave::build_env::CXXCPP },
-      { "CXXFLAGS", octave::build_env::CXXFLAGS },
-      { "CXXPICFLAG", octave::build_env::CXXPICFLAG },
-      { "DEFS", octave::build_env::DEFS },
-      { "DL_LD", octave::build_env::DL_LD },
-      { "DL_LDFLAGS", octave::build_env::DL_LDFLAGS },
-      { "DL_LIBS", octave::build_env::DL_LIBS },
-      { "GCC_VERSION", octave::build_env::GCC_VERSION },
-      { "GXX_VERSION", octave::build_env::GXX_VERSION },
-      { "EXEEXT", octave::build_env::EXEEXT },
-      { "F77", octave::build_env::F77 },
-      { "F77_FLOAT_STORE_FLAG", octave::build_env::F77_FLOAT_STORE_FLAG },
-      { "F77_INTEGER_8_FLAG", octave::build_env::F77_INTEGER_8_FLAG },
-      { "FFLAGS", octave::build_env::FFLAGS },
-      { "FFTW3_CPPFLAGS", octave::build_env::FFTW3_CPPFLAGS },
-      { "FFTW3_LDFLAGS", octave::build_env::FFTW3_LDFLAGS },
-      { "FFTW3_LIBS", octave::build_env::FFTW3_LIBS },
-      { "FFTW3F_CPPFLAGS", octave::build_env::FFTW3F_CPPFLAGS },
-      { "FFTW3F_LDFLAGS", octave::build_env::FFTW3F_LDFLAGS },
-      { "FFTW3F_LIBS", octave::build_env::FFTW3F_LIBS },
-      { "FLIBS", octave::build_env::FLIBS },
-      { "FLTK_CPPFLAGS", octave::build_env::FLTK_CPPFLAGS },
-      { "FLTK_LDFLAGS", octave::build_env::FLTK_LDFLAGS },
-      { "FLTK_LIBS", octave::build_env::FLTK_LIBS },
-      { "FONTCONFIG_CPPFLAGS", octave::build_env::FONTCONFIG_CPPFLAGS },
-      { "FONTCONFIG_LIBS", octave::build_env::FONTCONFIG_LIBS },
-      { "FPICFLAG", octave::build_env::FPICFLAG },
-      { "FT2_CPPFLAGS", octave::build_env::FT2_CPPFLAGS },
-      { "FT2_LIBS", octave::build_env::FT2_LIBS },
-      { "GLPK_CPPFLAGS", octave::build_env::GLPK_CPPFLAGS },
-      { "GLPK_LDFLAGS", octave::build_env::GLPK_LDFLAGS },
-      { "GLPK_LIBS", octave::build_env::GLPK_LIBS },
-      { "GNUPLOT", octave::build_env::GNUPLOT },
-      { "HDF5_CPPFLAGS", octave::build_env::HDF5_CPPFLAGS },
-      { "HDF5_LDFLAGS", octave::build_env::HDF5_LDFLAGS },
-      { "HDF5_LIBS", octave::build_env::HDF5_LIBS },
-      { "LAPACK_LIBS", octave::build_env::LAPACK_LIBS },
-      { "LDFLAGS", octave::build_env::LDFLAGS },
-      { "LD_CXX", octave::build_env::LD_CXX },
-      { "LD_STATIC_FLAG", octave::build_env::LD_STATIC_FLAG },
-      { "LEX", octave::build_env::LEX },
-      { "LEXLIB", octave::build_env::LEXLIB },
-      { "LFLAGS", octave::build_env::LFLAGS },
-      { "LIBOCTAVE", octave::build_env::LIBOCTAVE },
-      { "LIBOCTINTERP", octave::build_env::LIBOCTINTERP },
-      { "LIBS", octave::build_env::LIBS },
-      { "LLVM_CPPFLAGS", octave::build_env::LLVM_CPPFLAGS },
-      { "LLVM_LDFLAGS", octave::build_env::LLVM_LDFLAGS },
-      { "LLVM_LIBS", octave::build_env::LLVM_LIBS },
-      { "LN_S", octave::build_env::LN_S },
-      { "MAGICK_CPPFLAGS", octave::build_env::MAGICK_CPPFLAGS },
-      { "MAGICK_LDFLAGS", octave::build_env::MAGICK_LDFLAGS },
-      { "MAGICK_LIBS", octave::build_env::MAGICK_LIBS },
-      { "MKOCTFILE_DL_LDFLAGS", octave::build_env::MKOCTFILE_DL_LDFLAGS },
-      { "OCTAVE_LINK_DEPS", octave::build_env::OCTAVE_LINK_DEPS },
-      { "OCTAVE_LINK_OPTS", octave::build_env::OCTAVE_LINK_OPTS },
-      { "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS },
-      { "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS },
-      { "OPENGL_LIBS", octave::build_env::OPENGL_LIBS },
-      { "OSMESA_CPPFLAGS", octave::build_env::OSMESA_CPPFLAGS },
-      { "OSMESA_LDFLAGS", octave::build_env::OSMESA_LDFLAGS },
-      { "OSMESA_LIBS", octave::build_env::OSMESA_LIBS },
-      { "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS },
-      { "PCRE_LIBS", octave::build_env::PCRE_LIBS },
-      { "PTHREAD_CFLAGS", octave::build_env::PTHREAD_CFLAGS },
-      { "PTHREAD_LIBS", octave::build_env::PTHREAD_LIBS },
-      { "QHULL_CPPFLAGS", octave::build_env::QHULL_CPPFLAGS },
-      { "QHULL_LDFLAGS", octave::build_env::QHULL_LDFLAGS },
-      { "QHULL_LIBS", octave::build_env::QHULL_LIBS },
-      { "QRUPDATE_CPPFLAGS", octave::build_env::QRUPDATE_CPPFLAGS },
-      { "QRUPDATE_LDFLAGS", octave::build_env::QRUPDATE_LDFLAGS },
-      { "QRUPDATE_LIBS", octave::build_env::QRUPDATE_LIBS },
-      { "QT_CPPFLAGS", octave::build_env::QT_CPPFLAGS },
-      { "QT_LDFLAGS", octave::build_env::QT_LDFLAGS },
-      { "QT_LIBS", octave::build_env::QT_LIBS },
-      { "RANLIB", octave::build_env::RANLIB },
-      { "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG },
-      { "READLINE_LIBS", octave::build_env::READLINE_LIBS },
-      { "SED", octave::build_env::SED },
-      { "SHARED_LIBS", octave::build_env::SHARED_LIBS },
-      { "SH_LD", octave::build_env::SH_LD },
-      { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
-      { "STATIC_LIBS", octave::build_env::STATIC_LIBS },
-      { "TERM_LIBS", octave::build_env::TERM_LIBS },
-      { "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS },
-      { "UMFPACK_LDFLAGS", octave::build_env::UMFPACK_LDFLAGS },
-      { "UMFPACK_LIBS", octave::build_env::UMFPACK_LIBS },
-      { "WARN_CFLAGS", octave::build_env::WARN_CFLAGS },
-      { "WARN_CXXFLAGS", octave::build_env::WARN_CXXFLAGS },
-      { "X11_INCFLAGS", octave::build_env::X11_INCFLAGS },
-      { "X11_LIBS", octave::build_env::X11_LIBS },
-      { "XTRA_CFLAGS", octave::build_env::XTRA_CFLAGS },
-      { "XTRA_CXXFLAGS", octave::build_env::XTRA_CXXFLAGS },
-      { "YACC", octave::build_env::YACC },
-      { "YFLAGS", octave::build_env::YFLAGS },
-      { "Z_CPPFLAGS", octave::build_env::Z_CPPFLAGS },
-      { "Z_LDFLAGS", octave::build_env::Z_LDFLAGS },
-      { "Z_LIBS", octave::build_env::Z_LIBS },
-      { "config_opts", octave::build_env::config_opts },
-      { 0, 0 },
-    };
+  {
+    { "AMD_CPPFLAGS", octave::build_env::AMD_CPPFLAGS },
+    { "AMD_LDFLAGS", octave::build_env::AMD_LDFLAGS },
+    { "AMD_LIBS", octave::build_env::AMD_LIBS },
+    { "AR", octave::build_env::AR },
+    { "ARFLAGS", octave::build_env::ARFLAGS },
+    { "ARPACK_CPPFLAGS", octave::build_env::ARPACK_CPPFLAGS },
+    { "ARPACK_LDFLAGS", octave::build_env::ARPACK_LDFLAGS },
+    { "ARPACK_LIBS", octave::build_env::ARPACK_LIBS },
+    { "BLAS_LIBS", octave::build_env::BLAS_LIBS },
+    { "CAMD_CPPFLAGS", octave::build_env::CAMD_CPPFLAGS },
+    { "CAMD_LDFLAGS", octave::build_env::CAMD_LDFLAGS },
+    { "CAMD_LIBS", octave::build_env::CAMD_LIBS },
+    { "CARBON_LIBS", octave::build_env::CARBON_LIBS },
+    { "CC", octave::build_env::CC },
+    { "CCOLAMD_CPPFLAGS", octave::build_env::CCOLAMD_CPPFLAGS },
+    { "CCOLAMD_LDFLAGS", octave::build_env::CCOLAMD_LDFLAGS },
+    { "CCOLAMD_LIBS", octave::build_env::CCOLAMD_LIBS },
+    { "CFLAGS", octave::build_env::CFLAGS },
+    { "CHOLMOD_CPPFLAGS", octave::build_env::CHOLMOD_CPPFLAGS },
+    { "CHOLMOD_LDFLAGS", octave::build_env::CHOLMOD_LDFLAGS },
+    { "CHOLMOD_LIBS", octave::build_env::CHOLMOD_LIBS },
+    { "COLAMD_CPPFLAGS", octave::build_env::COLAMD_CPPFLAGS },
+    { "COLAMD_LDFLAGS", octave::build_env::COLAMD_LDFLAGS },
+    { "COLAMD_LIBS", octave::build_env::COLAMD_LIBS },
+    { "CPICFLAG", octave::build_env::CPICFLAG },
+    { "CPPFLAGS", octave::build_env::CPPFLAGS },
+    { "CURL_CPPFLAGS", octave::build_env::CURL_CPPFLAGS },
+    { "CURL_LDFLAGS", octave::build_env::CURL_LDFLAGS },
+    { "CURL_LIBS", octave::build_env::CURL_LIBS },
+    { "CXSPARSE_CPPFLAGS", octave::build_env::CXSPARSE_CPPFLAGS },
+    { "CXSPARSE_LDFLAGS", octave::build_env::CXSPARSE_LDFLAGS },
+    { "CXSPARSE_LIBS", octave::build_env::CXSPARSE_LIBS },
+    { "CXX", octave::build_env::CXX },
+    { "CXXCPP", octave::build_env::CXXCPP },
+    { "CXXFLAGS", octave::build_env::CXXFLAGS },
+    { "CXXPICFLAG", octave::build_env::CXXPICFLAG },
+    { "DEFS", octave::build_env::DEFS },
+    { "DL_LD", octave::build_env::DL_LD },
+    { "DL_LDFLAGS", octave::build_env::DL_LDFLAGS },
+    { "DL_LIBS", octave::build_env::DL_LIBS },
+    { "GCC_VERSION", octave::build_env::GCC_VERSION },
+    { "GXX_VERSION", octave::build_env::GXX_VERSION },
+    { "EXEEXT", octave::build_env::EXEEXT },
+    { "F77", octave::build_env::F77 },
+    { "F77_FLOAT_STORE_FLAG", octave::build_env::F77_FLOAT_STORE_FLAG },
+    { "F77_INTEGER_8_FLAG", octave::build_env::F77_INTEGER_8_FLAG },
+    { "FFLAGS", octave::build_env::FFLAGS },
+    { "FFTW3_CPPFLAGS", octave::build_env::FFTW3_CPPFLAGS },
+    { "FFTW3_LDFLAGS", octave::build_env::FFTW3_LDFLAGS },
+    { "FFTW3_LIBS", octave::build_env::FFTW3_LIBS },
+    { "FFTW3F_CPPFLAGS", octave::build_env::FFTW3F_CPPFLAGS },
+    { "FFTW3F_LDFLAGS", octave::build_env::FFTW3F_LDFLAGS },
+    { "FFTW3F_LIBS", octave::build_env::FFTW3F_LIBS },
+    { "FLIBS", octave::build_env::FLIBS },
+    { "FLTK_CPPFLAGS", octave::build_env::FLTK_CPPFLAGS },
+    { "FLTK_LDFLAGS", octave::build_env::FLTK_LDFLAGS },
+    { "FLTK_LIBS", octave::build_env::FLTK_LIBS },
+    { "FONTCONFIG_CPPFLAGS", octave::build_env::FONTCONFIG_CPPFLAGS },
+    { "FONTCONFIG_LIBS", octave::build_env::FONTCONFIG_LIBS },
+    { "FPICFLAG", octave::build_env::FPICFLAG },
+    { "FT2_CPPFLAGS", octave::build_env::FT2_CPPFLAGS },
+    { "FT2_LIBS", octave::build_env::FT2_LIBS },
+    { "GLPK_CPPFLAGS", octave::build_env::GLPK_CPPFLAGS },
+    { "GLPK_LDFLAGS", octave::build_env::GLPK_LDFLAGS },
+    { "GLPK_LIBS", octave::build_env::GLPK_LIBS },
+    { "GNUPLOT", octave::build_env::GNUPLOT },
+    { "HDF5_CPPFLAGS", octave::build_env::HDF5_CPPFLAGS },
+    { "HDF5_LDFLAGS", octave::build_env::HDF5_LDFLAGS },
+    { "HDF5_LIBS", octave::build_env::HDF5_LIBS },
+    { "LAPACK_LIBS", octave::build_env::LAPACK_LIBS },
+    { "LDFLAGS", octave::build_env::LDFLAGS },
+    { "LD_CXX", octave::build_env::LD_CXX },
+    { "LD_STATIC_FLAG", octave::build_env::LD_STATIC_FLAG },
+    { "LEX", octave::build_env::LEX },
+    { "LEXLIB", octave::build_env::LEXLIB },
+    { "LFLAGS", octave::build_env::LFLAGS },
+    { "LIBOCTAVE", octave::build_env::LIBOCTAVE },
+    { "LIBOCTINTERP", octave::build_env::LIBOCTINTERP },
+    { "LIBS", octave::build_env::LIBS },
+    { "LLVM_CPPFLAGS", octave::build_env::LLVM_CPPFLAGS },
+    { "LLVM_LDFLAGS", octave::build_env::LLVM_LDFLAGS },
+    { "LLVM_LIBS", octave::build_env::LLVM_LIBS },
+    { "LN_S", octave::build_env::LN_S },
+    { "MAGICK_CPPFLAGS", octave::build_env::MAGICK_CPPFLAGS },
+    { "MAGICK_LDFLAGS", octave::build_env::MAGICK_LDFLAGS },
+    { "MAGICK_LIBS", octave::build_env::MAGICK_LIBS },
+    { "MKOCTFILE_DL_LDFLAGS", octave::build_env::MKOCTFILE_DL_LDFLAGS },
+    { "OCTAVE_LINK_DEPS", octave::build_env::OCTAVE_LINK_DEPS },
+    { "OCTAVE_LINK_OPTS", octave::build_env::OCTAVE_LINK_OPTS },
+    { "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS },
+    { "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS },
+    { "OPENGL_LIBS", octave::build_env::OPENGL_LIBS },
+    { "OSMESA_CPPFLAGS", octave::build_env::OSMESA_CPPFLAGS },
+    { "OSMESA_LDFLAGS", octave::build_env::OSMESA_LDFLAGS },
+    { "OSMESA_LIBS", octave::build_env::OSMESA_LIBS },
+    { "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS },
+    { "PCRE_LIBS", octave::build_env::PCRE_LIBS },
+    { "PTHREAD_CFLAGS", octave::build_env::PTHREAD_CFLAGS },
+    { "PTHREAD_LIBS", octave::build_env::PTHREAD_LIBS },
+    { "QHULL_CPPFLAGS", octave::build_env::QHULL_CPPFLAGS },
+    { "QHULL_LDFLAGS", octave::build_env::QHULL_LDFLAGS },
+    { "QHULL_LIBS", octave::build_env::QHULL_LIBS },
+    { "QRUPDATE_CPPFLAGS", octave::build_env::QRUPDATE_CPPFLAGS },
+    { "QRUPDATE_LDFLAGS", octave::build_env::QRUPDATE_LDFLAGS },
+    { "QRUPDATE_LIBS", octave::build_env::QRUPDATE_LIBS },
+    { "QT_CPPFLAGS", octave::build_env::QT_CPPFLAGS },
+    { "QT_LDFLAGS", octave::build_env::QT_LDFLAGS },
+    { "QT_LIBS", octave::build_env::QT_LIBS },
+    { "RANLIB", octave::build_env::RANLIB },
+    { "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG },
+    { "READLINE_LIBS", octave::build_env::READLINE_LIBS },
+    { "SED", octave::build_env::SED },
+    { "SHARED_LIBS", octave::build_env::SHARED_LIBS },
+    { "SH_LD", octave::build_env::SH_LD },
+    { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
+    { "STATIC_LIBS", octave::build_env::STATIC_LIBS },
+    { "TERM_LIBS", octave::build_env::TERM_LIBS },
+    { "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS },
+    { "UMFPACK_LDFLAGS", octave::build_env::UMFPACK_LDFLAGS },
+    { "UMFPACK_LIBS", octave::build_env::UMFPACK_LIBS },
+    { "WARN_CFLAGS", octave::build_env::WARN_CFLAGS },
+    { "WARN_CXXFLAGS", octave::build_env::WARN_CXXFLAGS },
+    { "X11_INCFLAGS", octave::build_env::X11_INCFLAGS },
+    { "X11_LIBS", octave::build_env::X11_LIBS },
+    { "XTRA_CFLAGS", octave::build_env::XTRA_CFLAGS },
+    { "XTRA_CXXFLAGS", octave::build_env::XTRA_CXXFLAGS },
+    { "YACC", octave::build_env::YACC },
+    { "YFLAGS", octave::build_env::YFLAGS },
+    { "Z_CPPFLAGS", octave::build_env::Z_CPPFLAGS },
+    { "Z_LDFLAGS", octave::build_env::Z_LDFLAGS },
+    { "Z_LIBS", octave::build_env::Z_LIBS },
+    { "config_opts", octave::build_env::config_opts },
+    { 0, 0 },
+  };

   static octave_scalar_map config;
   static octave_scalar_map build_env;
@@ -715,3 +715,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/toplev.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/toplev.h	Tue Aug 30 21:46:47 2016 -0700
@@ -30,3 +30,4 @@
 #include "interpreter.h"

 #endif
+
--- a/libinterp/corefcn/tril.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/tril.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -418,3 +418,4 @@

 %!error tril ()
 */
+
--- a/libinterp/corefcn/tsearch.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/tsearch.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -172,3 +172,4 @@

 %!error tsearch ()
 */
+
--- a/libinterp/corefcn/txt-eng.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/txt-eng.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -37,3 +37,4 @@

   return code;
 }
+
--- a/libinterp/corefcn/txt-eng.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/txt-eng.h	Tue Aug 30 21:46:47 2016 -0700
@@ -453,3 +453,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/typecast.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/typecast.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -201,7 +201,8 @@
                                old_dims, frame);
       else
         get_data_and_bytesize (array.array_value (), data, byte_size,
-                               old_dims, frame); }
+                               old_dims, frame);
+    }
   else
     error ("typecast: invalid input class: %s",
            array.class_name ().c_str ());
@@ -291,7 +292,8 @@
   octave_idx_type n
     = bitp.numel () / (sizeof (T) * std::numeric_limits<unsigned char>::digits);

-  if (n * static_cast<int> (sizeof (T)) * std::numeric_limits<unsigned char>::digits != bitp.numel ())
+  if (n * static_cast<int> (sizeof (T)) *
+      std::numeric_limits<unsigned char>::digits != bitp.numel ())
     error ("bitpack: incorrect number of bits to make up output value");

   ArrayType retval (get_vec_dims (bitp.dims (), n));
--- a/libinterp/corefcn/urlwrite.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/urlwrite.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -926,3 +926,4 @@

   return ovl ();
 }
+
--- a/libinterp/corefcn/utils.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/utils.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1491,3 +1491,4 @@

 %!error isstudent (1)
 */
+
--- a/libinterp/corefcn/utils.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/utils.h	Tue Aug 30 21:46:47 2016 -0700
@@ -138,3 +138,4 @@
                    const char *fun_name, const octave_value_list& args);

 #endif
+
--- a/libinterp/corefcn/variables.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/variables.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -135,7 +135,8 @@
     }
   else if (warn)
     // FIXME: Should this be "err" and "error_for", rather than warn?
-    error ("%s: argument must be a string containing function name", warn_for.c_str ());
+    error ("%s: argument must be a string containing function name",
+           warn_for.c_str ());

   return ans;
 }
@@ -1672,7 +1673,7 @@
           feval ("load", octave_value (nm), 0);

           std::string newmsg = std::string ("Variables in the file ")
-            + nm + ":\n\n";
+                               + nm + ":\n\n";

           retval = do_who (i, argv, return_list, verbose, newmsg);

@@ -2690,3 +2691,4 @@
 {
   return SET_INTERNAL_VARIABLE (missing_component_hook);
 }
+
--- a/libinterp/corefcn/variables.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/variables.h	Tue Aug 30 21:46:47 2016 -0700
@@ -158,3 +158,4 @@
 extern OCTINTERP_API void maybe_missing_function_hook (const std::string& name);

 #endif
+
--- a/libinterp/corefcn/workspace-element.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/workspace-element.h	Tue Aug 30 21:46:47 2016 -0700
@@ -89,3 +89,4 @@
 };

 #endif
+
--- a/libinterp/corefcn/xdiv.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xdiv.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1015,3 +1015,4 @@
 FloatComplexDiagMatrix
 xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b)
 { return dmdm_leftdiv_impl (a, b); }
+
--- a/libinterp/corefcn/xdiv.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xdiv.h	Tue Aug 30 21:46:47 2016 -0700
@@ -150,3 +150,4 @@
                                         const FloatComplexDiagMatrix& b);

 #endif
+
--- a/libinterp/corefcn/xnorm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xnorm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -204,3 +204,4 @@

   return retval;
 }
+
--- a/libinterp/corefcn/xnorm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xnorm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -44,3 +44,4 @@
 xfrobnorm (const octave_value& x);

 #endif
+
--- a/libinterp/corefcn/xpow.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xpow.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -2782,3 +2782,4 @@

   return result;
 }
+
--- a/libinterp/corefcn/xpow.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/xpow.h	Tue Aug 30 21:46:47 2016 -0700
@@ -201,3 +201,4 @@
                                              const FloatComplexNDArray& b);

 #endif
+
--- a/libinterp/corefcn/zfstream.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/zfstream.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -613,3 +613,4 @@
 }

 #endif
+
--- a/libinterp/corefcn/zfstream.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/corefcn/zfstream.h	Tue Aug 30 21:46:47 2016 -0700
@@ -505,3 +505,4 @@
 #endif

 #endif
+
--- a/libinterp/deprecated-config.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/deprecated-config.h	Tue Aug 30 21:46:47 2016 -0700
@@ -28,3 +28,4 @@
 #warning "config.h has been deprecated; there is no need to include it directly"

 #endif
+
--- a/libinterp/dldfcn/__delaunayn__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__delaunayn__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -241,3 +241,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/__eigs__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__eigs__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -397,34 +397,34 @@

       if (have_a_fun)
         nconv = EigsComplexNonSymmetricFunc
-          (eigs_complex_func, n, typ, sigma, k, p, info, eig_vec,
-           eig_val, cresid, octave_stdout, tol, (nargout > 1), cholB,
-           disp, maxit);
+                (eigs_complex_func, n, typ, sigma, k, p, info, eig_vec,
+                 eig_val, cresid, octave_stdout, tol, (nargout > 1), cholB,
+                 disp, maxit);
       else if (have_sigma)
         {
           if (a_is_sparse)
             nconv = EigsComplexNonSymmetricMatrixShift
-              (ascm, sigma, k, p, info, eig_vec, eig_val, bscm, permB,
-               cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
-               maxit);
+                    (ascm, sigma, k, p, info, eig_vec, eig_val, bscm, permB,
+                     cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
+                     maxit);
           else
             nconv = EigsComplexNonSymmetricMatrixShift
-              (acm, sigma, k, p, info, eig_vec, eig_val, bcm, permB,
-               cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
-               maxit);
+                    (acm, sigma, k, p, info, eig_vec, eig_val, bcm, permB,
+                     cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
+                     maxit);
         }
       else
         {
           if (a_is_sparse)
             nconv = EigsComplexNonSymmetricMatrix
-              (ascm, typ, k, p, info, eig_vec, eig_val, bscm, permB,
-               cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
-               maxit);
+                    (ascm, typ, k, p, info, eig_vec, eig_val, bscm, permB,
+                     cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
+                     maxit);
           else
             nconv = EigsComplexNonSymmetricMatrix
-              (acm, typ, k, p, info, eig_vec, eig_val, bcm, permB,
-               cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
-               maxit);
+                    (acm, typ, k, p, info, eig_vec, eig_val, bcm, permB,
+                     cresid, octave_stdout, tol, (nargout > 1), cholB, disp,
+                     maxit);
         }

       if (nargout < 2)
@@ -440,21 +440,21 @@

       if (have_a_fun)
         nconv = EigsComplexNonSymmetricFunc
-          (eigs_complex_func, n, typ,  sigma, k, p, info, eig_vec,
-           eig_val, cresid, octave_stdout, tol, (nargout > 1), cholB,
-           disp, maxit);
+                (eigs_complex_func, n, typ,  sigma, k, p, info, eig_vec,
+                 eig_val, cresid, octave_stdout, tol, (nargout > 1), cholB,
+                 disp, maxit);
       else
         {
           if (a_is_sparse)
             nconv = EigsComplexNonSymmetricMatrixShift
-              (SparseComplexMatrix (asmm), sigma, k, p, info, eig_vec,
-               eig_val, SparseComplexMatrix (bsmm), permB, cresid,
-               octave_stdout, tol, (nargout > 1), cholB, disp, maxit);
+                    (SparseComplexMatrix (asmm), sigma, k, p, info, eig_vec,
+                     eig_val, SparseComplexMatrix (bsmm), permB, cresid,
+                     octave_stdout, tol, (nargout > 1), cholB, disp, maxit);
           else
             nconv = EigsComplexNonSymmetricMatrixShift
-              (ComplexMatrix (amm), sigma, k, p, info, eig_vec,
-               eig_val, ComplexMatrix (bmm), permB, cresid,
-               octave_stdout, tol, (nargout > 1), cholB, disp, maxit);
+                    (ComplexMatrix (amm), sigma, k, p, info, eig_vec,
+                     eig_val, ComplexMatrix (bmm), permB, cresid,
+                     octave_stdout, tol, (nargout > 1), cholB, disp, maxit);
         }

       if (nargout < 2)
@@ -471,34 +471,34 @@

           if (have_a_fun)
             nconv = EigsRealSymmetricFunc
-              (eigs_func, n, typ, sigmar, k, p, info, eig_vec,
-               eig_val, resid, octave_stdout, tol, (nargout > 1),
-               cholB, disp, maxit);
+                    (eigs_func, n, typ, sigmar, k, p, info, eig_vec,
+                     eig_val, resid, octave_stdout, tol, (nargout > 1),
+                     cholB, disp, maxit);
           else if (have_sigma)
             {
               if (a_is_sparse)
                 nconv = EigsRealSymmetricMatrixShift
-                  (asmm, sigmar, k, p, info, eig_vec, eig_val, bsmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (asmm, sigmar, k, p, info, eig_vec, eig_val, bsmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
               else
                 nconv = EigsRealSymmetricMatrixShift
-                  (amm, sigmar, k, p, info, eig_vec, eig_val, bmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (amm, sigmar, k, p, info, eig_vec, eig_val, bmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
             }
           else
             {
               if (a_is_sparse)
                 nconv = EigsRealSymmetricMatrix
-                  (asmm, typ, k, p, info, eig_vec, eig_val, bsmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (asmm, typ, k, p, info, eig_vec, eig_val, bsmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
               else
                 nconv = EigsRealSymmetricMatrix
-                  (amm, typ, k, p, info, eig_vec, eig_val, bmm, permB,
-                   resid, octave_stdout, tol, (nargout > 1), cholB,
-                   disp, maxit);
+                        (amm, typ, k, p, info, eig_vec, eig_val, bmm, permB,
+                         resid, octave_stdout, tol, (nargout > 1), cholB,
+                         disp, maxit);
             }

           if (nargout < 2)
@@ -513,34 +513,34 @@

           if (have_a_fun)
             nconv = EigsRealNonSymmetricFunc
-              (eigs_func, n, typ, sigmar, k, p, info, eig_vec,
-               eig_val, resid, octave_stdout, tol, (nargout > 1),
-               cholB, disp, maxit);
+                    (eigs_func, n, typ, sigmar, k, p, info, eig_vec,
+                     eig_val, resid, octave_stdout, tol, (nargout > 1),
+                     cholB, disp, maxit);
           else if (have_sigma)
             {
               if (a_is_sparse)
                 nconv = EigsRealNonSymmetricMatrixShift
-                  (asmm, sigmar, k, p, info, eig_vec, eig_val, bsmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (asmm, sigmar, k, p, info, eig_vec, eig_val, bsmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
               else
                 nconv = EigsRealNonSymmetricMatrixShift
-                  (amm, sigmar, k, p, info, eig_vec, eig_val, bmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (amm, sigmar, k, p, info, eig_vec, eig_val, bmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
             }
           else
             {
               if (a_is_sparse)
                 nconv = EigsRealNonSymmetricMatrix
-                  (asmm, typ, k, p, info, eig_vec, eig_val, bsmm,
-                   permB, resid, octave_stdout, tol, (nargout > 1),
-                   cholB, disp, maxit);
+                        (asmm, typ, k, p, info, eig_vec, eig_val, bsmm,
+                         permB, resid, octave_stdout, tol, (nargout > 1),
+                         cholB, disp, maxit);
               else
                 nconv = EigsRealNonSymmetricMatrix
-                  (amm, typ, k, p, info, eig_vec, eig_val, bmm, permB,
-                   resid, octave_stdout, tol, (nargout > 1), cholB,
-                   disp, maxit);
+                        (amm, typ, k, p, info, eig_vec, eig_val, bmm, permB,
+                         resid, octave_stdout, tol, (nargout > 1), cholB,
+                         disp, maxit);
             }

           if (nargout < 2)
@@ -575,3 +575,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__fltk_uigetfile__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -125,7 +125,8 @@
         }

       if (multi_type == Fl_File_Chooser::DIRECTORY)
-        retval(0) = octave::sys::file_ops::native_separator_path (std::string (fc.value ()));
+        retval(0) = octave::sys::file_ops::native_separator_path (
+                      std::string (fc.value ()));
       else
         {
           retval(1) = octave::sys::file_ops::native_separator_path (
--- a/libinterp/dldfcn/__glpk__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__glpk__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -631,3 +631,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/__init_fltk__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__init_fltk__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -119,7 +119,7 @@
     // Ask for double buffering and a depth buffer.
     mode (FL_DEPTH | FL_DOUBLE | FL_MULTISAMPLE);
 #else
-  err_disabled_feature ("OpenGL_fltk", "OpenGL");
+    err_disabled_feature ("OpenGL_fltk", "OpenGL");
 #endif
   }

@@ -149,10 +149,10 @@
     Fl_Gl_Window::resize (xx, yy, ww, hh);

 #else
-  // This shouldn't happen because construction of Opengl_fltk
-  // objects is supposed to be impossible if OpenGL is not available.
+    // This shouldn't happen because construction of Opengl_fltk
+    // objects is supposed to be impossible if OpenGL is not available.

-  panic_impossible ();
+    panic_impossible ();
 #endif
   }

@@ -193,10 +193,10 @@
       overlay ();

 #else
-  // This shouldn't happen because construction of Opengl_fltk
-  // objects is supposed to be impossible if OpenGL is not available.
+    // This shouldn't happen because construction of Opengl_fltk
+    // objects is supposed to be impossible if OpenGL is not available.

-  panic_impossible ();
+    panic_impossible ();
 #endif
   }

@@ -211,10 +211,10 @@
     glVertex2d (zoom_box(0), h () - zoom_box(1));

 #else
-  // This shouldn't happen because construction of Opengl_fltk
-  // objects is supposed to be impossible if OpenGL is not available.
+    // This shouldn't happen because construction of Opengl_fltk
+    // objects is supposed to be impossible if OpenGL is not available.

-  panic_impossible ();
+    panic_impossible ();
 #endif
   }

@@ -249,10 +249,10 @@
     glPopMatrix ();

 #else
-  // This shouldn't happen because construction of Opengl_fltk
-  // objects is supposed to be impossible if OpenGL is not available.
+    // This shouldn't happen because construction of Opengl_fltk
+    // objects is supposed to be impossible if OpenGL is not available.

-  panic_impossible ();
+    panic_impossible ();
 #endif
   }

@@ -274,10 +274,10 @@
     return Fl_Gl_Window::handle (event);

 #else
-  // This shouldn't happen because construction of Opengl_fltk
-  // objects is supposed to be impossible if OpenGL is not available.
+    // This shouldn't happen because construction of Opengl_fltk
+    // objects is supposed to be impossible if OpenGL is not available.

-  panic_impossible ();
+    panic_impossible ();
 #endif
   }
 };
@@ -556,7 +556,8 @@

   void update_position (uimenu::properties& uimenup, int pos)
   {
-    uimenup.get_property ("position").set (octave_value (static_cast<double> (pos)), true, false);
+    uimenup.get_property ("position").set (octave_value (static_cast<double> (pos)),
+                                           true, false);
   }

   void add_entry (uimenu::properties& uimenup)
@@ -638,9 +639,9 @@
             if (pos <= 0)
               delayed_menus.push_back ((len - (ii + 1)));
             else
-             {
-               add_to_menu (kprop);
-             }
+              {
+                add_to_menu (kprop);
+              }
           }
       }

@@ -680,10 +681,10 @@
             if (pos <= 0)
               delayed_menus.push_back ((len - (ii + 1)));
             else
-             {
-               add_to_menu (kprop);
-               update_position (kprop, ++count);
-             }
+              {
+                add_to_menu (kprop);
+                update_position (kprop, ++count);
+              }
           }
       }

@@ -1498,7 +1499,7 @@
                           ax_obj = gh_manager::get_object (gh);
                           set_axes_currentpoint (ax_obj, pos_x, pos_y);
                         }
-                     }
+                    }

                   fp.execute_keypressfcn (evt);
                 }
@@ -1659,11 +1660,11 @@
                                      x1, y1);

                           if (pan_enabled ())
-                          {
-                            std::string mode = pan_mode ();
+                            {
+                              std::string mode = pan_mode ();

-                            ap.translate_view (mode, x0, x1, y0, y1);
-                          }
+                              ap.translate_view (mode, x0, x1, y0, y1);
+                            }
                           else if (rotate_enabled ())
                             {
                               double daz, del;
@@ -2442,3 +2443,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/__init_gnuplot__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__init_gnuplot__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -247,3 +247,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/__osmesa_print__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -247,3 +247,4 @@
 %!   end_unwind_protect
 %! endif
 */
+
--- a/libinterp/dldfcn/__voronoi__.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/__voronoi__.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -349,3 +349,4 @@
 ## No test needed for internal helper function.
 %!assert (1)
 */
+
--- a/libinterp/dldfcn/amd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/amd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -204,3 +204,4 @@
 %!error amd (A2, 2)
 %!error <matrix S is corrupted|was unavailable or disabled> amd ([])
 */
+
--- a/libinterp/dldfcn/audiodevinfo.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/audiodevinfo.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -2655,3 +2655,4 @@
   return ovl ();
 #endif
 }
+
--- a/libinterp/dldfcn/audioread.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/audioread.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -110,7 +110,8 @@
       double dend = octave::math::isinf (range(1)) ? info.frames : range(1);

       if (dstart < 1 || dstart > dend || dend > info.frames
-          || octave::math::x_nint (dstart) != dstart || octave::math::x_nint (dend) != dend)
+          || octave::math::x_nint (dstart) != dstart
+          || octave::math::x_nint (dend) != dend)
         error ("audioread: invalid specification for range of frames");

       start = dstart - 1;
@@ -603,3 +604,4 @@

   return octave_value ();
 }
+
--- a/libinterp/dldfcn/ccolamd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/ccolamd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -528,7 +528,7 @@
   else
     {
       if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats,
-                            &calloc, &free, 0, -1))
+                             &calloc, &free, 0, -1))
         {
           CSYMAMD_NAME (_report)(stats);

@@ -573,3 +573,4 @@

 #endif
 }
+
--- a/libinterp/dldfcn/chol.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/chol.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1323,3 +1323,4 @@
 %! assert (norm (triu (R1)-R1, Inf), 0);
 %! assert (norm (R1'*R1 - single (Ac(p,p)), Inf) < 1e1*eps ("single"));
 */
+
--- a/libinterp/dldfcn/colamd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/colamd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -591,7 +591,7 @@
   OCTAVE_LOCAL_BUFFER (octave_idx_type, perm, n_col+1);
   OCTAVE_LOCAL_BUFFER (octave_idx_type, stats, COLAMD_STATS);
   if (! SYMAMD_NAME () (n_col, ridx, cidx, perm,
-                       knobs, stats, &calloc, &free))
+                        knobs, stats, &calloc, &free))
     {
       SYMAMD_NAME (_report)(stats);

@@ -755,3 +755,4 @@

   return retval;
 }
+
--- a/libinterp/dldfcn/convhulln.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/convhulln.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -335,3 +335,4 @@
 %! h = convhulln (triangle);
 %! assert (size (h), [3 2]);
 */
+
--- a/libinterp/dldfcn/dmperm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/dmperm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -210,3 +210,4 @@

 %!error sprank (1,2)
 */
+
--- a/libinterp/dldfcn/fftw.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/fftw.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -306,7 +306,7 @@
 #if defined (HAVE_FFTW3_THREADS)
         retval = octave_value (octave_fftw_planner::threads());
 #else
-      retval = 1;
+        retval = 1;
 #endif
     }
   else
@@ -383,3 +383,4 @@
 %!error fftw ("threads", "invalid")
 %!error fftw ("threads", -3)
  */
+
--- a/libinterp/dldfcn/gzip.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/gzip.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -424,46 +424,46 @@

     std::function<void(const std::string&)> walk;
     walk = [&walk, &mk_dest_path, &dest_paths] (const std::string& path) -> void
-      {
-        const octave::sys::file_stat fs (path);
-        // is_dir and is_reg will return false if failed to stat.
-        if (fs.is_dir ())
-          {
-            octave::sys::dir_entry dir (path);
-            if (dir)
-              {
-                // Collect the whole list of filenames first, before recursion
-                // to avoid issues with infinite loop if the action generates
-                // files in the same directory (highly likely).
-                string_vector dirlist = dir.read ();
-                for (octave_idx_type i = 0; i < dirlist.numel (); i++)
-                  if (dirlist(i) != "." && dirlist(i) != "..")
-                    walk (octave::sys::file_ops::concat (path, dirlist(i)));
-              }
-            // Note that we skip any problem with directories.
-          }
-        else if (fs.is_reg ())
-          {
-            const std::string dest_path = mk_dest_path (path);
-            try
-              {
-                X::zip (path, dest_path);
-              }
-            catch (...)
-              {
-                // Error "handling" is not including filename on the output list.
-                // Also remove created file which maybe was not even created
-                // in the first place.  Note that it is possible for the file
-                // to exist in the first place and for X::zip to not have
-                // clobber it yet but we remove it anyway by design.
-                octave::sys::unlink (dest_path);
-                return;
-              }
-            dest_paths.push_front (dest_path);
-          }
-        // Skip all other file types and errors.
-        return;
-      };
+    {
+      const octave::sys::file_stat fs (path);
+      // is_dir and is_reg will return false if failed to stat.
+      if (fs.is_dir ())
+        {
+          octave::sys::dir_entry dir (path);
+          if (dir)
+            {
+              // Collect the whole list of filenames first, before recursion
+              // to avoid issues with infinite loop if the action generates
+              // files in the same directory (highly likely).
+              string_vector dirlist = dir.read ();
+              for (octave_idx_type i = 0; i < dirlist.numel (); i++)
+                if (dirlist(i) != "." && dirlist(i) != "..")
+                  walk (octave::sys::file_ops::concat (path, dirlist(i)));
+            }
+          // Note that we skip any problem with directories.
+        }
+      else if (fs.is_reg ())
+        {
+          const std::string dest_path = mk_dest_path (path);
+          try
+            {
+              X::zip (path, dest_path);
+            }
+          catch (...)
+            {
+              // Error "handling" is not including filename on the output list.
+              // Also remove created file which maybe was not even created
+              // in the first place.  Note that it is possible for the file
+              // to exist in the first place and for X::zip to not have
+              // clobber it yet but we remove it anyway by design.
+              octave::sys::unlink (dest_path);
+              return;
+            }
+          dest_paths.push_front (dest_path);
+        }
+      // Skip all other file types and errors.
+      return;
+    };

     for (octave_idx_type i = 0; i < source_patterns.numel (); i++)
       {
@@ -787,3 +787,4 @@
 %!endfunction
 %!test run_test_function (@test_save_to_dir)
 */
+
--- a/libinterp/dldfcn/oct-qhull.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/oct-qhull.h	Tue Aug 30 21:46:47 2016 -0700
@@ -60,3 +60,4 @@
 }

 #endif
+
--- a/libinterp/dldfcn/qr.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/qr.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1641,3 +1641,4 @@
 %! assert (norm (vec (triu (R) - R), Inf) == 0);
 %! assert (norm (vec (Q*R - AA(:,p)), Inf) < norm (AA)*1e1*eps ("single"));
 */
+
--- a/libinterp/dldfcn/symbfact.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/symbfact.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -418,3 +418,4 @@
 %! fail ("symbfact (sparse ([1, 2; 3, 4; 5, 6]))", "S must be a square matrix");

 */
+
--- a/libinterp/dldfcn/symrcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/dldfcn/symrcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -691,3 +691,4 @@
   // increment all indices, since Octave is not C
   return ovl (P+1);
 }
+
--- a/libinterp/liboctinterp-build-info.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/liboctinterp-build-info.h	Tue Aug 30 21:46:47 2016 -0700
@@ -32,3 +32,4 @@
 extern OCTAVE_API std::string liboctinterp_hg_id (void);

 #endif
+
--- a/libinterp/liboctinterp-build-info.in.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/liboctinterp-build-info.in.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -32,3 +32,4 @@
 {
   return "%OCTAVE_HG_ID%";
 }
+
--- a/libinterp/octave-value/ov-base-diag.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-diag.h	Tue Aug 30 21:46:47 2016 -0700
@@ -234,3 +234,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-base-int.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-int.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -405,7 +405,8 @@

 template <typename T>
 bool
-octave_base_int_matrix<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool)
+octave_base_int_matrix<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                                      bool)
 {
   bool retval = false;

@@ -698,7 +699,8 @@

 template <typename T>
 bool
-octave_base_int_scalar<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool)
+octave_base_int_scalar<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                                      bool)
 {
   bool retval = false;
--- a/libinterp/octave-value/ov-base-int.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-int.h	Tue Aug 30 21:46:47 2016 -0700
@@ -157,3 +157,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-base-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -225,39 +225,39 @@
     {
       switch (n_idx)
         {
-          case 0:
-            panic_impossible ();
-            break;
+        case 0:
+          panic_impossible ();
+          break;

-          case 1:
-            {
-              idx_vector i = idx (0).index_vector ();
+        case 1:
+          {
+            idx_vector i = idx (0).index_vector ();

-              matrix.assign (i, rhs);
-            }
-            break;
+            matrix.assign (i, rhs);
+          }
+          break;

-          case 2:
-            {
-              idx_vector i = idx (0).index_vector ();
+        case 2:
+          {
+            idx_vector i = idx (0).index_vector ();

-              k = 1;
-              idx_vector j = idx (1).index_vector ();
+            k = 1;
+            idx_vector j = idx (1).index_vector ();

-              matrix.assign (i, j, rhs);
-            }
-            break;
+            matrix.assign (i, j, rhs);
+          }
+          break;

-          default:
-            {
-              Array<idx_vector> idx_vec (dim_vector (n_idx, 1));
+        default:
+          {
+            Array<idx_vector> idx_vec (dim_vector (n_idx, 1));

-              for (k = 0; k < n_idx; k++)
-                idx_vec(k) = idx(k).index_vector ();
+            for (k = 0; k < n_idx; k++)
+              idx_vec(k) = idx(k).index_vector ();

-              matrix.assign (idx_vec, rhs);
-            }
-            break;
+            matrix.assign (idx_vec, rhs);
+          }
+          break;
         }
     }
   catch (const octave::index_exception& e)
--- a/libinterp/octave-value/ov-base-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -213,3 +213,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-base-scalar.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-scalar.h	Tue Aug 30 21:46:47 2016 -0700
@@ -160,3 +160,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-base-sparse.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-sparse.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -540,3 +540,4 @@

   return retval;
 }
+
--- a/libinterp/octave-value/ov-base-sparse.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base-sparse.h	Tue Aug 30 21:46:47 2016 -0700
@@ -187,3 +187,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-base.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1590,3 +1590,4 @@
 %! assert (typeinfo (s), "matrix");
 %! sparse_auto_mutate (false);
 */
+
--- a/libinterp/octave-value/ov-base.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-base.h	Tue Aug 30 21:46:47 2016 -0700
@@ -874,3 +874,4 @@
 extern OCTINTERP_API bool called_from_builtin (void);

 #endif
+
--- a/libinterp/octave-value/ov-bool-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -551,7 +551,8 @@

   octave_idx_type nel = dv.numel ();
   OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel);
-  if (H5Dread (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, htmp)
+  if (H5Dread (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, htmp)
       >= 0)
     {
       retval = true;
@@ -640,3 +641,4 @@
 %!   assert (logical (eye (1, c{i})), s);
 %! endfor
 */
+
--- a/libinterp/octave-value/ov-bool-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -248,3 +248,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-bool-sparse.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool-sparse.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -57,7 +57,8 @@
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
 {
-  const octave_sparse_bool_matrix& v = dynamic_cast<const octave_sparse_bool_matrix&> (a);
+  const octave_sparse_bool_matrix& v =
+    dynamic_cast<const octave_sparse_bool_matrix&> (a);

   return
     new octave_sparse_matrix (SparseMatrix (v.sparse_bool_matrix_value ()));
@@ -336,7 +337,8 @@
 }

 bool
-octave_sparse_bool_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool)
+octave_sparse_bool_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                                      bool)
 {
   bool retval = false;

@@ -350,8 +352,8 @@
   // Ensure that additional memory is deallocated
   matrix.maybe_compress ();
 #if defined (HAVE_HDF5_18)
-  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
-                               octave_H5P_DEFAULT);
+  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT,
+                               octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   hid_t group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -372,7 +374,8 @@
     }
 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT);
@@ -397,7 +400,8 @@

 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT);
@@ -422,7 +426,8 @@

 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT);
@@ -460,7 +465,8 @@

 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT);
@@ -498,7 +504,8 @@

 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT);
@@ -523,7 +530,8 @@

 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid,
                         octave_H5P_DEFAULT);
@@ -595,7 +603,8 @@
       return false;
     }

-  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nr)
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, &nr)
       < 0)
     {
       H5Dclose (data_hid);
@@ -620,7 +629,8 @@
       return false;
     }

-  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nc)
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, &nc)
       < 0)
     {
       H5Dclose (data_hid);
@@ -645,7 +655,8 @@
       return false;
     }

-  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nz)
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, &nz)
       < 0)
     {
       H5Dclose (data_hid);
@@ -690,7 +701,8 @@
     }

   octave_idx_type *itmp = m.xcidx ();
-  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp)
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, itmp)
       < 0)
     {
       H5Sclose (space_hid);
@@ -818,3 +830,4 @@

   return retval;
 }
+
--- a/libinterp/octave-value/ov-bool-sparse.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool-sparse.h	Tue Aug 30 21:46:47 2016 -0700
@@ -158,3 +158,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-bool.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -318,3 +318,4 @@

   return retval;
 }
+
--- a/libinterp/octave-value/ov-bool.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-bool.h	Tue Aug 30 21:46:47 2016 -0700
@@ -260,3 +260,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-builtin.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-builtin.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -123,7 +123,7 @@

   BEGIN_PROFILER_BLOCK (octave_builtin)

-    retval = (*f) (args, nargout);
+  retval = (*f) (args, nargout);
   // Do not allow null values to be returned from functions.
   // FIXME: perhaps true builtins should be allowed?
   retval.make_storable_values ();
@@ -160,3 +160,4 @@
 }

 const std::list<octave_lvalue> *octave_builtin::curr_lvalue_list = 0;
+
--- a/libinterp/octave-value/ov-builtin.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-builtin.h	Tue Aug 30 21:46:47 2016 -0700
@@ -116,3 +116,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-cell.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cell.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -959,7 +959,8 @@
 }

 bool
-octave_cell::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
+octave_cell::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                        bool save_as_floats)
 {
 #if defined (HAVE_HDF5)

@@ -973,7 +974,8 @@
   space_hid = data_hid = size_hid = -1;

 #if defined (HAVE_HDF5_18)
-  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -1388,9 +1390,9 @@
 {
   switch (umap)
     {
-#define FORWARD_MAPPER(UMAP)                    \
-      case umap_ ## UMAP:                       \
-        return matrix.UMAP ()
+#define FORWARD_MAPPER(UMAP)                  \
+    case umap_ ## UMAP:                       \
+      return matrix.UMAP ()

     FORWARD_MAPPER (xisalnum);
     FORWARD_MAPPER (xisalpha);
@@ -1412,3 +1414,4 @@
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-cell.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cell.h	Tue Aug 30 21:46:47 2016 -0700
@@ -188,3 +188,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-ch-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-ch-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -277,9 +277,9 @@

   switch (umap)
     {
-#define STRING_MAPPER(UMAP,FCN,TYPE)                                    \
-      case umap_ ## UMAP:                                               \
-        return octave_value (matrix.map<TYPE, int (&) (int)> (FCN))
+#define STRING_MAPPER(UMAP,FCN,TYPE)                                  \
+    case umap_ ## UMAP:                                               \
+      return octave_value (matrix.map<TYPE, int (&) (int)> (FCN))

     STRING_MAPPER (xisalnum, std::isalnum, bool);
     STRING_MAPPER (xisalpha, std::isalpha, bool);
@@ -320,3 +320,4 @@

   return retval;
 }
+
--- a/libinterp/octave-value/ov-ch-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-ch-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -173,3 +173,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-class.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-class.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -382,11 +382,10 @@
                 Cell t = tmp.index (idx.front ());

                 retval(0) = (t.numel () == 1) ? t(0)
-                  : octave_value (t, true);
+                                              : octave_value (t, true);

                 // We handled two index elements, so tell
                 // next_subsref to skip both of them.
-
                 skip++;
               }
             else
@@ -1391,7 +1390,8 @@
 }

 bool
-octave_class::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
+octave_class::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                         bool save_as_floats)
 {
 #if defined (HAVE_HDF5)

@@ -1405,7 +1405,8 @@
   octave_map::iterator i;

 #if defined (HAVE_HDF5_18)
-  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                         octave_H5P_DEFAULT);
 #else
   group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -1423,18 +1424,20 @@
     goto error_cleanup;
 #if defined (HAVE_HDF5_18)
   class_hid = H5Dcreate (group_hid, "classname",  type_hid, space_hid,
-                         octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                         octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                         octave_H5P_DEFAULT);
 #else
   class_hid = H5Dcreate (group_hid, "classname",  type_hid, space_hid,
                          octave_H5P_DEFAULT);
 #endif
-  if (class_hid < 0 || H5Dwrite (class_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                                 octave_H5P_DEFAULT, c_name.c_str ()) < 0)
+  if (class_hid < 0 || H5Dwrite (class_hid, type_hid, octave_H5S_ALL,
+                                 octave_H5S_ALL, octave_H5P_DEFAULT,
+                                 c_name.c_str ()) < 0)
     goto error_cleanup;

 #if defined (HAVE_HDF5_18)
-  data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT, octave_H5P_DEFAULT,
-                        octave_H5P_DEFAULT);
+  data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   data_hid = H5Gcreate (group_hid, "value", 0);
 #endif
@@ -1563,8 +1566,9 @@
       st_id = H5Tcopy (H5T_C_S1);
       H5Tset_size (st_id, slen);

-      if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                   classname) < 0)
+      if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, classname)
+          < 0)
         {
           H5Tclose (st_id);
           H5Dclose (data_hid);
@@ -2068,3 +2072,4 @@

   return octave_value();
 }
+
--- a/libinterp/octave-value/ov-class.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-class.h	Tue Aug 30 21:46:47 2016 -0700
@@ -285,3 +285,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-classdef.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-classdef.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -66,7 +66,7 @@
 OCTAVE_NORETURN static
 void
 err_property_access (const std::string& from, const cdef_property& prop,
-                       bool is_set = false)
+                     bool is_set = false)
 {
   octave_value acc = prop.get (is_set ? "SetAccess" : "GetAccess");
   std::string acc_s;
@@ -821,8 +821,8 @@
 octave_classdef::register_type (void)
 {
   t_id = octave_value_typeinfo::register_type
-    (octave_classdef::t_name, "<unknown>",
-     octave_value (new octave_classdef ()));
+         (octave_classdef::t_name, "<unknown>",
+          octave_value (new octave_classdef ()));
 }

 octave_value_list
@@ -2020,7 +2020,7 @@
                 = a.get_constructor_list ();

               for (std::list<cdef_class>::const_iterator
-                     it = explicit_ctor_list.begin ();
+                   it = explicit_ctor_list.begin ();
                    it != explicit_ctor_list.end ();
                    ++it)
                 {
@@ -2054,7 +2054,7 @@
   int idx = 0;

   for (std::map<std::string,cdef_method>::const_iterator
-         it = meths.begin (); it != meths.end (); ++it, ++idx)
+       it = meths.begin (); it != meths.end (); ++it, ++idx)
     c (idx, 0) = to_ov (it->second);

   return c;
@@ -2153,7 +2153,7 @@
   int idx = 0;

   for (std::map<std::string,cdef_property>::const_iterator
-         it = props.begin (); it != props.end (); ++it, ++idx)
+       it = props.begin (); it != props.end (); ++it, ++idx)
     c (idx, 0) = to_ov (it->second);

   return c;
@@ -3470,9 +3470,11 @@
   // meta.class methods
   meta_class.install_method (make_method (meta_class, "fromName", class_fromName,
                                           "public", true));
-  meta_class.install_method (make_method (meta_class, "fevalStatic", class_fevalStatic,
+  meta_class.install_method (make_method (meta_class, "fevalStatic",
+                                          class_fevalStatic,
                                           "public", false));
-  meta_class.install_method (make_method (meta_class, "getConstant", class_getConstant,
+  meta_class.install_method (make_method (meta_class, "getConstant",
+                                          class_getConstant,
                                           "public", false));
   meta_class.install_method (make_method (meta_class, "eq", class_eq));
   meta_class.install_method (make_method (meta_class, "ne", class_ne));
@@ -3775,3 +3777,4 @@
 ;;; mode: C++ ***
 ;;; End: ***
 */
+
--- a/libinterp/octave-value/ov-classdef.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-classdef.h	Tue Aug 30 21:46:47 2016 -0700
@@ -410,7 +410,7 @@
     Cell val = map.contents (pname);

     if (val.numel () < 1)
-        error ("get: unknown slot: %s", pname.c_str ());
+      error ("get: unknown slot: %s", pname.c_str ());

     return val(0, 0);
   }
@@ -1666,3 +1666,4 @@
 ;;; mode: C++ ***
 ;;; End: ***
 */
+
--- a/libinterp/octave-value/ov-colon.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-colon.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -46,3 +46,4 @@
 {
   os << ":";
 }
+
--- a/libinterp/octave-value/ov-colon.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-colon.h	Tue Aug 30 21:46:47 2016 -0700
@@ -79,3 +79,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-complex.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-complex.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -396,8 +396,8 @@
     }

   Complex tmp = complex_value ();
-  retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     &tmp) >= 0;
+  retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, &tmp) >= 0;

   H5Dclose (data_hid);
   H5Tclose (type_hid);
@@ -449,8 +449,8 @@

   // complex scalar:
   Complex ctmp;
-  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-               &ctmp) >= 0)
+  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, &ctmp) >= 0)
     {
       retval = true;
       scalar = ctmp;
@@ -489,52 +489,53 @@
 {
   switch (umap)
     {
-#define SCALAR_MAPPER(UMAP, FCN)                \
-      case umap_ ## UMAP:                       \
-        return octave_value (FCN (scalar))
+#define SCALAR_MAPPER(UMAP, FCN)              \
+    case umap_ ## UMAP:                       \
+      return octave_value (FCN (scalar))

-      SCALAR_MAPPER (abs, std::abs);
-      SCALAR_MAPPER (acos, octave::math::acos);
-      SCALAR_MAPPER (acosh, octave::math::acosh);
-      SCALAR_MAPPER (angle, std::arg);
-      SCALAR_MAPPER (arg, std::arg);
-      SCALAR_MAPPER (asin, octave::math::asin);
-      SCALAR_MAPPER (asinh, octave::math::asinh);
-      SCALAR_MAPPER (atan, octave::math::atan);
-      SCALAR_MAPPER (atanh, octave::math::atanh);
-      SCALAR_MAPPER (erf, octave::math::erf);
-      SCALAR_MAPPER (erfc, octave::math::erfc);
-      SCALAR_MAPPER (erfcx, octave::math::erfcx);
-      SCALAR_MAPPER (erfi, octave::math::erfi);
-      SCALAR_MAPPER (dawson, octave::math::dawson);
-      SCALAR_MAPPER (ceil, octave::math::ceil);
-      SCALAR_MAPPER (conj, std::conj);
-      SCALAR_MAPPER (cos, std::cos);
-      SCALAR_MAPPER (cosh, std::cosh);
-      SCALAR_MAPPER (exp, std::exp);
-      SCALAR_MAPPER (expm1, octave::math::expm1);
-      SCALAR_MAPPER (fix, octave::math::fix);
-      SCALAR_MAPPER (floor, octave::math::floor);
-      SCALAR_MAPPER (imag, std::imag);
-      SCALAR_MAPPER (log, std::log);
-      SCALAR_MAPPER (log2, octave::math::log2);
-      SCALAR_MAPPER (log10, std::log10);
-      SCALAR_MAPPER (log1p, octave::math::log1p);
-      SCALAR_MAPPER (real, std::real);
-      SCALAR_MAPPER (round, octave::math::round);
-      SCALAR_MAPPER (roundb, octave::math::roundb);
-      SCALAR_MAPPER (signum, octave::math::signum);
-      SCALAR_MAPPER (sin, std::sin);
-      SCALAR_MAPPER (sinh, std::sinh);
-      SCALAR_MAPPER (sqrt, std::sqrt);
-      SCALAR_MAPPER (tan, std::tan);
-      SCALAR_MAPPER (tanh, std::tanh);
-      SCALAR_MAPPER (isfinite, octave::math::finite);
-      SCALAR_MAPPER (isinf, octave::math::isinf);
-      SCALAR_MAPPER (isna, octave::math::is_NA);
-      SCALAR_MAPPER (isnan, octave::math::isnan);
+    SCALAR_MAPPER (abs, std::abs);
+    SCALAR_MAPPER (acos, octave::math::acos);
+    SCALAR_MAPPER (acosh, octave::math::acosh);
+    SCALAR_MAPPER (angle, std::arg);
+    SCALAR_MAPPER (arg, std::arg);
+    SCALAR_MAPPER (asin, octave::math::asin);
+    SCALAR_MAPPER (asinh, octave::math::asinh);
+    SCALAR_MAPPER (atan, octave::math::atan);
+    SCALAR_MAPPER (atanh, octave::math::atanh);
+    SCALAR_MAPPER (erf, octave::math::erf);
+    SCALAR_MAPPER (erfc, octave::math::erfc);
+    SCALAR_MAPPER (erfcx, octave::math::erfcx);
+    SCALAR_MAPPER (erfi, octave::math::erfi);
+    SCALAR_MAPPER (dawson, octave::math::dawson);
+    SCALAR_MAPPER (ceil, octave::math::ceil);
+    SCALAR_MAPPER (conj, std::conj);
+    SCALAR_MAPPER (cos, std::cos);
+    SCALAR_MAPPER (cosh, std::cosh);
+    SCALAR_MAPPER (exp, std::exp);
+    SCALAR_MAPPER (expm1, octave::math::expm1);
+    SCALAR_MAPPER (fix, octave::math::fix);
+    SCALAR_MAPPER (floor, octave::math::floor);
+    SCALAR_MAPPER (imag, std::imag);
+    SCALAR_MAPPER (log, std::log);
+    SCALAR_MAPPER (log2, octave::math::log2);
+    SCALAR_MAPPER (log10, std::log10);
+    SCALAR_MAPPER (log1p, octave::math::log1p);
+    SCALAR_MAPPER (real, std::real);
+    SCALAR_MAPPER (round, octave::math::round);
+    SCALAR_MAPPER (roundb, octave::math::roundb);
+    SCALAR_MAPPER (signum, octave::math::signum);
+    SCALAR_MAPPER (sin, std::sin);
+    SCALAR_MAPPER (sinh, std::sinh);
+    SCALAR_MAPPER (sqrt, std::sqrt);
+    SCALAR_MAPPER (tan, std::tan);
+    SCALAR_MAPPER (tanh, std::tanh);
+    SCALAR_MAPPER (isfinite, octave::math::finite);
+    SCALAR_MAPPER (isinf, octave::math::isinf);
+    SCALAR_MAPPER (isna, octave::math::is_NA);
+    SCALAR_MAPPER (isnan, octave::math::isnan);

     default:
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-complex.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-complex.h	Tue Aug 30 21:46:47 2016 -0700
@@ -201,3 +201,4 @@
 typedef octave_complex octave_complex_scalar;

 #endif
+
--- a/libinterp/octave-value/ov-cs-list.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cs-list.h	Tue Aug 30 21:46:47 2016 -0700
@@ -88,3 +88,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-cx-diag.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-diag.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,7 +43,8 @@
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
 {
-  const octave_complex_diag_matrix& v = dynamic_cast<const octave_complex_diag_matrix&> (a);
+  const octave_complex_diag_matrix& v =
+    dynamic_cast<const octave_complex_diag_matrix&> (a);

   return new octave_complex_matrix (v.complex_matrix_value ());
 }
@@ -59,7 +60,8 @@
 static octave_base_value *
 default_numeric_demotion_function (const octave_base_value& a)
 {
-  const octave_complex_diag_matrix& v = dynamic_cast<const octave_complex_diag_matrix&> (a);
+  const octave_complex_diag_matrix& v =
+    dynamic_cast<const octave_complex_diag_matrix&> (a);

   return new octave_float_complex_diag_matrix
                (v.float_complex_diag_matrix_value ());
--- a/libinterp/octave-value/ov-cx-diag.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-diag.h	Tue Aug 30 21:46:47 2016 -0700
@@ -98,3 +98,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-cx-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -109,13 +109,13 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real scalar");
+                              "complex matrix", "real scalar");

   if (rows () == 0 || columns () == 0)
     err_invalid_conversion ("complex matrix", "real scalar");

   warn_implicit_conversion ("Octave:array-to-scalar",
-                             "complex matrix", "real scalar");
+                            "complex matrix", "real scalar");

   retval = octave::math::real (matrix(0, 0));

@@ -129,13 +129,13 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real scalar");
+                              "complex matrix", "real scalar");

   if (rows () == 0 || columns () == 0)
     err_invalid_conversion ("complex matrix", "real scalar");

   warn_implicit_conversion ("Octave:array-to-scalar",
-                             "complex matrix", "real scalar");
+                            "complex matrix", "real scalar");

   retval = octave::math::real (matrix(0, 0));

@@ -149,7 +149,7 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real matrix");
+                              "complex matrix", "real matrix");

   retval = ::real (matrix);

@@ -163,7 +163,7 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real matrix");
+                              "complex matrix", "real matrix");

   retval = ::real (ComplexMatrix (matrix));

@@ -177,7 +177,7 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real matrix");
+                              "complex matrix", "real matrix");

   retval = ::real (ComplexMatrix (matrix));

@@ -195,7 +195,7 @@
     err_invalid_conversion ("complex matrix", "complex scalar");

   warn_implicit_conversion ("Octave:array-to-scalar",
-                             "complex matrix", "complex scalar");
+                            "complex matrix", "complex scalar");

   retval = matrix(0, 0);

@@ -213,7 +213,7 @@
     err_invalid_conversion ("complex matrix", "complex scalar");

   warn_implicit_conversion ("Octave:array-to-scalar",
-                             "complex matrix", "complex scalar");
+                            "complex matrix", "complex scalar");

   retval = matrix(0, 0);

@@ -251,7 +251,7 @@

   if (! frc_str_conv)
     warn_implicit_conversion ("Octave:num-to-str",
-                               "complex matrix", "string");
+                              "complex matrix", "string");
   else
     {
       retval = charNDArray (dims ());
@@ -277,7 +277,7 @@

   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                               "complex matrix", "real matrix");
+                              "complex matrix", "real matrix");

   retval = SparseMatrix (::real (ComplexMatrix (matrix)));

@@ -614,8 +614,9 @@
   if (retval)
     {
       Complex *mtmp = m.fortran_vec ();
-      if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                    mtmp) < 0)
+      if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                    octave_H5P_DEFAULT, mtmp)
+          < 0)
         {
           H5Tclose (complex_type_hid);
           retval = false;
@@ -703,8 +704,9 @@

   ComplexNDArray m (dv);
   Complex *reim = m.fortran_vec ();
-  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-               reim) >= 0)
+  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, reim)
+      >= 0)
     {
       retval = true;
       matrix = m;
@@ -766,54 +768,55 @@
     case umap_conj:
       return ::conj (matrix);

-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
-      ARRAY_METHOD_MAPPER (isnan, isnan);
-      ARRAY_METHOD_MAPPER (isinf, isinf);
-      ARRAY_METHOD_MAPPER (isfinite, isfinite);
+    ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (isnan, isnan);
+    ARRAY_METHOD_MAPPER (isinf, isinf);
+    ARRAY_METHOD_MAPPER (isfinite, isfinite);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-      ARRAY_MAPPER (acos, Complex, octave::math::acos);
-      ARRAY_MAPPER (acosh, Complex, octave::math::acosh);
-      ARRAY_MAPPER (angle, double, std::arg);
-      ARRAY_MAPPER (arg, double, std::arg);
-      ARRAY_MAPPER (asin, Complex, octave::math::asin);
-      ARRAY_MAPPER (asinh, Complex, octave::math::asinh);
-      ARRAY_MAPPER (atan, Complex, octave::math::atan);
-      ARRAY_MAPPER (atanh, Complex, octave::math::atanh);
-      ARRAY_MAPPER (erf, Complex, octave::math::erf);
-      ARRAY_MAPPER (erfc, Complex, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, Complex, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, Complex, octave::math::erfi);
-      ARRAY_MAPPER (dawson, Complex, octave::math::dawson);
-      ARRAY_MAPPER (ceil, Complex, octave::math::ceil);
-      ARRAY_MAPPER (cos, Complex, std::cos);
-      ARRAY_MAPPER (cosh, Complex, std::cosh);
-      ARRAY_MAPPER (exp, Complex, std::exp);
-      ARRAY_MAPPER (expm1, Complex, octave::math::expm1);
-      ARRAY_MAPPER (fix, Complex, octave::math::fix);
-      ARRAY_MAPPER (floor, Complex, octave::math::floor);
-      ARRAY_MAPPER (log, Complex, std::log);
-      ARRAY_MAPPER (log2, Complex, octave::math::log2);
-      ARRAY_MAPPER (log10, Complex, std::log10);
-      ARRAY_MAPPER (log1p, Complex, octave::math::log1p);
-      ARRAY_MAPPER (round, Complex, octave::math::round);
-      ARRAY_MAPPER (roundb, Complex, octave::math::roundb);
-      ARRAY_MAPPER (signum, Complex, octave::math::signum);
-      ARRAY_MAPPER (sin, Complex, std::sin);
-      ARRAY_MAPPER (sinh, Complex, std::sinh);
-      ARRAY_MAPPER (sqrt, Complex, std::sqrt);
-      ARRAY_MAPPER (tan, Complex, std::tan);
-      ARRAY_MAPPER (tanh, Complex, std::tanh);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (acos, Complex, octave::math::acos);
+    ARRAY_MAPPER (acosh, Complex, octave::math::acosh);
+    ARRAY_MAPPER (angle, double, std::arg);
+    ARRAY_MAPPER (arg, double, std::arg);
+    ARRAY_MAPPER (asin, Complex, octave::math::asin);
+    ARRAY_MAPPER (asinh, Complex, octave::math::asinh);
+    ARRAY_MAPPER (atan, Complex, octave::math::atan);
+    ARRAY_MAPPER (atanh, Complex, octave::math::atanh);
+    ARRAY_MAPPER (erf, Complex, octave::math::erf);
+    ARRAY_MAPPER (erfc, Complex, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, Complex, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, Complex, octave::math::erfi);
+    ARRAY_MAPPER (dawson, Complex, octave::math::dawson);
+    ARRAY_MAPPER (ceil, Complex, octave::math::ceil);
+    ARRAY_MAPPER (cos, Complex, std::cos);
+    ARRAY_MAPPER (cosh, Complex, std::cosh);
+    ARRAY_MAPPER (exp, Complex, std::exp);
+    ARRAY_MAPPER (expm1, Complex, octave::math::expm1);
+    ARRAY_MAPPER (fix, Complex, octave::math::fix);
+    ARRAY_MAPPER (floor, Complex, octave::math::floor);
+    ARRAY_MAPPER (log, Complex, std::log);
+    ARRAY_MAPPER (log2, Complex, octave::math::log2);
+    ARRAY_MAPPER (log10, Complex, std::log10);
+    ARRAY_MAPPER (log1p, Complex, octave::math::log1p);
+    ARRAY_MAPPER (round, Complex, octave::math::round);
+    ARRAY_MAPPER (roundb, Complex, octave::math::roundb);
+    ARRAY_MAPPER (signum, Complex, octave::math::signum);
+    ARRAY_MAPPER (sin, Complex, std::sin);
+    ARRAY_MAPPER (sinh, Complex, std::sinh);
+    ARRAY_MAPPER (sqrt, Complex, std::sqrt);
+    ARRAY_MAPPER (tan, Complex, std::tan);
+    ARRAY_MAPPER (tanh, Complex, std::tanh);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);

     default:
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-cx-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -185,3 +185,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-cx-sparse.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -384,8 +384,8 @@
   matrix.maybe_compress ();

 #if defined (HAVE_HDF5_18)
-  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
-                               octave_H5P_DEFAULT);
+  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT,
+                               octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   hid_t group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -546,8 +546,8 @@
     }

   itmp = m.xridx ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     itmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, itmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -591,7 +591,8 @@
   data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid,
                         octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
-  data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, octave_H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid,
+                        octave_H5P_DEFAULT);
 #endif
   if (data_hid < 0)
     {
@@ -628,7 +629,8 @@
 }

 bool
-octave_sparse_complex_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name)
+octave_sparse_complex_matrix::load_hdf5 (octave_hdf5_id loc_id,
+                                         const char *name)
 {
   bool retval = false;

@@ -914,55 +916,56 @@
     case umap_imag:
       return ::imag (matrix);

-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (abs, abs);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-      ARRAY_MAPPER (acos, Complex, octave::math::acos);
-      ARRAY_MAPPER (acosh, Complex, octave::math::acosh);
-      ARRAY_MAPPER (angle, double, std::arg);
-      ARRAY_MAPPER (arg, double, std::arg);
-      ARRAY_MAPPER (asin, Complex, octave::math::asin);
-      ARRAY_MAPPER (asinh, Complex, octave::math::asinh);
-      ARRAY_MAPPER (atan, Complex, octave::math::atan);
-      ARRAY_MAPPER (atanh, Complex, octave::math::atanh);
-      ARRAY_MAPPER (erf, Complex, octave::math::erf);
-      ARRAY_MAPPER (erfc, Complex, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, Complex, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, Complex, octave::math::erfi);
-      ARRAY_MAPPER (dawson, Complex, octave::math::dawson);
-      ARRAY_MAPPER (ceil, Complex, octave::math::ceil);
-      ARRAY_MAPPER (conj, Complex, std::conj<double>);
-      ARRAY_MAPPER (cos, Complex, std::cos);
-      ARRAY_MAPPER (cosh, Complex, std::cosh);
-      ARRAY_MAPPER (exp, Complex, std::exp);
-      ARRAY_MAPPER (expm1, Complex, octave::math::expm1);
-      ARRAY_MAPPER (fix, Complex, octave::math::fix);
-      ARRAY_MAPPER (floor, Complex, octave::math::floor);
-      ARRAY_MAPPER (log, Complex, std::log);
-      ARRAY_MAPPER (log2, Complex, octave::math::log2);
-      ARRAY_MAPPER (log10, Complex, std::log10);
-      ARRAY_MAPPER (log1p, Complex, octave::math::log1p);
-      ARRAY_MAPPER (round, Complex, octave::math::round);
-      ARRAY_MAPPER (roundb, Complex, octave::math::roundb);
-      ARRAY_MAPPER (signum, Complex, octave::math::signum);
-      ARRAY_MAPPER (sin, Complex, std::sin);
-      ARRAY_MAPPER (sinh, Complex, std::sinh);
-      ARRAY_MAPPER (sqrt, Complex, std::sqrt);
-      ARRAY_MAPPER (tan, Complex, std::tan);
-      ARRAY_MAPPER (tanh, Complex, std::tanh);
-      ARRAY_MAPPER (isnan, bool, octave::math::isnan);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
-      ARRAY_MAPPER (isinf, bool, octave::math::isinf);
-      ARRAY_MAPPER (isfinite, bool, octave::math::finite);
+    ARRAY_MAPPER (acos, Complex, octave::math::acos);
+    ARRAY_MAPPER (acosh, Complex, octave::math::acosh);
+    ARRAY_MAPPER (angle, double, std::arg);
+    ARRAY_MAPPER (arg, double, std::arg);
+    ARRAY_MAPPER (asin, Complex, octave::math::asin);
+    ARRAY_MAPPER (asinh, Complex, octave::math::asinh);
+    ARRAY_MAPPER (atan, Complex, octave::math::atan);
+    ARRAY_MAPPER (atanh, Complex, octave::math::atanh);
+    ARRAY_MAPPER (erf, Complex, octave::math::erf);
+    ARRAY_MAPPER (erfc, Complex, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, Complex, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, Complex, octave::math::erfi);
+    ARRAY_MAPPER (dawson, Complex, octave::math::dawson);
+    ARRAY_MAPPER (ceil, Complex, octave::math::ceil);
+    ARRAY_MAPPER (conj, Complex, std::conj<double>);
+    ARRAY_MAPPER (cos, Complex, std::cos);
+    ARRAY_MAPPER (cosh, Complex, std::cosh);
+    ARRAY_MAPPER (exp, Complex, std::exp);
+    ARRAY_MAPPER (expm1, Complex, octave::math::expm1);
+    ARRAY_MAPPER (fix, Complex, octave::math::fix);
+    ARRAY_MAPPER (floor, Complex, octave::math::floor);
+    ARRAY_MAPPER (log, Complex, std::log);
+    ARRAY_MAPPER (log2, Complex, octave::math::log2);
+    ARRAY_MAPPER (log10, Complex, std::log10);
+    ARRAY_MAPPER (log1p, Complex, octave::math::log1p);
+    ARRAY_MAPPER (round, Complex, octave::math::round);
+    ARRAY_MAPPER (roundb, Complex, octave::math::roundb);
+    ARRAY_MAPPER (signum, Complex, octave::math::signum);
+    ARRAY_MAPPER (sin, Complex, std::sin);
+    ARRAY_MAPPER (sinh, Complex, std::sinh);
+    ARRAY_MAPPER (sqrt, Complex, std::sqrt);
+    ARRAY_MAPPER (tan, Complex, std::tan);
+    ARRAY_MAPPER (tanh, Complex, std::tanh);
+    ARRAY_MAPPER (isnan, bool, octave::math::isnan);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (isinf, bool, octave::math::isinf);
+    ARRAY_MAPPER (isfinite, bool, octave::math::finite);

     default: // Attempt to go via dense matrix.
       return octave_base_sparse<SparseComplexMatrix>::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-cx-sparse.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-cx-sparse.h	Tue Aug 30 21:46:47 2016 -0700
@@ -159,3 +159,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-dld-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-dld-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -81,8 +81,10 @@
 //       of objects to point to an invalid code segment.

 octave_dld_function*
-octave_dld_function::create (octave_builtin::fcn ff, const octave::dynamic_library& shl,
+octave_dld_function::create (octave_builtin::fcn ff,
+                             const octave::dynamic_library& shl,
                              const std::string& nm, const std::string& ds)
 {
   return new octave_dld_function (ff, shl, nm, ds);
 }
+
--- a/libinterp/octave-value/ov-dld-fcn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-dld-fcn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -99,3 +99,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-fcn-handle.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -699,7 +699,8 @@

   hid_t group_hid = -1;
 #if defined (HAVE_HDF5_18)
-  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                         octave_H5P_DEFAULT);
 #else
   group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -730,12 +731,15 @@
     }
 #if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid,
-                        octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                        octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
-  data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid, octave_H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid,
+                        octave_H5P_DEFAULT);
 #endif
-  if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                                octave_H5P_DEFAULT, nm.c_str ()) < 0)
+  if (data_hid < 0
+      || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, nm.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -761,13 +765,15 @@

 #if defined (HAVE_HDF5_18)
       data_hid = H5Dcreate (group_hid, "fcn",  type_hid, space_hid,
-                            octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+                            octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                            octave_H5P_DEFAULT);
 #else
       data_hid = H5Dcreate (group_hid, "fcn",  type_hid, space_hid,
                             octave_H5P_DEFAULT);
 #endif
-      if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                                    octave_H5P_DEFAULT, stmp.c_str ()) < 0)
+      if (data_hid < 0
+          || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                       octave_H5P_DEFAULT, stmp.c_str ()) < 0)
         {
           H5Sclose (space_hid);
           H5Tclose (type_hid);
@@ -999,7 +1005,9 @@
   st_id = H5Tcopy (H5T_C_S1);
   H5Tset_size (st_id, slen);

-  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, nm_tmp) < 0)
+  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, nm_tmp)
+      < 0)
     {
       H5Tclose (st_id);
       H5Sclose (space_hid);
@@ -1070,7 +1078,9 @@
       st_id = H5Tcopy (H5T_C_S1);
       H5Tset_size (st_id, slen);

-      if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, fcn_tmp) < 0)
+      if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, fcn_tmp)
+          < 0)
         {
           H5Tclose (st_id);
           H5Sclose (space_hid);
@@ -1757,7 +1767,7 @@
         {
           octave_scalar_map ws;
           for (std::list<symbol_table::symbol_record>::const_iterator
-                 p = vars.begin (); p != vars.end (); p++)
+               p = vars.begin (); p != vars.end (); p++)
             {
               ws.assign (p->name (), p->varval (0));
             }
@@ -2126,3 +2136,4 @@
 %! x = [1,2;3,4];
 %! assert (__f (@(i) x(:,i), 1), [1;3]);
 */
+
--- a/libinterp/octave-value/ov-fcn-handle.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn-handle.h	Tue Aug 30 21:46:47 2016 -0700
@@ -217,3 +217,4 @@
   int expected_nargin;
 };
 #endif
+
--- a/libinterp/octave-value/ov-fcn-inline.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn-inline.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -285,7 +285,8 @@
   hid_t group_hid = -1;

 #if defined (HAVE_HDF5_18)
-  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                         octave_H5P_DEFAULT);
 #else
   group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -372,10 +373,12 @@
   data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid,
                         octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
-  data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid, octave_H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid,
+                        octave_H5P_DEFAULT);
 #endif
-  if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                                octave_H5P_DEFAULT, nm.c_str ()) < 0)
+  if (data_hid < 0
+      || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, nm.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -399,8 +402,9 @@
   data_hid = H5Dcreate (group_hid, "iftext",  type_hid, space_hid,
                         octave_H5P_DEFAULT);
 #endif
-  if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                                octave_H5P_DEFAULT, iftext.c_str ()) < 0)
+  if (data_hid < 0
+      || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                   octave_H5P_DEFAULT, iftext.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -530,7 +534,8 @@
   st_id = H5Tcopy (H5T_C_S1);
   H5Tset_size (st_id, slen);

-  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, nm_tmp) < 0)
+  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, nm_tmp) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -592,7 +597,8 @@
   st_id = H5Tcopy (H5T_C_S1);
   H5Tset_size (st_id, slen);

-  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, iftext_tmp) < 0)
+  if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, iftext_tmp) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -985,3 +991,4 @@
 %!error vectorize (1, 2)
 %!error <FUN must be a string or inline function> vectorize (1)
 */
+
--- a/libinterp/octave-value/ov-fcn-inline.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn-inline.h	Tue Aug 30 21:46:47 2016 -0700
@@ -100,3 +100,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,3 +42,4 @@
   panic_impossible ();
   return 0;
 }
+
--- a/libinterp/octave-value/ov-fcn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-fcn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -227,3 +227,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-float.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-float.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -354,53 +354,53 @@
     case umap_conj:
       return scalar;

-#define SCALAR_MAPPER(UMAP, FCN)                \
-      case umap_ ## UMAP:                       \
-        return octave_value (FCN (scalar))
+#define SCALAR_MAPPER(UMAP, FCN)              \
+    case umap_ ## UMAP:                       \
+      return octave_value (FCN (scalar))

-      SCALAR_MAPPER (abs, ::fabsf);
-      SCALAR_MAPPER (acos, octave::math::rc_acos);
-      SCALAR_MAPPER (acosh, octave::math::rc_acosh);
-      SCALAR_MAPPER (angle, octave::math::arg);
-      SCALAR_MAPPER (arg, octave::math::arg);
-      SCALAR_MAPPER (asin, octave::math::rc_asin);
-      SCALAR_MAPPER (asinh, octave::math::asinh);
-      SCALAR_MAPPER (atan, ::atanf);
-      SCALAR_MAPPER (atanh, octave::math::rc_atanh);
-      SCALAR_MAPPER (erf, octave::math::erf);
-      SCALAR_MAPPER (erfinv, octave::math::erfinv);
-      SCALAR_MAPPER (erfcinv, octave::math::erfcinv);
-      SCALAR_MAPPER (erfc, octave::math::erfc);
-      SCALAR_MAPPER (erfcx, octave::math::erfcx);
-      SCALAR_MAPPER (erfi, octave::math::erfi);
-      SCALAR_MAPPER (dawson, octave::math::dawson);
-      SCALAR_MAPPER (gamma, octave::math::gamma);
-      SCALAR_MAPPER (lgamma, octave::math::rc_lgamma);
-      SCALAR_MAPPER (cbrt, octave::math::cbrt);
-      SCALAR_MAPPER (ceil, ::ceilf);
-      SCALAR_MAPPER (cos, ::cosf);
-      SCALAR_MAPPER (cosh, ::coshf);
-      SCALAR_MAPPER (exp, ::expf);
-      SCALAR_MAPPER (expm1, octave::math::expm1);
-      SCALAR_MAPPER (fix, octave::math::fix);
-      SCALAR_MAPPER (floor, std::floor);
-      SCALAR_MAPPER (log, octave::math::rc_log);
-      SCALAR_MAPPER (log2, octave::math::rc_log2);
-      SCALAR_MAPPER (log10, octave::math::rc_log10);
-      SCALAR_MAPPER (log1p, octave::math::rc_log1p);
-      SCALAR_MAPPER (round, octave::math::round);
-      SCALAR_MAPPER (roundb, octave::math::roundb);
-      SCALAR_MAPPER (signum, octave::math::signum);
-      SCALAR_MAPPER (sin, ::sinf);
-      SCALAR_MAPPER (sinh, ::sinhf);
-      SCALAR_MAPPER (sqrt, octave::math::rc_sqrt);
-      SCALAR_MAPPER (tan, ::tanf);
-      SCALAR_MAPPER (tanh, ::tanhf);
-      SCALAR_MAPPER (isfinite, octave::math::finite);
-      SCALAR_MAPPER (isinf, octave::math::isinf);
-      SCALAR_MAPPER (isna, octave::math::is_NA);
-      SCALAR_MAPPER (isnan, octave::math::isnan);
-      SCALAR_MAPPER (xsignbit, octave::math::signbit);
+    SCALAR_MAPPER (abs, ::fabsf);
+    SCALAR_MAPPER (acos, octave::math::rc_acos);
+    SCALAR_MAPPER (acosh, octave::math::rc_acosh);
+    SCALAR_MAPPER (angle, octave::math::arg);
+    SCALAR_MAPPER (arg, octave::math::arg);
+    SCALAR_MAPPER (asin, octave::math::rc_asin);
+    SCALAR_MAPPER (asinh, octave::math::asinh);
+    SCALAR_MAPPER (atan, ::atanf);
+    SCALAR_MAPPER (atanh, octave::math::rc_atanh);
+    SCALAR_MAPPER (erf, octave::math::erf);
+    SCALAR_MAPPER (erfinv, octave::math::erfinv);
+    SCALAR_MAPPER (erfcinv, octave::math::erfcinv);
+    SCALAR_MAPPER (erfc, octave::math::erfc);
+    SCALAR_MAPPER (erfcx, octave::math::erfcx);
+    SCALAR_MAPPER (erfi, octave::math::erfi);
+    SCALAR_MAPPER (dawson, octave::math::dawson);
+    SCALAR_MAPPER (gamma, octave::math::gamma);
+    SCALAR_MAPPER (lgamma, octave::math::rc_lgamma);
+    SCALAR_MAPPER (cbrt, octave::math::cbrt);
+    SCALAR_MAPPER (ceil, ::ceilf);
+    SCALAR_MAPPER (cos, ::cosf);
+    SCALAR_MAPPER (cosh, ::coshf);
+    SCALAR_MAPPER (exp, ::expf);
+    SCALAR_MAPPER (expm1, octave::math::expm1);
+    SCALAR_MAPPER (fix, octave::math::fix);
+    SCALAR_MAPPER (floor, std::floor);
+    SCALAR_MAPPER (log, octave::math::rc_log);
+    SCALAR_MAPPER (log2, octave::math::rc_log2);
+    SCALAR_MAPPER (log10, octave::math::rc_log10);
+    SCALAR_MAPPER (log1p, octave::math::rc_log1p);
+    SCALAR_MAPPER (round, octave::math::round);
+    SCALAR_MAPPER (roundb, octave::math::roundb);
+    SCALAR_MAPPER (signum, octave::math::signum);
+    SCALAR_MAPPER (sin, ::sinf);
+    SCALAR_MAPPER (sinh, ::sinhf);
+    SCALAR_MAPPER (sqrt, octave::math::rc_sqrt);
+    SCALAR_MAPPER (tan, ::tanf);
+    SCALAR_MAPPER (tanh, ::tanhf);
+    SCALAR_MAPPER (isfinite, octave::math::finite);
+    SCALAR_MAPPER (isinf, octave::math::isinf);
+    SCALAR_MAPPER (isna, octave::math::is_NA);
+    SCALAR_MAPPER (isnan, octave::math::isnan);
+    SCALAR_MAPPER (xsignbit, octave::math::signbit);

     // Special cases for Matlab compatibility.
     case umap_xtolower:
@@ -449,3 +449,4 @@
   else
     return false;
 }
+
--- a/libinterp/octave-value/ov-float.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-float.h	Tue Aug 30 21:46:47 2016 -0700
@@ -272,3 +272,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-flt-complex.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-complex.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -343,8 +343,8 @@
     }

   FloatComplex tmp = float_complex_value ();
-  retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     &tmp) >= 0;
+  retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, &tmp) >= 0;

   H5Dclose (data_hid);
   H5Tclose (type_hid);
@@ -396,8 +396,9 @@

   // complex scalar:
   FloatComplex ctmp;
-  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-               &ctmp) >= 0)
+  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, &ctmp)
+      >= 0)
     {
       retval = true;
       scalar = ctmp;
@@ -436,52 +437,53 @@
 {
   switch (umap)
     {
-#define SCALAR_MAPPER(UMAP, FCN)                \
-      case umap_ ## UMAP:                       \
-        return octave_value (FCN (scalar))
+#define SCALAR_MAPPER(UMAP, FCN)              \
+    case umap_ ## UMAP:                       \
+      return octave_value (FCN (scalar))

-      SCALAR_MAPPER (abs, std::abs);
-      SCALAR_MAPPER (acos, octave::math::acos);
-      SCALAR_MAPPER (acosh, octave::math::acosh);
-      SCALAR_MAPPER (angle, std::arg);
-      SCALAR_MAPPER (arg, std::arg);
-      SCALAR_MAPPER (asin, octave::math::asin);
-      SCALAR_MAPPER (asinh, octave::math::asinh);
-      SCALAR_MAPPER (atan, octave::math::atan);
-      SCALAR_MAPPER (atanh, octave::math::atanh);
-      SCALAR_MAPPER (erf, octave::math::erf);
-      SCALAR_MAPPER (erfc, octave::math::erfc);
-      SCALAR_MAPPER (erfcx, octave::math::erfcx);
-      SCALAR_MAPPER (erfi, octave::math::erfi);
-      SCALAR_MAPPER (dawson, octave::math::dawson);
-      SCALAR_MAPPER (ceil, octave::math::ceil);
-      SCALAR_MAPPER (conj, std::conj);
-      SCALAR_MAPPER (cos, std::cos);
-      SCALAR_MAPPER (cosh, std::cosh);
-      SCALAR_MAPPER (exp, std::exp);
-      SCALAR_MAPPER (expm1, octave::math::expm1);
-      SCALAR_MAPPER (fix, octave::math::fix);
-      SCALAR_MAPPER (floor, octave::math::floor);
-      SCALAR_MAPPER (imag, std::imag);
-      SCALAR_MAPPER (log, std::log);
-      SCALAR_MAPPER (log2, octave::math::log2);
-      SCALAR_MAPPER (log10, std::log10);
-      SCALAR_MAPPER (log1p, octave::math::log1p);
-      SCALAR_MAPPER (real, std::real);
-      SCALAR_MAPPER (round, octave::math::round);
-      SCALAR_MAPPER (roundb, octave::math::roundb);
-      SCALAR_MAPPER (signum, octave::math::signum);
-      SCALAR_MAPPER (sin, std::sin);
-      SCALAR_MAPPER (sinh, std::sinh);
-      SCALAR_MAPPER (sqrt, std::sqrt);
-      SCALAR_MAPPER (tan, std::tan);
-      SCALAR_MAPPER (tanh, std::tanh);
-      SCALAR_MAPPER (isfinite, octave::math::finite);
-      SCALAR_MAPPER (isinf, octave::math::isinf);
-      SCALAR_MAPPER (isna, octave::math::is_NA);
-      SCALAR_MAPPER (isnan, octave::math::isnan);
+    SCALAR_MAPPER (abs, std::abs);
+    SCALAR_MAPPER (acos, octave::math::acos);
+    SCALAR_MAPPER (acosh, octave::math::acosh);
+    SCALAR_MAPPER (angle, std::arg);
+    SCALAR_MAPPER (arg, std::arg);
+    SCALAR_MAPPER (asin, octave::math::asin);
+    SCALAR_MAPPER (asinh, octave::math::asinh);
+    SCALAR_MAPPER (atan, octave::math::atan);
+    SCALAR_MAPPER (atanh, octave::math::atanh);
+    SCALAR_MAPPER (erf, octave::math::erf);
+    SCALAR_MAPPER (erfc, octave::math::erfc);
+    SCALAR_MAPPER (erfcx, octave::math::erfcx);
+    SCALAR_MAPPER (erfi, octave::math::erfi);
+    SCALAR_MAPPER (dawson, octave::math::dawson);
+    SCALAR_MAPPER (ceil, octave::math::ceil);
+    SCALAR_MAPPER (conj, std::conj);
+    SCALAR_MAPPER (cos, std::cos);
+    SCALAR_MAPPER (cosh, std::cosh);
+    SCALAR_MAPPER (exp, std::exp);
+    SCALAR_MAPPER (expm1, octave::math::expm1);
+    SCALAR_MAPPER (fix, octave::math::fix);
+    SCALAR_MAPPER (floor, octave::math::floor);
+    SCALAR_MAPPER (imag, std::imag);
+    SCALAR_MAPPER (log, std::log);
+    SCALAR_MAPPER (log2, octave::math::log2);
+    SCALAR_MAPPER (log10, std::log10);
+    SCALAR_MAPPER (log1p, octave::math::log1p);
+    SCALAR_MAPPER (real, std::real);
+    SCALAR_MAPPER (round, octave::math::round);
+    SCALAR_MAPPER (roundb, octave::math::roundb);
+    SCALAR_MAPPER (signum, octave::math::signum);
+    SCALAR_MAPPER (sin, std::sin);
+    SCALAR_MAPPER (sinh, std::sinh);
+    SCALAR_MAPPER (sqrt, std::sqrt);
+    SCALAR_MAPPER (tan, std::tan);
+    SCALAR_MAPPER (tanh, std::tanh);
+    SCALAR_MAPPER (isfinite, octave::math::finite);
+    SCALAR_MAPPER (isinf, octave::math::isinf);
+    SCALAR_MAPPER (isna, octave::math::is_NA);
+    SCALAR_MAPPER (isnan, octave::math::isnan);

     default:
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-flt-complex.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-complex.h	Tue Aug 30 21:46:47 2016 -0700
@@ -197,3 +197,4 @@
 typedef octave_float_complex octave_float_complex_scalar;

 #endif
+
--- a/libinterp/octave-value/ov-flt-cx-diag.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-cx-diag.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,7 +42,8 @@
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
 {
-  const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
+  const octave_float_complex_diag_matrix& v =
+    dynamic_cast<const octave_float_complex_diag_matrix&> (a);

   return new octave_float_complex_matrix (v.float_complex_matrix_value ());
 }
@@ -219,3 +220,4 @@
     x = val.float_complex_value ();
   return retval;
 }
+
--- a/libinterp/octave-value/ov-flt-cx-diag.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-cx-diag.h	Tue Aug 30 21:46:47 2016 -0700
@@ -96,3 +96,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-flt-cx-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-cx-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -504,7 +504,8 @@
 }

 bool
-octave_float_complex_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool)
+octave_float_complex_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                                        bool)
 {
   bool retval = false;

@@ -568,8 +569,9 @@
   if (retval)
     {
       FloatComplex *mtmp = m.fortran_vec ();
-      if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                    mtmp) < 0)
+      if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                    octave_H5P_DEFAULT, mtmp)
+          < 0)
         {
           H5Tclose (complex_type_hid);
           retval = false;
@@ -654,8 +656,9 @@

   FloatComplexNDArray m (dv);
   FloatComplex *reim = m.fortran_vec ();
-  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-               reim) >= 0)
+  if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, reim)
+      >= 0)
     {
       retval = true;
       matrix = m;
@@ -717,54 +720,55 @@
     case umap_conj:
       return ::conj (matrix);

-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
-      ARRAY_METHOD_MAPPER (isnan, isnan);
-      ARRAY_METHOD_MAPPER (isinf, isinf);
-      ARRAY_METHOD_MAPPER (isfinite, isfinite);
+    ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (isnan, isnan);
+    ARRAY_METHOD_MAPPER (isinf, isinf);
+    ARRAY_METHOD_MAPPER (isfinite, isfinite);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-      ARRAY_MAPPER (acos, FloatComplex, octave::math::acos);
-      ARRAY_MAPPER (acosh, FloatComplex, octave::math::acosh);
-      ARRAY_MAPPER (angle, float, std::arg);
-      ARRAY_MAPPER (arg, float, std::arg);
-      ARRAY_MAPPER (asin, FloatComplex, octave::math::asin);
-      ARRAY_MAPPER (asinh, FloatComplex, octave::math::asinh);
-      ARRAY_MAPPER (atan, FloatComplex, octave::math::atan);
-      ARRAY_MAPPER (atanh, FloatComplex, octave::math::atanh);
-      ARRAY_MAPPER (erf, FloatComplex, octave::math::erf);
-      ARRAY_MAPPER (erfc, FloatComplex, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, FloatComplex, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, FloatComplex, octave::math::erfi);
-      ARRAY_MAPPER (dawson, FloatComplex, octave::math::dawson);
-      ARRAY_MAPPER (ceil, FloatComplex, octave::math::ceil);
-      ARRAY_MAPPER (cos, FloatComplex, std::cos);
-      ARRAY_MAPPER (cosh, FloatComplex, std::cosh);
-      ARRAY_MAPPER (exp, FloatComplex, std::exp);
-      ARRAY_MAPPER (expm1, FloatComplex, octave::math::expm1);
-      ARRAY_MAPPER (fix, FloatComplex, octave::math::fix);
-      ARRAY_MAPPER (floor, FloatComplex, octave::math::floor);
-      ARRAY_MAPPER (log, FloatComplex, std::log);
-      ARRAY_MAPPER (log2, FloatComplex, octave::math::log2);
-      ARRAY_MAPPER (log10, FloatComplex, std::log10);
-      ARRAY_MAPPER (log1p, FloatComplex, octave::math::log1p);
-      ARRAY_MAPPER (round, FloatComplex, octave::math::round);
-      ARRAY_MAPPER (roundb, FloatComplex, octave::math::roundb);
-      ARRAY_MAPPER (signum, FloatComplex, octave::math::signum);
-      ARRAY_MAPPER (sin, FloatComplex, std::sin);
-      ARRAY_MAPPER (sinh, FloatComplex, std::sinh);
-      ARRAY_MAPPER (sqrt, FloatComplex, std::sqrt);
-      ARRAY_MAPPER (tan, FloatComplex, std::tan);
-      ARRAY_MAPPER (tanh, FloatComplex, std::tanh);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (acos, FloatComplex, octave::math::acos);
+    ARRAY_MAPPER (acosh, FloatComplex, octave::math::acosh);
+    ARRAY_MAPPER (angle, float, std::arg);
+    ARRAY_MAPPER (arg, float, std::arg);
+    ARRAY_MAPPER (asin, FloatComplex, octave::math::asin);
+    ARRAY_MAPPER (asinh, FloatComplex, octave::math::asinh);
+    ARRAY_MAPPER (atan, FloatComplex, octave::math::atan);
+    ARRAY_MAPPER (atanh, FloatComplex, octave::math::atanh);
+    ARRAY_MAPPER (erf, FloatComplex, octave::math::erf);
+    ARRAY_MAPPER (erfc, FloatComplex, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, FloatComplex, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, FloatComplex, octave::math::erfi);
+    ARRAY_MAPPER (dawson, FloatComplex, octave::math::dawson);
+    ARRAY_MAPPER (ceil, FloatComplex, octave::math::ceil);
+    ARRAY_MAPPER (cos, FloatComplex, std::cos);
+    ARRAY_MAPPER (cosh, FloatComplex, std::cosh);
+    ARRAY_MAPPER (exp, FloatComplex, std::exp);
+    ARRAY_MAPPER (expm1, FloatComplex, octave::math::expm1);
+    ARRAY_MAPPER (fix, FloatComplex, octave::math::fix);
+    ARRAY_MAPPER (floor, FloatComplex, octave::math::floor);
+    ARRAY_MAPPER (log, FloatComplex, std::log);
+    ARRAY_MAPPER (log2, FloatComplex, octave::math::log2);
+    ARRAY_MAPPER (log10, FloatComplex, std::log10);
+    ARRAY_MAPPER (log1p, FloatComplex, octave::math::log1p);
+    ARRAY_MAPPER (round, FloatComplex, octave::math::round);
+    ARRAY_MAPPER (roundb, FloatComplex, octave::math::roundb);
+    ARRAY_MAPPER (signum, FloatComplex, octave::math::signum);
+    ARRAY_MAPPER (sin, FloatComplex, std::sin);
+    ARRAY_MAPPER (sinh, FloatComplex, std::sinh);
+    ARRAY_MAPPER (sqrt, FloatComplex, std::sqrt);
+    ARRAY_MAPPER (tan, FloatComplex, std::tan);
+    ARRAY_MAPPER (tanh, FloatComplex, std::tanh);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);

     default:
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-flt-cx-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-cx-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -181,3 +181,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-flt-re-diag.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-re-diag.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -41,7 +41,8 @@
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
 {
-  const octave_float_diag_matrix& v = dynamic_cast<const octave_float_diag_matrix&> (a);
+  const octave_float_diag_matrix& v =
+    dynamic_cast<const octave_float_diag_matrix&> (a);

   return new octave_float_matrix (v.float_matrix_value ());
 }
@@ -236,3 +237,4 @@
     x = val.float_value ();
   return retval;
 }
+
--- a/libinterp/octave-value/ov-flt-re-diag.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-re-diag.h	Tue Aug 30 21:46:47 2016 -0700
@@ -106,3 +106,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-flt-re-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -796,62 +796,62 @@
       return matrix;

     // Mappers handled specially.
-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
-      ARRAY_METHOD_MAPPER (isnan, isnan);
-      ARRAY_METHOD_MAPPER (isinf, isinf);
-      ARRAY_METHOD_MAPPER (isfinite, isfinite);
+    ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (isnan, isnan);
+    ARRAY_METHOD_MAPPER (isinf, isinf);
+    ARRAY_METHOD_MAPPER (isfinite, isfinite);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-#define RC_ARRAY_MAPPER(UMAP, TYPE, FCN)        \
-      case umap_ ## UMAP:                       \
-        return do_rc_map (matrix, FCN)
+#define RC_ARRAY_MAPPER(UMAP, TYPE, FCN)      \
+    case umap_ ## UMAP:                       \
+      return do_rc_map (matrix, FCN)

-      RC_ARRAY_MAPPER (acos, FloatComplex, octave::math::rc_acos);
-      RC_ARRAY_MAPPER (acosh, FloatComplex, octave::math::rc_acosh);
-      ARRAY_MAPPER (angle, float, octave::math::arg);
-      ARRAY_MAPPER (arg, float,octave::math ::arg);
-      RC_ARRAY_MAPPER (asin, FloatComplex, octave::math::rc_asin);
-      ARRAY_MAPPER (asinh, float, octave::math::asinh);
-      ARRAY_MAPPER (atan, float, ::atanf);
-      RC_ARRAY_MAPPER (atanh, FloatComplex, octave::math::rc_atanh);
-      ARRAY_MAPPER (erf, float, octave::math::erf);
-      ARRAY_MAPPER (erfinv, float, octave::math::erfinv);
-      ARRAY_MAPPER (erfcinv, float, octave::math::erfcinv);
-      ARRAY_MAPPER (erfc, float, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, float, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, float, octave::math::erfi);
-      ARRAY_MAPPER (dawson, float, octave::math::dawson);
-      ARRAY_MAPPER (gamma, float, octave::math::gamma);
-      RC_ARRAY_MAPPER (lgamma, FloatComplex, octave::math::rc_lgamma);
-      ARRAY_MAPPER (cbrt, float, octave::math::cbrt);
-      ARRAY_MAPPER (ceil, float, ::ceilf);
-      ARRAY_MAPPER (cos, float, ::cosf);
-      ARRAY_MAPPER (cosh, float, ::coshf);
-      ARRAY_MAPPER (exp, float, ::expf);
-      ARRAY_MAPPER (expm1, float, octave::math::expm1);
-      ARRAY_MAPPER (fix, float, octave::math::fix);
-      ARRAY_MAPPER (floor, float, ::floorf);
-      RC_ARRAY_MAPPER (log, FloatComplex, octave::math::rc_log);
-      RC_ARRAY_MAPPER (log2, FloatComplex, octave::math::rc_log2);
-      RC_ARRAY_MAPPER (log10, FloatComplex, octave::math::rc_log10);
-      RC_ARRAY_MAPPER (log1p, FloatComplex, octave::math::rc_log1p);
-      ARRAY_MAPPER (round, float, octave::math::round);
-      ARRAY_MAPPER (roundb, float, octave::math::roundb);
-      ARRAY_MAPPER (signum, float, octave::math::signum);
-      ARRAY_MAPPER (sin, float, ::sinf);
-      ARRAY_MAPPER (sinh, float, ::sinhf);
-      RC_ARRAY_MAPPER (sqrt, FloatComplex, octave::math::rc_sqrt);
-      ARRAY_MAPPER (tan, float, ::tanf);
-      ARRAY_MAPPER (tanh, float, ::tanhf);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
-      ARRAY_MAPPER (xsignbit, float, octave::math::signbit);
+    RC_ARRAY_MAPPER (acos, FloatComplex, octave::math::rc_acos);
+    RC_ARRAY_MAPPER (acosh, FloatComplex, octave::math::rc_acosh);
+    ARRAY_MAPPER (angle, float, octave::math::arg);
+    ARRAY_MAPPER (arg, float,octave::math ::arg);
+    RC_ARRAY_MAPPER (asin, FloatComplex, octave::math::rc_asin);
+    ARRAY_MAPPER (asinh, float, octave::math::asinh);
+    ARRAY_MAPPER (atan, float, ::atanf);
+    RC_ARRAY_MAPPER (atanh, FloatComplex, octave::math::rc_atanh);
+    ARRAY_MAPPER (erf, float, octave::math::erf);
+    ARRAY_MAPPER (erfinv, float, octave::math::erfinv);
+    ARRAY_MAPPER (erfcinv, float, octave::math::erfcinv);
+    ARRAY_MAPPER (erfc, float, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, float, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, float, octave::math::erfi);
+    ARRAY_MAPPER (dawson, float, octave::math::dawson);
+    ARRAY_MAPPER (gamma, float, octave::math::gamma);
+    RC_ARRAY_MAPPER (lgamma, FloatComplex, octave::math::rc_lgamma);
+    ARRAY_MAPPER (cbrt, float, octave::math::cbrt);
+    ARRAY_MAPPER (ceil, float, ::ceilf);
+    ARRAY_MAPPER (cos, float, ::cosf);
+    ARRAY_MAPPER (cosh, float, ::coshf);
+    ARRAY_MAPPER (exp, float, ::expf);
+    ARRAY_MAPPER (expm1, float, octave::math::expm1);
+    ARRAY_MAPPER (fix, float, octave::math::fix);
+    ARRAY_MAPPER (floor, float, ::floorf);
+    RC_ARRAY_MAPPER (log, FloatComplex, octave::math::rc_log);
+    RC_ARRAY_MAPPER (log2, FloatComplex, octave::math::rc_log2);
+    RC_ARRAY_MAPPER (log10, FloatComplex, octave::math::rc_log10);
+    RC_ARRAY_MAPPER (log1p, FloatComplex, octave::math::rc_log1p);
+    ARRAY_MAPPER (round, float, octave::math::round);
+    ARRAY_MAPPER (roundb, float, octave::math::roundb);
+    ARRAY_MAPPER (signum, float, octave::math::signum);
+    ARRAY_MAPPER (sin, float, ::sinf);
+    ARRAY_MAPPER (sinh, float, ::sinhf);
+    RC_ARRAY_MAPPER (sqrt, FloatComplex, octave::math::rc_sqrt);
+    ARRAY_MAPPER (tan, float, ::tanf);
+    ARRAY_MAPPER (tanh, float, ::tanhf);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (xsignbit, float, octave::math::signbit);

     // Special cases for Matlab compatibility.
     case umap_xtolower:
--- a/libinterp/octave-value/ov-flt-re-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-flt-re-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -227,3 +227,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-int-traits.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int-traits.h	Tue Aug 30 21:46:47 2016 -0700
@@ -63,3 +63,4 @@
 OCTAVE_VALUE_INT_TRAITS(uint64NDArray, octave_uint64_scalar);

 #endif
+
--- a/libinterp/octave-value/ov-int16.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int16.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int16_scalar,
                                      "int16 scalar", "int16");
+
--- a/libinterp/octave-value/ov-int16.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int16.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-int32.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int32.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int32_scalar,
                                      "int32 scalar", "int32");
+
--- a/libinterp/octave-value/ov-int32.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int32.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-int64.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int64.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int64_scalar,
                                      "int64 scalar", "int64");
+
--- a/libinterp/octave-value/ov-int64.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int64.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-int8.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int8.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int8_scalar,
                                      "int8 scalar", "int8");
+
--- a/libinterp/octave-value/ov-int8.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-int8.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-intx.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-intx.h	Tue Aug 30 21:46:47 2016 -0700
@@ -676,3 +676,4 @@

   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
+
--- a/libinterp/octave-value/ov-java.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-java.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -624,7 +624,8 @@
       vm_args.add ("-Djava.class.path=" + initial_class_path ());
       vm_args.add ("-Xrs");
       vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader");
-      vm_args.read_java_opts (initial_java_dir () + octave::sys::file_ops::dir_sep_str () +
+      vm_args.read_java_opts (initial_java_dir () +
+                              octave::sys::file_ops::dir_sep_str () +
                               "java.opts");

 #if ! defined (__APPLE__) && ! defined (__MACH__)
@@ -1606,7 +1607,7 @@
         UNBOX_PRIMITIVE_SCALAR (uint64_t, uint64_scalar, "java/lang/Long", "(J)V");

 #undef UNBOX_PRIMITIVE_SCALAR
-      }
+    }
   else if (val.is_empty ())
     {
       jobj = 0;
@@ -2270,7 +2271,8 @@
 }

 octave_value
-octave_java::do_javaMethod (const std::string& name, const octave_value_list& args)
+octave_java::do_javaMethod (const std::string& name,
+                            const octave_value_list& args)
 {
 #if defined (HAVE_JAVA)

@@ -2411,7 +2413,8 @@
 }

 octave_value
-octave_java::do_javaObject (const std::string& name, const octave_value_list& args)
+octave_java::do_javaObject (const std::string& name,
+                            const octave_value_list& args)
 {
 #if defined (HAVE_JAVA)

@@ -2534,7 +2537,8 @@
 }

 octave_value
-octave_java::do_java_get (const std::string& class_name, const std::string& name)
+octave_java::do_java_get (const std::string& class_name,
+                          const std::string& name)
 {
 #if defined (HAVE_JAVA)

@@ -2664,7 +2668,8 @@
 }

 octave_value
-octave_java::do_java_set (const std::string& class_name, const std::string& name,
+octave_java::do_java_set (const std::string& class_name,
+                          const std::string& name,
                           const octave_value& val)
 {
 #if defined (HAVE_JAVA)
@@ -3245,3 +3250,4 @@
 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "zzz"), 3);
 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "hhh") < 0);
 */
+
--- a/libinterp/octave-value/ov-java.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-java.h	Tue Aug 30 21:46:47 2016 -0700
@@ -188,3 +188,4 @@
 extern OCTINTERP_API bool Vdebug_java;

 #endif
+
--- a/libinterp/octave-value/ov-lazy-idx.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-lazy-idx.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -197,3 +197,4 @@

   return true;
 }
+
--- a/libinterp/octave-value/ov-lazy-idx.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-lazy-idx.h	Tue Aug 30 21:46:47 2016 -0700
@@ -253,3 +253,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-mex-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-mex-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -144,9 +144,10 @@

   BEGIN_PROFILER_BLOCK (octave_mex_function)

-    retval = call_mex (have_fmex, mex_fcn_ptr, args, nargout, this);
+  retval = call_mex (have_fmex, mex_fcn_ptr, args, nargout, this);

   END_PROFILER_BLOCK

   return retval;
 }
+
--- a/libinterp/octave-value/ov-mex-fcn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-mex-fcn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -118,3 +118,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-null-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-null-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -132,3 +132,4 @@
 %! x = [];
 %! assert (isnull (x), false);
 */
+
--- a/libinterp/octave-value/ov-null-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-null-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -100,3 +100,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-oncleanup.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-oncleanup.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -208,3 +208,4 @@
 %!   warning (old_wstate);
 %! end_unwind_protect
 */
+
--- a/libinterp/octave-value/ov-oncleanup.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-oncleanup.h	Tue Aug 30 21:46:47 2016 -0700
@@ -95,3 +95,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-perm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-perm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -517,3 +517,4 @@
   else
     return octave_value ();
 }
+
--- a/libinterp/octave-value/ov-perm.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-perm.h	Tue Aug 30 21:46:47 2016 -0700
@@ -249,3 +249,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-range.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-range.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -675,8 +675,9 @@
   range_vals[1] = r.inc () != 0 ? r.limit () : r.numel ();
   range_vals[2] = r.inc ();

-  if (H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                range_vals) >= 0)
+  if (H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
+                octave_H5P_DEFAULT, range_vals)
+      >= 0)
     {
       octave_idx_type nel = r.numel ();
       retval = hdf5_add_scalar_attr (data_hid, H5T_NATIVE_IDX,
@@ -734,8 +735,9 @@
     }

   double rangevals[3];
-  if (H5Dread (data_hid, range_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-               rangevals) >= 0)
+  if (H5Dread (data_hid, range_type, octave_H5S_ALL, octave_H5S_ALL,
+               octave_H5P_DEFAULT, rangevals)
+      >= 0)
     {
       retval = true;
       octave_idx_type nel;
@@ -840,3 +842,4 @@
 %!   warning (warn_state.state, warn_state.identifier);
 %! end_unwind_protect
 */
+
--- a/libinterp/octave-value/ov-range.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-range.h	Tue Aug 30 21:46:47 2016 -0700
@@ -329,3 +329,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-re-diag.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-diag.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -313,3 +313,4 @@
     x = val.double_value ();
   return retval;
 }
+
--- a/libinterp/octave-value/ov-re-diag.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-diag.h	Tue Aug 30 21:46:47 2016 -0700
@@ -111,3 +111,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-re-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -692,7 +692,8 @@
 }

 bool
-octave_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
+octave_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                          bool save_as_floats)
 {
   bool retval = false;

@@ -921,62 +922,62 @@
       return matrix;

     // Mappers handled specially.
-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
-      ARRAY_METHOD_MAPPER (isnan, isnan);
-      ARRAY_METHOD_MAPPER (isinf, isinf);
-      ARRAY_METHOD_MAPPER (isfinite, isfinite);
+    ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (isnan, isnan);
+    ARRAY_METHOD_MAPPER (isinf, isinf);
+    ARRAY_METHOD_MAPPER (isfinite, isfinite);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-#define RC_ARRAY_MAPPER(UMAP, TYPE, FCN)        \
-      case umap_ ## UMAP:                       \
-        return do_rc_map (matrix, FCN)
+#define RC_ARRAY_MAPPER(UMAP, TYPE, FCN)      \
+    case umap_ ## UMAP:                       \
+      return do_rc_map (matrix, FCN)

-      RC_ARRAY_MAPPER (acos, Complex, octave::math::rc_acos);
-      RC_ARRAY_MAPPER (acosh, Complex, octave::math::rc_acosh);
-      ARRAY_MAPPER (angle, double, octave::math::arg);
-      ARRAY_MAPPER (arg, double,octave::math ::arg);
-      RC_ARRAY_MAPPER (asin, Complex, octave::math::rc_asin);
-      ARRAY_MAPPER (asinh, double, octave::math::asinh);
-      ARRAY_MAPPER (atan, double, ::atan);
-      RC_ARRAY_MAPPER (atanh, Complex, octave::math::rc_atanh);
-      ARRAY_MAPPER (erf, double, octave::math::erf);
-      ARRAY_MAPPER (erfinv, double, octave::math::erfinv);
-      ARRAY_MAPPER (erfcinv, double, octave::math::erfcinv);
-      ARRAY_MAPPER (erfc, double, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, double, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, double, octave::math::erfi);
-      ARRAY_MAPPER (dawson, double, octave::math::dawson);
-      ARRAY_MAPPER (gamma, double, octave::math::gamma);
-      RC_ARRAY_MAPPER (lgamma, Complex, octave::math::rc_lgamma);
-      ARRAY_MAPPER (cbrt, double, octave::math::cbrt);
-      ARRAY_MAPPER (ceil, double, ::ceil);
-      ARRAY_MAPPER (cos, double, ::cos);
-      ARRAY_MAPPER (cosh, double, ::cosh);
-      ARRAY_MAPPER (exp, double, ::exp);
-      ARRAY_MAPPER (expm1, double, octave::math::expm1);
-      ARRAY_MAPPER (fix, double, octave::math::fix);
-      ARRAY_MAPPER (floor, double, ::floor);
-      RC_ARRAY_MAPPER (log, Complex, octave::math::rc_log);
-      RC_ARRAY_MAPPER (log2, Complex, octave::math::rc_log2);
-      RC_ARRAY_MAPPER (log10, Complex, octave::math::rc_log10);
-      RC_ARRAY_MAPPER (log1p, Complex, octave::math::rc_log1p);
-      ARRAY_MAPPER (round, double, octave::math::round);
-      ARRAY_MAPPER (roundb, double, octave::math::roundb);
-      ARRAY_MAPPER (signum, double, octave::math::signum);
-      ARRAY_MAPPER (sin, double, ::sin);
-      ARRAY_MAPPER (sinh, double, ::sinh);
-      RC_ARRAY_MAPPER (sqrt, Complex, octave::math::rc_sqrt);
-      ARRAY_MAPPER (tan, double, ::tan);
-      ARRAY_MAPPER (tanh, double, ::tanh);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
-      ARRAY_MAPPER (xsignbit, double, octave::math::signbit);
+    RC_ARRAY_MAPPER (acos, Complex, octave::math::rc_acos);
+    RC_ARRAY_MAPPER (acosh, Complex, octave::math::rc_acosh);
+    ARRAY_MAPPER (angle, double, octave::math::arg);
+    ARRAY_MAPPER (arg, double,octave::math ::arg);
+    RC_ARRAY_MAPPER (asin, Complex, octave::math::rc_asin);
+    ARRAY_MAPPER (asinh, double, octave::math::asinh);
+    ARRAY_MAPPER (atan, double, ::atan);
+    RC_ARRAY_MAPPER (atanh, Complex, octave::math::rc_atanh);
+    ARRAY_MAPPER (erf, double, octave::math::erf);
+    ARRAY_MAPPER (erfinv, double, octave::math::erfinv);
+    ARRAY_MAPPER (erfcinv, double, octave::math::erfcinv);
+    ARRAY_MAPPER (erfc, double, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, double, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, double, octave::math::erfi);
+    ARRAY_MAPPER (dawson, double, octave::math::dawson);
+    ARRAY_MAPPER (gamma, double, octave::math::gamma);
+    RC_ARRAY_MAPPER (lgamma, Complex, octave::math::rc_lgamma);
+    ARRAY_MAPPER (cbrt, double, octave::math::cbrt);
+    ARRAY_MAPPER (ceil, double, ::ceil);
+    ARRAY_MAPPER (cos, double, ::cos);
+    ARRAY_MAPPER (cosh, double, ::cosh);
+    ARRAY_MAPPER (exp, double, ::exp);
+    ARRAY_MAPPER (expm1, double, octave::math::expm1);
+    ARRAY_MAPPER (fix, double, octave::math::fix);
+    ARRAY_MAPPER (floor, double, ::floor);
+    RC_ARRAY_MAPPER (log, Complex, octave::math::rc_log);
+    RC_ARRAY_MAPPER (log2, Complex, octave::math::rc_log2);
+    RC_ARRAY_MAPPER (log10, Complex, octave::math::rc_log10);
+    RC_ARRAY_MAPPER (log1p, Complex, octave::math::rc_log1p);
+    ARRAY_MAPPER (round, double, octave::math::round);
+    ARRAY_MAPPER (roundb, double, octave::math::roundb);
+    ARRAY_MAPPER (signum, double, octave::math::signum);
+    ARRAY_MAPPER (sin, double, ::sin);
+    ARRAY_MAPPER (sinh, double, ::sinh);
+    RC_ARRAY_MAPPER (sqrt, Complex, octave::math::rc_sqrt);
+    ARRAY_MAPPER (tan, double, ::tan);
+    ARRAY_MAPPER (tanh, double, ::tanh);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (xsignbit, double, octave::math::signbit);

     // Special cases for Matlab compatibility.
     case umap_xtolower:
@@ -1005,3 +1006,4 @@
       return octave_base_value::map (umap);
     }
 }
+
--- a/libinterp/octave-value/ov-re-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -251,3 +251,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-re-sparse.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-sparse.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -406,8 +406,8 @@
   matrix.maybe_compress ();

 #if defined (HAVE_HDF5_18)
-  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
-                               octave_H5P_DEFAULT);
+  hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT,
+                               octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   hid_t group_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -441,8 +441,8 @@
     }

   tmp = m.rows ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     &tmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, &tmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -465,8 +465,8 @@
     }

   tmp = m.cols ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     &tmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, &tmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -490,8 +490,8 @@
     }

   tmp = m.nnz ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     &tmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, &tmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -528,8 +528,8 @@
     }

   octave_idx_type * itmp = m.xcidx ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     itmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, itmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -565,8 +565,8 @@
     }

   itmp = m.xridx ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
-                     itmp) >= 0;
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
+                     octave_H5P_DEFAULT, itmp) >= 0;
   H5Dclose (data_hid);
   if (! retval)
     {
@@ -903,57 +903,57 @@
       return matrix;

     // Mappers handled specially.
-#define ARRAY_METHOD_MAPPER(UMAP, FCN)          \
-      case umap_ ## UMAP:                       \
-        return octave_value (matrix.FCN ())
+#define ARRAY_METHOD_MAPPER(UMAP, FCN)        \
+    case umap_ ## UMAP:                       \
+      return octave_value (matrix.FCN ())

-      ARRAY_METHOD_MAPPER (abs, abs);
+    ARRAY_METHOD_MAPPER (abs, abs);

-#define ARRAY_MAPPER(UMAP, TYPE, FCN)                   \
-      case umap_ ## UMAP:                               \
-        return octave_value (matrix.map<TYPE> (FCN))
+#define ARRAY_MAPPER(UMAP, TYPE, FCN)                 \
+    case umap_ ## UMAP:                               \
+      return octave_value (matrix.map<TYPE> (FCN))

-      ARRAY_MAPPER (acos, Complex, octave::math::rc_acos);
-      ARRAY_MAPPER (acosh, Complex, octave::math::rc_acosh);
-      ARRAY_MAPPER (angle, double, octave::math::arg);
-      ARRAY_MAPPER (arg, double,octave::math ::arg);
-      ARRAY_MAPPER (asin, Complex, octave::math::rc_asin);
-      ARRAY_MAPPER (asinh, double, octave::math::asinh);
-      ARRAY_MAPPER (atan, double, ::atan);
-      ARRAY_MAPPER (atanh, Complex, octave::math::rc_atanh);
-      ARRAY_MAPPER (erf, double, octave::math::erf);
-      ARRAY_MAPPER (erfinv, double, octave::math::erfinv);
-      ARRAY_MAPPER (erfcinv, double, octave::math::erfcinv);
-      ARRAY_MAPPER (erfc, double, octave::math::erfc);
-      ARRAY_MAPPER (erfcx, double, octave::math::erfcx);
-      ARRAY_MAPPER (erfi, double, octave::math::erfi);
-      ARRAY_MAPPER (dawson, double, octave::math::dawson);
-      ARRAY_MAPPER (gamma, double, octave::math::gamma);
-      ARRAY_MAPPER (lgamma, Complex, octave::math::rc_lgamma);
-      ARRAY_MAPPER (cbrt, double, octave::math::cbrt);
-      ARRAY_MAPPER (ceil, double, ::ceil);
-      ARRAY_MAPPER (cos, double, ::cos);
-      ARRAY_MAPPER (cosh, double, ::cosh);
-      ARRAY_MAPPER (exp, double, ::exp);
-      ARRAY_MAPPER (expm1, double, octave::math::expm1);
-      ARRAY_MAPPER (fix, double, octave::math::fix);
-      ARRAY_MAPPER (floor, double, ::floor);
-      ARRAY_MAPPER (log, Complex, octave::math::rc_log);
-      ARRAY_MAPPER (log2, Complex, octave::math::rc_log2);
-      ARRAY_MAPPER (log10, Complex, octave::math::rc_log10);
-      ARRAY_MAPPER (log1p, Complex, octave::math::rc_log1p);
-      ARRAY_MAPPER (round, double, octave::math::round);
-      ARRAY_MAPPER (roundb, double, octave::math::roundb);
-      ARRAY_MAPPER (signum, double, octave::math::signum);
-      ARRAY_MAPPER (sin, double, ::sin);
-      ARRAY_MAPPER (sinh, double, ::sinh);
-      ARRAY_MAPPER (sqrt, Complex, octave::math::rc_sqrt);
-      ARRAY_MAPPER (tan, double, ::tan);
-      ARRAY_MAPPER (tanh, double, ::tanh);
-      ARRAY_MAPPER (isnan, bool, octave::math::isnan);
-      ARRAY_MAPPER (isna, bool, octave::math::is_NA);
-      ARRAY_MAPPER (isinf, bool, octave::math::isinf);
-      ARRAY_MAPPER (isfinite, bool, octave::math::finite);
+    ARRAY_MAPPER (acos, Complex, octave::math::rc_acos);
+    ARRAY_MAPPER (acosh, Complex, octave::math::rc_acosh);
+    ARRAY_MAPPER (angle, double, octave::math::arg);
+    ARRAY_MAPPER (arg, double,octave::math ::arg);
+    ARRAY_MAPPER (asin, Complex, octave::math::rc_asin);
+    ARRAY_MAPPER (asinh, double, octave::math::asinh);
+    ARRAY_MAPPER (atan, double, ::atan);
+    ARRAY_MAPPER (atanh, Complex, octave::math::rc_atanh);
+    ARRAY_MAPPER (erf, double, octave::math::erf);
+    ARRAY_MAPPER (erfinv, double, octave::math::erfinv);
+    ARRAY_MAPPER (erfcinv, double, octave::math::erfcinv);
+    ARRAY_MAPPER (erfc, double, octave::math::erfc);
+    ARRAY_MAPPER (erfcx, double, octave::math::erfcx);
+    ARRAY_MAPPER (erfi, double, octave::math::erfi);
+    ARRAY_MAPPER (dawson, double, octave::math::dawson);
+    ARRAY_MAPPER (gamma, double, octave::math::gamma);
+    ARRAY_MAPPER (lgamma, Complex, octave::math::rc_lgamma);
+    ARRAY_MAPPER (cbrt, double, octave::math::cbrt);
+    ARRAY_MAPPER (ceil, double, ::ceil);
+    ARRAY_MAPPER (cos, double, ::cos);
+    ARRAY_MAPPER (cosh, double, ::cosh);
+    ARRAY_MAPPER (exp, double, ::exp);
+    ARRAY_MAPPER (expm1, double, octave::math::expm1);
+    ARRAY_MAPPER (fix, double, octave::math::fix);
+    ARRAY_MAPPER (floor, double, ::floor);
+    ARRAY_MAPPER (log, Complex, octave::math::rc_log);
+    ARRAY_MAPPER (log2, Complex, octave::math::rc_log2);
+    ARRAY_MAPPER (log10, Complex, octave::math::rc_log10);
+    ARRAY_MAPPER (log1p, Complex, octave::math::rc_log1p);
+    ARRAY_MAPPER (round, double, octave::math::round);
+    ARRAY_MAPPER (roundb, double, octave::math::roundb);
+    ARRAY_MAPPER (signum, double, octave::math::signum);
+    ARRAY_MAPPER (sin, double, ::sin);
+    ARRAY_MAPPER (sinh, double, ::sinh);
+    ARRAY_MAPPER (sqrt, Complex, octave::math::rc_sqrt);
+    ARRAY_MAPPER (tan, double, ::tan);
+    ARRAY_MAPPER (tanh, double, ::tanh);
+    ARRAY_MAPPER (isnan, bool, octave::math::isnan);
+    ARRAY_MAPPER (isna, bool, octave::math::is_NA);
+    ARRAY_MAPPER (isinf, bool, octave::math::isinf);
+    ARRAY_MAPPER (isfinite, bool, octave::math::finite);

     default: // Attempt to go via dense matrix.
       return octave_base_sparse<SparseMatrix>::map (umap);
--- a/libinterp/octave-value/ov-re-sparse.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-re-sparse.h	Tue Aug 30 21:46:47 2016 -0700
@@ -163,3 +163,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-scalar.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-scalar.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -375,53 +375,53 @@
     case umap_conj:
       return scalar;

-#define SCALAR_MAPPER(UMAP, FCN)                \
-      case umap_ ## UMAP:                       \
-        return octave_value (FCN (scalar))
+#define SCALAR_MAPPER(UMAP, FCN)              \
+    case umap_ ## UMAP:                       \
+      return octave_value (FCN (scalar))

-      SCALAR_MAPPER (abs, ::fabs);
-      SCALAR_MAPPER (acos, octave::math::rc_acos);
-      SCALAR_MAPPER (acosh, octave::math::rc_acosh);
-      SCALAR_MAPPER (angle, octave::math::arg);
-      SCALAR_MAPPER (arg,octave::math ::arg);
-      SCALAR_MAPPER (asin, octave::math::rc_asin);
-      SCALAR_MAPPER (asinh, octave::math::asinh);
-      SCALAR_MAPPER (atan, ::atan);
-      SCALAR_MAPPER (atanh, octave::math::rc_atanh);
-      SCALAR_MAPPER (erf, octave::math::erf);
-      SCALAR_MAPPER (erfinv, octave::math::erfinv);
-      SCALAR_MAPPER (erfcinv, octave::math::erfcinv);
-      SCALAR_MAPPER (erfc, octave::math::erfc);
-      SCALAR_MAPPER (erfcx, octave::math::erfcx);
-      SCALAR_MAPPER (erfi, octave::math::erfi);
-      SCALAR_MAPPER (dawson, octave::math::dawson);
-      SCALAR_MAPPER (gamma, octave::math::gamma);
-      SCALAR_MAPPER (lgamma, octave::math::rc_lgamma);
-      SCALAR_MAPPER (cbrt, octave::math::cbrt);
-      SCALAR_MAPPER (ceil, ::ceil);
-      SCALAR_MAPPER (cos, ::cos);
-      SCALAR_MAPPER (cosh, ::cosh);
-      SCALAR_MAPPER (exp, ::exp);
-      SCALAR_MAPPER (expm1, octave::math::expm1);
-      SCALAR_MAPPER (fix, octave::math::fix);
-      SCALAR_MAPPER (floor, std::floor);
-      SCALAR_MAPPER (log, octave::math::rc_log);
-      SCALAR_MAPPER (log2, octave::math::rc_log2);
-      SCALAR_MAPPER (log10, octave::math::rc_log10);
-      SCALAR_MAPPER (log1p, octave::math::rc_log1p);
-      SCALAR_MAPPER (round, octave::math::round);
-      SCALAR_MAPPER (roundb, octave::math::roundb);
-      SCALAR_MAPPER (signum, octave::math::signum);
-      SCALAR_MAPPER (sin, ::sin);
-      SCALAR_MAPPER (sinh, ::sinh);
-      SCALAR_MAPPER (sqrt, octave::math::rc_sqrt);
-      SCALAR_MAPPER (tan, ::tan);
-      SCALAR_MAPPER (tanh, ::tanh);
-      SCALAR_MAPPER (isfinite, octave::math::finite);
-      SCALAR_MAPPER (isinf, octave::math::isinf);
-      SCALAR_MAPPER (isna, octave::math::is_NA);
-      SCALAR_MAPPER (isnan, octave::math::isnan);
-      SCALAR_MAPPER (xsignbit, octave::math::signbit);
+    SCALAR_MAPPER (abs, ::fabs);
+    SCALAR_MAPPER (acos, octave::math::rc_acos);
+    SCALAR_MAPPER (acosh, octave::math::rc_acosh);
+    SCALAR_MAPPER (angle, octave::math::arg);
+    SCALAR_MAPPER (arg,octave::math ::arg);
+    SCALAR_MAPPER (asin, octave::math::rc_asin);
+    SCALAR_MAPPER (asinh, octave::math::asinh);
+    SCALAR_MAPPER (atan, ::atan);
+    SCALAR_MAPPER (atanh, octave::math::rc_atanh);
+    SCALAR_MAPPER (erf, octave::math::erf);
+    SCALAR_MAPPER (erfinv, octave::math::erfinv);
+    SCALAR_MAPPER (erfcinv, octave::math::erfcinv);
+    SCALAR_MAPPER (erfc, octave::math::erfc);
+    SCALAR_MAPPER (erfcx, octave::math::erfcx);
+    SCALAR_MAPPER (erfi, octave::math::erfi);
+    SCALAR_MAPPER (dawson, octave::math::dawson);
+    SCALAR_MAPPER (gamma, octave::math::gamma);
+    SCALAR_MAPPER (lgamma, octave::math::rc_lgamma);
+    SCALAR_MAPPER (cbrt, octave::math::cbrt);
+    SCALAR_MAPPER (ceil, ::ceil);
+    SCALAR_MAPPER (cos, ::cos);
+    SCALAR_MAPPER (cosh, ::cosh);
+    SCALAR_MAPPER (exp, ::exp);
+    SCALAR_MAPPER (expm1, octave::math::expm1);
+    SCALAR_MAPPER (fix, octave::math::fix);
+    SCALAR_MAPPER (floor, std::floor);
+    SCALAR_MAPPER (log, octave::math::rc_log);
+    SCALAR_MAPPER (log2, octave::math::rc_log2);
+    SCALAR_MAPPER (log10, octave::math::rc_log10);
+    SCALAR_MAPPER (log1p, octave::math::rc_log1p);
+    SCALAR_MAPPER (round, octave::math::round);
+    SCALAR_MAPPER (roundb, octave::math::roundb);
+    SCALAR_MAPPER (signum, octave::math::signum);
+    SCALAR_MAPPER (sin, ::sin);
+    SCALAR_MAPPER (sinh, ::sinh);
+    SCALAR_MAPPER (sqrt, octave::math::rc_sqrt);
+    SCALAR_MAPPER (tan, ::tan);
+    SCALAR_MAPPER (tanh, ::tanh);
+    SCALAR_MAPPER (isfinite, octave::math::finite);
+    SCALAR_MAPPER (isinf, octave::math::isinf);
+    SCALAR_MAPPER (isna, octave::math::is_NA);
+    SCALAR_MAPPER (isnan, octave::math::isnan);
+    SCALAR_MAPPER (xsignbit, octave::math::signbit);

     // Special cases for Matlab compatibility.
     case umap_xtolower:
@@ -469,3 +469,4 @@
   else
     return false;
 }
+
--- a/libinterp/octave-value/ov-scalar.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-scalar.h	Tue Aug 30 21:46:47 2016 -0700
@@ -271,3 +271,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-str-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-str-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -64,7 +64,8 @@
 {
   octave_base_value *retval = 0;

-  const octave_char_matrix_str& v = dynamic_cast<const octave_char_matrix_str&> (a);
+  const octave_char_matrix_str& v
+    = dynamic_cast<const octave_char_matrix_str&> (a);

   NDArray nda = v.array_value (true);

@@ -765,3 +766,4 @@

   return retval;
 }
+
--- a/libinterp/octave-value/ov-str-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-str-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -258,3 +258,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-struct.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-struct.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -869,14 +869,16 @@
 }

 bool
-octave_struct::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
+octave_struct::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+                          bool save_as_floats)
 {
 #if defined (HAVE_HDF5)

   hid_t data_hid = -1;

 #if defined (HAVE_HDF5_18)
-  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -1481,7 +1483,8 @@
   hid_t data_hid = -1;

 #if defined (HAVE_HDF5_18)
-  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
+  data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
+                        octave_H5P_DEFAULT);
 #else
   data_hid = H5Gcreate (loc_id, name, 0);
 #endif
@@ -2125,3 +2128,4 @@
 {
   return SET_INTERNAL_VARIABLE (print_struct_array_contents);
 }
+
--- a/libinterp/octave-value/ov-struct.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-struct.h	Tue Aug 30 21:46:47 2016 -0700
@@ -281,3 +281,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-typeinfo.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-typeinfo.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -706,7 +706,7 @@
   octave_scalar_map retval;

   int len = std::min (static_cast<int> (non_const_unary_ops.columns ()),
-    num_types);
+                      num_types);

   dim_vector tab_dims (1, len);

@@ -731,7 +731,7 @@
   octave_scalar_map retval;

   int len = std::min (static_cast<int> (non_const_unary_ops.columns ()),
-    num_types);
+                      num_types);

   dim_vector tab_dims (1, len);

@@ -781,7 +781,7 @@
   octave_scalar_map retval;

   int len = std::min (static_cast<int> (compound_binary_ops.columns ()),
-    num_types);
+                      num_types);

   dim_vector tab_dims (len, len);

@@ -793,7 +793,8 @@
         for (int i = 0; i < len; i++)
           tab.xelem (j,i) = (compound_binary_ops(k,j,i) != 0);

-      octave_value::compound_binary_op op_id = static_cast<octave_value::compound_binary_op> (k);
+      octave_value::compound_binary_op op_id
+        = static_cast<octave_value::compound_binary_op> (k);

       retval.setfield (octave_value::binary_op_fcn_name (op_id), tab);
     }
@@ -891,3 +892,4 @@

   return ovl (octave_value_typeinfo::installed_type_info ());
 }
+
--- a/libinterp/octave-value/ov-typeinfo.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-typeinfo.h	Tue Aug 30 21:46:47 2016 -0700
@@ -327,3 +327,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov-uint16.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint16.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -72,3 +72,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint16_scalar,
                                      "uint16 scalar", "uint16");
+
--- a/libinterp/octave-value/ov-uint16.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint16.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-uint32.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint32.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint32_scalar,
                                      "uint32 scalar", "uint32");
+
--- a/libinterp/octave-value/ov-uint32.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint32.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-uint64.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint64.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint64_scalar,
                                      "uint64 scalar", "uint64");
+
--- a/libinterp/octave-value/ov-uint64.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint64.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-uint8.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint8.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -71,3 +71,4 @@

 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint8_scalar,
                                      "uint8 scalar", "uint8");
+
--- a/libinterp/octave-value/ov-uint8.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-uint8.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #undef OCTAVE_INT_BTYP

 #endif
+
--- a/libinterp/octave-value/ov-usr-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-usr-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1148,3 +1148,4 @@
 %! [~, y] = c{2}();
 %! assert (y, -2);
 */
+
--- a/libinterp/octave-value/ov-usr-fcn.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov-usr-fcn.h	Tue Aug 30 21:46:47 2016 -0700
@@ -525,3 +525,4 @@
 };

 #endif
+
--- a/libinterp/octave-value/ov.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ov.h	Tue Aug 30 21:46:47 2016 -0700
@@ -1632,3 +1632,4 @@
 #undef DEF_DUMMY_VALUE_EXTRACTOR

 #endif
+
--- a/libinterp/octave-value/ovl.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ovl.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -274,3 +274,4 @@
         data(i) = tmp;
     }
 }
+
--- a/libinterp/octave-value/ovl.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave-value/ovl.h	Tue Aug 30 21:46:47 2016 -0700
@@ -193,3 +193,4 @@
 }

 #endif
+
--- a/libinterp/octave.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -552,3 +552,4 @@
 %!assert (ischar (program_name ()))
 %!error program_name (1)
 */
+
--- a/libinterp/octave.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/octave.h	Tue Aug 30 21:46:47 2016 -0700
@@ -345,3 +345,4 @@
 #endif

 #endif
+
--- a/libinterp/operators/op-b-b.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-b-b.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -100,3 +100,4 @@
   INSTALL_ASSIGNCONV (octave_bool, octave_null_str, octave_bool_matrix);
   INSTALL_ASSIGNCONV (octave_bool, octave_null_sq_str, octave_bool_matrix);
 }
+
--- a/libinterp/operators/op-b-bm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-b-bm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -79,3 +79,4 @@

   INSTALL_WIDENOP (octave_bool, octave_bool_matrix, bool_matrix_conv);
 }
+
--- a/libinterp/operators/op-b-sbm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-b-sbm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,7 +48,8 @@
 DEFCATOP (b_sbm, bool, sparse_bool_matrix)
 {
   octave_bool& v1 = dynamic_cast<octave_bool&> (a1);
-  const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
+  const octave_sparse_bool_matrix& v2 =
+    dynamic_cast<const octave_sparse_bool_matrix&> (a2);
   SparseBoolMatrix tmp (1, 1, v1.bool_value ());
   return octave_value (tmp. concat (v2.sparse_bool_matrix_value (),
                                     ra_idx));
@@ -65,7 +66,8 @@
 DEFCATOP (s_sbm, scalar, sparse_bool_matrix)
 {
   octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
-  const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
+  const octave_sparse_bool_matrix& v2 =
+    dynamic_cast<const octave_sparse_bool_matrix&> (a2);
   SparseMatrix tmp (1, 1, v1.scalar_value ());
   return octave_value(tmp. concat (v2.sparse_matrix_value (), ra_idx));
 }
@@ -97,3 +99,4 @@
   INSTALL_WIDENOP (octave_bool, octave_sparse_bool_matrix,
                    sparse_bool_matrix_conv);
 }
+
--- a/libinterp/operators/op-bm-b.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-bm-b.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -118,3 +118,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_uint64_scalar,
                     conv_and_assign);
 }
+
--- a/libinterp/operators/op-bm-bm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-bm-bm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -198,3 +198,4 @@
   INSTALL_ASSIGNOP (op_el_or_eq, octave_bool_matrix, octave_bool_matrix,
                     assign_or);
 }
+
--- a/libinterp/operators/op-bm-sbm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-bm-sbm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -50,7 +50,8 @@
 DEFCATOP (bm_sbm, bool_matrix, sparse_bool_matrix)
 {
   octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1);
-  const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
+  const octave_sparse_bool_matrix& v2 =
+    dynamic_cast<const octave_sparse_bool_matrix&> (a2);
   SparseBoolMatrix tmp (v1.bool_matrix_value ());
   return octave_value (tmp. concat (v2.sparse_bool_matrix_value (),
                                     ra_idx));
@@ -59,7 +60,8 @@
 DEFCATOP (m_sbm, matrix, sparse_bool_matrix)
 {
   octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1);
-  const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
+  const octave_sparse_bool_matrix& v2 =
+    dynamic_cast<const octave_sparse_bool_matrix&> (a2);
   SparseMatrix tmp (v1.matrix_value ());
   return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx));
 }
@@ -104,3 +106,4 @@
   INSTALL_WIDENOP (octave_bool_matrix, octave_sparse_bool_matrix,
                    sparse_bool_matrix_conv);
 }
+
--- a/libinterp/operators/op-cdm-cdm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cdm-cdm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,13 +42,15 @@

 DEFUNOP (transpose, complex_diag_matrix)
 {
-  const octave_complex_diag_matrix& v = dynamic_cast<const octave_complex_diag_matrix&> (a);
+  const octave_complex_diag_matrix& v =
+    dynamic_cast<const octave_complex_diag_matrix&> (a);
   return octave_value (v.complex_diag_matrix_value ().transpose ());
 }

 DEFUNOP (hermitian, complex_diag_matrix)
 {
-  const octave_complex_diag_matrix& v = dynamic_cast<const octave_complex_diag_matrix&> (a);
+  const octave_complex_diag_matrix& v =
+    dynamic_cast<const octave_complex_diag_matrix&> (a);
   return octave_value (v.complex_diag_matrix_value ().hermitian ());
 }

@@ -60,8 +62,10 @@

 DEFBINOP (div, complex_diag_matrix, complex_diag_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_complex_diag_matrix& v1 =
+    dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_complex_diag_matrix& v2 =
+    dynamic_cast<const octave_complex_diag_matrix&> (a2);

   return xdiv (v1.complex_diag_matrix_value (),
                v2.complex_diag_matrix_value ());
@@ -69,8 +73,10 @@

 DEFBINOP (ldiv, complex_diag_matrix, complex_diag_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_complex_diag_matrix& v1 =
+    dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_complex_diag_matrix& v2 =
+    dynamic_cast<const octave_complex_diag_matrix&> (a2);

   return xleftdiv (v1.complex_diag_matrix_value (),
                    v2.complex_diag_matrix_value ());
@@ -78,7 +84,8 @@

 CONVDECL (complex_diag_matrix_to_complex_matrix)
 {
-  const octave_complex_diag_matrix& v = dynamic_cast<const octave_complex_diag_matrix&> (a);
+  const octave_complex_diag_matrix& v =
+    dynamic_cast<const octave_complex_diag_matrix&> (a);

   return new octave_complex_matrix (v.complex_matrix_value ());
 }
@@ -107,3 +114,4 @@
   INSTALL_WIDENOP (octave_complex_diag_matrix, octave_complex_matrix,
                    complex_diag_matrix_to_complex_matrix);
 }
+
--- a/libinterp/operators/op-cell.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cell.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -66,3 +66,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_cell, octave_null_str, null_assign);
   INSTALL_ASSIGNOP (op_asn_eq, octave_cell, octave_null_sq_str, null_assign);
 }
+
--- a/libinterp/operators/op-chm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-chm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -107,3 +107,4 @@
   INSTALL_CATOP (octave_scalar, octave_char_matrix, s_chm);
   INSTALL_CATOP (octave_matrix, octave_char_matrix, m_chm);
 }
+
--- a/libinterp/operators/op-class.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-class.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -155,3 +155,4 @@
   INSTALL_CLASS_BINOP (op_el_and, and);
   INSTALL_CLASS_BINOP (op_el_or, or);
 }
+
--- a/libinterp/operators/op-cm-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,7 +43,8 @@

 DEFUNOP (transpose, complex_matrix)
 {
-  const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a);
+  const octave_complex_matrix& v
+    = dynamic_cast<const octave_complex_matrix&> (a);

   if (v.ndims () > 2)
     error ("transpose not defined for N-D objects");
@@ -53,7 +54,8 @@

 DEFUNOP (hermitian, complex_matrix)
 {
-  const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a);
+  const octave_complex_matrix& v
+    = dynamic_cast<const octave_complex_matrix&> (a);

   if (v.ndims () > 2)
     error ("complex-conjugate transpose not defined for N-D objects");
@@ -76,8 +78,10 @@

 DEFBINOP (div, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   ComplexMatrix ret = xdiv (v1.complex_matrix_value (),
@@ -94,8 +98,10 @@

 DEFBINOP (ldiv, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
@@ -107,8 +113,10 @@

 DEFBINOP (trans_mul, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   return octave_value(xgemm (v1.complex_matrix_value (),
                              v2.complex_matrix_value (),
                              blas_trans, blas_no_trans));
@@ -116,8 +124,10 @@

 DEFBINOP (mul_trans, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   return octave_value(xgemm (v1.complex_matrix_value (),
                              v2.complex_matrix_value (),
                              blas_no_trans, blas_trans));
@@ -125,8 +135,10 @@

 DEFBINOP (herm_mul, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   return octave_value(xgemm (v1.complex_matrix_value (),
                              v2.complex_matrix_value (),
                              blas_conj_trans, blas_no_trans));
@@ -134,8 +146,10 @@

 DEFBINOP (mul_herm, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   return octave_value(xgemm (v1.complex_matrix_value (),
                              v2.complex_matrix_value (),
                              blas_no_trans, blas_conj_trans));
@@ -143,8 +157,10 @@

 DEFBINOP (trans_ldiv, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
@@ -156,8 +172,10 @@

 DEFBINOP (herm_ldiv, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
@@ -190,8 +208,10 @@

 DEFBINOP (el_ldiv, complex_matrix, complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return octave_value (quotient (v2.complex_array_value (),
                                  v1.complex_array_value ()));
@@ -287,3 +307,4 @@
   INSTALL_ASSIGNOP (op_el_div_eq, octave_complex_matrix, octave_complex_matrix,
                     assign_el_div);
 }
+
--- a/libinterp/operators/op-cm-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,7 +43,8 @@

 DEFBINOP (div, complex_matrix, complex)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   Complex d = v2.complex_value ();
@@ -58,7 +59,8 @@

 DEFBINOP (ldiv, complex_matrix, complex)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   ComplexMatrix m1 = v1.complex_matrix_value ();
@@ -87,7 +89,8 @@

 DEFBINOP (el_div, complex_matrix, complex)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   Complex d = v2.complex_value ();
@@ -103,7 +106,8 @@

 DEFBINOP (el_ldiv, complex_matrix, complex)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   return x_el_div (v2.complex_value (), v1.complex_array_value ());
@@ -163,3 +167,4 @@
   INSTALL_ASSIGNOP (op_div_eq, octave_complex_matrix, octave_complex_scalar,
                     assign_div);
 }
+
--- a/libinterp/operators/op-cm-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,7 +48,8 @@

 DEFBINOP (mul_trans, complex_matrix, matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   ComplexMatrix m1 = v1.complex_matrix_value ();
@@ -60,7 +61,8 @@

 DEFBINOP (div, complex_matrix, matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

@@ -78,7 +80,8 @@

 DEFBINOP (ldiv, complex_matrix, matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

@@ -102,7 +105,8 @@

 DEFBINOP (el_ldiv, complex_matrix, matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   return quotient (v2.array_value (), v1.complex_array_value ());
@@ -143,3 +147,4 @@

   INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_matrix, assign);
 }
+
--- a/libinterp/operators/op-cm-pm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-pm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define RIGHT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-cm-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -46,7 +46,8 @@

 DEFBINOP (div, complex_matrix, scalar)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   double d = v2.double_value ();
@@ -61,7 +62,8 @@

 DEFBINOP (ldiv, complex_matrix, scalar)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   ComplexMatrix m1 = v1.complex_matrix_value ();
@@ -85,7 +87,8 @@

 DEFBINOP (el_div, complex_matrix, scalar)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   double d = v2.double_value ();
@@ -100,7 +103,8 @@

 DEFBINOP (el_ldiv, complex_matrix, scalar)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   return x_el_div (v2.double_value (), v1.complex_array_value ());
@@ -147,3 +151,4 @@
   INSTALL_ASSIGNOP (op_div_eq, octave_complex_matrix, octave_scalar,
                     assign_div);
 }
+
--- a/libinterp/operators/op-cm-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,8 +48,10 @@

 DEFBINOP (div, complex_matrix, sparse_complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -79,8 +81,10 @@

 DEFBINOP (ldiv, complex_matrix, sparse_complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
@@ -105,8 +109,10 @@

 DEFBINOP (el_pow, complex_matrix, sparse_complex_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return octave_value
          (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()),
@@ -115,8 +121,10 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return octave_value (quotient (v2.sparse_complex_matrix_value (),
                                  v1.complex_matrix_value ()));
@@ -128,7 +136,8 @@
 DEFCATOP (cm_scm, complex_matrix, sparse_complex_matrix)
 {
   octave_complex_matrix& v1 = dynamic_cast<octave_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   SparseComplexMatrix tmp (v1.complex_matrix_value ());
   return octave_value (tmp. concat (v2.sparse_complex_matrix_value (),
                                     ra_idx));
@@ -137,7 +146,8 @@
 DEFCONV (sparse_complex_matrix_conv, complex_matrix,
          sparse_complex_matrix)
 {
-  const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a);
+  const octave_complex_matrix& v
+    = dynamic_cast<const octave_complex_matrix&> (a);
   return new octave_sparse_complex_matrix
          (SparseComplexMatrix (v.complex_matrix_value ()));
 }
@@ -200,3 +210,4 @@
   INSTALL_WIDENOP (octave_complex_matrix, octave_sparse_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-cm-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cm-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,8 +48,10 @@

 DEFBINOP (div, complex_matrix, sparse_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -79,8 +81,10 @@

 DEFBINOP (ldiv, complex_matrix, sparse_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
@@ -102,8 +106,10 @@

 DEFBINOP (el_pow, complex_matrix, sparse_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   return octave_value
          (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()),
@@ -112,8 +118,10 @@

 DEFBINOP (el_ldiv, complex_matrix, sparse_matrix)
 {
-  const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_matrix& v1
+    = dynamic_cast<const octave_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);
   return octave_value
          (quotient (v2.sparse_matrix_value (), v1.complex_matrix_value ()));
 }
@@ -124,7 +132,8 @@
 DEFCATOP (cm_sm, complex_matrix, sparse_matrix)
 {
   octave_complex_matrix& v1 = dynamic_cast<octave_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);
   SparseComplexMatrix tmp (v1.complex_matrix_value ());
   return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx));
 }
@@ -167,3 +176,4 @@
                       octave_complex_matrix)

 }
+
--- a/libinterp/operators/op-cs-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,7 +43,8 @@
 DEFBINOP (div, complex, complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   ComplexMatrix m1 = v1.complex_matrix_value ();
   ComplexMatrix m2 = v2.complex_matrix_value ();
@@ -60,7 +61,8 @@
 DEFBINOP (ldiv, complex, complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   Complex d = v1.complex_value ();

@@ -92,7 +94,8 @@
 DEFBINOP (el_ldiv, complex, complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   Complex d = v1.complex_value ();
--- a/libinterp/operators/op-cs-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -194,3 +194,4 @@
   INSTALL_ASSIGNCONV (octave_complex, octave_null_sq_str,
                       octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-cs-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -131,3 +131,4 @@

   INSTALL_ASSIGNCONV (octave_complex, octave_matrix, octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-cs-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -150,3 +150,4 @@

   INSTALL_ASSIGNCONV (octave_complex, octave_scalar, octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-cs-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -47,7 +47,8 @@
 DEFBINOP (div, complex, sparse_complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -72,14 +73,16 @@
 DEFBINOP (pow, complex, sparse_complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   return xpow (v1.complex_value (), v2.complex_matrix_value ());
 }

 DEFBINOP (ldiv, complex, sparse_complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   Complex d = v1.complex_value ();

@@ -104,7 +107,8 @@
 DEFBINOP (el_ldiv, complex, sparse_complex_matrix)
 {
   const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   Complex d = v1.complex_value ();
   octave_value retval;
@@ -123,7 +127,8 @@
 DEFCATOP (cs_scm, complex, sparse_complex_matrix)
 {
   octave_complex& v1 = dynamic_cast<octave_complex&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   SparseComplexMatrix tmp (1, 1, v1.complex_value ());
   return octave_value (tmp. concat (v2.sparse_complex_matrix_value (),
                                     ra_idx));
@@ -174,3 +179,4 @@
   INSTALL_WIDENOP (octave_complex, octave_sparse_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-cs-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-cs-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -169,3 +169,4 @@

   INSTALL_WIDENOP (octave_complex, octave_sparse_matrix, sparse_matrix_conv);
 }
+
--- a/libinterp/operators/op-dm-dm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-dm-dm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -94,3 +94,4 @@
   INSTALL_ASSIGNCONV (octave_diag_matrix, octave_matrix, octave_matrix);
   INSTALL_WIDENOP (octave_diag_matrix, octave_matrix, diag_matrix_to_matrix);
 }
+
--- a/libinterp/operators/op-dm-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-dm-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -51,7 +51,8 @@
 DEFBINOP (mul_dm_scm, diag_matrix, sparse_complex_matrix)
 {
   const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -75,8 +76,10 @@

 DEFBINOP (mul_cdm_sm, complex_diag_matrix, sparse_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -100,8 +103,10 @@

 DEFBINOP (mul_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -126,7 +131,8 @@
 DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix)
 {
   const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   MatrixType typ = v2.matrix_type ();
   return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (),
@@ -135,8 +141,10 @@

 DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   MatrixType typ = v2.matrix_type ();
   return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (),
@@ -145,8 +153,10 @@

 DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   MatrixType typ = v2.matrix_type ();
   return xleftdiv (v1.complex_diag_matrix_value (),
@@ -157,7 +167,8 @@
 DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix)
 {
   const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -173,8 +184,10 @@

 DEFBINOP (add_cdm_sm, complex_diag_matrix, sparse_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -190,8 +203,10 @@

 DEFBINOP (add_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -208,7 +223,8 @@
 DEFBINOP (sub_dm_scm, diag_matrix, sparse_complex_matrix)
 {
   const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -224,8 +240,10 @@

 DEFBINOP (sub_cdm_sm, complex_diag_matrix, sparse_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -241,8 +259,10 @@

 DEFBINOP (sub_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
 {
-  const octave_complex_diag_matrix& v1 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_complex_diag_matrix& v1
+    = dynamic_cast<const octave_complex_diag_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -260,7 +280,8 @@

 DEFBINOP (mul_scm_dm, sparse_complex_matrix, diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
@@ -285,8 +306,10 @@

 DEFBINOP (mul_sm_cdm, sparse_matrix, complex_diag_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     // If v1 is a scalar in disguise, return a diagonal matrix rather than
@@ -310,8 +333,10 @@

 DEFBINOP (mul_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     // If v1 is a scalar in disguise, return a diagonal matrix rather than
@@ -342,7 +367,8 @@

 DEFBINOP (div_scm_dm, sparse_complex_matrix, diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
@@ -364,8 +390,10 @@

 DEFBINOP (div_sm_cdm, sparse_matrix, complex_diag_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -386,8 +414,10 @@

 DEFBINOP (div_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -408,8 +438,10 @@

 DEFBINOP (add_sm_cdm, sparse_matrix, complex_diag_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -425,7 +457,8 @@

 DEFBINOP (add_scm_dm, sparse_complex_matrix, diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
@@ -442,8 +475,10 @@

 DEFBINOP (add_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -459,8 +494,10 @@

 DEFBINOP (sub_sm_cdm, sparse_matrix, complex_diag_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -476,7 +513,8 @@

 DEFBINOP (sub_scm_dm, sparse_complex_matrix, diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
@@ -493,8 +531,10 @@

 DEFBINOP (sub_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_diag_matrix& v2 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_diag_matrix& v2
+    = dynamic_cast<const octave_complex_diag_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     // If v2 is a scalar in disguise, return a diagonal matrix rather than
@@ -564,3 +604,4 @@
   INSTALL_BINOP (op_sub, octave_sparse_complex_matrix,
                  octave_complex_diag_matrix, sub_scm_cdm);
 }
+
--- a/libinterp/operators/op-dm-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-dm-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -202,3 +202,4 @@
   INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_diag_matrix, sub_sm_dm);
   INSTALL_BINOP (op_div, octave_sparse_matrix, octave_diag_matrix, div_sm_dm);
 }
+
--- a/libinterp/operators/op-dm-template.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-dm-template.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -99,3 +99,4 @@
   INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
 #endif
 }
+
--- a/libinterp/operators/op-dms-template.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-dms-template.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -94,3 +94,4 @@
   INSTALL_BINOP (op_ldiv, OCTAVE_SCALAR, OCTAVE_MATRIX, sdmldiv);
   INSTALL_BINOP (op_pow, OCTAVE_MATRIX, OCTAVE_SCALAR, dmspow);
 }
+
--- a/libinterp/operators/op-fcdm-fcdm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcdm-fcdm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,13 +42,15 @@

 DEFUNOP (transpose, float_complex_diag_matrix)
 {
-  const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
+  const octave_float_complex_diag_matrix& v
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
   return octave_value (v.float_complex_diag_matrix_value ().transpose ());
 }

 DEFUNOP (hermitian, float_complex_diag_matrix)
 {
-  const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
+  const octave_float_complex_diag_matrix& v
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
   return octave_value (v.float_complex_diag_matrix_value ().hermitian ());
 }

@@ -60,8 +62,10 @@

 DEFBINOP (div, float_complex_diag_matrix, float_complex_diag_matrix)
 {
-  const octave_float_complex_diag_matrix& v1 = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
-  const octave_float_complex_diag_matrix& v2 = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);
+  const octave_float_complex_diag_matrix& v1
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
+  const octave_float_complex_diag_matrix& v2
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);

   return xdiv (v1.float_complex_diag_matrix_value (),
                v2.float_complex_diag_matrix_value ());
@@ -69,8 +73,10 @@

 DEFBINOP (ldiv, float_complex_diag_matrix, float_complex_diag_matrix)
 {
-  const octave_float_complex_diag_matrix& v1 = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
-  const octave_float_complex_diag_matrix& v2 = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);
+  const octave_float_complex_diag_matrix& v1
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
+  const octave_float_complex_diag_matrix& v2
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);

   return xleftdiv (v1.float_complex_diag_matrix_value (),
                    v2.float_complex_diag_matrix_value ());
@@ -78,7 +84,8 @@

 CONVDECL (float_complex_diag_matrix_to_complex_diag_matrix)
 {
-  const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
+  const octave_float_complex_diag_matrix& v
+    = dynamic_cast<const octave_float_complex_diag_matrix&> (a);

   return new octave_complex_diag_matrix (v.complex_diag_matrix_value ());
 }
@@ -107,3 +114,4 @@
   INSTALL_WIDENOP (octave_float_complex_diag_matrix, octave_complex_diag_matrix,
                    float_complex_diag_matrix_to_complex_diag_matrix);
 }
+
--- a/libinterp/operators/op-fcm-fcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcm-fcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -43,7 +43,8 @@

 DEFUNOP (transpose, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v = dynamic_cast<const octave_float_complex_matrix&> (a);
+  const octave_float_complex_matrix& v
+    = dynamic_cast<const octave_float_complex_matrix&> (a);

   if (v.ndims () > 2)
     error ("transpose not defined for N-D objects");
@@ -53,7 +54,8 @@

 DEFUNOP (hermitian, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v = dynamic_cast<const octave_float_complex_matrix&> (a);
+  const octave_float_complex_matrix& v
+    = dynamic_cast<const octave_float_complex_matrix&> (a);

   if (v.ndims () > 2)
     error ("complex-conjugate transpose not defined for N-D objects");
@@ -76,8 +78,10 @@

 DEFBINOP (div, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (),
@@ -94,8 +98,10 @@

 DEFBINOP (ldiv, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (),
@@ -107,8 +113,10 @@

 DEFBINOP (trans_mul, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   return octave_value(xgemm (v1.float_complex_matrix_value (),
                              v2.float_complex_matrix_value (),
                              blas_trans, blas_no_trans));
@@ -116,8 +124,10 @@

 DEFBINOP (mul_trans, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   return octave_value(xgemm (v1.float_complex_matrix_value (),
                              v2.float_complex_matrix_value (),
                              blas_no_trans, blas_trans));
@@ -125,8 +135,10 @@

 DEFBINOP (herm_mul, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   return octave_value(xgemm (v1.float_complex_matrix_value (),
                              v2.float_complex_matrix_value (),
                              blas_conj_trans, blas_no_trans));
@@ -134,8 +146,10 @@

 DEFBINOP (mul_herm, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   return octave_value(xgemm (v1.float_complex_matrix_value (),
                              v2.float_complex_matrix_value (),
                              blas_no_trans, blas_conj_trans));
@@ -143,8 +157,10 @@

 DEFBINOP (trans_ldiv, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (),
@@ -157,8 +173,10 @@

 DEFBINOP (herm_ldiv, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (),
@@ -191,8 +209,10 @@

 DEFBINOP (el_ldiv, float_complex_matrix, float_complex_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   return octave_value (quotient (v2.float_complex_array_value (),
                                  v1.float_complex_array_value ()));
@@ -327,3 +347,4 @@
   INSTALL_ASSIGNOP (op_el_div_eq, octave_float_complex_matrix,
                     octave_float_complex_matrix, assign_el_div);
 }
+
--- a/libinterp/operators/op-fcm-fcs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcm-fcs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -47,8 +47,10 @@

 DEFBINOP (div, float_complex_matrix, float_complex)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex& v2
+    = dynamic_cast<const octave_float_complex&> (a2);

   FloatComplex d = v2.float_complex_value ();

@@ -62,8 +64,10 @@

 DEFBINOP (ldiv, float_complex_matrix, float_complex)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex& v2
+    = dynamic_cast<const octave_float_complex&> (a2);

   FloatComplexMatrix m1 = v1.float_complex_matrix_value ();
   FloatComplexMatrix m2 = v2.float_complex_matrix_value ();
@@ -92,8 +96,10 @@

 DEFBINOP (el_div, float_complex_matrix, float_complex)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex& v2
+    = dynamic_cast<const octave_float_complex&> (a2);

   FloatComplex d = v2.float_complex_value ();

@@ -108,8 +114,10 @@

 DEFBINOP (el_ldiv, float_complex_matrix, float_complex)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_complex& v2
+    = dynamic_cast<const octave_float_complex&> (a2);

   return x_el_div (v2.float_complex_value (), v1.float_complex_array_value ());
 }
@@ -194,3 +202,4 @@
   INSTALL_ASSIGNOP (op_div_eq, octave_float_complex_matrix,
                     octave_float_complex_scalar, assign_div);
 }
+
--- a/libinterp/operators/op-fcm-fm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcm-fm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -52,8 +52,10 @@

 DEFBINOP (mul_trans, float_complex_matrix, float_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_matrix& v2
+    = dynamic_cast<const octave_float_matrix&> (a2);

   FloatComplexMatrix m1 = v1.float_complex_matrix_value ();
   FloatMatrix m2 = v2.float_matrix_value ();
@@ -64,8 +66,10 @@

 DEFBINOP (div, float_complex_matrix, float_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_matrix& v2
+    = dynamic_cast<const octave_float_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (),
@@ -82,8 +86,10 @@

 DEFBINOP (ldiv, float_complex_matrix, float_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_matrix& v2
+    = dynamic_cast<const octave_float_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (),
@@ -115,8 +121,10 @@

 DEFBINOP (el_ldiv, float_complex_matrix, float_matrix)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_matrix& v2
+    = dynamic_cast<const octave_float_matrix&> (a2);

   return quotient (v2.float_array_value (), v1.float_complex_array_value ());
 }
@@ -182,3 +190,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix,
                     octave_float_matrix, dbl_assign);
 }
+
--- a/libinterp/operators/op-fcm-fs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcm-fs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -50,8 +50,10 @@

 DEFBINOP (div, float_complex_matrix, float)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_scalar& v2
+    = dynamic_cast<const octave_float_scalar&> (a2);

   float d = v2.float_value ();

@@ -65,8 +67,10 @@

 DEFBINOP (ldiv, float_complex_matrix, float)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_scalar& v2
+    = dynamic_cast<const octave_float_scalar&> (a2);

   FloatComplexMatrix m1 = v1.float_complex_matrix_value ();
   FloatMatrix m2 = v2.float_matrix_value ();
@@ -96,8 +100,10 @@

 DEFBINOP (el_div, float_complex_matrix, float)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_scalar& v2
+    = dynamic_cast<const octave_float_scalar&> (a2);

   float d = v2.float_value ();

@@ -112,8 +118,10 @@

 DEFBINOP (el_ldiv, float_complex_matrix, float)
 {
-  const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
-  const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2);
+  const octave_float_complex_matrix& v1
+    = dynamic_cast<const octave_float_complex_matrix&> (a1);
+  const octave_float_scalar& v2
+    = dynamic_cast<const octave_float_scalar&> (a2);

   return x_el_div (v2.float_value (), v1.float_complex_array_value ());
 }
@@ -185,3 +193,4 @@
   INSTALL_ASSIGNOP (op_div_eq, octave_float_complex_matrix,
                     octave_float_scalar, assign_div);
 }
+
--- a/libinterp/operators/op-fcm-pm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcm-pm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define RIGHT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-fcn.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcn.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -54,3 +54,4 @@
   INSTALL_BINOP (op_eq, octave_fcn_handle, octave_fcn_handle, eq);
   INSTALL_BINOP (op_ne, octave_fcn_handle, octave_fcn_handle, ne);
 }
+
--- a/libinterp/operators/op-fcs-fcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcs-fcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -47,8 +47,10 @@

 DEFBINOP (div, float_complex, float_complex_matrix)
 {
-  const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex& v1
+    = dynamic_cast<const octave_float_complex&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   FloatComplexMatrix m1 = v1.float_complex_matrix_value ();
   FloatComplexMatrix m2 = v2.float_complex_matrix_value ();
@@ -64,8 +66,10 @@

 DEFBINOP (ldiv, float_complex, float_complex_matrix)
 {
-  const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex& v1
+    = dynamic_cast<const octave_float_complex&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   FloatComplex d = v1.float_complex_value ();

@@ -97,8 +101,10 @@

 DEFBINOP (el_ldiv, float_complex, float_complex_matrix)
 {
-  const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_complex& v1
+    = dynamic_cast<const octave_float_complex&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   FloatComplex d = v1.float_complex_value ();

@@ -124,7 +130,8 @@

 DEFCONV (float_complex_matrix_conv, float_complex, float_complex_matrix)
 {
-  const octave_float_complex& v = dynamic_cast<const octave_float_complex&> (a);
+  const octave_float_complex& v
+    = dynamic_cast<const octave_float_complex&> (a);

   return new octave_float_complex_matrix (v.float_complex_matrix_value ());
 }
--- a/libinterp/operators/op-fcs-fcs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcs-fcs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -209,3 +209,4 @@
   INSTALL_ASSIGNCONV (octave_float_complex, octave_null_sq_str,
                       octave_float_complex_matrix);
 }
+
--- a/libinterp/operators/op-fcs-fm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcs-fm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   INSTALL_ASSIGNCONV (octave_complex, octave_float_matrix,
                       octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-fcs-fs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fcs-fs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -166,3 +166,4 @@
   INSTALL_ASSIGNCONV (octave_complex, octave_float_scalar,
                       octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-fdm-fdm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fdm-fdm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,7 +42,8 @@

 DEFUNOP (transpose, float_diag_matrix)
 {
-  const octave_float_diag_matrix& v = dynamic_cast<const octave_float_diag_matrix&> (a);
+  const octave_float_diag_matrix& v
+    = dynamic_cast<const octave_float_diag_matrix&> (a);
   return octave_value (v.float_diag_matrix_value ().transpose ());
 }

@@ -54,8 +55,10 @@

 DEFBINOP (div, float_diag_matrix, float_diag_matrix)
 {
-  const octave_float_diag_matrix& v1 = dynamic_cast<const octave_float_diag_matrix&> (a1);
-  const octave_float_diag_matrix& v2 = dynamic_cast<const octave_float_diag_matrix&> (a2);
+  const octave_float_diag_matrix& v1
+    = dynamic_cast<const octave_float_diag_matrix&> (a1);
+  const octave_float_diag_matrix& v2
+    = dynamic_cast<const octave_float_diag_matrix&> (a2);

   return xdiv (v1.float_diag_matrix_value (),
                v2.float_diag_matrix_value ());
@@ -63,8 +66,10 @@

 DEFBINOP (ldiv, float_diag_matrix, float_diag_matrix)
 {
-  const octave_float_diag_matrix& v1 = dynamic_cast<const octave_float_diag_matrix&> (a1);
-  const octave_float_diag_matrix& v2 = dynamic_cast<const octave_float_diag_matrix&> (a2);
+  const octave_float_diag_matrix& v1
+    = dynamic_cast<const octave_float_diag_matrix&> (a1);
+  const octave_float_diag_matrix& v2
+    = dynamic_cast<const octave_float_diag_matrix&> (a2);

   return xleftdiv (v1.float_diag_matrix_value (),
                    v2.float_diag_matrix_value ());
@@ -72,7 +77,8 @@

 CONVDECL (float_diag_matrix_to_float_matrix)
 {
-  const octave_float_diag_matrix& v = dynamic_cast<const octave_float_diag_matrix&> (a);
+  const octave_float_diag_matrix& v
+    = dynamic_cast<const octave_float_diag_matrix&> (a);

   return new octave_float_matrix (v.float_matrix_value ());
 }
@@ -101,3 +107,4 @@
   INSTALL_WIDENOP (octave_float_diag_matrix, octave_float_matrix,
                    float_diag_matrix_to_float_matrix);
 }
+
--- a/libinterp/operators/op-fm-fcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fm-fcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -52,8 +52,10 @@

 DEFBINOP (trans_mul, float_matrix, float_complex_matrix)
 {
-  const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_matrix& v1
+    = dynamic_cast<const octave_float_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   FloatMatrix m1 = v1.float_matrix_value ();
   FloatComplexMatrix m2 = v2.float_complex_matrix_value ();
@@ -64,8 +66,10 @@

 DEFBINOP (div, float_matrix, float_complex_matrix)
 {
-  const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_matrix& v1
+    = dynamic_cast<const octave_float_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   FloatComplexMatrix ret = xdiv (v1.float_matrix_value (),
@@ -82,8 +86,10 @@

 DEFBINOP (ldiv, float_matrix, float_complex_matrix)
 {
-  const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_matrix& v1
+    = dynamic_cast<const octave_float_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (),
@@ -95,8 +101,10 @@

 DEFBINOP (trans_ldiv, float_matrix, float_complex_matrix)
 {
-  const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_matrix& v1
+    = dynamic_cast<const octave_float_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (),
@@ -129,8 +137,10 @@

 DEFBINOP (el_ldiv, float_matrix, float_complex_matrix)
 {
-  const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_matrix& v1
+    = dynamic_cast<const octave_float_matrix&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   return quotient (v2.float_complex_array_value (), v1.float_array_value ());
 }
@@ -206,3 +216,4 @@
   INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix,
                    float_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-fm-fcs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fm-fcs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -165,3 +165,4 @@
   INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex,
                       octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-fm-fm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fm-fm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -263,3 +263,4 @@
   INSTALL_ASSIGNOP (op_el_div_eq, octave_float_matrix, octave_float_matrix,
                     assign_el_div);
 }
+
--- a/libinterp/operators/op-fm-fs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fm-fs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -169,3 +169,4 @@
   INSTALL_ASSIGNOP (op_div_eq, octave_float_matrix, octave_float_scalar,
                     assign_div);
 }
+
--- a/libinterp/operators/op-fm-pm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fm-pm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define RIGHT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-fs-fcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fs-fcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -53,8 +53,10 @@

 DEFBINOP (div, float_scalar, float_complex_matrix)
 {
-  const octave_float_scalar& v1 = dynamic_cast<const octave_float_scalar&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_scalar& v1
+    = dynamic_cast<const octave_float_scalar&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   FloatMatrix m1 = v1.float_matrix_value ();
   FloatComplexMatrix m2 = v2.float_complex_matrix_value ();
@@ -70,8 +72,10 @@

 DEFBINOP (ldiv, float_scalar, float_complex_matrix)
 {
-  const octave_float_scalar& v1 = dynamic_cast<const octave_float_scalar&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_scalar& v1
+    = dynamic_cast<const octave_float_scalar&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   float d = v1.float_value ();

@@ -103,8 +107,10 @@

 DEFBINOP (el_ldiv, float_scalar, float_complex_matrix)
 {
-  const octave_float_scalar& v1 = dynamic_cast<const octave_float_scalar&> (a1);
-  const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2);
+  const octave_float_scalar& v1
+    = dynamic_cast<const octave_float_scalar&> (a1);
+  const octave_float_complex_matrix& v2
+    = dynamic_cast<const octave_float_complex_matrix&> (a2);

   float d = v1.float_value ();

@@ -177,3 +183,4 @@
   INSTALL_WIDENOP (octave_float_scalar, octave_float_complex_matrix,
                    float_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-fs-fcs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fs-fcs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -168,3 +168,4 @@
   INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex,
                       octave_complex_matrix);
 }
+
--- a/libinterp/operators/op-fs-fm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fs-fm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@

   INSTALL_WIDENOP (octave_float_scalar, octave_float_matrix, matrix_conv);
 }
+
--- a/libinterp/operators/op-fs-fs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-fs-fs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -183,3 +183,4 @@
   INSTALL_ASSIGNCONV (octave_float_scalar, octave_null_sq_str,
                       octave_float_matrix);
 }
+
--- a/libinterp/operators/op-i16-i16.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-i16-i16.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int16, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int16, uint64);
 }
+
--- a/libinterp/operators/op-i32-i32.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-i32-i32.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int32, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int32, uint64);
 }
+
--- a/libinterp/operators/op-i64-i64.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-i64-i64.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint64);
 }
+
--- a/libinterp/operators/op-i8-i8.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-i8-i8.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int8, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int8, uint64);
 }
+
--- a/libinterp/operators/op-int-concat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-int-concat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -316,3 +316,4 @@
   OCTAVE_INSTALL_CHAR_INT_CONCAT_FN (uint32);
   OCTAVE_INSTALL_CHAR_INT_CONCAT_FN (uint64);
 }
+
--- a/libinterp/operators/op-int.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-int.h	Tue Aug 30 21:46:47 2016 -0700
@@ -1194,3 +1194,4 @@
   OCTAVE_INSTALL_MM_INT_CMP_OPS (T1 ## _ ## T2 ## _mm, T1 ## _, T2 ## _)

 #endif
+
--- a/libinterp/operators/op-m-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -51,7 +51,8 @@
 DEFBINOP (trans_mul, matrix, complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   Matrix m1 = v1.matrix_value ();
   ComplexMatrix m2 = v2.complex_matrix_value ();
@@ -63,7 +64,8 @@
 DEFBINOP (div, matrix, complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   ComplexMatrix ret = xdiv (v1.matrix_value (),
@@ -81,7 +83,8 @@
 DEFBINOP (ldiv, matrix, complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.matrix_value (),
@@ -94,7 +97,8 @@
 DEFBINOP (trans_ldiv, matrix, complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.matrix_value (),
@@ -118,7 +122,8 @@
 DEFBINOP (el_ldiv, matrix, complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return quotient (v2.complex_array_value (), v1.array_value ());
 }
@@ -172,3 +177,4 @@

   INSTALL_WIDENOP (octave_matrix, octave_complex_matrix, complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-m-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -143,3 +143,4 @@
   INSTALL_ASSIGNCONV (octave_float_matrix, octave_complex,
                       octave_float_complex_matrix);
 }
+
--- a/libinterp/operators/op-m-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -214,3 +214,4 @@
   INSTALL_ASSIGNOP (op_el_mul_eq, octave_matrix, octave_matrix, assign_el_mul);
   INSTALL_ASSIGNOP (op_el_div_eq, octave_matrix, octave_matrix, assign_el_div);
 }
+
--- a/libinterp/operators/op-m-pm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-pm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define RIGHT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-m-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -159,3 +159,4 @@
   INSTALL_ASSIGNOP (op_mul_eq, octave_matrix, octave_scalar, assign_mul);
   INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div);
 }
+
--- a/libinterp/operators/op-m-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -50,7 +50,8 @@
 DEFBINOP (div, matrix, sparse_complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -81,7 +82,8 @@
 DEFBINOP (ldiv, matrix, sparse_complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   MatrixType typ = v1.matrix_type ();

   ComplexMatrix ret = xleftdiv (v1.matrix_value (),
@@ -104,7 +106,8 @@
 DEFBINOP (el_pow, matrix, sparse_complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return octave_value
          (elem_xpow (SparseMatrix (v1.matrix_value ()),
@@ -114,7 +117,8 @@
 DEFBINOP (el_ldiv, matrix, sparse_complex_matrix)
 {
   const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   return octave_value
          (quotient (v2.sparse_complex_matrix_value (), v1.matrix_value ()));
 }
@@ -125,7 +129,8 @@
 DEFCATOP (m_scm, matrix, sparse_complex_matrix)
 {
   octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   SparseMatrix tmp (v1.matrix_value ());
   return octave_value (tmp. concat (v2.sparse_complex_matrix_value (),
                                     ra_idx));
@@ -174,3 +179,4 @@
   INSTALL_WIDENOP (octave_matrix, octave_sparse_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-m-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-m-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -169,3 +169,4 @@
   INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix,
                    sparse_matrix_conv);
 }
+
--- a/libinterp/operators/op-pm-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define LEFT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-pm-fcm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-fcm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define LEFT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-pm-fm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-fm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -31,3 +31,4 @@
 #define LEFT

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-pm-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -33,3 +33,4 @@
 #define DEFINENULLASSIGNCONV

 #include "op-pm-template.cc"
+
--- a/libinterp/operators/op-pm-pm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-pm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -87,3 +87,4 @@
   INSTALL_ASSIGNCONV (octave_perm_matrix, octave_matrix, octave_matrix);
   INSTALL_WIDENOP (octave_perm_matrix, octave_matrix, perm_matrix_to_matrix);
 }
+
--- a/libinterp/operators/op-pm-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -38,7 +38,8 @@
 DEFBINOP (mul_pm_scm, perm_matrix, sparse_complex_matrix)
 {
   const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -55,7 +56,8 @@
 DEFBINOP (ldiv_pm_scm, perm_matrix, sparse_complex_matrix)
 {
   const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return v1.perm_matrix_value ().inverse () * v2.sparse_complex_matrix_value ();
 }
@@ -64,7 +66,8 @@

 DEFBINOP (mul_scm_pm, sparse_complex_matrix, perm_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
@@ -81,7 +84,8 @@

 DEFBINOP (div_scm_pm, sparse_complex_matrix, perm_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2);

   return v1.sparse_complex_matrix_value () * v2.perm_matrix_value ().inverse ();
@@ -99,3 +103,4 @@
   INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_perm_matrix,
                  div_scm_pm);
 }
+
--- a/libinterp/operators/op-pm-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -99,3 +99,4 @@
   INSTALL_BINOP (op_div, octave_sparse_matrix, octave_perm_matrix,
                  div_sm_pm);
 }
+
--- a/libinterp/operators/op-pm-template.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-pm-template.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -94,3 +94,4 @@
   INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
 #endif
 }
+
--- a/libinterp/operators/op-range.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-range.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -140,3 +140,4 @@

   INSTALL_WIDENOP (octave_range, octave_matrix, range_to_matrix);
 }
+
--- a/libinterp/operators/op-s-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -51,7 +51,8 @@
 DEFBINOP (div, scalar, complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   Matrix m1 = v1.matrix_value ();
   ComplexMatrix m2 = v2.complex_matrix_value ();
@@ -68,7 +69,8 @@
 DEFBINOP (ldiv, scalar, complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   double d = v1.double_value ();

@@ -92,7 +94,8 @@
 DEFBINOP (el_ldiv, scalar, complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   double d = v1.double_value ();
--- a/libinterp/operators/op-s-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -154,3 +154,4 @@
   INSTALL_ASSIGNCONV (octave_float_scalar, octave_complex,
                       octave_float_complex_matrix);
 }
+
--- a/libinterp/operators/op-s-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -137,3 +137,4 @@

   INSTALL_WIDENOP (octave_scalar, octave_matrix, matrix_conv);
 }
+
--- a/libinterp/operators/op-s-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -175,3 +175,4 @@
   INSTALL_ASSIGNCONV (octave_scalar, octave_null_str, octave_matrix);
   INSTALL_ASSIGNCONV (octave_scalar, octave_null_sq_str, octave_matrix);
 }
+
--- a/libinterp/operators/op-s-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -50,7 +50,8 @@
 DEFBINOP (div, scalar, sparse_complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -75,14 +76,16 @@
 DEFBINOP (pow, scalar, sparse_complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   return xpow (v1.scalar_value (), v2.complex_matrix_value ());
 }

 DEFBINOP (ldiv, scalar, sparse_complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   double d = v1.double_value ();
   octave_value retval;
@@ -109,7 +112,8 @@
 DEFBINOP (el_ldiv, scalar, sparse_complex_matrix)
 {
   const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   double d = v1.double_value ();
   octave_value retval;
@@ -128,7 +132,8 @@
 DEFCATOP (s_scm, scalar, sparse_compelx_matrix)
 {
   octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
   SparseMatrix tmp (1, 1, v1.scalar_value ());
   return octave_value
          (tmp.concat (v2.sparse_complex_matrix_value (), ra_idx));
@@ -178,3 +183,4 @@
   INSTALL_WIDENOP (octave_scalar, octave_sparse_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-s-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-s-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -164,3 +164,4 @@

   INSTALL_WIDENOP (octave_scalar, octave_sparse_matrix, sparse_matrix_conv);
 }
+
--- a/libinterp/operators/op-sbm-b.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sbm-b.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -142,3 +142,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint64_scalar,
                     conv_and_assign);
 }
+
--- a/libinterp/operators/op-sbm-bm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sbm-bm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -168,3 +168,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_null_sq_str,
                     null_assign);
 }
+
--- a/libinterp/operators/op-sbm-sbm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sbm-sbm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -42,19 +42,22 @@

 DEFUNOP (uplus, sparse_bool_matrix)
 {
-  const octave_sparse_bool_matrix& v = dynamic_cast<const octave_sparse_bool_matrix&> (a);
+  const octave_sparse_bool_matrix& v
+    = dynamic_cast<const octave_sparse_bool_matrix&> (a);
   return octave_value (v.sparse_matrix_value ());
 }

 DEFUNOP (uminus, sparse_bool_matrix)
 {
-  const octave_sparse_bool_matrix& v = dynamic_cast<const octave_sparse_bool_matrix&> (a);
+  const octave_sparse_bool_matrix& v
+    = dynamic_cast<const octave_sparse_bool_matrix&> (a);
   return octave_value (- v.sparse_matrix_value ());
 }

 DEFUNOP (transpose, sparse_bool_matrix)
 {
-  const octave_sparse_bool_matrix& v = dynamic_cast<const octave_sparse_bool_matrix&> (a);
+  const octave_sparse_bool_matrix& v
+    = dynamic_cast<const octave_sparse_bool_matrix&> (a);
   return octave_value (v.sparse_bool_matrix_value ().transpose ());
 }

@@ -102,3 +105,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix,
                     octave_sparse_bool_matrix, assign);
 }
+
--- a/libinterp/operators/op-scm-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,8 +48,10 @@

 DEFBINOP (div, sparse_complex_matrix, complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   ComplexMatrix ret = xdiv (v1.complex_matrix_value (),
@@ -66,8 +68,10 @@

 DEFBINOP (ldiv, sparse_complex_matrix, complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     {
@@ -105,8 +109,10 @@

 DEFBINOP (el_pow, sparse_complex_matrix, complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return octave_value
          (elem_xpow (v1.sparse_complex_matrix_value (), SparseComplexMatrix
@@ -115,8 +121,10 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return octave_value (quotient (v2.complex_matrix_value (),
                                  v1.sparse_complex_matrix_value ()));
@@ -127,8 +135,10 @@

 DEFCATOP (scm_cm, sparse_complex_matrix, complex_matrix)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   SparseComplexMatrix tmp (v2.complex_matrix_value ());
   return octave_value
          (v1.sparse_complex_matrix_value ().concat (tmp, ra_idx));
@@ -136,8 +146,10 @@

 DEFASSIGNOP (assign, sparse_complex_matrix, complex_matrix)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   SparseComplexMatrix tmp (v2.complex_matrix_value ());
   v1.assign (idx, tmp);
@@ -194,3 +206,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix,
                     octave_complex_matrix, assign);
 }
+
--- a/libinterp/operators/op-scm-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -46,7 +46,8 @@

 DEFBINOP (div, sparse_complex_matrix, complex)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   Complex d = v2.complex_value ();
@@ -62,14 +63,16 @@

 DEFBINOP (pow, sparse_complex_matrix, complex)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
   return xpow (v1.complex_matrix_value (), v2.complex_value ());
 }

 DEFBINOP (ldiv, sparse_complex_matrix, complex)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
@@ -103,7 +106,8 @@

 DEFBINOP (el_div, sparse_complex_matrix, complex)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   octave_value retval;
@@ -122,7 +126,8 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, complex)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   return octave_value
@@ -134,7 +139,8 @@

 DEFCATOP (scm_cs, sparse_complex_matrix, complex)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
   SparseComplexMatrix tmp (1, 1, v2.complex_value ());
   return octave_value
@@ -143,7 +149,8 @@

 DEFASSIGNOP (assign, sparse_complex_matrix, complex)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);

   SparseComplexMatrix tmp (1, 1, v2.complex_value ());
@@ -185,3 +192,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_complex,
                     assign);
 }
+
--- a/libinterp/operators/op-scm-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -49,7 +49,8 @@

 DEFBINOP (div, sparse_complex_matrix, matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

@@ -67,7 +68,8 @@

 DEFBINOP (ldiv, sparse_complex_matrix, matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
@@ -103,7 +105,8 @@

 DEFBINOP (el_pow, sparse_complex_matrix, matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   return octave_value
@@ -113,7 +116,8 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   return octave_value
@@ -125,7 +129,8 @@

 DEFCATOP (scm_m, sparse_complex_matrix, matrix)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
   SparseMatrix tmp (v2.matrix_value ());
   return octave_value
@@ -134,7 +139,8 @@

 DEFASSIGNOP (assign, sparse_complex_matrix, matrix)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);

   SparseComplexMatrix tmp (v2.complex_matrix_value ());
@@ -175,3 +181,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_matrix,
                     assign);
 }
+
--- a/libinterp/operators/op-scm-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -49,7 +49,8 @@

 DEFBINOP (div, sparse_complex_matrix, scalar)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   double d = v2.double_value ();
@@ -65,7 +66,8 @@

 DEFBINOP (pow, sparse_complex_matrix, scalar)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   double tmp = v2.scalar_value ();
@@ -77,7 +79,8 @@

 DEFBINOP (ldiv, sparse_complex_matrix, scalar)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
@@ -111,7 +114,8 @@

 DEFBINOP (el_div, sparse_complex_matrix, scalar)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   double d = v2.double_value ();
@@ -129,7 +133,8 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, scalar)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   return octave_value
@@ -141,7 +146,8 @@

 DEFCATOP (scm_s, sparse_complex_matrix, scalar)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
   SparseComplexMatrix tmp (1, 1, v2.complex_value ());
   return octave_value
@@ -150,7 +156,8 @@

 DEFASSIGNOP (assign, sparse_complex_matrix, scalar)
 {
-  octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
+  octave_sparse_complex_matrix& v1
+    = dynamic_cast<octave_sparse_complex_matrix&> (a1);
   const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);

   SparseComplexMatrix tmp (1, 1, v2.complex_value ());
@@ -191,3 +198,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_scalar,
                     assign);
 }
+
--- a/libinterp/operators/op-scm-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -54,7 +54,8 @@

 DEFUNOP (transpose, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v = dynamic_cast<const octave_sparse_complex_matrix&> (a);
+  const octave_sparse_complex_matrix& v
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a);
   return octave_value
          (v.sparse_complex_matrix_value ().transpose (),
           v.matrix_type ().transpose ());
@@ -62,7 +63,8 @@

 DEFUNOP (hermitian, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v = dynamic_cast<const octave_sparse_complex_matrix&> (a);
+  const octave_sparse_complex_matrix& v
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a);
   return octave_value
          (v.sparse_complex_matrix_value ().hermitian (),
           v.matrix_type ().transpose ());
@@ -71,14 +73,16 @@
 #if 0
 DEFUNOP (incr, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v = dynamic_cast<const octave_sparse_complex_matrix&> (a);
+  const octave_sparse_complex_matrix& v
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a);

   return octave_value (v.complex_matrix_value () .increment ());
 }

 DEFUNOP (decr, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v = dynamic_cast<const octave_sparse_complex_matrix&> (a);
+  const octave_sparse_complex_matrix& v
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a);

   return octave_value (v.complex_matrix_value () .decrement ());
 }
@@ -93,8 +97,10 @@

 DEFBINOP (div, sparse_complex_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -123,8 +129,10 @@

 DEFBINOP (ldiv, sparse_complex_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     {
@@ -161,8 +169,10 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return octave_value (quotient (v2.sparse_complex_matrix_value (),
                                  v1.sparse_complex_matrix_value ()));
@@ -241,3 +251,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix,
                     octave_null_sq_str, null_assign);
 }
+
--- a/libinterp/operators/op-scm-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-scm-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -47,8 +47,10 @@

 DEFBINOP (div, sparse_complex_matrix, sparse_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -77,8 +79,10 @@

 DEFBINOP (ldiv, sparse_complex_matrix, sparse_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     {
@@ -114,8 +118,10 @@

 DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_matrix)
 {
-  const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
-  const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
+  const octave_sparse_complex_matrix& v1
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
+  const octave_sparse_matrix& v2
+    = dynamic_cast<const octave_sparse_matrix&> (a2);

   return octave_value (quotient (v2.sparse_matrix_value (),
                                  v1.sparse_complex_matrix_value ()));
@@ -173,3 +179,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix,
                     octave_sparse_matrix, assign);
 }
+
--- a/libinterp/operators/op-sm-cm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-cm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -48,8 +48,10 @@

 DEFBINOP (div, sparse_matrix, complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   MatrixType typ = v2.matrix_type ();

   ComplexMatrix ret = xdiv (v1.matrix_value (),
@@ -66,8 +68,10 @@

 DEFBINOP (ldiv, sparse_matrix, complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     {
@@ -102,8 +106,10 @@

 DEFBINOP (el_pow, sparse_matrix, complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return octave_value
          (elem_xpow (v1.sparse_matrix_value (), SparseComplexMatrix
@@ -112,8 +118,10 @@

 DEFBINOP (el_ldiv, sparse_matrix, complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);

   return octave_value
          (quotient (v2.complex_matrix_value (), v1.sparse_matrix_value ()));
@@ -125,14 +133,16 @@
 DEFCATOP (sm_cm, sparse_matrix, complex_matrix)
 {
   octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1);
-  const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2);
+  const octave_complex_matrix& v2
+    = dynamic_cast<const octave_complex_matrix&> (a2);
   SparseComplexMatrix tmp (v2.complex_matrix_value ());
   return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
 }

 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_matrix& v = dynamic_cast<const octave_sparse_matrix&> (a);
+  const octave_sparse_matrix& v
+    = dynamic_cast<const octave_sparse_matrix&> (a);
   return new octave_complex_matrix (v.complex_matrix_value ());
 }

@@ -172,3 +182,4 @@
   INSTALL_WIDENOP (octave_sparse_matrix, octave_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-sm-cs.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-cs.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -169,3 +169,4 @@
   INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_complex,
                       octave_sparse_complex_matrix);
 }
+
--- a/libinterp/operators/op-sm-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -168,3 +168,4 @@

   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_matrix, assign);
 }
+
--- a/libinterp/operators/op-sm-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -180,3 +180,4 @@

   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_scalar, assign);
 }
+
--- a/libinterp/operators/op-sm-scm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-scm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -47,8 +47,10 @@

 DEFBINOP (div, sparse_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v2.rows () == 1 && v2.columns () == 1)
     {
@@ -77,8 +79,10 @@

 DEFBINOP (ldiv, sparse_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   if (v1.rows () == 1 && v1.columns () == 1)
     {
@@ -115,8 +119,10 @@

 DEFBINOP (el_ldiv, sparse_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
-  const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
+  const octave_sparse_matrix& v1
+    = dynamic_cast<const octave_sparse_matrix&> (a1);
+  const octave_sparse_complex_matrix& v2
+    = dynamic_cast<const octave_sparse_complex_matrix&> (a2);

   return octave_value (quotient (v2.sparse_complex_matrix_value (),
                                  v1.sparse_matrix_value ()));
@@ -129,7 +135,8 @@

 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix)
 {
-  const octave_sparse_matrix& v = dynamic_cast<const octave_sparse_matrix&> (a);
+  const octave_sparse_matrix& v
+    = dynamic_cast<const octave_sparse_matrix&> (a);
   return new octave_sparse_complex_matrix (v.sparse_complex_matrix_value ());
 }

@@ -181,3 +188,4 @@
   INSTALL_WIDENOP (octave_sparse_matrix, octave_sparse_complex_matrix,
                    sparse_complex_matrix_conv);
 }
+
--- a/libinterp/operators/op-sm-sm.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-sm-sm.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -201,3 +201,4 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_sq_str,
                     null_assign);
 }
+
--- a/libinterp/operators/op-str-m.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-str-m.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -63,3 +63,4 @@
   INSTALL_CATOP (octave_matrix, octave_char_matrix_str, m_str);
   INSTALL_CATOP (octave_matrix, octave_char_matrix_sq_str, m_str);
 }
+
--- a/libinterp/operators/op-str-s.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-str-s.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -63,3 +63,4 @@
   INSTALL_CATOP (octave_scalar, octave_char_matrix_str, s_str);
   INSTALL_CATOP (octave_scalar, octave_char_matrix_sq_str, s_str);
 }
+
--- a/libinterp/operators/op-str-str.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-str-str.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -36,7 +36,8 @@

 DEFUNOP (transpose, char_matrix_str)
 {
-  const octave_char_matrix_str& v = dynamic_cast<const octave_char_matrix_str&> (a);
+  const octave_char_matrix_str& v
+    = dynamic_cast<const octave_char_matrix_str&> (a);

   if (v.ndims () > 2)
     error ("transpose not defined for N-D objects");
@@ -97,7 +98,8 @@
 DEFASSIGNOP (assign, char_matrix_str, char_matrix_str)
 {
   octave_char_matrix_str& v1 = dynamic_cast<octave_char_matrix_str&> (a1);
-  const octave_char_matrix_str& v2 = dynamic_cast<const octave_char_matrix_str&> (a2);
+  const octave_char_matrix_str& v2
+    = dynamic_cast<const octave_char_matrix_str&> (a2);

   v1.assign (idx, v2.char_array_value ());
   return octave_value ();
@@ -182,3 +184,4 @@
                     null_assign);

 }
+
--- a/libinterp/operators/op-struct.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-struct.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -105,3 +105,4 @@
   INSTALL_CATOP (octave_struct, octave_matrix, struct_matrix);
   INSTALL_CATOP (octave_matrix, octave_struct, matrix_struct);
 }
+
--- a/libinterp/operators/op-ui16-ui16.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-ui16-ui16.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint16, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint16, uint64);
 }
+
--- a/libinterp/operators/op-ui32-ui32.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-ui32-ui32.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -155,3 +155,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint32, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint32, uint64);
 }
+
--- a/libinterp/operators/op-ui64-ui64.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-ui64-ui64.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, uint32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, int64);
 }
+
--- a/libinterp/operators/op-ui8-ui8.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/op-ui8-ui8.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint8, int64);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint8, uint64);
 }
+
--- a/libinterp/operators/ops.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/operators/ops.h	Tue Aug 30 21:46:47 2016 -0700
@@ -380,3 +380,4 @@
   }

 #endif
+
--- a/libinterp/options-usage.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/options-usage.h	Tue Aug 30 21:46:47 2016 -0700
@@ -179,3 +179,4 @@
 }

 #endif
+
--- a/libinterp/parse-tree/lex.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/lex.h	Tue Aug 30 21:46:47 2016 -0700
@@ -95,12 +95,12 @@
     private:

       enum bracket_type
-        {
-          BRACKET = 1,
-          BRACE = 2,
-          PAREN = 3,
-          ANON_FCN_BODY = 4
-        };
+      {
+        BRACKET = 1,
+        BRACE = 2,
+        PAREN = 3,
+        ANON_FCN_BODY = 4
+      };

     public:

@@ -852,3 +852,4 @@
 }

 #endif
+
--- a/libinterp/parse-tree/parse.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/parse.h	Tue Aug 30 21:46:47 2016 -0700
@@ -528,3 +528,4 @@
 }

 #endif
+
--- a/libinterp/parse-tree/pt-all.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-all.h	Tue Aug 30 21:46:47 2016 -0700
@@ -56,3 +56,4 @@
 #include "pt-walk.h"

 #endif
+
--- a/libinterp/parse-tree/pt-arg-list.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-arg-list.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -348,3 +348,4 @@
 {
   tw.visit_argument_list (*this);
 }
+
--- a/libinterp/parse-tree/pt-arg-list.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-arg-list.h	Tue Aug 30 21:46:47 2016 -0700
@@ -110,3 +110,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-array-list.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-array-list.h	Tue Aug 30 21:46:47 2016 -0700
@@ -82,3 +82,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-assign.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-assign.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -379,3 +379,4 @@
 {
   tw.visit_multi_assignment (*this);
 }
+
--- a/libinterp/parse-tree/pt-assign.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-assign.h	Tue Aug 30 21:46:47 2016 -0700
@@ -167,3 +167,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-binop.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-binop.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -302,3 +302,4 @@
 %! endif
 %! assert (x, 1);
 */
+
--- a/libinterp/parse-tree/pt-binop.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-binop.h	Tue Aug 30 21:46:47 2016 -0700
@@ -183,3 +183,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-bp.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-bp.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -508,3 +508,4 @@
   else
     panic_impossible ();
 }
+
--- a/libinterp/parse-tree/pt-bp.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-bp.h	Tue Aug 30 21:46:47 2016 -0700
@@ -180,3 +180,4 @@
 extern bool octave_debug_on_interrupt_state;

 #endif
+
--- a/libinterp/parse-tree/pt-cbinop.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cbinop.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -231,3 +231,4 @@

   return ret;
 }
+
--- a/libinterp/parse-tree/pt-cbinop.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cbinop.h	Tue Aug 30 21:46:47 2016 -0700
@@ -83,3 +83,4 @@
                                   = octave_value::unknown_binary_op);

 #endif
+
--- a/libinterp/parse-tree/pt-cell.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cell.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -112,3 +112,4 @@
 {
   tw.visit_cell (*this);
 }
+
--- a/libinterp/parse-tree/pt-cell.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cell.h	Tue Aug 30 21:46:47 2016 -0700
@@ -72,3 +72,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-check.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-check.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -176,7 +176,7 @@

       if (len == 0 || len > 2)
         errmsg ("invalid number of output arguments in for command",
-               cmd.line ());
+                cmd.line ());

       do_lvalue_check = true;

@@ -510,7 +510,7 @@
     {
       if (! expr_id->lvalue_ok ())
         errmsg ("invalid lvalue used for identifier in try-catch command",
-               cmd.line ());
+                cmd.line ());
     }

   if (try_code)
@@ -572,3 +572,4 @@
   else
     error ("%s: %d: %s", file_name.c_str (), line, msg.c_str ());
 }
+
--- a/libinterp/parse-tree/pt-check.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-check.h	Tue Aug 30 21:46:47 2016 -0700
@@ -143,3 +143,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-classdef.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-classdef.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -256,3 +256,4 @@
 {
   tw.visit_classdef (*this);
 }
+
--- a/libinterp/parse-tree/pt-classdef.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-classdef.h	Tue Aug 30 21:46:47 2016 -0700
@@ -653,3 +653,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-cmd.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cmd.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -57,3 +57,4 @@
 {
   tw.visit_function_def (*this);
 }
+
--- a/libinterp/parse-tree/pt-cmd.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-cmd.h	Tue Aug 30 21:46:47 2016 -0700
@@ -132,3 +132,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-colon.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-colon.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -170,3 +170,4 @@
 {
   tw.visit_colon_expression (*this);
 }
+
--- a/libinterp/parse-tree/pt-colon.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-colon.h	Tue Aug 30 21:46:47 2016 -0700
@@ -115,3 +115,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-const.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-const.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -85,3 +85,4 @@
 {
   tw.visit_constant (*this);
 }
+
--- a/libinterp/parse-tree/pt-const.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-const.h	Tue Aug 30 21:46:47 2016 -0700
@@ -103,3 +103,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-decl.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-decl.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -143,3 +143,4 @@
 {
   tw.visit_persistent_command (*this);
 }
+
--- a/libinterp/parse-tree/pt-decl.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-decl.h	Tue Aug 30 21:46:47 2016 -0700
@@ -243,3 +243,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-eval.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-eval.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -68,7 +68,7 @@
   bool tree_evaluator::quiet_breakpoint_flag = false;

   tree_evaluator::stmt_list_type tree_evaluator::statement_context
-  = tree_evaluator::other;
+    = tree_evaluator::other;

   bool tree_evaluator::in_loop_command = false;

@@ -816,7 +816,8 @@
   {
     bool execution_error = false;

-    { // unwind frame before catch block
+    {
+      // unwind frame before catch block
       octave::unwind_protect frame;

       frame.protect_var (buffer_error_messages);
@@ -1240,3 +1241,4 @@

 %!error (silent_functions (1, 2))
 */
+
--- a/libinterp/parse-tree/pt-eval.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-eval.h	Tue Aug 30 21:46:47 2016 -0700
@@ -203,3 +203,4 @@
 extern int Vmax_recursion_depth;

 #endif
+
--- a/libinterp/parse-tree/pt-except.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-except.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -101,3 +101,4 @@
 {
   tw.visit_unwind_protect_command (*this);
 }
+
--- a/libinterp/parse-tree/pt-except.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-except.h	Tue Aug 30 21:46:47 2016 -0700
@@ -163,3 +163,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-exp.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-exp.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -79,3 +79,4 @@
 {
   return "";
 }
+
--- a/libinterp/parse-tree/pt-exp.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-exp.h	Tue Aug 30 21:46:47 2016 -0700
@@ -167,3 +167,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-fcn-handle.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-fcn-handle.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -219,3 +219,4 @@
 {
   tw.visit_anon_fcn_handle (*this);
 }
+
--- a/libinterp/parse-tree/pt-fcn-handle.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-fcn-handle.h	Tue Aug 30 21:46:47 2016 -0700
@@ -156,3 +156,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-funcall.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-funcall.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -108,3 +108,4 @@

   return retval;
 }
+
--- a/libinterp/parse-tree/pt-funcall.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-funcall.h	Tue Aug 30 21:46:47 2016 -0700
@@ -98,3 +98,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-id.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-id.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -154,3 +154,4 @@
 {
   tw.visit_identifier (*this);
 }
+
--- a/libinterp/parse-tree/pt-id.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-id.h	Tue Aug 30 21:46:47 2016 -0700
@@ -171,3 +171,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-idx.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-idx.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -428,7 +428,7 @@
       retval = tmp.subsref (type.substr (tmpi, n - tmpi), idx, nargout,
                             lvalue_list);
     }
-  catch (octave::index_exception& e)    // problems with range, invalid index type etc.
+  catch (octave::index_exception& e)  // range problems, bad index type, etc.
     {
       final_index_error (e, expr);
     }
@@ -704,3 +704,4 @@
 {
   tw.visit_index_expression (*this);
 }
+
--- a/libinterp/parse-tree/pt-idx.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-idx.h	Tue Aug 30 21:46:47 2016 -0700
@@ -132,3 +132,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-jump.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-jump.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -85,3 +85,4 @@
 {
   tw.visit_return_command (*this);
 }
+
--- a/libinterp/parse-tree/pt-jump.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-jump.h	Tue Aug 30 21:46:47 2016 -0700
@@ -115,3 +115,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-loop.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-loop.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -151,3 +151,4 @@
 {
   tw.visit_complex_for_command (*this);
 }
+
--- a/libinterp/parse-tree/pt-loop.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-loop.h	Tue Aug 30 21:46:47 2016 -0700
@@ -328,3 +328,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-mat.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-mat.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1391,3 +1391,4 @@

 %!error (string_fill_char (1, 2))
 */
+
--- a/libinterp/parse-tree/pt-mat.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-mat.h	Tue Aug 30 21:46:47 2016 -0700
@@ -90,3 +90,4 @@
 maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p);

 #endif
+
--- a/libinterp/parse-tree/pt-misc.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-misc.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -355,3 +355,4 @@
 {
   tw.visit_return_list (*this);
 }
+
--- a/libinterp/parse-tree/pt-misc.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-misc.h	Tue Aug 30 21:46:47 2016 -0700
@@ -155,3 +155,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-pr-code.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-pr-code.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -1340,3 +1340,4 @@

   decrement_indent_level ();
 }
+
--- a/libinterp/parse-tree/pt-pr-code.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-pr-code.h	Tue Aug 30 21:46:47 2016 -0700
@@ -198,3 +198,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-select.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-select.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -211,3 +211,4 @@
 {
   tw.visit_switch_command (*this);
 }
+
--- a/libinterp/parse-tree/pt-select.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-select.h	Tue Aug 30 21:46:47 2016 -0700
@@ -302,3 +302,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-stmt.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-stmt.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -243,7 +243,7 @@
   for (int i = 0; i < lines.length (); i++)
     {
       retval.push_back (bp_type (lines(i).double_value (),
-                                conds(i).string_value ()));
+                                 conds(i).string_value ()));
     }

   return retval;
@@ -325,3 +325,4 @@
 {
   tw.visit_statement_list (*this);
 }
+
--- a/libinterp/parse-tree/pt-stmt.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-stmt.h	Tue Aug 30 21:46:47 2016 -0700
@@ -200,3 +200,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-unop.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-unop.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -82,7 +82,7 @@

           if (val.is_defined ())
             {
-               BEGIN_PROFILER_BLOCK (tree_prefix_expression)
+              BEGIN_PROFILER_BLOCK (tree_prefix_expression)

               // Attempt to do the operation in-place if it is unshared
               // (a temporary expression).
@@ -189,3 +189,4 @@
 {
   tw.visit_postfix_expression (*this);
 }
+
--- a/libinterp/parse-tree/pt-unop.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-unop.h	Tue Aug 30 21:46:47 2016 -0700
@@ -161,3 +161,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt-walk.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt-walk.h	Tue Aug 30 21:46:47 2016 -0700
@@ -284,3 +284,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/pt.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -82,7 +82,7 @@
             {
               if (! val(0).is_scalar_type ())
                 warning ("Breakpoint condition must be a scalar, not size %s",
-                  val(0).dims ().str ('x').c_str ());
+                         val(0).dims ().str ('x').c_str ());
               else
                 retval = val(0).bool_value ();
             }
@@ -97,3 +97,4 @@
     }
   return retval;
 }
+
--- a/libinterp/parse-tree/pt.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/pt.h	Tue Aug 30 21:46:47 2016 -0700
@@ -61,23 +61,24 @@
   }

   virtual void set_breakpoint (const std::string& condition)
-    { if (bp)
-        *bp = condition;
-      else
-        bp = new std::string(condition);
-    }
+  {
+    if (bp)
+      *bp = condition;
+    else
+      bp = new std::string(condition);
+  }

   virtual void delete_breakpoint (void) { if (bp) delete bp; bp = NULL; }

   bool meets_bp_condition (void) const;

   bool is_breakpoint (bool check_active = false) const
-    { return bp && (!check_active || meets_bp_condition ()); }
+  { return bp && (!check_active || meets_bp_condition ()); }

   // breakpoint condition, or "0" (i.e., "false") if no breakpoint.
   // To distinguish "0" from a disabled breakpoint, test "is_breakpoint" too.
   const std::string bp_cond (void) const
-    { return bp ? *bp : std::string("0"); }
+  { return bp ? *bp : std::string("0"); }

   std::string str_print_code (void);

@@ -101,3 +102,4 @@
 };

 #endif
+
--- a/libinterp/parse-tree/token.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/token.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -193,3 +193,4 @@
 {
   return orig_text;
 }
+
--- a/libinterp/parse-tree/token.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/parse-tree/token.h	Tue Aug 30 21:46:47 2016 -0700
@@ -140,3 +140,4 @@
 };

 #endif
+
--- a/libinterp/template-inst/Array-jit.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/template-inst/Array-jit.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -49,3 +49,4 @@
 #endif

 #endif
+
--- a/libinterp/template-inst/Array-tc.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/template-inst/Array-tc.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -52,3 +52,4 @@

 NO_INSTANTIATE_ARRAY_SORT (cdef_object);
 INSTANTIATE_ARRAY (cdef_object, OCTINTERP_API);
+
--- a/libinterp/version.cc	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/version.cc	Tue Aug 30 21:46:47 2016 -0700
@@ -77,7 +77,7 @@

 std::string
 octave_name_version_copyright_copying_and_warranty
- (bool html, const std::string& extra_info)
+  (bool html, const std::string& extra_info)
 {
   std::string br = html ? "<br>\n" : "\n";
   std::string sep = html ? "\n</p>\n<p>\n" : "\n\n";
@@ -129,3 +129,4 @@

   return msg;
 }
+
--- a/libinterp/version.in.h	Mon Aug 29 14:32:22 2016 -0700
+++ b/libinterp/version.in.h	Tue Aug 30 21:46:47 2016 -0700
@@ -69,3 +69,4 @@
 extern OCTINTERP_API std::string octave_startup_message (bool html = false);

 #endif
+