source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "tie-engraver.hh"
#include "command-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
#include "musical-request.hh"
#include "tie.hh"
#include "translator-group.hh"
+#include "tie-column.hh"
+#include "pqueue.hh"
+#include "engraver.hh"
+#include "item.hh"
+
+struct CHead_melodic_tuple {
+ Melodic_req *req_l_ ;
+ Score_element *head_l_;
+ Moment end_;
+ CHead_melodic_tuple ();
+ CHead_melodic_tuple (Score_element*, Melodic_req*, Moment);
+ static int pitch_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);
+ static int time_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);
+};
+
+inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b)
+{
+ return CHead_melodic_tuple::time_compare (a,b);
+}
+
+
+/**
+ Manufacture ties. Acknowledge noteheads, and put them into a
+ priority queue. If we have a Tie_req, connect the notes that finish
+ just at this time, and note that start at this time.
+
+ TODO: junk the pq.
+ */
+class Tie_engraver : public Engraver
+{
+ PQueue<CHead_melodic_tuple> past_notes_pq_;
+ Tie_req *req_l_;
+ Array<CHead_melodic_tuple> now_heads_;
+ Array<CHead_melodic_tuple> stopped_heads_;
+ Link_array<Tie> tie_p_arr_;
+
+ Tie_column * tie_column_p_;
+
+ void set_melisma (bool);
+
+protected:
+ virtual void do_post_move_processing ();
+ virtual void do_pre_move_processing ();
+ virtual void acknowledge_element (Score_element_info);
+ virtual bool do_try_music (Music*);
+ virtual void do_process_music ();
+ virtual void process_acknowledged ();
+ void typeset_tie (Score_element*);
+public:
+ VIRTUAL_COPY_CONS(Translator);
+ Tie_engraver();
+};
+
+
Tie_engraver::Tie_engraver()
{
req_l_ = 0;
+ tie_column_p_ = 0;
}
if (Tie_req * c = dynamic_cast<Tie_req*> (m))
{
req_l_ = c;
- if (get_property ("automaticMelismas",0).to_bool ())
+ SCM m = get_property ("automaticMelismata");
+ bool am = gh_boolean_p (m) &&gh_scm2bool (m);
+ if (am)
{
set_melisma (true);
}
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 ? "1" :"0");
+ 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_))
+ if (Rhythmic_head::has_interface (i.elem_l_))
{
Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
if (!m)
return;
- now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
+ now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ()));
}
}
void
-Tie_engraver::do_process_requests ()
+Tie_engraver::do_process_music ()
{
if (req_l_)
{
void
Tie_engraver::process_acknowledged ()
{
- bool old_behavior = get_property ("oldTieBehavior", 0).to_bool ();
-
if (req_l_)
{
+ now_heads_.sort (CHead_melodic_tuple::pitch_compare);
+ stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+
+ SCM head_list = SCM_EOL;
+
+ int j = stopped_heads_.size ()-1;
+ int i = now_heads_.size ()-1;
- /*
- JUNKME!
- */
- if (old_behavior)
+ while (i >= 0 && j >=0)
{
- if (now_heads_.size () != stopped_heads_.size ())
+ int comp
+ = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
+ stopped_heads_[j].req_l_->pitch_);
+
+ if (comp)
{
- req_l_->warning ("Unequal number of note heads for tie");
+ (comp < 0) ? j -- : i--;
+ continue;
}
- 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 ())
- return;
-
- now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
-
- for (int i=0; i < sz; i++)
+ else
{
- 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_));
+ head_list = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm_,
+ now_heads_[i].head_l_->self_scm_),
+ head_list);
+
+ past_notes_pq_. insert (now_heads_[i]);
+ now_heads_.del (i);
+ stopped_heads_.del (j);
+ i--;
+ j--;
}
}
- else
+
+ SCM basic = get_property ("basicTieProperties");
+ SCM sparse = get_property ("sparseTies");
+ if (to_boolean (sparse))
{
- 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 ())
- {
- int comp
- = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
- stopped_heads_[j].req_l_->pitch_);
-
- if (comp)
- {
- (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++;
-
- }
- }
+ int i = scm_ilength (head_list);
- if (!tie_p_arr_.size ())
- {
- req_l_->warning (_("No ties were created!"));
- }
+ if (!i)
+ return;
+
+ SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
+ Tie * p = new Tie (basic);
+ Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
+ Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdr (pair))));
+
+ tie_p_arr_.push (p);
+ announce_element (Score_element_info (p, req_l_));
+ }
+ else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
+ {
+ Tie * p = new Tie (basic);
+ Tie::set_interface (p);
+
+ Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
+ Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdar (s))));
+
+ tie_p_arr_.push (p);
+ announce_element (Score_element_info (p, req_l_));
+ }
+
+ if (!tie_p_arr_.size ())
+ {
+ req_l_->warning (_ ("No ties were created!"));
+ }
+ else if (tie_p_arr_.size () > 1 && !tie_column_p_)
+ {
+ tie_column_p_ = new Tie_column (get_property ("basicTieColumnProperties"));
+ Tie_column::set_interface (tie_column_p_);
+ for (int i = tie_p_arr_.size (); i--; )
+ Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
+ announce_element (Score_element_info (tie_column_p_, 0));
}
}
}
+
void
Tie_engraver::do_pre_move_processing ()
{
}
now_heads_.clear ();
- Scalar dir (get_property ("tieVerticalDirection", 0));
- Scalar dir2 (get_property ("verticalDirection", 0));
-
- Direction tie_dir = CENTER;
- if (dir.length_i () && dir.isnum_b ())
- tie_dir = (Direction) sign (int(dir));
- else if (dir2.length_i () && dir2.isnum_b ())
- tie_dir = (Direction) sign (int (dir2));
-
for (int i=0; i< tie_p_arr_.size (); i++)
{
- tie_p_arr_[i]->dir_ = tie_dir;
- typeset_element (tie_p_arr_[i]);
+ typeset_tie (tie_p_arr_[i]);
}
tie_p_arr_.clear ();
+ if (tie_column_p_)
+ {
+ typeset_element (tie_column_p_);
+ tie_column_p_ =0;
+ }
+}
+
+void
+Tie_engraver::typeset_tie (Score_element *her)
+{
+ if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
+ warning (_ ("lonely tie"));
+
+ Direction d = LEFT;
+ Drul_array<Score_element *> new_head_drul;
+ new_head_drul[LEFT] = Tie::head(her,LEFT);
+ new_head_drul[RIGHT] = Tie::head (her,RIGHT);
+ do {
+ if (!Tie::head (her,d))
+ new_head_drul[d] = Tie::head(her,(Direction)-d);
+ } while (flip(&d) != LEFT);
+
+ index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ );
+ index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ );
+
+ typeset_element (her);
}
void
Tie_engraver::do_post_move_processing ()
{
- if (get_property ("automaticMelismas",0).to_bool ())
+ SCM m = get_property ("automaticMelismata");
+ if (to_boolean (m))
{
set_melisma (false);
}
end_ = 0;
}
-CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
+CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom)
{
head_l_ = h;
req_l_ = m;