source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "clef.hh"
-#include "string.hh"
-#include "stencil.hh"
-#include "item.hh"
#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "stencil.hh"
MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
SCM
if (scm_is_string (glyph))
{
- String str = ly_scm2string (glyph);
+ string str = ly_scm2string (glyph);
if (to_boolean (s->get_property ("non-default"))
&& s->break_status_dir () != RIGHT
str += "_change";
}
- return scm_makfrom0str (str.to_str0 ());
+ return ly_string2scm (str);
}
s->suicide ();
if (!scm_is_string (glyph_scm))
return SCM_EOL;
- String glyph = String (ly_scm2string (glyph_scm));
+ 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.to_str0 ()));
+ me->warning (_f ("clef `%s' not found", glyph.c_str ()));
return out.smobbed_copy ();
}
-ADD_INTERFACE (Clef, "clef-interface",
- "A clef sign",
+ADD_INTERFACE (Clef,
+ "A clef sign.",
/* properties */
"full-size-change "