Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / time-signature-engraver.cc

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 3ebb80672a48b0b130ecf4bb9469a92fe45a6af7..68a7e178b042da9a83d4c9802521c939efad02fc 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,13 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#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.
@@ -27,14 +30,12 @@ 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;
@@ -62,7 +63,7 @@ Time_signature_engraver::process_music ()
          */
          warning (_f ("strange time signature found: %d/%d",
                       den,
-                      scm_to_int (scm_car (fr))));
+                      int (scm_to_int (scm_car (fr)))));
        }
 
       last_time_fraction_ = fr;
@@ -80,8 +81,7 @@ 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 */ "",
+               /* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
+               /* create */ "TimeSignature",
+               /* read */ "",
                /* write */ "");