(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "sequential-iterator.hh"
+
#include "translator-group.hh"
#include "context.hh"
-#include "sequential-iterator.hh"
#include "music-list.hh"
#include "grace-fixup.hh"
if (scm_is_pair (cursor_))
- iter_->music_ == unsmob_music (ly_car (cursor_))
+ iter_->music_ == unsmob_music (scm_car (cursor_))
else
iter_ == 0;
Grace_fixup *head = 0;
Grace_fixup **tail = &head;
- for (; scm_is_pair (cursor); cursor = ly_cdr (cursor))
+ for (; scm_is_pair (cursor); cursor = scm_cdr (cursor))
{
- Music *mus = unsmob_music (ly_car (cursor));
+ Music *mus = unsmob_music (scm_car (cursor));
Moment s = mus->start_mom ();
Moment l = mus->get_length () - s;
iter_ = 0;
if (scm_is_pair (cursor_))
{
- Music *m = unsmob_music (ly_car (cursor_));
+ Music *m = unsmob_music (scm_car (cursor_));
iter_ = unsmob_iterator (get_iterator (m));
}
void
Sequential_iterator::next_element (bool)
{
- Moment len =iter_->music_get_length () - iter_->music_start_mom ();
+ Moment len = iter_->music_get_length () - iter_->music_start_mom ();
assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_);
if (len.main_part_
else if (len.grace_part_ && !len.main_part_)
{
last_mom_ = here_mom_;
- here_mom_.grace_part_ =0;
+ here_mom_.grace_part_ = 0;
}
else
{
here_mom_ += len;
}
- cursor_ = ly_cdr (cursor_);
+ cursor_ = scm_cdr (cursor_);
iter_->quit ();
if (scm_is_pair (cursor_))
- iter_ = unsmob_iterator (get_iterator (unsmob_music (ly_car (cursor_))));
+ iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_car (cursor_))));
else
iter_ = 0;
}