/*
- 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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)
{
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);
+
+ 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,
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<Pango_font*> (unsmob_metrics (val));
+ g_free (pango_fn);
+ return dynamic_cast<Pango_font *> (unsmob_metrics (val));
}
#endif
String
kpathsea_find_file (String name, String ext)
{
- name += "." + ext;
+ name += "." + ext;
String path = global_path.find (name);
- if (path.length() > 0)
+ if (path.length () > 0)
return path;
SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file");
- if (ly_c_procedure_p (kpath))
+ if (ly_is_procedure (kpath))
{
- SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0()));
+ SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0 ()));
if (scm_is_string (kp_result))
return ly_scm2string (kp_result);
}
should include design size when generating an AFM metric.
ugr: copied from find_tfm.
- */
+*/
Adobe_font_metric *
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 ())
{
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<Adobe_font_metric*> (unsmob_metrics (val));
+ = dynamic_cast<Adobe_font_metric *> (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_)
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<Adobe_font_metric*> (unsmob_metrics (val));
+
+ return dynamic_cast<Adobe_font_metric *> (unsmob_metrics (val));
}
-Open_type_font*
+Open_type_font *
All_font_metrics::find_otf (String name)
{
SCM sname = ly_symbol2scm (name.to_str0 ());
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)
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<Open_type_font*> (unsmob_metrics (val));
+ return dynamic_cast<Open_type_font *> (unsmob_metrics (val));
}
-Tex_font_metric*
+Tex_font_metric *
All_font_metrics::find_tfm (String name)
{
SCM sname = ly_symbol2scm (name.to_str0 ());
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
}
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)
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<Tex_font_metric*> (unsmob_metrics (val));
+ return dynamic_cast<Tex_font_metric *> (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)
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
{
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;
All_font_metrics *all_fonts_global;
-
LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
(SCM name),
"Load the font @var{name}. ")
projects / lilypond.git / blobdiff