From 961f0d1df526285b3a08b8a75af7197b5e6f86b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Feb 2020 22:42:01 +0000 Subject: l2e (2feb20) git-svn-id: svn://tug.org/texlive/trunk@53640 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/graphics/color.sty | 20 ++++++++++---------- Master/texmf-dist/tex/latex/graphics/dvipdf.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvipsnam.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvipsone.def | 2 +- Master/texmf-dist/tex/latex/graphics/dviwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/emtex.def | 2 +- Master/texmf-dist/tex/latex/graphics/epsfig.sty | 2 +- .../tex/latex/graphics/graphics-2017-06-25.sty | 6 +++--- Master/texmf-dist/tex/latex/graphics/graphics.sty | 14 +++++++------- Master/texmf-dist/tex/latex/graphics/graphicx.sty | 6 +++--- Master/texmf-dist/tex/latex/graphics/keyval.sty | 2 +- Master/texmf-dist/tex/latex/graphics/lscape.sty | 2 +- Master/texmf-dist/tex/latex/graphics/pctex32.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexhp.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexps.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/rotating.sty | 2 +- Master/texmf-dist/tex/latex/graphics/tcidvi.def | 2 +- Master/texmf-dist/tex/latex/graphics/trig.sty | 2 +- Master/texmf-dist/tex/latex/graphics/truetex.def | 2 +- 20 files changed, 39 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex/latex/graphics') diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index 6d50107b48b..7973f8428ff 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -12,7 +12,7 @@ %% %% %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [2016/07/10 v1.1e Standard LaTeX Color (DPC)] + [2019/11/23 v1.2a Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -98,28 +98,28 @@ \csname\string\color @#1\endcsname \set@color}% \ignorespaces} -\def\textcolor#1#{\@textcolor{#1}} +\protected\def\textcolor#1#{\@textcolor{#1}} \def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} -\def\pagecolor{% +\protected\def\pagecolor{% \begingroup \let\ignorespaces\endgroup \let\set@color\set@page@color \color} -\def\nopagecolor{% +\protected\def\nopagecolor{% \@ifundefined{no@page@color}{% \PackageInfo{color}{\string\nopagecolor\space is not supported}% }{% \no@page@color }% } -\def\definecolor#1#2#3{% +\protected\def\definecolor#1#2#3{% \@ifundefined{color@#2}% {\c@lor@error{model `#2'}}% {\@ifundefined{\string\color @#1}{}% {\PackageInfo{color}{Redefining color #1}}% \csname color@#2\expandafter\endcsname \csname\string\color @#1\endcsname{#3}}} -\def\DefineNamedColor#1#2#3#4{% +\protected\def\DefineNamedColor#1#2#3#4{% \@ifundefined{define@color@#1}% {\c@lor@error{model `#1'}}% {\@ifundefined{color@#3}% @@ -148,13 +148,13 @@ \@ifundefined{ver@\Gin@driver}{\input{\Gin@driver}}{} \fi \@ifundefined{c@lor@namefile}{}{\input{\c@lor@namefile}} -\def\normalcolor{\let\current@color\default@color\set@color} +\protected\def\normalcolor{\let\current@color\default@color\set@color} \AtBeginDocument{\let\default@color\current@color} \def\color@block#1#2#3{% {\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}} -\def\colorbox#1#{\color@box{#1}} +\protected\def\colorbox#1#{\color@box{#1}} \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} -\def\fcolorbox#1#{\color@fbox{#1}} +\protected\def\fcolorbox#1#{\color@fbox{#1}} \def\color@fbox#1#2#3{% \color@b@x{\fboxsep\z@\color#1{#2}\fbox}{\color#1{#3}}} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index 1e3c06b47ca..39d2d8f9835 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index cd86f75aec8..06e7398272f 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index 98334f3a130..b942a05ae3f 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index 5a636eafa9f..07a34e4db2b 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index 4a929483b6f..c3d17aa20d0 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/epsfig.sty b/Master/texmf-dist/tex/latex/graphics/epsfig.sty index d117fbfe8cc..114460d3493 100644 --- a/Master/texmf-dist/tex/latex/graphics/epsfig.sty +++ b/Master/texmf-dist/tex/latex/graphics/epsfig.sty @@ -12,7 +12,7 @@ %% %% %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty index 361193cf323..5cfa5df4500 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty @@ -5,12 +5,12 @@ %% The original source files were: %% %% graphics.dtx (with options: `package') -%% +%% %% The source is maintained by the LaTeX Project team and bug %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) -%% -%% +%% +%% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project %% diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index e6bdc2f8669..f23eabadc70 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -12,7 +12,7 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -29,7 +29,7 @@ \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{graphics} - [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)] + [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -115,7 +115,7 @@ \newcommand\DeclareGraphicsExtensions[1]{% \edef\Gin@extensions{\zap@space#1 \@empty}} \providecommand\Gin@extensions{} -\def\includegraphics{% +\protected\def\includegraphics{% \leavevmode \@ifstar {\Gin@cliptrue\Gin@i}% @@ -410,7 +410,7 @@ \let\Grot@d\@ydim \let\Grot@x\@linelen \let\Grot@y\@dashdim -\long\def\rotatebox#1#2{% +\protected\long\def\rotatebox#1#2{% \leavevmode \Grot@setangle{#1}% \setbox\z@\hbox{{#2}}% @@ -479,7 +479,7 @@ \advance\Grot@right-\Grot@left\wd\z@\Grot@right \leavevmode\box\z@ \endgroup} -\def\scalebox#1{% +\protected\def\scalebox#1{% \@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}} \long\def\Gscale@box#1[#2]#3{% \leavevmode @@ -498,8 +498,8 @@ \else \hb@xt@#1\wd\z@{\box\tw@\kern#1\wd\z@\hss}% \fi} -\def\reflectbox{\Gscale@box-1[1]} -\def\resizebox{% +\protected\def\reflectbox{\Gscale@box-1[1]} +\protected\def\resizebox{% \leavevmode \@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}} \def\Gscale@@box#1#2#3{% diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty index d41006e2609..c28ca752b3b 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty @@ -12,7 +12,7 @@ %% %% %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphicx} - [2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)] + [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)] \DeclareOption{unknownkeysallowed} {\PassOptionsToPackage\CurrentOption{keyval}} \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}} @@ -236,7 +236,7 @@ \the\toks@ \endgroup \fi} -\def\rotatebox{% +\protected\def\rotatebox{% \leavevmode \@ifnextchar[\Grot@box@kv\Grot@box@std} \long\def\Grot@box@std#1#2{% diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty index ad522ba6f02..ddb6c0a183e 100644 --- a/Master/texmf-dist/tex/latex/graphics/keyval.sty +++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty @@ -12,7 +12,7 @@ %% %% %% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/lscape.sty b/Master/texmf-dist/tex/latex/graphics/lscape.sty index b5bae157ae1..e4ece0f218d 100644 --- a/Master/texmf-dist/tex/latex/graphics/lscape.sty +++ b/Master/texmf-dist/tex/latex/graphics/lscape.sty @@ -12,7 +12,7 @@ %% %% %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 77ee66620e6..58c913cd023 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index 14987ca894f..341204427d1 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index 75a82ab3e35..6920dcd739e 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index 35964af3c55..198644d3b3b 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty index ded37b873cd..14ba6fb1427 100644 --- a/Master/texmf-dist/tex/latex/graphics/rotating.sty +++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty @@ -13,7 +13,7 @@ %% %% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca %% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns -%% Copyright (C) 2016-2019 LaTeX3 Project +%% Copyright (C) 2016-2020 LaTeX3 Project \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rotating}% [2016/08/11 v2.16d diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index a6624d40023..d4a93d43c38 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/trig.sty b/Master/texmf-dist/tex/latex/graphics/trig.sty index bb733b6654c..1cdc14cb7e3 100644 --- a/Master/texmf-dist/tex/latex/graphics/trig.sty +++ b/Master/texmf-dist/tex/latex/graphics/trig.sty @@ -12,7 +12,7 @@ %% %% %% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index 99b228aeb21..62a4742b863 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public -- cgit v1.2.3