replace SCM_ASSERT_TYPE with LY_ASSERT_TYPE and friends

[lilypond.git] / lily / font-metric-scheme.cc

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index db231fd11d50f4554c5c8a36aba43ac6ad27da84..96b79def6d75438cdef58878cbb0d6ddf6fbdd3b 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -20,8 +20,8 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
           "is not available, return @code{#f}.")
 {
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_string, 2);
 
   Stencil m = fm->find_by_name (ly_scm2string (name));
 
@@ -36,8 +36,8 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
           "in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (scm_is_number (index), index, SCM_ARG2, __FUNCTION__, "number");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_number, 2);
 
   return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy ();
 }
@@ -48,8 +48,8 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           "Return the index for @var{name} in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_string, 2);
 
   return scm_from_int (fm->name_to_index (ly_scm2string (name)));
 }
@@ -60,8 +60,8 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
           "Return the character code for @var{index} @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (scm_is_integer (index), index, SCM_ARG2, __FUNCTION__, "index");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_integer, 2);
 
   return scm_from_unsigned_integer (fm->index_to_charcode (scm_to_int (index)));
 }
@@ -72,8 +72,8 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           "Return the character code for glyph @var{name} in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_string, 2);
 
   return scm_from_unsigned_integer (fm->index_to_charcode (fm->name_to_index (ly_scm2string (name))));
 }
@@ -89,8 +89,8 @@ LY_DEFINE (ly_text_dimension, "ly:text-dimension",
   Modified_font_metric *fm = dynamic_cast<Modified_font_metric *>
     (unsmob_metrics (font));
 
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "modified font metric");
-  SCM_ASSERT_TYPE (scm_is_string (text), text, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+  LY_ASSERT_TYPE(scm_is_string, 2);
   Stencil stc (fm->text_stencil (ly_scm2string (text)));
   return scm_cons (ly_interval2scm (stc.extent (X_AXIS)),
                   ly_interval2scm (stc.extent (Y_AXIS)));
@@ -106,8 +106,9 @@ LY_DEFINE (ly_font_file_name, "ly:font-file-name",
           "Given the font metric @var{font}, "
           "return the corresponding file name.")
 {
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   SCM name = fm->font_file_name ();
 
   return name;
@@ -119,9 +120,9 @@ LY_DEFINE (ly_font_name, "ly:font-name",
           "Given the font metric @var{font}, "
           "return the corresponding name.")
 {
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
   Font_metric *fm = unsmob_metrics (font);
 
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return ly_string2scm (fm->font_name ());
 }
 
@@ -130,8 +131,9 @@ LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
           "Given the font metric @var{font}, return the "
           "magnification, relative to the current output-scale.")
 {
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return scm_cdr (fm->description_);
 }
 
@@ -140,8 +142,9 @@ LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
           "Given the font metric @var{font}, return the "
           "design size, relative to the current output-scale.")
 {
+  LY_ASSERT_FIRST_SMOB (Font_metric, font);
+
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return scm_from_double (fm->design_size ());
 }