X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbezier.hh;h=94f207a33bd15397f38cab02f41880d3531aec38;hb=6a3360c40308285434e06a1de031efb073c015fa;hp=3ac97b71706ea7baa09ac9f819f47ba254841465;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 3ac97b7170..94f207a33b 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,49 +1,56 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 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:
-  Bezier ();
-
   void assert_sanity () const;
-  void flip (Axis);
+  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;
-  Array<Offset> control_;
+
+  /*
+    Bezier curves always have 4 control points. Making this into an
+    vector<> gives unnecessary overhead, and makes debugging a royal
+    pain.  */
+
+  Offset control_[4];
 };
 
-void flip (Array<Offset>* arr_p, Axis a);
-void rotate (Array<Offset>* arr_p, Real phi);
-void translate (Array<Offset>* arr_p, 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