Doc-fr: NR-1.5.2 merging rests

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

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index b34964c9e8149c727b52c42504e13647b44c5966..a8c5987801069b01790b545b4a12db4c70923bfc 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -101,7 +101,7 @@ public:
     coordinate_a_[X_AXIS] = coordinate_a_[Y_AXIS] = 0.0;
   }
 
-  std::string to_string () const;
+  string to_string () const;
 
   Offset &mirror (Axis a)
   {
@@ -111,7 +111,6 @@ public:
   Offset direction () const;
   Offset swapped () const;
 
-  Real arg () const;
   Real angle_degrees () const;
   Real length () const;
   bool is_sane () const;
@@ -124,8 +123,7 @@ 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)