X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fauto-change-iterator.cc;h=e4966b9dcad5251c2d4b50d647e5086a00dec336;hb=d4eeffef422b68e35e232a8688693d06db7c0e49;hp=a2ab5be5e5af8f3f2f1cd3627ce3a6a0232aa0b7;hpb=0a8f98072c53d877cbb53dd490ba4394d03fa8d2;p=lilypond.git diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index a2ab5be5e5..e4966b9dca 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -3,23 +3,47 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2002 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ #include "music.hh" -#include "auto-change-iterator.hh" -#include "translator-group.hh" -#include "musical-request.hh" +#include "context.hh" +#include "event.hh" +#include "music-wrapper-iterator.hh" +#include "direction.hh" + +class Auto_change_iterator : public Music_wrapper_iterator +{ +public: + DECLARE_SCHEME_CALLBACK (constructor, ()); + + Auto_change_iterator (); + +protected: + virtual void do_quit (); + virtual void construct_children (); + virtual void process (Moment); + Array pending_pitch (Moment)const; +private: + SCM split_list_; + Direction where_dir_; + void change_to (Music_iterator* , SCM, String); + Moment start_moment_; + + Interpretation_context_handle up_; + Interpretation_context_handle down_; + +}; void -Auto_change_iterator::change_to (Music_iterator *it, String to_type, +Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym, String to_id) { - Translator_group * current = it->report_to (); - Translator_group * last = 0; + Context * current = it->get_outlet (); + Context * last = 0; /* Cut & Paste from Change_iterator (ugh). @@ -31,13 +55,13 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type, If \translator Staff = bass, then look for Staff = * */ - while (current && current->type_string_ != to_type) + while (current && !current->is_alias (to_type_sym)) { last = current; - current = current->daddy_trans_; + current = current->get_parent_context (); } - if (current && current->id_string_ == to_id) + if (current && current->id_string () == to_id) { String msg; msg += _ ("Can't switch translators, I'm there already"); @@ -46,10 +70,10 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type, if (current) if (last) { - Translator_group * dest = - it->report_to ()->find_create_translator (to_type, to_id); - current->remove_translator (last); - dest->add_used_group_translator (last); + Context * dest = + it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL); + current->remove_context (last); + dest->add_context (last); } else { @@ -57,92 +81,76 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type, We could change the current translator's id, but that would make errors hard to catch - last->translator_id_string_ = get_change ()->change_to_id_string_; */ - // error (_ ("I'm one myself")); } else - ; // error (_ ("none of these in my family")); + ; } -/* - Look ahead to find first pitches to determine staff position. - WARNING: this means that - - \autochange Staff \notes { .... \context Staff = otherstaff { .. } .. } - - will confuse the autochanger, since it will not notice that the - music for OTHERSTAFF is not his. - - PRECONDITION: this->ok () holds. -*/ -Array -Auto_change_iterator::pending_pitch (Moment m) const +void +Auto_change_iterator::process (Moment m) { - Music_iterator * iter = child_iter_ ->clone (); - Array ps; - while (1) + Music_wrapper_iterator::process (m); + + Moment now = get_outlet ()->now_mom (); + Moment *splitm = 0; + + for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_)) { - SCM muses = iter->get_pending_events (m); - for (SCM s = muses; gh_pair_p (s); s=ly_cdr (s)) - { - Music * m = unsmob_music (ly_car (s)); - if (m && m->is_mus_type ("note-event")) - { - ps.push (*unsmob_pitch (m->get_mus_property ("pitch"))); - } - } - - if (ps.size ()) - break; + splitm = unsmob_moment (ly_caar (split_list_)); + if ((*splitm + start_moment_) > now) + break ; - iter->skip (m); - if (!iter->ok ()) - break; + SCM tag = ly_cdar (split_list_); + Direction d = to_dir (tag); - m = iter->pending_moment (); + if (d && d != where_dir_) + { + where_dir_ = d; + String to_id = (d >= 0) ? "up" : "down"; + change_to (child_iter_, + ly_symbol2scm ("Staff"), + to_id); + } } +} - scm_gc_unprotect_object (iter->self_scm()); - - return ps; +Auto_change_iterator::Auto_change_iterator () +{ + where_dir_ = CENTER; + split_list_ = SCM_EOL; } void -Auto_change_iterator::process (Moment m) +Auto_change_iterator::construct_children () { - /* - first we get the pitches, then we do the real work. - Music_wrapper_iterator::process () might process (and throw away) - pitches we need. */ - Array ps = pending_pitch (m); + split_list_ = get_music ()->get_property ("split-list"); + start_moment_ = get_outlet ()->now_mom (); - Music_wrapper_iterator::process (m); - if (ps.size ()) - { - Pitch p = ps[0]; - Direction s = Direction (sign (p.steps ())); - /* - Don't change for central C. + SCM props = get_outlet()->get_property ("trebleStaffProperties"); + Context *up = get_outlet()->find_create_context (ly_symbol2scm ("Staff"), + "up", props); - TODO: make this tunable somehow. Sometimes, you'd want to - switch for C.C. as well. + props = get_outlet()->get_property ("bassStaffProperties"); + Context *down = get_outlet()->find_create_context (ly_symbol2scm ("Staff"), + "down", props); + + up_.set_translator (up); + down_.set_translator (down); + + Context *voice = up->find_create_context (ly_symbol2scm ("Voice"), + "", SCM_EOL); + set_translator (voice); + Music_wrapper_iterator::construct_children (); - */ - if (s && s != where_dir_) - { - where_dir_ = s; - String to_id = (s >= 0) ? "up" : "down"; - String wh = ly_scm2string (get_music ()->get_mus_property ("what")); - change_to (child_iter_, wh, to_id); - } - } } -Auto_change_iterator::Auto_change_iterator () +void +Auto_change_iterator::do_quit() { - where_dir_ = CENTER; + up_.set_translator (0); + down_.set_translator (0); + } - IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);