*** empty log message ***

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 5c9d9b6b2116864ee73a51d5da26622b68556d1a..9490490ac02db0f7fd4e09799771d3b07fa3b8b2 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -169,13 +169,16 @@ index_set_cell (SCM s, Direction d, SCM v)
 }
   
 LY_DEFINE (ly_warn, "ly:warn",
-          1, 0, 0, (SCM str),
-          "Scheme callable function to issue the warning @code{msg}.")
+          1, 0, 1, (SCM str, SCM rest),
+          "Scheme callable function to issue the warning @code{msg}. "
+          "The message is formatted with @code{format} and @code{rest}.")
 {
   SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
   progress_indication ("\n");
+
+  str = scm_simple_format (SCM_BOOL_F, str, rest);
   warning ("lily-guile: " + ly_scm2string (str));
-  return SCM_BOOL_T;
+  return SCM_UNSPECIFIED;
 }
 
 LY_DEFINE (ly_dir_p, "ly:dir?",
@@ -262,7 +265,7 @@ is_axis (SCM s)
 Direction
 to_dir (SCM s)
 {
-  return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER;
+  return scm_is_integer (s) ? (Direction) ly_scm2int (s) : CENTER;
 }
 
 Interval
@@ -781,7 +784,7 @@ LY_DEFINE (ly_protects, "ly:protects",
 #endif
 
 
-#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
 
 #include "pangofc-afm-decoder.hh"