Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 7acf004cf1f09b218747e632ee67c13956ddcf51..6e2d26a58a2fceb00cafeb3cb767b5c16f88395f 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,46 +1,45 @@
 /*
-  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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "global-context.hh"
 
 #include <cstdio>
+using namespace std;
 
-#include "warn.hh"
-#include "event.hh"
-#include "music-list.hh"
-#include "music-iterator.hh"
-#include "score-context.hh"
 #include "context-def.hh"
-#include "output-def.hh"
+#include "international.hh"
 #include "lilypond-key.hh"
+#include "music-iterator.hh"
+#include "music.hh"
+#include "output-def.hh"
+#include "score-context.hh"
+#include "warn.hh"
 
 Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
-  : Context (new Lilypond_context_key(key,
-                                     Moment(0),
-                                     "Global", "", 0))
+  : Context (new Lilypond_context_key (key,
+                                      Moment (0),
+                                      "Global", "", 0))
 {
-  scm_gc_unprotect_object (key_->self_scm());
-  
   output_def_ = o;
   final_mom_ = final;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
+  unique_count_ = 0;
+  unique_ = 0;
 
-  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_;
@@ -53,9 +52,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 (vsize i = 0; i < extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
@@ -78,13 +77,12 @@ 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);
-  
 }
 
 Moment
@@ -93,15 +91,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 (scm_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 ();
@@ -123,9 +121,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;
@@ -134,45 +132,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 sym = ly_symbol2scm ("Score");
-         Context_def * t = unsmob_context_def (find_context_def (get_output_def (), sym));
+         Context_def *t = unsmob_context_def (find_context_def (get_output_def (),
+                                                                sym));
          if (!t)
            error (_f ("can't find `%s' context", "Score"));
 
          Object_key const *key = get_context_key ("Score", "");
          Context *c = t->instantiate (SCM_EOL, key);
          add_context (c);
-         scm_gc_unprotect_object (key->self_scm());
 
-         Score_context *sc = dynamic_cast<Score_context*> (c);
+         Score_context *sc = dynamic_cast<Score_context *> (c);
          sc->prepare (w);
        }
-      
+
       one_time_step ();
     }
 }
@@ -183,6 +178,7 @@ Global_context::apply_finalizations ()
   SCM lst = get_property ("finalizations");
   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));
 }
@@ -193,7 +189,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
@@ -210,3 +206,9 @@ Global_context::get_default_interpreter ()
   else
     return Context::get_default_interpreter ();
 }
+
+int
+Global_context::new_unique ()
+{
+  return ++unique_count_;
+}