X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=3a251eb891caeae523c9277ddb4ffbdb5aaed6c2;hb=5db906cd3076781e573b5ee3b34af58a5fde97bc;hp=30966109663de6a3ef7ec243c5e9d830d9d36a08;hpb=b2bba8f2ecf6bd5e8b755c45b8f271d09ddaa79f;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 3096610966..3a251eb891 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -3,7 +3,7 @@
 
   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 "global-context.hh"
@@ -12,7 +12,6 @@
 
 #include "warn.hh"
 #include "event.hh"
-#include "music-list.hh"
 #include "music-iterator.hh"
 #include "score-context.hh"
 #include "context-def.hh"
@@ -20,25 +19,25 @@
 #include "lilypond-key.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))
 {
   output_def_ = o;
   final_mom_ = final;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
 
-  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_;
@@ -51,9 +50,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 (int i = 0; i < extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
@@ -76,13 +75,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
@@ -91,15 +89,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*
+Music_output *
 Global_context::get_output ()
 {
   return get_score_context ()->get_output ();
@@ -121,9 +119,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;
@@ -138,27 +136,26 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
 
       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"));
 
@@ -166,10 +163,10 @@ Global_context::run_iterator_on_me (Music_iterator * iter)
 	  Context *c = t->instantiate (SCM_EOL, key);
 	  add_context (c);
 
-	  Score_context *sc = dynamic_cast<Score_context*> (c);
+	  Score_context *sc = dynamic_cast<Score_context *> (c);
 	  sc->prepare (w);
 	}
-      
+
       one_time_step ();
     }
 }
@@ -190,7 +187,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