release: 1.1.39

[lilypond.git] / lily / time-signature-engraver.cc

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index b72d78460853e73712695352555af1c5a69c9ee2..54c6278e97c85bff7c068a43254fb0df081c7eba 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature-engraver.hh"
@@ -21,7 +21,7 @@ void
 Time_signature_engraver::do_process_requests()
 {
   Translator * result =
-    daddy_grav_l()->get_simple_translator (Timing_engraver::static_name());
+    daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh
 
   if (!result)
     {
@@ -30,18 +30,18 @@ Time_signature_engraver::do_process_requests()
       return ;
     }
   
-  Timing_engraver * timing_grav_l= (Timing_engraver*) result->engraver_l ();
+  Timing_engraver * timing_grav_l= dynamic_cast<Timing_engraver *> (result);
   
   Time_signature_change_req *req = timing_grav_l->time_signature_req_l();
   if (req)
     {
-      Array<Scalar> args;
+      Array<int> args;
       args.push (req->beats_i_);
       args.push (req->one_beat_i_);
        
       time_signature_p_ = new Time_signature ();
       time_signature_p_->args_ = args;
-      time_signature_p_->break_priority_i_ = 1; // ugh
+      time_signature_p_->set_elt_property (break_priority_scm_sym, gh_int2scm (1)); // 1
     }
 
   
@@ -54,7 +54,7 @@ Time_signature_engraver::do_pre_move_processing()
 {
   if (time_signature_p_) 
     {
-      Scalar sigstyle = get_property ("timeSignatureStyle");
+      Scalar sigstyle = get_property ("timeSignatureStyle", 0);
       if (sigstyle.length_i ())
        {
          time_signature_p_->time_sig_type_str_ = sigstyle;
@@ -67,4 +67,4 @@ Time_signature_engraver::do_pre_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Time_signature_engraver);
-IMPLEMENT_IS_TYPE_B1(Time_signature_engraver,Engraver); 
+