* lily/include/translator.icc: new file.

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 6eb62bf103b7a5294aaf56ed910db33f662bbff8..8c4d40ffc8957d09ef8bc77643653dcc2824c4e8 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -68,14 +68,15 @@ 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 +91,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));
 }
 
@@ -105,7 +106,7 @@ kpathsea_find_file (String name, String ext)
     return path;
 
   SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file");
-  if (ly_c_procedure_p (kpath))
+  if (ly_is_procedure (kpath))
     {
       SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0 ()));
       if (scm_is_string (kp_result))
@@ -295,7 +296,7 @@ All_font_metrics::find_font (String name)
   if (!f)
     {
       warning (_f ("can't find font: `%s'", name.to_str0 ()));
-      warning (_ ("Loading default font"));
+      warning (_ ("loading default font"));
     }
 
   String def_name = default_font_str0_;
@@ -312,7 +313,7 @@ All_font_metrics::find_font (String name)
     {
       error (_f ("can't find default font: `%s'", def_name.to_str0 ()));
       error (_f ("(search path: `%s')", search_path_.to_string ()));
-      error (_ ("Giving up"));
+      error (_ ("giving up"));
     }
 
   return f;