X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fphrasing-slur-engraver.cc;h=6d9aac7af68d64fb5b7220acc2ebccb0f37435d0;hb=d63542eb6004a896c23d912419a2468d662aba28;hp=8b6bcd353f8ba59b5e648d1a49b1d0233d0ec36e;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 8b6bcd353f..6d9aac7af6 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,155 +1,84 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2004 Han-Wen Nienhuys + Copyright (C) 1997--2012 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 "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "slur.hh" +#include "international.hh" #include "note-column.hh" +#include "slur.hh" +#include "slur-proto-engraver.hh" #include "spanner.hh" -#include "tie.hh" +#include "stream-event.hh" +#include "warn.hh" -/* - 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. -*/ +#include "translator.icc" -class Phrasing_slur_engraver : public Engraver +class Phrasing_slur_engraver : public Slur_proto_engraver { - Drul_array events_; - Music * running_slur_start_; - Link_array slurs_; - Link_array end_slurs_; - protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void finalize (); - virtual void process_music (); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + DECLARE_ACKNOWLEDGER (slur); public: TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () -{ - events_[START] = events_[STOP] = 0; -} - -bool -Phrasing_slur_engraver::try_music (Music *m) +Phrasing_slur_engraver::Phrasing_slur_engraver () : + Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event") { - 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; } - +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - 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()); - } - } - } + internal_listen_slur (ev); } void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::acknowledge_slur (Grob_info info) { - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated phrasing slur")); + acknowledge_extra_object (info); } -void -Phrasing_slur_engraver::process_music () -{ - if (events_[STOP]) - { - end_slurs_ = slurs_; - slurs_.clear (); - } - - if (events_[START] && slurs_.is_empty ()) - { - Music *ev = events_[START]; - - 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); - } -} +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_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, dots); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); +ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); -void -Phrasing_slur_engraver::stop_translation_timestep () -{ - end_slurs_.clear (); - events_[START] = events_[STOP] = 0; -} +ADD_TRANSLATOR (Phrasing_slur_engraver, + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + /* create */ + "PhrasingSlur ", -ADD_TRANSLATOR (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 */ ""); + /* read */ + "", + + /* write */ + "" + );