X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=348e9e2014f282eaa35533185ed108f01eefd41c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f85ce3248a3b5dce96efbf0ebc2a2ebebd39cc82;hpb=63e077438a4771dc81c9757b46cc46a8633862ef;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index f85ce3248a..348e9e2014 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,41 +1,65 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2004 Han-Wen Nienhuys -*/ + 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--2008 Han-Wen Nienhuys +*/ #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 "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 events_; - Music * running_slur_start_; - Grob * slur_; - Grob * end_slur_; - - Moment last_start_; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector end_slurs_; void set_melisma (bool); protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (slur); + DECLARE_ACKNOWLEDGER (accidental); + 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 (); + void process_music (); + virtual void finalize (); - virtual void process_music (); + public: TRANSLATOR_DECLARATIONS (Slur_engraver); @@ -43,71 +67,91 @@ public: Slur_engraver::Slur_engraver () { - events_[START] =events_[STOP] = 0; - end_slur_ = slur_ = 0; - last_start_ = Moment (-1); + 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")) - { - /* - Let's not start more than one slur per moment. - */ - Direction d = to_dir (m->get_property ("span-direction")); - if (d == START) - { - if (slur_) - return false; - - events_[START] = m; - return true; - } - else if (d == STOP) - { - if (!slur_) - return false; - - 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 (_f ("direction of %s invalid: %d", + "slur-event", int (d))); } 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_)) - { - if (slur_) - New_slur::add_column (slur_, e); - if (end_slur_) - New_slur::add_column (end_slur_, e); - } - else - { - if (slur_) - New_slur::add_extra_encompass (slur_, e); - if (end_slur_) - New_slur::add_extra_encompass (end_slur_, 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::acknowledge_extra_object (Grob_info info) +{ + 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_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 (slur_) - slur_->warning (_("unterminated slur")); + if (slurs_.size ()) + { + slurs_[0]->warning (_ ("unterminated slur")); + for (vsize i = 0; i < slurs_.size (); i++) + slurs_[i]->suicide (); + } } void @@ -115,32 +159,81 @@ Slur_engraver::process_music () { if (events_[STOP]) { - end_slur_ = slur_; - slur_ = 0; + if (slurs_.size () == 0) + events_[STOP]->origin ()->warning (_ ("cannot end slur")); + + + end_slurs_ = slurs_; + slurs_.clear (); } - - if (events_[START] && !slur_) + + if (events_[START] && slurs_.empty ()) { - Music *ev = events_[START]; - slur_ = make_spanner ("Slur", events_[START]->self_scm ()); - if (Direction updown = to_dir (ev->get_property ("direction"))) - slur_->set_property ("direction", scm_int2num (updown)); - } + Stream_event *ev = events_[START]; + + bool double_slurs = to_boolean (get_property ("doubleSlurs")); + + 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); - set_melisma (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_slur_ = 0; + if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) + { + 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++) + { + Spanner * s = dynamic_cast (end_slurs_[i]); + if (!s->get_bound (RIGHT)) + s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); + announce_end_grob (s, SCM_EOL); + } + end_slurs_.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 */ ""); +ADD_ACKNOWLEDGER (Slur_engraver, accidental); +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 ", + + /* read */ + "slurMelismaBusy " + "doubleSlurs ", + + /* write */ + "" + );