X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=bd038c7d105f92cfa62526144011e27005a8688b;hb=ca3b8c69a4a3d6bf69fcf7e36b32e0175bb7ff18;hp=e80e20a706a94fa5d3c349f67fd07fbca561dd5a;hpb=36f6cd546770e38c6e2314404e21f1c89504eb7d;p=lilypond.git

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index e80e20a706..bd038c7d10 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -1,28 +1,67 @@
 /*
-  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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
 #define AXIS_GROUP_INTERFACE_HH
 
-#include "group-interface.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "skyline.hh"
 
-/**
- */
 struct Axis_group_interface
 {
-  DECLARE_SCHEME_CALLBACK (group_extent_callback, (SCM smob, SCM axis));
-  static Interval relative_group_extent (SCM list, Grob *common, Axis);
+  static SCM generic_group_extent (Grob *me, 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));
+  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 (print, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_next_staff_spacing, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_pure_next_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, 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 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 Link_array<Grob> get_children (Grob *);
-  static bool has_interface (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_next_staff_spacing (Grob*, bool, int, int);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* AXIS_GROUP_INTERFACE_HH */