X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=3b45f1d6fe150197db3764d4ba9645975355c2a3;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=ddcec501ba4ec521d56176387d004405210fd96e;hpb=35fafba86276f47f3742fd10f0107eea1cc926ea;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index ddcec501ba..3b45f1d6fe 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,9 +1,20 @@
 /*
-  global-context.cc -- implement Global_context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "global-context.hh"
@@ -14,17 +25,13 @@ using namespace std;
 #include "context-def.hh"
 #include "dispatcher.hh"
 #include "international.hh"
-#include "lilypond-key.hh"
 #include "music-iterator.hh"
 #include "music.hh"
 #include "output-def.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
-Global_context::Global_context (Output_def *o, Object_key *key)
-  : Context (new Lilypond_context_key (key,
-				       Moment (0),
-				       "Global", "", 0))
+Global_context::Global_context (Output_def *o)
+  : Context ()
 {
   output_def_ = o;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
@@ -34,17 +41,19 @@ Global_context::Global_context (Output_def *o, Object_key *key)
 
   /* We only need the most basic stuff to bootstrap the context tree */
   event_source ()->add_listener (GET_LISTENER (create_context_from_event),
-                                ly_symbol2scm ("CreateContext"));
+                                 ly_symbol2scm ("CreateContext"));
   event_source ()->add_listener (GET_LISTENER (prepare),
-                                ly_symbol2scm ("Prepare"));
+                                 ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = unsmob_context_def (definition_);
+  Context_def *globaldef = Context_def::unsmob (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
     globaldef->apply_default_property_operations (this);
-  accepts_list_ = scm_list_1 (ly_symbol2scm ("Score"));
+
+  default_child_ = ly_symbol2scm ("Score");
+  accepts_list_ = scm_list_1 (default_child_);
 }
 
 Output_def *
@@ -84,7 +93,7 @@ void
 Global_context::prepare (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
-  Moment *mom = unsmob_moment (ev->get_property ("moment"));
+  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -93,8 +102,6 @@ Global_context::prepare (SCM sev)
   else
     prev_mom_ = now_mom_;
   now_mom_ = *mom;
-  
-  clear_key_disambiguations ();
 }
 
 Moment
@@ -107,14 +114,14 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? unsmob_context (scm_car (context_list_))
-    : 0;
+         ? Context::unsmob (scm_car (context_list_))
+         : 0;
 }
 
 SCM
 Global_context::get_output ()
 {
-  Context * c = get_score_context ();
+  Context *c = get_score_context ();
   if (c)
     return c->get_property ("output");
   else
@@ -134,26 +141,33 @@ 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 () || w > final_mom)
-	break;
+        break;
+
+      if (w == prev_mom_)
+        {
+          programming_error ("Moment is not increasing."
+                             "  Aborting interpretation.");
+          break;
+        }
 
       if (first)
-	{
-	  /*
-	    Need this to get grace notes at start of a piece correct.
-	  */
-	  first = false;
-	  set_property ("measurePosition", w.smobbed_copy ());
-	}
+        {
+          /*
+            Need this to get grace notes at start of a piece correct.
+          */
+          first = false;
+          set_property ("measurePosition", w.smobbed_copy ());
+        }
 
       send_stream_event (this, "Prepare", 0,
-			 ly_symbol2scm ("moment"), w.smobbed_copy ());
+                         ly_symbol2scm ("moment"), w.smobbed_copy ());
 
       if (iter->ok ())
-	iter->process (w);
+        iter->process (w);
 
       send_stream_event (this, "OneTimeStep", 0, 0);
       apply_finalizations ();
@@ -167,9 +181,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));
+    scm_apply_0 (scm_caar (s), scm_cdar (s));
 }
 
 /* Add a function to execute before stepping to the next time step.  */
@@ -188,10 +200,16 @@ Global_context::previous_moment () const
 }
 
 Context *
-Global_context::get_default_interpreter ()
+Global_context::get_default_interpreter (const string &/* context_id */)
 {
   if (get_score_context ())
     return get_score_context ()->get_default_interpreter ();
   else
     return Context::get_default_interpreter ();
 }
+
+Global_context *
+unsmob_global_context (SCM x)
+{
+  return dynamic_cast<Global_context *> (Context::unsmob (x));
+}