X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=cbb8f690948d00dbddcdf56f7802d4bb7bee5ce2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6f6fd757829d57aa57de0ef0a928939e5c61318f;hpb=f9eafe65e3d281e6cd07a25d8b6b19cc1eada1de;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 6f6fd75782..cbb8f69094 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,108 +1,60 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
 #define STEM_HH
-#include "item.hh"
-#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:
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "stem-info.hh"
+#include "grob-interface.hh"
 
-  \begin{itemize}
-  \item the rule
-  \item the flag
-  \item up/down position.
-  \end{itemize}
-
-  should move beam_{left, right} into Beam
-
-  TODO.
-  
-  Stem size depends on flag.
-
-  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
+class Stem
 {
-
-  /**extent of the stem (positions).
-    fractional, since Beam has to adapt them.
-    */
-  Drul_array<Real> yextent_drul_;
-
 public:
-
-    
-  /// 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 () const;
-  Note_head * first_head () const;
-
-  Drul_array<int> beams_i_drul_;
-  Stem ();
-    
-  /// ensure that this Stem also encompasses the Notehead #n#
-  void add_head (Rhythmic_head*n);
-  void beamify ();
-
-  Real hpos_f () const;
-  Real chord_start_f () const;
+  static vector<int> note_head_positions (Grob *);
+  static int duration_log (Grob *);
+  static void set_beaming (Grob *, int, Direction d);
+  static int get_beaming (Grob *, Direction d);
+  static Spanner *get_beam (Grob *);
+  static Grob *first_head (Grob *);
+  static Grob *last_head (Grob *);
+  static Drul_array<Grob *> extremal_heads (Grob *);
+  static Grob *support_head (Grob *);
+  static void add_head (Grob *me, Grob *n);
+  static Stem_info get_stem_info (Grob *);
+  static Real chord_start_y (Grob *);
+  static void set_stemend (Grob *, Real);
+  static Slice beam_multiplicity (Grob *);
+  static Direction get_default_dir (Grob*);
+  static Real thickness (Grob *);
+  static int head_count (Grob *);
+  static bool is_invisible (Grob *);
+  static bool is_normal_stem (Grob *);
+  static bool is_cross_staff (Grob *);
+  static Interval head_positions (Grob *);
+  static Real stem_end_position (Grob *);
+  static Stencil flag (Grob *);
+  static Stencil get_translated_flag (Grob*);
+  DECLARE_GROB_INTERFACE();
+  static void set_spacing_hints (Grob *);
   
-  int type_i () const;
-
-  void do_print() const;
-  void set_stemend (Real);
-  Direction get_default_dir() const;
-
-  int get_center_distance(Direction) const;
-
-  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)
-  Interval_t<int> head_positions() const;
-
-protected:
-  Molecule flag () const;
-
-  virtual void do_pre_processing();
-  static Interval dim_callback (Dimension_cache const*);
-  virtual Molecule* do_brew_molecule_p() const;
-
-  void set_spacing_hints () ;
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_default_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_length, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stem_end_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stem_info, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_flag, (SCM));
 };
 #endif