patch::: 1.3.58.jcn2

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 35743ad24f253c9bcd48f5ed55fffae61897d625..77f1e75e943d6abe7854924f32e809cb31cb7001 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--2000 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()
 { 
@@ -18,15 +18,15 @@ 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::static_name ());   // ugh
+    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 ;
     }
   
@@ -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<Real> 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_ = 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,12 +52,6 @@ Time_signature_engraver::do_pre_move_processing()
 {
   if (time_signature_p_) 
     {
-      Scalar sigstyle = get_property ("timeSignatureStyle");
-      if (sigstyle.length_i ())
-       {
-         time_signature_p_->time_sig_type_str_ = sigstyle;
-       }
-
       typeset_element (time_signature_p_);
       time_signature_p_ =0;
     }
@@ -67,4 +59,5 @@ Time_signature_engraver::do_pre_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Time_signature_engraver);
-IMPLEMENT_IS_TYPE_B1(Time_signature_engraver,Engraver); 
+ 
+