X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fstem.hh;h=432cd57073f3d0cd7c9d0f0a342912fa3b526ca7;hb=fceacfbaa44cdf0eafcfbcce0ea97ebf5d823c4e;hp=b496614ebeb08b00d8c244836a55af073f7869d9;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index b496614ebe..432cd57073 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,97 +1,53 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
 #define STEM_HH
 
-#include "item.hh"
-#include "array.hh"
-#include "moment.hh"
-#include "molecule.hh"
-#include "directional-element.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 #include "stem-info.hh"
+#include "drul-array.hh"
 
-/**the rule attached to the ball.
-  takes care of:
-
-  \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_;
-
-
-  
-  */
-class Stem : public Item,
-	     public Directional_element
+class Stem 
 {
 public:
-  /// log of the duration. Eg. 4 -> 16th note -> 2 flags
-  int flag_i () const;
-
-  int beam_count (Direction) const;
-  void set_beaming (int,  Direction d);
-  /** 
-    don't print flag when in beam.
-    our beam, for aligning abbrev flags
-   */
-  Beam* beam_l () const;
-  Note_head * first_head () const;
-  Score_element * support_head () const;
-  Stem ();
-
-  /// ensure that this Stem also encompasses the Notehead #n#
-  void add_head (Rhythmic_head*n);
-
-  Real hpos_f () const;
-  Stem_info calc_stem_info () const;
-
-  Real chord_start_f () const;
+  static Array<int> note_head_positions (Grob *);
+  static int duration_log (Grob *);
+  static void set_beaming (Grob *, int, Direction d);
+  static Grob *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 Direction get_direction (Grob *);
+  static void set_stemend (Grob *,Real);
+  static Direction get_default_dir (Grob *);
+  static Slice Stem::beam_multiplicity (Grob *);
+
+  static int head_count (Grob *);
+  static bool invisible_b (Grob *) ;
+  static Interval head_positions (Grob *);
+  static Real get_default_stem_end_position (Grob*me);
+  static void position_noteheads (Grob *);
+  static Real stem_end_position (Grob *);
+  static Molecule flag (Grob *);
+  static bool has_interface (Grob *);
+  static void set_spacing_hints (Grob *);
   
-  int type_i () const;
-  void set_stemend (Real);
-  Direction get_default_dir() const;
-  int get_center_distance(Direction) const;
-  Real  get_default_stemlen() const;
-
-  void position_noteheads();
-
-  Real stem_end_position () const;
-
-  // todo: cleanup, naming
-  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 (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (off_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (dim_callback, (SCM smob, SCM axis));
+  DECLARE_SCHEME_CALLBACK (height, (SCM, SCM));
+
+private:
+  static void calc_stem_info (Grob *);
 };
 #endif