Run `make grand-replace'.

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 0e649fe566165944aad7131a8f9edb4eacff558a..348e9e2014f282eaa35533185ed108f01eefd41c 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -14,8 +14,22 @@
 #include "note-column.hh"
 #include "slur.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
+
+/*
+  NOTE NOTE NOTE
+
+  This is largely similar to Phrasing_slur_engraver. Check if fixes
+  apply there too.
+
+  (on principle, engravers don't use inheritance for code sharing)
+  
+ */
+
 /*
   It is possible that a slur starts and ends on the same note.  At
   least, it is for phrasing slurs: a note can be both beginning and
@@ -23,29 +37,30 @@
 */
 class Slur_engraver : public Engraver
 {
-  Drul_array<Music *> events_;
-  Music *running_slur_start_;
+  Drul_array<Stream_event *> events_;
+  Stream_event *running_slur_start_;
   vector<Grob*> slurs_;
   vector<Grob*> end_slurs_;
 
   void set_melisma (bool);
 
 protected:
-  virtual bool try_music (Music *);
-
+  DECLARE_TRANSLATOR_LISTENER (slur);
   DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
   DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (script);
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
   DECLARE_ACKNOWLEDGER (tuplet_number);
+
   void acknowledge_extra_object (Grob_info);
   void stop_translation_timestep ();
-  virtual void finalize ();
   void process_music ();
 
+  virtual void finalize ();
+
+
 public:
   TRANSLATOR_DECLARATIONS (Slur_engraver);
 };
@@ -55,24 +70,17 @@ Slur_engraver::Slur_engraver ()
   events_[START] = events_[STOP] = 0;
 }
 
-bool
-Slur_engraver::try_music (Music *m)
-{
-  if (m->is_mus_type ("slur-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
-      if (d == START)
-       {
-         events_[START] = m;
-         return true;
-       }
-      else if (d == STOP)
-       {
-         events_[STOP] = m;
-         return true;
-       }
-    }
-  return false;
+IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur);
+void
+Slur_engraver::listen_slur (Stream_event *ev)
+{
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  if (d == START)
+    ASSIGN_EVENT_ONCE (events_[START], ev);
+  else if (d == STOP)
+    ASSIGN_EVENT_ONCE (events_[STOP], ev);
+  else ev->origin ()->warning (_f ("direction of %s invalid: %d",
+                                  "slur-event", int (d)));
 }
 
 void
@@ -103,12 +111,6 @@ Slur_engraver::acknowledge_accidental (Grob_info info)
   acknowledge_extra_object (info);
 }
 
-void
-Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
 void
 Slur_engraver::acknowledge_fingering (Grob_info info)
 {
@@ -145,7 +147,11 @@ void
 Slur_engraver::finalize ()
 {
   if (slurs_.size ())
-    slurs_[0]->warning (_ ("unterminated slur"));
+    {
+      slurs_[0]->warning (_ ("unterminated slur"));
+      for (vsize i = 0; i < slurs_.size (); i++)
+       slurs_[i]->suicide ();
+    }
 }
 
 void
@@ -154,15 +160,16 @@ Slur_engraver::process_music ()
   if (events_[STOP])
     {
       if (slurs_.size () == 0)
-       events_[STOP]->origin ()->warning (_ ("can't end slur"));
+       events_[STOP]->origin ()->warning (_ ("cannot end slur"));
 
+      
       end_slurs_ = slurs_;
       slurs_.clear ();
     }
 
   if (events_[START] && slurs_.empty ())
     {
-      Music *ev = events_[START];
+      Stream_event *ev = events_[START];
 
       bool double_slurs = to_boolean (get_property ("doubleSlurs"));
 
@@ -187,14 +194,29 @@ Slur_engraver::process_music ()
 void
 Slur_engraver::stop_translation_timestep ()
 {
+  if (Grob *g = unsmob_grob (get_property ("currentCommandColumn")))
+    {
+      for (vsize i = 0; i < end_slurs_.size (); i++)
+       Slur::add_extra_encompass (end_slurs_[i], g);
+
+      if (!events_[START])
+       for (vsize i = 0; i < slurs_.size (); i++)
+         Slur::add_extra_encompass (slurs_[i], g);
+    }
+  
+  
+  for (vsize i = 0; i < end_slurs_.size (); i++)
+    {
+      Spanner * s = dynamic_cast<Spanner*> (end_slurs_[i]);
+      if (!s->get_bound (RIGHT))
+       s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+      announce_end_grob (s, SCM_EOL);
+    }
   end_slurs_.clear ();
   events_[START] = events_[STOP] = 0;
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Slur_engraver, accidental);
-ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner);
 ADD_ACKNOWLEDGER (Slur_engraver, fingering);
 ADD_ACKNOWLEDGER (Slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Slur_engraver, script);
@@ -202,8 +224,16 @@ ADD_ACKNOWLEDGER (Slur_engraver, text_script);
 ADD_ACKNOWLEDGER (Slur_engraver, tie);
 ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
 ADD_TRANSLATOR (Slur_engraver,
-               /* doc */ "Build slur grobs from slur events",
-               /* create */ "Slur",
-               /* accept */ "slur-event",
-               /* read */ "slurMelismaBusy doubleSlurs",
-               /* write */ "");
+               /* doc */
+               "Build slur grobs from slur events.",
+
+               /* create */
+               "Slur ",
+
+               /* read */
+               "slurMelismaBusy "
+               "doubleSlurs ",
+
+               /* write */
+               ""
+               );