X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context-scheme.cc;h=d672178a54c3fda156dcc294ac348839596edcda;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=8b77fab5c6e1c01758d132f55e39a26a58313faa;hpb=1cd3b2484a4095d4e3fb6422dbc695a1a1219eea;p=lilypond.git

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index 8b77fab5c6..d672178a54 100644
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -3,72 +3,99 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#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 "output-def.hh"
+#include "translator-group.hh"
+#include "warn.hh"
 
 LY_DEFINE (ly_format_output, "ly:format-output",
 	   1, 0, 0, (SCM context),
-	   "Given a Global context in its final state, "
-	   "process it and return the @code{Music_output} object in its final state.")
+	   "Given a global context in its final state,"
+	   " process it and return the @code{Music_output} object"
+	   " in its final state.")
 {
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (context));
-  SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
+  
+  LY_ASSERT_TYPE (unsmob_global_context, context, 1)
 
   SCM output = g->get_output ();
   progress_indication ("\n");
-  unsmob_music_output (output)->process ();
+
+  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"
-
-	   "\n\nOptionally, this routine takes an Object-key to\n"
-	   "to uniquely identify the Score block containing it.\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"
+          " @var{global}.  The translator group is returned.")
 {
-  Output_def *odef = unsmob_output_def (output_def);
-  Music *music = unsmob_music (mus);
+  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (global));
+  LY_ASSERT_TYPE (unsmob_global_context, global, 1)
 
-  if (!music
-      || !music->get_length ().to_bool ())
+  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, 0, 0, (SCM output_def),
+	   "Set up a global interpretation context, using the output"
+	   " block @var{output_def}.  The context is returned.")
+{
+  LY_ASSERT_SMOB (Output_def, output_def, 1);
+  Output_def *odef = unsmob_output_def (output_def); 
+
+  Global_context *glob = new Global_context (odef);
+
+  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 global context"
+	   " @var{ctx}.  The context is returned in its final state.")
+{
+  LY_ASSERT_SMOB (Music, mus, 1);
+  LY_ASSERT_TYPE (unsmob_global_context, ctx, 2);
 
-  Global_context *trans = new Global_context (odef, music->get_length (), unsmob_key (key));
-  if (!trans)
+  Music *music = unsmob_music (mus);
+  if (!music
+      || !music->get_length ().to_bool ())
     {
-      programming_error ("no toplevel translator");
+      warning (_ ("no music found in score"));
       return SCM_BOOL_F;
     }
 
+  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (ctx));
+
+  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 ())
@@ -78,13 +105,34 @@ 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),
+	   "Process @var{mus} according to @var{output-def}.  An"
+	   " interpretation context is set up, and @var{mus} is"
+	   " interpreted with it.  The context is returned in its"
+	   " final state.\n"
+	   "\n"
+	   "Optionally, this routine takes an object-key to"
+	   " to uniquely identify the score block containing it.")
+{
+  LY_ASSERT_SMOB (Music, mus, 1);
+  LY_ASSERT_SMOB (Output_def, output_def, 2);
+
+  SCM glob = ly_make_global_context (output_def);
+  ly_make_global_translator (glob);
+  ly_interpret_music_expression (mus, glob);
+  return glob;
 }