X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select.cc;h=29686d44ddce44a8799fa59365870bd34723e3bd;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=31f9f79e772eed906cd3de3c116b1cd2a177875a;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 31f9f79e77..29686d44dd 100644
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -3,9 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include <math.h>
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -20,8 +19,8 @@ properties_to_pango_description (SCM chain, Real text_size)
   PangoFontDescription *description = 0;
   if (scm_is_string (name))
     {
-      String name_str = ly_scm2string (name);
-      description = pango_font_description_from_string (name_str.to_str0 ());
+      string name_str = ly_scm2string (name);
+      description = pango_font_description_from_string (name_str.c_str ());
     }
   else
     {
@@ -44,8 +43,7 @@ properties_to_pango_description (SCM chain, Real text_size)
 				 0.0);
   Real size = text_size * pow (2.0, step / 6.0);
 
-  pango_font_description_set_size (description,
-				   gint (size * PANGO_SCALE));
+  pango_font_description_set_size (description, gint (size * PANGO_SCALE));
   return description;
 }
 
@@ -58,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);
 }
 
@@ -134,14 +133,14 @@ symbols_to_pango_font_description (SCM family,
 {
   PangoFontDescription *description = pango_font_description_new ();
 
-  String family_str = "roman";
+  string family_str = "roman";
   if (scm_is_symbol (family))
     family_str = ly_symbol2string (family);
   else if (scm_is_string (family))
     family_str = ly_scm2string (family);
 
   pango_font_description_set_family (description,
-				     family_str.to_str0 ());
+				     family_str.c_str ());
   pango_font_description_set_style (description,
 				    symbol_to_pango_style (style));
   pango_font_description_set_variant (description,