* Documentation/user/refman.itely: remove superfluous -'s

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 5e85cf3c5bbb64cef5fd9c176f35f17b774a2554..ff335a0f974827ffc329fcba4eede009a45a81d3 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,25 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
-#include "command-request.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_p_;
+  Item * time_signature_;
   SCM last_time_fraction_;
 
 protected:
   virtual void stop_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_music ();
 public:
   TRANSLATOR_DECLARATIONS(Time_signature_engraver);
 };
@@ -29,35 +31,52 @@ public:
 
 Time_signature_engraver::Time_signature_engraver ()
 { 
-  time_signature_p_ =0;
+  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)
+  if (!time_signature_
+      && last_time_fraction_ != fr
+      && gh_pair_p (fr))
     {
+      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))
+                     ));
+       }
+  
+      
       last_time_fraction_ = fr; 
-      time_signature_p_ = new Item (get_property ("TimeSignature"));
-      time_signature_p_->set_grob_property ("fraction",fr);
+      time_signature_ = new Item (get_property ("TimeSignature"));
+      time_signature_->set_grob_property ("fraction",fr);
 
-      if (time_signature_p_)
-       announce_grob(time_signature_p_, SCM_EOL);
+      if (time_signature_)
+       announce_grob(time_signature_, SCM_EOL);
     }
 }
 
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_p_) 
+  if (time_signature_) 
     {
-      typeset_grob (time_signature_p_);
-      time_signature_p_ =0;
+      typeset_grob (time_signature_);
+      time_signature_ =0;
     }
 }
  
@@ -65,6 +84,7 @@ Time_signature_engraver::stop_translation_timestep ()
 ENTER_DESCRIPTION(Time_signature_engraver,
 /* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 /* creats*/       "TimeSignature",
-/* acks  */       "",
+/* accepts */     "",
+/* acks  */      "",
 /* reads */       "",
 /* write */       "");