Nested book parts: take account of Joe's code review from 2008/11/03

[lilypond.git] / scm / titling.scm

diff --git a/scm/titling.scm b/scm/titling.scm
index 28e0e9c8c8fc4c81ec80682e817fb51e64a40b00..1ab08d73b7797422e94d55daa34dedf240bd25a8 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -13,12 +13,12 @@
 ;;;;;;;;;;;;;;;;;;
 
 (define-public ((marked-up-headfoot what-odd what-even)
-                layout scopes page-number is-book-last-page is-part-last-page)
+                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))
@@ -42,8 +42,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? is-book-last-page)
-                (cons 'page:part-last? is-part-last-page)
+                (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)))
@@ -51,7 +51,6 @@ 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))