release: 1.0.1

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 3a034df85e09e778f97ab6afdc467ff03bc7233d..6bef757c911b755851ee34beff3a27925f5576f3 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"
 
@@ -29,7 +29,6 @@
   */
 class Stem : public Item {
 
-  Molecule abbrev_mol () const;
     
   Drul_array<Real> yextent_drul_;
     
@@ -51,8 +50,6 @@ class Stem : public Item {
   Link_array<Rest> rest_l_arr_;
     
 public:
-  /// abbrev flag? + count
-  int abbrev_flag_i_;
 
   /// how many abbrev beam don't reach stem?
   int beam_gap_i_;
@@ -69,25 +66,37 @@ public:
   int beams_left_i_;
   int beams_right_i_;
 
+  /// 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_;
     
   /* *************** */
   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 hpos_f () const;
+  Real chord_start_f () const;
   
   int type_i () const;
 
   void do_print() const;
   void set_stemend (Real);
-  Direction get_default_dir();
-  int get_center_distance_from_top();
-  int get_center_distance_from_bottom();
+  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();
@@ -95,16 +104,16 @@ public:
 
   Real stem_length_f() const;
   Real stem_end_f() const;
-  Real stem_start_f() const;
+  Real stem_begin_f() const;
   Real note_delta_f () const;
 
   bool invisible_b() const;
     
   /// heads that the stem encompasses (positions)
-  int max_head_i() const;
-  int min_head_i() const;
+  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;