* scm/drums.scm (reset-drum-kit): new function.

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index c49923bbf9373ad9f919baafe7d2bccca0c73897..36b56aab16f923b44395f2a4ff3f0a2e3ac7c1b2 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -85,7 +85,7 @@ gulp_file_to_string (String fn)
     {
       String e = _f ("can't find file: `%s'", fn);
       e += " ";
-      e += _f ("(load path: `%s')", global_path.string ());
+      e += _f ("(load path: `%s')", global_path.to_string ());
       error (e);
     }
   else if (verbose_global_b)
@@ -379,6 +379,13 @@ LY_DEFINE(ly_verbose,  "ly:verbose", 0, 0, 0, (),
   return gh_bool2scm (verbose_global_b);
 }
 
+LY_DEFINE(ly_dimension_p,  "ly:dimension?", 1, 0, 0, (SCM d),
+         "Return @var{d} is a number. Used to distinguish length "
+         "variables from normal numbers.")
+{
+  return scm_number_p (d);
+}
+
 static void
 init_functions ()
 {
@@ -549,11 +556,20 @@ type_check_assignment (SCM sym, SCM val,  SCM type_symbol)
   if (val == SCM_EOL || val == SCM_BOOL_F)
     return ok;
 
-  
-  SCM type = SCM_EOL;
+  if (!gh_symbol_p (sym))
+#if 0
+    return false;
+#else
+  /*
+    This is used for autoBeamSettings.
 
-  if (gh_symbol_p (sym))
-    type = scm_object_property (sym, type_symbol);
+    TODO: deprecate the use of \override and \revert for
+    autoBeamSettings?
+   */
+  return true; 
+#endif
+  
+  SCM type = scm_object_property (sym, type_symbol);
 
   if (type != SCM_EOL && !gh_procedure_p (type))
       {