* 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 fff532d9805d39140396bce59764a54673fe559d..793042cb23cf884c6e0e60ae7deb31876a8770ac 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -3,16 +3,14 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2002 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.
@@ -22,17 +20,16 @@ public:
   
   Duration ();
   Duration (int, int);
-  String string () const;
+  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,);
 
@@ -44,7 +41,6 @@ private:
   Rational factor_;
 };
 
-#include "compare.hh"
 INSTANTIATE_COMPARE (Duration, Duration::compare);
 DECLARE_UNSMOB (Duration, duration);