From 44d0ec632e1301891439d2e83dcfc8a1d817b6d5 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Tue, 18 Dec 2007 12:16:17 +1100 Subject: [PATCH] Revert "Revert "Fix line-ideal-distance to favour more even spacing."" The previous two spring fixes made the original commit OK. This reverts commit d2754a1919d82b2fc727fb17c80417237979d8fe. --- scm/layout-page-layout.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm index 38da734bd3..1686d9613a 100644 --- a/scm/layout-page-layout.scm +++ b/scm/layout-page-layout.scm @@ -202,11 +202,11 @@ "Ideal distance between `line' reference position and `next-line' reference position. If next-line is #f, return #f." (and next-line - (max (+ (max 0 (- (+ (interval-end (paper-system-staff-extents next-line)) - (if ignore-padding 0 (line-next-padding line next-line layout))) - (interval-start (paper-system-staff-extents line)))) - (line-next-space line next-line layout)) - (line-minimum-distance line next-line layout ignore-padding)))) + (max 0 + (+ (- (+ (interval-end (paper-system-staff-extents next-line)) + (if ignore-padding 0 (line-next-padding line next-line layout))) + (interval-start (paper-system-staff-extents line))) + (line-next-space line next-line layout))))) (define (first-line-position line layout) "Position of the first line on page" -- 2.39.5