X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=b6661993c17fbcafa0774fe30362a7fa56b79d3c;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2b3f5de296b666ba7eaca8dbb5971493e059a3a4;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 2b3f5de296..b6661993c1 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 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 @@ -24,227 +24,61 @@ #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" - -/* - NOTE NOTE NOTE - - This is largely similar to Phrasing_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 Slur_engraver : public Engraver +class Slur_engraver : public Slur_proto_engraver { - Drul_array events_; - Stream_event *running_slur_start_; - vector slurs_; - vector end_slurs_; - - void set_melisma (bool); + virtual void set_melisma (bool); protected: DECLARE_TRANSLATOR_LISTENER (slur); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (fingering); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (script); - 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 (); - public: TRANSLATOR_DECLARATIONS (Slur_engraver); }; -Slur_engraver::Slur_engraver () +Slur_engraver::Slur_engraver () : + Slur_proto_engraver ("doubleSlurs", "Slur", "slur", "slur-event") { - events_[START] = events_[STOP] = 0; } IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); void Slur_engraver::listen_slur (Stream_event *ev) { - Direction d = to_dir (ev->get_property ("span-direction")); - if (d == START) - ASSIGN_EVENT_ONCE (events_[START], ev); - else if (d == STOP) - ASSIGN_EVENT_ONCE (events_[STOP], ev); - else ev->origin ()->warning (_f ("direction of %s invalid: %d", - "slur-event", int (d))); + internal_listen_slur (ev); } void Slur_engraver::set_melisma (bool m) { - context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); -} - -void -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 -Slur_engraver::acknowledge_extra_object (Grob_info info) -{ - Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); -} - -void -Slur_engraver::acknowledge_accidental (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_engraver::acknowledge_fingering (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_engraver::acknowledge_tuplet_number (Grob_info info) -{ - acknowledge_extra_object (info); -} - - -void -Slur_engraver::acknowledge_script (Grob_info info) -{ - if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) - acknowledge_extra_object (info); -} - -void -Slur_engraver::acknowledge_text_script (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_engraver::acknowledge_tie (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_engraver::finalize () -{ - if (slurs_.size ()) - { - slurs_[0]->warning (_ ("unterminated slur")); - for (vsize i = 0; i < slurs_.size (); i++) - slurs_[i]->suicide (); - } -} - -void -Slur_engraver::process_music () -{ - if (events_[STOP]) - { - if (slurs_.size () == 0) - events_[STOP]->origin ()->warning (_ ("cannot end slur")); - - - end_slurs_ = slurs_; - slurs_.clear (); - } - - if (events_[START] && slurs_.empty ()) - { - Stream_event *ev = events_[START]; - - bool double_slurs = to_boolean (get_property ("doubleSlurs")); - - Grob *slur = make_spanner ("Slur", events_[START]->self_scm ()); - Direction updown = to_dir (ev->get_property ("direction")); - if (updown && !double_slurs) - set_grob_direction (slur, updown); - - slurs_.push_back (slur); - - if (double_slurs) - { - set_grob_direction (slur, DOWN); - slur = make_spanner ("Slur", events_[START]->self_scm ()); - set_grob_direction (slur, UP); - slurs_.push_back (slur); - } - } - set_melisma (slurs_.size ()); -} - -void -Slur_engraver::stop_translation_timestep () -{ - if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) - { - for (vsize i = 0; i < end_slurs_.size (); i++) - Slur::add_extra_encompass (end_slurs_[i], g); - - if (!events_[START]) - for (vsize i = 0; i < slurs_.size (); i++) - Slur::add_extra_encompass (slurs_[i], g); - } - - - for (vsize i = 0; i < end_slurs_.size (); i++) - { - Spanner * s = dynamic_cast (end_slurs_[i]); - if (!s->get_bound (RIGHT)) - s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); - announce_end_grob (s, SCM_EOL); - } - end_slurs_.clear (); - events_[START] = events_[STOP] = 0; + context ()->set_property ("slurMelismaBusy", ly_bool2scm (m)); } -ADD_ACKNOWLEDGER (Slur_engraver, accidental); +ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental); ADD_ACKNOWLEDGER (Slur_engraver, fingering); ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); ADD_ACKNOWLEDGER (Slur_engraver, text_script); -ADD_ACKNOWLEDGER (Slur_engraver, tie); +ADD_ACKNOWLEDGER (Slur_engraver, dots); +ADD_END_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver, - /* doc */ - "Build slur grobs from slur events.", + /* doc */ + "Build slur grobs from slur events.", - /* create */ - "Slur ", + /* create */ + "Slur ", - /* read */ - "slurMelismaBusy " - "doubleSlurs ", + /* read */ + "slurMelismaBusy " + "doubleSlurs ", - /* write */ - "" - ); + /* write */ + "" + );