From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 13 Jan 2008 18:01:04 +0000 (+0100)
Subject: fourth patch from Joe: revert revert fix line ideal distance to favour mo
X-Git-Tag: release/2.11.38-1~90
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=977c27b4fd00d51ff63bd1ed9c0ea2c098a4757c;p=lilypond.git

fourth patch from Joe: revert revert fix line ideal distance to favour mo
---

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"