From 3011bfd5453a324fbd6a0cc56096dc0dff8da3b8 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Wed, 25 May 2005 01:16:45 +0000
Subject: [PATCH] * ly/music-functions-init.ly (oldaddlyrics): idem.

* lily/parser.yy: NewLyricCombineMusic ->
LyricCombineMusic. LyricCombineMusic -> OldLyricCombineMusic.
---
 ChangeLog                  | 7 +++++++
 lily/parser.yy             | 2 +-
 ly/music-functions-init.ly | 2 +-
 scm/define-grobs.scm       | 2 +-
 scm/define-music-types.scm | 4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 771a884ad2..f95df7aa24 100644
--- 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 8cf6b01a40..8d1cbb643b 100644
--- 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 5ab7907bcf..d732b5731e 100644
--- 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 bb0cdd4662..6c535a8c76 100644
--- 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 260486ff45..4593aba5a8 100644
--- 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.
 
-- 
2.39.5