X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=aeee14a1ee5d3ede63d92ee69fd5cb3d91df0fdd;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=9303df4f22b078a9609382eb146a8eef758d8514;hpb=8f48aae564544d143022f5ddfde5bd9fdc600bf4;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 9303df4f22..aeee14a1ee 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 @@ -17,290 +17,73 @@ along with LilyPond. If not, see . */ -#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" +#include "slur-engraver.hh" #include "translator.icc" -/* - 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) - - */ - -/* - 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. -*/ -class Phrasing_slur_engraver : public Engraver +class Phrasing_slur_engraver : public Slur_engraver { - vector start_events_; - vector stop_events_; - vector slurs_; - vector end_slurs_; - vector objects_to_acknowledge_; - -protected: - DECLARE_TRANSLATOR_LISTENER (phrasing_slur); - DECLARE_ACKNOWLEDGER (inline_accidental); - DECLARE_ACKNOWLEDGER (fingering); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (dots); - DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); - DECLARE_ACKNOWLEDGER (tuplet_number); - - void acknowledge_extra_object (Grob_info); - void stop_translation_timestep (); - void process_music (); - - virtual void finalize (); - virtual void derived_mark () const; + 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 () -{ -} - -void -Phrasing_slur_engraver::derived_mark () const -{ - for (vsize i=start_events_.size(); i--;) - scm_gc_mark (start_events_[i]->self_scm ()); - for (vsize i=stop_events_.size(); i--;) - scm_gc_mark (stop_events_[i]->self_scm ()); -} - -IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); -void -Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) -{ - Direction d = to_dir (ev->get_property ("span-direction")); - if (d == START) - start_events_.push_back (ev); - else if (d == STOP) - stop_events_.push_back (ev); - else ev->origin ()->warning (_f ("direction of %s invalid: %d", - "phrasing-slur-event", int (d))); -} - -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) -{ - objects_to_acknowledge_.push_back (info); -} - -void -Phrasing_slur_engraver::acknowledge_inline_accidental (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_dots (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_tuplet_number (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Phrasing_slur_engraver::acknowledge_script (Grob_info info) +SCM +Phrasing_slur_engraver::event_symbol () const { - if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) - acknowledge_extra_object (info); + return ly_symbol2scm ("phrasing-slur-event"); } -void -Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +bool +Phrasing_slur_engraver::double_property () const { - acknowledge_extra_object (info); + return false; } -void -Phrasing_slur_engraver::acknowledge_tie (Grob_info info) +SCM +Phrasing_slur_engraver::grob_symbol () const { - acknowledge_extra_object (info); + return ly_symbol2scm ("PhrasingSlur"); } -void -Phrasing_slur_engraver::acknowledge_slur (Grob_info info) +const char * +Phrasing_slur_engraver::object_name () const { - acknowledge_extra_object (info); + return "phrasing slur"; } -void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::Phrasing_slur_engraver (Context *c) + : Slur_engraver (c) { - for (vsize i = 0; i < slurs_.size (); i++) - { - slurs_[i]->warning (_ ("unterminated phrasing slur")); - slurs_[i]->suicide (); - } - slurs_.clear (); } void -Phrasing_slur_engraver::process_music () +Phrasing_slur_engraver::set_melisma (bool) { - for (vsize i = 0; i < stop_events_.size (); i++) - { - Stream_event *ev = stop_events_[i]; - string id = robust_scm2string (ev->get_property ("spanner-id"), ""); - - // Find the slurs that are ended with this event (by checking the spanner-id) - bool ended = false; - for (vsize j = slurs_.size (); j--;) - { - if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) - { - ended = true; - end_slurs_.push_back (slurs_[j]); - slurs_.erase (slurs_.begin () + j); - } - } - if (ended) - { - // Ignore redundant stop events for this id - for (vsize j = stop_events_.size (); --j > i;) - { - if (id == robust_scm2string (stop_events_[j]->get_property ("spanner-id"), "")) - stop_events_.erase (stop_events_.begin() + j); - } - } - else - ev->origin ()->warning (_ ("cannot end phrasing slur")); - } - - vsize old_slurs = slurs_.size (); - for (vsize i = start_events_.size (); i--;) - { - Stream_event *ev = start_events_[i]; - string id = robust_scm2string (ev->get_property ("spanner-id"), ""); - Direction updown = to_dir (ev->get_property ("direction")); - - bool completed; - for (vsize j = 0; !(completed = (j == slurs_.size ())); j++) - { - // Check if we already have a slur with the same spanner-id. - if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) - { - if (j < old_slurs) - { - // We already have an old slur, so give a warning - // and completely ignore the new slur. - ev->origin ()->warning (_ ("already have phrasing slur")); - start_events_.erase (start_events_.begin () + i); - break; - } - - // If this slur event has no direction, it will not - // contribute anything new to the existing slur(s), so - // we can ignore it. This is not entirely accurate: - // tweaks or context properties like those set with - // \slurUp can still override a neutral direction, so - // when encountering a slur event with "opposite" - // direction first, then one with neutral direction, we - // only let the "opposite" direction remain, while if - // the order is the other way round, a double slur - // results since the direction of the first slur is no - // longer attributable to a "neutral" slur event. A - // mixture of neutral and directed events is nothing - // that the partcombiner should crank out, and it would - // be decidedly strange for manual input. - - if (!updown) - break; - - // If the existing slur does not have a direction yet, - // give it ours - - Direction slur_dir = to_dir (slurs_[j]->get_property ("direction")); - - if (!slur_dir) - { - set_grob_direction (slurs_[j], updown); - break; - } - - // If the existing slur has the same direction as ours, drop ours - - if (slur_dir == updown) - break; - } - } - // If the loop completed, our slur is new - if (completed) - { - Grob *slur = make_spanner ("PhrasingSlur", ev->self_scm ()); - slur->set_property ("spanner-id", ly_string2scm (id)); - if (updown) - set_grob_direction (slur, updown); - slurs_.push_back (slur); - } - } } void -Phrasing_slur_engraver::stop_translation_timestep () -{ - for (vsize i = 0; i < objects_to_acknowledge_.size (); i++) - Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_); - - end_slurs_.clear (); - start_events_.clear (); - stop_events_.clear (); - objects_to_acknowledge_.clear (); +Phrasing_slur_engraver::boot () +{ + 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_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_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); - ADD_TRANSLATOR (Phrasing_slur_engraver, /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}.",