X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=0e649fe566165944aad7131a8f9edb4eacff558a;hb=afcf9fa8d6794b08cd62f66dfd22c0f108a7c6e0;hp=cbecdf3c407d79e79b196177d3f7ac503f74495e;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index cbecdf3c40..0e649fe566 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,34 +1,50 @@
 /*
   slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2002 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 "musical-request.hh"
-#include "slur.hh"
-#include "warn.hh"
-#include "note-column.hh"
-#include "translator-group.hh"
 #include "engraver.hh"
+
+#include "context.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "note-column.hh"
+#include "slur.hh"
 #include "spanner.hh"
+#include "warn.hh"
 
+/*
+  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
+  ending of a phrase.
+*/
 class Slur_engraver : public Engraver
 {
-  Link_array<Span_req> requestses_;
-  Link_array<Span_req> new_slur_reqs_;
-  Link_array<Grob> slur_l_stack_;
-  Link_array<Grob> end_slurs_;
-  Moment last_start_;
+  Drul_array<Music *> events_;
+  Music *running_slur_start_;
+  vector<Grob*> slurs_;
+  vector<Grob*> end_slurs_;
 
   void set_melisma (bool);
 
 protected:
-  virtual bool try_music (Music*);
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *);
+
+  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 ();
-  virtual void process_acknowledged_grobs ();
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Slur_engraver);
@@ -36,49 +52,24 @@ public:
 
 Slur_engraver::Slur_engraver ()
 {
-  last_start_ = Moment (-1);
+  events_[START] = events_[STOP] = 0;
 }
 
 bool
-Slur_engraver::try_music (Music *req)
+Slur_engraver::try_music (Music *m)
 {
-  if (Span_req *sl = dynamic_cast <Span_req *> (req))
+  if (m->is_mus_type ("slur-event"))
     {
-      String t =  ly_scm2string (sl->get_mus_property ("span-type"));
-      if (t == "abort")
+      Direction d = to_dir (m->get_property ("span-direction"));
+      if (d == START)
 	{
-	  for (int i = 0; i < slur_l_stack_.size (); i++)
-	    {
-	      slur_l_stack_[i]->suicide ();
-	    }
-	  slur_l_stack_.clear ();
-	  for (int i = 0; i < end_slurs_.size (); i++)
-	    {
-	      end_slurs_[i]->suicide ();
-	    }
-	  end_slurs_.clear ();
-	  requestses_.clear ();
-	  new_slur_reqs_.clear ();
+	  events_[START] = m;
+	  return true;
 	}
-      else if (t == "slur")
+      else if (d == STOP)
 	{
-	  /*
-	    Let's not start more than one slur per moment.
-	   */
-	  if (sl->get_span_dir () == START)
-	    {
-	      if (now_mom () > last_start_)
-	        {
-	          new_slur_reqs_.push (sl);
-		  last_start_ = now_mom ();
-	          return true;
-		}
-	    }
-	  else
-	    {
-	      new_slur_reqs_.push (sl);
-	      return true;
-	    }
+	  events_[STOP] = m;
+	  return true;
 	}
     }
   return false;
@@ -87,108 +78,132 @@ Slur_engraver::try_music (Music *req)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
-Slur_engraver::acknowledge_grob (Grob_info info)
+Slur_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (Note_column::has_interface (info.grob_))
-    {
-      Grob *e =info.grob_;
-      for (int i = 0; i < slur_l_stack_.size (); i++)
-	Slur::add_column (slur_l_stack_[i], e);
-      for (int i = 0; i < end_slurs_.size (); i++)
-	Slur::add_column (end_slurs_[i], e);
-    }
+  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
-Slur_engraver::finalize ()
+Slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  for (int i = 0; i < slur_l_stack_.size (); i++)
-    {
-#if 0
-      typeset_grob (slur_l_stack_[i]);
-#else
-      /*
-	Let's not typeset unterminated stuff
-       */
-      slur_l_stack_[i]->suicide ();
-#endif     
-    }
-  slur_l_stack_.clear ();
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+}
 
