Run `make grand-replace'.

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

diff --git a/lily/include/break-align-interface.hh b/lily/include/break-align-interface.hh
index cd0cf144c79c1e2c1142d4d2a0095028e822a47c..c93a5cfe3ecdc6590d6e04c0fa73b9dede37136c 100644 (file)
--- a/lily/include/break-align-interface.hh
+++ b/lily/include/break-align-interface.hh
@@ -1,33 +1,40 @@
 /*
-  break-align-interface.hh -- declare Break_align_interface
+  break-align-interface.hh -- declare Break_alignment_interface
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef BREAK_ALIGN_INTERFACE_HH
 #define BREAK_ALIGN_INTERFACE_HH
 
-#include "item.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
-class Break_align_interface
+class Break_alignment_interface
 {
 public:
-  static void do_alignment (Grob*);
-  static void new_do_alignment (Grob*);  
-  static void set_interface (Grob*);
-  static bool has_interface (Grob*);
-  static void add_element (Grob*me, Grob*add);
-  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element, SCM axis));
-  
+  static vector<Grob*> ordered_elements (Grob *me);
+  DECLARE_GROB_INTERFACE();
+  static void add_element (Grob *me, Grob *add);
+  static SCM break_align_order (Item *me);
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
+  DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element));
 };
+
 struct Break_aligned_interface
 {
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (calc_average_anchor, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_extent_aligned_anchor, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_break_visibility, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
+struct Break_alignable_interface
+{
+  DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element));
+  DECLARE_GROB_INTERFACE();
+};
 
 #endif // BREAK_ALIGN_INTERFACE_HH