*** empty log message ***

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index d94c42a78be4537ef8a3318f594854e5e77d08ad..f4c1ee24d4356a8329401fef2bb5537e62ff8727 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,77 +1,110 @@
+\version "2.4.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
+  #"http://lilypond.org/pdflink/"
+  \line {
+    "Engraved by LilyPond"
+    #(ly:export (lilypond-version))
+    "-"
+    "www.lilypond.org"
+  }
+}
 bookTitleMarkup = \markup {
-  \column <
-    \fill-line < \fromproperty #'header:dedication >
-    \fill-line <
+
+  \column {
+    \fill-line { \fromproperty #'header:dedication }
+    \fill-line {
       \huge \bigger \bigger \bigger \bold \fromproperty #'header:title
-    >
-    \fill-line <
+    }
+    \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 <
+      \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
-               >
-      >
-  >
+      \column {
+       \fromproperty #'header:composer
+       \fromproperty #'header:arranger
+      }
+    }
+  }
+
 }
 
 scoreTitleMarkup = \markup {
-  \fill-line <
+  \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))
+
+#(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) 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)))
+    (interpret-markup layout props arg)
+    empty-stencil))
 
 oddHeaderMarkup = \markup
-\fill-line <
+\on-the-fly #not-single-page
+\fill-line {
   ""
-  \fromproperty #'header:instrument
+  \on-the-fly #not-first-page \fromproperty #'header:instrument
   \fromproperty #'page:page-number-string
->
+}
 
 evenHeaderMarkup = \markup
-\fill-line <
+\fill-line {
   \fromproperty #'page:page-number-string
   \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
-    >
-  >
 }
 
+oddFooterMarkup = \markup {
+  \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
+    }
+  }
+}