* Another grand 2003 update.

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

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index c256f74d85ea986c7913b1957aa96331dceee057..69498e3efb740e73ea9dafe4db8718a7632f6ee4 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -3,7 +3,7 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
@@ -18,34 +18,35 @@
    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,);
 
-public:
-  int duration_log ()const;
-  int dot_count () const;
-  
 private:
     /// Logarithm of the base duration.
-  int durlog_i_;
-  int dots_i_;
+  int durlog_;
+  int dots_;
 
   Rational factor_;
 };
 
 #include "compare.hh"
 INSTANTIATE_COMPARE (Duration, Duration::compare);
-DECLARE_UNSMOB(Duration,duration);
-
+DECLARE_UNSMOB (Duration, duration);
 
 #endif // DURATION_HH