X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=2ddb9ab0b7d5ab0eb4b819040988cf32674c1b3f;hb=7fe7bd5c2266a35c7815314d757fca3bc80917b4;hp=8684c9d5cdf0cd664e3f9110ad289c6e6170c520;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 8684c9d5cd..2ddb9ab0b7 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,35 +3,39 @@
 
   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@xs4all.nl>
 */
 
 #include "time-signature.hh"
 #include "warn.hh"
-
-#include "engraver.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.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:
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
 };
 
+void
+Time_signature_engraver::derived_mark () const
+{
+  scm_gc_mark (last_time_fraction_);
+}
 
 Time_signature_engraver::Time_signature_engraver ()
-{ 
-  time_signature_ =0;
+{
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
@@ -41,50 +45,41 @@ 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))
+      && scm_is_pair (fr))
     {
-      int den = gh_scm2int (gh_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,
-		      gh_scm2int (gh_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");
-      time_signature_->set_grob_property ("fraction",fr);
 
-      if (time_signature_)
-	announce_grob(time_signature_, SCM_EOL);
+      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 */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Time_signature_engraver,
+		/* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+		/* create */ "TimeSignature",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");