--- /dev/null
+\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. <g-- c-> >4--~ | <g-- c>-> ~ <g c---_>-> r2 |
+ r2. c4~ | c-> ~ c-> r2 |
+ r2. c4~-> | c ~ c-> r2 |
+ r2. c4~-> | c-> ~ c r2 |
+ r2. c4-> |
+}
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);
}
void
-Accidental_engraver::acknowledge_tie (Grob_info info)
+Accidental_engraver::acknowledge_end_tie (Grob_info info)
{
ties_.push_back (dynamic_cast<Spanner *> (info.grob ()));
}
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,
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);
}
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 ());
}
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);
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);
}
void
-Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
+Phrasing_slur_engraver::acknowledge_end_tie (Grob_info info)
{
acknowledge_extra_object (info);
}
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,
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);
}
}
+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)
{
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);
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);
}
void
-Slur_engraver::acknowledge_tie (Grob_info info)
+Slur_engraver::acknowledge_end_tie (Grob_info info)
{
acknowledge_extra_object (info);
}
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 */
{
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. <c e g>~ g, because otherwise the c
// and e will trigger a warning for an unterminated tie!
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<Grob *> now_heads_;
vector<Head_event_tuple> heads_to_tie_;
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);
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);
// moment that created a tie, so this is not necessarily an unterminated
// tie. Happens e.g. for <c e g>~ g
if (!tie_start.tie_from_chord_created)
- tie_start.head_->warning (_ ("unterminated tie"));
+ {
+ tie_start.tie_->warning (_ ("unterminated tie"));
+ tie_start.tie_->suicide ();
+ }
}
/*
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));
}
}
void
-Tie_engraver::stop_translation_timestep ()
+Tie_engraver::process_acknowledged ()
{
bool wait = to_boolean (get_property ("tieWaitForNote"));
if (ties_.size ())
vector<Head_event_tuple> 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++)
{
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_)
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