X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=440e16ca66fc55002a11d3dfa2e2967ce89cd13a;hb=36342ddfdbf0c112be9cb4ce471417e9c0e8fa1f;hp=19be65b8cc821c9da77fe7d3ca557b06d03ea2e3;hpb=46b41fe6cef4d1a9746e21f809c0ee62662aa145;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 19be65b8cc..440e16ca66 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,9 +1,9 @@ /* - 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 + + (c) 1999--2005 Han-Wen Nienhuys */ #include "all-font-metrics.hh" @@ -14,7 +14,6 @@ #include "afm.hh" #include "tfm.hh" #include "scm-hash.hh" -#include "kpath.hh" #include "pango-font.hh" static char const *default_font_str0_ = "cmr10"; @@ -26,75 +25,113 @@ All_font_metrics::All_font_metrics (String path) otf_dict_ = new Scheme_hash_table; #if HAVE_PANGO_FT2 - PangoFontMap*pfm = pango_ft2_font_map_new (); + PangoFontMap *pfm = pango_ft2_font_map_new (); - pango_ft2_fontmap_ = - G_TYPE_CHECK_INSTANCE_CAST(pfm, - PANGO_TYPE_FT2_FONT_MAP, - PangoFT2FontMap); + 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_dict_->self_scm ()); - scm_gc_unprotect_object (tfm_dict_->self_scm ()); - scm_gc_unprotect_object (otf_dict_->self_scm ()); + afm_dict_->unprotect (); + tfm_dict_->unprotect (); + otf_dict_->unprotect (); #if HAVE_PANGO_FT2 - scm_gc_unprotect_object (pango_dict_->self_scm ()); + pango_dict_->unprotect (); g_object_unref (pango_ft2_fontmap_); #endif } -All_font_metrics::All_font_metrics (All_font_metrics const&) +All_font_metrics::All_font_metrics (All_font_metrics const &) { } #if HAVE_PANGO_FT2 + Pango_font * -All_font_metrics::find_pango_font (PangoFontDescription*description) +All_font_metrics::find_pango_font (PangoFontDescription *description, + Real magnification, + Real output_scale + ) { - gchar *fn = pango_font_description_to_filename (description); - SCM key = ly_symbol2scm (fn); + 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); SCM val; if (!pango_dict_->try_retrieve (key, &val)) { if (be_verbose_global) - progress_indication ("[" + String (fn)); + progress_indication ("[" + String (pango_fn)); + Pango_font *pf = new Pango_font (pango_ft2_fontmap_, - RIGHT, - description); + description, + output_scale + ); + val = pf->self_scm (); pango_dict_->set (key, val); - scm_gc_unprotect_object (val); + pf->unprotect (); if (be_verbose_global) progress_indication ("]"); pf->description_ = scm_cons (SCM_BOOL_F, - scm_make_real (1.0)); + scm_from_double (1.0)); } - g_free (fn); - return dynamic_cast (unsmob_metrics (val)); + g_free (pango_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; + + 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 ""; +} + /* 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) { @@ -106,41 +143,41 @@ All_font_metrics::find_afm (String name) String file_name; if (file_name.is_empty ()) - file_name = search_path_.find (name + ".afm"); + file_name = search_path_.find (name + ".afm"); if (file_name.is_empty ()) { - String p = kpathsea_find_afm (name.to_str0 ()); + String p = kpathsea_find_file (name, "afm"); if (p.length ()) file_name = p; } if (file_name.is_empty ()) return 0; - + 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)); + + unsmob_metrics (val)->description_ = scm_cons (name_string, + scm_from_double (1.0)); if (be_verbose_global) progress_indication ("]"); afm_dict_->set (sname, val); - scm_gc_unprotect_object (val); + unsmob_metrics (val)->unprotect (); Adobe_font_metric *afm - = dynamic_cast (unsmob_metrics (val)); + = 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); - + 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_) @@ -158,18 +195,18 @@ All_font_metrics::find_afm (String name) 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 += _ ("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)); + + return dynamic_cast (unsmob_metrics (val)); } -Open_type_font* +Open_type_font * All_font_metrics::find_otf (String name) { SCM sname = ly_symbol2scm (name.to_str0 ()); @@ -178,15 +215,15 @@ All_font_metrics::find_otf (String name) if (!otf_dict_->try_retrieve (sname, &val)) { String file_name; - + if (file_name.is_empty ()) - file_name = search_path_.find (name + ".otf"); + 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) @@ -194,15 +231,15 @@ All_font_metrics::find_otf (String name) unsmob_metrics (val)->file_name_ = file_name; unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); + scm_from_double (1.0)); otf_dict_->set (sname, val); - scm_gc_unprotect_object (val); + unsmob_metrics (val)->unprotect (); } - return dynamic_cast (unsmob_metrics (val)); + return dynamic_cast (unsmob_metrics (val)); } -Tex_font_metric* +Tex_font_metric * All_font_metrics::find_tfm (String name) { SCM sname = ly_symbol2scm (name.to_str0 ()); @@ -211,24 +248,24 @@ All_font_metrics::find_tfm (String name) 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_tfm (name.to_str0 ()); + 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"); + 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) @@ -236,23 +273,23 @@ All_font_metrics::find_tfm (String name) unsmob_metrics (val)->file_name_ = file_name; unsmob_metrics (val)->description_ = scm_cons (name_string, - scm_make_real (1.0)); + scm_from_double (1.0)); tfm_dict_->set (sname, val); - scm_gc_unprotect_object (val); + unsmob_metrics (val)->unprotect (); } - return dynamic_cast (unsmob_metrics (val)); + return dynamic_cast (unsmob_metrics (val)); } -Font_metric* +Font_metric * All_font_metrics::find_font (String name) { Font_metric *f = find_otf (name); - - if (!f && - (name.left_string (4) == "feta" - || name.left_string (8) == "parmesan" - || name.left_string (2) == "lm")) + + if (!f + && (name.left_string (4) == "feta" + || name.left_string (8) == "parmesan" + || name.left_string (2) == "lm")) { f = find_afm (name); if (!f) @@ -268,9 +305,9 @@ All_font_metrics::find_font (String name) if (!f) { warning (_f ("can't find font: `%s'", name.to_str0 ())); - warning (_ ("Loading default font")); + warning (_ ("loading default font")); } - + String def_name = default_font_str0_; /* We're in emergency recovery mode here anyway, so don't try to do @@ -285,7 +322,7 @@ All_font_metrics::find_font (String 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")); + error (_ ("giving up")); } return f; @@ -293,7 +330,6 @@ All_font_metrics::find_font (String name) All_font_metrics *all_fonts_global; - LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, (SCM name), "Load the font @var{name}. ")