patch::: 1.5.41.jcn2

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 99eac088af3a3482a4090bb07614e468c337f40b..86c539d8ffadb5d7595de15554f2af7caa05ce3f 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,73 +1,60 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef BEAM_HH
 #define BEAM_HH
 
 #include "lily-proto.hh"
-#include "spanner.hh"
+#include "lily-guile.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)
-
-   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 SCM scheme_molecule (SCM);
-  
-
-  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 int visible_stem_count (Grob*);
+  static Item* first_visible_stem (Grob*);
+  static Item* last_visible_stem (Grob*);
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
   Beam (SCM);
-  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);
-
-  int get_multiplicity () const;
-
-protected:
- 
-  virtual void before_line_breaking ();
-  virtual void after_line_breaking ();
-  virtual Molecule do_brew_molecule () const;
+  static void add_stem (Grob*,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 ));
+  DECLARE_SCHEME_CALLBACK (end_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 (quantise_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (new_quanting, (SCM));
+  DECLARE_SCHEME_CALLBACK (score_slopes_dy, (SCM, SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (score_stem_lengths, (SCM, SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (score_forbidden_quants, (SCM, SCM,SCM));
+  
+  
+  static Molecule stem_beams (Grob*,Item *here, Item *next, Item *prev,
+                             Real dydx);
 
-  Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
 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*);
+  static void consider_auto_knees (Grob*);
+  static void set_stem_shorten (Grob*);
+  static Real calc_stem_y_f (Grob*, Item* s, Interval pos);
+  static Real check_stem_length_f (Grob*, Interval pos);
+  static void set_stem_lengths (Grob*);
+  static Interval quantise_interval (Grob*, Interval pos, Direction quant_dir);
+  static int forced_stem_count (Grob*);
 };
 
-#endif // BEAM_HH
+#endif /* BEAM_HH */