/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "musical-request.hh"
-#include "slur.hh"
-#include "debug.hh"
+#include "event.hh"
+#include "new-slur.hh"
#include "note-column.hh"
-#include "translator-group.hh"
+#include "context.hh"
+#include "directional-element-interface.hh"
#include "engraver.hh"
#include "spanner.hh"
+#include "tie.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<Grob> slur_l_stack_;
- Link_array<Grob> end_slur_l_arr_;
- Moment last_start_;
+ Drul_array<Music *> events_;
+ Music * running_slur_start_;
+ Link_array<Grob> slurs_;
+ Link_array<Grob> end_slurs_;
void set_melisma (bool);
virtual bool try_music (Music*);
virtual void acknowledge_grob (Grob_info);
virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
virtual void finalize ();
- virtual void create_grobs ();
+ virtual void process_music ();
public:
- VIRTUAL_COPY_CONS (Translator);
- Slur_engraver ();
+ TRANSLATOR_DECLARATIONS (Slur_engraver);
};
Slur_engraver::Slur_engraver ()
{
- last_start_ = Moment (-1);
+ events_[START] =events_[STOP] = 0;
}
bool
-Slur_engraver::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"))
{
- 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 < 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 (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_req_l_arr_.push (sl);
- last_start_ = now_mom ();
- return true;
- }
- }
- else
- {
- new_slur_req_l_arr_.push (sl);
- return true;
- }
+ if (slurs_.is_empty ())
+ return false;
+
+ events_[STOP] = m;
+ return true;
}
}
return false;
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_grob (Grob_info info)
{
- if (Note_column::has_interface (info.elem_l_))
+ Grob *e =info.grob_;
+ if (Note_column::has_interface (info.grob_))
{
- Grob *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);
+ for (int i = slurs_.size (); i--; )
+ New_slur::add_column (slurs_[i], e);
+ for (int i = end_slurs_.size (); i-- ; )
+ New_slur::add_column (end_slurs_[i], e);
}
-}
-
-void
-Slur_engraver::finalize ()
-{
- 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 ();
-
- for (int i=0; i < requests_arr_.size (); i++)
- {
- requests_arr_[i]->origin ()->warning (_ ("unterminated slur"));
- }
-}
-
-void
-Slur_engraver::create_grobs ()
-{
- Link_array<Grob> start_slur_l_arr;
- for (int i=0; i< new_slur_req_l_arr_.size (); i++)
+ else
{
- Span_req* slur_req_l = new_slur_req_l_arr_[i];
- // end slur: move the slur to other array
- if (slur_req_l->get_span_dir () == STOP)
+ SCM inside = e->get_property ("inside-slur");
+ if (Tie::has_interface (e)
+ || to_boolean (inside))
{
- if (slur_l_stack_.empty ())
- /* How to shut up this warning, when Voice_devnull_engraver has
- eaten start request? */
- slur_req_l->origin ()->warning (_f ("can't find start of slur"));
- else
- {
- Grob* slur = slur_l_stack_.pop ();
- SCM s = get_property ("slurEndAttachment");
- if (gh_symbol_p (s))
- {
- index_set_cell (slur->get_grob_property ("attachment"), STOP, s);
- }
- end_slur_l_arr_.push (slur);
- requests_arr_.pop ();
- }
+ for (int i = slurs_.size (); i--; )
+ New_slur::add_extra_encompass (slurs_[i], e);
+ for (int i = end_slurs_.size (); i--; )
+ New_slur::add_extra_encompass (end_slurs_[i], e);
}
- else if (slur_req_l->get_span_dir () == START)
+ else if (inside == SCM_BOOL_F)
{
- // 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);
- SCM s = get_property ("slurBeginAttachment");
- if (gh_symbol_p (s))
+ Grob *slur = slurs_.size()?slurs_[0] : 0;
+ slur = (end_slurs_.size () && !slur)
+ ? end_slurs_[0] : slur;
+
+ if (slur)
{
- index_set_cell (slur->get_grob_property ("attachment"), START, s);
+ e->add_offset_callback (New_slur::outside_slur_callback_proc, Y_AXIS);
+ e->set_property ("slur", slur->self_scm());
}
- start_slur_l_arr.push (slur);
- requests_arr_.push (slur_req_l);
- announce_grob (slur, slur_req_l);
}
}
- for (int i=0; i < start_slur_l_arr.size (); i++)
- slur_l_stack_.push (start_slur_l_arr[i]);
- new_slur_req_l_arr_.clear ();
}
void
-Slur_engraver::stop_translation_timestep ()
+Slur_engraver::finalize ()
{
- for (int i = 0; i < end_slur_l_arr_.size (); i++)
- {
- typeset_grob (end_slur_l_arr_[i]);
- }
- end_slur_l_arr_.clear ();
+ if (slurs_.size ())
+ slurs_[0]->warning (_("unterminated slur"));
}
void
-Slur_engraver::start_translation_timestep ()
+Slur_engraver::process_music ()
{
- new_slur_req_l_arr_.clear ();
- SCM m = get_property ("automaticMelismata");
- if (to_boolean (m))
+ if (events_[STOP])
+ {
+ end_slurs_ = slurs_;
+ slurs_.clear ();
+ }
+
+ if (events_[START] && slurs_.is_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 (slur);
+
+ if (double_slurs)
+ {
+ set_grob_direction (slur, DOWN);
+ slur = make_spanner ("Slur", events_[START]->self_scm ());
+ set_grob_direction (slur, UP);
+ slurs_.push (slur);
+ }
}
+ set_melisma (slurs_.size ());
}
+void
+Slur_engraver::stop_translation_timestep ()
+{
+ end_slurs_.clear ();
+ events_[START] = events_[STOP] = 0;
+}
-ADD_THIS_TRANSLATOR (Slur_engraver);
+ENTER_DESCRIPTION (Slur_engraver,
+ /* descr */ "Build slurs grobs from slur events",
+ /* creats*/ "Slur",
+ /* accepts */ "slur-event",
+ /* acks */ "note-column-interface accidental-interface fingering-interface script-interface tie-interface",
+ /* reads */ "slurMelismaBusy doubleSlurs",
+ /* write */ "");
projects / lilypond.git / blobdiff