--- a/src/DLD-FUNCTIONS/dassl.cc	Wed Jan 20 17:24:23 2010 -0500
+++ b/src/DLD-FUNCTIONS/dassl.cc	Wed Jan 20 17:33:41 2010 -0500
@@ -60,7 +60,7 @@
 
 ColumnVector
 dassl_user_function (const ColumnVector& x, const ColumnVector& xdot,
-		     double t, octave_idx_type& ires)
+                     double t, octave_idx_type& ires)
 {
   ColumnVector retval;
 
@@ -77,30 +77,30 @@
       octave_value_list tmp = dassl_fcn->do_multi_index_op (1, args);
 
       if (error_state)
-	{
-	  gripe_user_supplied_eval ("dassl");
-	  return retval;
-	}
+        {
+          gripe_user_supplied_eval ("dassl");
+          return retval;
+        }
 
       int tlen = tmp.length ();
       if (tlen > 0 && tmp(0).is_defined ())
-	{
-	  if (! warned_fcn_imaginary && tmp(0).is_complex_type ())
-	    {
-	      warning ("dassl: ignoring imaginary part returned from user-supplied function");
-	      warned_fcn_imaginary = true;
-	    }
+        {
+          if (! warned_fcn_imaginary && tmp(0).is_complex_type ())
+            {
+              warning ("dassl: ignoring imaginary part returned from user-supplied function");
+              warned_fcn_imaginary = true;
+            }
 
-	  retval = ColumnVector (tmp(0).vector_value ());
+          retval = ColumnVector (tmp(0).vector_value ());
 
-	  if (tlen > 1)
-	    ires = tmp(1).int_value ();
+          if (tlen > 1)
+            ires = tmp(1).int_value ();
 
-	  if (error_state || retval.length () == 0)
-	    gripe_user_supplied_eval ("dassl");
-	}
+          if (error_state || retval.length () == 0)
+            gripe_user_supplied_eval ("dassl");
+        }
       else
-	gripe_user_supplied_eval ("dassl");
+        gripe_user_supplied_eval ("dassl");
     }
 
   return retval;
@@ -108,7 +108,7 @@
 
 Matrix
 dassl_user_jacobian (const ColumnVector& x, const ColumnVector& xdot,
-		     double t, double cj)
+                     double t, double cj)
 {
   Matrix retval;
 
@@ -126,27 +126,27 @@
       octave_value_list tmp = dassl_jac->do_multi_index_op (1, args);
 
       if (error_state)
-	{
-	  gripe_user_supplied_eval ("dassl");
-	  return retval;
-	}
+        {
+          gripe_user_supplied_eval ("dassl");
+          return retval;
+        }
 
       int tlen = tmp.length ();
       if (tlen > 0 && tmp(0).is_defined ())
-	{
-	  if (! warned_jac_imaginary && tmp(0).is_complex_type ())
-	    {
-	      warning ("dassl: ignoring imaginary part returned from user-supplied jacobian function");
-	      warned_jac_imaginary = true;
-	    }
+        {
+          if (! warned_jac_imaginary && tmp(0).is_complex_type ())
+            {
+              warning ("dassl: ignoring imaginary part returned from user-supplied jacobian function");
+              warned_jac_imaginary = true;
+            }
 
-	  retval = tmp(0).matrix_value ();
+          retval = tmp(0).matrix_value ();
 
-	  if (error_state || retval.length () == 0)
-	    gripe_user_supplied_eval ("dassl");
-	}
+          if (error_state || retval.length () == 0)
+            gripe_user_supplied_eval ("dassl");
+        }
       else
-	gripe_user_supplied_eval ("dassl");
+        gripe_user_supplied_eval ("dassl");
     }
 
   return retval;
@@ -295,145 +295,145 @@
       octave_value f_arg = args(0);
 
       if (f_arg.is_cell ())
