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 e1be0f1de16c238cdee1c65c25a7997317f03604..f7334849b84ab2eabe4b68d1ae395e7b810c3326 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -3,21 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "all-font-metrics.hh"
 
-#include "open-type-font.hh"
+#include "international.hh"
 #include "main.hh"
-#include "warn.hh"
-#include "tfm.hh"
-#include "scm-hash.hh"
+#include "open-type-font.hh"
 #include "pango-font.hh"
+#include "scm-hash.hh"
+#include "tfm.hh"
+#include "warn.hh"
 
 static char const *default_font_str0_ = "cmr10";
 
-All_font_metrics::All_font_metrics (String path)
+All_font_metrics::All_font_metrics (string path)
 {
   tfm_dict_ = new Scheme_hash_table;
   otf_dict_ = new Scheme_hash_table;
@@ -73,7 +74,7 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
   if (!pango_dict_->try_retrieve (key, &val))
     {
       if (be_verbose_global)
-       progress_indication ("[" + String (pango_fn));
+       progress_indication ("[" + string (pango_fn));
 
       Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
                                       description,
@@ -96,11 +97,11 @@ All_font_metrics::find_pango_font (PangoFontDescription *description,
 
 #endif
 
-String
-kpathsea_find_file (String name, String ext)
+string
+kpathsea_find_file (string name, string ext)
 {
   name += "." + ext;
-  String path = global_path.find (name);
+  string path = global_path.find (name);
   if (path.length () > 0)
     return path;
 
@@ -114,7 +115,7 @@ kpathsea_find_file (String name, String ext)
 
   if (ly_is_procedure (proc))
     {
-      SCM kp_result = scm_call_1 (proc, scm_makfrom0str (name.to_str0 ()));
+      SCM kp_result = scm_call_1 (proc, scm_makfrom0str (name.c_str ()));
       if (scm_is_string (kp_result))
        return ly_scm2string (kp_result);
     }
@@ -123,18 +124,18 @@ kpathsea_find_file (String name, String ext)
 }
 
 Open_type_font *
-All_font_metrics::find_otf (String name)
+All_font_metrics::find_otf (string name)
 {
-  SCM sname = ly_symbol2scm (name.to_str0 ());
-  SCM name_string = scm_makfrom0str (name.to_str0 ());
+  SCM sname = ly_symbol2scm (name.c_str ());
+  SCM name_string = scm_makfrom0str (name.c_str ());
   SCM val;
   if (!otf_dict_->try_retrieve (sname, &val))
     {
-      String file_name;
+      string file_name;
 
-      if (file_name.is_empty ())
+      if (file_name.empty ())
        file_name = search_path_.find (name + ".otf");
-      if (file_name.is_empty ())
+      if (file_name.empty ())
        return 0;
 
       if (be_verbose_global)
@@ -156,27 +157,27 @@ All_font_metrics::find_otf (String name)
 }
 
 Tex_font_metric *
-All_font_metrics::find_tfm (String name)
+All_font_metrics::find_tfm (string name)
 {
-  SCM sname = ly_symbol2scm (name.to_str0 ());
-  SCM name_string = scm_makfrom0str (name.to_str0 ());
+  SCM sname = ly_symbol2scm (name.c_str ());
+  SCM name_string = scm_makfrom0str (name.c_str ());
   SCM val;
   if (!tfm_dict_->try_retrieve (sname, &val))
     {
-      String file_name;
+      string file_name;
 
-      if (file_name.is_empty ())
+      if (file_name.empty ())
        {
          /* FIXME: should add "cork-" prefix to lm* fonts.  How to do
             that, cleanly?  */
-         String p = kpathsea_find_file (name, "tfm");
+         string p = kpathsea_find_file (name, "tfm");
          if (p.length ())
            file_name = p;
        }
 
-      if (file_name.is_empty ())
+      if (file_name.empty ())
        file_name = search_path_.find (name + ".tfm");
-      if (file_name.is_empty ())
+      if (file_name.empty ())
        return 0;
 
       if (be_verbose_global)
@@ -198,7 +199,7 @@ All_font_metrics::find_tfm (String name)
 }
 
 Font_metric *
-All_font_metrics::find_font (String name)
+All_font_metrics::find_font (string name)
 {
   Font_metric *f = find_otf (name);
 
@@ -209,18 +210,18 @@ All_font_metrics::find_font (String name)
 
   if (!f)
     {
-      warning (_f ("can't find font: `%s'", name.to_str0 ()));
+      warning (_f ("can't find font: `%s'", name.c_str ()));
       warning (_ ("loading default font"));
     }
 
-  String def_name = default_font_str0_;
+  string def_name = default_font_str0_;
 
   if (!f)
     f = find_tfm (def_name);
 
   if (!f)
     {
-      error (_f ("can't find default font: `%s'", def_name.to_str0 ()));
+      error (_f ("can't find default font: `%s'", def_name.c_str ()));
       error (_f ("(search path: `%s')", search_path_.to_string ()));
       error (_ ("giving up"));
     }