release: 0.1.41

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index ad775b7a3c8e60db44ab0967c36a14fbd66d8005..3729be625cf2c3a656294e3488b9baddaf1d41cb 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -10,41 +10,57 @@
 #include "directional-spanner.hh"
 #include "plist.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 */
+/** 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 */
 class Beam:  public Directional_spanner {
 public:
-  Link_array<Stem> stems;
+  /** The beams (especially at small slopes) should be prevented to
+    conflict with the stafflines.  This necessitates some quantisation
+    of start and end posititons of the beam.
+    */
+  enum Pos { NONE, SIT = 1, STRADDLE = 2, HANG = 4, INTER = 8 };
+  // ugh, silly C++ (Pos::NONE vs Quantise::NONE)  
+  enum Quantise { NUNE, NORMAL, TRADITIONAL };
+
+  Link_array<Stem> stems_;
   /// the slope of the beam in posns / point (dimension)   
-  Real slope;
+  Real slope_f_;
 
   /// position of leftmost end of beam  
-  Real left_pos;
-   
+  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
+  Quantise quantisation_;
+  /// maximum number of beams (for opening-up of beam-spacing)
+  int multiple_i_;
+
 
-  /* *************** */
   DECLARE_MY_RUNTIME_TYPEINFO;
   Beam();
   void add (Stem*);
 
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
-  void set_stemlens();
-  SCORE_ELEM_CLONE(Beam);
+  void set_stemlens ();
+  SCORE_ELEM_CLONE (Beam);
+
 protected:
-  virtual Interval do_width() const;    
-  virtual Offset center() const;
-  virtual void set_default_dir();
-  virtual void do_pre_processing();
-  virtual void do_post_processing();
+  virtual Interval do_width () const;    
+  Offset center () const;
+  void set_default_dir ();
+  virtual void do_pre_processing ();
+  virtual void do_post_processing ();
   virtual void do_substitute_dependent (Score_elem*, Score_elem*);
 
   virtual void do_print() const;
 
-private:
-  Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
-  void solve_slope();
-  Molecule*brew_molecule_p() const;
+  virtual void quantise_left_y (Beam::Pos pos, bool extend_b);
+  virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
+  virtual void solve_slope ();
+  virtual void quantise_yspan ();
+  virtual Molecule*brew_molecule_p () const;
 };
 
 #endif // BEAM_HH