X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=ef11e66ac3516da74c48741a40305fdf37556f11;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=b0e5b1d21026fe5381b567a7ff174f7c29608df7;hpb=728c1f61013a32153c647a72ca31bc2353754803;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b0e5b1d210..ef11e66ac3 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,9 +1,20 @@ /* - 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--2014 Han-Wen Nienhuys - (c) 1997--2007 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 "engraver.hh" @@ -13,124 +24,33 @@ #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" #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. - -*/ - -/* - NOTE NOTE NOTE - - This is largely similar to Slur_engraver. Check if fixes apply there too. - - (on principle, engravers don't use inheritance for code sharing) - - */ -class Phrasing_slur_engraver : public Engraver +class Phrasing_slur_engraver : public Slur_proto_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 (); + DECLARE_ACKNOWLEDGER (slur); public: TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () +Phrasing_slur_engraver::Phrasing_slur_engraver () : + Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event") { - events_[START] = events_[STOP] = 0; } IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); void Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - /* - 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); -} - -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); -} - -void -Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) -{ - Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); -} - -void -Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_fingering (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_script (Grob_info info) -{ - if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) - acknowledge_extra_object (info); -} - -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); + internal_listen_slur (ev); } void @@ -139,61 +59,26 @@ 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, inline_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, dots); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); +ADD_END_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 */ + "" + );