--- a/src/ov-bool-mat.cc
+++ b/src/ov-bool-mat.cc
@@ -54,7 +54,7 @@
 DEFINE_OCTAVE_ALLOCATOR (octave_bool_matrix);
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool_matrix,
-				     "bool matrix", "logical");
+                                     "bool matrix", "logical");
 
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
@@ -84,7 +84,7 @@
       octave_idx_type nc = bm.cols ();
 
       if (nr == 1 && nc == 1)
-	retval = new octave_bool (bm (0, 0));
+        retval = new octave_bool (bm (0, 0));
     }
 
   return retval;
@@ -98,7 +98,7 @@
   if (rows () > 0 && columns () > 0)
     {
       gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "bool matrix", "real scalar");
+                                 "bool matrix", "real scalar");
 
       retval = matrix (0, 0);
     }
@@ -116,7 +116,7 @@
   if (rows () > 0 && columns () > 0)
     {
       gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "bool matrix", "real scalar");
+                                 "bool matrix", "real scalar");
 
       retval = matrix (0, 0);
     }
@@ -136,7 +136,7 @@
   if (rows () > 0 && columns () > 0)
     {
       gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "bool matrix", "complex scalar");
+                                 "bool matrix", "complex scalar");
 
       retval = matrix (0, 0);
     }
@@ -156,7 +156,7 @@
   if (rows () > 0 && columns () > 0)
     {
       gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "bool matrix", "complex scalar");
+                                 "bool matrix", "complex scalar");
 
       retval = matrix (0, 0);
     }
@@ -168,7 +168,7 @@
 
 octave_value
 octave_bool_matrix::convert_to_str_internal (bool pad, bool force,
-					     char type) const
+                                             char type) const
 {
   octave_value tmp = octave_value (array_value ());
   return tmp.convert_to_str (pad, force, type);
@@ -176,10 +176,10 @@
 
 void
 octave_bool_matrix::print_raw (std::ostream& os,
-			       bool pr_as_read_syntax) const
+                               bool pr_as_read_syntax) const
 {
   octave_print_internal (os, matrix, pr_as_read_syntax,
-			 current_print_indent_level ());
+                         current_print_indent_level ());
 }
 
 bool 
@@ -192,7 +192,7 @@
       os << "# ndims: " << d.length () << "\n";
 
       for (int i = 0; i < d.length (); i++)
-	os << " " << d (i);
+        os << " " << d (i);
 
       os << "\n" << tmp;
     }
@@ -201,7 +201,7 @@
       // Keep this case, rather than use generic code above for backward 
       // compatiability. Makes load_ascii much more complex!!
       os << "# rows: " << rows () << "\n"
-	 << "# columns: " << columns () << "\n";
+         << "# columns: " << columns () << "\n";
 
       Matrix tmp = matrix_value ();
 
