X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Faxis-group-interface.hh;h=fba715489da32b7443c2877a2eb950e3f5452fdb;hb=c1d5bb448321d688185e0c6b798575d4c325ae80;hp=2f4f501cee8db919a9f7992f9d030c51f45a1f4e;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 2f4f501cee..fba715489d 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,9 +1,20 @@
 /*
-  axis-group-interface.hh -- declare Axis_group_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef AXIS_GROUP_INTERFACE_HH
@@ -17,7 +28,7 @@
 struct Axis_group_interface
 {
   static SCM generic_group_extent (Grob *me, Axis a);
-  static SCM pure_group_height (Grob *me, int start, int end);
+  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));
   DECLARE_SCHEME_CALLBACK (calc_y_common, (SCM smob));
@@ -25,21 +36,31 @@ 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_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 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 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 Interval rest_of_line_pure_height (Grob *me, 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*> *);
+  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();
 };