quote %o and %i, heiko 8 Oct 2010 14:34:29

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

3 files changed, 42 insertions, 54 deletions

diff --git a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
index e1754ca8afd..4c2dad26ea9 100644
--- a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
+++ b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
@@ -1,3 +1,5 @@
+%% dvipdfmx.cfg for dvipdfmx.  (Public domain.)
+%%
 %% PDF Version Setting
 %%
 %% PDF (minor) version stamp to use in output file.
@@ -134,14 +136,11 @@ P  0x003C
 %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of
 %% "-sPAPERSIZE=a0"
 %%
-D  "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode %i %o"
+D  "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode '%i' '%o'"
 
 %% Frank Siegert's PStill:
 %D  "/usr/local/bin/pstill -c -o %o %i"
 
-%% Adobe Acrobat Distiller:
-%D  "/usr/local/bin/distill -quiet -pairs %i %o"
-
 %% Batik + Fop (SVG-to-PDF):
 %% If you want both PS and SVG, you need to write a script or program
 %% that selectively invokes converters.
@@ -174,13 +173,13 @@ D  "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -
 
 %% Font Map Files
 %%
-%% teTeX 2.x and TeXLive using updmap (pdfTeX format)
+%% teTeX 2.x and TeX Live using updmap (pdfTeX format)
 f  pdftex.map
 
-%% teTeX 2.x and TeXLive using updmap (DVIPDFM format)
+%% teTeX 2.x and TeX Live using updmap (DVIPDFM format)
 %f dvipdfm.map
 
-%% teTeX 2.x and TeXLive using updmap (DVIPS format)
+%% teTeX 2.x and TeX Live using updmap (DVIPS format)
 %% MiKTeX 2.2 and 2.3
 %f psfonts.map
 
diff --git a/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg b/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
index 64e09f37980..b3a22620fba 100644
--- a/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
+++ b/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
@@ -1,9 +1,4 @@
-%%
-%% ** PLEASE CHECK FILE ACCESS PERMISSION OF THIS FILE **
-%%
-%% With 'D' option dvipdfmx may invoke shell command via system()
-%% function call.
-%%
+%% dvipdfmx.cfg for xdvipdfmx (xetex).  (Public domain.)
 %%
 %% PDF Version Setting
 %%
@@ -16,7 +11,6 @@
 
 V  4
 
-%%
 %% Dvipdfmx Compatibility Flags
 %%
 %%   0x0002  Use semi-transparent filling for tpic shading command,
@@ -29,7 +23,6 @@ V  4
 %C  0x0000
 
 
-%%
 %% PDF Document Settings
 %%
 %% Papersize Option:
@@ -38,7 +31,6 @@ V  4
 %%
 %% papersize-spec is 'paper-format' or length-pair, e.g., 'a4', 'letter',
 %% '20cm,30cm'. Recognized unit is 'cm', 'mm', 'bp', 'pt', 'in'.
-%% 
 
 p  a4
 
@@ -50,7 +42,9 @@ p  a4
 %% TeX macro packages set the annotation bounding box equal to the TeX box
 %% that encloses the material. That's not always what you want.
 %% Annotations created by pdf:bannot/pdf:eannot is also affected.
-%%
+
+g  1
+
 %% Bookmark Open Level:
 %%
 %%   O integer
@@ -59,11 +53,8 @@ p  a4
 %% of that item (from root node) is less than or equal to the integer
 %% specified with this option.
 
-g  1
 O  0
 
-
-%%
 %% PDF Security (Encryption) Setting
 %%
 %% Those options won't take effects unless you use flag 'S'.
@@ -103,10 +94,11 @@ K  40
 
 P  0x003C
 
-
-%%
 %% Image Handler
 %%
+%% With 'D' option dvipdfmx may invoke shell command via system()
+%% function call.
+%%
 %% Command-line template for a-to-b conversion:
 %%
 %% Supported target format ('b') is currently PDF.
@@ -120,32 +112,32 @@ P  0x003C
 %%       "foo.eps".
 %%   %%  Replaced with single '%'.
 
-%% *Examples* for GhostScript (PS-to-PDF)
+%% Ghostscript (PS-to-PDF)
+%%
+%% ps2pdf is a front-end to gs. For a complete list of options, see
+%% http://ghostscript.com/doc/current/Ps2pdf.htm#Options
 %%