-  	{
-	  Cell c = f_arg.cell_value ();
-	  if (c.length() == 1)
-	    f_arg = c(0);
-	  else if (c.length() == 2)
-	    {
-	      if (c(0).is_function_handle () || c(0).is_inline_function ())
-		dassl_fcn = c(0).function_value ();
-	      else
-		{
-		  fcn_name = unique_symbol_name ("__dassl_fcn__");
-		  fname = "function y = ";
-		  fname.append (fcn_name);
-		  fname.append (" (x, xdot, t) y = ");
-		  dassl_fcn = extract_function
-		    (c(0), "dassl", fcn_name, fname, "; endfunction");
-		}
-	      
-	      if (dassl_fcn)
-		{
-		  if (c(1).is_function_handle () || c(1).is_inline_function ())
-		    dassl_jac = c(1).function_value ();
-		  else
-		    {
-			jac_name = unique_symbol_name ("__dassl_jac__");
-			jname = "function jac = ";
-			jname.append(jac_name);
-			jname.append (" (x, xdot, t, cj) jac = ");
-			dassl_jac = extract_function
-			  (c(1), "dassl", jac_name, jname, "; endfunction");
+        {
+          Cell c = f_arg.cell_value ();
+          if (c.length() == 1)
+            f_arg = c(0);
+          else if (c.length() == 2)
+            {
+              if (c(0).is_function_handle () || c(0).is_inline_function ())
+                dassl_fcn = c(0).function_value ();
+              else
+                {
+                  fcn_name = unique_symbol_name ("__dassl_fcn__");
+                  fname = "function y = ";
+                  fname.append (fcn_name);
+                  fname.append (" (x, xdot, t) y = ");
+                  dassl_fcn = extract_function
+                    (c(0), "dassl", fcn_name, fname, "; endfunction");
+                }
+              
+              if (dassl_fcn)
+                {
+                  if (c(1).is_function_handle () || c(1).is_inline_function ())
+                    dassl_jac = c(1).function_value ();
+                  else
+                    {
+                        jac_name = unique_symbol_name ("__dassl_jac__");
+                        jname = "function jac = ";
+                        jname.append(jac_name);
+                        jname.append (" (x, xdot, t, cj) jac = ");
+                        dassl_jac = extract_function
+                          (c(1), "dassl", jac_name, jname, "; endfunction");
 
-			if (!dassl_jac)
-			  {
-			    if (fcn_name.length())
-			      clear_function (fcn_name);
-			    dassl_fcn = 0;
-			  }
-		    }
-		}
-	    }
-	  else
-	    DASSL_ABORT1 ("incorrect number of elements in cell array");
-	}
+                        if (!dassl_jac)
+                          {
+                            if (fcn_name.length())
+                              clear_function (fcn_name);
+                            dassl_fcn = 0;
+                          }
+                    }
+                }
+            }
+          else
+            DASSL_ABORT1 ("incorrect number of elements in cell array");
+        }
 
       if (!dassl_fcn && ! f_arg.is_cell())
-	{
-	  if (f_arg.is_function_handle () || f_arg.is_inline_function ())
-	    dassl_fcn = f_arg.function_value ();
-	  else
-	    {
-	      switch (f_arg.rows ())
-		{
-		case 1:
-		  do
-		    {
-		      fcn_name = unique_symbol_name ("__dassl_fcn__");
-		      fname = "function y = ";
-		      fname.append (fcn_name);
-		      fname.append (" (x, xdot, t) y = ");
-		      dassl_fcn = extract_function
-			(f_arg, "dassl", fcn_name, fname, "; endfunction");
-		    }
-		  while (0);
-		  break;
+        {
+          if (f_arg.is_function_handle () || f_arg.is_inline_function ())
+            dassl_fcn = f_arg.function_value ();
+          else
+            {
+              switch (f_arg.rows ())
+                {
+                case 1:
+                  do
+                    {
+                      fcn_name = unique_symbol_name ("__dassl_fcn__");
+                      fname = "function y = ";
+                      fname.append (fcn_name);
+                      fname.append (" (x, xdot, t) y = ");
+                      dassl_fcn = extract_function
+                        (f_arg, "dassl", fcn_name, fname, "; endfunction");
+                    }
+                  while (0);
+                  break;
 
-		case 2:
-		  {
-		    string_vector tmp = f_arg.all_strings ();
+                case 2:
+                  {
+                    string_vector tmp = f_arg.all_strings ();
 
-		    if (! error_state)
-		      {
-			fcn_name = unique_symbol_name ("__dassl_fcn__");
-			fname = "function y = ";
-			fname.append (fcn_name);
-			fname.append (" (x, xdot, t) y = ");
-			dassl_fcn = extract_function
-			  (tmp(0), "dassl", fcn_name, fname, "; endfunction");
+                    if (! error_state)
+                      {
+                        fcn_name = unique_symbol_name ("__dassl_fcn__");
+                        fname = "function y = ";
+                        fname.append (fcn_name);
+                        fname.append (" (x, xdot, t) y = ");
+                        dassl_fcn = extract_function
+                          (tmp(0), "dassl", fcn_name, fname, "; endfunction");
 
-			if (dassl_fcn)
-			  {
-			    jac_name = unique_symbol_name ("__dassl_jac__");
-			    jname = "function jac = ";
-			    jname.append(jac_name);
-			    jname.append (" (x, xdot, t, cj) jac = ");
-			    dassl_jac = extract_function
-			      (tmp(1), "dassl", jac_name, jname, 
-			       "; endfunction");
+                        if (dassl_fcn)
+                          {
+                            jac_name = unique_symbol_name ("__dassl_jac__");
+                            jname = "function jac = ";
+                            jname.append(jac_name);
+                            jname.append (" (x, xdot, t, cj) jac = ");
+                            dassl_jac = extract_function
+                              (tmp(1), "dassl", jac_name, jname, 
+                               "; endfunction");
 
-			    if (!dassl_jac)
-			      {
-				if (fcn_name.length())
-				  clear_function (fcn_name);
-				dassl_fcn = 0;
-			      }
-			  }
-		      }
-		  }
-		}
-	    }
-	}
+                            if (!dassl_jac)
+                              {
+                                if (fcn_name.length())
+                                  clear_function (fcn_name);
+                                dassl_fcn = 0;
+                              }
+                          }
+                      }
+                  }
+                }
+            }
+        }
 
       if (error_state || ! dassl_fcn)
