X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=2b3f5de296b666ba7eaca8dbb5971493e059a3a4;hb=e5cc39a9a82b3c05156553173a8513db4152b1f9;hp=2481ea41acec36ccbfdeda097faf133523706a63;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 2481ea41ac..2b3f5de296 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,20 +1,46 @@ /* - slur-engraver.cc -- implement Slur_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#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 @@ -22,29 +48,30 @@ */ class 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_; void set_melisma (bool); protected: - virtual bool try_music (Music *); - + 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); void stop_translation_timestep (); - virtual void finalize (); void process_music (); + virtual void finalize (); + + public: TRANSLATOR_DECLARATIONS (Slur_engraver); }; @@ -54,24 +81,17 @@ Slur_engraver::Slur_engraver () events_[START] = events_[STOP] = 0; } -bool -Slur_engraver::try_music (Music *m) -{ - 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; +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); +void +Slur_engraver::listen_slur (Stream_event *ev) +{ + 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 @@ -84,44 +104,16 @@ 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) { - if (slurs_.is_empty () - && end_slurs_.is_empty ()) - return ; - - Grob *e = info.grob (); - SCM avoid = e->get_property ("avoid-slur"); - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("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 (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 ()); - } - } - else - e->warning ("Ignoring grob for slur. avoid-slur not set?"); + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); } void @@ -130,12 +122,6 @@ Slur_engraver::acknowledge_accidental (Grob_info info) 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) { @@ -152,13 +138,13 @@ Slur_engraver::acknowledge_tuplet_number (Grob_info info) void Slur_engraver::acknowledge_script (Grob_info info) { - acknowledge_extra_object (info); + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); } void Slur_engraver::acknowledge_text_script (Grob_info info) { - // if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText"))) acknowledge_extra_object (info); } @@ -172,7 +158,11 @@ void Slur_engraver::finalize () { if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated slur")); + { + slurs_[0]->warning (_ ("unterminated slur")); + for (vsize i = 0; i < slurs_.size (); i++) + slurs_[i]->suicide (); + } } void @@ -181,15 +171,16 @@ Slur_engraver::process_music () if (events_[STOP]) { if (slurs_.size () == 0) - events_[STOP]->origin ()->warning (_ ("can't end slur")); + events_[STOP]->origin ()->warning (_ ("cannot 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")); @@ -198,14 +189,14 @@ Slur_engraver::process_music () 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 ()); @@ -214,14 +205,29 @@ Slur_engraver::process_music () void Slur_engraver::stop_translation_timestep () { + 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; } -#include "translator.icc" - 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); @@ -229,8 +235,16 @@ 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", - /* accept */ "slur-event", - /* read */ "slurMelismaBusy doubleSlurs", - /* write */ ""); + /* doc */ + "Build slur grobs from slur events.", + + /* create */ + "Slur ", + + /* read */ + "slurMelismaBusy " + "doubleSlurs ", + + /* write */ + "" + );