source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "clef.hh"
SCM
Clef::before_line_breaking (SCM smob)
{
- Item * s = unsmob_item (smob);
+ Item *s = unsmob_item (smob);
SCM glyph = s->get_grob_property ("glyph-name");
&& !to_boolean (s->get_grob_property ("full-size-change")))
{
str += "_change";
- s->set_grob_property ("glyph-name", ly_str02scm (str.to_str0 ()));
+ s->set_grob_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));
}
}
else
SCM
Clef::brew_molecule (SCM smob)
{
- 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
+ Grob *me = unsmob_grob (smob);
+ SCM glyph_scm = me->get_grob_property ("glyph-name");
+ if (!gh_string_p (glyph_scm))
+ return SCM_EOL;
+
+ String glyph = String (ly_scm2string (glyph_scm));
+ Font_metric *fm = Font_interface::get_default_font (me);
+ Molecule out = fm->find_by_name (glyph);
+ if (out.empty_b())
{
- return SCM_EOL;
+ me->warning (_f ("clef `%s' not found", glyph.to_str0 ()));
}
+ return out.smobbed_copy ();
}