Merge with master

[lilypond.git] / lily / note-head-scheme.cc

diff --git a/lily/note-head-scheme.cc b/lily/note-head-scheme.cc
index 621e5311b98f034a671c833fcfc5919889be1f5c..57919802694ae70582e83e21bf0ffa0106149746 100644 (file)
--- a/lily/note-head-scheme.cc
+++ b/lily/note-head-scheme.cc
@@ -16,9 +16,9 @@ LY_DEFINE(ly_note_head__stem_attachment, "ly:note-head::stem-attachment",
          "Get attachment in @var{font-metric} for attaching a stem to notehead "
          "@var{glyph-name}.")
 {
+  LY_ASSERT_SMOB (Font_metric, font_metric, 1);
   Font_metric *fm = unsmob_metrics (font_metric);
-  SCM_ASSERT_TYPE(fm, font_metric, SCM_ARG1, __FUNCTION__, "font metric");
-  SCM_ASSERT_TYPE(scm_is_string (glyph_name), glyph_name, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_TYPE(scm_is_string,glyph_name, 2);
   
   return ly_offset2scm (Note_head::get_stem_attachment (fm, ly_scm2string (glyph_name)));
 }