X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=581136791d932daff6148c2ad80d2b82366c095b;hb=8379d72964ea43cb455cfc9beb7143f1ce76c834;hp=b703078f6235eb44da0720244c1384ecda84e1f3;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index b703078f62..581136791d 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,211 +1,100 @@ /* - slur-engraver.cc -- implement Slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2002 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 "musical-request.hh" -#include "slur.hh" -#include "warn.hh" -#include "note-column.hh" -#include "translator-group.hh" #include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "note-column.hh" +#include "slur.hh" +#include "slur-proto-engraver.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" -/* - TODO: junk nested slur functionality. - */ -class Slur_engraver : public Engraver -{ - Link_array requests_; - Link_array new_slur_reqs_; - Link_array slur_stack_; - Link_array end_slurs_; - Moment last_start_; +#include "translator.icc" - void set_melisma (bool); +class Slur_engraver : public Slur_proto_engraver +{ + virtual void set_melisma (bool); protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void finalize (); - virtual void process_acknowledged_grobs (); + 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") { - last_start_ = Moment (-1); } -bool -Slur_engraver::try_music (Music *req) +SCM +Slur_engraver::event_symbol () { - if (Span_req *sl = dynamic_cast (req)) - { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") - { - for (int i = 0; i < slur_stack_.size (); i++) - { - slur_stack_[i]->suicide (); - } - slur_stack_.clear (); - for (int i = 0; i < end_slurs_.size (); i++) - { - end_slurs_[i]->suicide (); - } - end_slurs_.clear (); - requests_.clear (); - new_slur_reqs_.clear (); - } - else if (t == "slur") - { - /* - Let's not start more than one slur per moment. - */ - if (sl->get_span_dir () == START) - { - if (now_mom () > last_start_) - { - new_slur_reqs_.push (sl); - last_start_ = now_mom (); - } - - /* - But we swallow other slur requests. - */ - - return true; - - } - else if (sl->get_span_dir () == STOP) - { - /* - Swallow other requests. - */ - for (int j = new_slur_reqs_.size(); j--;) - if (new_slur_reqs_[j]->get_span_dir() == STOP) - return true; - - new_slur_reqs_.push (sl); - 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) { - daddy_trans_->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) { - if (Note_column::has_interface (info.grob_)) - { - Grob *e =info.grob_; - for (int i = 0; i < slur_stack_.size (); i++) - Slur::add_column (slur_stack_[i], e); - for (int i = 0; i < end_slurs_.size (); i++) - Slur::add_column (end_slurs_[i], e); - } + Slur_proto_engraver::listen_note (ev); } void -Slur_engraver::finalize () -{ - for (int i = 0; i < slur_stack_.size (); i++) - { -#if 0 - typeset_grob (slur_stack_[i]); -#else - /* - Let's not typeset unterminated stuff - */ - slur_stack_[i]->suicide (); -#endif - } - slur_stack_.clear (); - - for (int i=0; i < requests_.size (); i++) - { - requests_[i]->origin ()->warning (_ ("unterminated slur")); - } -} - -void -Slur_engraver::process_acknowledged_grobs () -{ - Link_array start_slurs; - for (int i=0; i< new_slur_reqs_.size (); i++) - { - Span_req* slur_req = new_slur_reqs_[i]; - // end slur: move the slur to other array - if (slur_req->get_span_dir () == STOP) - { - if (slur_stack_.empty ()) - /* How to shut up this warning, when Voice_devnull_engraver has - eaten start request? */ - slur_req->origin ()->warning (_f ("can't find start of slur")); - else - { - Grob* slur = slur_stack_.pop (); - - end_slurs_.push (slur); - requests_.pop (); - } - } - else if (slur_req->get_span_dir () == START) - { - // push a new slur onto stack. - // (use temp. array to wait for all slur STOPs) - Grob* slur = new Spanner (get_property ("Slur")); - Slur::set_interface (slur); // cannot remove yet! - start_slurs.push (slur); - requests_.push (slur_req); - announce_grob (slur, slur_req->self_scm ()); - } - } - for (int i=0; i < start_slurs.size (); i++) - slur_stack_.push (start_slurs[i]); - new_slur_reqs_.clear (); -} - -void -Slur_engraver::stop_translation_timestep () -{ - for (int i = 0; i < end_slurs_.size (); i++) - { - typeset_grob (end_slurs_[i]); - } - end_slurs_.clear (); -} - -void -Slur_engraver::start_translation_timestep () +Slur_engraver::set_melisma (bool m) { - new_slur_reqs_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) - { - set_melisma (slur_stack_.size ()); - } + context ()->set_property ("slurMelismaBusy", ly_bool2scm (m)); } - - -ENTER_DESCRIPTION (Slur_engraver, -/* descr */ "Build slurs from Slur_reqs", -/* creats*/ "Slur", -/* accepts */ "general-music", -/* acks */ "note-column-interface", -/* reads */ "slurMelismaBusy", -/* write */ ""); +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.", + + /* create */ + "Slur ", + + /* read */ + "slurMelismaBusy " + "doubleSlurs ", + + /* write */ + "" + );