* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / include / duration.hh

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 54c4793fb8b05bc97da97993388e4b385735185c..793042cb23cf884c6e0e60ae7deb31876a8770ac 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -3,50 +3,46 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
 #ifndef DURATION_HH
 #define DURATION_HH
 
-#include "flower-proto.hh"
 #include "moment.hh"
-#include "smobs.hh"
 
 /**
    A musical duration.
   */
 struct Duration {
+public:
+  
   Duration ();
   Duration (int, int);
-  String str () const;
-  void set_plet (int,int );
+  String to_string () const;
+
   Duration compressed (Rational) const;
-  Rational length_mom () const ;
+  Rational get_length () const ;
+  Rational factor () const { return factor_; }
+  int duration_log ()const;
+  int dot_count () const;
+
   static int compare (Duration const&, Duration const&);
 
-  SCM smobbed_copy () const;
-  DECLARE_SCHEME_CALLBACK(less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS(Duration,);
+  DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
+  DECLARE_SIMPLE_SMOBS (Duration,);
 
-public:
-  int duration_log ()const;
-  int dot_count () const;
-  
 private:
     /// Logarithm of the base duration.
-  int durlog_i_;
-  int dots_i_;
-
-  Moment factor_;
+  int durlog_;
+  int dots_;
 
+  Rational factor_;
 };
 
-#include "compare.hh"
-INSTANTIATE_COMPARE(Duration, Duration::compare);
-Duration*unsmob_duration(SCM);
-// int compare (Array<Duration>*, Array<Duration>*);
+INSTANTIATE_COMPARE (Duration, Duration::compare);
+DECLARE_UNSMOB (Duration, duration);
 
 #endif // DURATION_HH