patch::: 1.1.26.jcn2: fixjes

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index e9e5cac4c49ff04166749747d03c007ec31a8288..c87555367f6d94ec4367fe325f30f6da362f049f 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,13 +1,13 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
 #define STEM_HH
 #include "item.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "moment.hh"
 #include "molecule.hh"
 
@@ -46,11 +46,10 @@ class Stem : public Item {
     */
   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_;
 
@@ -63,21 +62,32 @@ public:
    */
   Beam* beam_l_;
 
-  int beams_left_i_;
-  int beams_right_i_;
+  /// our slur (urg)
+  Slur* slur_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 (Rhythmic_head*n);
+  void add_head (Rhythmic_head*n);
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  
 
   Real hpos_f () const;
   Real chord_start_f () const;
@@ -86,10 +96,10 @@ public:
 
   void do_print() const;
   void set_stemend (Real);
-  Direction get_default_dir();
-  Direction get_dir ();
+  Direction get_default_dir() const;
+  Direction get_dir () const;
 
-  int get_center_distance(Direction);
+  int get_center_distance(Direction) const;
   void set_default_dir();
   void set_default_stemlen();
   void set_default_extents();
@@ -104,10 +114,11 @@ public:
     
   /// heads that the stem encompasses (positions)
   Interval_t<int> head_positions() const;
+  virtual ~Stem ();
 protected:
-  virtual void do_substitute_dependency (Score_elem*,Score_elem*);
+  virtual void do_substitute_dependency (Score_element*,Score_element*);
   virtual void do_pre_processing();
   virtual Interval do_width() const;
-  Molecule* brew_molecule_p() const;
+  virtual Molecule* do_brew_molecule_p() const;
 };
 #endif