X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=49bfff6e19248326c4347662fd6249559dea617d;hb=6d209bd29394fe068438f602d50b8257b6f766ef;hp=94f354763071d3d8700d5c432ef55f1ba2d9c18d;hpb=862601226f319d2395794fe1175e7f17485b8e19;p=lilypond.git diff --git a/lily/global-context.cc b/lily/global-context.cc index 94f3547630..49bfff6e19 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -1,9 +1,20 @@ /* - global-context.cc -- implement Global_context + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Han-Wen Nienhuys - (c) 1997--2006 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 "global-context.hh" @@ -14,18 +25,13 @@ using namespace std; #include "context-def.hh" #include "dispatcher.hh" #include "international.hh" -#include "lilypond-key.hh" #include "music-iterator.hh" #include "music.hh" #include "output-def.hh" -#include "score-context.hh" -#include "stream-event.hh" #include "warn.hh" -Global_context::Global_context (Output_def *o, Object_key *key) - : Context (new Lilypond_context_key (key, - Moment (0), - "Global", "", 0)) +Global_context::Global_context (Output_def *o) + : Context () { output_def_ = o; definition_ = find_context_def (o, ly_symbol2scm ("Global")); @@ -35,9 +41,9 @@ Global_context::Global_context (Output_def *o, Object_key *key) /* We only need the most basic stuff to bootstrap the context tree */ event_source ()->add_listener (GET_LISTENER (create_context_from_event), - ly_symbol2scm ("CreateContext")); + ly_symbol2scm ("CreateContext")); event_source ()->add_listener (GET_LISTENER (prepare), - ly_symbol2scm ("Prepare")); + ly_symbol2scm ("Prepare")); events_below ()->register_as_listener (event_source_); Context_def *globaldef = unsmob_context_def (definition_); @@ -45,7 +51,9 @@ Global_context::Global_context (Output_def *o, Object_key *key) programming_error ("no `Global' context found"); else globaldef->apply_default_property_operations (this); - accepts_list_ = scm_list_1 (ly_symbol2scm ("Score")); + + default_child_ = ly_symbol2scm ("Score"); + accepts_list_ = scm_list_1 (default_child_); } Output_def * @@ -94,12 +102,6 @@ Global_context::prepare (SCM sev) else prev_mom_ = now_mom_; now_mom_ = *mom; - - clear_key_disambiguations (); - - // should do nothing now - if (get_score_context ()) - get_score_context ()->prepare (now_mom_); } Moment @@ -108,31 +110,22 @@ Global_context::now_mom () const return now_mom_; } -Score_context * +Context * Global_context::get_score_context () const { return (scm_is_pair (context_list_)) - ? dynamic_cast (unsmob_context (scm_car (context_list_))) - : 0; + ? unsmob_context (scm_car (context_list_)) + : 0; } SCM Global_context::get_output () { - return get_score_context ()->get_output (); -} - -void -Global_context::one_time_step () -{ - get_score_context ()->one_time_step (); -} - -void -Global_context::finish () -{ - if (get_score_context ()) - get_score_context ()->finish (); + Context *c = get_score_context (); + if (c) + return c->get_property ("output"); + else + return SCM_EOL; } void @@ -148,43 +141,33 @@ Global_context::run_iterator_on_me (Music_iterator *iter) Moment w; w.set_infinite (1); if (iter->ok ()) - w = iter->pending_moment (); + w = iter->pending_moment (); w = sneaky_insert_extra_moment (w); if (w.main_part_.is_infinity () || w > final_mom) - break; + break; + + if (w == prev_mom_) + { + programming_error ("Moment is not increasing." + " Aborting interpretation."); + break; + } if (first) - { - /* - Need this to get grace notes at start of a piece correct. - */ - first = false; - set_property ("measurePosition", w.smobbed_copy ()); - } + { + /* + Need this to get grace notes at start of a piece correct. + */ + first = false; + set_property ("measurePosition", w.smobbed_copy ()); + } send_stream_event (this, "Prepare", 0, - ly_symbol2scm ("moment"), w.smobbed_copy ()); + ly_symbol2scm ("moment"), w.smobbed_copy ()); if (iter->ok ()) - iter->process (w); - - if (!get_score_context ()) - { - error ("ES TODO: no score context, this shouldn't happen"); - SCM sym = ly_symbol2scm ("Score"); - Context_def *t = unsmob_context_def (find_context_def (get_output_def (), - sym)); - if (!t) - error (_f ("can't find `%s' context", "Score")); - - Object_key const *key = get_context_key ("Score", ""); - Context *c = t->instantiate (SCM_EOL, key); - add_context (c); - - Score_context *sc = dynamic_cast (c); - sc->prepare (w); - } + iter->process (w); send_stream_event (this, "OneTimeStep", 0, 0); apply_finalizations (); @@ -219,10 +202,16 @@ Global_context::previous_moment () const } Context * -Global_context::get_default_interpreter () +Global_context::get_default_interpreter (string /* context_id */) { if (get_score_context ()) return get_score_context ()->get_default_interpreter (); else return Context::get_default_interpreter (); } + +Global_context * +unsmob_global_context (SCM x) +{ + return dynamic_cast (unsmob_context (x)); +}