X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=3b61792aebfde302494e8d9df480313e69c0a59d;hb=e0ab7a37fa31290d42c9e5534ac5480c7d9f4a8f;hp=e505cd670926a193e10fb57dbd1e7452ddb4d135;hpb=8eafccec8c45891d8e00366ca2f67f67a9c93cf9;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index e505cd6709..3b61792aeb 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -83,6 +83,7 @@ public:
   static Real get_thickness (Grob *me);
   static void connect_beams (Grob *me);
   static vector<Beam_segment> get_beam_segments (Grob *me_grob, Grob **common); 
+  static Interval no_visible_stem_positions (Grob *me, Interval default_value);
   
   DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
@@ -94,7 +95,7 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM));  
   DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM));
   DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM));
-  DECLARE_SCHEME_CALLBACK (cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
 
   /* position callbacks */
   DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM));
@@ -122,7 +123,7 @@ private:
   static void consider_auto_knees (Grob *);
   static void set_stem_shorten (Grob *);
   static Real calc_stem_y (Grob *, Grob *s, Grob **c,
-			   Real, Real,
+			   Real, Real, Direction,
 			   Drul_array<Real> pos, bool french);
   static int forced_stem_count (Grob *);
 };