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/doc/latex/base/alltt.pdf | Bin 172932 -> 172932 bytes Master/texmf-dist/doc/latex/base/changes.txt | 13 + Master/texmf-dist/doc/latex/base/classes.pdf | Bin 506942 -> 515890 bytes Master/texmf-dist/doc/latex/base/cmfonts.pdf | Bin 270770 -> 270770 bytes Master/texmf-dist/doc/latex/base/doc.pdf | Bin 620344 -> 627916 bytes Master/texmf-dist/doc/latex/base/docstrip.pdf | Bin 468993 -> 468938 bytes Master/texmf-dist/doc/latex/base/egreg.txt | 3 + Master/texmf-dist/doc/latex/base/exscale.pdf | Bin 194318 -> 194318 bytes Master/texmf-dist/doc/latex/base/fix-cm.pdf | Bin 261918 -> 261918 bytes Master/texmf-dist/doc/latex/base/graphpap.pdf | Bin 156294 -> 156294 bytes Master/texmf-dist/doc/latex/base/ifthen.pdf | Bin 205224 -> 205224 bytes Master/texmf-dist/doc/latex/base/inputenc.pdf | Bin 294565 -> 294565 bytes Master/texmf-dist/doc/latex/base/latexrelease.pdf | Bin 232395 -> 232395 bytes Master/texmf-dist/doc/latex/base/latexsym.pdf | Bin 192303 -> 192303 bytes Master/texmf-dist/doc/latex/base/lb2.pdf | Bin 238184 -> 238184 bytes Master/texmf-dist/doc/latex/base/letter.pdf | Bin 300599 -> 305275 bytes Master/texmf-dist/doc/latex/base/lgc2.pdf | Bin 202895 -> 202895 bytes Master/texmf-dist/doc/latex/base/lppl.pdf | Bin 125833 -> 125833 bytes Master/texmf-dist/doc/latex/base/ltluatex.pdf | Bin 294457 -> 294460 bytes Master/texmf-dist/doc/latex/base/ltxdoc.pdf | Bin 214721 -> 214721 bytes Master/texmf-dist/doc/latex/base/makeindx.pdf | Bin 160707 -> 160707 bytes Master/texmf-dist/doc/latex/base/manual.pdf | Bin 150072 -> 150072 bytes Master/texmf-dist/doc/latex/base/nfssfont.pdf | Bin 201828 -> 201828 bytes Master/texmf-dist/doc/latex/base/proc.pdf | Bin 216918 -> 216918 bytes Master/texmf-dist/doc/latex/base/slides.pdf | Bin 351784 -> 351784 bytes Master/texmf-dist/doc/latex/base/slifonts.pdf | Bin 213778 -> 213778 bytes Master/texmf-dist/doc/latex/base/source2e.pdf | Bin 2486068 -> 2573482 bytes Master/texmf-dist/doc/latex/base/syntonly.pdf | Bin 181185 -> 181446 bytes Master/texmf-dist/doc/latex/base/tlc2.pdf | Bin 273641 -> 273641 bytes Master/texmf-dist/doc/latex/base/utf8ienc.pdf | Bin 322633 -> 322749 bytes Master/texmf-dist/doc/latex/base/webcomp.pdf | Bin 136166 -> 136166 bytes Master/texmf-dist/doc/latex/graphics/README.txt | 3 + Master/texmf-dist/doc/latex/graphics/a.pdf | 130 ++++ Master/texmf-dist/doc/latex/graphics/cat.eps | 305 +++++++++ Master/texmf-dist/doc/latex/graphics/changes.txt | 14 + Master/texmf-dist/doc/latex/graphics/color.pdf | Bin 201658 -> 200967 bytes Master/texmf-dist/doc/latex/graphics/drivers.pdf | Bin 263214 -> 263033 bytes Master/texmf-dist/doc/latex/graphics/epsfig.pdf | Bin 153962 -> 153962 bytes Master/texmf-dist/doc/latex/graphics/graphics.pdf | Bin 279729 -> 279018 bytes Master/texmf-dist/doc/latex/graphics/graphicx.pdf | Bin 230370 -> 230370 bytes Master/texmf-dist/doc/latex/graphics/grfguide.pdf | Bin 301318 -> 301615 bytes Master/texmf-dist/doc/latex/graphics/grfguide.tex | 8 +- 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 0 -> 245974 bytes Master/texmf-dist/doc/latex/graphics/rotex.pdf | Bin 0 -> 253977 bytes Master/texmf-dist/doc/latex/graphics/rotex.tex | 687 ++++++++++++++++++++ Master/texmf-dist/doc/latex/graphics/trig.pdf | Bin 191710 -> 191710 bytes Master/texmf-dist/doc/latex/tools/README.txt | 2 +- Master/texmf-dist/doc/latex/tools/afterpage.pdf | Bin 189860 -> 189860 bytes Master/texmf-dist/doc/latex/tools/array.pdf | Bin 458055 -> 462858 bytes Master/texmf-dist/doc/latex/tools/bm.pdf | Bin 306256 -> 306256 bytes Master/texmf-dist/doc/latex/tools/calc.pdf | Bin 340656 -> 340591 bytes Master/texmf-dist/doc/latex/tools/changes.txt | 5 + Master/texmf-dist/doc/latex/tools/dcolumn.pdf | Bin 199065 -> 199065 bytes Master/texmf-dist/doc/latex/tools/delarray.pdf | Bin 183440 -> 183440 bytes Master/texmf-dist/doc/latex/tools/enumerate.pdf | Bin 199065 -> 199065 bytes Master/texmf-dist/doc/latex/tools/fileerr.pdf | Bin 179883 -> 179951 bytes Master/texmf-dist/doc/latex/tools/fontsmpl.pdf | Bin 144837 -> 144837 bytes Master/texmf-dist/doc/latex/tools/ftnright.pdf | Bin 346709 -> 346776 bytes Master/texmf-dist/doc/latex/tools/hhline.pdf | Bin 175739 -> 175739 bytes Master/texmf-dist/doc/latex/tools/indentfirst.pdf | Bin 144795 -> 144795 bytes Master/texmf-dist/doc/latex/tools/layout.pdf | Bin 246944 -> 246944 bytes Master/texmf-dist/doc/latex/tools/longtable.pdf | Bin 349827 -> 349817 bytes Master/texmf-dist/doc/latex/tools/multicol.pdf | Bin 481625 -> 482292 bytes Master/texmf-dist/doc/latex/tools/rawfonts.pdf | Bin 135709 -> 135709 bytes Master/texmf-dist/doc/latex/tools/shellesc.pdf | Bin 167348 -> 167031 bytes Master/texmf-dist/doc/latex/tools/showkeys.pdf | Bin 242803 -> 242803 bytes Master/texmf-dist/doc/latex/tools/somedefs.pdf | Bin 156479 -> 156479 bytes Master/texmf-dist/doc/latex/tools/tabularx.pdf | Bin 253979 -> 253979 bytes Master/texmf-dist/doc/latex/tools/theorem.pdf | Bin 322634 -> 322875 bytes .../texmf-dist/doc/latex/tools/tools-overview.pdf | Bin 68297 -> 68297 bytes Master/texmf-dist/doc/latex/tools/trace.pdf | Bin 212988 -> 212988 bytes Master/texmf-dist/doc/latex/tools/varioref.pdf | Bin 334897 -> 335124 bytes Master/texmf-dist/doc/latex/tools/verbatim.pdf | Bin 309063 -> 309063 bytes Master/texmf-dist/doc/latex/tools/xr.pdf | Bin 163068 -> 163068 bytes Master/texmf-dist/doc/latex/tools/xspace.pdf | Bin 238013 -> 238013 bytes Master/texmf-dist/source/latex/base/classes.dtx | 2 +- Master/texmf-dist/source/latex/base/ltfinal.dtx | 20 +- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- Master/texmf-dist/source/latex/graphics/color.dtx | 15 +- .../texmf-dist/source/latex/graphics/drivers.dtx | 24 +- .../texmf-dist/source/latex/graphics/graphics.dtx | 15 +- .../texmf-dist/source/latex/graphics/graphics.ins | 2 + .../texmf-dist/source/latex/graphics/rotating.dtx | 688 +++++++++++++++++++++ Master/texmf-dist/source/latex/tools/shellesc.dtx | 12 +- 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 +- 105 files changed, 2280 insertions(+), 50 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/base/egreg.txt create mode 100644 Master/texmf-dist/doc/latex/graphics/a.pdf create mode 100644 Master/texmf-dist/doc/latex/graphics/cat.eps create mode 100644 Master/texmf-dist/doc/latex/graphics/rotating.pdf create mode 100644 Master/texmf-dist/doc/latex/graphics/rotex.pdf create mode 100644 Master/texmf-dist/doc/latex/graphics/rotex.tex create mode 100644 Master/texmf-dist/source/latex/graphics/rotating.dtx create mode 100644 Master/texmf-dist/tex/latex/graphics/rotating.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf index 7772cc7b57b..6eeb78ea84d 100644 Binary files a/Master/texmf-dist/doc/latex/base/alltt.pdf and b/Master/texmf-dist/doc/latex/base/alltt.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt index 7a9d5122965..9611200a8ae 100644 --- a/Master/texmf-dist/doc/latex/base/changes.txt +++ b/Master/texmf-dist/doc/latex/base/changes.txt @@ -4,6 +4,19 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +######################### +# 2016/03/31 PL 1 Release +######################### + +2016-05-08 David Carlisle + + * source2e.tex: Pick up patch level from ltvers (not ltfinal) + (Hironobu Yamashita) + +2016-04-22 David Carlisle + + * ltvers.dtx, ltfinal.dtx: 4096 character classes in latest xetex. + ######################### # 2016/03/31 Release ######################### diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf index 923a3dcf830..0058572be17 100644 Binary files a/Master/texmf-dist/doc/latex/base/classes.pdf and b/Master/texmf-dist/doc/latex/base/classes.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf index 0aefa35b28c..5d1027105d9 100644 Binary files a/Master/texmf-dist/doc/latex/base/cmfonts.pdf and b/Master/texmf-dist/doc/latex/base/cmfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf index b1c8bcc090f..ce95928dadb 100644 Binary files a/Master/texmf-dist/doc/latex/base/doc.pdf and b/Master/texmf-dist/doc/latex/base/doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf index 12947daf071..6377580e44d 100644 Binary files a/Master/texmf-dist/doc/latex/base/docstrip.pdf and b/Master/texmf-dist/doc/latex/base/docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/egreg.txt b/Master/texmf-dist/doc/latex/base/egreg.txt new file mode 100644 index 00000000000..632011e4907 --- /dev/null +++ b/Master/texmf-dist/doc/latex/base/egreg.txt @@ -0,0 +1,3 @@ +@DavidCarlisle U+2011 could be \mbox{-} and U+2012 could be the same as en-dash (at least it's a good approximation) +@DavidCarlisle I found another missing Unicode character in t1enc.dfu: \DeclareUnicodeCharacter{2010}{-} + diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf index 5cb618f5adc..e2a16eda3dc 100644 Binary files a/Master/texmf-dist/doc/latex/base/exscale.pdf and b/Master/texmf-dist/doc/latex/base/exscale.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf index 1597cb82775..bf4c08c7d21 100644 Binary files a/Master/texmf-dist/doc/latex/base/fix-cm.pdf and b/Master/texmf-dist/doc/latex/base/fix-cm.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf index 06f5f197b11..4438a36e8d8 100644 Binary files a/Master/texmf-dist/doc/latex/base/graphpap.pdf and b/Master/texmf-dist/doc/latex/base/graphpap.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf index c9789d51043..a0690b9f689 100644 Binary files a/Master/texmf-dist/doc/latex/base/ifthen.pdf and b/Master/texmf-dist/doc/latex/base/ifthen.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf index 85ad88c6aa8..049d9619e0a 100644 Binary files a/Master/texmf-dist/doc/latex/base/inputenc.pdf and b/Master/texmf-dist/doc/latex/base/inputenc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf index 1e831949411..88c55f85bad 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexrelease.pdf and b/Master/texmf-dist/doc/latex/base/latexrelease.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf index ba8b8c4591e..cf79ab25427 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexsym.pdf and b/Master/texmf-dist/doc/latex/base/latexsym.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf index e6dfc2b4ecc..a2cec129f3e 100644 Binary files a/Master/texmf-dist/doc/latex/base/lb2.pdf and b/Master/texmf-dist/doc/latex/base/lb2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf index 1586404539e..9c3e1138315 100644 Binary files a/Master/texmf-dist/doc/latex/base/letter.pdf and b/Master/texmf-dist/doc/latex/base/letter.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf index 2297ac00cb9..c7ed15b3217 100644 Binary files a/Master/texmf-dist/doc/latex/base/lgc2.pdf and b/Master/texmf-dist/doc/latex/base/lgc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf index ea0f8ad5377..6a4b22cb8a9 100644 Binary files a/Master/texmf-dist/doc/latex/base/lppl.pdf and b/Master/texmf-dist/doc/latex/base/lppl.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf index 7eebfcb6187..ae3b37d7c25 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltluatex.pdf and b/Master/texmf-dist/doc/latex/base/ltluatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf index 562f7960f6b..7504fff0074 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf and b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf index a1cba06ffc3..f7bb67424af 100644 Binary files a/Master/texmf-dist/doc/latex/base/makeindx.pdf and b/Master/texmf-dist/doc/latex/base/makeindx.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf index a089633754d..9b7a2cbb7ce 100644 Binary files a/Master/texmf-dist/doc/latex/base/manual.pdf and b/Master/texmf-dist/doc/latex/base/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf index 6927683ed96..be19dede18e 100644 Binary files a/Master/texmf-dist/doc/latex/base/nfssfont.pdf and b/Master/texmf-dist/doc/latex/base/nfssfont.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf index bff812136df..c8a28d039a6 100644 Binary files a/Master/texmf-dist/doc/latex/base/proc.pdf and b/Master/texmf-dist/doc/latex/base/proc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf index 5c0cd4a331e..4014be61e70 100644 Binary files a/Master/texmf-dist/doc/latex/base/slides.pdf and b/Master/texmf-dist/doc/latex/base/slides.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf index 98a7ca4832d..92fe1d4caa1 100644 Binary files a/Master/texmf-dist/doc/latex/base/slifonts.pdf and b/Master/texmf-dist/doc/latex/base/slifonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf index a343eae4034..938930739d7 100644 Binary files a/Master/texmf-dist/doc/latex/base/source2e.pdf and b/Master/texmf-dist/doc/latex/base/source2e.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf index 25832ee2cbc..ba9fcec7b2a 100644 Binary files a/Master/texmf-dist/doc/latex/base/syntonly.pdf and b/Master/texmf-dist/doc/latex/base/syntonly.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf index 1ad3da14bc0..ebdea93013b 100644 Binary files a/Master/texmf-dist/doc/latex/base/tlc2.pdf and b/Master/texmf-dist/doc/latex/base/tlc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf index dfda12870d2..45646f9fc4c 100644 Binary files a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf and b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf index cfae79d9fa1..6ae23991351 100644 Binary files a/Master/texmf-dist/doc/latex/base/webcomp.pdf and b/Master/texmf-dist/doc/latex/base/webcomp.pdf differ diff --git a/Master/texmf-dist/doc/latex/graphics/README.txt b/Master/texmf-dist/doc/latex/graphics/README.txt index 0f092d53c50..825805ab522 100644 --- a/Master/texmf-dist/doc/latex/graphics/README.txt +++ b/Master/texmf-dist/doc/latex/graphics/README.txt @@ -46,6 +46,7 @@ Non Standard Packages ===================== graphicx.dtx Source for graphicx package (extension of graphics) epsfig.dtx Source for epsfig package (extension of graphicx) +rotating.dtx Source for rotating package (extension of graphicx) keyval.dtx Source for keyval pacakge (required by both the above) lscape.sty Produce landscape pages in a (mainly) portrait document. @@ -65,6 +66,8 @@ grfguide.tex User Guide to all the packages in this bundle. \ExecuteOptions{dvips} Before running this file. +rotex.tex examples of use of rotating package. + ============================================= TO UNPACK THE PACKAGES diff --git a/Master/texmf-dist/doc/latex/graphics/a.pdf b/Master/texmf-dist/doc/latex/graphics/a.pdf new file mode 100644 index 00000000000..17741778c1c --- /dev/null +++ b/Master/texmf-dist/doc/latex/graphics/a.pdf @@ -0,0 +1,130 @@ +%PDF-1.4 +%%%%% +1 0 obj +<< +/Pages 2 0 R +/Type /Catalog +>> + endobj +2 0 obj +<< +/Kids [3 0 R] +/Type /Pages +/Count 1 +>> + endobj +3 0 obj +<< +/Rotate 0 +/Parent 2 0 R +/MediaBox [0 0 72 72] + /Resources +<< +/ExtGState 4 0 R +/Font 5 0 R +/ProcSet [/PDF /Text] +>> +/pdftk_PageNum 1 +/Type /Page +/Contents 6 0 R +>> + endobj +4 0 obj +<< +/R7 7 0 R +>> + endobj +5 0 obj +<< +/R8 8 0 R +>> + endobj +6 0 obj +<< +/Length 135 +>> +stream +q 0.1 0 0 0.1 0 0 cm +/R7 gs +10 w +0 G +0 0 m +720 720 l +0 720 l +720 0 l +S +0 g +q +10 0 0 10 0 0 cm BT +/R8 72 Tf +1 0 0 1 0 0 Tm +(A)Tj +ET +Q +Q + + endstream + endobj +7 0 obj +<< +/Type /ExtGState +/OPM 1 +>> + endobj +8 0 obj +<< +/BaseFont /Times-Roman +/LastChar 65 +/Subtype /Type1 +/FontDescriptor 9 0 R +/Widths [722] +/Type /Font +/Encoding /WinAnsiEncoding +/FirstChar 65 +>> + endobj +9 0 obj +<< +/FontName /Times-Roman +/StemV 105 +/CharSet (/A) +/Ascent 674 +/Flags 65568 +/Descent 0 +/ItalicAngle 0 +/MissingWidth 250 +/FontBBox [0 0 706 674] +/Type /FontDescriptor +/CapHeight 674 +>> + endobj +10 0 obj +<< +/Producer (GPL Ghostscript 9.06) +/ModDate (D:20140426202438+01'00') +/CreationDate (D:20140426202438+01'00') +>> +endobj xref +0 11 +0000000000 65535 f +0000000015 00000 n +0000000066 00000 n +0000000125 00000 n +0000000308 00000 n +0000000341 00000 n +0000000374 00000 n +0000000563 00000 n +0000000610 00000 n +0000000774 00000 n +0000000975 00000 n +trailer + +<< +/Info 10 0 R +/Root 1 0 R +/Size 11 +/ID [<4ca1370d594acd28b9d948a5e8b925c3> <4ca1370d594acd28b9d948a5e8b925c3>] +>> +startxref +1106 +%%EOF diff --git a/Master/texmf-dist/doc/latex/graphics/cat.eps b/Master/texmf-dist/doc/latex/graphics/cat.eps new file mode 100644 index 00000000000..0042ea088fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/graphics/cat.eps @@ -0,0 +1,305 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%BoundingBox: 44 527 80 559 +%%Creator: COREL DRAW +%%Title: CAT.TMP +%%CreationDate: Sat Jan 18 17:29:05 1992 + +%%DocumentFonts: +%%EndComments +%%BeginProlog +% -------------- POSTSCRIPT PROLOG FOR CORELDRAW 2.X ------ +% Copyright Corel Systems Corporation 1990 +/AutoFlatness 0 def/wCorelDict 300 dict def +wCorelDict begin/bd{bind def}bind def/ld{load def}bd +/xd{exch def}bd/_ null def/$c 0 def/$m 0 def +/$y 0 def/$k 0 def/$t 1 def/$n _ def/$o 0 def +/$fil 0 def/$C 0 def/$M 0 def/$Y 0 def/$K 0 def +/$T 1 def/$N _ def/$O 0 def/$PF false def +/$pan 0 def/$h false def/$al 0 def/$tr 0 def +/$le 0 def/$lx 0 def/$ly 0 def/$ctm matrix currentmatrix def +/$ptm matrix def/$ttm matrix def/$stm matrix def +/$skm matrix def/$fst 128 def/$pad 0 def/$rox 0 def +/$roy 0 def currentscreen/@dsp xd/$dsp/@dsp def +/$dsa xd/$dsf xd/$sdf false def/$SDF false def +/$Scra 0.0 def statusdict/pageparams known{statusdict begin +pageparams end 1 ne{/$Scra -90.0 def}if pop pop pop}if +/$sv 0 def/@cp/closepath ld/@gs/gsave ld/@gr/grestore ld +/@np/newpath ld/@sv{/$sv save def}bd/@rs{$sv restore}bd +/@ss{load setscreen}bd AutoFlatness 1 eq{/$cpx ([Error: PathTooComplex; OffendingCommand: AnyPaintingOperator;\n) def +/@err1{$cpx print flush newpath}bd/@ifl{currentflat dup 10 gt{pop @err1 exit}if 2 add setflat}bd +/@fill/fill ld/fill{currentflat{{@fill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +/@eofill/eofill ld/eofill{currentflat{{@eofill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +/@clip/clip ld/clip{currentflat{{@clip}stopped{initclip @ifl}{exit}ifelse}bind loop setflat}bd +/@eoclip/eoclip ld/eoclip{currentflat{{@eoclip}stopped{initclip @ifl}{exit}ifelse}bind loop setflat}bd +/@stroke/stroke ld/stroke{currentflat{{@stroke}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +}if/InRange{3 -1 roll 2 copy le{pop}{exch pop}ifelse +2 copy ge{pop}{exch pop}ifelse}bd/wDstChck{2 1 roll dup 3 -1 roll +eq{1 add}if}bd/@dot{dup mul exch dup mul add 1 exch sub 2 div}bd +/@lin{exch pop abs 1 exch sub}bd/@MN{2 copy le{pop}{exch pop}ifelse}bd +/setcmykcolor where{pop}{/setcmykcolor{4 1 roll +3{3 index add 1 @MN 1 exch sub 3 1 roll}repeat +setrgbcolor pop}bd}ifelse/colorimage where{pop}{/colorimage{/$ncl xd +pop pop pop pop{currentfile $dat readhexstring pop}repeat +pop}bd}ifelse/@tc{dup 1 ge{pop}{4{dup 6 -1 roll +mul exch}repeat pop}ifelse}bd/@spc{7 2 roll +ColorSeparationMode 1 eq{6 index @tc 0 4 $ink sub index +exch pop}{5 index dup _ eq{pop 0 4 $ink sub index +exch pop}{CurrentInkName eq{6 index}{0}ifelse}ifelse}ifelse +5 1 roll 8 -2 roll 6{pop}repeat 1 exch sub dup setgray +1 eq exch 1 eq and not}bd/@scc{$ink -1 eq +{$c $m $y $k $t @tc setcmykcolor true}{$o $c $m $y $k $t $n @spc +}ifelse}bd/@SCC{$ink -1 eq{$C $M $Y $K $T @tc setcmykcolor true}{ +$O $C $M $Y $K $T $N @spc}ifelse}bd/@sft{ +/$tx $tllx $pxf add dup $tllx gt{$pwid sub}if def +/$ty $tury $pyf sub dup $tury lt{$phei add}if def}bd +/@stb{pathbbox/$ury xd/$urx xd/$lly xd/$llx xd}bd +/@ep{{cvx exec}forall}bd/@tp{@sv/$in true def +2 copy dup $lly le{/$in false def}if $phei sub $ury ge{/$in false def}if +dup $urx ge{/$in false def}if $pwid add $llx le{/$in false def}if +$in{@np 2 copy moveto $pwid 0 rlineto 0 $phei neg rlineto +$pwid neg 0 rlineto 0 $phei rlineto clip @np +$pn cvlit load aload pop 7 -1 roll 5 index sub +7 -1 roll 3 index sub translate/$ctm matrix currentmatrix def +@ep pop pop pop pop}{pop pop}ifelse @rs}bd/@th{@sft +0 1 $tly 1 sub{dup $psx mul $tx add{dup $llx gt{$pwid sub}{exit}ifelse +}loop exch $phei mul $ty exch sub 0 1 $tlx 1 sub{$pwid mul +3 copy 3 -1 roll add exch @tp pop}for pop pop}for}bd +/@tv{@sft 0 1 $tlx 1 sub{dup $pwid mul $tx add +exch $psy mul $ty exch sub{dup $ury lt{$phei add}{exit}ifelse}loop +0 1 $tly 1 sub{$phei mul 3 copy sub @tp pop}for +pop pop}for}bd/@pf{@gs $ctm setmatrix $pm concat +@stb @gs ColorSeparationMode 0 eq{1 setgray eofill}{ +$o 0 0 0 0 0 (Black) @spc{eofill}if}ifelse +@gr eoclip Bburx Bbury $pm itransform/$tury xd/$turx xd +Bbllx Bblly $pm itransform/$tlly xd/$tllx xd +/$wid $turx $tllx sub def/$hei $tury $tlly sub def +$wid 0 gt $hei 0 gt and{$pn cvlit load aload pop +/$pd xd 3 -1 roll sub/$phei xd exch sub/$pwid xd +/$tlx $wid $pwid div ceiling 1 add def/$tly $hei $phei div ceiling 1 add def +$psx 0 eq{@tv}{@th}ifelse}if @gr @np}bd/@dlt{ColorSeparationMode 0 eq{ +/$dc $toc $tot mul $frc $frt mul dup/$c xd sub $fst 1 sub div def +/$dm $tom $tot mul $frm $frt mul dup/$m xd sub $fst 1 sub div def +/$dy $toy $tot mul $fry $frt mul dup/$y xd sub $fst 1 sub div def +/$dk $tok $tot mul $frk $frt mul dup/$k xd sub $fst 1 sub div def +true}{$o $frc $frm $fry $frk $frt $frn @spc +dup{/$frk 1 currentgray sub def}{/$frk 0 def}ifelse +$o $toc $tom $toy $tok $tot $ton @spc dup{/$tok 1 currentgray sub def} +{/$tok 0 def}ifelse or dup{/$c 0 def/$m 0 def/$y 0 def/$k $frk def +/$dc 0 def/$dm 0 def/$dy 0 def/$dk $tok $frk sub $fst 1 sub div def}if +}ifelse}bd/@ftl{1 index 4 index sub dup $pad mul dup/$pdw xd +2 mul sub $fst div/$wid xd 2 index sub/$hei xd +pop translate $c $m $y $k 4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +0 0 moveto 0 $hei lineto $pdw $hei lineto $pdw 0 lineto 0 0 lineto fill +$pdw 0 translate $fst{4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +0 0 moveto 0 $hei lineto $wid $hei lineto $wid 0 lineto 0 0 lineto fill +$wid 0 translate $dk add 4 1 roll $dy add 4 1 roll +$dm add 4 1 roll $dc add 4 1 roll}repeat $dk sub 4 1 roll +$dy sub 4 1 roll $dm sub 4 1 roll $dc sub 4 1 roll +ColorSeparationMode 0 ne{1 exch sub setgray pop pop pop} +{setcmykcolor}ifelse 0 0 moveto 0 $hei lineto $pdw $hei lineto $pdw 0 lineto 0 0 lineto fill +}bd/@ftr{1 index 4 index sub dup $rox mul/$row xd +2 div 1 index 4 index sub dup $roy mul/$roh xd +2 div 2 copy dup mul exch dup mul add sqrt +$row dup mul $roh dup mul add sqrt add dup/$hei xd $fst div/$wid xd +4 index add $roh add exch 5 index add $row add +exch translate pop pop pop pop currentflat 5 mul setflat +$c $m $y $k 4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +$wid 0 moveto 0 0 $hei 0 360 arc fill 1.0 $pad 2 mul sub dup scale +$fst{4 copy ColorSeparationMode 0 ne{1 exch sub setgray pop pop pop} +{setcmykcolor}ifelse $wid 0 moveto 0 0 $hei 0 360 arc fill +/$hei $hei $wid sub def $dk add 4 1 roll $dy add 4 1 roll +$dm add 4 1 roll $dc add 4 1 roll}repeat pop pop pop pop}bd +/@ff{@gs @dlt{$ctm setmatrix eoclip newpath Bbllx Bblly moveto +Bbllx Bbury lineto Bburx Bbury lineto Bburx Bblly lineto +$fan rotate pathbbox newpath $fty 1 eq{@ftr}{@ftl}ifelse}if +@gr @np}bd/@Pf{@sv ColorSeparationMode 0 eq $ink 3 eq or{$ctm setmatrix +72 1000 div dup matrix scale dup concat dup Bburx exch Bbury exch itransform +ceiling cvi/Bbury xd ceiling cvi/Bburx xd Bbllx exch Bblly exch itransform +floor cvi/Bblly xd floor cvi/Bbllx xd $Prm aload pop +$Psn load exec}{1 setgray eofill}ifelse @rs +@np}bd/@ftx{{(0) dup 3 -1 roll 0 exch put +@gs true charpath currentpoint $ctm setmatrix +@@txt @gr @np moveto $tr 0 rmoveto}forall pop}bd +/@sm{/$ctm $ctm currentmatrix def}bd/@lorg{$lx $ly moveto +/$ly $ly $le sub def}bd/@ft{matrix currentmatrix 3 1 roll +$sdf{$scf $sca $scp @ss}if $fil 1 eq{/@@txt/@pf ld @ftx}{$fil 2 eq +{/@@txt/@ff ld @ftx}{$fil 3 eq{/@@txt/@Pf ld @ftx}{@scc +{dup $tr exch 0 exch ashow}if pop pop}ifelse}ifelse}ifelse +$sdf{$dsf $dsa $dsp @ss}if setmatrix}bd/@st{ +matrix currentmatrix 3 1 roll $SDF{$SCF $SCA $SCP @ss}if +@SCC{{(0) dup 3 -1 roll 0 exch put @gs true charpath currentpoint +$ctm setmatrix $ptm concat stroke @gr moveto $tr 0 rmoveto}forall +pop}{pop pop}ifelse $SDF{$dsf $dsa $dsp @ss}if +setmatrix}bd/@pt{dup length exch}bd/@te{@pt +@lorg @ft cleartomark [}bd/@tr{@pt @lorg @st cleartomark [}bd +/@ta{@pt @lorg 2 copy @gs @ft @gr @st cleartomark [}bd +/@t@a{@pt @lorg 2 copy @gs @st @gr @ft cleartomark [}bd +/g{1 exch sub/$k xd/$c 0 def/$m 0 def/$y 0 def/$t 1 def/$n _ def/$fil 0 def +}bd/G{1 exch sub/$K xd/$C 0 def/$M 0 def/$Y 0 def/$T 1 def/$N _ def}bd +/k{/$k xd/$y xd/$m xd/$c xd/$t 1 def/$n _ def/$fil 0 def}bd +/K{/$K xd/$Y xd/$M xd/$C xd/$T 1 def/$N _ def}bd +/x{1 exch sub/$t xd/$n xd/$k xd/$y xd/$m xd/$c xd/$fil 0 def}bd +/X{1 exch sub/$T xd/$N xd/$K xd/$Y xd/$M xd/$C xd}bd +/d/setdash ld/i{dup 0 ne{setflat}{pop}ifelse}bd +/j/setlinejoin ld/J/setlinecap ld/M/setmiterlimit ld +/w/setlinewidth ld/O{/$o xd}bd/R{/$O xd}bd +/c/curveto ld/C/c ld/v{4 -2 roll 2 copy 6 -2 roll curveto}bd +/V/v ld/y{2 copy curveto}bd/Y/y ld/l/lineto ld +/L/l ld/m/moveto ld/n/newpath ld/N/newpath ld +/F{matrix currentmatrix $sdf{$scf $sca $scp @ss}if +$fil 1 eq{@pf}{$fil 2 eq{@ff}{$fil 3 eq{@Pf}{@scc{eofill}{@np}ifelse +}ifelse}ifelse}ifelse $sdf{$dsf $dsa $dsp @ss}if +setmatrix}bd/f{@cp F}bd/S{matrix currentmatrix +$ctm setmatrix $SDF{$SCF $SCA $SCP @ss}if @SCC{$skm currentmatrix +$ptm concat stroke setmatrix}{@np}ifelse $SDF{$dsf $dsa $dsp @ss}if +setmatrix}bd/s{@cp S}bd/B{@gs F @gr S}bd/b{@cp B}bd +/W{eoclip}bd/p{/$pm xd 7{pop}repeat/$pyf xd/$pxf xd +/$pn xd/$fil 1 def}bd/P{11{pop}repeat}bd/z{/$al xd +/$tr xd/$le xd exch findfont exch scalefont setfont}bd +/Z{dup type 0 type eq{/$bDir xd}if findfont +dup maxlength 1 add dict exch dup{1 index/FID ne{3 index +3 1 roll put}{pop pop}ifelse}forall pop dup dup/Encoding get +256 array copy dup/$fe xd/Encoding exch put +dup/Fontname 3 index put 3 -1 roll dup length 0 ne{0 exch{ +dup type 0 type eq{exch pop}{$fe exch 2 index exch put +1 add}ifelse}forall pop}if definefont pop}bd +/e{@sm concat [/t{@te}def}bd/r{@sm concat [/t{@tr}def}bd +/o{@sm concat [/t{pop}def}bd/a{@sm concat [/t{@ta}def}bd +/t{@te}def/T{cleartomark @np/$lx 0 def/$ly 0 def +$ctm setmatrix/$ttm matrix def}bd/u{}bd/U{}bd +/A{pop}bd/H{/$h true def}bd/h{@cp H}bd/q/@gs ld +/Q/@gr ld/E{5 array astore exch cvlit exch def}bd +/`{}bd/~{}bd/@{}bd/&{}bd/CorelDrawRencodeVect [ +16#80/grave/circumflex/tilde/dotlessi/florin/quotedblleft/quotedblright/guilsinglleft +16#88/guilsinglright/fi/fl/dagger/daggerdbl/endash/periodcentered/breve +16#90/quotedblbase/ellipsis/perthousand/trademark/Pt/fractionbar +16#98/divide 16#a1/exclamdown/cent/sterling/currency/yen/bar/section +16#a8/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/emdash/registered/overbar +16#b0/ring/plusminus/twosuperior/threesuperior/acute/mu/paragraph/bullet +16#b8/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown +16#c0/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla +16#c8/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis +16#d0/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/OE +16#d8/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls +16#e0/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla +16#e8/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis +16#f0/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/oe +16#f8/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis +] def/@cc{currentfile $dat readhexstring pop}bd +/@ii{concat 3 index 3 index m 3 index 1 index l +2 copy l 1 index 3 index l 3 index 3 index l +clip pop pop pop pop}bd/@E{/Bbury xd/Bburx xd +/Bblly xd/Bbllx xd}bd/@c{@cp}bd/@p{/$fil 1 def +/$pm xd/$psy xd/$psx xd/$pyf xd/$pxf xd/$pn xd}bd +/@P{/$fil 3 def/$Psn xd array astore/$Prm xd}bd +/@k{/$fil 2 def/$roy xd/$rox xd/$pad xd/$fty xd/$fan xd +$fty 1 eq{/$fan 0 def}if/$tok xd/$toy xd/$tom xd/$toc xd +/$frk xd/$fry xd/$frm xd/$frc xd/$frn _ def/$frt 1 def/$ton _ def/$tot 1 def +}bd/@x{/$fil 2 def/$roy xd/$rox xd/$pad xd +/$fty xd/$fan xd 1 exch sub/$tot xd/$ton xd/$tok xd/$toy xd/$tom xd/$toc xd +1 exch sub/$frt xd/$frn xd/$frk xd/$fry xd/$frm xd/$frc xd}bd +/@i{@sm @gs @ii 5 index 1 ne{@gs 1 g F @gr}if +1 eq 5 index 1 eq and{@gs $ctm setmatrix F @gr}if +@np/$ury xd/$urx xd/$lly xd/$llx xd/$bts xd +/$hei xd/$wid xd/$dat $wid $bts mul 8 div ceiling cvi string def +$bts 1 eq{@SCC/$frg xd}{1 G @SCC/$frg xd}ifelse +$frg{$SDF{$SCF $SCA $SCP @ss}if $llx $lly translate +$urx $llx sub $ury $lly sub scale $wid $hei abs +$bts 1 eq{false}{$bts}ifelse [ $wid 0 0 $hei neg 0 +$hei 0 gt{$hei}{0}ifelse]/@cc load $bts 1 eq{imagemask}{image}ifelse +$SDF{$dsf $dsa $dsp @ss}if}{$hei{@cc pop}repeat}ifelse +@gr $ctm setmatrix}def/@M {@sv}bd/@N{/@cc{}def +12 -1 roll neg 12 1 roll @i @rs}bd/@I{@sm @gs +@ii @np/$ury xd/$urx xd/$lly xd/$llx xd/$ncl xd +/$bts xd/$hei xd/$wid xd/$dat $wid $bts mul $ncl mul 8 div ceiling cvi string def +$llx $lly translate $urx $llx sub $ury $lly sub scale +$wid $hei $bts [ $wid 0 0 $hei neg 0 $hei]/@cc load +false $ncl colorimage @gr $ctm setmatrix}bd +/@t{/$lx 0 def/$ly 0 def/$stm $stm currentmatrix def +3 1 roll translate $ttm concat 1 exch t $stm setmatrix}def +/@n{/$ttm exch matrix rotate def}bd/@z{ exch findfont exch scalefont setfont +}bd/@s{}bd/@l{}bd/@B{@gs S @gr F}bd/@b{@cp @B}bd +/@a{@sm concat [/t{@t@a}def}bd/@w{5 2 roll dup/$pan xd +matrix rotate/$ptm xd matrix scale $ptm dup concatmatrix/$ptm xd +1 eq{$ptm exch dup concatmatrix/$ptm xd}{pop}ifelse +1 w}bd/@g{1 eq dup/$sdf xd{/$scp xd/$sca xd +/$scf xd}if}bd/@G{1 eq dup/$SDF xd{/$SCP xd +/$SCA xd/$SCF xd}if}bd/@D{3 copy @ss/$dsp xd +/$dsa xd/$dsf xd}bd/@j{@sv @np}bind def/@J{@rs}bind def +/@sep{/ColorSeparationMode where{pop}{/ColorSeparationMode 0 def +/CurrentInkName (Composite) def}ifelse ColorSeparationMode 0 eq +{/CurrentInkName (Composite) def}if/CurrentInkName where{pop}{ +/CurrentInkName (Composite) def}ifelse CurrentInkName (Composite) eq{/$ink -1 def} +{CurrentInkName (Cyan) eq{/$ink 0 def} {CurrentInkName (Magenta) eq{/$ink 1 def} +{CurrentInkName (Yellow) eq{/$ink 2 def} {CurrentInkName (Black) eq{/$ink 3 def} +{/$ink 4 def}ifelse}ifelse}ifelse}ifelse}ifelse}bd +@sep/@whi{@gs -72000 dup moveto -72000 72000 lineto +72000 dup lineto 72000 -72000 lineto closepath 1 setgray fill +@gr}bd/@neg{ [{1 exch sub}/exec cvx currenttransfer/exec cvx] cvx settransfer +@whi}bd/@reg{[] 0 d 0 setgray .3 setlinewidth +2 copy 5.4 0 360 arc closepath 2 copy moveto 9 0 rlineto +2 copy moveto -9 0 rlineto 2 copy moveto 0 9 rlineto +moveto 0 -9 rlineto stroke}bd/leftbracket{(\050)}def +/rightbracket{(\051)}def + +%%EndProlog +%%BeginSetup +11.4737 setmiterlimit +1.00 setflat +/$fst 128 def + +%%EndSetup +@sv +/$ctm matrix currentmatrix def +u +%%Note: Object +45.22 528.19 78.98 558.14 @E +0 J 0 j [] 0 d 0 R 0 @G +0.00 0.00 0.00 1.00 K +1.01 1.01 0.00 [1.00000 0.00000 0.00000 1.00000 0.00000 0.00000] 0 @w +%%CURV 106 +73.30 539.78 m +73.08 538.42 72.22 537.26 71.78 536.33 C +72.79 534.67 73.73 531.43 74.81 530.64 C +74.59 530.64 77.04 528.84 73.87 529.06 C +73.08 529.34 73.08 530.93 70.20 533.81 C +69.70 533.74 70.56 530.57 71.50 529.63 c +73.15 528.19 70.27 528.55 70.13 528.62 C +68.98 529.34 68.62 534.60 67.03 536.26 c +66.24 537.19 65.16 536.98 64.30 536.90 C +63.22 536.62 60.62 537.19 60.55 534.02 C +60.62 532.66 62.14 530.21 62.86 529.78 c +65.30 528.41 62.06 528.34 61.70 528.77 C +61.13 529.34 60.19 530.64 59.26 531.65 C +57.74 532.44 56.38 533.66 56.02 534.96 C +54.94 534.74 53.86 534.17 53.64 533.23 C +53.42 532.22 53.86 531.58 54.86 530.14 C +56.02 529.85 56.38 529.27 56.02 528.98 c +55.87 528.84 53.71 528.62 53.57 528.91 C +52.70 529.49 51.70 531.86 51.19 533.16 c +50.90 533.88 49.97 535.82 51.55 537.77 C +51.98 538.49 51.91 539.86 51.77 540.65 c +51.55 541.94 51.55 542.74 52.42 544.46 C +49.75 546.77 45.22 551.23 49.61 557.14 C +50.11 557.64 51.55 558.14 50.76 556.27 C +49.82 553.68 46.66 551.45 53.42 546.19 C +54.50 546.91 58.97 546.48 60.48 546.19 c +64.66 545.33 65.52 545.33 68.40 546.05 C +68.76 546.19 68.83 547.99 70.34 549.22 C +70.06 550.15 72.00 551.45 72.22 552.53 C +72.65 553.39 73.66 550.73 73.66 550.66 C +73.58 551.23 74.66 552.31 74.81 552.96 C +75.74 553.25 75.10 550.94 75.89 549.50 c +76.32 548.93 76.68 549.07 77.11 547.70 C +77.47 546.34 78.98 545.18 76.54 543.89 c +75.17 543.17 74.59 543.31 73.58 542.88 C +73.58 542.23 73.51 540.79 73.30 539.78 c +@c +S +U +@rs +%%Trailer + end diff --git a/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt index 44a3215be97..4c27e1e99ad 100644 --- a/Master/texmf-dist/doc/latex/graphics/changes.txt +++ b/Master/texmf-dist/doc/latex/graphics/changes.txt @@ -4,6 +4,20 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2016-06-02 David Carlisle + + * graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips + option to match pdftex behaviour and add setpagesize and + nosetpagesize options to color and graphics packages to enable or + disable this feature for all drivers. + +2016-05-22 David Carlisle + + * rotating.dtx: add from rotating distribution + * rotex.tex: add from rotating distribution (was example.tex} + * cat.eps: add from rotating distribution + * grfguide.tex: list the rotating package. + 2016-05-09 David Carlisle * graphics.dtx, color.dtx: add dvisvgm option (Till Tantau) diff --git a/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf index 514127665f4..432346fe4c5 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 bfe6d1aecd3..9e25ae75f16 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 05e231aa71e..1e5f4ac5cc7 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 1bd30698ce4..b820bc9aab3 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 d3cc0f9dd20..74f213287dc 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 c5c221220ed..a3e2d440793 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/grfguide.tex b/Master/texmf-dist/doc/latex/graphics/grfguide.tex index aa15526bef2..fc35793960b 100644 --- a/Master/texmf-dist/doc/latex/graphics/grfguide.tex +++ b/Master/texmf-dist/doc/latex/graphics/grfguide.tex @@ -1,5 +1,5 @@ %% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle -%% Copyright (C) 2005 2014 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005 2014 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 @@ -190,7 +190,7 @@ startxref \begin{document} \title{Packages in the `graphics' bundle} \author{D. P. Carlisle \and The \LaTeX3 Project} -\date{2014/04/27} +\date{2016/05/22} \maketitle @@ -954,6 +954,10 @@ syntax\\ It also has a few more commands to make it slightly more compatible with the old \LaTeX~2.09 style of the same name. +\subsection{Rotating} +An extension package to \package{graphicx}, mainly used for providing +rotated float environments. + \subsection{Trig} The trig package is not intended to be used directly in documents. It calculates sine, cosine and tangent trigonometric functions. These diff --git a/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf index 877cf20a149..fbf7259d7dc 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 59057afb21a..4478551d64f 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 new file mode 100644 index 00000000000..8f34b2d322b Binary files /dev/null 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 new file mode 100644 index 00000000000..38edafde0b5 Binary files /dev/null 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 new file mode 100644 index 00000000000..142f0b54fd6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/graphics/rotex.tex @@ -0,0 +1,687 @@ +% +% \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}}% +} +% \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 +} +% \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 +} +% \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}% +} +\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 + } +% \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{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 +} +\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 +% \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}% +} +% +% \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{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 +% diff --git a/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf index 1b7611aa430..e47c48b8234 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/doc/latex/tools/README.txt b/Master/texmf-dist/doc/latex/tools/README.txt index 82e0856a859..6545cda2fed 100644 --- a/Master/texmf-dist/doc/latex/tools/README.txt +++ b/Master/texmf-dist/doc/latex/tools/README.txt @@ -20,7 +20,7 @@ % -README for the `tools' bundle (December 1999) +README for the `tools' bundle ============================= This `bundle' consists of LaTeX2e packages written and supported by diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf index a9cc27cb39f..6bb51d4b7be 100644 Binary files a/Master/texmf-dist/doc/latex/tools/afterpage.pdf and b/Master/texmf-dist/doc/latex/tools/afterpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf index c0d2e2e4db0..cf82a2f057f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/array.pdf and b/Master/texmf-dist/doc/latex/tools/array.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf index 4b02afff7f5..0896d8e9b06 100644 Binary files a/Master/texmf-dist/doc/latex/tools/bm.pdf and b/Master/texmf-dist/doc/latex/tools/bm.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf index cd9a756bcf4..78263e5d0b5 100644 Binary files a/Master/texmf-dist/doc/latex/tools/calc.pdf and b/Master/texmf-dist/doc/latex/tools/calc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt index 88fb8b710e5..a355ac6bfaf 100644 --- a/Master/texmf-dist/doc/latex/tools/changes.txt +++ b/Master/texmf-dist/doc/latex/tools/changes.txt @@ -5,6 +5,11 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2016-06-07 David Carlisle + + * shellesc.dtx: typos in messages, and + improve use with plain etex or luatex + 2016-04-29 David Carlisle * shellesc.dtx: in classic tex code accidentally defined diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf index dfb8e8a911d..1c3d4a5b08f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf and b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf index 94b7a3cbde9..1d3d4a5164f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/delarray.pdf and b/Master/texmf-dist/doc/latex/tools/delarray.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf index 8da879b4638..093ef640e9e 100644 Binary files a/Master/texmf-dist/doc/latex/tools/enumerate.pdf and b/Master/texmf-dist/doc/latex/tools/enumerate.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf index f1da480db02..21f6efde988 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fileerr.pdf and b/Master/texmf-dist/doc/latex/tools/fileerr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf index 4a6ea2f7498..b3eedbf9432 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf and b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf index 2b88800c61f..1dfe8a7d26d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/ftnright.pdf and b/Master/texmf-dist/doc/latex/tools/ftnright.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf index f820d8e8db9..7e71c1d37b8 100644 Binary files a/Master/texmf-dist/doc/latex/tools/hhline.pdf and b/Master/texmf-dist/doc/latex/tools/hhline.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf index 200d7aab03e..57dc32719c5 100644 Binary files a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf and b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf index 7158c2818ea..6c6e6d5de73 100644 Binary files a/Master/texmf-dist/doc/latex/tools/layout.pdf and b/Master/texmf-dist/doc/latex/tools/layout.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf index 60a6ac79385..647a61aede8 100644 Binary files a/Master/texmf-dist/doc/latex/tools/longtable.pdf and b/Master/texmf-dist/doc/latex/tools/longtable.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf index 9f8a1f7616f..c1bb641bfe6 100644 Binary files a/Master/texmf-dist/doc/latex/tools/multicol.pdf and b/Master/texmf-dist/doc/latex/tools/multicol.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf index 83b87ddae36..33d7b4f6f4b 100644 Binary files a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf and b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/shellesc.pdf b/Master/texmf-dist/doc/latex/tools/shellesc.pdf index 408baa5020f..cf258fdb2e4 100644 Binary files a/Master/texmf-dist/doc/latex/tools/shellesc.pdf and b/Master/texmf-dist/doc/latex/tools/shellesc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf index 6a5ec6991d2..359993b1914 100644 Binary files a/Master/texmf-dist/doc/latex/tools/showkeys.pdf and b/Master/texmf-dist/doc/latex/tools/showkeys.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf index 81d510b4708..d5ae67b6ca5 100644 Binary files a/Master/texmf-dist/doc/latex/tools/somedefs.pdf and b/Master/texmf-dist/doc/latex/tools/somedefs.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf index 843e20e2be5..c6ef199bfba 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tabularx.pdf and b/Master/texmf-dist/doc/latex/tools/tabularx.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf index 0a760c4e853..f1501a4a45f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/theorem.pdf and b/Master/texmf-dist/doc/latex/tools/theorem.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf index c0b407e7094..e3e5ffee56f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf and b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf index 0dd35b49c7c..5e6e3e7f1f3 100644 Binary files a/Master/texmf-dist/doc/latex/tools/trace.pdf and b/Master/texmf-dist/doc/latex/tools/trace.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf index 81a53b101b5..885159ce12f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/varioref.pdf and b/Master/texmf-dist/doc/latex/tools/varioref.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf index 88b21bd90d1..68d03bc1145 100644 Binary files a/Master/texmf-dist/doc/latex/tools/verbatim.pdf and b/Master/texmf-dist/doc/latex/tools/verbatim.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf index 1f90e25f38c..a0eadd3aecf 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xr.pdf and b/Master/texmf-dist/doc/latex/tools/xr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf index 0bbb7985c2b..5aa58c7ad2d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xspace.pdf and b/Master/texmf-dist/doc/latex/tools/xspace.pdf differ diff --git a/Master/texmf-dist/source/latex/base/classes.dtx b/Master/texmf-dist/source/latex/base/classes.dtx index 885b85c6f51..c8092012147 100644 --- a/Master/texmf-dist/source/latex/base/classes.dtx +++ b/Master/texmf-dist/source/latex/base/classes.dtx @@ -263,7 +263,7 @@ % \end{macro} % % \begin{macro}{\if@restonecol} -% When the document has to printed in two columns, we sometimes +% When the document has to be printed in two columns, we sometimes % have to temporarily switch to one column. This switch is used to % remember to switch back. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx index 5103c8b4ebe..05b09ea2934 100644 --- a/Master/texmf-dist/source/latex/base/ltfinal.dtx +++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltfinal.dtx} - [2016/01/05 v2.0p LaTeX Kernel (Final Settings)] + [2016/04/22 v2.0q LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -149,6 +149,7 @@ % \changes{v2.0b}{2015/01/23}{use reserved count 257} % \changes{v2.0f}{2015/04/28}{define \cs{xe@alloc@intercharclass} for compatibility with older xelatex initilisation} %\begin{macro}{\xe@alloc@intercharclass} +%\begin{macro}{\e@alloc@intercharclass@top} % \changes{v2.0j}{2016/01/04}{Start allocation at one not three} % \changes{v2.0k}{2016/01/05}{Remove duplicated code} % Allocate |\XeTeXintercharclass| types if xetex is active. @@ -161,13 +162,25 @@ % {\newXeTeXintercharclass}{Extended Allocation}% % \end{macrocode} % -% Classes allocated 1 to 254 (early 1, 2 and 3 were pre-set for CJK). +% Classes allocated 1 to 4094 (or 254 on older xetex) +% (In earlier XeLaTeX versions 1, 2 and 3 were pre-set for CJK). % \changes{v2.0g}{2015/06/19}{Use $-1$ for first range to get contiguous allocation} +% \changes{v2.0q}{2016/04/22}{XeTeX 0.99996 has 4096 char classes not 256} % \begin{macrocode} \ifx\XeTeXcharclass\@undefined \else +% \end{macrocode} +% \begin{macrocode} +\ifdim\the\XeTeXversion\XeTeXrevision\p@>0.99993\p@ + \chardef\e@alloc@intercharclass@top=4095 +\else + \chardef\e@alloc@intercharclass@top=255 +\fi +% \end{macrocode} +% \begin{macrocode} \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 % \end{macrocode} % @@ -221,6 +234,7 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % % diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index f0bde869bd5..5dab5b2175c 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -95,7 +95,7 @@ {2016/03/31} % %<*2ekernel> -\def\patch@level{0} +\def\patch@level{1} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx index 0ef43f209be..14bd364f4fc 100644 --- a/Master/texmf-dist/source/latex/graphics/color.dtx +++ b/Master/texmf-dist/source/latex/graphics/color.dtx @@ -19,7 +19,7 @@ % \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2016/05/09 v1.1c Standard LaTeX Color (DPC)] + [2016/06/02 v1.1d Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -142,6 +142,19 @@ % \end{macrocode} % \end{option} % +% \begin{option}{setpagesize} +% \begin{option}{nosetpagesize} +% The |setpagesize| option requests that the driver option sets the page size. +% \changes{v1.1d}{2016/06/02} +% {(no)setpagesize options added} +% \begin{macrocode} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} +% \end{macrocode} +% \end{option} +% \end{option} +% % Now the options for supported drivers. % % \begin{option}{dvips} diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index e50aa55d6fd..31c3f1c5507 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -3,7 +3,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 @@ -37,7 +37,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{drivers.dtx} % - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/02 v3.0l Driver-dependent file (DPC,SPQR)] % %<*driver> \documentclass{ltxdoc} @@ -548,6 +548,26 @@ \def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}} % \end{macrocode} % +% \section{Page Size} +% +% \changes{v3.0l}{2016/06/02}{page size special added to patch pdftex.def} +% \begin{macrocode} +\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 +% \end{macrocode} +% % \begin{macrocode} % % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx index cfdfa929864..feca08c1e8f 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx @@ -19,7 +19,7 @@ % \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2016/05/09 v1.0r Standard LaTeX Graphics (DPC,SPQR)] + [2016/06/02 v1.0s Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -512,6 +512,19 @@ % \end{macrocode} % \end{option} % +% \begin{option}{setpagesize} +% \begin{option}{nosetpagesize} +% The |setpagesize| option requests that the driver option sets the page size. +% \changes{v1.0s}{2016/06/02} +% {(no)setpagesize options added} +% \begin{macrocode} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} +% \end{macrocode} +% \end{option} +% \end{option} +% % \begin{macro}{\Gin@driver} % Driver in use. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/graphics.ins b/Master/texmf-dist/source/latex/graphics/graphics.ins index ef0ba6edf46..e4aeeb0f04a 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.ins +++ b/Master/texmf-dist/source/latex/graphics/graphics.ins @@ -38,4 +38,6 @@ reports for it can be opened at http://latex-project.org/bugs.html \generate{\file{lscape.sty}{\from{lscape.dtx}{package}}} +\generate{\file{rotating.sty}{\from{rotating.dtx}{package}}} + \endbatchfile diff --git a/Master/texmf-dist/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx new file mode 100644 index 00000000000..f36174a7ece --- /dev/null +++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx @@ -0,0 +1,688 @@ +% +% \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 +%% Copyright 2016 LaTeX3 Project +% +% 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% +% + ] +%<*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 + \and Sebastian Rahtz \and Leonor Barroca} + \date{printed \today} + \MaintainedByLaTeXTeam{graphics} + \maketitle + \tableofcontents +% \listoffigures +% \listoftables + \DocInput{rotating.dtx} +\end{document} +% +% \fi +% +% \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}}% +} +% \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 +} +% \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 +} +% \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}% +} +\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 + } +% \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{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 +} +\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 +% \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}% +} +% +% \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{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 +% diff --git a/Master/texmf-dist/source/latex/tools/shellesc.dtx b/Master/texmf-dist/source/latex/tools/shellesc.dtx index d33678caa31..ebc436ad96e 100644 --- a/Master/texmf-dist/source/latex/tools/shellesc.dtx +++ b/Master/texmf-dist/source/latex/tools/shellesc.dtx @@ -10,12 +10,14 @@ % %\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} % \ProvidesFile{shellesc.drv} % \fi % \ProvidesFile{shellesc.dtx} - [2016/04/29 v0.01c unified shell escape interface for LaTeX] + [2016/06/07 v0.02a unified shell escape interface for LaTeX] % % \iffalse %<*driver> @@ -36,6 +38,7 @@ % \maketitle % % \changes{v0.1b}{2016/02/02}{Doc typo fixes (JB)} +% \changes{v0.2a}{2016/06/07}{Improve use with plain TeX} % \section{Introduction} % % @@ -92,6 +95,7 @@ % \subsection{Status Check} % % +% \changes{v0.2a}{2016/06/07}{spelling in messages} % \begin{macrocode} \ifcase \ifx\pdfshellescape\@undefined @@ -110,9 +114,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 % \end{macrocode} % @@ -180,7 +184,7 @@ % immediate form, which is overwhelmingly more commonly used with % |\write18|. % -% stop at this point if not a recent Lua\TeX. +% Stop at this point if not a recent Lua\TeX. % \begin{macrocode} \ifx\lastsavedimageresourcepages\@undefined\expandafter\endinput\fi % \end{macrocode} 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