Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 576a9d86f11b7ed3239895d75bd6f7d8cfff335c..f7334849b84ab2eabe4b68d1ae395e7b810c3326 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -18,7 +18,7 @@
 
 static char const *default_font_str0_ = "cmr10";
 
-All_font_metrics::All_font_metrics (std::string path)
+All_font_metrics::All_font_metrics (string path)
 {
   tfm_dict_ = new Scheme_hash_table;
   otf_dict_ = new Scheme_hash_table;
@@ -74,7 +74,7 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
   if (!pango_dict_->try_retrieve (key, &val))
     {
       if (be_verbose_global)
-       progress_indication ("[" + std::string (pango_fn));
+       progress_indication ("[" + string (pango_fn));
 
       Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
                                       description,
@@ -97,11 +97,11 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
 
 #endif
 
-std::string
-kpathsea_find_file (std::string name, std::string ext)
+string
+kpathsea_find_file (string name, string ext)
 {
   name += "." + ext;
-  std::string path = global_path.find (name);
+  string path = global_path.find (name);
   if (path.length () > 0)
     return path;
 
@@ -124,14 +124,14 @@ kpathsea_find_file (std::string name, std::string ext)
 }
 
 Open_type_font *
-All_font_metrics::find_otf (std::string name)
+All_font_metrics::find_otf (string name)
 {
   SCM sname = ly_symbol2scm (name.c_str ());
   SCM name_string = scm_makfrom0str (name.c_str ());
   SCM val;
   if (!otf_dict_->try_retrieve (sname, &val))
     {
-      std::string file_name;
+      string file_name;
 
       if (file_name.empty ())
        file_name = search_path_.find (name + ".otf");
@@ -157,20 +157,20 @@ All_font_metrics::find_otf (std::string name)
 }
 
 Tex_font_metric *
-All_font_metrics::find_tfm (std::string name)
+All_font_metrics::find_tfm (string name)
 {
   SCM sname = ly_symbol2scm (name.c_str ());
   SCM name_string = scm_makfrom0str (name.c_str ());
   SCM val;
   if (!tfm_dict_->try_retrieve (sname, &val))
     {
-      std::string file_name;
+      string file_name;
 
       if (file_name.empty ())
        {
          /* FIXME: should add "cork-" prefix to lm* fonts.  How to do
             that, cleanly?  */
-         std::string p = kpathsea_find_file (name, "tfm");
+         string p = kpathsea_find_file (name, "tfm");
          if (p.length ())
            file_name = p;
        }
@@ -199,7 +199,7 @@ All_font_metrics::find_tfm (std::string name)
 }
 
 Font_metric *
-All_font_metrics::find_font (std::string name)
+All_font_metrics::find_font (string name)
 {
   Font_metric *f = find_otf (name);
 
@@ -214,7 +214,7 @@ All_font_metrics::find_font (std::string name)
       warning (_ ("loading default font"));
     }
 
-  std::string def_name = default_font_str0_;
+  string def_name = default_font_str0_;
 
   if (!f)
     f = find_tfm (def_name);