/*
phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
- (c) 1997--2004 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 "engraver.hh"
+
#include "context.hh"
#include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "event.hh"
-#include "new-slur.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"
/*
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.
+
*/
+/*
+ NOTE NOTE NOTE
+
+ This is largely similar to Slur_engraver. Check if fixes apply there too.
+
+ (on principle, engravers don't use inheritance for code sharing)
+
+ */
class Phrasing_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_;
protected:
- virtual bool try_music (Music*);
- virtual void acknowledge_grob (Grob_info);
- virtual void stop_translation_timestep ();
+ void acknowledge_extra_object (Grob_info);
+ DECLARE_ACKNOWLEDGER (accidental);
+ DECLARE_ACKNOWLEDGER (fingering);
+ DECLARE_ACKNOWLEDGER (note_column);
+ DECLARE_ACKNOWLEDGER (slur);
+ DECLARE_ACKNOWLEDGER (script);
+ DECLARE_ACKNOWLEDGER (text_script);
+ DECLARE_ACKNOWLEDGER (tie);
+ DECLARE_ACKNOWLEDGER (tuplet_number);
+ DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
+
+ void stop_translation_timestep ();
virtual void finalize ();
- virtual void process_music ();
+ void process_music ();
public:
TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
Phrasing_slur_engraver::Phrasing_slur_engraver ()
{
- events_[START] =events_[STOP] = 0;
+ events_[START] = events_[STOP] = 0;
}
-bool
-Phrasing_slur_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur);
+void
+Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
{
- if (m->is_mus_type ("phrasing-slur-event"))
- {
- /*
- Let's not start more than one slur per moment.
- */
- Direction d = to_dir (m->get_property ("span-direction"));
- if (d == START)
- {
- events_[START] = m;
- return true;
- }
- else if (d == STOP)
- {
- if (slurs_.is_empty ())
- return false;
-
- events_[STOP] = m;
- return true;
- }
- }
- return false;
+ /*
+ Let's not start more than one slur per moment.
+ */
+ Direction d = to_dir (ev->get_property ("span-direction"));
+ if (d == START)
+ ASSIGN_EVENT_ONCE (events_[START], ev);
+ else if (d == STOP && !slurs_.empty ())
+ ASSIGN_EVENT_ONCE (events_[STOP], ev);
}
+void
+Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
+{
+ 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::acknowledge_grob (Grob_info info)
+Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
{
- Grob *e =info.grob_;
- if (Note_column::has_interface (info.grob_))
- {
- 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);
- }
- else
- {
- /*
- TODO: maybe take more objects?
- */
- 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);
- }
+ Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_fingering (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_script (Grob_info info)
+{
+ if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+ acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
+{
+ acknowledge_extra_object (info);
}
void
Phrasing_slur_engraver::finalize ()
{
if (slurs_.size ())
- slurs_[0]->warning (_("unterminated slur"));
+ slurs_[0]->warning (_ ("unterminated phrasing slur"));
}
void
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];
- Grob * slur = make_spanner ("Slur", events_[START]->self_scm ());
+ 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 (slur);
+ slurs_.push_back (slur);
}
}
events_[START] = events_[STOP] = 0;
}
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);
+
+ADD_TRANSLATOR (Phrasing_slur_engraver,
+ /* doc */
+ "Print phrasing slurs. Similar to @ref{Slur_engraver}.",
+
+ /* create */
+ "PhrasingSlur ",
+
+ /* read */
+ "",
-ENTER_DESCRIPTION (Phrasing_slur_engraver,
-/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-/* creats*/ "PhrasingSlur",
-/* accepts */ "phrasing-slur-event",
-/* acks */ "note-column-interface slur-interface",
-/* reads */ "",
-/* write */ "");
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff