patch::: 1.3.15.jcn4

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 75d803226ba608eaa17c7cbfc6e32ab371bc0b0d..bba35fe2b1d9421f1f3ea7cd4ab034eb03a210e7 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,14 +3,14 @@
 
   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"
 #include "time-signature.hh"
 #include "command-request.hh"
 #include "timing-engraver.hh"
-#include "engraver-group.hh"
+#include "engraver-group-engraver.hh"
 
 Time_signature_engraver::Time_signature_engraver()
 { 
@@ -21,28 +21,30 @@ 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)
     {
-      warning (_ ("lost in time") + ": " + _ ("can't find") 
-        + " Timing_translator");
+      warning (_ ("lost in time:"));
+      warning (_f ("Can't find: `%s'", " Timing_translator"));
       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 (args);
-      time_signature_p_->break_priority_i_ = 1; // ugh
+      time_signature_p_ = new Time_signature;
+      time_signature_p_->args_ = args;
+      time_signature_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
     }
 
+  
   if (time_signature_p_)
     announce_element (Score_element_info (time_signature_p_, req));
 }
@@ -59,4 +61,5 @@ Time_signature_engraver::do_pre_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Time_signature_engraver);
-IMPLEMENT_IS_TYPE_B1(Time_signature_engraver,Engraver); 
+ 
+