X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=bf4c147e84b157909d9f64d12e4e4c956a63bc98;hb=1c0ec6f412462ee0f773b09b079847d2be03f64f;hp=d94c42a78be4537ef8a3318f594854e5e77d08ad;hpb=14d880f92583caf3dbbe610201679930fdafdc9c;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index d94c42a78b..bf4c147e84 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,77 +1,137 @@
+\version "2.10.0"
+
+slashSeparator = \markup {
+  \hcenter
+  \vcenter \combine
+  \beam #2.0 #0.5 #0.48
+  \raise #0.7 \beam #2.0 #0.5 #0.48
+}
+
+tagline = \markup {
+  \with-url
+
+  %% todo: lilypond.org/music-engraving
+  #"http://lilypond.org/web/"
+  \line {
+
+    %% 2014 = em dash.
+    
+    #(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 'printallheaders) #t)
+   (interpret-markup layout props arg)
+   empty-stencil))
 
 bookTitleMarkup = \markup {
-  \column <
-    \fill-line < \fromproperty #'header:dedication >
-    \fill-line <
-      \huge \bigger \bigger \bigger \bold \fromproperty #'header:title
-    >
-    \fill-line <
-      \override #'(baseline-skip . 3)
-        \column <
-	  \fill-line <
-	        \huge \bigger \bigger
-		   \bold \fromproperty #'header:subtitle
-		>
-	  \fill-line <
-	        \huge \bigger
-		   \bold \fromproperty #'header:subsubtitle
-		>
-	  >
-    >
-    \fill-line <
-      \fromproperty #'header:poet
-      \fromproperty #'header:instrument 
-      \column <
-		\fromproperty #'header:composer
-		\fromproperty #'header:arranger
-		>
-      >
-  >
+  \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
+      }
+      \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 {
-  \fill-line <
+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)
+         (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))
+
+#(define (not-first-page layout props arg)
+  (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) 
+                   (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
-\fill-line <
-  ""
-  \fromproperty #'header:instrument
-  \fromproperty #'page:page-number-string
->
+\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
+  \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
-  ""
->
+\fill-line {
+  \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 <
-      \on-the-fly #(lambda (layout props arg)
-		    (if (= 1 (chain-assoc-get 'page:page-number props   -1))
-		     (interpret-markup layout props arg)
-		     empty-stencil
-		   ))
-      \fromproperty #'header:copyright
-    >
-    \fill-line <
-      \on-the-fly #(lambda (layout props arg)
-		    (if (chain-assoc-get 'page:last?  props #f)
-		     (interpret-markup layout props arg)
-		     empty-stencil
-		   ))
-      \fromproperty #'header:tagline
-    >
-  >
+  \column {
+    \fill-line {
+      %% Copyright header field only on first page.
+      \on-the-fly #first-page \fromproperty #'header:copyright
+    }
+    \fill-line {
+      %% Tagline header field only on last page.
+      \on-the-fly #last-page \fromproperty #'header:tagline
+    }
+  }
 }
 
-
-
-