X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=7985b35d90e850a9f67152f7a22e4d22e83bbc13;hb=fea33b81da974ff0627843dfc88a00b49cd2323c;hp=710fe151263ccb20f0efcfa80c796b1d9e333332;hpb=bb8aa1aed52c49e6e3de8c6c70a876598b11b4a8;p=lilypond.git

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 710fe15126..7985b35d90 100644
--- 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
@@ -326,25 +326,6 @@ ly_scm2offsets (SCM s)
 /*
   ALIST
 */
-
-// This one is used nowhere.
-bool
-ly_is_alist_equal (SCM a, SCM b)
-{
-  if (!scm_is_pair (a) || !scm_is_pair (b))
-    return false;
-  for (SCM s = a; scm_is_pair (s); s = scm_cdr (s))
-    {
-      SCM key = scm_caar (s);
-      SCM val = scm_cdar (s);
-      SCM l = scm_assoc (key, b);
-
-      if (scm_is_false (l) || !ly_is_equal (scm_cdr (l), val))
-        return false;
-    }
-  return true;
-}
-
 SCM
 ly_alist_vals (SCM alist)
 {
@@ -546,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)
 {
@@ -562,6 +565,18 @@ 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)
 {