X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=4159cd5a32356f52be6d2d85105fee8919e83bfc;hb=d5e69ed8a1d37f6c43395c33b1481ded35afd4f9;hp=63658d6be34b3f5d901102653551db02b25fe439;hpb=f525f992e5dbeb579981153775cc9ee10b78cb3f;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 63658d6be3..4159cd5a32 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,245 +1,177 @@ /* - all-font-metrics.cc -- implement All_font_metrics - + all-font-metrics.cc -- implement All_font_metrics + source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys + + (c) 1999--2006 Han-Wen Nienhuys */ #include "all-font-metrics.hh" -#include "open-type-font.hh" -#include "config.hh" +#include "international.hh" #include "main.hh" -#include "warn.hh" -#include "afm.hh" -#include "tfm.hh" +#include "open-type-font.hh" +#include "pango-font.hh" #include "scm-hash.hh" -#include "kpath.hh" +#include "warn.hh" -static const char *default_font_str0_ = "cmr10"; +static char const *default_font_str0_ = "cmr10"; -All_font_metrics::All_font_metrics (String path) +All_font_metrics::All_font_metrics (string path) { - afm_p_dict_ = new Scheme_hash_table; - tfm_p_dict_ = new Scheme_hash_table; - otf_p_dict_ = new Scheme_hash_table; - + otf_dict_ = new Scheme_hash_table; + +#if HAVE_PANGO_FT2 + PangoFontMap *pfm = pango_ft2_font_map_new (); + + pango_ft2_fontmap_ + = G_TYPE_CHECK_INSTANCE_CAST (pfm, + PANGO_TYPE_FT2_FONT_MAP, + PangoFT2FontMap); + pango_dpi_ = 1200; + pango_ft2_font_map_set_resolution (pango_ft2_fontmap_, + pango_dpi_, pango_dpi_); + + pango_dict_ = new Scheme_hash_table; +#endif + search_path_.parse_path (path); } All_font_metrics::~All_font_metrics () { - scm_gc_unprotect_object (afm_p_dict_->self_scm ()); - scm_gc_unprotect_object (tfm_p_dict_->self_scm ()); - scm_gc_unprotect_object (otf_p_dict_->self_scm ()); + otf_dict_->unprotect (); + +#if HAVE_PANGO_FT2 + pango_dict_->unprotect (); + g_object_unref (pango_ft2_fontmap_); +#endif } -All_font_metrics::All_font_metrics (All_font_metrics const&) +All_font_metrics::All_font_metrics (All_font_metrics const &) { } -/* - 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) +#if HAVE_PANGO_FT2 + +Pango_font * +All_font_metrics::find_pango_font (PangoFontDescription *description, + Real magnification, + Real output_scale + ) { - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); - SCM val; - if (!afm_p_dict_->try_retrieve (sname, &val)) - { - String file_name; + pango_font_description_set_size (description, + gint (magnification * + pango_font_description_get_size (description))); - if (file_name.is_empty ()) - file_name = search_path_.find (name + ".afm"); + gchar *pango_fn = pango_font_description_to_filename (description); + SCM key = ly_symbol2scm (pango_fn); - if (file_name.is_empty ()) - { - String p = kpathsea_find_afm (name.to_str0 ()); - if (p.length ()) - file_name = p; - } + SCM val; + if (!pango_dict_->try_retrieve (key, &val)) + { + if (be_verbose_global) + progress_indication ("[" + string (pango_fn)); - if (file_name.is_empty ()) - return 0; - - if (verbose_global_b) - progress_indication ("[" + file_name); - val = read_afm_file (file_name); - unsmob_metrics (val)->file_name_ = file_name; + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, + description, + output_scale + ); - unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); + val = pf->self_scm (); + pango_dict_->set (key, val); + pf->unprotect (); - if (verbose_global_b) + if (be_verbose_global) progress_indication ("]"); - afm_p_dict_->set (sname, val); - scm_gc_unprotect_object (val); - - 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); - } - } + pf->description_ = scm_cons (SCM_BOOL_F, + scm_from_double (1.0)); } - - return dynamic_cast (unsmob_metrics (val)); + g_free (pango_fn); + return dynamic_cast (unsmob_metrics (val)); } +#endif -Open_type_font* -All_font_metrics::find_otf (String name) +string +kpathsea_find_file (string name, string ext) { - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); - SCM val; - if (!otf_p_dict_->try_retrieve (sname, &val)) - { - String file_name; - - if (file_name.is_empty ()) - file_name = search_path_.find (name + ".otf"); - if (file_name.is_empty ()) - return 0; + name += "." + ext; + string path = global_path.find (name); + if (path.length () > 0) + return path; - if (verbose_global_b) - progress_indication ("[" + file_name); - - val = Open_type_font::make_otf (file_name); - - if (verbose_global_b) - progress_indication ("]"); + static SCM proc; + if (!proc) + { + SCM module = scm_c_resolve_module ("scm kpathsea"); + proc = scm_c_module_lookup (module, "ly:kpathsea-find-file"); + proc = scm_variable_ref (proc); + } - unsmob_metrics (val)->file_name_ = file_name; - unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); - otf_p_dict_->set (sname, val); - scm_gc_unprotect_object (val); + if (ly_is_procedure (proc)) + { + 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 ""; } - -Tex_font_metric* -All_font_metrics::find_tfm (String name) +Open_type_font * +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 (!tfm_p_dict_->try_retrieve (sname, &val)) + if (!otf_dict_->try_retrieve (sname, &val)) { - String file_name; - - if (file_name.is_empty ()) - { - /* FIXME: should add "cork-" prefix to lm* fonts. How to do - that, cleanly? */ - String p = kpathsea_find_tfm (name.to_str0 ()); - if (p.length ()) - file_name = p; - } - - if (file_name.is_empty ()) - file_name = search_path_.find (name + ".tfm"); - if (file_name.is_empty ()) + string file_name; + + if (file_name.empty ()) + file_name = search_path_.find (name + ".otf"); + if (file_name.empty ()) return 0; - if (verbose_global_b) + if (be_verbose_global) progress_indication ("[" + file_name); - - val = Tex_font_metric::make_tfm (file_name); - if (verbose_global_b) + val = Open_type_font::make_otf (file_name); + + if (be_verbose_global) progress_indication ("]"); unsmob_metrics (val)->file_name_ = file_name; unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); - tfm_p_dict_->set (sname, val); - scm_gc_unprotect_object (val); + scm_from_double (1.0)); + otf_dict_->set (sname, val); + unsmob_metrics (val)->unprotect (); } - return dynamic_cast (unsmob_metrics (val)); + return dynamic_cast (unsmob_metrics (val)); } -Font_metric* -All_font_metrics::find_font (String name) +Font_metric * +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) - { - f = find_tfm (name); - if (!f) - f = find_afm (name); - } if (!f) { - warning (_f ("can't find font: `%s'", name.to_str0 ())); - warning (_ ("Loading default font")); + 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); - if (!f) - f = find_tfm (def_name); + string def_name = default_font_str0_; 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")); + error (_ ("giving up")); } return f; @@ -247,7 +179,6 @@ All_font_metrics::find_font (String name) All_font_metrics *all_fonts_global; - LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, (SCM name), "Load the font @var{name}. ")