*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b95b2dc5c735bd0e264461bc861d08fe59aad2c9..a1ddac1ff80e2b3e20b3544f828c6c6018cb77ad 100644 (file)
--- 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 47f6e390a799fbff59842827d4d158757d28f634..a679ee687ddec56989719fc7c355001003e6a5fa 100644 (file)
--- 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 a72fa8085696e99e4ccbba800a6b0bb0324ba5d4..aa0b431ae9f230703f37e2b04660002b94c6798c 100644 (file)
--- 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))