input/test fixes

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index f2ff5c4fea13b1d483494ed733defe729796e571..24d2c3c377d397e4ff13f5a4f24d15fcb4551ff1 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -49,15 +49,18 @@ Timing_translator::initialize ()
   /*
     move this to engraver-init.ly? 
    */
- 
-  daddy_context_->set_property ("timing" , SCM_BOOL_T);  
-  daddy_context_->set_property ("currentBarNumber" , gh_int2scm (1));
-
-  daddy_context_->set_property ("timeSignatureFraction",
-                               gh_cons (gh_int2scm (4), gh_int2scm (4)));
-  daddy_context_->set_property ("measurePosition", Moment (Rational (0)).smobbed_copy ());
-  daddy_context_->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
-  daddy_context_->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
+  context ()->add_alias (ly_symbol2scm ("Timing"));
+  context ()->set_property ("timing" , SCM_BOOL_T);  
+  context ()->set_property ("currentBarNumber" , scm_int2num (1));
+
+  context ()->set_property ("timeSignatureFraction",
+                               scm_cons (scm_int2num (4), scm_int2num (4)));
+  /*
+    Do not init measurePosition; this should be done from global
+    context.
+   */
+  context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
+  context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
 }
 
 Rational
@@ -96,8 +99,8 @@ Timing_translator::start_translation_timestep ()
 {
   Global_context *global =get_global_context ();
 
-  Moment now = global->now_mom_;
-  Moment dt = now  - global->prev_mom_;
+  Moment now = global->now_mom ();
+  Moment dt = now  - global->previous_moment ();
   if (dt < Moment (0))
     {
       programming_error ("Moving backwards in time");
@@ -122,16 +125,17 @@ Timing_translator::start_translation_timestep ()
   else
     {
       measposp = now;
-      daddy_context_->set_property ("measurePosition", measposp.smobbed_copy ());
+      context ()->set_property ("measurePosition",
+                                   measposp.smobbed_copy ());
     }
   
   measposp += dt;
   
   SCM barn = get_property ("currentBarNumber");
   int b = 0;
-  if (gh_number_p (barn))
+  if (ly_c_number_p (barn))
     {
-      b = gh_scm2int (barn);
+      b = ly_scm2int (barn);
     }
 
   SCM cad = get_property ("timing");
@@ -144,8 +148,13 @@ Timing_translator::start_translation_timestep ()
       b ++;
     }
 
-  daddy_context_->set_property ("currentBarNumber", gh_int2scm (b));
-  daddy_context_->set_property ("measurePosition", measposp.smobbed_copy ());
+  context ()->set_property ("currentBarNumber", scm_int2num (b));
+  context ()->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
-ENTER_DESCRIPTION(Timing_translator,"","","","","","");
+ENTER_DESCRIPTION (Timing_translator,
+                  "This engraver adds the alias "
+                  "@code{Timing} to its containing context."
+                  ,
+
+                  "","","","","");