-
/*
clef.cc -- implement Clef_item
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"
#include "string.hh"
#include "molecule.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.ch_C ()));
+ s->set_grob_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));
}
}
else
return SCM_UNSPECIFIED;
}
-bool
-Clef::has_interface (Grob* me)
-{
- return me->has_interface (ly_symbol2scm ("clef-interface"));
-}
-void
-Clef::set_interface (Grob* me)
-{
- me->set_interface (ly_symbol2scm ("clef-interface"));
-}
MAKE_SCHEME_CALLBACK (Clef,brew_molecule,1)
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.is_empty ())
{
- return SCM_EOL;
+ me->warning (_f ("clef `%s' not found", glyph.to_str0 ()));
}
+ return out.smobbed_copy ();
}
+
+
+ADD_INTERFACE (Clef, "clef-interface",
+ "A clef sign",
+ "non-default full-size-change glyph-name");
+