Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 72ccc5be89952803a72082f2f03aadbf3c58f5f3..f494ab4191e63c2b5025afe603aef5dacb14991e 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -30,7 +30,10 @@ using namespace std;
 #include "output-def.hh"
 #include "warn.hh"
 
-using std::string;
+Preinit_Global_context::Preinit_Global_context ()
+{
+  output_def_ = 0;
+}
 
 Global_context::Global_context (Output_def *o)
   : Context ()
@@ -58,6 +61,13 @@ Global_context::Global_context (Output_def *o)
   accepts_list_ = scm_list_1 (default_child_);
 }
 
+void
+Global_context::derived_mark () const
+{
+  if (output_def_)
+    scm_gc_mark (output_def_->self_scm ());
+}
+
 Output_def *
 Global_context::get_output_def () const
 {
@@ -170,7 +180,7 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
       if (iter->ok ())
         iter->process (w);
 
-      send_stream_event (this, "OneTimeStep", 0, 0);
+      send_stream_event (this, "OneTimeStep", 0);
       apply_finalizations ();
       check_removal ();
     }