Fix 1385.

[lilypond.git] / ly / titling-init.ly

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 08b23d469d8538c99d6538502d8aa8a14e7489a3..e99b23064522f8dab17b2ae9b11228746cf55caf 100644 (file)
--- 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
@@ -10,8 +10,7 @@ slashSeparator = \markup {
 tagline = \markup {
   \with-url
 
-  %% todo: lilypond.org/music-engraving
-  #"http://lilypond.org/web/"
+  #"http://lilypond.org/"
   \line {
 
     %% 2014 = em dash.
@@ -70,33 +69,36 @@ 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 (and (chain-assoc-get 'page:is-bookpart-last-page props #f)
-           (chain-assoc-get 'page:is-last-bookpart props #f))
+  (if (book-last-page? layout props)
       (interpret-markup layout props arg)
       empty-stencil))
 
 #(define (not-first-page layout props arg)
-  (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 (not (= (chain-assoc-get 'page:page-number props -1)
-              (ly:output-def-lookup (ancestor layout) 'first-page-number)))
+  (if (not (book-first-page? layout props))
       (interpret-markup layout props arg)
       empty-stencil))
 
@@ -126,8 +128,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))