Merge commit '657385efc4e790e67627f5146f4bb81ab334f870'

[lilypond.git] / lily / include / bezier.hh

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 4b449c6b42bcda714845d25f765ca393113fec4a..98886105ee2e959699490f0455d13b1b69f08242 100644 (file)
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,20 +1,19 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEZIER_HH
 #define BEZIER_HH
 
-
 #include "interval.hh"
 #include "offset.hh"
 #include "polynomial.hh"
 
 /**
-  Simple bezier curve
- */
+   Simple bezier curve
+*/
 class Bezier
 {
 public:
@@ -25,33 +24,33 @@ public:
   void translate (Offset);
 
   Real get_other_coordinate (Axis a, Real x) const;
-  Array<Real> solve_point (Axis, Real coordinate) const;
-  Array<Real> solve_derivative (Offset) const;
-  Interval extent (Axis)const;
+  vector<Real> solve_point (Axis, Real coordinate) const;
+  vector<Real> solve_derivative (Offset) const;
+  Interval extent (Axis) const;
+  Interval control_point_extent (Axis) const;
+  
   Polynomial polynomial (Axis)const;
   Offset curve_point (Real t) const;
+  Real curve_coordinate (Real t, Axis) const;
 
   static const int CONTROL_COUNT = 4;
 
   /*
     Bezier curves always have 4 control points. Making this into an
-    Array<> gives unnecessary overhead, and makes debugging a royal
+    vector<> gives unnecessary overhead, and makes debugging a royal
     pain.  */
 
-  
   Offset control_[4];
 };
 
-void scale (Array<Offset>* array, Real xscale, Real yscale);
-void rotate (Array<Offset>* array, Real phi);
-void translate (Array<Offset>* array, Offset o);
-
-
+void scale (vector<Offset> *array, Real xscale, Real yscale);
+void rotate (vector<Offset> *array, Real phi);
+void translate (vector<Offset> *array, Offset o);
 
 Bezier slur_shape (Real width, Real height_limit,
                   Real height_proportion);
-Real slur_height (Real width, Real height_limit, Real height_proportion); 
-void get_slur_indent_height (Real * indent, Real *height, Real width, Real h_inf, Real r_0);
+Real slur_height (Real width, Real height_limit, Real height_proportion);
+void get_slur_indent_height (Real *indent, Real *height, Real width, Real h_inf, Real r_0);
 
 #endif // BEZIER_HH