X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=df4a4114c74b67425d2a126960f0ced83f1dac1d;hb=4c6280c2ba6b0485aae7da731def216c2524bd0b;hp=e217fd900378309cab19e337cba3c17a3533eab4;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index e217fd9003..df4a4114c7 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,32 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver-group.hh"
+
+#include "international.hh"
+#include "misc.hh"
 #include "time-signature.hh"
 #include "warn.hh"
-#include "engraver-group-engraver.hh"
-#include "misc.hh"
 
 /**
-  generate time_signatures. 
-  */
+   generate time_signatures.
+*/
 class Time_signature_engraver : public Engraver
 {
   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);
 };
 
+void
+Time_signature_engraver::derived_mark () const
+{
+  scm_gc_mark (last_time_fraction_);
+}
 
 Time_signature_engraver::Time_signature_engraver ()
-{ 
+{
   time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
@@ -51,15 +59,13 @@ Time_signature_engraver::process_music ()
 	    Todo: should make typecheck?
 
 	    OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-	   */
-	  warning (_f ("Found strange time signature %d/%d.",
-		      den,
-		      scm_to_int (scm_car (fr))
-		      ));
+	  */
+	  warning (_f ("strange time signature found: %d/%d",
+		       den,
+		       scm_to_int (scm_car (fr))));
 	}
-  
-      
-      last_time_fraction_ = fr; 
+
+      last_time_fraction_ = fr;
       time_signature_ = make_item ("TimeSignature", SCM_EOL);
       time_signature_->set_property ("fraction", fr);
     }
@@ -70,12 +76,12 @@ Time_signature_engraver::stop_translation_timestep ()
 {
   time_signature_ = 0;
 }
- 
+
+#include "translator.icc"
 
 ADD_TRANSLATOR (Time_signature_engraver,
-/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
-/* creats*/       "TimeSignature",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+		/* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+		/* create */ "TimeSignature",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");