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 5bf8c02f82dc1e84c5a5901d61f02da9aa620eea..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--2005 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
@@ -21,23 +20,21 @@
 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 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*);
-};
 
+  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 */