X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=e7594f5a4d745032e12d00b608d26a5c09eb6e41;hb=342fabd2d06666257dd41c8d38e8682949a04f36;hp=768d07aaa75c311e71c229467b122fe6a115f417;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 768d07aaa7..e7594f5a4d 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,71 +1,80 @@
 /*
   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
 #define BEAM_HH
 
 #include "lily-proto.hh"
-#include "spanner.hh"
-
-
-/** a beam connects multiple stems.
+#include "lily-guile.hh"
+#include "stem-info.hh"
 
-  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)
-
-   damping: amount of beam slope damping. (int)
-   should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams 
-*/
-class Beam : public Spanner
+class Beam
 {
 public:
+  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 (Grob*,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);
 
-  int stem_count () const;
-  Stem* stem (int) const;
-  Stem* stem_top () const;
-  int visible_stem_count () const;
-  Stem* first_visible_stem () const;
-  Stem* last_visible_stem () const;
+  static void connect_beams (Grob*me);
+  DECLARE_SCHEME_CALLBACK (space_function, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (print, (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, Real, bool);
 
-  Beam ();
-  void add_stem (Stem*);
-  void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
-  void set_beaming (Beaming_info_list *);
-  void set_stemlens ();
-  VIRTUAL_COPY_CONS(Score_element);
+  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,
+				      Drul_array<int>, Direction, Direction);
+  
 
-  int get_multiplicity () const;
-
-protected:
- 
-  virtual void before_line_breaking ();
-  virtual void after_line_breaking ();
-  virtual Molecule do_brew_molecule () const;
-
-  Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
+  static int get_direction_beam_count (Grob *me, Direction d);
 private:
-  Direction get_default_dir () const;
-  void set_stem_directions ();
-  void auto_knees ();
-  bool auto_knee (String gap_str, bool interstaff_b);
-  void set_stem_shorten ();
-  void calc_default_position_and_height (Real* y, Real* dy) const;
-  bool suspect_slope_b (Real y, Real dy) const;
-  Real calc_slope_damping_f (Real dy) const;
-  Real calc_stem_y_f (Stem* s, Real y, Real dy) const;
-  Real check_stem_length_f (Real y, Real dy) const;
-  void set_stem_length (Real y, Real dy);
-  Real quantise_dy_f (Real dy) const;
-  Real quantise_y_f (Real y, Real dy, int quant_dir);
-  int forced_stem_count () const;
+  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,
+			   Drul_array<Real> 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 1
+
+#endif /* BEAM_HH */