/*
completion-note-heads-engraver.cc -- Completion_heads_engraver
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <ctype.h>
+#include <cctype>
#include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "event.hh"
#include "dots.hh"
#include "dot-column.hh"
Link_array<Music> scratch_note_reqs_;
Moment note_end_mom_;
- bool first_b_;
+ bool is_first_;
Rational left_to_do_;
Rational do_nothing_until_;
void
Completion_heads_engraver::initialize ()
{
- first_b_ = false;
+ is_first_ = false;
}
bool
{
note_reqs_.push (m);
- first_b_ = true;
+ is_first_ = true;
Moment musiclen = m->get_length ();
Moment now = now_mom ();
if (now_mom ().grace_part_)
{
musiclen.grace_part_ = musiclen.main_part_ ;
- musiclen.main_part_ = Rational (0,1);
+ musiclen.main_part_ = Rational (0, 1);
}
note_end_mom_ = note_end_mom_ >? (now + musiclen);
- do_nothing_until_ = Rational (0,0);
+ do_nothing_until_ = Rational (0, 0);
return true;
}
else if (m->is_mus_type ("busy-playing-event"))
{
- return note_reqs_.size ();
+ return note_reqs_.size() && is_first_;
}
return false;
if (!e || !l)
{
programming_error ("No timing props set?");
- return Moment (1,1);
+ return Moment (1, 1);
}
return (*l - *e);
Duration
Completion_heads_engraver::find_nearest_duration (Rational length)
{
- int log_limit= 6;
+ int log_limit = 6;
- Duration d (0,0);
+ Duration d (0, 0);
/*
this could surely be done more efficient. Left to the reader as an
void
Completion_heads_engraver::process_music ()
{
- if (!first_b_ && !left_to_do_)
+ if (!is_first_ && !left_to_do_)
return ;
- first_b_ = false;
+ is_first_ = false;
Moment now = now_mom ();
if (do_nothing_until_ > now.main_part_)
for (int i = 0;
left_to_do_ && i < note_reqs_.size (); i++)
{
- Item *note = make_item ("NoteHead");
-
Music * req = note_reqs_[i];
if (scratch_note_reqs_.size ())
{
req = scratch_note_reqs_[i];
SCM pits = note_reqs_[i]->get_property ("pitch");
- req->set_property ("pitch",pits);
+ req->set_property ("pitch", pits);
}
req->set_property ("duration", note_dur.smobbed_copy ());
+
+ Item *note = make_item ("NoteHead", req->self_scm ());
note->set_property ("duration-log",
- scm_int2num (note_dur.duration_log ()));
+ scm_int2num (note_dur.duration_log ()));
- int dots= note_dur.dot_count ();
+ int dots = note_dur.dot_count ();
if (dots)
{
- Item * d = make_item ("Dots");
+ Item * d = make_item ("Dots", SCM_EOL);
Rhythmic_head::set_dots (note, d);
/*
measly attempt to save an eeny-weenie bit of memory.
*/
- if (dots != ly_scm2int (d->get_property ("dot-count")))
+ if (dots != scm_to_int (d->get_property ("dot-count")))
d->set_property ("dot-count", scm_int2num (dots));
d->set_parent (note, Y_AXIS);
- announce_grob (d, SCM_EOL);
dots_.push (d);
}
- Pitch *pit =unsmob_pitch (req->get_property ("pitch"));
+ Pitch *pit = unsmob_pitch (req->get_property ("pitch"));
int pos = pit->steps ();
SCM c0 = get_property ("middleCPosition");
- if (ly_c_number_p (c0))
- pos += ly_scm2int (c0);
+ if (scm_is_number (c0))
+ pos += scm_to_int (c0);
note->set_property ("staff-position", scm_int2num (pos));
- announce_grob (note,req->self_scm ());
notes_.push (note);
}
if (prev_notes_.size () == notes_.size ())
{
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
- Grob * p = make_spanner ("Tie");
+ Grob * p = make_spanner ("Tie", SCM_EOL);
Tie::set_interface (p); // cannot remove yet!
Tie::set_head (p, LEFT, prev_notes_[i]);
Tie::set_head (p, RIGHT, notes_[i]);
ties_.push (p);
- announce_grob (p, SCM_EOL);
+
}
}
if (orig
&& now_mom ().grace_part_ )
{
- left_to_do_ = Rational (0,0);
+ left_to_do_ = Rational (0, 0);
}
}
void
Completion_heads_engraver::stop_translation_timestep ()
{
- for (int i = ties_.size (); i--;)
- typeset_grob (ties_[i]);
ties_.clear ();
- for (int i=0; i < notes_.size (); i++)
- {
- typeset_grob (notes_[i]);
- }
if (notes_.size ())
prev_notes_ = notes_;
notes_.clear ();
- for (int i=0; i < dots_.size (); i++)
- {
- typeset_grob (dots_[i]);
- }
dots_.clear ();
for (int i = scratch_note_reqs_.size (); i--;)
{
}
-ENTER_DESCRIPTION (Completion_heads_engraver,
+ADD_TRANSLATOR (Completion_heads_engraver,
/* descr */ "This engraver replaces "
"@code{Note_heads_engraver}. It plays some trickery to "
"break long notes and automatically tie them into the next measure.",