X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=18f20f5430bc23c2422f9731893e126fc3e32310;hb=9a25c725c54c0e2f20441cf365708d0a3b577ff7;hp=c7571f118cacc109b02a1a12f27c455c5c2caaaf;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index c7571f118c..18f20f5430 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,218 +1,98 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys -*/ - -#include "engraver.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. -#include "context.hh" -#include "directional-element-interface.hh" -#include "international.hh" -#include "note-column.hh" -#include "slur.hh" -#include "spanner.hh" -#include "tie.hh" -#include "warn.hh" + 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. -/* - 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. + 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 { - Drul_array events_; - Music *running_slur_start_; - vector slurs_; - vector end_slurs_; - -protected: - virtual bool try_music (Music *); - - void acknowledge_extra_object (Grob_info); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (dynamic_line_spanner); - DECLARE_ACKNOWLEDGER (fingering); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (slur); - DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); - - void stop_translation_timestep (); - virtual void finalize (); - void process_music (); + 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_INHERIT (Slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () +SCM +Phrasing_slur_engraver::event_symbol () const { - events_[START] = events_[STOP] = 0; + return ly_symbol2scm ("phrasing-slur-event"); } bool -Phrasing_slur_engraver::try_music (Music *m) +Phrasing_slur_engraver::double_property () const { - 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_.empty ()) - return false; - - events_[STOP] = m; - return true; - } - } return false; } -void -Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) -{ - Grob *e = info.grob (); - for (vsize i = slurs_.size (); i--;) - Slur::add_column (slurs_[i], e); - for (vsize i = end_slurs_.size (); i--;) - Slur::add_column (end_slurs_[i], e); -} - -/* FIXME: cut + paste job from Slur:: */ -void -Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) -{ - Grob *e = info.grob (); - SCM avoid = e->get_property ("avoid-slur"); - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("inside")) - { - for (vsize i = slurs_.size (); i--;) - Slur::add_extra_encompass (slurs_[i], e); - for (vsize 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 ()); - } - } -} - -void -Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) +SCM +Phrasing_slur_engraver::grob_symbol () const { - acknowledge_extra_object (info); + return ly_symbol2scm ("PhrasingSlur"); } -void -Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +const char * +Phrasing_slur_engraver::object_name () const { - acknowledge_extra_object (info); + return "phrasing slur"; } -void -Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_script (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_tie (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_slur (Grob_info info) +Phrasing_slur_engraver::Phrasing_slur_engraver () { - acknowledge_extra_object (info); } void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::set_melisma (bool) { - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated phrasing slur")); } void -Phrasing_slur_engraver::process_music () +Phrasing_slur_engraver::boot () { - if (events_[STOP]) - { - end_slurs_ = slurs_; - slurs_.clear (); - } - - if (events_[START] && slurs_.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_back (slur); - } + 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); } -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}.", -#include "translator.icc" + /* create */ + "PhrasingSlur ", -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering) - ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); + /* read */ + "", -ADD_TRANSLATOR (Phrasing_slur_engraver, - /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", - /* create */ "PhrasingSlur", - /* accept */ "phrasing-slur-event", - /* read */ "", - /* write */ ""); + /* write */ + "" + );