X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=3d06bca6f6e08745fac2cf705ceba87ba7e9536d;hb=0fee6eb672cef04454e02856412f9bcea3f4115b;hp=5e6260c6b0281ad52cd3610683880b523f3981f9;hpb=85d8b50f9d36b3f2d38aa11de3755cf563ac49e3;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 5e6260c6b0..3d06bca6f6 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,12 +1,13 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2006 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"
@@ -14,7 +15,7 @@
 class Stem
 {
 public:
-  static Array<int> note_head_positions (Grob *);
+  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);
@@ -40,13 +41,16 @@ public:
   static void set_spacing_hints (Grob *);
   
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element, SCM axis));
+  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_callback, (SCM smob, SCM axis));
-  DECLARE_SCHEME_CALLBACK (height, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
 };
 #endif