Nested book parts: in header/footer texts, make the difference between

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index 3e25bdaaee3b46059ce22a90eb1578cb8b7b6426..068572694b6a0d61147aa3fad80fb5171c67bca7 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -136,8 +136,8 @@
 \f
 
 
-(define (page-headfoot layout scopes number
-                      sym separation-symbol dir last?)
+(define (page-headfoot layout scopes number sym separation-symbol dir
+                      is-book-last-page is-part-last-page)
   
   "Create a stencil including separating space."
 
@@ -146,9 +146,8 @@
         (stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
         (head-stencil
          (if (procedure? header-proc)
-             (header-proc layout scopes number last?)
-             #f))
-        )
+             (header-proc layout scopes number is-book-last-page is-part-last-page)
+             #f)))
     
     (if (and (number? sep)
             (ly:stencil? head-stencil)
@@ -198,8 +197,8 @@
        (layout (ly:paper-book-paper paper-book))
        (scopes (ly:paper-book-scopes paper-book))
        (number (page-page-number page))
-       (last? (page-property page 'is-last))
-       )
+       (is-book-last-page (page-property page 'is-last))
+       (is-part-last-page (page-property page 'is-part-last)))
        
       (page-headfoot layout scopes number
                (if (= dir UP)
@@ -208,7 +207,7 @@
                (if (= dir UP)
                    'head-separation
                    'foot-separation)
-               dir last?)))
+               dir is-book-last-page is-part-last-page)))
 
 (define (page-header page)
   (page-header-or-footer page UP))