* 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 20d1196cac2e7402d8c45851af1188fb33ad3b51..60c9a63411d1671618ce9be588a97ff06ae62f4b 100644 (file)
--- 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
@@ -18,20 +18,20 @@
   */
 class Time_signature_engraver : public Engraver
 {
-  Item * time_signature_;
+  Item *time_signature_;
   SCM last_time_fraction_;
 
 protected:
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
 };
 
 
 Time_signature_engraver::Time_signature_engraver ()
 { 
-  time_signature_ =0;
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
@@ -41,12 +41,12 @@ 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
-      && gh_pair_p (fr))
+      && ly_c_pair_p (fr))
     {
-      int den = gh_scm2int (gh_cdr (fr));
+      int den = ly_scm2int (ly_cdr (fr));
       if (den != (1 << intlog2 (den)))
        {
          /*
@@ -54,34 +54,27 @@ Time_signature_engraver::process_music ()
 
            OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
           */
-         warning (_f("Found strange time signature %d/%d.",
+         warning (_f ("Found strange time signature %d/%d.",
                      den,
-                     gh_scm2int (gh_car (fr))
+                     ly_scm2int (ly_car (fr))
                      ));
        }
   
       
       last_time_fraction_ = fr; 
-      time_signature_ = new Item (get_property ("TimeSignature"));
-      time_signature_->set_grob_property ("fraction",fr);
-
-      if (time_signature_)
-       announce_grob(time_signature_, SCM_EOL);
+      time_signature_ = make_item ("TimeSignature",SCM_EOL);
+      time_signature_->set_property ("fraction",fr);
     }
 }
 
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_) 
-    {
-      typeset_grob (time_signature_);
-      time_signature_ =0;
-    }
+  time_signature_ = 0;
 }
  
 
-ENTER_DESCRIPTION(Time_signature_engraver,
+ENTER_DESCRIPTION (Time_signature_engraver,
 /* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 /* creats*/       "TimeSignature",
 /* accepts */     "",