2003 -> 2004

[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 341b711c6779deeb0b24d0452957f563e27fe245..d826a849dd296c113f8852062454c42d0f55ade3 100644 (file)
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,30 +13,31 @@
 #include "spanner.hh"
 #include "item.hh"
 
+/*
+  TODO: move out unrelated callbacks.
+
+  TODO: reduce number of methods.
+*/
 struct Side_position_interface
 {
-  Score_element * elt_l_;
 public:
-  Side_position_interface (Score_element const*);
-  static Real side_position (Dimension_cache const *);
-  static Real aligned_on_self (Dimension_cache const *);
-  static Real aligned_side (Dimension_cache const *);  
-  static Real quantised_position (Dimension_cache const*);
-  static Real centered_on_parent (Dimension_cache const*);
-  void set_axis (Axis);
-  void set_quantised (Axis);
-  Axis get_axis () const;
+  DECLARE_SCHEME_CALLBACK (aligned_on_support_extents, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (aligned_on_support_refpoints, (SCM element, SCM axis));
   
-  bool supported_b () const;
-  bool has_interface_b () const;
-  void add_support (Score_element*);
+  DECLARE_SCHEME_CALLBACK (aligned_side, (SCM element, SCM axis));  
+
+  DECLARE_SCHEME_CALLBACK (quantised_position, (SCM element, SCM axis));
 
-  void add_staff_support ();
-  Direction get_direction () const;
-  void set_direction (Direction);
+  static SCM general_side_position (Grob*, Axis, bool);
+  static Axis get_axis (Grob*) ;
+  static void set_axis (Grob*,  Axis) ;
+  static bool has_interface (Grob*) ;
+  static void add_support (Grob*,Grob*);
+  static void add_staff_support (Grob*);
+  static Direction get_direction (Grob*);
 };
 
-Side_position_interface side_position (Score_element*);
+
 
 #endif /* SIDE_POSITION_INTERFACE_HH */