Do not print intstrument twice on first

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index bea90f7ebcc5166fdeb3ef8f50a54b69f668683b..5b16c8102efdfd23cbc39d56a6f178fd3862f7e4 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,76 +1,97 @@
+
+slashSeparator = \markup {
+    \hcenter
+    \vcenter \combine
+      \beam #2.0 #0.5 #0.48
+      \raise #0.7 \beam #2.0 #0.5 #0.48
+  }
+
 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 <
+      \column {
+       \fill-line {
          \huge \bigger \bigger
          \bold \fromproperty #'header:subtitle
-       >
-       \fill-line <
+       }
+       \fill-line {
          \huge \bigger
          \bold \fromproperty #'header:subsubtitle
-       >
-      >
-    >
-    \fill-line <
+       }
+      }
+    }
+    \fill-line {
       \fromproperty #'header:poet
       \fromproperty #'header:instrument 
-      \column <
+      \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 (multiple-pages layout props arg)
 
 oddHeaderMarkup = \markup
-\fill-line <
+%% Do not print page number on fist page.
+%% FIXME: only if multiple pages, do page number
+%% \on-the-fly #multiple-pages
+\on-the-fly #not-first-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 <
+  \column {
+    \fill-line {
 
-      % put copyright only on pagenr. 1 
-      \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 <
-      % put tagline only on last page
-      \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
-    >
-  >
+      %% 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
+    }
+  }
 }
 
+