--- a/src/DLD-FUNCTIONS/tsearch.cc	Fri Apr 23 11:28:50 2010 -0700
+++ b/src/DLD-FUNCTIONS/tsearch.cc	Fri Apr 23 14:43:41 2010 -0400
@@ -38,20 +38,20 @@
 #include "oct-obj.h"
 #include "parse.h"
 
-inline double max(double a, double b, double c)
+inline double max (double a, double b, double c)
 {
   if (a < b) 
-    return ( b < c ? c : b );
+    return (b < c ? c : b);
   else 
-    return ( a < c ? c : a );
+    return (a < c ? c : a);
 }
 
-inline double min(double a, double b, double c)
+inline double min (double a, double b, double c)
 {
   if (a > b) 
-    return ( b > c ? c : b );
+    return (b > c ? c : b);
   else 
-    return ( a > c ? c : a );
+    return (a > c ? c : a);
 }
 
 #define REF(x,k,i) x(static_cast<octave_idx_type>(elem((k), (i))) - 1)
@@ -78,41 +78,43 @@
 
   octave_value_list retval;
   const int nargin = args.length ();
-  if ( nargin != 5 ) {
-    print_usage ();
-    return retval;
-  }
+  if (nargin != 5)
+    {
+      print_usage ();
+      return retval;
+    }
   
-  const ColumnVector x(args(0).vector_value());
-  const ColumnVector y(args(1).vector_value());
-  const Matrix elem(args(2).matrix_value());
-  const ColumnVector xi(args(3).vector_value());
-  const ColumnVector yi(args(4).vector_value());
-
-  if (error_state) return retval;
+  const ColumnVector x (args(0).vector_value ());
+  const ColumnVector y (args(1).vector_value ());
+  const Matrix elem (args(2).matrix_value ());
+  const ColumnVector xi (args(3).vector_value ());
+  const ColumnVector yi (args(4).vector_value ());
 
-  const octave_idx_type nelem = elem.rows();
+  if (error_state)
+    return retval;
+
+  const octave_idx_type nelem = elem.rows ();
 
-  ColumnVector minx(nelem);
-  ColumnVector maxx(nelem);
-  ColumnVector miny(nelem);
-  ColumnVector maxy(nelem);
-  for(octave_idx_type k = 0; k < nelem; k++) 
+  ColumnVector minx (nelem);
+  ColumnVector maxx (nelem);
+  ColumnVector miny (nelem);
+  ColumnVector maxy (nelem);
+  for (octave_idx_type k = 0; k < nelem; k++) 
     {
-      minx(k) = min(REF(x,k,0), REF(x,k,1), REF(x,k,2)) - eps;
-      maxx(k) = max(REF(x,k,0), REF(x,k,1), REF(x,k,2)) + eps;
-      miny(k) = min(REF(y,k,0), REF(y,k,1), REF(y,k,2)) - eps;
-      maxy(k) = max(REF(y,k,0), REF(y,k,1), REF(y,k,2)) + eps;
+      minx(k) = min (REF (x, k, 0), REF (x, k, 1), REF (x, k, 2)) - eps;
+      maxx(k) = max (REF (x, k, 0), REF (x, k, 1), REF (x, k, 2)) + eps;
+      miny(k) = min (REF (y, k, 0), REF (y, k, 1), REF (y, k, 2)) - eps;
+      maxy(k) = max (REF (y, k, 0), REF (y, k, 1), REF (y, k, 2)) + eps;
     }
 
-  const octave_idx_type np = xi.length();
-  ColumnVector values(np);
+  const octave_idx_type np = xi.length ();
+  ColumnVector values (np);
 
   double x0 = 0.0, y0 = 0.0;
   double a11 = 0.0, a12 = 0.0, a21 = 0.0, a22 = 0.0, det = 0.0;
 
   octave_idx_type k = nelem; // k is a counter of elements
-  for(octave_idx_type kp = 0; kp < np; kp++) 
+  for (octave_idx_type kp = 0; kp < np; kp++) 
     {
       const double xt = xi(kp); 
       const double yt = yi(kp);
@@ -124,7 +126,7 @@
           const double dx2 = yt - y0;
           const double c1 = (a22 * dx1 - a21 * dx2) / det;
           const double c2 = (-a12 * dx1 + a11 * dx2) / det;
-          if ( c1 >= -eps && c2 >= -eps && (c1 + c2) <= (1 + eps)) 
+          if (c1 >= -eps && c2 >= -eps && (c1 + c2) <= (1 + eps)) 
             {
               values(kp) = double(k+1);
               continue;
@@ -135,16 +137,15 @@
       for (k = 0; k < nelem; k++) 
         { 
           OCTAVE_QUIT;
-          if (xt >= minx(k) && xt <= maxx(k) && 
-              yt >= miny(k) && yt <= maxy(k) )
+          if (xt >= minx(k) && xt <= maxx(k) && yt >= miny(k) && yt <= maxy(k))
             {
               // element inside the minimum rectangle: examine it closely
-              x0  = REF(x,k,0);
-              y0  = REF(y,k,0);
-              a11 = REF(x,k,1)-x0;
-              a12 = REF(y,k,1)-y0;
-              a21 = REF(x,k,2)-x0;
-              a22 = REF(y,k,2)-y0;
+              x0  = REF (x, k, 0);
+              y0  = REF (y, k, 0);
+              a11 = REF (x, k, 1) - x0;
+              a12 = REF (y, k, 1) - y0;
+              a21 = REF (x, k, 2) - x0;
+              a22 = REF (y, k, 2) - y0;
               det = a11 * a22 - a21 * a12;
         
               // solve the system