Uniformize, internalize.

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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index b95cf42b4d8183687ecaa518923bde8278ef2499..953a89a0083e549754b13e51317d634dbf7307af 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,7 +19,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment, );
 public:
   Moment ();
   Moment (int m);
@@ -46,10 +46,9 @@ public:
   /*
     Deliver a copy of THIS as a smobified SCM
    */
-  SCM smobbed_copy () const;
   String to_string () const;
   static int compare (Moment const&, Moment const&);
-  
+  SCM as_scheme () const;
 };
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, + );
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, - );
@@ -57,14 +56,17 @@ IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * );
 
 
-DECLARE_UNSMOB(Moment,moment);
-int compare (Moment const&,Moment const&);
+DECLARE_UNSMOB(Moment, moment);
+int compare (Moment const&, Moment const&);
 INSTANTIATE_COMPARE (Moment const&, Moment::compare);
 
+Moment robust_scm2moment (SCM, Moment);
 
 #ifdef STREAM_SUPPORT
 std::ostream & operator << (std::ostream &, Moment const &);
 #endif
 
+bool moment_less (SCM a, SCM b);
+
 #endif /* MOMENT_HH */