X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=31d75f0f1c4262b8c650589737a5088378c20a5a;hb=b37e3f652677ae0298423db9fa0e552e5fce0c92;hp=5db9f69033f74919490a35e05e79f4aa5ef8096a;hpb=4975901229a1b074f6c93d812e15d653aa8e2952;p=lilypond.git diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 5db9f69033..31d75f0f1c 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -1,139 +1,148 @@ -/* +/* auto-change-iterator.cc -- implement Auto_change_iterator source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ -#include "auto-change-music.hh" -#include "auto-change-iterator.hh" -#include "translator-group.hh" -#include "musical-request.hh" + (c) 1999--2005 Han-Wen Nienhuys +*/ +#include "context.hh" +#include "direction.hh" +#include "international.hh" +#include "music-wrapper-iterator.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, std::string); + Moment start_moment_; + + Context_handle up_; + Context_handle down_; +}; void -Auto_change_iterator::change_to (Music_iterator *it, String to_type, - String to_id) +Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym, + std::string to_id) { - Translator_group * current = it->report_to_l (); - Translator_group * last = 0; + Context *current = it->get_outlet (); + Context *last = 0; /* Cut & Paste from Change_iterator (ugh). - TODO: abstract this function - */ - + TODO: abstract this function + */ + /* find the type of translator that we're changing. - - If \translator Staff = bass, then look for Staff = * - */ - while (current && current->type_str_ != to_type) + + If \translator Staff = bass, then look for Staff = * + */ + while (current && !current->is_alias (to_type_sym)) { last = current; - current = current->daddy_trans_l_; + current = current->get_parent_context (); } - if (current && current->id_str_ == to_id) + if (current && current->id_string () == to_id) { - String msg; - msg += _ ("Can't switch translators, I'm there already"); + std::string msg; + msg += _f ("can't change, already in translator: %s", to_id); } - - if (current) + + if (current) if (last) { - Translator_group * dest = - it->report_to_l ()->find_create_translator_l (to_type, to_id); - current->remove_translator_p (last); - dest->add_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 { /* - We could change the current translator's id, but that would make + We could change the current translator's id, but that would make errors hard to catch - - last->translator_id_str_ = change_l ()->change_to_id_str_; + */ - // error (_ ("I'm one myself")); } - else - ; // error (_ ("none of these in my family")); - + else; } -/* - Look ahead to find first pitches to determine staff position. - WARNING: this means that - - \autochange Staff \notes { .... \context Staff = otherstaff { .. } .. } +void +Auto_change_iterator::process (Moment m) +{ + Music_wrapper_iterator::process (m); - will confuse the autochanger, since it will not notice that the - music for OTHERSTAFF is not his. + Moment now = get_outlet ()->now_mom (); + Moment *splitm = 0; - PRECONDITION: this->ok() holds. -*/ -Array -Auto_change_iterator::pending_pitch (Moment m) const -{ - Music_iterator * iter = child_iter_p_ ->clone (); - Array ps; - while (1) + for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_)) { - SCM muses = iter->get_music (m); - for (SCM s = muses; gh_pair_p (s); s=gh_cdr (s)) - if (Note_req* nr = dynamic_cast (unsmob_music (gh_car (s)))) - { - ps.push (*unsmob_pitch (nr->get_mus_property ("pitch"))); - } - - if (ps.size ()) + splitm = unsmob_moment (scm_caar (split_list_)); + if ((*splitm + start_moment_) > now) break; - iter->skip (m); - if (!iter->ok()) - break; - - m = iter->pending_moment (); + SCM tag = scm_cdar (split_list_); + Direction d = to_dir (tag); + + if (d && d != where_dir_) + { + where_dir_ = d; + std::string to_id = (d >= 0) ? "up" : "down"; + change_to (child_iter_, + ly_symbol2scm ("Staff"), + to_id); + } } +} - delete iter; - 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 ())); - if (s != where_dir_) - { - where_dir_ = s; - String to_id = (s >= 0) ? "up" : "down"; - Auto_change_music const * auto_mus = dynamic_cast (music_l_); + SCM props = get_outlet ()->get_property ("trebleStaffProperties"); + Context *up = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"), + "up", props); - String wh = ly_scm2string (auto_mus->get_mus_property ("what")); - change_to (child_iter_p_, wh, to_id); - } - } + props = get_outlet ()->get_property ("bassStaffProperties"); + Context *down = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"), + "down", props); + + up_.set_context (up); + down_.set_context (down); + + Context *voice = up->find_create_context (ly_symbol2scm ("Voice"), + "", SCM_EOL); + set_context (voice); + Music_wrapper_iterator::construct_children (); } -Auto_change_iterator::Auto_change_iterator( ) +void +Auto_change_iterator::do_quit () { - where_dir_ = CENTER; + up_.set_context (0); + down_.set_context (0); } -IMPLEMENT_CTOR_CALLBACK(Auto_change_iterator); +IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);