release: 0.1.25

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index d2b8a7e19fc109eb3115de1918ae3391355905ab..d150eb1e76d42141279fdfa94ab55dbac5cfb879 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -9,6 +9,7 @@
 #include "item.hh"
 #include "varray.hh"
 #include "moment.hh"
+#include "molecule.hh"
 
 
 /**the rule attached to the ball.
@@ -27,76 +28,84 @@
   Stem size depends on flag.
   */
 class Stem : public Item {
+
+  Molecule abbrev_mol () const;
     
-    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_;
+  /// abbrev flag? + count
+  int abbrev_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_;
+
+  Direction 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 (Rhythmic_head*n);
 
-    NAME_MEMBERS();
+  DECLARE_MY_RUNTIME_TYPEINFO;
 
-    Real hpos_f()const;
-    
-    void do_print() const;
-    void set_stemend(Real);
-    int get_default_dir();
-    int get_center_distance_from_top();
-    int get_center_distance_from_bottom();
-    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;
+  Real hpos_f() const;
+  
+  int type_i () const;
+
+  void do_print() const;
+  void set_stemend (Real);
+  Direction get_default_dir();
+
+  int get_center_distance(Direction);
+  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;
+  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;
 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_elem*,Score_elem*);
+  virtual void do_pre_processing();
+  virtual Interval do_width() const;
+  Molecule* brew_molecule_p() const;
 };
 #endif