Issue 3151: Fix some oversights of \layout in \book

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e8380324fbe40f84311c5592c4100046c99e7194..27909a6bc2a43bccca2bcce48fdb029099f3eb6d 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -62,7 +62,7 @@ ly_scm_write_string (SCM s)
 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
@@ -355,8 +355,23 @@ SCM
 ly_deep_copy (SCM src)
 {
   if (scm_is_pair (src))
-    return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src)));
-  else if (scm_is_vector (src))
+    {
+      SCM res = SCM_EOL;
+      do
+        {
+          res = scm_cons (ly_deep_copy (scm_car (src)), res);
+          src = scm_cdr (src);
+        }
+      while (scm_is_pair (src));
+      // Oh, come on, GUILE.  Why do you require the second argument
+      // of scm_reverse_x to be a proper list?  That makes no sense.
+      // return scm_reverse_x (res, ly_deep_copy (src));
+      SCM last_cons = res;
+      res = scm_reverse_x (res, SCM_EOL);
+      scm_set_cdr_x (last_cons, ly_deep_copy (src));
+      return res;
+    }
+  if (scm_is_vector (src))
     {
       int len = scm_c_vector_length (src);
       SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
@@ -365,6 +380,7 @@ ly_deep_copy (SCM src)
           SCM si = scm_from_int (i);
           scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
         }
+      return nv;
     }
   return src;
 }
@@ -394,20 +410,10 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol)
   if (val == SCM_EOL || val == SCM_BOOL_F)
     return ok;
 
+  // If undefined, some internal function caused it...should never happen.
+  assert (val != SCM_UNDEFINED);
   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);