X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsequential-iterator.cc;h=b02e58c62d0c57ab8dd3f00a9fecad1002ede9b1;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=d822c61b86f91b02d8361e2b377211dd5ee6d238;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index d822c61b86..b02e58c62d 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -1,23 +1,31 @@ /* - Sequential_iterator.cc -- implement Sequential_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "sequential-iterator.hh" - +#include "music.hh" #include "translator-group.hh" #include "context.hh" -#include "music-list.hh" #include "grace-fixup.hh" /* - TODO: handling of grace notes is exquisite pain. This handling should be formally specified and then the implementation verified. - */ /* @@ -25,28 +33,32 @@ if (scm_is_pair (cursor_)) - iter_->music_ == unsmob_music (scm_car (cursor_)) + iter_->music_ == unsmob (scm_car (cursor_)) else - iter_ == 0; + iter_ == 0; The length of musiclist from start to up to cursor_ (cursor_ not including), is summed - here_mom_ = sum (length (musiclist [start ... cursor>)) %) - - */ + here_mom_ = sum (length (musiclist [start ... cursor>)) %) +*/ Sequential_iterator::Sequential_iterator () { here_mom_ = Moment (0); - cursor_ = SCM_EOL; + cursor_ = SCM_EOL; grace_fixups_ = 0; iter_ = 0; } -SCM +SCM Sequential_iterator::get_music_list () const { - return SCM_EOL; + Music *m = get_music (); + SCM proc = m->get_property ("elements-callback"); + if (ly_is_procedure (proc)) + return scm_call_1 (proc, m->self_scm ()); + else + return SCM_EOL; } void @@ -56,9 +68,6 @@ Sequential_iterator::do_quit () iter_->quit (); } - - - void Sequential_iterator::derived_mark () const { @@ -67,7 +76,6 @@ Sequential_iterator::derived_mark () const scm_gc_mark (cursor_); } - void Sequential_iterator::derived_substitute (Context *f, Context *t) { @@ -77,7 +85,7 @@ Sequential_iterator::derived_substitute (Context *f, Context *t) /* TODO: this should be made lazily. - */ +*/ Grace_fixup * create_grace_fixup_list (SCM cursor) { @@ -88,33 +96,33 @@ create_grace_fixup_list (SCM cursor) for (; scm_is_pair (cursor); cursor = scm_cdr (cursor)) { - Music *mus = unsmob_music (scm_car (cursor)); + Music *mus = unsmob (scm_car (cursor)); Moment s = mus->start_mom (); Moment l = mus->get_length () - s; if (s.grace_part_) - { - if (last != Moment (-1)) - { - Grace_fixup *p = new Grace_fixup; - p->start_ = last; - p->length_ = here - last; - p->grace_start_ = s.grace_part_; - p->next_ = 0; - *tail = p; - tail = &(*tail)->next_; - } - - here.grace_part_ = s.grace_part_; - } - + { + if (last != Moment (-1)) + { + Grace_fixup *p = new Grace_fixup; + p->start_ = last; + p->length_ = here - last; + p->grace_start_ = s.grace_part_; + p->next_ = 0; + *tail = p; + tail = &(*tail)->next_; + } + + here.grace_part_ = s.grace_part_; + } + if (l.to_bool ()) - { - last = here; - here += l; - } + { + last = here; + here += l; + } } - + return head; } @@ -126,14 +134,12 @@ Sequential_iterator::construct_children () iter_ = 0; if (scm_is_pair (cursor_)) { - Music *m = unsmob_music (scm_car (cursor_)); - iter_ = unsmob_iterator (get_iterator (m)); + Music *m = unsmob (scm_car (cursor_)); + iter_ = unsmob (get_iterator (m)); } - + while (iter_ && !iter_->ok ()) - { - next_element (true); - } + next_element (true); last_mom_ = Moment (-1); here_mom_ = get_music ()->start_mom (); @@ -141,12 +147,11 @@ Sequential_iterator::construct_children () /* iter_->ok () is tautology, but what the heck. - */ - if (iter_ && iter_->ok ()) + */ + if (iter_ && iter_->ok ()) descend_to_child (iter_->get_outlet ()); } - /* maintain invariants: change cursor, iter and here_mom_ in one fell swoop. @@ -155,8 +160,8 @@ void Sequential_iterator::next_element (bool) { Moment len = iter_->music_get_length () - iter_->music_start_mom (); - assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_); - + assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_); + if (len.main_part_ && get_grace_fixup ()) { @@ -176,56 +181,54 @@ Sequential_iterator::next_element (bool) else { /* - !len.grace_part_ || len.main_part_ + !len.grace_part_ || len.main_part_ - We skip over a big chunk (mainpart != 0). Any starting graces - in that chunk should be in len.grace_part_ + We skip over a big chunk (mainpart != 0). Any starting graces + in that chunk should be in len.grace_part_ */ - last_mom_ = here_mom_;; + last_mom_ = here_mom_; here_mom_ += len; } - + cursor_ = scm_cdr (cursor_); iter_->quit (); if (scm_is_pair (cursor_)) - iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_car (cursor_)))); + iter_ = unsmob (get_iterator (unsmob (scm_car (cursor_)))); else iter_ = 0; } - - void Sequential_iterator::process (Moment until) { while (iter_) { - Grace_fixup * gf = get_grace_fixup (); + Grace_fixup *gf = get_grace_fixup (); if (gf - && gf->start_ + gf->length_ - + Moment (Rational (0), gf->grace_start_) == until) - { - /* - do the stuff/note/rest preceding a grace. - */ - iter_->process (iter_->music_get_length ()); - } + && gf->start_ + gf->length_ + + Moment (Rational (0), gf->grace_start_) == until) + { + /* + do the stuff/note/rest preceding a grace. + */ + iter_->process (iter_->music_get_length ()); + } else - { - Moment w = until - here_mom_ + iter_->music_start_mom (); - iter_->process (w); - } - + { + Moment w = until - here_mom_ + iter_->music_start_mom (); + iter_->process (w); + } + /* - if the iter is still OK, there must be events left that have - - TIME > LEFT - + if the iter is still OK, there must be events left that have + + TIME > LEFT + */ if (iter_->ok ()) - return ; + return; descend_to_child (iter_->get_outlet ()); next_element (true); @@ -240,12 +243,10 @@ Sequential_iterator::pending_moment () const /* Fix-up a grace note halfway in the music. */ - Grace_fixup * gf = get_grace_fixup (); + Grace_fixup *gf = get_grace_fixup (); if (gf && gf->length_ + iter_->music_start_mom () == cp) - { - return here_mom_ + gf->length_ + Moment (0, gf->grace_start_); - } + return here_mom_ + gf->length_ + Moment (0, gf->grace_start_); /* Fix-up a grace note at the start of the music. @@ -253,36 +254,29 @@ Sequential_iterator::pending_moment () const return cp + here_mom_ - iter_->music_start_mom (); } - bool Sequential_iterator::ok () const { return iter_; } -Music_iterator* -Sequential_iterator::try_music_in_children (Music *m) const -{ - return iter_ ? iter_->try_music (m) : 0; -} - IMPLEMENT_CTOR_CALLBACK (Sequential_iterator); bool Sequential_iterator::run_always () const { - return iter_ ? iter_->run_always () : false; + return iter_ ? iter_->run_always () : false; } void Sequential_iterator::next_grace_fixup () { - Grace_fixup * n = grace_fixups_->next_; + Grace_fixup *n = grace_fixups_->next_; delete grace_fixups_; grace_fixups_ = n; } -Grace_fixup* +Grace_fixup * Sequential_iterator::get_grace_fixup () const { if (grace_fixups_ && grace_fixups_->start_ == here_mom_)