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
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);
ly_rational2scm (Rational r)
{
if (r.is_infinity ())
- if (r > Rational(0))
- return scm_inf ();
- else
+ {
+ 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 ()));
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)),
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)
{