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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index d3ed3f6a1e..9d43433604 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,34 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "time-signature.hh"
-#include "warn.hh"
+#include "engraver-group.hh"
 
-#include "engraver.hh"
-#include "engraver-group-engraver.hh"
+#include "item.hh"
+#include "international.hh"
 #include "misc.hh"
+#include "time-signature.hh"
+#include "warn.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;
 }
@@ -46,24 +53,27 @@ Time_signature_engraver::process_music ()
       && last_time_fraction_ != fr
       && scm_is_pair (fr))
     {
-      int den = scm_to_int (ly_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,
-		      scm_to_int (ly_car (fr))
-		      ));
+	  */
+	  warning (_f ("strange time signature found: %d/%d",
+		       int (scm_to_int (scm_car (fr))),
+		       den));
 	}
-  
+
+      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; 
-      time_signature_ = make_item ("TimeSignature",SCM_EOL);
-      time_signature_->set_property ("fraction",fr);
+      last_time_fraction_ = fr;
     }
 }
 
@@ -72,12 +82,21 @@ Time_signature_engraver::stop_translation_timestep ()
 {
   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 @ref{TimeSignature} whenever"
+		" @code{timeSignatureFraction} changes.",
+
+		/* create */
+		"TimeSignature ",
+		
+		/* read */
+		"implicitTimeSignatureVisibility "
+		"timeSignatureFraction ",
+
+		/* write */
+		""
+		);