X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftitling-init.ly;h=12bfa4f34072e919b2a38b2e607b47f33bab1554;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=da2bf166c94e063ec5b419b2bf38cc5325ce7603;hpb=c0ae8834560b64fdbb5d2352dc55e3006eb9104f;p=lilypond.git

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index da2bf166c9..12bfa4f340 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
@@ -73,14 +76,8 @@ scoreTitleMarkup = \markup { \column {
 #(define (book-first-page? layout props)
    "Return #t iff the current page number, got from @code{props}, is the
 book first one."
-   (define (ancestor layout)
-     "Return the topmost layout ancestor"
-     (let ((parent (ly:output-def-parent layout)))
-       (if (not (ly:output-def? parent))
-           layout
-           (ancestor parent))))
    (= (chain-assoc-get 'page:page-number props -1)
-      (ly:output-def-lookup (ancestor layout) 'first-page-number)))
+      (book-first-page layout props)))
 
 #(define (book-last-page? layout props)
    "Return #t iff the current page number, got from @code{props}, is the
@@ -152,9 +149,7 @@ book last one."
 
 oddHeaderMarkup = \markup
 \fill-line {
-  %% force the header to take some space, otherwise the
-  %% page layout becomes a complete mess.
-  " "
+  ""
   \on-the-fly #not-part-first-page \fromproperty #'header:instrument
   \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
 }
@@ -165,7 +160,7 @@ evenHeaderMarkup = \markup
 \fill-line {
   \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
   \on-the-fly #not-part-first-page \fromproperty #'header:instrument
-  " "
+  ""
 }
 
 oddFooterMarkup = \markup {