Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 26bca808c8f19cb8faf78e0ea5dad23c45b3fda6..bf4c147e84b157909d9f64d12e4e4c956a63bc98 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.10.0"
 
 slashSeparator = \markup {
   \hcenter
@@ -13,13 +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)
+       ))
   }
 }
 
@@ -69,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 'first-page-number))   (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)
@@ -92,7 +94,7 @@ scoreTitleMarkup = \markup { \column {
    (interpret-markup layout props arg)
    empty-stencil))
 
-#(define (print-page-number layout props arg)
+#(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))
@@ -100,8 +102,8 @@ scoreTitleMarkup = \markup { \column {
 #(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 'first-page-number)))
-          (eq? (ly:output-def-lookup layout 'printfirst-page-number) #t))
-   (print-page-number layout props arg)
+          (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
+   (create-page-number-stencil layout props arg)
    empty-stencil))
 
 oddHeaderMarkup = \markup