X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=5e940a670d161959d191fbe133f4bbc211b6cbe3;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3a29a6f24a27ef7fbc28d489214afcbba3947002;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 3a29a6f24a..5e940a670d 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -41,17 +41,19 @@ Global_context::Global_context (Output_def *o)
 
   /* 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"));
+                                 ly_symbol2scm ("CreateContext"));
   event_source ()->add_listener (GET_LISTENER (prepare),
-                                ly_symbol2scm ("Prepare"));
+                                 ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = unsmob_context_def (definition_);
+  Context_def *globaldef = Context_def::unsmob (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_);
 }
 
 Output_def *
@@ -90,8 +92,8 @@ 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 = Stream_event::unsmob (sev);
+  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -112,14 +114,14 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? unsmob_context (scm_car (context_list_))
-    : 0;
+         ? Context::unsmob (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
@@ -139,33 +141,33 @@ 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);
       apply_finalizations ();
@@ -179,9 +181,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.  */
@@ -200,16 +200,10 @@ 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 ();
   else
     return Context::get_default_interpreter ();
 }
-
-Global_context *
-unsmob_global_context (SCM x)
-{
-  return dynamic_cast<Global_context *> (unsmob_context (x));
-}