release: 1.1.54

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

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index 762f465b98c27cc2c627f7abf5fc7a1465bc5173..771ff759af86711f64a45dc89095aab89b125e39 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -1,14 +1,15 @@
 /*
   time_signature.hh -- declare Time_signature
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef METER_HH
 #define METER_HH
+
 #include "item.hh"
 #include "array.hh"
-#include "scalar.hh"
+#include "real.hh"
 
 /**
    Print a time_signature sign.
@@ -18,14 +19,18 @@
   
  */
 class Time_signature: public Item {
-  Array<Scalar> args;
+
+  
 
 protected:
-  virtual Molecule*brew_molecule_p() const;
+  virtual Molecule*do_brew_molecule_p() const;
 public:
-  Time_signature (Array<Scalar> args) ;
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEMENT_CLONE(Time_signature);
+  Time_signature () ;
+  Array<int> args_;
+  String time_sig_type_str_;
+  
+  
+  VIRTUAL_COPY_CONS(Score_element);
 };
 #endif // METER_HH