* Documentation/topdocs/NEWS.tely (Top): Mention markup text feature.

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 580479bb94f46c5e43ece28e13afd5cde3f7a52f..37e9612a0d249aaa18f1e1b35e69eeb00ada050a 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,24 +1,27 @@
 /*
-  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;
@@ -49,7 +52,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 +78,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
@@ -151,12 +156,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);