- Grob * sc = unsmob_grob (smob);
- SCM glyph = sc->get_grob_property ("glyph-name");
- if (gh_string_p (glyph))
- {
- return Font_interface::get_default_font (sc)->find_by_name (String (ly_scm2string (glyph))).smobbed_copy ();
- }
- else
- {
- return SCM_EOL;
- }
+ Grob *me = unsmob_grob (smob);
+ SCM glyph_scm = me->get_property ("glyph-name");
+ if (!scm_is_string (glyph_scm))
+ return SCM_EOL;
+
+ string glyph = string (ly_scm2string (glyph_scm));
+ Font_metric *fm = Font_interface::get_default_font (me);
+ Stencil out = fm->find_by_name (glyph);
+ if (out.is_empty ())
+ me->warning (_f ("clef `%s' not found", glyph.c_str ()));
+ return out.smobbed_copy ();