From b77a348b68095e25ff53806034cd68543066a39d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 17 Jun 2016 10:20:33 +0000 Subject: graphics (17Jun) git-svn-id: svn://tug.org/texlive/trunk@41468 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/graphics/cat-eps-converted-to.pdf | 84 ++ Master/texmf-dist/doc/latex/graphics/changes.txt | 4 + Master/texmf-dist/doc/latex/graphics/color.pdf | Bin 200967 -> 200967 bytes Master/texmf-dist/doc/latex/graphics/drivers.pdf | Bin 263033 -> 263549 bytes Master/texmf-dist/doc/latex/graphics/epsfig.pdf | Bin 153962 -> 153962 bytes Master/texmf-dist/doc/latex/graphics/graphics.pdf | Bin 279018 -> 279018 bytes Master/texmf-dist/doc/latex/graphics/graphicx.pdf | Bin 230370 -> 230370 bytes Master/texmf-dist/doc/latex/graphics/grfguide.pdf | Bin 301615 -> 301615 bytes Master/texmf-dist/doc/latex/graphics/keyval.pdf | Bin 222533 -> 222533 bytes Master/texmf-dist/doc/latex/graphics/lscape.pdf | Bin 150122 -> 150122 bytes Master/texmf-dist/doc/latex/graphics/rotating.pdf | Bin 245974 -> 245924 bytes Master/texmf-dist/doc/latex/graphics/rotex.pdf | Bin 253977 -> 162265 bytes Master/texmf-dist/doc/latex/graphics/rotex.tex | 1167 ++++++++------------ Master/texmf-dist/doc/latex/graphics/trig.pdf | Bin 191710 -> 191710 bytes .../texmf-dist/source/latex/graphics/drivers.dtx | 12 +- .../texmf-dist/source/latex/graphics/rotating.dtx | 3 +- Master/texmf-dist/tex/latex/graphics/dvipdf.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvips.def | 8 +- Master/texmf-dist/tex/latex/graphics/dvipsnam.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvipsone.def | 2 +- Master/texmf-dist/tex/latex/graphics/dviwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/emtex.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctex32.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexhp.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexps.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/tcidvi.def | 2 +- Master/texmf-dist/tex/latex/graphics/truetex.def | 2 +- 28 files changed, 608 insertions(+), 692 deletions(-) create mode 100755 Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf (limited to 'Master/texmf-dist') 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 new file mode 100755 index 00000000000..e116acec8ae --- /dev/null +++ b/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf @@ -0,0 +1,84 @@ +%PDF-1.5 +%쏢 +5 0 obj +<> +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[3b|!e}!Q I։φTceu9yy=?/ F\endstream +endobj +6 0 obj +686 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +2016-06-17T01:25:42+01:00 +2016-06-17T01:25:42+01:00 +COREL DRAW + +CAT.TMP + + + + + +endstream +endobj +2 0 obj +<>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 [<72D52C1F3210E494095A964146618F96><72D52C1F3210E494095A964146618F96>] +>> +startxref +2683 +%%EOF diff --git a/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt index 4c27e1e99ad..92105b0acd9 100644 --- a/Master/texmf-dist/doc/latex/graphics/changes.txt +++ b/Master/texmf-dist/doc/latex/graphics/changes.txt @@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2016-06-17 David Carlisle + + * drivers.dtx: guards for contributed packages and plain TeX. + 2016-06-02 David Carlisle * graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips diff --git a/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf index 432346fe4c5..9f79d8bde5f 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/color.pdf and b/Master/texmf-dist/doc/latex/graphics/color.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/drivers.pdf b/Master/texmf-dist/doc/latex/graphics/drivers.pdf index 9e25ae75f16..4139f2acf2e 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/drivers.pdf and b/Master/texmf-dist/doc/latex/graphics/drivers.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf index 1e5f4ac5cc7..e07e0266da9 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf and b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/graphics.pdf b/Master/texmf-dist/doc/latex/graphics/graphics.pdf index b820bc9aab3..336225e1b5f 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/graphics.pdf and b/Master/texmf-dist/doc/latex/graphics/graphics.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf index 74f213287dc..29a26bd6aef 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf and b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf index a3e2d440793..36088037887 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf and b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf index fbf7259d7dc..175ceeff384 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/keyval.pdf and b/Master/texmf-dist/doc/latex/graphics/keyval.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/lscape.pdf b/Master/texmf-dist/doc/latex/graphics/lscape.pdf index 4478551d64f..22cf9372592 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/lscape.pdf and b/Master/texmf-dist/doc/latex/graphics/lscape.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/rotating.pdf b/Master/texmf-dist/doc/latex/graphics/rotating.pdf index 8f34b2d322b..69cb5c1f951 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/rotating.pdf and b/Master/texmf-dist/doc/latex/graphics/rotating.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.pdf b/Master/texmf-dist/doc/latex/graphics/rotex.pdf index 38edafde0b5..de72ae3ec63 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/rotex.pdf and b/Master/texmf-dist/doc/latex/graphics/rotex.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.tex b/Master/texmf-dist/doc/latex/graphics/rotex.tex index 142f0b54fd6..9dabfd37f74 100644 --- a/Master/texmf-dist/doc/latex/graphics/rotex.tex +++ b/Master/texmf-dist/doc/latex/graphics/rotex.tex @@ -1,687 +1,500 @@ -% -% \iffalse -% -% $Id: rotating.dtx,v 1.21 2010/01/26 13:25:07 rf10 Exp rf10 $ -% -% File: rotating.dtx -% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca -% Copyright 2001--2003,2007--2009 Robin Fairbairns -% Mail contact: rf10@cam.ac.uk -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Robin Fairbairns. -% -% This work consists of the files rotating.dtx and rotating.ins, -% and the derived file rotating.sty, and testing material -% rotex.tex and cat.eps -% -% \begin{macrocode} -\NeedsTeXFormat{LaTeX2e} -%<*dtx> -\ProvidesFile{rotating.dtx}% -% -%\ProvidesPackage{rotating}% - [2016/05/22 v2.16c -% rotated objects in LaTeX% -%<*dtx> - rotating package source file% -% - ]% $Id: rotating.dtx,v 1.21 2010/01/26 13:25:07 rf10 Exp rf10 $ -%<*dtx> -\documentclass{ltxdoc} -\GetFileInfo{rotating.dtx} -\begin{document} - \title{A package for rotated objects in \LaTeX\thanks{This file has - version number \fileversion, last revised \filedate}} - \author{Robin Fairbairns\thanks{Contact: rf10@cam.ac.uk} - \and Sebastian Rahtz \and Leonor Barroca} - \date{printed \today} - \maketitle - \tableofcontents -% \listoffigures -% \listoftables - \DocInput{rotating.dtx} -\end{document} -% -% \fi -% \CheckSum{485} -% \begin{abstract} -% This article documents a \LaTeX\ package, `rotating.sty', -% which performs most sorts of -% rotation one might like, including rotation of complete floating -% figures and tables. -% \end{abstract} -% -% \section{Introduction} -% -% The package provides: -% \begin{itemize} -% \item two new environments, \texttt{sidewaystable} and -% \texttt{sidewaysfigure}, each of which produces a single page-size -% float with contents rotated $\pm90$\,degrees; and -% \item a variety of other rotation-related commands and environments. -% \end{itemize} -% -% Note that the package uses rotation facilities from the -% \textsf{graphicx} package. When generating DVI output, users should -% note that rotation is typically \emph{not} visible in a DVI viewer: -% conversion to, and viewing, PostScript or PDF is necessary. -% -% \section{Usage} -% -% \subsection{Package options} -% -% Sideways figures and tables always take up the whole page. In -% single-sided documents, they may be rotated so that the bottom of -% the figures is on the left (package option -% `\texttt{counterclockwise}') or the right (package option -% `\texttt{clockwise}'). The default is to turn so that the bottom is -% on the right (option `\texttt{clockwise}'). -% -% Option `\texttt{anticlockwise}' is an alias for -% `\texttt{counterclockwise}'. -% -% If the `\texttt{twoside}' option has been given to the main document -% class (either explicitly, or implicitly as in the default for book -% class), the package will rotate sideways figures according to the -% page number (this requires at least two passes through \LaTeX{}). -% If you want the `\texttt{twoside}' option, but want the figures -% always in one direction, use the `\texttt{figuresright}' or -% `\texttt{figuresleft}' options to the package. -% -% The package can produce a lot of logging information; the -% amount of information is controlled by the package options -% `\texttt{quiet}' (fewest messages; default), `\texttt{log}' and -% `\texttt{chatter}' (most messages). -% -% All other options are passed to the \textsf{graphicx} package when -% it is loaded to provide rotation functions. -% -% \subsection{Float environments} -% -% The environments \texttt{sidewaystable} and \texttt{sidewaysfigure} -% introduce landscape-form floating tables and figures, respectively. -% (Each of the environments has a ``starred'' version, such as -% \texttt{sidewaystable*}, for a single-column float in a double-column -% area of the document.) -% -% New rotated environments may be declared using the combined -% facilities of the float and rotfloat packages. -% -% \subsection{Other environments and commands} -% The package provides other \LaTeX\ environments: -% \begin{description} -% \item[\mdseries\ttfamily sideways] prints the contents of the -% environment turned through 90 degrees counterclockwise; -% \item[\mdseries\ttfamily turn] prints the contents turned through an -% arbitrary angle (the argument to the environment); -% \item[\mdseries\ttfamily rotate] prints the contents turned through -% an arbitrary angle but does \emph{not} leave any space for the result -% \end{description} -% -% The command \cs{turnbox}\marg{angle}\marg{matter to turn} is a macro -% version of the \texttt{rotate} environment. -% -% A set of examples is given in the file \texttt{examples.tex} -% -% \subsection{Positioning} -% -% Floats appear one to a page, and are positioned by spacer skips that -% appear (logically) above and below the floating object. The skips, -% \cs{rotFPtop} and \cs{rotFPbot}, are initialised from the standard -% \LaTeX{} (internal) \cs{@fptop} and \cs{@fpbot} skips. As a result, -% by default, rotated floats appear horizontally centred on their -% float pages. -% -% Some sensible values for the registers are: -% \par\noindent -% \begin{tabular}{@{}llp{3in}@{}} -% \cs{rotFPtop} & \cs{rotFPbot} & Effect \\ -% \hline -% 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 \\ -% 0pt plus 1fil & 0pt plus 2fil & figure/table's bottom appears -% twice as far from the edge as the -% top does -% \end{tabular} -% -% \StopEventually{} -% -% \section{Setup} -% Now we present the documented code. First, package options. -% -% Note that the \texttt{clockwise} and \texttt{counterclockwise} -% options are present for compatibility only. -% \begin{macrocode} -%<*package> -\DeclareOption{clockwise}{% - \AtBeginDocument{\setkeys{Grot}{units=360}}% -} -\DeclareOption{counterclockwise}{% - \AtBeginDocument{\setkeys{Grot}{units=-360}}% -} -\DeclareOption{anticlockwise}{\ds@counterclockwise} -% \end{macrocode} -% Control figure orientation -% \begin{macrocode} -\DeclareOption{figuresleft}{% - \@rot@twosidefalse - \def\rot@LR{0}% -} -\DeclareOption{figuresright}{% - \@rot@twosidefalse - \def\rot@LR{-1}% -} -% \end{macrocode} -% -% control messages: -% \begin{macrocode} -\newif\ifrot@messages -\DeclareOption{quiet}{% - \rot@messagesfalse - \let\rot@message\@gobble % pro tem -- should suppress altogether -} -\DeclareOption{log}{% - \rot@messagestrue - \def\rot@message{\PackageInfo{rotating}}% -} -\DeclareOption{chatter}{% - \rot@messagestrue - \def\rot@message{\PackageWarning{rotating}}% +\errorcontextlines32 +\documentclass[twoside]{report} +\usepackage[chatter]{rotating} +\usepackage{fancyvrb} +\makeatletter +\newsavebox{\@display} +\newcommand\@@Display[1]{% + \sbox\@display{% + \begin{minipage}[b]{.45\textwidth}% + #1\end{minipage}% + }\raisebox{\depth}{\usebox{\@display}}% } -% \end{macrocode} -% -% \begin{macro}{\if@rot@twoside} -% \begin{macro}{\rot@LR} -% A couple of commands for passing rotation direction around -% \begin{macrocode} -\newif\if@rot@twoside -\if@twoside - \@rot@twosidetrue -\else - \@rot@twosidefalse -\fi -\def\rot@LR{-1} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% Pass any unknown options to the \textsf{graphicx} package, and -% set up defaults and process the options. -% \begin{macrocode} -\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} -\ExecuteOptions{clockwise,quiet} -\ProcessOptions -% \end{macrocode} -% -% Other initialisation -% \begin{macrocode} -\RequirePackage{graphicx} -\RequirePackage{ifthen} -% \end{macrocode} -% -% \begin{macro}{\rotdriver} -% The command \cs{rotdriver} allows a user to specify an initialisation file, -% a sort of non-automatically-loaded driver (in the graphics, hyperref -% sense). -% \begin{macrocode} -\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} -\newcounter{r@tfl@t} -\setcounter{r@tfl@t}{0} -% \end{macrocode} -% -% Positioning skips (see above). -% \begin{macrocode} -\newskip\rotFPtop \rotFPtop=\@fptop -\newskip\rotFPbot \rotFPbot=\@fpbot -% \end{macrocode} -% -% \section{Turning and rotation environments} -% \begin{macro}{sideways} -% Environment to turn the contents through 90 degrees. -% \begin{macrocode} -\def\sideways{% - \Grot@setangle{90}% - \setbox\z@\color@hbox\ignorespaces} -\def\endsideways{% - \unskip\color@endbox - \Grot@x\z@ - \Grot@y\z@ - \Grot@box -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{turn} -% Rotate the contents of the environment, leaving the appropriate space -% \begin{macrocode} -\def\turn#1{% - \Grot@setangle{#1}% - \setbox\z@\color@hbox\ignorespaces} -\def\endturn{% - \unskip\color@endbox - \Grot@x\z@ - \Grot@y\z@ - \Grot@box -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{rotate} -% Rotate the contents of the environment, leaving \emph{no space}. -% \begin{macrocode} -\def\rotate#1{% - \Grot@setangle{#1}% - \setbox\z@\color@hbox\ignorespaces} -\def\endrotate{% - \unskip\color@endbox - \Grot@x\z@ - \Grot@y\z@ - \wd0\z@\dp0\z@\ht0\z@ - \Grot@box + +\newcommand\@@VDisplay[1]{% + \sbox\@display{% + \begin{minipage}[b]{.45\textwidth}% + \BVerbatimInput[fontsize=\small]{#1}% + \end{minipage}}% + \usebox{\@display}% } -% \end{macrocode} -% \end{macro} -% \begin{macro}{\turnbox} -% A macro version of the `rotate' environment. -% \begin{macrocode} -\def\turnbox#1#2{% - \Grot@setangle{#1}% -% \end{macrocode} -% Note: grouping within the box makes \cs{color@hbox} unnecessary, I think. -% \begin{macrocode} - \setbox\z@\hbox{{#2}}% - \Grot@x\z@\Grot@y\z@ - \wd0\z@\dp0\z@\ht0\z@ - \Grot@box +\newcommand\SideBySide[2]{% +\bgroup\def\baselinestretch{1}% + \trivlist\item[]% + \leavevmode + \makebox[\textwidth][l]{\@@Display{#1}\hspace{1em}% + \@@VDisplay{#2}}% + \endtrivlist + \egroup } -% \end{macrocode} -% \end{macro} -% \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 -% |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} -% First a generalised `rotfloat' environment. We need to intercept -% \LaTeX's float macros, in order to change the assumed width of a -% float being |\columnwidth|. We want it to work on a width of -% |\textheight| so that when we rotate the float, it comes out -% the right height. This is not actually very satisfactory, since what -% we \emph{really} want is for rotated floats to occupy the space they -% actually \emph{use}. The captions are a problem --- since they can -% precede the figure or table, we cannot set them in a box of the -% right width (ie the \emph{height} of the forthcoming object), because -% it has not happened yet. The result of these difficulties is that -% rotated figures always end up as full page figures. -% \begin{macrocode} -\newsavebox\rot@float@box -\def\@rotfloat#1{% - \@ifnextchar[% - {\@xrotfloat{#1}}% - {\edef\@tempa{\noexpand\@xrotfloat{#1}[\csname fps@#1\endcsname]}\@tempa}% +\newcommand\BeginExample{% + \nobreak + \VerbatimEnvironment + \catcode`\<=12 + \begin{VerbatimOut}{\jobname.ex}% } -\def\@xrotfloat#1[#2]{% - \@float{#1}[#2]% -% \end{macrocode} -% Set the float contents in -% a box of width \cs{textheight} instead of \cs{columnwidth}. -% \begin{macrocode} - \begin{lrbox}\rot@float@box - \begin{minipage}\textheight +\newcommand{\EndExample}{\end{VerbatimOut}} + +\newenvironment{example} + {\nobreak + \VerbatimEnvironment + \catcode`\<=12 + \begin{VerbatimOut}{\jobname.ex}% } -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\end@rotfloat} -% We call \LaTeX's \cs{end@float} macro having previously rotated -% the box \cs{@currbox}. -% The rotation is either clockwise or -% anti-clockwise, depending on whether the page is odd or even; -% in oneside mode it is always odd. -% \begin{macrocode} -\def\end@rotfloat{% -% \end{macrocode} -% 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} - \end{minipage}\end{lrbox}% - \stepcounter{r@tfl@t}% - \rot@label{RF\ther@tfl@t}% - \rot@pageref{RF\ther@tfl@t}{\R@@page}% - \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space} - \rot@mess@toks\expandafter{\@tempa} - \wd\rot@float@box\z@ - \ht\rot@float@box\z@ - \dp\rot@float@box\z@ - \vbox to \textheight{% -% \end{macrocode} -% We need to know for sure which direction rotation is going to -% be in, so locally reset the graphics units. -% \begin{macrocode} - \setkeys{Grot}{units=360}% - \if@rot@twoside - \else - \let\R@@page\rot@LR - \fi - \ifthenelse{\isodd{\R@@page}}{% - \if@rot@twoside - \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% - \fi - \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 - \@@line{% - \hskip\rotFPbot - \rotatebox{-90}{\box\rot@float@box}% - \hskip\rotFPtop - }% - \vfill - }% - \rot@message{\the\rot@mess@toks} - }% - \end@float -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\sidewaysfigure} -% \begin{macro}{\endsidewaysfigure} -% \begin{macro}{\sidewaystable} -% \begin{macro}{\endsidewaystable} -% 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 -% and tables. -% \begin{macrocode} -\def\sidewaysfigure{\@rotfloat{figure}} -% -\let\endsidewaysfigure\end@rotfloat -% -\def\sidewaystable{\@rotfloat{table}} -\let\endsidewaystable\end@rotfloat -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@rotdblfloat} -% \begin{macro}{\end@rotdblfloat} -% Handling double column floats -% \begin{macrocode} -\def\@rotdblfloat{% - \if@twocolumn\expandafter\@rotdbflt\else\expandafter\@rotfloat\fi -} -\def\@rotdbflt#1{\@ifnextchar[{\@rotxdblfloat{#1}}{\@rotxdblfloat{#1}[tp]}} -\def\@rotxdblfloat#1[#2]{% - \@float{#1}[#2]% - \hsize\textwidth\linewidth\textwidth - \begin{lrbox}\rot@float@box - \begin{minipage}\textheight -} -\def\end@rotdblfloat{% -% \end{macrocode} -% 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! -% \begin{macrocode} - \end{minipage}\end{lrbox}% - \stepcounter{r@tfl@t}% - \rot@label{RF\ther@tfl@t}% - \rot@pageref{RF\ther@tfl@t}{\R@@page}% - \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space} - \rot@mess@toks\expandafter{\@tempa} - \@tempdima\ht\rot@float@box - \advance\@tempdima by \dp\rot@float@box -% \ifrot@messages -% \rot@message{BOX wd: \the\wd\rot@float@box, -% ht: \the\ht\rot@float@box, dp: \the\dp\rot@float@box: -% so shift by .5 of \the\@tempdima}% -% \fi - \wd\rot@float@box\z@ - \ht\rot@float@box\z@ - \dp\rot@float@box\z@ - \vbox to \textheight{% -% \end{macrocode} -% We need to know for sure which direction rotation is going to -% be in, so locally reset the graphics units. -% \begin{macrocode} - \setkeys{Grot}{units=360}% - \if@rot@twoside - \else - \let\R@@page\rot@LR - \fi - \ifthenelse{\isodd{\R@@page}}{% - \ifrot@messages - \if@rot@twoside - \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% - \fi - \fi - \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% - \@@line{% - \hskip\rotFPbot - \rotatebox{-90}{\box\rot@float@box}% - \hskip\rotFPtop - }% - \vfill - }% - \rot@message{\the\rot@mess@toks}% - }% - \end@dblfloat + {\end{VerbatimOut} + \SideBySide {\input{\jobname.ex}}% + {\jobname.ex}} +\makeatother +%------------------------------------------------------- +\def\degrees{{\small$^{\mathrm{o}}$}} +%------------------------------------------------------- + +\begin{document} + +\title{Test of `rotating' package} +\author{Sebastian Rahtz and Leonor Barroca\thanks{Now maintained as part of the \LaTeX\ graphics bundle.}} +\date{November 19th 1994\thanks{Updated for graphics bundle 2016/05/22}} +\maketitle + +`Rotating' provides a generalised rotation environment, where the text +will be rotated (anti-clockwise) by the number of degrees specified as +a parameter to the environment, but no special arrangement is made to +find space for the result. + +\begin{example} +Start here +\begin{rotate}{-56} +Save whales +\end{rotate} +End here +\end{example} + +A complete example of rotating text without leaving space +would the `Save the whale' text +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} +\newcount\wang +\newsavebox{\wangtext} +\newdimen\wangspace +\def\wheel#1{\savebox{\wangtext}{#1}% +\wangspace\wd\wangtext +\advance\wangspace by 1cm% +\centerline{% +\rule{0pt}{\wangspace}% +\rule[-\wangspace]{0pt}{\wangspace}% +\wang=-180\loop\ifnum\wang<180 +\rlap{\begin{rotate}{\the\wang}% +\rule{1cm}{0pt}#1\end{rotate}}% +\advance\wang by 10\repeat}} +\wheel{Save the whale} +\end{example} + +If the user +desires \LaTeX\ to leave space for the rotated box, then `turn' is used: +\begin{example} + Start here \begin{turn}{56}% + Save the whale + \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. +\begin{example} +Start here +\begin{sideways}% +Save the whale +\end{sideways} +End here +\end{example} + +If you deal with whole paragraphs of text, you realize that \TeX\ +boxes are not as simple as they sometimes look: they have a height +{\em and} a depth. So when you rotate, you rotate about the point on +the left-hand edge of the box that meets the baseline. The results can +be unexpected, as shown in the full set of paragraph rotations in +Figures \ref{angles1} and \ref{angles2}. If you really want to turn a +paragraph so that it appears to rotate about the {\em real} bottom of +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 +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 +Save the whale}}% +Start +\begin{turn}{45}\usebox{\foo}\end{turn} +End +\end{example} + +\def\testrot#1{% +\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}---}}% + +\begin{figure*} +\begin{tabular}{|c|c|c|} +\hline +\testrot{0} &\testrot{-40}&\testrot{-80}\\ +0\degrees & -40\degrees & -80\degrees \\ +\hline +\testrot{-120}&\testrot{-160}&\testrot{-200}\\ +120\degrees & -160\degrees & -200\degrees \\ +\hline +\testrot{-240}&\testrot{-280}&\testrot{-320}\\ +-240\degrees & -280\degrees & -320\degrees \\ +\hline +\end{tabular} +\caption{Rotation of paragraphs between 0 and -320 degrees \label{angles1}} +\end{figure*} + +\begin{figure*} +\begin{tabular}{|c|c|c|} +\hline +\testrot{-180} &\testrot{40}&\testrot{80}\\ +-180\degrees & 40\degrees & 80\degrees \\ +\hline +\testrot{120}&\testrot{160}&\testrot{200}\\ +120\degrees & 160\degrees & 200\degrees \\ +\hline +\testrot{240}&\testrot{280}&\testrot{320}\\ +240\degrees & 280\degrees & 320\degrees \\ +\hline +\end{tabular} +\caption{Rotation of paragraphs between 0 and 320 degrees\label{angles2}} +\end{figure*} + + +We can set tabular material in this way; at the same time, we +demonstrate that the rotation can be nested: +\begin{example} +\begin{sideways} +\rule{1in}{0pt} +\begin{tabular}{|lr|} +\em Word & \begin{rotate}{90}% +Occurrences\end{rotate} +\\ +\hline +hello & 33\\ +goodbye & 34\\ +\hline +\end{tabular} +\end{sideways} +\end{example} + +\begin{example} +\begin{quote} +\rule{0pt}{1.5in}\begin{tabular}{rrr} +\begin{rotate}{45}Column 1\end{rotate}& +\begin{rotate}{45}Column 2\end{rotate}& +\begin{rotate}{45}Column 3\end{rotate}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{quote} +\begin{tabular}{rrr} +\begin{turn}{45}Column 1\end{turn}& +\begin{turn}{45}Column 2\end{turn}& +\begin{turn}{45}Column 3\end{turn}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{quote} +\rule{0pt}{1.5in}\begin{tabular}{rrr} +\begin{rotate}{45}Column 1\end{rotate} +\rule{.5cm}{0pt}& +\begin{rotate}{45}Column 2\end{rotate} +\rule{.5cm}{0pt}& +\begin{rotate}{45}Column 3\end{rotate} +\rule{.5cm}{0pt}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{sideways} +\begin{tabular}{|l|c|c|c|c|c|p{1in}|} +\hline +&&\multicolumn{4}{c}{NUMBER OF SITES}\vline &ACCEPT or\\ +\cline{3-6} &STUDY AREA&&\multicolumn{3}{c}{% +IN BOUNDARY ZONE}\vline&REJECT\\ +\cline{4-6}&&&&\multicolumn{2}{c}{EXPECTED} +\vline&NULL\\ +\cline{5-6}&&TOT&OBS&FROM&TO&HYPOTH\\ +\cline{2-7} +&FULL SAMPLE&41&31&10.3&27.0&REJECT\\ +&SAMPLE AREA 1&23&16&4.3&16.7&ACCEPT\\ +&SAMPLE AREA 2&18&15&2.8&13.7&REJECT\\ +&RUSHEN&13&9&1.2&10.4&ACCEPT\\ +&ARBORY&10&7&0.6&8.8&ACCEPT\\ +&MAROWN&10&8&0.4&8.6&ACCEPT\\ +\rule{0.5cm}{0pt} +\begin{rotate}{90}PRIMARY UNITS% +\end{rotate}\rule{0.5cm}{0pt} +&SANTON&8&7&0.0&7.3&ACCEPT\\ +\hline +\end{tabular} +\end{sideways} +\end{example} + +If you are interested in setting rotated material in tables or +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, +by using the `sidewaysfigure' ands `sidewaystable' environments +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; +the default is to always turn to the right. If the `twoside' option +has been given to the main document class, this package then starts +rotating sideways figures according to the page number (this requires +two passes through \LaTeX{} at least). If you want the `twoside' +option, but want the figures always in one direction, use the +`figuresright' or `riguresleft' options to `rotating'. + +The code used to produce figures +\ref{rotfloat1}--\ref{rotfloat4} is as follows: +\begin{description} + +\item[Figure \ref{rotfloat1}] +{\small\begin{verbatim} +\begin{sidewaystable} +\centering +\caption{This is a narrow table, which should be centred vertically +on the final page.\label{rotfloat1}} + \begin{tabular}{|ll|} +\hline + a & b \\ + c & d \\ + e & f \\ + g & h \\ + i & j \\ +\hline + \end{tabular} +\end{sidewaystable} +\end{verbatim} } -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{environment}{sidewaysfigure*} -% \begin{environment}{sidewaystable*} -% \begin{macrocode} -\newenvironment{sidewaystable*} - {\@rotdblfloat{table}} - {\end@rotdblfloat} -\newenvironment{sidewaysfigure*} - {\@rotdblfloat{figure}} - {\end@rotdblfloat} - -% \end{macrocode} -% \end{environment} -% \end{environment} -% -% \begin{macro}{\rot@label} -% \begin{macro}{\rot@thepage} -% \begin{macro}{\rot@pageref} -% \begin{macro}{\rot@protected@write} -% \begin{macro}{\if@rot@refundefined} -% Note that we used \cs{rot@label}, not \cs{label}; this -% variant writes (just) the \emph{true} page number, not the -% value of \cs{thepage}; this ``true'' value then needs special -% treatment in \cs{protected@write}, just as -% \cs{thepage} already has. -% \cs{rot@pageref}\marg{generated label name}\marg{cs to set to -% pageno} then returns the labelled page's number (or 0 if label not -% yet defined). If label not defined, flags using -% \cs{rot@refundefinedtrue} for end-document to pick up. (later...) -% \begin{macrocode} -\def\rot@thepage{\@arabic\c@page} -\def\rot@label#1{\@bsphack - \rot@protected@write{\@auxout}{}% - {\string\newlabel{#1}{\rot@thepage}}% - \@esphack} -\def\rot@pageref#1#2{% - \expandafter\ifx\csname r@#1\endcsname\relax - \global\@rot@refundefinedtrue - \def#2{0}% - \else - \edef#2{\csname r@#1\endcsname}% - \fi + +\item[Figure \ref{rotfloat2}] +{\scriptsize\begin{verbatim} +\begin{sidewaystable} +\centering +\begin{tabular}{|llllllllp{1in}lp{1in}|} +\hline +Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\ + & &Diameter & & & & & +Bones&&&\\ +\hline +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Grooved Ware}&\\ +784 &--- &0.9m &0.18m &Sloping U &P1 &$\times$46 & $\times$8 && $\times$2 bone& 2150$\pm$ 100 BC\\ +785 &--- &1.00m &0.12 &Sloping U &P2--4 &$\times$23 & $\times$21 & Hammerstone &---&---\\ +962 &--- &1.37m &0.20m &Sloping U &P5--6 &$\times$48 & $\times$57* & ---& ---&1990 $\pm$ 80 BC (Layer 4) 1870 $\pm$90 BC (Layer 1)\\ +983 &0.83m &0.73m &0.25m &Stepped U &--- &$\times$18 & $\times$8 & ---& Fired clay&---\\ +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Beaker}&\\ +552 &--- &0.68m &0.12m &Saucer &P7--14 &--- & --- & --- &--- &---\\ +790 &--- &0.60m &0.25m &U &P15 &$\times$12 & --- & Quartzite-lump&--- &---\\ +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 +Assemblages see Tables I and III; for +the Flints see Tables II and IV; for the +Animal Bones see Table V.}\label{rotfloat2} +\end{sidewaystable} +\end{verbatim} } -\long\def\rot@protected@write#1#2#3{% - \begingroup - \let\rot@thepage\relax - #2% - \let\protect\@unexpandable@protect - \edef\reserved@a{\write#1{#3}}% - \reserved@a - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi + +\item[Figure \ref{rotfloat3}] +{\small\begin{verbatim} +\begin{table} +\centering +\rotcaption{Minimum number of individuals; effect of rotating table +and caption separately}\label{rotfloat3}% +\begin{sideways} +\begin{tabular}[b]{cccccccccp{1cm}} +\hline +Phase&Total&Cattle&Sheep&Pig&Red Deer&Horse&Dog&Goat&Other\\ +\hline +&1121&54&12&32&1&1&1&1&1 polecat\\ +3&8255&58&6&35&1&1&1&1&1 roe deer, 1 hare, 1 cat, 1 otter\\ +4&543&45&6&45&4&1&1&---&---\\ +\hline +&9919&157&24&112&6&3&3&2&5\\ +\hline +\end{tabular} +\end{sideways} +\end{table} +\end{verbatim} } -\newif\if@rot@refundefined -\global\@rot@refundefinedfalse -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\rot@mess@toks} -% A token register to build up debugging messages -% \begin{macrocode} -\newtoks\rot@mess@toks -% \end{macrocode} -% \end{macro} -% -% \subsection{Rotated captions only} -% -% \begin{macro}{\rotcaption} -% \begin{macro}{\@makerotcaption} -% Sometimes you may find that the rotation of complete figures does -% not give quite the right result, since they always take up the whole -% page. You may prefer to rotate the caption and the float contents -% separately within a conventional figure. Here we offer a suggestion -% for a \cs{rotcaption} command, which inserts the caption rotated -% by 90 degrees. It is essentially a copy of the normal captioning -% code. -% Packages which define the \cs{@makecaption} command may also need -% to define \cs{@makerotcaption}. -% \begin{macrocode} -\def\rotcaption{\refstepcounter\@captype\@dblarg{\@rotcaption\@captype}} -\long\def\@rotcaption#1[#2]#3{% - \addcontentsline{\csname ext@#1\endcsname}{#1}{% - \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% - \par - \begingroup - \@parboxrestore - \normalsize - \@makerotcaption{\csname fnum@#1\endcsname}{#3}% - \endgroup} - \long\def\@makerotcaption#1#2{% - \setbox\@tempboxa\color@hbox#1: #2\color@endbox - \ifdim \wd\@tempboxa > .8\vsize - \rotatebox{90}{% - \begin{minipage}{.8\textheight}#1: #2\end{minipage}% - }% - \else% - \rotatebox{90}{\box\@tempboxa}% - \fi - \nobreak - \hspace{12pt}% + +\item[Figure \ref{rotfloat4}] +{\small\begin{verbatim} +\begin{sidewaysfigure} + \centering + \includegraphics[width=.8\textheight,height=.4\textwidth]{cat} +\caption{A pathetically squashed rotated pussycat}\label{rotfloat4} +\end{sidewaysfigure} +\end{verbatim} } -% -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \section{Last-minute infrastructure} -% -% \begin{macro}{\color@hbox} -% \begin{macro}{\color@endbox} -% These macros aren't provided in \LaTeX{}, by default (I seem to have -% assumed that they were\dots) -% \begin{macrocode} -\AtBeginDocument{% - \providecommand\color@hbox{\hbox\bgroup}% - \providecommand\color@vbox{\vbox\bgroup}% - \providecommand\color@endbox{\egroup}% +\end{description} + +\begin{figure} +\begin{example} +---\begin{turn}{156} +\includegraphics[width=1in]{cat} +\end{turn}--- +\end{example} + +\begin{example} +---\begin{sideways} +\includegraphics[width=1in]{cat} +\end{sideways}--- +\end{example} + +\begin{example} +---\includegraphics[width=1in]{cat}--- +\end{example} +\caption{A normal, and sideways, pictures within a figure\label{fig1}} +\end{figure} + +\begin{figure} +\begin{example} +\includegraphics[width=1in,% +angle=-56]{cat} +\end{example} + +\caption{Figures rotated with `includegraphics'\label{fig2}} +\end{figure} +\begin{sidewaystable} +\centering +\caption{This is a narrow table, which should be centred vertically +on the final page.\label{rotfloat1}} + \begin{tabular}{|ll|} +\hline + a & b \\ + c & d \\ + e & f \\ + g & h \\ + i & j \\ +\hline + \end{tabular} +\end{sidewaystable} + + + +\begin{sidewaystable} +\centering +\begin{tabular}{|llllllllp{1in}lp{1in}|} +\hline +Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\ + & &Diameter & & & & & +Bones&&&\\ +\hline +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Grooved Ware}&\\ +784 &--- &0.9m &0.18m &Sloping U &P1 &$\times$46 & $\times$8 && $\times$2 bone& 2150$\pm$ 100 BC\\ +785 &--- &1.00m &0.12 &Sloping U &P2--4 &$\times$23 & $\times$21 & Hammerstone &---&---\\ +962 &--- &1.37m &0.20m &Sloping U &P5--6 &$\times$48 & $\times$57* & ---& ---&1990 $\pm$ 80 BC (Layer 4) 1870 $\pm$90 BC (Layer 1)\\ +983 &0.83m &0.73m &0.25m &Stepped U &--- &$\times$18 & $\times$8 & ---& Fired clay&---\\ +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Beaker}&\\ +552 &--- &0.68m &0.12m &Saucer &P7--14 &--- & --- & --- &--- &---\\ +790 &--- &0.60m &0.25m &U &P15 &$\times$12 & --- & Quartzite-lump&--- &---\\ +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 +Assemblages see Tables I and III; for +the Flints see Tables II and IV; for the +Animal Bones see Table V.}\label{rotfloat2} +\end{sidewaystable} + +\begin{table} +\centering +\hbox{ +\rotcaption{Minimum number of individuals; effect of rotating table +and caption separately}\label{rotfloat3}% +\begin{sideways} +\begin{tabular}[t]{cccccccccp{1cm}} +\hline +Phase&Total&Cattle&Sheep&Pig&Red Deer&Horse&Dog&Goat&Other\\ +\hline +&1121&54&12&32&1&1&1&1&1 polecat\\ +3&8255&58&6&35&1&1&1&1&1 roe deer, 1 hare, 1 cat, 1 otter\\ +4&543&45&6&45&4&1&1&---&---\\ +\hline +&9919&157&24&112&6&3&3&2&5\\ +\hline +\end{tabular} +\end{sideways} } -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \section{History} -% -% Version 2.0 is a complete re-write, with most of the work now -% being done by the \LaTeXe\ graphics package. -% -% Version 2.1 provides a `clockwise' option to reinstate the behaviour -% described in the `\LaTeX\ Companion' -% -% Version 2.2 just intercepts the standard float macros instead -% of copying and changing the. The `twoside' option is obeyed. -% -% Version 2.5 corrects problems in sideways figures. -% -% Version 2.6 is a rewrite of the sideways floats via Frank Mittelbach -% (to whom many thanks for looking at the mangy code). -% -% Version 2.7 is checked for \LaTeX\ of December 94, and adds the option -% of twoside behaviour independent of the general twoside. -% -% Version 2.8 cleans up some mistakes pointed out by Harald Axel -% Sommerfeldt. -% -% Version 2.9 cleans up some (more) mistakes pointed out by Harald -% Axel Sommerfeldt. -% -% Version 2.13a permits positioning of rotated floats in the same way -% as they are positioned in `normal' floats. -% -% Version 2.14 is the first to be published anywhere as the outcome of -% maintenance by Robin Fairbairns. -% -% Version 2.15 deals with page-numbering bug for auto-float-rotation, -% and tidying of messages; published to ctan -% -% Version 2.16 uses colour boxes as necessary; published to ctan. -% Version 2.16a provides the colour box commands \cs{AtBeginDocument}. -% -% \Finale -\endinput -% +\end{table} + + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (1)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (2)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (3)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (4)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat}\label{rotfloat4} +\end{sidewaysfigure} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf index e47c48b8234..4cab32d41fa 100644 Binary files a/Master/texmf-dist/doc/latex/graphics/trig.pdf and b/Master/texmf-dist/doc/latex/graphics/trig.pdf differ diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index 31c3f1c5507..07c201cf873 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -37,7 +37,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{drivers.dtx} % - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] % %<*driver> \documentclass{ltxdoc} @@ -551,8 +551,17 @@ % \section{Page Size} % % \changes{v3.0l}{2016/06/02}{page size special added to patch pdftex.def} +% \changes{v3.0m}{2016/06/17}{guards for contributed packages and plain TeX} +% \begin{macrocode} +\@ifundefined{ifGin@setpagesize} + {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname + \csname iftrue\endcsname} + {} +% \end{macrocode} +% % \begin{macrocode} \ifGin@setpagesize +\ifx\paperwidth\@undefined\else \AtBeginDocument{\AtBeginDvi{% \begingroup \ifx\stockwidth\@undefined\else @@ -566,6 +575,7 @@ \fi \endgroup}} \fi +\fi % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx index f36174a7ece..ca4c9203b77 100644 --- a/Master/texmf-dist/source/latex/graphics/rotating.dtx +++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx @@ -18,9 +18,8 @@ % % This work has the LPPL maintenance status `maintained'. % -% The Current Maintainer of this work is Robin Fairbairns. % -% This work consists of the files rotating.dtx and rotating.ins, +% This work consists of the file rotating.dtx % and the derived file rotating.sty, and testing material % rotex.tex and cat.eps % diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index 18aae59bc75..caa7f13c7cb 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipdf.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/dvips.def b/Master/texmf-dist/tex/latex/graphics/dvips.def index 4794f2cf128..8e36afb649f 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics/dvips.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvips.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -140,7 +140,12 @@ \def\Gin@PS@restored#1{\special{" #1}} \def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}} \def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}} +\@ifundefined{ifGin@setpagesize} + {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname + \csname iftrue\endcsname} + {} \ifGin@setpagesize +\ifx\paperwidth\@undefined\else \AtBeginDocument{\AtBeginDvi{% \begingroup \ifx\stockwidth\@undefined\else @@ -154,6 +159,7 @@ \fi \endgroup}} \fi +\fi \def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps} \@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} \@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index eb33a1cce0a..4cbfe9c6096 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsnam.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \DefineNamedColor{named}{GreenYellow} {cmyk}{0.15,0,0.69,0} \DefineNamedColor{named}{Yellow} {cmyk}{0,0,1,0} \DefineNamedColor{named}{Goldenrod} {cmyk}{0,0.10,0.84,0} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index 1b3ebdc64d6..62bc97b85bc 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsone.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index df09b15dddc..46f9feab4fe 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dviwin.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \@namedef{Gin@rule@*}#1{{bmp}{}{#1}} \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{% diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index 32c19fa171c..33700992240 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{emtex.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{\special{em:graph #1}}% \typeout{WARNING: emtex does not permit graphics to be scaled}% diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 7ca014e6fec..885b006623f 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctex32.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index fc9029a4630..b9d05fa1e94 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexhp.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@pcl#1{% \message{<#1>}% \ifGin@clip diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index d5a57ce8835..13161ad409b 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexps.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index 3d8b2637d7b..862a03c082c 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexwin.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@eps#1{% \message{<#1>}% \ifGin@clip diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index 5a68e2dd192..9e92ebf51b2 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{tcidvi.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index 3d754309a8c..bd0acc49611 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{truetex.def} - [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi -- cgit v1.2.3