diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-21 23:44:55 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-21 23:44:55 +0000 |
| commit | 62f69243c4e9c8c098040e43607a312a5923cb83 (patch) | |
| tree | 8c42ef115e5fe1501c5e043feb04243a92cea0a4 /Build | |
| parent | 33a33a9400fd462244a0fe4c2abd4cb41bfea5d2 (diff) | |
Fix loading font files without an extension
git-svn-id: svn://tug.org/texlive/trunk@29191 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog | 12 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 9 |
2 files changed, 17 insertions, 4 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index de8443704a8..ae4cb69c3fc 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,7 +1,15 @@ +2013-02-22 Khaled Hosny <khaledhosny@eglug.org> + + * src/fontmap.c (pdf_load_native_font_from_path): Fix loading font files + without an extension (e.g. Mac suitcase fonts). + 2013-02-21 Khaled Hosny <khaledhosny@eglug.org> - * src/tt_cmap.c: Use FT_Get_Glyph_Name() instead of reading 'post' table - directly, to handle CFF fonts where the 'post' table has no glyph names. + * src/tt_cmap.c (handle_subst_glyphs): Use FT_Get_Glyph_Name() instead of + reading 'post' table directly, to handle CFF fonts where the 'post' table + has no glyph names. + * rc/tt_cmap.c (create_ToUnicode_cmap4, create_ToUnicode_cmap12, + otf_create_ToUnicode_stream): Adapt. 2013-02-15 Khaled Hosny <khaledhosny@eglug.org> diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c index 87f8996c702..85fe6b953fd 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.c +++ b/Build/source/texk/xdvipdfmx/src/fontmap.c @@ -1136,10 +1136,15 @@ pdf_load_native_font_from_path(const char *ps_name, int layout_dir, int extend, index = index * 10 + *p++ - '0'; } - if ( (q = dpx_find_opentype_file(filename)) != NULL + /* try loading the filename directly */ + error = FT_New_Face(ftLib, filename, index, &face); + + /* if failed, try locating the file in the TEXMF tree */ + if ( error && + ( (q = dpx_find_opentype_file(filename)) != NULL || (q = dpx_find_truetype_file(filename)) != NULL || (q = dpx_find_type1_file(filename)) != NULL - || (q = dpx_find_dfont_file(filename)) != NULL) { + || (q = dpx_find_dfont_file(filename)) != NULL) ) { error = FT_New_Face(ftLib, q, index, &face); RELEASE(q); } |