X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=a54b211849cf4e9b99fa26da9e90213d4c6acf0a;hb=59ed0cee2aae58a3f0483f21261c68aee406fa10;hp=dad7e1660fbf8b2b53cac21f52590f5e002e23f9;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index dad7e1660f..a54b211849 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,14 +1,15 @@
 /*
   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"
 
 
 /**the rule attached to the ball.
@@ -21,78 +22,99 @@
   \end{itemize}
 
   should move beam_{left, right} into Beam
+
+  TODO.
+  
+  Stem size depends on flag.
   */
 class Stem : public Item {
+
     
-    Real stem_bottom_f_, stem_top_f_;
-    
+  Drul_array<Real> yextent_drul_;
     
-    /// needed for determining direction/length
-    int staff_size_i_;
-
-    /**extent of the stem (positions).
-      fractional, since Beam has to adapt them.
-      */
-
-
-    /**
-      geen gedonder, jij gaat onder.
-      -1 stem points down, +1: stem points up
-      */
-    Real stem_xoffset_f_;
-    /**
-      store the wholes (for vapourware tremolo)
-     */
-    Link_array<Note_head> whole_l_arr_;
-    Link_array<Note_head> head_l_arr_;
-    Link_array<Note_head> rest_l_arr_;
+  /// needed for determining direction/length
+  int staff_size_i_;
+
+  /**extent of the stem (positions).
+    fractional, since Beam has to adapt them.
+    */
+
+
+  /**
+    geen gedonder, jij gaat onder.
+    -1 stem points down, +1: stem points up
+    */
+  Direction  stem_xdir_;
+
+  Link_array<Note_head> head_l_arr_;
+  Link_array<Rest> rest_l_arr_;
     
 public:
-    /// flagtype? 4 none, 8 8th flag, 0 = beam.
-    int flag_i_;
 
-    int beams_left_i_;
-    int beams_right_i_;
+  /// how many abbrev beam don't reach stem?
+  int beam_gap_i_;
 
-    /// false if in beam
-    bool print_flag_b_;
-    
-    int dir_i_;
+  /// log of the duration. Eg. 4 -> 16th note -> 2 flags
+  int flag_i_;
+
+  /** 
+    don't print flag when in beam.
+    our beam, for aligning abbrev flags
+   */
+  Beam* beam_l_;
 
+  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(int staff_size_i);
+  Stem ();
     
-    /// ensure that this Stem also encompasses the Notehead #n#
-    void add(Note_head*n);
+  /// ensure that this Stem also encompasses the Notehead #n#
+  void add_head (Rhythmic_head*n);
 
-    NAME_MEMBERS(Stem);
+  DECLARE_MY_RUNTIME_TYPEINFO;
 
-    Real hpos_f()const;
-    
-    void do_print() const;
-    void set_stemend(Real);
-    int get_default_dir();
-    int get_center_distance();
-    void set_default_dir();
-    void set_default_stemlen();
-    void set_default_extents();
-    void set_noteheads();
-
-    Real stem_length_f()const;
-    Real stem_end_f()const;
-    Real stem_start_f() const;
-
-    bool invisible_b()const;
-    bool chord_b()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() 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();
+
+  Real stem_length_f() const;
+  Real stem_end_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;
+  /// 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_pre_processing();
-    virtual Interval do_width() const;
-    Molecule* brew_molecule_p() const;
+  virtual void do_substitute_dependency (Score_element*,Score_element*);
+  virtual void do_pre_processing();
+  virtual Interval do_width() const;
+  Molecule* brew_molecule_p() const;
 };
 #endif