* mf/GNUmakefile: always trace pfa fonts.

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index cab31a2124a2bbb444eb6e84e79a4db03b158ae6..9646364087cab8b71c95dbfe3a867a243de716c0 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -157,9 +157,9 @@ LY_DEFINE(ly_warning,"ly:warn", 1, 0, 0,
   return SCM_BOOL_T;
 }
 
-LY_DEFINE(ly_isdir,  "ly:dir?", 1,0, 0,  (SCM s),
-         "type predicate. A direction is a -1, 0 or 1, where -1 represents left or "
-"down and 1 represents right or up. ")
+LY_DEFINE(ly_dir_p,  "ly:dir?", 1,0, 0,  (SCM s),
+         "type predicate. A direction is a -1, 0 or 1, where -1 represents "
+         "left or down and 1 represents right or up. ")
 {
   if (gh_number_p (s))
     {
@@ -170,7 +170,7 @@ LY_DEFINE(ly_isdir,  "ly:dir?", 1,0, 0,  (SCM s),
 }
 
 bool
-ly_number_pair_p (SCM p)
+is_number_pair (SCM p)
 {
   return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
 }
@@ -217,7 +217,7 @@ unsigned int ly_scm_hash (SCM s)
 
 
 bool
-ly_dir_p (SCM s)
+is_direction (SCM s)
 {
   if (gh_number_p (s))
     {
@@ -229,7 +229,7 @@ ly_dir_p (SCM s)
 
 
 bool
-ly_axis_p (SCM s)
+is_axis (SCM s)
 {
   if (gh_number_p (s))
     {
@@ -362,7 +362,7 @@ wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
 LY_DEFINE(ly_version,  "ly:version", 0, 0, 0, (),
          "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
 {
-  char const* vs =  "\' (" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
+  char const* vs =  "\'(" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
   
   return gh_eval_str ((char*)vs);
 }
@@ -373,10 +373,13 @@ LY_DEFINE(ly_unit,  "ly:unit", 0, 0, 0, (),
   return scm_makfrom0str (INTERNAL_UNIT);
 }
 
-LY_DEFINE(ly_verbose,  "ly:verbose", 0, 0, 0, (),
-  "Return whether lilypond is being run in verbose mode.")
+
+
+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 gh_bool2scm (verbose_global_b);
+  return scm_number_p (d);
 }
 
 static void
@@ -549,11 +552,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))
       {