Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / include / align-interface.hh

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 0d0f0958468b5a69eca0cc96d9b57ef173d42b32..91fd53da67b82b8f222aa36fbc9c09942b55752b 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -19,11 +19,11 @@ struct Align_interface
   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_to_fixed_distance (Grob *, 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*);
   static void set_ordered (Grob *);
   static Axis axis (Grob *);
   static void add_element (Grob *, Grob *);
@@ -34,7 +34,5 @@ struct Align_interface
   static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
 };
 
-Grob *find_fixed_alignment_parent (Grob *g);
-
 #endif /* ALIGN_INTERFACE_HH */