]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix minimum spacing between staves.
authorJoe Neeman <joeneeman@gmail.com>
Sun, 21 Nov 2010 03:39:44 +0000 (19:39 -0800)
committerJoe Neeman <joeneeman@gmail.com>
Sun, 21 Nov 2010 03:45:14 +0000 (19:45 -0800)
Ensure that loose lines with fixed spacing (ie. stretchability zero)
cause the correct minimum-distance constraint between their
surrounding staves.

lily/page-layout-problem.cc

index 8acef86cd53412b040ed4479cf17be0587db3ede..1a39ad51e8c21f681d1d345424b1c30931820e57 100644 (file)
@@ -193,10 +193,11 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real inde
   extract_grob_set (align, "elements", all_elts);
   vector<Grob*> elts = filter_dead_elements (all_elts);
   vector<Real> minimum_offsets = Align_interface::get_minimum_translations_without_min_dist (align, elts, Y_AXIS);
+  vector<Real> minimum_offsets_with_min_dist = Align_interface::get_minimum_translations (align, elts, Y_AXIS);
 
   Skyline up_skyline (UP);
   Skyline down_skyline (DOWN);
-  build_system_skyline (elts, minimum_offsets, &up_skyline, &down_skyline);
+  build_system_skyline (elts, minimum_offsets_with_min_dist, &up_skyline, &down_skyline);
   up_skyline.shift (indent);
   down_skyline.shift (indent);