* lily/my-lily-lexer.cc (set_encoding): New method.

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

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 5d3d7a6fb7b2044c2e16141b18d09869a2f6e663..017dd42b7bea566146f464a293f6bbc5cf40716a 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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. 
@@ -23,7 +25,7 @@ protected:
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
 };
 
 
@@ -40,14 +42,31 @@ 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_ && 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_ = new Item (get_property ("TimeSignature"));
-      time_signature_->set_grob_property ("fraction",fr);
+      time_signature_ = make_item ("TimeSignature");
+      time_signature_->set_property ("fraction",fr);
 
       if (time_signature_)
-       announce_grob(time_signature_, SCM_EOL);
+       announce_grob (time_signature_, SCM_EOL);
     }
 }
 
@@ -62,9 +81,10 @@ Time_signature_engraver::stop_translation_timestep ()
 }
  
 
-ENTER_DESCRIPTION(Time_signature_engraver,
+ENTER_DESCRIPTION (Time_signature_engraver,
 /* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 /* creats*/       "TimeSignature",
-/* acks  */       "",
+/* accepts */     "",
+/* acks  */      "",
 /* reads */       "",
 /* write */       "");