X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fslur-engraver.cc;h=581136791d932daff6148c2ad80d2b82366c095b;hb=8379d72964ea43cb455cfc9beb7143f1ce76c834;hp=cb1da18560ab0f92d92e7ba43401827817581b5f;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index cb1da18560..581136791d 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,167 +1,100 @@ /* - slur-engraver.cc -- implement Slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2005 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 "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 Slur_engraver : public Engraver +class Slur_engraver : public Slur_proto_engraver { - Drul_array events_; - Music *running_slur_start_; - Link_array slurs_; - Link_array end_slurs_; - - void set_melisma (bool); + virtual void set_melisma (bool); protected: - virtual bool try_music (Music *); - virtual void acknowledge_grob (Grob_info); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - virtual void finalize (); - PRECOMPUTED_VIRTUAL void process_music (); + DECLARE_TRANSLATOR_LISTENER (slur); + DECLARE_TRANSLATOR_LISTENER (note); public: + SCM event_symbol (); TRANSLATOR_DECLARATIONS (Slur_engraver); }; -Slur_engraver::Slur_engraver () +Slur_engraver::Slur_engraver () : + Slur_proto_engraver ("doubleSlurs", "Slur", "slur", "slur-event") { - events_[START] = events_[STOP] = 0; } -bool -Slur_engraver::try_music (Music *m) +SCM +Slur_engraver::event_symbol () { - 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; + // Need a string constant for memoization + return ly_symbol2scm ("slur-event"); } +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); void -Slur_engraver::set_melisma (bool m) +Slur_engraver::listen_slur (Stream_event *ev) { - context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + Slur_proto_engraver::listen_slur (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, note); void -Slur_engraver::acknowledge_grob (Grob_info info) +Slur_engraver::listen_note (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 - { - SCM inside = e->get_property ("inside-slur"); - if (Tie::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_object ("slur", slur->self_scm ()); - } - } - } + Slur_proto_engraver::listen_note (ev); } void -Slur_engraver::finalize () +Slur_engraver::set_melisma (bool m) { - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated slur")); + context ()->set_property ("slurMelismaBusy", ly_bool2scm (m)); } -void -Slur_engraver::process_music () -{ - if (events_[STOP]) - { - if (slurs_.size () == 0) - events_[STOP]->origin ()->warning (_ ("can't end slur")); - - end_slurs_ = slurs_; - slurs_.clear (); - } - - if (events_[START] && slurs_.is_empty ()) - { - Music *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 (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); - } - } - set_melisma (slurs_.size ()); -} +ADD_ACKNOWLEDGER (Slur_engraver, inline_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, dots); +ADD_END_ACKNOWLEDGER (Slur_engraver, tie); +ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); +ADD_TRANSLATOR (Slur_engraver, + /* doc */ + "Build slur grobs from slur events.", -void -Slur_engraver::stop_translation_timestep () -{ - end_slurs_.clear (); - events_[START] = events_[STOP] = 0; -} + /* create */ + "Slur ", -#include "translator.icc" + /* read */ + "slurMelismaBusy " + "doubleSlurs ", -ADD_TRANSLATOR (Slur_engraver, - /* descr */ "Build slurs grobs from slur events", - /* creats*/ "Slur", - /* accepts */ "slur-event", - /* acks */ "note-column-interface accidental-interface fingering-interface script-interface tie-interface text-script-interface", - /* reads */ "slurMelismaBusy doubleSlurs", - /* write */ ""); + /* write */ + "" + );