*** empty log message ***

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 7e91b89c36a5a3669236e76961bcafaab7b0f889..7b43d2b174bb70db5b8007bc7aafcc15706cacf5 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -16,12 +16,15 @@
 #include "score-context.hh"
 #include "context-def.hh"
 #include "music-output-def.hh"
+#include "grace-fixup.hh"
 
-Global_context::Global_context (Music_output_def*o)
+Global_context::Global_context (Music_output_def *o, Moment final)
 {
   output_def_ = o;
+  final_mom_ = final;
   definition_ = o->find_context_def (ly_symbol2scm ("Global"));
   unsmob_context_def (definition_)->apply_default_property_operations (this);
+  accepts_list_ = scm_list_1 (ly_symbol2scm ("Score"));
 }
 
 Music_output_def* 
@@ -33,7 +36,7 @@ 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_)
@@ -78,8 +81,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 (ly_c_pair_p (context_list_))
+    ? dynamic_cast<Score_context*> (unsmob_context (ly_car (context_list_)))
     : 0;
 }
 
@@ -124,17 +127,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 ())
@@ -147,15 +149,15 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
                                                ->find_context_def (key));
          if (!t)
            error (_f ("can't find `%s' context", "Score"));
-         
-         add_context (t->instantiate (SCM_EOL));
 
-         Score_context *sc = dynamic_cast<Score_context*> (t);
+         Context *c = t->instantiate (SCM_EOL);
+         add_context (c);
+
+         Score_context *sc = dynamic_cast<Score_context*> (c);
          sc->prepare (w);
        }
       
       one_time_step ();
-      first = false;      
     }
 }
 
@@ -164,15 +166,15 @@ 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))
+  for (SCM s = lst ; ly_c_pair_p (s); s = ly_cdr (s))
     {
-      scm_primitive_eval (gh_car (s));
+      scm_primitive_eval (ly_car (s)); // TODO: make safe.
     }
 }
 
 /*
-   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)
 {
@@ -181,3 +183,17 @@ Global_context::add_finalization (SCM x)
   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 ();
+}