From 6b256b18eecccaf45ce6d19260adb752db85aff0 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 1 Dec 2004 11:05:37 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog          |  4 ++++
 ly/titling-init.ly |  3 +++
 scm/titling.scm    | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b95b2dc5c7..a1ddac1ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* mf/parmesan-heads.mf (overdone_heads): typos.
+
 2004-11-30  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 
 	* lily/parser.yy (markup): in markups, { .. } without command
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 47f6e390a7..a679ee687d 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,5 @@
 bookTitleMarkup = \markup {
+
   \column {
     \fill-line { \fromproperty #'header:dedication }
     \fill-line {
@@ -26,6 +27,7 @@ bookTitleMarkup = \markup {
       }
     }
   }
+
 }
 
 scoreTitleMarkup = \markup {
@@ -74,3 +76,4 @@ oddFooterMarkup = \markup {
   }
 }
 
+
diff --git a/scm/titling.scm b/scm/titling.scm
index a72fa80856..aa0b431ae9 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -38,16 +38,21 @@ page:last?, page:page-number-string and page:page-number
 			     ))
 			  alist))
 		   alists))
-	     (pgnum-alist (list
-			   (cons 'page:last? last?)
-			   (cons 'page:page-number-string
-				 (number->string page-number))
-			   (cons 'page:page-number  page-number)))
+	     (tagline (ly:modules-lookup scopes 'tagline)) 
+
+	     (pgnum-alist
+	       (list
+		(cons 'header:tagline (if (markup? tagline)
+					  tagline
+					  TAGLINE)))
+		(cons 'page:last? last?)
+		(cons 'page:page-number-string
+		      (number->string page-number))
+		(cons 'page:page-number  page-number))
 	     (props (append
 		     (list pgnum-alist)
 		     prefixed-alists
-		     (page-properties layout)))
-	     )
+		     (page-properties layout))))
 
 	  (interpret-markup layout props potential-markup))
 	
-- 
2.39.5