X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=1c6cd69bd4518b4571caf4b1e931c2bb8a612b9e;hb=0b0975b706cf71a843f46140acc8cf6e3d97e4e5;hp=99f7898328d9edc056864ba051f3bb03ae834e81;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 99f7898328..1c6cd69bd4 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,83 +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--2012 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 "timing-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 do_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_;
-
-  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::do_process_music()
+Time_signature_engraver::process_music ()
 {
   /*
-    UGH.
-    this should use properties.
-   */
-  Translator * result =
-    daddy_grav_l()->get_simple_translator ("Timing_engraver");	// ugh
-
-  if (!result)
-    {
-      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)
+    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
+      && scm_is_pair (fr))
     {
-      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_))); 
+      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_, req);
 }
 
 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.",
+
+                /* create */
+                "TimeSignature ",
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
- 
+                /* read */
+                "implicitTimeSignatureVisibility "
+                "timeSignatureFraction ",
 
+                /* write */
+                ""
+               );