Run `make grand-replace'.

[lilypond.git] / lily / include / time-signature.hh

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index ea338b29a45511c3f38547b5faa7a3320799ec20..07c4968b3453c89254d6962a6fe3356bfcdae02f 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -1,41 +1,28 @@
 /*
   time_signature.hh -- declare Time_signature
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef METER_HH
 #define METER_HH
 
-#include "item.hh"
-#include "array.hh"
-#include "real.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /**
    Print a time_signature sign.
-  TODO:
 
-  C style time_signatures, 2+3+2/8 time_signatures, alla breve.
-  
- */
-class Time_signature: public Item
-{
-  Molecule special_time_signature (String,int,int) const;
-  Molecule time_signature (int, int)const;
-  
-protected:
-  Molecule do_brew_molecule() const;
-public:
-  Time_signature (SCM);
- static SCM scheme_molecule (SCM);
-  
+   TODO:
 
-  /*
-    TODO: make this SCM!
-   */
-  Array<int> args_;
-  
-  VIRTUAL_COPY_CONS(Score_element);
+   2+3+2/8 time_signatures
+*/
+struct Time_signature
+{
+  DECLARE_GROB_INTERFACE();
+  static Stencil special_time_signature (Grob *, SCM, int, int);
+  static Stencil numbered_time_signature (Grob *, int, int);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
 };
 #endif // METER_HH