diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/dvipdfmx/dvipdfmx.cfg | 35 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/xelatex/xetex-def/xetex.def | 9 |
3 files changed, 34 insertions, 21 deletions
diff --git a/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg b/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg index afa3b843e16..d0c021bc84c 100644 --- a/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg +++ b/Master/texmf-dist/dvipdfmx/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 %% @@ -201,13 +207,12 @@ f pdftex.map %% MiKTeX 2.2 and 2.3 %f psfonts.map -%% Put additional fontmap files here (usually for Type0 fonts) +%% Put additonal fontmap files here (usually for Type0 fonts) %f cid-x.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/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def index 742f83042ba..dc7955d0d8c 100644 --- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def @@ -1,7 +1,7 @@ %% This is file `dvipdfmx.def' for DVIPDFMx by J.-H. Cho and S. Hirata %% which is written based on `dvipdf.def' in the LaTeX `Graphics Bundle'. %% -%% This is file `dvipdf.def', +%% This was file `dvipdf.def', %% generated with the docstrip utility. %% %% The original source files were: @@ -10,14 +10,15 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle +%% Copyright (C) 2005-2013 Jin-Hwan Cho, Shunsaku Hirata %% -%% This file is part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public +%% This file is not part of the Standard LaTeX `Graphics Bundle' but still +%% may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% \ProvidesFile{dvipdfmx.def} - [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] + [2013/04/29 v3.1 LaTeX graphics driver for dvipdfmx (TeX Live/ChoF)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -196,6 +197,8 @@ lly=\Gin@lly\space urx=\Gin@urx\space ury=\Gin@ury\space + hoffset=\Gin@llx\space + voffset=\Gin@lly\space \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi \ifGin@clip clip\fi}% diff --git a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def index b8edaefbc95..4d219f02f03 100644 --- a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def +++ b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def @@ -3,7 +3,7 @@ %% based upon other drivers for LaTeX color and graphics support. %% %% Copyright 2004-2007, 2009, 2013 Ross Moore <ross@maths.mq.edu.au> -%% modified by Jonathan Kew <jonathan_kew@sil.org> +%% modified by Jonathan Kew et al. %% %% This file is *not yet* part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -13,6 +13,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Version History %% +%% 2013/04/29 [KB] Version v0.96 handle non-origin ll corner. +%% (code provided by Bruno Voisin) +%% %% 2013/02/04 [RRM] Version v0.95 added clipping support. %% (code provided by Joseph Wright and Martin Scharrer) %% @@ -66,7 +69,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{xetex.def} - [2013/02/04 v0.95 LaTeX color/graphics driver for XeTeX (RRM/JK)] + [2013/04/29 v0.96 LaTeX color/graphics driver for XeTeX (RRM/JK)] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % make sure we can use " with correct catcode @@ -474,6 +477,8 @@ lly=\Gin@lly\space urx=\Gin@urx\space ury=\Gin@ury\space + hoffset=\Gin@llx\space + voffset=\Gin@lly\space \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi \ifGin@clip clip\fi}% |