patch::: 1.3.127.jcn2

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 18126770aff1a6523ef5a2e89317a1f42ffe0223..c1eb843b1a261a9703600b7ef50d289bccc16ec0 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -29,6 +29,17 @@ public:
   DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
   DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
   DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
+
+  /*
+    y-dy callbacks
+   */
+  DECLARE_SCHEME_CALLBACK (least_squares, (SCM));
+  DECLARE_SCHEME_CALLBACK (cancel_suspect_slope, (SCM));
+  DECLARE_SCHEME_CALLBACK (slope_damping, (SCM));
+  DECLARE_SCHEME_CALLBACK (quantise_dy, (SCM));
+  DECLARE_SCHEME_CALLBACK (user_override, (SCM));
+  DECLARE_SCHEME_CALLBACK (do_quantise_y, (SCM));
+
   static Molecule stem_beams (Grob*,Item *here, Item *next, Item *prev);
 
 private:
@@ -36,13 +47,9 @@ private:
   static void set_stem_directions (Grob*);
   static void consider_auto_knees (Grob*);
   static void set_stem_shorten (Grob*);
-  static void calc_default_position_and_height (Grob*,Real* y, Real* dy);
-  static bool suspect_slope_b (Grob*, Real y, Real dy);
-  static Real calc_slope_damping_f (Grob*, Real dy);
   static Real calc_stem_y_f (Grob*, Item* s, Real y, Real dy);
   static Real check_stem_length_f (Grob*, Real y, Real dy);
-  static void set_stem_length (Grob*, Real y, Real dy);
-  static Real quantise_dy_f (Grob*, Real dy);
+  static void set_stem_lengths (Grob*);
   static Real quantise_y_f (Grob*, Real y, Real dy, int quant_dir);
   static int forced_stem_count (Grob*);
 };