(kpathsea_find_tfm): Do not trigger TMF generation.

diff --git a/ChangeLog b/ChangeLog
index fb7b912dbcfd325709d1419afed88715648ba522..d072246ac0e2e6021683da8860ce32f81e2765af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/kpath.cc (kpathsea_find_tfm): Do not trigger TMF generation.
+
        * scm/output-ps.scm: Remove some cruft.
 
 2004-04-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>

diff --git a/lily/kpath.cc b/lily/kpath.cc
index bc64468e06573421cf21b574be4df2a37e08f738..cea15b6cd9069985e2b6299859f8ddbda5c4f007 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -63,22 +63,29 @@ kpathsea_find_afm (char const * name)
 }
 
 String
-kpathsea_find_tfm (char const * name)
+kpathsea_find_tfm (char const *name)
 {
-  String p = global_path.find (String (name) + ".tfm");
-
-  if (p.length ())
-    return p;
-  
+  String filename = global_path.find (String (name) + ".tfm");
 #if (KPATHSEA && HAVE_KPSE_FIND_FILE)
-  char * name_ptr =  kpse_find_file (name, kpse_tfm_format, true);
-  if (!name_ptr)
-    warning (_f ("kpathsea can not find TFM file: `%s'", name));
-  else
-    return name_ptr;
+  if (filename.is_empty ())
+    {
+      /* If invoked for a TeX font, we could do TRUE (must exist).
+        We could also do:
+          p = kpse_find_file (name, kpse_mf_format, false);
+          if (p)
+            p = kpse_find_file (name, kpse_mf_format, true);
+
+        but we assume that if there is a .PFA, there is also a .TFM,
+        and it's no use generating TFMs on the fly, because PFAs cannot
+        be generated on the fly. */
+      char *p = kpse_find_file (name, kpse_tfm_format, false);
+      if (!p)
+       warning (_f ("kpathsea can not find TFM file: `%s'", name));
+      else
+       filename = p;
+    }
 #endif
-
-  return "";
+  return filename;
 }
 
 #if KPATHSEA