--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-20  John W. Eaton  <jwe@octave.org>
+
+	* misc/cquit.c, misc/f77-fcn.h, misc/quit.cc: Strip trailing
+	whitespace.
+
 2011-01-14  John W. Eaton  <jwe@octave.org>
 
 	* Update copyright notices for 2011.

--- a/libcruft/misc/cquit.c
+++ b/libcruft/misc/cquit.c
@@ -98,10 +98,10 @@
   DEBUGs ("enter w32_set_context");
   SuspendThread (w32_main_thread);
   DEBUGs ("main suspended");
-  if (! SetThreadContext (w32_main_thread, context)) 
+  if (! SetThreadContext (w32_main_thread, context))
     {
       fprintf (stderr, "%lx: context failed: ctrl-c won't work\n",
-               GetCurrentThreadId ()); 
+               GetCurrentThreadId ());
       fflush (stderr);
     }
   DEBUGs ("context captured (or not)");
@@ -112,7 +112,7 @@
   return 0;
 }
 
-static void 
+static void
 w32_raise_in_main (void)
 {
   DWORD threadid;
@@ -127,16 +127,16 @@
     CloseHandle (w32_restore_thread);
   w32_restore_thread = CreateThread (NULL, 10000, w32_reset_context,
                                      &w32_signal_context, 0, &threadid);
-  if (w32_restore_thread == NULL) 
+  if (w32_restore_thread == NULL)
     {
-      fprintf (stderr, "w32_raise_in_main couldn't create thread\n"); 
+      fprintf (stderr, "w32_raise_in_main couldn't create thread\n");
       fflush (stderr);
-    } 
-  else 
+    }
+  else
     {
       DEBUGs ("waiting to restore raise context");
       WaitForSingleObject (w32_restore_thread, INFINITE);
-      fprintf (stderr, "w32_raise_in_main couldn't restore context\n"); 
+      fprintf (stderr, "w32_raise_in_main couldn't restore context\n");
       fflush (stderr);
     }
 }
@@ -157,14 +157,14 @@
 {
   int ret;
 
-  if (w32_in_main_thread ()) 
+  if (w32_in_main_thread ())
     {
       /* Called from main thread -- a simple raise () should work.  */
       DEBUGd ("raising signal %d within main", signal);
       raise (sig);
       DEBUGd ("returning from signal %d within main", signal);
-    } 
-  else 
+    }
+  else
     {
       /* Called from alternate thread -- call w32_raise_in_main in the
          main thread with w32_signal_to_raise set to the signal */
@@ -174,7 +174,7 @@
       /* Suspend main and remember the context.  */
       SuspendThread (w32_main_thread);
       /* X86 code */
-      w32_signal_context.ContextFlags 
+      w32_signal_context.ContextFlags
         = CONTEXT_FULL|CONTEXT_FLOATING_POINT|CONTEXT_DEBUG_REGISTERS;
       GetThreadContext (w32_main_thread, &w32_signal_context);
 

--- a/libcruft/misc/f77-fcn.h
+++ b/libcruft/misc/f77-fcn.h
@@ -102,7 +102,7 @@
    Fortran-style character strings.  */
 #define F77_CHAR_ARG_DEF(s, len) octave_cray_ftn_ch_dsc s
 #define F77_CONST_CHAR_ARG_DEF(s, len) octave_cray_ftn_ch_dsc s
-#define F77_CHAR_ARG_LEN_DEF(len) 
+#define F77_CHAR_ARG_LEN_DEF(len)
 #define F77_CHAR_ARG_USE(s) s.ptr
 #define F77_CHAR_ARG_LEN_USE(s, len) (s.mask.len>>3)
 
@@ -171,7 +171,7 @@
    Fortran-style character strings.  */
 #define F77_CHAR_ARG_DEF(s, len) char *s, int len
 #define F77_CONST_CHAR_ARG_DEF(s, len) const char *s, int len
-#define F77_CHAR_ARG_LEN_DEF(len) 
+#define F77_CHAR_ARG_LEN_DEF(len)
 #define F77_CHAR_ARG_USE(s) s
 #define F77_CHAR_ARG_LEN_USE(s, len) len
 
@@ -209,13 +209,13 @@
 
 /* Build a C string local variable CS from the Fortran string parameter S
    declared as F77_CHAR_ARG_DEF(s, len) or F77_CONST_CHAR_ARG_DEF(s, len).
-   The string will be cleaned up at the end of the current block.  
+   The string will be cleaned up at the end of the current block.
    Needs to include <cstring> and <vector>.  */
 
 #define F77_CSTRING(s, len, cs) \
  OCTAVE_LOCAL_BUFFER (char, cs, F77_CHAR_ARG_LEN_USE (s, len) + 1); \
  memcpy (cs, F77_CHAR_ARG_USE (s), F77_CHAR_ARG_LEN_USE (s, len)); \
- cs[F77_CHAR_ARG_LEN_USE(s, len)] = '\0' 
+ cs[F77_CHAR_ARG_LEN_USE(s, len)] = '\0'
 
 
 extern CRUFT_API F77_RET_T

--- a/libcruft/misc/quit.cc
+++ b/libcruft/misc/quit.cc
@@ -53,7 +53,7 @@
 {
   if (octave_interrupt_hook)
     octave_interrupt_hook ();
-    
+
   throw octave_interrupt_exception ();
 }
 
@@ -63,7 +63,7 @@
   // FIXME -- would a hook function be useful here?
 
   octave_exception_state = octave_exec_exception;
-    
+
   throw octave_execution_exception ();
 }
 
@@ -72,7 +72,7 @@
 {
   if (octave_bad_alloc_hook)
     octave_bad_alloc_hook ();
-    
+
   octave_exception_state = octave_alloc_exception;
 
   throw std::bad_alloc ();

--- a/liboctave/Array-b.cc
+++ b/liboctave/Array-b.cc
@@ -46,7 +46,7 @@
 }
 
 template<bool desc>
