* dvipdfmx.cfg (D): use -dEPSCrop instead of -dPAPERSIZE=a0.

* xetex.def,
* dvipdfmx.def (\Ginclude@eps): include hoffset= and voffset= parameters
in the \special{PSfile=..., so that eps files that are not zero-origin
(e.g., from Asymptote) are handled properly.
From Bruno Voisin <bvoisin@me.com>, mactex mail 4 Mar 2013 12:34:50
(and related).


git-svn-id: svn://tug.org/texlive/trunk@30175 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 27 insertions, 15 deletions

diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 0c973b6f9b5..a82eceafcb2 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-30  Karl Berry  <karl@tug.org>
+
+	* data/dvipdfmx.cfg (D): back to using -dEPSCrop instead of
+	-sPAPERSIZE=a0, in conjunction with changes to dvipdfmx.def
+	and xetex.def.
+	(I): set to -1 for the safest default.
+
 2013-04-05  Karl Berry  <karl@tug.org>
 
 	* configure.ac: version 20130405 for TL'13.
diff --git a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
index afa3b843e16..d0c021bc84c 100644
--- a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
+++ b/Build/source/texk/dvipdfmx/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
 %%
@@ -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