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/doc/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/doc/latex/graphics')
16 files changed, 58 insertions, 129 deletions
diff --git a/Master/texmf-dist/doc/latex/graphics/README.md b/Master/texmf-dist/doc/latex/graphics/README.md index 6567a09f2f1..f319461c367 100644 --- a/Master/texmf-dist/doc/latex/graphics/README.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf deleted file mode 100644 index 7da1b3dcd58..00000000000 --- a/Master/texmf-dist/doc/latex/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_0kh Rn@{݈/`v6:+uhr1N{=tDOE,tڜitn,}b0ζ=PxBE|-rϚ9HI뵛l9fn^n/;{Ǯ˸: ȋAɍbƕJӈ,P۷BS`<)h(LHĔqN*X q‽?;9_W(l#ܜCfj
sBUCcWu~cyV$(1WH]7+ /mA"znYRU1j1GKV{2, V!YB.R%]>Kج,)gx kT(iRښ(ٷwи'Qk{T -*Bd5d[<h7N @Y ݚd ξջiMg`i[d k B0I-3 - yVD'1۫_+(x 5"<Y? AE5f'gρ
tYic5R8 t`>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/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt index f4343bc2c39..108723ddb4c 100644 --- a/Master/texmf-dist/doc/latex/graphics/changes.txt +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf Binary files differindex c7360251f16..4953d86459d 100644 --- a/Master/texmf-dist/doc/latex/graphics/color.pdf +++ b/Master/texmf-dist/doc/latex/graphics/color.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/drivers.pdf b/Master/texmf-dist/doc/latex/graphics/drivers.pdf Binary files differindex 9d9ac44a910..7d424d4d952 100644 --- a/Master/texmf-dist/doc/latex/graphics/drivers.pdf +++ b/Master/texmf-dist/doc/latex/graphics/drivers.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf Binary files differindex 953af25b5fb..25a6c138210 100644 --- a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf +++ b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/graphics.pdf b/Master/texmf-dist/doc/latex/graphics/graphics.pdf Binary files differindex 918a377b0cb..ccf7a574dce 100644 --- a/Master/texmf-dist/doc/latex/graphics/graphics.pdf +++ b/Master/texmf-dist/doc/latex/graphics/graphics.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf Binary files differindex 8e2772f5b51..243ca190741 100644 --- a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf +++ b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf Binary files differindex 80aebf496f1..144513d883c 100644 --- a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf +++ b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.tex b/Master/texmf-dist/doc/latex/graphics/grfguide.tex index 19888db741c..d25bcac27bb 100644 --- a/Master/texmf-dist/doc/latex/graphics/grfguide.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf Binary files differindex 375ae88b39f..3096eb4614d 100644 --- a/Master/texmf-dist/doc/latex/graphics/keyval.pdf +++ b/Master/texmf-dist/doc/latex/graphics/keyval.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/lscape.pdf b/Master/texmf-dist/doc/latex/graphics/lscape.pdf Binary files differindex 69cab578f14..3b425736bf6 100644 --- a/Master/texmf-dist/doc/latex/graphics/lscape.pdf +++ b/Master/texmf-dist/doc/latex/graphics/lscape.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/rotating.pdf b/Master/texmf-dist/doc/latex/graphics/rotating.pdf Binary files differindex 704c4e11e57..f893e672ae7 100644 --- a/Master/texmf-dist/doc/latex/graphics/rotating.pdf +++ b/Master/texmf-dist/doc/latex/graphics/rotating.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.pdf b/Master/texmf-dist/doc/latex/graphics/rotex.pdf Binary files differindex 12ff8587b11..ac8f0d43cb3 100644 --- a/Master/texmf-dist/doc/latex/graphics/rotex.pdf +++ b/Master/texmf-dist/doc/latex/graphics/rotex.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.tex b/Master/texmf-dist/doc/latex/graphics/rotex.tex index 9dabfd37f74..0ba5948998c 100644 --- a/Master/texmf-dist/doc/latex/graphics/rotex.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf Binary files differindex f8af90699c1..0273a683d67 100644 --- a/Master/texmf-dist/doc/latex/graphics/trig.pdf +++ b/Master/texmf-dist/doc/latex/graphics/trig.pdf |