X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=4693c113ef05b488d7cae97ea3f8da09e7852a28;hb=c08af381a1f23a3656d845b86895a9f2a955590b;hp=41eb841c244b925e5679cad9cb43390afb6643cb;hpb=da66c77772050eccbb972538c2cf9f6ec76018b4;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index 41eb841c24..4693c113ef 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,55 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include <math.h>
 
-#ifndef STANDALONE
-#include "string.hh"
-#endif
 #include "offset.hh"
 
-
 #ifndef STANDALONE
-String
+string
 Offset::to_string () const
 {
-  String s;
-  s = String (" (") + ::to_string (coordinate_a_[X_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_b (z2[Y_AXIS]))
-  {
-      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
+  if (!isinf (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];
+  o[Y_AXIS] = -o[Y_AXIS];
   return o;
 }
 
@@ -60,21 +47,19 @@ complex_divide (Offset z1, Offset z2)
 {
   z2 = complex_conjugate (z2);
   Offset z = complex_multiply (z1, z2);
-  z *= 1/z2.length ();
+  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
@@ -83,11 +68,40 @@ Offset::arg () const
   return atan2 (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }
 
+Real
+Offset::angle_degrees () const
+{
+  return arg () * 180 / M_PI;
+}
 /**
    euclidian vector length / complex modulus
- */
+*/
 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]) 
+    && !isinf (coordinate_a_[Y_AXIS]);
+}
+
+Offset
+Offset::direction () const
+{
+  Offset d = *this;
+  d /= length (); 
+  return d;
+}
+
+Offset
+Offset::swapped () const
+{
+  return Offset (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }