replace SCM_ASSERT_TYPE with LY_ASSERT_TYPE and friends

[lilypond.git] / lily / ttf.cc

diff --git a/lily/ttf.cc b/lily/ttf.cc
index 092284edba0f6f5fac16726b17c5d215c5323a69..b34b657dac9d98605a27cb6813c59d1ba32a1fa0 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -223,8 +223,7 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
           1, 0, 0, (SCM ttf_file_name),
           "Extract the PostScript name from a TrueType font.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
-                  SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, ttf_file_name);
   string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);
@@ -248,8 +247,7 @@ LY_DEFINE (ly_ttf_2_pfa, "ly:ttf->pfa",
           "Convert the contents of a TTF file to Type42 PFA, returning it as "
           " a string.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
-                  SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, ttf_file_name);
 
   string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)