Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 3dbab14a927e5a404c6839f6b8046127a5a0a682..a8c5987801069b01790b545b4a12db4c70923bfc 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2009 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include "std-string.hh"
 #include "real.hh"
 
-
 /*
   This is a mixture a 2D vector. Sometimes it can
   also be convenient to think of 2D vectors as complex numbers
@@ -79,7 +78,7 @@ public:
 
   Offset &operator /= (Real a)
   {
-    (*this) *= 1/a;
+    (*this) *= 1 / a;
     return *this;
   }
 
@@ -111,8 +110,7 @@ public:
   }
   Offset direction () const;
   Offset swapped () const;
-  
-  Real arg () const;
+
   Real angle_degrees () const;
   Real length () const;
   bool is_sane () const;
@@ -124,11 +122,8 @@ 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);
+Offset offset_directed (Real);
 
 inline Offset
 Offset::operator *= (Offset z2)
@@ -172,5 +167,13 @@ dot_product (Offset o1, Offset o2)
   return o1[X_AXIS] * o2[X_AXIS] + o1[Y_AXIS] * o2[Y_AXIS];
 }
 
+inline
+Real
+cross_product (Offset o1, Offset o2)
+{
+  return o1[X_AXIS] * o2[Y_AXIS] - o1[Y_AXIS] * o2[X_AXIS];
+}
+
+
 #endif /* OFFSET_HH */