X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper-system.scm;h=9e9f9ab7d4ca85357f1b759de1745cc5ae75a384;hb=02c66956a342eccc4858111ad587ce8b8a5e44b8;hp=d7436a224fef055c6ce80953e55eede70d064f1c;hpb=794dcbdb52faf4292036cd1b0270a956cf4316a3;p=lilypond.git

diff --git a/scm/paper-system.scm b/scm/paper-system.scm
index d7436a224f..9e9f9ab7d4 100644
--- a/scm/paper-system.scm
+++ b/scm/paper-system.scm
@@ -1,10 +1,19 @@
-;;
-;; paper-system.scm -- implement paper-system objects.
-;;
-;; source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-;;
+;;;; This file is part of LilyPond, the GNU music typesetter.
+;;;;
+;;;; Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (scm paper-system))
 
@@ -71,14 +80,16 @@
     (let* ((spacing-spec (cond ((and next-system
 				     (paper-system-title? system)
 				     (paper-system-title? next-system))
-				(ly:output-def-lookup layout 'between-title-spacing))
+				(ly:output-def-lookup layout 'markup-markup-spacing))
 			       ((paper-system-title? system)
-				(ly:output-def-lookup layout 'after-title-spacing))
+				(ly:output-def-lookup layout 'markup-system-spacing))
 			       ((and next-system
 				     (paper-system-title? next-system))
-				(ly:output-def-lookup layout 'before-title-spacing))
+				(ly:output-def-lookup layout 'score-markup-spacing))
+			       ((not next-system)
+				(ly:output-def-lookup layout 'last-bottom-spacing))
 			       (else
-				(ly:output-def-lookup layout 'between-system-spacing))))
+				(ly:output-def-lookup layout 'system-system-spacing))))
 	   (last-staff-Y (car (paper-system-staff-extents system))))
 
       (set! annotations