X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=3806c4e7f7e69a30d47ad029a184428b9dca5a46;hb=76fc550ad24948eb3615ac2da52e22500d092e23;hp=33e6b2cdb60ed8c4230997f6dde5b11a42db488a;hpb=eeafd68c62481b0d10c292f0e4bfa5d821168c87;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 33e6b2cdb6..3806c4e7f7 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -1,400 +1,205 @@ /* - music-iterator.cc -- implement {Music,Chord,Voice}_iterator + music-iterator.cc -- implement Music_iterator source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ +/* + UGH. too many includes. + */ +#include "debug.hh" #include "music-list.hh" #include "music-iterator.hh" -#include "translator.hh" +#include "property-iterator.hh" +#include "request-chord-iterator.hh" +#include "sequential-music-iterator.hh" +#include "simultaneous-music-iterator.hh" +#include "translator-group.hh" +#include "translation-property.hh" +#include "change-iterator.hh" +#include "change-translator.hh" +#include "music-wrapper.hh" +#include "music-wrapper-iterator.hh" +#include "time-scaled-music-iterator.hh" +#include "time-scaled-music.hh" +#include "context-specced-music.hh" +#include "repeated-music.hh" +#include "folded-repeat-iterator.hh" +#include "unfolded-repeat-iterator.hh" +#include "grace-iterator.hh" +#include "grace-music.hh" +#include "lyric-combine-music.hh" +#include "lyric-combine-music-iterator.hh" +#include "auto-change-music.hh" +#include "auto-change-iterator.hh" +#include "part-combine-music.hh" +#include "part-combine-music-iterator.hh" #include "request.hh" -#include "debug.hh" - -IMPLEMENT_STATIC_NAME(Music_iterator); -IMPLEMENT_IS_TYPE_B(Music_iterator); - -void -Music_iterator::do_print()const -{ - -} - -void -Music_iterator::print() const -{ -#ifndef NPRINT - mtor << name() << "{"; - mtor << "report to " << report_to_l() << " (" << report_to_l()->name() << ")\n"; - mtor << "next at " << next_moment() << " "; - do_print(); - mtor << "}\n"; -#endif -} - -Translator* -Music_iterator::get_req_translator_l() -{ - assert(report_to_l()); - if (report_to_l()->is_bottom_engraver_b() ) - return report_to_l(); - - set_translator( report_to_l()->get_default_interpreter() ); - return report_to_l(); -} +#include "simple-music-iterator.hh" +#include "output-property.hh" +#include "chord-tremolo-iterator.hh" -void -Music_iterator::push_translator(Translator*t) +Music_iterator::Music_iterator () { - if (t) { - report_to_l_arr_.push(t); - t->iterator_count_ ++; - } + // clone_i_ = 0; } -void -Music_iterator::pop_translator() +Music_iterator::Music_iterator (Music_iterator const& src) { - if (report_to_l()) { - report_to_l()->iterator_count_ --; - report_to_l_arr_.pop(); - } + // clone_i_ = src.clone_i_ + 1; + handle_ = *src.handle_.clone (); + music_l_ = src.music_l_; } -Translator* -Music_iterator::report_to_l()const +Music_iterator::~Music_iterator () { - if (! report_to_l_arr_.size() ) - return 0; - return report_to_l_arr_.top(); } -void -Music_iterator::set_translator(Translator*reg) -{ - if (report_to_l()==reg) - return; - pop_translator(); - push_translator(reg); -} -void -Music_iterator::construct_children() -{ -} - -Music_iterator::~Music_iterator() +Translator_group* +Music_iterator::report_to_l () const { - set_translator(0); + return handle_.report_to_l (); } -Moment -Music_iterator::next_moment()const -{ - return 0; -} void -Music_iterator::process_and_next(Moment) -{ - first_b_ = false; -} - -bool -Music_iterator::ok()const -{ - return first_b_; -} - -Music_iterator* -Music_iterator::static_get_iterator_p(Music *m, - Translator *report_l) -{ - Music_iterator * p =0; - if (m->is_type_b( Change_reg::static_name())) - p = new Change_iterator((Change_reg*)m); - else if (m->is_type_b( Voice_element::static_name())) - p = new Voice_element_iterator( (Voice_element*) m); - else if (m->is_type_b( Chord::static_name())) - p = new Chord_iterator( (Chord*) m); - else if (m->is_type_b( Voice::static_name())) - p = new Voice_iterator( (Voice*) m); - else if (m->is_type_b( Request::static_name() )) - p = new Request_iterator( (Request*) m ); - - if ( m->is_type_b( Music_list::static_name())) { - Music_list* ml = (Music_list*) m; - if (ml -> type_str_ != "") { - Translator * a =report_l-> - find_get_translator_l(ml-> type_str_, ml->id_str_); - - - p->set_translator( a); - - } - } - if (! p->report_to_l() ) - p ->set_translator(report_l); - - return p; -} - -Music_iterator* -Music_iterator::get_iterator_p(Music*m)const -{ - Music_iterator*p = static_get_iterator_p(m,report_to_l()); - p->daddy_iter_l_ = (Music_iterator*)this; - p->construct_children(); - return p; -} - -Music_iterator::Music_iterator() -{ - daddy_iter_l_ =0; - first_b_ = true; -} - -/* ************** */ - -Chord_iterator::Chord_iterator(Chord const *chord_C) +Music_iterator::set_translator (Translator_group *trans) { - chord_C_ = chord_C; + handle_.set_translator (trans); } void -Chord_iterator::construct_children() +Music_iterator::construct_children () { - int j = 0; - for(PCursor i(chord_C_->music_p_list_.top()); //, int j = 0; - i.ok(); j++, i++) { - Music_iterator * mi = get_iterator_p( i.ptr()); - set_translator(mi->report_to_l()->ancestor_l( chord_C_->multi_level_i_ )); - if ( mi->ok() ) - children_p_list_.bottom().add( mi ); - else - delete mi; - } } -void -Chord_iterator::do_print() const -{ -#ifndef NPRINT - for (PCursor i(children_p_list_.top()); i.ok(); i++) { - i->print(); - } -#endif -} - -void -Chord_iterator::process_and_next(Moment until) -{ - for (PCursor i(children_p_list_.top()); i.ok(); ) { - if (i->next_moment() == until) { - i->process_and_next(until); - } - if (!i->ok()) - delete i.remove_p(); - else - i++; - } - Music_iterator::process_and_next(until); - -// assert(!ok() || next_moment() > until); -} - -IMPLEMENT_STATIC_NAME(Chord_iterator); -IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator); Moment -Chord_iterator::next_moment()const +Music_iterator::pending_moment () const { - Moment next_ = INFTY; - for (PCursor i(children_p_list_.top()); i.ok(); i++) - next_ = next_ next_moment() ; - return next_; + return 0; } - -bool -Chord_iterator::ok()const -{ - return children_p_list_.size(); -} - -/* ************** */ - void -Voice_iterator::do_print()const -{ - if (iter_p_) - iter_p_->print(); -} - -Voice_iterator::Voice_iterator(Voice const*v) - : PCursor ( v->music_p_list_) +Music_iterator::skip (Moment) { - here_mom_ = v->offset_mom_; - voice_C_ = v; - iter_p_ =0; + assert (0); } void -Voice_iterator::construct_children() +Music_iterator::process (Moment) { - if (ok()) { - iter_p_ = Music_iterator::get_iterator_p( ptr() ); - if (iter_p_->report_to_l()->depth_i() > report_to_l()->depth_i()) - set_translator(iter_p_->report_to_l()); - } } -void -Voice_iterator::next_element() +bool +Music_iterator::ok () const { - delete iter_p_ ; - iter_p_ =0; - here_mom_ += ptr()->time_int().length(); - PCursor::next(); - construct_children(); + return false; } -Voice_iterator::~Voice_iterator() +SCM +Music_iterator::get_music (Moment)const { - delete iter_p_; + return SCM_EOL; } -IMPLEMENT_STATIC_NAME(Voice_iterator); -IMPLEMENT_IS_TYPE_B1(Voice_iterator,Music_iterator); - -void -Voice_iterator::process_and_next(Moment until) -{ - while (ok()) { - Moment local_until = until - here_mom_; - while ( iter_p_ && iter_p_->ok() ) { - Moment here = iter_p_->next_moment(); - if (here != local_until) - return; - iter_p_->process_and_next(local_until); - } - if (!iter_p_) - iter_p_ = Music_iterator::get_iterator_p( ptr() ); - else if (!iter_p_->ok() ) - next_element(); +Music_iterator* +Music_iterator::static_get_iterator_p (Music *m) +{ + Music_iterator * p =0; + + /* It would be nice to do this decentrally, but the order of this is + significant. */ + if (dynamic_cast (m)) + p = new Request_chord_iterator; + else if (dynamic_cast (m)) + p = new Lyric_combine_music_iterator; + else if (dynamic_cast (m)) + p = new Simultaneous_music_iterator; + else if (dynamic_cast (m)) + p = new Sequential_music_iterator; + else if (dynamic_cast (m)) + p = new Property_iterator; + else if (dynamic_cast (m)) + p = new Change_iterator; + else if (dynamic_cast (m)) + p = new Push_property_iterator; + else if (dynamic_cast (m)) + p = new Pop_property_iterator; + else if (dynamic_cast (m)) + p = new Time_scaled_music_iterator; + else if (dynamic_cast (m)) + p = new Grace_iterator; + else if (dynamic_cast (m)) + p = new Auto_change_iterator; + else if (dynamic_cast (m)) + p = new Part_combine_music_iterator; + else if (dynamic_cast (m)) + p = new Music_wrapper_iterator; + else if (Repeated_music * n = dynamic_cast (m)) + { + if (n->type_ == "tremolo") + p = new Chord_tremolo_iterator; + else if (n->fold_b_) + p = new Folded_repeat_iterator; + else + p = new Unfolded_repeat_iterator; + } + else + { + p = new Simple_music_iterator ; } - Music_iterator::process_and_next(until); - assert(!ok() || next_moment() > until); -} - -Moment -Voice_iterator::next_moment()const -{ - return iter_p_->next_moment() + here_mom_; -} -bool -Voice_iterator::ok()const -{ - return PCursor::ok(); + p->music_l_ = m; + return p; } -/* ***************** */ - void -Request_iterator::do_print()const +Music_iterator::init_translator (Music *m, Translator_group *report_l) { - mtor << req_l_->name() ; -} + music_l_ = m; + if (Context_specced_music * csm =dynamic_cast (m)) + { + Translator_group* a =report_l-> + find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_); -Request_iterator::Request_iterator(Request const*c) -{ - req_l_ = (Request*)c; - last_b_ = false; -} - -void -Request_iterator::process_and_next(Moment m) -{ - if ( first_b_ ) { - bool gotcha = daddy_iter_l_->report_to_l()->try_request(req_l_); - if (!gotcha) - req_l_->warning("Junking request: " + String(req_l_->name())); - first_b_ = false; + set_translator (a); + } - if ( m >= req_l_->duration() ) - last_b_ = true; + if (! report_to_l ()) + set_translator (report_l); } -Moment -Request_iterator::next_moment()const -{ - - Moment m(0); - if (!first_b_) - m = req_l_->duration(); - return m; -} -bool -Request_iterator::ok()const -{ - return (req_l_->duration() && !last_b_) || first_b_; // ugh -} - -IMPLEMENT_STATIC_NAME(Request_iterator); -IMPLEMENT_IS_TYPE_B1(Request_iterator, Music_iterator); - -/* ****************** */ - -Change_iterator::Change_iterator(Change_reg * ch) +Music_iterator* +Music_iterator::get_iterator_p (Music *m) const { - change_l_ = ch; + Music_iterator*p = static_get_iterator_p (m); + p->init_translator (m, report_to_l ()); + + p->construct_children (); + return p; } -IMPLEMENT_STATIC_NAME(Change_iterator); -IMPLEMENT_IS_TYPE_B1(Change_iterator,Music_iterator); - -/* - TODO: pop/pushgroup - */ -void -Change_iterator::process_and_next(Moment mom) +Music_iterator* +Music_iterator::try_music (Music *m) const { -#if 0 - if ( id[0] == '-') { - - - Engraver_group_engraver *group_l = - report_to_l()->find_get_translator_l(change_l_->type_str_, - change_l_->id_str_); - - report_to_l()->daddy_grav_l_->remove_engraver_p(report_to_l()); - group_l->add(report_to_l()); -#endif - Music_iterator::process_and_next(mom); + bool b = report_to_l ()->try_music ( (Music*)m); // ugh + Music_iterator * it = b ? (Music_iterator*) this : 0; // ugh + if (!it) + it = try_music_in_children (m); + return it; } - - -/* ******************** */ - -IMPLEMENT_STATIC_NAME(Voice_element_iterator); -IMPLEMENT_IS_TYPE_B1(Voice_element_iterator,Chord_iterator); - -void -Voice_element_iterator::construct_children() +Music_iterator* +Music_iterator::try_music_in_children (Music *) const { - get_req_translator_l(); - Chord_iterator::construct_children(); + return 0; } -Voice_element_iterator::Voice_element_iterator(Voice_element*el_l) - : Chord_iterator(el_l) -{ - -}