(marked-up-headfoot): change tagline

[lilypond.git] / scm / titling.scm

diff --git a/scm/titling.scm b/scm/titling.scm
index c41dfb8ee2d499305d39fc14ffc2b946e23031bf..ab429c85f9739d362eed303e54dc1ec84888a7b5 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -5,7 +5,7 @@
 ;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-(define-public (page-properties layout)
+(define-public (layout-extract-page-properties layout)
   (list (append `((linewidth . ,(ly:paper-get-number
                                 layout 'linewidth)))
                (ly:output-def-lookup layout 'text-font-defaults))))
@@ -36,13 +36,11 @@ page:last?, page:page-number-string and page:page-number
                               (cdr entry)))
                            alist))
                     alists))
-              (tagline (ly:modules-lookup scopes 'tagline)) 
-
               (pgnum-alist
                (list
-                (cons 'header:tagline (if (markup? tagline)
-                                          tagline
-                                          TAGLINE))
+                (cons 'header:tagline
+                      (ly:modules-lookup scopes 'tagline
+                                         (ly:output-def-lookup layout 'tagline)))
                 (cons 'page:last? last?)
                 (cons 'page:page-number-string
                       (number->string page-number))
@@ -50,8 +48,8 @@ page:last?, page:page-number-string and page:page-number
               (props (append
                       (list pgnum-alist)
                       prefixed-alists
-                      (page-properties layout))))
-
+                      (layout-extract-page-properties layout))))
+         (display prefixed-alists)
          (interpret-markup layout props potential-markup))
 
        empty-stencil))
@@ -85,7 +83,7 @@ PROPS argument will include variables set in SCOPES (prefixed with
                      alist))
               alists))
         (props (append prefixed-alist
-                       (page-properties layout)))
+                       (layout-extract-page-properties layout)))
 
         (markup (ly:output-def-lookup layout what)))