X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=b404862ee923c1fdb043b65c2f831ede6204e2e4;hb=9e6f16dddf9e21b29eed1717efe4bac6c20774ba;hp=0a4aee48595dd3a98cd66a951f48f8589f52fbb9;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 0a4aee4859..b404862ee9 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,83 +1,60 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
 #define STEM_HH
 
+#include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
+#include "grob-interface.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 
+class Stem
 {
 public:
-  static SCM brew_molecule (SCM);
-
-  /// log of the duration. Eg. 4 -> 16th note -> 2 flags
-  static  int flag_i (Score_element*) ;
-  static int beam_count (Score_element*,Direction) ;
-  static void set_beaming (Score_element*,int,  Direction d);
-  /** 
-      don't print flag when in beam.
-      our beam, for aligning abbrev flags
-  */
-  static Score_element * beam_l (Score_element*);
-  static Score_element * first_head (Score_element*) ;
-  static Drul_array<Score_element*> extremal_heads (Score_element*);
-  static Score_element * support_head (Score_element*) ;
+  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 *);
   
-  /// ensure that this Stem also encompasses the Notehead #n#
-  static void add_head (Score_element*me, Score_element*n);
-  static Stem_info calc_stem_info (Score_element *) ;
-  static Real chord_start_f (Score_element *) ;
-  static Direction get_direction (Score_element*) ;
-  static int type_i (Score_element *) ;
-  static void set_stemend (Score_element *,Real);
-  static Direction get_default_dir(Score_element *) ;
-  static int get_center_distance(Score_element *,Direction) ;
-  static int heads_i (Score_element *) ;
-  static bool invisible_b(Score_element *) ;
- 
-  /// heads that the stem encompasses (positions)
-  static Interval head_positions(Score_element *) ;
-  static Real get_default_stem_end_position (Score_element*me) ;
-  static void position_noteheads(Score_element*);
-  static Real stem_end_position (Score_element*) ;
-  static SCM off_callback (SCM element, SCM axis);
-  static Molecule flag (Score_element*);
-  static SCM before_line_breaking (SCM);
-  static Interval dim_callback (Score_element *,Axis);
-  static bool has_interface (Score_element*);
-  static void set_interface (Score_element*);
-
-  static void set_spacing_hints (Score_element*me) ;
+  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