X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=f0e20d0064296a54847f0d7f2320e4321c4c3f50;hb=31a6650e2b2a5c1cae3237ee47b80cd43d084d53;hp=643bd531751c77ea2b80ea5811c4ed77cd92d6a4;hpb=643c1a49be582b0f0959db5904c284e8f1dd2a16;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 643bd53175..f0e20d0064 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,31 +1,34 @@
 /*
   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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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*);
+struct Align_interface
+{
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
+  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (fixed_distance_alignment_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element));
+  static void align_to_fixed_distance (Grob *, Axis a);
+  static void align_elements_to_extents (Grob *, Axis a);
+  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 *);
 };
 
+Grob *find_fixed_alignment_parent (Grob *g);
+
 #endif /* ALIGN_INTERFACE_HH */