summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/graphics/graphicx.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
committerKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
commit610c45beb863b008027a871701c889fe40bed7fb (patch)
tree5b879b56850db183fd749a497edd1d91172edf69 /Master/texmf-dist/source/latex/graphics/graphicx.dtx
parent18fa80c232cf479ae713b01b17d48bdc1d653aac (diff)
latex2e 2014/05/01 (via latex-tds)
git-svn-id: svn://tug.org/texlive/trunk@33946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/graphics/graphicx.dtx')
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphicx.dtx60
1 files changed, 32 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx
index 4c241873eab..e611eb6ceb5 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 1996 1997 1999 David Carlisle
+%% Copyright (C) 1995 1996 1997 1999 2014 David Carlisle
%%
%% 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}
- [1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2014/04/25 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -40,7 +40,7 @@
% \date{\filedate}
% \maketitle
%
-% \CheckSum{593}
+% \CheckSum{596}
%
% \changes{v0.3}{1994/03/01}
% {First DPC version (after prototype by SPQR).}
@@ -109,22 +109,22 @@
% \DescribeMacro
% \includegraphics\star\oarg{llx,lly}\oarg{urx,ury}\marg{file}\\
% Include a graphics file.
-%
+%
% The star form is just for
% compatibility with the standard interface, and essentially just adds
% |clip| to the keys specified. Similarly the second, two-optional
% argument form is for increased compatibility with the standard
% package. The two optional argument form is not needed in the |keyval|
-% interface.
+% interface.
%
% Various `keys' or named arguments are supported.
% \begin{description}
% \item[bb] Set the bounding box. The argument should be four
-% dimensions, separated by spaces.
+% dimensions, separated by spaces.
% \item[bbllx,bblly,bburx,bbury] Set the bounding box. Mainly for
% compatibility with older packages. |bbllx=a,bblly=b,bburx=c,bbury=d|
% is equivalent to |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[viewport] Modify the bounding box specified in the file.
% The four values specify a bounding box \emph{relative} to the
@@ -132,7 +132,7 @@
% \item[trim] Modify the bounding box specified in the file.
% The four values specify the amounts to remove from
% the left, bottom, right and top of the original box.
-% \item[hiresbb] Boolean valued key. Defaults to |true|.
+% \item[hiresbb] Boolean valued key. Defaults to |true|.
% Causes \TeX\ to look for |%%HiResBoundingBox| comments rather than
% the standard |%%BoundingBox|. May be set to |false| to override
% a default setting of true specified by the |hiresbb| package option.
@@ -157,7 +157,7 @@
% draft mode, ie.\ do not include the graphic, but leave the
% correct space, and print the filename.
% \item[type] Specify the file type. (Normally determined from the file
-% extension.)
+% extension.)
% \item[ext] Specify the file extension.
% \emph{Only} for use with |type|.
% \item[read] Specify the `read file' which is used for determining the
@@ -277,7 +277,7 @@
% \begin{key}{Gin}{hiresbb}
% \changes{v1.0b}{1996/10/29}
% {hiresbb key added}
-% If set to true (the default) \TeX\ will look for bounding box
+% If set to true (the default) \TeX\ will look for bounding box
% comments of the form |%%HiResBoundingBox| (which typically have
% real values) instead of the standard |%%BoundingBox| (which should
% have integer values).
@@ -285,7 +285,7 @@
% \begin{macrocode}
\define@key{Gin}{hiresbb}[true]{%
\edef\Gread@BBox{%
- \@percentchar\@percentchar
+ \@percentchar\@percentchar
\csname if#1\endcsname HiRes\fi
BoundingBox}}
% \end{macrocode}
@@ -350,13 +350,13 @@
\let\Gin@olly\Gin@lly
\let\Gin@ourx\Gin@urx
\let\Gin@oury\Gin@ury
- \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
+ \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
\edef\Gin@urx{\strip@pt\dimen@}%
- \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
+ \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
\edef\Gin@ury{\strip@pt\dimen@}%
\dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
\edef\Gin@llx{\strip@pt\dimen@}%
- \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
+ \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
\edef\Gin@lly{\strip@pt\dimen@}}
% \end{macrocode}
% \end{macro}
@@ -466,7 +466,7 @@
% {Use \cs{Gin@exclamation}}
% If the scaling is being handled externally, wrap |\includegraphics| in
% the internal form of |\scalebox|, otherwise locally define
-% |\Gin@req@sizes| to calculate the required sizes based on
+% |\Gin@req@sizes| to calculate the required sizes based on
% scale factor.
% \begin{macrocode}
\define@key{Gin}{scale}{%
@@ -531,7 +531,7 @@
% Specify a read file, for use with the `type' key.
% You may want to globally set this to |*| using |\setkeys|.
% |*| means read the graphic file for size info, as in
-% |\DeclareGraphicsRule|.
+% |\DeclareGraphicsRule|.
% \changes{v0.5a}{1994/11/29}
% {Add default * possibility.}
% \begin{macrocode}
@@ -574,12 +574,12 @@
\if@tempswa
% \end{macrocode}
% External. Wrap the |\includegraphics| command in a call to the
-% internal form of |\scalebox| to handle the rotation.
+% internal form of |\scalebox| to handle the rotation.
% \begin{macrocode}
\edef\@tempa{\toks@{\noexpand
\Gscale@@box\noexpand\Gin@eresize
{\Gin@ewidth}{\Gin@eheight}{\the\toks@}}}%
- \@tempa
+ \@tempa
\else
% \end{macrocode}
% Internal. Handle scaling with the |\includegraphics| command directly
@@ -601,7 +601,7 @@
\let\Gin@@eheight\Gin@eheight
\def\Gin@req@sizes{%
\Gscale@div\Gin@scaley\Gin@@eheight\Gin@nat@height
- \let\Gin@scalex\Gin@exclamation
+ \let\Gin@scalex\Gin@exclamation
\setlength\Gin@req@height\Gin@@eheight
\Gin@req@width\Gin@scaley\Gin@nat@width}%
\fi
@@ -617,7 +617,7 @@
\let\Gin@@ewidth\Gin@ewidth
\def\Gin@req@sizes{%
\Gscale@div\Gin@scalex\Gin@@ewidth\Gin@nat@width
- \let\Gin@scaley\Gin@exclamation
+ \let\Gin@scaley\Gin@exclamation
\setlength\Gin@req@width\Gin@@ewidth
\Gin@req@height\Gin@scalex\Gin@nat@height}%
\else
@@ -709,7 +709,7 @@
% \begin{macro}{\Gin@eheight}
% Final size, initialised for no scaling.
% \begin{macrocode}
-\let\Gin@ewidth\Gin@exclamation
+\let\Gin@ewidth\Gin@exclamation
\let\Gin@eheight\Gin@ewidth
% \end{macrocode}
% \end{macro}
@@ -722,7 +722,7 @@
% Scale factors. Initialised for no scaling.
% \begin{macrocode}
\def\Gin@scalex{1}
-\let\Gin@scaley\Gin@exclamation
+\let\Gin@scaley\Gin@exclamation
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -772,16 +772,19 @@
% \begin{macro}{\rotatebox}
% 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}
% \begin{macrocode}
\def\rotatebox{%
+ \leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Grot@box@std}
% If no KV argument, just repeat the standard definition.
+% \changes{v1.0g}{2014/04/25}{Made long graphics/4296}
% \begin{macrocode}
-\def\Grot@box@std#1#2{%
+\long\def\Grot@box@std#1#2{%
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
\Grot@x\z@
@@ -789,10 +792,11 @@
\Grot@box}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Grot@box@kv}
+% \changes{v1.0g}{2014/04/25}{Made long graphics/4296}
% \begin{macrocode}
-\def\Grot@box@kv[#1]#2#3{%
+\long\def\Grot@box@kv[#1]#2#3{%
\@begin@tempboxa\hbox{#3}%
\Grot@x\width \divide\Grot@x\tw@
\Grot@y\height \advance\Grot@y-\depth \divide\Grot@y\tw@
@@ -803,12 +807,12 @@
\@end@tempboxa}
% \end{macrocode}
% \end{macro}
-%
+%
%
% There are two ways of specifying the centre of rotation.
%
% \begin{key}{Grot}{origin}
-% |origin=|\meta{label}, where the labels are up to two of |lrctbB|
+% |origin=|\meta{label}, where the labels are up to two of |lrctbB|
% (|B| denotes the baseline, as for PSTricks).
% \begin{macrocode}
\define@key{Grot}{origin}[c]{%