X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=149ef321c1b2f449270621b9c4bbcc0802e9279c;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=d7294b990a975f8f57f313cea7c465948cdbb280;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index d7294b990a..149ef321c1 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,30 +1,37 @@
 /*
   align-interface.hh -- declare Align_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
-#include "axes.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
-
-struct Align_interface {
-  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (fixed_distance_alignment_callback, (SCM element, SCM axis));
-  static void align_to_fixed_distance (Grob*,Axis a);
-  static void align_elements_to_extents (Grob*,Axis a);
-  static void set_axis (Grob*,Axis);
-  static Axis axis (Grob*) ;
-  static void add_element (Grob*,Grob*, SCM callback);
-  static int get_count (Grob*,Grob*);
-  static void set_interface (Grob*);
-  static bool has_interface (Grob*);
+#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));
+  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 *);
+
+  DECLARE_GROB_INTERFACE();
+
+  static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
 };
 
 #endif /* ALIGN_INTERFACE_HH */