From e8e8f7cf71ade6076695e89651033876cab3a1ae Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 14 Jan 2008 01:39:04 +0100 Subject: [PATCH] Revert "fourth patch from Joe: revert revert fix line ideal distance to favour mo" This reverts commit 9800152af3a902baa4b2fd11032355b2aee08e49. Signed-off-by: Valentin Villenave --- 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 1686d9613a..38da734bd3 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 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))))) + (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)))) (define (first-line-position line layout) "Position of the first line on page" -- 2.39.2