/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+ source file of the GNU LilyPond music typesetter
-#include "event.hh"
-#include "new-slur.hh"
-#include "warn.hh"
-#include "note-column.hh"
-#include "context.hh"
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#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"
/*
- TODO: junk nested slur functionality.
- */
+ 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<Music> events_;
- Link_array<Music> new_slur_evs_;
- Link_array<Grob> slur_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 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_music ();
+ void process_music ();
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
Slur_engraver::Slur_engraver ()
{
- last_start_ = Moment (-1);
+ events_[START] = events_[STOP] = 0;
}
bool
-Slur_engraver::try_music (Music *ev)
+Slur_engraver::try_music (Music *m)
{
- if (ev->is_mus_type ("slur-event"))
+ if (m->is_mus_type ("slur-event"))
{
- /*
- Let's not start more than one slur per moment.
- */
- Direction d = to_dir (ev->get_property ("span-direction"));
+ Direction d = to_dir (m->get_property ("span-direction"));
if (d == START)
{
- if (now_mom () > last_start_)
- {
- new_slur_evs_.push (ev);
- last_start_ = now_mom ();
- }
-
- /*
- But we swallow other slur events.
- */
-
+ events_[START] = m;
return true;
}
else if (d == STOP)
{
- /*
- Swallow other events.
- */
- for (int j = new_slur_evs_.size (); j--;)
- {
- Direction nd = to_dir (new_slur_evs_[j]->get_property ("span-direction"));
-
- if (nd == STOP)
- return true;
- }
-
- new_slur_evs_.push (ev);
+ events_[STOP] = m;
return true;
}
}
void
Slur_engraver::set_melisma (bool m)
{
- context ()->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)
{
- Grob *e =info.grob_;
- if (Note_column::has_interface (info.grob_))
- {
- for (int i = 0; i < slur_stack_.size (); i++)
- New_slur::add_column (slur_stack_[i], e);
- for (int i = 0; i < end_slurs_.size (); i++)
- New_slur::add_column (end_slurs_[i], e);
- }
- else
- {
- for (int i = 0; i < slur_stack_.size (); i++)
- New_slur::add_extra_encompass (slur_stack_[i], e);
- for (int i = 0; i < end_slurs_.size (); i++)
- New_slur::add_extra_encompass (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_stack_.size (); i++)
- {
- /*
- Let's not typeset unterminated stuff
- */
- slur_stack_[i]->suicide ();
- }
- slur_stack_.clear ();
+ 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_dynamic_line_spanner (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
- for (int i=0; i < events_.size (); i++)
- {
- events_[i]->origin ()->warning (_ ("unterminated slur"));
- }
+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)
+{
+ 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::process_music ()
{
- Link_array<Grob> start_slurs;
- for (int i=0; i< new_slur_evs_.size (); i++)
+ if (events_[STOP])
{
- Music* slur_ev = new_slur_evs_[i];
- // end slur: move the slur to other array
- Direction d = to_dir (slur_ev->get_property ("span-direction"));
- if (d== STOP)
- {
- if (slur_stack_.is_empty ())
- /* How to shut up this warning, when Voice_devnull_engraver has
- eaten start event? */
- slur_ev->origin ()->warning (_f ("can't find start of slur"));
- else
- {
- Grob* slur = slur_stack_.pop ();
-
- end_slurs_.push (slur);
- events_.pop ();
- }
- }
- else if (d == START)
- {
- /* push a new slur onto stack.
- (use temp. array to wait for all slur STOPs) */
- Grob *slur = make_spanner ("Slur", slur_ev->self_scm ());
-
- if (Direction updown = to_dir (slur_ev->get_property ("direction")))
- slur->set_property ("direction", scm_int2num (updown));
+ if (slurs_.size () == 0)
+ events_[STOP]->origin ()->warning (_ ("can't end slur"));
- start_slurs.push (slur);
- events_.push (slur_ev);
- }
+ end_slurs_ = slurs_;
+ slurs_.clear ();
}
- slur_stack_.concat (start_slurs);
+ if (events_[START] && slurs_.empty ())
+ {
+ Music *ev = events_[START];
- set_melisma (slur_stack_.size ());
+ bool double_slurs = to_boolean (get_property ("doubleSlurs"));
- new_slur_evs_.clear ();
+ 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 ();
- new_slur_evs_.clear ();
+ events_[START] = events_[STOP] = 0;
}
-
-
-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",
-/* 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 */ "");
projects / lilypond.git / blobdiff