run cvs up before patching.

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 6882651b8b0f591bcd9c4df1bdfa2fbdfc92084c..4d95f9e6c1c00fd4aab59a5b1f3e7f6e0d38f202 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -8,18 +8,15 @@
 
 #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 "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;
 
 #if HAVE_PANGO_FT2
@@ -41,7 +38,6 @@ All_font_metrics::All_font_metrics (String path)
 
 All_font_metrics::~All_font_metrics ()
 {
-  tfm_dict_->unprotect ();
   otf_dict_->unprotect ();
 
 #if HAVE_PANGO_FT2
@@ -73,7 +69,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 +92,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 +110,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 +119,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)
@@ -155,74 +151,14 @@ All_font_metrics::find_otf (String name)
   return dynamic_cast<Open_type_font *> (unsmob_metrics (val));
 }
 
-Tex_font_metric *
-All_font_metrics::find_tfm (String name)
-{
-  SCM sname = ly_symbol2scm (name.to_str0 ());
-  SCM name_string = scm_makfrom0str (name.to_str0 ());
-  SCM val;
-  if (!tfm_dict_->try_retrieve (sname, &val))
-    {
-      String file_name;
-
-      if (file_name.is_empty ())
-       {
-         /* FIXME: should add "cork-" prefix to lm* fonts.  How to do
-            that, cleanly?  */
-         String p = kpathsea_find_file (name, "tfm");
-         if (p.length ())
-           file_name = p;
-       }
-
-      if (file_name.is_empty ())
-       file_name = search_path_.find (name + ".tfm");
-      if (file_name.is_empty ())
-       return 0;
-
-      if (be_verbose_global)
-       progress_indication ("[" + file_name);
-
-      val = Tex_font_metric::make_tfm (file_name);
-
-      if (be_verbose_global)
-       progress_indication ("]");
-
-      unsmob_metrics (val)->file_name_ = file_name;
-      unsmob_metrics (val)->description_ = scm_cons (name_string,
-                                                    scm_from_double (1.0));
-      tfm_dict_->set (sname, val);
-      unsmob_metrics (val)->unprotect ();
-    }
-
-  return dynamic_cast<Tex_font_metric *> (unsmob_metrics (val));
-}
-
 Font_metric *
-All_font_metrics::find_font (String name)
+All_font_metrics::find_font (string name)
 {
   Font_metric *f = find_otf (name);
 
   if (!f)
     {
-      f = find_tfm (name);
-    }
-
-  if (!f)
-    {
-      warning (_f ("can't find font: `%s'", name.to_str0 ()));
-      warning (_ ("loading default font"));
-    }
-
-  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 ("(search path: `%s')", search_path_.to_string ()));
-      error (_ ("giving up"));
+      error (_f ("can't find font: `%s'", name.c_str ()));
     }
 
   return f;