X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select.cc;h=29686d44ddce44a8799fa59365870bd34723e3bd;hb=81abebcfecdb22d2e7b6b8e2a6d9f758aa45a13a;hp=5c93c1386cbf7642d7837486654f2f7e4096438d;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 5c93c1386c..29686d44dd 100644
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
@@ -19,7 +19,7 @@ properties_to_pango_description (SCM chain, Real text_size)
   PangoFontDescription *description = 0;
   if (scm_is_string (name))
     {
-      std::string name_str = ly_scm2string (name);
+      string name_str = ly_scm2string (name);
       description = pango_font_description_from_string (name_str.c_str ());
     }
   else
@@ -56,9 +56,10 @@ select_pango_font (Output_def *layout, SCM chain)
 				       * layout->get_dimension (ly_symbol2scm ("text-font-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 find_pango_font (layout, scm_str, 1.0);
 }
 
@@ -132,7 +133,7 @@ symbols_to_pango_font_description (SCM family,
 {
   PangoFontDescription *description = pango_font_description_new ();
 
-  std::string family_str = "roman";
+  string family_str = "roman";
   if (scm_is_symbol (family))
     family_str = ly_symbol2string (family);
   else if (scm_is_string (family))