X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=fcf477430e5241d3f3ee0ce5e0a4bd9a167ee56f;hb=67a763d2c94cf4e24c01186d9f2df06b31778778;hp=f6f59c8c9eb24f178eefdd837ee5966479073eb3;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index f6f59c8c9e..fcf477430e 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,20 +1,31 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef BEAM_HH
 #define BEAM_HH
+
 #include "lily-proto.hh"
 #include "directional-spanner.hh"
-#include "plist.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 */
-class Beam:  public Directional_spanner {
+  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 
+
+
+*/
+class Beam : public Directional_spanner  {
 public:
   /** 
     The beams should be prevented to conflict with the stafflines, 
@@ -31,37 +42,41 @@ public:
 
   /// 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
+
+  /** 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_;
 
-
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  Array<Stem_info> sinfo_;
+  
   Beam();
   void add_stem (Stem*);
+  Stem_info get_stem_info (Stem*);
 
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
   void set_stemlens ();
-  SCORE_ELEMENT_CLONE (Beam);
+  VIRTUAL_COPY_CONS(Score_element);
 
 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_dependent (Score_element*, Score_element*);
-
+  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*brew_molecule_p () const;
+  virtual Molecule*do_brew_molecule_p () const;
 };
 
 #endif // BEAM_HH