/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2000--2011 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
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_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, 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 sum_partial_pure_heights (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 Interval part_of_line_pure_height (Grob *me, bool begin, 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 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();
};