From 9a1c781313c984e8d5c88b832b1c08e1da3fe155 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Jun 2016 22:40:56 +0000 Subject: latex2e (14jun16) git-svn-id: svn://tug.org/texlive/trunk@41447 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/latex.ltx | 10 +- Master/texmf-dist/tex/latex/base/latexrelease.sty | 8 +- Master/texmf-dist/tex/latex/base/source2e.tex | 5 +- Master/texmf-dist/tex/latex/graphics/color.sty | 5 +- Master/texmf-dist/tex/latex/graphics/dvipdf.def | 4 +- Master/texmf-dist/tex/latex/graphics/dvips.def | 18 +- Master/texmf-dist/tex/latex/graphics/dvipsnam.def | 4 +- Master/texmf-dist/tex/latex/graphics/dvipsone.def | 4 +- Master/texmf-dist/tex/latex/graphics/dviwin.def | 4 +- Master/texmf-dist/tex/latex/graphics/emtex.def | 4 +- Master/texmf-dist/tex/latex/graphics/graphics.sty | 5 +- Master/texmf-dist/tex/latex/graphics/pctex32.def | 4 +- Master/texmf-dist/tex/latex/graphics/pctexhp.def | 4 +- Master/texmf-dist/tex/latex/graphics/pctexps.def | 4 +- Master/texmf-dist/tex/latex/graphics/pctexwin.def | 4 +- Master/texmf-dist/tex/latex/graphics/rotating.sty | 277 ++++++++++++++++++++++ Master/texmf-dist/tex/latex/graphics/tcidvi.def | 4 +- Master/texmf-dist/tex/latex/graphics/truetex.def | 4 +- Master/texmf-dist/tex/latex/tools/shellesc.sty | 8 +- 19 files changed, 346 insertions(+), 34 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/graphics/rotating.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index f8c54ef0da1..3aded204f11 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -704,7 +704,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2016/03/31} -\def\patch@level{0} +\def\patch@level{1} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -8153,8 +8153,14 @@ Type H for immediate help.}% \fi \ifx\XeTeXcharclass\@undefined \else +\ifdim\the\XeTeXversion\XeTeXrevision\p@>0.99993\p@ + \chardef\e@alloc@intercharclass@top=4095 +\else + \chardef\e@alloc@intercharclass@top=255 +\fi \def\newXeTeXintercharclass{% - \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\m@ne\@cclv} + \e@alloc\XeTeXcharclass + \chardef\xe@alloc@intercharclass\m@ne\e@alloc@intercharclass@top} \fi \ifx\XeTeXcharclass\@undefined \else diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index cae82906ffb..a46148ae2f5 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -2312,8 +2312,14 @@ of this package available from CTAN} {\newXeTeXintercharclass}{Extended Allocation}% \ifx\XeTeXcharclass\@undefined \else +\ifdim\the\XeTeXversion\XeTeXrevision\p@>0.99993\p@ + \chardef\e@alloc@intercharclass@top=4095 +\else + \chardef\e@alloc@intercharclass@top=255 +\fi \def\newXeTeXintercharclass{% - \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\m@ne\@cclv} + \e@alloc\XeTeXcharclass + \chardef\xe@alloc@intercharclass\m@ne\e@alloc@intercharclass@top} \fi \EndIncludeInRelease \IncludeInRelease{0000/00/00}% diff --git a/Master/texmf-dist/tex/latex/base/source2e.tex b/Master/texmf-dist/tex/latex/base/source2e.tex index f3255721268..be9c8a951d0 100644 --- a/Master/texmf-dist/tex/latex/base/source2e.tex +++ b/Master/texmf-dist/tex/latex/base/source2e.tex @@ -161,11 +161,12 @@ page_precedence "rnaA" -% Get the date from ltvers.dtx +% Get the date and patch level from ltvers.dtx \makeatletter \let\patchdate=\@empty \begingroup - \def\ProvidesFile#1\fmtversion#2{\date{#2}\endinput} + \def\ProvidesFile#1\fmtversion#2#3\patch@level#4{% + \date{#2}\xdef\patchdate{#4}\endinput} \input{ltvers.dtx} \global\let\X@date=\@date diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index b38bf850760..0a5b4d1d1af 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [2016/05/09 v1.1c Standard LaTeX Color (DPC)] + [2016/06/02 v1.1d Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -51,6 +51,9 @@ \def\define@color#1#2{% \c@lor@special\m@ne{define #1 #2}}}} \DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} \DeclareOption{dvips}{\def\Gin@driver{dvips.def}% \def\c@lor@namefile{dvipsnam.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index d1ea64b4460..18aae59bc75 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipdf.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 73bb471c5cf..4794f2cf128 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics/dvips.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvips.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -140,6 +140,20 @@ \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}}} +\ifGin@setpagesize + \AtBeginDocument{\AtBeginDvi{% + \begingroup + \ifx\stockwidth\@undefined\else + \paperwidth\stockwidth + \paperheight\stockheight + \fi + \ifdim\paperwidth>\z@ + \ifdim\paperheight>\z@ + \special{papersize=\the\paperwidth,\the\paperheight}% + \fi + \fi + \endgroup}} +\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 1411a44d0d3..eb33a1cce0a 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsnam.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 d37cbb245cc..1b3ebdc64d6 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsone.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 6d839d4fa0c..df09b15dddc 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dviwin.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 4d867435a81..32c19fa171c 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{emtex.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index 235a54c87ee..30bc506f6f1 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2016/05/09 v1.0r Standard LaTeX Graphics (DPC,SPQR)] + [2016/06/02 v1.0s Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -53,6 +53,9 @@ \def\Ginclude@graphics#1{% \rule{\@ifundefined{Gin@@ewidth}{150pt}{\Gin@@ewidth}}% {\@ifundefined{Gin@@eheight}{100pt}{\Gin@@eheight}}}}} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} \providecommand\Gin@driver{} \DeclareOption{dvips}{\def\Gin@driver{dvips.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips}} diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 2949b3e26f8..7ca014e6fec 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctex32.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 ccf616feabf..fc9029a4630 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexhp.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 0cf85afd530..d5a57ce8835 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexps.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 2d792c06788..3d8b2637d7b 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexwin.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] \def\Ginclude@eps#1{% \message{<#1>}% \ifGin@clip diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty new file mode 100644 index 00000000000..08fad184e88 --- /dev/null +++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty @@ -0,0 +1,277 @@ +%% +%% This is file `rotating.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% rotating.dtx (with options: `package') +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at http://latex-project.org/bugs.html +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca +%% Copyright 2001--2003,2007--2009 Robin Fairbairns +%% Copyright 2016 LaTeX3 Project +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{rotating}% + [2016/05/22 v2.16c + rotated objects in LaTeX% + ] +\DeclareOption{clockwise}{% + \AtBeginDocument{\setkeys{Grot}{units=360}}% +} +\DeclareOption{counterclockwise}{% + \AtBeginDocument{\setkeys{Grot}{units=-360}}% +} +\DeclareOption{anticlockwise}{\ds@counterclockwise} +\DeclareOption{figuresleft}{% + \@rot@twosidefalse + \def\rot@LR{0}% +} +\DeclareOption{figuresright}{% + \@rot@twosidefalse + \def\rot@LR{-1}% +} +\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}}% +} +\newif\if@rot@twoside +\if@twoside + \@rot@twosidetrue +\else + \@rot@twosidefalse +\fi +\def\rot@LR{-1} +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} +\ExecuteOptions{clockwise,quiet} +\ProcessOptions +\RequirePackage{graphicx} +\RequirePackage{ifthen} +\def\rotdriver#1{\makeatletter\input{#1.def}\makeatother} +\newcounter{r@tfl@t} +\setcounter{r@tfl@t}{0} +\newskip\rotFPtop \rotFPtop=\@fptop +\newskip\rotFPbot \rotFPbot=\@fpbot +\def\sideways{% + \Grot@setangle{90}% + \setbox\z@\color@hbox\ignorespaces} +\def\endsideways{% + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \Grot@box +} +\def\turn#1{% + \Grot@setangle{#1}% + \setbox\z@\color@hbox\ignorespaces} +\def\endturn{% + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \Grot@box +} +\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 +} +\def\turnbox#1#2{% + \Grot@setangle{#1}% + \setbox\z@\hbox{{#2}}% + \Grot@x\z@\Grot@y\z@ + \wd0\z@\dp0\z@\ht0\z@ + \Grot@box +} +\newsavebox\rot@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]% + \begin{lrbox}\rot@float@box + \begin{minipage}\textheight + } +\def\end@rotfloat{% + \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{% + \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 +} +\def\sidewaysfigure{\@rotfloat{figure}} +\let\endsidewaysfigure\end@rotfloat +\def\sidewaystable{\@rotfloat{table}} +\let\endsidewaystable\end@rotfloat +\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{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 + \wd\rot@float@box\z@ + \ht\rot@float@box\z@ + \dp\rot@float@box\z@ + \vbox to \textheight{% + \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 +} +\newenvironment{sidewaystable*} + {\@rotdblfloat{table}} + {\end@rotdblfloat} +\newenvironment{sidewaysfigure*} + {\@rotdblfloat{figure}} + {\end@rotdblfloat} + +\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 +} +\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 +} +\newif\if@rot@refundefined +\global\@rot@refundefinedfalse +\newtoks\rot@mess@toks +\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}% +} +\AtBeginDocument{% + \providecommand\color@hbox{\hbox\bgroup}% + \providecommand\color@vbox{\vbox\bgroup}% + \providecommand\color@endbox{\egroup}% +} +\endinput +%% +%% End of file `rotating.sty'. diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index 6622341b474..5a68e2dd192 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{tcidvi.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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 c8cee22e88b..3d754309a8c 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{truetex.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l 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/tools/shellesc.sty b/Master/texmf-dist/tex/latex/tools/shellesc.sty index d3f9a110a61..4e22f866ec0 100644 --- a/Master/texmf-dist/tex/latex/tools/shellesc.sty +++ b/Master/texmf-dist/tex/latex/tools/shellesc.sty @@ -42,9 +42,11 @@ %% See README for details. \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}} +\ifx\PackageInfo\undefined\def\PackageInfo#1#2{\wlog{#1: #2}}\fi +\ifx\PackageWarning\undefined\def\PackageWarning#1#2{\wlog{#1: #2}}\fi \expandafter\next\fi \ProvidesPackage{shellesc} - [2016/04/29 v0.01c unified shell escape interface for LaTeX] + [2016/06/07 v0.02a unified shell escape interface for LaTeX] \ifcase \ifx\pdfshellescape\@undefined \ifx\shellescape\@undefined @@ -62,9 +64,9 @@ \fi \PackageWarning{shellesc}{Shell escape disabled} \or - \PackageInfo {shellesc}{Unrestricted shell escape ensabled} + \PackageInfo {shellesc}{Unrestricted shell escape enabled} \else - \PackageInfo {shellesc}{Restricted shell escape ensabled} + \PackageInfo {shellesc}{Restricted shell escape enabled} \fi \ifx\lastsavedimageresourcepages\@undefined \protected\def\ShellEscape{\immediate\write18 } -- cgit v1.2.3