X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=d57b35bf6eae9bb95c04d2d0d1dde3d85c9f6764;hb=616820eb02249fe731df7a5dabf975a108fa2970;hp=5b7b384e79b53fbc878ce6c3d850a59fe9c8478e;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 5b7b384e79..d57b35bf6e 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,71 +1,139 @@
 /*
-  time-signature-engraver.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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2002 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.
+
+  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 "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 "moment.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /**
-  generate time_signatures. 
-  */
+   generate time_signatures.
+*/
 class Time_signature_engraver : public Engraver
 {
-  Item * time_signature_;
+  Item *time_signature_;
   SCM last_time_fraction_;
+  SCM time_cause_;
 
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_engraver);
+  TRANSLATOR_DECLARATIONS (Time_signature_engraver);
+  void listen_time_signature (Stream_event *);
 };
 
+void
+Time_signature_engraver::derived_mark () const
+{
+  scm_gc_mark (last_time_fraction_);
+  scm_gc_mark (time_cause_);
+}
 
 Time_signature_engraver::Time_signature_engraver ()
-{ 
-  time_signature_ =0;
+{
+  time_signature_ = 0;
+  time_cause_ = SCM_EOL;
   last_time_fraction_ = SCM_BOOL_F;
 }
 
+void
+Time_signature_engraver::listen_time_signature (Stream_event *ev)
+{
+  time_cause_ = ev->self_scm ();
+}
+
 void
 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_)
+    return;
+
+  SCM fr = get_property ("timeSignatureFraction");
+  if (last_time_fraction_ != fr
+      && scm_is_pair (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_cause_);
+      time_signature_->set_property ("fraction", fr);
+
+      if (scm_is_false (last_time_fraction_))
+        time_signature_->set_property ("break-visibility",
+                                       get_property ("initialTimeSignatureVisibility"));
+
+      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.
+          */
+          time_signature_->warning (_f ("strange time signature found: %d/%d",
+                                        int (scm_to_int (scm_car (fr))),
+                                        den));
+        }
 
-      if (time_signature_)
-	announce_grob(time_signature_, SCM_EOL);
+      last_time_fraction_ = fr;
     }
 }
 
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
-  if (time_signature_) 
+  if (time_signature_ && !scm_is_null (time_cause_))
     {
-      typeset_grob (time_signature_);
-      time_signature_ =0;
+      Moment *mp = unsmob<Moment> (get_property ("measurePosition"));
+      if (mp && (mp->main_part_ > Rational (0))
+          && !to_boolean (get_property ("partialBusy")))
+        time_signature_->warning ("mid-measure time signature without \\partial");
     }
+
+  time_signature_ = 0;
+  time_cause_ = SCM_EOL;
 }
- 
-
-ENTER_DESCRIPTION(Time_signature_engraver,
-/* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
-/* creats*/       "TimeSignature",
-/* accepts */     "general-music",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+
+void
+Time_signature_engraver::boot ()
+{
+  ADD_LISTENER (Time_signature_engraver, time_signature);
+}
+
+ADD_TRANSLATOR (Time_signature_engraver,
+                /* doc */
+                "Create a @ref{TimeSignature} whenever"
+                " @code{timeSignatureFraction} changes.",
+
+                /* create */
+                "TimeSignature ",
+
+                /* read */
+                "initialTimeSignatureVisibility "
+                "partialBusy "
+                "timeSignatureFraction ",
+
+                /* write */
+                ""
+               );