diff options
| -rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/data/dvipdfmx.cfg | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/src/dvipdfmx.c | 12 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg | 33 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/dvipdfmx.c | 19 |
10 files changed, 56 insertions, 38 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index a82eceafcb2..80c9c0b7637 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,9 @@ +2013-04-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * src/dvipdfmx.c: Default is not to cache image files. + Must not cast command line value to 'unsigned'. + * data/dvipdfmx.cfg (I): Now -1 is the program default. + 2013-04-30 Karl Berry <karl@tug.org> * data/dvipdfmx.cfg (D): back to using -dEPSCrop instead of diff --git a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg index d0c021bc84c..3aca31fd2ed 100644 --- a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg +++ b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg @@ -193,7 +193,7 @@ D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel= %% Image cache life in hours %% 0 means erase all old images and leave new images %% -1 means erase all old images and also erase new images -I -1 +%I -1 %% Font Map Files %% @@ -207,7 +207,7 @@ f pdftex.map %% MiKTeX 2.2 and 2.3 %f psfonts.map -%% Put additonal fontmap files here (usually for Type0 fonts) +%% Put additional fontmap files here (usually for Type0 fonts) %f cid-x.map % the following file is generated by updmap(-sys) from the diff --git a/Build/source/texk/dvipdfmx/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/src/dvipdfmx.c index 7dbd7de9769..91371e5713a 100644 --- a/Build/source/texk/dvipdfmx/src/dvipdfmx.c +++ b/Build/source/texk/dvipdfmx/src/dvipdfmx.c @@ -2,7 +2,7 @@ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. - Copyright (C) 2009-2012 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, + Copyright (C) 2009-2013 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -89,7 +89,7 @@ static int pdfdecimaldigits = 2; /* Image cache life in hours */ /* 0 means erase all old images and leave new images */ /* -1 means erase all old images and also erase new images */ -static int image_cache_life = 48; +static int image_cache_life = -1; /* Encryption */ static int do_encryption = 0; @@ -146,7 +146,7 @@ show_version (void) fprintf(stdout, "\nThis is %s-%s by the DVIPDFMx project team,\n", PACKAGE, VERSION); fprintf(stdout, "modified for TeX Live,\n"); fprintf(stdout, "an extended version of dvipdfm-0.13.2c developed by Mark A. Wicks.\n"); - fprintf(stdout, "\nCopyright (C) 2002-2012 by the DVIPDFMx project team\n"); + fprintf(stdout, "\nCopyright (C) 2002-2013 by the DVIPDFMx project team\n"); fprintf(stdout, "\nThis is free software; you can redistribute it and/or modify\n"); fprintf(stdout, "it under the terms of the GNU General Public License as published by\n"); fprintf(stdout, "the Free Software Foundation; either version 2 of the License, or\n"); @@ -186,7 +186,7 @@ show_usage (void) fprintf(stdout, "\t\tAnd negative values replace old values.\n"); fprintf(stdout, "-D template\tPS->PDF conversion command line template [none]\n"); fprintf(stdout, "-E \t\tEnable DVIPDFM emulation mode\n"); - fprintf(stdout, "-I number\tImage cache life in hours [48]\n"); + fprintf(stdout, "-I number\tImage cache life in hours [-1]\n"); fprintf(stdout, " \t 0: erase all old images and leave new images\n"); fprintf(stdout, " \t-1: erase all old images and also erase new images\n"); fprintf(stdout, "-K number\tEncryption key length [40]\n"); @@ -539,7 +539,7 @@ do_args (int argc, char *argv[]) break; case 'I': CHECK_ARG(1, "image cache life in hours"); - image_cache_life = (unsigned) atoi(argv[1]); + image_cache_life = atoi(argv[1]); POP_ARG(); break; case 'S': @@ -613,7 +613,7 @@ do_args (int argc, char *argv[]) } else if (argc > 0) { /* * The only legitimate way to have argc == 0 here is - * is do_args was called from config file. In that case, there is + * do_args was called from config file. In that case, there is * no dvi file name. Check for that case . */ if (!mp_mode && STRN_CMP(".dvi", argv[0] + strlen(argv[0]) - 4, 4)) { diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index 5f1fb3c1e4b..a6c9532e6a6 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,3 +1,11 @@ +2013-04-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * src/dvipdfmx.c: Default is not to cache image files. + Must not cast command line value to 'unsigned'. + * data/dvipdfmx.cfg: Synch with ../dvipdfmx/. + + * Makefile.am, src/Makefile.am: Fixed a typo. + 2013-03-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * src/dpxfile.c, src/spc_dvips.c: Recover dpx_create_temp_file() diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am index a796b7dc735..414240cc327 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.am +++ b/Build/source/texk/xdvipdfmx/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -9,7 +9,7 @@ SUBDIRS = . src all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(KPATHSEA_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(KPATHSEA_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index 2275129ea8e..a35baaab128 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -803,7 +803,7 @@ uninstall-am: all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(KPATHSEA_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(KPATHSEA_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg b/Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg index afa3b843e16..3aca31fd2ed 100644 --- a/Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg +++ b/Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg @@ -1,4 +1,4 @@ -%% dvipdfmx.cfg for dvipdfmx. (Public domain.) +%% dvipdfmx.cfg for dvipdfmx and xdvipdfmx. (Public domain.) %% %% PDF Version Setting %% @@ -129,13 +129,10 @@ P 0x003C %% encoded images (which is possible in PS level 2), then these images %% will also be re-encoded using Flate. To turn the conversion off, %% simply remove the options mentioned above. -%% -%% Also note that PAPERSIZE=a0 is specified below. This converts PS -%% files (including EPS) to A0 papersize PDF. This is necessary to -%% prevent gs from clipping PS figure at some papersize. (A0 above -%% simply means large size paper.) If you have figures even larger -%% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of -%% "-sPAPERSIZE=a0" +%% +%% The -dEPSCROP below converts PS files. Before TL 2013, +%% -sPAPERSIZE=a0 was used for this. In 2013, changes were made to +%% xetex.def, dvipdfmx.def, etc., to handle non-zero llx/lly. %% %% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we %% must omit the -dSAFER which ps2pdf specifies: in order for pstricks @@ -148,22 +145,31 @@ P 0x003C %% Incidentally, especially in TL, more than one dvipdfmx.cfg may be %% extant. You can find the one that is active by running: %% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg +%% and control which one is found by setting DVIPDFMXINPUTS. %% -D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" +D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" + +% pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes: +%D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" +% other random ps converters people have experimented with. +%D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'" +%D "/usr/texbin/epstopdf '%i' -o '%o'" +%D "/usr/bin/pstopdf '%i' -o '%o'" +% %% Frank Siegert's PStill: %D "/usr/local/bin/pstill -c -o '%o' '%i'" - +% %% Batik + Fop (SVG-to-PDF): %% If you want both PS and SVG, you need to write a script or program %% that selectively invokes converters. %D "java -classpath classpaths -jar /path/to/batik-rasterizer.jar -m application/pdf -d '%o' '%i'" - +% %% There are no way to directly know suggested size of (raster) images. %% You may want to use %b here, since you can try reading the ebb file %% to see what is natural (physical) size of images. %D "ras2pdf -r 300x300 -b '%b.bb' -o '%o' '%i'" - +% %% ImageMagick: %% Easiest way to support various file formats. %D "convert '%i' 'epdf:%o'" @@ -187,7 +193,7 @@ D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityL %% Image cache life in hours %% 0 means erase all old images and leave new images %% -1 means erase all old images and also erase new images -%I 48 +%I -1 %% Font Map Files %% @@ -207,7 +213,6 @@ f pdftex.map % the following file is generated by updmap(-sys) from the % KanjiMap entries in the updmap.cfg file. f kanjix.map - % minimal example for Chinese and Korean users % improvements please to tex-live@tug.org f ckx.map diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am index 6ff201801fa..367e2f35a57 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.am +++ b/Build/source/texk/xdvipdfmx/src/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/src/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) @@ -33,7 +33,7 @@ xdvipdfmx_SOURCES = \ type0.h t1_char.h t1_load.h type1.h type1c.h \ unicode.h vf.h xbb.h -xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(KPATHSEA_DEPEND) +xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in index 52b87e3f67c..6d8d1e04ccb 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.in +++ b/Build/source/texk/xdvipdfmx/src/Makefile.in @@ -326,7 +326,7 @@ xdvipdfmx_SOURCES = \ type0.h t1_char.h t1_load.h type1.h type1c.h \ unicode.h vf.h xbb.h -xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(KPATHSEA_DEPEND) +xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) all: all-am diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c index 932237574d3..ac82c2cdf56 100644 --- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c +++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c @@ -1,13 +1,12 @@ /* - This is xdvipdfmx, an extended version of... + This is xdvipdfmx, an extended version of... - DVIPDFMx, an eXtended-2012 version of DVIPDFM by Mark A. Wicks. + DVIPDFMx, an eXtended-2013 version of DVIPDFM by Mark A. Wicks. - Copyright (c) 2006 SIL. - (xdvipdfmx extensions for XeTeX support) + Copyright (c) 2006 SIL. (xdvipdfmx extensions for XeTeX support) - Copyright (C) 2008 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, + Copyright (C) 2008-2013 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, the DVIPDFMx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -92,7 +91,7 @@ static int pdfdecimaldigits = 2; /* Image cache life in hours */ /* 0 means erase all old images and leave new images */ /* -1 means erase all old images and also erase new images */ -static int image_cache_life = 48; +static int image_cache_life = -1; /* Encryption */ static int do_encryption = 0; @@ -156,7 +155,7 @@ usage (int exit_code) fprintf (stdout, "\nThis is %s-%s by Jonathan Kew and Jin-Hwan Cho,\n", PACKAGE, VERSION); fprintf (stdout, "an extended version of DVIPDFMx, which in turn was\n"); fprintf (stdout, "an extended version of dvipdfm-0.13.2c developed by Mark A. Wicks.\n"); - fprintf (stdout, "\nCopyright (c) 2006-2011 SIL International and Jin-Hwan Cho.\n"); + fprintf (stdout, "\nCopyright (c) 2006-2013 SIL International and Jin-Hwan Cho.\n"); fprintf (stdout, "\nThis is free software; you can redistribute it and/or modify\n"); fprintf (stdout, "it under the terms of the GNU General Public License as published by\n"); fprintf (stdout, "the Free Software Foundation; either version 2 of the License, or\n"); @@ -191,7 +190,7 @@ usage (int exit_code) fprintf (stdout, "\t\tAnd negative values replace old values.\n"); fprintf (stdout, "-D template\tPS->PDF conversion command line template [none]\n"); fprintf (stdout, "-E \t\tAlways try to embed fonts, regardless of licensing flags.\n"); - fprintf (stdout, "-I number\tImage cache life in hours [48]\n"); + fprintf (stdout, "-I number\tImage cache life in hours [-1]\n"); fprintf (stdout, " \t 0: erase all old images and leave new images\n"); fprintf (stdout, " \t-1: erase all old images and also erase new images\n"); fprintf (stdout, "-K number\tEncryption key length [40]\n"); @@ -534,7 +533,7 @@ do_args (int argc, char *argv[]) break; case 'I': CHECK_ARG(1, "image cache life in hours"); - image_cache_life = (unsigned) atoi(argv[1]); + image_cache_life = atoi(argv[1]); POP_ARG(); break; case 'S': @@ -599,7 +598,7 @@ do_args (int argc, char *argv[]) } else if (argc > 0) { /* * The only legitimate way to have argc == 0 here is - * is do_args was called from config file. In that case, there is + * do_args was called from config file. In that case, there is * no dvi file name. Check for that case . */ dvi_filename = NEW(strlen(argv[0]) + 5, char); /* space to append .dvi */ |