* lily/ambitus-engraver.cc (create_ambitus): change name to

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index be062c5fda5c273bfa16b15747e2743b34ef2cbf..60c9a63411d1671618ce9be588a97ff06ae62f4b 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -18,7 +18,7 @@
   */
 class Time_signature_engraver : public Engraver
 {
-  Item * time_signature_;
+  Item *time_signature_;
   SCM last_time_fraction_;
 
 protected:
@@ -31,7 +31,7 @@ public:
 
 Time_signature_engraver::Time_signature_engraver ()
 { 
-  time_signature_ =0;
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
@@ -41,10 +41,10 @@ Time_signature_engraver::process_music ()
   /*
     not rigorously safe, since the value might get GC'd and
     reallocated in the same spot */
-  SCM fr= get_property ("timeSignatureFraction");
+  SCM fr = get_property ("timeSignatureFraction");
   if (!time_signature_
       && last_time_fraction_ != fr
-      && is_pair (fr))
+      && ly_c_pair_p (fr))
     {
       int den = ly_scm2int (ly_cdr (fr));
       if (den != (1 << intlog2 (den)))
@@ -62,22 +62,15 @@ Time_signature_engraver::process_music ()
   
       
       last_time_fraction_ = fr; 
-      time_signature_ = make_item ("TimeSignature");
+      time_signature_ = make_item ("TimeSignature",SCM_EOL);
       time_signature_->set_property ("fraction",fr);
-
-      if (time_signature_)
-       announce_grob (time_signature_, SCM_EOL);
     }
 }
 
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_) 
-    {
-      typeset_grob (time_signature_);
-      time_signature_ =0;
-    }
+  time_signature_ = 0;
 }