diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-02 22:42:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-02 22:42:01 +0000 |
commit | 961f0d1df526285b3a08b8a75af7197b5e6f86b7 (patch) | |
tree | a0a096f519b75b148833f7ebd70ca5af996fa2c6 /Master/texmf-dist/source/latex/graphics | |
parent | b97aa19e35137596fcf0193abee3788b21250f32 (diff) |
l2e (2feb20)
git-svn-id: svn://tug.org/texlive/trunk@53640 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/graphics')
9 files changed, 78 insertions, 58 deletions
diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx index 8de7d013a37..ad5df89a7ee 100644 --- a/Master/texmf-dist/source/latex/graphics/color.dtx +++ b/Master/texmf-dist/source/latex/graphics/color.dtx @@ -2,7 +2,7 @@ % \iffalse % %% 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 @@ -19,7 +19,7 @@ %<driver> \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2016/07/10 v1.1e Standard LaTeX Color (DPC)] + [2019/11/23 v1.2a Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -462,10 +462,10 @@ % correctly. % \changes{v0.3a}{1994/07/20} % {Stop command being \cs{long}, and make robust.} -% \changes{v0.3l}{1995/12/07} -% {Add \cs{leavevmode}} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\textcolor#1#{\@textcolor{#1}} +\protected\def\textcolor#1#{\@textcolor{#1}} \def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} % \end{macrocode} % \end{macro} @@ -481,8 +481,10 @@ % {end the group even if the colour command generates an error} % \changes{v0.3c}{1994/09/19} % {Use \cs{color} to parse arguments} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\pagecolor{% +\protected\def\pagecolor{% \begingroup \let\ignorespaces\endgroup \let\set@color\set@page@color @@ -497,8 +499,10 @@ % % \changes{v1.1a}{2014/04/23} % {add \cs{nopagecolor} graphics/3873} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\nopagecolor{% +\protected\def\nopagecolor{% \@ifundefined{no@page@color}{% \PackageInfo{color}{\string\nopagecolor\space is not supported}% }{% @@ -533,8 +537,10 @@ % {New internal implementation of colour commands} % \changes{v0.3f}{1994/10/04} % {Give info about redefinitions} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\definecolor#1#2#3{% +\protected\def\definecolor#1#2#3{% \@ifundefined{color@#2}% {\c@lor@error{model `#2'}}% {\@ifundefined{\string\color @#1}{}% @@ -589,8 +595,10 @@ % |[named]| all the time, just give the package option |usenames|, which % will redefine |\DefineNamedColor|, so that the colour name is declared % as a user-colour as well as a name in the `named' model. +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\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}% @@ -684,8 +692,10 @@ % \changes{v0.2d}{1994/05/13} % {Stop changing \cs{reset@font}. Use the new \cs{normalfont} % instead.} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\normalcolor{\let\current@color\default@color\set@color} +\protected\def\normalcolor{\let\current@color\default@color\set@color} % \end{macrocode} % \end{macro} % @@ -751,8 +761,10 @@ % colour specifies the \emph{background} colour of the box. % \changes{v0.3b}{1994/09/14} % {New implementation} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macrocode} -\def\colorbox#1#{\color@box{#1}} +\protected\def\colorbox#1#{\color@box{#1}} % \end{macrocode} % \end{macro} % @@ -771,9 +783,11 @@ % colour model for both colours. % \changes{v0.3b}{1994/09/14} % {New implementation} +% \changes{v1.2a}{2019/11/23} +% {Add \cs{protected} gh/208} % \begin{macro}{\fcolorbox} % \begin{macrocode} -\def\fcolorbox#1#{\color@fbox{#1}} +\protected\def\fcolorbox#1#{\color@fbox{#1}} % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index d693ebd27b0..9bf32f78a1f 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -3,7 +3,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/source/latex/graphics/epsfig.dtx b/Master/texmf-dist/source/latex/graphics/epsfig.dtx index f9197c7b1c9..8e883bd8df7 100644 --- a/Master/texmf-dist/source/latex/graphics/epsfig.dtx +++ b/Master/texmf-dist/source/latex/graphics/epsfig.dtx @@ -2,7 +2,7 @@ % \iffalse % %% 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/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx index ac570c02278..b88ef1e0666 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx @@ -2,7 +2,7 @@ % \iffalse % %% 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 @@ -25,7 +25,7 @@ %<driver> \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)] + [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -870,9 +870,10 @@ % \changes{v1.1a}{2017/03/17} % {\cs{leavevmode} added before the group in \cs{Gin@iii} so that % settings in \cs{everypar} are cleared} +% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208} % Top level command for the standard interface, just look for a |*|. % \begin{macrocode} -\def\includegraphics{% +\protected\def\includegraphics{% % \end{macrocode} % Clear |\everypar| before starting a group. % \begin{macrocode} @@ -1081,7 +1082,7 @@ % \end{macrocode} % \end{macro} % \end{macro} -% +% % \begin{macro}{\Ginclude@graphics} % The main internal function implementing graphics file inclusion. % |#1| is the file name. @@ -1651,8 +1652,9 @@ % \changes{v0.7a}{1995/04/11}{\cs{leavevmode} added graphics/1521} % \changes{v1.0n}{2001/07/07} % {Made long (CAR) graphics/2908 and 3345} +% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208} % \begin{macrocode} -\long\def\rotatebox#1#2{% +\protected\long\def\rotatebox#1#2{% \leavevmode \Grot@setangle{#1}% \setbox\z@\hbox{{#2}}% @@ -1866,8 +1868,9 @@ % The top level |\scalebox|. If the vertical scale factor is omitted it % defaults to the horizontal scale factor, |#1|. % \changes{v0.3d}{1994/03/06}{Better support for negative arguments.} +% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208} % \begin{macrocode} -\def\scalebox#1{% +\protected\def\scalebox#1{% \@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}} % \end{macrocode} % \end{macro} @@ -1905,8 +1908,9 @@ % \begin{macro}{\reflectbox} % Just an abbreviation for the appropriate scale to get reflection. % \changes{v0.3e}{1994/03/09}{Macro added} +% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208} % \begin{macrocode} -\def\reflectbox{\Gscale@box-1[1]} +\protected\def\reflectbox{\Gscale@box-1[1]} % \end{macrocode} % \end{macro} % @@ -1915,10 +1919,11 @@ % \changes{v0.3b}{1994/03/01}{Recode \cmd\resizebox.} % \changes{v0.7b}{1995/04/27} % {Add \cs{leavevmode} for graphics/1512} +% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208} % Look for a |*|, which specifies that a final vertical size refers to % `height + depth' not just `height'. % \begin{macrocode} -\def\resizebox{% +\protected\def\resizebox{% \leavevmode \@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx index 4134c4eed1f..3cf15925d3f 100644 --- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx @@ -2,7 +2,7 @@ % \iffalse % %% 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 @@ -17,7 +17,7 @@ %<driver> \ProvidesFile{graphicx.drv} % \fi % \ProvidesFile{graphicx.dtx} - [2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)] + [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -167,7 +167,7 @@ % \item[quiet] Turns off writing information about graphics to the |.log|. % \item[page] The page of a multi-page PDF graphic to be used. % \item[interpolate] Enables interpolation of bitmap images by viewers. -% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of +% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of % mediabox, cropbox, bleedbox, trimbox, artbox. The default is driver-specific. % \end{description} % @@ -845,8 +845,9 @@ % Look for an optional argument. % \changes{v0.3b}{1994/03/11}{Remove star form} % \changes{v1.0g}{2014/04/25}{\cs{leavevmode} added graphics/1521} +% \changes{v1.2a}{2019/11/30}{Add \cs{protected} gh/208} % \begin{macrocode} -\def\rotatebox{% +\protected\def\rotatebox{% \leavevmode \@ifnextchar[\Grot@box@kv\Grot@box@std} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/keyval.dtx b/Master/texmf-dist/source/latex/graphics/keyval.dtx index 1e1581eee36..dd1f542832c 100644 --- a/Master/texmf-dist/source/latex/graphics/keyval.dtx +++ b/Master/texmf-dist/source/latex/graphics/keyval.dtx @@ -1,7 +1,7 @@ % % \iffalse %% 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/source/latex/graphics/lscape.dtx b/Master/texmf-dist/source/latex/graphics/lscape.dtx index a5a3dc3220f..e14462c9d42 100644 --- a/Master/texmf-dist/source/latex/graphics/lscape.dtx +++ b/Master/texmf-dist/source/latex/graphics/lscape.dtx @@ -2,7 +2,7 @@ % \iffalse % %% 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/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx index 149c19d049d..535f115594b 100644 --- a/Master/texmf-dist/source/latex/graphics/rotating.dtx +++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx @@ -5,7 +5,7 @@ % File: rotating.dtx %% 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 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -21,7 +21,7 @@ % This work consists of the file rotating.dtx % and the derived file rotating.sty, and testing material % rotex.tex and cat.eps -% +% % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} %<*dtx> @@ -75,7 +75,7 @@ % note that rotation is typically \emph{not} visible in a DVI viewer: % conversion to, and viewing, PostScript or PDF is necessary. % -% \section{Usage} +% \section{Usage} % % \subsection{Package options} % @@ -114,7 +114,7 @@ % area of the document.) % % New rotated environments may be declared using the combined -% facilities of the float and rotfloat packages. +% facilities of the float and rotfloat packages. % % \subsection{Other environments and commands} % The package provides other \LaTeX\ environments: @@ -146,7 +146,7 @@ % \begin{tabular}{@{}llp{3in}@{}} % \cs{rotFPtop} & \cs{rotFPbot} & Effect \\ % \hline -% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle +% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle % (default value) \\ % 0pt & 0pt plus 1fil & figure/table appears with its top % nearest the edge of the page \\ @@ -175,11 +175,11 @@ % Control figure orientation % \begin{macrocode} \DeclareOption{figuresleft}{% - \@rot@twosidefalse + \@rot@twosidefalse \def\rot@LR{0}% } \DeclareOption{figuresright}{% - \@rot@twosidefalse + \@rot@twosidefalse \def\rot@LR{-1}% } % \end{macrocode} @@ -206,7 +206,7 @@ % A couple of commands for passing rotation direction around % \begin{macrocode} \newif\if@rot@twoside -\if@twoside +\if@twoside \@rot@twosidetrue \else \@rot@twosidefalse @@ -238,7 +238,7 @@ \def\rotdriver#1{\makeatletter\input{#1.def}\makeatother} % \end{macrocode} % \end{macro} -% +% % The \texttt{r@tfl@t} counter is used when generating `labels' for % determining what side of the page the float is on, in twoside mode. % \begin{macrocode} @@ -298,7 +298,7 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\turnbox} -% A macro version of the `rotate' environment. +% A macro version of the `rotate' environment. % \begin{macrocode} \def\turnbox#1#2{% \Grot@setangle{#1}% @@ -315,13 +315,13 @@ % \section{Sideways figures and tables} % Now for the macros to provide a complete % environment for sideways figures and tables. -% We define two environments |sidewaysfigure| and +% We define two environments |sidewaysfigure| and % |sidewaystable| that % fit in with the normal table and figure floats. These are `fixed' % environments that just do 90 degree rotation, but it would be easy % to parameterize this to do other rotations if needed (the mind % boggles\ldots) -% +% % \begin{macro}{\@rotfloat} % \begin{macro}{\@xrotfloat} % \begin{macro}{\rot@float@box} @@ -347,7 +347,7 @@ \@float{#1}[#2]% % \end{macrocode} % Set the float contents in -% a box of width \cs{textheight} instead of \cs{columnwidth}. +% a box of width \cs{textheight} instead of \cs{columnwidth}. % \begin{macrocode} \begin{lrbox}\rot@float@box \begin{minipage}\textheight @@ -366,7 +366,7 @@ % \begin{macrocode} \def\end@rotfloat{% % \end{macrocode} -% If we are going to know whether pages are odd or even, +% If we are going to know whether pages are odd or even, % we need to use the a variant \cs{pageref} mechanism and our own % specialised labels. % \begin{macrocode} @@ -388,18 +388,18 @@ \if@rot@twoside \else \let\R@@page\rot@LR - \fi - \ifthenelse{\isodd{\R@@page}}{% + \fi + \ifthenelse{\isodd{\R@@page}}{% \if@rot@twoside \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% \fi - \vfill + \vfill \@@line{% \hskip\rotFPtop \rotatebox{90}{\box\rot@float@box}% \hskip\rotFPbot }% - }{% + }{% \if@rot@twoside \rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}% \fi @@ -409,9 +409,9 @@ \hskip\rotFPtop }% \vfill - }% + }% \rot@message{\the\rot@mess@toks} - }% + }% \end@float } % \end{macrocode} @@ -421,7 +421,7 @@ % \begin{macro}{\endsidewaysfigure} % \begin{macro}{\sidewaystable} % \begin{macro}{\endsidewaystable} -% The following definitions set up two environments, +% The following definitions set up two environments, % \texttt{sidewaystable} and \texttt{sidewaysfigure}, which uses this % type of float. Naturally, users may need to change these to suit % their local style. Both contribute to the normal lists of figures @@ -455,7 +455,7 @@ } \def\end@rotdblfloat{% % \end{macrocode} -% If we are going to know whether pages are odd or even, +% If we are going to know whether pages are odd or even, % we need to use the \cs{pageref} mechanism, and labels. But % Labels won't work \emph{unless} the user has put in a % caption. Beware! @@ -485,34 +485,34 @@ \if@rot@twoside \else \let\R@@page\rot@LR - \fi - \ifthenelse{\isodd{\R@@page}}{% + \fi + \ifthenelse{\isodd{\R@@page}}{% \ifrot@messages \if@rot@twoside \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% \fi \fi - \vfill + \vfill \@@line{% \hskip\rotFPtop \rotatebox{90}{\box\rot@float@box}% \hskip\rotFPbot }% - }{% + }{% \ifrot@messages \if@rot@twoside \rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}% \fi - \fi% + \fi% \@@line{% \hskip\rotFPbot \rotatebox{-90}{\box\rot@float@box}% \hskip\rotFPtop }% \vfill - }% + }% \rot@message{\the\rot@mess@toks}% - }% + }% \end@dblfloat } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/trig.dtx b/Master/texmf-dist/source/latex/graphics/trig.dtx index 2b152578ad7..67f6c6a9703 100644 --- a/Master/texmf-dist/source/latex/graphics/trig.dtx +++ b/Master/texmf-dist/source/latex/graphics/trig.dtx @@ -1,6 +1,6 @@ % \iffalse %% 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 |