release: 1.3.100

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

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index d3b9eb8a1e7d494ea37e832664d75749dcd74aec..200ce735927c4b6b140eecb77a6f24f296a4b3c3 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -7,65 +7,25 @@
 #ifndef STEM_HH
 #define STEM_HH
 
-#include "item.hh"
-#include "array.hh"
-#include "moment.hh"
-#include "molecule.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
+class Stem 
 {
 public:
-  static SCM brew_molecule (SCM);
+  DECLARE_SCHEME_CALLBACK(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 Beam * beam_l (Score_element*);
+  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*) ;
-  Stem (SCM);
-
-  /// 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 *) ;
@@ -73,20 +33,15 @@ public:
   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 Real off_callback (Score_element *, Axis);
+  DECLARE_SCHEME_CALLBACK(off_callback, (SCM element, SCM axis));
   static Molecule flag (Score_element*);
-  static SCM before_line_breaking (SCM);
-  static Interval dim_callback (Score_element *,Axis);
+  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis));
   static bool has_interface (Score_element*);
   static void set_interface (Score_element*);