Issue 2626: add on-page for usage in \on-the-fly

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index e99b23064522f8dab17b2ae9b11228746cf55caf..7b004468a91abdb192be3aa691851ac3e34a82d8 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.15.20"
 
 slashSeparator = \markup {
   \center-align
@@ -14,12 +14,11 @@ tagline = \markup {
   \line {
 
     %% 2014 = em dash.
-    
-    #(ly:export
-      (format "Music engraving by LilyPond ~a~awww.lilypond.org"
+
+    #(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
        (lilypond-version)
        (ly:wide-char->utf-8 #x2014)
-       ))
+       )
   }
 }
 
@@ -102,6 +101,11 @@ book last one."
       (interpret-markup layout props arg)
       empty-stencil))
 
+#(define ((on-page nmbr) layout props arg)
+ (if (= (chain-assoc-get 'page:page-number props -1) nmbr)
+   (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)
@@ -116,7 +120,7 @@ book last one."
 
 %% unused
 #(define (not-single-page layout props arg)
-  (if (not (and (= (chain-assoc-get 'page:page-number props -1) 
+  (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)
@@ -142,6 +146,8 @@ oddHeaderMarkup = \markup
   \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 {
   \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
@@ -162,3 +168,6 @@ oddFooterMarkup = \markup {
   }
 }
 
+%% As long as evenFooterMarkup is unset, it inherits the value of
+%% oddFooterMarkup, as if this were declared here:
+% evenFooterMarkup = \oddFooterMarkup