X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=36b1e8fdf59030697495a29bf9881d563105af9d;hb=5164ade24d92374331fe3af82730dd89c30aa66d;hp=db67e1914356c617c8552ed329b9edeb3b89100e;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index db67e19143..36b1e8fdf5 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   side-position-interface.hh -- declare Side_position_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SIDE_POSITION_INTERFACE_HH
 #define SIDE_POSITION_INTERFACE_HH
@@ -13,59 +12,32 @@
 #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 (y_aligned_on_support_refpoints, (SCM element));
+  DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_support_refpoints, (SCM element, SCM start, SCM end));
+  DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element, SCM current));
+  DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element, SCM current));
+  DECLARE_SCHEME_CALLBACK (pure_y_aligned_side, (SCM element, SCM start, SCM end));
+
+  static SCM aligned_side (Grob*me, Axis a, bool pure, int start, int end, Real *current_off_ptr);
+
+  static SCM general_side_position (Grob *, Axis, bool, bool my_extents,
+				    bool pure, int start, int end, Real *current_off);
+  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 *);
+};
 
 #endif /* SIDE_POSITION_INTERFACE_HH */