X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=f99fbf8028e2ac3cb0f428dbb3394a9156a927c3;hb=a4cc26c32b822769ce54c72d94a93936195d3eb9;hp=1fbb74f981952d6533b40d3616a96960cfbdb798;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 1fbb74f981..f99fbf8028 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -26,39 +26,16 @@
 #include "lily-proto.hh"
 #include "stem-info.hh"
 
-/*
-  TODO: move quanting in separate file.
-*/
-struct Beam_quant_parameters
-{
-  Real SECONDARY_BEAM_DEMERIT;
-  Real STEM_LENGTH_DEMERIT_FACTOR;
-  Real REGION_SIZE;
-
-  /*
-    threshold to combat rounding errors.
-  */
-  Real BEAM_EPS;
-
-  // possibly ridiculous, but too short stems just won't do
-  Real STEM_LENGTH_LIMIT_PENALTY;
-  Real DAMPING_DIRECTION_PENALTY;
-  Real MUSICAL_DIRECTION_FACTOR;
-  Real HINT_DIRECTION_PENALTY;
-  Real IDEAL_SLOPE_FACTOR;
-  Real ROUND_TO_ZERO_SLOPE;
-
-  void fill (Grob *him);
-};
-
 struct Beam_segment
 {
   int vertical_count_;
-  Interval horizontal_; 
+  Interval horizontal_;
   Beam_segment ();
 };
 
-struct Beam_stem_segment 
+bool beam_segment_less (Beam_segment const &a, Beam_segment const &b);
+
+struct Beam_stem_segment
 {
   Beam_stem_segment ();
 
@@ -70,10 +47,8 @@ struct Beam_stem_segment
   bool gapped_;
   Direction dir_;
   int max_connect_;
-  
 };
 
-
 bool operator <(Beam_stem_segment const &a, Beam_stem_segment const &b);
 
 class Beam
@@ -82,7 +57,7 @@ public:
   static int normal_stem_count (Grob *);
   static Grob *first_normal_stem (Grob *);
   static Grob *last_normal_stem (Grob *);
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
   static void add_stem (Grob *, Grob *);
   static bool is_cross_staff (Grob *);
   static bool is_knee (Grob *);
@@ -92,17 +67,18 @@ public:
   static Real get_beam_translation (Grob *me);
   static Real get_beam_thickness (Grob *me);
   static void connect_beams (Grob *me);
-  static vector<Beam_segment> get_beam_segments (Grob *me_grob, Grob **common); 
+  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 (pure_rest_collision_callback, (SCM element, SCM prev_off, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_stem_shorten, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_positions, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_least_squares_positions, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM));  
+  DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM));
   DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
@@ -111,33 +87,21 @@ public:
   DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM));
   DECLARE_SCHEME_CALLBACK (slope_damping, (SCM, SCM));
   DECLARE_SCHEME_CALLBACK (quanting, (SCM, SCM));
-  
-static Real score_slopes_dy (Real, Real, Real, Real, Real, bool, Beam_quant_parameters const *);
-
-  static Real score_stem_lengths (vector<Grob*> const &stems,
-				  vector<Stem_info> const &stem_infos,
-				  vector<Real> const &base_stem_ys,
-				  vector<Real> const &stem_xs,
-				  Real xl, Real xr,
-				  bool knee,
-				  Real yl, Real yr, Beam_quant_parameters const *);
-  static Real score_forbidden_quants (Real, Real,
-				      Real, Real, Real, Real,
-				      Drul_array<int>, Direction, Direction,
-				      Beam_quant_parameters const *);
 
   static int get_direction_beam_count (Grob *me, Direction d);
+
 private:
+  friend class Beam_scoring_problem;
+
   static Direction get_default_dir (Grob *);
   static void set_stem_directions (Grob *, Direction);
   static void consider_auto_knees (Grob *);
   static void set_stem_shorten (Grob *);
-  static Real calc_stem_y (Grob *, Grob *s, Grob **c,
-			   Real, Real, Direction,
-			   Drul_array<Real> pos, bool french);
   static int forced_stem_count (Grob *);
+  static Real calc_stem_y (Grob *, Grob *s, Grob **c,
+                           Real, Real, Direction,
+                           Drul_array<Real> pos, bool french);
 };
 
-
 #endif /* BEAM_HH */