X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=467f1248f260cfa2b8d30b0ee82223674460a102;hb=1f8a60df45cfe68b39a6461b4f898a677847ff8c;hp=149ef321c1b2f449270621b9c4bbcc0802e9279c;hpb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 149ef321c1..467f1248f2 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -15,15 +15,13 @@
 
 struct Align_interface
 {
-  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
-  DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element));
-  DECLARE_SCHEME_CALLBACK (calc_max_stretch, (SCM));
-  static void stretch (Grob *, Real amount, Axis a);
-  static void align_elements_to_extents (Grob *, Axis a);
-  static vector<Real> get_extents_aligned_translates (Grob *, vector<Grob*> const&,
-						      Axis a,
-						      bool safe, int start, int end);
-  static int stretchable_children_count (Grob const*);
+  DECLARE_SCHEME_CALLBACK (align_to_minimum_distances, (SCM));
+  DECLARE_SCHEME_CALLBACK (align_to_ideal_distances, (SCM));
+  static void align_elements_to_minimum_distances(Grob *, Axis a);
+  static void align_elements_to_ideal_distances(Grob *);
+  static vector<Real> get_minimum_translations (Grob *, vector<Grob*> const&,
+						Axis a,
+						bool safe, int start, int end);
   static void set_ordered (Grob *);
   static Axis axis (Grob *);
   static void add_element (Grob *, Grob *);