-%% The following example decode all DCT (i.e., JPEG) encoded images
-%% and then recompress images with Flate (zlib, same as PNG) encode
-%% filter. If you are using recent version of gs, then please remove
-%% -dAutoFilterXXXImages and -dXXXImageFilter. 
-%% /FlateEncode is introduced to avoid quality loss of "EPS JPEG"
-%% images.
+%% By default, gs encodes all images contained in a PS file using
+%% the lossy DCT (i.e., JPEG) filter. This often leads to inferior
+%% result (see the discussion at http://electron.mit.edu/~gsteele/pdf/).
+%% The "-dAutoFilterXXXImages" and "-dXXXImageFilter" options used
+%% below force all images to be encoded with the lossless Flate (zlib,
+%% same as PNG) filter. Note that if the PS file already contains DCT
+%% 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 convert PS
+%% 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)
+%% 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"
 %%
-%% GhostScript (Unix/Linux):
-%D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
-
-%% GhostScript (Win32):
-%D  "gswin32c -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
 
 %% Frank Siegert's PStill:
 %D  "/usr/local/bin/pstill -c -o %o %i"
 
-%% Adobe Acrobat Distiller:
-%D  "/usr/local/bin/distill -quiet -pairs %i %o"
-
 %% Batik + Fop (SVG-to-PDF):
 %% If you want both PS and SVG, you need to write a script or program
 %% that selectively invokes converters.
@@ -163,6 +155,7 @@ P  0x003C
 %% Other Options
 %%
 %% DPI for PK font creation
+
 %r  600
 
 %% Set number of fractional digit kept for various numbers in PDF page
@@ -172,22 +165,21 @@ P  0x003C
 %% for old Acrobat due to implementation limit of Acrobat.
 %% Length 0.01 in unscaled coordinate system amount to width of 1 pixel
 %% in 7200ppi display. 
+
 %d  5
 
-%%
 %% Font Map Files
 %%
-%% Lookup order is different than dvipdfm, see 'C' option above.
-%%
-%% teTeX 2.x using updmap
+%% teTeX 2.x and TeX Live using updmap (pdfTeX format)
+%f  pdftex.map
 
-f  dvipdfm.map
+%% teTeX 2.x and TeX Live using updmap (DVIPDFM format)
+f dvipdfm.map
 
+%% teTeX 2.x and TeX Live using updmap (DVIPS format)
 %% MiKTeX 2.2 and 2.3
-
 %f psfonts.map
 
-
 %% Put additonal fontmap files here
 f  cid-x.map
 
diff --git a/Master/texmf/dvipdfmx/dvipdfmx.cfg b/Master/texmf/dvipdfmx/dvipdfmx.cfg
index 9667743ea65..2a4c2cdab3b 100644
--- a/Master/texmf/dvipdfmx/dvipdfmx.cfg
+++ b/Master/texmf/dvipdfmx/dvipdfmx.cfg
@@ -1,4 +1,4 @@
-%% dvipdfmx configuration file.  (Public domain.)
+%% dvipdfmx.cfg for dvipdfmx.  (Public domain.)
 %%
 %% PDF Version Setting
 %%
@@ -142,14 +142,11 @@ P  0x003C
 %% /usr/local/texlive/2009/texmf-dist/dvips/pstricks/pstricks.pro (for
 %% example) needs to be accessed.
 %%
-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 -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
 
 %% Frank Siegert's PStill:
 %D  "/usr/local/bin/pstill -c -o %o %i"
 
-%% Adobe Acrobat Distiller:
-%D  "/usr/local/bin/distill -quiet -pairs %i %o"
-
 %% Batik + Fop (SVG-to-PDF):
 %% If you want both PS and SVG, you need to write a script or program
 %% that selectively invokes converters.
@@ -182,13 +179,13 @@ D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityL
 
 %% Font Map Files
 %%
-%% teTeX 2.x and TeXLive using updmap (pdfTeX format)
+%% teTeX 2.x and TeX Live using updmap (pdfTeX format)
 f  pdftex.map
 
-%% teTeX 2.x and TeXLive using updmap (DVIPDFM format)
+%% teTeX 2.x and TeX Live using updmap (DVIPDFM format)
 %f dvipdfm.map
 
-%% teTeX 2.x and TeXLive using updmap (DVIPS format)
+%% teTeX 2.x and TeX Live using updmap (DVIPS format)
 %% MiKTeX 2.2 and 2.3
 %f psfonts.map