* buildscripts/output-distance.py (FileLink.calc_distance): count

[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 7eb1e213525a872082d076a06144b56f4fb1be86..41972c83a5ee1e7f5b2c5d7708ab5de614e54b09 100644 (file)
--- a/lily/include/break-align-interface.hh
+++ b/lily/include/break-align-interface.hh
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef BREAK_ALIGN_INTERFACE_HH
 #define BREAK_ALIGN_INTERFACE_HH
 
@@ -15,19 +14,23 @@
 class Break_align_interface
 {
 public:
-  static void do_alignment (Grob*);
-  static void new_do_alignment (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);
+  static bool has_interface (Grob *);
+  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*);
+  static bool has_interface (Grob *);
 };
 
+struct Break_alignment_align_interface
+{
+  DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element));
+  static bool has_interface (Grob *);
+};
 
 #endif // BREAK_ALIGN_INTERFACE_HH