X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=8ace05fe10d8bad48f7017fa989ccb65a0cf236b;hb=0c5927ef30c9f9a9ddec37cc2b9e660695d27303;hp=b5087e2f491fbb7fa4b643b3267a994e1f19d4f1;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b5087e2f49..8ace05fe10 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,44 +1,68 @@ /* - 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--2011 Han-Wen Nienhuys - (c) 1997--2005 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" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "slur.hh" +#include "international.hh" #include "note-column.hh" +#include "slur.hh" #include "spanner.hh" -#include "tie.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 { - Drul_array events_; - Music *running_slur_start_; - Link_array slurs_; - Link_array end_slurs_; + Drul_array events_; + Stream_event *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 (script); DECLARE_ACKNOWLEDGER (text_script); DECLARE_ACKNOWLEDGER (tie); + DECLARE_ACKNOWLEDGER (tuplet_number); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); void stop_translation_timestep (); virtual void finalize (); @@ -53,69 +77,34 @@ Phrasing_slur_engraver::Phrasing_slur_engraver () events_[START] = events_[STOP] = 0; } -bool -Phrasing_slur_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); +void +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - 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_.is_empty ()) - return false; - - events_[STOP] = m; - return true; - } - } - return false; + /* + 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 (int i = slurs_.size (); i--;) + for (vsize i = slurs_.size (); i--;) Slur::add_column (slurs_[i], e); - for (int i = end_slurs_.size (); i--;) + 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 inside = e->get_property ("inside-slur"); - if (Tie::has_interface (e) - || to_boolean (inside)) - { - for (int i = slurs_.size (); i--;) - Slur::add_extra_encompass (slurs_[i], e); - for (int i = end_slurs_.size (); i--;) - Slur::add_extra_encompass (end_slurs_[i], e); - } - else if (!to_boolean (inside) - && e->name () != "DynamicText") - { - Grob *slur = slurs_.size () ? slurs_[0] : 0; - slur = (end_slurs_.size () && !slur) - ? end_slurs_[0] : slur; - - if (slur) - { - e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); - e->set_object ("slur", slur->self_scm ()); - } - } + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); } void @@ -125,13 +114,13 @@ Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) } void -Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) { acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) { acknowledge_extra_object (info); } @@ -139,17 +128,18 @@ Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) void Phrasing_slur_engraver::acknowledge_script (Grob_info info) { - acknowledge_extra_object (info); + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +Phrasing_slur_engraver::acknowledge_tie (Grob_info info) { acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_tie (Grob_info info) +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) { acknowledge_extra_object (info); } @@ -176,16 +166,16 @@ Phrasing_slur_engraver::process_music () slurs_.clear (); } - if (events_[START] && slurs_.is_empty ()) + if (events_[START] && slurs_.empty ()) { - Music *ev = events_[START]; + 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 (slur); + slurs_.push_back (slur); } } @@ -196,20 +186,25 @@ Phrasing_slur_engraver::stop_translation_timestep () events_[START] = events_[STOP] = 0; } -#include "translator.icc" - 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, 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}", - /* create */ "PhrasingSlur", - /* accept */ "phrasing-slur-event", - /* read */ "", - /* write */ ""); + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + + /* read */ + "", + + /* write */ + "" + );