From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 24 Aug 2006 15:11:09 +0000 (+0000)
Subject: (char): use ly:wide-char->utf-8
X-Git-Tag: release/2.10.0-2~353
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=67dbba6150b8c9a85f46294c4e3ac05f81235e73;p=lilypond.git

(char): use ly:wide-char->utf-8
---

diff --git a/ChangeLog b/ChangeLog
index ed40336860..8ecc4ad8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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:
diff --git a/THANKS b/THANKS
index 8be5301cbf..c17cb912cd 100644
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ BUG HUNTERS/SUGGESTIONS
 Albert Frantz
 Anthony Youngman
 Aurèle Duda
+Ben Hoefer
 Bernie Arai
 Cameron Horsburgh
 Charles Cave
@@ -89,6 +90,7 @@ Trent Johnston
 Trevor Bača
 Vaclav Smilauer
 Werner Lemberg
+Will Oram
 Zoltan V. Laszlo
 
 Release 2.8
diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index bcb034174e..c39d79494a 100644
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -6,6 +6,7 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "warn.hh"
 #include "stencil.hh"
 #include "font-metric.hh"
 #include "modified-font-metric.hh"
@@ -97,6 +98,10 @@ LY_DEFINE (ly_text_dimension, "ly:text-dimension",
 		   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),
@@ -105,7 +110,9 @@ LY_DEFINE (ly_font_file_name, "ly:font-file-name",
 {
   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",
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index d450ec2468..c98fe803c1 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1066,8 +1066,8 @@ See @usermanref{The Feta font} for  a complete listing of the possible glyphs."
 (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))