summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/graphics/graphics.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-13 23:57:15 +0000
committerKarl Berry <karl@freefriends.org>2014-11-13 23:57:15 +0000
commit3e547f01cff20101db9b8b4b211fcf7adfe7191f (patch)
tree7862f83e052a0d1a178eaf30a08678eb901c39e3 /Master/texmf-dist/source/latex/graphics/graphics.dtx
parente0056016e425d97e79d80fdee01acf4cd84c1d8d (diff)
latex2e (13nov14)
git-svn-id: svn://tug.org/texlive/trunk@35577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/graphics/graphics.dtx')
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphics.dtx27
1 files changed, 14 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index ab2f34066f1..39d0d4575f1 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -4,7 +4,7 @@
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995--1999 2001 David Carlisle
%% Copyright (C) 2005--2006 David Carlisle, LaTeX3 Project
-%% Copyright (C) 2009 LaTeX3 Project
+%% Copyright (C) 2009-2014 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 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)]
+ [2014/10/28 v1.0p Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -142,10 +142,10 @@
% will be determined by reading an external file as described below.
% If \oarg{urx,ury} is present, then it should specify the coordinates
% of the top right corner of the image, as a pair of \TeX\ dimensions.
-% If the units are ommited they default to |bp|. So |[1in,1in]| and
+% If the units are omitted they default to |bp|. So |[1in,1in]| and
% |[72,72]| are equivalent. If only one optional argument appears, the
% lower left corner of the image is assumed to be at |[0,0]|. Otherwise
-% \oarg{llx,lly} may be used to specify the cordinates of this point.
+% \oarg{llx,lly} may be used to specify the coordinates of this point.
%
% \DescribeMacro
% \graphicspath\marg{dir-list}\\
@@ -211,7 +211,7 @@
% info, and the size must be specified in the arguments of
% |\includegraphics|. As a special case |*| may be used to denote the
% same extension as the graphic file. This is mainly of use in
-% conjuction with using |*| as the extension, as in that case the
+% conjunction with using |*| as the extension, as in that case the
% particular graphic extension is not known. For example
%\begin{verbatim}
% \DeclareGraphicsRule{*}{eps}{*}{}
@@ -525,7 +525,7 @@
% \changes{v0.3g}{1994/03/15}
% {Use dvips def file not development version}
% \begin{option}{xdvi}
-% Tomas Rockiki's PostScript driver (unix, MSDOS, VMS\ldots).
+% Tomas Rockicki's PostScript driver (unix, MSDOS, VMS\ldots).
% The |X11| previewer |xdvi| supports basically the same set of
% |\specials|.
% \begin{macrocode}
@@ -857,9 +857,9 @@
% \end{macro}
%
% \begin{macro}{\Gin@iii}
-% Set the cordinates of the {\bfseries l}lower {\bfseries l}eft corner,
-% and the cordinates of the {\bfseries u}pper {\bfseries r}ight
-% corner. The cordinates may be any \TeX\ dimension, defaulting to |bp|.
+% Set the coordinates of the {\bfseries l}lower {\bfseries l}eft corner,
+% and the coordinates of the {\bfseries u}pper {\bfseries r}ight
+% corner. The coordinates may be any \TeX\ dimension, defaulting to |bp|.
% \changes{v0.6c}{1994/12/15}
% {(Denis Roegel) Extra group to keep bb settings local}
% \begin{macrocode}
@@ -883,7 +883,7 @@
% and if a unit is supplied, converts to `bp' and stores the value in
% |#1|. If a unit is not supplied `bp' is assumed, and |#2| is directly
% stored in |#1|. Note that supplying `bp' is not quite the same as
-% supplying no units, as in the former case a convertion via `pt' and
+% supplying no units, as in the former case a conversion via `pt' and
% back to `bp' takes place which can introduce rounding error. The error
% is invisibly small but files conforming to Adobe DSC should have
% \emph{integer} Bounding Box Coordinates, and conceivably some drivers
@@ -1098,7 +1098,7 @@
% \begin{macrocode}
\Gin@viewport@code
% \end{macrocode}
-% Save the natural size, and then call |\Gin@req@sizes| whic (in the
+% Save the natural size, and then call |\Gin@req@sizes| which (in the
% key-val interface) will calculate the required size from the natural
% size, and any scaling info.
% \begin{macrocode}
@@ -1195,6 +1195,7 @@
% \end{macro}
%
% \begin{macro}{\Gin@nosize}
+% \changes{v1.0p}{2014/10/14}{Fixed typo in error message}
% \changes{v0.7f}{1995/11/10}
% {Macro added}
% This command is called in the case that the graphics type
@@ -1203,7 +1204,7 @@
% \begin{macrocode}
\def\Gin@nosize#1{%
\@latex@error
- {Cannot determine size of graphic in #1 (no size specifed)}%
+ {Cannot determine size of graphic in #1 (no size specified)}%
\@ehc}
% \end{macrocode}
% \end{macro}
@@ -1443,7 +1444,7 @@
% box.
% We define two formulae (as \TeX\ macros) to work out the $x$ and $y$
% coordinates of vertices of the rotated box
-% in relation to its original coordinates (ie its width, height
+% in relation to its original coordinates (i.e., its width, height
% and depth). The box we visualize with vertices $B$, $C$,
% $D$ and $E$ is illustrated below. The vertex
% $S$ is the reference point on the baseline. $O$ is the centre of