-	DASSL_ABORT ();
+        DASSL_ABORT ();
 
       ColumnVector state = ColumnVector (args(1).vector_value ());
 
       if (error_state)
-	DASSL_ABORT1 ("expecting state vector as second argument");
+        DASSL_ABORT1 ("expecting state vector as second argument");
 
       ColumnVector deriv (args(2).vector_value ());
 
       if (error_state)
-	DASSL_ABORT1 ("expecting derivative vector as third argument");
+        DASSL_ABORT1 ("expecting derivative vector as third argument");
 
       ColumnVector out_times (args(3).vector_value ());
 
       if (error_state)
-	DASSL_ABORT1 ("expecting output time vector as fourth argument");
+        DASSL_ABORT1 ("expecting output time vector as fourth argument");
 
       ColumnVector crit_times;
       int crit_times_set = 0;
       if (nargin > 4)
-	{
-	  crit_times = ColumnVector (args(4).vector_value ());
+        {
+          crit_times = ColumnVector (args(4).vector_value ());
 
-	  if (error_state)
-	    DASSL_ABORT1 ("expecting critical time vector as fifth argument");
+          if (error_state)
+            DASSL_ABORT1 ("expecting critical time vector as fifth argument");
 
-	  crit_times_set = 1;
-	}
+          crit_times_set = 1;
+        }
 
       if (state.capacity () != deriv.capacity ())
-	DASSL_ABORT1 ("x and xdot must have the same size");
+        DASSL_ABORT1 ("x and xdot must have the same size");
 
       double tzero = out_times (0);
 
       DAEFunc func (dassl_user_function);
       if (dassl_jac)
-	func.set_jacobian_function (dassl_user_jacobian);
+        func.set_jacobian_function (dassl_user_jacobian);
 
       DASSL dae (state, deriv, tzero, func);
 
@@ -443,36 +443,36 @@
       Matrix deriv_output;
 
       if (crit_times_set)
-	output = dae.integrate (out_times, deriv_output, crit_times);
+        output = dae.integrate (out_times, deriv_output, crit_times);
       else
-	output = dae.integrate (out_times, deriv_output);
+        output = dae.integrate (out_times, deriv_output);
 
       if (fcn_name.length())
-	clear_function (fcn_name);
+        clear_function (fcn_name);
       if (jac_name.length())
-	clear_function (jac_name);
+        clear_function (jac_name);
 
       if (! error_state)
-	{
-	  std::string msg = dae.error_message ();
+        {
+          std::string msg = dae.error_message ();
 
-	  retval(3) = msg;
-	  retval(2) = static_cast<double> (dae.integration_state ());
+          retval(3) = msg;
+          retval(2) = static_cast<double> (dae.integration_state ());
 
-	  if (dae.integration_ok ())
-	    {
-	      retval(1) = deriv_output;
-	      retval(0) = output;
-	    }
-	  else
-	    {
-	      retval(1) = Matrix ();
-	      retval(0) = Matrix ();
+          if (dae.integration_ok ())
+            {
+              retval(1) = deriv_output;
+              retval(0) = output;
+            }
+          else
+            {
+              retval(1) = Matrix ();
+              retval(0) = Matrix ();
 
-	      if (nargout < 3)
-		error ("dassl: %s", msg.c_str ());
-	    }
-	}
+              if (nargout < 3)
+                error ("dassl: %s", msg.c_str ());
+            }
+        }
     }
   else
     print_usage ();