Adds Scheme bindings for Spring constructor and setters.

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 4d6f6a79c6440c331d54f090853cda0439243500..933bf271701959739cd5c9fcabbc8212e0a1ac0d 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -71,8 +71,13 @@ ly_symbol2string (SCM s)
   /*
     Ugh. this is not very efficient.
   */
-  SCM str = scm_symbol_to_string (s);
-  return ly_scm2string (str);
+  return ly_scm2string (scm_symbol_to_string (s));
+}
+
+string
+robust_symbol2string (SCM sym, string str)
+{
+  return scm_is_symbol (sym) ? ly_symbol2string (sym) : str;
 }
 
 string
@@ -92,14 +97,12 @@ gulp_file_to_string (string fn, bool must_exist, int size)
       return s;
     }
 
-  if (be_verbose_global)
-    progress_indication ("[" + s);
+  debug_output ("[" + s, true);
 
   vector<char> chars = gulp_file (s, size);
   string result (&chars[0], chars.size ());
 
-  if (be_verbose_global)
-    progress_indication ("]\n");
+  debug_output ("]\n", false);
 
   return result;
 }
@@ -180,7 +183,7 @@ ly_scm_hash (SCM s)
 bool
 is_axis (SCM s)
 {
-  if (scm_is_number (s))
+  if (scm_is_integer (s))
     {
       int i = scm_to_int (s);
       return i == 0 || i == 1;
@@ -228,7 +231,8 @@ is_direction (SCM s)
 Interval
 ly_scm2interval (SCM p)
 {
-  return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p)));
+  return Interval (scm_to_double (scm_car (p)),
+                   scm_to_double (scm_cdr (p)));
 }
 
 Drul_array<Real>
@@ -322,25 +326,6 @@ ly_scm2offsets (SCM s)
 /*
   ALIST
 */
-
-bool
-alist_equal_p (SCM a, SCM b)
-{
-  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 (l == SCM_BOOL_F
-          || !ly_is_equal (scm_cdr (l), val))
-
-        return false;
-    }
-  return true;
-}
-
 SCM
 ly_alist_vals (SCM alist)
 {