release: 1.3.93

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index f014ef3e46883bce1600badfa69e11467e8f7449..ab4d17759ca92e9a28006b771eda3a7e0f018eb5 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -7,6 +7,7 @@
   
  */
 
+#include "config.h"
 #include "main.hh"
 #include "all-font-metrics.hh"
 #include "debug.hh"
@@ -14,97 +15,125 @@
 #include "afm.hh"
 #include "tfm.hh"
 #include "lily-guile.hh"
-#include "tfm-reader.hh"
+#include "scm-hash.hh"
+#include "kpath.hh"
+
+
+
 
-extern "C" {
-#include <kpathsea/kpathsea.h>
-}
 
 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;
+  scaled_p_dict_ = new Scheme_hash_table;
+  
   search_path_.parse_path (path);
 }
 
+All_font_metrics::~All_font_metrics ()
+{
+  scm_unprotect_object (afm_p_dict_->self_scm ());
+  scm_unprotect_object (tfm_p_dict_->self_scm ());
+  scm_unprotect_object (scaled_p_dict_->self_scm ());
+}
+
 Adobe_font_metric *
 All_font_metrics::find_afm (String name)
 {
   SCM sname = ly_symbol2scm (name.ch_C ());
-  if (!afm_p_dict_.elem_b (sname))
+
+  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 ())
-        { 
-         path = kpse_find_file(name.ch_C(), kpse_afm_format, true);
-         if (path.empty_b())
-           return 0;
-        }
+       {
+         char  * p = ly_find_afm (name.ch_C());
+         if (p)
+           path = p;
+       }
+
+      if (path.empty_b())
+       return 0;
+      
       if (verbose_global_b)
        progress_indication ("[" + path);
-      Adobe_font_metric * afm_p = read_afm_file (path);
+      val = read_afm_file (path);
 
-      afm_p->name_ = ly_symbol2scm (name.ch_C ());
+      unsmob_metrics (val)->name_ = sname;
 
       if (verbose_global_b)
        progress_indication ("]");
 
-      afm_p_dict_.set (sname,afm_p->self_scm_);
+      afm_p_dict_->set (sname,val);
+
+      
     }
   
-  return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (afm_p_dict_.get (sname)));
+  return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 }
 
 Scaled_font_metric * 
 All_font_metrics::find_scaled (String nm, int m)
 {
-  Scaled_font_metric * s=0;
   String index =  nm + "@" + to_str (m);
   SCM sname = ly_symbol2scm (index.ch_C ());
 
-  Font_metric *fm =0;
-  if (!scaled_p_dict_.elem_b (sname))
+  SCM val;
+
+  if (!scaled_p_dict_->try_retrieve  (sname, &val))
     {
       Font_metric *f = find_font (nm);
-      s = new Scaled_font_metric (f, m);
-      scaled_p_dict_.set (sname, s->self_scm_);
-      fm =  s;
+      val =  Scaled_font_metric::make_scaled_font_metric (f, m);
+      scaled_p_dict_->set (sname, val);
     }
-  else
-    fm = unsmob_metrics (scaled_p_dict_.get (sname));
+  
 
-  return dynamic_cast<Scaled_font_metric*> (fm);
+  return dynamic_cast<Scaled_font_metric*> (unsmob_metrics (val));
 }
 
 Tex_font_metric *
 All_font_metrics::find_tfm (String name)
 {
-  SCM sname = ly_symbol2scm (name.ch_C ());  
-  if (!tfm_p_dict_.elem_b (sname))
+  SCM sname = ly_symbol2scm (name.ch_C ());
+
+  SCM val;
+  if (!tfm_p_dict_->try_retrieve (sname, &val))
     {
-      String path = name  + ".tfm";
-      path = search_path_.find (path);
-      path = search_path_.find (path);
-      if (path.empty_b ())
-        { 
-         path = kpse_find_tfm(name.ch_C());
-         if (path.empty_b())
-           return 0;
-        }
+      String path;
+      
+      if (path.empty_b())
+       {
+         char * p = ly_find_tfm (name.ch_C());
+         if (p)
+           path = p;
+       }
+
+      if (path.empty_b())
+       path = search_path_.find (name  + ".tfm");
+      if (path.empty_b())
+       return 0;
+
       if (verbose_global_b)
        progress_indication ("[" + path);
-      Tex_font_metric  * tfm_p = Tex_font_metric_reader::read_file (path);
-      tfm_p->name_ = ly_symbol2scm (name.ch_C( ));
-
+      val = Tex_font_metric::make_tfm (path);
       if (verbose_global_b)
        progress_indication ("]");
 
-      tfm_p_dict_.set (sname, tfm_p->self_scm_);
+      unsmob_metrics (val)->name_ = sname;
+      tfm_p_dict_->set (sname, val);
     }
     
   return
-    dynamic_cast<Tex_font_metric*> (unsmob_metrics (tfm_p_dict_.get(sname)));
+    dynamic_cast<Tex_font_metric*> (unsmob_metrics (val));
 }
 
 
@@ -112,11 +141,12 @@ Font_metric *
 All_font_metrics::find_font (String name)
 {
   Font_metric * f=0;
-  f = find_tfm (name);
+
+  f= find_afm (name);
   if (f)
     return f;
 
-  f= find_afm (name);
+  f = find_tfm (name);
   if (f)
     return f;
 
@@ -125,16 +155,16 @@ All_font_metrics::find_font (String name)
   
   String def_name = default_font_sz_;
   SCM l = scm_assoc (ly_str02scm ("default"),
-                    scm_eval (ly_symbol2scm ("cmr-alist")));
+                    scm_eval2 (ly_symbol2scm ("cmr-alist"), SCM_EOL));
   
   if (l != SCM_BOOL_F)
     def_name = ly_scm2string (gh_cdr (l));
 
-  f =  find_tfm (def_name);
+  f= find_afm (def_name);
   if (f)
     return f;
 
-  f= find_afm (def_name);
+  f =  find_tfm (def_name);
   if (f)
     return f;
 
@@ -150,9 +180,9 @@ All_font_metrics::font_descriptions () const
 {
   SCM l[] = {0,0,0};
 
-  l[0] = afm_p_dict_.to_alist ();
-  l[1] = tfm_p_dict_.to_alist ();
-  l[2] = scaled_p_dict_.to_alist ();  
+  l[0] = afm_p_dict_->to_alist ();
+  l[1] = tfm_p_dict_->to_alist ();
+  l[2] = scaled_p_dict_->to_alist ();  
 
   SCM list = SCM_EOL;
   for (int i=0; i < 3; i++)