source file of the GNU LilyPond music typesetter
- (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "note-head.hh"
#include "musical-request.hh"
#include "tie.hh"
+#include "translator-group.hh"
Tie_engraver::Tie_engraver()
{
if (Tie_req * c = dynamic_cast<Tie_req*> (m))
{
req_l_ = c;
+ SCM m = get_property ("automaticMelismata",0);
+ bool am = gh_boolean_p (m) &&gh_scm2bool (m);
+ if (am)
+ {
+ set_melisma (true);
+ }
return true;
}
return false;
}
+void
+Tie_engraver::set_melisma (bool m)
+{
+ Translator_group *where = daddy_trans_l_;
+ get_property ("tieMelismaBusy", &where);
+ if (!where)
+ where = daddy_trans_l_;
+
+ daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
+}
+
void
Tie_engraver::acknowledge_element (Score_element_info i)
{
if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
{
Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
- now_heads_.push (CHead_melodic_tuple (nh, m, now_moment()+ m->duration ()));
+ if (!m)
+ return;
+ now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
}
}
{
if (req_l_)
{
- Moment now = now_moment ();
+ Moment now = now_mom ();
Link_array<Note_head> nharr;
stopped_heads_.clear ();
while (past_notes_pq_.size ()
&& past_notes_pq_.front ().end_ == now)
stopped_heads_.push (past_notes_pq_.get ());
-
}
}
{
if (req_l_)
{
- if (now_heads_.size () != stopped_heads_.size ())
+ now_heads_.sort (CHead_melodic_tuple::pitch_compare);
+ stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+ int i=0;
+ int j=0;
+ int tie_count=0;
+ while ( i < now_heads_.size () && j < stopped_heads_.size ())
{
- req_l_->warning ("Unequal number of note heads for tie");
- }
- int sz = now_heads_.size () <? stopped_heads_.size ();
-
- // hmm. Should do something more sensible.
- // because, we assume no more noteheads come along after the 1st pass.
- if (sz > tie_p_arr_.size ())
- {
- now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+ int comp
+ = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
+ stopped_heads_[j].req_l_->pitch_);
- for (int i=0; i < sz; i++)
+ if (comp)
{
- Tie * p = new Tie;
- p->set_head (LEFT, stopped_heads_[i].head_l_);
- p->set_head (RIGHT, now_heads_[i].head_l_);
- tie_p_arr_.push (p);
- announce_element (Score_element_info (p, req_l_));
+ (comp < 0) ? i ++ : j++;
+ continue;
+ }
+ else
+ {
+ tie_count ++;
+
+ /* don't go around recreating ties that were already
+ made. Not infallible. Due to reordering in sort (),
+ we will make the wrong ties when noteheads are
+ added. */
+ if (tie_count > tie_p_arr_.size ())
+ {
+ Tie * p = new Tie;
+ p->set_head (LEFT, stopped_heads_[j].head_l_);
+ p->set_head (RIGHT, now_heads_[i].head_l_);
+ tie_p_arr_.push (p);
+ announce_element (Score_element_info (p, req_l_));
+ }
+ i++;
+ j++;
+
}
}
+
+ if (!tie_p_arr_.size ())
+ {
+ req_l_->warning (_ ("No ties were created!"));
+ }
+
}
}
+
void
Tie_engraver::do_pre_move_processing ()
{
{
past_notes_pq_.insert (now_heads_[i]);
}
- now_heads_.clear( );
+ now_heads_.clear ();
+
+ SCM dir (get_property ("tieVerticalDirection", 0));
+ SCM dir2 (get_property ("verticalDirection", 0));
+
+ Direction tie_dir = CENTER;
+ if (gh_number_p(dir))
+ tie_dir = to_dir (dir);
+ else if (isdir_b (dir2))
+ tie_dir = to_dir (dir2);
for (int i=0; i< tie_p_arr_.size (); i++)
- {
+ {
+ tie_p_arr_[i]->set_direction (tie_dir);
typeset_element (tie_p_arr_[i]);
}
tie_p_arr_.clear ();
void
Tie_engraver::do_post_move_processing ()
{
- req_l_ =0;
- Moment now = now_moment ();
+ SCM m = get_property ("automaticMelismata",0);
+ if (gh_boolean_p (m) && gh_scm2bool (m))
+ {
+ set_melisma (false);
+ }
+ req_l_ = 0;
+ Moment now = now_mom ();
while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
past_notes_pq_.delmin ();
}
-
-
ADD_THIS_TRANSLATOR(Tie_engraver);
CHead_melodic_tuple::CHead_melodic_tuple ()
{
head_l_ =0;
- mel_l_ =0;
+ req_l_ =0;
end_ = 0;
}
CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
{
head_l_ = h;
- mel_l_ = m;
+ req_l_ = m;
end_ = mom;
}
CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
CHead_melodic_tuple const &h2)
{
- return Melodic_req::compare (*h1.mel_l_, *h2.mel_l_);
+ return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
}
int