X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=ee26880d4deeb366207740e1d042c1b953850dc2;hb=4ebb61bb6f16135ecbe329c5acb2f88969981a91;hp=3ecf6110e3ab0ab48f7c3ce23c45cf6aef401ce7;hpb=3cd9f51c1faddb92fa36706601be496398cc2886;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 3ecf6110e3..ee26880d4d 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -5,27 +5,40 @@
 
   (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 "music-output-def.hh"
+#include "output-def.hh"
+#include "lilypond-key.hh"
 
-Global_context::Global_context (Music_output_def*o)
+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;
-  definition_ = o->find_context_def (ly_symbol2scm ("Global"));
-  unsmob_context_def (definition_)->apply_default_property_operations (this);
-  
+  final_mom_ = final;
+  definition_ = find_context_def (o, ly_symbol2scm ("Global"));
+
+  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"));
 }
 
-Music_output_def* 
+Output_def* 
 Global_context::get_output_def () const
 {
   return output_def_;
@@ -34,13 +47,13 @@ Global_context::get_output_def () const
 void
 Global_context::add_moment_to_process (Moment m)
 {
-  if (m  > final_mom_)
+  if (m > final_mom_)
     return;
 
   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);
@@ -66,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
@@ -79,8 +94,8 @@ Global_context::now_mom () const
 Score_context*
 Global_context::get_score_context () const
 {
-  return (gh_pair_p (context_list_))
-    ? dynamic_cast<Score_context*> (unsmob_context (gh_car (context_list_)))
+  return (scm_is_pair (context_list_))
+    ? dynamic_cast<Score_context*> (unsmob_context (scm_car (context_list_)))
     : 0;
 }
 
@@ -125,17 +140,16 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
       if (w.main_part_.is_infinity ())
 	break ;
       
-#if 0      
-      //      printf ("proccing %s\n ",       w.to_string ().to_str0 ());
       if (first)
-	{
+        {
 	  /*
-	    Huh? 
+	    Need this to get grace notes at start of a piece correct.
 	   */
-	  set_property ("measurePosition", w.smobbed_copy ());
-	}
-#endif
-      
+          first = false;
+          set_property ("measurePosition", w.smobbed_copy ());
+        }
+
+
       prepare (w);
 
       if (iter->ok ())
@@ -143,20 +157,20 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
 
       if (!get_score_context ()) 
 	{
-	  SCM key = ly_symbol2scm ("Score");
-	  Context_def * t = unsmob_context_def (get_output_def ()
-						->find_context_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"));
-	  
-	  add_context (t->instantiate (SCM_EOL));
 
-	  Score_context *sc = dynamic_cast<Score_context*> (t);
+	  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);
 	  sc->prepare (w);
 	}
       
       one_time_step ();
-      first = false;      
     }
 }
 
@@ -164,21 +178,32 @@ void
 Global_context::apply_finalizations ()
 {
   SCM lst = get_property ("finalizations");
-  set_property ("finalizations" , SCM_EOL); 
-  for (SCM s = lst ; gh_pair_p (s); s = gh_cdr (s))
-    {
-      scm_primitive_eval (gh_car (s));
-    }
+  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
+Global_context::previous_moment () const
+{
+  return prev_mom_;
 }
 
+Context *
+Global_context::get_default_interpreter ()
+{
+  if (get_score_context ())
+    return get_score_context ()->get_default_interpreter ();
+  else
+    return Context::get_default_interpreter ();
+}