X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=e2e594c6612b48dd0d66a520a675631fe7544731;hb=285afa80427ca7c750bbf0a605914196769e1774;hp=3ed32fae68a1cdd4928890ba64e511ecd93649b9;hpb=ce9845392e4e22ae9c5f6ec1da914eb301f1892c;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 3ed32fae68..e2e594c661 100644
--- 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEAM_HH
@@ -9,85 +12,65 @@
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
+#include "stem-info.hh"
 
 
-/** a beam connects multiple stems.
-
-  Beam adjusts the stems its owns to make sure that they reach the
-  beam and that point in the correct direction (urg?)
-
-   elt_properties:
-   
-   y-position -- real  (position of left edge)
-
-   height -- real  (dy)
-
-
-   Read-only
-   =========
-   
-   flag-width-function --
-
-   damping -- amount of beam slope damping. (int)
-     should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams 
-
-   default-neutral-direction -- which direction to choose if we're in
-     the middle of the staff
-   
-   thickness -- weight of beams, in staffspace
-
-   space-function -- function of type multiplicity -> real (in staffspace)
-
-   beamed-stem-shorten --
-
-   height-quants --
-
-   vertical-position-quant-function --
-
-   dir-function --
-   
-   damping -- damping factor (real).
-
-   outer-stem-length-limit -- catch suspect beam slopes, set slope to zero if
-     outer stem is lengthened more than this (in staffspace)
-
-   slope-limit -- set slope to zero if slope is running away steeper than this.
-*/
 class Beam
 {
 public:
-  static int visible_stem_count (Score_element*);
-  static  Item* first_visible_stem (Score_element*);
-  static  Item* last_visible_stem (Score_element*);
-  static bool has_interface (Score_element*);
-  static void set_interface (Score_element*);  
-  static Real rest_collision_callback (Score_element *,Axis);
+  static int visible_stem_count (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));
   Beam (SCM);
-  static void add_stem (Score_element*,Score_element*);
-  static void set_beaming (Score_element*,Beaming_info_list *);
-  static void set_stemlens (Score_element*);
-  static int get_multiplicity (Score_element*me);
-  static SCM brew_molecule (SCM);
-  static SCM before_line_breaking (SCM);
-  static SCM after_line_breaking (SCM);
-  static Molecule stem_beams (Score_element*,Item *here, Item *next, Item *prev);
-
+  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_beam_count (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 (check_concave, (SCM));
+  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_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 (Score_element*);
-  static  void set_stem_directions (Score_element*);
-  static  void auto_knees (Score_element*);
-  static  bool auto_knee (Score_element*,String gap_str, bool interstaff_b);
-  static void set_stem_shorten (Score_element*);
-  static  void calc_default_position_and_height (Score_element*,Real* y, Real* dy);
-  static  bool suspect_slope_b (Score_element*, Real y, Real dy);
-  static  Real calc_slope_damping_f (Score_element*, Real dy);
-  static  Real calc_stem_y_f (Score_element*, Item* s, Real y, Real dy);
-  static  Real check_stem_length_f (Score_element*, Real y, Real dy);
-  static  void set_stem_length (Score_element*, Real y, Real dy);
-  static   Real quantise_dy_f (Score_element*, Real dy);
-  static  Real quantise_y_f (Score_element*, Real y, Real dy, int quant_dir);
-  static int forced_stem_count (Score_element*);
+  static Direction get_default_dir (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 (Grob*, Grob* s, Grob**c,
+			   Real, Real,
+			   Interval pos, bool french);
+  static void set_stem_lengths (Grob*);
+  static int forced_stem_count (Grob*);
 };
 
-#endif // BEAM_HH
+const int REGION_SIZE = 2;
+#define DEBUG_QUANTING 0
+
+
+#endif /* BEAM_HH */