X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=41459bd56aef44ba783187d5e57ab40393ee9595;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9e3bb205db0e05f0a29842a0f285e99d7a289b51;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 9e3bb205db..41459bd56a 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -1,137 +1,165 @@ -/* - 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--2001 Han-Wen Nienhuys - - */ + Copyright (C) 1999--2015 Han-Wen Nienhuys -#include "music.hh" -#include "auto-change-iterator.hh" -#include "translator-group.hh" -#include "musical-request.hh" + 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 "context.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, ()); + + Auto_change_iterator (); + +protected: + virtual void do_quit (); + virtual void construct_children (); + virtual void process (Moment); + vector pending_pitch (Moment) const; +private: + SCM split_list_; + Direction where_dir_; + 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, String to_type, - String to_id) +Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym, + const 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"); + string msg; + msg += _f ("cannot change, already in translator: %s", to_id); } - - 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); - } - else - { - /* - 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")); + 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 + + */ + ; + } + } } -/* - 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; + if (start_moment_.main_part_.is_infinity () && start_moment_ < 0) + start_moment_ = now; - 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 ()) - break; - - iter->skip (m); - if (!iter->ok()) - break; - - m = iter->pending_moment (); + splitm = Moment::unsmob (scm_caar (split_list_)); + if ((*splitm + start_moment_) > now) + break; + + SCM tag = scm_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); + } } +} - 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"; - String wh = ly_scm2string (music_l_->get_mus_property ("what")); - change_to (child_iter_p_, wh, to_id); - } - } + 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 (); } -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);