X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fself-alignment-interface.hh;h=877998965cafffb0a55908ca96a474a8d2e21b71;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6f3d63de9c6034cea8e9411cf394eeef970c854c;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh
index 6f3d63de9c..877998965c 100644
--- a/lily/include/self-alignment-interface.hh
+++ b/lily/include/self-alignment-interface.hh
@@ -1,23 +1,35 @@
-/*   
+/*
   side-position-interface.hh -- declare Side_position_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SELF_ALIGNMENT_INTERFACE_HH
 #define SELF_ALIGNMENT_INTERFACE_HH
 
-#include "spanner.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 struct Self_alignment_interface
 {
-  static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK (aligned_on_self, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (centered_on_parent, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (aligned_on_parent, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (centered_on_other_axis_parent, (SCM element, SCM axis));
+  DECLARE_GROB_INTERFACE();
+
+  static SCM aligned_on_self (Grob *me, Axis a);
+  static SCM centered_on_object (Grob *me, Axis a);
+  static SCM aligned_on_parent (Grob *me, Axis a);
+  static void set_center_parent (Grob *me, Axis a);
+  static void set_align_self (Grob *me, Axis a);
+  
+  DECLARE_SCHEME_CALLBACK (x_aligned_on_self, (SCM element));
+  DECLARE_SCHEME_CALLBACK (y_aligned_on_self, (SCM element));
+
+  DECLARE_SCHEME_CALLBACK (centered_on_x_parent, (SCM element));
+  DECLARE_SCHEME_CALLBACK (centered_on_y_parent, (SCM element));
+  DECLARE_SCHEME_CALLBACK (x_centered_on_y_parent, (SCM element));
+
+  DECLARE_SCHEME_CALLBACK (aligned_on_x_parent, (SCM element));
+  DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element));
 };
 #endif