Merge branch 'master' into nested-bookparts

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 2af0acc450b7c644091c66db2629525e91f6558b..9f5cf98a71f810ba77dbc79891f5680064ca2c6f 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,7 +1,7 @@
-\version "2.4.0"
+\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
@@ -10,101 +10,121 @@ slashSeparator = \markup {
 tagline = \markup {
   \with-url
 
-  % todo: lilypond.org/music-engraving
+  %% todo: lilypond.org/music-engraving
   #"http://lilypond.org/web/"
   \line {
-    "Music engraving by LilyPond"
-    #(ly:export (lilypond-version))
-    "-"
-    "www.lilypond.org"
+
+    %% 2014 = em dash.
+    
+    #(ly:export
+      (format "Music engraving by LilyPond ~a~awww.lilypond.org"
+       (lilypond-version)
+       (ly:wide-char->utf-8 #x2014)
+       ))
   }
 }
 
-bookTitleMarkup = \markup {
+#(define (print-all-headers layout props arg)
+  (if (eq? (ly:output-def-lookup layout 'printallheaders) #t)
+   (interpret-markup layout props arg)
+   empty-stencil))
 
+bookTitleMarkup = \markup {
+  \override #'(baseline-skip . 3.5)
   \column {
-      \override #'(baseline-skip . 3)
     \fill-line { \fromproperty #'header:dedication }
-    \fill-line {
-      \huge \bigger \bigger \bold \fromproperty #'header:title
-    }
-    \fill-line {
-      \override #'(baseline-skip . 6)
-      \column {
-       \fill-line {
-         \huge \bigger \bigger
-         \bold \fromproperty #'header:subtitle
-       }
-       \fill-line {
-         \huge \bigger
-         \bold \fromproperty #'header:subsubtitle
-       }
-%% From 2.4:
-%%     \column {
-%%       \override #'(baseline-skip . 5)
-%%       ""
-%%     }
+    \override #'(baseline-skip . 3.5)
+    \column {
+      \huge \bigger \bold
+      \fill-line {
+        \bigger \fromproperty #'header:title
       }
-    }
-    \fill-line {
-      \fromproperty #'header:poet
-      \fromproperty #'header:instrument 
-      \column {
-       \fromproperty #'header:composer
-       \fromproperty #'header:arranger
+      \fill-line {
+        \large \smaller \bold
+        \bigger \fromproperty #'header:subtitle
+      }
+      \fill-line {
+        \smaller \bold
+        \fromproperty #'header:subsubtitle
+      }
+      \fill-line {
+        \fromproperty #'header:poet
+        { \large \bold \fromproperty #'header:instrument }
+        \fromproperty #'header:composer
+      }
+      \fill-line {
+        \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
   }
 }
+}
 
 #(define (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 1)
-    (interpret-markup layout props arg)
-    empty-stencil))
+  (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 (last-page layout props arg)
   (if (chain-assoc-get 'page:last? props #f)
-    (interpret-markup layout props arg)
-    empty-stencil))
+   (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))
-    (interpret-markup layout props arg)
-    empty-stencil))
+  (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))
 
+%% unused
 #(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)))
-    (interpret-markup layout props arg)
-    empty-stencil))
+  (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 (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.
+  " "
   \on-the-fly #not-first-page \fromproperty #'header:instrument
-  \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
     }
@@ -115,4 +135,3 @@ oddFooterMarkup = \markup {
   }
 }
 
-