X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Ftitling.scm;h=7eae28e66df9e78300e7f694de1a4783626b0d42;hb=e0caac883553c23c92d4b51070b721fe2207ddcb;hp=19a637657f360e8de950aec862e92cc96568fa96;hpb=0493b7e196b2757276d5802d87094bfddc464606;p=lilypond.git

diff --git a/scm/titling.scm b/scm/titling.scm
index 19a637657f..7eae28e66d 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -2,12 +2,12 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (layout-extract-page-properties layout)
-  (list (append `((linewidth . ,(ly:paper-get-number
-				 layout 'linewidth)))
+  (list (append `((line-width . ,(ly:paper-get-number
+				 layout 'line-width)))
 		(ly:output-def-lookup layout 'text-font-defaults))))
 
 ;;;;;;;;;;;;;;;;;;
@@ -36,16 +36,11 @@ page:last?, page:page-number-string and page:page-number
 			       (cdr entry)))
 			    alist))
 		     alists))
-	       (tagline (ly:modules-lookup scopes 'tagline)) 
-	       (default-tagline (ly:output-def-lookup layout 'tagline)) 
-
 	       (pgnum-alist
 		(list
 		 (cons 'header:tagline
-		       (cond
-			((markup? tagline) tagline)
-			((markup? default-tagline) default-tagline)
-			(else "")))
+		       (ly:modules-lookup scopes 'tagline
+					  (ly:output-def-lookup layout 'tagline)))
 		 (cons 'page:last? last?)
 		 (cons 'page:page-number-string
 		       (number->string page-number))
@@ -53,8 +48,8 @@ page:last?, page:page-number-string and page:page-number
 	       (props (append
 		       (list pgnum-alist)
 		       prefixed-alists
-		       layout-extract-page-properties layout))))
-
+		       (layout-extract-page-properties layout))))
+	  
 	  (interpret-markup layout props potential-markup))
 
 	empty-stencil))
@@ -88,7 +83,7 @@ PROPS argument will include variables set in SCOPES (prefixed with
 		      alist))
 	       alists))
 	 (props (append prefixed-alist
-			layout-extract-page-properties layout)))
+			(layout-extract-page-properties layout)))
 
 	 (markup (ly:output-def-lookup layout what)))