X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=41459bd56aef44ba783187d5e57ab40393ee9595;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=83c2f45fafd42715d4b6c9b7304bb4f4e18b37e5;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 83c2f45faf..41459bd56a 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -1,112 +1,128 @@ -/* - auto-change-iterator.cc -- implement Auto_change_iterator +/* + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ + Copyright (C) 1999--2015 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 "music.hh" #include "context.hh" -#include "event.hh" -#include "music-wrapper-iterator.hh" #include "direction.hh" +#include "international.hh" +#include "music.hh" +#include "music-wrapper-iterator.hh" class Auto_change_iterator : public Music_wrapper_iterator { public: - DECLARE_SCHEME_CALLBACK(constructor, ()); - + 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; + virtual void process (Moment); + vector pending_pitch (Moment) const; private: SCM split_list_; Direction where_dir_; - void change_to (Music_iterator* , SCM, String); -}; - + void change_to (Music_iterator *, SCM, const string&); + Moment start_moment_; + Context_handle up_; + Context_handle down_; +}; void Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym, - String to_id) + const string &to_id) { - Context * current = it->get_outlet (); - Context * 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 = * - */ + + If \translator Staff = bass, then look for Staff = * + */ while (current && !current->is_alias (to_type_sym)) { last = current; - current = current->daddy_context_; + 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"); + string msg; + msg += _f ("cannot change, already in translator: %s", to_id); } - - if (current) - if (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 - errors hard to catch - - */ - } - else - ; + if (current) + { + if (last) + { + Context *dest + = it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL); + + send_stream_event (last, "ChangeParent", get_music ()->origin (), + ly_symbol2scm ("context"), dest->self_scm ()); + } + else + { + /* + We could change the current translator's id, but that would make + errors hard to catch + + */ + ; + } + } } void Auto_change_iterator::process (Moment m) { Music_wrapper_iterator::process (m); - + Moment now = get_outlet ()->now_mom (); Moment *splitm = 0; - - for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_)) + if (start_moment_.main_part_.is_infinity () && start_moment_ < 0) + start_moment_ = now; + + for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_)) { - splitm = unsmob_moment (gh_caar (split_list_)); - if (*splitm > now) - break ; + splitm = Moment::unsmob (scm_caar (split_list_)); + if ((*splitm + start_moment_) > now) + break; + + SCM tag = scm_cdar (split_list_); + Direction d = to_dir (tag); - SCM tag = gh_cdar (split_list_); - Direction d = to_dir (tag); - if (d && d != where_dir_) - { - where_dir_ = d; - String to_id = (d >= 0) ? "up" : "down"; - change_to (child_iter_, - ly_symbol2scm ("Staff"), - to_id); - } + { + where_dir_ = d; + string to_id = (d >= 0) ? "up" : "down"; + change_to (child_iter_, + ly_symbol2scm ("Staff"), + to_id); + } } } @@ -119,8 +135,31 @@ Auto_change_iterator::Auto_change_iterator () void Auto_change_iterator::construct_children () { + split_list_ = get_music ()->get_property ("split-list"); + start_moment_ = get_outlet ()->now_mom (); + + SCM props = get_outlet ()->get_property ("trebleStaffProperties"); + Context *up = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"), + "up", props); + + 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 (); - split_list_ = get_music ()->get_property ("split-list"); +} + +void +Auto_change_iterator::do_quit () +{ + up_.set_context (0); + down_.set_context (0); } IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);