X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=9d4343360475191038b51b32c6521d394b17d7f2;hb=0c1bd11621381ae88080162e13a54110f5bc3860;hp=c904595505b5e824856ddbc2e17c6fc6aaad9efb;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index c904595505..9d43433604 100644
--- 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--2009 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:
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_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;
@@ -52,13 +62,18 @@ Time_signature_engraver::process_music ()
 	    OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 	  */
 	  warning (_f ("strange time signature found: %d/%d",
-		       den,
-		       scm_to_int (scm_car (fr))));
+		       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;
     }
 }
 
@@ -71,9 +86,17 @@ Time_signature_engraver::stop_translation_timestep ()
 #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 */
+		""
+		);