Fix some bugs in the dynamic engraver and PostScript backend

[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 b2c5b5f2ce2af8467b66b2aa8764917c9e7dd929..6c6e48306681713c4b5de49be6c08708808aa92b 100644 (file)
--- 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
@@ -14,30 +13,28 @@
 #include "item.hh"
 
 /*
-  TODO: move  out unrelated callbacks.
+  TODO: move out unrelated callbacks.
 
   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 (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);
-};
 
+  DECLARE_SCHEME_CALLBACK (y_aligned_on_support_refpoints, (SCM element));
+  DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element));
+  DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element));
+
+  static SCM aligned_side (Grob*me, Axis a);
+
+  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 *);
+};
 
 #endif /* SIDE_POSITION_INTERFACE_HH */