Run `make grand-replace'.

[lilypond.git] / scm / titling.scm

diff --git a/scm/titling.scm b/scm/titling.scm
index b129166ac36ccf0869c623d9012a6caa5c364cff..d34b7113d46aa89eee62234d4c45f1db76832f4f 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -2,22 +2,23 @@
 ;;;;
 ;;;;  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--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))
@@ -36,25 +37,20 @@ 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: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)))
               (props (append
                       (list pgnum-alist)
                       prefixed-alists
-                      (page-properties layout))))
-
+                      (layout-extract-page-properties layout))))
          (interpret-markup layout props potential-markup))
 
        empty-stencil))
@@ -88,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)))