-/*
+/*
+
all-font-metrics.cc -- implement All_font_metrics
source file of the GNU LilyPond music typesetter
- (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
scm_gc_unprotect_object (tfm_p_dict_->self_scm ());
}
+/*
+ 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.
+ */
Adobe_font_metric *
All_font_metrics::find_afm (String name)
{
{
String path;
- if (path.empty_b ())
+ if (path.is_empty ())
path = search_path_.find (name + ".afm");
- if (path.empty_b ())
+ if (path.is_empty ())
{
- String p = ly_find_afm (name.to_str0 ());
+ String p = kpathsea_find_afm (name.to_str0 ());
if (p.length ())
path = p;
}
- if (path.empty_b ())
+ if (path.is_empty ())
return 0;
if (verbose_global_b)
*/
if (afm->checksum_)
{
-
Tex_font_metric * tfm = find_tfm (name);
/* FIXME: better warning message
{
String path;
- if (path.empty_b ())
+ if (path.is_empty ())
{
- String p = ly_find_tfm (name.to_str0 ());
+ String p = kpathsea_find_tfm (name.to_str0 ());
if (p.length ())
path = p;
}
- if (path.empty_b ())
+ if (path.is_empty ())
path = search_path_.find (name + ".tfm");
- if (path.empty_b ())
+ if (path.is_empty ())
return 0;
-
if (verbose_global_b)
progress_indication ("[" + path);
+
val = Tex_font_metric::make_tfm (path);
if (verbose_global_b)
Font_metric *
All_font_metrics::find_font (String name)
{
- Font_metric * f= find_afm (name);
- if (f)
- return f;
-
- f = find_tfm (name);
- if (f)
- return f;
+ if ((name.left_string (4) == "feta") ||
+ (name.left_string (8) == "parmesan"))
+ {
+ Font_metric * f = find_afm (name);
+ if (f)
+ return f;
+ else
+ f =find_tfm (name);
+ if (f)
+ return f ;
+ }
+ else
+ {
+ Font_metric * f = find_tfm (name);
+ if (f)
+ return f;
+ else
+ f =find_afm (name);
+ if (f)
+ return f ;
+ }
warning (_f ("can't find font: `%s'", name.to_str0 ()));
warning (_ ("Loading default font"));
/*
we're in emergency recovery mode here anyway, so don't try to do
anything smart that runs the risk of failing. */
- f= find_afm (def_name);
+ Font_metric* f= find_afm (def_name);
if (f)
return f;