--- a/src/ov-base-int.cc	Thu Feb 11 12:23:32 2010 -0500
+++ b/src/ov-base-int.cc	Thu Feb 11 12:41:46 2010 -0500
@@ -153,23 +153,23 @@
 
       static const bool is_signed = std::numeric_limits<val_type>::is_signed;
       static const bool can_be_larger_than_uchar_max
-	= octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
+        = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
 
       if (octave_base_int_helper<val_type, is_signed,
-	  can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
-	{
-	  // FIXME -- is there something better we could do?
+          can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
+        {
+          // FIXME -- is there something better we could do?
 
-	  ival = 0;
+          ival = 0;
 
-	  if (! warned)
-	    {
-	      ::warning ("range error for conversion to character value");
-	      warned = true;
-	    }
-	}
+          if (! warned)
+            {
+              ::warning ("range error for conversion to character value");
+              warned = true;
+            }
+        }
       else
-	chm (i) = static_cast<char> (ival);
+        chm (i) = static_cast<char> (ival);
     }
 
   retval = octave_value (chm, type);
@@ -203,30 +203,30 @@
   if (extract_keyword (is, "ndims", mdims, true))
     {
       if (mdims >= 0)
-	{
-	  dim_vector dv;
-	  dv.resize (mdims);
+        {
+          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);
 
-	  T tmp(dv);
+          T tmp(dv);
 
-	  is >> tmp;
+          is >> tmp;
 
-	  if (!is) 
-	    {
-	      error ("load: failed to load matrix constant");
-	      success = false;
-	    }
+          if (!is) 
+            {
+              error ("load: failed to load matrix constant");
+              success = false;
+            }
 
-	  this->matrix = tmp;
-	}
+          this->matrix = tmp;
+        }
       else
-	{
-	  error ("load: failed to extract number of rows and columns");
-	  success = false;
-	}
+        {
+          error ("load: failed to extract number of rows and columns");
+          success = false;
+        }
     }
   else
     error ("load: failed to extract number of dimensions");
@@ -259,7 +259,7 @@
 template <class T>
 bool
 octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap,
-					oct_mach_info::float_format )
+                                        oct_mach_info::float_format )
 {
   int32_t mdims;
   if (! is.read (reinterpret_cast<char *> (&mdims), 4))
@@ -277,9 +277,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;
     }
 
@@ -305,21 +305,21 @@
       int nel = dv.numel ();
       int bytes = nel / m.byte_size();
       for (int i = 0; i < nel; i++) 
-	switch (bytes)
-	  {
-	  case 8:
-	    swap_bytes<8> (&m(i));
-	    break;
-	  case 4:
-	    swap_bytes<4> (&m(i));
-	    break;
-	  case 2:
-	    swap_bytes<2> (&m(i));
-	    break;
-	  case 1:
-	  default:
-	    break;
-	  }
+        switch (bytes)
+          {
+          case 8:
+            swap_bytes<8> (&m(i));
+            break;
+          case 4:
+            swap_bytes<4> (&m(i));
+            break;
+          case 2:
+            swap_bytes<2> (&m(i));
+            break;
+          case 1:
+          default:
+            break;
+          }
     }
 
   this->matrix = m;
@@ -352,10 +352,10 @@
   if (space_hid < 0) return false;
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 
-			H5P_DEFAULT);
+                        H5P_DEFAULT);
 #endif
   if (data_hid < 0)
     {
@@ -364,7 +364,7 @@
     }
 
   retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL,
-		     H5P_DEFAULT, this->matrix.data()) >= 0;
+                     H5P_DEFAULT, this->matrix.data()) >= 0;
 
   H5Dclose (data_hid);
   H5Sclose (space_hid);
@@ -417,12 +417,12 @@
     {
       dv.resize (rank);
       for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
-	dv(j) = hdims[i];
+        dv(j) = hdims[i];
     }
 
   T m (dv);
   if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, 
-	       H5P_DEFAULT, m.fortran_vec()) >= 0) 
+               H5P_DEFAULT, m.fortran_vec()) >= 0) 
     {
       retval = true;
       this->matrix = m;
@@ -439,10 +439,10 @@
 template <class T>
 void
 octave_base_int_matrix<T>::print_raw (std::ostream& os,
-				      bool pr_as_read_syntax) const
+                                      bool pr_as_read_syntax) const
 {
   octave_print_internal (os, this->matrix, pr_as_read_syntax,
-   			 this->current_print_indent_level ());
+                         this->current_print_indent_level ());
 }
 
 template <class T>
@@ -508,7 +508,7 @@
 template <class T>
 bool 
 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap,
-					oct_mach_info::float_format)
+                                        oct_mach_info::float_format)
 {
   T tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size()))
@@ -518,17 +518,17 @@
     switch (this->byte_size())
       {
       case 8:
-	swap_bytes<8> (&tmp);
-	break;
+        swap_bytes<8> (&tmp);
+        break;
       case 4:
-	swap_bytes<4> (&tmp);
-	break;
+        swap_bytes<4> (&tmp);
+        break;
       case 2:
-	swap_bytes<2> (&tmp);
-	break;
+        swap_bytes<2> (&tmp);
+        break;
       case 1:
       default:
-	break;
+        break;
       }
   this->scalar = tmp;
   return true;
@@ -550,10 +550,10 @@
 
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 #else
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 
-			H5P_DEFAULT);
+                        H5P_DEFAULT);
 #endif
   if (data_hid < 0) 
     {
@@ -562,7 +562,7 @@
     }
 
   retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL,
-		     H5P_DEFAULT, &(this->scalar)) >= 0;
+                     H5P_DEFAULT, &(this->scalar)) >= 0;
 
   H5Dclose (data_hid);
   H5Sclose (space_hid);
@@ -592,7 +592,7 @@
 
   T tmp;
   if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, 
-	       H5P_DEFAULT, &tmp) < 0)
+               H5P_DEFAULT, &tmp) < 0)
     { 
       H5Dclose (data_hid);
       return false;