#include "tfm.hh"
#include "lily-guile.hh"
#include "scm-hash.hh"
-
-
-#if HAVE_KPATHSEA_KPATHSEA_H
-extern "C" {
-#include <kpathsea/kpathsea.h>
-}
-#endif
+#include "kpath.hh"
const char * default_font_sz_ = "cmr10";
{
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);
}
{
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 name_str = ly_str02scm (name.ch_C ());
+
+ SCM val;
+
+ if (!afm_p_dict_->try_retrieve (sname, &val))
{
String path;
-#if (KPATHSEA && HAVE_KPSE_FIND_FILE)
+ if (path.empty_b())
+ path = search_path_.find (name + ".afm");
+
if (path.empty_b ())
{
- char * p = kpse_find_file (name.ch_C(), kpse_afm_format, true);
+ char * p = ly_find_afm (name.ch_C());
if (p)
path = p;
}
-#endif
-
- if (path.empty_b())
- path = search_path_.find (name + ".afm");
+
if (path.empty_b())
return 0;
if (verbose_global_b)
progress_indication ("[" + path);
- SCM afm = read_afm_file (path);
-
- unsmob_metrics (afm)->name_ = sname;
+ 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,afm);
- }
-
- return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (afm_p_dict_->get (sname)));
-}
+ afm_p_dict_->set (sname,val);
-Scaled_font_metric *
-All_font_metrics::find_scaled (String nm, int m)
-{
- String index = nm + "@" + to_str (m);
- SCM sname = ly_symbol2scm (index.ch_C ());
+ scm_unprotect_object (val);
- Font_metric *fm =0;
- if (!scaled_p_dict_->elem_b (sname))
- {
- Font_metric *f = find_font (nm);
- SCM s = Scaled_font_metric::make_scaled_font_metric (f, m);
- scaled_p_dict_->set (sname, s);
- fm = unsmob_metrics (s);
- }
- else
- fm = unsmob_metrics (scaled_p_dict_->get (sname));
- return dynamic_cast<Scaled_font_metric*> (fm);
+ Adobe_font_metric *afm
+ = dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val) );
+ Tex_font_metric * tfm = find_tfm (name);
+
+ if (tfm->info_.checksum != 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);
+ }
+ }
+
+ return dynamic_cast<Adobe_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 name_str = ly_str02scm (name.ch_C ());
+
+ SCM val;
+ if (!tfm_p_dict_->try_retrieve (sname, &val))
{
String path;
-//#if KPATHSEA && HAVE_KPSE_FIND_TFM -- urg: a macro
-#if KPATHSEA && HAVE_KPSE_FIND_FILE
if (path.empty_b())
{
- char * p = kpse_find_tfm (name.ch_C());
- path = p;
+ char * p = ly_find_tfm (name.ch_C());
+ if (p)
+ path = p;
}
-#endif
+
if (path.empty_b())
path = search_path_.find (name + ".tfm");
if (path.empty_b())
return 0;
+
if (verbose_global_b)
progress_indication ("[" + path);
- SCM tfm = Tex_font_metric::make_tfm (path);
+ val = Tex_font_metric::make_tfm (path);
+
if (verbose_global_b)
progress_indication ("]");
- Font_metric *fm = unsmob_metrics (tfm);
- fm->name_ = sname;
- tfm_p_dict_->set (sname, tfm);
+ 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);
}
-
+
return
- dynamic_cast<Tex_font_metric*> (unsmob_metrics (tfm_p_dict_->get(sname)));
+ 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;
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;
return 0;
}
-SCM
-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 ();
- SCM list = SCM_EOL;
- for (int i=0; i < 3; i++)
- {
- for (SCM s = l[i]; gh_pair_p (s); s = gh_cdr (s))
- {
- Font_metric * fm = unsmob_metrics (gh_cdar (s));
-
- list = gh_cons (fm->description (), list);
- }
- }
- return list;
-}
-
-
-
-Font_metric*
-find_font (String name)
-{
- return all_fonts_global_p->find_font (name);
-}
projects / lilypond.git / blobdiff