X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context-scheme.cc;h=219dc267c1d3762f0a0c19f314f415833001f976;hb=b64f901106efd0b554b531bda41aab57c5b8e57a;hp=6f83fc2fc4fa86457ad6446031416256fa07ad91;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc index 6f83fc2fc4..219dc267c1 100644 --- a/lily/global-context-scheme.cc +++ b/lily/global-context-scheme.cc @@ -3,73 +3,103 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys + (c) 2005--2006 Han-Wen Nienhuys */ - -#include "warn.hh" -#include "music-output.hh" -#include "output-def.hh" -#include "music-iterator.hh" -#include "music.hh" #include "cpu-timer.hh" #include "global-context.hh" -#include "object-key.hh" +#include "international.hh" #include "main.hh" +#include "music-iterator.hh" +#include "music-output.hh" +#include "music.hh" +#include "object-key.hh" +#include "output-def.hh" +#include "translator-group.hh" +#include "warn.hh" LY_DEFINE (ly_format_output, "ly:format-output", - 2, 0, 0, (SCM context, SCM outname), + 1, 0, 0, (SCM context), "Given a Global context in its final state, " - "process it and return the (rendered) result.") + "process it and return the @code{Music_output} object in its final state.") { Global_context *g = dynamic_cast (unsmob_context (context)); SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output file name"); - Music_output *output = g->get_output (); + SCM output = g->get_output (); progress_indication ("\n"); - /* ugh, midi still wants outname */ - return output->process (ly_scm2string (outname)); + + if (Music_output *od = unsmob_music_output (output)) + od->process (); + + return output; } -LY_DEFINE (ly_run_translator, "ly:run-translator", - 2, 1, 0, (SCM mus, SCM output_def, SCM key), - "Process @var{mus} according to @var{output_def}. \n" - "An interpretation context is set up,\n" - "and @var{mus} is interpreted with it. \n" - "The context is returned in its final state.\n" +LY_DEFINE (ly_make_global_translator, "ly:make-global-translator", + 1, 0, 0, (SCM global), + "Create a translator group and connect it to the global context\n" + "@var{global}. The translator group is returned.") +{ + Global_context *g = dynamic_cast (unsmob_context (global)); + SCM_ASSERT_TYPE (g, global, SCM_ARG1, __FUNCTION__, "Global context"); + + Translator_group *tg = new Translator_group (); + tg->connect_to_context (g); + g->implementation_ = tg; + + return tg->unprotect (); +} + +LY_DEFINE (ly_make_global_context, "ly:make-global-context", + 1, 1, 0, (SCM output_def, SCM key), + "Set up a global interpretation context, using the output\n" + "block @var{output_def}.\n" + "The context is returned.\n" "\n\nOptionally, this routine takes an Object-key to\n" "to uniquely identify the Score block containing it.\n") { Output_def *odef = unsmob_output_def (output_def); - Music *music = unsmob_music (mus); - if (!music - || !music->get_length ().to_bool ()) + SCM_ASSERT_TYPE (odef, output_def, SCM_ARG1, __FUNCTION__, + "Output definition"); + + Global_context *glob = new Global_context (odef, unsmob_key (key)); + + if (!glob) { - warning (_ ("no music found in score")); + programming_error ("no toplevel translator"); return SCM_BOOL_F; } - SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); - SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, - "Output definition"); + return glob->unprotect (); +} - Cpu_timer timer; +LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression", + 2, 0, 0, (SCM mus, SCM ctx), + "Interpret the music expression @var{mus} in the\n" + "global context @var{ctx}. The context is returned in its\n" + "final state.\n") +{ + Music *music = unsmob_music (mus); + Global_context *g = dynamic_cast (unsmob_context (ctx)); + SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); + SCM_ASSERT_TYPE (g, ctx, SCM_ARG2, __FUNCTION__, "Global context"); - Global_context *trans = new Global_context (odef, music->get_length (), unsmob_key (key)); - if (!trans) + if (!music + || !music->get_length ().to_bool ()) { - programming_error ("no toplevel translator"); + warning (_ ("no music found in score")); return SCM_BOOL_F; } + Cpu_timer timer; + message (_ ("Interpreting music... ")); SCM protected_iter = Music_iterator::get_static_get_iterator (music); Music_iterator *iter = unsmob_iterator (protected_iter); - iter->init_translator (music, trans); + iter->init_context (music, g); iter->construct_children (); if (!iter->ok ()) @@ -79,13 +109,31 @@ LY_DEFINE (ly_run_translator, "ly:run-translator", return SCM_BOOL_F; } - trans->run_iterator_on_me (iter); + g->run_iterator_on_me (iter); + iter->quit (); scm_remember_upto_here_1 (protected_iter); - trans->finish (); + + send_stream_event (g, "Finish", 0, 0); if (be_verbose_global) message (_f ("elapsed time: %.2f seconds", timer.read ())); - return scm_gc_unprotect_object (trans->self_scm ()); + return ctx; +} + +LY_DEFINE (ly_run_translator, "ly:run-translator", + 2, 1, 0, (SCM mus, SCM output_def, SCM key), + "Process @var{mus} according to @var{output_def}. \n" + "An interpretation context is set up,\n" + "and @var{mus} is interpreted with it. \n" + "The context is returned in its final state.\n" + "\n\n" + "Optionally, this routine takes an Object-key to\n" + "to uniquely identify the Score block containing it.\n") +{ + SCM glob = ly_make_global_context (output_def, key); + ly_make_global_translator (glob); + ly_interpret_music_expression (mus, glob); + return glob; }