X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=8cec05324bbcdebc4e2013b973a231700d08c893;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b01c744bffc63284b9374b2dc2afb74f0faab839;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index b01c744bff..8cec05324b 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -3,30 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 struct Align_interface
 {
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
   DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element));
-  static void align_to_fixed_distance (Grob *, Axis a);
+  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*);
   static void set_ordered (Grob *);
   static Axis axis (Grob *);
   static void add_element (Grob *, Grob *);
   static int get_count (Grob *, Grob *);
 
-  static bool has_interface (Grob *);
-};
+  DECLARE_GROB_INTERFACE();
 
-Grob *find_fixed_alignment_parent (Grob *g);
+  static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
+};
 
 #endif /* ALIGN_INTERFACE_HH */