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

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 279c1b6a3d..8cec05324b 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,33 +1,38 @@
 /*
   align-interface.hh -- declare Align_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.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"
-
-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 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);
 };
 
-Grob *find_fixed_alignment_parent  (Grob *g);
-
-
 #endif /* ALIGN_INTERFACE_HH */