X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=4b72bf36949569b3bed542549e153c833d3c8c0f;hb=19b37df119ff6ca84421d984fe1d33112ad08299;hp=ebec85b53eef90e5412a4d4255df08d7678ed289;hpb=4d8f773563ad6b84f08d1c30667f444178fb75d0;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index ebec85b53e..4b72bf3694 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.12.0"
 
 slashSeparator = \markup {
   \center-align
@@ -70,24 +70,40 @@ scoreTitleMarkup = \markup { \column {
 }
 
 %% Book first page and last page predicates
-#(define (first-page layout props arg)
-  (define (ancestor layout)
-    "Return the topmost layout ancestor"
-    (let ((parent (ly:output-def-parent layout)))
+#(define (book-first-page? layout props)
+   "Return #t iff the current page number, got from @code{props}, is the
+book first one."
+   (define (ancestor layout)
+     "Return the topmost layout ancestor"
+     (let ((parent (ly:output-def-parent layout)))
        (if (not (ly:output-def? parent))
            layout
            (ancestor parent))))
-  (if (= (chain-assoc-get 'page:page-number props -1)
-         (ly:output-def-lookup (ancestor layout) 'first-page-number))
+   (= (chain-assoc-get 'page:page-number props -1)
+      (ly:output-def-lookup (ancestor layout) 'first-page-number)))
+
+#(define (book-last-page? layout props)
+   "Return #t iff the current page number, got from @code{props}, is the
+book last one."
+   (and (chain-assoc-get 'page:is-bookpart-last-page props #f)
+        (chain-assoc-get 'page:is-last-bookpart props #f)))
+
+#(define (first-page layout props arg)
+  (if (book-first-page? layout props)
       (interpret-markup layout props arg)
       empty-stencil))
 
 #(define (last-page layout props arg)
-  (if (chain-assoc-get 'page:last? props #f)
-   (interpret-markup layout props arg)
-   empty-stencil))
+  (if (book-last-page? layout props)
+      (interpret-markup layout props arg)
+      empty-stencil))
 
-%% Part first page and last page predicates
+#(define (not-first-page layout props arg)
+  (if (not (book-first-page? layout props))
+      (interpret-markup layout props arg)
+      empty-stencil))
+
+%% Bookpart first page and last page predicates
 #(define (part-first-page layout props arg)
   (if (= (chain-assoc-get 'page:page-number props -1)
          (ly:output-def-lookup layout 'first-page-number))
@@ -95,15 +111,9 @@ scoreTitleMarkup = \markup { \column {
       empty-stencil))
 
 #(define (part-last-page layout props arg)
-  (if (chain-assoc-get 'page:part-last? props #f)
-   (interpret-markup layout props arg)
-   empty-stencil))
-
-#(define (not-first-page layout props arg)
-  (if (not (= (chain-assoc-get 'page:page-number props -1)
-              (ly:output-def-lookup layout 'first-page-number)))
-   (interpret-markup layout props arg)
-   empty-stencil))
+  (if (chain-assoc-get 'page:is-bookpart-last-page props #f)
+      (interpret-markup layout props arg)
+      empty-stencil))
 
 %% unused
 #(define (not-single-page layout props arg)
@@ -119,8 +129,7 @@ scoreTitleMarkup = \markup { \column {
    empty-stencil))
 
 #(define (print-page-number-check-first layout props arg)
-  (if (or (not (= (chain-assoc-get 'page:page-number props -1) 
-                  (ly:output-def-lookup layout 'first-page-number)))
+  (if (or (not (book-first-page? layout props))
           (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
    (create-page-number-stencil layout props arg)
    empty-stencil))