diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-12 08:29:45 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-12 08:29:45 +0000 |
| commit | bd74479743b9859bd48c6245cc6c61e504cd280c (patch) | |
| tree | 40e9f373122318afb745f76ae0adff897ec619b5 /Build | |
| parent | 0118aa751967d1e438000b45d2747a877777bd23 (diff) | |
Fix loading *.dfont fonts by filename
git-svn-id: svn://tug.org/texlive/trunk@29085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxfile.c | 3 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxfile.h | 1 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index def611cbf3c..1198467c6b1 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,3 +1,8 @@ +2013-02-12 Khaled Hosny <khaledhosny@eglug.org> + + * dpxfile.c, dpxfile.h (dpx_find_dfont_file): Make public. + * fontmap.c (pdf_load_native_font_from_path): Fix loading *.dfont files. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * data/Makefile.am (configdatadir, mapdatadir, cmapdatadir): diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.c b/Build/source/texk/xdvipdfmx/src/dpxfile.c index 5e727e6f949..85833256b30 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxfile.c +++ b/Build/source/texk/xdvipdfmx/src/dpxfile.c @@ -375,7 +375,6 @@ static char *dpx_find_sfd_file (const char *filename); static char *dpx_find_cmap_file (const char *filename); static char *dpx_find_enc_file (const char *filename); static char *dpx_find_iccp_file (const char *filename); -static char *dpx_find_dfont_file (const char *filename); FILE * dpx_open_file (const char *filename, int type) @@ -718,7 +717,7 @@ dpx_find_opentype_file (const char *filename) -static char * +char * dpx_find_dfont_file (const char *filename) { char *fqpn = NULL; diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.h b/Build/source/texk/xdvipdfmx/src/dpxfile.h index 2160915a5b1..a165d42c61b 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxfile.h +++ b/Build/source/texk/xdvipdfmx/src/dpxfile.h @@ -51,6 +51,7 @@ extern FILE *dpx_open_file (const char *filename, int type); extern char * dpx_find_type1_file (const char *filename); extern char * dpx_find_truetype_file (const char *filename); extern char * dpx_find_opentype_file (const char *filename); +extern char * dpx_find_dfont_file (const char *filename); #define DPXFOPEN(n,t) dpx_open_file((const char *)(n),(t)) #define DPXFCLOSE(f) MFCLOSE((f)) diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c index 035f0aacd9f..3444929e064 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.c +++ b/Build/source/texk/xdvipdfmx/src/fontmap.c @@ -1138,7 +1138,8 @@ pdf_load_native_font_from_path(const char *ps_name, int layout_dir, int extend, if ( (q = dpx_find_opentype_file(filename)) != NULL || (q = dpx_find_truetype_file(filename)) != NULL - || (q = dpx_find_type1_file(filename)) != NULL) { + || (q = dpx_find_type1_file(filename)) != NULL + || (q = dpx_find_dfont_file(filename)) != NULL) { error = FT_New_Face(ftLib, q, index, &face); RELEASE(q); } |