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

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 26bca808c8f19cb8faf78e0ea5dad23c45b3fda6..08b23d469d8538c99d6538502d8aa8a14e7489a3 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,7 +1,7 @@
-\version "2.7.39"
+\version "2.11.57"
 
 slashSeparator = \markup {
-  \hcenter
+  \center-align
   \vcenter \combine
   \beam #2.0 #0.5 #0.48
   \raise #0.7 \beam #2.0 #0.5 #0.48
@@ -13,18 +13,19 @@ tagline = \markup {
   %% todo: lilypond.org/music-engraving
   #"http://lilypond.org/web/"
   \line {
-    "Music engraving by LilyPond"
-    " "
-    #(ly:export (lilypond-version))
-    
+
     %% 2014 = em dash.
-    #(ly:export (ly:wide-char->utf-8 #x2014))
-    "www.lilypond.org"
+    
+    #(ly:export
+      (format "Music engraving by LilyPond ~a~awww.lilypond.org"
+       (lilypond-version)
+       (ly:wide-char->utf-8 #x2014)
+       ))
   }
 }
 
 #(define (print-all-headers layout props arg)
-  (if (eq? (ly:output-def-lookup layout 'printallheaders) #t)
+  (if (eq? (ly:output-def-lookup layout 'print-all-headers) #t)
    (interpret-markup layout props arg)
    empty-stencil))
 
@@ -34,13 +35,13 @@ bookTitleMarkup = \markup {
     \fill-line { \fromproperty #'header:dedication }
     \override #'(baseline-skip . 3.5)
     \column {
-      \huge \bigger \bold
+      \huge \larger \bold
       \fill-line {
-        \bigger \fromproperty #'header:title
+        \larger \fromproperty #'header:title
       }
       \fill-line {
         \large \smaller \bold
-        \bigger \fromproperty #'header:subtitle
+        \larger \fromproperty #'header:subtitle
       }
       \fill-line {
         \smaller \bold
@@ -68,21 +69,48 @@ scoreTitleMarkup = \markup { \column {
 }
 }
 
+%% Book first page and last page predicates
 #(define (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 
-         (ly:output-def-lookup layout 'first-page-number))   (interpret-markup layout props arg)
-   empty-stencil))
+  (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))
+      (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 (and (chain-assoc-get 'page:is-bookpart-last-page props #f)
+           (chain-assoc-get 'page:is-last-bookpart props #f))
+      (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 layout 'first-page-number)))
-   (interpret-markup layout props arg)
-   empty-stencil))
+              (ly:output-def-lookup (ancestor layout) 'first-page-number)))
+      (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))
+      (interpret-markup layout props arg)
+      empty-stencil))
+
+#(define (part-last-page layout props arg)
+  (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)
@@ -92,7 +120,7 @@ scoreTitleMarkup = \markup { \column {
    (interpret-markup layout props arg)
    empty-stencil))
 
-#(define (print-page-number layout props arg)
+#(define (create-page-number-stencil layout props arg)
   (if (eq? (ly:output-def-lookup layout 'print-page-number) #t)
    (interpret-markup layout props arg)
    empty-stencil))
@@ -100,8 +128,8 @@ scoreTitleMarkup = \markup { \column {
 #(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)))
-          (eq? (ly:output-def-lookup layout 'printfirst-page-number) #t))
-   (print-page-number layout props arg)
+          (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
+   (create-page-number-stencil layout props arg)
    empty-stencil))
 
 oddHeaderMarkup = \markup