*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 59f1bfd272c1f6395b6b71f2f8b595c85909e07c..777fa149ff1b293a2711131d6e92baca3b19664f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2005-03-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/score.cc: Bugfixes for SCM header_ and texts_ members.
+
 2005-03-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/open-type-font-scheme.cc:  new file.
 
 2005-03-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/titling.scm (layout-extract-page-properties): Rename from
+       page-properties.  Update callers.
+
        * lily/lexer.ll (Lily_lexer):
        * lily/parser.yy: Junk lyric_markup state.
 

diff --git a/scm/titling.scm b/scm/titling.scm
index b129166ac36ccf0869c623d9012a6caa5c364cff..19a637657f360e8de950aec862e92cc96568fa96 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))))
@@ -53,7 +53,7 @@ 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))))
 
          (interpret-markup layout props potential-markup))
 
@@ -88,7 +88,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)))