2006-08-24 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * scm/define-markup-commands.scm (char): use ly:wide-char->utf-8
+
* scm/define-event-classes.scm (unlistened-music-event-classes): idem.
* scm/define-music-types.scm (music-descriptions): consistency:
(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",
(define-markup-command (char layout props num) (integer?)
"Produce a single character, e.g. @code{\\char #65} produces the
letter 'A'."
- (ly:get-glyph (ly:paper-get-font layout props) num))
+ (ly:text-interface::interpret-markup layout props (ly:wide-char->utf-8 num)))
(define number->mark-letter-vector (make-vector 25 #\A))