summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/graphics
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
committerKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
commit610c45beb863b008027a871701c889fe40bed7fb (patch)
tree5b879b56850db183fd749a497edd1d91172edf69 /Master/texmf-dist/tex/latex/graphics
parent18fa80c232cf479ae713b01b17d48bdc1d653aac (diff)
latex2e 2014/05/01 (via latex-tds)
git-svn-id: svn://tug.org/texlive/trunk@33946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphics')
-rw-r--r--Master/texmf-dist/tex/latex/graphics/color.sty9
-rw-r--r--Master/texmf-dist/tex/latex/graphics/dvipdf.def5
-rw-r--r--Master/texmf-dist/tex/latex/graphics/dvips.def6
-rw-r--r--Master/texmf-dist/tex/latex/graphics/dvipsnam.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/dvipsone.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/dviwin.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/emtex.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/graphicx.sty9
-rw-r--r--Master/texmf-dist/tex/latex/graphics/keyval.sty24
-rw-r--r--Master/texmf-dist/tex/latex/graphics/pctex32.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/pctexhp.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/pctexps.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/pctexwin.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/tcidvi.def2
-rw-r--r--Master/texmf-dist/tex/latex/graphics/truetex.def2
15 files changed, 42 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty
index 15826813e15..1a7a268213c 100644
--- a/Master/texmf-dist/tex/latex/graphics/color.sty
+++ b/Master/texmf-dist/tex/latex/graphics/color.sty
@@ -18,7 +18,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{color}
- [2005/11/14 v1.0j Standard LaTeX Color (DPC)]
+ [2014/04/23 v1.1a Standard LaTeX Color (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -95,6 +95,13 @@
\let\ignorespaces\endgroup
\let\set@color\set@page@color
\color}
+\def\nopagecolor{%
+ \@ifundefined{no@page@color}{%
+ \PackageInfo{color}{\string\nopagecolor\space is not supported}%
+ }{%
+ \no@page@color
+ }%
+}
\def\definecolor#1#2#3{%
\@ifundefined{color@#2}%
{\c@lor@error{model `#2'}}%
diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def
index a7543dcc11d..601a7befdd3 100644
--- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def
+++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{dvipdf.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -126,9 +126,10 @@
\@namedef{Gin@rule@.msp}#1{{bmp}{.bb}{#1}}
\@namedef{Gin@rule@.jpg}#1{{bmp}{.bb}{#1}}
\@namedef{Gin@rule@.bmp}#1{{bmp}{.bb}{#1}}
-\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z}
+\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}
\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}}
\@namedef{Gin@rule@.pz}#1{{eps}{.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.bb}{`gunzip -c #1}}
diff --git a/Master/texmf-dist/tex/latex/graphics/dvips.def b/Master/texmf-dist/tex/latex/graphics/dvips.def
index bbf384ffbc4..5b6b2a15e49 100644
--- a/Master/texmf-dist/tex/latex/graphics/dvips.def
+++ b/Master/texmf-dist/tex/latex/graphics/dvips.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{dvips.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -81,6 +81,7 @@
background \current@color}}
\def\define@color@named#1#2{%
\expandafter\let\csname col@#1\endcsname\@nnil}
+ \def\no@page@color{\special{background \string"newpath clip}}
\def\Ginclude@eps#1{%
\message{<#1>}%
\bgroup
@@ -138,9 +139,10 @@
\def\Gin@PS@restored#1{\special{" #1}}
\def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}}
\def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}}
-\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z}
+\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}
\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}}
\@namedef{Gin@rule@.pz}#1{{eps}{.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.bb}{`gunzip -c #1}}
diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def
index a4620489911..de979f7a089 100644
--- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def
+++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{dvipsnam.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\DefineNamedColor{named}{GreenYellow} {cmyk}{0.15,0,0.69,0}
\DefineNamedColor{named}{Yellow} {cmyk}{0,0,1,0}
\DefineNamedColor{named}{Goldenrod} {cmyk}{0,0.10,0.84,0}
diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def
index 210f48eddb9..213d4d93bb7 100644
--- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def
+++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{dvipsone.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def
index c8e89b3e3df..6c6926656f1 100644
--- a/Master/texmf-dist/tex/latex/graphics/dviwin.def
+++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{dviwin.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\@namedef{Gin@rule@*}#1{{bmp}{}{#1}}
\def\Ginclude@bmp#1{%
\raise\Gin@req@height\hbox{%
diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def
index f4cfa864b92..63fee498660 100644
--- a/Master/texmf-dist/tex/latex/graphics/emtex.def
+++ b/Master/texmf-dist/tex/latex/graphics/emtex.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{emtex.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\Ginclude@bmp#1{%
\raise\Gin@req@height\hbox{\special{em:graph #1}}%
\typeout{WARNING: emtex does not permit graphics to be scaled}%
diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
index cccb538c06f..ccbdf4383b1 100644
--- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty
+++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
@@ -7,7 +7,7 @@
%% graphicx.dtx (with options: `package')
%%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995 1996 1997 1999 David Carlisle
+%% Copyright (C) 1995 1996 1997 1999 2014 David Carlisle
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{graphicx}
- [1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2014/04/25 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)]
\DeclareOption{unknownkeysallowed}
{\PassOptionsToPackage\CurrentOption{keyval}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
@@ -200,14 +200,15 @@
\endgroup
\fi}
\def\rotatebox{%
+ \leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
-\def\Grot@box@std#1#2{%
+\long\def\Grot@box@std#1#2{%
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
\Grot@x\z@
\Grot@y\z@
\Grot@box}
-\def\Grot@box@kv[#1]#2#3{%
+\long\def\Grot@box@kv[#1]#2#3{%
\@begin@tempboxa\hbox{#3}%
\Grot@x\width \divide\Grot@x\tw@
\Grot@y\height \advance\Grot@y-\depth \divide\Grot@y\tw@
diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty
index aa973f2e294..f5ca00f4b3c 100644
--- a/Master/texmf-dist/tex/latex/graphics/keyval.sty
+++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty
@@ -6,7 +6,7 @@
%%
%% keyval.dtx (with options: `package')
%%
-%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
+%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 2014 David Carlisle
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -15,16 +15,16 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{keyval}
- [1999/03/16 v1.13 key=value parser (DPC)]
-\def\setkeys#1#2{%
+ [2014/05/08 v1.15 key=value parser (DPC)]
+\long\def\setkeys#1#2{%
\def\KV@prefix{KV@#1@}%
\let\@tempc\relax
\KV@do#2,\relax,}
-\def\KV@do#1,{%
- \ifx\relax#1\empty\else
+\long\def\KV@do#1,{%
+ \ifx\relax#1\@empty\else
\KV@split#1==\relax
\expandafter\KV@do\fi}
-\def\KV@split#1=#2=#3\relax{%
+\long\def\KV@split#1=#2=#3\relax{%
\KV@@sp@def\@tempa{#1}%
\ifx\@tempa\@empty\else
\expandafter\let\expandafter\@tempc
@@ -57,7 +57,7 @@
\let\KV@err\KV@errx
\ProcessOptions
\def\@tempa#1{%
-\def\KV@@sp@def##1##2{%
+\long\def\KV@@sp@def##1##2{%
\futurelet\KV@tempa\KV@@sp@d##2\@nil\@nil#1\@nil\relax##1}%
\def\KV@@sp@d{%
\ifx\KV@tempa\@sptoken
@@ -65,17 +65,17 @@
\else
\expandafter\KV@@sp@b\expandafter#1%
\fi}%
-\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}%
+\long\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}%
}
\@tempa{ }
-\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}}
+\long\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}}
\newtoks\KV@toks@
\def\define@key#1#2{%
- \@ifnextchar[{\KV@def{#1}{#2}}{\@namedef{KV@#1@#2}####1}}
+ \@ifnextchar[{\KV@def{#1}{#2}}{\long\@namedef{KV@#1@#2}####1}}
\def\KV@def#1#2[#3]{%
- \@namedef{KV@#1@#2@default\expandafter}\expandafter
+ \long\@namedef{KV@#1@#2@default\expandafter}\expandafter
{\csname KV@#1@#2\endcsname{#3}}%
- \@namedef{KV@#1@#2}##1}
+ \long\@namedef{KV@#1@#2}##1}
\endinput
%%
%% End of file `keyval.sty'.
diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def
index 2ebd9acce4f..6da3b0975d4 100644
--- a/Master/texmf-dist/tex/latex/graphics/pctex32.def
+++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{pctex32.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def
index a322aaedc3f..e966b734b62 100644
--- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def
+++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{pctexhp.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\Ginclude@pcl#1{%
\message{<#1>}%
\ifGin@clip
diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def
index eeeb9519d5b..c1f300b15c5 100644
--- a/Master/texmf-dist/tex/latex/graphics/pctexps.def
+++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{pctexps.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def
index bdc40f2f836..a7eb220f016 100644
--- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def
+++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{pctexwin.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\Ginclude@eps#1{%
\message{<#1>}%
\ifGin@clip
diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def
index 4156e28ea10..0c34e2dadcb 100644
--- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def
+++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{tcidvi.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def
index e9cf0d3c7e9..df33f3d23f4 100644
--- a/Master/texmf-dist/tex/latex/graphics/truetex.def
+++ b/Master/texmf-dist/tex/latex/graphics/truetex.def
@@ -15,7 +15,7 @@
%% Either version 1.3 or, at your option, any later version.
%%
\ProvidesFile{truetex.def}
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi