X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=f7334849b84ab2eabe4b68d1ae395e7b810c3326;hb=5d1d077e3d4f49fd822d3c04e785eee4be06a7fc;hp=bc21a30ea8c864dabe11590d09cda8153ebcfe4f;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index bc21a30ea8..f7334849b8 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,24 +3,23 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2005 Han-Wen Nienhuys + (c) 1999--2006 Han-Wen Nienhuys */ #include "all-font-metrics.hh" -#include "open-type-font.hh" +#include "international.hh" #include "main.hh" -#include "warn.hh" -#include "afm.hh" -#include "tfm.hh" -#include "scm-hash.hh" +#include "open-type-font.hh" #include "pango-font.hh" +#include "scm-hash.hh" +#include "tfm.hh" +#include "warn.hh" static char const *default_font_str0_ = "cmr10"; -All_font_metrics::All_font_metrics (String path) +All_font_metrics::All_font_metrics (string path) { - afm_dict_ = new Scheme_hash_table; tfm_dict_ = new Scheme_hash_table; otf_dict_ = new Scheme_hash_table; @@ -43,7 +42,6 @@ All_font_metrics::All_font_metrics (String path) All_font_metrics::~All_font_metrics () { - afm_dict_->unprotect (); tfm_dict_->unprotect (); otf_dict_->unprotect (); @@ -62,7 +60,8 @@ All_font_metrics::All_font_metrics (All_font_metrics const &) Pango_font * All_font_metrics::find_pango_font (PangoFontDescription *description, Real magnification, - Real output_scale) + Real output_scale + ) { pango_font_description_set_size (description, gint (magnification * @@ -75,12 +74,13 @@ All_font_metrics::find_pango_font (PangoFontDescription *description, if (!pango_dict_->try_retrieve (key, &val)) { if (be_verbose_global) - progress_indication ("[" + String (pango_fn)); - + progress_indication ("[" + string (pango_fn)); + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, - RIGHT, description, - output_scale); + output_scale + ); + val = pf->self_scm (); pango_dict_->set (key, val); pf->unprotect (); @@ -97,119 +97,45 @@ All_font_metrics::find_pango_font (PangoFontDescription *description, #endif -String -kpathsea_find_file (String name, String ext) +string +kpathsea_find_file (string name, string ext) { name += "." + ext; - String path = global_path.find (name); + string path = global_path.find (name); if (path.length () > 0) return path; - SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file"); - if (ly_is_procedure (kpath)) + static SCM proc; + if (!proc) { - SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0 ())); - if (scm_is_string (kp_result)) - return ly_scm2string (kp_result); + SCM module = scm_c_resolve_module ("scm kpathsea"); + proc = scm_c_module_lookup (module, "ly:kpathsea-find-file"); + proc = scm_variable_ref (proc); } - return ""; -} - -/* - TODO: our AFM handling is broken: the units in an AFM file are - relative to the design size (1000 units = 1 designsize). Hence we - should include design size when generating an AFM metric. - - ugr: copied from find_tfm. -*/ -Adobe_font_metric * -All_font_metrics::find_afm (String name) -{ - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); - SCM val; - if (!afm_dict_->try_retrieve (sname, &val)) + if (ly_is_procedure (proc)) { - String file_name; - - if (file_name.is_empty ()) - file_name = search_path_.find (name + ".afm"); - - if (file_name.is_empty ()) - { - String p = kpathsea_find_file (name, "afm"); - if (p.length ()) - file_name = p; - } - - if (file_name.is_empty ()) - return 0; - - if (be_verbose_global) - progress_indication ("[" + file_name); - val = read_afm_file (file_name); - unsmob_metrics (val)->file_name_ = file_name; - - unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_from_double (1.0)); - - if (be_verbose_global) - progress_indication ("]"); - - afm_dict_->set (sname, val); - unsmob_metrics (val)->unprotect (); - - Adobe_font_metric *afm - = dynamic_cast (unsmob_metrics (val)); - - /* Only check checksums if there is one. We take the risk that - some file has valid checksum 0 */ - if (afm->checksum_) - { - 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_) - { - // FIXME: broken sentence - String s = _f ("checksum mismatch for font file: `%s'", - file_name.to_str0 ()); - s += " " + _f ("does not match: `%s'", - tfm->file_name_.to_str0 ()); - 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."); - s += "\n"; - s += _ ("Rerun with -V to show font paths."); - s += "\n"; - s += _ ("A script for removing font-files is delivered with the source-code:"); - s += "\n"; - s += "buildscripts/clean-fonts.sh"; - error (s); - } - } + SCM kp_result = scm_call_1 (proc, scm_makfrom0str (name.c_str ())); + if (scm_is_string (kp_result)) + return ly_scm2string (kp_result); } - return dynamic_cast (unsmob_metrics (val)); + return ""; } Open_type_font * -All_font_metrics::find_otf (String name) +All_font_metrics::find_otf (string name) { - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); + SCM sname = ly_symbol2scm (name.c_str ()); + SCM name_string = scm_makfrom0str (name.c_str ()); SCM val; if (!otf_dict_->try_retrieve (sname, &val)) { - String file_name; + string file_name; - if (file_name.is_empty ()) + if (file_name.empty ()) file_name = search_path_.find (name + ".otf"); - if (file_name.is_empty ()) + if (file_name.empty ()) return 0; if (be_verbose_global) @@ -231,27 +157,27 @@ All_font_metrics::find_otf (String name) } Tex_font_metric * -All_font_metrics::find_tfm (String name) +All_font_metrics::find_tfm (string name) { - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); + SCM sname = ly_symbol2scm (name.c_str ()); + SCM name_string = scm_makfrom0str (name.c_str ()); SCM val; if (!tfm_dict_->try_retrieve (sname, &val)) { - String file_name; + string file_name; - if (file_name.is_empty ()) + if (file_name.empty ()) { /* FIXME: should add "cork-" prefix to lm* fonts. How to do that, cleanly? */ - String p = kpathsea_find_file (name, "tfm"); + string p = kpathsea_find_file (name, "tfm"); if (p.length ()) file_name = p; } - if (file_name.is_empty ()) + if (file_name.empty ()) file_name = search_path_.find (name + ".tfm"); - if (file_name.is_empty ()) + if (file_name.empty ()) return 0; if (be_verbose_global) @@ -273,45 +199,29 @@ All_font_metrics::find_tfm (String name) } Font_metric * -All_font_metrics::find_font (String name) +All_font_metrics::find_font (string name) { Font_metric *f = find_otf (name); - if (!f - && (name.left_string (4) == "feta" - || name.left_string (8) == "parmesan" - || name.left_string (2) == "lm")) - { - f = find_afm (name); - if (!f) - f = find_tfm (name); - } - else if (!f) + if (!f) { f = find_tfm (name); - if (!f) - f = find_afm (name); } if (!f) { - warning (_f ("can't find font: `%s'", name.to_str0 ())); + warning (_f ("can't find font: `%s'", name.c_str ())); warning (_ ("loading default font")); } - 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. */ - if (!f) - f = find_afm (def_name); + string def_name = default_font_str0_; if (!f) f = find_tfm (def_name); if (!f) { - error (_f ("can't find default font: `%s'", def_name.to_str0 ())); + error (_f ("can't find default font: `%s'", def_name.c_str ())); error (_f ("(search path: `%s')", search_path_.to_string ())); error (_ ("giving up")); }