Merge with master

[lilypond.git] / lily / pango-select-scheme.cc

diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc
index 1ae597c236450b017ec1a446feb65bcb341d9b12..613cd01caeba114b232959665260e724639aab59 100644 (file)
--- a/lily/pango-select-scheme.cc
+++ b/lily/pango-select-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
@@ -15,11 +15,11 @@ LY_DEFINE (ly_make_pango_description_string, "ly:make-pango-description-string",
           2, 0, 0, (SCM chain, SCM size),
           "Make a PangoFontDescription string for the property alist @var{chain} at size @var{size}.")
 {
-  SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG1, __FUNCTION__, "number");
+  LY_ASSERT_TYPE (scm_is_number, size, 1);
   PangoFontDescription *pfd = properties_to_pango_description (chain, scm_to_double (size));
   char *str = pango_font_description_to_string (pfd);
 
-  SCM scm_str = scm_makfrom0str (str);
+  SCM scm_str = scm_from_locale_string (str);
   g_free (str);
   pango_font_description_free (pfd);
   return scm_str;