X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=c90f6ee5d242ebc3a0dbcb3b6acd4d7f845cff93;hb=1429773f3c8a2e559ba7acc71c58786326bcdcbc;hp=73fd17fe598106a3953cc0146b73ccce90bd223d;hpb=2055f35c47a045a50a01ff4dba8524322cfc3b48;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 73fd17fe59..c90f6ee5d2 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.16.0"
 
 slashSeparator = \markup {
   \center-align
@@ -15,11 +15,10 @@ tagline = \markup {
 
     %% 2014 = em dash.
 
-    #(ly:export
-      (format "Music engraving by LilyPond ~a~awww.lilypond.org"
+    #(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
        (lilypond-version)
        (ly:wide-char->utf-8 #x2014)
-       ))
+       )
   }
 }
 
@@ -34,13 +33,13 @@ bookTitleMarkup = \markup {
     \fill-line { \fromproperty #'header:dedication }
     \override #'(baseline-skip . 3.5)
     \column {
-      \huge \larger \bold
       \fill-line {
-        \larger \fromproperty #'header:title
+        \huge \larger \larger \bold
+        \fromproperty #'header:title
       }
       \fill-line {
-        \large \smaller \bold
-        \larger \fromproperty #'header:subtitle
+        \large \bold
+        \fromproperty #'header:subtitle
       }
       \fill-line {
         \smaller \bold
@@ -102,15 +101,31 @@ book last one."
       (interpret-markup layout props arg)
       empty-stencil))
 
+#(define ((on-page nmbr) layout props arg)
+ (if (= (chain-assoc-get 'page:page-number props -1) nmbr)
+   (interpret-markup layout props arg)
+   empty-stencil))
+
 %% Bookpart first page and last page predicates
+#(define (part-first-page? layout props)
+  (= (chain-assoc-get 'page:page-number props -1)
+     (ly:output-def-lookup layout 'first-page-number)))
+
+#(define (part-last-page? layout props)
+  (chain-assoc-get 'page:is-bookpart-last-page props #f))
+
 #(define (part-first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1)
-         (ly:output-def-lookup layout 'first-page-number))
+  (if (part-first-page? layout props)
+      (interpret-markup layout props arg)
+      empty-stencil))
+
+#(define (not-part-first-page layout props arg)
+  (if (not (part-first-page? layout props))
       (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)
+  (if (part-last-page? layout props)
       (interpret-markup layout props arg)
       empty-stencil))
 
@@ -128,7 +143,7 @@ book last one."
    empty-stencil))
 
 #(define (print-page-number-check-first layout props arg)
-  (if (or (not (book-first-page? layout props))
+  (if (or (not (part-first-page? layout props))
           (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
    (create-page-number-stencil layout props arg)
    empty-stencil))
@@ -138,7 +153,7 @@ oddHeaderMarkup = \markup
   %% force the header to take some space, otherwise the
   %% page layout becomes a complete mess.
   " "
-  \on-the-fly #not-first-page \fromproperty #'header:instrument
+  \on-the-fly #not-part-first-page \fromproperty #'header:instrument
   \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
 }
 
@@ -147,7 +162,7 @@ oddHeaderMarkup = \markup
 evenHeaderMarkup = \markup
 \fill-line {
   \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
-  \on-the-fly #not-first-page \fromproperty #'header:instrument
+  \on-the-fly #not-part-first-page \fromproperty #'header:instrument
   " "
 }
 
@@ -155,11 +170,11 @@ oddFooterMarkup = \markup {
   \column {
     \fill-line {
       %% Copyright header field only on first page.
-      \on-the-fly #first-page \fromproperty #'header:copyright
+      \on-the-fly #part-first-page \fromproperty #'header:copyright
     }
     \fill-line {
       %% Tagline header field only on last page.
-      \on-the-fly #last-page \fromproperty #'header:tagline
+      \on-the-fly #part-last-page \fromproperty #'header:tagline
     }
   }
 }