Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / global-context-scheme.cc

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index 9229a8a0d956d8124cfd83aa671cbfb185f08d7a..7eb5fb224aa67003a08b06fed3d10c588c58958e 100644 (file)
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -15,7 +15,6 @@
 #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",
@@ -32,21 +31,6 @@ LY_DEFINE (ly_format_output, "ly:format-output",
   return output;
 }
 
-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<Global_context *> (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_run_translator, "ly:run-translator",
           2, 1, 0, (SCM mus, SCM output_def, SCM key),
           "Process @var{mus} according to @var{output_def}. \n"
@@ -73,21 +57,19 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
 
   Cpu_timer timer;
 
-  Global_context *glob = new Global_context (odef, unsmob_key (key));
-  if (!glob)
+  Global_context *trans = new Global_context (odef, music->get_length (),
+                                             unsmob_key (key));
+  if (!trans)
     {
-      programming_error ("Couldn't create Global context");
+      programming_error ("no toplevel translator");
       return SCM_BOOL_F;
     }
 
-  SCM tgs = ly_make_global_translator (glob->self_scm ());
-  Translator_group *tg = unsmob_translator_group (tgs);
-
   message (_ ("Interpreting music... "));
 
   SCM protected_iter = Music_iterator::get_static_get_iterator (music);
   Music_iterator *iter = unsmob_iterator (protected_iter);
-  iter->init_translator (music, glob);
+  iter->init_translator (music, trans);
   iter->construct_children ();
 
   if (!iter->ok ())
@@ -97,13 +79,13 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
       return SCM_BOOL_F;
     }
 
-  glob->run_iterator_on_me (iter);
+  trans->run_iterator_on_me (iter);
   iter->quit ();
   scm_remember_upto_here_1 (protected_iter);
-  send_stream_event (glob, "Finish", 0, 0);
+  trans->finish ();
 
   if (be_verbose_global)
     message (_f ("elapsed time: %.2f seconds", timer.read ()));
 
-  return glob->unprotect ();
+  return trans->unprotect ();
 }