X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=cb5cb7ffaa8d86f46075fc3a30d5b4c709c872ee;hb=36f6766b9de37adb09d2a27e3f925b356cbc0849;hp=94655c48c8726e875220751a48592644e5755d8f;hpb=ba858880848d6aca1de4401d185860eb2017a01c;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 94655c48c8..cb5cb7ffaa 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,37 +1,118 @@ /* - all-font-metrics.cc -- implement All_font_metrics source file of the GNU LilyPond music typesetter - (c) 1999--2004 Han-Wen Nienhuys - - */ + (c) 1999--2005 Han-Wen Nienhuys +*/ -#include "config.h" -#include "main.hh" #include "all-font-metrics.hh" + +#include "open-type-font.hh" +#include "main.hh" #include "warn.hh" #include "afm.hh" #include "tfm.hh" -#include "lily-guile.hh" #include "scm-hash.hh" -#include "kpath.hh" +#include "pango-font.hh" -static const char *default_font_str0_ = "cmr10"; +static char const *default_font_str0_ = "cmr10"; All_font_metrics::All_font_metrics (String path) { - afm_p_dict_ = new Scheme_hash_table; - tfm_p_dict_ = new Scheme_hash_table; + afm_dict_ = new Scheme_hash_table; + tfm_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 (afm_dict_->self_scm ()); + scm_gc_unprotect_object (tfm_dict_->self_scm ()); + scm_gc_unprotect_object (otf_dict_->self_scm ()); + +#if HAVE_PANGO_FT2 + scm_gc_unprotect_object (pango_dict_->self_scm ()); + g_object_unref (pango_ft2_fontmap_); +#endif +} + +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, + Real output_scale) +{ + pango_font_description_set_size (description, + gint (magnification * + pango_font_description_get_size (description))); + + gchar *fn = pango_font_description_to_filename (description); + SCM key = ly_symbol2scm (fn); + + SCM val; + if (!pango_dict_->try_retrieve (key, &val)) + { + if (be_verbose_global) + progress_indication ("[" + String (fn)); + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, + RIGHT, + description, + output_scale); + val = pf->self_scm (); + pango_dict_->set (key, val); + scm_gc_unprotect_object (val); + + if (be_verbose_global) + progress_indication ("]"); + + pf->description_ = scm_cons (SCM_BOOL_F, + scm_make_real (1.0)); + } + g_free (fn); + return dynamic_cast (unsmob_metrics (val)); +} + +#endif + +String +kpathsea_find_file (String name, String ext) +{ + name += "." + ext; + String path = global_path.find (name); + if (path.length() > 0) + return path; + + SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file"); + if (ly_c_procedure_p (kpath)) + { + SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0())); + if (scm_is_string (kp_result)) + return ly_scm2string (kp_result); + } + + return ""; } /* @@ -47,35 +128,35 @@ All_font_metrics::find_afm (String name) 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)) + if (!afm_dict_->try_retrieve (sname, &val)) { - String filename; + String file_name; - if (filename.is_empty ()) - filename = search_path_.find (name + ".afm"); + if (file_name.is_empty ()) + file_name = search_path_.find (name + ".afm"); - if (filename.is_empty ()) + if (file_name.is_empty ()) { - String p = kpathsea_find_afm (name.to_str0 ()); + String p = kpathsea_find_file (name, "afm"); if (p.length ()) - filename = p; + file_name = p; } - if (filename.is_empty ()) + if (file_name.is_empty ()) return 0; - if (verbose_global_b) - progress_indication ("[" + filename); - val = read_afm_file (filename); - unsmob_metrics (val)->filename_ = filename; + if (be_verbose_global) + 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) + if (be_verbose_global) progress_indication ("]"); - afm_p_dict_->set (sname, val); + afm_dict_->set (sname, val); scm_gc_unprotect_object (val); Adobe_font_metric *afm @@ -89,15 +170,15 @@ All_font_metrics::find_afm (String name) /* FIXME: better warning message (maybe check upon startup for feta16.afm, feta16.tfm?) */ - if (tfm && tfm->info_.checksum != afm->checksum_) + if (tfm && tfm->info ().checksum != afm->checksum_) { // FIXME: broken sentence String s = _f ("checksum mismatch for font file: `%s'", - filename.to_str0 ()); + file_name.to_str0 ()); s += " " + _f ("does not match: `%s'", - tfm->filename_.to_str0 ()); + tfm->file_name_.to_str0 ()); s += "\n"; - s += " TFM: " + to_string ((int) tfm->info_.checksum); + 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."); @@ -115,6 +196,38 @@ All_font_metrics::find_afm (String name) return dynamic_cast (unsmob_metrics (val)); } +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 val; + if (!otf_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; + + if (be_verbose_global) + progress_indication ("[" + file_name); + + 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)); + otf_dict_->set (sname, val); + scm_gc_unprotect_object (val); + } + + return dynamic_cast (unsmob_metrics (val)); +} Tex_font_metric* All_font_metrics::find_tfm (String name) @@ -122,34 +235,36 @@ 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_p_dict_->try_retrieve (sname, &val)) + if (!tfm_dict_->try_retrieve (sname, &val)) { - String filename; + String file_name; - if (filename.is_empty ()) + if (file_name.is_empty ()) { - String p = kpathsea_find_tfm (name.to_str0 ()); + /* FIXME: should add "cork-" prefix to lm* fonts. How to do + that, cleanly? */ + String p = kpathsea_find_file (name, "tfm"); if (p.length ()) - filename = p; + file_name = p; } - if (filename.is_empty ()) - filename = search_path_.find (name + ".tfm"); - if (filename.is_empty ()) + 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 ("[" + filename); + if (be_verbose_global) + progress_indication ("[" + file_name); - val = Tex_font_metric::make_tfm (filename); + val = Tex_font_metric::make_tfm (file_name); - if (verbose_global_b) + if (be_verbose_global) progress_indication ("]"); - unsmob_metrics (val)->filename_ = filename; + 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); + tfm_dict_->set (sname, val); scm_gc_unprotect_object (val); } @@ -159,49 +274,48 @@ All_font_metrics::find_tfm (String name) Font_metric* All_font_metrics::find_font (String name) { - if ((name.left_string (4) == "feta") || - (name.left_string (8) == "parmesan")) + Font_metric *f = find_otf (name); + + if (!f && + (name.left_string (4) == "feta" + || name.left_string (8) == "parmesan" + || name.left_string (2) == "lm")) { - Font_metric *f = find_afm (name); - if (f) - return f; - else - f =find_tfm (name); - if (f) - return f ; + f = find_afm (name); + if (!f) + f = find_tfm (name); } - else + else if (!f) { - Font_metric * f = find_tfm (name); - if (f) - return f; - else - f = find_afm (name); - if (f) - return f; + f = find_tfm (name); + if (!f) + f = find_afm (name); } - warning (_f ("can't find font: `%s'", name.to_str0 ())); - warning (_ ("Loading default font")); + if (!f) + { + 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; + /* 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); - f = find_tfm (def_name); - if (f) - return f; + if (!f) + f = find_tfm (def_name); - error (_f ("can't find default font: `%s'", def_name.to_str0 ())); - error (_f ("(search path: `%s')", search_path_.to_string ())); - error (_ ("Giving up")); + 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")); + } - return 0; + return f; } All_font_metrics *all_fonts_global; @@ -211,9 +325,9 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, (SCM name), "Load the font @var{name}. ") { - SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); - Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name)); + Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name)); return fm->self_scm (); }