X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=e7594f5a4d745032e12d00b608d26a5c09eb6e41;hb=6d10791f358dc637ee7d8858fb61f959f1262b3c;hp=c2be8243a3133e832e83deb6e25d568aaea2dc57;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index c2be8243a3..e7594f5a4d 100644
--- 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>
 */
 
@@ -25,17 +25,17 @@ public:
   DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
   Beam (SCM);
   static void add_stem (Grob*,Grob*);
-  static bool knee_b (Grob*);
+  static bool is_knee (Grob*);
   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);
 
   static void connect_beams (Grob*me);
   DECLARE_SCHEME_CALLBACK (space_function, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
   
@@ -45,14 +45,18 @@ 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);
+				      Drul_array<int>, Direction, Direction);
   
 
   static int get_direction_beam_count (Grob *me, Direction d);
@@ -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 */