X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=ab4f2a4ce4e3a09651b674a8f9598e2cdd6699f5;hb=3b53bdd3752fdc0e82ffab896d42490a606c5d89;hp=df523671f777794284f5bdd4ba2b794e2464da0a;hpb=1487d6190220ca2952b09e4539b794f7c56684a9;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index df523671f7..ab4f2a4ce4 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,215 +1,163 @@ /* - all-font-metrics.cc -- implement All_font_metrics - - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1999--2015 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "all-font-metrics.hh" -#include "config.hh" +#include "string-convert.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"; +Index_to_charcode_map const * +All_font_metrics::get_index_to_charcode_map (const string &filename, + int face_index, + FT_Face face) +{ + string key = filename + String_convert::int_string (face_index); + if (filename_charcode_maps_map_.find (key) + == filename_charcode_maps_map_.end ()) + filename_charcode_maps_map_[key] = make_index_to_charcode_map (face); + + return &filename_charcode_maps_map_[key]; +} -All_font_metrics::All_font_metrics (String path) +All_font_metrics::All_font_metrics (const string &path) { - afm_p_dict_ = new Scheme_hash_table; - tfm_p_dict_ = new Scheme_hash_table; - +#if HAVE_PANGO_FT2 + pango_dict_ = 0; +#endif + + otf_dict_ = 0; + smobify_self (); + otf_dict_ = unsmob (Scheme_hash_table::make_smob ()); + +#if HAVE_PANGO_FT2 + pango_dict_ = unsmob (Scheme_hash_table::make_smob ()); + PangoFontMap *pfm = pango_ft2_font_map_new (); + + pango_ft2_fontmap_ = PANGO_FT2_FONT_MAP (pfm); + + pango_dpi_ = PANGO_RESOLUTION; + pango_ft2_font_map_set_resolution (pango_ft2_fontmap_, + pango_dpi_, pango_dpi_); +#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 ()); +#if HAVE_PANGO_FT2 + 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. - - ugr: copied from find_tfm. - */ -Adobe_font_metric * -All_font_metrics::find_afm (String name) +SCM +All_font_metrics::mark_smob () const { - 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; - - if (file_name.is_empty ()) - file_name = search_path_.find (name + ".afm"); - - if (file_name.is_empty ()) - { - String p = kpathsea_find_afm (name.to_str0 ()); - if (p.length ()) - file_name = p; - } - - 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; - - unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); - - if (verbose_global_b) - 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); - } - } - } - - return dynamic_cast (unsmob_metrics (val)); +#if HAVE_PANGO_FT2 + if (pango_dict_) + scm_gc_mark (pango_dict_->self_scm ()); +#endif + if (otf_dict_) + return otf_dict_->self_scm (); + return SCM_UNDEFINED; } +#if HAVE_PANGO_FT2 -Tex_font_metric* -All_font_metrics::find_tfm (String name) +Pango_font * +All_font_metrics::find_pango_font (PangoFontDescription const *description, + Real output_scale + ) { - SCM sname = ly_symbol2scm (name.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); + gchar *pango_fn = pango_font_description_to_filename (description); + SCM key = ly_symbol2scm (pango_fn); + SCM val; - if (!tfm_p_dict_->try_retrieve (sname, &val)) + if (!pango_dict_->try_retrieve (key, &val)) { - String file_name; - - if (file_name.is_empty ()) - { - 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 ()) - return 0; - - if (verbose_global_b) - progress_indication ("[" + file_name); - - val = Tex_font_metric::make_tfm (file_name); - - if (verbose_global_b) - 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); - } + debug_output ("[" + string (pango_fn), true); // start on a new line + + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, + description, + output_scale + ); + + val = pf->self_scm (); + pango_dict_->set (key, val); + pf->unprotect (); + + debug_output ("]", false); - return dynamic_cast (unsmob_metrics (val)); + pf->description_ = scm_cons (SCM_BOOL_F, + scm_from_double (1.0)); + } + g_free (pango_fn); + return unsmob (val); } -Font_metric* -All_font_metrics::find_font (String name) +#endif + +Open_type_font * +All_font_metrics::find_otf (const string &name) { - Font_metric *f = 0; - if ((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 + SCM sname = ly_symbol2scm (name.c_str ()); + SCM val; + if (!otf_dict_->try_retrieve (sname, &val)) { - f = find_tfm (name); - if (!f) - f = find_afm (name); - } + string file_name; - if (!f) - { - warning (_f ("can't find font: `%s'", name.to_str0 ())); - warning (_ ("Loading default font")); - } - - String def_name = default_font_str0_; + if (file_name.empty ()) + file_name = search_path_.find (name + ".otf"); + if (file_name.empty ()) + return 0; - /* 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); + debug_output ("[" + file_name, true); // start on a new line - if (!f) - f = find_tfm (def_name); + val = Open_type_font::make_otf (file_name); - if (!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")); + debug_output ("]", false); + + unsmob (val)->file_name_ = file_name; + SCM name_string = ly_string2scm (name); + unsmob (val)->description_ = scm_cons (name_string, + scm_from_double (1.0)); + otf_dict_->set (sname, val); + unsmob (val)->unprotect (); } - return f; + return unsmob (val); } -All_font_metrics *all_fonts_global; - - -LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, - (SCM name), - "Load the font @var{name}. ") +Font_metric * +All_font_metrics::find_font (const string &name) { - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + Font_metric *f = find_otf (name); - Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name)); + if (!f) + { + error (_f ("cannot find font: `%s'", name.c_str ())); + } - return fm->self_scm (); + return f; } -