X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=2f4f501cee8db919a9f7992f9d030c51f45a1f4e;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=7bacbf8ac394150f638dd867fa664f49d5d3e262;hpb=6b6a34e929bf1d5a8859fe77e66396c3c15ef37c;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 7bacbf8ac3..2f4f501cee 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,46 +1,46 @@
-/*   
+/*
   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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef AXIS_GROUP_INTERFACE_HH
 #define AXIS_GROUP_INTERFACE_HH
 
-#include "group-interface.hh"
-
-/**
-   Treat a group of elements as a union. This sets the parent of any S
-   added to ELT_L_ to ELT_L_.
-
-   Properties:
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "skyline.hh"
 
-   axes -- list of axis (number) in which this group works
-
-   transparent -- an Axis_group is transparent by default
-
-   elements -- contains list of pointers to other elements
-
-   interfaces -- Axis_group is added to this list.
-*/
-struct Axis_group_interface 
+struct Axis_group_interface
 {
-  Score_element *elt_l_;
-  Axis_group_interface (Score_element*);
-
-  static Interval group_extent_callback (Dimension_cache const*);
-  static Interval relative_group_extent (Axis, Score_element * common, SCM list);
-
-  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 (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));
+  DECLARE_SCHEME_CALLBACK (calc_max_stretch, (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 */