Run `make grand-replace'.

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 5dc4913a80de7d10b1b1e176369d3a96aa5f8490..ec4ff28efc58ea7e8bc2dcb216b7d21b233fc08a 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,13 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver-group.hh"
+
+#include "item.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.
@@ -20,12 +23,19 @@ class Time_signature_engraver : public Engraver
   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;
@@ -51,14 +61,19 @@ Time_signature_engraver::process_music ()
 
            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",
+                      int (scm_to_int (scm_car (fr))),
+                      den));
        }
 
-      last_time_fraction_ = fr;
       time_signature_ = make_item ("TimeSignature", SCM_EOL);
       time_signature_->set_property ("fraction", fr);
+
+      if (last_time_fraction_ == SCM_BOOL_F)
+       time_signature_->set_property ("break-visibility",
+                                      get_property ("implicitTimeSignatureVisibility"));
+      
+      last_time_fraction_ = fr;
     }
 }
 
@@ -68,10 +83,20 @@ 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 @ref{TimeSignature} whenever"
+               " @code{timeSignatureFraction} changes.",
+
+               /* create */
+               "TimeSignature ",
+               
+               /* read */
+               "implicitTimeSignatureVisibility "
+               "timeSignatureFraction ",
+
+               /* write */
+               ""
+               );