/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2005 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 "slur.hh"
-#include "note-column.hh"
+#include "engraver.hh"
+
#include "context.hh"
#include "directional-element-interface.hh"
-#include "engraver.hh"
+#include "international.hh"
+#include "note-column.hh"
+#include "slur.hh"
#include "spanner.hh"
-#include "tie.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<Music *> events_;
- Music *running_slur_start_;
- Link_array<Grob> slurs_;
- Link_array<Grob> end_slurs_;
+ Drul_array<Stream_event *> events_;
+ Stream_event *running_slur_start_;
+ vector<Grob*> slurs_;
+ vector<Grob*> end_slurs_;
void set_melisma (bool);
protected:
- virtual bool try_music (Music *);
-
- DECLARE_ACKNOWLEDGER(note_column);
- DECLARE_ACKNOWLEDGER(accidental);
- DECLARE_ACKNOWLEDGER(fingering);
- DECLARE_ACKNOWLEDGER(script);
- DECLARE_ACKNOWLEDGER(tie);
- DECLARE_ACKNOWLEDGER(text_script);
+ DECLARE_TRANSLATOR_LISTENER (slur);
+ 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);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+ void stop_translation_timestep ();
+ void process_music ();
+
virtual void finalize ();
- PRECOMPUTED_VIRTUAL void process_music ();
+
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
events_[START] = events_[STOP] = 0;
}
-bool
-Slur_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur);
+void
+Slur_engraver::listen_slur (Stream_event *ev)
{
- if (m->is_mus_type ("slur-event"))
- {
- Direction d = to_dir (m->get_property ("span-direction"));
- if (d == START)
- {
- events_[START] = m;
- return true;
- }
- else if (d == STOP)
- {
- events_[STOP] = m;
- return true;
- }
- }
- return false;
+ 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 (_ ("Invalid direction of slur-event"));
}
void
Slur_engraver::acknowledge_note_column (Grob_info info)
{
Grob *e = info.grob ();
- for (int i = slurs_.size (); i--;)
+ for (vsize i = slurs_.size (); i--;)
Slur::add_column (slurs_[i], e);
- for (int i = end_slurs_.size (); i--;)
+ for (vsize i = end_slurs_.size (); i--;)
Slur::add_column (end_slurs_[i], e);
}
void
Slur_engraver::acknowledge_extra_object (Grob_info info)
{
- Grob*e = info.grob ();
- SCM inside = e->get_property ("inside-slur");
- if (Tie::has_interface (e)
- || to_boolean (inside))
- {
- for (int i = slurs_.size (); i--;)
- Slur::add_extra_encompass (slurs_[i], e);
- for (int i = end_slurs_.size (); i--;)
- Slur::add_extra_encompass (end_slurs_[i], e);
- }
- else if (inside == SCM_BOOL_F)
- {
- Grob *slur = slurs_.size () ? slurs_[0] : 0;
- slur = (end_slurs_.size () && !slur)
- ? end_slurs_[0] : slur;
-
- if (slur)
- {
- e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
- e->set_object ("slur", slur->self_scm ());
- }
- }
+ Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
}
void
acknowledge_extra_object (info);
}
+void
+Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
void
Slur_engraver::acknowledge_fingering (Grob_info info)
}
void
-Slur_engraver::acknowledge_script (Grob_info info)
+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::finalize ()
{
if (slurs_.size () == 0)
events_[STOP]->origin ()->warning (_ ("can't end slur"));
+
end_slurs_ = slurs_;
slurs_.clear ();
}
- if (events_[START] && slurs_.is_empty ())
+ if (events_[START] && slurs_.empty ())
{
- Music *ev = events_[START];
+ Stream_event *ev = events_[START];
bool double_slurs = to_boolean (get_property ("doubleSlurs"));
if (updown && !double_slurs)
set_grob_direction (slur, updown);
- slurs_.push (slur);
+ 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 (slur);
+ slurs_.push_back (slur);
}
}
set_melisma (slurs_.size ());
void
Slur_engraver::stop_translation_timestep ()
{
+ if (Grob *g = unsmob_grob (get_property ("breakableSeparationItem")))
+ {
+ 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++)
+ announce_end_grob (end_slurs_[i], SCM_EOL);
end_slurs_.clear ();
events_[START] = events_[STOP] = 0;
}
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER(Slur_engraver,note_column);
-ADD_ACKNOWLEDGER(Slur_engraver,accidental);
-ADD_ACKNOWLEDGER(Slur_engraver,fingering)
-ADD_ACKNOWLEDGER(Slur_engraver,script);
-ADD_ACKNOWLEDGER(Slur_engraver,tie);
-ADD_ACKNOWLEDGER(Slur_engraver,text_script);
+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,
- /* descr */ "Build slurs grobs from slur events",
- /* creats*/ "Slur",
- /* accepts */ "slur-event",
- /* reads */ "slurMelismaBusy doubleSlurs",
+ /* doc */ "Build slur grobs from slur events",
+ /* create */ "Slur",
+ /* read */
+ "slurMelismaBusy "
+ "doubleSlurs ",
+
/* write */ "");