Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index a0b9abac3de023da222ac12329f1a71ef7ca8014..a5cf4adb3f6441d6efe2f9572a330595359de2d4 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,7 +4,7 @@
 
   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 "timing-translator.hh"
@@ -19,16 +19,10 @@ Timing_translator::stop_translation_timestep ()
 {
   Global_context *global = get_global_context ();
 
-  /* allbars == ! skipbars */
-  SCM sb = get_property ("skipBars");
-  bool allbars = !to_boolean (sb);
-
-  // urg: multi bar rests: should always process whole of first bar?
-  SCM tim = get_property ("timing");
-  bool timb = to_boolean (tim);
-  if (timb && allbars)
+  if (to_boolean (get_property ("timing"))
+      && !to_boolean (get_property ("skipBars")))
     {
-      Moment barleft = (measure_length () - measure_position ());
+      Moment barleft = (measure_length () - measure_position (context ()));
       Moment now = now_mom ();
 
       if (barleft > Moment (0)
@@ -44,22 +38,19 @@ Timing_translator::stop_translation_timestep ()
 void
 Timing_translator::initialize ()
 {
-
-  /*
-    move this to engraver-init.ly?
-  */
   context ()->add_alias (ly_symbol2scm ("Timing"));
-  context ()->set_property ("timing", SCM_BOOL_T);
-  context ()->set_property ("currentBarNumber", scm_int2num (1));
+  context ()->set_property ("currentBarNumber", scm_from_int (1));
 
   context ()->set_property ("timeSignatureFraction",
-                           scm_cons (scm_int2num (4), scm_int2num (4)));
+                           scm_cons (scm_from_int (4), scm_from_int (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 ());
+  context ()->set_property ("measureLength",
+                           Moment (Rational (1)).smobbed_copy ());
+  context ()->set_property ("beatLength",
+                           Moment (Rational (1, 4)).smobbed_copy ());
 }
 
 Rational
@@ -76,22 +67,6 @@ Timing_translator::Timing_translator ()
 {
 }
 
-Moment
-Timing_translator::measure_position () const
-{
-  SCM sm = get_property ("measurePosition");
-
-  Moment m = 0;
-  if (unsmob_moment (sm))
-    {
-      m = *unsmob_moment (sm);
-      while (m.main_part_ < Rational (0))
-       m.main_part_ += measure_length ();
-    }
-
-  return m;
-}
-
 void
 Timing_translator::start_translation_timestep ()
 {
@@ -101,12 +76,12 @@ Timing_translator::start_translation_timestep ()
   Moment dt = now - global->previous_moment ();
   if (dt < Moment (0))
     {
-      programming_error ("Moving backwards in time");
+      programming_error ("moving backwards in time");
       dt = 0;
     }
   else if (dt.main_part_.is_infinity ())
     {
-      programming_error ("Moving infinitely to future");
+      programming_error ("moving infinitely to future");
       dt = 0;
     }
 
@@ -117,9 +92,7 @@ Timing_translator::start_translation_timestep ()
 
   SCM s = get_property ("measurePosition");
   if (unsmob_moment (s))
-    {
-      measposp = *unsmob_moment (s);
-    }
+    measposp = *unsmob_moment (s);
   else
     {
       measposp = now;
@@ -132,9 +105,7 @@ Timing_translator::start_translation_timestep ()
   SCM barn = get_property ("currentBarNumber");
   int b = 0;
   if (scm_is_number (barn))
-    {
-      b = scm_to_int (barn);
-    }
+    b = scm_to_int (barn);
 
   SCM cad = get_property ("timing");
   bool c = to_boolean (cad);
@@ -146,12 +117,19 @@ Timing_translator::start_translation_timestep ()
       b++;
     }
 
-  context ()->set_property ("currentBarNumber", scm_int2num (b));
+  context ()->set_property ("currentBarNumber", scm_from_int (b));
   context ()->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Timing_translator,
                "This engraver adds the alias "
-               "@code{Timing} to its containing context.",
-
-               "", "", "", "", "");
+               "@code{Timing} to its containing context."
+               "Responsible for synchronizing timing information from staves.  "
+               "Normally in @code{Score}.  In order to create polyrhythmic music, "
+               "this engraver should be removed from @code{Score} and placed in "
+               "@code{Staff}. "
+               "\n\nThis engraver adds the alias @code{Timing} to its containing context.",
+
+               "", "", "", "");