(conv): \apply -> \applymusic

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 20d1196cac2e7402d8c45851af1188fb33ad3b51..2a5a456ffc93bf753c0172f1eeab08c080fa7e49 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"
@@ -25,7 +25,7 @@ protected:
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
 };
 
 
@@ -44,9 +44,9 @@ Time_signature_engraver::process_music ()
   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,19 +54,16 @@ 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);
     }
 }
 
@@ -81,7 +78,7 @@ Time_signature_engraver::stop_translation_timestep ()
 }
  
 
-ENTER_DESCRIPTION(Time_signature_engraver,
+ENTER_DESCRIPTION (Time_signature_engraver,
 /* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 /* creats*/       "TimeSignature",
 /* accepts */     "",