summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-26 23:01:55 +0000
committerKarl Berry <karl@freefriends.org>2014-07-26 23:01:55 +0000
commitfd51d0046efd80209b379d62891b73afc27c9f27 (patch)
treecb8525f13dd5977bd2426ec2dd13cac5c3b4622b
parentc877908e59425b4baa87016a5a28f5ff2c160323 (diff)
fmxdef (26jul14)
git-svn-id: svn://tug.org/texlive/trunk@34732 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def6
-rw-r--r--Master/texmf-dist/tex/xelatex/xetex-def/xetex.def6
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
index 01c07ce62b8..65a4bd1e002 100644
--- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
@@ -18,12 +18,12 @@
%%
%% The original source files were:
%% drivers.dtx (with options: `dvipdf,color1,psrulesZ')
-%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
+%% Copyright (C) 1995 1996 1997 1998 1999, 2014 David Carlisle
%% Copyright (C) 1994 David Carlisle Sebastian Rahtz
%%
% emacs-page
\ProvidesFile{dvipdfmx.def}
- [2014/07/02 v4.02 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)]
+ [2014/07/25 v4.03 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)]
%
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -195,10 +195,10 @@
\ifGin@interpolate/Interpolate\space true\fi>>%
\fi}%
\egroup}
+\newif\if@trim@vport
\def\Ginclude@eps#1{%
\message{<#1>}%
\bgroup
- \newif\if@trim@vport
\ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi
\def\@tempa{!}%
\dimen@\Gin@urx\p@
diff --git a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
index cf7ffc656e1..0c40d58aeb7 100644
--- a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
+++ b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
@@ -20,6 +20,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Version History
%%
+%% 2014/04/28 [KB] [v4.03] \newif outside \def. Skipped 4.02.
+%%
%% 2014/04/28 [HO] [v4.01] .CAPS extensions.
%% [KB] ordering: find .jpeg just after .jpg,
%% more like dvipdfmx.def. Also remove .sga/.sgi,
@@ -92,7 +94,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% emacs-page
\ProvidesFile{xetex.def}
- [2014/04/28 v4.01 LaTeX color/graphics driver for XeTeX (RRM/JK)]
+ [2014/07/25 v4.03 LaTeX color/graphics driver for XeTeX (RRM/JK)]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% make sure we can use " with correct catcode
@@ -525,10 +527,10 @@
% 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)
+\newif\if@trim@vport
\def\Ginclude@eps#1{%
\message{<#1>}%
\bgroup
- \newif\if@trim@vport
\ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi
\def\@tempa{!}%
\dimen@\Gin@urx\p@