release: 1.5.29

[lilypond.git] / lily / time-signature-engraver.cc

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 9b44c6ded40fe2ff1ad08a5b2671fca0f0ec2d21..f352b498f0e84ae87391181d09fb8098136945d5 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,81 +3,78 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
 #include "command-request.hh"
 #include "engraver.hh"
 
-#include "timing-engraver.hh"
+
 #include "engraver-group-engraver.hh"
 
 
 /**
   generate time_signatures. 
   */
-class Time_signature_engraver : public Engraver {
+class Time_signature_engraver : public Engraver
+{
+  Item * time_signature_p_;
+  SCM last_time_fraction_;
+
 protected:
-  virtual void do_process_music();
-  virtual void do_pre_move_processing();
+  virtual void stop_translation_timestep ();
+  virtual void create_grobs ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Item * time_signature_p_;
+  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
 
-  Time_signature_engraver();
 };
 
 
-Time_signature_engraver::Time_signature_engraver()
+Time_signature_engraver::Time_signature_engraver ()
 { 
   time_signature_p_ =0;
+  last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::do_process_music()
+Time_signature_engraver::create_grobs ()
 {
   /*
-    UGH.
-    this should use properties.
-   */
-  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_p_ && last_time_fraction_ != 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)
-    {
-      time_signature_p_ = new Item (get_property ("basicTimeSignatureProperties"));
-      time_signature_p_->set_elt_property ("fraction",
-                                          gh_cons (gh_int2scm (req->beats_i_),
-                                                   gh_int2scm (req->one_beat_i_))); 
-    }
+      last_time_fraction_ = fr; 
+      time_signature_p_ = new Item (get_property ("TimeSignature"));
+      time_signature_p_->set_grob_property ("fraction",fr);
 
+      if (time_signature_p_)
+       announce_grob (time_signature_p_, 0);
+    }
   
-  if (time_signature_p_)
-    announce_element (Score_element_info (time_signature_p_, req));
 }
 
+
+
 void
-Time_signature_engraver::do_pre_move_processing()
+Time_signature_engraver::stop_translation_timestep ()
 {
   if (time_signature_p_) 
     {
-      typeset_element (time_signature_p_);
+      typeset_grob (time_signature_p_);
       time_signature_p_ =0;
     }
 }
 
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
+
  
 
+ENTER_DESCRIPTION(Time_signature_engraver,
+/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+/* creats*/       "TimeSignature",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");