texlive[41468] Master/texmf-dist: graphics (17Jun)
commits+preining at tug.org
commits+preining at tug.org
Fri Jun 17 12:20:33 CEST 2016
Revision: 41468
http://tug.org/svn/texlive?view=revision&revision=41468
Author: preining
Date: 2016-06-17 12:20:33 +0200 (Fri, 17 Jun 2016)
Log Message:
-----------
graphics (17Jun)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/graphics/changes.txt
trunk/Master/texmf-dist/doc/latex/graphics/color.pdf
trunk/Master/texmf-dist/doc/latex/graphics/drivers.pdf
trunk/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
trunk/Master/texmf-dist/doc/latex/graphics/graphics.pdf
trunk/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
trunk/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
trunk/Master/texmf-dist/doc/latex/graphics/keyval.pdf
trunk/Master/texmf-dist/doc/latex/graphics/lscape.pdf
trunk/Master/texmf-dist/doc/latex/graphics/rotating.pdf
trunk/Master/texmf-dist/doc/latex/graphics/rotex.pdf
trunk/Master/texmf-dist/doc/latex/graphics/rotex.tex
trunk/Master/texmf-dist/doc/latex/graphics/trig.pdf
trunk/Master/texmf-dist/source/latex/graphics/drivers.dtx
trunk/Master/texmf-dist/source/latex/graphics/rotating.dtx
trunk/Master/texmf-dist/tex/latex/graphics/dvipdf.def
trunk/Master/texmf-dist/tex/latex/graphics/dvips.def
trunk/Master/texmf-dist/tex/latex/graphics/dvipsnam.def
trunk/Master/texmf-dist/tex/latex/graphics/dvipsone.def
trunk/Master/texmf-dist/tex/latex/graphics/dviwin.def
trunk/Master/texmf-dist/tex/latex/graphics/emtex.def
trunk/Master/texmf-dist/tex/latex/graphics/pctex32.def
trunk/Master/texmf-dist/tex/latex/graphics/pctexhp.def
trunk/Master/texmf-dist/tex/latex/graphics/pctexps.def
trunk/Master/texmf-dist/tex/latex/graphics/pctexwin.def
trunk/Master/texmf-dist/tex/latex/graphics/tcidvi.def
trunk/Master/texmf-dist/tex/latex/graphics/truetex.def
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf
Added: trunk/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf 2016-06-17 10:20:33 UTC (rev 41468)
@@ -0,0 +1,87 @@
+%PDF-1.5
+%\xC7쏢
+5 0 obj
+<</Length 6 0 R/Filter /FlateDecode>>
+stream
+x\x9CUUK\x92U!
\x9D\xDFU\xB0\xE4$\xC8,\xEA\xDE@'=\xB0
\xB8}\xF3\xA3[\xAB\xAB\x8B
\xE4s\xCEI\xC8\xFB\xD5FG\xFEW\xEB\xEB\xED\xF9\xF4m\xB7 \xBF \xF8џ\xE8s\xF3n_\x9E0kh\x9F Rn\xA0\xDD\xCF@{\xB3݈/`v\xA86:+u\xD4h\xA7\xA5r\xE71N{=t\xECDO\xDB\xD2E\xD5,t\xDBڜi\xC1\xE3t\xF3n,}b\xF3\xE0\xB1\xC2\xE3\x9E0\x8Fζ\xC7\xC9=\xE9\xF1P\x8D\x86\xA5\x84x\x8EBE|-rϚ9H\xA8\x89\xA7I뵛l9\xEDfn^\x85n/;{Ǯ\xE8˸:
\xB7\xA5ȋ\xD5\xDDA\xE2\xFCɍ\xA7\xFEbƕ\xB7\xA3\xC6J\x92ӈ\xE0\x8D,\x89\xE3P\x8F\xE1\x88۷BS`\xAD<)\xC1\xD3\xE2h\xF6\xB8(\xEE\xFD\x92L\x85\x83HĔ\xF4qN*X\x81\xE7\xBD
q\x8B‽\xED?\xA5\xB1\xD8;9_\x86\xFCW(\xACl#\xBEܜC\xE4\xB6fj
+\xF3s\x81\xE4B\xA3\x91\xE9UC\xC3cWu\xBC\xD0~cy\x82\x89\xE7V\x88\xAA\x90\xCE$\xBE(\xD7\xEB1W\xD2\xC3H\xBA\x8C\xDB]7+
/mA"\xCA\xF7z\xD5\xB2\xD9n\xF3Y\xF7\xA6RU\xAD\xC61\x8Fj\xAF\xB3\xAD\xF4\xD91\xA6\xDE\xFC\xA0G\x82KV\xD4{2\xD2,\xCD V\x9B\xBA\xBD\xA6!\xBCY\xEEB\xE3\x8F.\x9ER\xE5%\xB9]\xA7\xF0\xE9>K\xCBج,\xC5)\xB9\xB0gx\xBE
\xBB\xB0k\xCDT(iRښ(ٷ\xB3wи'Q\xF3\x8C\xCE\xC8k{T\xC1\x8D\x94
+\xF9*Bd5\x9D\xAB\xF4d\xAF\xB5[<h\xF6\x917\x80\x83\xD1N @\x99Y\x8C
\xA9\xF5ݚ\x86d\xB7
ξ\xB4\x97ջ\xFBiMg\xA3`\xC5\xEB\xDCi[\xDEd\x85 k\xB9\xD8
\x87B\xFE0\xD8I\xF2-\xFB\xA03
+\xF5
y\xB4VD\xF0'1\xB8\xAB۫\x94_\xBA\x8F\xBD\x94\xE6\xA4+\xD5(\x99\xB9x\xD0\xE2
\x855\xC9\xFB"<Y? A\xA1\xB7E\xCB\xF2\xB25f\xE0'g\xC9\xD6ρ
+\x9A\x91\xA9t\xF7Yi\xE7\xCC\xC8\xC8c\xBB5\xCFR8
t\xE3\x9A`>3b|\xD2\xCA!e}\xAA\x85\xE9!\xB9\xDEQ
+I\xE4\x97։\xF5\x83\xABφTceu9\xFE\xFDyy=?\x9F\xEF\xCF\xD7\xE7/ \xC9F\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:92f77d6f-6c3e-11f1-0000-b0069176419e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.15'/>
+<rdf:Description rdf:about='uuid:92f77d6f-6c3e-11f1-0000-b0069176419e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-06-17T01:25:42+01:00</xmp:ModifyDate>
+<xmp:CreateDate>2016-06-17T01:25:42+01:00</xmp:CreateDate>
+<xmp:CreatorTool>COREL DRAW</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:92f77d6f-6c3e-11f1-0000-b0069176419e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:92f77d6f-6c3e-11f1-0000-b0069176419e'/>
+<rdf:Description rdf:about='uuid:92f77d6f-6c3e-11f1-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.15)
+/CreationDate(D:20160617012542+01'00')
+/ModDate(D:20160617012542+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 [<72D52C1F3210E494095A964146618F96><72D52C1F3210E494095A964146618F96>]
+>>
+startxref
+2683
+%%EOF
Property changes on: trunk/Master/texmf-dist/doc/latex/graphics/cat-eps-converted-to.pdf
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/graphics/changes.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics/changes.txt 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/doc/latex/graphics/changes.txt 2016-06-17 10:20:33 UTC (rev 41468)
@@ -4,6 +4,10 @@
are not part of the distribution.
=======================================================================
+2016-06-17 David Carlisle <latex-bugs at latex-project.org>
+
+ * drivers.dtx: guards for contributed packages and plain TeX.
+
2016-06-02 David Carlisle <latex-bugs at latex-project.org>
* graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips
Modified: trunk/Master/texmf-dist/doc/latex/graphics/color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/drivers.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/graphics.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/keyval.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/lscape.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/rotating.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/rotex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/graphics/rotex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics/rotex.tex 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/doc/latex/graphics/rotex.tex 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at 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}%
-%</dtx>
-%<package>\ProvidesPackage{rotating}%
- [2016/05/22 v2.16c
-%<package> rotated objects in LaTeX%
-%<*dtx>
- rotating package source file%
-%</dtx>
- ]% $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 at cam.ac.uk}
- \and Sebastian Rahtz \and Leonor Barroca}
- \date{printed \today}
- \maketitle
- \tableofcontents
-% \listoffigures
-% \listoftables
- \DocInput{rotating.dtx}
-\end{document}
-%</dtx>
-% \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}}%
+\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}}%
}
-\DeclareOption{counterclockwise}{%
- \AtBeginDocument{\setkeys{Grot}{units=-360}}%
+
+\newcommand\@@VDisplay[1]{%
+ \sbox\@display{%
+ \begin{minipage}[b]{.45\textwidth}%
+ \BVerbatimInput[fontsize=\small]{#1}%
+ \end{minipage}}%
+ \usebox{\@display}%
}
-\DeclareOption{anticlockwise}{\ds at counterclockwise}
-% \end{macrocode}
-% Control figure orientation
-% \begin{macrocode}
-\DeclareOption{figuresleft}{%
- \@rot at twosidefalse
- \def\rot at LR{0}%
+\newcommand\SideBySide[2]{%
+\bgroup\def\baselinestretch{1}%
+ \trivlist\item[]%
+ \leavevmode
+ \makebox[\textwidth][l]{\@@Display{#1}\hspace{1em}%
+ \@@VDisplay{#2}}%
+ \endtrivlist
+ \egroup
}
-\DeclareOption{figuresright}{%
- \@rot at twosidefalse
- \def\rot at LR{-1}%
+\newcommand\BeginExample{%
+ \nobreak
+ \VerbatimEnvironment
+ \catcode`\<=12
+ \begin{VerbatimOut}{\jobname.ex}%
}
-% \end{macrocode}
-%
-% control messages:
-% \begin{macrocode}
-\newif\ifrot at messages
-\DeclareOption{quiet}{%
- \rot at messagesfalse
- \let\rot at message\@gobble % pro tem -- should suppress altogether
-}
-\DeclareOption{log}{%
- \rot at messagestrue
- \def\rot at message{\PackageInfo{rotating}}%
-}
-\DeclareOption{chatter}{%
- \rot at messagestrue
- \def\rot at message{\PackageWarning{rotating}}%
-}
-% \end{macrocode}
-%
-% \begin{macro}{\if at rot@twoside}
-% \begin{macro}{\rot at LR}
-% A couple of commands for passing rotation direction around
-% \begin{macrocode}
-\newif\if at rot@twoside
-\if at twoside
- \@rot at twosidetrue
-\else
- \@rot at twosidefalse
-\fi
-\def\rot at 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 at 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 at tfl@t}
-\setcounter{r at 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 at setangle{90}%
- \setbox\z@\color at hbox\ignorespaces}
-\def\endsideways{%
- \unskip\color at endbox
- \Grot at x\z@
- \Grot at y\z@
- \Grot at box
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{turn}
-% Rotate the contents of the environment, leaving the appropriate space
-% \begin{macrocode}
-\def\turn#1{%
- \Grot at setangle{#1}%
- \setbox\z@\color at hbox\ignorespaces}
-\def\endturn{%
- \unskip\color at endbox
- \Grot at x\z@
- \Grot at y\z@
- \Grot at box
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{rotate}
-% Rotate the contents of the environment, leaving \emph{no space}.
-% \begin{macrocode}
-\def\rotate#1{%
- \Grot at setangle{#1}%
- \setbox\z@\color at hbox\ignorespaces}
-\def\endrotate{%
- \unskip\color at endbox
- \Grot at x\z@
- \Grot at y\z@
- \wd0\z@\dp0\z@\ht0\z@
- \Grot at box
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\turnbox}
-% A macro version of the `rotate' environment.
-% \begin{macrocode}
-\def\turnbox#1#2{%
- \Grot at setangle{#1}%
-% \end{macrocode}
-% Note: grouping within the box makes \cs{color at hbox} unnecessary, I think.
-% \begin{macrocode}
- \setbox\z@\hbox{{#2}}%
- \Grot at x\z@\Grot at y\z@
- \wd0\z@\dp0\z@\ht0\z@
- \Grot at box
-}
-% \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 at 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 at float@box
-\def\@rotfloat#1{%
- \@ifnextchar[%
- {\@xrotfloat{#1}}%
- {\edef\@tempa{\noexpand\@xrotfloat{#1}[\csname fps@#1\endcsname]}\@tempa}%
-}
-\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 at 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 at rotfloat}
-% We call \LaTeX's \cs{end at 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 at 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 at tfl@t}%
- \rot at label{RF\ther at tfl@t}%
- \rot at pageref{RF\ther at tfl@t}{\R@@page}%
- \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space}
- \rot at mess@toks\expandafter{\@tempa}
- \wd\rot at float@box\z@
- \ht\rot at float@box\z@
- \dp\rot at 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 at rot@twoside
- \else
- \let\R@@page\rot at LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
- \if at rot@twoside
- \rot at mess@toks\expandafter{\the\rot at mess@toks (right hand page)}%
- \fi
- \vfill
- \@@line{%
- \hskip\rotFPtop
- \rotatebox{90}{\box\rot at float@box}%
- \hskip\rotFPbot
- }%
- }{%
- \if at rot@twoside
- \rot at mess@toks\expandafter{\the\rot at mess@toks (left hand page)}%
- \fi
- \@@line{%
- \hskip\rotFPbot
- \rotatebox{-90}{\box\rot at float@box}%
- \hskip\rotFPtop
- }%
- \vfill
- }%
- \rot at message{\the\rot at mess@toks}
- }%
- \end at float
+ {\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}
-%
-% \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 at rotfloat
-%
-\def\sidewaystable{\@rotfloat{table}}
-\let\endsidewaystable\end at rotfloat
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@rotdblfloat}
-% \begin{macro}{\end at rotdblfloat}
-% Handling double column floats
-% \begin{macrocode}
-\def\@rotdblfloat{%
- \if at twocolumn\expandafter\@rotdbflt\else\expandafter\@rotfloat\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}
}
-\def\@rotdbflt#1{\@ifnextchar[{\@rotxdblfloat{#1}}{\@rotxdblfloat{#1}[tp]}}
-\def\@rotxdblfloat#1[#2]{%
- \@float{#1}[#2]%
- \hsize\textwidth\linewidth\textwidth
- \begin{lrbox}\rot at float@box
- \begin{minipage}\textheight
+
+\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}
}
-\def\end at 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 at tfl@t}%
- \rot at label{RF\ther at tfl@t}%
- \rot at pageref{RF\ther at tfl@t}{\R@@page}%
- \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space}
- \rot at mess@toks\expandafter{\@tempa}
- \@tempdima\ht\rot at float@box
- \advance\@tempdima by \dp\rot at float@box
-% \ifrot at messages
-% \rot at message{BOX wd: \the\wd\rot at float@box,
-% ht: \the\ht\rot at float@box, dp: \the\dp\rot at float@box:
-% so shift by .5 of \the\@tempdima}%
-% \fi
- \wd\rot at float@box\z@
- \ht\rot at float@box\z@
- \dp\rot at 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 at rot@twoside
- \else
- \let\R@@page\rot at LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
- \ifrot at messages
- \if at rot@twoside
- \rot at mess@toks\expandafter{\the\rot at mess@toks (right hand page)}%
- \fi
- \fi
- \vfill
- \@@line{%
- \hskip\rotFPtop
- \rotatebox{90}{\box\rot at float@box}%
- \hskip\rotFPbot
- }%
- }{%
- \ifrot at messages
- \if at rot@twoside
- \rot at mess@toks\expandafter{\the\rot at mess@toks (left hand page)}%
- \fi
- \fi%
- \@@line{%
- \hskip\rotFPbot
- \rotatebox{-90}{\box\rot at float@box}%
- \hskip\rotFPtop
- }%
- \vfill
- }%
- \rot at message{\the\rot at mess@toks}%
- }%
- \end at dblfloat
+
+\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}
-%
-% \begin{environment}{sidewaysfigure*}
-% \begin{environment}{sidewaystable*}
-% \begin{macrocode}
-\newenvironment{sidewaystable*}
- {\@rotdblfloat{table}}
- {\end at rotdblfloat}
-\newenvironment{sidewaysfigure*}
- {\@rotdblfloat{figure}}
- {\end at rotdblfloat}
+\end{description}
-% \end{macrocode}
-% \end{environment}
-% \end{environment}
-%
-% \begin{macro}{\rot at label}
-% \begin{macro}{\rot at thepage}
-% \begin{macro}{\rot at pageref}
-% \begin{macro}{\rot at protected@write}
-% \begin{macro}{\if at rot@refundefined}
-% Note that we used \cs{rot at 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 at write}, just as
-% \cs{thepage} already has.
-% \cs{rot at 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 at refundefinedtrue} for end-document to pick up. (later...)
-% \begin{macrocode}
-\def\rot at thepage{\@arabic\c at page}
-\def\rot at label#1{\@bsphack
- \rot at protected@write{\@auxout}{}%
- {\string\newlabel{#1}{\rot at thepage}}%
- \@esphack}
-\def\rot at pageref#1#2{%
- \expandafter\ifx\csname r@#1\endcsname\relax
- \global\@rot at refundefinedtrue
- \def#2{0}%
- \else
- \edef#2{\csname r@#1\endcsname}%
- \fi
+\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}
}
-\long\def\rot at protected@write#1#2#3{%
- \begingroup
- \let\rot at thepage\relax
- #2%
- \let\protect\@unexpandable at protect
- \edef\reserved at a{\write#1{#3}}%
- \reserved at a
- \endgroup
- \if at nobreak\ifvmode\nobreak\fi\fi
-}
-\newif\if at rot@refundefined
-\global\@rot at refundefinedfalse
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\rot at mess@toks}
-% A token register to build up debugging messages
-% \begin{macrocode}
-\newtoks\rot at 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 at hbox#1: #2\color at 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}%
-}
-%</package>
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \section{Last-minute infrastructure}
-%
-% \begin{macro}{\color at hbox}
-% \begin{macro}{\color at endbox}
-% These macros aren't provided in \LaTeX{}, by default (I seem to have
-% assumed that they were\dots)
-% \begin{macrocode}
-\AtBeginDocument{%
- \providecommand\color at hbox{\hbox\bgroup}%
- \providecommand\color at vbox{\vbox\bgroup}%
- \providecommand\color at endbox{\egroup}%
-}
-% \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}
Modified: trunk/Master/texmf-dist/doc/latex/graphics/trig.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/graphics/drivers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/graphics/drivers.dtx 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/source/latex/graphics/drivers.dtx 2016-06-17 10:20:33 UTC (rev 41468)
@@ -37,7 +37,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{drivers.dtx}
%</driver>
- [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 at setpagesize}
+ {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
+ \csname iftrue\endcsname}
+ {}
+% \end{macrocode}
+%
+% \begin{macrocode}
\ifGin at setpagesize
+\ifx\paperwidth\@undefined\else
\AtBeginDocument{\AtBeginDvi{%
\begingroup
\ifx\stockwidth\@undefined\else
@@ -566,6 +575,7 @@
\fi
\endgroup}}
\fi
+\fi
% \end{macrocode}
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/graphics/rotating.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/graphics/rotating.dtx 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/source/latex/graphics/rotating.dtx 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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
%
Modified: trunk/Master/texmf-dist/tex/latex/graphics/dvipdf.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/dvipdf.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/dvipdf.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics/dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/dvips.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/dvips.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -140,7 +140,12 @@
\def\Gin at PS@restored#1{\special{" #1}}
\def\Gin at PS@literal at header#1{\AtBeginDvi{\special{! #1}}}
\def\Gin at PS@file at header#1{\AtBeginDvi{\special{header=#1}}}
+\@ifundefined{ifGin at setpagesize}
+ {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
+ \csname iftrue\endcsname}
+ {}
\ifGin at setpagesize
+\ifx\paperwidth\@undefined\else
\AtBeginDocument{\AtBeginDvi{%
\begingroup
\ifx\stockwidth\@undefined\else
@@ -154,6 +159,7 @@
\fi
\endgroup}}
\fi
+\fi
\def\Gin at extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}
\@namedef{Gin at rule@.ps}#1{{eps}{.ps}{#1}}
\@namedef{Gin at rule@.eps}#1{{eps}{.eps}{#1}}
Modified: trunk/Master/texmf-dist/tex/latex/graphics/dvipsnam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/dvipsnam.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/dvipsnam.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/graphics/dvipsone.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/dvipsone.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/dvipsone.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics/dviwin.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/dviwin.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/dviwin.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at rule@*}#1{{bmp}{}{#1}}
\def\Ginclude at bmp#1{%
\raise\Gin at req@height\hbox{%
Modified: trunk/Master/texmf-dist/tex/latex/graphics/emtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/emtex.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/emtex.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at bmp#1{%
\raise\Gin at req@height\hbox{\special{em:graph #1}}%
\typeout{WARNING: emtex does not permit graphics to be scaled}%
Modified: trunk/Master/texmf-dist/tex/latex/graphics/pctex32.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/pctex32.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/pctex32.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics/pctexhp.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/pctexhp.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/pctexhp.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at pcl#1{%
\message{<#1>}%
\ifGin at clip
Modified: trunk/Master/texmf-dist/tex/latex/graphics/pctexps.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/pctexps.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/pctexps.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics/pctexwin.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/pctexwin.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/pctexwin.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at eps#1{%
\message{<#1>}%
\ifGin at clip
Modified: trunk/Master/texmf-dist/tex/latex/graphics/tcidvi.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/tcidvi.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/tcidvi.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
Modified: trunk/Master/texmf-dist/tex/latex/graphics/truetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics/truetex.def 2016-06-17 10:13:15 UTC (rev 41467)
+++ trunk/Master/texmf-dist/tex/latex/graphics/truetex.def 2016-06-17 10:20:33 UTC (rev 41468)
@@ -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 at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
More information about the tex-live-commits
mailing list