X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select-scheme.cc;h=613cd01caeba114b232959665260e724639aab59;hb=2b8c85e27b554513c6527e8a2d25b0e3d2db4b66;hp=734fa7a88526f9b460f2f5f347e6d08158cb5397;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc
index 734fa7a885..613cd01cae 100644
--- a/lily/pango-select-scheme.cc
+++ b/lily/pango-select-scheme.cc
@@ -3,8 +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"
@@ -12,18 +11,18 @@
 #if HAVE_PANGO_FT2
 #include "pango-font.hh"
 
-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}.")
+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;
 }
-	  
+
 #endif