* Another grand 2003 update.

[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 db67e1914356c617c8552ed329b9edeb3b89100e..ea3a0a969778d4c6a09b74d25c847c9b907c3b5c 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,59 +13,37 @@
 #include "spanner.hh"
 #include "item.hh"
 
+/*
+  TODO: move out unrelated callbacks.
 
-
-
-
-/**
-   Position victim object (ELT_L_) next to other objects (the support).
-
-   side-support -- list of score elements
-
-   direction -- where to put the victim object (left or right?)
-
-   side-relative-direction -- if set: get the direction from a different object, and multiply by this.
-   
-   direction-source -- in case side-relative-direction is set, where
-   to get the direction
-
-   minimum-space -- minimum distance that the victim should move
-   (after padding)
-
-   padding -- add this much extra space between victim and support
-
-   self-alignment-X -- real number: -1 = left aligned, 0 = center, 1
-     right-aligned in X direction.
-
-     Set to an element pointer, if you want that element to be the center. 
-     
-   self-alignment-Y -- like self-alignment-X but for Y axis
-   
-   TODO: move  out unrelated callbacks.
-
-   TODO: reduce number of methods.
-
+  TODO: reduce number of methods.
 */
-struct Side_position
+struct Side_position_interface
 {
 public:
-  DECLARE_SCHEME_CALLBACK(side_position, (SCM  element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(aligned_on_self, (SCM  element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(aligned_side, (SCM element, SCM axis));  
-  DECLARE_SCHEME_CALLBACK(quantised_position, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(centered_on_parent, (SCM element, SCM axis));
-  static void set_axis (Score_element*,Axis);
-  static void set_minimum_space (Score_element*,Real);
-  static void set_padding (Score_element*,Real);
-  static Axis get_axis (Score_element*) ;
-  static bool supported_b (Score_element*) ;
-  static bool has_interface (Score_element*) ;
-  static void add_support (Score_element*,Score_element*);
-  static void add_staff_support (Score_element*);
-  static Direction get_direction (Score_element*);
-  static void set_direction (Score_element*,Direction);
+  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 (out_of_staff, (SCM element, SCM axis));  
+
+  DECLARE_SCHEME_CALLBACK (quantised_position, (SCM element, SCM axis));
+
+  static SCM general_side_position (Grob*, Axis, bool);
+  static void set_axis (Grob*,Axis);
+  static void set_minimum_space (Grob*,Real);
+  static void set_padding (Grob*,Real);
+  static Axis get_axis (Grob*) ;
+  static bool supported_b (Grob*) ;
+  static bool has_interface (Grob*) ;
+  static void add_support (Grob*,Grob*);
+  static void add_staff_support (Grob*);
+  static Direction get_direction (Grob*);
+  static void set_direction (Grob*,Direction);
 };
 
 
+
 #endif /* SIDE_POSITION_INTERFACE_HH */