X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=e892776b61a39e6f4814eb350500ab706a45c4ee;hb=760406bea561a45cc2d578ab29b4871c927aab23;hp=9da14dadb1a8f5a04b2d742d7c25757764a9f682;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 9da14dadb1..e892776b61 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -1,93 +1,175 @@ /* - Simultaneous_music-iterator.cc -- implement Simultaneous_music_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--1999 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 "translator-group.hh" -#include "debug.hh" #include "simultaneous-music-iterator.hh" -#include "music-list.hh" -#include "killing-cons.tcc" +#include "music.hh" +#include "context.hh" +#include "warn.hh" +#include "context-def.hh" Simultaneous_music_iterator::Simultaneous_music_iterator () { + create_separate_contexts_ = false; + children_list_ = SCM_EOL; +} + +void +Simultaneous_music_iterator::derived_mark () const +{ + scm_gc_mark (children_list_); } -Simultaneous_music_iterator::~Simultaneous_music_iterator () +void +Simultaneous_music_iterator::derived_substitute (Context *f, Context *t) { - children_p_list_.junk (); + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + unsmob (scm_car (s))->substitute_outlet (f, t); } void -Simultaneous_music_iterator::construct_children() +Simultaneous_music_iterator::construct_children () { int j = 0; - Simultaneous_music const *sim = dynamic_cast (music_l_); - for (PCursor i (sim->music_p_list_p_->top()); - i.ok(); j++, i++) + + SCM i = get_music ()->get_property ("elements"); + + children_list_ = SCM_EOL; + SCM *tail = &children_list_; + for (; scm_is_pair (i); i = scm_cdr (i), j++) { - Music_iterator * mi = get_iterator_p (i.ptr()); - if (mi->ok()) - { - if (sim->translator_type_str_.empty_b ()) - set_translator (mi->report_to_l()->ancestor_l (0)); // huh? - children_p_list_.append (new Killing_cons (mi,0)); - } + Music *mus = unsmob (scm_car (i)); + + SCM scm_iter = get_static_get_iterator (mus); + Music_iterator *mi = unsmob (scm_iter); + + /* if create_separate_contexts_ is set, create a new context with the + number number as name */ + + SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); + Context *c = (j && create_separate_contexts_) + ? get_outlet ()->find_create_context (name, ::to_string (j), SCM_EOL) + : get_outlet (); + + if (!c) + c = get_outlet (); + + mi->init_context (mus, c); + mi->construct_children (); + + if (mi->ok ()) + { + *tail = scm_cons (scm_iter, *tail); + tail = SCM_CDRLOC (*tail); + } else - delete mi; + mi->quit (); } } +// If we have some iterators with definite next moment and no of them +// remain after processing, we take the iterators with indefinite next +// moment along. That makes sure that no Lyric_combine_music_iterator +// will outstay its welcome (issue 2010). void -Simultaneous_music_iterator::do_print() const +Simultaneous_music_iterator::process (Moment until) { -#ifndef NPRINT - for (Cons *p = children_p_list_.head_; p; p = p->next_) - p->car_->print(); -#endif -} - -void -Simultaneous_music_iterator::do_process_and_next (Moment until) -{ - for (Cons **pp = &children_p_list_.head_; *pp; ) + SCM *proc = &children_list_; + bool finite = !pending_moment ().main_part_.is_infinity (); + while (scm_is_pair (*proc)) { - Music_iterator * i = (*pp)->car_; - if (i->next_moment() == until) - { - i->process_and_next (until); - } - if (!i->ok()) - delete children_p_list_.remove_cons (pp); + Music_iterator *i = unsmob (scm_car (*proc)); + if (i->run_always () || i->pending_moment () == until) + i->process (until); + if (!i->ok ()) + { + i->quit (); + *proc = scm_cdr (*proc); + } else - pp = &(*pp)->next_; + { + proc = SCM_CDRLOC (*proc); + } + } + // If there were definite-ended iterators and all of them died, take + // the rest of the iterators along with them. They have + // likely lost their reference iterators. Basing this on the actual + // music contexts is not reliable since something like + // \new Voice = blah { + // << \context Voice = blah { c4 d } + // \addlyrics { oh no } + // >> e f + // } + // cannot wait for the death of context blah before ending the + // simultaneous iterator. + if (finite && pending_moment ().main_part_.is_infinity ()) + { + for (SCM p = children_list_; scm_is_pair (p); p = scm_cdr (p)) + unsmob (scm_car (p))->quit (); + children_list_ = SCM_EOL; } - Music_iterator::do_process_and_next (until); } - - - Moment -Simultaneous_music_iterator::next_moment() const +Simultaneous_music_iterator::pending_moment () const { Moment next; next.set_infinite (1); - - for (Cons *p = children_p_list_.head_; p; p = p->next_) - next = next car_->next_moment() ; + + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob (scm_car (s)); + next = min (next, it->pending_moment ()); + } + return next; } - +bool +Simultaneous_music_iterator::ok () const +{ + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob (scm_car (s)); + if (it->ok ()) + return true; + } + return false; +} bool -Simultaneous_music_iterator::ok() const +Simultaneous_music_iterator::run_always () const +{ + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob (scm_car (s)); + if (it->run_always ()) + return true; + } + return false; +} + +void +Simultaneous_music_iterator::do_quit () { - return children_p_list_.head_; + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + unsmob (scm_car (s))->quit (); } +IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);