Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 1c18751edc6650eadccb9af7505291e47f44119e..68cc9d49c8f1d6a86577f2adeb511cc722b4bb6e 100644 (file)
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -245,9 +245,7 @@
                       (if prev-line prev-position 0.0)))
          (bottom-position (- position
                              (interval-start (line-extent line)))))
-    (and (or (not prev-line)
-             (< bottom-position (page-printable-height page)))
-         position)))
+    position))
 
 (define (page-maximum-space-to-fill page lines paper)
   "Return the space between the first line top position and the last line
@@ -271,7 +269,7 @@
                  (position (line-position-on-page
                             line prev-line prev-position page relative-positionning-fn)))
             (if (null? (cdr lines))
-                (and position
+                (max 0
                      (- (page-printable-height page)
                         (- position
                            (interval-start (line-extent line)))))