X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=4a2c2ec95ec5468b9da751d264899ac854f3fe7c;hb=acec5c037f53a163237c31486b84971aa33deaab;hp=23143201653c39b790a3d4e3394dd0aca4741e75;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 2314320165..4a2c2ec95e 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -1,388 +1,225 @@ /* - 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 */ -#include "music-list.hh" -#include "music-iterator.hh" -#include "translator.hh" -#include "request.hh" +/* + UGH. too many includes. + */ #include "debug.hh" +#include "music-iterator.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 "change-iterator.hh" +#include "music-wrapper.hh" +#include "music-wrapper-iterator.hh" +#include "time-scaled-music-iterator.hh" +#include "repeated-music.hh" +#include "folded-repeat-iterator.hh" +#include "unfolded-repeat-iterator.hh" +#include "grace-iterator.hh" +#include "lyric-combine-music-iterator.hh" +#include "auto-change-iterator.hh" +#include "part-combine-music-iterator.hh" +#include "simple-music-iterator.hh" +#include "output-property-music-iterator.hh" +#include "chord-tremolo-iterator.hh" +#include "context-specced-music.hh" - -IMPLEMENT_IS_TYPE_B(Music_iterator); - -Chord_iterator::~Chord_iterator() +Music_iterator::Music_iterator () { + // clone_i_ = 0; } -void -Music_iterator::do_print()const +Music_iterator::Music_iterator (Music_iterator const& src) { - + // clone_i_ = src.clone_i_ + 1; + handle_ = *src.handle_.clone (); + music_l_ = src.music_l_; + music_length_ = src.music_length_; } -void -Music_iterator::print() const +Music_iterator::~Music_iterator () { -#ifndef NPRINT - if ( !check_debug) - return ; - DOUT << name() << "{"; - DOUT << "report to " << - report_to_l() << " (" << report_to_l ()->name () << ")\n"; - DOUT << "next at " << next_moment() << " "; - do_print(); - DOUT << "}\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(); -} -void -Music_iterator::push_translator (Translator*t) -{ - report_to_l_arr_.push (t); - t->iterator_count_ ++; -} -void -Music_iterator::pop_translator() +Translator_group* +Music_iterator::report_to_l () const { - report_to_l()->iterator_count_ --; - assert (report_to_l()->iterator_count_ >=0); - report_to_l_arr_.pop(); -} - -Translator* -Music_iterator::report_to_l()const -{ - if (! report_to_l_arr_.size()) - return 0; - return report_to_l_arr_.top(); + return handle_.report_to_l (); } void -Music_iterator::set_translator (Translator*trans) -{ - if (report_to_l()==trans) - return; - if ( report_to_l()) - pop_translator(); - if (trans) - push_translator (trans); -} - -void -Music_iterator::construct_children() +Music_iterator::set_translator (Translator_group *trans) { - + handle_.set_translator (trans); } -Music_iterator::~Music_iterator() +void +Music_iterator::construct_children () { - set_translator (0); } Moment -Music_iterator::next_moment()const +Music_iterator::pending_moment () const { - return 0; + return 0; } + void -Music_iterator::process_and_next (Moment) +Music_iterator::process (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::ok () const { - Music_iterator * p =0; - if (m->is_type_b (Request_chord::static_name())) - p = new Request_chord_iterator ((Request_chord*) 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); - - if (m -> type_str_ != "") { - Translator * a =report_l-> - find_get_translator_l (m-> type_str_, m->id_str_); - p->set_translator (a); - } - - - if (! p->report_to_l()) - p ->set_translator (report_l); - - return p; + return false; } -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) -{ - chord_C_ = chord_C; -} - -void -Chord_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()); - if ( mi->ok()) { - set_translator (mi->report_to_l()->ancestor_l ( - chord_C_->multi_level_i_) ); - children_p_list_.bottom().add (mi); - } else - delete mi; - } -} void -Chord_iterator::do_print() const +Music_iterator::skip (Moment ) { -#ifndef NPRINT - for (PCursor i (children_p_list_.top()); i.ok (); i++) { - i->print(); - } -#endif } -void -Chord_iterator::process_and_next (Moment until) +SCM +Music_iterator::get_music (Moment)const { - 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); + return SCM_EOL; } -IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator); -Moment -Chord_iterator::next_moment()const -{ - Moment next_ = infinity_mom; - for (PCursor i (children_p_list_.top()); i.ok (); i++) - next_ = next_ next_moment() ; - return next_; -} +/* We could do this decentrally: + - Declare a new smob-type, which stores a function ptr in its CDR + (and not a struct ptr). The function ptr has signature + Music_iterator* (*)() -bool -Chord_iterator::ok()const -{ - return children_p_list_.size(); -} + - initialize all music with a set_mus_property("iterator-ctor"), -/* ************** */ + - do + + func_ptr p = (func_ptr) gh_cdr (get_mus_property ("iterator-ctor")); + iter_p = (*p)(); -void -Voice_iterator::do_print()const -{ - if (iter_p_) - iter_p_->print(); -} - -Voice_iterator::Voice_iterator (Voice const*v) - : PCursor ( v->music_p_list_) -{ - here_mom_ = v->offset_mom_; - voice_C_ = v; - iter_p_ =0; -} +*/ -void -Voice_iterator::construct_children() -{ - while (PCursor::ok()) { - start_next_element(); - if ( !iter_p_->ok()) { - leave_element(); - } else { - set_voice_translator(); - break; - } +Music_iterator* +Music_iterator::static_get_iterator_p (Music *m) +{ + Music_iterator * p =0; + + SCM type = m->get_mus_property ("type") ; + + if (type == ly_symbol2scm ("property-set")) + p = new Property_iterator; + else if (type == ly_symbol2scm ("property-push")) + p = new Push_property_iterator; + else if (type == ly_symbol2scm ("property-pop")) + p = new Pop_property_iterator; + else if (type == ly_symbol2scm ("output-property")) + p = new Output_property_music_iterator; + else if (type == ly_symbol2scm ("request-chord")) + p = new Request_chord_iterator; + else if (type == ly_symbol2scm ("lyric-combine-music")) + p = new Lyric_combine_music_iterator; + else if (type == ly_symbol2scm ("simultaneous-music")) + p = new Simultaneous_music_iterator; + else if (type == ly_symbol2scm ("sequential-music")) + p = new Sequential_music_iterator; + else if (type == ly_symbol2scm ("change-translator")) + p = new Change_iterator; + else if (type == ly_symbol2scm ("time-scaled-music")) + p = new Time_scaled_music_iterator; + else if (type == ly_symbol2scm ("grace-music")) + p = new Grace_iterator; + else if (type == ly_symbol2scm ("auto-change-music")) + p = new Auto_change_iterator; + else if (type == ly_symbol2scm ("part-combined-music")) + 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; } -} - -void -Voice_iterator::leave_element() -{ - delete iter_p_; - iter_p_ =0; - MInterval elt_time = ptr()->time_int (); - if (!elt_time.empty_b()) - here_mom_ += elt_time.length(); - PCursor::next(); -} - -void -Voice_iterator::start_next_element() -{ - assert (!iter_p_); - iter_p_ = get_iterator_p (ptr()); -} - -void -Voice_iterator::set_voice_translator() -{ - if (iter_p_->report_to_l()->depth_i () > report_to_l ()->depth_i ()) - set_translator (iter_p_->report_to_l()); -} - -Voice_iterator::~Voice_iterator() -{ - assert (! iter_p_); -} - - -IMPLEMENT_IS_TYPE_B1(Voice_iterator,Music_iterator); - -void -Voice_iterator::process_and_next (Moment until) -{ - while (1) { - Moment local_until = until - here_mom_; - while ( iter_p_->ok()) { - Moment here = iter_p_->next_moment(); - if (here != local_until) - goto loopexit; - - iter_p_->process_and_next (local_until); - } - - if (!iter_p_->ok()) { - leave_element(); - if ( PCursor::ok()) { - start_next_element(); - set_voice_translator(); - } else { - goto loopexit; - } - } + else + { + p = new Simple_music_iterator ; } -loopexit: - - Music_iterator::process_and_next (until); + p->music_l_ = m; + p->music_length_ = m->length_mom (); + + return p; } -Moment -Voice_iterator::next_moment()const -{ - return iter_p_->next_moment() + here_mom_; -} -bool -Voice_iterator::ok()const +Moment +Music_iterator::music_length_mom() const { - return iter_p_; + return music_length_; } - -IMPLEMENT_IS_TYPE_B1(Request_chord_iterator,Music_iterator); - void -Request_chord_iterator::construct_children() +Music_iterator::init_translator (Music *m, Translator_group *report_l) { - get_req_translator_l(); -} + 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_chord_iterator::Request_chord_iterator (Request_chord*el_l) -{ - elt_l_ = el_l; - elt_duration_ = el_l->time_int().length (); - last_b_ = false; + set_translator (a); + + } + + if (! report_to_l ()) + set_translator (report_l); } -bool -Request_chord_iterator::ok()const +Music_iterator* +Music_iterator::get_iterator_p (Music *m) const { - return (elt_duration_ && !last_b_) || first_b_; + Music_iterator*p = static_get_iterator_p (m); + p->init_translator (m, report_to_l ()); + + p->construct_children (); + return p; } - - -Moment -Request_chord_iterator::next_moment()const +Music_iterator* +Music_iterator::try_music (Music *m) const { - Moment m (0); - if (!first_b_) - m = elt_duration_; - return m; + 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; } -void -Request_chord_iterator::do_print() const +Music_iterator* +Music_iterator::try_music_in_children (Music *) const { -#ifndef NPRINT - DOUT << "duration: " << elt_duration_; -#endif + return 0; } -void -Request_chord_iterator::process_and_next (Moment mom) -{ - if ( first_b_) { - for (PCursor i (elt_l_->music_p_list_); i.ok(); i++) { - assert (i->is_type_b (Request::static_name())); - Request * req_l = (Request*)i.ptr(); - bool gotcha = report_to_l()->try_request (req_l); - if (!gotcha) - req_l->warning ("Junking request: " + String (req_l->name())); - - } - first_b_ = false; - } - if ( mom >= elt_duration_) - last_b_ = true; -}