Doc: Update documentation of \once (2952)

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 7985b35d90e850a9f67152f7a22e4d22e83bbc13..ddda5185792522cc60afc155cc04a40fca0e8dcd 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -62,7 +62,7 @@ ly_scm_write_string (SCM s)
 SCM
 ly_quote_scm (SCM s)
 {
-  return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
+  return scm_list_2 (ly_symbol2scm ("quote"), s);
 }
 
 string
@@ -395,19 +395,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol)
     return ok;
 
   if (!scm_is_symbol (sym))
-#if 0
     return false;
-#else
-    /*
-      This is used for autoBeamSettings.
-
-      TODO: deprecate the use of \override and \revert for
-      autoBeamSettings?
-
-      or use a symbol autoBeamSettingS?
-    */
-    return true;
-#endif
 
   SCM type = scm_object_property (sym, type_symbol);
 
@@ -580,6 +568,14 @@ robust_scm2vsize (SCM k, vsize o)
 SCM
 ly_rational2scm (Rational r)
 {
+  if (r.is_infinity ())
+    {
+      if (r > Rational (0))
+        return scm_inf ();
+
+      return scm_difference (scm_inf (), SCM_UNDEFINED);
+    }
+
   return scm_divide (scm_from_int64 (r.numerator ()),
                      scm_from_int64 (r.denominator ()));
 }
@@ -587,6 +583,22 @@ ly_rational2scm (Rational r)
 Rational
 ly_scm2rational (SCM r)
 {
+  if (scm_is_true (scm_inf_p (r)))
+    {
+      if (scm_is_true (scm_positive_p (r)))
+        {
+          Rational r;
+          r.set_infinite (1);
+          return r;
+        }
+      else
+        {
+          Rational r;
+          r.set_infinite (-1);
+          return r;
+        }
+    }
+
   return Rational (scm_to_int64 (scm_numerator (r)),
                    scm_to_int64 (scm_denominator (r)));
 }
@@ -594,12 +606,20 @@ ly_scm2rational (SCM r)
 Rational
 robust_scm2rational (SCM n, Rational rat)
 {
-  if (ly_is_fraction (n))
+  if (ly_is_rational (n))
     return ly_scm2rational (n);
   else
     return rat;
 }
 
+bool
+ly_is_rational (SCM n)
+{
+  return (scm_is_real (n)
+          && (scm_is_true (scm_exact_p (n))
+              || scm_is_true (scm_inf_p (n))));
+}
+
 SCM
 alist_to_hashq (SCM alist)
 {