X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=dd205661fc87aae4295286ced62bf8741322695e;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=232967e675d4ea913df6d5833f51f62e5b0057b0;hpb=472c212541034e95c30f5a1a6bc99d7f36f15b68;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index 232967e675..dd205661fc 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,33 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
+#ifndef STANDALONE
 #include "string.hh"
+#endif
 #include "offset.hh"
 
 
 #ifndef STANDALONE
 String
-Offset::str () const
+Offset::to_string () const
 {
   String s;
-  s = String("(") + coordinate_a_[X_AXIS] + ", " + coordinate_a_[Y_AXIS] + ")";
+  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;
-  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];
+  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)
 {
@@ -38,13 +74,13 @@ complex_exp (Offset o)
   
   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]);
 }
 
 /**
@@ -53,7 +89,7 @@ Offset::arg () const
 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)