Hi,
In the lexer/parser, NEWADDLYRICS has not been renamed to LYRICSTO. This makes
some rare parser error messages more confusing.
The attached patch hopefully fixes this.
Erik
diff -u -r1.169 my-lily-lexer.cc
--- lily/my-lily-lexer.cc 12 Apr 2004 12:48:41 -0000 1.169
+++ lily/my-lily-lexer.cc 15 Apr 2004 22:40:16 -0000
@@ -55,7 +55,7 @@
{"header", HEADER},
{"key", KEY},
{"lyrics", LYRICS},
- {"lyricsto", NEWADDLYRICS},
+ {"lyricsto", LYRICSTO},
{"mark", MARK},
{"markup", MARKUP},
{"midi", MIDI},
Index: lily/parser.yy
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/parser.yy,v
retrieving revision 1.353
diff -u -r1.353 parser.yy
--- lily/parser.yy 12 Apr 2004 14:35:19 -0000 1.353
+++ lily/parser.yy 15 Apr 2004 22:40:20 -0000
@@ -236,7 +236,7 @@
%token ACCEPTS
%token ADDLYRICS
%token ADDQUOTE
-%token NEWADDLYRICS
+%token LYRICSTO
%token ALIAS
%token ALTERNATIVE
%token APPLY
@@ -1137,7 +1137,7 @@
scm_gc_unprotect_object ($2->self_scm ());
$$ = l;
}
- | NEWADDLYRICS string Music {
+ | LYRICSTO string Music {
Music *l = MY_MAKE_MUSIC ("NewLyricCombineMusic");
l->set_property ("element", $3->self_scm ());
scm_gc_unprotect_object ($3->self_scm ());
_______________________________________________
Lilypond-devel mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/lilypond-devel
