X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=36e24e2439112bbe5f805c9b11a1357a1b3f96c5;hb=a1c2a3a778efafbb8abbd44eb212a3f52f34c5f9;hp=2499bcba2eaed945e7e116e8372e7b24a67c177d;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 2499bcba2e..36e24e2439 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,69 +1,113 @@
 /*
-  time_signature-reg.cc -- implement Time_signature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-#include "time-signature.hh"
-#include "command-request.hh"
-#include "engraver.hh"
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#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:
-  void deprecated_process_music();
-  virtual void do_pre_move_processing();
+  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;
-  last_time_fraction_ = SCM_EOL;
+Time_signature_engraver::Time_signature_engraver ()
+{
+  time_signature_ = 0;
+  last_time_fraction_ = SCM_BOOL_F;
 }
 
 void
-Time_signature_engraver::deprecated_process_music()
+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 (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_elt_property ("fraction",fr);
+      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;
     }
-  
-  if (time_signature_p_)
-    announce_element (time_signature_p_, 0);
 }
 
 void
-Time_signature_engraver::do_pre_move_processing()
+Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_p_) 
-    {
-      typeset_element (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 */
+		""
+		);