X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=a022660b647a8c7fe62ba23317bf87d1e852e56c;hb=58a112d5df3f1a8313ee721cea5cd9ce479e2f48;hp=8fe4f5de8510cb43b9ebaa6b88954c0f47aedfbf;hpb=0faba210842f1b0dd3863bfa6e2238bfa7384ba5;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 8fe4f5de85..a022660b64 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,62 +1,75 @@
 /*
-  slur-grav.cc -- implement Slur_engraver
+  slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2000 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-engraver.hh"
-#include "slur.hh"
-#include "debug.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 "tie.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> requests_arr_;
-  Link_array<Span_req> new_slur_req_l_arr_;
-  Link_array<Score_element> slur_l_stack_;
-  Link_array<Score_element> end_slur_l_arr_;
+  Drul_array<Music *> events_;
+  Music *running_slur_start_;
+  vector<Grob*> slurs_;
+  vector<Grob*> end_slurs_;
 
   void set_melisma (bool);
 
 protected:
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_removal_processing ();
+  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 ();
+  void process_music ();
 
 public:
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Slur_engraver);
 };
 
+Slur_engraver::Slur_engraver ()
+{
+  events_[START] = events_[STOP] = 0;
+}
+
 bool
-Slur_engraver::do_try_music (Music *req_l)
+Slur_engraver::try_music (Music *m)
 {
-  if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
+  if (m->is_mus_type ("slur-event"))
     {
-      if (sl->span_type_str_ == "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_slur_l_arr_.size (); i++)
-	    {
-	      end_slur_l_arr_[i]->suicide ();
-	    }
-	  end_slur_l_arr_.clear ();
-	  requests_arr_.clear ();
-	  new_slur_req_l_arr_.clear ();
+	  events_[START] = m;
+	  return true;
 	}
-      else if (sl->span_type_str_ == "slur")
+      else if (d == STOP)
 	{
-	  new_slur_req_l_arr_.push (sl);
+	  events_[STOP] = m;
 	  return true;
 	}
     }
@@ -66,110 +79,159 @@ Slur_engraver::do_try_music (Music *req_l)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_trans_l_->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_element (Score_element_info info)
+Slur_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (Note_column::has_interface (info.elem_l_))
-    {
-      Score_element *e =info.elem_l_;
-      for (int i = 0; i < slur_l_stack_.size (); i++)
-	Slur::add_column (slur_l_stack_[i], e);
-      for (int i = 0; i < end_slur_l_arr_.size (); i++)
-	Slur::add_column (end_slur_l_arr_[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::do_removal_processing ()
+Slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  for (int i = 0; i < slur_l_stack_.size (); i++)
+  if (slurs_.empty () && end_slurs_.empty ())
+    return ;
+  
+  Grob *e = info.grob ();
+  SCM avoid = e->get_property ("avoid-slur");
+  if (Tie::has_interface (e)
+      || avoid == ly_symbol2scm ("inside"))
     {
-#if 0
-      typeset_element (slur_l_stack_[i]);
-#else
-      /*
-	Let's not typeset unterminated stuff
-       */
-      slur_l_stack_[i]->suicide ();
-#endif     
+      for (vsize i = slurs_.size (); i--;)
+	Slur::add_extra_encompass (slurs_[i], e);
+      for (vsize i = end_slurs_.size (); i--;)
+	Slur::add_extra_encompass (end_slurs_[i], e);
     }
-  slur_l_stack_.clear ();
-  SCM wg = get_property ("weAreGraceContext");
-  bool wgb = to_boolean (wg);
-  if (!wgb)
-    for (int i=0; i < requests_arr_.size (); i++)
-      {
-	requests_arr_[i]->origin ()->warning (_ ("unterminated slur"));
-      }
-}
-
-void
-Slur_engraver::do_process_music ()
-{
-  Link_array<Score_element> start_slur_l_arr;
-  for (int i=0; i< new_slur_req_l_arr_.size (); i++)
+  else if (avoid == ly_symbol2scm ("outside")
+	   || avoid == ly_symbol2scm ("around"))
     {
-      Span_req* slur_req_l = new_slur_req_l_arr_[i];
-      // end slur: move the slur to other array
-      if (slur_req_l->span_dir_ == STOP)
-	{
-	  if (slur_l_stack_.empty ())
-	    slur_req_l->origin ()->warning (_f ("can't find start of slur"));
-	  else
-	    {
-	      Score_element* slur = slur_l_stack_.pop ();
-	      SCM s = get_property ("slurEndAttachment");
-	      if (gh_symbol_p (s))
-		{
-		  index_set_cell (slur->get_elt_property ("attachment"), STOP, s);
-		}
-	      end_slur_l_arr_.push (slur);
-	      requests_arr_.pop ();
-	    }
-	}
-      else  if (slur_req_l->span_dir_ == START)
+      Grob *slur = slurs_.size () ? slurs_[0] : 0;
+      slur = (end_slurs_.size () && !slur)
+	? end_slurs_[0] : slur;
+
+      if (slur)
 	{
-	  // push a new slur onto stack.
-	  // (use temp. array to wait for all slur STOPs)
-	  Score_element* slur = new Spanner (get_property ("basicSlurProperties"));
-	  Slur::set_interface (slur);
-	  SCM s = get_property ("slurBeginAttachment");
-	  if (gh_symbol_p (s))
-	    {
-	      index_set_cell (slur->get_elt_property ("attachment"), START, s);
-	    }
-	  start_slur_l_arr.push (slur);
-	  requests_arr_.push (slur_req_l);
-	  announce_element (slur, slur_req_l);
+	  chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS);
+	  e->set_object ("slur", slur->self_scm ());
 	}
     }
-  for (int i=0; i < start_slur_l_arr.size (); i++)
-    slur_l_stack_.push (start_slur_l_arr[i]);
+  else
+    e->warning ("Ignoring grob for slur. avoid-slur not set?");
 }
 
 void
-Slur_engraver::do_pre_move_processing ()
+Slur_engraver::acknowledge_accidental (Grob_info info)
 {
-  for (int i = 0; i < end_slur_l_arr_.size (); i++)
-    {
-      typeset_element (end_slur_l_arr_[i]);
-    }
-  end_slur_l_arr_.clear ();
+  acknowledge_extra_object (info);
 }
 
 void
-Slur_engraver::do_post_move_processing ()
+Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
 {
-  new_slur_req_l_arr_.clear ();
-  SCM m = get_property ("automaticMelismata");
-  if (to_boolean (m))
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_fingering (Grob_info info)
+{
+  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)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_text_script (Grob_info info)
+{
+  //  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText")))
+  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::process_music ()
+{
+  if (events_[STOP])
+    {
+      if (slurs_.size () == 0)
+	events_[STOP]->origin ()->warning (_ ("can't end slur"));
+
+      end_slurs_ = slurs_;
+      slurs_.clear ();
+    }
+
+  if (events_[START] && slurs_.empty ())
     {
-      set_melisma (slur_l_stack_.size ());
+      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;
 }
 
+#include "translator.icc"
 
-ADD_THIS_TRANSLATOR (Slur_engraver);
+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 */ "");