* lily/parser.yy (relative_music): whoops. All \relative were off

[lilypond.git] / lily / extender-engraver.cc

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index b6ff094700a7814e49f899b0e3ece3caeaae63cd..25ca7a65b9aa5dbcaa1ca92cc29623d6d9c1cfc4 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,13 +1,15 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>,
-  Han-Wen Nienhuys, Jan Nieuwenhuizen.
+  source file of the GNU LilyPond music typesetter
   
+  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>,
+                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "flower-proto.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "lyric-extender.hh"
 #include "paper-column.hh"
 #include "item.hh"
@@ -23,14 +25,14 @@
   gap between syllables.
 
   We remember the last Item that come across. When we get a
-  request, we create the spanner, and attach the left point to the
+  event, we create the spanner, and attach the left point to the
   last lyrics, and the right point to any lyrics we receive by
   then.  */
 class Extender_engraver : public Engraver
 {
   Grob *last_lyric_;
   Grob *current_lyric_;
-  Extender_req* req_;
+  Music* req_;
   Spanner* extender_;
 public:
   TRANSLATOR_DECLARATIONS(Extender_engraver);
@@ -77,15 +79,11 @@ Extender_engraver::acknowledge_grob (Grob_info i)
 bool
 Extender_engraver::try_music (Music* r)
 {
-  if (Extender_req* p = dynamic_cast <Extender_req *> (r))
-    {
-      if (req_)
-       return false;
+  if (req_)
+    return false;
 
-      req_ = p;
-      return true;
-    }
-  return false;
+  req_ = r;
+  return true;
 }
 
 void
@@ -105,7 +103,7 @@ Extender_engraver::process_music ()
     {
       if (!last_lyric_)
        {
-         req_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
+         req_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender event."));
          return;
        }
       
@@ -144,7 +142,7 @@ Extender_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Extender_engraver,
 /* descr */       "Create lyric extenders",
 /* creats*/       "LyricExtender",
-/* accepts */     "general-music",
+/* accepts */     "extender-event",
 /* acks  */      "lyric-syllable-interface",
 /* reads */       "",
 /* write */       "");