X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=6f749f85cc14d719fe8d43fb5a82c6d712addea5;hb=fb1afe411d7ef4d5c8853c936adf894e3edbf833;hp=d7ec2a94fb565bc40986424eacac9fb011e1cbc5;hpb=3a7b6b3cbd35499a0993d46c302f37853f1b9c51;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index d7ec2a94fb..6f749f85cc 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 + (c) 1999--2001 Han-Wen Nienhuys */ @@ -18,17 +18,12 @@ #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) { 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); } @@ -37,14 +32,18 @@ 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 name_str = ly_str02scm (name.ch_C ()); + + SCM val; + + if (!afm_p_dict_->try_retrieve (sname, &val)) { String path; @@ -63,44 +62,50 @@ All_font_metrics::find_afm (String name) 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 (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 (fm); + Adobe_font_metric *afm + = dynamic_cast (unsmob_metrics (val) ); + Tex_font_metric * tfm = find_tfm (name); + + if (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 (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; @@ -116,28 +121,30 @@ All_font_metrics::find_tfm (String name) 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 (unsmob_metrics (tfm_p_dict_->get(sname))); + dynamic_cast (unsmob_metrics (val)); } Font_metric * All_font_metrics::find_font (String name) { - Font_metric * f=0; - - f= find_afm (name); + Font_metric * f= find_afm (name); if (f) return f; @@ -149,12 +156,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; @@ -170,32 +175,4 @@ All_font_metrics::find_font (String name) 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); -}