From 6c98920d868524eee3e809578ad4389d409a566a Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Mon, 10 Sep 2012 08:53:09 +0200 Subject: [PATCH] Avoids script-tie collisions Ties are now issued at their correct beginning time step and are suicided if they are ultimately unused. This allows the Script_engraver to acknowledge them at the correct timestep and register them as supports for the side-position-interface. --- input/regression/script-tie-collision.ly | 23 +++++++++ lily/accidental-engraver.cc | 6 +-- lily/figured-bass-position-engraver.cc | 6 +-- lily/phrasing-slur-engraver.cc | 6 +-- lily/script-engraver.cc | 24 +++++++++ lily/slur-engraver.cc | 6 +-- lily/tie-engraver.cc | 66 ++++++++++++------------ 7 files changed, 93 insertions(+), 44 deletions(-) create mode 100644 input/regression/script-tie-collision.ly diff --git a/input/regression/script-tie-collision.ly b/input/regression/script-tie-collision.ly new file mode 100644 index 0000000000..0b1c837e0e --- /dev/null +++ b/input/regression/script-tie-collision.ly @@ -0,0 +1,23 @@ +\version "2.17.2" + +\header { + texidoc = "Scripts avoid ties. +" +} + +% Managing what note heads' scripts have been accounted for in +% the Tie_engraver is tricky. +% This regtest tries to confuse it with various configurations +% Of notes with and without ties, with multiple scripts, etc.. + +\relative c''' { + r2. c4~-> | c-> r2. | + r2. c4-> | c-> r2. | + r2. c4~-> | c r2. | + r2. c4~ | c-> r2. | \break + r2. >4--~ | -> ~ -> r2 | + r2. c4~ | c-> ~ c-> r2 | + r2. c4~-> | c ~ c-> r2 | + r2. c4~-> | c-> ~ c r2 | + r2. c4-> | +} diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 9c4d8976fe..12b9072238 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -73,7 +73,7 @@ protected: TRANSLATOR_DECLARATIONS (Accidental_engraver); void process_music (); - void acknowledge_tie (Grob_info); + void acknowledge_end_tie (Grob_info); void acknowledge_arpeggio (Grob_info); void acknowledge_rhythmic_head (Grob_info); void acknowledge_finger (Grob_info); @@ -468,7 +468,7 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info) } void -Accidental_engraver::acknowledge_tie (Grob_info info) +Accidental_engraver::acknowledge_end_tie (Grob_info info) { ties_.push_back (dynamic_cast (info.grob ())); } @@ -502,7 +502,7 @@ Accidental_engraver::process_music () ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio); ADD_ACKNOWLEDGER (Accidental_engraver, finger); ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head); -ADD_ACKNOWLEDGER (Accidental_engraver, tie); +ADD_END_ACKNOWLEDGER (Accidental_engraver, tie); ADD_ACKNOWLEDGER (Accidental_engraver, note_column); ADD_TRANSLATOR (Accidental_engraver, diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index 5fa27a69cb..9b55e04f49 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -39,7 +39,7 @@ protected: DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (slur); DECLARE_END_ACKNOWLEDGER (slur); - DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (bass_figure_alignment); DECLARE_END_ACKNOWLEDGER (bass_figure_alignment); @@ -106,7 +106,7 @@ Figured_bass_position_engraver::acknowledge_slur (Grob_info info) } void -Figured_bass_position_engraver::acknowledge_tie (Grob_info info) +Figured_bass_position_engraver::acknowledge_end_tie (Grob_info info) { support_.push_back (info.grob ()); } @@ -142,7 +142,7 @@ ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column); ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur); ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur); -ADD_ACKNOWLEDGER (Figured_bass_position_engraver, tie); +ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie); ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 123878b644..7e6c3c63fe 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -62,7 +62,7 @@ protected: DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (dots); DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (tuplet_number); void acknowledge_extra_object (Grob_info); @@ -156,7 +156,7 @@ Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) } void -Phrasing_slur_engraver::acknowledge_tie (Grob_info info) +Phrasing_slur_engraver::acknowledge_end_tie (Grob_info info) { acknowledge_extra_object (info); } @@ -314,7 +314,7 @@ 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, diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 288d771ef2..3085f4f155 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -58,6 +58,8 @@ protected: DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (inline_accidental); @@ -199,6 +201,26 @@ Script_engraver::acknowledge_stem_tremolo (Grob_info info) } } +void +Script_engraver::acknowledge_tie (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + +void +Script_engraver::acknowledge_end_tie (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + void Script_engraver::acknowledge_inline_accidental (Grob_info info) { @@ -255,6 +277,8 @@ Script_engraver::stop_translation_timestep () ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head); ADD_ACKNOWLEDGER (Script_engraver, stem); +ADD_ACKNOWLEDGER (Script_engraver, tie); +ADD_END_ACKNOWLEDGER (Script_engraver, tie); ADD_ACKNOWLEDGER (Script_engraver, note_column); ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo); ADD_ACKNOWLEDGER (Script_engraver, inline_accidental); diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 03f5a5c430..49f92ab0ed 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -63,7 +63,7 @@ protected: DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (dots); DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (tuplet_number); void acknowledge_extra_object (Grob_info); @@ -163,7 +163,7 @@ Slur_engraver::acknowledge_text_script (Grob_info info) } void -Slur_engraver::acknowledge_tie (Grob_info info) +Slur_engraver::acknowledge_end_tie (Grob_info info) { acknowledge_extra_object (info); } @@ -324,7 +324,7 @@ ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); ADD_ACKNOWLEDGER (Slur_engraver, text_script); ADD_ACKNOWLEDGER (Slur_engraver, dots); -ADD_ACKNOWLEDGER (Slur_engraver, tie); +ADD_END_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver, /* doc */ diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 40da0d3e84..07eb9196c7 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -46,9 +46,9 @@ struct Head_event_tuple { Grob *head_; Moment end_moment_; - SCM tie_definition_; Stream_event *tie_stream_event_; Stream_event *tie_event_; + Spanner *tie_; // Indicate whether a tie from the same moment has been processed successfully // This is needed for tied chords, e.g. ~ g, because otherwise the c // and e will trigger a warning for an unterminated tie! @@ -57,15 +57,20 @@ struct Head_event_tuple Head_event_tuple () { head_ = 0; - tie_definition_ = SCM_EOL; tie_event_ = 0; tie_stream_event_ = 0; tie_from_chord_created = false; + tie_ = 0; } }; class Tie_engraver : public Engraver { + /* + Whether tie event has been processed and can be deleted or should + be kept for later portions of a split note. + */ + bool event_processed_; Stream_event *event_; vector now_heads_; vector heads_to_tie_; @@ -74,8 +79,8 @@ class Tie_engraver : public Engraver Spanner *tie_column_; protected: + void process_acknowledged (); void stop_translation_timestep (); - virtual void derived_mark () const; void start_translation_timestep (); DECLARE_ACKNOWLEDGER (note_head); DECLARE_TRANSLATOR_LISTENER (tie); @@ -87,18 +92,11 @@ public: TRANSLATOR_DECLARATIONS (Tie_engraver); }; -void -Tie_engraver::derived_mark () const -{ - Engraver::derived_mark (); - for (vsize i = 0; i < heads_to_tie_.size (); i++) - scm_gc_mark (heads_to_tie_[i].tie_definition_); -} - Tie_engraver::Tie_engraver () { event_ = 0; tie_column_ = 0; + event_processed_ = false; } IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); @@ -114,7 +112,10 @@ void Tie_engraver::report_unterminated_tie (Head_event_tuple const &tie_start) // moment that created a tie, so this is not necessarily an unterminated // tie. Happens e.g. for ~ g if (!tie_start.tie_from_chord_created) - tie_start.head_->warning (_ ("unterminated tie")); + { + tie_start.tie_->warning (_ ("unterminated tie")); + tie_start.tie_->suicide (); + } } /* @@ -166,20 +167,21 @@ Tie_engraver::acknowledge_note_head (Grob_info i) if (ly_is_equal (right_ev->get_property ("pitch"), left_ev->get_property ("pitch")) && (!Tie_engraver::has_autosplit_end (left_ev))) { - Grob *p = new Spanner (heads_to_tie_[i].tie_definition_); + Grob *p = heads_to_tie_[i].tie_; Moment end = heads_to_tie_[i].end_moment_; - SCM cause = heads_to_tie_[i].tie_event_ - ? heads_to_tie_[i].tie_event_->self_scm () - : heads_to_tie_[i].tie_stream_event_->self_scm (); + Stream_event *cause = heads_to_tie_[i].tie_event_ + ? heads_to_tie_[i].tie_event_ + : heads_to_tie_[i].tie_stream_event_; + + announce_end_grob (p, cause->self_scm ()); - announce_grob (p, cause); Tie::set_head (p, LEFT, th); Tie::set_head (p, RIGHT, h); - if (is_direction (unsmob_stream_event (cause)->get_property ("direction"))) + if (is_direction (cause->get_property ("direction"))) { - Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction")); + Direction d = to_dir (cause->get_property ("direction")); p->set_property ("direction", scm_from_int (d)); } @@ -229,7 +231,7 @@ Tie_engraver::start_translation_timestep () } void -Tie_engraver::stop_translation_timestep () +Tie_engraver::process_acknowledged () { bool wait = to_boolean (get_property ("tieWaitForNote")); if (ties_.size ()) @@ -251,11 +253,6 @@ Tie_engraver::stop_translation_timestep () vector new_heads_to_tie; - /* - Whether tie event has been processed and can be deleted or should - be kept for later portions of a split note. - */ - bool event_processed = false; for (vsize i = 0; i < now_heads_.size (); i++) { @@ -292,17 +289,16 @@ Tie_engraver::stop_translation_timestep () if (left_ev && (tie_event || tie_stream_event) && (!Tie_engraver::has_autosplit_end (left_ev))) { - event_processed = true; + event_processed_ = true; Head_event_tuple event_tup; - SCM start_definition - = updated_grob_properties (context (), ly_symbol2scm ("Tie")); - event_tup.head_ = head; - event_tup.tie_definition_ = start_definition; event_tup.tie_event_ = tie_event; event_tup.tie_stream_event_ = tie_stream_event; + event_tup.tie_ = make_spanner ("Tie", tie_event + ? tie_event->self_scm () + : tie_stream_event->self_scm ()); Moment end = now_mom (); if (end.grace_part_) @@ -331,14 +327,20 @@ Tie_engraver::stop_translation_timestep () for (vsize i = 0; i < new_heads_to_tie.size (); i++) heads_to_tie_.push_back (new_heads_to_tie[i]); + now_heads_.clear (); +} + +void +Tie_engraver::stop_translation_timestep () +{ /* Discard event only if it has been processed with at least one appropriate note. */ - if (event_processed) + if (event_processed_) event_ = 0; - now_heads_.clear (); + event_processed_ = false; } void -- 2.39.2