X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Foffset.hh;h=8f395398b75e2768d31f476737142502c3a7eedd;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=0975e292b604ef05a58373ad9ef0de95235200e8;hpb=94fdd3f7932666ac1b3169854ea0a9964b5d32f3;p=lilypond.git

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 0975e292b6..8f395398b7 100644
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,7 +1,20 @@
 /*
-  offset.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef OFFSET_HH
@@ -11,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
@@ -66,7 +78,7 @@ public:
 
   Offset &operator /= (Real a)
   {
-    (*this) *= 1/a;
+    (*this) *= 1 / a;
     return *this;
   }
 
@@ -97,8 +109,10 @@ public:
     return *this;
   }
   Offset direction () const;
-  
+  Offset swapped () const;
+
   Real arg () const;
+  Real angle_degrees () const;
   Real length () const;
   bool is_sane () const;
   Offset operator *= (Offset z2);
@@ -109,8 +123,6 @@ 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);
@@ -157,5 +169,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 */