From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sun, 9 Dec 2007 17:51:27 +0000 (+0100)
Subject: Revert "Fix line-ideal-distance to favour more even spacing."
X-Git-Tag: release/2.11.36-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=17aed40ebc05cec4aa7f4aff5a11441d0f28c311;p=lilypond.git

Revert "Fix line-ideal-distance to favour more even spacing."

This reverts commit a0c6b97af8366c381263772aea1dfe1434a36c2c
which broke markuplines
---

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"