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.

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 38da734bd38a5b6add540937a7ab56680b0d014b..1686d9613a11d7ac097e484f797f462282feb372 100644 (file)
--- 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"