X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=7f342a182f2bebb4ef1f7edb7a73bb9fbd4cbe10;hb=428909a52eedefe201a8cd89876336f76e29fa28;hp=b7afb1dab41f59e20a07c75a474f64009288f9b1;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git diff --git a/lily/global-context.cc b/lily/global-context.cc index b7afb1dab4..7f342a182f 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -30,7 +30,7 @@ Global_context::Global_context (Output_def *o, Moment final, Object_key *key) Context_def *globaldef = unsmob_context_def (definition_); if (!globaldef) { - programming_error ("No `Global' context found."); + programming_error ("no `Global' context found"); } else globaldef->apply_default_property_operations (this); @@ -50,7 +50,7 @@ Global_context::add_moment_to_process (Moment m) return; if (m < now_mom_) - programming_error ("Trying to freeze in time."); + programming_error ("trying to freeze in time"); for (int i = 0; i < extra_mom_pq_.size (); i++) if (extra_mom_pq_[i] == m) @@ -97,7 +97,7 @@ Global_context::get_score_context () const : 0; } -Music_output * +SCM Global_context::get_output () { return get_score_context ()->get_output (); @@ -155,7 +155,8 @@ Global_context::run_iterator_on_me (Music_iterator *iter) if (!get_score_context ()) { SCM sym = ly_symbol2scm ("Score"); - Context_def *t = unsmob_context_def (find_context_def (get_output_def (), sym)); + Context_def *t = unsmob_context_def (find_context_def (get_output_def (), + sym)); if (!t) error (_f ("can't find `%s' context", "Score")); @@ -177,6 +178,7 @@ Global_context::apply_finalizations () SCM lst = get_property ("finalizations"); set_property ("finalizations", SCM_EOL); for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) + /* TODO: make safe. */ scm_primitive_eval (scm_car (s)); }