X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=bf4c147e84b157909d9f64d12e4e4c956a63bc98;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=4e155b0dc09182afb8c27f7445dcd3b89c92b359;hpb=d15fe331c8c497051c589dd9000fc08c21bda3ee;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 4e155b0dc0..bf4c147e84 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.10.0"
 
 slashSeparator = \markup {
   \hcenter
@@ -13,12 +13,14 @@ tagline = \markup {
   %% todo: lilypond.org/music-engraving
   #"http://lilypond.org/web/"
   \line {
-    "Music engraving by LilyPond"
-    #(ly:export (lilypond-version))
 
     %% 2014 = em dash.
-    #(ly:export (ly:wide-char->utf-8 #x2014))
-    "www.lilypond.org"
+    
+    #(ly:export
+      (format "Music engraving by LilyPond ~a~awww.lilypond.org"
+       (lilypond-version)
+       (ly:wide-char->utf-8 #x2014)
+       ))
   }
 }
 
@@ -68,9 +70,10 @@ scoreTitleMarkup = \markup { \column {
 }
 
 #(define (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 
-         (ly:output-def-lookup layout 'firstpagenumber))   (interpret-markup layout props arg)
-   empty-stencil))
+  (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)
@@ -79,28 +82,28 @@ scoreTitleMarkup = \markup { \column {
 
 #(define (not-first-page layout props arg)
   (if (not (= (chain-assoc-get 'page:page-number props -1)
-              (ly:output-def-lookup layout 'firstpagenumber)))
+              (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 'firstpagenumber))
+                   (ly:output-def-lookup layout 'first-page-number))
                (chain-assoc-get 'page:last? props -1)))
    (interpret-markup layout props arg)
    empty-stencil))
 
-#(define (print-page-number layout props arg)
-  (if (eq? (ly:output-def-lookup layout 'printpagenumber) #t)
+#(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 'firstpagenumber)))
-          (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t))
-   (print-page-number layout props arg)
+                  (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
@@ -116,7 +119,7 @@ evenHeaderMarkup = \markup
 \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 {