X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=91fcbcf3de130fe09375761552de306215ad0fb9;hb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;hp=2d3f73140e22fcb4c46138f457a0395bf8dbcb1e;hpb=a0f4b682135cf77e168a7201adbb4d083a1972d4;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 2d3f73140e..91fcbcf3de 100644
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -18,11 +18,7 @@
 #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)
 {
@@ -34,8 +30,8 @@ All_font_metrics::All_font_metrics (String path)
 
 All_font_metrics::~All_font_metrics ()
 {
-  scm_unprotect_object (afm_p_dict_->self_scm ());
-  scm_unprotect_object (tfm_p_dict_->self_scm ());
+  scm_gc_unprotect_object (afm_p_dict_->self_scm ());
+  scm_gc_unprotect_object (tfm_p_dict_->self_scm ());
 }
 
 Adobe_font_metric *
@@ -43,31 +39,32 @@ All_font_metrics::find_afm (String name)
 {
   SCM sname = ly_symbol2scm (name.ch_C ());
 
-  SCM name_str = gh_str02scm (name.ch_C ());
+  SCM name_str = ly_str02scm (name.ch_C ());
 
   SCM val;
   
-  if (!afm_p_dict_->try_retrieve  (sname, &val))
+  if (!afm_p_dict_->try_retrieve (sname, &val))
     {
       String path;
 
-      if (path.empty_b())
+      if (path.empty_b ())
 	path = search_path_.find (name  + ".afm");
 
       if (path.empty_b ())
 	{
-	  char  * p = ly_find_afm (name.ch_C());
-	  if (p)
+	  String p = ly_find_afm (name.ch_C ());
+	  if (p.length_i ())
 	    path = p;
 	}
 
-      if (path.empty_b())
+      if (path.empty_b ())
 	return 0;
       
       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)
@@ -75,7 +72,38 @@ All_font_metrics::find_afm (String name)
 
       afm_p_dict_->set (sname,val);
 
-      scm_unprotect_object (val);      
+      scm_gc_unprotect_object (val);
+
+
+      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_)
+	    {
+	      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 dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
@@ -86,37 +114,40 @@ Tex_font_metric *
 All_font_metrics::find_tfm (String name)
 {
   SCM sname = ly_symbol2scm (name.ch_C ());
-  SCM name_str = gh_str02scm (name.ch_C ());
+  SCM name_str = ly_str02scm (name.ch_C ());
 
   SCM val;
   if (!tfm_p_dict_->try_retrieve (sname, &val))
     {
       String path;
       
-      if (path.empty_b())
+      if (path.empty_b ())
 	{
-	  char * p = ly_find_tfm (name.ch_C());
-	  if (p)
+	  String p = ly_find_tfm (name.ch_C ());
+	  if (p.length_i ())
 	    path = p;
 	}
 
-      if (path.empty_b())
+      if (path.empty_b ())
 	path = search_path_.find (name  + ".tfm");
-      if (path.empty_b())
+      if (path.empty_b ())
 	return 0;
 
+      
       if (verbose_global_b)
 	progress_indication ("[" + path);
       val = Tex_font_metric::make_tfm (path);
+
       if (verbose_global_b)
 	progress_indication ("]");
 
+      unsmob_metrics (val)->path_ = path;
       unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
       tfm_p_dict_->set (sname, val);
 
-      scm_unprotect_object (val);
+      scm_gc_unprotect_object (val);
     }
-    
+
   return
     dynamic_cast<Tex_font_metric*> (unsmob_metrics (val));
 }
@@ -137,12 +168,10 @@ All_font_metrics::find_font (String name)
   warning (_ ("Loading default font"));
   
   String def_name = default_font_sz_;
-  SCM l = scm_assoc (ly_str02scm ("default"),
-		     scm_eval2 (ly_symbol2scm ("cmr-alist"), SCM_EOL));
-  
-  if (l != SCM_BOOL_F)
-    def_name = ly_scm2string (gh_cdr (l));
 
+  /*
+    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;