(transform_heads): replace

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 66e164c3834337bf02d66a687e97b3e13e8d65c0..ee26880d4deeb366207740e1d042c1b953850dc2 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -5,20 +5,24 @@
 
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <stdio.h>
+
+#include "global-context.hh"
+
+#include <cstdio>
 
 #include "warn.hh"
-#include "music.hh"
 #include "event.hh"
 #include "music-list.hh"
 #include "music-iterator.hh"
-#include "global-context.hh"
 #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)
+Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
+  : Context (new Lilypond_context_key(key,
+                                     Moment(0),
+                                     "Global", "", 0))
 {
   output_def_ = o;
   final_mom_ = final;
@@ -49,7 +53,7 @@ Global_context::add_moment_to_process (Moment m)
   if (m < now_mom_)
     programming_error ("Trying to freeze in time.");
   
-  for (int i=0; i <  extra_mom_pq_.size (); i++)
+  for (int i = 0; i <  extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
@@ -75,8 +79,10 @@ Global_context::prepare (Moment m)
   prev_mom_  = now_mom_;
   now_mom_ = m;
 
+  clear_key_disambiguations ();
   if (get_score_context ())
     get_score_context ()->prepare (m);
+  
 }
 
 Moment
@@ -89,7 +95,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,12 +157,13 @@ 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 const *key = get_context_key ("Score", "");
+         Context *c = t->instantiate (SCM_EOL, key);
          add_context (c);
 
          Score_context *sc = dynamic_cast<Score_context*> (c);
@@ -172,9 +179,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.  */