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 ceafb4672cb9d9a60557fe02feee83a05dd18c49..6e2d26a58a2fceb00cafeb3cb767b5c16f88395f 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -3,20 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 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-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,
@@ -26,12 +28,12 @@ Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
   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_);
   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"));
@@ -50,9 +52,9 @@ Global_context::add_moment_to_process (Moment m)
     return;
 
   if (m < now_mom_)
-    programming_error ("Trying to freeze in time.");
+    programming_error ("trying to freeze in time");
 
-  for (int i = 0; i < extra_mom_pq_.size (); i++)
+  for (vsize i = 0; i < extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
@@ -81,7 +83,6 @@ Global_context::prepare (Moment m)
   clear_key_disambiguations ();
   if (get_score_context ())
     get_score_context ()->prepare (m);
-
 }
 
 Moment
@@ -98,7 +99,7 @@ Global_context::get_score_context () const
     : 0;
 }
 
-Music_output *
+SCM
 Global_context::get_output ()
 {
   return get_score_context ()->get_output ();
@@ -122,7 +123,7 @@ Global_context::finish ()
 void
 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;
@@ -131,9 +132,7 @@ 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 ())
@@ -156,7 +155,8 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
       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"));
 
@@ -178,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));
 }
@@ -205,3 +206,9 @@ Global_context::get_default_interpreter ()
   else
     return Context::get_default_interpreter ();
 }
+
+int
+Global_context::new_unique ()
+{
+  return ++unique_count_;
+}