(out_filename): fix thinko with \version.

[lilypond.git] / lily / all-font-metrics.cc

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 2b3db1bc0993f2399bacaa880b3b80b0cc6178e3..9ccc1f78ed6087ba1d15ab53c236e3e90010f25b 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -68,14 +68,14 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
                                   gint (magnification *
                                         pango_font_description_get_size (description)));
 
-  gchar *fn = pango_font_description_to_filename (description);
-  SCM key = ly_symbol2scm (fn);
+  gchar *pango_fn = pango_font_description_to_filename (description);
+  SCM key = ly_symbol2scm (pango_fn);
 
   SCM val;
   if (!pango_dict_->try_retrieve (key, &val))
     {
-      if (be_verbose_global)
-       progress_indication ("[" + String (fn));
+      progress_indication ("[" + String (pango_fn));
+      
       Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
                                       RIGHT,
                                       description,
@@ -90,7 +90,7 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
       pf->description_ = scm_cons (SCM_BOOL_F,
                                   scm_make_real (1.0));
     }
-  g_free (fn);
+  g_free (pango_fn);
   return dynamic_cast<Pango_font *> (unsmob_metrics (val));
 }