X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=a19e27884773f7b6dcea22ec974373730a55fcdf;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3cfd3730d17d26f9a384aa0ce9cea2802a31f1d5;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index 3cfd3730d1..a19e278847 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,17 +1,16 @@
-/*   
+/*
   side-position-interface.hh -- declare Side_position_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SIDE_POSITION_INTERFACE_HH
 #define SIDE_POSITION_INTERFACE_HH
 
-#include "spanner.hh"
-#include "item.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /*
   TODO: move out unrelated callbacks.
@@ -21,34 +20,25 @@
 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 (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);
-};
-
 
-struct Self_alignment_interface
-{
-  static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK (aligned_on_self, (SCM element, SCM axis));
-DECLARE_SCHEME_CALLBACK (centered_on_parent, (SCM element, SCM axis));
+  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, SCM current));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM element));
+
+  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);
+  DECLARE_GROB_INTERFACE();
+  static void add_support (Grob *, Grob *);
+  static void add_staff_support (Grob *);
+  static Direction get_direction (Grob *);
 };
 
-
 #endif /* SIDE_POSITION_INTERFACE_HH */