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 *
if (path.empty_b ())
{
- char * p = ly_find_afm (name.ch_C ());
- if (p)
+ String p = ly_find_afm (name.ch_C ());
+ if (p.length_i ())
path = p;
}
afm_p_dict_->set (sname,val);
- scm_unprotect_object (val);
+ scm_gc_unprotect_object (val);
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_)
+ /*
+ 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);
+ }
}
}
if (path.empty_b ())
{
- char * p = ly_find_tfm (name.ch_C ());
- if (p)
+ String p = ly_find_tfm (name.ch_C ());
+ if (p.length_i ())
path = p;
}
unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
tfm_p_dict_->set (sname, val);
- scm_unprotect_object (val);
+ scm_gc_unprotect_object (val);
}
return