2003 -> 2004

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

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index 3bdc1208e19a0eb318e5759268d98ab75d0dd0b0..13791563af4ceb5171c6681e9803f901e60dca7f 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -1,39 +1,28 @@
 /*
   time_signature.hh -- declare Time_signature
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef METER_HH
 #define METER_HH
 
 #include "item.hh"
-#include "array.hh"
-#include "real.hh"
 
 /**
    Print a time_signature sign.
-  TODO:
 
-  C style time_signatures, 2+3+2/8 time_signatures, alla breve.
+   TODO:
+
+   2+3+2/8 time_signatures
   
  */
-class Time_signature: public Item
+struct Time_signature
 {
-  Molecule special_time_signature (String,int,int) const;
-  Molecule time_signature (int, int)const;
-  
-protected:
-  virtual Molecule do_brew_molecule() const;
-public:
-  Time_signature () ;
-
-  /*
-    TODO: make this SCM!
-   */
-  Array<int> args_;
-  
-  VIRTUAL_COPY_CONS(Score_element);
+  static bool has_interface (Grob*);
+  static Molecule special_time_signature (Grob*,SCM,int,int) ;
+  static Molecule numbered_time_signature (Grob*,int, int);
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
 };
 #endif // METER_HH