X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=28e0e9c8c8fc4c81ec80682e817fb51e64a40b00;hb=4d8f773563ad6b84f08d1c30667f444178fb75d0;hp=428c07d5cdeb0e15688f17086ba3035c72c7187b;hpb=eca9c3e7048cad8784be59db894e1531f362c9e4;p=lilypond.git

diff --git a/scm/titling.scm b/scm/titling.scm
index 428c07d5cd..28e0e9c8c8 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -2,17 +2,18 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (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-book-last-page is-part-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
@@ -36,17 +37,13 @@ page:last?, page:page-number-string and page:page-number
 			       (cdr entry)))
 			    alist))
 		     alists))
-	       (tagline (ly:modules-lookup scopes 'tagline)) 
-	       (default-tagline (ly:output-def-lookup layout 'tagline)) 
-
 	       (pgnum-alist
 		(list
 		 (cons 'header:tagline
-		       (cond
-			((markup? tagline) tagline)
-			((markup? default-tagline) default-tagline)
-			(else "")))
-		 (cons 'page:last? last?)
+		       (ly:modules-lookup scopes 'tagline
+					  (ly:output-def-lookup layout 'tagline)))
+		 (cons 'page:last? is-book-last-page)
+		 (cons 'page:part-last? is-part-last-page)
 		 (cons 'page:page-number-string
 		       (number->string page-number))
 		 (cons 'page:page-number page-number)))
@@ -54,7 +51,7 @@ page:last?, page:page-number-string and page:page-number
 		       (list pgnum-alist)
 		       prefixed-alists
 		       (layout-extract-page-properties layout))))
-
+	  
 	  (interpret-markup layout props potential-markup))
 
 	empty-stencil))