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

[lilypond.git] / lily / include / grob.hh

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 211bf08d394b2bb2550925a25dd9a029dfec5444..b969f7478be82e4dc4fecff9107a8890447efb17 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -44,8 +44,8 @@ protected:
   DECLARE_CLASSNAME(Grob);
   Real get_offset (Axis a) const;
 public:
-  DECLARE_SCHEME_CALLBACK(same_axis_parent_positioning, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK(other_axis_parent_positioning, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK(x_parent_positioning, (SCM));
+  DECLARE_SCHEME_CALLBACK(y_parent_positioning, (SCM));
 
   Object_key const *get_key () const;
 
@@ -112,9 +112,6 @@ public:
   Real relative_coordinate (Grob const *refp, Axis) const;
   Grob *common_refpoint (Grob const *s, Axis a) const;
 
-  // duh. slim down interface here. (todo)
-  bool has_offset_callback (SCM callback, Axis) const;
-  void add_offset_callback (SCM callback, Axis);
   void flush_extent_cache (Axis);
 
   void set_parent (Grob *e, Axis);
@@ -142,4 +139,12 @@ Interval robust_relative_extent (Grob *, Grob *, Axis);
 bool is_callback_chain (SCM s);
 SCM callback_chain_extract_procedures (SCM chain_smob);
 
+
+SCM axis_offset_symbol (Axis a);
+SCM axis_self_offset_symbol (Axis a);
+SCM axis_parent_positioning (Axis a);
+void add_offset_callback (Grob *g, SCM proc, Axis a);
+void chain_offset_callback (Grob *g, SCM proc, Axis a);
+
+
 #endif /* GROB_HH */