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 c98a6fd8e458aef15b0d304d66c92b8d175b0d5a..7eb5fb224aa67003a08b06fed3d10c588c58958e 100644 (file)
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 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 "object-key.hh"
+#include "output-def.hh"
+#include "warn.hh"
 
 LY_DEFINE (ly_format_output, "ly:format-output",
           1, 0, 0, (SCM context),
@@ -24,10 +25,10 @@ LY_DEFINE (ly_format_output, "ly:format-output",
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (context));
   SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
 
-  Music_output *output = g->get_output ();
+  SCM output = g->get_output ();
   progress_indication ("\n");
-  output->process ();
-  return output->self_scm ();
+  unsmob_music_output (output)->process ();
+  return output;
 }
 
 LY_DEFINE (ly_run_translator, "ly:run-translator",
@@ -36,8 +37,8 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
           "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"
+          "\n\n"
+          "Optionally, 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);
@@ -56,7 +57,8 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
 
   Cpu_timer timer;
 
-  Global_context *trans = new Global_context (odef, music->get_length (), unsmob_key (key));
+  Global_context *trans = new Global_context (odef, music->get_length (),
+                                             unsmob_key (key));
   if (!trans)
     {
       programming_error ("no toplevel translator");
@@ -68,7 +70,6 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
   SCM protected_iter = Music_iterator::get_static_get_iterator (music);
   Music_iterator *iter = unsmob_iterator (protected_iter);
   iter->init_translator (music, trans);
-
   iter->construct_children ();
 
   if (!iter->ok ())
@@ -86,5 +87,5 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
   if (be_verbose_global)
     message (_f ("elapsed time: %.2f seconds", timer.read ()));
 
-  return scm_gc_unprotect_object (trans->self_scm ());
+  return trans->unprotect ();
 }