xetex-def (2may14)

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

1 files changed, 60 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
index 545c509c152..cf7ffc656e1 100644
--- a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
+++ b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
@@ -20,9 +20,17 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Version History
 %%
-%%  2013/03/24  [AK] [v0.98] non-origin viewport, avoid double bp conversion.
+%%  2014/04/28  [HO] [v4.01] .CAPS extensions.
+%%              [KB]  ordering: find .jpeg just after .jpg,
+%%                      more like dvipdfmx.def.  Also remove .sga/.sgi,
+%%                      which were mismatched and never noticed.
+%%                      Change version number to match dvipdfmx.def.
 %%
-%%  2013/03/21  [KB] doc tweaks for project home at puszcza.gnu.org.ua.
+%%  2014/04/07  [AK] [v0.99] remove spurious spaces.
+%%
+%%  2014/03/24  [AK] [v0.98] non-origin viewport, avoid double bp conversion.
+%%
+%%  2014/03/21  [KB] doc tweaks for project home at puszcza.gnu.org.ua.
 %%  
 %%  2013/05/27  [KB] Version v0.97  non-commutative operations.
 %%              (code provided by Bruno Voisin)
@@ -82,8 +90,9 @@
 %%  2004/04/22  Version v0.4 designed to work with XeTeX v0.4
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% emacs-page
 \ProvidesFile{xetex.def}
-        [2014/04/07 v0.99 LaTeX color/graphics driver for XeTeX (RRM/JK)]
+  [2014/04/28 v4.01 LaTeX color/graphics driver for XeTeX (RRM/JK)]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % make sure we can use " with correct catcode
@@ -290,7 +299,11 @@
 %
 \def\XeTeX@include@QTm#1{%
   \def\picpage{}%
-  \lowercase{\edef\type@ext{\Gin@ext}}%
+  \edef\type@ext{%
+    \noexpand\lowercase{%
+      \noexpand\def\noexpand\type@ext{\Gin@ext}%
+    }%
+  }\type@ext
   \ifx\type@ext\G@pdf@ext
    \ifx\Gin@XeTeX@page\@empty\else
      \edef\picpage{ page\Gin@XeTeX@page}\fi
@@ -411,7 +424,11 @@
 \def\G@measure@QTm#1#2{%
  % \@warning{measuring size of QuickTime graphic #1#2}%
   \bgroup
-   \lowercase{\edef\type@ext{#2}}%
+   \edef\type@ext{%
+     \noexpand\lowercase{%
+       \noexpand\def\noexpand\type@ext{#2}%
+     }%
+   }\type@ext
    \ifx\type@ext\G@pdf@ext
     \ifx\Gin@XeTeX@page\@empty \def\picpage{}%
     \else \edef\picpage{ page\Gin@XeTeX@page}\fi
@@ -450,16 +467,43 @@
 
 % For a new graphics type, you can include a line here ...
 \@namedef{Gin@rule@.pdf}#1{{QTm}{QTm}{#1}}
-\@namedef{Gin@rule@.gif}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.PDF}#1{{QTm}{QTm}{#1}}
+%
+\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin@rule@.EPS}#1{{eps}{.EPS}{#1}}
+%
+\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
+\@namedef{Gin@rule@.PS}#1{{eps}{.PS}{#1}}
+%
+\@namedef{Gin@rule@.png}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.PNG}#1{{QTm}{QTm}{#1}}
+%
 \@namedef{Gin@rule@.jpg}#1{{QTm}{QTm}{#1}}
-\@namedef{Gin@rule@.mac}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.JPG}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.jpeg}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.JPEG}#1{{QTm}{QTm}{#1}}
+%
+\@namedef{Gin@rule@.bmp}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.BMP}#1{{QTm}{QTm}{#1}}
+%
 \@namedef{Gin@rule@.pict}#1{{QTm}{QTm}{#1}}
-\@namedef{Gin@rule@.png}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.PICT}#1{{QTm}{QTm}{#1}}
+%
 \@namedef{Gin@rule@.psd}#1{{QTm}{QTm}{#1}}
-\@namedef{Gin@rule@.sgi}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.PSD}#1{{QTm}{QTm}{#1}}
+%
+\@namedef{Gin@rule@.mac}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.MAC}#1{{QTm}{QTm}{#1}}
 \@namedef{Gin@rule@.tga}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.TGA}#1{{QTm}{QTm}{#1}}
+%
+\@namedef{Gin@rule@.gif}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.GIF}#1{{QTm}{QTm}{#1}}
+%
 \@namedef{Gin@rule@.tif}#1{{QTm}{QTm}{#1}}
-\@namedef{Gin@rule@.bmp}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.TIF}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.tiff}#1{{QTm}{QTm}{#1}}
+\@namedef{Gin@rule@.TIFF}#1{{QTm}{QTm}{#1}}
 
 % movies not supported yet:
 %\@namedef{Gin@rule@.qt}#1{{QTm}{QTm}{#1}}
@@ -472,8 +516,12 @@
 \@namedef{Gin@rule@*}#1{{QTm}{QTm}{#1}}
 
 % ... and add its extension here
-\def\Gin@extensions{.pdf,.eps,.ps,%
-                    .png,.jpg,.bmp,.pict,.tif,.psd,.mac,.sga,.tga,.gif}
+\def\Gin@extensions{% order here is like dvipdfmx.def, except for PS
+  .pdf,.PDF,.eps,.EPS,.ps,.PS,%
+  .png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.bmp,.BMP,%
+  .pict,.PICT,.psd,.PSD,.mac,.MAC,.TGA,.tga,%
+  .gif,.GIF,.tif,.TIF,.tiff,.TIFF,%
+}
 
 % xdvipdfmx is now the default driver, and can support EPS images,
 % so we borrow code for this from dvipdfmx.def (and add the extensions above)
@@ -511,8 +559,6 @@
       \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi
       \ifGin@clip clip\fi}%
   \egroup}
-\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
-\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
 
 %
 % Rotation & Scaling