Merge branch 'stable/2.16' into staging

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 0695ad5f42cc2aa371bb65785fcf9cd36820b16a..c90f6ee5d242ebc3a0dbcb3b6acd4d7f845cff93 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,7 +1,7 @@
-\version "2.6.0"
+\version "2.16.0"
 
 slashSeparator = \markup {
-  \hcenter
+  \center-align
   \vcenter \combine
   \beam #2.0 #0.5 #0.48
   \raise #0.7 \beam #2.0 #0.5 #0.48
@@ -10,31 +10,36 @@ slashSeparator = \markup {
 tagline = \markup {
   \with-url
 
-  %% todo: lilypond.org/music-engraving
-  #"http://lilypond.org/web/"
+  #"http://lilypond.org/"
   \line {
-    "Music engraving by LilyPond"
-    #(ly:export (lilypond-version))
 
     %% 2014 = em dash.
-    #(ly:export (ly:wide-char->utf-8 #x2014))
-    "www.lilypond.org"
+
+    #(format #f "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 'print-all-headers) #t)
+   (interpret-markup layout props arg)
+   empty-stencil))
+
 bookTitleMarkup = \markup {
   \override #'(baseline-skip . 3.5)
   \column {
     \fill-line { \fromproperty #'header:dedication }
     \override #'(baseline-skip . 3.5)
     \column {
-      \huge \bigger \bold
       \fill-line {
-        \bigger \fromproperty #'header:title
+        \huge \larger \larger \bold
+        \fromproperty #'header:title
       }
       \fill-line {
-        \large \smaller \bold
-        \bigger \fromproperty #'header:subtitle
+        \large \bold
+        \fromproperty #'header:subtitle
       }
       \fill-line {
         \smaller \bold
@@ -53,47 +58,94 @@ bookTitleMarkup = \markup {
   }
 }
 
-scoreTitleMarkup = \markup {
+scoreTitleMarkup = \markup { \column {
+  \on-the-fly #print-all-headers { \bookTitleMarkup \hspace #1 }
   \fill-line {
     \fromproperty #'header:piece
     \fromproperty #'header:opus
   }
 }
+}
+
+%% Book first page and last page predicates
+#(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))))
+   (= (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 (= (chain-assoc-get 'page:page-number props -1) 
-         (ly:output-def-lookup layout 'firstpagenumber))   (interpret-markup layout props arg)
-   empty-stencil))
+  (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))
 
 #(define (not-first-page layout props arg)
-  (if (not (= (chain-assoc-get 'page:page-number props -1)
-              (ly:output-def-lookup layout 'firstpagenumber)))
+  (if (not (book-first-page? layout props))
+      (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 (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 (part-last-page? layout props)
+      (interpret-markup layout props arg)
+      empty-stencil))
+
 %% unused
 #(define (not-single-page layout props arg)
-  (if (not (and (= (chain-assoc-get 'page:page-number props -1) 
-                   (ly:output-def-lookup layout 'firstpagenumber))
+  (if (not (and (= (chain-assoc-get 'page:page-number props -1)
+                   (ly:output-def-lookup layout 'first-page-number))
                (chain-assoc-get 'page:last? props -1)))
    (interpret-markup layout props arg)
    empty-stencil))
 
-#(define (print-page-number layout props arg)
-  (if (eq? (ly:output-def-lookup layout 'printpagenumber) #t)
+#(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))
 
 #(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 'firstpagenumber)))
-          (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t))
-   (print-page-number layout props arg)
+  (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))
 
 oddHeaderMarkup = \markup
@@ -101,27 +153,32 @@ 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
 }
 
+%% evenHeaderMarkup would inherit the value of
+%% oddHeaderMarkup if it were not defined here
 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
+  " "
 }
 
 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
     }
   }
 }
 
+%% As long as evenFooterMarkup is unset, it inherits the value of
+%% oddFooterMarkup, as if this were declared here:
+% evenFooterMarkup = \oddFooterMarkup