diff options
Diffstat (limited to 'Build/source/texk/xdvipdfmx/src/fontmap.c')
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c index d2d0d7e7d3a..13c232e3edb 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.c +++ b/Build/source/texk/xdvipdfmx/src/fontmap.c @@ -1099,8 +1099,10 @@ pdf_insert_native_fontmap_record (const char *name, const char *path, int index, static FT_Library ftLib; -static int -pdf_load_native_font_from_path(const char *ps_name, int layout_dir, int extend, int slant, int embolden) +int +pdf_load_native_font (const char *ps_name, + const char *fam_name, const char *sty_name, + int layout_dir, int extend, int slant, int embolden) { const char *p; char *filename = NEW(strlen(ps_name), char); @@ -1108,7 +1110,17 @@ pdf_load_native_font_from_path(const char *ps_name, int layout_dir, int extend, int index = 0; FT_Face face = NULL; int error = -1; - + + if (ps_name[0] != '[') { + ERROR("Loading fonts by font name is not supported: %s", ps_name); + return error; + } + + if (FT_Init_FreeType(&ftLib) != 0) { + ERROR("FreeType initialization failed."); + return error; + } + #ifdef WIN32 for (p = ps_name + 1; *p && *p != ']'; ++p) { if (*p == ':') { @@ -1150,31 +1162,6 @@ pdf_load_native_font_from_path(const char *ps_name, int layout_dir, int extend, RELEASE(filename); return error; } - -int -pdf_load_native_font (const char *ps_name, - const char *fam_name, const char *sty_name, - int layout_dir, int extend, int slant, int embolden) -{ - static int sInitialized = 0; - int error = -1; - - if (!sInitialized) { - if (FT_Init_FreeType(&ftLib) != 0) { - WARN("FreeType initialization failed."); - return error; - } - sInitialized = 1; - } - - if (ps_name[0] == '[') { - error = pdf_load_native_font_from_path(ps_name, layout_dir, extend, slant, embolden); - } else { - ERROR("Loading fonts by font name is not supported: %s", ps_name); - } - - return error; -} #endif /* XETEX */ #if 0 |