Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 64f1855a0499d713df10d016b92952dd7abaf042..26bca808c8f19cb8faf78e0ea5dad23c45b3fda6 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.7.39"
 
 slashSeparator = \markup {
   \hcenter
@@ -14,52 +14,63 @@ tagline = \markup {
   #"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"
   }
 }
 
+#(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)
+  \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
       \fill-line {
-       \bigger \fromproperty #'header:title
+        \bigger \fromproperty #'header:title
+      }
+      \fill-line {
+        \large \smaller \bold
+        \bigger \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
   }
 }
+}
 
 #(define (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 1)
-   (interpret-markup 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 (last-page layout props arg)
@@ -68,37 +79,50 @@ scoreTitleMarkup = \markup {
    empty-stencil))
 
 #(define (not-first-page layout props arg)
-  (if (not (= (chain-assoc-get 'page:page-number props -1) 1))
+  (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)))
+  (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 '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 'printfirst-page-number) #t))
+   (print-page-number 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
     }
@@ -109,4 +133,3 @@ oddFooterMarkup = \markup {
   }
 }
 
-