@@ -227,93 +227,93 @@
   if (extract_keyword (is, keywords, kw, val, true))
     {
       if (kw == "ndims")
-	{
-	  int mdims = static_cast<int> (val);
+        {
+          int mdims = static_cast<int> (val);
 
-	  if (mdims >= 0)
-	    {
-	      dim_vector dv;
-	      dv.resize (mdims);
+          if (mdims >= 0)
+            {
+              dim_vector dv;
+              dv.resize (mdims);
 
-	      for (int i = 0; i < mdims; i++)
-		is >> dv(i);
+              for (int i = 0; i < mdims; i++)
+                is >> dv(i);
 
-	      if (is)
-		{
-		  boolNDArray btmp (dv);
+              if (is)
+                {
+                  boolNDArray btmp (dv);
 
-		  if (btmp.is_empty ())
-		    matrix = btmp;
-		  else
-		    {
-		      NDArray tmp(dv);
-		      is >> tmp;
+                  if (btmp.is_empty ())
+                    matrix = btmp;
+                  else
+                    {
+                      NDArray tmp(dv);
+                      is >> tmp;
 
-		      if (is)
-			{
-			  for (octave_idx_type i = 0; i < btmp.nelem (); i++)
-			    btmp.elem (i) = (tmp.elem (i) != 0.);
+                      if (is)
+                        {
+                          for (octave_idx_type i = 0; i < btmp.nelem (); i++)
+                            btmp.elem (i) = (tmp.elem (i) != 0.);
 
-			  matrix = btmp;
-			}
-		      else
-			{
-			  error ("load: failed to load matrix constant");
-			  success = false;
-			}
-		    }
-		}
-	      else
-		{
-		  error ("load: failed to extract dimensions");
-		  success = false;
-		}
-	    }
-	  else
-	    {
-	      error ("load: failed to extract number of dimensions");
-	      success = false;
-	    }
-	}
+                          matrix = btmp;
+                        }
+                      else
+                        {
+                          error ("load: failed to load matrix constant");
+                          success = false;
+                        }
+                    }
+                }
+              else
+                {
+                  error ("load: failed to extract dimensions");
+                  success = false;
+                }
+            }
+          else
+            {
+              error ("load: failed to extract number of dimensions");
+              success = false;
+            }
+        }
       else if (kw == "rows")
-	{
-	  octave_idx_type nr = val;
-	  octave_idx_type nc = 0;
+        {
+          octave_idx_type nr = val;
+          octave_idx_type nc = 0;
 
-	  if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
-	    {
-	      if (nr > 0 && nc > 0)
-		{
-		  Matrix tmp (nr, nc);
-		  is >> tmp;
-		  if (is) 
-		    {
-		      boolMatrix btmp (nr, nc);
-		      for (octave_idx_type j = 0; j < nc; j++)
-			for (octave_idx_type i = 0; i < nr; i++)
-			  btmp.elem (i,j) = (tmp.elem (i, j) != 0.);
+          if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
+            {
+              if (nr > 0 && nc > 0)
+                {
+                  Matrix tmp (nr, nc);
+                  is >> tmp;
+                  if (is) 
+                    {
+                      boolMatrix btmp (nr, nc);
+                      for (octave_idx_type j = 0; j < nc; j++)
+                        for (octave_idx_type i = 0; i < nr; i++)
+                          btmp.elem (i,j) = (tmp.elem (i, j) != 0.);
 
-		      matrix = btmp;
-		    }
-		  else
-		    {
-		      error ("load: failed to load matrix constant");
-		      success = false;
-		    }
-		}
-	      else if (nr == 0 || nc == 0)
-		matrix = boolMatrix (nr, nc);
-	      else
-		panic_impossible ();
-	    }
-	  else
-	    {
-	      error ("load: failed to extract number of rows and columns");
-	      success = false;
-	    }
-	}
+                      matrix = btmp;
+                    }
+                  else
+                    {
+                      error ("load: failed to load matrix constant");
+                      success = false;
+                    }
+                }
+              else if (nr == 0 || nc == 0)
+                matrix = boolMatrix (nr, nc);
+              else
+                panic_impossible ();
+            }
+          else
+            {
+              error ("load: failed to extract number of rows and columns");
+              success = false;
+            }
+        }
       else
-	panic_impossible ();
+        panic_impossible ();
     }
   else
     {
@@ -356,7 +356,7 @@
 
 bool 
 octave_bool_matrix::load_binary (std::istream& is, bool swap,
-				 oct_mach_info::float_format /* fmt */)
+                                 oct_mach_info::float_format /* fmt */)
 {
   int32_t mdims;
   if (! is.read (reinterpret_cast<char *> (&mdims), 4))
@@ -377,9 +377,9 @@
   for (int i = 0; i < mdims; i++)
     {
       if (! is.read (reinterpret_cast<char *> (&di), 4))
-	return false;
+        return false;
       if (swap)
-	swap_bytes<4> (&di);
+        swap_bytes<4> (&di);
       dv(i) = di;
     }
   
@@ -412,7 +412,7 @@
 
 bool
 octave_bool_matrix::save_hdf5 (hid_t loc_id, const char *name,
-			       bool /* save_as_floats */)
+                               bool /* save_as_floats */)
 {
   dim_vector dv = dims ();
   int empty = save_hdf5_empty (loc_id, name, dv);
@@ -434,10 +434,10 @@
   if (space_hid < 0) return false;
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid, 
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid, 
-			H5P_DEFAULT);
+                        H5P_DEFAULT);
 #endif
   if (data_hid < 0)
     {
@@ -453,7 +453,7 @@
     htmp[i] = mtmp[i];
 
   retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL,
-		     H5P_DEFAULT, htmp) >= 0;
+                     H5P_DEFAULT, htmp) >= 0;
 
   H5Dclose (data_hid);
   H5Sclose (space_hid);
@@ -504,7 +504,7 @@
     {
       dv.resize (rank);
       for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
-	dv(j) = hdims[i];
+        dv(j) = hdims[i];
     }
 
   octave_idx_type nel = dv.numel ();
@@ -515,7 +515,7 @@
 
       boolNDArray btmp (dv);
       for (octave_idx_type i = 0; i < nel; i++)
-	  btmp.elem (i) = htmp[i];
+          btmp.elem (i) = htmp[i];
 
       matrix = btmp;
     }