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.

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index b589ff671ec52d8e34db78f10ce5196b1fc1866a..05536316bbd91e7712067a0c28dbcabe6773105e 100644 (file)
--- 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);
 
   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 ();
 }
 
   return skylines.smobbed_copy ();
 }
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 58ce25960a62fdd48dbadc1038befe634f3f0b2f..4a09d7c60954c8ba874ef4fe8d511dd436d5c0d7 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -60,6 +60,7 @@
   localKeySignature = #'()
   createSpacing = ##t
   ignoreFiguredBassRest = ##t 
   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
   
   %% 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."
 
 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 = #'()
   \consists "Instrument_name_engraver"
   
   instrumentName = #'()