X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=a0e87b58cf57984734386aabc3a6b3dc8ea99b7d;hb=5c96e2bf8b69f73986951ca1baac7319f142fc72;hp=258cc1782cc4a63ca2e39001a26fddb1402b8c30;hpb=d36e8ced83cfeabcf4ec3840ffe93a717a17ac4d;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index 258cc1782c..a0e87b58cf 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,73 +3,93 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include <math.h>
 
-#ifndef STANDALONE
-#include "string.hh"
-#endif
 #include "offset.hh"
 
 
 #ifndef STANDALONE
-String
-Offset::str () const
+string
+Offset::to_string () const
 {
-  String s;
-  s = String("(") + to_str (coordinate_a_[X_AXIS]) + ", " 
-    + to_str (coordinate_a_[Y_AXIS]) + ")";
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif
 
+bool
+isinf_b (Real r)
+{
+  return (fabs (r) > 1e20);
+}
 
 /*
   free bsd fix by John Galbraith
- */
-  
+*/
+
 Offset
 complex_multiply (Offset z1, Offset z2)
 {
   Offset z;
-  if(!isinf(z2[Y_AXIS]))
-  {
-      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
+  if (!isinf_b (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;
 }
 
+Offset
+complex_conjugate (Offset o)
+{
+  o[Y_AXIS] = -o[Y_AXIS];
+  return o;
+}
 
+Offset
+complex_divide (Offset z1, Offset z2)
+{
+  z2 = complex_conjugate (z2);
+  Offset z = complex_multiply (z1, z2);
+  z *= 1 / z2.length ();
+  return z;
+}
 
 Offset
 complex_exp (Offset o)
 {
   Real s = sin (o[Y_AXIS]);
   Real c = cos (o[Y_AXIS]);
-  
+
   Real r = exp (o[X_AXIS]);
 
-  return Offset(r*c, r*s);
+  return Offset (r * c, r * s);
 }
 
 Real
 Offset::arg () const
 {
-  return atan2 (y (), x());
+  return atan2 (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }
 
 /**
    euclidian vector length / complex modulus
- */
+*/
 Real
 Offset::length () const
 {
-  return sqrt (sqr (x()) + sqr (y()));
+  return sqrt (sqr (coordinate_a_[X_AXIS])
+		    + sqr (coordinate_a_[Y_AXIS]));
 }
-void
-Offset::mirror (Axis a)
+
+bool
+Offset::is_sane () const
 {
-  coordinate_a_[a] = - coordinate_a_[a];
+  return !isnan (coordinate_a_[X_AXIS])
+    && !isnan (coordinate_a_ [Y_AXIS])
+    && !isinf (coordinate_a_[X_AXIS]) 
+    && !isnan (coordinate_a_[Y_AXIS]);
 }