Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / flower / include / offset.hh

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 7929573ee7af082b87ac5c256304e1e88207ad83..a3093c98ef2548f2157b328c44d510415352ee27 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,18 +1,16 @@
 /*
   offset.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef OFFSET_HH
 #define OFFSET_HH
 
 #include "axis.hh"
-#include "string.hh"
+#include "std-string.hh"
+#include "real.hh"
 
-Offset complex_multiply (Offset, Offset);
-Offset complex_divide (Offset, Offset);
-Offset complex_exp (Offset);
 
 /*
   This is a mixture a 2D vector. Sometimes it can
@@ -66,6 +64,12 @@ public:
     return *this;
   }
 
+  Offset &operator /= (Real a)
+  {
+    (*this) *= 1/a;
+    return *this;
+  }
+
   Offset &operator *= (Real a)
   {
     (*this)[X_AXIS] *= a;
@@ -85,28 +89,40 @@ public:
     coordinate_a_[X_AXIS] = coordinate_a_[Y_AXIS] = 0.0;
   }
 
-  String to_string () const;
+  string to_string () const;
 
   Offset &mirror (Axis a)
   {
     coordinate_a_[a] = -coordinate_a_[a];
     return *this;
   }
-
+  Offset direction () const;
+  
   Real arg () const;
+  Real angle_degrees () const;
   Real length () const;
   bool is_sane () const;
-  Offset operator *= (Offset z2)
-  {
-    *this = complex_multiply (*this, z2);
-    return *this;
-  }
+  Offset operator *= (Offset z2);
 };
 
+#include "arithmetic-operator.hh"
 IMPLEMENT_ARITHMETIC_OPERATOR (Offset, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Offset, -);
 IMPLEMENT_ARITHMETIC_OPERATOR (Offset, *);
 
+
+
+Offset complex_multiply (Offset, Offset);
+Offset complex_divide (Offset, Offset);
+Offset complex_exp (Offset);
+
+inline Offset
+Offset::operator *= (Offset z2)
+{
+  *this = complex_multiply (*this, z2);
+  return *this;
+}
+
 inline Offset
 operator * (Real o1, Offset o2)
 {
@@ -114,6 +130,13 @@ operator * (Real o1, Offset o2)
   return o2;
 }
 
+inline Offset
+operator / (Offset o1, Real a)
+{
+  o1 /= a;
+  return o1;
+}
+
 inline Offset
 operator * (Offset o1, Real o2)
 {