X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=aeee14a1ee5d3ede63d92ee69fd5cb3d91df0fdd;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=b0e5b1d21026fe5381b567a7ff174f7c29608df7;hpb=fa4cd867ea93884cc094814dda7c04b94e71ccf4;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b0e5b1d210..aeee14a1ee 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,199 +1,99 @@ /* - 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--2007 Han-Wen Nienhuys -*/ - -#include "engraver.hh" - -#include "context.hh" -#include "directional-element-interface.hh" -#include "international.hh" -#include "note-column.hh" -#include "slur.hh" -#include "spanner.hh" -#include "stream-event.hh" -#include "warn.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 "translator.icc" - -/* - 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. + 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 . */ -/* - NOTE NOTE NOTE +#include "slur-engraver.hh" - This is largely similar to Slur_engraver. Check if fixes apply there too. +#include "translator.icc" - (on principle, engravers don't use inheritance for code sharing) - - */ -class Phrasing_slur_engraver : public Engraver +class Phrasing_slur_engraver : public Slur_engraver { - Drul_array events_; - Stream_event *running_slur_start_; - vector slurs_; - vector end_slurs_; - -protected: - void acknowledge_extra_object (Grob_info); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (fingering); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); - DECLARE_ACKNOWLEDGER (tuplet_number); - DECLARE_TRANSLATOR_LISTENER (phrasing_slur); - - 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"); } -IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); -void -Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) +bool +Phrasing_slur_engraver::double_property () const { - /* - Let's not start more than one slur per moment. - */ - Direction d = to_dir (ev->get_property ("span-direction")); - if (d == START) - ASSIGN_EVENT_ONCE (events_[START], ev); - else if (d == STOP && !slurs_.empty ()) - ASSIGN_EVENT_ONCE (events_[STOP], ev); + return false; } -void -Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) +SCM +Phrasing_slur_engraver::grob_symbol () const { - 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); + return ly_symbol2scm ("PhrasingSlur"); } -void -Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) +const char * +Phrasing_slur_engraver::object_name () const { - Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); + return "phrasing slur"; } -void -Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +Phrasing_slur_engraver::Phrasing_slur_engraver (Context *c) + : Slur_engraver (c) { - acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +Phrasing_slur_engraver::set_melisma (bool) { - acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_script (Grob_info info) +Phrasing_slur_engraver::boot () { - if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) - acknowledge_extra_object (info); + 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::acknowledge_tie (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_slur (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::finalize () -{ - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated phrasing slur")); -} - -void -Phrasing_slur_engraver::process_music () -{ - if (events_[STOP]) - { - end_slurs_ = slurs_; - slurs_.clear (); - } - - if (events_[START] && slurs_.empty ()) - { - Stream_event *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); - } -} - -void -Phrasing_slur_engraver::stop_translation_timestep () -{ - end_slurs_.clear (); - events_[START] = events_[STOP] = 0; -} - -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, 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, text_script); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); - ADD_TRANSLATOR (Phrasing_slur_engraver, - /* doc */ - "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", - /* create */ - "PhrasingSlur ", + /* create */ + "PhrasingSlur ", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + );