diff options
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/agl.c | 12 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxconf.c | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxconf.h | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxcrypt.c | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxcrypt.h | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/pdffont.h | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/sfnt.c | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/t1_load.c | 4 |
9 files changed, 27 insertions, 12 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index 6776875fd6b..821df41561d 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,3 +1,12 @@ +2013-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reduce dvipdfmx/xdvipdfmx diffs. + src/agl.c: Definition of hval_free() moved up. + src/pdffont.h: Added #ifdef XETEX ... #endif. + src/t1_load.c: Added #ifdef XETEX ... #else ... #endif. + src/dpxconf.[ch], src/dpxcrypt.[ch]: Copied from ../dvipdfmx. + src/sfnt.c: '#if HAVE_CONFIG_H' => '#ifdef HAVE_CONFIG_H'. + 2013-01-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * read_v2_post_names() in tt_post.c: Change calculation of post->count diff --git a/Build/source/texk/xdvipdfmx/src/agl.c b/Build/source/texk/xdvipdfmx/src/agl.c index 77305e4e366..c8b81e0a023 100644 --- a/Build/source/texk/xdvipdfmx/src/agl.c +++ b/Build/source/texk/xdvipdfmx/src/agl.c @@ -364,6 +364,12 @@ agl_normalized_name (char *glyphname) static struct ht_table aglmap; +static void CDECL +hval_free (void *hval) +{ + agl_release_name((struct agl_name *) hval); +} + void agl_init_map (void) { @@ -377,12 +383,6 @@ agl_init_map (void) } } -static void CDECL -hval_free (void *hval) -{ - agl_release_name((struct agl_name *) hval); -} - void agl_close_map (void) { diff --git a/Build/source/texk/xdvipdfmx/src/dpxconf.c b/Build/source/texk/xdvipdfmx/src/dpxconf.c index 4f82e1535df..6c6e0e19160 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxconf.c +++ b/Build/source/texk/xdvipdfmx/src/dpxconf.c @@ -3,7 +3,7 @@ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, - the DVIPDFMx project team. + the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> diff --git a/Build/source/texk/xdvipdfmx/src/dpxconf.h b/Build/source/texk/xdvipdfmx/src/dpxconf.h index d2b26987095..167257bf477 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxconf.h +++ b/Build/source/texk/xdvipdfmx/src/dpxconf.h @@ -2,8 +2,8 @@ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. - Copyright (C) 2002-2012-2003 by Jin-Hwan Cho and Shunsaku Hirata, - the DVIPDFMx project team. + Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, + the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c index 34d588a0c89..cc61cd55dc8 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c +++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c @@ -3,7 +3,7 @@ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. Copyright (C) 2003-2012 by Jin-Hwan Cho and Shunsaku Hirata, - the DVIPDFMx project team. + the dvipdfmx project team. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.h b/Build/source/texk/xdvipdfmx/src/dpxcrypt.h index 876e9c3e8fd..d2613043cf8 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.h +++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.h @@ -3,7 +3,7 @@ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. Copyright (C) 2003-2012 by Jin-Hwan Cho and Shunsaku Hirata, - the DVIPDFMx project team. + the dvipdfmx project team. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/xdvipdfmx/src/pdffont.h b/Build/source/texk/xdvipdfmx/src/pdffont.h index a1f842712b4..f4a9a3c19fa 100644 --- a/Build/source/texk/xdvipdfmx/src/pdffont.h +++ b/Build/source/texk/xdvipdfmx/src/pdffont.h @@ -71,7 +71,9 @@ extern char *pdf_get_font_fontname (int font_id); /* without unique tag */ #endif /* 0 */ extern int pdf_get_font_encoding (int font_id); extern int pdf_get_font_wmode (int font_id); +#ifdef XETEX extern unsigned short *pdf_get_font_ft_to_gid (int font_id); +#endif /* Each font drivers use the followings. */ extern int pdf_font_is_in_use (pdf_font *font); diff --git a/Build/source/texk/xdvipdfmx/src/sfnt.c b/Build/source/texk/xdvipdfmx/src/sfnt.c index 09dc7e27a54..754fe366db3 100644 --- a/Build/source/texk/xdvipdfmx/src/sfnt.c +++ b/Build/source/texk/xdvipdfmx/src/sfnt.c @@ -22,7 +22,7 @@ /* Based on dvipdfmx-0.13.2c */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H_ */ diff --git a/Build/source/texk/xdvipdfmx/src/t1_load.c b/Build/source/texk/xdvipdfmx/src/t1_load.c index 399586ece00..c3dc14297bc 100644 --- a/Build/source/texk/xdvipdfmx/src/t1_load.c +++ b/Build/source/texk/xdvipdfmx/src/t1_load.c @@ -1133,7 +1133,11 @@ t1_get_fontname (FILE *fp, char *fontname) static void init_cff_font (cff_font *cff) { +#ifdef XETEX cff->sfont = NULL; +#else + cff->stream = NULL; +#endif cff->filter = 0; cff->fontname = NULL; cff->index = 0; |