use classnames for interface naming; remove inclusion of

[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 9ceee2fcb13011a0a23f0c02f92ac9f2c7dfadc2..e03d7326adceadb2fc10f565c78bab86d142394e 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,31 +1,41 @@
-/*   
+/*
   axis-group-interface.hh -- declare Axis_group_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 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"
+#include "grob-interface.hh"
 
-struct Axis_group_interface : Group_interface
+struct Axis_group_interface
 {
-  Axis_group_interface (Score_element*);
-  static Interval group_extent_callback (Dimension_cache const*);
-  void add_element (Score_element*);
-  void set_axes (Axis,Axis);
-  bool axis_b (Axis)const;
-  Link_array<Score_element> get_children ();
-  bool has_interface_b ();
-  void set_interface ();
-};
+  static SCM generic_group_extent (Grob *me, Axis a);
+  static SCM pure_group_height (Grob *me, int start, int end);
+  DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (height, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end));
+  static Interval relative_group_extent (vector<Grob*> const &list,
+                                        Grob *common, Axis);
+  static Interval relative_pure_height (Grob *me, vector<Grob*> const &list,
+                                       Grob *common, int start, int end,
+                                       bool use_cache);
+  static Interval cached_pure_height (Grob *me, vector<Grob*> const &list,
+                                     Grob *common, int, int);
 
-Axis_group_interface
-axis_group (Score_element*);
+  static void skyline_spacing (Grob *me, vector<Grob*> elements);
+  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*> *);
+  DECLARE_GROB_INTERFACE();
+};
 
 #endif /* AXIS_GROUP_INTERFACE_HH */