Imported Upstream version 2.16.0

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index f541a216be2966b4732eedc1ed7ceb838fb4458e..116ae6aa5730a72ad616594c69bc89bb34991672 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -29,13 +29,13 @@
 struct Beam_segment
 {
   int vertical_count_;
-  Interval horizontal_; 
+  Interval horizontal_;
   Beam_segment ();
 };
 
-bool beam_segment_less (Beam_segment const& a, Beam_segment const& b);
+bool beam_segment_less (Beam_segment const &a, Beam_segment const &b);
 
-struct Beam_stem_segment 
+struct Beam_stem_segment
 {
   Beam_stem_segment ();
 
@@ -49,7 +49,6 @@ struct Beam_stem_segment
   int max_connect_;
 };
 
-
 bool operator <(Beam_stem_segment const &a, Beam_stem_segment const &b);
 
 class Beam
@@ -58,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 *);
@@ -68,41 +67,38 @@ 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 Interval no_visible_stem_positions (Grob *me, Interval default_value);
-  
+  static vector<Beam_segment> get_beam_segments (Grob *me_grob, Grob **common);
+
   DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off));
+  DECLARE_SCHEME_CALLBACK (pure_rest_collision_callback, (SCM element, SCM, SCM, SCM prev_off));
   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_concaveness, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM));
   DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
-
+  DECLARE_SCHEME_CALLBACK (calc_beam_segments, (SCM));
   /* position callbacks */
-  DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (slope_damping, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (quanting, (SCM, SCM));
-  
+  DECLARE_SCHEME_CALLBACK (quanting, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_x_positions, (SCM));
+
   static int get_direction_beam_count (Grob *me, Direction d);
 
 private:
   friend class Beam_scoring_problem;
-  
+
   static Direction get_default_dir (Grob *);
+  static vector<Beam_segment> get_beam_segments (Grob *);
   static void set_stem_directions (Grob *, Direction);
   static void consider_auto_knees (Grob *);
   static void set_stem_shorten (Grob *);
   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);
+                           Real, Real, Direction,
+                           Drul_array<Real> pos, bool french);
 };
 
-
 #endif /* BEAM_HH */