X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=f494ab4191e63c2b5025afe603aef5dacb14991e;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=f4aff0398eeaa977015b2142e212c88985aa7fa8;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index f4aff0398e..f494ab4191 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,9 +1,20 @@
 /*
-  global-context.cc -- implement Global_context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "global-context.hh"
@@ -19,6 +30,11 @@ using namespace std;
 #include "output-def.hh"
 #include "warn.hh"
 
+Preinit_Global_context::Preinit_Global_context ()
+{
+  output_def_ = 0;
+}
+
 Global_context::Global_context (Output_def *o)
   : Context ()
 {
@@ -29,18 +45,27 @@ Global_context::Global_context (Output_def *o)
   prev_mom_.set_infinite (-1);
 
   /* We only need the most basic stuff to bootstrap the context tree */
-  event_source ()->add_listener (GET_LISTENER (create_context_from_event),
-                                ly_symbol2scm ("CreateContext"));
-  event_source ()->add_listener (GET_LISTENER (prepare),
-                                ly_symbol2scm ("Prepare"));
+  event_source ()->add_listener (GET_LISTENER (Context, create_context_from_event),
+                                 ly_symbol2scm ("CreateContext"));
+  event_source ()->add_listener (GET_LISTENER (Global_context, prepare),
+                                 ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = unsmob_context_def (definition_);
+  Context_def *globaldef = unsmob<Context_def> (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
     globaldef->apply_default_property_operations (this);
-  accepts_list_ = scm_list_1 (ly_symbol2scm ("Score"));
+
+  default_child_ = ly_symbol2scm ("Score");
+  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 *
@@ -75,12 +100,11 @@ Global_context::get_moments_left () const
   return extra_mom_pq_.size ();
 }
 
-IMPLEMENT_LISTENER (Global_context, prepare);
 void
 Global_context::prepare (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
-  Moment *mom = unsmob_moment (ev->get_property ("moment"));
+  Stream_event *ev = unsmob<Stream_event> (sev);
+  Moment *mom = unsmob<Moment> (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -101,14 +125,14 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? unsmob_context (scm_car (context_list_))
-    : 0;
+         ? unsmob<Context> (scm_car (context_list_))
+         : 0;
 }
 
 SCM
 Global_context::get_output ()
 {
-  Context * c = get_score_context ();
+  Context *c = get_score_context ();
   if (c)
     return c->get_property ("output");
   else
@@ -128,35 +152,35 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
       Moment w;
       w.set_infinite (1);
       if (iter->ok ())
-	w = iter->pending_moment ();
+        w = iter->pending_moment ();
 
       w = sneaky_insert_extra_moment (w);
       if (w.main_part_.is_infinity () || w > final_mom)
-	break;
+        break;
 
       if (w == prev_mom_)
-	{
-	  programming_error ("Moment is not increasing. Aborting interpretation.");
-	  break ;
-	}
+        {
+          programming_error ("Moment is not increasing."
+                             "  Aborting interpretation.");
+          break;
+        }
 
-      
       if (first)
-	{
-	  /*
-	    Need this to get grace notes at start of a piece correct.
-	  */
-	  first = false;
-	  set_property ("measurePosition", w.smobbed_copy ());
-	}
+        {
+          /*
+            Need this to get grace notes at start of a piece correct.
+          */
+          first = false;
+          set_property ("measurePosition", w.smobbed_copy ());
+        }
 
       send_stream_event (this, "Prepare", 0,
-			 ly_symbol2scm ("moment"), w.smobbed_copy ());
+                         ly_symbol2scm ("moment"), w.smobbed_copy ());
 
       if (iter->ok ())
-	iter->process (w);
+        iter->process (w);
 
-      send_stream_event (this, "OneTimeStep", 0, 0);
+      send_stream_event (this, "OneTimeStep", 0);
       apply_finalizations ();
       check_removal ();
     }
@@ -168,9 +192,7 @@ Global_context::apply_finalizations ()
   SCM lst = get_property ("finalizations");
   set_property ("finalizations", SCM_EOL);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-
-    /* TODO: make safe.  */
-    scm_primitive_eval (scm_car (s));
+    scm_apply_0 (scm_caar (s), scm_cdar (s));
 }
 
 /* Add a function to execute before stepping to the next time step.  */
@@ -189,7 +211,7 @@ Global_context::previous_moment () const
 }
 
 Context *
-Global_context::get_default_interpreter ()
+Global_context::get_default_interpreter (const string &/* context_id */)
 {
   if (get_score_context ())
     return get_score_context ()->get_default_interpreter ();