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 "musical-request.hh"
#include "tie.hh"
#include "translator-group.hh"
+#include "tie-column.hh"
+#include "pqueue.hh"
+#include "engraver.hh"
+
+struct CHead_melodic_tuple {
+ Melodic_req *req_l_ ;
+ Note_head *head_l_;
+ Moment end_;
+ CHead_melodic_tuple ();
+ CHead_melodic_tuple (Note_head*, 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: should share code with Beam_engraver, Extender_engraver?
+ */
+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 ();
+
+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;
- SCM m = get_property ("automaticMelismata",0);
+ SCM m = get_property ("automaticMelismata");
bool am = gh_boolean_p (m) &&gh_scm2bool (m);
if (am)
{
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::do_process_requests ()
+Tie_engraver::do_process_music ()
{
if (req_l_)
{
{
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 ())
+
+ SCM head_list = SCM_EOL;
+
+ int j = stopped_heads_.size ()-1;
+ int i = now_heads_.size ()-1;
+
+ while (i >= 0 && j >=0)
{
int comp
= Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
if (comp)
{
- (comp < 0) ? i ++ : j++;
+ (comp < 0) ? j -- : i--;
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++;
+ 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--;
}
}
+
+ SCM sparse = get_property ("sparseTies");
+ if (to_boolean (sparse))
+ {
+ int i = scm_ilength (head_list);
+
+ if (!i)
+ return;
+
+ SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
+
+ Tie * p = new Tie;
+ p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
+ p->set_head (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;
+ p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
+ p->set_head (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;
+ for (int i = tie_p_arr_.size (); i--; )
+ tie_column_p_->add_tie (tie_p_arr_ [i]);
+ announce_element (Score_element_info (tie_column_p_, 0));
+ }
}
}
}
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]->dir_ = tie_dir;
typeset_element (tie_p_arr_[i]);
}
tie_p_arr_.clear ();
+ if (tie_column_p_)
+ {
+ typeset_element (tie_column_p_);
+ tie_column_p_ =0;
+ }
}
void
Tie_engraver::do_post_move_processing ()
{
- SCM m = get_property ("automaticMelismata",0);
- if (gh_boolean_p (m) && gh_scm2bool (m))
+ SCM m = get_property ("automaticMelismata");
+ if (to_boolean (m))
{
set_melisma (false);
}
projects / lilypond.git / blobdiff