X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftime-signature.hh;h=5c77a2cff92e1572e2fc2b3e89e5e9411b431791;hb=aa7e0d00e324791a14ba0b9d840ec4fe7e962700;hp=3bdc1208e19a0eb318e5759268d98ab75d0dd0b0;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index 3bdc1208e1..5c77a2cff9 100644 --- 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--2007 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: - virtual Molecule do_brew_molecule() const; -public: - Time_signature () ; + TODO: - /* - TODO: make this SCM! - */ - Array 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