Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index f9f7fba61041a701b9b8f3865d46636110d818de..60c07e6ef0776102b59cbdcdedd2b07a5bd9db3e 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,7 +1,7 @@
-\version "2.4.0"
+\version "2.12.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
@@ -13,94 +13,144 @@ 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 'print-all-headers) #t)
+   (interpret-markup layout props arg)
+   empty-stencil))
+
 bookTitleMarkup = \markup {
-  \override #'(baseline-skip . 3)
+  \override #'(baseline-skip . 3.5)
   \column {
     \fill-line { \fromproperty #'header:dedication }
+    \override #'(baseline-skip . 3.5)
     \column {
-      \override #'(baseline-skip . 3.5)
-      \huge \bigger \bold
+      \huge \larger \bold
+      \fill-line {
+        \larger \fromproperty #'header:title
+      }
       \fill-line {
-       \bigger \fromproperty #'header:title
+        \large \smaller \bold
+        \larger \fromproperty #'header:subtitle
       }
       \fill-line {
-       \large \smaller \bold
-       \bigger  \fromproperty #'header:subtitle
+        \smaller \bold
+        \fromproperty #'header:subsubtitle
       }
       \fill-line {
-       \smaller \bold
-       \fromproperty #'header:subsubtitle
+        \fromproperty #'header:poet
+        { \large \bold \fromproperty #'header:instrument }
+        \fromproperty #'header:composer
       }
       \fill-line {
-       \fromproperty #'header:poet
-       { \large \bold \fromproperty #'header:instrument }
-       \column {
-         \fromproperty #'header:composer
-         \fromproperty #'header:arranger
-       }
+        \fromproperty #'header:meter
+        \fromproperty #'header:arranger
       }
     }
   }
 }
 
-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 (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 1)
-   (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)
-  (if (not (= (chain-assoc-get 'page:page-number props -1) 1))
+  (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)))
+      (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)
+  (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 (not-single-page layout props arg)
-  (if (not (and (= (chain-assoc-get 'page:page-number props -1) 1)
-           (chain-assoc-get 'page:last? props -1)))
+#(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 'first-page-number)))
+          (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
+   (create-page-number-stencil layout props arg)
+   empty-stencil))
+
 oddHeaderMarkup = \markup
- % \on-the-fly #not-single-page
 \fill-line {
   %% force the header to take some space, otherwise the
-  %% page layout becomes a complete mess. 
+  %% page layout becomes a complete mess.
   " "
   \on-the-fly #not-first-page \fromproperty #'header:instrument
-  \on-the-fly #not-first-page \fromproperty #'page:page-number-string
+  \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
 }
 
 evenHeaderMarkup = \markup
 \fill-line {
-  \fromproperty #'page:page-number-string
-  \fromproperty #'header:instrument
-  ""
+  \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
+  \on-the-fly #not-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
     }
@@ -111,4 +161,3 @@ oddFooterMarkup = \markup {
   }
 }
 
-