(c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "warn.hh"
#include "stencil.hh"
#include "font-metric.hh"
#include "modified-font-metric.hh"
ly_interval2scm (stc.extent (Y_AXIS)));
}
+
+/*
+ TODO: when are non string retvals allowed?
+ */
LY_DEFINE (ly_font_file_name, "ly:font-file-name",
1, 0, 0,
(SCM font),
{
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
- return fm->font_file_name ();
+ SCM name = fm->font_file_name ();
+
+ return name;
}
LY_DEFINE (ly_font_name, "ly:font-name",
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
- return scm_makfrom0str (fm->font_name ().to_str0 ());
+ return scm_makfrom0str (fm->font_name ().c_str ());
}
LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
(SCM font),
"Given the font metric @var{font}, return the "
- "magnification, relative to the current outputscale.")
+ "magnification, relative to the current outputs-cale.")
{
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
(SCM font),
"Given the font metric @var{font}, return the "
- "design size, relative to the current outputscale.")
+ "design size, relative to the current output-scale.")
{
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");