* lily/context.cc (Context): take key argument in ctor.

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

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 3ac97b71706ea7baa09ac9f819f47ba254841465..c7317be581aa39dc1003e1b3dcd482a43c8bd9c3 100644 (file)
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,7 +1,7 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEZIER_HH
@@ -11,7 +11,6 @@
 #include "real.hh"
 #include "drul-array.hh"
 #include "interval.hh"
-#include "axes.hh"
 #include "offset.hh"
 #include "array.hh"
 #include "polynomial.hh"
@@ -22,10 +21,8 @@
 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);
@@ -38,12 +35,26 @@ public:
   Offset curve_point (Real t) const;
 
   static const int CONTROL_COUNT = 4;
-  Array<Offset> control_;
+
+  /*
+    Bezier curves always have 4 control points. Making this into an
+    Array<> 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 (Array<Offset>* array, Real xscale, Real yscale);
+void rotate (Array<Offset>* array, Real phi);
+void translate (Array<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