-  for (int i=0; i < requestses_.size (); i++)
-      {
-	requestses_[i]->origin ()->warning (_ ("unterminated slur"));
-      }
+void
+Slur_engraver::acknowledge_accidental (Grob_info info)
+{
+  acknowledge_extra_object (info);
 }
 
 void
-Slur_engraver::process_acknowledged_grobs ()
+Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
 {
-  Link_array<Grob> start_slurs;
-  for (int i=0; i< new_slur_reqs_.size (); i++)
-    {
-      Span_req* slur_req = new_slur_reqs_[i];
-      // end slur: move the slur to other array
-      if (slur_req->get_span_dir () == STOP)
-	{
-	  if (slur_l_stack_.empty ())
-	    /* How to shut up this warning, when Voice_devnull_engraver has
-	       eaten start request? */
-	    slur_req->origin ()->warning (_f ("can't find start of slur"));
-	  else
-	    {
-	      Grob* slur = slur_l_stack_.pop ();
-	    
-	      end_slurs_.push (slur);
-	      requestses_.pop ();
-	    }
-	}
-      else  if (slur_req->get_span_dir () == START)
-	{
-	  // push a new slur onto stack.
-	  // (use temp. array to wait for all slur STOPs)
-	  Grob* slur = new Spanner (get_property ("Slur"));
-	  Slur::set_interface (slur); // cannot remove yet!
-	  start_slurs.push (slur);
-	  requestses_.push (slur_req);
-	  announce_grob (slur, slur_req->self_scm ());
-	}
-    }
-  for (int i=0; i < start_slurs.size (); i++)
-    slur_l_stack_.push (start_slurs[i]);
-  new_slur_reqs_.clear ();
+  acknowledge_extra_object (info);
 }
 
 void
-Slur_engraver::stop_translation_timestep ()
+Slur_engraver::acknowledge_fingering (Grob_info info)
 {
-  for (int i = 0; i < end_slurs_.size (); i++)
-    {
-      typeset_grob (end_slurs_[i]);
-    }
-  end_slurs_.clear ();
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_tuplet_number (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+
+void
+Slur_engraver::acknowledge_script (Grob_info info)
+{
+  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+    acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_text_script (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_tie (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::finalize ()
+{
+  if (slurs_.size ())
+    slurs_[0]->warning (_ ("unterminated slur"));
 }
 
 void
-Slur_engraver::start_translation_timestep ()
+Slur_engraver::process_music ()
 {
-  new_slur_reqs_.clear ();
-  SCM m = get_property ("automaticMelismata");
-  if (to_boolean (m))
+  if (events_[STOP])
     {
-      set_melisma (slur_l_stack_.size ());
+      if (slurs_.size () == 0)
+	events_[STOP]->origin ()->warning (_ ("can't end slur"));
+
+      end_slurs_ = slurs_;
+      slurs_.clear ();
     }
-}
 
+  if (events_[START] && slurs_.empty ())
+    {
+      Music *ev = events_[START];
+
+      bool double_slurs = to_boolean (get_property ("doubleSlurs"));
+
+      Grob *slur = make_spanner ("Slur", events_[START]->self_scm ());
+      Direction updown = to_dir (ev->get_property ("direction"));
+      if (updown && !double_slurs)
+	set_grob_direction (slur, updown);
+
+      slurs_.push_back (slur);
+
+      if (double_slurs)
+	{
+	  set_grob_direction (slur, DOWN);
+	  slur = make_spanner ("Slur", events_[START]->self_scm ());
+	  set_grob_direction (slur, UP);
+	  slurs_.push_back (slur);
+	}
+    }
+  set_melisma (slurs_.size ());
+}
 
+void
+Slur_engraver::stop_translation_timestep ()
+{
+  end_slurs_.clear ();
+  events_[START] = events_[STOP] = 0;
+}
 
-ENTER_DESCRIPTION (Slur_engraver,
-/* descr */       "Build slurs from Slur_reqs",
-/* creats*/       "Slur",
-/* acks  */       "note-column-interface",
-/* reads */       "slurMelismaBusy",
-/* write */       "");
+#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);
+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 */ "");