(Paper_column): copy rank_. This fixes

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 77a67639c49588b1007ed70591c5232851c569c9..6b6ba4e5a6da81735cc16e996e5f34bc80c3cbff 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -5,25 +5,36 @@
 
   (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;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
-  unsmob_context_def (definition_)->apply_default_property_operations (this);
+
+  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"));
 }
 
@@ -42,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);
@@ -68,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
@@ -81,8 +94,8 @@ Global_context::now_mom () const
 Score_context*
 Global_context::get_score_context () const
 {
-  return (ly_c_pair_p (context_list_))
-    ? dynamic_cast<Score_context*> (unsmob_context (ly_car (context_list_)))
+  return (scm_is_pair (context_list_))
+    ? dynamic_cast<Score_context*> (unsmob_context (scm_car (context_list_)))
     : 0;
 }
 
@@ -144,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);
@@ -164,22 +178,19 @@ void
 Global_context::apply_finalizations ()
 {
   SCM lst = get_property ("finalizations");
-  set_property ("finalizations" , SCM_EOL); 
-  for (SCM s = lst ; ly_c_pair_p (s); s = ly_cdr (s))
-    {
-      scm_primitive_eval (ly_car (s)); // TODO: make safe.
-    }
+  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));
 }
 
-/*
-  Add a function to execute before stepping to the next time step.
-*/
+/* Add a function to execute before stepping to the next time step.  */
 void
 Global_context::add_finalization (SCM x)
 {
   SCM lst = get_property ("finalizations");
   lst = scm_cons (x, lst);
-  set_property ("finalizations" ,lst); 
+  set_property ("finalizations", lst); 
 }
 
 Moment