(new_lyrics): \addlyrics -> \oldaddlyrics,

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

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 0a5a7a10d541887b04124f5e428c895cb102ba6f..8c57c3de2968d1bab7c46ff4671bb6f655fab499 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,93 +1,117 @@
 /*
   offset.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef OFFSET_HH
 #define OFFSET_HH
 
+#include "flower-proto.hh"
 #include "real.hh"
 #include "axes.hh"
 #include "arithmetic-operator.hh"
-
-struct Offset;
+#include "string.hh"
 
 Offset complex_multiply (Offset, Offset);
+Offset complex_divide (Offset, Offset);
 Offset complex_exp (Offset);
 
 
 /** 2d vector
-    should change to Complex
+    should change to Complex -- how is vector == complex?
+
+    ughr wat een beerput
 */
-struct Offset {
+class Offset 
+{
 public:
   Real coordinate_a_[NO_AXES];
     
-  Real &operator[](Axis i) {
+  Real &operator[] (Axis i) 
+  {
     return coordinate_a_[i];
   }
-  Real operator[](Axis i) const{
+
+  Real operator[] (Axis i) const
+  {
     return coordinate_a_[i];
   }
     
-  Offset& operator+=(Offset o) {
+  Offset& operator+= (Offset o) 
+  {
     (*this)[X_AXIS] += o[X_AXIS];
     (*this)[Y_AXIS] += o[Y_AXIS];
     return *this;
   }
-  Offset operator - () const {
+
+  Offset operator - () const 
+  {
     Offset o = *this;
     
     o[X_AXIS]  = - o[X_AXIS];
     o[Y_AXIS]  = - o[Y_AXIS];
     return o;
   }
-  Offset& operator-=(Offset o) {
+
+  Offset& operator-= (Offset o) 
+  {
     (*this)[X_AXIS] -= o[X_AXIS];
     (*this)[Y_AXIS] -= o[Y_AXIS];
 
     return *this;
   }
   
-  Offset &scale (Offset o) {
+  Offset &scale (Offset o) 
+  {
     (*this)[X_AXIS] *= o[X_AXIS];
     (*this)[Y_AXIS] *= o[Y_AXIS];
 
     return *this;
   }
-  Offset &operator *=(Real a) {
+
+  Offset &operator *= (Real a) 
+  {
     (*this)[X_AXIS] *= a;
     (*this)[Y_AXIS] *= a;
 
     return *this;
   }
       
-  Offset (Real ix , Real iy) {
+  Offset (Real ix , Real iy) 
+  {
     coordinate_a_[X_AXIS] =ix;
     coordinate_a_[Y_AXIS] =iy;    
   }
-  Offset() {
-    coordinate_a_[X_AXIS]=
-      coordinate_a_[Y_AXIS]=
-      0.0;
+
+  Offset () 
+  {
+    coordinate_a_[X_AXIS] = coordinate_a_[Y_AXIS]= 0.0;
   }
 
-  String str () const;
+  String to_string () const;
 
-  void mirror (Axis);
-  Real  arg () const;
+  Offset& mirror (Axis a)
+  {
+    coordinate_a_[a] = - coordinate_a_[a];
+    return *this;
+  }
+  
+  Real arg () const;
   Real length () const;
-  Offset operator *=(Offset z2) {
+
+  //wtf, How is Offset a Complex? is this used?
+  Offset operator *= (Offset z2) 
+  {
     *this = complex_multiply (*this,z2);
     return *this;
   }
 
 };
 
-IMPLEMENT_ARITHMETIC_OPERATOR(Offset, +);
-IMPLEMENT_ARITHMETIC_OPERATOR(Offset, -);
-IMPLEMENT_ARITHMETIC_OPERATOR(Offset, *);
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, *);
 
 inline Offset
 operator* (Real o1, Offset o2)
@@ -103,7 +127,14 @@ operator* (Offset o1, Real o2)
   return o1;
 }
 
+inline Offset
+mirror (Offset o, Axis a)
+{
+  o.mirror (a);
+  return o;
+}
+
 
-#endif // OFFSET_HH
+#endif /* OFFSET_HH */