From 1fe86c7a5655efb505579e3e22ce88306456fd12 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sat, 6 Oct 2007 09:55:33 +1000 Subject: [PATCH] Fix 411, 412 and 445. Exclude VerticalAxisGroup 'minimum-Y-extent from the skyline, but include it in align-interface calculations. Reinstate minimum-Y-extent in Staff. --- lily/axis-group-interface.cc | 7 ------- ly/engraver-init.ly | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index b589ff671e..05536316bb 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -263,13 +263,6 @@ Axis_group_interface::calc_skylines (SCM smob) extract_grob_set (me, "elements", elts); Skyline_pair skylines = skyline_spacing (me, elts); - /* add a minimum-Y-extent-sized box to the skyline */ - SCM min_y_extent = me->get_property ("minimum-Y-extent"); - if (is_number_pair (min_y_extent)) - { - Box b (me->extent (me, X_AXIS), ly_scm2interval (min_y_extent)); - skylines.insert (b, 0, X_AXIS); - } return skylines.smobbed_copy (); } diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 58ce25960a..4a09d7c609 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -60,6 +60,7 @@ localKeySignature = #'() createSpacing = ##t ignoreFiguredBassRest = ##t + \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) %% explicitly set instrument, so we don't get %% weird effects when doing instrument names for @@ -303,7 +304,6 @@ contained staves are connected vertically." distance between the staves, so cross staff beaming and slurring can be used." - \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) \consists "Instrument_name_engraver" instrumentName = #'() -- 2.39.2