X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=ef0b4287df1faae20a2b43f6a72ec649f87f5992;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5f11aaa48608776f5899d527c7ce7cd93522190a;hpb=d8bbcd9efe6032f976f864bf04aa00f85499834d;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 5f11aaa486..ef0b4287df 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,37 +1,61 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2004 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2008 Han-Wen Nienhuys */ +#include "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "event.hh" -#include "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 events_; - Music * running_slur_start_; - Link_array slurs_; - Link_array end_slurs_; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector 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); @@ -39,75 +63,80 @@ public: Phrasing_slur_engraver::Phrasing_slur_engraver () { - events_[START] =events_[STOP] = 0; + events_[START] = events_[STOP] = 0; +} + +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); +void +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) +{ + /* + 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); } -bool -Phrasing_slur_engraver::try_music (Music *m) +void +Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) { - 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; + 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_extra_object (Grob_info info) +{ + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); +} void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) { - Grob *e =info.grob_; - if (Note_column::has_interface (info.grob_)) - { - for (int i = slurs_.size (); i--; ) - Slur::add_column (slurs_[i], e); - for (int i = end_slurs_.size (); i-- ; ) - Slur::add_column (end_slurs_[i], e); - } - else - { - /* - ugh. cut & paste from slur-engraver.cc - */ - SCM inside = e->get_property ("inside-slur"); - if (Tie::has_interface (e) - || Slur::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_property ("slur", slur->self_scm()); - } - } - } + 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 @@ -125,17 +154,17 @@ Phrasing_slur_engraver::process_music () 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 ("PhrasingSlur", 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); } } @@ -146,11 +175,25 @@ Phrasing_slur_engraver::stop_translation_timestep () 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 tie-interface fingering-interface script-interface slur-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );