X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=e10593862a50575de46d2e3a53adaa839b442743;hb=1250bccd52cc74203c10f7815008bd47635fcf83;hp=1815a865e83d51847721c38563fddc64b365d0c3;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 1815a865e8..e10593862a 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -1,15 +1,29 @@
 /*
-  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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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 "engraver-group.hh"
+
+#include "item.hh"
+#include "international.hh"
+#include "misc.hh"
 #include "time-signature.hh"
 #include "warn.hh"
-#include "engraver-group-engraver.hh"
-#include "misc.hh"
 
 /**
    generate time_signatures.
@@ -20,12 +34,19 @@ class Time_signature_engraver : public Engraver
   SCM last_time_fraction_;
 
 protected:
+  virtual void derived_mark () const;
   void stop_translation_timestep ();
   void process_music ();
 public:
   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_ = 0;
@@ -52,13 +73,18 @@ Time_signature_engraver::process_music ()
 	    OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 	  */
 	  warning (_f ("strange time signature found: %d/%d",
-		       den,
-		       scm_to_int (scm_car (fr))));
+		       int (scm_to_int (scm_car (fr))),
+		       den));
 	}
 
-      last_time_fraction_ = fr;
       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;
     }
 }
 
@@ -71,8 +97,17 @@ Time_signature_engraver::stop_translation_timestep ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Time_signature_engraver,
-		/* descr */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
-		/* creats*/ "TimeSignature",
-		/* accepts */ "",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"Create a @ref{TimeSignature} whenever"
+		" @code{timeSignatureFraction} changes.",
+
+		/* create */
+		"TimeSignature ",
+		
+		/* read */
+		"implicitTimeSignatureVisibility "
+		"timeSignatureFraction ",
+
+		/* write */
+		""
+		);