*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 9777667ddf0f44743082de82060a3f9be960a8c5..404639174cbf4861465d49cfee9aa116074adbc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/parser.yy: rename NEWADDLYRICS to LYRICSTO. Thanks to Erik
+       Sandberg.
+
 2004-04-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * 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 ec4b3fdc934563e4740e07b5f005b4d810bc6108..3f4f7565cc9dead9e43a62a4aa36633a76042b27 100644 (file)
--- 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 ca417da882a7d08d0b2fd27dad36eece3af1f336..3332625295de25d3ae8153e6ee705b92ec77a9f2 100644 (file)
--- 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 5da07aee6ef179602fc9d7e2e5d311702edd22af..ec0618de7a4886b6cf333303fd370c917fc2f1ea 100644 (file)
--- 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 d070a412c97c4ab51616ac7da815f02a5088012f..d7c320c8969437b20f3f42b8171600bcc8579c3f 100644 (file)
--- 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 fa453ad70db7130f9047479bd936cbaaee9468b0..e0f512186f3e8c68e7b0dea6352221469509aa9e 100644 (file)
--- 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 ());