X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=b3b9abbe0067947f7a9ec47ed51c986327c029d4;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=ab0b30d230025bd555c4d67aca21ad991064d4c1;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index ab0b30d230..b3b9abbe00 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "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
@@ -24,8 +26,8 @@ class Phrasing_slur_engraver : public Engraver
 {
   Drul_array<Music *> events_;
   Music *running_slur_start_;
-  Link_array<Grob> slurs_;
-  Link_array<Grob> end_slurs_;
+  vector<Grob*> slurs_;
+  vector<Grob*> end_slurs_;
 
 protected:
   virtual bool try_music (Music *);
@@ -39,7 +41,7 @@ protected:
   DECLARE_ACKNOWLEDGER (slur);
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
-  
+
   void stop_translation_timestep ();
   virtual void finalize ();
   void process_music ();
@@ -69,7 +71,7 @@ Phrasing_slur_engraver::try_music (Music *m)
 	}
       else if (d == STOP)
 	{
-	  if (slurs_.is_empty ())
+	  if (slurs_.empty ())
 	    return false;
 
 	  events_[STOP] = m;
@@ -83,39 +85,16 @@ void
 Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *e = info.grob ();
-  for (int i = slurs_.size (); i--;)
+  for (vsize i = slurs_.size (); i--;)
     Slur::add_column (slurs_[i], e);
-  for (int i = end_slurs_.size (); i--;)
+  for (vsize i = end_slurs_.size (); i--;)
     Slur::add_column (end_slurs_[i], e);
 }
 
-/* FIXME: cut + paste job from Slur:: */
 void
 Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  Grob*e = info.grob ();
-  SCM inside = e->get_property ("inside-slur");
-  if (Tie::has_interface (e)
-      || to_boolean (inside))
-    {
-      for (int i = slurs_.size (); i--;)
-	Slur::add_extra_encompass (slurs_[i], e);
-      for (int i = end_slurs_.size (); i--;)
-	Slur::add_extra_encompass (end_slurs_[i], e);
-    }
-  else if (!to_boolean (inside)
-	   && e->name () != "DynamicText")
-    {
-      Grob *slur = slurs_.size () ? slurs_[0] : 0;
-      slur = (end_slurs_.size () && !slur)
-	? end_slurs_[0] : slur;
-
-      if (slur)
-	{
-	  e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
-	  e->set_object ("slur", slur->self_scm ());
-	}
-    }
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
 }
 
 void
@@ -154,7 +133,6 @@ Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
   acknowledge_extra_object (info);
 }
 
-
 void
 Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
 {
@@ -177,7 +155,7 @@ Phrasing_slur_engraver::process_music ()
       slurs_.clear ();
     }
 
-  if (events_[START] && slurs_.is_empty ())
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
@@ -186,7 +164,7 @@ Phrasing_slur_engraver::process_music ()
       if (updown)
 	set_grob_direction (slur, updown);
 
-      slurs_.push (slur);
+      slurs_.push_back (slur);
     }
 }
 
@@ -199,11 +177,10 @@ Phrasing_slur_engraver::stop_translation_timestep ()
 
 #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, note_column);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);