X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=2ddb9ab0b7d5ab0eb4b819040988cf32674c1b3f;hb=bbd89dfe7865636f9fb1eccf9326db4831f632e8;hp=35743ad24f253c9bcd48f5ed55fffae61897d625;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 35743ad24f..2ddb9ab0b7 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,70 +1,85 @@
 /*
-  time_signature-reg.cc -- implement Time_signature_engraver
+  time-signature-engraver.cc -- implement Time_signature_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "time-signature-engraver.hh"
 #include "time-signature.hh"
-#include "command-request.hh"
-#include "timing-engraver.hh"
+#include "warn.hh"
 #include "engraver-group.hh"
+#include "misc.hh"
 
-Time_signature_engraver::Time_signature_engraver()
-{ 
-  time_signature_p_ =0;
-}
+/**
+   generate time_signatures.
+*/
+class Time_signature_engraver : public Engraver
+{
+  Item *time_signature_;
+  SCM last_time_fraction_;
+
+protected:
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
+public:
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
+};
 
 void
-Time_signature_engraver::do_process_requests()
+Time_signature_engraver::derived_mark () const
 {
-  Translator * result =
-    daddy_grav_l()->get_simple_translator (Timing_engraver::static_name ());	// ugh
-
-  if (!result)
-    {
-      warning (_ ("lost in time") + ": " + _ ("can't find") 
-        + " Timing_translator");
-      return ;
-    }
-  
-  Timing_engraver * timing_grav_l= dynamic_cast<Timing_engraver *> (result);
-  
-  Time_signature_change_req *req = timing_grav_l->time_signature_req_l();
-  if (req)
-    {
-      Array<Real> args;
-      args.push (req->beats_i_);
-      args.push (req->one_beat_i_);
-	
-      time_signature_p_ = new Time_signature ();
-      time_signature_p_->args_ = args;
-      time_signature_p_->break_priority_i_ = 1; // ugh
-    }
+  scm_gc_mark (last_time_fraction_);
+}
 
-  
-  if (time_signature_p_)
-    announce_element (Score_element_info (time_signature_p_, req));
+Time_signature_engraver::Time_signature_engraver ()
+{
+  time_signature_ = 0;
+  last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::do_pre_move_processing()
+Time_signature_engraver::process_music ()
 {
-  if (time_signature_p_) 
+  /*
+    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_is_pair (fr))
     {
-      Scalar sigstyle = get_property ("timeSignatureStyle");
-      if (sigstyle.length_i ())
+      int den = scm_to_int (scm_cdr (fr));
+      if (den != (1 << intlog2 (den)))
 	{
-	  time_signature_p_->time_sig_type_str_ = sigstyle;
+	  /*
+	    Todo: should make typecheck?
+
+	    OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+	  */
+	  warning (_f ("strange time signature found: %d/%d",
+		       den,
+		       scm_to_int (scm_car (fr))));
 	}
 
-      typeset_element (time_signature_p_);
-      time_signature_p_ =0;
+      last_time_fraction_ = fr;
+      time_signature_ = make_item ("TimeSignature", SCM_EOL);
+      time_signature_->set_property ("fraction", fr);
     }
 }
 
+void
+Time_signature_engraver::stop_translation_timestep ()
+{
+  time_signature_ = 0;
+}
+
+#include "translator.icc"
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
-IMPLEMENT_IS_TYPE_B1(Time_signature_engraver,Engraver); 
+ADD_TRANSLATOR (Time_signature_engraver,
+		/* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+		/* create */ "TimeSignature",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");