2003 -> 2004

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 3f0b1a8b2a004f134bf45475db6ca340ff525858..64c967dd51265671adb95635efc464ccfff1a3ed 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,7 +1,10 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  source file of the LilyPond music typesetter
+
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEAM_HH
@@ -9,49 +12,69 @@
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
-
+#include "stem-info.hh"
 
 
 class Beam
 {
 public:
   static int visible_stem_count (Grob*);
-  static Item* first_visible_stem (Grob*);
-  static Item* last_visible_stem (Grob*);
+  static Grob* first_visible_stem (Grob*);
+  static Grob* last_visible_stem (Grob*);
   static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK(rest_collision_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
   Beam (SCM);
   static void add_stem (Grob*,Grob*);
+  static bool knee_b (Grob*);
   static void set_beaming (Grob*,Beaming_info_list *);
   static void set_stemlens (Grob*);
-  static int get_multiplicity (Grob*me);
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
-  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
-  DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
-
-  /*
-    y-dy callbacks
-   */
+  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 (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  
+  /* position callbacks */
   DECLARE_SCHEME_CALLBACK (least_squares, (SCM));
-  DECLARE_SCHEME_CALLBACK (cancel_suspect_slope, (SCM));
+  DECLARE_SCHEME_CALLBACK (check_concave, (SCM));
   DECLARE_SCHEME_CALLBACK (slope_damping, (SCM));
-  DECLARE_SCHEME_CALLBACK (quantise_dy, (SCM));
-  DECLARE_SCHEME_CALLBACK (user_override, (SCM));
-  DECLARE_SCHEME_CALLBACK (do_quantise_y, (SCM));
+  DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM));  
+  DECLARE_SCHEME_CALLBACK (quanting, (SCM));
+  static Real score_slopes_dy (Real, Real, Real, Real, Real, bool);
 
-  static Molecule stem_beams (Grob*,Item *here, Item *next, Item *prev);
+  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);
+  
 
+  static int get_direction_beam_count (Grob *me, Direction d);
 private:
   static Direction get_default_dir (Grob*);
-  static void set_stem_directions (Grob*);
+  static void set_stem_directions (Grob*, Direction );
   static void consider_auto_knees (Grob*);
   static void set_stem_shorten (Grob*);
-  static Real calc_stem_y_f (Grob*, Item* s, Real y, Real dy);
-  static Real check_stem_length_f (Grob*, Real y, Real dy);
+  static Real calc_stem_y (Grob*, Grob* s, Grob**c,
+                          Real, Real,
+                          Drul_array<Real> pos, bool french);
   static void set_stem_lengths (Grob*);
-  static Real quantise_y_f (Grob*, Real y, Real dy, int quant_dir);
   static int forced_stem_count (Grob*);
 };
 
+const int REGION_SIZE = 2;
+
+#define DEBUG_QUANTING 1
+
 #endif /* BEAM_HH */