don't use extent of musical column for horizontal spacing.

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 1f67c0043310d32c2d0abe57e42ece5b7a53e119..e5cdbc77f2732aef18d0e38794ccbf950e9aa710 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -118,7 +118,7 @@ ly_scm2string (SCM str)
 SCM
 ly_string2scm (string const &str)
 {
-  return scm_from_locale_stringn (str.c_str(),
+  return scm_from_locale_stringn (str.c_str (),
                                  str.length ());
 }
 
@@ -126,7 +126,7 @@ ly_string2scm (string const &str)
 char *
 ly_scm2newstr (SCM str, size_t *lenp)
 {
-  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
+  LY_ASSERT_TYPE (scm_is_string, str, 1);
 
   size_t len = scm_i_string_length (str);
   if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
@@ -308,7 +308,7 @@ ly_offsets2scm (vector<Offset> os)
   for (vsize i = 0; i < os.size (); i++)
     {
       *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL);
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
   return l;
 }