* lily/main.cc (setup_guile_env): new function. Set GC min_yields

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index d9c16d732767a557e6dbd866f7daf9942abd6921..fa9fdb166070cf8cca38f04c07608bd0f1854056 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -41,12 +41,12 @@ Rest::after_line_breaking (SCM smob)
   if (d && bt > 4) // UGH.
     {
       d->set_property ("staff-position",
-                      scm_int2num ((bt == 7) ? 4 : 3));
+                      scm_from_int ((bt == 7) ? 4 : 3));
     }
   if (d && bt >= -1 && bt <= 1) // UGH again.
     {
       d->set_property ("staff-position",
-                      scm_int2num ((bt == 0) ? -1 : 1));
+                      scm_from_int ((bt == 0) ? -1 : 1));
     }
   return SCM_UNSPECIFIED;
 }
@@ -175,14 +175,14 @@ Rest::polyphonic_offset_callback (SCM smob, SCM)
 {
   Grob *me = unsmob_grob (smob);
   if (scm_is_number (me->get_property ("staff-position")))
-    return scm_make_real (0);
+    return scm_from_double (0);
 
   Direction d = get_grob_direction (me);
   Real off = 2 * d;
   if (off)
     off *= Staff_symbol_referencer::staff_space (me);
 
-  return scm_make_real (off);
+  return scm_from_double (off);
 }
 
 ADD_INTERFACE (Rest, "rest-interface",