X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=b0ef2b2d74ab69a63aca41b1dc3e49692bbdf85e;hb=af99781b40aed8c6dedbd7d78f1a893355a98e09;hp=64f76ae3a01317b8d93cfca7cb7a20a3e2927069;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 64f76ae3a0..b0ef2b2d74 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "engraver.hh" @@ -14,34 +14,43 @@ #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 events_; - Music *running_slur_start_; - Link_array__Grob_ slurs_; - Link_array__Grob_ end_slurs_; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector end_slurs_; protected: - 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 (script); DECLARE_ACKNOWLEDGER (text_script); DECLARE_ACKNOWLEDGER (tie); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); void stop_translation_timestep (); virtual void finalize (); @@ -56,30 +65,18 @@ Phrasing_slur_engraver::Phrasing_slur_engraver () 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_.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 @@ -92,33 +89,10 @@ Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) Slur::add_column (end_slurs_[i], e); } -/* FIXME: cut + paste job from Slur:: */ void Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { - Grob *e = info.grob (); - SCM avoid = e->get_property ("avoid-slur"); - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("inside")) - { - for (vsize i = slurs_.size (); i--;) - Slur::add_extra_encompass (slurs_[i], e); - for (vsize i = end_slurs_.size (); i--;) - Slur::add_extra_encompass (end_slurs_[i], e); - } - else if (avoid == ly_symbol2scm ("outside") - || avoid == ly_symbol2scm ("around")) - { - Grob *slur = slurs_.size () ? slurs_[0] : 0; - slur = (end_slurs_.size () && !slur) - ? end_slurs_[0] : slur; - - if (slur) - { - chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS); - e->set_object ("slur", slur->self_scm ()); - } - } + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); } void @@ -128,13 +102,13 @@ Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) } void -Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) { acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) { acknowledge_extra_object (info); } @@ -142,13 +116,8 @@ Phrasing_slur_engraver::acknowledge_fingering (Grob_info 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); + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); } void @@ -181,7 +150,7 @@ Phrasing_slur_engraver::process_music () if (events_[START] && slurs_.empty ()) { - Music *ev = events_[START]; + Stream_event *ev = events_[START]; Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ()); Direction updown = to_dir (ev->get_property ("direction")); @@ -199,20 +168,24 @@ Phrasing_slur_engraver::stop_translation_timestep () events_[START] = events_[STOP] = 0; } -#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, 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_TRANSLATOR (Phrasing_slur_engraver, - /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", - /* create */ "PhrasingSlur", - /* accept */ "phrasing-slur-event", - /* read */ "", - /* write */ ""); + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + + /* read */ + "", + + /* write */ + "" + );