/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "translator.icc"
/**
- Manufacture ties. Acknowledge noteheads, and put them into a
+ Manufacture ties. Acknowledge note heads, and put them into a
priority queue. If we have a TieEvent, connect the notes that finish
just at this time, and note that start at this time.
SCM tie_definition_;
Stream_event *tie_stream_event_;
Stream_event *tie_event_;
-
+ // 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!
+ bool tie_from_chord_created;
+
Head_event_tuple ()
{
head_ = 0;
tie_definition_ = SCM_EOL;
tie_event_ = 0;
tie_stream_event_ = 0;
+ tie_from_chord_created = false;
}
};
DECLARE_TRANSLATOR_LISTENER (tie);
void process_music ();
void typeset_tie (Grob *);
+ void report_unterminated_tie (Head_event_tuple const &);
public:
TRANSLATOR_DECLARATIONS (Tie_engraver);
};
ASSIGN_EVENT_ONCE (event_, ev);
}
+void Tie_engraver::report_unterminated_tie (Head_event_tuple const &tie_start)
+{
+ // If tie_from_chord_created is set, we have another note at the same
+ // 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"));
+}
+
void
Tie_engraver::process_music ()
{
*/
if (!right_ev || !left_ev)
continue;
-
+
if (ly_is_equal (right_ev->get_property ("pitch"),
left_ev->get_property ("pitch")))
{
Grob *p = new Spanner (heads_to_tie_[i].tie_definition_);
+ 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 ();
-
+
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")))
{
Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction"));
- p->set_property ("direction", scm_from_int (d));
+ p->set_property ("direction", scm_from_int (d));
}
-
+
ties_.push_back (p);
heads_to_tie_.erase (heads_to_tie_.begin () + i);
+
+ // Prevent all other tied notes ending at the same moment (assume
+ // implicitly the notes have also started at the same moment!)
+ // from triggering an "unterminated tie" warning. Needed e.g. for
+ // <c e g>~ g
+ for (vsize j = heads_to_tie_.size (); j--;)
+ {
+ if (heads_to_tie_[j].end_moment_ == end)
+ heads_to_tie_[j].tie_from_chord_created = true;
+ }
}
}
void
Tie_engraver::start_translation_timestep ()
{
- context ()->set_property ("tieMelismaBusy",
- ly_bool2scm (heads_to_tie_.size ()));
-
if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote")))
{
Moment now = now_mom ();
for (vsize i = heads_to_tie_.size (); i--; )
{
if (now > heads_to_tie_[i].end_moment_)
- heads_to_tie_.erase (heads_to_tie_.begin () + i);
+ {
+ report_unterminated_tie (heads_to_tie_[i]);
+ heads_to_tie_.erase (heads_to_tie_.begin () + i);
+ }
}
}
+
+ context ()->set_property ("tieMelismaBusy",
+ ly_bool2scm (heads_to_tie_.size ()));
}
void
if (ties_.size ())
{
if (!wait)
- heads_to_tie_.clear ();
+ {
+ vector<Head_event_tuple>::iterator it = heads_to_tie_.begin ();
+ for (; it < heads_to_tie_.end (); it++)
+ report_unterminated_tie (*it);
+ heads_to_tie_.clear ();
+ }
for (vsize i = 0; i < ties_.size (); i++)
typeset_tie (ties_[i]);
}
vector<Head_event_tuple> new_heads_to_tie;
-
+
for (vsize i = 0; i < now_heads_.size (); i++)
{
Grob *head = now_heads_[i];
if (!left_ev)
{
- // may happen for ambituses
+ // may happen for ambitus
continue;
}
-
-
+
+
SCM left_articulations = left_ev->get_property ("articulations");
Stream_event *tie_event = 0;
Stream_event *ev = unsmob_stream_event (scm_car (s));
if (!ev)
continue;
-
+
if (ev->in_event_class ("tie-event"))
tie_event = ev;
}
-
+
if (left_ev && (tie_event || tie_stream_event))
{
Head_event_tuple event_tup;
end += get_event_length (left_ev);
}
event_tup.end_moment_ = end;
-
+
new_heads_to_tie.push_back (event_tup);
}
}
if (!wait && new_heads_to_tie.size ())
- heads_to_tie_.clear ();
+ {
+ vector<Head_event_tuple>::iterator it=heads_to_tie_.begin ();
+ for (; it < heads_to_tie_.end (); it++)
+ report_unterminated_tie (*it);
+ heads_to_tie_.clear ();
+ }
// hmmm, how to do with copy () ?
for (vsize i = 0; i < new_heads_to_tie.size (); i++)
heads_to_tie_.push_back (new_heads_to_tie[i]);
-
+
event_ = 0;
now_heads_.clear ();
}