X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=691c601129e337c12a8892f0f7f474538ebe172f;hb=5e7ba357ed642cad2e07f53d8c27d96128fe7dab;hp=425ae585a790d8de8e8829f1b75f17c4fa722888;hpb=1d9a73b13ee576d28c0f41f5b243f2ebb1ff9fcf;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 425ae585a7..691c601129 100644
--- 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -70,19 +70,19 @@ public:
   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 prev_off, SCM, SCM));
+  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_normal_stems, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_concaveness, (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 (quanting, (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);
 
@@ -90,6 +90,7 @@ 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 *);