Index: lily/include/axis-group-interface.hh |
diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh |
index 6eb52c4df2b909c99a8ba4eed2483bd8ca23dfe3..d51fc6ef34a46d37db3580d123c637f1f191d308 100644 |
--- a/lily/include/axis-group-interface.hh |
+++ b/lily/include/axis-group-interface.hh |
@@ -28,6 +28,7 @@ |
struct Axis_group_interface |
{ |
static SCM generic_group_extent (Grob *me, Axis a); |
+ 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)); |
@@ -46,6 +47,8 @@ struct Axis_group_interface |
DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM)); |
static Interval relative_group_extent (vector<Grob *> const &list, |
Grob *common, Axis); |
+ static Interval relative_maybe_bound_group_extent (vector<Grob*> const &list, |
Neil Puttock
2011/08/14 21:01:24
vector<Grob *>
|
+ Grob *common, Axis, bool); |
Neil Puttock
2011/08/14 21:01:24
indent
|
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); |