X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=77f1e75e943d6abe7854924f32e809cb31cb7001;hb=f5e5c04d731e93b1d8d4cf7e7697f71f6e7c2bdf;hp=f6808850642858dedad59a8e678a7c2605545f15;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index f680885064..77f1e75e94 100644
--- 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature-engraver.hh"
@@ -18,7 +18,7 @@ Time_signature_engraver::Time_signature_engraver()
 }
 
 void
-Time_signature_engraver::do_process_requests()
+Time_signature_engraver::do_process_music()
 {
   Translator * result =
     daddy_grav_l()->get_simple_translator ("Timing_engraver");	// ugh
@@ -26,7 +26,7 @@ Time_signature_engraver::do_process_requests()
   if (!result)
     {
       warning (_ ("lost in time:"));
-      warning (_f ("Can't find: `%s'", " Timing_translator"));
+      warning (_f ("can't find: `%s'", " Timing_translator"));
       return ;
     }
   
@@ -35,13 +35,11 @@ Time_signature_engraver::do_process_requests()
   Time_signature_change_req *req = timing_grav_l->time_signature_req_l();
   if (req)
     {
-      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_->set_elt_property (break_priority_scm_sym, gh_int2scm (1)); // 1
+      time_signature_p_ = new Time_signature (get_property ("basicTimeSignatureProperties"));
+
+      time_signature_p_->set_elt_property ("fraction",
+					   gh_cons (gh_int2scm (req->beats_i_),
+						    gh_int2scm (req->one_beat_i_))); 
     }
 
   
@@ -54,7 +52,6 @@ Time_signature_engraver::do_pre_move_processing()
 {
   if (time_signature_p_) 
     {
-
       typeset_element (time_signature_p_);
       time_signature_p_ =0;
     }
@@ -63,3 +60,4 @@ Time_signature_engraver::do_pre_move_processing()
 
 ADD_THIS_TRANSLATOR(Time_signature_engraver);
  
+