CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/25 01:16:45
Modified files:
. : ChangeLog
lily : parser.yy
ly : music-functions-init.ly
scm : define-grobs.scm define-music-types.scm
Log message:
* ly/music-functions-init.ly (oldaddlyrics): idem.
* lily/parser.yy: NewLyricCombineMusic ->
LyricCombineMusic. LyricCombineMusic -> OldLyricCombineMusic.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3654&tr2=1.3655&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.469&tr2=1.470&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/music-functions-init.ly.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.197&tr2=1.198&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-types.scm.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3654 lilypond/ChangeLog:1.3655
--- lilypond/ChangeLog:1.3654 Tue May 24 21:39:09 2005
+++ lilypond/ChangeLog Wed May 25 01:16:45 2005
@@ -1,3 +1,10 @@
+2005-05-25 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * ly/music-functions-init.ly (oldaddlyrics): idem.
+
+ * lily/parser.yy: NewLyricCombineMusic ->
+ LyricCombineMusic. LyricCombineMusic -> OldLyricCombineMusic.
+
2005-05-24 Pedro Kroger <[EMAIL PROTECTED]>
* ly/Welcome_to_LilyPond.ly: typo.
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.469 lilypond/lily/parser.yy:1.470
--- lilypond/lily/parser.yy:1.469 Mon May 23 23:23:42 2005
+++ lilypond/lily/parser.yy Wed May 25 01:16:45 2005
@@ -199,7 +199,7 @@
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;
Index: lilypond/ly/music-functions-init.ly
diff -u lilypond/ly/music-functions-init.ly:1.23
lilypond/ly/music-functions-init.ly:1.24
--- lilypond/ly/music-functions-init.ly:1.23 Sat Apr 2 19:56:25 2005
+++ lilypond/ly/music-functions-init.ly Wed May 25 01:16:45 2005
@@ -6,7 +6,7 @@
oldaddlyrics = #(def-music-function (parser location music lyrics) (ly:music?
ly:music?)
- (make-music 'LyricCombineMusic
+ (make-music 'OldLyricCombineMusic
'origin location
'elements (list music lyrics)))
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.197 lilypond/scm/define-grobs.scm:1.198
--- lilypond/scm/define-grobs.scm:1.197 Wed May 18 04:35:39 2005
+++ lilypond/scm/define-grobs.scm Wed May 25 01:16:45 2005
@@ -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
Index: lilypond/scm/define-music-types.scm
diff -u lilypond/scm/define-music-types.scm:1.55
lilypond/scm/define-music-types.scm:1.56
--- lilypond/scm/define-music-types.scm:1.55 Sun May 22 23:29:23 2005
+++ lilypond/scm/define-music-types.scm Wed May 25 01:16:45 2005
@@ -255,7 +255,7 @@
(types . (general-music span-event ligature-event event))
))
- (LyricCombineMusic
+ (OldLyricCombineMusic
. (
(description . "Align lyrics to the start of notes.
@@ -268,7 +268,7 @@
(iterator-ctor . ,Lyric_combine_music_iterator::constructor)
))
- (NewLyricCombineMusic
+ (LyricCombineMusic
. (
(description . "Align lyrics to the start of notes.
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
