Doc-de: updating running manual

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 933bf271701959739cd5c9fcabbc8212e0a1ac0d..e8380324fbe40f84311c5592c4100046c99e7194 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -527,6 +527,28 @@ robust_scm2double (SCM k, double x)
   return x;
 }
 
+vector<Real>
+ly_scm2floatvector (SCM l)
+{
+  vector<Real> floats;
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    floats.push_back (robust_scm2double (scm_car (s), 0.0));
+  return floats;
+}
+
+SCM
+ly_floatvector2scm (vector<Real> v)
+{
+  SCM l = SCM_EOL;
+  SCM *tail = &l;
+  for (vsize i = 0; i < v.size (); i++)
+    {
+      *tail = scm_cons (scm_from_double (v[i]), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
+    }
+  return l;
+}
+
 string
 robust_scm2string (SCM k, string s)
 {
@@ -543,9 +565,29 @@ robust_scm2int (SCM k, int o)
   return o;
 }
 
+vsize
+robust_scm2vsize (SCM k, vsize o)
+{
+  if (scm_integer_p (k) == SCM_BOOL_T)
+    {
+      int i = scm_to_int (k);
+      if (i >= 0)
+        return (vsize) i;
+    }
+  return 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 ()));
 }
@@ -553,6 +595,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)));
 }
@@ -560,12 +618,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)
 {