X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config-scheme.cc;h=a2bc3ae5d0f7111df71e39ff11cbbb3b05a827ff;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=993e52568eb1ce6a631b7364355ebfbe7fec22e8;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
index 993e52568e..a2bc3ae5d0 100644
--- a/lily/font-config-scheme.cc
+++ b/lily/font-config-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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
@@ -120,7 +120,7 @@ LY_DEFINE (ly_font_config_get_font_file, "ly:font-config-get-font-file", 1, 0, 0
   pat = FcFontMatch (NULL, pat, &result);
   FcChar8 *str = 0;
   if (FcPatternGetString (pat, FC_FILE, 0, &str) == FcResultMatch)
-    scm_result = scm_from_locale_string ((char const *)str);
+    scm_result = scm_from_utf8_string ((char const *)str);
 
   FcPatternDestroy (pat);
 
@@ -149,8 +149,8 @@ LY_DEFINE (ly_font_config_add_directory, "ly:font-config-add-directory", 1, 0, 0
 
   if (!FcConfigAppFontAddDir (0, (const FcChar8 *)d.c_str ()))
     error (_f ("failed adding font directory: %s", d.c_str ()));
-  else if (be_verbose_global)
-    message (_f ("adding font directory: %s", d.c_str ()));
+  else
+    debug_output (_f ("Adding font directory: %s", d.c_str ()));
 
   return SCM_UNSPECIFIED;
 }
@@ -165,8 +165,8 @@ LY_DEFINE (ly_font_config_add_font, "ly:font-config-add-font", 1, 0, 0,
 
   if (!FcConfigAppFontAddFile (0, (const FcChar8 *)f.c_str ()))
     error (_f ("failed adding font file: %s", f.c_str ()));
-  else if (be_verbose_global)
-    message (_f ("adding font file: %s", f.c_str ()));
+  else
+    debug_output (_f ("Adding font file: %s", f.c_str ()));
 
   return SCM_UNSPECIFIED;
 }