2003 -> 2004

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index c2be8243a3133e832e83deb6e25d568aaea2dc57..64c967dd51265671adb95635efc464ccfff1a3ed 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -29,7 +29,7 @@ public:
   static void set_beaming (Grob*,Beaming_info_list *);
   static void set_stemlens (Grob*);
   static int get_beam_count (Grob*me);
-
+  static void position_beam (Grob* me);
   static Real get_beam_translation (Grob*me);
   static Real get_thickness (Grob*me);
 
@@ -45,11 +45,15 @@ public:
   DECLARE_SCHEME_CALLBACK (slope_damping, (SCM));
   DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM));  
   DECLARE_SCHEME_CALLBACK (quanting, (SCM));
-  static Real score_slopes_dy (Real, Real, Real, Real, bool);
-  static Real score_stem_lengths (Link_array<Grob>,
-                                 Array<Stem_info>,
-                                 Array<Real>, Array<Real>,
-                                 Real, Real, bool, Real, Real);
+  static Real score_slopes_dy (Real, Real, Real, Real, Real, bool);
+
+  static Real score_stem_lengths (Link_array<Grob> const &stems,
+                                 Array<Stem_info> const &stem_infos,
+                                 Array<Real> const &base_stem_ys,
+                                 Array<Real> const &stem_xs,
+                                 Real xl, Real xr, 
+                                 bool knee, 
+                                 Real yl, Real yr);
   static Real score_forbidden_quants (Real, Real,
                                      Real, Real, Real, Real,
                                      int, Direction, Direction);
@@ -63,14 +67,14 @@ private:
   static void set_stem_shorten (Grob*);
   static Real calc_stem_y (Grob*, Grob* s, Grob**c,
                           Real, Real,
-                          Interval pos, bool french);
+                          Drul_array<Real> pos, bool french);
   static void set_stem_lengths (Grob*);
   static int forced_stem_count (Grob*);
 };
 
 const int REGION_SIZE = 2;
-#define DEBUG_QUANTING 0
 
+#define DEBUG_QUANTING 1
 
 #endif /* BEAM_HH */