X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=3ecc3b9aafa77057379a1c97c314f643ae9b6eba;hb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;hp=66e164c3834337bf02d66a687e97b3e13e8d65c0;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 66e164c383..3ecc3b9aaf 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,40 +1,41 @@
 /*
-  global-translator.cc -- implement global_context
+  global-context.cc -- implement Global_context
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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"));
 
-  Context_def *globaldef  =  unsmob_context_def (definition_);
+  Context_def *globaldef = unsmob_context_def (definition_);
   if (!globaldef)
-    {
-      programming_error ("No `Global' context found.");
-    }
+    programming_error ("no `Global' context found");
   else
     globaldef->apply_default_property_operations (this);
   accepts_list_ = scm_list_1 (ly_symbol2scm ("Score"));
 }
 
-Output_def* 
+Output_def *
 Global_context::get_output_def () const
 {
   return output_def_;
@@ -47,9 +48,9 @@ Global_context::add_moment_to_process (Moment m)
     return;
 
   if (m < now_mom_)
-    programming_error ("Trying to freeze in time.");
-  
-  for (int i=0; i <  extra_mom_pq_.size (); i++)
+    programming_error ("trying to freeze in time");
+
+  for (int i = 0; i < extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
@@ -72,9 +73,10 @@ Global_context::get_moments_left () const
 void
 Global_context::prepare (Moment m)
 {
-  prev_mom_  = now_mom_;
+  prev_mom_ = now_mom_;
   now_mom_ = m;
 
+  clear_key_disambiguations ();
   if (get_score_context ())
     get_score_context ()->prepare (m);
 }
@@ -85,15 +87,15 @@ Global_context::now_mom () const
   return now_mom_;
 }
 
-Score_context*
+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;
 }
 
-Music_output*
+SCM
 Global_context::get_output ()
 {
   return get_score_context ()->get_output ();
@@ -115,9 +117,9 @@ Global_context::finish ()
 }
 
 void
-Global_context::run_iterator_on_me (Music_iterator * iter)
+Global_context::run_iterator_on_me (Music_iterator *iter)
 {
-  if (iter-> ok ())
+  if (iter->ok ())
     prev_mom_ = now_mom_ = iter->pending_moment ();
 
   bool first = true;
@@ -126,43 +128,42 @@ 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 ())
-	break ;
-      
+	break;
+
       if (first)
-        {
+	{
 	  /*
 	    Need this to get grace notes at start of a piece correct.
-	   */
-          first = false;
-          set_property ("measurePosition", w.smobbed_copy ());
-        }
-
+	  */
+	  first = false;
+	  set_property ("measurePosition", w.smobbed_copy ());
+	}
 
       prepare (w);
 
       if (iter->ok ())
 	iter->process (w);
 
-      if (!get_score_context ()) 
+      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);
+	  Score_context *sc = dynamic_cast<Score_context *> (c);
 	  sc->prepare (w);
 	}
-      
+
       one_time_step ();
     }
 }
@@ -172,9 +173,10 @@ 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.  */
@@ -183,7 +185,7 @@ 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