Fix minimum distance between loose lines and headers/footers.

[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 c9b1a58eb09f8b924bcfd57b41da165a1dc100d8..95aa9f3bc555c2e5695445df70bd5fe1c736ae79 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AXIS_GROUP_INTERFACE_HH
@@ -25,13 +25,15 @@ struct Axis_group_interface
   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));
   DECLARE_SCHEME_CALLBACK (print, (SCM smob));
   DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_next_staff_spacing, (SCM));
   static Interval relative_group_extent (vector<Grob*> const &list,
                                         Grob *common, Axis);
   static Interval relative_pure_height (Grob *me, int start, int end);
+  static Interval combine_pure_heights (Grob *me, SCM, int, int);
   static Interval cached_pure_height (Grob *me, int, int);
+  static Interval begin_of_line_pure_height (Grob *me, int);
 
   static Grob *calc_pure_elts_and_common (Grob*);
   static Skyline_pair skyline_spacing (Grob *me, vector<Grob*> elements);
@@ -39,6 +41,9 @@ struct Axis_group_interface
   static void set_axes (Grob *, Axis, Axis);
   static bool has_axis (Grob *, Axis);
   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);
   DECLARE_GROB_INTERFACE();
 };