Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

[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 0898f3f8cd8356ae96e7790fa2b2e8667e0743ad..767271ad34bfda475008db8f72b1f8cdd108d537 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -9,6 +9,7 @@
 #ifndef AXIS_GROUP_INTERFACE_HH
 #define AXIS_GROUP_INTERFACE_HH
 
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
@@ -17,15 +18,22 @@
 struct Axis_group_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));
-  static Interval relative_group_extent (Link_array<Grob> const &list,
+  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);
 
   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 void get_children (Grob *, vector<Grob*> *);
   static bool has_interface (Grob *);
 };