X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-page-layout.scm;h=1686d9613a11d7ac097e484f797f462282feb372;hb=993e0400c2ea45306fe9eb245e693b5ded258f0d;hp=68cc9d49c8f1d6a86577f2adeb511cc722b4bb6e;hpb=bbc9700ae8ff4e78f56f9127d2cb87060e5b13ea;p=lilypond.git diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm index 68cc9d49c8..1686d9613a 100644 --- a/scm/layout-page-layout.scm +++ b/scm/layout-page-layout.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004--2006 Jan Nieuwenhuizen +;;;; (c) 2004--2007 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys (define-module (scm layout-page-layout) @@ -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"