texlive[41687] Master/texmf-dist: graphics-def (13jul16)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 14 00:32:59 CEST 2016
Revision: 41687
http://tug.org/svn/texlive?view=revision&revision=41687
Author: karl
Date: 2016-07-14 00:32:59 +0200 (Thu, 14 Jul 2016)
Log Message:
-----------
graphics-def (13jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def
trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def
Modified: trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics-def/README.md 2016-07-13 22:32:41 UTC (rev 41686)
+++ trunk/Master/texmf-dist/doc/latex/graphics-def/README.md 2016-07-13 22:32:59 UTC (rev 41687)
@@ -1,12 +1,12 @@
# graphics-def
-## 2016/07/02 release
+## 2016/07/11 release
`.def` files for latex color and graphics packages,
contributed by multiple authors, extending the collection
available in latex/required/graphics.
-
+* dvips.def (from latex/required/graphics)
* luatex.def (for luatex > 0.87)
* pdftex.def from https://github.com/ho-tex/pdftex-def
* xetex.def from https://puszcza.gnu.org.ua/projects/latexfmxdef
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def 2016-07-13 22:32:41 UTC (rev 41686)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def 2016-07-13 22:32:59 UTC (rev 41687)
@@ -16,13 +16,30 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvipdfmx.def}
- [2016/07/02 v4.10 LaTeX color/graphics driver for dvipdfmx (L3/ChoF)]
+ [2016/07/11 v4.12 LaTeX color/graphics driver for dvipdfmx (L3/ChoF)]
%
+% miniltx.tex does not define \PackageWarning
+\@ifundefined{PackageWarning}{%
+ \def\PackageWarning#1#2{%
+ \begingroup
+ \def\@spaces{\space\space\space\space}%
+ \ifx\on at line\@undefined\def\on at line{}\fi
+ \newlinechar=10 %
+ \def\MessageBreak{%
+ ^^J(#1)\@spaces\@spaces\@spaces\@spaces
+ }%
+ \immediate\write16{^^JPackage #1 Warning: #2\on at line.^^J}%
+ \endgroup
+ }%
+}{}
+
+\def\GPT at warn{\PackageWarning{dvipdfmx.def}}%
+
\def\c at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
\ifdim\dimen@>\p@
- \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
+ \PackageError{color}{Argument `#1' not in range [0,1]}{}%
\fi}
\def\color at gray#1#2{%
\c at lor@arg{#2}%
@@ -66,7 +83,7 @@
\def\color at named#1#2{\c at lor@@named#2,,\@@#1}
\def\c at lor@@named#1,#2,#3\@@#4{%
\@ifundefined{col@#1}%
- {\PackageError{color}{Undefined color `#1'}\@ehd}%
+ {\PackageError{color}{Undefined color `#1'}{}}%
{\edef#4{ #1}}%
}
\def\c at lor@to at ps#1 #2\@@{\csname c at lor@ps@#1\endcsname#2 \@@}
@@ -95,18 +112,7 @@
%
% import from pdftex.def
%
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input infwarerr.sty\relax
- \input ltxcmds.sty\relax
-\else
- \RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{ltxcmds}[2010/12/07]%
-\fi
-
-\def\GPT at error{\@PackageError{dvipdfmx.def}}%
-\def\GPT at warn{\@PackageWarning{dvipdfmx.def}}%
-\let\GPT at pagebox@option\ltx at empty
+\let\GPT at pagebox@option\@empty
\begingroup
\toks@{%
\define at key{Gin}{page}{\def\Gin at page{#1}}
@@ -117,7 +123,7 @@
\expandafter\let\expandafter\GPT at pagebox%
\csname GPT at pagebox@#1\endcsname
\ifx\GPT at pagebox\relax
- \let\GPT at pagebox\ltx at empty
+ \let\GPT at pagebox\@empty
\GPT at warn{%
Unknown value `#1' for `pagebox'.\MessageBreak
Supported values:\MessageBreak
@@ -128,10 +134,10 @@
\fi%
}%
}
-\ltx at IfUndefined{define at key}{
+\@ifundefined{define at key}{
\edef\x{\endgroup
\noexpand\AtBeginDocument{%
- \noexpand\ltx at IfUndefined{define at key}{}{\the\toks@}%
+ \noexpand\@ifundefined{define at key}{}{\the\toks@}%
}%
}\x
}{%
@@ -184,7 +190,7 @@
\@latex at error
{Cannot run pipe command. Try --shell-escape^^J%
(--enable-pipes in MikTeX) option}%
- \@ehc
+ {}%
\else
\loop
\read\@inputcheck to\@tempa
@@ -211,7 +217,7 @@
\@latex at error
{Cannot run pipe command. Try --shell-escape^^J%
(--enable-pipes in MikTeX) option}%
- \@ehc
+ {}%
\else
\loop
\read\@inputcheck to\@tempa
@@ -235,7 +241,7 @@
\else
\@latex at error
{Cannot determine size of image (no BoundingBox)}%
- \@ehc
+ {}%
\gdef\@gtempa{0 0 72 72 }%
\fi
\endgroup
@@ -246,7 +252,7 @@
\def\Gin at page{!}
\def\Gin at mask{!}
\newif\ifGin at interpolate\Gin at interpolatefalse
-\let\GPT at pagebox\ltx at empty
+\let\GPT at pagebox\@empty
\def\Ginclude at pdf#1{%
\message{<#1>}%
\bgroup
@@ -253,7 +259,7 @@
\def\@tempa{!}%
\special{pdf:epdf\space
\ifx\Gin at page\@tempa\else page\space\Gin at page\space\fi
- \ifx\GPT at pagebox\ltx at empty\else pagebox\space\GPT at pagebox\space\fi
+ \ifx\GPT at pagebox\@empty\else pagebox\space\GPT at pagebox\space\fi
bbox\space\Gin at llx\space\Gin at lly\space\Gin at urx\space\Gin at ury\space
clip\space\ifGin at clip 1\else 0\fi\space
\ifx\Gin at scalex\@tempa\else width\space\the\Gin at req@width\space\fi
@@ -423,6 +429,9 @@
% v4.10
% Support new (no)setpagesize option of graphics and color.
+% v4.11
+% Use \special{pdf:pagesize ...} instead of \special{papersize=...}
+% to support \mag (dvipdfmx only)
\@ifundefined{ifGin at setpagesize}
{\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
\csname iftrue\endcsname}
@@ -429,7 +438,11 @@
{}
\ifGin at setpagesize
\ifx\paperwidth\@undefined\else
-\AtBeginDocument{\AtBeginDvi{%
+\AtBeginDocument{%
+% If a package has changed \mag, assume it knows what it is doing
+% and leave page size alone
+\ifnum\mag=\@m
+\AtBeginDvi{%
\begingroup
\ifx\stockwidth\@undefined\else
\paperwidth\stockwidth
@@ -437,11 +450,13 @@
\fi
\ifdim\paperwidth>\z@
\ifdim\paperheight>\z@
-\special{papersize=\the\paperwidth,\the\paperheight}%
+\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}%
\fi
\fi
-\endgroup}}
+\endgroup}%
\fi
+}
+\fi
\fi
\endinput
Added: trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def 2016-07-13 22:32:59 UTC (rev 41687)
@@ -0,0 +1,195 @@
+%%
+%% This is file `dvips.def',
+%% original generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% drivers.dtx (with options: `dvips,color1,psrulesZ,dosrules,macrules')
+%%
+%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
+%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
+%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is the LaTeX3 Project.
+%%
+%% https://github.com/latex3/graphics-def/issues
+%%
+\ProvidesFile{dvips.def}
+ [2016/07/10 v3.1a Driver-dependent file (DPC,SPQR)]
+\def\c at lor@arg#1{%
+ \dimen@#1\p@
+ \ifdim\dimen@<\z@\dimen@\maxdimen\fi
+ \ifdim\dimen@>\p@
+ \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
+ \fi}
+\def\color at gray#1#2{%
+ \c at lor@arg{#2}%
+ \edef#1{gray #2}%
+ }
+\def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
+\def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
+ \c at lor@arg{#4}%
+ \c at lor@arg{#1}%
+ \c at lor@arg{#2}%
+ \c at lor@arg{#3}%
+ \edef#5{cmyk #1 #2 #3 #4}%
+ }
+\def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
+\def\c at lor@@rgb#1,#2,#3\@@#4{%
+ \c at lor@arg{#1}%
+ \c at lor@arg{#2}%
+ \c at lor@arg{#3}%
+ \edef#4{rgb #1 #2 #3}%
+ }
+\def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
+\def\c at lor@@RGB#1,#2,#3\@@#4{%
+ \c at lor@RGB at rgb{#1}\@tempa
+ \c at lor@RGB at rgb{#2}\@tempb
+ \c at lor@RGB at rgb{#3}\@tempc
+ \c at lor@@rgb\@tempa,\@tempb,\@tempc\@@#4%
+ }
+\def\c at lor@RGB at rgb#1#2{%
+ \dimen@#1\p@
+ \divide\dimen@\@cclv
+ \edef#2{\strip at pt\dimen@}}
+\def\color at hsb#1#2{\c at lor@@hsb#2\@@#1}
+\def\c at lor@@hsb#1,#2,#3\@@#4{%
+ \c at lor@arg{#1}%
+ \c at lor@arg{#2}%
+ \c at lor@arg{#3}%
+ \edef#4{hsb #1 #2 #3}%
+ }
+\def\color at named#1#2{\c at lor@@named#2,,\@@#1}
+\def\c at lor@@named#1,#2,#3\@@#4{%
+ \@ifundefined{col@#1}%
+ {\PackageError{color}{Undefined color `#1'}\@ehd}%
+ {\edef#4{ #1}}%
+ }
+\def\c at lor@to at ps#1 #2\@@{\csname c at lor@ps@#1\endcsname#2 \@@}
+\def\c at lor@ps@#1 #2\@@{TeXDict begin #1 end}
+\def\c at lor@ps at rgb#1\@@{#1 setrgbcolor}
+\def\c at lor@ps at hsb#1\@@{#1 sethsbcolor}
+\def\c at lor@ps at cmyk#1\@@{#1 setcmykcolor}
+\def\c at lor@ps at gray#1\@@{#1 setgray}
+\def\current at color{ Black}
+\def\set at color{%
+ \special{color push \current at color
+ }\aftergroup\reset at color}
+\def\reset at color{\special{%
+ color pop}}
+\def\set at page@color{\special{%
+ background \current at color}}
+\def\define at color@named#1#2{%
+ \expandafter\let\csname col@#1\endcsname\@nnil}
+ \def\no at page@color{\special{background \string"newpath clip}}
+\def\Ginclude at eps#1{%
+ \message{<#1>}%
+ \bgroup
+ \def\@tempa{!}%
+ \dimen@\Gin at req@width
+ \dimen at ii.1bp%
+ \divide\dimen@\dimen at ii
+ \@tempdima\Gin at req@height
+ \divide\@tempdima\dimen at ii
+ \special{PSfile="#1"\space
+ llx=\Gin at llx\space
+ lly=\Gin at lly\space
+ urx=\Gin at urx\space
+ ury=\Gin at ury\space
+ \ifx\Gin at scalex\@tempa\else rwi=\number\dimen@\space\fi
+ \ifx\Gin at scaley\@tempa\else rhi=\number\@tempdima\space\fi
+ \ifGin at clip clip\fi}%
+ \egroup}
+\def\Ginclude at bmp#1{%
+ \message{<#1>}%
+ \dimen@\Gin at req@height
+ \advance\dimen@ by-\Gin at lly bp
+ \kern-\Gin at llx bp\raise\Gin at req@height\hbox{%
+ \ifdim\Gin at urx bp=\z@
+ \ifdim\Gin at ury bp=\z@
+ \special{em: graph #1}%
+ \else
+ \special{em: graph #1,\Gin at urx bp}%
+ \fi
+ \else
+ \special{em: graph #1,\Gin at urx bp,\Gin at ury bp}%
+ \fi
+ }%
+}
+\def\oztex at include#1#2{%
+ \dimen at 1bp%
+ \divide\Gin at req@width\dimen@
+ \divide\Gin at req@height\dimen@
+ \special{#1=#2\space
+ \@width=\number\Gin at req@width \space
+ \@height=\number\Gin at req@height}}
+\def\Ginclude at pntg{\oztex at include{pntg}}
+\def\Ginclude at pict{\oztex at include{pict}}
+\def\Grot at start{%
+ \special{ps: gsave currentpoint
+ currentpoint translate \Grot at angle\space neg
+ rotate neg exch neg exch translate}}
+\def\Grot at end{\special{ps: currentpoint grestore moveto}}
+\def\Gscale at start{\special{ps: currentpoint currentpoint translate
+ \Gscale at x\space \Gscale at y\space scale neg exch neg exch translate}}
+\def\Gscale at end{\special{ps: currentpoint currentpoint translate
+ 1 \Gscale at x\space div 1 \Gscale at y\space div scale
+ neg exch neg exch translate}}
+\def\Gin at PS@raw#1{\special{ps: #1}}
+\def\Gin at PS@restored#1{\special{" #1}}
+\def\Gin at PS@literal at header#1{\AtBeginDvi{\special{! #1}}}
+\def\Gin at PS@file at header#1{\AtBeginDvi{\special{header=#1}}}
+\@ifundefined{ifGin at setpagesize}
+ {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
+ \csname iftrue\endcsname}
+ {}
+\ifGin at setpagesize
+\ifx\paperwidth\@undefined\else
+ \AtBeginDocument{%
+% If a package has changed \mag, assume it knows what it is doing
+% and leave page size alone
+\ifnum\mag=\@m
+ \AtBeginDvi{%
+ \begingroup
+ \ifx\stockwidth\@undefined\else
+ \paperwidth\stockwidth
+ \paperheight\stockheight
+ \fi
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \fi
+ \fi
+ \endgroup}%
+ \fi
+ }
+\fi
+\fi
+\def\Gin at extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}
+\@namedef{Gin at rule@.ps}#1{{eps}{.ps}{#1}}
+\@namedef{Gin at rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin at rule@.mps}#1{{eps}{.mps}{#1}}
+\@namedef{Gin at rule@.pz}#1{{eps}{.bb}{#1}}
+\@namedef{Gin at rule@.eps.Z}#1{{eps}{.eps.bb}{#1}}
+\@namedef{Gin at rule@.ps.Z}#1{{eps}{.ps.bb}{#1}}
+\@namedef{Gin at rule@.ps.gz}#1{{eps}{.ps.bb}{#1}}
+\@namedef{Gin at rule@.eps.gz}#1{{eps}{.eps.bb}{#1}}
+\@namedef{Gin at rule@*}#1{{eps}{\Gin at ext}{#1}}
+\@namedef{Gin at rule@.pcx}#1{{bmp}{}{#1}}
+\@namedef{Gin at rule@.bmp}#1{{bmp}{}{#1}}
+\@namedef{Gin at rule@.msp}#1{{bmp}{}{#1}}
+\@namedef{Gin at rule@.pict}#1{{pict}{}{#1}}
+\@namedef{Gin at rule@.pntg}#1{{pntg}{}{#1}}
+\endinput
+%%
+%% End of file `dvips.def'.
Property changes on: trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def 2016-07-13 22:32:41 UTC (rev 41686)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def 2016-07-13 22:32:59 UTC (rev 41687)
@@ -1,4 +1,4 @@
-\ProvidesFile{luatex.def}[2016/07/01 v0.01f Graphics/Color for luaTeX]
+\ProvidesFile{luatex.def}[2016/07/11 v0.01f Graphics/Color for luaTeX]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% LaTeX Colour and Graphics support for luatex
@@ -61,8 +61,9 @@
% 2016/05/21 Version 0.01c fix for graphics/4472
% 2016/06/24 Version 0.01d support the (no)setpagesize option.
% 2016/06/17 Version 0.01e guards for contributed packages and plain TeX
+% 2016/07/11 Version 0.01f test for \mag added to all drivers, missing \fi in pagebox
%
-% Prefix of internal commands for this file `pdftex.def':
+% Prefix of internal commands for this file `luatex.def':
% \GPT@ (Graphics bundle PdfTex driver, even though this is for luatex)
@@ -115,6 +116,9 @@
\ifGin at setpagesize
\ifx\paperwidth\@undefined\else
\AtBeginDocument{%
+% If a package has changed \mag, assume it knows what it is doing
+% and leave page size alone
+\ifnum\mag=\@m
\ltx at IfUndefined{stockwidth}{%
\ltx at IfUndefined{paperwidth}{%
}{%
@@ -133,6 +137,7 @@
\fi
\fi
}%
+\fi
}
\fi
\fi
@@ -356,6 +361,7 @@
Supported values:\MessageBreak
mediabox, cropbox, bleedbox, trimbox, artbox%
}%
+ \fi
}%
\def\GPT at pagebox@mediabox{mediabox}%
\let\GPT at pagebox@cropbox\ltx at empty
@@ -997,16 +1003,9 @@
\@namedef{Gin at rule@.jpeg}#1{{jpg}{.jpeg}{#1}}%
\@namedef{Gin at rule@.JPG}#1{{jpg}{.JPG}{#1}}%
\@namedef{Gin at rule@.JPEG}#1{{jpg}{.JPEG}{#1}}%
- \@ifpackageloaded{pst-pdf}% hv 20160630
- {\def\Gin at extensions{%
+ \def\Gin at extensions{%
.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}%
- }%
- {\def\Gin at extensions{%
- .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
- .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,%
- .eps}%
- }%
\@namedef{Gin at rule@.jb2}#1{{jbig2}{.jb2}{#1}}%
\@namedef{Gin at rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}%
@@ -1263,6 +1262,8 @@
\ifx\includegraphics\@undefined\else
\@ifpackageloaded{pst-pdf}{}{%
\@ifpackageloaded{pdftricks}{}{%
+ % only add .eps to file extension list if epstopdf is loaded
+ \edef\Gin at extensions{\Gin at extensions,.eps}%
\RequirePackage{epstopdf-base}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def 2016-07-13 22:32:41 UTC (rev 41686)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def 2016-07-13 22:32:59 UTC (rev 41687)
@@ -1,4 +1,4 @@
-\ProvidesFile{pdftex.def}[2016/07/01 v0.06i Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2016/07/10 v0.06j Graphics/color for pdfTeX]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% LaTeX Colour and Graphics support for PDFTeX
@@ -268,7 +268,11 @@
% * typo
% 2016/06/17 v0.6h (DPC)
% * guards for contributed packages and plain TeX
+% 2016/07/1o v0.6j (DPC)
+% * don't set page size for non standard \mag
%
+
+
% Prefix of internal commands for this file `pdftex.def':
% \GPT@ (Graphics bundle PdfTex driver)
@@ -452,6 +456,9 @@
\ifGin at setpagesize
\ifx\paperwidth\@undefined\else
\AtBeginDocument{%
+% If a package has changed \mag, assume it knows what it is doing
+% and leave page size alone
+\ifnum\mag=\@m
\ltx at IfUndefined{stockwidth}{%
\ltx at IfUndefined{paperwidth}{%
}{%
@@ -470,6 +477,7 @@
\fi
\fi
}%
+\fi
}
\fi
\fi
@@ -1566,16 +1574,9 @@
\else
\ifnum\driver at release>9 %
\ifnum\pdfminorversion>3 %
- \@ifpackageloaded{pst-pdf}% hv 20160630
- {\def\Gin at extensions{%
+ \def\Gin at extensions{%
.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}%
- }%
- {\def\Gin at extensions{%
- .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
- .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,%
- .eps}%
- }%
\fi
\@namedef{Gin at rule@.jb2}#1{{jbig2}{.jb2}{#1}}%
\@namedef{Gin at rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}%
@@ -1946,6 +1947,8 @@
\else
\@ifpackageloaded{graphics}{
\ifnum\pdf at shellescape>0 %
+ % only add .eps to file extension list if epstopdf is loaded
+ \edef\Gin at extensions{\Gin at extensions,.eps}%
\RequirePackage{epstopdf-base}[2009/07/12]%
\fi}{}
\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def 2016-07-13 22:32:41 UTC (rev 41686)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def 2016-07-13 22:32:59 UTC (rev 41687)
@@ -22,6 +22,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Version History
%%
+%% 2016/07/11 [DPC] [v4.10] \mag test added to all the files
+%% Remove spurious dependency on external packages.
+%% Avoid \@ehd help text (not defined by miniltx)
+%%
%% 2016/07/02 [DPC] [v4.09] support new (no)setpagesize options of
%% color and graphics packages.
%% revert pagecolor code to match dvips
@@ -118,7 +122,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% emacs-page
\ProvidesFile{xetex.def}
- [2016/07/02 v4.09 LaTeX color/graphics driver for XeTeX (L3/RRM/JK)]
+ [2016/07/11 v4.10 LaTeX color/graphics driver for XeTeX (L3/RRM/JK)]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% make sure we can use " with correct catcode
@@ -127,10 +131,11 @@
}
% miniltx.tex does not define \PackageWarning
-% or \PackageWarningNoLine.
\@ifundefined{PackageWarning}{%
\def\PackageWarning#1#2{%
\begingroup
+ \def\@spaces{\space\space\space\space}%
+ \ifx\on at line\@undefined\def\on at line{}\fi
\newlinechar=10 %
\def\MessageBreak{%
^^J(#1)\@spaces\@spaces\@spaces\@spaces
@@ -139,11 +144,9 @@
\endgroup
}%
}{}
-\@ifundefined{PackageWarningNoLine}{%
- \def\PackageWarningNoLine#1#2{%
- \PackageWarning{#1}{#2\@gobble}%
- }%
-}{}
+
+\def\GPT at warn{\PackageWarning{xetex.def}}%
+
\@ifundefined{on at line}{%
\def\on at line{ on input line \the\inputlineno}%
}{}
@@ -167,7 +170,7 @@
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
\ifdim\dimen@>\p@
- \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
+ \PackageError{color}{Argument `#1' not in range [0,1]}{}%
\fi}
\def\color at gray#1#2{%
\c at lor@arg{#2}%
@@ -209,7 +212,7 @@
\def\color at named#1#2{\c at lor@@named#2,,\@@#1}
\def\c at lor@@named#1,#2,#3\@@#4{%
\@ifundefined{col@#1}%
- {\PackageError{color}{Undefined color `#1'}\@ehd}%
+ {\PackageError{color}{Undefined color `#1'}{}}%
{\edef#4{ #1}}%
}
@@ -304,22 +307,10 @@
%
% import from pdftex.def to support pagebox=artbox etc. in XeLaTeX
%
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input infwarerr.sty\relax
- \input ltxcmds.sty\relax
-\else
- \RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{ltxcmds}[2010/12/07]%
-\fi
-
-\def\GPT at error{\@PackageError{xetex.def}}%
-\def\GPT at warn{\@PackageWarning{xetex.def}}%
-%
% \Gin at XeTeX@page: page number of pdf image or \@empty otherwise.
% This code adapted from pdftex.def
\let\Gin at XeTeX@page\@empty
-\let\GPT at pagebox\ltx at empty
+\let\GPT at pagebox\@empty
\begingroup
\toks@{\define at key{Gin}{page}{\def\Gin at XeTeX@page{#1}}
\define at key{Gin}{pagebox}{%
@@ -326,7 +317,7 @@
\expandafter\let\expandafter\GPT at pagebox%
\csname GPT at pagebox@#1\endcsname
\ifx\GPT at pagebox\relax
- \let\GPT at pagebox\ltx at empty
+ \let\GPT at pagebox\@empty
\GPT at warn{%
Unknown value `#1' for `pagebox'.\MessageBreak
Supported values:\MessageBreak
@@ -373,7 +364,7 @@
}%
}\type at ext
\ifx\type at ext\G at pdf@ext
- \ifx\GPT at pagebox\ltx at empty\else
+ \ifx\GPT at pagebox\@empty\else
\edef\picpagebox{ \GPT at pagebox}\fi
\ifx\Gin at XeTeX@page\@empty\else
\edef\picpage{ page\Gin at XeTeX@page}\fi
@@ -502,7 +493,7 @@
\ifx\type at ext\G at pdf@ext
\ifx\Gin at XeTeX@page\@empty \def\picpage{}%
\else \edef\picpage{ page\Gin at XeTeX@page}\fi
- \ifx\GPT at pagebox\ltx at empty \def\picpagebox{}%
+ \ifx\GPT at pagebox\@empty \def\picpagebox{}%
\else \edef\picpagebox{ \GPT at pagebox}\fi
\fi
\setbox0=\hbox{%
@@ -696,8 +687,11 @@
\ifGin at setpagesize
\ifx\paperwidth\@undefined\else
\AtBeginDocument{%
-\ltx at IfUndefined{stockwidth}{%
-\ltx at IfUndefined{paperwidth}{%
+% If a package has changed \mag, assume it knows what it is doing
+% and leave page size alone
+\ifnum\mag=\@m
+\@ifundefined{stockwidth}{%
+\@ifundefined{paperwidth}{%
}{%
\ifdim\paperwidth>0pt\relax
\ifdim\paperheight>0pt\relax
@@ -714,6 +708,7 @@
\fi
\fi
}%
+\fi
}
\fi
\fi
More information about the tex-live-commits
mailing list