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

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 51664870b46c917078c3dd282f311bd5827d2615..4ac319df5bd0041159377021f5c61640e3b8f889 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -6,10 +6,9 @@
   (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "lily-guile.hh"
 #include "moment.hh"
-#include "warn.hh"
 
+#include "warn.hh"
 
 Moment::Moment ()
 {
@@ -56,6 +55,16 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
+SCM
+Moment::as_scheme () const
+{
+  return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
+                    scm_from_int (main_part_.num()),
+                    scm_from_int (main_part_.den()),
+                    scm_from_int (grace_part_.num()),
+                    scm_from_int (grace_part_.den()));
+}
+
 /* TODO: add optional factor argument. */
 LY_DEFINE (ly_make_moment, "ly:make-moment",
           2, 2, 0, (SCM n, SCM d, SCM gn, SCM gd),
@@ -251,7 +260,7 @@ operator << (std::ostream &os, Moment const &m)
 Moment
 robust_scm2moment (SCM m, Moment d)
 {
-  Moment * p = unsmob_moment (m);
+  Moment *p = unsmob_moment (m);
   if (!p)
     return d;
   else
@@ -262,6 +271,6 @@ robust_scm2moment (SCM m, Moment d)
 bool
 moment_less (SCM a, SCM b)
 {
-  return  *unsmob_moment (a) < *unsmob_moment (b);
+  return *unsmob_moment (a) < *unsmob_moment (b);
 }