* The grand 2005-2006 replace.

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index a3ed32aecbbb9ac447d6450411bbe3c34e780a03..62862327acfdce663fc323f1c0a8c965d0be94ba 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "offset.hh"
 
-#include <cmath>
 
 #ifndef STANDALONE
 String
@@ -37,7 +36,7 @@ complex_multiply (Offset z1, Offset z2)
   Offset z;
   if (!isinf_b (z2[Y_AXIS]))
     {
-      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
+      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS] * z2[Y_AXIS];
       z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
     }
   return z;
@@ -67,7 +66,7 @@ complex_exp (Offset o)
 
   Real r = exp (o[X_AXIS]);
 
-  return Offset (r*c, r*s);
+  return Offset (r * c, r * s);
 }
 
 Real
@@ -82,5 +81,15 @@ Offset::arg () const
 Real
 Offset::length () const
 {
-  return sqrt (sqr (coordinate_a_[X_AXIS]) + sqr (coordinate_a_[Y_AXIS]));
+  return sqrt (sqr (coordinate_a_[X_AXIS])
+                   + sqr (coordinate_a_[Y_AXIS]));
+}
+
+bool
+Offset::is_sane () const
+{
+  return !isnan (coordinate_a_[X_AXIS])
+    && !isnan (coordinate_a_ [Y_AXIS])
+    && !isinf (coordinate_a_[X_AXIS]) 
+    && !isnan (coordinate_a_[Y_AXIS]);
 }