X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=d34b7113d46aa89eee62234d4c45f1db76832f4f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9fa0c4f74db6533362c88d1721e67f7e80204634;hpb=3b2376c6828136cdbc078015c0b9bee26bffb448;p=lilypond.git

diff --git a/scm/titling.scm b/scm/titling.scm
index 9fa0c4f74d..d34b7113d4 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -2,29 +2,30 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(define-public (page-properties layout)
-  (list (append `((linewidth . ,(ly:paper-get-number
-				 layout 'linewidth)))
+(define-public (layout-extract-page-properties layout)
+  (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))
 
   (define (interpret-in-page-env potential-markup)
     (if (markup? potential-markup)
-	(let* ((alists  (map ly:module->alist scopes))
+	(let* ((alists (map ly:module->alist scopes))
 	       (prefixed-alists
 		(map (lambda (alist)
 		       (map (lambda (entry)
@@ -36,24 +37,22 @@ page:last?, page:page-number-string and page:page-number
 			       (cdr entry)))
 			    alist))
 		     alists))
-	       (tagline (ly:modules-lookup scopes 'tagline)) 
-
 	       (pgnum-alist
 		(list
-		 (cons 'header:tagline (if (markup? tagline)
-					   tagline
-					   TAGLINE))
-		 (cons 'page:last? last?)
+		 (cons 'header:tagline
+		       (ly:modules-lookup scopes 'tagline
+					  (ly:output-def-lookup layout 'tagline)))
+		 (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)))
+		 (cons 'page:page-number page-number)))
 	       (props (append
 		       (list pgnum-alist)
 		       prefixed-alists
-		       (page-properties layout))))
-
+		       (layout-extract-page-properties layout))))
 	  (interpret-markup layout props potential-markup))
-	
+
 	empty-stencil))
 
   (interpret-in-page-env
@@ -72,7 +71,7 @@ PROPS argument will include variables set in SCOPES (prefixed with
     (let ((x (ly:modules-lookup scopes sym)))
       (if (markup? x) x #f)))
 
-  (let* ((alists  (map ly:module->alist scopes))
+  (let* ((alists (map ly:module->alist scopes))
 	 (prefixed-alist
 	  (map (lambda (alist)
 		 (map (lambda (entry)
@@ -85,7 +84,7 @@ PROPS argument will include variables set in SCOPES (prefixed with
 		      alist))
 	       alists))
 	 (props (append prefixed-alist
-			(page-properties layout)))
+			(layout-extract-page-properties layout)))
 
 	 (markup (ly:output-def-lookup layout what)))