X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Finclude%2Fbeam.hh;h=258c538d9db3a93f56fd4ab905d4f68b0ee9e9c0;hb=795708fdc77fccf592103e995d97ea5fda9e094f;hp=a8b6ca286a3d8c2de56290a7cdae7d11096b8689;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index a8b6ca286a..258c538d9d 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -9,65 +9,76 @@
 
 #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
+
+elt property:
+
+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  {
 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)   
+
+  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 (staffpositions) per (X-dimension, in PT).
+     UGH. standardise this for once and for all.
+   */
   Real slope_f_;
-  /// the slope as solved; not quantised or damped
-  Real solved_slope_f_;
 
   /// position of leftmost end of beam  
   Real left_y_;
-  /// should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams
-  int damping_i_;
-  /// should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional
-  Quantisation quantisation_;
-  /// maximum number of beams (for opening-up of beam-spacing)
-  int multiple_i_;
 
-  /// vertical align distance between staffs
-  Drul_array<Real> vertical_align_drul_;
+  /** 
+   */
 
-  Array<Stem_info> sinfo_;
-  
-  Beam();
+  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);
+  int multiplicity_i () const;
 
 protected:
-  virtual Interval do_width () const;    
   Offset center () const;
-  void set_default_dir ();
-  void set_steminfo ();
+  Direction get_default_dir () const;
+  void set_direction (Direction);
+  void set_stem_shorten ();
+  bool auto_knee (SCM gap, bool interstaff_b);
+  bool auto_knees ();
+  
   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:
+  void calculate_slope ();
+  Real check_stemlengths_f (bool set_b);
+  void solve_slope ();
+
+  void quantise_left_y (bool extend_b);
+  void quantise_dy ();
+
 };
 
 #endif // BEAM_HH