X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=77fd444f129f399ab70f0277491f6811668341e8;hb=da18ce55e6c6755ba018ec35a8ce8d59c9dde1e0;hp=2a5a456ffc93bf753c0172f1eeab08c080fa7e49;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 2a5a456ffc..77fd444f12 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,22 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
 #include "warn.hh"
-
-#include "engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "misc.hh"
 
 /**
-  generate time_signatures. 
-  */
+   generate time_signatures.
+*/
 class Time_signature_engraver : public Engraver
 {
-  Item * time_signature_;
+  Item *time_signature_;
   SCM last_time_fraction_;
 
 protected:
@@ -28,10 +26,9 @@ public:
   TRANSLATOR_DECLARATIONS (Time_signature_engraver);
 };
 
-
 Time_signature_engraver::Time_signature_engraver ()
-{ 
-  time_signature_ =0;
+{
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
@@ -41,47 +38,40 @@ 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
-      && ly_c_pair_p (fr))
+      && scm_is_pair (fr))
     {
-      int den = ly_scm2int (ly_cdr (fr));
+      int den = scm_to_int (scm_cdr (fr));
       if (den != (1 << intlog2 (den)))
 	{
 	  /*
 	    Todo: should make typecheck?
 
 	    OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-	   */
-	  warning (_f ("Found strange time signature %d/%d.",
-		      den,
-		      ly_scm2int (ly_car (fr))
-		      ));
+	  */
+	  warning (_f ("strange time signature found: %d/%d",
+		       den,
+		       scm_to_int (scm_car (fr))));
 	}
-  
-      
-      last_time_fraction_ = fr; 
-      time_signature_ = make_item ("TimeSignature",SCM_EOL);
-      time_signature_->set_property ("fraction",fr);
+
+      last_time_fraction_ = fr;
+      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,
-/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
-/* creats*/       "TimeSignature",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Time_signature_engraver,
+		/* descr */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+		/* creats*/ "TimeSignature",
+		/* accepts */ "",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");