X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=a00877a75b1b2fe01a1b74bf00462aae52647ed6;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=0c22c59b6cbf3cbaca20862770053c7e40ff3e9c;hpb=af51453530b95aee167fe02ee3f4cb0c8dcd1fe2;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 0c22c59b6c..a00877a75b 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,14 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "config.h" #include "main.hh" #include "all-font-metrics.hh" -#include "debug.hh" + #include "warn.hh" #include "afm.hh" #include "tfm.hh" @@ -18,7 +18,7 @@ #include "scm-hash.hh" #include "kpath.hh" -const char * default_font_sz_ = "cmr10"; +static const char * default_font_str0_ = "cmr10"; All_font_metrics::All_font_metrics (String path) { @@ -30,34 +30,34 @@ 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 * All_font_metrics::find_afm (String name) { - SCM sname = ly_symbol2scm (name.ch_C ()); + SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_str = ly_str02scm (name.ch_C ()); + SCM name_string = scm_makfrom0str (name.to_str0 ()); 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.to_str0 ()); + if (p.length ()) path = p; } - if (path.empty_b()) + if (path.empty_b ()) return 0; if (verbose_global_b) @@ -65,31 +65,44 @@ All_font_metrics::find_afm (String name) val = read_afm_file (path); unsmob_metrics (val)->path_ = path; - unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0)); + unsmob_metrics (val)->description_ = gh_cons (name_string, gh_double2scm (1.0)); if (verbose_global_b) progress_indication ("]"); afm_p_dict_->set (sname,val); - scm_unprotect_object (val); + scm_gc_unprotect_object (val); Adobe_font_metric *afm - = dynamic_cast (unsmob_metrics (val) ); - Tex_font_metric * tfm = find_tfm (name); + = dynamic_cast (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.to_str0 ()); + s += " " + _f ("does not match: `%s'", tfm->path_.to_str0 ()); // FIXME + s += "\n"; + s += " TFM: " + to_string ((int) tfm->info_.checksum); + s += " AFM: " + to_string ((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); + } } } @@ -100,24 +113,24 @@ All_font_metrics::find_afm (String name) Tex_font_metric * All_font_metrics::find_tfm (String name) { - SCM sname = ly_symbol2scm (name.ch_C ()); - SCM name_str = ly_str02scm (name.ch_C ()); + SCM sname = ly_symbol2scm (name.to_str0 ()); + SCM name_string = scm_makfrom0str (name.to_str0 ()); SCM val; if (!tfm_p_dict_->try_retrieve (sname, &val)) { 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.to_str0 ()); + if (p.length ()) 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; @@ -129,10 +142,10 @@ All_font_metrics::find_tfm (String name) progress_indication ("]"); unsmob_metrics (val)->path_ = path; - unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0)); + unsmob_metrics (val)->description_ = gh_cons (name_string, gh_double2scm (1.0)); tfm_p_dict_->set (sname, val); - scm_unprotect_object (val); + scm_gc_unprotect_object (val); } return @@ -140,6 +153,7 @@ All_font_metrics::find_tfm (String name) } + Font_metric * All_font_metrics::find_font (String name) { @@ -151,16 +165,14 @@ All_font_metrics::find_font (String name) if (f) return f; - warning (_f ("can't find font: `%s'", name.ch_C ())); + warning (_f ("can't find font: `%s'", name.to_str0 ())); 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)); + String def_name = default_font_str0_; + /* + 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; @@ -169,8 +181,8 @@ All_font_metrics::find_font (String name) if (f) return f; - error (_f ("can't find default font: `%s'", def_name.ch_C ())); - error (_f ("(search path: `%s')", search_path_.str ())); + error (_f ("can't find default font: `%s'", def_name.to_str0 ())); + error (_f ("(search path: `%s')", search_path_.string ())); error (_ ("Giving up")); return 0;