From 0e01f5c8df7afc0be4d10611f9ebd32f967cfe30 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 17 Apr 2004 21:58:12 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ Documentation/bibliography/computer-notation.bib | 2 +- THANKS | 1 + configure.in | 1 - lily/my-lily-lexer.cc | 2 +- lily/parser.yy | 4 ++-- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9777667ddf..404639174c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-16 Han-Wen Nienhuys + + * lily/parser.yy: rename NEWADDLYRICS to LYRICSTO. Thanks to Erik + Sandberg. + 2004-04-17 Jan Nieuwenhuizen * scm/font.scm (add-cmr-fonts): Narrow bold is ecrb. diff --git a/Documentation/bibliography/computer-notation.bib b/Documentation/bibliography/computer-notation.bib index ec4b3fdc93..3f4f7565cc 100644 --- a/Documentation/bibliography/computer-notation.bib +++ b/Documentation/bibliography/computer-notation.bib @@ -699,7 +699,7 @@ basically say: "You can embed a NIFF or MIDI file")} note = {Describes a system called MusicEase, and explains that it uses "constraints" (which go unexplained) to automatically position various elements. }, - + html={http://mesastate.edu/~grader/ieeeme.pdf}, year = {1996}, title = {Creating Printed Music Automatically}, author = {Gary M. Rader}, diff --git a/THANKS b/THANKS index ca417da882..3332625295 100644 --- a/THANKS +++ b/THANKS @@ -20,6 +20,7 @@ David Bobroff David Brandon Peter Rosenbeck Stephen Pollei +Bertalan Fodor Release 2.2 *********** diff --git a/configure.in b/configure.in index 5da07aee6e..ec0618de7a 100644 --- a/configure.in +++ b/configure.in @@ -94,5 +94,4 @@ Type: make$mc install to install LilyPond make$mc help to see all possible targets -Do not worry if ./Documentation should not build. EOF diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index d070a412c9..d7c320c896 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -55,7 +55,7 @@ static Keyword_ent the_key_tab[] = { {"header", HEADER}, {"key", KEY}, {"lyrics", LYRICS}, - {"lyricsto", NEWADDLYRICS}, + {"lyricsto", LYRICSTO}, {"mark", MARK}, {"markup", MARKUP}, {"midi", MIDI}, diff --git a/lily/parser.yy b/lily/parser.yy index fa453ad70d..e0f512186f 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -236,7 +236,7 @@ or %token ACCEPTS %token ADDLYRICS %token ADDQUOTE -%token NEWADDLYRICS +%token LYRICSTO %token ALIAS %token ALTERNATIVE %token APPLY @@ -1137,7 +1137,7 @@ re_rhythmed_music: 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 ()); -- 2.39.2