X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select-scheme.cc;h=3c080a5ac4fb6fb86d05f55a66b81a2ec9c67c66;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=7c755e05f00a30af5fad3cc789f0009abff22fb5;hpb=477969652aa0d12bb3d9c75516515e1a140ea763;p=lilypond.git

diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc
index 7c755e05f0..3c080a5ac4 100644
--- a/lily/pango-select-scheme.cc
+++ b/lily/pango-select-scheme.cc
@@ -1,20 +1,40 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "config.hh"
 
 #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 @code{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