summaryrefslogtreecommitdiff
path: root/macros/latex/required/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
committerNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
commit34897eebd22c3de968b64f09bb4a371d96cb0b89 (patch)
tree19a50e54fca63f1f6482d6cb4c2fdee676fd97b1 /macros/latex/required/graphics
parente05dc0bb38b16bfb9ba35591285e40af0adaadc4 (diff)
CTAN sync 202002030302
Diffstat (limited to 'macros/latex/required/graphics')
-rw-r--r--macros/latex/required/graphics/README.md4
-rw-r--r--macros/latex/required/graphics/cat-eps-converted-to.pdf84
-rw-r--r--macros/latex/required/graphics/changes.txt25
-rw-r--r--macros/latex/required/graphics/color.dtx38
-rw-r--r--macros/latex/required/graphics/color.pdfbin201496 -> 201521 bytes
-rw-r--r--macros/latex/required/graphics/drivers.dtx2
-rw-r--r--macros/latex/required/graphics/drivers.pdfbin263534 -> 268843 bytes
-rw-r--r--macros/latex/required/graphics/epsfig.dtx2
-rw-r--r--macros/latex/required/graphics/epsfig.pdfbin154483 -> 154491 bytes
-rw-r--r--macros/latex/required/graphics/graphics-2017-06-25.sty6
-rw-r--r--macros/latex/required/graphics/graphics.dtx21
-rw-r--r--macros/latex/required/graphics/graphics.pdfbin284134 -> 289788 bytes
-rw-r--r--macros/latex/required/graphics/graphicx.dtx9
-rw-r--r--macros/latex/required/graphics/graphicx.pdfbin232381 -> 232502 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.pdfbin310537 -> 310569 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.tex44
-rw-r--r--macros/latex/required/graphics/keyval.dtx2
-rw-r--r--macros/latex/required/graphics/keyval.pdfbin222662 -> 222531 bytes
-rw-r--r--macros/latex/required/graphics/lscape.dtx2
-rw-r--r--macros/latex/required/graphics/lscape.pdfbin150107 -> 150110 bytes
-rw-r--r--macros/latex/required/graphics/rotating.dtx58
-rw-r--r--macros/latex/required/graphics/rotating.pdfbin246267 -> 250716 bytes
-rw-r--r--macros/latex/required/graphics/rotex.pdfbin162245 -> 162253 bytes
-rw-r--r--macros/latex/required/graphics/rotex.tex30
-rw-r--r--macros/latex/required/graphics/trig.dtx2
-rw-r--r--macros/latex/required/graphics/trig.pdfbin191693 -> 191699 bytes
26 files changed, 139 insertions, 190 deletions
diff --git a/macros/latex/required/graphics/README.md b/macros/latex/required/graphics/README.md
index 6567a09f2f..f319461c36 100644
--- a/macros/latex/required/graphics/README.md
+++ b/macros/latex/required/graphics/README.md
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2019-10-01 patch level 2
+Release 2020-02-02
Overview
--------
@@ -61,4 +61,4 @@ of the package.
-----
-<p>Copyright (C) 1993-2019 The LaTeX Project <br />
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff --git a/macros/latex/required/graphics/cat-eps-converted-to.pdf b/macros/latex/required/graphics/cat-eps-converted-to.pdf
deleted file mode 100644
index 7da1b3dcd5..0000000000
--- a/macros/latex/required/graphics/cat-eps-converted-to.pdf
+++ /dev/null
@@ -1,84 +0,0 @@
-%PDF-1.5
-%쏢
-5 0 obj
-<</Length 6 0 R/Filter /FlateDecode>>
-stream
-xUUKU! U$,@'=}[ sIFGWmџsn_0khRn@{݈/`v6:+uhr1N{=tDOE,tڜitn,}b0ζ=PxBE|-rϚ9HI뵛l9fn^n/;{Ǯ˸:ȋAɍbƕJӈ,P۷BS`<)h(LHĔqN*Xq‽?;9_W(l#ܜCfj sBUCcWu~cyV$(1WH]7+/mA"znYRU1j1GKV{2, V!YB.R%]>Kج,)gxkT(iRښ(ٷwи'Qk{T
-*Bd5d[<h7N @YݚdξջiMg`i[d k B0I-3
-yVD'1۫_+(x5"<Y?AE5f'gρ tYic5R8t`>3b|!e}!Q I։φTceu9yy=?/ F\endstream
-endobj
-6 0 obj
-686
-endobj
-4 0 obj
-<</Type/Page/MediaBox [0 0 36 32]
-/Parent 3 0 R
-/Resources<</ProcSet[/PDF]
-/ExtGState 8 0 R
->>
-/Contents 5 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages /Kids [
-4 0 R
-] /Count 1
->>
-endobj
-1 0 obj
-<</Type /Catalog /Pages 3 0 R
-/Metadata 9 0 R
->>
-endobj
-7 0 obj
-<</Type/ExtGState
-/OPM 1>>endobj
-8 0 obj
-<</R7
-7 0 R>>
-endobj
-9 0 obj
-<</Type/Metadata
-/Subtype/XML/Length 1335>>stream
-<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
-<?adobe-xap-filters esc="CRLF"?>
-<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
-<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.27'/>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2019-07-20T10:14:48+01:00</xmp:ModifyDate>
-<xmp:CreateDate>2019-07-20T10:14:48+01:00</xmp:CreateDate>
-<xmp:CreatorTool>COREL DRAW</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:5f138aac-e2eb-11f4-0000-b0069176419e'/>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>CAT.TMP</rdf:li></rdf:Alt></dc:title></rdf:Description>
-</rdf:RDF>
-</x:xmpmeta>
-
-
-<?xpacket end='w'?>
-endstream
-endobj
-2 0 obj
-<</Producer(GPL Ghostscript 9.27)
-/CreationDate(D:20190720101448+01'00')
-/ModDate(D:20190720101448+01'00')
-/Creator(COREL DRAW)
-/Title(CAT.TMP)>>endobj
-xref
-0 10
-0000000000 65535 f
-0000000978 00000 n
-0000002523 00000 n
-0000000919 00000 n
-0000000790 00000 n
-0000000015 00000 n
-0000000771 00000 n
-0000001042 00000 n
-0000001083 00000 n
-0000001112 00000 n
-trailer
-<< /Size 10 /Root 1 0 R /Info 2 0 R
-/ID [<A1B9BB71BF53A8513F7E1A14881A66CA><A1B9BB71BF53A8513F7E1A14881A66CA>]
->>
-startxref
-2683
-%%EOF
diff --git a/macros/latex/required/graphics/changes.txt b/macros/latex/required/graphics/changes.txt
index f4343bc2c3..108723ddb4 100644
--- a/macros/latex/required/graphics/changes.txt
+++ b/macros/latex/required/graphics/changes.txt
@@ -5,6 +5,20 @@ are not part of the distribution.
=======================================================================
#########################
+# 2020-02-02 Release
+#########################
+
+2019-11-30 David Carlisle <David.Carlisle@latex-project.org>
+
+ * graphics.dtx: proteced definitions gh/208
+ * graphicx.dtx: proteced definitions gh/208
+
+2019-11-23 David Carlisle <David.Carlisle@latex-project.org>
+
+ * color.dtx: Made commands robust gh/208
+
+
+#########################
# 2019-10-01 PL 2 Release
#########################
@@ -77,7 +91,7 @@ are not part of the distribution.
2016-06-17 David Carlisle <latex-bugs@latex-project.org>
* drivers.dtx: guards for contributed packages and plain TeX.
-
+
2016-06-02 David Carlisle <latex-bugs@latex-project.org>
* graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips
@@ -960,12 +974,11 @@ are not part of the distribution.
1994-03-09 David Carlisle <latex-bugs@latex-project.org>
* \reflectbox added.
-
+
* \rotatebox* removed
-
+
* The order of the arguments of \includegraphics corrected
-
+
* \includegraphics[lower-l,lower-r][upper-l,upper-r]{file}
-
+
* \definecolor not \newcolor to define colours
-
diff --git a/macros/latex/required/graphics/color.dtx b/macros/latex/required/graphics/color.dtx
index 8de7d013a3..ad5df89a7e 100644
--- a/macros/latex/required/graphics/color.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/color.pdf b/macros/latex/required/graphics/color.pdf
index c7360251f1..4953d86459 100644
--- a/macros/latex/required/graphics/color.pdf
+++ b/macros/latex/required/graphics/color.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/drivers.dtx b/macros/latex/required/graphics/drivers.dtx
index d693ebd27b..9bf32f78a1 100644
--- a/macros/latex/required/graphics/drivers.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/drivers.pdf b/macros/latex/required/graphics/drivers.pdf
index 9d9ac44a91..7d424d4d95 100644
--- a/macros/latex/required/graphics/drivers.pdf
+++ b/macros/latex/required/graphics/drivers.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/epsfig.dtx b/macros/latex/required/graphics/epsfig.dtx
index f9197c7b1c..8e883bd8df 100644
--- a/macros/latex/required/graphics/epsfig.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/epsfig.pdf b/macros/latex/required/graphics/epsfig.pdf
index 953af25b5f..25a6c13821 100644
--- a/macros/latex/required/graphics/epsfig.pdf
+++ b/macros/latex/required/graphics/epsfig.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphics-2017-06-25.sty b/macros/latex/required/graphics/graphics-2017-06-25.sty
index 361193cf32..5cfa5df450 100644
--- a/macros/latex/required/graphics/graphics-2017-06-25.sty
+++ b/macros/latex/required/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/macros/latex/required/graphics/graphics.dtx b/macros/latex/required/graphics/graphics.dtx
index ac570c0227..b88ef1e066 100644
--- a/macros/latex/required/graphics/graphics.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/graphics.pdf b/macros/latex/required/graphics/graphics.pdf
index 918a377b0c..ccf7a574dc 100644
--- a/macros/latex/required/graphics/graphics.pdf
+++ b/macros/latex/required/graphics/graphics.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphicx.dtx b/macros/latex/required/graphics/graphicx.dtx
index 4134c4eed1..3cf15925d3 100644
--- a/macros/latex/required/graphics/graphicx.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/graphicx.pdf b/macros/latex/required/graphics/graphicx.pdf
index 8e2772f5b5..243ca19074 100644
--- a/macros/latex/required/graphics/graphicx.pdf
+++ b/macros/latex/required/graphics/graphicx.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.pdf b/macros/latex/required/graphics/grfguide.pdf
index 80aebf496f..144513d883 100644
--- a/macros/latex/required/graphics/grfguide.pdf
+++ b/macros/latex/required/graphics/grfguide.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.tex b/macros/latex/required/graphics/grfguide.tex
index 19888db741..d25bcac27b 100644
--- a/macros/latex/required/graphics/grfguide.tex
+++ b/macros/latex/required/graphics/grfguide.tex
@@ -1,5 +1,5 @@
%% grfguide.tex Copyright (C) 1994 1995 1996 1998 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
@@ -261,7 +261,7 @@ The final driver option is an alias for |dvipsone|.
\begin{quote}\raggedright
|dviwindo|
\end{quote}
-
+
\section[Colour]{Colour\footnote{%
The basic \package{color} package functionality described here
@@ -294,7 +294,7 @@ models, eg \textbf{pantone} (An industry standard set of colours),
\textbf{x11} (Colour names from the X Window System), etc. The
standard distribution does not currently have such models, but the
\textbf{named} model could be used as an example of how to define a new
-colour model. The names used in the \textbf{named} model are those
+colour model. The names used in the \textbf{named} model are those
suggested by Jim Hafner in his \textsf{colordvi} and \textsf{foiltex}
packages, and implemented originally in the |color.pro| header file for
the \texttt{dvips} driver.
@@ -303,7 +303,7 @@ the \texttt{dvips} driver.
Most of the options to the \package{color} package just specify a
driver, e.g., \ |dvips|, as discussed in section~\ref{drivers}.
-One special option for the \package{color} package
+One special option for the \package{color} package
that is of interest is |monochrome.|
If this option is selected the colour commands are all
disabled so that they do not generate errors, but do not generate colour
@@ -404,7 +404,7 @@ model, thus allowing |\color{WildStrawberry}| in addition to
\subsection{Named Colours}
Using the \textbf{named} colour model has certain advantages over
-using other colour models.
+using other colour models.
Firstly as the |dvi| file contains a request
for a colour by \emph{name}, the actual mix of primary colours used to
@@ -493,7 +493,7 @@ There are two graphics packages:
\begin{description}
\item[\package{graphics}] The `standard' graphics package.
\item[\package{graphicx}] The `extended' or `enhanced' graphics
- package.
+ package.
\end{description}
The two differ only in the format of optional arguments for the
commands defined. The command names, and the mandatory arguments are
@@ -594,15 +594,15 @@ An abbreviation for |\scalebox{-1}[1]|\arg{text}.
If |!| is used as either length argument, the other argument is used
to determine a scale factor that is used in both directions.
Normally \emph{v-length} refers to the height of the box, but in the
- star form, it refers to the `height + depth'.
+ star form, it refers to the `height + depth'.
As normal for \LaTeXe\ box length arguments, |\height|,
|\width|, |\totalheight|, |\depth| may be used to refer to the
original size of the box.
-|\resizebox{1in}{\height}{Some text}|:
+|\resizebox{1in}{\height}{Some text}|:
\resizebox{1in}{\height}{Some text}
-|\resizebox{1in}{!}{Some text}|:
+|\resizebox{1in}{!}{Some text}|:
\resizebox{1in}{!}{Some text}
\subsection{Including Graphics Files}
@@ -656,7 +656,7 @@ The allowed keys are listed below.
compatibility with older packages.
Specifying |bbllx=a,bblly=b,bburx=c,bbury=d|
is equivalent to specifying |bb = a b c d|.
-\item[natwidth,natheight] Again an alternative to |bb|.
+\item[natwidth,natheight] Again an alternative to |bb|.
|natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|.
\item[hiresbb]\NEWfeature{1996/10/29}
Boolean valued key. If set to |true| (just specifying |hiresbb|
@@ -705,7 +705,7 @@ The value should be one of
\item[totalheight]\NEWfeature{1995/06/01}
Specify the total height (height $+$ depth) of the figure.
This will differ from the `height' if rotation has occurred.
- In particular if the figure has been rotated by $-90^\circ$
+ In particular if the figure has been rotated by $-90^\circ$
then it will have zero height but large depth.
\item[keepaspectratio]\NEWfeature{1995/09/27}
Boolean valued key like `clip'.
@@ -721,7 +721,7 @@ The value should be one of
\item[ext] Specify the file extension. This should \emph{only} be
used in conjunction with |type|.
\item[read] Specify the file extension of the `read file'. This
- should \emph{only} be used in conjunction with |type|.
+ should \emph{only} be used in conjunction with |type|.
\item[command] Specify any command to be applied to the file. This
should \emph{only} be used in conjunction with |type|.
\item[quiet]\NEWfeature{2017/06/01}
@@ -756,16 +756,16 @@ image. To get these effects using the standard package, the
|\rotatebox| or |\scalebox| command.
The keys are read left-to-right, so |[angle=90, height=1in]| means
-rotate by 90 degrees, and then scale to a height of 1in.
+rotate by 90 degrees, and then scale to a height of 1in.
|[height=1in, angle=90]| would result in a final \emph{width} of 1in.
-If the \textsf{calc} package is also loaded the lengths may use
-\textsf{calc} syntax, for instance to specify a width of 2\,cm
+If the \textsf{calc} package is also loaded the lengths may use
+\textsf{calc} syntax, for instance to specify a width of 2\,cm
less than the text width: |[width=\textwidth-2cm]|.
\TeX\ leaves the space specified either in the file, or in
the optional arguments. If any part of the image is actually outside
-this area, it will by default overprint the surrounding text.
+this area, it will by default overprint the surrounding text.
If the star form is used, or |clip| specified, any part of the image
outside this area will not be printed.
@@ -858,9 +858,9 @@ must exist at the time \LaTeX\ is used.
system behaves when a file with extension \emph{ext} is specified.
(The extension may be specified explicitly or, if the argument to
|\includegraphics| does not have an extension, it may be a default
- extension from the \emph{ext-list} specified with
+ extension from the \emph{ext-list} specified with
|\DeclareGraphicsExtensions|.)
-
+
\emph{ext} the file extension for which this rule applies. As a special
case, \emph{ext} may be given as |*| to denote the default behaviour for
all undeclared extensions (see the example below).
@@ -878,7 +878,7 @@ a separate file with extension |.ps.bb|. If \emph{read-file} is empty,
|{}|, then the system will not try to locate an external file for size
info, and the size must be specified in the arguments of
|\includegraphics|. If the driver file specifies a procedure for
-reading size files for \emph{type}, that will be used, otherwise the
+reading size files for \emph{type}, that will be used, otherwise the
procedure for reading |eps| files will be used. Thus the size of
bitmap files may be specified in a file with a PostScript style
|%%BoundingBox| line, if no other specific format is available.
@@ -914,7 +914,7 @@ above command so that the last argument is:\\
which incantation causes the |kpsewhich| program to find the
file, by searching along \LaTeX's path, and then pass the full path
name to the |zcat| program so that it can uncompress the file.
-Any such uses are very system dependent, and would best be placed in
+Any such uses are very system dependent, and would best be placed in
a |graphics.cfg| file, thus keeping the document itself portable.
\subsection{Global setting of keys}
@@ -953,13 +953,13 @@ print a company logo as part of the letterhead.
As the author of the class you may want to give the users the
possibility of using either interface in their letters (should they
-need to include any further graphics into the letter body).
+need to include any further graphics into the letter body).
In this case the class should load the \package{graphics} package (not
\package{graphicx}, as this would commit any users of the class to the
\package{keyval} interface). The logo should be included with
|\includegraphics| either with \emph{no} optional argument (if the
correct size information is in the file) or \emph{both} optional
-arguments otherwise.
+arguments otherwise.
Do not use the \emph{one} optional argument form, as the meaning of this
argument would change (and generate errors) if the user were to load
\package{graphicx} as well as your class.
diff --git a/macros/latex/required/graphics/keyval.dtx b/macros/latex/required/graphics/keyval.dtx
index 1e1581eee3..dd1f542832 100644
--- a/macros/latex/required/graphics/keyval.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/keyval.pdf b/macros/latex/required/graphics/keyval.pdf
index 375ae88b39..3096eb4614 100644
--- a/macros/latex/required/graphics/keyval.pdf
+++ b/macros/latex/required/graphics/keyval.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/lscape.dtx b/macros/latex/required/graphics/lscape.dtx
index a5a3dc3220..e14462c9d4 100644
--- a/macros/latex/required/graphics/lscape.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/lscape.pdf b/macros/latex/required/graphics/lscape.pdf
index 69cab578f1..3b425736bf 100644
--- a/macros/latex/required/graphics/lscape.pdf
+++ b/macros/latex/required/graphics/lscape.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotating.dtx b/macros/latex/required/graphics/rotating.dtx
index 149c19d049..535f115594 100644
--- a/macros/latex/required/graphics/rotating.dtx
+++ b/macros/latex/required/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/macros/latex/required/graphics/rotating.pdf b/macros/latex/required/graphics/rotating.pdf
index 704c4e11e5..f893e672ae 100644
--- a/macros/latex/required/graphics/rotating.pdf
+++ b/macros/latex/required/graphics/rotating.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.pdf b/macros/latex/required/graphics/rotex.pdf
index 12ff8587b1..ac8f0d43cb 100644
--- a/macros/latex/required/graphics/rotex.pdf
+++ b/macros/latex/required/graphics/rotex.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.tex b/macros/latex/required/graphics/rotex.tex
index 9dabfd37f7..0ba5948998 100644
--- a/macros/latex/required/graphics/rotex.tex
+++ b/macros/latex/required/graphics/rotex.tex
@@ -75,7 +75,7 @@ written at 10 degree intervals round the compass. We use
`rlap' to ensure that all the texts are printed at the same point.
Just to show that \TeX\ can handle PostScript muckings-about
properly\ldots
-\begin{example}
+\begin{example}
\newcount\wang
\newsavebox{\wangtext}
\newdimen\wangspace
@@ -100,7 +100,7 @@ desires \LaTeX\ to leave space for the rotated box, then `turn' is used:
\end{turn} end here
\end{example}
The environment `Sideways' is a special case, setting the rotation to $-90$,
-and leaving the correct space for the rotated box.
+and leaving the correct space for the rotated box.
\begin{example}
Start here
\begin{sideways}%
@@ -120,18 +120,18 @@ the \TeX\ box,
you have to adjust the box in the normal \LaTeX\ way:
\begin{example}
\newsavebox{\foo}
-\savebox{\foo}{\parbox{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
End
\end{example}
\begin{example}
-\savebox{\foo}{\parbox[b]{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox[b]{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
@@ -139,7 +139,7 @@ End
\end{example}
\def\testrot#1{%
-\savebox{\foo}{\parbox{1in}{Save
+\savebox{\foo}{\parbox{1in}{Save
the whales Save the whale Save the whale Save the whale}}%
\framebox{---\begin{turn}{#1}\framebox{\usebox{\foo}}\end{turn}---}}%
@@ -272,9 +272,9 @@ figures, this presents no problem. Figure \ref{fig1} shows how
PostScript files which are being incorporated using can be
rotated at will, while Figure \ref{fig2} shows, in contrast, how
`includegraphics' itself handles rotation. It is also possible to rotate the
-whole of the figure environment, including caption,
+whole of the figure environment, including caption,
by using the `sidewaysfigure' ands `sidewaystable' environments
-in place of `figure' and `table'.
+in place of `figure' and `table'.
Sideways figures and tables always take up the whole page. They can be
rotated so that the bottom ot the figures is on the left or the right;
@@ -315,7 +315,7 @@ on the final page.\label{rotfloat1}}
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -331,7 +331,7 @@ Bones&&&\\
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
@@ -425,7 +425,7 @@ on the final page.\label{rotfloat1}}
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -441,7 +441,7 @@ Bones&&&\\
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
diff --git a/macros/latex/required/graphics/trig.dtx b/macros/latex/required/graphics/trig.dtx
index 2b152578ad..67f6c6a970 100644
--- a/macros/latex/required/graphics/trig.dtx
+++ b/macros/latex/required/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
diff --git a/macros/latex/required/graphics/trig.pdf b/macros/latex/required/graphics/trig.pdf
index f8af90699c..0273a683d6 100644
--- a/macros/latex/required/graphics/trig.pdf
+++ b/macros/latex/required/graphics/trig.pdf
Binary files differ