X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=c27b7c23945d6db060a482513be694fb4e4204a0;hb=ee44e5855df96a91937bdf36e7268bb9feb0f77b;hp=87d56c14d54577177a76e7c9a82c108f6b1a3295;hpb=4300e287a18cbc4569c79f8e8445609dc7d4546a;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 87d56c14d5..c27b7c2394 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,108 +1,159 @@
-\version "2.4.0"
+\version "2.12.0"
 
 slashSeparator = \markup {
-    \hcenter
-    \vcenter \combine
-      \beam #2.0 #0.5 #0.48
-      \raise #0.7 \beam #2.0 #0.5 #0.48
-  }
-
+  \center-align
+  \vcenter \combine
+  \beam #2.0 #0.5 #0.48
+  \raise #0.7 \beam #2.0 #0.5 #0.48
+}
 
 tagline = \markup {
   \with-url
-  #"http://lilypond.org/pdflink/"
+
+  #"http://lilypond.org/"
   \line {
-    "Engraved 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 'print-all-headers) #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 \larger \bold
+      \fill-line {
+        \larger \fromproperty #'header:title
       }
-    }
-    \fill-line {
-      \fromproperty #'header:poet
-      \fromproperty #'header:instrument 
-      \column {
-	\fromproperty #'header:composer
-	\fromproperty #'header:arranger
+      \fill-line {
+        \large \smaller \bold
+        \larger \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
   }
 }
+}
+
+%% 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) 1)
-    (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) 1))
-    (interpret-markup layout props arg)
-    empty-stencil))
-
+  (if (not (book-first-page? layout props))
+      (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) 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 (book-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
-\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 would inherit the value of
+%% oddHeaderMarkup if it were not defined here
 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
     }
@@ -113,4 +164,6 @@ oddFooterMarkup = \markup {
   }
 }
 
-
+%% As long as evenFooterMarkup is unset, it inherits the value of
+%% oddFooterMarkup, as if this were declared here:
+% evenFooterMarkup = \oddFooterMarkup