X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftime-signature.hh;h=95190025bcc41f8bdf67526fc10d79367b8d0fe3;hb=8a52af2ae812fd16bc8f875099ab53e89bbacd26;hp=ac4a49f237c289dcb1153527a03f64a83bb0bdbc;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index ac4a49f237..95190025bc 100644
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -1,41 +1,41 @@
 /*
-  time_signature.hh -- declare Time_signature
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  Copyright (C) 1996--2011 Han-Wen Nienhuys
+
+  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/>.
 */
 
 #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
+   TODO:
+
+   2+3+2/8 time_signatures
+*/
+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 (SCM);
- static SCM scheme_molecule (SCM);
-  
-
-  /*
-    TODO: make this SCM!
-   */
-  Array<int> args_;
-  
-  VIRTUAL_COPY_CONS(Score_element);
+  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