Do not print intstrument twice on first

page.  Do not print page number on first page.

diff --git a/ChangeLog b/ChangeLog
index b3dca95ff74b5a8bdddf3da63251e8689218b0cf..75a1ac71ca0a80c756f7ce310916a47408bac203 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-06  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * ly/titling-init.ly: Do not print intstrument twice on first
+       page.  Do not print page number on first page.
+
 2005-02-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * input/regression/*.ly: remove old-relative everywhere

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index a41a24c633ad33ce2c8a1241a28b65960cf87341..5b16c8102efdfd23cbc39d56a6f178fd3862f7e4 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -45,11 +45,31 @@ scoreTitleMarkup = \markup {
   }
 }
 
+#(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
+%% 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
 }
 
@@ -64,22 +84,12 @@ oddFooterMarkup = \markup {
   \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
+      %% Copyright header field only on first page.
+      \on-the-fly #first-page \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
+      %% Tagline header field only on last page.
+      \on-the-fly #last-page \fromproperty #'header:tagline
     }
   }
 }