]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/phrasing-slur-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / phrasing-slur-engraver.cc
index dc4b7d624b00e2dc5708f9d00e3522dd20a1096d..b3b9abbe0067947f7a9ec47ed51c986327c029d4 100644 (file)
 /*
   phrasing-slur-engraver.cc -- implement Phrasing_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 "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 "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 Phrasing_slur_engraver : public Engraver
 {
-  Link_array<Span_req> requests_arr_;
-  Link_array<Span_req> new_phrasing_slur_req_l_arr_;
-  Link_array<Grob> phrasing_slur_l_stack_;
-  Link_array<Grob> end_phrasing_slur_l_arr_;
-  Moment last_start_;
+  Drul_array<Music *> events_;
+  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 void start_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 create_grobs ();
+  void process_music ();
 
 public:
-  TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
 };
 
 Phrasing_slur_engraver::Phrasing_slur_engraver ()
 {
-  last_start_ = Moment (-1);
+  events_[START] = events_[STOP] = 0;
 }
 
 bool
-Phrasing_slur_engraver::try_music (Music *req_l)
+Phrasing_slur_engraver::try_music (Music *m)
 {
-  if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
+  if (m->is_mus_type ("phrasing-slur-event"))
     {
-      String t =  ly_scm2string (sl->get_mus_property ("span-type"));
-      if (t == "abort")
+      /*
+       Let's not start more than one slur per moment.
+      */
+      Direction d = to_dir (m->get_property ("span-direction"));
+      if (d == START)
        {
-         for (int i = 0; i < phrasing_slur_l_stack_.size (); i++)
-           {
-             phrasing_slur_l_stack_[i]->suicide ();
-           }
-         phrasing_slur_l_stack_.clear ();
-         for (int i = 0; i < end_phrasing_slur_l_arr_.size (); i++)
-           {
-             end_phrasing_slur_l_arr_[i]->suicide ();
-           }
-         end_phrasing_slur_l_arr_.clear ();
-         requests_arr_.clear ();
-         new_phrasing_slur_req_l_arr_.clear ();
+         events_[START] = m;
+         return true;
        }
-      else if (t == "phrasing-slur")
+      else if (d == STOP)
        {
-         /*
-           Let's not start more than one phrasing slur per moment.
-          */
-         if (sl->get_span_dir () == START)
-           {
-             if (now_mom () > last_start_)
-               {
-                 new_phrasing_slur_req_l_arr_.push (sl);
-                 last_start_ = now_mom ();
-                 return true;
-               }
-           }
-         else
-           {
-             new_phrasing_slur_req_l_arr_.push (sl);
-             return true;
-           }
+         if (slurs_.empty ())
+           return false;
+
+         events_[STOP] = m;
+         return true;
        }
     }
   return false;
 }
 
 void
-Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
+Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (Note_column::has_interface (info.grob_l_))
-    {
-      Grob *e =info.grob_l_;
-      for (int i = 0; i < phrasing_slur_l_stack_.size (); i++)
-       Slur::add_column (phrasing_slur_l_stack_[i], e);
-      for (int i = 0; i < end_phrasing_slur_l_arr_.size (); i++)
-       Slur::add_column (end_phrasing_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
-Phrasing_slur_engraver::finalize ()
+Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  for (int i = 0; i < phrasing_slur_l_stack_.size (); i++)
-    {
-#if 0
-      typeset_grob (phrasing_slur_l_stack_[i]);
-#else
-      /*
-       Let's not typeset unterminated stuff
-       */
-      phrasing_slur_l_stack_[i]->suicide ();
-#endif     
-    }
-  phrasing_slur_l_stack_.clear ();
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+}
 
-    for (int i=0; i < requests_arr_.size (); i++)
-      {
-       requests_arr_[i]->origin ()->warning (_ ("unterminated phrasing slur"));
-      }
+void
+Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
+{
+  acknowledge_extra_object (info);
 }
 
 void
-Phrasing_slur_engraver::create_grobs ()
+Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
 {
-  Link_array<Grob> start_phrasing_slur_l_arr;
-  for (int i=0; i< new_phrasing_slur_req_l_arr_.size (); i++)
-    {
-      Span_req* phrasing_slur_req_l = new_phrasing_slur_req_l_arr_[i];
-      // end phrasing slur: move the phrasing slur to other array
-      if (phrasing_slur_req_l->get_span_dir () == STOP)
-       {
-         if (phrasing_slur_l_stack_.empty ())
-           phrasing_slur_req_l->origin ()->warning (_f ("can't find start of phrasing slur"));
-         else
-           {
-             Grob* phrasing_slur = phrasing_slur_l_stack_.pop ();
-             SCM s = get_property ("phrasingSlurEndAttachment");
-             if (gh_symbol_p (s))
-               {
-                 index_set_cell (phrasing_slur->get_grob_property ("attachment"), STOP, s);
-               }
-             end_phrasing_slur_l_arr_.push (phrasing_slur);
-             requests_arr_.pop ();
-           }
-       }
-      else  if (phrasing_slur_req_l->get_span_dir () == START)
-       {
-         // push a new phrasing_slur onto stack.
-         // (use temp. array to wait for all phrasing_slur STOPs)
-         Grob* phrasing_slur = new Spanner (get_property ("PhrasingSlur"));
-         Slur::set_interface (phrasing_slur); // can't remove.
-         SCM s = get_property ("phrasingSlurBeginAttachment");
-         if (gh_symbol_p (s))
-           {
-             index_set_cell (phrasing_slur->get_grob_property ("attachment"), START, s);
-           }
-         start_phrasing_slur_l_arr.push (phrasing_slur);
-         requests_arr_.push (phrasing_slur_req_l);
-         announce_grob(phrasing_slur, phrasing_slur_req_l->self_scm());
-       }
-    }
-  for (int i=0; i < start_phrasing_slur_l_arr.size (); i++)
-    phrasing_slur_l_stack_.push (start_phrasing_slur_l_arr[i]);
-  new_phrasing_slur_req_l_arr_.clear ();
+  acknowledge_extra_object (info);
 }
 
 void
-Phrasing_slur_engraver::stop_translation_timestep ()
+Phrasing_slur_engraver::acknowledge_fingering (Grob_info info)
 {
-  for (int i = 0; i < end_phrasing_slur_l_arr_.size (); i++)
-    {
-      typeset_grob (end_phrasing_slur_l_arr_[i]);
-    }
-  end_phrasing_slur_l_arr_.clear ();
+  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::start_translation_timestep ()
+Phrasing_slur_engraver::finalize ()
 {
-  new_phrasing_slur_req_l_arr_.clear ();
+  if (slurs_.size ())
+    slurs_[0]->warning (_ ("unterminated phrasing slur"));
 }
 
+void
+Phrasing_slur_engraver::process_music ()
+{
+  if (events_[STOP])
+    {
+      end_slurs_ = slurs_;
+      slurs_.clear ();
+    }
+
+  if (events_[START] && slurs_.empty ())
+    {
+      Music *ev = events_[START];
+
+      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_back (slur);
+    }
+}
+
+void
+Phrasing_slur_engraver::stop_translation_timestep ()
+{
+  end_slurs_.clear ();
+  events_[START] = events_[STOP] = 0;
+}
 
-ENTER_DESCRIPTION(Phrasing_slur_engraver,
-/* descr */       "Print phrasing slurs. Similar to Slur_engraver",
-/* creats*/       "PhrasingSlur",
-/* acks  */       "note-column-interface",
-/* reads */       "slurBeginAttachment slurEndAttachment slurMelismaBusy",
-/* 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 */ "");