release: 1.3.4

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 81f4617bf94d7b62d7ab1ba282ca360f579d5916..411848696b843cac8d8ba4db0e8df5da1d59a553 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,7 +1,7 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
@@ -10,7 +10,8 @@
 #include "array.hh"
 #include "moment.hh"
 #include "molecule.hh"
-
+#include "staff-symbol-referencer.hh"
+#include "directional-element.hh"
 
 /**the rule attached to the ball.
   takes care of:
@@ -26,34 +27,35 @@
   TODO.
   
   Stem size depends on flag.
-  */
-class Stem : public Item {
 
-    
-  Drul_array<Real> yextent_drul_;
-    
-  /// needed for determining direction/length
-  int staff_size_i_;
+  elt properties:
+
+  beam_dir: direction of the beam (int)
+
+  dir_force: is direction explicitely specified? (bool)
+
+  /// how many abbrev beam don't reach stem?
+  int beam_gap_i_;
+
+
+  
+  */
+// todo: remove baseclass Staff_symbol_referencer, since stem
+// can be across a staff.
+class Stem : public Item, public Staff_symbol_referencer,
+            public Directional_element
+{
 
   /**extent of the stem (positions).
     fractional, since Beam has to adapt them.
     */
+  Drul_array<Real> yextent_drul_;
 
-
-  /**
-    geen gedonder, jij gaat onder.
-    -1 stem points down, +1: stem points up
-    */
-  Direction  stem_xdir_;
+public:
 
   Link_array<Note_head> head_l_arr_;
   Link_array<Rest> rest_l_arr_;
     
-public:
-
-  /// how many abbrev beam don't reach stem?
-  int beam_gap_i_;
-
   /// log of the duration. Eg. 4 -> 16th note -> 2 flags
   int flag_i_;
 
@@ -64,29 +66,11 @@ public:
   Beam* beam_l_;
 
   Drul_array<int> beams_i_drul_;
-
-  /// maximum number of beams
-  int mult_i_;
-
-  /// direction stem (that's me)
-  Direction dir_;
-
-  /// is direction explicitely specified?
-  bool dir_forced_b_;
-
-  /// direction of the beam
-  Direction beam_dir_;
-
-  /// what staff am i on?
-  Staff_symbol* staff_sym_l_;    
-
   Stem ();
     
   /// ensure that this Stem also encompasses the Notehead #n#
   void add_head (Rhythmic_head*n);
 
-  
-
   Real hpos_f () const;
   Real chord_start_f () const;
   
@@ -95,10 +79,9 @@ public:
   void do_print() const;
   void set_stemend (Real);
   Direction get_default_dir() const;
-  Direction get_dir () const;
 
   int get_center_distance(Direction) const;
-  void set_default_dir();
+
   void set_default_stemlen();
   void set_default_extents();
   void set_noteheads();
@@ -112,11 +95,14 @@ public:
     
   /// heads that the stem encompasses (positions)
   Interval_t<int> head_positions() const;
-  virtual ~Stem ();
+
 protected:
-  virtual void do_substitute_dependency (Score_element*,Score_element*);
+  Molecule flag () const;
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
   virtual void do_pre_processing();
   virtual Interval do_width() const;
   virtual Molecule* do_brew_molecule_p() const;
+
+  void set_spacing_hints () ;
 };
 #endif