X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=ec4ff28efc58ea7e8bc2dcb216b7d21b233fc08a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=11bc922e4c8e5008816bbb2d26ba754df60925ad;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 11bc922e4c..ec4ff28efc 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,33 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "time-signature.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_;
+  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);
+  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;
+{
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
@@ -39,33 +48,55 @@ Time_signature_engraver::process_music ()
   /*
     not rigorously safe, since the value might get GC'd and
     reallocated in the same spot */
-  SCM fr= get_property ("timeSignatureFraction");
-  if (!time_signature_ && last_time_fraction_ != fr)
+  SCM fr = get_property ("timeSignatureFraction");
+  if (!time_signature_
+      && last_time_fraction_ != fr
+      && scm_is_pair (fr))
     {
-      last_time_fraction_ = fr; 
-      time_signature_ = new Item (get_property ("TimeSignature"));
-      time_signature_->set_grob_property ("fraction",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 ("strange time signature found: %d/%d",
+		       int (scm_to_int (scm_car (fr))),
+		       den));
+	}
 
-      if (time_signature_)
-	announce_grob(time_signature_, SCM_EOL);
+      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;
     }
 }
 
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_) 
-    {
-      typeset_grob (time_signature_);
-      time_signature_ =0;
-    }
+  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 */
+		""
+		);