X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=8a1143a537e2d33982506d4f7102e4c1e8590d28;hb=5157c9ae198de75060258eb33ddc14ace0fdd1e0;hp=fb6d20b7736b14c6797facb3c24ae21bffd4a2d7;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index fb6d20b773..8a1143a537 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,211 +1,149 @@ /* - - 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 - - */ -#include "config.h" -#include "main.hh" + (c) 1999--2007 Han-Wen Nienhuys +*/ + #include "all-font-metrics.hh" -#include "warn.hh" -#include "afm.hh" -#include "tfm.hh" -#include "lily-guile.hh" +#include "international.hh" +#include "main.hh" +#include "open-type-font.hh" +#include "pango-font.hh" #include "scm-hash.hh" -#include "kpath.hh" +#include "warn.hh" + + +Index_to_charcode_map const * +All_font_metrics::get_index_to_charcode_map (string filename, FT_Face face) +{ + if (filename_charcode_maps_map_.find (filename) + == filename_charcode_maps_map_.end ()) + filename_charcode_maps_map_[filename] = make_index_to_charcode_map (face); + + return &filename_charcode_maps_map_[filename]; +} -static const char * 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_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 ()); + otf_dict_->unprotect (); + +#if HAVE_PANGO_FT2 + pango_dict_->unprotect (); + g_object_unref (pango_ft2_fontmap_); +#endif } -/* - 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. - */ -Adobe_font_metric * -All_font_metrics::find_afm (String name) +All_font_metrics::All_font_metrics (All_font_metrics const &) { - SCM sname = ly_symbol2scm (name.to_str0 ()); +} - SCM name_string = scm_makfrom0str (name.to_str0 ()); +#if HAVE_PANGO_FT2 + +Pango_font * +All_font_metrics::find_pango_font (PangoFontDescription const *description, + Real output_scale + ) +{ + gchar *pango_fn = pango_font_description_to_filename (description); + SCM key = ly_symbol2scm (pango_fn); SCM val; - - if (!afm_p_dict_->try_retrieve (sname, &val)) + if (!pango_dict_->try_retrieve (key, &val)) { - String path; - - if (path.is_empty ()) - path = search_path_.find (name + ".afm"); + if (be_verbose_global) + progress_indication ("[" + string (pango_fn)); - if (path.is_empty ()) - { - String p = kpathsea_find_afm (name.to_str0 ()); - if (p.length ()) - path = p; - } - - if (path.is_empty ()) - return 0; - - if (verbose_global_b) - progress_indication ("[" + path); - val = read_afm_file (path); - unsmob_metrics (val)->path_ = path; + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, + description, + output_scale + ); - unsmob_metrics (val)->description_ = gh_cons (name_string, gh_double2scm (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_) - { - 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.\nRerun with -V to show font paths.\n"); - s += _("A script for removing font-files is delivered with the source-code,\n" - "in 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 -Tex_font_metric * -All_font_metrics::find_tfm (String name) -{ - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); +Open_type_font * +All_font_metrics::find_otf (string name) +{ + SCM sname = ly_symbol2scm (name.c_str ()); + SCM name_string = ly_string2scm (name); SCM val; - if (!tfm_p_dict_->try_retrieve (sname, &val)) + if (!otf_dict_->try_retrieve (sname, &val)) { - String path; - - if (path.is_empty ()) - { - String p = kpathsea_find_tfm (name.to_str0 ()); - if (p.length ()) - path = p; - } - - if (path.is_empty ()) - path = search_path_.find (name + ".tfm"); - if (path.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) - progress_indication ("[" + path); - - val = Tex_font_metric::make_tfm (path); + if (be_verbose_global) + progress_indication ("[" + file_name); - if (verbose_global_b) - progress_indication ("]"); + val = Open_type_font::make_otf (file_name); - unsmob_metrics (val)->path_ = path; - unsmob_metrics (val)->description_ = gh_cons (name_string, gh_double2scm (1.0)); - tfm_p_dict_->set (sname, val); + if (be_verbose_global) + progress_indication ("]"); - scm_gc_unprotect_object (val); + unsmob_metrics (val)->file_name_ = file_name; + unsmob_metrics (val)->description_ = scm_cons (name_string, + 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) +All_font_metrics::find_font (string name) { - if ((name.left_string (4) == "feta") || - (name.left_string (8) == "parmesan")) - { - Font_metric * f = find_afm (name); - if (f) - return f; - else - f =find_tfm (name); - if (f) - return f ; - } - else + Font_metric *f = find_otf (name); + + if (!f) { - Font_metric * f = find_tfm (name); - if (f) - return f; - else - f =find_afm (name); - if (f) - return f ; + error (_f ("cannot find font: `%s'", name.c_str ())); } - warning (_f ("can't find font: `%s'", name.to_str0 ())); - 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. */ - Font_metric* f= find_afm (def_name); - if (f) - return f; - - f = find_tfm (def_name); - if (f) - return f; - - error (_f ("can't find default font: `%s'", def_name.to_str0 ())); - error (_f ("(search path: `%s')", search_path_.to_string ())); - error (_ ("Giving up")); - - return 0; + return f; } - +All_font_metrics *all_fonts_global;