* ly/music-functions-init.ly (oldaddlyrics): idem.

* lily/parser.yy: NewLyricCombineMusic ->
LyricCombineMusic. LyricCombineMusic -> OldLyricCombineMusic.

diff --git a/ChangeLog b/ChangeLog
index 771a884ad2a9bb5aca05bcdf1be58cb65cef2617..f95df7aa2464adfccb49b565c669d37005f0eec0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * ly/music-functions-init.ly (oldaddlyrics): idem.
+
+       * lily/parser.yy: NewLyricCombineMusic ->
+       LyricCombineMusic. LyricCombineMusic -> OldLyricCombineMusic.
+
 2005-05-24  Pedro Kroger  <kroeger@pedrokroeger.net>
 
        * ly/Welcome_to_LilyPond.ly: typo.

diff --git a/lily/parser.yy b/lily/parser.yy
index 8cf6b01a4008d769030dec029ae3a331aea4b914..8d1cbb643ba4bf6aeba47cc508c7dbd96a495729 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -199,7 +199,7 @@ make_music_relative (Pitch start, Music *music)
 Music*
 make_lyric_combine_music (SCM name, Music *music)
 {
-       Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic");
+       Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
        combine->set_property ("element", music->self_scm ());
        combine->set_property ("associated-context", name);
        return combine;

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 5ab7907bcfde10e6d11f1b4a9dd05e975d7ce497..d732b5731e88ddcebda4d93ce86fb51dd5df5aa0 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -6,7 +6,7 @@ applymusic = #(def-music-function (parser location func music) (procedure? ly:mu
 
 oldaddlyrics = #(def-music-function (parser location music lyrics) (ly:music? ly:music?)
 
-              (make-music 'LyricCombineMusic 
+              (make-music 'OldLyricCombineMusic 
                           'origin location
                           'elements (list music lyrics)))
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index bb0cdd4662d2dfab815fc0558e6df4dd5a39f281..6c535a8c76a42420f43f06d93a402aae5a028a6e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -512,7 +512,7 @@
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_parent))
        (layer . 0)
-       (meta . ((interfaces . (grid-line-interface)))
+       (meta . ((interfaces . (self-alignment-interface grid-line-interface)))
        )))
        
     (Hairpin

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 260486ff45fd26eba6dcbad8da3b6ffc744dac12..4593aba5a8fc80172637f015e02fa99f238b8622 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -255,7 +255,7 @@ Syntax: @code{\\key } @var{name} @var{scale}.")
        (types . (general-music span-event ligature-event event))
        ))
     
-    (LyricCombineMusic
+    (OldLyricCombineMusic
      . (
        (description .  "Align lyrics to the start of notes.
 
@@ -268,7 +268,7 @@ Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.")
        (iterator-ctor . ,Lyric_combine_music_iterator::constructor)
        ))
     
-    (NewLyricCombineMusic
+    (LyricCombineMusic
      . (
        (description .  "Align lyrics to the start of notes.