release: 1.5.29

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 69646280db0da218a08f003925d9c465c0ee9b6e..f352b498f0e84ae87391181d09fb8098136945d5 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
@@ -17,32 +17,34 @@
 /**
   generate time_signatures. 
   */
-class Time_signature_engraver : public Engraver {
+class Time_signature_engraver : public Engraver
+{
+  Item * time_signature_p_;
+  SCM last_time_fraction_;
+
 protected:
-  virtual void stop_translation_timestep();
+  virtual void stop_translation_timestep ();
   virtual void create_grobs ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Item * time_signature_p_;
-  SCM last_time_fraction_;
-  Time_signature_engraver();
+  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+
 };
 
 
-Time_signature_engraver::Time_signature_engraver()
+Time_signature_engraver::Time_signature_engraver ()
 { 
   time_signature_p_ =0;
-  last_time_fraction_ = SCM_EOL;
+  last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::create_grobs()
+Time_signature_engraver::create_grobs ()
 {
   /*
     not rigorously safe, since the value might get GC'd and
     reallocated in the same spot */
   SCM fr= get_property ("timeSignatureFraction");
-  if (last_time_fraction_ != fr)
+  if (!time_signature_p_ && last_time_fraction_ != fr)
     {
       last_time_fraction_ = fr; 
       time_signature_p_ = new Item (get_property ("TimeSignature"));
@@ -57,7 +59,7 @@ Time_signature_engraver::create_grobs()
 
 
 void
-Time_signature_engraver::stop_translation_timestep()
+Time_signature_engraver::stop_translation_timestep ()
 {
   if (time_signature_p_) 
     {
@@ -67,6 +69,12 @@ Time_signature_engraver::stop_translation_timestep()
 }
 
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
+
  
 
+ENTER_DESCRIPTION(Time_signature_engraver,
+/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+/* creats*/       "TimeSignature",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");