X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=348e9e2014f282eaa35533185ed108f01eefd41c;hb=f118125537097c71cd60a4dedb140f2e51bd26e9;hp=89edf59ca959950c3668ea54b9432c1bbfa107ae;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 89edf59ca9..348e9e2014 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,142 +1,239 @@
 /*
-  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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "proto.hh"
-#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"
 
-class Slur_engraver :public Engraver {
-  Link_array<Span_req> requests_arr_;
-  Link_array<Span_req> new_slur_req_l_arr_;
-  Link_array<Slur> slur_l_stack_;
-  Link_array<Slur> end_slur_l_arr_;
+#include "context.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#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
+  ending of a phrase.
+*/
+class Slur_engraver : public Engraver
+{
+  Drul_array<Stream_event *> events_;
+  Stream_event *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 ();
+  DECLARE_TRANSLATOR_LISTENER (slur);
+  DECLARE_ACKNOWLEDGER (accidental);
+  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 ();
+  void process_music ();
+
+  virtual void finalize ();
+
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
+  TRANSLATOR_DECLARATIONS (Slur_engraver);
 };
 
-bool
-Slur_engraver::do_try_music (Music *req_l)
+Slur_engraver::Slur_engraver ()
 {
-  if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
-    {
-      if (sl->span_type_str_ != "slur")
-	return false;
-      new_slur_req_l_arr_.push (sl);
+  events_[START] = events_[STOP] = 0;
+}
 
-      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
 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 (dynamic_cast<Note_column *> (info.elem_l_))
-    {
-      Note_column *col_l =dynamic_cast<Note_column *> (info.elem_l_) ;// ugh
-      for (int i = 0; i < slur_l_stack_.size(); i++)
-	slur_l_stack_[i]->add_column (col_l);
-      for (int i = 0; i < end_slur_l_arr_.size(); i++)
-	end_slur_l_arr_[i]->add_column (col_l);
-    }
+  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++)
-    {
-      typeset_element (slur_l_stack_[i]);
-    }
-  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]->warning (_ ("unterminated slur"));
-      }
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+}
+
+void
+Slur_engraver::acknowledge_accidental (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_fingering (Grob_info info)
+{
+  acknowledge_extra_object (info);
 }
 
 void
-Slur_engraver::do_process_music()
+Slur_engraver::acknowledge_tuplet_number (Grob_info info)
 {
-  Array<Slur*> start_slur_l_arr_;
-  for (int i=0; i< new_slur_req_l_arr_.size(); i++)
+  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 ())
     {
-      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->warning (_f ("can't find both ends of %s", _("slur")));
-	  else
-	    {
-	      end_slur_l_arr_.push (slur_l_stack_.pop());
-	      requests_arr_.pop();
-	    }
-	}
-      else  if (slur_req_l->span_dir_ == START)
-	{
-	  // push a new slur onto stack.
-	  //(use temp. array to wait for all slur STOPs)
-	  Slur * s_p =new Slur (SCM_EOL);
-	  
-	  requests_arr_.push (slur_req_l);
-	  start_slur_l_arr_.push (s_p);
-	  announce_element (Score_element_info (s_p, slur_req_l));
-	}
+      slurs_[0]->warning (_ ("unterminated slur"));
+      for (vsize i = 0; i < slurs_.size (); i++)
+	slurs_[i]->suicide ();
     }
-  for (int i=0; i < start_slur_l_arr_.size(); i++)
-    slur_l_stack_.push (start_slur_l_arr_[i]);
 }
 
 void
-Slur_engraver::do_pre_move_processing()
+Slur_engraver::process_music ()
 {
-  for (int i = 0; i < end_slur_l_arr_.size(); i++)
+  if (events_[STOP])
     {
-      typeset_element (end_slur_l_arr_[i]);
+      if (slurs_.size () == 0)
+	events_[STOP]->origin ()->warning (_ ("cannot end slur"));
+
+      
+      end_slurs_ = slurs_;
+      slurs_.clear ();
+    }
+
+  if (events_[START] && slurs_.empty ())
+    {
+      Stream_event *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);
+	}
     }
-  end_slur_l_arr_.clear();
+  set_melisma (slurs_.size ());
 }
 
 void
-Slur_engraver::do_post_move_processing()
+Slur_engraver::stop_translation_timestep ()
 {
-  new_slur_req_l_arr_.clear();
-  SCM m = get_property ("automaticMelismata");
-  if (to_boolean (m))
+  if (Grob *g = unsmob_grob (get_property ("currentCommandColumn")))
     {
-      set_melisma (slur_l_stack_.size ());
+      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;
 }
 
-
-ADD_THIS_TRANSLATOR(Slur_engraver);
+ADD_ACKNOWLEDGER (Slur_engraver, accidental);
+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 ",
+
+		/* read */
+		"slurMelismaBusy "
+		"doubleSlurs ",
+
+		/* write */
+		""
+		);