diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-20 08:37:58 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-20 08:37:58 +0000 |
commit | a98bcb6ee9be04a4c22facf3aef31f7f14f1847c (patch) | |
tree | 854e116a6f03e15e27383a3178f3d7ed711d0146 /Build/source/texk | |
parent | 491ee8bfc91afcd72bc3fb7abaed9218dfd6a0e2 (diff) |
dvipdf-x: Typos and trivial changes to reduce diffs with dvipdfm-x
git-svn-id: svn://tug.org/texlive/trunk@31706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
76 files changed, 224 insertions, 183 deletions
diff --git a/Build/source/texk/dvipdf-x/agl.c b/Build/source/texk/dvipdf-x/agl.c index d5a4edd7730..eb788d5662f 100644 --- a/Build/source/texk/dvipdf-x/agl.c +++ b/Build/source/texk/dvipdf-x/agl.c @@ -29,8 +29,8 @@ * http://partners.adobe.com/asn/tech/type/unicodegn.jsp */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/bmpimage.h b/Build/source/texk/dvipdf-x/bmpimage.h index 2259ba79c9e..35ac6a59f0b 100644 --- a/Build/source/texk/dvipdf-x/bmpimage.h +++ b/Build/source/texk/dvipdf-x/bmpimage.h @@ -26,10 +26,6 @@ #ifndef _BMPIMAGE_H_ #define _BMPIMAGE_H_ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include "mfileio.h" #include "pdfximage.h" diff --git a/Build/source/texk/dvipdf-x/cid.c b/Build/source/texk/dvipdf-x/cid.c index c1ccbaf0585..130bea89ff0 100644 --- a/Build/source/texk/dvipdf-x/cid.c +++ b/Build/source/texk/dvipdf-x/cid.c @@ -26,8 +26,8 @@ * See also, cidtype0, and cidtype2 */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/cmap.c b/Build/source/texk/dvipdf-x/cmap.c index 033431234de..9c3f5425f91 100644 --- a/Build/source/texk/dvipdf-x/cmap.c +++ b/Build/source/texk/dvipdf-x/cmap.c @@ -37,8 +37,8 @@ * Only cid(range|char) allowed for CODE_TO_CID and bf(range|char) for CID_TO_CODE ? */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/cmap_read.c b/Build/source/texk/dvipdf-x/cmap_read.c index 6128cf5084a..beba205cbf3 100644 --- a/Build/source/texk/dvipdf-x/cmap_read.c +++ b/Build/source/texk/dvipdf-x/cmap_read.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> #include "system.h" diff --git a/Build/source/texk/dvipdf-x/cmap_write.c b/Build/source/texk/dvipdf-x/cmap_write.c index 6772d511cf7..98695cb0b59 100644 --- a/Build/source/texk/dvipdf-x/cmap_write.c +++ b/Build/source/texk/dvipdf-x/cmap_write.c @@ -35,8 +35,8 @@ * */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/cs_type2.c b/Build/source/texk/dvipdf-x/cs_type2.c index fcb3edf4805..038781a437f 100644 --- a/Build/source/texk/dvipdf-x/cs_type2.c +++ b/Build/source/texk/dvipdf-x/cs_type2.c @@ -46,6 +46,10 @@ * charstring spec.. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> /* fabs, sqrt ... */ diff --git a/Build/source/texk/dvipdf-x/dpxconf.c b/Build/source/texk/dvipdf-x/dpxconf.c index 6c6e0e19160..2fc198ace0c 100644 --- a/Build/source/texk/dvipdf-x/dpxconf.c +++ b/Build/source/texk/dvipdf-x/dpxconf.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/dpxcrypt.c b/Build/source/texk/dvipdf-x/dpxcrypt.c index e7b96af169f..379ebe5ead2 100644 --- a/Build/source/texk/dvipdf-x/dpxcrypt.c +++ b/Build/source/texk/dvipdf-x/dpxcrypt.c @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #ifdef HAVE_SYS_TYPES_H diff --git a/Build/source/texk/dvipdf-x/dvicodes.h b/Build/source/texk/dvipdf-x/dvicodes.h index 964da579b15..6d691407afc 100644 --- a/Build/source/texk/dvipdf-x/dvicodes.h +++ b/Build/source/texk/dvipdf-x/dvicodes.h @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2013 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/dvipdf-x/mem.c b/Build/source/texk/dvipdf-x/mem.c index 39f87193976..ab23dca5733 100644 --- a/Build/source/texk/dvipdf-x/mem.c +++ b/Build/source/texk/dvipdf-x/mem.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdlib.h> diff --git a/Build/source/texk/dvipdf-x/mfileio.c b/Build/source/texk/dvipdf-x/mfileio.c index df83b932f83..f2ea51b5544 100644 --- a/Build/source/texk/dvipdf-x/mfileio.c +++ b/Build/source/texk/dvipdf-x/mfileio.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include "system.h" diff --git a/Build/source/texk/dvipdf-x/numbers.c b/Build/source/texk/dvipdf-x/numbers.c index 56da780a305..f80215e8c7a 100644 --- a/Build/source/texk/dvipdf-x/numbers.c +++ b/Build/source/texk/dvipdf-x/numbers.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "system.h" #include "error.h" #include "mfileio.h" diff --git a/Build/source/texk/dvipdf-x/otl_conf.c b/Build/source/texk/dvipdf-x/otl_conf.c index cffbe505645..9b10996431c 100644 --- a/Build/source/texk/dvipdf-x/otl_conf.c +++ b/Build/source/texk/dvipdf-x/otl_conf.c @@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifdef _HAVE_CONFIG_H -#include "config.h" -#endif /* _HAVE_CONFIG_H */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "system.h" #include "error.h" diff --git a/Build/source/texk/dvipdf-x/otl_opt.c b/Build/source/texk/dvipdf-x/otl_opt.c index cc26113eaa3..e46180967fa 100644 --- a/Build/source/texk/dvipdf-x/otl_opt.c +++ b/Build/source/texk/dvipdf-x/otl_opt.c @@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifdef _HAVE_CONFIG_H -#include "config.h" -#endif /* _HAVE_CONFIG_H */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdlib.h> #include <string.h> diff --git a/Build/source/texk/dvipdf-x/pdfencoding.c b/Build/source/texk/dvipdf-x/pdfencoding.c index 539a575748e..036ed599158 100644 --- a/Build/source/texk/dvipdf-x/pdfencoding.c +++ b/Build/source/texk/dvipdf-x/pdfencoding.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/pdffont.c b/Build/source/texk/dvipdf-x/pdffont.c index e9ba84acac5..dd78bf05c27 100644 --- a/Build/source/texk/dvipdf-x/pdffont.c +++ b/Build/source/texk/dvipdf-x/pdffont.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/pdfresource.c b/Build/source/texk/dvipdf-x/pdfresource.c index ac53e28f581..52e1d7a91f1 100644 --- a/Build/source/texk/dvipdf-x/pdfresource.c +++ b/Build/source/texk/dvipdf-x/pdfresource.c @@ -26,8 +26,8 @@ * Currently, this is nearly useless. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/pkfont.c b/Build/source/texk/dvipdf-x/pkfont.c index 12ba5b76fae..3c179b1e56f 100644 --- a/Build/source/texk/dvipdf-x/pkfont.c +++ b/Build/source/texk/dvipdf-x/pkfont.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/pst.c b/Build/source/texk/dvipdf-x/pst.c index fd3dab66678..a92bdddd840 100644 --- a/Build/source/texk/dvipdf-x/pst.c +++ b/Build/source/texk/dvipdf-x/pst.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> #include <ctype.h> diff --git a/Build/source/texk/dvipdf-x/pst_obj.c b/Build/source/texk/dvipdf-x/pst_obj.c index 1534f522c43..4d0243b4f01 100644 --- a/Build/source/texk/dvipdf-x/pst_obj.c +++ b/Build/source/texk/dvipdf-x/pst_obj.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> #include <stdlib.h> #include <errno.h> diff --git a/Build/source/texk/dvipdf-x/sfnt.h b/Build/source/texk/dvipdf-x/sfnt.h index 29ffeeec98b..d03d740b4b7 100644 --- a/Build/source/texk/dvipdf-x/sfnt.h +++ b/Build/source/texk/dvipdf-x/sfnt.h @@ -23,10 +23,6 @@ #ifndef _SFNT_H_ #define _SFNT_H_ -#if HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H_ */ - #include "mfileio.h" #include "numbers.h" #include "pdfobj.h" diff --git a/Build/source/texk/dvipdf-x/spc_misc.c b/Build/source/texk/dvipdf-x/spc_misc.c index ae8ee12e421..a37cc261d9e 100644 --- a/Build/source/texk/dvipdf-x/spc_misc.c +++ b/Build/source/texk/dvipdf-x/spc_misc.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/spc_xtx.c b/Build/source/texk/dvipdf-x/spc_xtx.c index a039c36371c..cf4f668bc5c 100644 --- a/Build/source/texk/dvipdf-x/spc_xtx.c +++ b/Build/source/texk/dvipdf-x/spc_xtx.c @@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> diff --git a/Build/source/texk/dvipdf-x/src/bmpimage.c b/Build/source/texk/dvipdf-x/src/bmpimage.c index ef23e70a3a4..03fe341a34d 100644 --- a/Build/source/texk/dvipdf-x/src/bmpimage.c +++ b/Build/source/texk/dvipdf-x/src/bmpimage.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif /* diff --git a/Build/source/texk/dvipdf-x/src/cff.c b/Build/source/texk/dvipdf-x/src/cff.c index 7e280732123..0e0fe7131d3 100644 --- a/Build/source/texk/dvipdf-x/src/cff.c +++ b/Build/source/texk/dvipdf-x/src/cff.c @@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/cff_dict.c b/Build/source/texk/dvipdf-x/src/cff_dict.c index c2e20250299..67956a72f27 100644 --- a/Build/source/texk/dvipdf-x/src/cff_dict.c +++ b/Build/source/texk/dvipdf-x/src/cff_dict.c @@ -1,8 +1,8 @@ /* - + This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -26,6 +26,10 @@ * Adobe Technical Note #5176 "The Compact Font Format Specification" */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <math.h> #include <stdlib.h> #include <errno.h> diff --git a/Build/source/texk/dvipdf-x/src/cidtype0.c b/Build/source/texk/dvipdf-x/src/cidtype0.c index f2a2afaed00..ee8193dcd8e 100644 --- a/Build/source/texk/dvipdf-x/src/cidtype0.c +++ b/Build/source/texk/dvipdf-x/src/cidtype0.c @@ -27,8 +27,8 @@ * */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/cidtype2.c b/Build/source/texk/dvipdf-x/src/cidtype2.c index dcf74c6abec..472be1c1607 100644 --- a/Build/source/texk/dvipdf-x/src/cidtype2.c +++ b/Build/source/texk/dvipdf-x/src/cidtype2.c @@ -25,8 +25,8 @@ * GhostScript can't handle CIDToGIDMap correctly. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/dpxfile.c b/Build/source/texk/dvipdf-x/src/dpxfile.c index d6390641ed0..75fa6da0801 100644 --- a/Build/source/texk/dvipdf-x/src/dpxfile.c +++ b/Build/source/texk/dvipdf-x/src/dpxfile.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #ifdef _MSC_VER diff --git a/Build/source/texk/dvipdf-x/src/dpxutil.c b/Build/source/texk/dvipdf-x/src/dpxutil.c index 05e1b1b1485..e40e3630820 100644 --- a/Build/source/texk/dvipdf-x/src/dpxutil.c +++ b/Build/source/texk/dvipdf-x/src/dpxutil.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/Build/source/texk/dvipdf-x/src/dvi.c b/Build/source/texk/dvipdf-x/src/dvi.c index 62a315f4831..ef9f726f100 100644 --- a/Build/source/texk/dvipdf-x/src/dvi.c +++ b/Build/source/texk/dvipdf-x/src/dvi.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2013 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <sys/types.h> diff --git a/Build/source/texk/dvipdf-x/src/dvipdfmx.c b/Build/source/texk/dvipdf-x/src/dvipdfmx.c index b57243e8142..a62225c62a2 100644 --- a/Build/source/texk/dvipdf-x/src/dvipdfmx.c +++ b/Build/source/texk/dvipdf-x/src/dvipdfmx.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdio.h> diff --git a/Build/source/texk/dvipdf-x/src/epdf.c b/Build/source/texk/dvipdf-x/src/epdf.c index 17fdcf3ee26..3558f9c0b43 100644 --- a/Build/source/texk/dvipdf-x/src/epdf.c +++ b/Build/source/texk/dvipdf-x/src/epdf.c @@ -31,15 +31,14 @@ * TrimBox, BleedBox, ArtBox, Rotate ... */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" #include "mem.h" #include "mfileio.h" #include "error.h" - #include "dvipdfmx.h" #include "pdfobj.h" diff --git a/Build/source/texk/dvipdf-x/src/error.c b/Build/source/texk/dvipdf-x/src/error.c index c4d2d3d7cac..af12bd3ba41 100644 --- a/Build/source/texk/dvipdf-x/src/error.c +++ b/Build/source/texk/dvipdf-x/src/error.c @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdarg.h> #include <stdio.h> diff --git a/Build/source/texk/dvipdf-x/src/fontmap.c b/Build/source/texk/dvipdf-x/src/fontmap.c index c2151278f12..1dc567fcf01 100644 --- a/Build/source/texk/dvipdf-x/src/fontmap.c +++ b/Build/source/texk/dvipdf-x/src/fontmap.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/jpegimage.c b/Build/source/texk/dvipdf-x/src/jpegimage.c index b21d6c34e94..bd89b075ff9 100644 --- a/Build/source/texk/dvipdf-x/src/jpegimage.c +++ b/Build/source/texk/dvipdf-x/src/jpegimage.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007-2013 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -23,8 +23,8 @@ */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif /* diff --git a/Build/source/texk/dvipdf-x/src/mpost.c b/Build/source/texk/dvipdf-x/src/mpost.c index 2d610d1f158..703d0b45a36 100644 --- a/Build/source/texk/dvipdf-x/src/mpost.c +++ b/Build/source/texk/dvipdf-x/src/mpost.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfcolor.c b/Build/source/texk/dvipdf-x/src/pdfcolor.c index 4aff0dd589b..7749ce6638a 100644 --- a/Build/source/texk/dvipdf-x/src/pdfcolor.c +++ b/Build/source/texk/dvipdf-x/src/pdfcolor.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/pdfdev.c b/Build/source/texk/dvipdf-x/src/pdfdev.c index 79351aec34c..9d560bd4c20 100644 --- a/Build/source/texk/dvipdf-x/src/pdfdev.c +++ b/Build/source/texk/dvipdf-x/src/pdfdev.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfdoc.c b/Build/source/texk/dvipdf-x/src/pdfdoc.c index 862789ec714..57b5b37c82d 100644 --- a/Build/source/texk/dvipdf-x/src/pdfdoc.c +++ b/Build/source/texk/dvipdf-x/src/pdfdoc.c @@ -26,8 +26,9 @@ * TODO: Many things... * {begin,end}_{bead,article}, box stack, name tree (not limited to dests)... */ -#if HAVE_CONFIG_H -#include "config.h" + +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <time.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfdraw.c b/Build/source/texk/dvipdf-x/src/pdfdraw.c index de5b4dc7f11..6dc30e863d2 100644 --- a/Build/source/texk/dvipdf-x/src/pdfdraw.c +++ b/Build/source/texk/dvipdf-x/src/pdfdraw.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include <math.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfencrypt.c b/Build/source/texk/dvipdf-x/src/pdfencrypt.c index bd610d7a69b..1652af4b7f5 100644 --- a/Build/source/texk/dvipdf-x/src/pdfencrypt.c +++ b/Build/source/texk/dvipdf-x/src/pdfencrypt.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdio.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfnames.c b/Build/source/texk/dvipdf-x/src/pdfnames.c index 28082c8b9a9..864910b3411 100644 --- a/Build/source/texk/dvipdf-x/src/pdfnames.c +++ b/Build/source/texk/dvipdf-x/src/pdfnames.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfobj.c b/Build/source/texk/dvipdf-x/src/pdfobj.c index 9f87910f718..f4d40148903 100644 --- a/Build/source/texk/dvipdf-x/src/pdfobj.c +++ b/Build/source/texk/dvipdf-x/src/pdfobj.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> @@ -2522,7 +2522,6 @@ pdf_new_ref (pdf_obj *object) return result; } - /* pdf_deref_obj always returns a link instead of the original */ /* It never return the null object, but the NULL pointer instead */ pdf_obj * diff --git a/Build/source/texk/dvipdf-x/src/pdfparse.c b/Build/source/texk/dvipdf-x/src/pdfparse.c index 78c3fdd3455..c05d37ed454 100644 --- a/Build/source/texk/dvipdf-x/src/pdfparse.c +++ b/Build/source/texk/dvipdf-x/src/pdfparse.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + 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> @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> diff --git a/Build/source/texk/dvipdf-x/src/pdfximage.c b/Build/source/texk/dvipdf-x/src/pdfximage.c index ff81ac697fb..5dad655a97a 100644 --- a/Build/source/texk/dvipdf-x/src/pdfximage.c +++ b/Build/source/texk/dvipdf-x/src/pdfximage.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/pngimage.c b/Build/source/texk/dvipdf-x/src/pngimage.c index 2a835ae49f9..2583a8a6ced 100644 --- a/Build/source/texk/dvipdf-x/src/pngimage.c +++ b/Build/source/texk/dvipdf-x/src/pngimage.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + 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> @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif /* diff --git a/Build/source/texk/dvipdf-x/src/pngimage.h b/Build/source/texk/dvipdf-x/src/pngimage.h index 04b4e478a71..dd5ffe572ae 100644 --- a/Build/source/texk/dvipdf-x/src/pngimage.h +++ b/Build/source/texk/dvipdf-x/src/pngimage.h @@ -26,10 +26,6 @@ #ifndef _PNGIMAGE_H_ #define _PNGIMAGE_H_ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_LIBPNG #include "mfileio.h" diff --git a/Build/source/texk/dvipdf-x/src/sfnt.c b/Build/source/texk/dvipdf-x/src/sfnt.c index 7f40f9e49d5..47627b9f501 100644 --- a/Build/source/texk/dvipdf-x/src/sfnt.c +++ b/Build/source/texk/dvipdf-x/src/sfnt.c @@ -23,8 +23,8 @@ /* Based on dvipdfmx-0.13.2c */ #ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ +#include <config.h> +#endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/spc_color.c b/Build/source/texk/dvipdf-x/src/spc_color.c index 6031948e1ab..94d3a0bd206 100644 --- a/Build/source/texk/dvipdf-x/src/spc_color.c +++ b/Build/source/texk/dvipdf-x/src/spc_color.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/spc_dvips.c b/Build/source/texk/dvipdf-x/src/spc_dvips.c index 07ea009172e..8fd666d98fd 100644 --- a/Build/source/texk/dvipdf-x/src/spc_dvips.c +++ b/Build/source/texk/dvipdf-x/src/spc_dvips.c @@ -22,12 +22,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <string.h> - #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif +#include <string.h> + #include "system.h" #include "mem.h" #include "error.h" diff --git a/Build/source/texk/dvipdf-x/src/spc_html.c b/Build/source/texk/dvipdf-x/src/spc_html.c index c7a4d535b8e..779f3ffb0d7 100644 --- a/Build/source/texk/dvipdf-x/src/spc_html.c +++ b/Build/source/texk/dvipdf-x/src/spc_html.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + 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> @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/spc_pdfm.c b/Build/source/texk/dvipdf-x/src/spc_pdfm.c index 6ae6a94fded..aa0bfba861e 100644 --- a/Build/source/texk/dvipdf-x/src/spc_pdfm.c +++ b/Build/source/texk/dvipdf-x/src/spc_pdfm.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <ctype.h> @@ -117,7 +117,7 @@ addresource (struct spc_pdf_ *sd, const char *ident, int res_id) ht_append_table(sd->resourcemap, ident, strlen(ident), r); spc_push_object(ident, pdf_ximage_get_reference(res_id)); - return 0; + return 0; } static int @@ -160,7 +160,7 @@ spc_handler_pdfm__init (struct spc_env *spe, struct spc_arg *ap, void *dp) } #endif /* ENABLE_TOUNICODE */ - return 0; + return 0; } static int @@ -186,7 +186,7 @@ spc_handler_pdfm__clean (struct spc_env *spe, struct spc_arg *ap, void *dp) sd->cd.taintkeys = NULL; #endif /* ENABLE_TOUNICODE */ - return 0; + return 0; } @@ -216,7 +216,7 @@ spc_handler_pdfm_bop (struct spc_env *spe, struct spc_arg *args) args->curptr = args->endptr; - return 0; + return 0; } static int @@ -229,7 +229,7 @@ spc_handler_pdfm_eop (struct spc_env *spe, struct spc_arg *args) args->curptr = args->endptr; - return 0; + return 0; } #define streamfiltered(o) \ @@ -250,7 +250,7 @@ safeputresdent (pdf_obj *kp, pdf_obj *vp, void *dp) pdf_add_dict(dp, pdf_link_obj(kp), pdf_link_obj(vp)); } - return 0; + return 0; } #ifndef pdf_obj_isaref @@ -281,7 +281,7 @@ safeputresdict (pdf_obj *kp, pdf_obj *vp, void *dp) return -1; } - return 0; + return 0; } @@ -416,7 +416,7 @@ reencodestring (CMap *cmap, pdf_obj *instring) pdf_set_string(instring, wbuf, WBUF_SIZE - obufleft); - return 0; + return 0; } static int @@ -572,7 +572,7 @@ spc_handler_pdfm_annot (struct spc_env *spe, struct spc_arg *args) /* Order is important... */ if (ident) spc_push_object(ident, pdf_link_obj(annot_dict)); - /* This add reference. */ + /* Add this reference. */ pdf_doc_add_annot(pdf_doc_current_page_number(), &rect, annot_dict, 1); if (ident) { @@ -581,7 +581,7 @@ spc_handler_pdfm_annot (struct spc_env *spe, struct spc_arg *args) } pdf_release_obj(annot_dict); - return 0; + return 0; } /* NOTE: This can't have ident. See "Dvipdfm User's Manual". */ @@ -659,7 +659,7 @@ spc_handler_pdfm_bcolor (struct spc_env *spe, struct spc_arg *ap) if (error) spc_warn(spe, "Invalid color specification?"); else { - pdf_color_push(&sc, &fc); + pdf_color_push(&sc, &fc); /* save currentcolor */ } return error; @@ -688,9 +688,8 @@ spc_handler_pdfm_scolor (struct spc_env *spe, struct spc_arg *ap) if (error) spc_warn(spe, "Invalid color specification?"); - else { + else pdf_color_set(&sc, &fc); - } return error; } @@ -699,7 +698,7 @@ static int spc_handler_pdfm_ecolor (struct spc_env *spe, struct spc_arg *args) { pdf_color_pop(); - return 0; + return 0; } @@ -722,7 +721,7 @@ spc_handler_pdfm_btrans (struct spc_env *spe, struct spc_arg *args) pdf_dev_gsave(); pdf_dev_concat(&M); - return 0; + return 0; } static int @@ -740,7 +739,7 @@ spc_handler_pdfm_etrans (struct spc_env *spe, struct spc_arg *args) */ pdf_dev_reset_color(0); - return 0; + return 0; } static int @@ -818,7 +817,7 @@ spc_handler_pdfm_outline (struct spc_env *spe, struct spc_arg *args) pdf_doc_bookmarks_add(item_dict, is_open); - return 0; + return 0; } static int @@ -853,7 +852,7 @@ spc_handler_pdfm_article (struct spc_env *spe, struct spc_arg *args) spc_push_object(ident, info_dict); RELEASE(ident); - return 0; + return 0; } static int @@ -940,7 +939,7 @@ spc_handler_pdfm_bead (struct spc_env *spe, struct spc_arg *args) pdf_doc_add_bead(article_name, NULL, page_no, &rect); RELEASE(article_name); - return 0; + return 0; } static int @@ -1018,7 +1017,7 @@ spc_handler_pdfm_image (struct spc_env *spe, struct spc_arg *args) pdf_release_obj(fspec); - return 0; + return 0; } /* Use do_names instead. */ @@ -1041,7 +1040,7 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args) array = parse_pdf_object(&args->curptr, args->endptr, NULL); if (!array) { - spc_warn(spe, "No destination not specified for pdf:dest."); + spc_warn(spe, "No destination specified for pdf:dest."); pdf_release_obj(name); return -1; } else if (!PDF_OBJ_ARRAYTYPE(array)) { @@ -1057,7 +1056,7 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args) array); pdf_release_obj(name); - return 0; + return 0; } static int @@ -1136,7 +1135,7 @@ spc_handler_pdfm_names (struct spc_env *spe, struct spc_arg *args) } pdf_release_obj(category); - return 0; + return 0; } static int @@ -1161,7 +1160,7 @@ spc_handler_pdfm_docinfo (struct spc_env *spe, struct spc_arg *args) pdf_merge_dict(docinfo, dict); pdf_release_obj(dict); - return 0; + return 0; } static int @@ -1194,7 +1193,7 @@ spc_handler_pdfm_docview (struct spc_env *spe, struct spc_arg *args) pdf_merge_dict (catalog, dict); pdf_release_obj(dict); - return 0; + return 0; } static int @@ -1211,7 +1210,7 @@ spc_handler_pdfm_close (struct spc_env *spe, struct spc_arg *args) spc_clear_objects(); } - return 0; + return 0; } static int @@ -1237,7 +1236,7 @@ spc_handler_pdfm_object (struct spc_env *spe, struct spc_arg *args) } RELEASE(ident); - return 0; + return 0; } static int @@ -1266,7 +1265,7 @@ spc_handler_pdfm_content (struct spc_env *spe, struct spc_arg *args) } args->curptr = args->endptr; - return 0; + return 0; } static int @@ -1307,7 +1306,7 @@ spc_handler_pdfm_literal (struct spc_env *spe, struct spc_arg *args) args->curptr = args->endptr; - return 0; + return 0; } static int @@ -1331,7 +1330,7 @@ spc_handler_pdfm_econtent (struct spc_env *spe, struct spc_arg *args) pdf_dev_grestore(); pdf_dev_reset_color(0); - return 0; + return 0; } static int @@ -1345,7 +1344,7 @@ spc_handler_pdfm_code (struct spc_env *spe, struct spc_arg *args) args->curptr = args->endptr; } - return 0; + return 0; } static int @@ -1465,7 +1464,7 @@ spc_handler_pdfm_stream_with_type (struct spc_env *spe, struct spc_arg *args, in spc_push_object(ident, fstream); RELEASE(ident); - return 0; + return 0; } /* @@ -1568,7 +1567,7 @@ spc_handler_pdfm_bform (struct spc_env *spe, struct spc_arg *args) spc_push_object(ident, pdf_ximage_get_reference(xobj_id)); RELEASE(ident); - return 0; + return 0; } /* An extra dictionary after exobj must be merged to the form dictionary, @@ -1591,7 +1590,7 @@ spc_handler_pdfm_eform (struct spc_env *spe, struct spc_arg *args) } pdf_doc_end_grabbing(attrib); - return 0; + return 0; } /* Saved XObjects can be used as follows: @@ -1657,7 +1656,7 @@ spc_handler_pdfm_uxobj (struct spc_env *spe, struct spc_arg *args) pdf_dev_put_image(xobj_id, &ti, spe->x_user, spe->y_user); RELEASE(ident); - return 0; + return 0; } static int @@ -1680,7 +1679,7 @@ spc_handler_pdfm_pagesize (struct spc_env *spe, struct spc_arg *args) { args->curptr = args->endptr; - return 0; + return 0; } /* Please remove this. @@ -1760,7 +1759,7 @@ spc_handler_pdfm_mapline (struct spc_env *spe, struct spc_arg *ap) if (!error) ap->curptr = ap->endptr; - return 0; + return 0; } static int diff --git a/Build/source/texk/dvipdf-x/src/spc_tpic.c b/Build/source/texk/dvipdf-x/src/spc_tpic.c index d0a6e91c0f4..3da276d9f0e 100644 --- a/Build/source/texk/dvipdf-x/src/spc_tpic.c +++ b/Build/source/texk/dvipdf-x/src/spc_tpic.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/spc_util.c b/Build/source/texk/dvipdf-x/src/spc_util.c index ff56d0d2f90..ea9f69c2072 100644 --- a/Build/source/texk/dvipdf-x/src/spc_util.c +++ b/Build/source/texk/dvipdf-x/src/spc_util.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" @@ -169,7 +169,7 @@ spc_read_color_color (struct spc_env *spe, pdf_color *colorspec, struct spc_arg return error; } -/* Argumaent for this is PDF_Number or PDF_Array. +/* Argument for this is PDF_Number or PDF_Array. * But we ignore that since we don't want to add * dependency to pdfxxx and @foo can not be * allowed for color specification. "pdf" here diff --git a/Build/source/texk/dvipdf-x/src/specials.c b/Build/source/texk/dvipdf-x/src/specials.c index dc5bf600028..e1cc2bb7a9f 100644 --- a/Build/source/texk/dvipdf-x/src/specials.c +++ b/Build/source/texk/dvipdf-x/src/specials.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdarg.h> diff --git a/Build/source/texk/dvipdf-x/src/tfm.c b/Build/source/texk/dvipdf-x/src/tfm.c index a296b8848de..bd511450518 100644 --- a/Build/source/texk/dvipdf-x/src/tfm.c +++ b/Build/source/texk/dvipdf-x/src/tfm.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/truetype.c b/Build/source/texk/dvipdf-x/src/truetype.c index 41d06e65b78..225c0b793d4 100644 --- a/Build/source/texk/dvipdf-x/src/truetype.c +++ b/Build/source/texk/dvipdf-x/src/truetype.c @@ -20,9 +20,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/tt_aux.c b/Build/source/texk/dvipdf-x/src/tt_aux.c index fc19300f431..09e92efefe3 100644 --- a/Build/source/texk/dvipdf-x/src/tt_aux.c +++ b/Build/source/texk/dvipdf-x/src/tt_aux.c @@ -21,8 +21,8 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ +#include <config.h> +#endif #include "system.h" #include "mem.h" diff --git a/Build/source/texk/dvipdf-x/src/tt_cmap.c b/Build/source/texk/dvipdf-x/src/tt_cmap.c index 6fad1352ded..1d7f34a6ccd 100644 --- a/Build/source/texk/dvipdf-x/src/tt_cmap.c +++ b/Build/source/texk/dvipdf-x/src/tt_cmap.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/tt_glyf.c b/Build/source/texk/dvipdf-x/src/tt_glyf.c index 661ed8693ee..c01b7309a68 100644 --- a/Build/source/texk/dvipdf-x/src/tt_glyf.c +++ b/Build/source/texk/dvipdf-x/src/tt_glyf.c @@ -25,7 +25,9 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "system.h" #include "mem.h" diff --git a/Build/source/texk/dvipdf-x/src/tt_post.c b/Build/source/texk/dvipdf-x/src/tt_post.c index 46adba1afcf..120c1fc6180 100644 --- a/Build/source/texk/dvipdf-x/src/tt_post.c +++ b/Build/source/texk/dvipdf-x/src/tt_post.c @@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "system.h" #include "error.h" #include "mem.h" @@ -58,8 +62,8 @@ read_v2_post_names (struct tt_post_table *post, sfnt *sfont) static char warning_issued = 0; if (!warning_issued) { WARN("TrueType post table name index %u > 32767", idx); - warning_issued = 1; - } + warning_issued = 1; + } /* In a real-life large font, (x)dvipdfmx crashes if we use nonvanishing idx in the case of idx > 32767. If we set idx = 0, (x)dvipdfmx works fine for the font and diff --git a/Build/source/texk/dvipdf-x/src/tt_table.c b/Build/source/texk/dvipdf-x/src/tt_table.c index c14573d62b2..8680b479067 100644 --- a/Build/source/texk/dvipdf-x/src/tt_table.c +++ b/Build/source/texk/dvipdf-x/src/tt_table.c @@ -2,7 +2,7 @@ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/type0.c b/Build/source/texk/dvipdf-x/src/type0.c index 0882175708d..b2b95898649 100644 --- a/Build/source/texk/dvipdf-x/src/type0.c +++ b/Build/source/texk/dvipdf-x/src/type0.c @@ -28,8 +28,8 @@ * Composite font (multiple descendants) - not supported in PDF */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/type1.c b/Build/source/texk/dvipdf-x/src/type1.c index fff0e44cab5..110bf7ffc6c 100644 --- a/Build/source/texk/dvipdf-x/src/type1.c +++ b/Build/source/texk/dvipdf-x/src/type1.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/type1c.c b/Build/source/texk/dvipdf-x/src/type1c.c index 1c61ce24eaa..1bfbbb18730 100644 --- a/Build/source/texk/dvipdf-x/src/type1c.c +++ b/Build/source/texk/dvipdf-x/src/type1c.c @@ -34,8 +34,8 @@ * */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/src/vf.c b/Build/source/texk/dvipdf-x/src/vf.c index 1d7f9e753f4..fa40ae9954a 100644 --- a/Build/source/texk/dvipdf-x/src/vf.c +++ b/Build/source/texk/dvipdf-x/src/vf.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include "system.h" diff --git a/Build/source/texk/dvipdf-x/src/xbb.c b/Build/source/texk/dvipdf-x/src/xbb.c index c5fd0f22094..e7ef0f9d99e 100644 --- a/Build/source/texk/dvipdf-x/src/xbb.c +++ b/Build/source/texk/dvipdf-x/src/xbb.c @@ -2,7 +2,7 @@ This is extractbb, a bounding box extraction program. - Copyright (C) 2009-2012 by Jin-Hwan Cho and Matthias Franz + Copyright (C) 2008-2013 by Jin-Hwan Cho and Matthias Franz 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 @@ -19,6 +19,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <time.h> #include <string.h> @@ -33,8 +37,6 @@ #include "pdfdoc.h" #include "pdfparse.h" -#include "config.h" - #include "jpegimage.h" #include "pngimage.h" diff --git a/Build/source/texk/dvipdf-x/subfont.c b/Build/source/texk/dvipdf-x/subfont.c index 001dec358d3..55747ba3407 100644 --- a/Build/source/texk/dvipdf-x/subfont.c +++ b/Build/source/texk/dvipdf-x/subfont.c @@ -20,12 +20,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <errno.h> - -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif +#include <errno.h> + #include "system.h" #include "mem.h" #include "error.h" diff --git a/Build/source/texk/dvipdf-x/t1_char.c b/Build/source/texk/dvipdf-x/t1_char.c index 7b6788870bd..0d2b6dbf729 100644 --- a/Build/source/texk/dvipdf-x/t1_char.c +++ b/Build/source/texk/dvipdf-x/t1_char.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/t1_load.c b/Build/source/texk/dvipdf-x/t1_load.c index c3dc14297bc..860bf0579e6 100644 --- a/Build/source/texk/dvipdf-x/t1_load.c +++ b/Build/source/texk/dvipdf-x/t1_load.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/tt_gsub.c b/Build/source/texk/dvipdf-x/tt_gsub.c index ea31da94e3e..6469c29a82f 100644 --- a/Build/source/texk/dvipdf-x/tt_gsub.c +++ b/Build/source/texk/dvipdf-x/tt_gsub.c @@ -24,6 +24,10 @@ * TrueType GSUB support: (incomplete) */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "system.h" #include "error.h" diff --git a/Build/source/texk/dvipdf-x/unicode.c b/Build/source/texk/dvipdf-x/unicode.c index ddf7380b53a..5ecadbee1c4 100644 --- a/Build/source/texk/dvipdf-x/unicode.c +++ b/Build/source/texk/dvipdf-x/unicode.c @@ -30,8 +30,8 @@ * Normalization? */ -#if HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <string.h> diff --git a/Build/source/texk/dvipdf-x/xsrc/pdfparse.c b/Build/source/texk/dvipdf-x/xsrc/pdfparse.c index 4d0444b5a30..98ad0240e50 100644 --- a/Build/source/texk/dvipdf-x/xsrc/pdfparse.c +++ b/Build/source/texk/dvipdf-x/xsrc/pdfparse.c @@ -669,7 +669,7 @@ parse_pdf_tainted_dict (const char **pp, const char *endptr) } #else /* PDF_PARSE_STRICT */ pdf_obj * -parse_pdf_tainted_dict (const char **pp, const char *endptr, int level) +parse_pdf_tainted_dict (const char **pp, const char *endptr) { return parse_pdf_dict(pp, endptr, NULL); } diff --git a/Build/source/texk/dvipdf-x/xsrc/pngimage.h b/Build/source/texk/dvipdf-x/xsrc/pngimage.h index 747b7b1d223..41fd0919f21 100644 --- a/Build/source/texk/dvipdf-x/xsrc/pngimage.h +++ b/Build/source/texk/dvipdf-x/xsrc/pngimage.h @@ -26,10 +26,6 @@ #ifndef _PNGIMAGE_H_ #define _PNGIMAGE_H_ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_LIBPNG #include "mfileio.h" |