X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=5e5152d2378aa6e684c6c7e30f275f58eca8c711;hb=4051d4410364b9984faa181659a3bfe2763a9736;hp=1537f1d35861f89d79318289612b9f814e57bee6;hpb=54b02666750062788185bd3f99e644d621e348c2;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 1537f1d358..5e5152d237 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,9 +25,14 @@
 #include "grob-interface.hh"
 #include "skyline.hh"
 
-struct Axis_group_interface
+class Axis_group_interface
 {
+  static Real default_outside_staff_padding_;
+  public
+:
   static SCM generic_group_extent (Grob *me, Axis a);
+  static Real get_default_outside_staff_padding ();
+  static Interval generic_bound_extent (Grob *me, Grob *common, Axis a);
   static Interval pure_group_height (Grob *me, int start, int end);
   DECLARE_SCHEME_CALLBACK (width, (SCM smob));
   DECLARE_SCHEME_CALLBACK (calc_x_common, (SCM smob));
@@ -41,11 +46,12 @@ struct Axis_group_interface
   DECLARE_SCHEME_CALLBACK (calc_staff_staff_spacing, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_staff_staff_spacing, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM));
-  static Interval relative_group_extent (vector<Grob*> const &list,
-					 Grob *common, Axis);
+  static SCM internal_calc_pure_relevant_grobs (Grob *, const string&);
+  static Interval relative_group_extent (vector<Grob *> const &list,
+                                         Grob *common, Axis);
+  static Interval relative_maybe_bound_group_extent (vector<Grob *> const &list,
+                                                     Grob *common, Axis, bool);
   static Interval relative_pure_height (Grob *me, int start, int end);
   static Interval combine_pure_heights (Grob *me, SCM, int, int);
   static Interval sum_partial_pure_heights (Grob *me, int, int);
@@ -53,17 +59,16 @@ struct Axis_group_interface
   static Interval rest_of_line_pure_height (Grob *me, int, int);
   static Interval part_of_line_pure_height (Grob *me, bool begin, int, int);
 
-  static bool has_outside_staff_parent (Grob *me);
-  static Skyline_pair skyline_spacing (Grob *me, vector<Grob*> elements);
+  static Grob *outside_staff_ancestor (Grob *me);
+  static Skyline_pair skyline_spacing (Grob *me);
   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*> *);
+  static void get_children (Grob *, vector<Grob *> *);
   static Interval staff_extent (Grob *me, Grob *ref, Axis, Grob *staff, Axis);
   static SCM calc_common (Grob *, Axis);
-  static Real minimum_distance (Grob*, Grob*, Axis);
-  static SCM calc_maybe_pure_staff_staff_spacing (Grob*, bool, int, int);
-  DECLARE_GROB_INTERFACE();
+  static Real minimum_distance (Grob *, Grob *, Axis);
+  static SCM calc_maybe_pure_staff_staff_spacing (Grob *, bool, int, int);
 };
 
 #endif /* AXIS_GROUP_INTERFACE_HH */