-static void do_bool_partition (bool *data, octave_idx_type *idx, 
+static void do_bool_partition (bool *data, octave_idx_type *idx,
                                octave_idx_type nel)
 {
   // FIXME: This is essentially a simple bucket sort.

--- a/liboctave/Array-d.cc
+++ b/liboctave/Array-d.cc
@@ -116,7 +116,7 @@
         r = el[j++];
       while (xisnan (r) && j < n);
 
-      // Orient the test so that NaN will not pass through. 
+      // Orient the test so that NaN will not pass through.
       for (; j < n; j++)
         {
           if (r >= el[j])
@@ -137,7 +137,7 @@
 
       if (n > 0)
         {
-          // Orient the test so that NaN will not pass through. 
+          // Orient the test so that NaN will not pass through.
           double r = el[0];
           for (octave_idx_type j = 1; j < n; j++)
             {

--- a/liboctave/Array-f.cc
+++ b/liboctave/Array-f.cc
@@ -116,7 +116,7 @@
         r = el[j++];
       while (xisnan (r) && j < n);
 
-      // Orient the test so that NaN will not pass through. 
+      // Orient the test so that NaN will not pass through.
       for (; j < n; j++)
         {
           if (r >= el[j])
@@ -137,7 +137,7 @@
 
       if (n > 0)
         {
-          // Orient the test so that NaN will not pass through. 
+          // Orient the test so that NaN will not pass through.
           float r = el[0];
           for (octave_idx_type j = 1; j < n; j++)
             {

--- a/liboctave/Array-util.cc
+++ b/liboctave/Array-util.cc
@@ -88,9 +88,9 @@
       retval = idx(--n);
 
       while (--n >= 0)
-        {               
+        {
           retval *= dims (n);
-        
+
           retval += idx(n);
         }
     }
@@ -129,7 +129,7 @@
           if (dim (i) != 1)
             {
               retval = false;
-        
+
               break;
             }
         }
@@ -167,14 +167,14 @@
       if (arr (i) == 1)
         {
           retval = true;
-        
+
           break;
         }
     }
   return retval;
 }
 
-octave_idx_type 
+octave_idx_type
 compute_index (octave_idx_type n, const dim_vector& dims)
 {
   if (n < 0)
@@ -185,7 +185,7 @@
   return n;
 }
 
-octave_idx_type 
+octave_idx_type
 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims)
 {
   if (i < 0 || j < 0)
@@ -198,7 +198,7 @@
   return j*dims(0) + i;
 }
 
-octave_idx_type 
+octave_idx_type
 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k,
                const dim_vector& dims)
 {
@@ -214,7 +214,7 @@
   return (k*dims(1) + j)*dims(0) + i;
 }
 
-octave_idx_type 
+octave_idx_type
 compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims)
 {
   int nd = ra_idx.length ();
@@ -428,7 +428,7 @@
   dim_vector rdv = dim_vector::alloc (ial);
   bool *scalar = new bool[ial], *colon = new bool[ial];
   // Mark scalars and colons, count non-scalar indices.
-  int nonsc = 0; 
+  int nonsc = 0;
   bool all_colons = true;
   for (int i = 0; i < ial; i++)
     {

--- a/liboctave/Array-util.h
+++ b/liboctave/Array-util.h
@@ -47,17 +47,17 @@
 
 // These four compute a linear index for given dimensions, throwing
 // exceptions on invalid indices.
-extern OCTAVE_API octave_idx_type 
+extern OCTAVE_API octave_idx_type
 compute_index (octave_idx_type n, const dim_vector& dims);
 
-extern OCTAVE_API octave_idx_type 
+extern OCTAVE_API octave_idx_type
 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims);
 
-extern OCTAVE_API octave_idx_type 
+extern OCTAVE_API octave_idx_type
 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k,
                const dim_vector& dims);
 
-extern OCTAVE_API octave_idx_type 
+extern OCTAVE_API octave_idx_type
 compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims);
 
 extern OCTAVE_API Array<octave_idx_type> conv_to_int_array (const Array<idx_vector>& a);

--- a/liboctave/Array.cc
+++ b/liboctave/Array.cc
@@ -1,7 +1,7 @@
 // Template array classes
 /*
 
-Copyright (C) 1993-2011 John W. Eaton 
+Copyright (C) 1993-2011 John W. Eaton
 Copyright (C) 2008-2009 Jaroslav Hajek
 Copyright (C) 2009 VZLU Prague
 
@@ -88,7 +88,7 @@
     delete rep;
 
   rep = nil_rep ();
-  rep->count++; 
+  rep->count++;
   slice_data = rep->data;
   slice_len = rep->len;
 
@@ -185,7 +185,7 @@
 }
 
 template <class T>
-T& 
+T&
 Array<T>::checkelem (octave_idx_type n)
 {
   // Do checks directly to avoid recomputing slice_len.
@@ -198,21 +198,21 @@
 }
 
 template <class T>
-T& 
+T&
 Array<T>::checkelem (octave_idx_type i, octave_idx_type j)
 {
   return elem (compute_index (i, j));
 }
 
 template <class T>
-T& 
+T&
 Array<T>::checkelem (octave_idx_type i, octave_idx_type j, octave_idx_type k)
 {
   return elem (compute_index (i, j, k));
 }
 
 template <class T>
-T& 
+T&
 Array<T>::checkelem (const Array<octave_idx_type>& ra_idx)
 {
   return elem (compute_index (ra_idx));
@@ -416,7 +416,7 @@
 
       return dest;
     }
-  
+
 public:
 
   template <class T>
@@ -505,7 +505,7 @@
 // Helper class for multi-d index reduction and recursive
 // indexing/indexed assignment.  Rationale: we could avoid recursion
 // using a state machine instead.  However, using recursion is much
-// more amenable to possible parallelization in the future. 
+// more amenable to possible parallelization in the future.
 // Also, the recursion solution is cleaner and more understandable.
 
 class rec_index_helper
@@ -545,7 +545,7 @@
               idx[top] = ia(i);
               dim[top] = dv(i);
               cdim[top] = cdim[top-1] * dim[top-1];
-            } 
+            }
         }
     }
 
@@ -568,7 +568,7 @@
 
       return dest;
     }
-  
+
   // Recursive N-d indexed assignment
   template <class T>
   const T *do_assign (const T *src, T *dest, int lev) const
@@ -610,7 +610,7 @@
   template <class T>
   void fill (const T& val, T *dest) const { do_fill (val, dest, top); }
 
-  bool is_cont_range (octave_idx_type& l, 
+  bool is_cont_range (octave_idx_type& l,
                             octave_idx_type& u) const
     {
       return top == 0 && idx[0].is_cont_range (dim[0], l, u);
@@ -675,7 +675,7 @@
     }
 public:
   template <class T>
-  void resize_fill (const T* src, T *dest, const T& rfv) const 
+  void resize_fill (const T* src, T *dest, const T& rfv) const
     { do_resize_fill (src, dest, rfv, n-1); }
 
 };
@@ -833,7 +833,7 @@
           dv.chop_trailing_singletons ();
           retval = Array<T> (*this, dv);
         }
-      else 
+      else
         {
           // Form result dimensions.
           dim_vector rdv = dim_vector::alloc (ial);
@@ -889,12 +889,12 @@
       // treated).
       bool invalid = false;
       if (rows () == 0 || rows () == 1)
-        dv = dim_vector (1, n);          
+        dv = dim_vector (1, n);
       else if (columns () == 1)
         dv = dim_vector (n, 1);
       else
          invalid = true;
-        
+
       if (invalid)
         gripe_invalid_resize ();
       else
@@ -1004,7 +1004,7 @@
           rec_resize_helper rh (dv, dimensions.redim (dvl));
 
           // Do it.
-          rh.resize_fill (data (), tmp.fortran_vec (), rfv);   
+          rh.resize_fill (data (), tmp.fortran_vec (), rfv);
           *this = tmp;
         }
       else
@@ -1013,7 +1013,7 @@
 }
 
 template <class T>
-Array<T> 
+Array<T>
 Array<T>::index (const idx_vector& i, bool resize_ok, const T& rfv) const
 {
   Array<T> tmp = *this;
@@ -1036,8 +1036,8 @@
 }
 
 template <class T>
-Array<T> 
-Array<T>::index (const idx_vector& i, const idx_vector& j, 
+Array<T>
+Array<T>::index (const idx_vector& i, const idx_vector& j,
                  bool resize_ok, const T& rfv) const
 {
   Array<T> tmp = *this;
@@ -1058,11 +1058,11 @@
         return Array<T> ();
     }
 
-  return tmp.index (i, j);  
+  return tmp.index (i, j);
 }
 
 template <class T>
-Array<T> 
+Array<T>
 Array<T>::index (const Array<idx_vector>& ia,
                  bool resize_ok, const T& rfv) const
 {
@@ -1076,7 +1076,7 @@
       if (! (dvx == dv))
         {
           bool all_scalars = true;
-          for (int i = 0; i < ial; i++) 
+          for (int i = 0; i < ial; i++)
             all_scalars = all_scalars && ia(i).is_scalar ();
           if (all_scalars)
             return Array<T> (dim_vector (1, 1), rfv);
@@ -1088,7 +1088,7 @@
         return Array<T> ();
     }
 
-  return tmp.index (ia);  
+  return tmp.index (ia);
 }
 
 
@@ -1102,10 +1102,10 @@
     {
       octave_idx_type nx = i.extent (n);
       bool colon = i.is_colon_equiv (nx);
-      // Try to resize first if necessary. 
+      // Try to resize first if necessary.
       if (nx != n)
         {
-          // Optimize case A = []; A(1:n) = X with A empty. 
+          // Optimize case A = []; A(1:n) = X with A empty.
           if (dimensions.zero_by_zero () && colon)
             {
               if (rhl == 1)
@@ -1115,7 +1115,7 @@
               return;
             }
 
-          resize1 (nx, rfv);      
+          resize1 (nx, rfv);
           n = numel ();
         }
 
@@ -1145,11 +1145,11 @@
                   const Array<T>& rhs, const T& rfv)
 {
   // Get RHS extents, discarding singletons.
-  dim_vector rhdv = rhs.dims (); 
+  dim_vector rhdv = rhs.dims ();
   // Get LHS extents, allowing Fortran indexing in the second dim.
   dim_vector dv = dimensions.redim (2);
   // Check for out-of-bounds and form resizing dimensions.
-  dim_vector rdv; 
+  dim_vector rdv;
   // In the special when all dimensions are zero, colons are allowed
   // to inquire the shape of RHS.  The rules are more obscure, so we
   // solve that elsewhere.
@@ -1170,7 +1170,7 @@
 
   if (match)
     {
-      bool all_colons = (i.is_colon_equiv (rdv(0)) 
+      bool all_colons = (i.is_colon_equiv (rdv(0))
                          && j.is_colon_equiv (rdv(1)));
       // Resize if requested.
       if (rdv != dv)
@@ -1252,8 +1252,8 @@
 
       // Get LHS extents, allowing Fortran indexing in the second dim.
       dim_vector dv = dimensions.redim (ial);
-      
-      // Get the extents forced by indexing. 
+
+      // Get the extents forced by indexing.
       dim_vector rdv;
 
       // In the special when all dimensions are zero, colons are
@@ -1283,7 +1283,7 @@
 
       match = match && (j == rhdvl || rhdv(j) == 1);
       match = match || isfill;
-            
+
       if (match)
         {
           // Resize first if necessary.
@@ -1326,18 +1326,18 @@
                 rh.assign (rhs.data (), fortran_vec ());
             }
         }
-      else 
+      else
         gripe_assignment_dimension_mismatch ();
     }
 }
 
 template <class T>
-void 
+void
 Array<T>::delete_elements (const idx_vector& i)
 {
   octave_idx_type n = numel ();
   if (i.is_colon ())
-    { 
+    {
       *this = Array<T> ();
     }
   else if (i.length (n) != 0)
@@ -1372,7 +1372,7 @@
 }
 
 template <class T>
-void 
+void
 Array<T>::delete_elements (int dim, const idx_vector& i)
 {
   if (dim < 0 || dim >= ndims ())
@@ -1384,7 +1384,7 @@
 
   octave_idx_type n = dimensions (dim);
   if (i.is_colon ())
-    { 
+    {
       *this = Array<T> ();
     }
   else if (i.length (n) != 0)
@@ -1430,7 +1430,7 @@
 }
 
 template <class T>
-void 
+void
 Array<T>::delete_elements (const Array<idx_vector>& ia)
 {
   if (ia.length () == 1)
@@ -1575,15 +1575,15 @@
           for (ii = 0; ii < (nr - 8 + 1); ii += 8)
             {
               // Copy to buffer
-              for (octave_idx_type j = jj, k = 0, idxj = jj * nr; 
+              for (octave_idx_type j = jj, k = 0, idxj = jj * nr;
                    j < jj + 8; j++, idxj += nr)
                 for (octave_idx_type i = ii; i < ii + 8; i++)
                   buf[k++] = xelem (i + idxj);
 
               // Copy from buffer
-              for (octave_idx_type i = ii, idxi = ii * nc; i < ii + 8; 
+              for (octave_idx_type i = ii, idxi = ii * nc; i < ii + 8;
                    i++, idxi += nc)
-                for (octave_idx_type j = jj, k = i - ii; j < jj + 8; 
+                for (octave_idx_type j = jj, k = i - ii; j < jj + 8;
                      j++, k+=8)
                   result.xelem (j + idxi) = fcn (buf[k]);
             }
@@ -1592,7 +1592,7 @@
             for (octave_idx_type j = jj; j < jj + 8; j++)
               for (octave_idx_type i = ii; i < nr; i++)
                 result.xelem (j, i) = fcn (xelem (i, j));
-        } 
+        }
 
       for (octave_idx_type j = jj; j < nc; j++)
         for (octave_idx_type i = 0; i < nr; i++)
@@ -1695,8 +1695,8 @@
   const T *ov = data ();
 
   octave_sort<T> lsort;
-  
-  if (mode != UNSORTED) 
+
+  if (mode != UNSORTED)
     lsort.set_compare (mode);
   else
     return m;
@@ -1705,7 +1705,7 @@
     {
       for (octave_idx_type j = 0; j < iter; j++)
         {
-          // copy and partition out NaNs. 
+          // copy and partition out NaNs.
           // FIXME: impact on integer types noticeable?
           octave_idx_type kl = 0, ku = ns;
           for (octave_idx_type i = 0; i < ns; i++)
@@ -1736,7 +1736,7 @@
     {
       OCTAVE_LOCAL_BUFFER (T, buf, ns);
 
-      for (octave_idx_type j = 0; j < iter; j++) 
+      for (octave_idx_type j = 0; j < iter; j++)
         {
           octave_idx_type offset = j;
           octave_idx_type offset2 = 0;
@@ -1748,8 +1748,8 @@
             }
 
           offset += offset2 * stride * ns;
-          
-          // gather and partition out NaNs. 
+
+          // gather and partition out NaNs.
           // FIXME: impact on integer types noticeable?
           octave_idx_type kl = 0, ku = ns;
           for (octave_idx_type i = 0; i < ns; i++)
@@ -1783,7 +1783,7 @@
 
 template <class T>
 Array<T>
-Array<T>::sort (Array<octave_idx_type> &sidx, int dim, 
+Array<T>::sort (Array<octave_idx_type> &sidx, int dim,
                 sortmode mode) const
 {
   if (dim < 0 || dim >= ndims ())
@@ -1817,8 +1817,8 @@
 
   sidx = Array<octave_idx_type> (dv);
   octave_idx_type *vi = sidx.fortran_vec ();
-  
-  if (mode != UNSORTED) 
+
+  if (mode != UNSORTED)
     lsort.set_compare (mode);
   else
     return m;
@@ -1827,7 +1827,7 @@
     {
       for (octave_idx_type j = 0; j < iter; j++)
         {
-          // copy and partition out NaNs. 
+          // copy and partition out NaNs.
           // FIXME: impact on integer types noticeable?
           octave_idx_type kl = 0, ku = ns;
           for (octave_idx_type i = 0; i < ns; i++)
@@ -1872,7 +1872,7 @@
       OCTAVE_LOCAL_BUFFER (T, buf, ns);
       OCTAVE_LOCAL_BUFFER (octave_idx_type, bufi, ns);
 
-      for (octave_idx_type j = 0; j < iter; j++) 
+      for (octave_idx_type j = 0; j < iter; j++)
         {
           octave_idx_type offset = j;
           octave_idx_type offset2 = 0;
@@ -1884,8 +1884,8 @@
             }
 
           offset += offset2 * stride * ns;
-          
-          // gather and partition out NaNs. 
+
+          // gather and partition out NaNs.
           // FIXME: impact on integer types noticeable?
           octave_idx_type kl = 0, ku = ns;
           for (octave_idx_type i = 0; i < ns; i++)
@@ -1998,7 +1998,7 @@
 
 
 template <class T>
-sortmode 
+sortmode
 Array<T>::is_sorted_rows (sortmode mode) const
 {
   octave_sort<T> lsort;
@@ -2057,7 +2057,7 @@
 
 // Do a binary lookup in a sorted array.
 template <class T>
-octave_idx_type 
+octave_idx_type
 Array<T>::lookup (const T& value, sortmode mode) const
 {
   octave_idx_type n = numel ();
@@ -2078,7 +2078,7 @@
 }
 
 template <class T>
-Array<octave_idx_type> 
+Array<octave_idx_type>
 Array<T>::lookup (const Array<T>& values, sortmode mode) const
 {
   octave_idx_type n = numel (), nval = values.numel ();
@@ -2120,7 +2120,7 @@
 }
 
 template <class T>
-octave_idx_type 
+octave_idx_type
 Array<T>::nnz (void) const
 {
   const T *src = data ();
@@ -2134,7 +2134,7 @@
 }
 
 template <class T>
-Array<octave_idx_type> 
+Array<octave_idx_type>
 Array<T>::find (octave_idx_type n, bool backward) const
 {
   Array<octave_idx_type> retval;
@@ -2302,7 +2302,7 @@
 
       if (stride == 1)
         {
-          // copy without NaNs. 
+          // copy without NaNs.
           // FIXME: impact on integer types noticeable?
           for (octave_idx_type i = 0; i < ns; i++)
             {
@@ -2318,7 +2318,7 @@
       else
         {
           octave_idx_type offset = j % stride;
-          // copy without NaNs. 
+          // copy without NaNs.
           // FIXME: impact on integer types noticeable?
           for (octave_idx_type i = 0; i < ns; i++)
             {
@@ -2421,7 +2421,7 @@
   Array<T> d;
 
   if (nd > 2)
-    (*current_liboctave_error_handler) ("Matrix must be 2-dimensional");    
+    (*current_liboctave_error_handler) ("Matrix must be 2-dimensional");
   else
     {
       octave_idx_type nnr = dv (0);
@@ -2628,7 +2628,7 @@
   bool retval = dimensions == dv;
   if (retval)
     dimensions = dv;
-  
+
   return retval;
 }
 

--- a/liboctave/Array.h
+++ b/liboctave/Array.h
@@ -61,16 +61,16 @@
     octave_idx_type len;
     int count;
 
-    ArrayRep (T *d, octave_idx_type l) 
-      : data (no_ctor_new<T> (l)), len (l), count (1) 
-        { 
+    ArrayRep (T *d, octave_idx_type l)
+      : data (no_ctor_new<T> (l)), len (l), count (1)
+        {
           copy_or_memcpy (l, d, data);
         }
 
     template <class U>
-    ArrayRep (U *d, octave_idx_type l) 
-      : data (no_ctor_new<T> (l)), len (l), count (1) 
-        { 
+    ArrayRep (U *d, octave_idx_type l)
+      : data (no_ctor_new<T> (l)), len (l), count (1)
+        {
           std::copy (d, d+l, data);
         }
 
@@ -89,7 +89,7 @@
       {
         copy_or_memcpy (a.len, a.data, data);
       }
- 
+
     ~ArrayRep (void) { no_ctor_delete<T> (data); }
 
     octave_idx_type length (void) const { return len; }
@@ -164,8 +164,8 @@
   Array (void)
     : dimensions (), rep (nil_rep ()), slice_data (rep->data),
       slice_len (rep->len)
-    { 
-      rep->count++; 
+    {
+      rep->count++;
     }
 
   // Obsolete 1D ctor (there are no 1D arrays).
@@ -187,7 +187,7 @@
     : dimensions (dv),
       rep (new typename Array<T>::ArrayRep (dv.safe_numel ())),
       slice_data (rep->data), slice_len (rep->len)
-    { 
+    {
       dimensions.chop_trailing_singletons ();
     }
 
@@ -246,7 +246,7 @@
       return *this;
     }
 
-  void fill (const T& val); 
+  void fill (const T& val);
 
   void clear (void);
   void clear (const dim_vector& dv);
@@ -304,10 +304,10 @@
   const dim_vector& dims (void) const { return dimensions; }
 
   Array<T> squeeze (void) const;
-  
+
   void chop_trailing_singletons (void) GCC_ATTR_DEPRECATED
   { dimensions.chop_trailing_singletons (); }
-  
+
   octave_idx_type compute_index (octave_idx_type i, octave_idx_type j) const;
   octave_idx_type compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k) const;
   octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx) const;
@@ -323,9 +323,9 @@
   T& xelem (octave_idx_type i, octave_idx_type j) { return xelem (dim1()*j+i); }
   crefT xelem (octave_idx_type i, octave_idx_type j) const { return xelem (dim1()*j+i); }
 
-  T& xelem (octave_idx_type i, octave_idx_type j, octave_idx_type k) 
+  T& xelem (octave_idx_type i, octave_idx_type j, octave_idx_type k)
     { return xelem (i, dim2()*k+j); }
-  crefT xelem (octave_idx_type i, octave_idx_type j, octave_idx_type k) const 
+  crefT xelem (octave_idx_type i, octave_idx_type j, octave_idx_type k) const
     { return xelem (i, dim2()*k+j); }
 
   T& xelem (const Array<octave_idx_type>& ra_idx)
@@ -443,7 +443,7 @@
 
   Array<T> index (const Array<idx_vector>& ia) const;
 
-  static const T& resize_fill_value (); 
+  static const T& resize_fill_value ();
 
   // Resizing (with fill).
 
@@ -467,7 +467,7 @@
   Array<T> index (const idx_vector& i, bool resize_ok,
                   const T& rfv = resize_fill_value ()) const;
 
-  Array<T> index (const idx_vector& i, const idx_vector& j, 
+  Array<T> index (const idx_vector& i, const idx_vector& j,
                   bool resize_ok, const T& rfv = resize_fill_value ()) const;
 
   Array<T> index (const Array<idx_vector>& ia,
@@ -475,7 +475,7 @@
 
   // Indexed assignment (always with resize & fill).
 
-  void assign (const idx_vector& i, const Array<T>& rhs, 
+  void assign (const idx_vector& i, const Array<T>& rhs,
                const T& rfv = resize_fill_value ());
 
   void assign (const idx_vector& i, const idx_vector& j, const Array<T>& rhs,
@@ -615,7 +615,7 @@
       {
         octave_quit ();
 
-        if (fcn (m[i]) != zero 
+        if (fcn (m[i]) != zero
             || fcn (m[i+1]) != zero
             || fcn (m[i+2]) != zero
             || fcn (m[i+3]) != zero)
@@ -663,7 +663,7 @@
 
 private:
 
-  void resize2 (octave_idx_type nr, octave_idx_type nc, 
+  void resize2 (octave_idx_type nr, octave_idx_type nc,
                 const T& rfv = resize_fill_value ());
 
   static void instantiation_guard ();

--- a/liboctave/Array3.h
+++ b/liboctave/Array3.h
@@ -63,7 +63,7 @@
       return *this;
     }
 
-  void resize (octave_idx_type r, octave_idx_type c, octave_idx_type p) 
+  void resize (octave_idx_type r, octave_idx_type c, octave_idx_type p)
     { Array<T>::resize (dim_vector (r, c, p)); }
 
   void resize (octave_idx_type r, octave_idx_type c, octave_idx_type p, const T& val)

--- a/liboctave/CColVector.cc
+++ b/liboctave/CColVector.cc
@@ -221,9 +221,9 @@
   return retval;
 }
 
-ComplexRowVector 
+ComplexRowVector
 ComplexColumnVector::hermitian (void) const
-{ 
+{
   return MArray<Complex>::hermitian (std::conj);
 }
 

--- a/liboctave/CColVector.h
+++ b/liboctave/CColVector.h
@@ -42,7 +42,7 @@
   explicit ComplexColumnVector (octave_idx_type n)
     : MArray<Complex> (dim_vector (n, 1)) { }
 
-  explicit ComplexColumnVector (const dim_vector& dv) 
+  explicit ComplexColumnVector (const dim_vector& dv)
     : MArray<Complex> (dv.as_column ()) { }
 
   ComplexColumnVector (octave_idx_type n, const Complex& val)

--- a/liboctave/CDiagMatrix.cc
+++ b/liboctave/CDiagMatrix.cc
@@ -275,7 +275,7 @@
   if (i < 0 || i >= r)
     {
       (*current_liboctave_error_handler) ("invalid row selection");
-      return ComplexRowVector (); 
+      return ComplexRowVector ();
     }
 
   ComplexRowVector retval (c, 0.0);
@@ -291,7 +291,7 @@
   if (! s)
     {
       (*current_liboctave_error_handler) ("invalid row selection");
-      return ComplexRowVector (); 
+      return ComplexRowVector ();
     }
 
   char c = *s;
@@ -314,7 +314,7 @@
   if (i < 0 || i >= c)
     {
       (*current_liboctave_error_handler) ("invalid column selection");
-      return ComplexColumnVector (); 
+      return ComplexColumnVector ();
     }
 
   ComplexColumnVector retval (r, 0.0);
@@ -330,7 +330,7 @@
   if (! s)
     {
       (*current_liboctave_error_handler) ("invalid column selection");
-      return ComplexColumnVector (); 
+      return ComplexColumnVector ();
     }
 
   char c = *s;
@@ -341,7 +341,7 @@
   else
     {
       (*current_liboctave_error_handler) ("invalid column selection");
-      return ComplexColumnVector (); 
+      return ComplexColumnVector ();
     }
 }
 

--- a/liboctave/CDiagMatrix.h
+++ b/liboctave/CDiagMatrix.h
@@ -52,7 +52,7 @@
   explicit ComplexDiagMatrix (const Array<double>& a)
     : MDiagArray2<Complex> (Array<Complex> (a)) { }
 
-  ComplexDiagMatrix (const Array<Complex>& a, octave_idx_type r, octave_idx_type c) 
+  ComplexDiagMatrix (const Array<Complex>& a, octave_idx_type r, octave_idx_type c)
     : MDiagArray2<Complex> (a, r, c) { }
 
   explicit ComplexDiagMatrix (const DiagMatrix& a);
@@ -64,7 +64,7 @@
     : MDiagArray2<Complex> (a) { }
 
   template <class U>
-  ComplexDiagMatrix (const DiagArray2<U>& a) 
+  ComplexDiagMatrix (const DiagArray2<U>& a)
     : MDiagArray2<Complex> (a) { }
 
   ComplexDiagMatrix& operator = (const ComplexDiagMatrix& a)
@@ -91,7 +91,7 @@
 
   ComplexDiagMatrix hermitian (void) const { return MDiagArray2<Complex>::hermitian (std::conj); }
   ComplexDiagMatrix transpose (void) const { return MDiagArray2<Complex>::transpose(); }
-  DiagMatrix abs (void) const; 
+  DiagMatrix abs (void) const;
 
   friend OCTAVE_API ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
 

--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -123,7 +123,7 @@
   F77_RET_T
   F77_FUNC (zsyrk, ZSYRK) (F77_CONST_CHAR_ARG_DECL,
                            F77_CONST_CHAR_ARG_DECL,
-                           const octave_idx_type&, const octave_idx_type&, 
+                           const octave_idx_type&, const octave_idx_type&,
                            const Complex&, const Complex*,
                            const octave_idx_type&, const Complex&,
                            Complex*, const octave_idx_type&
@@ -133,7 +133,7 @@
   F77_RET_T
   F77_FUNC (zherk, ZHERK) (F77_CONST_CHAR_ARG_DECL,
                            F77_CONST_CHAR_ARG_DECL,
-                           const octave_idx_type&, const octave_idx_type&, 
+                           const octave_idx_type&, const octave_idx_type&,
                            const double&, const Complex*,
                            const octave_idx_type&, const double&, Complex*,
                            const octave_idx_type&
@@ -161,8 +161,8 @@
 
   F77_RET_T
   F77_FUNC (zgecon, ZGECON) (F77_CONST_CHAR_ARG_DECL,
-                             const octave_idx_type&, Complex*, 
-                             const octave_idx_type&, const double&, double&, 
+                             const octave_idx_type&, Complex*,
+                             const octave_idx_type&, const double&, double&,
                              Complex*, double*, octave_idx_type&
                              F77_CHAR_ARG_LEN_DECL);
 
@@ -181,7 +181,7 @@
                              const octave_idx_type&, Complex*,
                              const octave_idx_type&, double*, double&,
                              octave_idx_type&, Complex*,
-                             const octave_idx_type&, double*, 
+                             const octave_idx_type&, double*,
                              octave_idx_type*, octave_idx_type&);
 
   F77_RET_T
@@ -200,25 +200,25 @@
   F77_RET_T
   F77_FUNC (zpotrs, ZPOTRS) (F77_CONST_CHAR_ARG_DECL,
                              const octave_idx_type&, const octave_idx_type&,
-                             const Complex*, const octave_idx_type&, Complex*, 
+                             const Complex*, const octave_idx_type&, Complex*,
                              const octave_idx_type&, octave_idx_type&
                              F77_CHAR_ARG_LEN_DECL);
 
   F77_RET_T
   F77_FUNC (ztrtri, ZTRTRI) (F77_CONST_CHAR_ARG_DECL,
-                             F77_CONST_CHAR_ARG_DECL, 
-                             const octave_idx_type&, const Complex*, 
-                             const octave_idx_type&, octave_idx_type& 
+                             F77_CONST_CHAR_ARG_DECL,
+                             const octave_idx_type&, const Complex*,
+                             const octave_idx_type&, octave_idx_type&
                              F77_CHAR_ARG_LEN_DECL
                              F77_CHAR_ARG_LEN_DECL);
 
   F77_RET_T
   F77_FUNC (ztrcon, ZTRCON) (F77_CONST_CHAR_ARG_DECL,
-                             F77_CONST_CHAR_ARG_DECL, 
+                             F77_CONST_CHAR_ARG_DECL,
                              F77_CONST_CHAR_ARG_DECL,
                              const octave_idx_type&, const Complex*,
                              const octave_idx_type&, double&,
-                             Complex*, double*, octave_idx_type& 
+                             Complex*, double*, octave_idx_type&
                              F77_CHAR_ARG_LEN_DECL
                              F77_CHAR_ARG_LEN_DECL
                              F77_CHAR_ARG_LEN_DECL);
@@ -228,7 +228,7 @@
                              F77_CONST_CHAR_ARG_DECL,
                              F77_CONST_CHAR_ARG_DECL,
                              const octave_idx_type&, const octave_idx_type&,
-                             const Complex*, const octave_idx_type&, Complex*, 
+                             const Complex*, const octave_idx_type&, Complex*,
                              const octave_idx_type&, octave_idx_type&
                              F77_CHAR_ARG_LEN_DECL
                              F77_CHAR_ARG_LEN_DECL
@@ -1016,15 +1016,15 @@
 
       F77_XFCN (ztrtri, ZTRTRI, (F77_CONST_CHAR_ARG2 (&uplo, 1),
                                  F77_CONST_CHAR_ARG2 (&udiag, 1),
-                                 nr, tmp_data, nr, info 
+                                 nr, tmp_data, nr, info
                                  F77_CHAR_ARG_LEN (1)
                                  F77_CHAR_ARG_LEN (1)));
 
       // Throw-away extra info LAPACK gives so as to not change output.
       rcon = 0.0;
-      if (info != 0) 
+      if (info != 0)
         info = -1;
-      else if (calc_cond) 
+      else if (calc_cond)
         {
           octave_idx_type ztrcon_info = 0;
           char job = '1';
@@ -1035,13 +1035,13 @@
           F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&job, 1),
                                      F77_CONST_CHAR_ARG2 (&uplo, 1),
                                      F77_CONST_CHAR_ARG2 (&udiag, 1),
-                                     nr, tmp_data, nr, rcon, 
-                                     cwork, rwork, ztrcon_info 
+                                     nr, tmp_data, nr, rcon,
+                                     cwork, rwork, ztrcon_info
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)));
 
-          if (ztrcon_info != 0) 
+          if (ztrcon_info != 0)
             info = -1;
         }
 
@@ -1076,7 +1076,7 @@
 
       // Query the optimum work array size.
 
-      F77_XFCN (zgetri, ZGETRI, (nc, tmp_data, nr, pipvt, 
+      F77_XFCN (zgetri, ZGETRI, (nc, tmp_data, nr, pipvt,
                                  z.fortran_vec (), lwork, info));
 
       lwork = static_cast<octave_idx_type> (std::real(z(0)));
@@ -1095,9 +1095,9 @@
 
       // Throw-away extra info LAPACK gives so as to not change output.
       rcon = 0.0;
-      if (info != 0) 
+      if (info != 0)
         info = -1;
-      else if (calc_cond) 
+      else if (calc_cond)
         {
           // Now calculate the condition number for non-singular matrix.
           octave_idx_type zgecon_info = 0;
@@ -1105,11 +1105,11 @@
           Array<double> rz (dim_vector (2 * nc, 1));
           double *prz = rz.fortran_vec ();
           F77_XFCN (zgecon, ZGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
-                                     nc, tmp_data, nr, anorm, 
+                                     nc, tmp_data, nr, anorm,
                                      rcon, pz, prz, zgecon_info
                                      F77_CHAR_ARG_LEN (1)));
 
-          if (zgecon_info != 0) 
+          if (zgecon_info != 0)
             info = -1;
         }
 
@@ -1122,14 +1122,14 @@
           F77_XFCN (zgetri, ZGETRI, (nc, tmp_data, nr, pipvt,
                                      pz, lwork, zgetri_info));
 
-          if (zgetri_info != 0) 
+          if (zgetri_info != 0)
             info = -1;
         }
 
       if (info != 0)
         mattype.mark_as_rectangular();
     }
-  
+
   return retval;
 }
 
@@ -1239,7 +1239,7 @@
   const Complex *in (data ());
   Complex *out (retval.fortran_vec ());
 
-  octave_fftw::fft (in, out, npts, nsamples); 
+  octave_fftw::fft (in, out, npts, nsamples);
 
   return retval;
 }
@@ -1268,7 +1268,7 @@
   const Complex *in (data ());
   Complex *out (retval.fortran_vec ());
 
-  octave_fftw::ifft (in, out, npts, nsamples); 
+  octave_fftw::ifft (in, out, npts, nsamples);
 
   return retval;
 }
@@ -1591,7 +1591,7 @@
 
       if (typ == MatrixType::Lower || typ == MatrixType::Upper)
         {
-          for (octave_idx_type i = 0; i < nc; i++) 
+          for (octave_idx_type i = 0; i < nc; i++)
             retval *= elem (i,i);
         }
       else if (typ == MatrixType::Hermitian)
@@ -1605,17 +1605,17 @@
 
 
           char job = 'L';
-          F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, 
+          F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
                                      tmp_data, nr, info
                                      F77_CHAR_ARG_LEN (1)));
 
-          if (info != 0) 
+          if (info != 0)
             {
               rcon = 0.0;
               mattype.mark_as_unsymmetric ();
               typ = MatrixType::Full;
             }
-          else 
+          else
             {
               Array<Complex> z (dim_vector (2 * nc, 1));
               Complex *pz = z.fortran_vec ();
@@ -1627,10 +1627,10 @@
                                          rcon, pz, prz, info
                                          F77_CHAR_ARG_LEN (1)));
 
-              if (info != 0) 
+              if (info != 0)
                 rcon = 0.0;
 
-              for (octave_idx_type i = 0; i < nc; i++) 
+              for (octave_idx_type i = 0; i < nc; i++)
                 retval *= atmp (i,i);
 
               retval = retval.square ();
@@ -1657,14 +1657,14 @@
 
           // Throw-away extra info LAPACK gives so as to not change output.
           rcon = 0.0;
-          if (info != 0) 
+          if (info != 0)
             {
               info = -1;
               retval = ComplexDET ();
-            } 
-          else 
+            }
+          else
             {
-              if (calc_cond) 
+              if (calc_cond)
                 {
                   // Now calc the condition number for non-singular matrix.
                   char job = '1';
@@ -1674,19 +1674,19 @@
                   double *prz = rz.fortran_vec ();
 
                   F77_XFCN (zgecon, ZGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
-                                             nc, tmp_data, nr, anorm, 
+                                             nc, tmp_data, nr, anorm,
                                              rcon, pz, prz, info
                                              F77_CHAR_ARG_LEN (1)));
                 }
 
-              if (info != 0) 
+              if (info != 0)
                 {
                   info = -1;
                   retval = ComplexDET ();
-                } 
-              else 
+                }
+              else
                 {
-                  for (octave_idx_type i = 0; i < nc; i++) 
+                  for (octave_idx_type i = 0; i < nc; i++)
                     {
                       Complex c = atmp(i,i);
                       retval *= (ipvt(i) != (i+1)) ? -c : c;
@@ -1738,16 +1738,16 @@
           Array<double> rz (dim_vector (nc, 1));
           double *prz = rz.fortran_vec ();
 
-          F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1), 
-                                     F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                     F77_CONST_CHAR_ARG2 (&dia, 1), 
+          F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
+                                     F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                     F77_CONST_CHAR_ARG2 (&dia, 1),
                                      nr, tmp_data, nr, rcon,
                                      pz, prz, info
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)));
 
-          if (info != 0) 
+          if (info != 0)
             rcon = 0;
         }
       else if  (typ == MatrixType::Permuted_Upper)
@@ -1766,16 +1766,16 @@
           Array<double> rz (dim_vector (nc, 1));
           double *prz = rz.fortran_vec ();
 
-          F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1), 
-                                     F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                     F77_CONST_CHAR_ARG2 (&dia, 1), 
+          F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
+                                     F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                     F77_CONST_CHAR_ARG2 (&dia, 1),
                                      nr, tmp_data, nr, rcon,
                                      pz, prz, info
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)
                                      F77_CHAR_ARG_LEN (1)));
 
-          if (info != 0) 
+          if (info != 0)
             rcon = 0.0;
         }
       else if (typ == MatrixType::Permuted_Lower)
@@ -1794,18 +1794,18 @@
               anorm = atmp.abs().sum().
                 row(static_cast<octave_idx_type>(0)).max();
 
-              F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, 
+              F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
                                          tmp_data, nr, info
                                          F77_CHAR_ARG_LEN (1)));
 
-              if (info != 0) 
+              if (info != 0)
                 {
                   rcon = 0.0;
 
                   mattype.mark_as_unsymmetric ();
                   typ = MatrixType::Full;
                 }
-              else 
+              else
                 {
                   Array<Complex> z (dim_vector (2 * nc, 1));
                   Complex *pz = z.fortran_vec ();
@@ -1817,7 +1817,7 @@
                                              rcon, pz, prz, info
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     rcon = 0.0;
                 }
             }
@@ -1841,20 +1841,20 @@
 
               F77_XFCN (zgetrf, ZGETRF, (nr, nr, tmp_data, nr, pipvt, info));
 
-              if (info != 0) 
-                { 
+              if (info != 0)
+                {
                   rcon = 0.0;
                   mattype.mark_as_rectangular ();
-                } 
-              else 
+                }
+              else
                 {
                   char job = '1';
                   F77_XFCN (zgecon, ZGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
-                                             nc, tmp_data, nr, anorm, 
+                                             nc, tmp_data, nr, anorm,
                                              rcon, pz, prz, info
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     rcon = 0.0;
                 }
             }
@@ -1867,8 +1867,8 @@
 }
 
 ComplexMatrix
-ComplexMatrix::utsolve (MatrixType &mattype, const ComplexMatrix& b, 
-                        octave_idx_type& info, double& rcon, 
+ComplexMatrix::utsolve (MatrixType &mattype, const ComplexMatrix& b,
+                        octave_idx_type& info, double& rcon,
                         solve_singularity_handler sing_handler,
                         bool calc_cond, blas_trans_type transt) const
 {
@@ -1913,16 +1913,16 @@
                   Array<double> rz (dim_vector (nc, 1));
                   double *prz = rz.fortran_vec ();
 
-                  F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1), 
-                                             F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                             F77_CONST_CHAR_ARG2 (&dia, 1), 
+                  F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
+                                             F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                             F77_CONST_CHAR_ARG2 (&dia, 1),
                                              nr, tmp_data, nr, rcon,
                                              pz, prz, info
                                              F77_CHAR_ARG_LEN (1)
                                              F77_CHAR_ARG_LEN (1)
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     info = -2;
 
                   volatile double rcond_plus_one = rcon + 1.0;
@@ -1949,9 +1949,9 @@
                   char trans = get_blas_char (transt);
                   char dia = 'N';
 
-                  F77_XFCN (ztrtrs, ZTRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                             F77_CONST_CHAR_ARG2 (&trans, 1), 
-                                             F77_CONST_CHAR_ARG2 (&dia, 1), 
+                  F77_XFCN (ztrtrs, ZTRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                             F77_CONST_CHAR_ARG2 (&trans, 1),
+                                             F77_CONST_CHAR_ARG2 (&dia, 1),
                                              nr, b_nc, tmp_data, nr,
                                              result, nr, info
                                              F77_CHAR_ARG_LEN (1)
@@ -1968,8 +1968,8 @@
 }
 
 ComplexMatrix
-ComplexMatrix::ltsolve (MatrixType &mattype, const ComplexMatrix& b, 
-                        octave_idx_type& info, double& rcon, 
+ComplexMatrix::ltsolve (MatrixType &mattype, const ComplexMatrix& b,
+                        octave_idx_type& info, double& rcon,
                         solve_singularity_handler sing_handler,
                         bool calc_cond, blas_trans_type transt) const
 {
@@ -2014,16 +2014,16 @@
                   Array<double> rz (dim_vector (nc, 1));
                   double *prz = rz.fortran_vec ();
 
-                  F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1), 
-                                             F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                             F77_CONST_CHAR_ARG2 (&dia, 1), 
+                  F77_XFCN (ztrcon, ZTRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
+                                             F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                             F77_CONST_CHAR_ARG2 (&dia, 1),
                                              nr, tmp_data, nr, rcon,
                                              pz, prz, info
                                              F77_CHAR_ARG_LEN (1)
                                              F77_CHAR_ARG_LEN (1)
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     info = -2;
 
                   volatile double rcond_plus_one = rcon + 1.0;
@@ -2050,9 +2050,9 @@
                   char trans = get_blas_char (transt);
                   char dia = 'N';
 
-                  F77_XFCN (ztrtrs, ZTRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1), 
-                                             F77_CONST_CHAR_ARG2 (&trans, 1), 
-                                             F77_CONST_CHAR_ARG2 (&dia, 1), 
+                  F77_XFCN (ztrtrs, ZTRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1),
+                                             F77_CONST_CHAR_ARG2 (&trans, 1),
+                                             F77_CONST_CHAR_ARG2 (&dia, 1),
                                              nr, b_nc, tmp_data, nr,
                                              result, nr, info
                                              F77_CHAR_ARG_LEN (1)
@@ -2069,7 +2069,7 @@
 }
 
 ComplexMatrix
-ComplexMatrix::fsolve (MatrixType &mattype, const ComplexMatrix& b, 
+ComplexMatrix::fsolve (MatrixType &mattype, const ComplexMatrix& b,
                        octave_idx_type& info, double& rcon,
                        solve_singularity_handler sing_handler,
                        bool calc_cond) const
@@ -2088,7 +2088,7 @@
   else
     {
       volatile int typ = mattype.type ();
- 
+
      // Calculate the norm of the matrix, for later use.
       double anorm = -1.;
 
@@ -2100,20 +2100,20 @@
           Complex *tmp_data = atmp.fortran_vec ();
           anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
 
-          F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, 
+          F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
                                      tmp_data, nr, info
                                      F77_CHAR_ARG_LEN (1)));
 
           // Throw-away extra info LAPACK gives so as to not change output.
           rcon = 0.0;
-          if (info != 0) 
+          if (info != 0)
             {
               info = -2;
 
               mattype.mark_as_unsymmetric ();
               typ = MatrixType::Full;
             }
-          else 
+          else
             {
               if (calc_cond)
                 {
@@ -2127,7 +2127,7 @@
                                              rcon, pz, prz, info
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     info = -2;
 
                   volatile double rcond_plus_one = rcon + 1.0;
@@ -2188,8 +2188,8 @@
 
           // Throw-away extra info LAPACK gives so as to not change output.
           rcon = 0.0;
-          if (info != 0) 
-            { 
+          if (info != 0)
+            {
               info = -2;
 
               if (sing_handler)
@@ -2199,20 +2199,20 @@
                   ("matrix singular to machine precision");
 
               mattype.mark_as_rectangular ();
-            } 
-          else 
+            }
+          else
             {
               if (calc_cond)
                 {
-                  // Now calculate the condition number for 
+                  // Now calculate the condition number for
                   // non-singular matrix.
                   char job = '1';
                   F77_XFCN (zgecon, ZGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
-                                             nc, tmp_data, nr, anorm, 
+                                             nc, tmp_data, nr, anorm,
                                              rcon, pz, prz, info
                                              F77_CHAR_ARG_LEN (1)));
 
-                  if (info != 0) 
+                  if (info != 0)
                     info = -2;
 
                   volatile double rcond_plus_one = rcon + 1.0;
@@ -2241,14 +2241,14 @@
                   F77_XFCN (zgetrs, ZGETRS, (F77_CONST_CHAR_ARG2 (&job, 1),
                                              nr, b_nc, tmp_data, nr,
                                              pipvt, result, b.rows(), info
-                                             F77_CHAR_ARG_LEN (1))); 
+                                             F77_CHAR_ARG_LEN (1)));
                 }
               else
-                mattype.mark_as_rectangular ();             
+                mattype.mark_as_rectangular ();
             }
         }
     }
-  
+
   return retval;
 }
 
@@ -2261,7 +2261,7 @@
 }
 
 ComplexMatrix
-ComplexMatrix::solve (MatrixType &typ, const Matrix& b, 
+ComplexMatrix::solve (MatrixType &typ, const Matrix& b,
                       octave_idx_type& info) const
 {
   double rcon;
@@ -2276,7 +2276,7 @@
 }
 
 ComplexMatrix
-ComplexMatrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, 
+ComplexMatrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info,
                       double& rcon, solve_singularity_handler sing_handler,
                       bool singular_fallback, blas_trans_type transt) const
 {
@@ -2293,7 +2293,7 @@
 }
 
 ComplexMatrix
-ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b, 
+ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b,
                       octave_idx_type& info) const
 {
   double rcon;
@@ -2301,14 +2301,14 @@
 }
 
 ComplexMatrix
-ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b, 
+ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b,
                       octave_idx_type& info, double& rcon) const
 {
   return solve (typ, b, info, rcon, 0);
 }
 
 ComplexMatrix
-ComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, 
+ComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b,
                       octave_idx_type& info, double& rcon,
                       solve_singularity_handler sing_handler,
                       bool singular_fallback, blas_trans_type transt) const
@@ -2355,7 +2355,7 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, 
+ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b,
                       octave_idx_type& info) const
 {
   double rcon;
@@ -2363,14 +2363,14 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, 
+ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b,
                       octave_idx_type& info, double& rcon) const
 {
   return solve (typ, ComplexColumnVector (b), info, rcon, 0);
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, 
+ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b,
                       octave_idx_type& info, double& rcon,
                       solve_singularity_handler sing_handler, blas_trans_type transt) const
 {
@@ -2386,7 +2386,7 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b, 
+ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b,
                       octave_idx_type& info) const
 {
   double rcon;
@@ -2485,15 +2485,15 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (const ColumnVector& b, octave_idx_type& info, 
+ComplexMatrix::solve (const ColumnVector& b, octave_idx_type& info,
                       double& rcon) const
 {
   return solve (ComplexColumnVector (b), info, rcon, 0);
 }
 
 ComplexColumnVector
-ComplexMatrix::solve (const ColumnVector& b, octave_idx_type& info, 
-                      double& rcon, 
+ComplexMatrix::solve (const ColumnVector& b, octave_idx_type& info,
+                      double& rcon,
                       solve_singularity_handler sing_handler, blas_trans_type transt) const
 {
   return solve (ComplexColumnVector (b), info, rcon, sing_handler, transt);
@@ -2588,7 +2588,7 @@
 }
 
 ComplexMatrix
-ComplexMatrix::lssolve (const ComplexMatrix& b, octave_idx_type& info, 
+ComplexMatrix::lssolve (const ComplexMatrix& b, octave_idx_type& info,
                         octave_idx_type& rank, double& rcon) const
 {
   ComplexMatrix retval;
@@ -2713,7 +2713,7 @@
 
       F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, tmp_data, m, pretval,
                                  maxmn, ps, rcon, rank,
-                                 work.fortran_vec (), lwork, 
+                                 work.fortran_vec (), lwork,
                                  prwork, piwork, info));
 
       if (s.elem (0) == 0.0)
@@ -2745,7 +2745,7 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::lssolve (const ColumnVector& b, octave_idx_type& info, 
+ComplexMatrix::lssolve (const ColumnVector& b, octave_idx_type& info,
                         octave_idx_type& rank) const
 {
   double rcon;
@@ -2753,7 +2753,7 @@
 }
 
 ComplexColumnVector
-ComplexMatrix::lssolve (const ColumnVector& b, octave_idx_type& info, 
+ComplexMatrix::lssolve (const ColumnVector& b, octave_idx_type& info,
                         octave_idx_type& rank, double& rcon) const
 {
   return lssolve (ComplexColumnVector (b), info, rank, rcon);
@@ -2874,7 +2874,7 @@
 
       F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, tmp_data, m, pretval,
                                  maxmn, ps, rcon, rank,
-                                 work.fortran_vec (), lwork, 
+                                 work.fortran_vec (), lwork,
                                  prwork, piwork, info));
 
       if (rank < minmn)
@@ -3103,7 +3103,7 @@
 
 // Return nonzero if any element of CM has a non-integer real or
 // imaginary part.  Also extract the largest and smallest (real or
-// imaginary) values and return them in MAX_VAL and MIN_VAL. 
+// imaginary) values and return them in MAX_VAL and MIN_VAL.
 
 bool
 ComplexMatrix::all_integers (double& max_val, double& min_val) const
@@ -3253,7 +3253,7 @@
         }
     }
 
-  return retval;              
+  return retval;
 }
 
 bool
@@ -3272,7 +3272,7 @@
         }
     }
 
-  return retval;              
+  return retval;
 }
 
 ComplexColumnVector
@@ -3618,7 +3618,7 @@
 {
   double cc;
   Complex cs, temp_r;
- 
+
   F77_FUNC (zlartg, ZLARTG) (x, y, cc, cs, temp_r);
 
   ComplexMatrix g (2, 2);
@@ -3644,7 +3644,7 @@
 
   ComplexSCHUR as (a, "U");
   ComplexSCHUR bs (b, "U");
-  
+
   // Transform c to new coordinates.
 
   ComplexMatrix ua = as.unitary_matrix ();
@@ -3652,7 +3652,7 @@
 
   ComplexMatrix ub = bs.unitary_matrix ();
   ComplexMatrix sch_b = bs.schur_matrix ();
-  
+
   ComplexMatrix cx = ua.hermitian () * c * ub;
 
   // Solve the sylvester equation, back-transform, and return the
@@ -3667,7 +3667,7 @@
   Complex *pa = sch_a.fortran_vec ();
   Complex *pb = sch_b.fortran_vec ();
   Complex *px = cx.fortran_vec ();
-  
+
   F77_XFCN (ztrsyl, ZTRSYL, (F77_CONST_CHAR_ARG2 ("N", 1),
                              F77_CONST_CHAR_ARG2 ("N", 1),
                              1, a_nr, b_nr, pa, a_nr, pb,
@@ -3730,7 +3730,7 @@
 // the general GEMM operation
 
 ComplexMatrix
-xgemm (const ComplexMatrix& a, const ComplexMatrix& b, 
+xgemm (const ComplexMatrix& a, const ComplexMatrix& b,
        blas_trans_type transa, blas_trans_type transb)
 {
   ComplexMatrix retval;
@@ -4030,8 +4030,8 @@
   return result;
 }
 
-ComplexMatrix linspace (const ComplexColumnVector& x1, 
-                        const ComplexColumnVector& x2, 
+ComplexMatrix linspace (const ComplexColumnVector& x1,
+                        const ComplexColumnVector& x2,
                         octave_idx_type n)
 
 {
@@ -4049,7 +4049,7 @@
     retval(i, 0) = x1(i);
 
   // The last column is not needed while using delta.
-  Complex *delta = &retval(0, n-1); 
+  Complex *delta = &retval(0, n-1);
   for (octave_idx_type i = 0; i < m; i++)
     delta[i] = (x2(i) - x1(i)) / (n - 1.0);