release: 1.3.12

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index fcf477430e5241d3f3ee0ce5e0a4bd9a167ee56f..ff53282f52661eaf11fa9b0d8e2507c15a89f6e7 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -9,13 +9,12 @@
 
 #include "lily-proto.hh"
 #include "directional-spanner.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
+  beam and that point in the correct direction (urg?)
 
 elt property:
 
@@ -23,60 +22,60 @@ damping: amount of beam slope damping. (int)
 
 should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams 
 
+slope_quantisation: 'none, 'normal or 'traditional
 
 */
-class Beam : public Directional_spanner  {
+class Beam : public Directional_spanner
+{
 public:
-  /** 
-    The beams should be prevented to conflict with the stafflines, 
-    especially at small slopes.
-    */
-  enum Quantisation { NONE, NORMAL, TRADITIONAL, TEST };
-  enum Dir_algorithm { /* DOWN=-1, UP=1, */ MAJORITY=2, MEAN, MEDIAN };
-
-  Link_array<Stem> stems_;
-  /// the slope of the beam in posns / point (dimension)   
-  Real slope_f_;
-  /// the slope as solved; not quantised or damped
-  Real solved_slope_f_;
+
+  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;
+
+  /**
+     the slope of the beam in dy/dx
+   */
+  Real dydx_f_;
 
   /// position of leftmost end of beam  
   Real left_y_;
 
-  /** should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional
-      JUNKME.
-   */
-  Quantisation quantisation_;
-  
-  /// maximum number of beams (for opening-up of beam-spacing)
-  int multiple_i_;
-
-  Array<Stem_info> sinfo_;
-  
-  Beam();
+  Beam ();
   void add_stem (Stem*);
-  Stem_info get_stem_info (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 Interval do_width () const;    
-  Offset center () const;
-  void set_default_dir ();
-  void set_steminfo ();
+ 
   virtual void do_pre_processing ();
   virtual void do_post_processing ();
-  virtual void do_substitute_element_pointer (Score_element*, Score_element*);
-  virtual void do_print() const;
-  virtual void quantise_left_y (bool extend_b);
-  virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
-  virtual void calculate_slope ();
-  virtual Real check_stemlengths_f (bool set_b);
-  virtual void solve_slope ();
-  virtual void quantise_dy ();
   virtual Molecule*do_brew_molecule_p () const;
+
+  Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
+private:
+  Direction calc_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_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;
+
 };
 
 #endif // BEAM_HH