X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=e4e76e17d685154c2868ab75c2efd8d8feae5dbe;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=d72ba64645c65468968bf1b8c50da8fcdc74b09e;hpb=fcc5f76615e024803904a055902fdc6a3b24dccb;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index d72ba64645..e4e76e17d6 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2007 Han-Wen Nienhuys <hanwen@xs4all.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 "engraver-group.hh"
@@ -11,9 +22,12 @@
 #include "item.hh"
 #include "international.hh"
 #include "misc.hh"
-#include "time-signature.hh"
+#include "moment.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 /**
    generate time_signatures.
 */
@@ -21,6 +35,7 @@ class Time_signature_engraver : public Engraver
 {
   Item *time_signature_;
   SCM last_time_fraction_;
+  SCM time_cause_;
 
 protected:
   virtual void derived_mark () const;
@@ -28,51 +43,59 @@ protected:
   void process_music ();
 public:
   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_engraver::Time_signature_engraver (Context *c)
+  : Engraver (c)
 {
   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 */
+  if (time_signature_)
+    return;
+
   SCM fr = get_property ("timeSignatureFraction");
-  if (!time_signature_
-      && last_time_fraction_ != fr
-      && scm_is_pair (fr))
+  if (!scm_is_eq (last_time_fraction_, fr) && scm_is_pair (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.
-	  */
-	  warning (_f ("strange time signature found: %d/%d",
-		       den,
-		       int (scm_to_int (scm_car (fr)))));
-	}
-
-      time_signature_ = make_item ("TimeSignature", SCM_EOL);
-      time_signature_->set_property ("fraction", fr);
+        {
+          /*
+            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 (last_time_fraction_ == SCM_BOOL_F)
-	time_signature_->set_property ("break-visibility",
-				       get_property ("implicitTimeSignatureVisibility"));
-      
       last_time_fraction_ = fr;
     }
 }
@@ -80,23 +103,37 @@ Time_signature_engraver::process_music ()
 void
 Time_signature_engraver::stop_translation_timestep ()
 {
+  if (time_signature_ && !scm_is_null (time_cause_))
+    {
+      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;
 }
 
-#include "translator.icc"
+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 */
-		"implicitTimeSignatureVisibility "
-		"timeSignatureFraction ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Create a @ref{TimeSignature} whenever"
+                " @code{timeSignatureFraction} changes.",
+
+                /* create */
+                "TimeSignature ",
+
+                /* read */
+                "initialTimeSignatureVisibility "
+                "partialBusy "
+                "timeSignatureFraction ",
+
+                /* write */
+                ""
+               );