From 571e8c9bab86302c179df0e37af536da9499b427 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:59:58 +0000 Subject: [PATCH] lilypond-1.3.145 --- lily/all-font-metrics.cc | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index a19fb2aa8b..72003d663e 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -77,20 +77,32 @@ All_font_metrics::find_afm (String name) Adobe_font_metric *afm = dynamic_cast (unsmob_metrics (val)); - Tex_font_metric * tfm = find_tfm (name); - 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 += " " + _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.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); + } } } -- 2.39.5