release: 1.5.8

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 2a67d597700a3746c82b67efaa4cb838f27017a6..b198384426c8a4388b7409a6e4e0da8c7b6fc79f 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 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 *
@@ -47,27 +43,28 @@ 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)
        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,23 +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: `%s'", path.ch_C ());
-         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);
+           }
        }
     }
   
@@ -110,30 +121,33 @@ 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;
 
+      
       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));
 }
@@ -154,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;