X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fall-font-metrics.cc;h=91fcbcf3de130fe09375761552de306215ad0fb9;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=0ecfbf4420de88d419e88b1e20a4ddc31f462970;hpb=0a92b605eb18b62d171c97f354c2101109d9e071;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 0ecfbf4420..91fcbcf3de 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -1,78 +1,190 @@
+/*   
+  all-font-metrics.cc --  implement All_font_metrics
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
+#include "config.h"
 #include "main.hh"
-#include "all-fonts.hh"
+#include "all-font-metrics.hh"
 #include "debug.hh"
 #include "warn.hh"
 #include "afm.hh"
 #include "tfm.hh"
+#include "lily-guile.hh"
+#include "scm-hash.hh"
+#include "kpath.hh"
 
-const char * default_font_sz_ = "cmr10";
+static const char * default_font_sz_ = "cmr10";
 
 All_font_metrics::All_font_metrics (String path)
 {
+  afm_p_dict_ = new Scheme_hash_table;
+  tfm_p_dict_ = new Scheme_hash_table;
+  
   search_path_.parse_path (path);
 }
 
+All_font_metrics::~All_font_metrics ()
+{
+  scm_gc_unprotect_object (afm_p_dict_->self_scm ());
+  scm_gc_unprotect_object (tfm_p_dict_->self_scm ());
+}
+
 Adobe_font_metric *
 All_font_metrics::find_afm (String name)
 {
-  if (!afm_p_dict_.elem_b (name))
+  SCM sname = ly_symbol2scm (name.ch_C ());
+
+  SCM name_str = ly_str02scm (name.ch_C ());
+
+  SCM val;
+  
+  if (!afm_p_dict_->try_retrieve (sname, &val))
     {
-      String path = name  + ".afm";
-      path = search_path_.find (path);
+      String path;
+
+      if (path.empty_b ())
+	path = search_path_.find (name  + ".afm");
+
+      if (path.empty_b ())
+	{
+	  String p = ly_find_afm (name.ch_C ());
+	  if (p.length_i ())
+	    path = p;
+	}
+
       if (path.empty_b ())
 	return 0;
       
-      *mlog << "[" << path;
-      Adobe_font_metric
-	* afm_p = new Adobe_font_metric (read_afm_file (path));
-      *mlog << "]" << flush ;
+      if (verbose_global_b)
+	progress_indication ("[" + path);
+      val = read_afm_file (path);
+      unsmob_metrics (val)->path_ = path;
+      
+      unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
+
+      if (verbose_global_b)
+	progress_indication ("]");
+
+      afm_p_dict_->set (sname,val);
+
+      scm_gc_unprotect_object (val);
+
+
+      Adobe_font_metric *afm
+	= dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 
-      afm_p_dict_[name] = afm_p;
+      /*
+	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_)
+	    {
+	      String s = _f ("checksum mismatch for font file: `%s'",
+			     path.ch_C ());
+	      s += " " + _f ("does not match: `%s'", tfm->path_.ch_C ()); // FIXME
+	      s += "\n";
+	      s += " TFM: " + to_str ((int) tfm->info_.checksum);
+	      s += " AFM: " + to_str ((int) afm->checksum_);
+	      s += "\n";
+	      s += _ (" Rebuild all .afm files, and remove all .pk and .tfm files.  Rerun with -V to show font paths.");
+	      
+	      error (s);
+	    }
+	}
     }
-  return afm_p_dict_[name];  
+  
+  return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 }
 
+
 Tex_font_metric *
 All_font_metrics::find_tfm (String name)
 {
-  if (!tfm_p_dict_.elem_b (name))
+  SCM sname = ly_symbol2scm (name.ch_C ());
+  SCM name_str = ly_str02scm (name.ch_C ());
+
+  SCM val;
+  if (!tfm_p_dict_->try_retrieve (sname, &val))
     {
-      String path = name  + ".tfm";
-      path = search_path_.find (path);
+      String path;
+      
+      if (path.empty_b ())
+	{
+	  String p = ly_find_tfm (name.ch_C ());
+	  if (p.length_i ())
+	    path = p;
+	}
+
+      if (path.empty_b ())
+	path = search_path_.find (name  + ".tfm");
       if (path.empty_b ())
 	return 0;
+
       
-      *mlog << "[" << path;
-      Tex_font_metric	* tfm_p = new Tex_font_metric;
-      tfm_p->read_file (path);
-      *mlog << "]" << flush ;
+      if (verbose_global_b)
+	progress_indication ("[" + path);
+      val = Tex_font_metric::make_tfm (path);
+
+      if (verbose_global_b)
+	progress_indication ("]");
 
-      tfm_p_dict_[name] = tfm_p;
+      unsmob_metrics (val)->path_ = path;
+      unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
+      tfm_p_dict_->set (sname, val);
+
+      scm_gc_unprotect_object (val);
     }
-  return tfm_p_dict_[name];  
+
+  return
+    dynamic_cast<Tex_font_metric*> (unsmob_metrics (val));
 }
 
 
 Font_metric *
 All_font_metrics::find_font (String name)
 {
-  Font_metric * f=0;
-  f = find_tfm (name);
+  Font_metric * f= find_afm (name);
   if (f)
     return f;
 
-  f= find_afm (name);
+  f = find_tfm (name);
   if (f)
     return f;
 
-  warning (_f ("Can't find font: `%s'", name.ch_C ()));
+  warning (_f ("can't find font: `%s'", name.ch_C ()));
   warning (_ ("Loading default font"));
   
-  f =  find_tfm (default_font_sz_);
+  String def_name = default_font_sz_;
+
+  /*
+    we're in emergency recovery mode here anyway, so don't try to do
+    anything smart that runs the risk of failing.  */
+  f= find_afm (def_name);
+  if (f)
+    return f;
+
+  f =  find_tfm (def_name);
   if (f)
     return f;
-  error (_f ("Can't find default font: `%s'", default_font_sz_));
-  error (_f ("(search path: `%s'", search_path_.str ()));
+
+  error (_f ("can't find default font: `%s'", def_name.ch_C ()));
+  error (_f ("(search path: `%s')", search_path_.str ()));
   error (_ ("Giving up"));
+
+  return 0;
 }
+
+