X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=eb9ced5375c577714e31e005877a71caeaad6fe9;hb=b357d2084d1ae252a890e92019e62aa8ccbfdafc;hp=c90f6ee5d242ebc3a0dbcb3b6acd4d7f845cff93;hpb=f0fe9c843e926066299c1f9a33004649f42e1f24;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index c90f6ee5d2..eb9ced5375 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,5 +1,8 @@
 \version "2.16.0"
 
+#(if (guile-v2)
+  (use-modules (ice-9 curried-definitions)))
+
 slashSeparator = \markup {
   \center-align
   \vcenter \combine
@@ -8,17 +11,19 @@ slashSeparator = \markup {
 }
 
 tagline = \markup {
-  \with-url
+  \pad-to-box #'(0 . 0) #'(0 . 3)
+  {  \with-url
 
-  #"http://lilypond.org/"
-  \line {
+    #"http://lilypond.org/"
+    \line {
 
-    %% 2014 = em dash.
+      %% 2014 = em dash.
 
-    #(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
-       (lilypond-version)
-       (ly:wide-char->utf-8 #x2014)
-       )
+      #(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
+         (lilypond-version)
+         (ly:wide-char->utf-8 #x2014)
+         )
+    }
   }
 }
 
@@ -59,7 +64,7 @@ bookTitleMarkup = \markup {
 }
 
 scoreTitleMarkup = \markup { \column {
-  \on-the-fly #print-all-headers { \bookTitleMarkup \hspace #1 }
+  \on-the-fly \print-all-headers { \bookTitleMarkup \hspace #1 }
   \fill-line {
     \fromproperty #'header:piece
     \fromproperty #'header:opus
@@ -143,7 +148,7 @@ book last one."
    empty-stencil))
 
 #(define (print-page-number-check-first layout props arg)
-  (if (or (not (part-first-page? layout props))
+  (if (or (not (book-first-page? layout props))
           (eq? (ly:output-def-lookup layout 'print-first-page-number) #t))
    (create-page-number-stencil layout props arg)
    empty-stencil))
@@ -169,12 +174,12 @@ evenHeaderMarkup = \markup
 oddFooterMarkup = \markup {
   \column {
     \fill-line {
-      %% Copyright header field only on first page.
+      %% Copyright header field only on first page in each bookpart.
       \on-the-fly #part-first-page \fromproperty #'header:copyright
     }
     \fill-line {
-      %% Tagline header field only on last page.
-      \on-the-fly #part-last-page \fromproperty #'header:tagline
+      %% Tagline header field only on last page in the book.
+      \on-the-fly #last-page \fromproperty #'header:tagline
     }
   }
 }