X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbezier.hh;h=98886105ee2e959699490f0455d13b1b69f08242;hb=f287d7846e9d5f2de14894cd655b2f84341c4a2c;hp=8ab5d48fc3ac50c81d3d55d81022661a097e1974;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 8ab5d48fc3..98886105ee 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,54 +1,56 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEZIER_HH
 #define BEZIER_HH
 
-
-#include "real.hh"
-#include "drul-array.hh"
 #include "interval.hh"
-#include "axes.hh"
 #include "offset.hh"
-#include "array.hh"
 #include "polynomial.hh"
 
 /**
-  Simple bezier curve
- */
+   Simple bezier curve
+*/
 class Bezier
 {
 public:
   void assert_sanity () const;
-  void scale (Real x,Real y);
+  void scale (Real x, Real y);
   void reverse ();
   void rotate (Real);
   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);
 
 #endif // BEZIER_HH