Run `make grand-replace'.

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index caabdb6e254fafc13b720d3e713fffb825e2f32f..ec4ff28efc58ea7e8bc2dcb216b7d21b233fc08a 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,72 +1,102 @@
 /*
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "time-signature.hh"
-#include "command-request.hh"
-#include "engraver.hh"
-
-
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 
+#include "item.hh"
+#include "international.hh"
+#include "misc.hh"
+#include "time-signature.hh"
+#include "warn.hh"
 
 /**
-  generate time_signatures. 
-  */
-class Time_signature_engraver : public Engraver {
+   generate time_signatures.
+*/
+class Time_signature_engraver : public Engraver
+{
+  Item *time_signature_;
+  SCM last_time_fraction_;
+
 protected:
-  virtual void stop_translation_timestep();
-  virtual void create_grobs ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Item * time_signature_p_;
-  SCM last_time_fraction_;
-  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_p_ =0;
+Time_signature_engraver::Time_signature_engraver ()
+{
+  time_signature_ = 0;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::create_grobs()
+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_p_ && 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_p_ = new Item (get_property ("TimeSignature"));
-      time_signature_p_->set_grob_property ("fraction",fr);
-
-      if (time_signature_p_)
-       announce_grob (time_signature_p_, 0);
+      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));
+       }
+
+      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()
+Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_p_) 
-    {
-      typeset_grob (time_signature_p_);
-      time_signature_p_ =0;
-    }
+  time_signature_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Time_signature_engraver,
+               /* doc */
+               "Create a @ref{TimeSignature} whenever"
+               " @code{timeSignatureFraction} changes.",
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
- 
+               /* create */
+               "TimeSignature ",
+               
+               /* read */
+               "implicitTimeSignatureVisibility "
+               "timeSignatureFraction ",
 
+               /* write */
+               ""
+               );