release: 1.3.12

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 2d91e441e9c0a8d6d07abda450ff207a2396411f..7da90a36493009e90690d4a1ab0b6d3943364217 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -6,11 +6,13 @@
 
 #ifndef STEM_HH
 #define STEM_HH
+
 #include "item.hh"
 #include "array.hh"
 #include "moment.hh"
 #include "molecule.hh"
-#include "staff-symbol-referencer.hh"
+#include "directional-element.hh"
+#include "stem-info.hh"
 
 /**the rule attached to the ball.
   takes care of:
@@ -39,46 +41,38 @@
 
   
   */
-// todo: remove baseclass Staff_symbol_referencer, since stem
-// can be across a staff.
-class Stem : public Item, public Staff_symbol_referencer {
+class Stem : public Item,
+            public Directional_element
+{
 
   /**extent of the stem (positions).
     fractional, since Beam has to adapt them.
     */
-  Drul_array<Real> yextent_drul_;
-
-  /// direction stem (that's me)
-  Direction dir_;
+  Interval yextent_;
 
 public:
-  void set_direction (Direction d);
-  Direction get_direction () const { return dir_; }
-
-  Link_array<Note_head> head_l_arr_;
-  Link_array<Rest> rest_l_arr_;
-    
   /// log of the duration. Eg. 4 -> 16th note -> 2 flags
-  int flag_i_;
+  int flag_i () const;
 
+  int beam_count (Direction) const;
+  void set_beaming (int,  Direction d);
   /** 
     don't print flag when in beam.
     our beam, for aligning abbrev flags
    */
-  Beam* beam_l_;
-
-  Drul_array<int> beams_i_drul_;
+  Beam* beam_l () const;
+  Note_head * first_head () const;
+  Score_element * support_head () const;
   Stem ();
-    
   /// ensure that this Stem also encompasses the Notehead #n#
   void add_head (Rhythmic_head*n);
 
   Real hpos_f () const;
+  Stem_info calc_stem_info () const;
+
   Real chord_start_f () const;
   
   int type_i () const;
-
-  void do_print() const;
   void set_stemend (Real);
   Direction get_default_dir() const;
 
@@ -88,7 +82,6 @@ public:
   void set_default_extents();
   void set_noteheads();
 
-  Real stem_length_f() const;
   Real stem_end_f() const;
   Real stem_begin_f() const;
   Real note_delta_f () const;
@@ -100,9 +93,9 @@ public:
 
 protected:
   Molecule flag () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+
   virtual void do_pre_processing();
-  virtual Interval do_width() const;
+  static Interval dim_callback (Dimension_cache const*);
   virtual Molecule* do_brew_molecule_p() const;
 
   void set_spacing_hints () ;