X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=b3b9abbe0067947f7a9ec47ed51c986327c029d4;hb=d929a664c85112ffecaa16c5e114d6f75cf002e2;hp=73fd4b4061e7a3fb05b43c6fcec6d2ca70ac0843;hpb=60f464fe4944205d4e7f5a04464aaf93a70b51b0;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 73fd4b4061..b3b9abbe00 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -1,17 +1,20 @@
 /*
   phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "event.hh"
-#include "new-slur.hh"
+#include "international.hh"
 #include "note-column.hh"
+#include "slur.hh"
 #include "spanner.hh"
-#include "tie.hh"
+#include "warn.hh"
 
 /*
   It is possible that a slur starts and ends on the same note.  At
@@ -22,16 +25,26 @@
 class Phrasing_slur_engraver : public Engraver
 {
   Drul_array<Music *> events_;
-  Music * running_slur_start_;
-  Link_array<Grob> slurs_;
-  Link_array<Grob> end_slurs_;
+  Music *running_slur_start_;
+  vector<Grob*> slurs_;
+  vector<Grob*> end_slurs_;
 
 protected:
-  virtual bool try_music (Music*);
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+
+  void acknowledge_extra_object (Grob_info);
+  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
+  DECLARE_ACKNOWLEDGER (fingering);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (slur);
+  DECLARE_ACKNOWLEDGER (text_script);
+  DECLARE_ACKNOWLEDGER (tie);
+
+  void stop_translation_timestep ();
   virtual void finalize ();
-  virtual void process_music ();
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
@@ -39,7 +52,7 @@ public:
 
 Phrasing_slur_engraver::Phrasing_slur_engraver ()
 {
-  events_[START] =events_[STOP] = 0;
+  events_[START] = events_[STOP] = 0;
 }
 
 bool
@@ -58,9 +71,9 @@ Phrasing_slur_engraver::try_music (Music *m)
 	}
       else if (d == STOP)
 	{
-	  if (slurs_.is_empty ())
+	  if (slurs_.empty ())
 	    return false;
-	  
+
 	  events_[STOP] = m;
 	  return true;
 	}
@@ -68,35 +81,69 @@ Phrasing_slur_engraver::try_music (Music *m)
   return false;
 }
 
+void
+Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
+{
+  Grob *e = info.grob ();
+  for (vsize i = slurs_.size (); i--;)
+    Slur::add_column (slurs_[i], e);
+  for (vsize i = end_slurs_.size (); i--;)
+    Slur::add_column (end_slurs_[i], e);
+}
 
 void
-Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
+Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  Grob *e =info.grob_;
-  if (Note_column::has_interface (info.grob_))
-    {
-      for (int i = slurs_.size (); i--; )
-	New_slur::add_column (slurs_[i], e);
-      for (int i = end_slurs_.size (); i-- ; )
-	New_slur::add_column (end_slurs_[i], e);
-    }
-  else
-    {
-      /*
-	TODO: maybe take more objects?  
-       */
-      for (int i = slurs_.size (); i--; )
-	New_slur::add_extra_encompass (slurs_[i], e);
-      for (int i = end_slurs_.size (); i--; )
-	New_slur::add_extra_encompass (end_slurs_[i], e);
-    }
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_fingering (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_script (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_text_script (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
+{
+  acknowledge_extra_object (info);
 }
 
 void
 Phrasing_slur_engraver::finalize ()
 {
   if (slurs_.size ())
-    slurs_[0]->warning (_("unterminated slur"));
+    slurs_[0]->warning (_ ("unterminated phrasing slur"));
 }
 
 void
@@ -107,17 +154,17 @@ Phrasing_slur_engraver::process_music ()
       end_slurs_ = slurs_;
       slurs_.clear ();
     }
-  
-  if (events_[START] && slurs_.is_empty ())
+
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
-      Grob * slur = make_spanner ("Slur", events_[START]->self_scm ());
+      Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ());
       Direction updown = to_dir (ev->get_property ("direction"));
       if (updown)
 	set_grob_direction (slur, updown);
 
-      slurs_.push (slur);
+      slurs_.push_back (slur);
     }
 }
 
@@ -128,11 +175,20 @@ Phrasing_slur_engraver::stop_translation_timestep ()
   events_[START] = events_[STOP] = 0;
 }
 
-
-ENTER_DESCRIPTION (Phrasing_slur_engraver,
-/* descr */       "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-/* creats*/       "PhrasingSlur",
-/* accepts */     "phrasing-slur-event",
-/* acks  */       "note-column-interface slur-interface",
-/* reads */       "",
-/* write */       "");
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
+  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+
+ADD_TRANSLATOR (Phrasing_slur_engraver,
+		/* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
+		/* create */ "PhrasingSlur",
+		/* accept */ "phrasing-slur-event",
+		/* read */ "",
+		/* write */ "");