X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=d752a05bb46189557679157e372dbae27c51b492;hb=49c5e7ba9c44a60281f45a802a77e006570c7ac0;hp=ed9f991cfb508643b86ef78e497b8255c72e5e37;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index ed9f991cfb..d752a05bb4 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,32 +1,45 @@
-/*   
+/*
   axis-group-interface.hh -- declare Axis_group_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2007 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 "grob-interface.hh"
+#include "skyline.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 axis_b (Grob*,Axis);
-  static Link_array<Grob> get_children (Grob*);
-  static bool has_interface (Grob*);
-  static void set_interface (Grob*);
-  
+  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 (calc_x_common, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (calc_y_common, (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 Grob *calc_pure_elts_and_common (Grob*);
+  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 *, vector<Grob*> *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* AXIS_GROUP_INTERFACE_HH */