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

[lilypond.git] / lily / include / side-position-interface.hh

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index ff16b0c386c97004cd1d902258bf2d259bc43873..7dc56384863c177b26deed813ee9ed8a326c2ecf 100644 (file)
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -20,12 +20,12 @@
 struct Side_position_interface
 {
 public:
-  DECLARE_SCHEME_CALLBACK (aligned_on_support_extents, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (aligned_on_support_refpoints, (SCM element, SCM axis));
 
-  DECLARE_SCHEME_CALLBACK (aligned_side, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (y_aligned_on_support_refpoints, (SCM element));
+  DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element));
+  DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element));
 
-  DECLARE_SCHEME_CALLBACK (quantised_position, (SCM element, SCM axis));
+  static SCM Side_position_interface::aligned_side (Grob*me, Axis a);
 
   static SCM general_side_position (Grob *, Axis, bool);
   static Axis get_axis (Grob *);