Merge remote-tracking branch 'origin/translation' into staging

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 9806f14d24f77fab36a921ac265ef044521f3e6b..3fd0e890a01b252f9ee9332ce4aadd739824751a 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
@@ -582,8 +582,8 @@ ly_rational2scm (Rational r)
 {
   if (r.is_infinity ())
     {
-      if (r > Rational(0))
-       return scm_inf ();
+      if (r > Rational (0))
+        return scm_inf ();
 
       return scm_difference (scm_inf (), SCM_UNDEFINED);
     }
@@ -598,17 +598,17 @@ 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;
-       }
+        {
+          Rational r;
+          r.set_infinite (1);
+          return r;
+        }
       else
-       {
-         Rational r;
-         r.set_infinite (-1);
-         return r;
-       }
+        {
+          Rational r;
+          r.set_infinite (-1);
+          return r;
+        }
     }
 
   return Rational (scm_to_int64 (scm_numerator (r)),
@@ -618,14 +618,20 @@ ly_scm2rational (SCM r)
 Rational
 robust_scm2rational (SCM n, Rational rat)
 {
-  if (scm_is_real (n)
-      && (scm_is_true (scm_exact_p (n))
-         || scm_is_true (scm_inf_p (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)
 {