X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=4272b1a8901acaa2a8678dee0f5ebad2c00c070d;hb=883e317d51c5e50011bc0e764a785631e5ea8689;hp=5a220237bef1334730a18c3b7cde1dab8efeee4d;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 5a220237be..4272b1a890 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -3,27 +3,40 @@
 
   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 "pointer-group-interface.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "skyline.hh"
 
-/**
- */
 struct Axis_group_interface
 {
-  DECLARE_SCHEME_CALLBACK (group_extent_callback, (SCM smob, SCM axis));
-  static Interval relative_group_extent (Link_array<Grob> const &list,
+  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));
+  DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob));
+  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);
 
+  static Skyline_pair 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 *, Link_array<Grob> *);
-  static bool has_interface (Grob *);
+  static void get_children (Grob *, vector<Grob*> *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* AXIS_GROUP_INTERFACE_HH */