X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=8684c9d5cdf0cd664e3f9110ad289c6e6170c520;hb=5cc390968095201b69f142ad01842ac3f08144a2;hp=d9051d59aee360913ab2f5cc3aab0e03233c1ea2;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index d9051d59ae..8684c9d5cd 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,70 +1,90 @@
 /*
-  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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "time-signature-engraver.hh"
 #include "time-signature.hh"
-#include "command-request.hh"
-#include "timing-engraver.hh"
+#include "warn.hh"
+
+#include "engraver.hh"
 #include "engraver-group-engraver.hh"
+#include "misc.hh"
+
+/**
+  generate time_signatures. 
+  */
+class Time_signature_engraver : public Engraver
+{
+  Item * time_signature_;
+  SCM last_time_fraction_;
 
-Time_signature_engraver::Time_signature_engraver()
+protected:
+  virtual void stop_translation_timestep ();
+  virtual void process_music ();
+public:
+  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+};
+
+
+Time_signature_engraver::Time_signature_engraver ()
 { 
-  time_signature_p_ =0;
+  time_signature_ =0;
+  last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::do_process_requests()
+Time_signature_engraver::process_music ()
 {
-  Translator * result =
-    daddy_grav_l()->get_simple_translator ("Timing_engraver");	// ugh
-
-  if (!result)
+  /*
+    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
+      && gh_pair_p (fr))
     {
-      warning (_ ("lost in time:"));
-      warning (_f ("Can't find: `%s'", " 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<int> 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_->set_elt_property (break_priority_scm_sym, gh_int2scm (1)); // 1
-    }
+      int den = gh_scm2int (gh_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,
+		      gh_scm2int (gh_car (fr))
+		      ));
+	}
   
-  if (time_signature_p_)
-    announce_element (Score_element_info (time_signature_p_, req));
+      
+      last_time_fraction_ = fr; 
+      time_signature_ = make_item ("TimeSignature");
+      time_signature_->set_grob_property ("fraction",fr);
+
+      if (time_signature_)
+	announce_grob(time_signature_, SCM_EOL);
+    }
 }
 
 void
-Time_signature_engraver::do_pre_move_processing()
+Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_p_) 
+  if (time_signature_) 
     {
-      SCM sigstyle = get_property ("timeSignatureStyle", 0);
-      if (gh_string_p (sigstyle))
-	{
-	  time_signature_p_->time_sig_type_str_ = ly_scm2string (sigstyle);
-	}
-
-      typeset_element (time_signature_p_);
-      time_signature_p_ =0;
+      typeset_grob (time_signature_);
+      time_signature_ =0;
     }
 }
-
-
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
  
+
+ENTER_DESCRIPTION(Time_signature_engraver,
+/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+/* creats*/       "TimeSignature",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");