Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / axis-group-interface.hh

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index aee77390170a064a4bca6cac5f8020563969dbf6..94e1a256d9dc0da75e9bb47e24bfb4372cbbce5b 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,32 +1,33 @@
-/*   
+/*
   axis-group-interface.hh -- declare Axis_group_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef AXIS_GROUP_INTERFACE_HH
 #define AXIS_GROUP_INTERFACE_HH
 
-#include "group-interface.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 
 /**
-
-*/
-struct Axis_group_interface 
+ */
+struct Axis_group_interface
 {
-  DECLARE_SCHEME_CALLBACK (group_extent_callback, (SCM smob, SCM axis));
-  static Interval relative_group_extent (Axis, Grob * common, SCM list);
-
-  static void add_element (Grob* me, Grob*);
-  static void set_axes (Grob*, Axis, Axis);
-  static bool has_axis (Grob*, Axis);
-  static Link_array<Grob> get_children (Grob*);
-  static bool has_interface (Grob*);
-  
-  
+  static SCM generic_group_extent (Grob *me, Axis a);
+  DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (height, (SCM smob));
+  static Interval relative_group_extent (vector<Grob*> const &list,
+                                        Grob *common, Axis);
+
+  static void add_element (Grob *me, Grob *);
+  static void set_axes (Grob *, Axis, Axis);
+  static bool has_axis (Grob *, Axis);
+  static void get_children (Grob *, vector<Grob*> *);
+  static bool has_interface (Grob *);
 };
 
 #endif /* AXIS_GROUP_INTERFACE_HH */