X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=f8da4b2ecdf4ef205e0989baa64b83f85b0ba76c;hb=788bff9573d132238d81962aa806497a86fe0ab7;hp=e1be0f1de16c238cdee1c65c25a7997317f03604;hpb=6c4a24832005a3634a3d829fba364874a7cf9813;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index e1be0f1de1..f8da4b2ecd 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,23 +3,32 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2005 Han-Wen Nienhuys + (c) 1999--2007 Han-Wen Nienhuys */ #include "all-font-metrics.hh" -#include "open-type-font.hh" +#include "international.hh" #include "main.hh" -#include "warn.hh" -#include "tfm.hh" -#include "scm-hash.hh" +#include "open-type-font.hh" #include "pango-font.hh" +#include "scm-hash.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 char const *default_font_str0_ = "cmr10"; -All_font_metrics::All_font_metrics (String path) +All_font_metrics::All_font_metrics (string path) { - tfm_dict_ = new Scheme_hash_table; otf_dict_ = new Scheme_hash_table; #if HAVE_PANGO_FT2 @@ -41,7 +50,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 @@ -57,15 +65,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); @@ -73,7 +76,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 ("[" + string (pango_fn)); Pango_font *pf = new Pango_font (pango_ft2_fontmap_, description, @@ -96,45 +99,20 @@ 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.to_str0 ())); - if (scm_is_string (kp_result)) - return ly_scm2string (kp_result); - } - - 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 = ly_string2scm (name); 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) @@ -155,80 +133,31 @@ 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.to_str0 ()); - SCM name_string = scm_makfrom0str (name.to_str0 ()); - SCM val; - if (!tfm_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_file (name, "tfm"); - 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 (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) +All_font_metrics::find_font (string name) { Font_metric *f = find_otf (name); if (!f) { - f = find_tfm (name); - } - - if (!f) - { - warning (_f ("can't find font: `%s'", name.to_str0 ())); - warning (_ ("loading default font")); + error (_f ("cannot find font: `%s'", name.c_str ())); } - String def_name = default_font_str0_; + return f; +} - if (!f) - f = find_tfm (def_name); +All_font_metrics *all_fonts_global; - 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")); - } +LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0, + (), + "Forget all about previously loaded fonts. ") +{ + delete all_fonts_global; + all_fonts_global = new All_font_metrics (global_path.to_string ()); - return f; + return SCM_UNSPECIFIED; } -All_font_metrics *all_fonts_global; LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, (SCM name), @@ -241,3 +170,4 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, return fm->self_scm (); } +