Merge with master

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

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 273dbc660ccb18dec8cd388c205f9c0298b4eeaa..0d0f0958468b5a69eca0cc96d9b57ef173d42b32 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -3,20 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2007 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));
+  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&,
@@ -27,7 +29,7 @@ struct Align_interface
   static void add_element (Grob *, Grob *);
   static int get_count (Grob *, Grob *);
 
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 
   static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
 };