* The grand 2005-2006 replace.

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index e49f36c13a983df0cb5d0eeb765aa64cc17470d6..6882651b8b0f591bcd9c4df1bdfa2fbdfc92084c 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -11,7 +11,6 @@
 #include "open-type-font.hh"
 #include "main.hh"
 #include "warn.hh"
-#include "afm.hh"
 #include "tfm.hh"
 #include "scm-hash.hh"
 #include "pango-font.hh"
@@ -20,7 +19,6 @@ static char const *default_font_str0_ = "cmr10";
 
 All_font_metrics::All_font_metrics (String path)
 {
-  afm_dict_ = new Scheme_hash_table;
   tfm_dict_ = new Scheme_hash_table;
   otf_dict_ = new Scheme_hash_table;
 
@@ -43,7 +41,6 @@ All_font_metrics::All_font_metrics (String path)
 
 All_font_metrics::~All_font_metrics ()
 {
-  afm_dict_->unprotect ();
   tfm_dict_->unprotect ();
   otf_dict_->unprotect ();
 
@@ -107,96 +104,22 @@ kpathsea_find_file (String name, String ext)
   if (path.length () > 0)
     return path;
 
-  SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file");
-  if (ly_is_procedure (kpath))
+  static SCM proc;
+  if (!proc)
     {
-      SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0 ()));
-      if (scm_is_string (kp_result))
-       return ly_scm2string (kp_result);
+      SCM module = scm_c_resolve_module ("scm kpathsea");
+      proc = scm_c_module_lookup (module, "ly:kpathsea-find-file");
+      proc = scm_variable_ref (proc);
     }
 
-  return "";
-}
-
-/*
-  TODO: our AFM handling is broken: the units in an AFM file are
-  relative to the design size (1000 units = 1 designsize). Hence we
-  should include design size when generating an AFM metric.
-
-  ugr: copied from find_tfm.
-*/
-Adobe_font_metric *
-All_font_metrics::find_afm (String name)
-{
-  SCM sname = ly_symbol2scm (name.to_str0 ());
-  SCM name_string = scm_makfrom0str (name.to_str0 ());
-  SCM val;
-  if (!afm_dict_->try_retrieve (sname, &val))
+  if (ly_is_procedure (proc))
     {
-      String file_name;
-
-      if (file_name.is_empty ())
-       file_name = search_path_.find (name + ".afm");
-
-      if (file_name.is_empty ())
-       {
-         String p = kpathsea_find_file (name, "afm");
-         if (p.length ())
-           file_name = p;
-       }
-
-      if (file_name.is_empty ())
-       return 0;
-
-      if (be_verbose_global)
-       progress_indication ("[" + file_name);
-      val = read_afm_file (file_name);
-      unsmob_metrics (val)->file_name_ = file_name;
-
-      unsmob_metrics (val)->description_ = scm_cons (name_string,
-                                                    scm_from_double (1.0));
-
-      if (be_verbose_global)
-       progress_indication ("]");
-
-      afm_dict_->set (sname, val);
-      unsmob_metrics (val)->unprotect ();
-
-      Adobe_font_metric *afm
-       = dynamic_cast<Adobe_font_metric *> (unsmob_metrics (val));
-
-      /* Only check checksums if there is one.  We take the risk that
-        some file has valid checksum 0 */
-      if (afm->checksum_)
-       {
-         Tex_font_metric *tfm = find_tfm (name);
-
-         /* FIXME: better warning message
-            (maybe check upon startup for feta16.afm, feta16.tfm?) */
-         if (tfm && tfm->info ().checksum != afm->checksum_)
-           {
-             // FIXME: broken sentence
-             String s = _f ("checksum mismatch for font file: `%s'",
-                            file_name.to_str0 ());
-             s += " " + _f ("does not match: `%s'",
-                            tfm->file_name_.to_str0 ());
-             s += "\n";
-             s += " TFM: " + to_string ((int) tfm->info ().checksum);
-             s += " AFM: " + to_string ((int) afm->checksum_);
-             s += "\n";
-             s += _ ("Rebuild all .afm files, and remove all .pk and .tfm files.");
-             s += "\n";
-             s += _ ("Rerun with -V to show font paths.");
-             s += "\n";
-             s += _ ("A script for removing font-files is delivered with the source-code:");
-             s += "\n";
-             s += "buildscripts/clean-fonts.sh";
-             error (s);
-           }
-       }
+      SCM kp_result = scm_call_1 (proc, scm_makfrom0str (name.to_str0 ()));
+      if (scm_is_string (kp_result))
+       return ly_scm2string (kp_result);
     }
 
-  return dynamic_cast<Adobe_font_metric *> (unsmob_metrics (val));
+  return "";
 }
 
 Open_type_font *
@@ -279,20 +202,9 @@ All_font_metrics::find_font (String name)
 {
   Font_metric *f = find_otf (name);
 
-  if (!f
-      && (name.left_string (4) == "feta"
-         || name.left_string (8) == "parmesan"
-         || name.left_string (2) == "lm"))
-    {
-      f = find_afm (name);
-      if (!f)
-       f = find_tfm (name);
-    }
-  else if (!f)
+  if (!f)
     {
       f = find_tfm (name);
-      if (!f)
-       f = find_afm (name);
     }
 
   if (!f)
@@ -303,11 +215,6 @@ All_font_metrics::find_font (String name)
 
   String def_name = default_font_str0_;
 
-  /* We're in emergency recovery mode here anyway, so don't try to do
-     anything smart that runs the risk of failing.  */
-  if (!f)
-    f = find_afm (def_name);
-
   if (!f)
     f = find_tfm (def_name);