release: 1.3.1

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 2045dcb4b07f0509ff8a9a1685d1ad8758ff8482..f6808850642858dedad59a8e678a7c2605545f15 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()
 { 
@@ -25,8 +25,8 @@ Time_signature_engraver::do_process_requests()
 
   if (!result)
     {
-      warning (_ ("lost in time") + ": " + _ ("can't find") 
-        + " Timing_translator");
+      warning (_ ("lost in time:"));
+      warning (_f ("Can't find: `%s'", " Timing_translator"));
       return ;
     }
   
@@ -41,7 +41,7 @@ Time_signature_engraver::do_process_requests()
        
       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,11 +54,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;