X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=a6172e1994d79c671ded8be15490a4d91c495177;hb=3dd9b13331489a191d0e901245cc98476e5fcac1;hp=f7334849b84ab2eabe4b68d1ae395e7b810c3326;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index f7334849b8..a6172e1994 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,26 +1,49 @@ /* - all-font-metrics.cc -- implement All_font_metrics + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1999--2009 Han-Wen Nienhuys - (c) 1999--2006 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 "string-convert.hh" #include "international.hh" #include "main.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"; + +Index_to_charcode_map const * +All_font_metrics::get_index_to_charcode_map (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) { - tfm_dict_ = new Scheme_hash_table; otf_dict_ = new Scheme_hash_table; #if HAVE_PANGO_FT2 @@ -42,7 +65,6 @@ All_font_metrics::All_font_metrics (string path) All_font_metrics::~All_font_metrics () { - tfm_dict_->unprotect (); otf_dict_->unprotect (); #if HAVE_PANGO_FT2 @@ -58,15 +80,10 @@ All_font_metrics::All_font_metrics (All_font_metrics const &) #if HAVE_PANGO_FT2 Pango_font * -All_font_metrics::find_pango_font (PangoFontDescription *description, - Real magnification, +All_font_metrics::find_pango_font (PangoFontDescription const *description, Real output_scale ) { - pango_font_description_set_size (description, - gint (magnification * - pango_font_description_get_size (description))); - gchar *pango_fn = pango_font_description_to_filename (description); SCM key = ly_symbol2scm (pango_fn); @@ -74,7 +91,7 @@ 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 ("\n[" + string (pango_fn)); Pango_font *pf = new Pango_font (pango_ft2_fontmap_, description, @@ -97,37 +114,11 @@ All_font_metrics::find_pango_font (PangoFontDescription *description, #endif -string -kpathsea_find_file (string name, string ext) -{ - name += "." + ext; - string path = global_path.find (name); - if (path.length () > 0) - return path; - - 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); - } - - 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 ""; -} Open_type_font * All_font_metrics::find_otf (string name) { SCM sname = ly_symbol2scm (name.c_str ()); - SCM name_string = scm_makfrom0str (name.c_str ()); SCM val; if (!otf_dict_->try_retrieve (sname, &val)) { @@ -139,7 +130,7 @@ All_font_metrics::find_otf (string name) return 0; if (be_verbose_global) - progress_indication ("[" + file_name); + progress_indication ("\n[" + file_name); val = Open_type_font::make_otf (file_name); @@ -147,6 +138,7 @@ All_font_metrics::find_otf (string name) progress_indication ("]"); unsmob_metrics (val)->file_name_ = file_name; + SCM name_string = ly_string2scm (name); unsmob_metrics (val)->description_ = scm_cons (name_string, scm_from_double (1.0)); otf_dict_->set (sname, val); @@ -156,48 +148,6 @@ All_font_metrics::find_otf (string name) return dynamic_cast (unsmob_metrics (val)); } -Tex_font_metric * -All_font_metrics::find_tfm (string name) -{ - 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; - - if (file_name.empty ()) - { - /* FIXME: should add "cork-" prefix to lm* fonts. How to do - that, cleanly? */ - string p = kpathsea_find_file (name, "tfm"); - if (p.length ()) - file_name = p; - } - - if (file_name.empty ()) - file_name = search_path_.find (name + ".tfm"); - if (file_name.empty ()) - return 0; - - if (be_verbose_global) - progress_indication ("[" + file_name); - - val = Tex_font_metric::make_tfm (file_name); - - if (be_verbose_global) - progress_indication ("]"); - - unsmob_metrics (val)->file_name_ = file_name; - unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_from_double (1.0)); - tfm_dict_->set (sname, val); - unsmob_metrics (val)->unprotect (); - } - - return dynamic_cast (unsmob_metrics (val)); -} - Font_metric * All_font_metrics::find_font (string name) { @@ -205,40 +155,10 @@ All_font_metrics::find_font (string name) if (!f) { - f = find_tfm (name); - } - - if (!f) - { - warning (_f ("can't find font: `%s'", name.c_str ())); - warning (_ ("loading default font")); - } - - 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.c_str ())); - error (_f ("(search path: `%s')", search_path_.to_string ())); - error (_ ("giving up")); + error (_f ("cannot find font: `%s'", name.c_str ())); } return f; } All_font_metrics *all_fonts_global; - -LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, - (SCM name), - "Load the font @var{name}. ") -{ - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); - - Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name)); - - return fm->self_scm (); -} -