X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=aeee14a1ee5d3ede63d92ee69fd5cb3d91df0fdd;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=80baaabdd128521b402306d66327fc78813186b9;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 80baaabdd1..aeee14a1ee 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,178 +1,99 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2004 Han-Wen Nienhuys -*/ - -#include "event.hh" -#include "slur.hh" -#include "warn.hh" -#include "note-column.hh" -#include "context.hh" + Copyright (C) 1997--2015 Han-Wen Nienhuys -#include "engraver.hh" -#include "spanner.hh" + 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. -/* - TODO: - - ALGRGRRGRG + 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. - Derive this from Slur_engraver. This code is completely duplicate. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -class Phrasing_slur_engraver : public Engraver + +#include "slur-engraver.hh" + +#include "translator.icc" + +class Phrasing_slur_engraver : public Slur_engraver { - Link_array eventses_; - Link_array new_phrasing_slur_evs_; - Link_array phrasing_slurs_; - Link_array end_phrasing_slurs_; - Moment last_start_; - -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 (); + virtual SCM event_symbol () const; + virtual bool double_property () const; + virtual SCM grob_symbol () const; + virtual const char* object_name () const; + virtual void set_melisma (bool); public: - TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); - + TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); + TRANSLATOR_INHERIT (Slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () +SCM +Phrasing_slur_engraver::event_symbol () const { - last_start_ = Moment (-1); + return ly_symbol2scm ("phrasing-slur-event"); } bool -Phrasing_slur_engraver::try_music (Music *ev) +Phrasing_slur_engraver::double_property () const { - if (ev->is_mus_type ("phrasing-slur-event")) - { - /* - Let's not start more than one phrasing slur per moment. - */ - - Direction d = to_dir (ev->get_mus_property ("span-direction")); - - if (d == START) - { - if (now_mom () > last_start_) - { - new_phrasing_slur_evs_.push (ev); - last_start_ = now_mom (); - return true; - } - } - else - { - new_phrasing_slur_evs_.push (ev); - return true; - } - } return false; } -void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +SCM +Phrasing_slur_engraver::grob_symbol () const { - if (Note_column::has_interface (info.grob_)) - { - Grob *e =info.grob_; - for (int i = 0; i < phrasing_slurs_.size (); i++) - Slur::add_column (phrasing_slurs_[i], e); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - Slur::add_column (end_phrasing_slurs_[i], e); - } + return ly_symbol2scm ("PhrasingSlur"); } -void -Phrasing_slur_engraver::finalize () +const char * +Phrasing_slur_engraver::object_name () const { - for (int i = 0; i < phrasing_slurs_.size (); i++) - { - /* - Let's not typeset unterminated stuff - */ - phrasing_slurs_[i]->suicide (); - } - phrasing_slurs_.clear (); - - for (int i=0; i < eventses_.size (); i++) - { - eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } + return "phrasing slur"; } -void -Phrasing_slur_engraver::process_acknowledged_grobs () +Phrasing_slur_engraver::Phrasing_slur_engraver (Context *c) + : Slur_engraver (c) { - Link_array start_phrasing_slurs; - for (int i=0; i< new_phrasing_slur_evs_.size (); i++) - { - Music* phrasing_slur_ev = new_phrasing_slur_evs_[i]; - // end phrasing slur: move the phrasing slur to other array - - Direction d = to_dir (phrasing_slur_ev->get_mus_property ("span-direction")); - - if (d == STOP) - { - if (phrasing_slurs_.is_empty ()) - phrasing_slur_ev->origin ()->warning (_f ("can't find start of phrasing slur")); - else - { - Grob* phrasing_slur = phrasing_slurs_.pop (); - end_phrasing_slurs_.push (phrasing_slur); - eventses_.pop (); - } - } - else if (d == START) - { - // push a new phrasing_slur onto stack. - // (use temp. array to wait for all phrasing_slur STOPs) - Grob* phrasing_slur = make_spanner ("PhrasingSlur"); - Slur::set_interface (phrasing_slur); // can't remove. - - - if (Direction updown = to_dir (phrasing_slur_ev->get_mus_property ("direction"))) - { - phrasing_slur->set_grob_property ("direction", gh_int2scm (updown)); - } - - start_phrasing_slurs.push (phrasing_slur); - eventses_.push (phrasing_slur_ev); - announce_grob(phrasing_slur, phrasing_slur_ev->self_scm()); - } - } - for (int i=0; i < start_phrasing_slurs.size (); i++) - phrasing_slurs_.push (start_phrasing_slurs[i]); - new_phrasing_slur_evs_.clear (); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::set_melisma (bool) { - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - typeset_grob (end_phrasing_slurs_[i]); - } - end_phrasing_slurs_.clear (); } void -Phrasing_slur_engraver::start_translation_timestep () +Phrasing_slur_engraver::boot () { - new_phrasing_slur_evs_.clear (); + ADD_LISTENER_FOR (Phrasing_slur_engraver, slur, phrasing_slur); + ADD_LISTENER (Phrasing_slur_engraver, note); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, inline_accidental); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, fingering); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, slur); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, dots); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, text_script); + ADD_END_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tie); + ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tuplet_number); } +ADD_TRANSLATOR (Phrasing_slur_engraver, + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + /* read */ + "", -ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );