* lily/context.cc (Context): take key argument in ctor.

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 66e164c3834337bf02d66a687e97b3e13e8d65c0..ce3f9e9ef5b4e2f9aa9fab2b44b2bdec3b72606c 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -16,10 +16,15 @@
 #include "score-context.hh"
 #include "context-def.hh"
 #include "output-def.hh"
-#include "grace-fixup.hh"
+#include "lilypond-key.hh"
 
 Global_context::Global_context (Output_def *o, Moment final)
+  : Context (new Lilypond_context_key(0,
+                                     Moment(0),
+                                     "Global", ""))
 {
+  scm_gc_unprotect_object (key_->self_scm());
+  
   output_def_ = o;
   final_mom_ = final;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
@@ -89,7 +94,7 @@ Score_context*
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? dynamic_cast<Score_context*> (unsmob_context (ly_car (context_list_)))
+    ? dynamic_cast<Score_context*> (unsmob_context (scm_car (context_list_)))
     : 0;
 }
 
@@ -151,13 +156,16 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
 
       if (!get_score_context ()) 
        {
-         SCM key = ly_symbol2scm ("Score");
-         Context_def * t = unsmob_context_def (find_context_def (get_output_def (), key));
+         SCM sym = ly_symbol2scm ("Score");
+         Context_def * t = unsmob_context_def (find_context_def (get_output_def (), sym));
          if (!t)
            error (_f ("can't find `%s' context", "Score"));
 
-         Context *c = t->instantiate (SCM_EOL);
+         Object_key *key = new Lilypond_context_key (get_key(), now_mom(),
+                                                     "Score", "");
+         Context *c = t->instantiate (SCM_EOL, key);
          add_context (c);
+         scm_gc_unprotect_object (key->self_scm());
 
          Score_context *sc = dynamic_cast<Score_context*> (c);
          sc->prepare (w);
@@ -172,9 +180,9 @@ Global_context::apply_finalizations ()
 {
   SCM lst = get_property ("finalizations");
   set_property ("finalizations", SCM_EOL);
-  for (SCM s = lst; scm_is_pair (s); s = ly_cdr (s))
+  for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
     /* TODO: make safe.  */
-    scm_primitive_eval (ly_car (s));
+    scm_primitive_eval (scm_car (s));
 }
 
 /* Add a function to execute before stepping to the next time step.  */