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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 33a4667ef7..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>
   
  */
 
@@ -30,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,21 +43,21 @@ All_font_metrics::find_afm (String name)
 
   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)
@@ -72,24 +72,37 @@ 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) );
-      Tex_font_metric * tfm = find_tfm (name);
+	= dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 
-      if (tfm->info_.checksum != afm->checksum_)
+      /*
+	only check checksums if there is one.  We take the risk that
+	some file has valid checksum 0
+      */
+      if (afm->checksum_)
 	{
-	  String s = _f ("checksum mismatch for font file:\n`%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);
+	  
+	  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);
+	    }
 	}
     }
   
@@ -108,16 +121,16 @@ All_font_metrics::find_tfm (String name)
     {
       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;
 
       
@@ -132,7 +145,7 @@ All_font_metrics::find_tfm (String name)
       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