summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea/tex-glyph.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-16 15:54:32 +0000
committerKarl Berry <karl@freefriends.org>2018-03-16 15:54:32 +0000
commite69e90912037ff24c42325a1b87022ceef0066cf (patch)
treecf7a16f7d2a8593277af15dacfb80a5d49512892 /Build/source/texk/kpathsea/tex-glyph.c
parent3e82729e7e1d522082a5971d6232aa53a9baead6 (diff)
distinguish glyph source being fallback resolutions from fallback font
git-svn-id: svn://tug.org/texlive/trunk@46982 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea/tex-glyph.c')
-rw-r--r--Build/source/texk/kpathsea/tex-glyph.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/Build/source/texk/kpathsea/tex-glyph.c b/Build/source/texk/kpathsea/tex-glyph.c
index 9af2aabfce0..aae1b6555ec 100644
--- a/Build/source/texk/kpathsea/tex-glyph.c
+++ b/Build/source/texk/kpathsea/tex-glyph.c
@@ -1,6 +1,6 @@
/* tex-glyph.c: search for GF/PK files.
- Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2017 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2017, 2018 Karl Berry.
Copyright 1997, 1998, 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -298,8 +298,10 @@ kpathsea_find_glyph (kpathsea kpse,
/* If mktex... failed, try any fallback resolutions. */
} else {
- if (kpse->fallback_resolutions)
+ if (kpse->fallback_resolutions) {
+ source = kpse_glyph_source_fallback_res;
ret = try_fallback_resolutions (kpse, fontname, dpi,format,glyph_file);
+ }
/* We're down to the font of last resort. */
if (!ret && kpse->fallback_font) {
@@ -311,8 +313,9 @@ kpathsea_find_glyph (kpathsea kpse,
ret = try_resolution (kpse, name, dpi, format, glyph_file);
/* The fallback font at the fallback resolutions. */
- if (!ret && kpse->fallback_resolutions)
+ if (!ret && kpse->fallback_resolutions) {
ret = try_fallback_resolutions (kpse, name, dpi, format, glyph_file);
+ }
}
}
}
@@ -337,8 +340,8 @@ kpse_find_glyph (const_string passed_fontname, unsigned dpi,
kpse_file_format_type format,
kpse_glyph_file_type *glyph_file)
{
- return kpathsea_find_glyph (kpse_def, passed_fontname, dpi, format,
- glyph_file);
+ return kpathsea_find_glyph (kpse_def, passed_fontname, dpi, format,
+ glyph_file);
}
#endif