X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=7eae28e66df9e78300e7f694de1a4783626b0d42;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=cf1fae1316ce4ec0902f0099cd03976257f6ab43;hpb=e66c42324b8f89bf409327eb0ec893df711e782f;p=lilypond.git

diff --git a/scm/titling.scm b/scm/titling.scm
index cf1fae1316..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,27 +36,20 @@ 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
-           (if (ly:output-def-lookup layout 'printpagenumber)
-               (number->string page-number)
-               ""))
+		       (number->string page-number))
 		 (cons 'page:page-number page-number)))
 	       (props (append
 		       (list pgnum-alist)
 		       prefixed-alists
 		       (layout-extract-page-properties layout))))
-
+	  
 	  (interpret-markup layout props potential-markup))
 
 	empty-stencil))