X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=50e916b536e2a832c8dfa8a456c8b7866cc99ff0;hb=9181df064925f1de6686e9692aff5f30686b4a99;hp=ab429c85f9739d362eed303e54dc1ec84888a7b5;hpb=0a8f198d8e62718cf1a9fbcc1837ea498cc0da54;p=lilypond.git

diff --git a/scm/titling.scm b/scm/titling.scm
index ab429c85f9..50e916b536 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -1,23 +1,35 @@
-;;;; titling.scm -- titling functions
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;          Han-Wen Nienhuys <hanwen@cs.uu.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-public (layout-extract-page-properties layout)
-  (list (append `((linewidth . ,(ly:paper-get-number
-				 layout 'linewidth)))
+  (list (append `((line-width . ,(ly:paper-get-number
+				 layout 'line-width)))
 		(ly:output-def-lookup layout 'text-font-defaults))))
 
 ;;;;;;;;;;;;;;;;;;
 
-(define-public ((marked-up-headfoot what-odd what-even) layout scopes page-number last?)
+(define-public ((marked-up-headfoot what-odd what-even)
+                layout scopes page-number is-last-bookpart is-bookpart-last-page)
 
   "Read variables WHAT-ODD, WHAT-EVEN from LAYOUT, and interpret them
 as markup. The PROPS argument will include variables set in SCOPES and
-page:last?, page:page-number-string and page:page-number
-" 
+page:is-bookpart-last-page, page:is-last-bookpart, page:page-number-string
+and page:page-number" 
 
   (define (get sym)
     (ly:output-def-lookup layout sym))
@@ -41,7 +53,8 @@ page:last?, page:page-number-string and page:page-number
 		 (cons 'header:tagline
 		       (ly:modules-lookup scopes 'tagline
 					  (ly:output-def-lookup layout 'tagline)))
-		 (cons 'page:last? last?)
+		 (cons 'page:is-last-bookpart is-last-bookpart)
+		 (cons 'page:is-bookpart-last-page is-bookpart-last-page)
 		 (cons 'page:page-number-string
 		       (number->string page-number))
 		 (cons 'page:page-number page-number)))
@@ -49,7 +62,6 @@ page:last?, page:page-number-string and page:page-number
 		       (list pgnum-alist)
 		       prefixed-alists
 		       (layout-extract-page-properties layout))))
-	  (display prefixed-alists)
 	  (interpret-markup layout props potential-markup))
 
 	empty-stencil))