* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

[lilypond.git] / lily / include / self-alignment-interface.hh

diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh
index aa47c7af76b692735bc998a5941262a2ada6b04f..c9438a764b3e47101f9104bd8d5f56a42dd34134 100644 (file)
--- a/lily/include/self-alignment-interface.hh
+++ b/lily/include/self-alignment-interface.hh
@@ -14,9 +14,18 @@
 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));
+
+  static SCM aligned_on_self (Grob *me, Axis a);
+  static SCM centered_on_parent (Grob *me, Axis a);
+  static SCM aligned_on_parent (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 (aligned_on_x_parent, (SCM element));
+  DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element));
 };
 #endif