summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
committerKarl Berry <karl@freefriends.org>2014-05-09 22:39:48 +0000
commit610c45beb863b008027a871701c889fe40bed7fb (patch)
tree5b879b56850db183fd749a497edd1d91172edf69 /Master/texmf-dist/source
parent18fa80c232cf479ae713b01b17d48bdc1d653aac (diff)
latex2e 2014/05/01 (via latex-tds)
git-svn-id: svn://tug.org/texlive/trunk@33946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/base/ltnews21.pdfbin0 -> 303211 bytes
-rw-r--r--Master/texmf-dist/source/latex/base/manual.err6
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins30
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/lcy.dtx12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/ot2.dtx12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd12
-rw-r--r--Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd12
-rw-r--r--Master/texmf-dist/source/latex/graphics/color.dtx47
-rw-r--r--Master/texmf-dist/source/latex/graphics/drivers.dtx52
-rw-r--r--Master/texmf-dist/source/latex/graphics/epsfig.dtx4
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphics.dtx44
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphicx.dtx60
-rw-r--r--Master/texmf-dist/source/latex/graphics/grfguide.tex213
-rw-r--r--Master/texmf-dist/source/latex/graphics/keyval.dtx55
-rw-r--r--Master/texmf-dist/source/latex/graphics/lscape.dtx6
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/README.asciidoc21
-rwxr-xr-xMaster/texmf-dist/source/latex/latex-tds/build.pl313
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/license/adjust_checksum/lppl.txt48
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/license/latex-tds/lppl.txt48
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/patch/encguide.tex.diff33
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/patch/source2e.tex.diff18
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/patch/utf8ienc.dtx.diff13
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex31
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini4
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini7
-rw-r--r--Master/texmf-dist/source/latex/latex-tds/tex/tools.tex8
-rw-r--r--Master/texmf-dist/source/latex/psnfss/psfonts.dtx30
-rw-r--r--Master/texmf-dist/source/latex/psnfss/psnfss2e.tex164
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.ins68
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx62
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx22
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.ins68
-rw-r--r--Master/texmf-dist/source/latex/tools/calc.dtx140
-rw-r--r--Master/texmf-dist/source/latex/tools/dcolumn.dtx26
-rw-r--r--Master/texmf-dist/source/latex/tools/delarray.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/enumerate.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/fileerr.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/fontsmpl.dtx56
-rw-r--r--Master/texmf-dist/source/latex/tools/ftnright.dtx122
-rw-r--r--Master/texmf-dist/source/latex/tools/hhline.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/indentfirst.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/layout.dtx54
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.dtx56
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.ins68
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx928
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.ins70
-rw-r--r--Master/texmf-dist/source/latex/tools/rawfonts.dtx30
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx55
-rw-r--r--Master/texmf-dist/source/latex/tools/somedefs.dtx50
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx73
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.ins67
-rw-r--r--Master/texmf-dist/source/latex/tools/theorem.dtx44
-rw-r--r--Master/texmf-dist/source/latex/tools/tools.ins40
-rw-r--r--Master/texmf-dist/source/latex/tools/trace.dtx123
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx112
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.ins69
-rw-r--r--Master/texmf-dist/source/latex/tools/verbatim.dtx42
-rw-r--r--Master/texmf-dist/source/latex/tools/xr.dtx12
-rw-r--r--Master/texmf-dist/source/latex/tools/xspace.dtx52
64 files changed, 2552 insertions, 1380 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltnews21.pdf b/Master/texmf-dist/source/latex/base/ltnews21.pdf
new file mode 100644
index 00000000000..bee4e272153
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/ltnews21.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/base/manual.err b/Master/texmf-dist/source/latex/base/manual.err
index b06bba047a4..084ae599f2d 100644
--- a/Master/texmf-dist/source/latex/base/manual.err
+++ b/Master/texmf-dist/source/latex/base/manual.err
@@ -19,13 +19,13 @@
\def\ypmd{% %
% %
% %
- Last modified on Wed 18 Jan 2006 at 13:17:43 PST by lamport %
+ Last modified on Mon 22 Aug 2005 at 1:21:28 UT by lamport %
endypmd} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\moddate}{\expandafter\xpmd\ypmd} %
\def\xpmd Last modified %
-on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#2 #3 #4} %
+on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#3 #2 #8} %
\newcommand{\prdate}{\noindent\fbox{\Large\moddate}} %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -335,7 +335,7 @@ at which point all unprocessed figures and tables are allowed a
\end{quote}
\reportedby{Paul Stanford}{9 Oct 2004}
-\subsection*{Error Corrected in the Twenty-Second Printing}
+\subsection*{Errors in All Printings}
\erratum{page 253, column 2, lines $-5$ and $-6$}
diff --git a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx
index d6c9fd329a3..82cce1be94b 100644
--- a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx
+++ b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |cyinpenc.dtx| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
index 2a971b631ab..e75d677c866 100644
--- a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
+++ b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |cyoutenc.dtx| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins
index 77dfb6cd81e..68e0c50a571 100644
--- a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins
+++ b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins
@@ -3,32 +3,32 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Cyrillic Bundle'.
%% ----------------------------------------------------------
-%%
+%%
%% It 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
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Cyrillic Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
-%% Copyright 1998, 1999, 2000, 2001 The LaTeX3 Project Team.
+%% Copyright 1993-2014
%%
%% This file is part of the `cyrillic' bundle in the LaTeX2e distribution.
%%
@@ -48,9 +48,9 @@ in the LaTeX2e distribution.
This is a generated file.
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
+Copyright 1993-2014
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Cyrillic Bundle'.
-----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ 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
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -125,9 +125,9 @@ in the LaTeX2e distribution.
This is a generated file.
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008
+Copyright 1993-2014
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Cyrillic Bundle'.
-----------------------------------------------------------------------------
@@ -137,7 +137,7 @@ 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
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/cyrillic/lcy.dtx b/Master/texmf-dist/source/latex/cyrillic/lcy.dtx
index 25ce7d23db6..acac253aab9 100644
--- a/Master/texmf-dist/source/latex/cyrillic/lcy.dtx
+++ b/Master/texmf-dist/source/latex/cyrillic/lcy.dtx
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |lcy.dtx| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd
index 22c261883a1..d6ebb6f6ec0 100644
--- a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd
+++ b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |lcycmlh.fdd| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2.dtx b/Master/texmf-dist/source/latex/cyrillic/ot2.dtx
index 6c537026de6..2ad2547b75f 100644
--- a/Master/texmf-dist/source/latex/cyrillic/ot2.dtx
+++ b/Master/texmf-dist/source/latex/cyrillic/ot2.dtx
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |ot2.dtx| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd
index acf91f82810..6ccb1e29259 100644
--- a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd
+++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |ot2cmams.fdd| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd
index 95c0937d447..70f8a952303 100644
--- a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd
+++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |ot2cmlh.fdd| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd
index 09b268e012e..174c57d207a 100644
--- a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd
+++ b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd
@@ -2,22 +2,22 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Cyrillic Bundle'.
% ----------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3b
% 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.3b or later is part of all distributions of LaTeX
+% and version 1.3b or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the `Cyrillic Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
% This is the file |t2lhfnt.fdd| of the cyrillic bundle for LaTeX2e.
diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx
index 03c02429a44..7a545b98fd5 100644
--- a/Master/texmf-dist/source/latex/graphics/color.dtx
+++ b/Master/texmf-dist/source/latex/graphics/color.dtx
@@ -19,7 +19,7 @@
%<driver> \ProvidesFile{color.drv}
% \fi
% \ProvidesFile{color.dtx}
- [2005/11/14 v1.0j Standard LaTeX Color (DPC)]
+ [2014/04/23 v1.1a Standard LaTeX Color (DPC)]
%
% \iffalse
%<*driver>
@@ -41,7 +41,7 @@
% \date{\filedate}
% \maketitle
%
-% \CheckSum{432}
+% \CheckSum{440}
%
%
% \title{The implementation of the \LaTeX\ Colour interface.}
@@ -52,15 +52,15 @@
%
% The user level documentation of this package is contained in the
% document \emph{Packages in the `graphics' bundle} in the file
-% \texttt{grfguide.tex}.
-%
+% \texttt{grfguide.tex}.
+%
% \StopEventually{}
%
%
% \section{Options}
%
% \changes{v0.2a}{1994/04/13}
-% {TEMP KLUDGE for Feb 94 release of 2e:
+% {TEMP KLUDGE for Feb 94 release of 2e:
% Add extra groups}
% \changes{v0.2d}{1994/05/13}
% {All support for Feb 1994 release removed (so used optional arg
@@ -421,7 +421,7 @@
% Since December 95, in fact this command has one other difference
% from |\color|. It calls |\leavevmode| to ensure the start of
% horizontal mode. Specifically this means that a construction
-% such as
+% such as
%\begin{verbatim}
% xxx\parbox[t]{1cm}{\textcolor{red}{a}.....
%\end{verbatim}
@@ -457,6 +457,25 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\nopagecolor}
+% |\nopagecolor| (suggested by Heiko Oberdiek) removes any currently specified page colour
+% returning to the default transparent background. It is not yet supported by all driver options
+% and so generates a warning if there is no definition in the driver file.
+%
+% \changes{v1.1a}{2014/04/23}
+% {add \cs{nopagecolor} graphics/3873}
+% \begin{macrocode}
+\def\nopagecolor{%
+ \@ifundefined{no@page@color}{%
+ \PackageInfo{color}{\string\nopagecolor\space is not supported}%
+ }{%
+ \no@page@color
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \section{Defining Colours}
%
% \begin{macro}{\definecolor}
@@ -503,7 +522,7 @@
%
% Driver files may opt to define a `named' colour model.
% Placing colour names rather than numeric specifications into the dvi
-% file has certain advantages, in that post processing software can
+% file has certain advantages, in that post processing software can
% tune the colour specifications to the particular technology being
% used, and more easily make colour separations for that colour.
% The disadvantage is that the driver must `know' the colour
@@ -516,7 +535,7 @@
%
% The `color2' drivers (textures) use a special postscript operator
% that takes both the name and the cmyk equivalent. so if the names are
-% no being used, fall back' definitions in the cmyk model are available.
+% not being used, `fall back' definitions in the cmyk model are available.
% These drivers also allow a numeric value to affect the `density'
% of the colour to use.
%
@@ -567,8 +586,8 @@
%
% \begin{macro}{\c@lor@special}
% Some drivers can not support all the features of this package. They
-% should always put a \meta{whatsit} in the current list though. the
-% following macro has most of the features of |\special|, but does not
+% should always put a \meta{whatsit} in the current list though. The
+% following macro has most of the features of |\special|, but does not
% put anything into the |dvi| file. It does write to the log file or the
% terminal (depending on the value of |#1|).
% \begin{macrocode}
@@ -627,7 +646,7 @@
% conjunction with colour. It will have no effect until the |color|
% package is also loaded.
% \changes{v0.2b}{1994/04/18}
-% {Only reset the colour with \cmd{\reset@font} not
+% {Only reset the colour with \cmd{\reset@font} not
% \cmd{\normalfont}}
% \changes{v0.2d}{1994/05/13}
% {Stop changing \cs{reset@font}. Use the new \cs{normalfont}
@@ -649,7 +668,7 @@
% the truth as the `macro layer' of \TeX\ does not know where the output
% routine is going to re-insert floats. This is why drivers must
% maintain their own stack of colours in order to fully support these
-% commands.
+% commands.
%
% For dvips, the |\current@color| it is something like `|Black|' or
% `|rgb 0 1 0|', but other packages should not rely on any particular
@@ -661,7 +680,7 @@
% are not known at this point.
%
% \section{Higher Level Commands}
-%
+%
% With the basic colour primitives specified above we may define a few
% higer level commands for coloured boxes etc. This is still quite a low
% level and presumably packages and classes making use of colour will
@@ -673,7 +692,7 @@
% |\color@block{|\emph{width}|}{|\emph{height}|}{|\emph{depth}|}|\\
% Should take up no space for \TeX, but produce a block in the current
% colour of the specified size. It is mainly used for producing box
-% backgrounds.
+% backgrounds.
%
% The definition here works by selecting a colour, and then drawing a
% \TeX\ rule (unless |\ifcolors@false|). This allows the `driver
diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx
index 81ef0afcaff..095e06920b1 100644
--- a/Master/texmf-dist/source/latex/graphics/drivers.dtx
+++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx
@@ -36,7 +36,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{drivers.dtx}
%</driver>
- [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)]
+ [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)]
%
%<*driver>
\documentclass{ltxdoc}
@@ -52,7 +52,7 @@
%</driver>
% \fi
%
-% \CheckSum{1541}
+% \CheckSum{1546}
%
%
% \providecommand\OzTeX{O\kern-.03em z\kern-.15em\TeX}
@@ -71,9 +71,9 @@
% access, so they are untested. Please send any corrections to the
% latexbugs address.
%
-%
%
-%
+%
+%
% \StopEventually{}
%
%
@@ -186,8 +186,8 @@
%
% \begin{macrocode}
\def\c@lor@@RGB#1,#2,#3\@@#4{%
-%<!color4> \c@lor@RGB@rgb{#1}\@tempa
-%<!color4> \c@lor@RGB@rgb{#2}\@tempb
+%<!color4> \c@lor@RGB@rgb{#1}\@tempa
+%<!color4> \c@lor@RGB@rgb{#2}\@tempb
%<!color4> \c@lor@RGB@rgb{#3}\@tempc
%<!color4> \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4%
%<color4> \edef#4{#1 #2 #3}%
@@ -264,7 +264,7 @@
\def\c@lor@ps@rgb@#1. #2. #3. #4. #5\@@#6{#1 #2 #3 setrgbcolor}
\def\c@lor@ps@cmyk#1. #2. #3. #4. #5. #6\@@{#1 #2 #3 #4 setcmykcolor}
\def\c@lor@ps@cmyk@#1. #2. #3. #4. #5. #6\@@#7{%
- #1 #2 #3 #4 (#7) findcustomcmykcolor
+ #1 #2 #3 #4 (#7) findcustomcmykcolor
\if!\@firstofone#5!1 \else#5 \fi setcustomcolor}
%</color2>
% \end{macrocode}
@@ -277,6 +277,8 @@
%<color4>\def\current@color{0 0 0}
% \end{macrocode}
%
+% \changes{v3.0j}{2014/04/23}
+% {add \cs{nopagecolor} for dvips graphics/3873}
% \begin{macrocode}
%<*color1>
\def\set@color{%
@@ -293,6 +295,7 @@
\def\define@color@named#1#2{%
%<!dvipsone> \expandafter\let\csname col@#1\endcsname\@nnil}
%<dvipsone> \expandafter\edef\csname col@#1\endcsname{#2}}
+%<dvips> \def\no@page@color{\special{background \string"newpath clip}}
%</color1>
%<*color2>
\def\set@color{%
@@ -519,7 +522,7 @@
%
% \section{Literal Postscript}
%
-% Raw PostScript code, no save/restore.
+% Raw PostScript code, no save/restore.
% \begin{macrocode}
\def\Gin@PS@raw#1{\special{ps: #1}}
% \end{macrocode}
@@ -626,7 +629,7 @@
%
% \section{Literal Postscript}
%
-% Raw PostScript code, no save/restore.
+% Raw PostScript code, no save/restore.
% \begin{macrocode}
\def\Gin@PS@raw#1{\special{ps: #1}}
% \end{macrocode}
@@ -665,7 +668,7 @@
%
% \section{\OzTeX}
%
-% A \LaTeXe\ graphics driver file for \OzTeX\
+% A \LaTeXe\ graphics driver file for \OzTeX\
% (versions 1.42 and later),
% by Andrew Trevorrow.
% \begin{macrocode}
@@ -715,7 +718,7 @@
from textures.def.\MessageBreak\MessageBreak
The code for scaling/rotation and file inclusion\MessageBreak
in this file is still rudimentary, and does not\MessageBreak
- use textures' full capabilities.\MessageBreak\MessageBreak
+ use textures' full capabilities.\MessageBreak\MessageBreak
A new textures.def is currently being developed\@gobble}
% \end{macrocode}
%
@@ -786,7 +789,7 @@
\typeout{no clipping support in dvialw}%
\fi
\special{language "PS",
- literal "\Gin@scalex\space
+ literal "\Gin@scalex\space
\Gin@scaley\space scale",
position = "bottom left",
include "#1\space"}%
@@ -928,7 +931,7 @@
%
% \section{Literal Postscript}
%
-% Raw PostScript code, no save/restore.
+% Raw PostScript code, no save/restore.
% \begin{macrocode}
\def\Gin@PS@raw#1{\special{ps: #1}}
% \end{macrocode}
@@ -990,7 +993,7 @@
\ifGin@clip
\typeout{no clipping support in dvitops}%
\fi
-\special{import #1\space \the\Gin@req@width\space
+\special{import #1\space \the\Gin@req@width\space
\the\Gin@req@height\space fill}}
% \end{macrocode}
%
@@ -1043,7 +1046,7 @@
\fi
\Gin@req@width.03515\Gin@req@width
\Gin@req@height.03515\Gin@req@height
- \special{ps:#1\space x=\strip@pt\Gin@req@width cm,
+ \special{ps:#1\space x=\strip@pt\Gin@req@width cm,
y=\strip@pt\Gin@req@height cm}}
% \end{macrocode}
%
@@ -1072,7 +1075,7 @@ please rename the file to .eps file extension.^^J%
\def\Gin@PS@raw#1{\special{ps::#1}}
\def\Grot@start{%
\special{ps::gsave currentpoint
- currentpoint translate \Grot@angle\space
+ currentpoint translate \Grot@angle\space
rotate neg exch neg exch translate}}
\def\Grot@end{\special{ps:: currentpoint grestore moveto}}
% \end{macrocode}
@@ -1095,7 +1098,7 @@ please rename the file to .eps file extension.^^J%
%
% \subsection{Colour}
% Uses the generic `color1' code.
-%
+%
% \begin{macrocode}
%<*pctex32>
% \end{macrocode}
@@ -1201,7 +1204,7 @@ please rename the file to .eps file extension.^^J%
\fi
\Gin@req@width.03515\Gin@req@width
\Gin@req@height.03515\Gin@req@height
- \special{eps:#1\space x=\strip@pt\Gin@req@width cm,
+ \special{eps:#1\space x=\strip@pt\Gin@req@width cm,
y=\strip@pt\Gin@req@height cm}}
% \end{macrocode}
%
@@ -1229,7 +1232,7 @@ please rename the file to .eps file extension.^^J%
\fi
\Gin@req@width.03515\Gin@req@width
\Gin@req@height.03515\Gin@req@height
- \special{bmp:#1\space x=\strip@pt\Gin@req@width cm,
+ \special{bmp:#1\space x=\strip@pt\Gin@req@width cm,
y=\strip@pt\Gin@req@height cm}}
% \end{macrocode}
%
@@ -1241,7 +1244,7 @@ please rename the file to .eps file extension.^^J%
\fi
\Gin@req@width.03515\Gin@req@width
\Gin@req@height.03515\Gin@req@height
- \special{wmf:#1\space x=\strip@pt\Gin@req@width cm,
+ \special{wmf:#1\space x=\strip@pt\Gin@req@width cm,
y=\strip@pt\Gin@req@height cm}}
% \end{macrocode}
%
@@ -1528,7 +1531,7 @@ please rename the file to .eps file extension.^^J%
\def\Gin@extensions{}
% \end{macrocode}
%
-% .ps .PS .eps .EPS are (E)PS
+% .ps .PS .eps .EPS are (E)PS
% rest are `bmp' which is a catch all type for anything
% that the inport filter can handle.
% \begin{macrocode}
@@ -1552,7 +1555,7 @@ please rename the file to .eps file extension.^^J%
% output. However Non-PS drivers can not support this (and some PS
% one's can't either). The code here makes all these commands no ops.
% Individual driver sections may define the commands to do something
-% useful.
+% useful.
%
% \begin{macrocode}
%<*nops>
@@ -1610,13 +1613,16 @@ please rename the file to .eps file extension.^^J%
%<*psrulesZ>
% \end{macrocode}
%
+% \changes{v3.0j}{2014/04/23}
+% {add .mps for metapost generated postscript to match pdftex graphics/4050}
% \begin{macrocode}
-\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z}
+\def\Gin@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}
% \end{macrocode}
%
% \begin{macrocode}
\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}}
\@namedef{Gin@rule@.pz}#1{{eps}{.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.bb}{`gunzip -c #1}}
\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.bb}{`gunzip -c #1}}
diff --git a/Master/texmf-dist/source/latex/graphics/epsfig.dtx b/Master/texmf-dist/source/latex/graphics/epsfig.dtx
index cece2634a82..c22b0eb6a68 100644
--- a/Master/texmf-dist/source/latex/graphics/epsfig.dtx
+++ b/Master/texmf-dist/source/latex/graphics/epsfig.dtx
@@ -102,8 +102,8 @@
\epsfxsize\epsfsize{\Gin@nat@width}{\Gin@nat@height}%
\ifdim\epsfxsize=\z@
\ifdim\epsfysize=\z@
- \Gin@req@height\Gin@nat@height
- \Gin@req@width\Gin@nat@width
+ \Gin@req@height\Gin@nat@height
+ \Gin@req@width\Gin@nat@width
\else
\let\Gin@scalex\Gin@exclamation
\Gin@req@height\epsfysize
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index 5ede57afa3b..ab2f34066f1 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -72,7 +72,7 @@
% to appear in a document text. Actually two separate user interface
% have been implemented. The `standard' interface, described here, and a
% more powerful, and more `user-friendly' interface provided by the
-% |graphicx| package.
+% |graphicx| package.
% \item The core functions. These functions, which are also implemented
% in this file do all the `main work'. The `user-interface functions
% just collect together the information from any optional-arguments or
@@ -171,9 +171,9 @@
% \changes{v1.0m}{2001/06/07}{Extended documentation (CAR) graphics/3228}
%
% Each use of |\DeclareGraphicsExtensions| overwrites all previous
-% definitions. It is not possible to add an extension to an
+% definitions. It is not possible to add an extension to an
% existing list.
-%
+%
% Early versions of this package defined a default argument for this
% command. This has been removed.
%
@@ -184,9 +184,9 @@
% system behaves when a file with extension \emph{ext} is specified.
% (The extension may be specified explicitly or, if the argument to
% |\includegraphics| does not have an extension, it may be a default
-% extension from the \emph{ext-list} specified with
+% extension from the \emph{ext-list} specified with
% |\DeclareGraphicsExtensions|.)
-%
+%
% \emph{ext} is the \emph{extension} of the file. Any file with this
% extension will be processed by this graphics rule. Normally a file
% with an extension for which no rule has been declared will generate an
@@ -221,7 +221,7 @@
% a BoundingBox comment.
%
% If the driver file specifies a procedure for
-% reading size files for \emph{type}, that will be used, otherwise the
+% reading size files for \emph{type}, that will be used, otherwise the
% procedure for reading |eps| files will be used. Thus the size of
% bitmap files may be specified in a file with a PostScript style
% |%%BoundingBox| line, if no other specific format is available.
@@ -235,10 +235,10 @@
% file before inserting it into the PostScript output.
%
% \subsection{Rotation}
-%
+%
% \DescribeMacro
% \rotatebox\marg{angle}\marg{text}\\
-% Rotate \emph{text} \emph{angle} degrees anti-clockwise. Normally
+% Rotate \emph{text} \emph{angle} degrees anti-clockwise. Normally
% the rotation is about the left-hand end of the baseline of
% \emph{text}.
%
@@ -255,7 +255,7 @@
% If |!| is used as either length argument, the other argument is used
% to determine a scale factor that is used in both directions.
% Normally \emph{v-length} refers to the height of the box, but in the
-% star form, it refers to the `height + depth'.
+% star form, it refers to the `height + depth'.
% As normal for \LaTeXe\ box length arguments, |\height|,
% |\width|, |\totalheight| and |\depth| may be used to refer to the
% original size of the box.
@@ -271,7 +271,7 @@
% \section{The Graphics Kernel Functions}
%
% \subsection{Graphics Inclusion}
-%
+%
% \DescribeMacro
% {\Ginclude@graphics}\marg{file}\\
% Insert the contents of the file \emph{file} at the current point.
@@ -291,15 +291,15 @@
% The read command is responsible for obtaining size information from
% the file specified in the |\DeclareGraphicsRule| command. However the
% kernel defines a function, |\Gread@eps|, which can read PostScript
-% files to find the
+% files to find the
% |%%BoundingBox| comment. This function will be used for any type for
% which a specific function has not been declared. |\Gread@eps| accepts
% a generalised version of the bounding box comment. \TeX\ units may be
% used (but there must be no space before the unit). If the unit is
-% omitted |bp| is assumed. So\\
+% omitted |bp| is assumed. So\\
% |%%BoundingBox 0 0 2in 3in|\\
% Would be accepted by this function, to produce a 2in wide, by 3in high
-% graphic.
+% graphic.
%
% \subsection{Rotation}
%
@@ -319,7 +319,7 @@
% \DescribeMacro
% {\Gscale@box@dd}\marg{dima}\marg{dimb}\marg{text}\\
% Scale \emph{text} in both directions by a factor
-% \emph{dima}/\emph{dimb}.
+% \emph{dima}/\emph{dimb}.
%
% \DescribeMacro
% {\Gscale@box@dddd}
@@ -330,7 +330,7 @@
% \DescribeMacro
% {\Gscale@div}\marg{cmd}\marg{dima}\marg{dimb}\\
% Define the macro \emph{cmd} to be the ratio of the lengths
-% \emph{dima}/\emph{dimb}.
+% \emph{dima}/\emph{dimb}.
%
%
% \section{Interface to the Driver Files}
@@ -378,7 +378,7 @@
% section of the PostScript file.\\
% |\Gin@PS@file@header|, external file to be inserted in the header
% section of the PostScript file.
-%
+%
%
% \subsection{Rotation}
%
@@ -501,7 +501,7 @@
% \end{option}
%
% \begin{option}{demo}
-% \changes{v1.0o}{2006/02/20}{demo option added}
+% \changes{v1.0o}{2006/02/20}{demo option added}
% If given this option the package will disregard the actual
% graphics file and insert a black box unless width or height are
% already specified.
@@ -699,7 +699,7 @@
% \end{macrocode}
% \end{option}
%
-% A local configuration file may define more options.
+% A local configuration file may define more options.
% It should also make one driver option the default, by calling
% |\ExecuteOptions| with the appropriate option.
% \changes{v0.4f}{1994/07/27}
@@ -887,7 +887,7 @@
% back to `bp' takes place which can introduce rounding error. The error
% is invisibly small but files conforming to Adobe DSC should have
% \emph{integer} Bounding Box Coordinates, and conceivably some drivers
-% might demand integer values.
+% might demand integer values.
% (Although most seem to accept real values (if they accept bounding box
% coordinates at all) in the |\special|. This is the reason why the
% mechanism uses |\def| and not \TeX\ lengths, as in earlier releases of
@@ -1021,7 +1021,7 @@
\def\Gin@base{\filename@area\filename@base}%
% \end{macrocode}
% \changes{v0.6c}{1994/12/15}
-% {(Piet van Oostrum) include `.' in \cs{Gin@ext}}%
+% {(Piet van Oostrum) include `.' in \cs{Gin@ext}}%
% \begin{macrocode}
\edef\Gin@ext{\Gin@sepdefault\filename@ext}%
\fi
@@ -1153,7 +1153,7 @@
%
% \begin{macro}{\Gin@exclamation}
% \changes{v0.7g}{1995/12/06}{Macro added}
-% Catcode 12 |!|, in case of French, or other language styles.
+% Catcode 12 |!|, in case of French, or other language styles.
% \begin{macrocode}
\def\Gin@exclamation{!}
% \end{macrocode}
@@ -1581,7 +1581,7 @@
% Now we should translate back by $(O_x,O_y)$, but \TeX\ can not really
% deal with boxes that do not have the reference point at the left edge.
% (Everything with a $-$ve $x$-coordinate would over-print earlier
-% text). So we modify the horizontal translation so that the
+% text). So we modify the horizontal translation so that the
% reference point as understood by \TeX\ \emph{is} at the left edge.
% This means that the `centre of rotation' is not fixed by |\rotatebox|,
% but typically moves horizontally. We also need to find the image of
diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx
index 4c241873eab..e611eb6ceb5 100644
--- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995 1996 1997 1999 David Carlisle
+%% Copyright (C) 1995 1996 1997 1999 2014 David Carlisle
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -17,7 +17,7 @@
%<driver> \ProvidesFile{graphicx.drv}
% \fi
% \ProvidesFile{graphicx.dtx}
- [1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2014/04/25 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -40,7 +40,7 @@
% \date{\filedate}
% \maketitle
%
-% \CheckSum{593}
+% \CheckSum{596}
%
% \changes{v0.3}{1994/03/01}
% {First DPC version (after prototype by SPQR).}
@@ -109,22 +109,22 @@
% \DescribeMacro
% \includegraphics\star\oarg{llx,lly}\oarg{urx,ury}\marg{file}\\
% Include a graphics file.
-%
+%
% The star form is just for
% compatibility with the standard interface, and essentially just adds
% |clip| to the keys specified. Similarly the second, two-optional
% argument form is for increased compatibility with the standard
% package. The two optional argument form is not needed in the |keyval|
-% interface.
+% interface.
%
% Various `keys' or named arguments are supported.
% \begin{description}
% \item[bb] Set the bounding box. The argument should be four
-% dimensions, separated by spaces.
+% dimensions, separated by spaces.
% \item[bbllx,bblly,bburx,bbury] Set the bounding box. Mainly for
% compatibility with older packages. |bbllx=a,bblly=b,bburx=c,bbury=d|
% is equivalent to |bb = a b c d|.
-% \item[natwidth,natheight] Again an alternative to |bb|.
+% \item[natwidth,natheight] Again an alternative to |bb|.
% |natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|.
% \item[viewport] Modify the bounding box specified in the file.
% The four values specify a bounding box \emph{relative} to the
@@ -132,7 +132,7 @@
% \item[trim] Modify the bounding box specified in the file.
% The four values specify the amounts to remove from
% the left, bottom, right and top of the original box.
-% \item[hiresbb] Boolean valued key. Defaults to |true|.
+% \item[hiresbb] Boolean valued key. Defaults to |true|.
% Causes \TeX\ to look for |%%HiResBoundingBox| comments rather than
% the standard |%%BoundingBox|. May be set to |false| to override
% a default setting of true specified by the |hiresbb| package option.
@@ -157,7 +157,7 @@
% draft mode, ie.\ do not include the graphic, but leave the
% correct space, and print the filename.
% \item[type] Specify the file type. (Normally determined from the file
-% extension.)
+% extension.)
% \item[ext] Specify the file extension.
% \emph{Only} for use with |type|.
% \item[read] Specify the `read file' which is used for determining the
@@ -277,7 +277,7 @@
% \begin{key}{Gin}{hiresbb}
% \changes{v1.0b}{1996/10/29}
% {hiresbb key added}
-% If set to true (the default) \TeX\ will look for bounding box
+% If set to true (the default) \TeX\ will look for bounding box
% comments of the form |%%HiResBoundingBox| (which typically have
% real values) instead of the standard |%%BoundingBox| (which should
% have integer values).
@@ -285,7 +285,7 @@
% \begin{macrocode}
\define@key{Gin}{hiresbb}[true]{%
\edef\Gread@BBox{%
- \@percentchar\@percentchar
+ \@percentchar\@percentchar
\csname if#1\endcsname HiRes\fi
BoundingBox}}
% \end{macrocode}
@@ -350,13 +350,13 @@
\let\Gin@olly\Gin@lly
\let\Gin@ourx\Gin@urx
\let\Gin@oury\Gin@ury
- \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
+ \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
\edef\Gin@urx{\strip@pt\dimen@}%
- \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
+ \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
\edef\Gin@ury{\strip@pt\dimen@}%
\dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
\edef\Gin@llx{\strip@pt\dimen@}%
- \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
+ \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
\edef\Gin@lly{\strip@pt\dimen@}}
% \end{macrocode}
% \end{macro}
@@ -466,7 +466,7 @@
% {Use \cs{Gin@exclamation}}
% If the scaling is being handled externally, wrap |\includegraphics| in
% the internal form of |\scalebox|, otherwise locally define
-% |\Gin@req@sizes| to calculate the required sizes based on
+% |\Gin@req@sizes| to calculate the required sizes based on
% scale factor.
% \begin{macrocode}
\define@key{Gin}{scale}{%
@@ -531,7 +531,7 @@
% Specify a read file, for use with the `type' key.
% You may want to globally set this to |*| using |\setkeys|.
% |*| means read the graphic file for size info, as in
-% |\DeclareGraphicsRule|.
+% |\DeclareGraphicsRule|.
% \changes{v0.5a}{1994/11/29}
% {Add default * possibility.}
% \begin{macrocode}
@@ -574,12 +574,12 @@
\if@tempswa
% \end{macrocode}
% External. Wrap the |\includegraphics| command in a call to the
-% internal form of |\scalebox| to handle the rotation.
+% internal form of |\scalebox| to handle the rotation.
% \begin{macrocode}
\edef\@tempa{\toks@{\noexpand
\Gscale@@box\noexpand\Gin@eresize
{\Gin@ewidth}{\Gin@eheight}{\the\toks@}}}%
- \@tempa
+ \@tempa
\else
% \end{macrocode}
% Internal. Handle scaling with the |\includegraphics| command directly
@@ -601,7 +601,7 @@
\let\Gin@@eheight\Gin@eheight
\def\Gin@req@sizes{%
\Gscale@div\Gin@scaley\Gin@@eheight\Gin@nat@height
- \let\Gin@scalex\Gin@exclamation
+ \let\Gin@scalex\Gin@exclamation
\setlength\Gin@req@height\Gin@@eheight
\Gin@req@width\Gin@scaley\Gin@nat@width}%
\fi
@@ -617,7 +617,7 @@
\let\Gin@@ewidth\Gin@ewidth
\def\Gin@req@sizes{%
\Gscale@div\Gin@scalex\Gin@@ewidth\Gin@nat@width
- \let\Gin@scaley\Gin@exclamation
+ \let\Gin@scaley\Gin@exclamation
\setlength\Gin@req@width\Gin@@ewidth
\Gin@req@height\Gin@scalex\Gin@nat@height}%
\else
@@ -709,7 +709,7 @@
% \begin{macro}{\Gin@eheight}
% Final size, initialised for no scaling.
% \begin{macrocode}
-\let\Gin@ewidth\Gin@exclamation
+\let\Gin@ewidth\Gin@exclamation
\let\Gin@eheight\Gin@ewidth
% \end{macrocode}
% \end{macro}
@@ -722,7 +722,7 @@
% Scale factors. Initialised for no scaling.
% \begin{macrocode}
\def\Gin@scalex{1}
-\let\Gin@scaley\Gin@exclamation
+\let\Gin@scaley\Gin@exclamation
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -772,16 +772,19 @@
% \begin{macro}{\rotatebox}
% Look for an optional argument.
% \changes{v0.3b}{1994/03/11}{Remove star form}
+% \changes{v1.0g}{2014/04/25}{\cs{leavevmode} added graphics/1521}
% \begin{macrocode}
\def\rotatebox{%
+ \leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Grot@box@std}
% If no KV argument, just repeat the standard definition.
+% \changes{v1.0g}{2014/04/25}{Made long graphics/4296}
% \begin{macrocode}
-\def\Grot@box@std#1#2{%
+\long\def\Grot@box@std#1#2{%
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
\Grot@x\z@
@@ -789,10 +792,11 @@
\Grot@box}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Grot@box@kv}
+% \changes{v1.0g}{2014/04/25}{Made long graphics/4296}
% \begin{macrocode}
-\def\Grot@box@kv[#1]#2#3{%
+\long\def\Grot@box@kv[#1]#2#3{%
\@begin@tempboxa\hbox{#3}%
\Grot@x\width \divide\Grot@x\tw@
\Grot@y\height \advance\Grot@y-\depth \divide\Grot@y\tw@
@@ -803,12 +807,12 @@
\@end@tempboxa}
% \end{macrocode}
% \end{macro}
-%
+%
%
% There are two ways of specifying the centre of rotation.
%
% \begin{key}{Grot}{origin}
-% |origin=|\meta{label}, where the labels are up to two of |lrctbB|
+% |origin=|\meta{label}, where the labels are up to two of |lrctbB|
% (|B| denotes the baseline, as for PSTricks).
% \begin{macrocode}
\define@key{Grot}{origin}[c]{%
diff --git a/Master/texmf-dist/source/latex/graphics/grfguide.tex b/Master/texmf-dist/source/latex/graphics/grfguide.tex
index 382f6671c98..a61b0daf5e0 100644
--- a/Master/texmf-dist/source/latex/graphics/grfguide.tex
+++ b/Master/texmf-dist/source/latex/graphics/grfguide.tex
@@ -1,5 +1,5 @@
%% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle
-%% Copyright (C) 2005 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005 2014 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
@@ -10,7 +10,7 @@
\begin{filecontents*}{a.ps}
%!
-%%BoundingBox:100 100 172 172
+%%BoundingBox:0 0 72 72
100 100 moveto
72 72 rlineto
72 neg 0 rlineto
@@ -23,7 +23,138 @@ setfont
(A) show
showpage
\end{filecontents*}
-
+\begin{filecontents*}{a.pdf}
+%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
+\end{filecontents*}
\documentclass{ltxguide}
%%% No driver option specified
@@ -38,7 +169,7 @@ showpage
%% driver option has not declared a default rule for
%% .ps files:
\DeclareGraphicsRule{.ps}{eps}{.ps}{}
-\DeclareGraphicsExtensions{.ps}
+\DeclareGraphicsExtensions{.pdf,.ps}
%% Which means:
%% .ps files are (to be treated as) EncapsulatedPostScript
%% files. The .ps file is to be read for the BoundingBox.
@@ -59,7 +190,7 @@ showpage
\begin{document}
\title{Packages in the `graphics' bundle}
\author{D. P. Carlisle \and The \LaTeX3 Project}
-\date{2005/11/14}
+\date{2014/04/27}
\maketitle
@@ -166,7 +297,7 @@ models, eg \textbf{pantone} (An industry standard set of colours),
\textbf{x11} (Colour names from the X Window System), etc. The
standard distribution does not currently have such models, but the
\textbf{named} model could be used as an example of how to define a new
-colour model. The names used in the \textbf{named} model are those
+colour model. The names used in the \textbf{named} model are those
suggested by Jim Hafner in his \textsf{colordvi} and \textsf{foiltex}
packages, and implemented originally in the |color.pro| header file for
the \texttt{dvips} driver.
@@ -175,7 +306,7 @@ the \texttt{dvips} driver.
Most of the options to the \package{color} package just specify a
driver, e.g., \ |dvips|, as discussed in section~\ref{drivers}.
-One special option for the \package{color} package
+One special option for the \package{color} package
that is of interest is |monochrome.|
If this option is selected the colour commands are all
disabled so that they do not generate errors, but do not generate colour
@@ -276,7 +407,7 @@ model, thus allowing |\color{WildStrawberry}| in addition to
\subsection{Named Colours}
Using the \textbf{named} colour model has certain advantages over
-using other colour models.
+using other colour models.
Firstly as the |dvi| file contains a request
for a colour by \emph{name}, the actual mix of primary colours used to
@@ -300,14 +431,17 @@ ink colour.
\begin{decl}
|\pagecolor|\arg{name}\\
-|\pagecolor|\oarg{model}\arg{specification}
+|\pagecolor|\oarg{model}\arg{specification}\\
+|\nopagecolor|
\end{decl}
The background colour of the whole page can be set using
|\pagecolor|. This takes the same argument forms as |\color| but sets
the background colour for the current and all subsequent pages. It is
-a global declaration, so you need to use |\pagecolor{white}| to `get
-back to normal'.
+a global declaration, so you need to use
+|\nopagecolor|\NEWfeature{2014/04/23}\ to `get back to normal'.
+If that is not supported, you may use |\pagecolor{white}| although that
+will make a white background rather than the default transparent background.
\subsection{Box Backgrounds}
Two commands similar to |\fbox| produce boxes with the backgrounds
@@ -362,7 +496,7 @@ There are two graphics packages:
\begin{description}
\item[\package{graphics}] The `standard' graphics package.
\item[\package{graphicx}] The `extended' or `enhanced' graphics
- package.
+ package.
\end{description}
The two differ only in the format of optional arguments for the
commands defined. The command names, and the mandatory arguments are
@@ -463,15 +597,15 @@ An abbreviation for |\scalebox{-1}[1]|\arg{text}.
If |!| is used as either length argument, the other argument is used
to determine a scale factor that is used in both directions.
Normally \emph{v-length} refers to the height of the box, but in the
- star form, it refers to the `height + depth'.
+ star form, it refers to the `height + depth'.
As normal for \LaTeXe\ box length arguments, |\height|,
|\width|, |\totalheight|, |\depth| may be used to refer to the
original size of the box.
-|\resizebox{1in}{\height}{Some text}|:
+|\resizebox{1in}{\height}{Some text}|:
\resizebox{1in}{\height}{Some text}
-|\resizebox{1in}{!}{Some text}|:
+|\resizebox{1in}{!}{Some text}|:
\resizebox{1in}{!}{Some text}
\subsection{Including Graphics Files}
@@ -525,7 +659,7 @@ The allowed keys are listed below.
compatibility with older packages.
Specifying |bbllx=a,bblly=b,bburx=c,bbury=d|
is equivalent to specifying |bb = a b c d|.
-\item[natwidth,natheight] Again an alternative to |bb|.
+\item[natwidth,natheight] Again an alternative to |bb|.
|natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|.
\item[hiresbb]\NEWfeature{1996/10/29}
Boolean valued key. If set to |true| (just specifying |hiresbb|
@@ -554,7 +688,7 @@ The allowed keys are listed below.
\item[totalheight]\NEWfeature{1995/06/01}
Specify the total height (height $+$ depth) of the figure.
This will differ from the `height' if rotation has occurred.
- In particular if the figure has been rotated by $-90^\circ$
+ In particular if the figure has been rotated by $-90^\circ$
then it will have zero height but large depth.
\item[keepaspectratio]\NEWfeature{1995/09/27}
Boolean valued key like `clip'.
@@ -570,7 +704,7 @@ The allowed keys are listed below.
\item[ext] Specify the file extension. This should \emph{only} be
used in conjunction with |type|.
\item[read] Specify the file extension of the `read file'. This
- should \emph{only} be used in conjunction with |type|.
+ should \emph{only} be used in conjunction with |type|.
\item[command] Specify any command to be applied to the file. This
should \emph{only} be used in conjunction with |type|.
\end{description}
@@ -599,16 +733,16 @@ image. To get these effects using the standard package, the
|\rotatebox| or |\scalebox| command.
The keys are read left-to-right, so |[angle=90, height=1in]| means
-rotate by 90 degrees, and then scale to a height of 1in.
+rotate by 90 degrees, and then scale to a height of 1in.
|[height=1in, angle=90]| would result in a final \emph{width} of 1in.
-If the \textsf{calc} package is also loaded the lengths may use
-\textsf{calc} syntax, for instance to specify a width of 2\,cm
+If the \textsf{calc} package is also loaded the lengths may use
+\textsf{calc} syntax, for instance to specify a width of 2\,cm
less than the text width: |[width=\textwidth-2cm]|.
\TeX\ leaves the space specified either in the file, or in
the optional arguments. If any part of the image is actually outside
-this area, it will by default overprint the surrounding text.
+this area, it will by default overprint the surrounding text.
If the star form is used, or |clip| specified, any part of the image
outside this area will not be printed.
@@ -620,10 +754,10 @@ described below.
To see the effect that the various options have consider the file
|a.ps|. This file contains the bounding box specification
\begin{verbatim}
-%%BoundingBox:100 100 172 172
+%%BoundingBox:0 0 72 72
\end{verbatim}
-That is, the printed region consists of a one-inch square, 100\,pt in
-from the bottom and left hand edges of the paper.
+That is, the printed region consists of a one-inch square, in
+the bottom left hand corner of the paper.
In all the following examples the input will be of the form
\begin{verbatim}
@@ -638,13 +772,13 @@ left---\fbox{\includegraphics{a}}---right
\gx |\includegraphics[scale=.5]{a}|\\
left---\fbox{\includegraphics[scale=.5]{a}}---right
-\gs |\includegraphics[115,110][135,145]{a}}|\\
-\gx |\includegraphics[bb= 115 110 135 145]{a}|\\
-left---\fbox{\includegraphics[bb= 115 110 135 145]{a}}---right
+\gs |\includegraphics[15,10][35,45]{a}}|\\
+\gx |\includegraphics[viewport= 15 10 35 45]{a}|\\
+left---\fbox{\includegraphics[viewport= 15 10 35 45]{a}}---right
-\gs |\includegraphics*[115,110][135,145]{a}}|\\
-\gx |\includegraphics[bb= 115 110 135 145,clip]{a}|\\
-left---\fbox{\includegraphics[bb= 115 110 135 145,clip]{a}}---right
+\gs |\includegraphics*[15,10][35,45]{a}}|\\
+\gx |\includegraphics[viewport= 15 10 35 45,clip]{a}|\\
+left---\fbox{\includegraphics[viewport= 15 10 35 45,clip]{a}}---right
\gs |\scalebox{0.5}{\includegraphics{a}}|
and |draft| option.\\
@@ -704,9 +838,9 @@ must exist at the time \LaTeX\ is used.
system behaves when a file with extension \emph{ext} is specified.
(The extension may be specified explicitly or, if the argument to
|\includegraphics| does not have an extension, it may be a default
- extension from the \emph{ext-list} specified with
+ extension from the \emph{ext-list} specified with
|\DeclareGraphicsExtensions|.)
-
+
\emph{ext} the file extension for which this rule applies. As a special
case, \emph{ext} may be given as |*| to denote the default behaviour for
all undeclared extensions (see the example below).
@@ -724,7 +858,7 @@ a separate file with extension |.ps.bb|. If \emph{read-file} is empty,
|{}|, then the system will not try to locate an external file for size
info, and the size must be specified in the arguments of
|\includegraphics|. If the driver file specifies a procedure for
-reading size files for \emph{type}, that will be used, otherwise the
+reading size files for \emph{type}, that will be used, otherwise the
procedure for reading |eps| files will be used. Thus the size of
bitmap files may be specified in a file with a PostScript style
|%%BoundingBox| line, if no other specific format is available.
@@ -760,14 +894,17 @@ above command so that the last argument is:\\
which incantation causes the |kpsewhich| program to find the
file, by searching along \LaTeX's path, and then pass the full path
name to the |zcat| program so that it can uncompress the file.
-Any such uses are very system dependent, and would best be placed in
+Any such uses are very system dependent, and would best be placed in
a |graphics.cfg| file, thus keeping the document itself portable.
\subsection{Global setting of keys}
Most of the \package{keyval} keys used in the \package{graphicx} package
may also be set using the command |\setkeys| provided by the
-\package{keyval} package.
+\package{keyval} package.%
+\footnote{\texttt{clip}, \texttt{scale} and \texttt{angle} may not be set via
+\texttt{\string\setkeys} prior to calling
+\texttt{\string\includegraphics}.}
For instance, suppose you wanted all the files to be included in the
current document to be scaled to 75\% of the width of the lines of text,
@@ -796,13 +933,13 @@ print a company logo as part of the letterhead.
As the author of the class you may want to give the users the
possibility of using either interface in their letters (should they
-need to include any further graphics into the letter body).
+need to include any further graphics into the letter body).
In this case the class should load the \package{graphics} package (not
\package{graphicx}, as this would commit any users of the class to the
\package{keyval} interface). The logo should be included with
|\includegraphics| either with \emph{no} optional argument (if the
correct size information is in the file) or \emph{both} optional
-arguments otherwise.
+arguments otherwise.
Do not use the \emph{one} optional argument form, as the meaning of this
argument would change (and generate errors) if the user were to load
\package{graphicx} as well as your class.
diff --git a/Master/texmf-dist/source/latex/graphics/keyval.dtx b/Master/texmf-dist/source/latex/graphics/keyval.dtx
index d86da03348a..864e2c08380 100644
--- a/Master/texmf-dist/source/latex/graphics/keyval.dtx
+++ b/Master/texmf-dist/source/latex/graphics/keyval.dtx
@@ -1,6 +1,6 @@
%
% \iffalse
-%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
+%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 2014 David Carlisle
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -17,7 +17,7 @@
%<driver> \ProvidesFile{keyval.drv}
% \fi
% \ProvidesFile{keyval.dtx}
- [1999/03/16 v1.13 key=value parser (DPC)]
+ [2014/05/08 v1.15 key=value parser (DPC)]
%
% \iffalse
%</!plain>
@@ -40,13 +40,13 @@
%
% \begin{abstract}
% A \LaTeX\ package implementing a system allowing the setting
-% of parameters (or `named arguments' with a
+% of parameters (or `named arguments' with a
% \meta{key}${}={}$\meta{value} syntax.
%
% Eg: |\foo[height=3in, shadow = true ]{bar}|
% \end{abstract}
%
-% \CheckSum{149}
+% \CheckSum{158}
%
% \changes{v1.03}
% {1993/10/13}{Initial version}
@@ -62,6 +62,12 @@
% {Improve docstrip handling}
% \changes{v1.09}{1995/09/21}
% {Move a comma for graphics/1698}
+% \changes{v1.14}{2014/04/25}
+% {Make most definitions \cs{long} to allow \cs{par} in values: graphics/3446}
+% \changes{v1.14}{2014/04/25}
+% {Only strip a single brace pair from values: graphics/3446}
+% \changes{v1.15}{2014/05/08}
+% {revert this change: Only strip a single brace pair from values: graphics/3446}
%
%
% This package implements a system of defining and using sets of
@@ -213,7 +219,7 @@
% argument \meta{value}. The second form is only allowed if the key was
% declared with a default value.
% \begin{macrocode}
-\def\setkeys#1#2{%
+\long\def\setkeys#1#2{%
% \end{macrocode}
% Save the `family' for later. Then begin acting on the comma
% separated list.
@@ -228,9 +234,11 @@
%
% \begin{macro}{\KV@do}
% Iterate down the list of comma separated argument pairs.
+% \changes{v1.14}{2014/04/25}
+% {Add \cs{@empty} not \cs{empty}}
% \begin{macrocode}
-\def\KV@do#1,{%
- \ifx\relax#1\empty\else
+\long\def\KV@do#1,{%
+ \ifx\relax#1\@empty\else
\KV@split#1==\relax
\expandafter\KV@do\fi}
% \end{macrocode}
@@ -241,7 +249,7 @@
% This macro was slightly reorganised for version 1.04, after some
% suggestions from Timothy Van Zandt.
% \begin{macrocode}
-\def\KV@split#1=#2=#3\relax{%
+\long\def\KV@split#1=#2=#3\relax{%
\KV@@sp@def\@tempa{#1}%
\ifx\@tempa\@empty\else
\expandafter\let\expandafter\@tempc
@@ -285,9 +293,9 @@
% \begin{macrocode}
%<plain>\def\KV@err#1{\errmessage{key-val: #1}}
%<*!plain>
-\DeclareOption{unknownkeysallowed}{%
+\DeclareOption{unknownkeysallowed}{%
\def\KV@errx#1{\PackageInfo{keyval}{#1}}}
-\DeclareOption{unknownkeyserror}{%
+\DeclareOption{unknownkeyserror}{%
\def\KV@errx#1{\PackageError{keyval}{#1}\@ehc}}
\ExecuteOptions{unknownkeyserror}
\let\KV@err\KV@errx
@@ -315,16 +323,17 @@
% drop any initial brace group, so |{abc}d| would incorrectly
% be treated as |abcd|. The current version only removes brace
% groups that surround the entire value, so |{abcd}| \emph{is} treated
-% correctly as |abcd|. In fact, two levels of bracing are removed, if
-% you require the entire argument to be a single brace group, you must
-% use |{{{abcd}}}|.
+% correctly as |abcd|. Prior to v1.14, two levels of bracing are removed, if
+% you require the entire argument to be a single brace group, you had
+% use |{{{abcd}}}|, fron v1.14 exactly one brace grup is removed, so to make
+% the entire value be a brace group you need |{{abc}}|.
%
% \begin{macrocode}
\def\@tempa#1{%
% \end{macrocode}
%
% \begin{macrocode}
-\def\KV@@sp@def##1##2{%
+\long\def\KV@@sp@def##1##2{%
\futurelet\KV@tempa\KV@@sp@d##2\@nil\@nil#1\@nil\relax##1}%
% \end{macrocode}
%
@@ -342,8 +351,12 @@
\fi}%
% \end{macrocode}
%
+% \changes{v1.14}{2014/04/25}
+% {Add \cs{@empty} to avoid dropping a brace pair: graphics/3446}
+% \changes{v1.15}{2014/05/08}
+% {revert last change}
% \begin{macrocode}
-\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}%
+\long\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}%
% \end{macrocode}
%
% \begin{macrocode}
@@ -356,8 +369,12 @@
\@tempa{ }
% \end{macrocode}
%
+% \changes{v1.14}{2014/04/25}
+% {Add \cs{expandafter} to remove the extra \cs{@empty} token: graphics/3446}
+% \changes{v1.15}{2014/05/08}
+% {revert last change}
% \begin{macrocode}
-\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}}
+\long\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -379,7 +396,7 @@
% key)
% \begin{macrocode}
\def\define@key#1#2{%
- \@ifnextchar[{\KV@def{#1}{#2}}{\@namedef{KV@#1@#2}####1}}
+ \@ifnextchar[{\KV@def{#1}{#2}}{\long\@namedef{KV@#1@#2}####1}}
% \end{macrocode}
% \end{macro}
%
@@ -387,9 +404,9 @@
% Make the definitions of the command, and the default value.
% \begin{macrocode}
\def\KV@def#1#2[#3]{%
- \@namedef{KV@#1@#2@default\expandafter}\expandafter
+ \long\@namedef{KV@#1@#2@default\expandafter}\expandafter
{\csname KV@#1@#2\endcsname{#3}}%
- \@namedef{KV@#1@#2}##1}
+ \long\@namedef{KV@#1@#2}##1}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/graphics/lscape.dtx b/Master/texmf-dist/source/latex/graphics/lscape.dtx
index 57c32190bff..60062d1d83b 100644
--- a/Master/texmf-dist/source/latex/graphics/lscape.dtx
+++ b/Master/texmf-dist/source/latex/graphics/lscape.dtx
@@ -67,15 +67,15 @@
% \end{macrocode}
% Here is what Scott Pakin wrote about the pdftex option:
% \begin{quote}
-% I've made a minor improvement to lscape.dtx that I'd like to share
+% I've made a minor improvement to lscape.dtx that I'd like to share
% with the world. My addition makes lscape rotate the PDF "paper" --
% not just the text on the page -- when given the "pdftex" option.
% (Naturally, this works only with pdfLaTeX.) The result is that the
% text is viewable online without the reader having to rotate his/her
% head 90 degrees. The document still prints normally.
% \end{quote}
-%
-%
+%
+%
% \begin{macrocode}
\newif\ifGin@pdftex
\Gin@pdftexfalse
diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
index d17267851a2..968481f9067 100644
--- a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
+++ b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
@@ -1,7 +1,7 @@
README for project latex-tds
============================
:author: Heiko Oberdiek
-:revdate: 2014/02/03
+:revdate: 2014/05/08
:lang: en
:toc:
:numbered:
@@ -254,7 +254,7 @@ Licenses
|license/lppl.txt |LPPL (The LaTeX Project Public License)
for latex-tds and adjust_checksum
|license/ziptimetree/lgpl.txt |LGPL (GNU Lesser General Public License)
- for ziptimetree
+ for ziptimetree, check-ascii, check-eolspaces
|===
Scripts
@@ -264,6 +264,8 @@ Scripts
|build.pl |main script for building the distribution
|lib/adjust_checksum.pl |Perl script that runs a DTX file through
LaTeX and corrects its +\Checksum+ if necessary
+|lib/check-ascii.pl |Perl script that looks for non-ASCII characters
+|lib/check-eolspaces.pl |Perl script that looks for trailing spaces
|lib/ziptimetree.pl |Perl script that generates a ZIP file from
a directory tree with sorted entries (LGPL)
|===
@@ -661,3 +663,18 @@ History
languages are now maintained separately.
* Update of knuth (2014/01/19).
* Update of base (errata lists: +lb2.err+, +tlc2.err+).
+2014/05/03::
+ * Update of LaTeX, release 2014/05/01
+ using public subversion repository of LaTeX2e.
+ Modules: base, cyrillic, graphics, tools.
+ * Line ends are normalized in source text files of the LaTeX modules.
+ Trailing spaces are removed and the line ends are Unix line ends.
+ * Update of armtex (needed to generate module base).
+ * New options +--vcs+ and +--vcs-update+ for using the files of
+ the public source repository of the LaTeX project.
+2014/05/05::
+ * Using LaTeX modules from CTAN.
+2014/05/08::
+ * Update of base and graphics.
+ * +README.html+ with Unix line ends.
+ * ZIP file for CTAN upload with top level directory +latex-tds+.
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index a654ba7e469..d1dbf8fe08e 100755
--- a/Master/texmf-dist/source/latex/latex-tds/build.pl
+++ b/Master/texmf-dist/source/latex/latex-tds/build.pl
@@ -4,8 +4,8 @@ $^W=1;
my $prj = 'latex-tds';
my $file = 'build.pl';
-my $version = '1.182';
-my $date = '2014-02-03';
+my $version = '1.185';
+my $date = '2014-05-08';
my $author = 'Heiko Oberdiek';
my $copyright = "Copyright 2006-2014 $author";
chomp(my $license = <<"END_LICENSE");
@@ -67,12 +67,16 @@ my $dir_incoming = 'incoming';
my $dir_incoming_ctan = "$dir_incoming/ctan";
my $dir_incoming_ams = "$dir_incoming/ams";
my $dir_incoming_ltxprj = "$dir_incoming/ltxprj";
+my $dir_ltxpub = "latex2e-public";
+my $dir_incoming_ltxpub = "$dir_incoming/$dir_ltxpub";
my $dir_build = 'build';
my $dir_lib = 'lib';
my $dir_license = 'license';
my $dir_tex = 'tex';
my $dir_patch = 'patch';
my $dir_distrib = 'distrib';
+my $dir_build_distrib = "$dir_build/distrib";
+my $dir_build_distrib_data = "$dir_build_distrib/$prj";
my $dir_texmf = 'texmf';
chomp(my $cwd = `pwd`);
@@ -125,13 +129,14 @@ my $prg_lualatextds = "lualatex -fmt=$cwd/$dir_build/lualatex-tds";
my $prg_lualatextds2 = "lualatex -fmt=$cwd/$dir_build/lualatex-tds2";
my $prg_pdflatex = 'pdflatex';
my $prg_pdflatextds = "pdflatex -fmt=$cwd/$dir_build/pdflatex-tds";
-my $prg_pdftex = "pdftex";
-my $prg_recode = "recode";
-my $prg_rm = "rm";
-my $prg_rsync = "rsync";
+my $prg_pdftex = 'pdftex';
+my $prg_recode = 'recode';
+my $prg_rm = 'rm';
+my $prg_rsync = 'rsync';
my $prg_sed = "sed";
-my $prg_sort = "sort";
-my $prg_texhash = "texhash";
+my $prg_sort = 'sort';
+my $prg_svn = 'svn';
+my $prg_texhash = 'texhash';
my $prg_unzip = 'unzip';
my $prg_w3m = 'w3m';
my $prg_weave = 'weave';
@@ -172,6 +177,8 @@ my $usage = <<"END_OF_USAGE";
Usage: build.pl [options]
General options:
--(no)download (check for newer files, disabled by default)
+ --(no)vcs (use version control files)
+ --(no)vcs-update (update version control files)
--(no)postprocess (pdf files are postprocessed, enabled by default)
--(no)cache (use cached pdf files, enabled by default)
Module options:
@@ -180,6 +187,8 @@ END_OF_USAGE
map { $usage .= " --(no)$_\n"; } @pkg_list;
my $opt_download = 0;
+my $opt_vcs = 0;
+my $opt_vcs_update = 0;
my $opt_postprocess = 0;
my $opt_cache = 1;
my $opt_all = 0;
@@ -195,6 +204,8 @@ GetOptions(
map { $modules{$_} = 1; } @pkg_list;
},
'download!' => \$opt_download,
+ 'vcs!' => \$opt_vcs,
+ 'vcs-update!' => \$opt_vcs_update,
'postprocess!' => \$opt_postprocess,
'cache!' => \$opt_cache,
) or die $usage;
@@ -210,12 +221,32 @@ sub cd ($) {
chdir $dir or die "$error Cannot change to directory `$dir'!\n";
}
+### Line end sanitizing
+
+sub lf ($) {
+ my $file = shift;
+ open(IN, '<', $file) or die "!!! Error: Cannot open `$file'!\n";
+ my @lines = <IN>;
+ close(IN);
+ my $found = 0;
+ $found += s/\s+$/\n/ for @lines;
+ if ($found) {
+ open(OUT, '>', $file) or die "!!! Error: Cannot write `$file'!\n";
+ print OUT @lines;
+ close(OUT);
+ print "--> lf($file): $found line(s) fixed.\n";
+ }
+ else {
+ print "--> lf($file): nothing to do.\n";
+ }
+}
+
### Format generation
if (@list_modules > 0) {
section('Format generation');
ensure_directory($dir_build);
-
+
sub make_ini ($$) {
my $prg = shift;
my $fmt = shift;
@@ -229,12 +260,12 @@ if (@list_modules > 0) {
run("$prg_cp $fmt.fmt $fmt.log $dir_cache");
}
}
-
- chdir $dir_build;
+
+ cd $dir_build;
make_ini($prg_pdflatex, 'pdflatex-tds');
make_ini($prg_lualatex, 'lualatex-tds');
make_ini($prg_lualatex, 'lualatex-tds2');
- chdir $cwd;
+ cd $cwd;
}
### Download
@@ -320,6 +351,24 @@ if (@list_modules > 0) {
download_ctan_file('armtex.zip', 'language/armenian');
}
+### VCS
+{
+ section('VCS');
+
+ if ($opt_vcs_update) {
+ if (-d "$dir_incoming_ltxpub/.svn") {
+ cd $dir_incoming_ltxpub;
+ run("$prg_svn update");
+ }
+ else {
+ cd $dir_incoming;
+ run("$prg_svn checkout http://latex-project.org/svnroot/latex2e-public/ $dir_ltxpub");
+ }
+ cd $cwd;
+ }
+}
+
+
### Remove previous build
section('Remove previous build');
{
@@ -384,32 +433,59 @@ section('Unpacking');
run("$prg_unzip -j $zipfile -d$dir");
}
+ sub eols (@) {
+ for my $pat (@_) {
+ for my $file (glob "$dir_build/$pat") {
+ next if $file =~ /\.(?:pdf|zip)$/i;
+ lf $file;
+ }
+ }
+ }
+
ensure_directory($dir_build);
- unpack_ctan('base');
+
if ($modules{'base'}) {
- # replace .err files
- foreach my $name (qw[
- lb2
- lgc2
- manual
- tlc2
- ]) {
- my $file = "$dir_incoming_ltxprj/$name.err";
- my $dest = "$dir_build/base/$name.err";
- run("$prg_cp $file $dest");
+ ensure_directory("$dir_build/base");
+ if ($opt_vcs) {
+ run("$prg_cp -r $dir_incoming_ltxpub/base/* $dir_build/base/");
+ run("$prg_cp $dir_incoming_ltxpub/doc/*.tex $dir_build/base/");
+ }
+ else {
+ unpack_ctan('base');
+ # replace .err files
+ foreach my $name (qw[
+ lb2
+ lgc2
+ manual
+ tlc2
+ ]) {
+ my $file = "$dir_incoming_ltxprj/$name.err";
+ my $dest = "$dir_build/base/$name.err";
+ run("$prg_cp $file $dest");
+ }
+ run("$prg_rm -rf $dir_build/base/doc");
+ unpacking('base',
+ "$dir_incoming_ctan/doc.zip",
+ "$dir_build/base");
+ run("$prg_cp -p $dir_build/base/doc/*.tex $dir_build/base/");
}
- run("$prg_rm -rf $dir_build/base/doc");
- unpacking('base',
- "$dir_incoming_ctan/doc.zip",
- "$dir_build/base");
- run("$prg_cp -p $dir_build/base/doc/*.tex $dir_build/base/");
unpacking('base',
"$dir_incoming_ctan/armtex.zip",
"$dir_build/base");
+ eols("base/*") if $modules{'base'};
}
- map {
- unpack_ctan($_);
+
+ map {
+ ensure_directory("$dir_build/$_");
+ if ($opt_vcs and /cyrillic|graphics|tools/) {
+ run("$prg_cp -r $dir_incoming_ltxpub/required/$_/* $dir_build/$_/");
+ }
+ else {
+ unpack_ctan($_);
+ }
+ eols("$_/*") if $modules{$_};
} @required_list;
+
if ($modules{'amslatex'}) {
unpack_ams('amscls', "$dir_incoming_ctan/amscls.tds.zip");
unpack_ams('amsrefs', "$dir_incoming_ctan/amsrefs.tds.zip");
@@ -427,6 +503,7 @@ section('Unpacking');
# run("$prg_cp $dir_build/amslatex/ctan/amsrefs/amsrefs.dtx "
# . "$dir_build/amslatex/texmf/source/latex/amsrefs/amsrefs.dtx");
}
+
if ($modules{'amsfonts'}) {
ensure_directory("$dir_build/amsfonts");
unpacking('amsfonts',
@@ -457,13 +534,13 @@ section('Patches');
; #
if ($modules{'psnfss'}) {
- chdir "$dir_build/psnfss";
+ cd "$dir_build/psnfss";
run("$prg_checksum psfonts.dtx");
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'knuth'}) {
- chdir "$dir_build/knuth";
+ cd "$dir_build/knuth";
my @files = qw[
trip.fot
tripin.log
@@ -479,7 +556,7 @@ section('Patches');
trap.typ
];
run("$prg_chmod -x @files");
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'amslatex'}) {
@@ -496,18 +573,18 @@ section('Install source');
my $pkg = shift;
my @list = @_;
$modules{$pkg} or return 1;
- chdir "$dir_build/$pkg";
+ cd "$dir_build/$pkg";
install "texmf/source/$fmt/$pkg", @list;
- chdir $cwd;
+ cd $cwd;
}
sub install_generic_source ($$@) {
my $pkg = shift;
my $dir = shift;
my @list = @_;
$modules{$pkg} or return 1;
- chdir "$dir_build/$pkg";
+ cd "$dir_build/$pkg";
install "texmf/source/$dir", @list;
- chdir $cwd;
+ cd $cwd;
}
sub install_source ($@) {
my $pkg = shift;
@@ -617,7 +694,7 @@ section('Install source');
section('Patches after source install');
{
if ($modules{'base'}) {
- chdir "$dir_build/base";
+ cd "$dir_build/base";
# ltdirchk.dtx must be patched to fool it in
# not having texsys.cfg
@@ -635,31 +712,14 @@ section('Patches after source install');
close(IN);
}
- # base: TDS:makeindex/base -> TDS:makeindex/latex
- {
- my $file_ins = 'docstrip.ins';
- my $file_org = 'docstrip.ins.org';
- rename $file_ins, $file_org;
- open(IN, '<', $file_org) or die "$error Cannot open `$file_org'!\n";
- open(OUT, '>', $file_ins) or die "$error Cannot write `$file_ins'!\n";
- while (<IN>) {
- s|makeindex/base|makeindex/latex|;
- print OUT;
- }
- close(OUT);
- close(IN);
- }
-
- # fix CR/LF line endings of tlc2.err (2012-05-12)
- run("$prg_zip -ll tlc2.zip tlc2.err");
- run("$prg_unzip -o tlc2.zip");
-
- chdir $cwd;
+ cd $cwd;
+ lf("$dir_build/base/encguide.tex");
patch('base/encguide.tex');
patch('base/source2e.tex');
patch('base/tlc2.err');
patch('base/utf8ienc.dtx');
+ #
# lb2.err contains <CR><LF> line endings, a patch file
# created by diff in Linux would create mixed line endings
# causing trouble for subversion (Karl Berry).
@@ -703,9 +763,9 @@ section('Docstrip');
my $pkg = shift;
my $ins = shift;
$modules{$pkg} or return 1;
- chdir "$dir_build/$pkg";
+ cd "$dir_build/$pkg";
run("$prg_docstrip $ins.ins");
- chdir $cwd;
+ cd $cwd;
1;
}
docstrip('base', 'unpack');
@@ -717,9 +777,9 @@ section('Docstrip');
## patch for amsthm.sty, part 1/2
#if ($modules{'amslatex'}) {
- # chdir "$dir_build/amslatex/amscls";
+ # cd "$dir_build/amslatex/amscls";
# run("$prg_docstrip ams-c1.ins");
- # chdir $cwd;
+ # cd $cwd;
#}
}
@@ -767,7 +827,7 @@ section('TDS cleanup');
section('Install tex doc');
{
if ($modules{'base'}) {
- chdir "$dir_build/base";
+ cd "$dir_build/base";
install 'texmf/doc/latex/base', qw[
00readme.txt
autoload.txt
@@ -793,40 +853,40 @@ section('Install tex doc');
install 'texmf/tex/latex/base', qw[
texsys.cfg
];
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'tools'}) {
- chdir "$dir_build/tools";
+ cd "$dir_build/tools";
install 'texmf/doc/latex/tools', qw[
changes.txt
manifest.txt
readme.txt
];
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'graphics'}) {
- chdir "$dir_build/graphics";
+ cd "$dir_build/graphics";
install('texmf/doc/latex/graphics',
'*.txt'
);
install('texmf/tex/latex/graphics',
'*.def'
);
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'cyrillic'}) {
- chdir "$dir_build/cyrillic";
+ cd "$dir_build/cyrillic";
install('texmf/doc/latex/cyrillic',
'*.txt'
);
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'psnfss'}) {
- chdir "$dir_build/psnfss";
+ cd "$dir_build/psnfss";
install('texmf/doc/latex/psnfss',
'*.txt'
);
@@ -839,11 +899,11 @@ section('Install tex doc');
install('texmf/fonts/map/dvips/psnfss',
'*.map'
);
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'tds'}) {
- chdir "$dir_build/tds";
+ cd "$dir_build/tds";
install('texmf/doc/tds', qw[
README
ChangeLog
@@ -852,11 +912,11 @@ section('Install tex doc');
install('texmf/doc/info', qw[
tds.info
]);
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'knuth'}) {
- chdir "$dir_build/knuth";
+ cd "$dir_build/knuth";
install('texmf/doc/knuth/tex', qw[
texbook.tex
]);
@@ -868,11 +928,11 @@ section('Install tex doc');
mf84.bug
tex82.bug
]);
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'etex'}) {
- chdir "$dir_build/etex";
+ cd "$dir_build/etex";
my $doc_dir = 'texmf/doc/etex/base';
my $src_dir = 'texmf/source/etex/base';
ensure_directory($doc_dir);
@@ -880,31 +940,23 @@ section('Install tex doc');
install($src_dir, qw[
etex_man.tex etex_man.sty
]);
- chdir $cwd;
+ cd $cwd;
}
## patch for amsthm.sty, part 2/2
#if ($modules{'amslatex'}) {
- # chdir "$dir_build/amslatex/amscls";
+ # cd "$dir_build/amslatex/amscls";
# my $dest_dir = '../texmf/tex/latex/amscls';
# ensure_directory($dest_dir);
# install($dest_dir, 'amsthm.sty');
- # chdir $cwd;
+ # cd $cwd;
#}
}
### Preparation for documentation
if ($modules{'base'}) {
my $dir_src = "$dir_build/base/armtex";
- my $tds_mf = "$dir_texmf/fonts/source/public/armtex";
- my $tds_tfm = "$dir_texmf/fonts/tfm/public/armtex";
- my $tds_latex = "$dir_texmf/tex/latex/armtex";
- my @tds_mf = map {chomp;$_} glob "$dir_src/mf/*.mf";
- my @tds_tfm = map {chomp;$_} glob "$dir_src/tfm/*.tfm";
- my @tds_latex = map {chomp;$_} glob "$dir_src/latex/*.*";
- install($tds_mf, @tds_mf);
- install($tds_tfm, @tds_tfm);
- install($tds_latex, @tds_latex);
+ run("$prg_cp -r $dir_build/base/armtex/* $dir_texmf/");
run("$prg_texhash $dir_texmf");
}
@@ -951,6 +1003,7 @@ if ($modules{'base'}) {
cache 'base', $guide, sub {
my $latextds = $prg_lualatextds;
$latextds = $prg_lualatextds2 if $guide eq 'usrguide';
+ $latextds = $prg_pdflatextds if $guide eq 'encguide';
run("$latextds -draftmode $guide");
run("$latextds -draftmode $guide");
final_begin;
@@ -1011,7 +1064,7 @@ if ($modules{'base'}) {
install_pdf('base', "$base");
1;
}
- chdir "$dir_build/base";
+ cd "$dir_build/base";
## source2e
cache 'base', 'source2e', sub {
@@ -1165,19 +1218,20 @@ END_CODE
}
}
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for tools
if ($modules{'tools'}) {
section('Documentation: tools');
- chdir "$dir_build/tools";
+ cd "$dir_build/tools";
my @list = glob("*.dtx");
map { s/\.dtx$//; } @list;
foreach my $entry (@list) {
my $latextds = $prg_lualatextds;
- $latextds = $prg_pdflatextds if $entry eq 'bm';
+ $latextds = $prg_pdflatextds if $entry eq 'bm'
+ or $entry eq 'multicol';
$latextds = $prg_lualatextds2 if $entry eq 'calc'
or $entry eq 'rawfonts'
or $entry eq 'showkeys';
@@ -1279,14 +1333,14 @@ END_FILE
final_end;
};
install_pdf('tools', 'tools');
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for cyrillic
if ($modules{'cyrillic'}) {
section('Documentation: cyrillic');
- chdir "$dir_build/cyrillic";
+ cd "$dir_build/cyrillic";
my @list = (glob("*.dtx"), glob("*.fdd"));
foreach my $entry (@list) {
my $base = $entry;
@@ -1300,14 +1354,14 @@ if ($modules{'cyrillic'}) {
};
install_pdf('cyrillic', $base);
}
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for graphics
if ($modules{'graphics'}) {
section('Documentation: graphics');
- chdir "$dir_build/graphics";
+ cd "$dir_build/graphics";
my @list = glob("*.dtx");
map { s/\.dtx$//; } @list;
foreach my $entry (@list) {
@@ -1336,7 +1390,7 @@ END_CODE
final_end;
};
install_pdf('graphics', 'grfguide');
- chdir $cwd;
+ cd $cwd;
}
sub makeindex ($) {
@@ -1394,23 +1448,23 @@ if ($modules{'amslatex'}) {
install_pdf($amspkg, $doc);
}
- chdir "$dir_build/amslatex/amsmath";
+ cd "$dir_build/amslatex/amsmath";
symlink '../texmf', 'texmf';
map { generate_doc 'amsmath', $_; } qw[
amsldoc subeqn technote testmath
amsbsy amscd amsgen amsmath amsopn amstext amsxtra
];
- chdir $cwd;
+ cd $cwd;
- chdir "$dir_build/amslatex/amscls";
+ cd "$dir_build/amslatex/amscls";
symlink '../texmf', 'texmf';
map { generate_doc 'amscls', $_; } qw[
amsthdoc instr-l thmtest
amsclass amsdtx amsmidx upref
];
- chdir $cwd;
+ cd $cwd;
- chdir "$dir_build/amslatex/amsrefs";
+ cd "$dir_build/amslatex/amsrefs";
symlink '../texmf', 'texmf';
map { generate_doc 'amsrefs', $_; } qw[
amsrdoc changes
@@ -1418,7 +1472,7 @@ if ($modules{'amslatex'}) {
];
# 2013-02-13: Excluded as test files:
# cite-xa cite-xb cite-xh cite-xs
- chdir $cwd;
+ cd $cwd;
}
if ($modules{'amsfonts'}) {
@@ -1449,7 +1503,7 @@ if ($modules{'amsfonts'}) {
install_gen_pdf('fonts', $amspkg, $doc);
}
- chdir "$dir_build/amsfonts";
+ cd "$dir_build/amsfonts";
map {generate_doc2 'amsfonts', $_; } qw[
amsfonts amssymb cmmib57 eufrak euscript
];
@@ -1464,14 +1518,14 @@ if ($modules{'amsfonts'}) {
};
}
install_gen_pdf('fonts', 'amsfonts', 'amsfndoc');
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for psnfss
if ($modules{'psnfss'}) {
section('Documentation: psnfss');
- chdir "$dir_build/psnfss";
+ cd "$dir_build/psnfss";
cache 'psnfss', 'psfonts', sub {
run("$prg_pdflatextds -draftmode psfonts.dtx");
@@ -1490,14 +1544,14 @@ if ($modules{'psnfss'}) {
};
install_pdf('psnfss', 'psnfss2e');
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for tds
if ($modules{'tds'}) {
section('Documentation: tds');
- chdir "$dir_build/tds";
+ cd "$dir_build/tds";
my $file_tds = 'tds.tex';
my $file_tds_new = 'tds.new';
@@ -1530,14 +1584,14 @@ END_TEXT
};
install_gen_pdf('', 'tds', 'tds');
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for knuth
if ($modules{'knuth'}) {
section('Documentation: knuth');
- chdir "$dir_build/knuth";
+ cd "$dir_build/knuth";
my $knuth_drv = "$cwd/$dir_tex/knuth.drv";
@@ -1676,14 +1730,14 @@ if ($modules{'knuth'}) {
};
install_gen_pdf('knuth', 'errata', 'errata');
- chdir $cwd;
+ cd $cwd;
}
### Generate documentation for etex
if ($modules{'etex'}) {
section('Documentation: etex');
- chdir "$dir_build/etex";
+ cd "$dir_build/etex";
my $entry = 'etex_man';
my $etex_man_drv = "$cwd/$dir_tex/$entry.drv";
@@ -1697,7 +1751,7 @@ if ($modules{'etex'}) {
};
install_gen_pdf('etex', 'base', $entry);
- chdir $cwd;
+ cd $cwd;
}
### Module source
@@ -1718,6 +1772,7 @@ if ($modules{'source'}) {
# generate README.html
run("$prg_asciidoc --backend=xhtml11 README.asciidoc");
+ lf("README.html");
# generate README.pdf
# run("$prg_asciidoc --out-file=$file_readme_notoc_html"
@@ -1760,7 +1815,7 @@ if ($modules{'source'}) {
push @lines_post, $_;
push @lines_post, ($2 ? '-' : '=') x length($_) . "\n";
my $prefix = ' ' x (3 * ($2 ? 2 : 1));
- s/^(\d+)\.(\d+\.)? /($1<10 ? ' ' : '') . "$1.$2 "/e;
+ s/^(\d+)\.((?:\d+\.)?) /($1<10 ? ' ' : '') . "$1.$2 "/e;
push @lines_toc, "$prefix$_";
next;
}
@@ -1846,13 +1901,29 @@ section('Distrib');
}
if ($opt_all) {
- chdir $dir_distrib;
- my $cmd = "$prg_zip -0 $file_ctan_distrib README README.html README.pdf";
- for my $pkg (sort @pkg_list) {
- $cmd .= " $pkg.tds.zip";
+ ensure_directory($dir_build_distrib);
+ my @files = map {"$cwd/$_"} qw[
+ README
+ README.html
+ README.pdf
+ ],
+ map {"$dir_distrib/$_.tds.zip"} sort @pkg_list;
+ run("$prg_rm -rf $dir_build_distrib_data") if -d $dir_build_distrib_data;
+ ensure_directory($dir_build_distrib_data);
+ cd $dir_build_distrib_data;
+ my @list;
+ foreach my $file (@files) {
+ $file =~ m|/([^/]+)$| or die "!!! Error: Cannot extract file name (`$file')!\n";
+ my $file_new = $1;
+ -f $file or die "!!! Error: File `$file' not found!\n";
+ link $file, $file_new or die "!!! Error: Cannot link `$file' => `$file_new': $!\n";
+ push @list, "$prj/$file_new";
}
+ cd $cwd;
+ cd $dir_build_distrib;
+ my $cmd = "$prg_zip -0 $file_ctan_distrib $prj @list";
run($cmd);
- chdir $cwd;
+ cd $cwd;
}
}
diff --git a/Master/texmf-dist/source/latex/latex-tds/license/adjust_checksum/lppl.txt b/Master/texmf-dist/source/latex/latex-tds/license/adjust_checksum/lppl.txt
index 22443139013..494f58131f7 100644
--- a/Master/texmf-dist/source/latex/latex-tds/license/adjust_checksum/lppl.txt
+++ b/Master/texmf-dist/source/latex/latex-tds/license/adjust_checksum/lppl.txt
@@ -16,8 +16,8 @@ which the LaTeX kernel and the base LaTeX packages are distributed.
You may use this license for any work of which you hold the copyright
and which you wish to distribute. This license may be particularly
-suitable if your work is TeX-related (such as a LaTeX package), but
-it is written in such a way that you can use it even if your work is
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
unrelated to TeX.
The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
@@ -44,11 +44,11 @@ In this license document the following terms are used:
`Work'
Any work being distributed under this License.
-
+
`Derived Work'
Any work that under any applicable law is derived from the Work.
- `Modification'
+ `Modification'
Any procedure that produces a Derived Work under any applicable
law -- for example, the production of a file containing an
original file associated with the Work or a significant portion of
@@ -58,7 +58,7 @@ In this license document the following terms are used:
`Modify'
To apply any procedure that produces a Derived Work under any
applicable law.
-
+
`Distribution'
Making copies of the Work available from one person to another, in
whole or in part. Distribution includes (but is not limited to)
@@ -79,16 +79,16 @@ In this license document the following terms are used:
no such explicit nomination then it is the `Copyright Holder' under
any applicable law.
- `Base Interpreter'
+ `Base Interpreter'
A program or process that is normally needed for running or
- interpreting a part or the whole of the Work.
+ interpreting a part or the whole of the Work.
A Base Interpreter may depend on external components but these
are not considered part of the Base Interpreter provided that each
external component clearly identifies itself whenever it is used
interactively. Unless explicitly specified when applying the
license to the Work, the only applicable Base Interpreter is a
- `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-Format' or in the case of files belonging to the
`LaTeX-format' a program implementing the `TeX language'.
@@ -129,8 +129,8 @@ the Derived Work.
distribute a Derived Work provided the following conditions are met
for every component of the Work unless that component clearly states
in the copyright notice that it is exempt from that condition. Only
-the Current Maintainer is allowed to add such statements of exemption
-to a component of the Work.
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
a. If a component of this Derived Work can be a direct replacement
for a component of the Work when that component is used with the
@@ -140,13 +140,13 @@ to a component of the Work.
clearly and unambiguously identifies itself as a modified version
of this component to the user when used interactively with that
Base Interpreter.
-
+
b. Every component of the Derived Work contains prominent notices
detailing the nature of the changes to that component, or a
prominent reference to another file that is distributed as part
of the Derived Work and that contains a complete and accurate log
of the changes.
-
+
c. No information in the Derived Work implies that any persons,
including (but not limited to) the authors of the original version
of the Work, provide any support, including (but not limited to)
@@ -156,7 +156,7 @@ to a component of the Work.
d. You distribute at least one of the following with the Derived Work:
- 1. A complete, unmodified copy of the Work;
+ 1. A complete, unmodified copy of the Work;
if your distribution of a modified component is made by
offering access to copy the modified component from a
designated place, then offering equivalent access to copy
@@ -183,15 +183,15 @@ format, where the Work or that Derived Work (in whole or in part) is
then produced by applying some process to that format, does not relax or
nullify any sections of this license as they pertain to the results of
applying that process.
-
+
10. a. A Derived Work may be distributed under a different license
provided that license itself honors the conditions listed in
Clause 6 above, in regard to the Work, though it does not have
to honor the rest of the conditions in this license.
-
+
b. If a Derived Work is distributed under a different license, that
Derived Work must provide sufficient documentation as part of
- itself to allow each recipient of that Derived Work to honor the
+ itself to allow each recipient of that Derived Work to honor the
restrictions in Clause 6 above, concerning changes from the Work.
11. This license places no restrictions on works that are unrelated to
@@ -260,7 +260,7 @@ the Work through the following steps:
a. If it is being maintained, then ask the Current Maintainer
to update their communication data within one month.
-
+
b. If the search is unsuccessful or no action to resume active
maintenance is taken by the Current Maintainer, then announce
within the pertinent community your intention to take over
@@ -270,17 +270,17 @@ the Work through the following steps:
3a. If the Current Maintainer is reachable and agrees to pass
maintenance of the Work to you, then this takes effect
immediately upon announcement.
-
+
b. If the Current Maintainer is not reachable and the Copyright
Holder agrees that maintenance of the Work be passed to you,
- then this takes effect immediately upon announcement.
-
+ then this takes effect immediately upon announcement.
+
4. If you make an `intention announcement' as described in 2b. above
and after three months your intention is challenged neither by
the Current Maintainer nor by the Copyright Holder nor by other
people, then you may arrange for the Work to be changed so as
to name you as the (new) Current Maintainer.
-
+
5. If the previously unreachable Current Maintainer becomes
reachable once more within three months of a change completed
under the terms of 3b) or 4), then that Current Maintainer must
@@ -363,7 +363,7 @@ Here is an example of such a notice and statement:
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is M. Y. Name.
%
% This work consists of the files pig.dtx and pig.ins
@@ -377,7 +377,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and
`Current Maintainer' referring to the person `M. Y. Name'.
If you do not want the Maintenance section of LPPL to apply to your
-Work, change `maintained' above into `author-maintained'.
+Work, change `maintained' above into `author-maintained'.
However, we recommend that you use `maintained', as the Maintenance
section was added in order to ensure that your Work remains useful to
the community even when you can no longer maintain and support it
@@ -407,7 +407,7 @@ Important Recommendations
using a line such as:
% This work consists of all files listed in manifest.txt.
-
+
in that place. In the absence of an unequivocal list it might be
impossible for the licensee to determine what is considered by you
to comprise the Work and, in such a case, the licensee would be
diff --git a/Master/texmf-dist/source/latex/latex-tds/license/latex-tds/lppl.txt b/Master/texmf-dist/source/latex/latex-tds/license/latex-tds/lppl.txt
index 22443139013..494f58131f7 100644
--- a/Master/texmf-dist/source/latex/latex-tds/license/latex-tds/lppl.txt
+++ b/Master/texmf-dist/source/latex/latex-tds/license/latex-tds/lppl.txt
@@ -16,8 +16,8 @@ which the LaTeX kernel and the base LaTeX packages are distributed.
You may use this license for any work of which you hold the copyright
and which you wish to distribute. This license may be particularly
-suitable if your work is TeX-related (such as a LaTeX package), but
-it is written in such a way that you can use it even if your work is
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
unrelated to TeX.
The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
@@ -44,11 +44,11 @@ In this license document the following terms are used:
`Work'
Any work being distributed under this License.
-
+
`Derived Work'
Any work that under any applicable law is derived from the Work.
- `Modification'
+ `Modification'
Any procedure that produces a Derived Work under any applicable
law -- for example, the production of a file containing an
original file associated with the Work or a significant portion of
@@ -58,7 +58,7 @@ In this license document the following terms are used:
`Modify'
To apply any procedure that produces a Derived Work under any
applicable law.
-
+
`Distribution'
Making copies of the Work available from one person to another, in
whole or in part. Distribution includes (but is not limited to)
@@ -79,16 +79,16 @@ In this license document the following terms are used:
no such explicit nomination then it is the `Copyright Holder' under
any applicable law.
- `Base Interpreter'
+ `Base Interpreter'
A program or process that is normally needed for running or
- interpreting a part or the whole of the Work.
+ interpreting a part or the whole of the Work.
A Base Interpreter may depend on external components but these
are not considered part of the Base Interpreter provided that each
external component clearly identifies itself whenever it is used
interactively. Unless explicitly specified when applying the
license to the Work, the only applicable Base Interpreter is a
- `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-Format' or in the case of files belonging to the
`LaTeX-format' a program implementing the `TeX language'.
@@ -129,8 +129,8 @@ the Derived Work.
distribute a Derived Work provided the following conditions are met
for every component of the Work unless that component clearly states
in the copyright notice that it is exempt from that condition. Only
-the Current Maintainer is allowed to add such statements of exemption
-to a component of the Work.
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
a. If a component of this Derived Work can be a direct replacement
for a component of the Work when that component is used with the
@@ -140,13 +140,13 @@ to a component of the Work.
clearly and unambiguously identifies itself as a modified version
of this component to the user when used interactively with that
Base Interpreter.
-
+
b. Every component of the Derived Work contains prominent notices
detailing the nature of the changes to that component, or a
prominent reference to another file that is distributed as part
of the Derived Work and that contains a complete and accurate log
of the changes.
-
+
c. No information in the Derived Work implies that any persons,
including (but not limited to) the authors of the original version
of the Work, provide any support, including (but not limited to)
@@ -156,7 +156,7 @@ to a component of the Work.
d. You distribute at least one of the following with the Derived Work:
- 1. A complete, unmodified copy of the Work;
+ 1. A complete, unmodified copy of the Work;
if your distribution of a modified component is made by
offering access to copy the modified component from a
designated place, then offering equivalent access to copy
@@ -183,15 +183,15 @@ format, where the Work or that Derived Work (in whole or in part) is
then produced by applying some process to that format, does not relax or
nullify any sections of this license as they pertain to the results of
applying that process.
-
+
10. a. A Derived Work may be distributed under a different license
provided that license itself honors the conditions listed in
Clause 6 above, in regard to the Work, though it does not have
to honor the rest of the conditions in this license.
-
+
b. If a Derived Work is distributed under a different license, that
Derived Work must provide sufficient documentation as part of
- itself to allow each recipient of that Derived Work to honor the
+ itself to allow each recipient of that Derived Work to honor the
restrictions in Clause 6 above, concerning changes from the Work.
11. This license places no restrictions on works that are unrelated to
@@ -260,7 +260,7 @@ the Work through the following steps:
a. If it is being maintained, then ask the Current Maintainer
to update their communication data within one month.
-
+
b. If the search is unsuccessful or no action to resume active
maintenance is taken by the Current Maintainer, then announce
within the pertinent community your intention to take over
@@ -270,17 +270,17 @@ the Work through the following steps:
3a. If the Current Maintainer is reachable and agrees to pass
maintenance of the Work to you, then this takes effect
immediately upon announcement.
-
+
b. If the Current Maintainer is not reachable and the Copyright
Holder agrees that maintenance of the Work be passed to you,
- then this takes effect immediately upon announcement.
-
+ then this takes effect immediately upon announcement.
+
4. If you make an `intention announcement' as described in 2b. above
and after three months your intention is challenged neither by
the Current Maintainer nor by the Copyright Holder nor by other
people, then you may arrange for the Work to be changed so as
to name you as the (new) Current Maintainer.
-
+
5. If the previously unreachable Current Maintainer becomes
reachable once more within three months of a change completed
under the terms of 3b) or 4), then that Current Maintainer must
@@ -363,7 +363,7 @@ Here is an example of such a notice and statement:
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is M. Y. Name.
%
% This work consists of the files pig.dtx and pig.ins
@@ -377,7 +377,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and
`Current Maintainer' referring to the person `M. Y. Name'.
If you do not want the Maintenance section of LPPL to apply to your
-Work, change `maintained' above into `author-maintained'.
+Work, change `maintained' above into `author-maintained'.
However, we recommend that you use `maintained', as the Maintenance
section was added in order to ensure that your Work remains useful to
the community even when you can no longer maintain and support it
@@ -407,7 +407,7 @@ Important Recommendations
using a line such as:
% This work consists of all files listed in manifest.txt.
-
+
in that place. In the absence of an unequivocal list it might be
impossible for the licensee to determine what is considered by you
to comprise the Work and, in such a case, the licensee would be
diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/encguide.tex.diff b/Master/texmf-dist/source/latex/latex-tds/patch/encguide.tex.diff
index 748e62d4e75..b1095c54ae6 100644
--- a/Master/texmf-dist/source/latex/latex-tds/patch/encguide.tex.diff
+++ b/Master/texmf-dist/source/latex/latex-tds/patch/encguide.tex.diff
@@ -1,57 +1,40 @@
*** encguide.tex.org 2009-09-24 17:00:50.000000000 +0200
--- encguide.tex 2011-07-01 22:00:17.000000000 +0200
***************
-*** 34,40 ****
-
- \documentclass{ltxguide}[1994/11/20]
-
-! \usepackage[T1]{fontenc}
- \IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
- \usepackage{textcomp}
- \usepackage{url}
---- 34,40 ----
-
- \documentclass{ltxguide}[1994/11/20]
-
-! \usepackage{fontspec}% \usepackage[T1]{fontenc}
- \IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
- \usepackage{textcomp}
- \usepackage{url}
-***************
*** 1226,1232 ****
\newblock {\em {TUG}boat}, 11(4):514--516, 1990.
-
+
\bibitem{fontinst} \emph{The \Pkg{fontinst} package}:
! \textlangle CTAN\textrangle\url{/fonts/utilities/fontinst}.
-
+
\bibitem{Rei:TB17-2-102} Fukui Rei:
\emph{\textsl{TIPA}: A system for processing phonetic
--- 1226,1234 ----
\newblock {\em {TUG}boat}, 11(4):514--516, 1990.
-
+
\bibitem{fontinst} \emph{The \Pkg{fontinst} package}:
! \href{ftp://ftp.ctan.org/tex-archive/fonts/utilities/fontinst}{%
! \textlangle CTAN\textrangle\nolinkurl{/fonts/utilities/fontinst}%
! }.
-
+
\bibitem{Rei:TB17-2-102} Fukui Rei:
\emph{\textsl{TIPA}: A system for processing phonetic
***************
*** 1266,1272 ****
\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
-
+
\bibitem{LH-Fonts} \emph{The \Pkg{lh}-Fonts for Cyrillic}:
! \textlangle CTAN\textrangle\url{/fonts/cyrillic/lh}.
-
+
\bibitem{A-W:MG2004}
Frank Mittelbach and Michel Goossens.
--- 1268,1276 ----
\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
-
+
\bibitem{LH-Fonts} \emph{The \Pkg{lh}-Fonts for Cyrillic}:
! \href{ftp://ftp.ctan.org/tex-archive/fonts/cyrillic/lh}{%
! \textlangle CTAN\textrangle\nolinkurl{/fonts/cyrillic/lh}%
! }.
-
+
\bibitem{A-W:MG2004}
Frank Mittelbach and Michel Goossens.
diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/source2e.tex.diff b/Master/texmf-dist/source/latex/latex-tds/patch/source2e.tex.diff
index 0f8d7c15fe7..742269bdafd 100644
--- a/Master/texmf-dist/source/latex/latex-tds/patch/source2e.tex.diff
+++ b/Master/texmf-dist/source/latex/latex-tds/patch/source2e.tex.diff
@@ -3,23 +3,23 @@
***************
*** 71,76 ****
--- 71,81 ----
-
+
\documentclass{ltxdoc}
-
+
+ \newdimen\OldHeadHeight
+ \OldHeadHeight=\headheight
+ \newdimen\OldHeadSep
+ \OldHeadSep=\headsep
-+
++
\listfiles
-
+
% Do not index some TeX primitives, and some common plain TeX commands.
***************
*** 301,306 ****
--- 306,325 ----
\clearpage
\pagestyle{headings}
-
+
+ \makeatletter
+ \headheight=\OldHeadHeight
+ \headsep=\OldHeadSep
@@ -33,16 +33,16 @@
+ \@colht\textheight
+ \@colroom\textheight
+ \makeatother
-+
++
% Make TeX shut up.
\hbadness=10000
\newcount\hbadness
***************
*** 315,320 ****
--- 334,359 ----
-
+
\clearpage
-
+
+ \makeatletter
+ \footskip=85pt
+ \addtolength{\footskip}{\OldFootSkip}
@@ -62,7 +62,7 @@
+ \let\@evenfoot\@oddfoot
+ }%
+ \makeatother
-+
++
% makeindex needs a symbol between the parts of composite page numbers
% but we dont want one, so:
\typeout{%
diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/utf8ienc.dtx.diff b/Master/texmf-dist/source/latex/latex-tds/patch/utf8ienc.dtx.diff
index de3b3832938..dc48b5e72c5 100644
--- a/Master/texmf-dist/source/latex/latex-tds/patch/utf8ienc.dtx.diff
+++ b/Master/texmf-dist/source/latex/latex-tds/patch/utf8ienc.dtx.diff
@@ -2,11 +2,20 @@
--- utf8ienc.dtx 2008-09-10 16:16:45.000000000 +0200
***************
*** 30,35 ****
---- 30,36 ----
+--- 30,45 ----
% \iffalse
%<*driver>
\documentclass{ltxdoc}
-+ \usepackage[utf8]{inputenc}
++ \usepackage{ifluatex,ifxetex}
++ \ifluatex
++ \usepackage{fontspec}
++ \else
++ \ifxetex
++ \usepackage{fontspec}
++ \else
++ \usepackage[utf8]{inputenc}
++ \fi
++ \fi
\GetFileInfo{utf8.def}
\title{Providing some UTF-8 support via \texttt{inputenc}}
\date{\fileversion\space\filedate{} printed \today}
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex b/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
index 895f0bd72f6..ed54c679903 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
@@ -24,6 +24,9 @@
% 2006/06/02 v1.0: First version.
% 2009/09/25 v1.1: \usepackage disabled.
% 2011/07/01 v1.2: Fixes.
+% 2014/02/30 v1.3:
+% * Update for LaTeX 2014/05/01.
+% * Fix for anchor positions of issue titles.
%
\providecommand*{\lastissue}{20}
\InputIfFileExists{ltnews-lastissue.cfg}{}{}
@@ -52,6 +55,7 @@
\RequirePackage[T1]{fontenc}
\RequirePackage{lmodern}
+\RequirePackage{hologo}
\documentclass{ltnews}
@@ -137,28 +141,39 @@
\def\y{|lmodern,url}%
\ifx\x\y
\else
- \@latex@error{\string\usepackage[#1]{#2} found}\@ehc
+ \def\y{|lmodern,url,hologo}%
+ \ifx\x\y
+ \else
+ \@latex@error{ltnews.tex: \string\usepackage[#1]{#2} found}\@ehc
+ \fi
\fi
\fi
\endgroup
}%
- \makeatother
\renewcommand*{\documentclass}[2][]{%
\setcounter{footnote}{0}%
\gobbleopt
}%
\newcommand*{\gobbleopt}[1][]{}%
+ \let\org@twocolumn\twocolumn
\renewenvironment{document}{%
\clearpage
- \pdfbookmark[0]{\printissue}{issue\theissue}%
- \begingroup
- \let\WriteBookmarks\relax
- \phantomsection
- \addcontentsline{toc}{part}{\printissue}%
- \endgroup
+ \def\twocolumn[{%
+ \let\twocolumn\org@twocolumn
+ \org@twocolumn[%
+ {% because of optional argument of \twocolumn
+ \pdfbookmark[0]{\printissue}{issue\theissue}%
+ }%
+ \begingroup
+ \let\WriteBookmarks\relax
+ \phantomsection
+ \addcontentsline{toc}{part}{\printissue}%
+ \endgroup
+ }%
}{%
\clearpage
}%
+ \makeatother
\loop
\ifnum\value{issue}<\lastissue
\stepcounter{issue}%
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
index ca3e8da3cac..8c2e40f20a5 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
@@ -30,6 +30,10 @@
% * Package `unicode-math' with LM Math added.
% 2013/02/13 v1.6
% * Font `lmmath-regular.otf' was renamed to `latinmodern-math.otf'.
+% 2014/04/29 v1.7
+% * Patch for `inputenc' 2014/04/20 v1.2a.
+% 2014/04/30 v1.8
+% * Patch for `inputenc' 2014/04/30 v1.2b no longer needed.
%
\input lualatexiniconfig.tex
\input pdftexconfig %
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
index 39bb79513fc..f35f3b57377 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
@@ -19,7 +19,12 @@
% See `README' for a list of all files belonging to the
% project `latex-tds' and additional information.
%
-% 2011/07/25 v1.0: lualatex-tds.ini without math stuff.
+% 2011/07/25 v1.0:
+% * lualatex-tds.ini without math stuff.
+% 2014/04/29 v1.1:
+% * Patch for `inputenc' 2014/04/20 v1.2a.
+% 2014/04/30 v1.8:
+% * Patch for `inputenc' 2014/04/30 v1.2b no longer needed.
%
\input lualatexiniconfig.tex
\input pdftexconfig %
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex b/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
index c7f5f933cba..f57df9e0dc7 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{tools.tex}[2014/02/03 Tools overview (HO)]
+\ProvidesFile{tools.tex}[2014/04/30 Tools overview (HO)]
% Copyright 2006-2014 Heiko Oberdiek
%
% This file is part of project `latex-tds'.
@@ -31,7 +31,7 @@
Access bold math symbols.
}%
\entry{calc}{%
- Infix arithmetic expresions. Contributed to the distribution by
+ Infix arithmetic expresions. Contributed to the distribution by
Kresten Krab Thorup and Frank Jensen.
}%
\entry{dcolumn}{%
@@ -44,7 +44,7 @@
Extended version of the enumerate environment.
}%
\entry{fileerr}{%
- Suite of small files which may be used to control \TeX{}'s
+ Suite of small files which may be used to control \TeX{}'s
missing file error loop.
}%
\entry{fontsmpl}{%
@@ -64,7 +64,7 @@
}%
\entry{longtable}{%
Multipage tables. (Does not require array, but uses the extended
- features if both are loaded.)
+ features if both are loaded.)
}%
\entry{multicol}{%
Typeset text in columns, with the length of the final columns
diff --git a/Master/texmf-dist/source/latex/psnfss/psfonts.dtx b/Master/texmf-dist/source/latex/psnfss/psfonts.dtx
index 919955c8493..fff5393cf3e 100644
--- a/Master/texmf-dist/source/latex/psnfss/psfonts.dtx
+++ b/Master/texmf-dist/source/latex/psnfss/psfonts.dtx
@@ -73,10 +73,10 @@
% \maketitle
%
% \noindent
-% The source file \texttt{psfonts.dtx} contains suitable package files
+% The source file \texttt{psfonts.dtx} contains suitable package files
% to use common PostScript fonts with \LaTeX.
% See the file \texttt{00readme.txt} for the installation instructions;
-% it also explains how to obtain the
+% it also explains how to obtain the
% related Type1 fonts, font definition files, font metrics and virtual fonts.
%
% See the document `Using common PostScript fonts with \LaTeX',
@@ -225,7 +225,7 @@
\fi
}{\endlist}
% \end{macrocode}
-% All the old Dingbat commands still work;
+% All the old Dingbat commands still work;
% they are now implemented using the +\Pi...+ commands.
% \begin{macrocode}
\newcommand{\ding}{\Pisymbol{pzd}}
@@ -295,12 +295,12 @@
\PackageError
%<mathptm> {mathptm}
%<mathptmx> {mathptmx}
- {The symbols \protect\jmath, \protect\amalg\space and
+ {The symbols \protect\jmath, \protect\amalg\space and
\protect\coprod\MessageBreak
are not available with this package}
- {Type \space <return> \space to proceed;
+ {Type \space <return> \space to proceed;
your command will be ignored.}}
-\let\amalg=\jmath
+\let\amalg=\jmath
\let\coprod=\jmath
% \end{macrocode}
%
@@ -318,7 +318,7 @@
\def\hbar{{\mskip1.6mu\mathchar'26\mkern-7.6muh}}
%</mathptm>
% \end{macrocode}
-% With \textsf{mathptmx}, PSNFSS 9.0 and later is using an improved definition,
+% With \textsf{mathptmx}, PSNFSS 9.0 and later is using an improved definition,
% which was adopted from Frank Mittelbach's \textsf{mathtime} package:
% \begin{macrocode}
%<*mathptmx>
@@ -656,7 +656,7 @@
% `BlueSky' distribution.
% \end{itemize}
% Special thanks to Daniel Schlieper, who suggested the
-% development of the \textsf{mathpple} package,
+% development of the \textsf{mathpple} package,
% contributed many good ideas and helped with testing.
%
%
@@ -703,7 +703,7 @@
% \end{macrocode}
%
% Make Palatino (+ppl+) the default roman font.
-% If the options +osf+ or +sc+ were specified,
+% If the options +osf+ or +sc+ were specified,
% use +pplj+ or +pplx+ instead,
% and make sure that +\oldstylenums+ switches to +pplj+, too.
% \begin{macrocode}
@@ -721,7 +721,7 @@
% \end{macrocode}
%
% The Pazo fonts provide an Euro symbol, which is now available in the
-% Palatino text companion fonts. For the sake of compatibility, we still define
+% Palatino text companion fonts. For the sake of compatibility, we still define
% the macro +\ppleuro+, which was introduced with version 8.2, and
% we make it work with the
% \textsf{eurofont} and \textsf{europs} packages:
@@ -731,14 +731,14 @@
% \end{macrocode}
%
% Now we declare the math fonts. The \textsf{mathpazo} package uses
-% a Palatino text font family with OT1 encoding
+% a Palatino text font family with OT1 encoding
% as the +operators+ and +\mathit+ alphabets.
% If the +sc+ option was specified, we use the family +pplx+.
% Otherwise we just take +ppl+, thus making sure that no oldstyle digits are
% used in math mode. Note that specifying both +sc+ and +osf+ gives
% oldstyle numbers in text and uses the family +pplx+ in math mode,
% so that the +ppl+ family is not required at all. Thus, the number
-% of TFM's loaded by \TeX{} is minimized.
+% of TFM's loaded by \TeX{} is minimized.
% \begin{macrocode}
\ifpazo@sc
\DeclareSymbolFont{operators} {OT1}{pplx}{m}{n}
@@ -752,7 +752,7 @@
\SetMathAlphabet{\mathit}{bold} {OT1}{ppl}{b}{it}
\fi
% \end{macrocode}
-% Uppercase upright Greek
+% Uppercase upright Greek
% and math symbols such as `plus', `equal' and others
% are taken from a new symbol font named +upright+.
% Its spacing is less tight than in the text font.
@@ -808,7 +808,7 @@
% As to uppercase Greek, see below!
%
% The follwowing symbols used to come from `letters'.
-% Now they are taken from `operators', with respect to
+% Now they are taken from `operators', with respect to
% correct spacing of decimal numbers:
% \begin{macrocode}
\DeclareMathSymbol{,}{\mathpunct}{operators}{44}
@@ -990,7 +990,7 @@
% \end{macrocode}
%
% \subsection*{Credits}
-% The Pazo fonts and the related virtual fonts
+% The Pazo fonts and the related virtual fonts
% were created by Diego Puga.
% The \textsf{mathpazo} package was written by D.~Puga and W.~Schmidt.
% \Finale
diff --git a/Master/texmf-dist/source/latex/psnfss/psnfss2e.tex b/Master/texmf-dist/source/latex/psnfss/psnfss2e.tex
index 2e604452646..66280d63dcf 100644
--- a/Master/texmf-dist/source/latex/psnfss/psnfss2e.tex
+++ b/Master/texmf-dist/source/latex/psnfss/psnfss2e.tex
@@ -12,7 +12,7 @@
\newif\ifutopia
-% \utopiatrue
+% \utopiatrue
% If you have got the Utopia fonts, uncomment the above line,
% or put \utopiatrue into your ltxguide.cfg.
@@ -94,7 +94,7 @@
\newcommand{\Lpack}[1]{\textsf{#1}}
% the macros for the typeface samples:
-\newlength{\rightwidth}
+\newlength{\rightwidth}
\rightwidth=11cm
\newlength{\leftwidth}
\leftwidth=\textwidth
@@ -116,7 +116,7 @@
And when one looked up again at the mountains there was the whole
unbearable glory of the risen sun.
\par}}
- \par
+ \par
\medskip}
@@ -158,16 +158,16 @@ a number of free fonts.
\section{Package overview}
The easiest way to make use of the above-mentioned typefaces is to completely
-replace one or more of the font families used by \LaTeX{} as
+replace one or more of the font families used by \LaTeX{} as
`roman', `sans serif' and `typewriter' family and for math.
-This is accomplished by the packages listed in table \ref{tab:packages}.
+This is accomplished by the packages listed in table \ref{tab:packages}.
Its first row lists the default (Computer Modern) font families.
-An empty column indicates that a package does not change the particular
+An empty column indicates that a package does not change the particular
font family. Some of these packages need more detailed explanation and
are described in the below sections \ref{sec:helvet}, \ref{sec:mathpazo}
and \ref{sec:mathptmx}.
-The PSNFSS distribution includes also a package
+The PSNFSS distribution includes also a package
\Lpack{pifont}, which serves for accessing symbol fonts (aka `Pi~fonts'),
such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
@@ -183,29 +183,29 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
\hline
\textbf{package} & \textbf{roman} & \textbf{sans serif} & \textbf{typewriter} & \textbf{formulas} \\\hline\hline
(none) & CM Roman & CM Sans Serif & CM Typewriter & $\approx$ CM Roman\\\hline
-\Lpack{mathpazo} & Palatino
+\Lpack{mathpazo} & Palatino
&
&
& $\approx$ Palatino\\\hline
-\Lpack{mathptmx} & Times
+\Lpack{mathptmx} & Times
&
&
& $\approx$ Times\\\hline
-\Lpack{helvet} &
+\Lpack{helvet} &
& Helvetica
&
& \\\hline
-\Lpack{avant} &
+\Lpack{avant} &
& Avant~Garde
&
& \\\hline
\Lpack{courier} &
&
- & Courier
+ & Courier
& \\\hline
\Lpack{chancery} & Zapf Chancery
- &
- &
+ &
+ &
& \\\hline
\Lpack{bookman} & Bookman
& Avant~Garde
@@ -216,8 +216,8 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
& Courier
& \\\hline
\Lpack{charter} & Charter
- &
- &
+ &
+ &
& \\\hline
\end{tabular}
\end{center}
@@ -231,17 +231,17 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
\subsection{Output font encoding}
None of the packages listed in table~\ref{tab:packages} changes the
output font encoding from its default setting OT1.
-It is, however, highly recommended to use the fonts with the extended
+It is, however, highly recommended to use the fonts with the extended
T1 and TS1 (text symbols) encodings by means of the commands:
\begin{quote}
+\usepackage[T1]{fontenc}+\\
+\usepackage{textcomp}+
\end{quote}
When using \ps\ fonts that come from `outside the \TeX{} world',
-there is no reason at all to stay with the obsolete OT1~encoding,
+there is no reason at all to stay with the obsolete OT1~encoding,
which would not provide access to all available glyphs.
-However, since these fonts were not particularly designed
-for use with \TeX{}, they do \emph{not} include all of the
+However, since these fonts were not particularly designed
+for use with \TeX{}, they do \emph{not} include all of the
text companion (TS1) symbols.
@@ -254,13 +254,13 @@ Using this command requires the \Lpack{textcomp} package; see above.
\subsection{Inter-line spacing}
-With certain font families, the leading of the standard \LaTeX{}
-document classes may be too small.
-This results from the larger x-height of these typefaces, as compared with
+With certain font families, the leading of the standard \LaTeX{}
+document classes may be too small.
+This results from the larger x-height of these typefaces, as compared with
Computer Modern.
Since it is a question of document design and line width,
-the packages of the PSNFSS bundle do \emph{not} take care of this.
-Issuing the command
+the packages of the PSNFSS bundle do \emph{not} take care of this.
+Issuing the command
\begin{quote}
+\linespread+ \arg{factor}
\end{quote}
@@ -269,7 +269,7 @@ Typical values for \m{factor} are in the range of $1.04\dots1.1$.
\subsection{Using sans serif fonts}
-The packages \Lpack{helvet} and \Lpack{avant} do not change the
+The packages \Lpack{helvet} and \Lpack{avant} do not change the
default text font family from `roman'.
If required, the additional command
\begin{quote}
@@ -284,9 +284,9 @@ used in the formulas!
\section{The package \Lpack{helvet}}
\label{sec:helvet}
Helvetica is actually somewhat larger than other typefaces
-of the same nominal size.
+of the same nominal size.
As a result, mixing, \eg Times and Helvetica within running text
-may look bad.
+may look bad.
\begin{decl}
\texttt{[scaled=}\m{scale}\texttt{]}\\
\texttt{[scaled]}
@@ -295,7 +295,7 @@ This can be fixed by loading the package with the option
\texttt{[scaled=}\m{scale}\texttt{]},
for instance:
+\usepackage[scaled=.92]{helvet}+.
-As a result, the font family \texttt{phv} (Helvetica) will be
+As a result, the font family \texttt{phv} (Helvetica) will be
scaled down to 92\% of its `natural' size, which is suitable
for use with Adobe Times.
Specifying +[scaled]+ alone is equivalent to +[scaled=0.95]+% and makes
@@ -309,8 +309,8 @@ Specifying +[scaled]+ alone is equivalent to +[scaled=0.95]+% and makes
\label{sec:mathpazo}
Loading
%% \NEWfeature{2001-06-04 v8.2}
-this package changes the default roman font family
-to Adobe Palatino, and the virtual `mathpazo' fonts will be used
+this package changes the default roman font family
+to Adobe Palatino, and the virtual `mathpazo' fonts will be used
for math.
These virtual fonts are made up basically from Palatino Italic, with the
missing math symbols coming from the CM and Pazo math fonts.
@@ -324,14 +324,14 @@ missing math symbols coming from the CM and Pazo math fonts.
By default, the package \Lpack{mathpazo} uses
the typeface family +ppl+ as the roman text font family.
The option +[sc]+ selects Palatino with real smallcaps (family +pplx+) insread.
-Correspondingly, the option +[osf]+ selects Palatino with smallcaps and default
-oldstyle figures (family +pplj+).
+Correspondingly, the option +[osf]+ selects Palatino with smallcaps and default
+oldstyle figures (family +pplj+).
Of course, oldstyle figures will be used only in text mode, as opposed to formulas.
\NEWfeature{2004-09-15 v9.2}
Using either option is strongly recommended:
Beside the real smallcaps, the font families +pplx+ and +pplj+ show further
-improvements over +ppl+: Increased word space, enhanced kerning tables,
-additional `dotlessj' glyph.
+improvements over +ppl+: Increased word space, enhanced kerning tables,
+additional `dotlessj' glyph.
\begin{decl}
+[slantedGreek]+
@@ -362,13 +362,13 @@ Upright \emph{lowercase} Greek is, however, not available.
+\mathbb+
\end{decl}
+\mathbold+ is a math alphabet for typesetting variables (incl.\ Greek)
-in a {\bfseries\itshape bold italic} style. Do not mix this up with +\mathbf+,
+in a {\bfseries\itshape bold italic} style. Do not mix this up with +\mathbf+,
which selects a {\bfseries\upshape bold upright} text font
for use in math!
+\mathbb+ is a `blackboard bold' alphabet, whose characters
-are taken from the Pazo fonts. %% \NEWfeature{2002-04-10 v9.0}
-All upper case letters and the numeral `1' are available.
+are taken from the Pazo fonts. %% \NEWfeature{2002-04-10 v9.0}
+All upper case letters and the numeral `1' are available.
If you want to use a different, external, doublestroke alphabet,
load the package \Lpack{mathpazo} with the package option +[noBBppl]+, see above.
@@ -386,29 +386,29 @@ one of these packages, using the +\euro+ command from the
\subsection{Font size of the `large' math symbols}
-With \Lpack{mathpazo}, the `large' math symbols are automatically
-scaled to fit the base font size.
-In contrast to standard \LaTeX{} you need not
+With \Lpack{mathpazo}, the `large' math symbols are automatically
+scaled to fit the base font size.
+In contrast to standard \LaTeX{} you need not
load the package \Lpack{exscale} for this purpose!
\subsection{Known problems}
In contrast to the standard CM fonts, the virtual \Lpack{mathpazo} fonts
-do not provide any Greek letters in the math alphabet +\mathrm+.
-Applying this math alphabet command to Greek letters
+do not provide any Greek letters in the math alphabet +\mathrm+.
+Applying this math alphabet command to Greek letters
will result in garbage output.
\section{The package \Lpack{mathptmx}}
\label{sec:mathptmx}
-Loading this package changes the default roman font family
-to Times, and the virtual `mathptmx' fonts will be used
-for math.
+Loading this package changes the default roman font family
+to Times, and the virtual `mathptmx' fonts will be used
+for math.
These virtual fonts are made up basically from Times Italic, with the
-missing math symbols coming from CM, RSFS (for +\mathcal+) and
-Adobe~Symbol.
+missing math symbols coming from CM, RSFS (for +\mathcal+) and
+Adobe~Symbol.
\subsection{Package options}
\begin{decl}
@@ -429,8 +429,8 @@ Upright \emph{lowercase} Greek is, however, not available.
\subsection{Font size of the `large' math symbols}
-With \Lpack{mathptmx}, the `large' math symbols are automatically scaled
-to fit the base font size. In contrast to standard \LaTeX{} you need not
+With \Lpack{mathptmx}, the `large' math symbols are automatically scaled
+to fit the base font size. In contrast to standard \LaTeX{} you need not
load the package \Lpack{exscale} for this purpose!
@@ -439,7 +439,7 @@ load the package \Lpack{exscale} for this purpose!
\item There are no bold math fonts, and +\boldmath+ has no effect.
Use of the package \Lpack{bm} in conjunction with \Lpack{mathptmx}
is not recommended.
- \item The symbols
+ \item The symbols
+\jmath+, +\coprod +and +\amalg+
are not available.
\end{itemize}
@@ -449,10 +449,10 @@ load the package \Lpack{exscale} for this purpose!
\section{The package \Lpack{pifont}}
\label{sec:pifont}
-Using symbol fonts is supported by means of the
+Using symbol fonts is supported by means of the
\Lpack{pifont} package, providing commands for using the Zapf Dingbats font,
as well as an interface to other families.\footnote{%
-This section was adopted, with minor changes,
+This section was adopted, with minor changes,
from \cite{companion}, 1st ed.}
\subsection{Commands for using Zapf Dingbats}
@@ -462,8 +462,8 @@ from \cite{companion}, 1st ed.}
\end{decl}
A given character can be chosen via the +\ding+ command.
-Its parameter is an integer that specifies the character to be
-typeset. For example, +\ding{38}+ gives \ding{38};
+Its parameter is an integer that specifies the character to be
+typeset. For example, +\ding{38}+ gives \ding{38};
see table~\vref{tab:dingbats}.
\begin{decl}
@@ -524,7 +524,7 @@ with a little space on the left and right:
\caption{The characters in the \ps{} font Zapf Dingbats}
\label{tab:dingbats}
\medskip
-
+
{\footnotesize
\begin{tabular}{|rr|rr|rr|rr|rr|rr|rr|rr|}
\hline
@@ -609,14 +609,14 @@ the specified symbol, with some space at the left and right
\section{NFSS classification}
-Table~\vref{tab:families} lists all text and symbol font shapes
+Table~\vref{tab:families} lists all text and symbol font shapes
supported by the basic PSNFSS distribution,
and the related \ps\ fonts.
\NEWdescription{2004-09-15 v9.2}
-With the exception of Charter and Utopia, these fonts are commercial products.
+With the exception of Charter and Utopia, these fonts are commercial products.
Therefore, most \TeX\ systems include free substitutes instead.
-Available encodings are OT1, T1 and TS1, except for
+Available encodings are OT1, T1 and TS1, except for
Symbol and Zapf~Dingbats, which are implemented with encoding U.
See \cite{fntguide} for how to access a given font shape directly.
@@ -628,14 +628,14 @@ whose typographical quality is -- at least -- questionable.
The math font families loaded by the
\Lpack{mathptm}, \Lpack{mathptmx}, \Lpack{mathpazo} and \Lpack{mathpple} packages
are not listed here.
-See the documented source file \texttt{psfonts.dtx}
+See the documented source file \texttt{psfonts.dtx}
for information on this topic.
\begin{table}[p]
\caption{Font shapes supported by the basic PSNFSS distribution}
\label{tab:families}
\medskip
-
+
{\small
\begin{tabularx}{\linewidth}{|l|l|l|>{\raggedright\arraybackslash}X|}
\hline
@@ -663,9 +663,9 @@ for information on this topic.
pnc & b & n, sl, it, sc & NewCenturySchlbk-Bold, NewCenturySchlbk-BoldItalic\\ \hline \hline
\multicolumn{4}{|c|}{\textit{Palatino}}\\ \hline
ppl & m & n, sl, it, sc & Palatino-Roman, Palatino-Italic\\ \hline
- ppl & b & n, sl, it, sc & Palatino-Bold, Palatino-BoldItalic\\ \hline
+ ppl & b & n, sl, it, sc & Palatino-Bold, Palatino-BoldItalic\\ \hline
pplx & m & n, it, sc & Palatino-Roman, Palatino-Italic, Palatino-SC\\ \hline
- pplx & b & n, it & Palatino-Bold, Palatino-BoldItalic\\ \hline
+ pplx & b & n, it & Palatino-Bold, Palatino-BoldItalic\\ \hline
pplj & m & n, it, sc & Palatino-Roman, Palatino-SC, Palatino-Italic, Palatino-ItalicOsF\\ \hline
pplj & b & n, it & Palatino-Bold, Palatino-BoldOsF, Palatino-BoldItalic, Palatino-BoldItalicOsF\\ \hline \hline
\multicolumn{4}{|c|}{\textit{Times}}\\ \hline
@@ -700,7 +700,7 @@ They are provided for compatibility with existing documents only.
\begin{tabular}{|l|p{1.8cm}p{2.2cm}p{2.4cm}p{2.2cm}|}
\hline
\textbf{package} & \textbf{roman} & \textbf{sans serif} & \textbf{typewriter} & \textbf{math} \\\hline\hline
-\Lpack{times} & Times
+\Lpack{times} & Times
& Helvetica
& Courier
& \\\hline
@@ -708,11 +708,11 @@ They are provided for compatibility with existing documents only.
& Helvetica
& Courier
& \\\hline
-\Lpack{mathptm} & Times
+\Lpack{mathptm} & Times
&
&
& $\approx$ Times\\\hline
-\Lpack{mathpple} & Palatino
+\Lpack{mathpple} & Palatino
&
&
& $\approx$ Palatino\\\hline
@@ -727,10 +727,10 @@ They are provided for compatibility with existing documents only.
\subsection{The packages \Lpack{times} and \Lpack{palatino}}
-These packages do not load suitable math fonts,
-and they do not scale the Helvetica fonts appropriately
+These packages do not load suitable math fonts,
+and they do not scale the Helvetica fonts appropriately
to match Times and Palatino -- see section \ref{sec:helvet}.
-Use \Lpack{mathptmx} or \Lpack{mathpazo} in conjunction with
+Use \Lpack{mathptmx} or \Lpack{mathpazo} in conjunction with
\Lpack{helvet} and \Lpack{courier} instead!
In case you need to load Times or Palatino \emph{without} the
@@ -740,7 +740,7 @@ basic NFSS commands. For instance,
+\renewcommand{\rmdefault}{ptm}+
\end{quote}
changes only the default roman font family to
-\texttt{ptm}, i.e.\ Times.
+\texttt{ptm}, i.e.\ Times.
\subsection{The package \Lpack{mathptm}}
The package \Lpack{mathptm} is a predecessor to \Lpack{mathptmx}.
@@ -755,7 +755,7 @@ be available in Type~1 format.
\Lpack{mathpple} is a predecessor to \Lpack{mathpazo},
using also a set of virtual math fonts to go with Palatino.
The Greek alphabet is, however, taken from the
-Euler fonts (which get slanted), rather than from the Pazo fonts.
+Euler fonts (which get slanted), rather than from the Pazo fonts.
The package \Lpack{mathpple} does not support the
Palatino SC/OsF fonts, and there is no `blackboard bold' math alphabet.
Further flaws are:
@@ -766,31 +766,31 @@ Further flaws are:
\item There are no bold variants of +\partial+ and +\infty+.
\item +\jmath+ is taken from the CM math italic font, which does
not blend well with Palatino.
- \item DVI viewers may exhibit problems as to rendering of the artificially slanted
+ \item DVI viewers may exhibit problems as to rendering of the artificially slanted
Greek letters.
\end{itemize}
The newer \Lpack{mathpazo} package can be considered as
-superior; yet you may still use \Lpack{mathpple}, if you prefer
+superior; yet you may still use \Lpack{mathpple}, if you prefer
the shape of its Greek letters.
\subsection{The package \Lpack{utopia}}
-Use %%\NEWdescription{2003-11-17 v9.1}
-of the \Lpack{utopia}
-package is no longer recommended, because
+Use %%\NEWdescription{2003-11-17 v9.1}
+of the \Lpack{utopia}
+package is no longer recommended, because
the newer package \Lpack{fourier} provides a basically improved
-interface to the Utopia typeface and loads suitable math fonts, too.
+interface to the Utopia typeface and loads suitable math fonts, too.
Notice that this package does \emph{not} belong to the PSNFSS collection!
-Furthermore, the \LaTeX3 team does no longer regard the Utopia
+Furthermore, the \LaTeX3 team does no longer regard the Utopia
fonts as a \emph{required} component of \LaTeX{},
-because their license does not comply with the strict
+because their license does not comply with the strict
guidelines of the FSF.
\section{Typeface samples}
The following samples show the regular font of each typeface family
-supported by PSNFSS.
+supported by PSNFSS.
The particular font size and baselineskip is indicated below the font name.
Notice that Helvetica is scaled to 92\,\% of the nominal size.
@@ -853,11 +853,11 @@ The PSNFSS system was originally developed by Sebastian Rahtz.
The virtual \Lpack{mathptm} and \Lpack{mathptmx} fonts and the related packages
were created by Alan Jeffrey, Sebastian Rathz and Ulrik Vieth.
-The \Lpack{mathpple} package and its virtual fonts are based
+The \Lpack{mathpple} package and its virtual fonts are based
on earlier work by Aloysius Helminck. Special thanks to Daniel Schlieper
without whose initiative the package would not have been developed.
-The Pazo math fonts and the related virtual fonts were created
+The Pazo math fonts and the related virtual fonts were created
by Diego Puga.
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index e9c597ccf8f..1e99345a86d 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: afterpage.dtx Copyright (C) 1994 1994 1995 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.ins b/Master/texmf-dist/source/latex/tools/afterpage.ins
new file mode 100644
index 00000000000..ad544fade7e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/afterpage.ins
@@ -0,0 +1,68 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+
+\generate{\file{afterpage.sty}{\from{afterpage.dtx}{package}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index b3b7e2ed293..30410861187 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%\iffalse % this is a METACOMMENT !
%
@@ -68,7 +68,7 @@
% centered `parbox.}
%
% \changes{v1.2a}{1987/09/27}{Completely new implementation.}
-% \changes{v1.2b}{1987/10/06}{{\tt !|} does no longer generate space at
+% \changes{v1.2b}{1987/10/06}{{\tt !|} does no longer generate space at
% start or end of the preamble. Otherwise `hline
% is too long.}
% \changes{v1.2b}{1987/10/06}{Enlarged `@arstrutbox by 1pt (Test-Impl)
@@ -191,7 +191,7 @@
% \author{Frank Mittelbach
% \and
% David Carlisle\thanks{David kindly agreed on the inclusion
-% of the \texttt{\textbackslash{}newcolumntype} implementation,
+% of the \texttt{\textbackslash{}newcolumntype} implementation,
% formerly in
% \texttt{newarray.sty} into this package }}
%
@@ -224,7 +224,7 @@
% The reader should be familiar with the general structure of the
% environments
% mentioned above. Further information can be found in
-% \cite{bk:lamport} and \cite{bk:GMS94}.
+% \cite{bk:lamport} and \cite{bk:GMS94}.
% The additional options which can be used in the
% preamble as well as those which now have a slightly different meaning
% are described in table~\ref{tab:opt}.
@@ -484,7 +484,7 @@
%
% \DescribeMacro\firsthline
% \DescribeMacro\lasthline
-% Using "\firsthline" and "\lasthline" will
+% Using "\firsthline" and "\lasthline" will
% cure the problem, and the tables will align properly as long
% as their first or last line does not contain extremely large
% objects.
@@ -519,7 +519,7 @@
% dimension, which is called "\extratabsurround", to add some
% additional space at the top and the bottom of such an environment.
% This is useful if such tables are nested.
-%
+%
% \section{Final Comments}
%
% \subsection{Handling of rules}
@@ -571,7 +571,7 @@
% \hline \null\hskip-.5\arrayrulewidth\vline
% \hskip\tabcolsep
% A\hskip\tabcolsep
-% \vline\hskip-.5\arrayrulewidth\null \\ \hline
+% \vline\hskip-.5\arrayrulewidth\null \\ \hline
%\end{tabular}
% \quad
% instead of
@@ -596,7 +596,7 @@
% \item A preamble such as "{cc*{2}}" with an error in
% a $*$-form will generate different errors in the new version. In
% both cases the error message is not particularly helpful to the
-% casual user.
+% casual user.
% \item Repeated \texttt{<} or \texttt{>} constructions
% generated an error in earlier versions, but are now allowed in
% this package. ">{"\meta{decs1}"}>{"\meta{decs2}"}" is treated the
@@ -661,7 +661,7 @@
%
% \end{itemize}
%
-%
+%
%
% \changes{v2.2b}{1994/02/04}{Removed interactive prompt}
%
@@ -706,9 +706,9 @@
\usepackage{array}
% Allow large table at bottom
- \renewcommand{\bottomfraction}{0.7}
+ \renewcommand{\bottomfraction}{0.7}
-\EnableCrossrefs
+\EnableCrossrefs
%\DisableCrossrefs % Say \DisableCrossrefs if index is ready
\RecordChanges % Gather update information
@@ -1148,7 +1148,7 @@
% is followed by other digits. E.g.\ a =5= saved in the
% \textsf{token} register $2$ would lead \TeX\ to insert the contents
% of \textsf{token} register $15$ instead of $1$ later on.
-%
+%
% The example above referred to an older version of =\save@decl= which
% inserted a =\relex= inside the token register. This is now moved to
% the places where the actual token registers are inserted (look for
@@ -1206,7 +1206,7 @@
% We make sure that there will be no further expansion after reading
% the number, by finishing with =\relax=. The case above is not
% critical since it is ended by =\ignorespaces=.
-% \changes{v2.0c}{1990/08/14}{\cs{relax} added to avoid problem
+% \changes{v2.0c}{1990/08/14}{\cs{relax} added to avoid problem
% \cs{the}\cs{toks0}\cs{the}\cs{toks1}.}
% \begin{macrocode}
\the@toks \the \count@ \relax}
@@ -1618,8 +1618,8 @@
% There is only one incompatibility with the original definition:
% the definition of =\@arrayrule=. In the original a line without
% width\footnote{So the space between \texttt{cc} and \texttt{c|c}
-% is equal.} is created by multiple insertions of
-% =\hskip .5\arrayrulewidth=.
+% is equal.} is created by multiple insertions of
+% =\hskip .5\arrayrulewidth=.
% We only insert a vertical line into the
% preamble. This is done to prevent problems with \TeX's main
% memory when generating tables with many vertical lines in them
@@ -1696,7 +1696,7 @@
% \begin{macrocode}
\def\@classii{\advance \count@ \m@ne
% \end{macrocode}
-% Next we store the current \textsf{token} into the correct
+% Next we store the current \textsf{token} into the correct
% \textsf{token} register by calling =\save@decl= and then
% increase the value of =\count@= again. At this point we
% can save memory once more (at the cost of time) if we use the
@@ -1721,7 +1721,7 @@
% math mode if it was used in an
% \textsf{array}--environment. Therefore we surround it with
% =\d@llar...='s.
-% \changes{v2.0c}{1990/08/14}{\cs{relax} added to avoid problem
+% \changes{v2.0c}{1990/08/14}{\cs{relax} added to avoid problem
% `the`toks0`the`toks1.}
% \begin{macrocode}
\@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
@@ -1868,9 +1868,9 @@
% The =\noexpand= in front of =\ialign= does no harm in standard \LaTeX{}
% and was added since some experimental support for using text glyphs in math
% redefines =\halign= with the result that is becomes expandable with
-% disastrous results in cases like this.
+% disastrous results in cases like this.
% In the kernel definition for this macro the problem does
-% not surface because there =\protect= is set (which is not necessary in this
+% not surface because there =\protect= is set (which is not necessary in this
% implementation as there is no arbitrary user input that can get expanded) and
% the experimental code made the redefinition robust. Whether this is the right
% approach is open to question; consider the =\noexpand= a curtesy to allow an
@@ -2045,7 +2045,7 @@
% is skipping conditional text.
% \changes{v2.3c}{1995/04/23}{Use \cs{expandafter}'s in conditional}
% \begin{macrocode}
- \expandafter\@xargarraycr\else
+ \expandafter\@xargarraycr\else
\expandafter\@yargarraycr\fi{#1}}
% \end{macrocode}
% \end{macro}
@@ -2072,7 +2072,7 @@
% the command =\multicolumn= must be used. It has three
% arguments: the number of columns to be covered; the format for
% the result column and the actual column entry.
-% \changes{v2.3j}{1998/01/29}{Command made \cs{long} to match
+% \changes{v2.3j}{1998/01/29}{Command made \cs{long} to match
% kernel change for pr/2180}
% \begin{macrocode}
\long\def\multicolumn#1#2#3{%
@@ -2146,8 +2146,8 @@
% local since otherwise nested \textsf{tabular} and \textsf{array}
% environments (via =\multicolumn=) are impossible.
% \changes{v2.0g}{1992/06/18}{`d@llarbegin defined on toplevel.}
-% When the new font selection scheme is in force we have to
-% we surround all =\halign= entries
+% When the new font selection scheme is in force we have to
+% we surround all =\halign= entries
% with braces. See remarks in TUGboat 10\#2. Actually we are going
% to use =\begingroup= and =\endgroup=. However, this is only
% necessary when we are in text mode. In math the surrounding
@@ -2194,7 +2194,7 @@
% \begin{macrocode}
\def\tabular{\gdef\@halignto{}\@tabular}
% \end{macrocode}
-% and analoguesly for the star form. We evalute the argument first
+% and analoguesly for the star form. We evalute the argument first
% using =\setlength= so that users of the \texttt{calc} package can
% write code like\\ =\begin{tabular*}{(\columnwidth-1cm)/2}...=
% \changes{v2.3l}{1998/05/13}{Use \cs{setlength} evaluate arg
@@ -2315,7 +2315,7 @@
% named "\newcolumn". When the functionality was added to
% \texttt{array.sty} the command was renamed "\newcolumntype".
% Initially both names were supported, but now (In versions of this
-% package distributed for \LaTeXe) the old name is not defined.
+% package distributed for \LaTeXe) the old name is not defined.
% \changes{v2.2a}{1994/02/03}{Now made `newcolumn an error}
% \changes{v2.2a}{1994/02/04}{Removed `newcolumn}
% \begin{macrocode}
@@ -2688,7 +2688,7 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Support for \texttt{\textbackslash firsthline} and
+% \subsection{Support for \texttt{\textbackslash firsthline} and
% \texttt{\textbackslash lasthline}}
%
% The Companion~\cite[p.137]{bk:GMS94} suggests two additional
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index fb3db67f5a3..dffbabd4f17 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% \iffalse
@@ -223,7 +223,7 @@
% non-bold $a$ (compare $\hat{a}$)
% whereas |\bm{\hat{a}}| makes both the $a$ and the accent bold,
% $\bm{\hat{a}}$.
-% Similarly, although the \LaTeX\ command |\sqrt| must be used with its
+% Similarly, although the \LaTeX\ command |\sqrt| must be used with its
% arguments, |\sqrtsign| may be used as in |\bm\sqrtsign{abc}| to
% produce $\bm\sqrtsign{abc}$ rather than $\sqrtsign{abc}$ or
% $\bm{\sqrtsign{abc}}$
@@ -268,7 +268,7 @@
% |\SetSymbolFont{extras}{bold}{OMS}{xyz}{bx}{n}|\\
% At this point the symbols wil be available in the normal math
% version, and their bold variants in |\boldmath|. If you also
-% declare:\\
+% declare:\\
% |\DeclareSymbolFont{boldextras}{OMS}{xyz}{bx}{n}|\\
% That is, declare a symbol font whose name is formed by prefixing
% `bold' (or `heavy') to an existing symbol font, then |\bm| (or
@@ -1590,13 +1590,13 @@
% \end{macro}
%
% \begin{macro}{\bm@prime}
-% \changes{v1.0d}{1997/11/15}
-% {Macro added}
+% \changes{v1.0d}{1997/11/15}
+% {Macro added}
% Support |'|. Earlier versions did not make the prime bold in a'.
%
% |\bm{a''}| will now produce (with the normal encodings)
%\begin{verbatim}
-% \mathchar 30049
+% \mathchar 30049
% \bm@prime \mathchar 1584 \relax
% \bm@prime \mathchar 1584 \relax
%\end{verbatim}
diff --git a/Master/texmf-dist/source/latex/tools/bm.ins b/Master/texmf-dist/source/latex/tools/bm.ins
new file mode 100644
index 00000000000..b9e659bdbdc
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/bm.ins
@@ -0,0 +1,68 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+
+\generate{\file{bm.sty}{\from{bm.dtx}{package}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index 50e6620cc17..1534e542cb7 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File `calc.dtx'.
@@ -96,7 +96,7 @@
% Instead of a simple value, these commands now accept an infix
% notation expression.
% \end{abstract}
-%
+%
% \section{Introduction}
%
% Arithmetic in \TeX\ is done using low-level operations such as
@@ -189,9 +189,9 @@
% `\texttt{/}' with their usual meaning) using the familiar infix
% notation; parentheses may be used to override the usual precedences
% (that multiplication/division have higher precedence than
-% addition/subtraction).
+% addition/subtraction).
%
-% Expressions must be properly typed. This means, e.g., that a dimen
+% Expressions must be properly typed. This means, e.g., that a dimen
% expression must be a sum of dimen terms: i.e., you cannot say
% `\texttt{2cm+4}' but `\texttt{2cm+4pt}' is valid.
%
@@ -219,7 +219,7 @@
% real value to be used for multiplication/division. The first form has
% the obvious meaning, and the second form denotes the number obtained
% by dividing the value of the first expression by the value of the
-% second expression.
+% second expression.
%
% A later addition to the package (in June 1998) allows an additional
% method of specifying a factor of type dimen by setting some text
@@ -237,12 +237,12 @@
%\begin{quote}
% |\totalheightof{|\<text>|}|
%\end{quote}
-% This command does exactly what you'd expect from its name.
+% This command does exactly what you'd expect from its name.
% Additionally the package also provides the command
%\begin{quote}
% |\settototalheight{|\<cmd>|}{|\<text>|}|
-%\end{quote}
-%
+%\end{quote}
+%
%
% Note that there is a small difference in the usage of these two
% methods of accessing text dimensions. After
@@ -255,7 +255,7 @@
%\begin{verbatim}
% \setlength{\parskip}{\widthof{Some text} * \real{0.68}}
%\end{verbatim}
-%
+%
% \TeX\ discards the stretch and shrink components of glue when glue
% is multiplied by a real number. So, for example,
%\begin{verbatim}
@@ -298,17 +298,17 @@
%
%
% Another new feature introduced in August 2005 was $\max$ and $\min$
-% operations with associated macros
+% operations with associated macros
%\begin{quote}
% |\maxof{|\<\textit{type} expression>|}{|\<\textit{type} expression>|}|
% \\
% |\minof{|\<\textit{type} expression>|}{|\<\textit{type} expression>|}|
%\end{quote}
-% When \textit{type} is either \meta{glue} or \meta{dimen} these macros
-% are allowed only as part of addition or subtraction but when
+% When \textit{type} is either \meta{glue} or \meta{dimen} these macros
+% are allowed only as part of addition or subtraction but when
% \textit{type} is \meta{integer} they can also be used when
-% multiplying and dividing. In the latter case they follow the
-% same syntax rules as |\ratio| and |\real| which means they must come
+% multiplying and dividing. In the latter case they follow the
+% same syntax rules as |\ratio| and |\real| which means they must come
% after the |*| or the |/|. Thus
%\begin{verbatim}
% \setcounter{x}{3*\maxof{4+5}{3*4}+\minof{2*\real{1.6}}{5-1}}
@@ -363,7 +363,7 @@
% |{| \<\textit{type} expression> |}|^^A
% |{| \<\textit{type} expression> |}|
%
-% \<$\max$ or $\min$ command> \is |\maxof|^^A
+% \<$\max$ or $\min$ command> \is |\maxof|^^A
% \alt |\minof|
%
% \<text dimen factor>^^A
@@ -418,11 +418,11 @@
% on the catcode of syntax characters as \TeX\ and b)~tries to expand
% its argument fully. a)~means that implicit characters for the tokens
% |*|$_{12}$, |/|$_{12}$, |(|$_{12}$, and |)|$_{12}$ will not
-% work\footnote{e\TeX\ also assumes these catcodes when parsing a
+% work\footnote{e\TeX\ also assumes these catcodes when parsing a
% \cs{numexpr}, \cs{dimexpr}, \cs{glueexpr}, or \cs{muglueexpr} and
% does not allow implicit characters.} but because of~b), the
% expansion should allow you to use macros that expand to explicit
-% syntax characters.
+% syntax characters.
%
%
% \StopEventually{
@@ -450,7 +450,7 @@
% An expression $E$ is a sum of terms: $T_1+\cdots+T_n$; a term is a
% product of factors: $F_1*\cdots*F_m$; a factor is either a simple
% numeric quantity~$f$ (like \<number> as described in the \TeX book),
-% or a parenthesized expression~$(E')$.
+% or a parenthesized expression~$(E')$.
%
% Since the \TeX\ engine can only execute arithmetic operations in a
% machine-code like manner, we have to find a way to translate the
@@ -519,7 +519,7 @@
% \{\savecode{B\lassign A}\,\s{F_1}\,\} \quad
% \{\savecode{B\lassign B*A}\,\s{F_2}\,\}\\
% &&\qquad \ldots \quad \{\savecode{B\lassign B*A}\,\s{F_m}\,\}
-% \quad A\gassign B
+% \quad A\gassign B
% \end{eqnarray*}
% By structural induction, it is easily seen that the stated property
% is attained.
@@ -556,7 +556,7 @@
% (1)~`$*$' always initiates an \<integer factor>, (2)~all
% \<numeric>s in an expression, except those which are part of an
% \<integer factor>, are of the same type as the whole expression, and
-% all \<numeric>s in an \<integer factor> are \<number>s.
+% all \<numeric>s in an \<integer factor> are \<number>s.
%
% We have to ensure that $A$ and~$B$ always have an appropriate type
% for the \<numeric>s they manipulate. We can achieve this by having
@@ -580,7 +580,7 @@
%
% Now we have enough insight to do the actual implementation in \TeX.
% First, we announce the macro package.\footnote{Code moved to top of file}
-% \begin{macrocode}
+% \begin{macrocode}
%<*package>
%\NeedsTeXFormat{LaTeX2e}
%\ProvidesPackage{calc}[\filedate\space\fileversion]
@@ -591,7 +591,7 @@
% \begin{macro}{\calc@assign@generic}
% \changes{v4.2}{2005/08/06}{Removed a few redundant \cs{expandafter}s}
% The |\calc@assign@generic| macro takes four arguments: (1~and~2) the
-% registers to be used
+% registers to be used
% for global and local manipulations, respectively; (3)~the lvalue
% part; (4)~the expression to be evaluated.
%
@@ -609,13 +609,13 @@
% |\let|-assignments.
%
% As discovered in Section~\ref{evaluation:scheme}, we have to
-% generate code as
+% generate code as
% if the expression is parenthesized. As described below,
% |\calc@open| is the macro that replaces a left parenthesis by its
% corresponding \TeX\ code sequence. When the scanning process sees
% the exclamation point, it generates an |\endgroup| and stops. As we
% recall from Section~\ref{evaluation:scheme}, the correct expansion
-% of a right
+% of a right
% parenthesis is ``$\}A\gassign B\}A\gassign B$''. The remaining
% tokens of this expansion are inserted explicitly, except that the
% last assignment has been replaced by the lvalue part (i.e.,
@@ -659,7 +659,7 @@
% \begin{macro}{\setlength}
% \begin{macro}{\addtolength}
% As promised, we redefine the following standard \LaTeX\ commands:
-% |\setcounter|,
+% |\setcounter|,
% |\addtocounter|, |\setlength|, and |\addtolength|.
% \begin{macrocode}
\def\setcounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
@@ -679,7 +679,7 @@
\let\@elt\@stpelt \csname cl@#1\endcsname
\endgroup}}%
% \end{macrocode}
-% If the \texttt{amstext} package is loaded we must add the
+% If the \texttt{amstext} package is loaded we must add the
% |\iffirstchoice@| switch as well. We patch the commands this
% way since it's good practice when we know how many arguments they take.
% \begin{macrocode}
@@ -735,14 +735,14 @@
% illegal will simply generate a \TeX-level error, often a
% reasonably comprehensible one!
%
-% The |\romannumeral-`\a| part is a little trick which forces expansion
-% in case |#1| is a normal macro, something that occurs from time to
-% time. A conditional test inside will possibly leave a trailing
+% The |\romannumeral-`\a| part is a little trick which forces expansion
+% in case |#1| is a normal macro, something that occurs from time to
+% time. A conditional test inside will possibly leave a trailing
% \cs{fi} but this remnant is removed later when \cs{calc@post@scan}
% performs the same trick.
%
% The many |\expandafter|s are needed to efficiently end the nested
-% conditionals so that |\calc@textsize| and |\calc@maxmin@addsub| can
+% conditionals so that |\calc@textsize| and |\calc@maxmin@addsub| can
% process their argument.
% \changes{v4.1a}{1998/06/07}
% {Added code for text sizes: CAR}
@@ -779,7 +779,7 @@
% This parenthesis is replaced by \TeX\ code corresponding to the code
% sequence ``$\{\savecode{B\lassign A}\{\savecode{B\lassign A}$''
% derived in Section~\ref{evaluation:scheme}. Finally,
-% |\calc@pre@scan| is
+% |\calc@pre@scan| is
% called again.
% \begin{macrocode}
\def\calc@open({\begingroup\aftergroup\calc@initB
@@ -816,21 +816,21 @@
%
% As we have to check for these commands explicitly we must ensure
% that our definition wins. Using \cs{newcommand} gives an error when
-% loading \texttt{calc} and may be mildly surprising. This should be
+% loading \texttt{calc} and may be mildly surprising. This should be
% a little more informative.
% \begin{macrocode}
\@for\reserved@a:=widthof,heightof,depthof,totalheightof,maxof,minof\do
{\@ifundefined{\reserved@a}{}{%
\PackageError{calc}{%
- The\space calc\space package\space reserves\space the\space
+ The\space calc\space package\space reserves\space the\space
command\space name\space `\@backslashchar\reserved@a'\MessageBreak
but\space it\space has\space already\space been\space defined\space
- with\space the\space meaning\MessageBreak
+ with\space the\space meaning\MessageBreak
`\expandafter\meaning\csname\reserved@a\endcsname'.\MessageBreak
This\space original\space definition\space will\space be\space lost}%
- {If\space you\space need\space a\space command\space with\space
- this\space definition,\space you\space must\space use\space a\space
- different\space name.}}%
+ {If\space you\space need\space a\space command\space with\space
+ this\space definition,\space you\space must\space use\space a\space
+ different\space name.}}%
}
\let\widthof\ignorespaces
\let\heightof\ignorespaces
@@ -881,7 +881,7 @@
\calc@post@scan}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\calc@post@scan}
% \begin{macro}{\@calc@post@scan}
% \changes{v4.2}{2005/08/06}{Added macro and force expansion}
@@ -895,14 +895,14 @@
% corresponding \TeX\ code (except when we detect the
% end-of-expression marker: then scanning ends, and control is
% returned to |\calc@assign@generic|).
-%
+%
% This macro may be optimized by selecting a different order of
% |\ifx|-tests. The test for `\texttt{!}' (end-of-expression) is
% placed first as it will always be performed: this is the only test
% to be performed if the expression consists of a single \<numeric>.
% This ensures that documents that do not use the extra expressive
% power provided by the \texttt{calc} package only suffer a minimum
-% slowdown in processing time.
+% slowdown in processing time.
% \begin{macrocode}
\def\calc@post@scan#1{%
\expandafter\@calc@post@scan\romannumeral-`\a#1}
@@ -912,7 +912,7 @@
\ifx#1-\let\calc@next\calc@subtract \else
\ifx#1*\let\calc@next\calc@multiplyx \else
\ifx#1/\let\calc@next\calc@dividex \else
- \ifx#1)\let\calc@next\calc@close \else
+ \ifx#1)\let\calc@next\calc@close \else
\ifx#1\relax\let\calc@next\calc@post@scan \else
\def\calc@next{\calc@error#1}%
\fi
@@ -956,10 +956,10 @@
% \begin{macro}{\calc@ratio@x}
% \begin{macro}{\calc@real@x}
% The multiplicative operators, `\texttt{*}' and `\texttt{/}', may be
-% followed by a |\real|, |\ratio|, |\minof|, or |\maxof| token. The
+% followed by a |\real|, |\ratio|, |\minof|, or |\maxof| token. The
% last two of these control sequences are defined by \texttt{calc} as
-% they are needed by the scanner for addition or subtraction while the
-% first two are not defined (at least not by the \texttt{calc}
+% they are needed by the scanner for addition or subtraction while the
+% first two are not defined (at least not by the \texttt{calc}
% package); this,
% unfortunately, leaves them highly non-robust. We therefore
% equate them to |\relax| but only if they have not already been
@@ -973,7 +973,7 @@
\ifx\real\@undefined\let\real\relax\fi
\ifx\ratio\@undefined\let\ratio\relax\fi
% \end{macrocode}
-% In order to test for |\real| or |\ratio|, we define these
+% In order to test for |\real| or |\ratio|, we define these
% two.\footnote{May not need the extra names, CAR?}
% \begin{macrocode}
\def\calc@ratio@x{\ratio}
@@ -983,7 +983,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \begin{macro}{\calc@multiplyx}
+% \begin{macro}{\calc@multiplyx}
% \changes{v4.2}{2005/08/06}
% {Added $\protect\max$ and $\protect\min$ operations}
% \begin{macro}{\calc@dividex}
@@ -1047,7 +1047,7 @@
% |\calc@close| generates code for a right parenthesis (which was
% derived to be ``$\}A\gassign B\}A\gassign B$'' in
% Section~\ref{evaluation:scheme}). After this code, the control is
-% returned to
+% returned to
% |\calc@post@scan| in order to look for another right parenthesis or
% a binary operator.
% \begin{macrocode}
@@ -1095,7 +1095,7 @@
% \end{macro}
% \begin{macro}{\calc@ratio@evaluate}
% Here is the macro that handles the actual evaluation of ratios. The
-% procedure is
+% procedure is
% this: First, the two expressions are evaluated and coerced to
% integers. The whole procedure is enclosed in a group to be able to
% use the registers |\calc@numerator| and |\calc@denominator| for temporary
@@ -1110,7 +1110,7 @@
% and/or denominator; note that \TeX\ interprets two minus signs the
% same as a plus sign. Then, we calculate the integer part.
% The minus sign(s), the integer part, and a decimal point, form the
-% initial expansion of the |\calc@the@ratio| macro.
+% initial expansion of the |\calc@the@ratio| macro.
% \begin{macrocode}
\gdef\calc@the@ratio{}%
\ifnum\calc@numerator<0 \calc@numerator-\calc@numerator
@@ -1136,7 +1136,7 @@
% Now we have the ratio represented (as the expansion of the global
% macro |\calc@the@ratio|) in the syntax \<decimal constant>
% \cite[page~270]{texbook}. This is fed to |\calc@multiply@by@real|
-% that will
+% that will
% perform the actual multiplication. It is important that the
% multiplication takes place at the correct grouping level so that the
% correct instance of the $B$ register will be used. Also note that
@@ -1196,14 +1196,14 @@
% \end{macro}
%
% \subsection{$\max$ and $\min$ operations}
-%
+%
% \begin{macro}{\maxof}
% \begin{macro}{\minof}
% \changes{v4.2}{2005/08/06}
% {Added macros}
% With version 4.2, the $\max$ and $\min$ operators were
% added to \texttt{calc}. The user functions for them are \cs{maxof} and
-% \cs{minof} respectively.
+% \cs{minof} respectively.
% These macros are internally similar to \cs{widthof} etc.\ in that they
% are unexpandable and easily recognizable by the scanner.
% \begin{macrocode}
@@ -1216,8 +1216,8 @@
%
% \begin{macro}{\calc@Cskip}
% \begin{macro}{\ifcalc@count@}
-% The $\max$ and $\min$ operations take two arguments so we need an extra
-% \<skip> register. We also add a switch for determining when to perform
+% The $\max$ and $\min$ operations take two arguments so we need an extra
+% \<skip> register. We also add a switch for determining when to perform
% a \<skip> or a \<count> assignment.
% \begin{macrocode}
\newskip\calc@Cskip
@@ -1228,9 +1228,9 @@
% \begin{macro}{\calc@maxmin@addsub}
% \begin{macro}{\calc@maxmin@generic}
% \changes{v4.2}{2005/08/06}{Macros added}
-% When doing addition or subtraction with a $\max$ or $\min$ operator, we
-% first check if |\calc@A| is a \<count> register or not and then set the
-% switch. Then call the real function which sets |\calc@A| to the desired
+% When doing addition or subtraction with a $\max$ or $\min$ operator, we
+% first check if |\calc@A| is a \<count> register or not and then set the
+% switch. Then call the real function which sets |\calc@A| to the desired
% value and continue as usual with |\calc@post@scan|.
% \begin{macrocode}
\def\calc@maxmin@addsub#1#2#3{\begingroup
@@ -1244,9 +1244,9 @@
\calc@post@scan
}
% \end{macrocode}
-% Check the switch and do either \<count> or \<skip> assignments. Note that
-% |\maxof| and |\minof| are not set to |>| and |<| until after the
-% assignments, which ensures we can nest them without problems. Then set
+% Check the switch and do either \<count> or \<skip> assignments. Note that
+% |\maxof| and |\minof| are not set to |>| and |<| until after the
+% assignments, which ensures we can nest them without problems. Then set
% |\calc@A| to the correct one.
% \begin{macrocode}
\def\calc@maxmin@generic#1#2#3{%
@@ -1274,11 +1274,11 @@
% \begin{macro}{\calc@maxmin@multiply}
% \begin{macro}{\calc@maxmin@divide}
% \changes{v4.2}{2005/08/06}{Macros added}
-% When doing division or multiplication we must be using \<count> registers
-% so we set the switch. Other than that it is almost business as usual when
-% multiplying or dividing. |#1| is the instruction to either multiply or
-% divide |\calc@B| by |\calc@A|, |#2| is either |\maxof| or |\minof| which
-% is waiting in the input stream and |#3| and |#4| are the calc expressions.
+% When doing division or multiplication we must be using \<count> registers
+% so we set the switch. Other than that it is almost business as usual when
+% multiplying or dividing. |#1| is the instruction to either multiply or
+% divide |\calc@B| by |\calc@A|, |#2| is either |\maxof| or |\minof| which
+% is waiting in the input stream and |#3| and |#4| are the calc expressions.
% We end it all as usual by calling |\calc@post@scan|.
% \begin{macrocode}
\def\calc@maxmin@divmul#1#2#3#4{%
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index b087a50324a..048ffadadb2 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: dcolumn.dtx Copyright (C) 1992-1996 1999-2001 David Carlisle
@@ -91,8 +91,8 @@
%
% \meta{decimal places} should be the maximum number of decimal places
% in the column. If this is negative, any number of decimal places can
-% be used in the column, and all entries will be centred on
-% (the leading edge of) the
+% be used in the column, and all entries will be centred on
+% (the leading edge of) the
% separator. Note that this can cause a column to be too wide, compare
% the first two columns in the example below. If this argument is
% positive, the column uses macros equivalent to "\rightdots"
@@ -153,7 +153,7 @@
%\multicolumn{1}{c|}{head}\\[3pt]
% 1.2 & 1.2 &1.2 \\
% 11212.2& 11212.2&11212.2 \\
-% .4 & .4 &.4
+% .4 & .4 &.4
% \end{tabular}
% \hfill
% \begin{tabular}[t]{|D..{-1}|D..{1}|D..{1.1}|}
@@ -161,7 +161,7 @@
%\multicolumn{1}{c|}{wide heading}&
%\multicolumn{1}{c|}{wide heading}\\[3pt]
% 1.2 & 1.2 &1.2 \\
-% .4 & .4 &.4
+% .4 & .4 &.4
% \end{tabular}
% \end{center}
%
@@ -185,9 +185,9 @@
% tokens, not necessarily `.' in this argument.) The column of figures
% is then positioned such that a number with the specified numbers of
% digits is centred in the column.
-%
+%
% This notation also enables columns that are centred on the mid-point
-% of the separator, rather than its leading edge; for example
+% of the separator, rather than its leading edge; for example
% "D{+}{\,\pm\,}{3,3}" will give nice, symmetric layout of up to three
% digits on either side of a $\pm$ sign.
%
@@ -292,7 +292,7 @@
\def\DC@right#1#2#3{%
\ifx\relax#3\relax
% \end{macrocode}
-% If "#3" is empty, add "\hfill" to right align the column, and
+% If "#3" is empty, add "\hfill" to right align the column, and
% Just set "\DC@rl" to begin a group, so nothing fancy is done with
% the whole number part.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index 0f1bf336768..7db6ac20b67 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: delarray.dtx Copyright (C) 1991-1994 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index 3242bee4590..77db9e2b6f2 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: enumerate.dtx Copyright 1993 1994 1999 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index f5a415b3129..cbddc36eeff 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \def\fileversion{v1.1a} \def\filedate{2003/12/28}
% \CheckSum{18}
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index 530afac447b..0bf8f9455fe 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \title{A font sampler}
% \author{Alan Jeffrey}
@@ -45,28 +45,28 @@
%% Right brace \} Tilde \~}
%%
%
-% \changes{v0.01}{1994/05/01}{Created this test document as part of
+% \changes{v0.01}{1994/05/01}{Created this test document as part of
% accents.dtx.}
% \changes{v0.02}{1994/05/12}{Added the t1enc and ot1enc packages.}
% \changes{v0.03}{1994/05/14}{Moved fontsmpl to its own dtx file.}
% \changes{v0.03}{1994/05/14}{Removed the t1enc and ot1enc packages.}
-% \changes{v0.04}{1994/05/14}{Removed some debugging code, improved
+% \changes{v0.04}{1994/05/14}{Removed some debugging code, improved
% documentation.}
-% \changes{v0.05}{1994/05/14}{Tidied up some more. Removed the fontenc
+% \changes{v0.05}{1994/05/14}{Tidied up some more. Removed the fontenc
% package.}
-% \changes{v0.06}{1994/10/27}{Added testing for all the commands in
+% \changes{v0.06}{1994/10/27}{Added testing for all the commands in
% ltoutenc.}
-% \changes{v0.06}{1994/10/27}{Switched off error for `commands not
+% \changes{v0.06}{1994/10/27}{Switched off error for `commands not
% defined in this encoding'.}
% \changes{v0.07}{1994/10/29}{Added testing for \cs{dots},
% \cs{copyright} and \cs{textregistered}.}
-% \changes{v0.07}{1994/10/29}{Replaced ??? for missing characters by
-% \textbf{?}.}
-% \changes{v0.08}{1994/10/30}{Added testing for \cs{k} and \cs{t}.}
-% \changes{v0.08}{1994/10/30}{Removed testing for any glyphs not in
-% usrguide.}
-% \changes{v0.08}{1994/10/30}{Allowed overfull boxes in the accent test
-% to extend out into the right margin.}
+% \changes{v0.07}{1994/10/29}{Replaced ??? for missing characters by
+% \textbf{?}.}
+% \changes{v0.08}{1994/10/30}{Added testing for \cs{k} and \cs{t}.}
+% \changes{v0.08}{1994/10/30}{Removed testing for any glyphs not in
+% usrguide.}
+% \changes{v0.08}{1994/10/30}{Allowed overfull boxes in the accent test
+% to extend out into the right margin.}
% \changes{v0.10}{1995/09/19}{Corrected placement of docstrip guard.}
% \changes{v0.11}{1997/05/13}{Replaced \cs{@changed@x@err} by
% \cs{TextSymbolUnavailable}, according to the change in
@@ -74,15 +74,15 @@
%
% \section{Introduction}
%
-% This document describes the font test document |fontsmpl.tex| and the
-% accompanying package |fontsmpl.sty|. This produces a test of a font
-% family, printing a sample text, a table of accents, and a sample of
+% This document describes the font test document |fontsmpl.tex| and the
+% accompanying package |fontsmpl.sty|. This produces a test of a font
+% family, printing a sample text, a table of accents, and a sample of
% commands such as |\pounds|.
%
-% It can be used in two ways. The |fontsmpl| package provides the
+% It can be used in two ways. The |fontsmpl| package provides the
% command |\fontsample|, which produces a sample of the current font.
%
-% The |fontsmpl| document prompts interactively for a font family (for
+% The |fontsmpl| document prompts interactively for a font family (for
% example `|cmr|') and produces a sample of that family.
%
% \StopEventually{}
@@ -108,7 +108,7 @@
%
% \section{Font sample document}
%
-% The sample document prompts for a family, and uses the |fontsmpl|
+% The sample document prompts for a family, and uses the |fontsmpl|
% package. If there is a file |fontsmpl.cfg|, this is loaded.
% \changes{v0.9}{1995/05/07}{Removed \cs{pagestyle} empty}
% \begin{macrocode}
@@ -152,7 +152,7 @@
\end{document}
%</document>
% \end{macrocode}
-%
+%
% \section{Font sample package}
%
% The |fontsmpl| package is a \LaTeXe{} package.
@@ -203,7 +203,7 @@
and \AE sop's \OE uvres often na\"\i ve vis-\`a-vis the
d\ae monic ph\oe nix's official r\^ole in fluffy s\t ouffl\'es?
\\
-
+
\end{flushleft}\end{quote}
}
% \end{macrocode}
@@ -311,7 +311,7 @@
\fontsampleaccent{\k} \\
\fontsampleaccent{\u} \\
\fontsampleaccent{\v} \\
- \fontsampleaccent{\~}
+ \fontsampleaccent{\~}
\end{flushleft}\end{quote}
}
\newcommand{\fontsampleaccent}[1]{%
@@ -349,5 +349,5 @@
% \end{macro}
%\Finale
\endinput
-
+
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index 07f56cf7efb..b70055f38ad 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009 2010
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%\iffalse % this is a METACOMMENT !
%
@@ -47,7 +47,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-%
+%
%
% \DoNotIndex{\;}
%^^A \DoNotIndex{\@cclv}
@@ -158,18 +158,18 @@
% \setlength{\hfuzz}{2pt} ^^A allow small overshot in verbatim
%
% \GetFileInfo{ftnright.sty}
-%
+%
% \title{Footnotes in a multi-column layout\thanks
% {The \LaTeX{} package {\tt \filename} which is described
% in this article has the version number \fileversion{} dated
% \filedate.}}
% \author{Frank Mittelbach}
%
-%
+%
% \maketitle
-%
+%
% \pageshrink 1pt %^^A compensate for the \thanks marker
-%
+%
%
% \section{Preface to version 1.1}
%
@@ -191,14 +191,14 @@
% necessary corrections.
%
% \section{Introduction}
-%
-%
+%
+%
% The placement of footnotes in a multicolumn layout always bothered
% me. The approach taken by \LaTeX{} (i.e., placing the footnotes
% separately under each column) might be all right if nearly no
% footnotes are present. But it looks clumsy when both columns contain
% footnotes, especially when they occupy different amounts of space.
-%
+%
% In the multicolumn package~\cite{art:FMi89b}, I used page-wide
% footnotes at the bottom of the page, but again the result doesn't
% look very pleasant since short footnotes produce undesired gaps of
@@ -211,14 +211,14 @@
% of the results it seems best to avoid footnotes in such a layout
% entirely.
%
-%
+%
% Another possibility is to turn footnotes into endnotes, i.e.,
% printing them at the end of every chapter or the end of the entire
% document. But I assume everyone who has ever read a book using such
% a layout will agree with me, that it is a pain to search back and
% forth, so that the reader is tempted to ignore the endnotes
% entirely.
-%
+%
% When I wrote the article about ``Future extensions of
% \TeX{}''~\cite{inproc:FMi90} I was again dissatisfied with the
% outcome of the footnotes, and since this article should show certain
@@ -230,17 +230,17 @@
% of footnotes I also consulted books by Jan Tschichold
% \cite{book:JTs87} and Manfred Simoneit \cite{book:MSi89}, books I
% would recommend to everyone being able to read German texts.
-%
-%
+%
+%
% \subsection{Description of the new layout}
-%
+%
% The result of this effort is presented in this paper and the reader
% can judge for himself whether it was successful or
% not.\footnote{Please note, that this option only changed the
% placement of footnotes. Since this article also makes use of the
% {\tt doc} package \cite{bk:GMS94}, that assigns tiny numbers to
% code lines sprinkled throughout the text, the resulting design is
-% not perfect. This package is now a standard part of \LaTeXe.}
+% not perfect. This package is now a standard part of \LaTeXe.}
% The main idea for this layout is to assemble the
% footnotes of all columns on a page and place them all together at
% the bottom of the right column. Allowing for enough space between
@@ -261,13 +261,13 @@
% preceding the footnote text and not the one used within the main
% text where a raised number or symbol set in smaller type will help
% to keep the flow of thoughts, uninterrupted.}
-%
+%
% All in all, I think this generates a neat layout, and surprisingly
% enough, the necessary changes to the \LaTeX{} output routine are
% nevertheless astonishingly simple.
-%
+%
% \subsection{The use of the package}
-%
+%
% This package might be used together with any other package
% for \LaTeX{} which does not change the three internals changed by
% {\tt \filename}.\footnote{These are the macros {\tt\bslash
@@ -285,9 +285,9 @@
% the \LaTeX3 implementation, we will certainly add some hooks that
% will make such changes more easy.
%
-%
+%
% \subsection{Limitations}
-%
+%
% If in the first column there is more than a full column worth of footnote
% material the material will be split resulting in footnotes out of
% order. This issue is now detected and generates an error but the package is
@@ -309,10 +309,10 @@
% likely to be detached from their reference and show up on a later page!
%
% \StopEventually{
-%
+%
% \begin{small}
% \begin{thebibliography}{1}
-%
+%
% \bibitem{bk:GMS94} \textsc{M.~Goossens}, \textsc{F.~Mittelbach}
% and \textsc{A.~Samarin}.
% \newblock The \LaTeX{} Companion.
@@ -323,46 +323,46 @@
% Hans-Joachim Koppitz, editor.
% \newblock {\em {Gutenberg Jahrbuch}}.
% \newblock Gutenberg-Gesellschaft, Mainz.
-%
+%
% \bibitem{book:LLa86}
% Leslie Lamport.
% \newblock {\em {\LaTeX:} A Document Preparation System}.
% \newblock Addison-Wesley, Reading, Massachusetts, 1986.
-%
+%
% \bibitem{src:ltxiii94}
% \LaTeX3 project.
% \newblock \LaTeXe distribution, 1994.
% \newblock Souces for {\LaTeXe} the successor to \LaTeX~2.09.
-%
+%
% \bibitem{art:FMi89b}
% Frank Mittelbach
% \newblock An environment for multi-column output.
% \newblock {\em TUGboat}, 10(3):407--415, November 1989.
-%
+%
% \bibitem{inproc:FMi90}
% Frank Mittelbach
% \newblock E-{\TeX}: Guidelines to future {\TeX} extensions.
% \newblock In Lincoln K. Durst, editor, {\em \TUB}, 11(3):
% {\em 1990 TUG Annual Meeting Proceedings}, pages
% 337--345, September 1990.
-%
+%
% \bibitem{book:MSi89}
% Manfred Siemoneit.
% \newblock {\em Typographisches {G}estalten}.
% \newblock Polygraph Verlag, Frankfurt am Main, second edition, 1989.
-%
+%
% \bibitem{book:JTs87}
% Jan Tschichold.
% \newblock {\em {Ausgew\"ahlte Aufs\"atze \"uber Fragen der Gestalt des
% Buches}}.
% \newblock Birkh\"auser Verlag, Basel, 1987.
% \newblock Second printing.
-%
+%
% \bibitem{book:JWh88}
% Jan White.
% \newblock {\em Graphic Design for the Electronic Age}.
% \newblock Watson Guptill, Xerox Press, New York, 1988.
-%
+%
% \end{thebibliography}
% \end{small}
%
@@ -370,7 +370,7 @@
% \PrintIndex
% \PrintChanges
% }
-%
+%
%
%
% \section{The documentation driver}
@@ -402,7 +402,7 @@
\setlength{\parskip}
{2pt plus1pt minus1pt}
\setlength{\headsep}{20pt}
-\setlength{\columnsep}{1.5pc}
+\setlength{\columnsep}{1.5pc}
\renewcommand{\bottomfraction}{.4}
\flushbottom
@@ -424,7 +424,7 @@
% \end{macrocode}
%
% \section{The Implementation}
-%
+%
%
% As usual, we start by identifying the current version of this package
% file in the transcript file.\footnote{Nico Poppelier suggested
@@ -438,7 +438,7 @@
% This actually happens at the very top of this file so it is commented out
% here.
%\begin{verbatim}
-%\ProvidesPackage{ftnright}[\filedate\space
+%\ProvidesPackage{ftnright}[\filedate\space
% LaTeX2e package \fileversion]
%\end{verbatim}
%
@@ -478,7 +478,7 @@
% is a nice enhancement, and, I suppose, it is of some value for
% preparing publications in certain disciplines, so here is the
% challenge~\ldots}
-%
+%
%
% \begin{macro}{\preparefootins}
% \begin{macro}{\saved@footinsskip}
@@ -522,7 +522,7 @@
% assembled. Therefore, the macro will start with the following
% code:
% \begin{macrocode}
-\def\@outputdblcol{\if@firstcolumn
+\def\@outputdblcol{\if@firstcolumn
\global\@firstcolumnfalse
% \end{macrocode}
% After changing the switch, we save the first column (which was
@@ -580,7 +580,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macro}{\@startcolumn}
% \changes{v1.0b}{1990/08/11}{Macro added to correct float problems}
% There is a fundamental flaw in \LaTeX's output routine for float
@@ -594,11 +594,11 @@
% be to rewrite two-thirds of \LaTeX{}'s output routine, so I am
% leaving this open for the interested reader.
%
-% \begin{figure}[b]
+% \begin{figure}[b]
% \fbox{%^^A
-% \newlength{\puzzlewd}%^^A
-% \setlength{\puzzlewd}{\columnwidth}%^^A
-% \addtolength{\puzzlewd}{-2.1\fboxsep}%^^A
+% \newlength{\puzzlewd}%^^A
+% \setlength{\puzzlewd}{\columnwidth}%^^A
+% \addtolength{\puzzlewd}{-2.1\fboxsep}%^^A
% \begin{minipage}{\puzzlewd}
% \vspace{17pt}
% \begin{center}
@@ -607,7 +607,7 @@
% \vspace{-3pt}
% \small
% \begin{quote}
-% \rightskip \leftmargini plus 2.5em
+% \rightskip \leftmargini plus 2.5em
% Given a simple \TeX{} document containing only straight text, is
% it possible for the editor, after
% deleting one sentence, to end up with a document
@@ -616,7 +616,7 @@
% We assume that the deleted text contains no \TeX{} macros and
% that the document was prepared
% with a standard macro package like the one used for \TUB\/ production.
-% \end{quote}
+% \end{quote}
% \vspace{7pt}
% \begin{flushright}
% The answer will be given in the next issue.
@@ -658,7 +658,7 @@
% whether such footnotes are present. As we have not reinserted
% them in |\@outputdblcol|, we can check the |\footins| box.
% \begin{macrocode}
- \ifvoid\footins\else
+ \ifvoid\footins\else
% \end{macrocode}
% If there are some, we measure the space that will be occupied by
% them. This measurement is not really exact. If we have a full
@@ -757,7 +757,7 @@
}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\@makecol}
% The other internal macro that we have to change is |\@makecol|, a
% macro that is called whenever one column of material is assembled
@@ -773,7 +773,7 @@
% \begin{macrocode}
\setbox\@outputbox\box\@cclv
% \end{macrocode}
-%
+%
% But if the user errously forgot to specify a twocolumn layout, we
% will always typeset the first column, so that the footnotes are
% never printed. Therefore we better check for this special case
@@ -790,13 +790,13 @@
% \begin{macrocode}
\if@twocolumn \else
\ifvoid\footins \else
- \@latexerr{ftnright package
+ \@latexerr{ftnright package
used in one-column mode}%
{The ftnright package was designed to
work with LaTeX's standard^^Jtwocolumn
option. It does *not* work with the
multicol package.^^JSo please specify
- `twocolumn' in the
+ `twocolumn' in the
\noexpand\documentclass command.}%
\shipout\box\footins \fi\fi
% \end{macrocode}
@@ -813,9 +813,9 @@
\ifnum\insertpenalties>\z@
\@latexerr{ftnright package
scrambled footnotes}%
- {There is too much footnote material in
- the first column and ftnright^^Jis
- unable to cope with this.^^JYou need
+ {There is too much footnote material in
+ the first column and ftnright^^Jis
+ unable to cope with this.^^JYou need
to reduce the amount to get a properly
formatted page.}%
\fi
@@ -838,12 +838,12 @@
% possibility.
% \begin{macrocode}
\setbox\@outputbox\vbox
- {\ifvoid\@cclv \else
+ {\ifvoid\@cclv \else
\unvbox\@cclv
\vskip\skip\footins\fi
% \end{macrocode}
% But in any case, we place the |\footnoterule| in front of the
-% footnotes even if this macro is not used by this
+% footnotes even if this macro is not used by this
% package.\footnote{This decision is certainly open to criticism,
% since there is nothing to separate. On the other hand, a rule or
% some other ornament in front of the footnotes is part of the
@@ -857,7 +857,7 @@
% or not. It also ends the code which differs depending on the
% column number.
% \changes{v1.1d}{1998/12/02}{Added the color@group macros and
-% \texttt{\protect\bslash normalcolor} to make this colorsafe}
+% \texttt{\protect\bslash normalcolor} to make this colorsafe}
% \begin{macrocode}
\color@begingroup
\normalcolor
@@ -927,7 +927,7 @@
\@setfontsize\footnotesize\@viiipt{9.9}%
\abovedisplayskip 6\p@\@plus2\p@\@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
- \belowdisplayshortskip
+ \belowdisplayshortskip
3\p@\@plus\p@\@minus2\p@
\def\@listi{\leftmargin\leftmargini
\topsep 3\p@ \@plus\p@ \@minus\p@
@@ -953,7 +953,7 @@
\@setfontsize\footnotesize\@xpt{12.3}%
\abovedisplayskip10\p@\@plus2\p@\@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
- \belowdisplayshortskip
+ \belowdisplayshortskip
6\p@ \@plus3\p@ \@minus3\p@
\def\@listi{\leftmargin\leftmargini
\topsep 6\p@ \@plus2\p@ \@minus2\p@
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index 9d29634e421..399e1a71e7e 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: hhline.dtx Copyright (C) 1991-1994 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
index eb49964b882..229dbbe58f9 100644
--- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: indent.dtx Copyright (C) 1991-1994 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index dd2d34d5ece..a8c16713774 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \CheckSum{920}
%\iffalse
@@ -74,7 +74,7 @@
% document. The command |\layout*| recomputes the values it uses to
% produce the overview.
%
-% The figure on the next page shows the output of the |\layout|
+% The figure on the next page shows the output of the |\layout|
% command for this document.
%
% \begin{figure}[p]
@@ -98,7 +98,7 @@
% \changes{v1.1f}{1995/03/14}{Added \cs{notshown}}
% \changes{v1.1f}{1995/03/14}{Added option french}
% \changes{v1.1j}{1995/10/29}{Added the options spanish, brazilian and
-% portuguese}
+% portuguese}
% \changes{v1.1k}{1995/11/23}{Documentation fixes}
% \changes{v1.2}{1998/04/13}{Redesign of the output by Hideo Umeki}
% \changes{v1.2c}{2000/09/21}{Added option german}
@@ -207,7 +207,7 @@
% \end{macrocode}
%
% \begin{macro}{\LayOutbs}
-% Define |\LayOutbs| to produce a backslash. We use a definition
+% Define |\LayOutbs| to produce a backslash. We use a definition
% which also works with OT1 fonts.
% \changes{v1.2b}{1998/06/21}{Renamed \cs{bs} to avoid possible conflicts
% with other packages}
@@ -481,13 +481,13 @@
% offset of one inch.
% \begin{macrocode}
\ref@hoffset=\cnt@hoffset \advance\cnt@hoffset by \oneinch
-\ref@voffset=\cnt@voffset
+\ref@voffset=\cnt@voffset
% \end{macrocode}
%
% |\cnt@voffset| is converted to be relative to the origin of the
-% picture.
+% picture.
% \begin{macrocode}
-\cnt@voffset=\ref@top
+\cnt@voffset=\ref@top
\advance\cnt@voffset by -\ref@voffset
% \end{macrocode}
% \end{macro}
@@ -540,7 +540,7 @@
%
% \begin{macro}{\lay@getvalues}
% \changes{v1.1j}{1995/10/30}{Added macro to compute values at later
-% time}
+% time}
% All values that might change during the document are computed by
% calling the macro |\lay@getvalues|. By default this macro is
% executed at |\begin{document}|.
@@ -559,10 +559,10 @@
\ConvertToCount\cnt@footskip\footskip
\ref@head=\ref@top
\advance\ref@head by -\ref@voffset
- \advance\ref@head by -\cnt@topmargin
+ \advance\ref@head by -\cnt@topmargin
\advance\ref@head by -\cnt@headheight
- \ref@body=\ref@head
- \advance\ref@body by -\cnt@headsep
+ \ref@body=\ref@head
+ \advance\ref@body by -\cnt@headsep
\advance\ref@body by -\cnt@textheight
\ref@foot=\ref@body
\advance\ref@foot by -\cnt@footskip
@@ -625,7 +625,7 @@
\advance\ref@marginpar by \cnt@marginparsep
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\else
% \end{macrocode}
@@ -653,7 +653,7 @@
\advance\ref@marginpar by -\cnt@marginparwidth
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\fi
\else
@@ -712,7 +712,7 @@
\framebox(\cnt@textwidth,\cnt@textheight){\Bodytext}}
% \end{macrocode}
%
-% the footer
+% the footer
%
% \begin{macrocode}
\put(\ref@margin,\ref@foot){%
@@ -736,7 +736,7 @@
% |\PositionX| and |\PositionY| will be the coordinates of the center of
% the arrow displaying |\textwidth|.
% \begin{macrocode}
- \SetToHalf\PositionX\cnt@textwidth
+ \SetToHalf\PositionX\cnt@textwidth
\advance\PositionX by \ref@margin
% \end{macrocode}
% The arrow should be a bit above the bottom of the `body box'.
@@ -776,8 +776,8 @@
%
%
% The |\hoffset|,
-% \changes{v1.2}{1998/04/13}{\cs{PositionY} for label 1 is
-% fixed at 50}
+% \changes{v1.2}{1998/04/13}{\cs{PositionY} for label 1 is
+% fixed at 50}
% \begin{macrocode}
\PositionY = 50
\SetToHalf\PositionX\cnt@hoffset
@@ -820,7 +820,7 @@
%
%
% The |\marginparsep|, this depends on single or double sided
-% printing.
+% printing.
% \begin{macrocode}
\advance\PositionY by 30
\if@twoside
@@ -948,7 +948,7 @@
% \end{macrocode}
% and finally the |\headsep|
% \changes{v1.2}{1998/04/13}{The \cs{PositionY} of the label 6 is
-% fixed}
+% fixed}
% \begin{macrocode}
\ExtraYPos=\ref@body
\advance\ExtraYPos\cnt@textheight
@@ -960,11 +960,11 @@
% \end{macrocode}
%
% Here we can end the picture environment and insert a little
-% space.
+% space.
% \begin{macrocode}
\end{picture}
- \medskip
+ \medskip
% \end{macrocode}
%
% Below the picture we put a table to show the actual values of the
@@ -999,7 +999,7 @@
\rlap{(\notshown)}\\
& \Show{ref}{hoffset} & & \Show{ref}{voffset} \\
& \Show{cnt}{paperwidth} & & \Show{cnt}{paperheight} \\
-
+
\end{tabular}\vss}
% \end{macrocode}
% When the option \Lopt{verbose} was used the following lines will
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 93e6d191201..5c5ae0c6380 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: longtable.dtx Copyright (C) 1990-2001 David Carlisle
@@ -169,7 +169,7 @@
% \section{Introduction}
%
% The \package{longtable} package defines a new environment,
-% \DescribeEnv{longtable}
+% \DescribeEnv{longtable}
% \env{longtable}, which has most of the features of the \env{tabular}
% environment, but produces tables which may be broken by \TeX's
% standard page-breaking algorithm. It also shares some features with
@@ -297,7 +297,7 @@
% These chunks do not affect page breaking,
% thus if you are using a \TeX\ with a lot of memory, you can set
% "LTchunksize" to be several pages of the table. \TeX\ will run
-% faster with a large "LTchunksize". However, if necessary,
+% faster with a large "LTchunksize". However, if necessary,
% \env{longtable} can work with "LTchunksize" set to 1, in which case
% the memory taken up is negligible.
% Note that if you use the commands for setting the table head or foot
@@ -311,7 +311,7 @@
% widths had changed. \env{longtable} writes information onto the
% ".aux" file, so that it can line up the different chunks.
% Prior to version~4 of this package, this information was not used
-% unless a "\setlongtables" command was issued, however, now the
+% unless a "\setlongtables" command was issued, however, now the
% information is always used, using a new algorithm\footnote{Due to
% David Kastrup.} and so "\setlongtables" is no longer needed. It is
% defined (but does nothing) for the benefit of old documents that
@@ -365,7 +365,7 @@
% list of tables if this is different from the text to appear in the
% caption. Thus the caption for table \ref{long} was specified as
% {\ttfamily
-% "\caption"[An optional table caption
+% "\caption"[An optional table caption
% (used in the list of tables)]\v{A long
% table"\label{long}"\v}}.
%
@@ -378,7 +378,7 @@
% command.
%
% The captions are set based on the code for the \package{article}
-% class.
+% class.
% If you have redefined the standard "\@makecaption" command to produce
% a different format for the captions, you may
% need to make similar changes to the \package{longtable} version,
@@ -510,7 +510,7 @@
% the document before the final run to add "\setlongtables", and the
% better choice of final column widths in the case of multiple
% "\multicolumn" entries will hopefully more than pay for the extra
-% passes that may possibly be needed.
+% passes that may possibly be needed.
%
% So Table~\ref{pass1} converges after 4~passes, as seen in
% Table~\ref{pass4}.
@@ -676,13 +676,13 @@
% \multicolumn{2}{c}{\textbf{\env{longtable} caption commands}}\\*
% \hline
% "\caption"\marg{caption}&
-% Caption `Table ?: \meta{caption}', and a `\meta{caption}'
+% Caption `Table ?: \meta{caption}', and a `\meta{caption}'
% entry in the list of tables.\\
% "\caption"\oarg{lot}\marg{caption}&
-% Caption `Table ?: \meta{caption}', and a `\meta{lot}'
+% Caption `Table ?: \meta{caption}', and a `\meta{lot}'
% entry in the list of tables.\\
% "\caption[]"\marg{caption}&
-% Caption `Table ?: \meta{caption}',
+% Caption `Table ?: \meta{caption}',
% but no entry in the list of tables.\\
% "\caption*"\marg{caption}&
% Caption `\meta{caption}', but no entry in the list of tables.\\[5pt]
@@ -797,7 +797,7 @@
% \changes{v4.04}{1996/05/24}
% {Macro added}
% If any \env{longtable}s have not aligned, generate a warning at the
-% end of the run at "\AtEndDocument".
+% end of the run at "\AtEndDocument".
% \begin{macrocode}
\def\LT@final@warn{%
\AtEndDocument{%
@@ -813,7 +813,7 @@
%
% \begin{macro}{errorshow}
% \emph{Only} show errors on the terminal. `warnings' are just sent to
-% the log file.
+% the log file.
% \changes{v3.14}{1995/04/25}
% {Change string from LT to longtable}
% \begin{macrocode}
@@ -1031,7 +1031,7 @@
% \end{macro}
%
% \begin{macro}{\LT@array}
-% Start setting the alignment.
+% Start setting the alignment.
% Based on "\@array" from the \LaTeX\ kernel
% and the \package{array} package.
%
@@ -1056,7 +1056,7 @@
% \changes{v3.13}{1994/12/08}
% {add \cs{tabularnewline}}
% \changes{v3.14}{1995/04/25}
-% {(Mike Van Geest) rename \cs{LT@mc} to
+% {(Mike Van Geest) rename \cs{LT@mc} to
% \cs{LT@mcol} to allow 1100 tables}
% \changes{v4.01}{1996/04/11}
% {(DPC) dont need multicolumn warning}
@@ -1121,7 +1121,7 @@
\let\LT@LL@FM@cr\@tabularcr
\else
% \end{macrocode}
-% Initialise these commands as in \package{array}. "\d@llar"
+% Initialise these commands as in \package{array}. "\d@llar"
% replaced by "\d@llarbegin" "\d@llarend" in V3.03 to match
% \package{array} V2.0h. We do not need to set "\d@llarbegin" and
% "\d@llarend" as the \package{array} package gives them the correct
@@ -1565,7 +1565,7 @@
% in alignment templates. It has a "\kern" only if the maximum is
% imposed from a different chunk.
% The "\ifhmode" test reveals the first entry, when we don't want to add
-% an "&".
+% an "&".
% \begin{macrocode}
\def\LT@entry#1#2{%
\ifhmode\@firstofone{&}\fi\omit
@@ -1585,7 +1585,7 @@
% shortened (or the sequencing got mixed up) since the
% previous run.
% Note that this is premature: the last chunk still is going to be
-% set, and with the chopped limits.
+% set, and with the chopped limits.
% \begin{macrocode}
\def\LT@entry@chop#1#2{%
\noexpand\LT@entry
@@ -1604,7 +1604,7 @@
% surprising definition which has the sole purpose of avoiding
% overfull lines (which might break \TeX{}'s limits when reading the
% "aux" file, probably you'd need to have a few hundred columns before
-% this happened but\ldots).
+% this happened but\ldots).
% \begin{macrocode}
\def\LT@entry@write{%
\noexpand\LT@entry^^J%
@@ -1648,7 +1648,7 @@
% {(DK) Macro added}
% \changes{v4.01}{1996/04/11}
% {(DPC) Dont mess with \cs{multicolumn} on draft passes}
-% Create a blank row if we are not using the info in the ".aux" file.
+% Create a blank row if we are not using the info in the ".aux" file.
% \begin{macrocode}
\def\LT@blank@row{%
\xdef\LT@save@row{\expandafter\LT@build@blank
@@ -1675,7 +1675,7 @@
% {(DPC) Make this the default behaviour, not needing
% \cs{setlongtables}}
%
-% Prior to version 4, by default did not use information in the
+% Prior to version 4, by default did not use information in the
% ".aux" file but now we can define "\LT@make@row" to use the ".aux"
% file, even on the `draft' passes.
% \begin{macrocode}
@@ -1694,7 +1694,7 @@
% {(DPC) Use \cs{if} test rather than \cs{ifx}\cs{@empty}}
%
% The expansion between "!"\ldots"!" below will be empty if the number
-% of "\LT@entry" macros
+% of "\LT@entry" macros
% including arguments in "\LT@save@row" is equal to "\LT@cols". If it
% is not empty, we throw the row away and start from scratch.
% \begin{macrocode}
@@ -1921,7 +1921,7 @@
% column widths. Inside that is a "\parbox" of width
% "\LTcapwidth".
% \changes{v3.14}{1995/05/02}
-% {Renamed from \cs{LT@mkcaption},
+% {Renamed from \cs{LT@mkcaption},
% and modified to call \cs{@makecaption}}
% \changes{v3.14}{1995/05/02}
% {Use the first arg to remove counter for star form}
@@ -2075,7 +2075,7 @@
%
% Earlier versions needed a special `draft' form of "\multicolumn".
% This is not needed in version~4, and so these commands have been
-% removed.
+% removed.
%
% \begin{macro}{\LTmulticolumn}
% \changes{v4.01}{1996/04/11}
diff --git a/Master/texmf-dist/source/latex/tools/longtable.ins b/Master/texmf-dist/source/latex/tools/longtable.ins
new file mode 100644
index 00000000000..c6ace539ddb
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/longtable.ins
@@ -0,0 +1,68 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+
+\generate{\file{longtable.sty}{\from{longtable.dtx}{package}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index fd69fab4efb..3d70d330f66 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -1,27 +1,27 @@
% \iffalse meta-comment
%
-%
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% \iffalse This is a METACOMMENT
%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2011 Frank Mittelbach
-%%
+%% Copyright 1989-2013 Frank Mittelbach
+%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
%% about the moral obligation for using multicol. In case of major
@@ -91,10 +91,10 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2011/06/27 v1.7a multicolumn formatting (FMi)]
+ [2014/04/23 v1.8e multicolumn formatting (FMi)]
%
%
-%% \CheckSum{1669}
+%% \CheckSum{1839}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -181,14 +181,58 @@
% one and multicolumn format on the same page. Footnotes are handled
% correctly (for the most part), but will be placed at the bottom of
% the page and not under each column. \LaTeX{}'s float mechanism,
-% however, is partly disabled in the current implementation. At the
+% however, is partly disabled in this implementation. At the
% moment only page-wide floats (i.e., star-forms) can be used within
% the scope of the environment.
% \end{abstract}
%
+% \begin{multicols}{3}[\section*{Preface to version 1.8}]
+% The 1.8 release improves on the balancing approach. If due to a
+% limited number of break points (e.g., due to large objects) the
+% balanced columns exceed the available vertical space, then
+% balancing is canceled and a normal page is produced first. Some
+% overflow is allowed (controlled by the parameter
+% |\maxbalancingoverflow| which defaults to 12pt). This ensures
+% that we only cut a normal page if we get enough material carried
+% over to next page.
+%
+% Also added was support for |\enlargethispage|. This means it is
+% now possible to request a page to be artifically enlarged or
+% shortened. Note that if you enlarge pages by more than one line
+% you may have to increase the {\sf collectmore} counter value to
+% ensure that enough material is being picked up.
+%
+% This command was used on the second page of this manual to shorten
+% it by one line, in order to get rid of a number of widow lines on
+% the following pages.
+%
+%
+% Finally, version 1.8 adds the command |\docolaction| to help with
+% more complicated actions that depend on the current column. This
+% command expects 3 arguments: code that is executed if we are in
+% the ``first'' column, code to execute if we end up in any
+% ``middle'' column (if there are more than two) and finally code to
+% execute if we are in the ``last'' column. Thus
+%\begin{verbatim}
+% \docolaction{first}
+% {middle}{last}
+%\end{verbatim}
+% would typeset a different word depending the type of column this
+% code is executed. Using it like this is probably pointless, but
+% you can imagine applications like writing something into the
+% nearest margin, etc.
+%
+% As this feature needs at least two \LaTeX{} runs to produce correct
+% results and as it adds to the processing complexity it is only
+% made available if one add the option \texttt{colaction} when
+% loading the package.
+%
+% \end{multicols}
+%
% \RLmulticolcolumns
%
-% \begin{multicols}{3}[\section*{Preface to version 1.7}]
+% \begin{multicols}{3}[\section*{Preface to version 1.7
+% (right to left support)}]
% The 1.7 release adds support for languages that are typeset
% right-to-left. For those languages the order of the columns on the page
% also need to be reversed---something that wasn't supported before. This
@@ -199,6 +243,23 @@
%
% \LRmulticolcolumns
%
+% \begin{multicols}{3}
+% Right-to-left typesetting will only reverse the column orders. Any
+% other support needed will have to be provided by other means,
+% e.g., using apprpriate fonts and reversing the writing directions
+% within the columns. As footnotes are typeset in full measure the
+% footnote rule needs to be redefined as if they are below a single
+% column, i.e., using |\textwidth| not |\columnwidth|. For example:
+%\begin{verbatim}
+%\renewcommand \footnoterule{%
+% \kern-3pt\hbox to\textwidth
+% {\hskip .6\textwidth
+% \hrulefill }%
+% \kern2.6pt}
+%\end{verbatim}
+% \end{multicols}
+%
+%
% \begin{multicols}{3}[\section*{Preface to version 1.5 + 1.6}]
% \hbadness=10000
% The 1.5 release contains two major changes: \mc{} will now
@@ -261,6 +322,8 @@
% lack of time. To implement floats one has to reimplement the
% whole \LaTeX{} output routine.}.
%
+% \enlargethispage{-1\baselineskip}
+%
% \DescribeMacro\premulticols
% As its first action, the {\sf multicols} environment measures the
% current page to determine whether there is enough room for some
@@ -305,7 +368,7 @@
%\end{verbatim}
%
%
-% \DescribeMacro\columnsep
+% \DescribeMacro\columnsep
% The space between columns is controlled by the length parameter
% |\columnsep|. The width for the individual columns is automatically
% calculated from this parameter and the current |\linewidth|. In this
@@ -333,6 +396,7 @@
%
% \subsection{Balancing columns}
%
+%
% Besides the previously mentioned parameters, some others are
% provided to influence the layout of the columns generated.
%
@@ -396,10 +460,9 @@
%
% In the second step (balancing columns) we have other bells and
% whistles. First of all you can say |\raggedcolumns| if you
-% don't want the bottom lines to be aligned.
-% The default is |\flushcolumns|, so \TeX{} will normally try to
-% make both
-% \columnbreak
+% don't want the bottom lines to be aligned.
+% The default is |\flushcolumns|, so \TeX{} will normally try to
+% make both
% the top and bottom baselines of all columns align.
%
% Additionally you can set another counter, the `{\sf unbalance}'
@@ -407,7 +470,7 @@
% right-most column \meta{number} of lines longer than they would
% normally have been. `Lines' in this context refer to normal text
% lines (i.e.\ one |\baselineskip| apart); thus, if your columns
-% contain displays,
+% contain displays,
% for example, you may need a higher \meta{number}
% to shift something from one column into another.
%
@@ -430,10 +493,10 @@
% solutions where at least one column has a badness being larger than
% the value of the counter {\sf columnbadness}. The default value for
% this counter is 10000, thus \TeX{} will accept all solutions except
-% those being overfull.
+% those being overfull.
% By setting the counter to a smaller value you can force the algorithm
% to search for solutions that do not have columns with a lot of white
-% space.
+% space.
%
% However, if the setting is too low, the algorithm may not find any
% acceptable solution at all and will then finally choose the extreme
@@ -453,13 +516,21 @@
% bad. In that case the final column is allowed to run short which gives
% a much better result.
%
-% And there are two more parameters of some experimental nature,
-% one called |\multicolovershoot| the other |\multicolundershoot|.
-% They control
-% the amount of space a column is allowed to be ``too full'' or ``too
-% short'' without affecting the column badness. They are set to 0pt
-% and 2pt, respectively.
-%
+% And there are two more parameters of some experimental nature, one
+% called |\multicolovershoot| the other |\multicolundershoot|. They
+% control the amount of space a column within the \mc{} environment is
+% allowed to be ``too full'' or ``too short'' without affecting the
+% column badness. They are set to 0pt and 2pt, respectively.
+%
+% Finally, when doing the balancing at the end, columns may become
+% higher than the remaining available space. In that case the
+% algorithm aborts and instead generates a normal page. However, if the
+% amount is not too large, e.g., a line or so, then it might be better to
+% keep everything on the same page instead of starting a new page with
+% just one line after balancing. So the parameter
+% |\maxbalancingoverflow| governs this process: only when the excess
+% gets larger than its value balancing is aborted.
+%
% \subsection{Not balancing the columns}
%
% Although this package was written to solve the problem of balancing
@@ -471,7 +542,7 @@
% works on top-level, e.g., inside a box one has to balance to
% determine a column height in absence of a fixed value.
%
-%
+%
% \subsection{Manually breaking columns}
%
% Another request often voiced was: ``How do I tell \LaTeX{} that it
@@ -514,7 +585,7 @@
% \subsection{Warnings}
%
% Under certain circumstances the use of the \mc{} environment may
-% result in some
+% result in some
% warnings from \TeX{} or \LaTeX{}. Here is a list
% of the important ones and the possible cause:
% \begin{description}
@@ -525,7 +596,7 @@
% As the columns are often very narrow \TeX{} wasn't able to find a
% good way to break the paragraph. Underfull denotes a loose line but
% as long as the badness value is below $10000$ the result is probably
-% acceptable.
+% acceptable.
%
% \item[]
% {\hspace*{-\labelsep}\tt Underfull \string\vbox\space ... while
@@ -571,7 +642,7 @@
%
% To understand the reasoning behind the decisions \TeX{} makes when
% processing a \mc{} environment, a tracing mechanism is provided.
-% If you set the counter `\texttt{tracingmulticols}'
+% If you set the counter `\texttt{tracingmulticols}'
% to a positive \meta{number} you then
% will get some tracing information on the terminal and in the
% transcript file:
@@ -648,9 +719,9 @@
%
% When it finishes it must return the individual columns in boxes
% suitable for further processing with |\page@sofar|. This means
-% that the left column should be stored in box register
+% that the left column should be stored in box register
% |\mult@gfirstbox|, the next
-% in register |\mult@firstbox|${}+2$, \ldots,
+% in register |\mult@firstbox|${}+2$, \ldots,
% only the last one as an exception in
% register |\mult@grightbox|. Furthermore it has to set up
% the two macros
@@ -759,7 +830,7 @@
% \StopEventually{\PrintIndex \PrintChanges
% \ifx\Finale\relax
% \typeout{**********************************}
-% \typeout{* Info: Typesetting this document with
+% \typeout{* Info: Typesetting this document with
% \protect\OnlyDescription\space will}
% \typeout{* Info: result in one unresolved
% reference to `sec:v14'.}
@@ -831,16 +902,16 @@
% \begin{macrocode}
\setcounter{IndexColumns}{4}
\let\DescribeMacro\SpecialUsageIndex
-\let\DescribeEnv\SpecialEnvIndex
-\renewcommand\PrintMacroName[1]{}
+\let\DescribeEnv\SpecialEnvIndex
+\renewcommand\PrintMacroName[1]{}
\CodelineIndex
%\DisableCrossrefs % Partial index
\RecordChanges % Change log
% \end{macrocode}
% Line numbers are very small for this article.
% \begin{macrocode}
-\renewcommand{\theCodelineNo}
- {\scriptsize\rm\arabic{CodelineNo}}
+\renewcommand{\theCodelineNo}
+ {\scriptsize\rm\arabic{CodelineNo}}
\settowidth\MacroIndent{\scriptsize\rm 00\ }
\begin{document}
@@ -856,7 +927,7 @@
%
% \end{multicols}
%
-% \begin{multicols}{2}[\subsection{Identification and
+% \begin{multicols}{2}[\subsection{Identification and
% option processing}]
%
%
@@ -866,7 +937,7 @@
% \begin{macrocode}
%<*package>
% \NeedsTeXFormat{LaTeX2e}
-% \ProvidesPackage{multicol}[..../../..
+% \ProvidesPackage{multicol}[..../../..
% v... multicolum formatting]
% \end{macrocode}
%
@@ -904,13 +975,34 @@
% \begin{macrocode}
\let\mc@gridwarn\maxdimen
\DeclareOption{grid}{\def\mc@gridwarn{\maxdepth}}
+% \end{macrocode}
+%
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+% Next option enables the |\docolaction| command. As this changes
+% the \texttt{.aux} file content this is not automatically enabled.
+% \begin{macrocode}
+\DeclareOption{colaction}{%
+ \def\mc@col@status@write{%
+ \protected@write\@auxout{}%
+ {\string\mc@col@status
+ {\ifmc@firstcol 1\else 2\fi}}%
+ \mc@firstcolfalse}%
+ \def\mc@lastcol@status@write{%
+ \protected@write\@auxout{}%
+ {\string\mc@col@status{3}}}%
+}
+\let\mc@col@status@write\relax
+\let\mc@lastcol@status@write\relax
+% \end{macrocode}
+%
+% \begin{macrocode}
\ProcessOptions
% \end{macrocode}
%
%
% \end{multicols}
%
-% \begin{multicols}{2}[\subsection{Starting and
+% \begin{multicols}{2}[\subsection{Starting and
% Ending the \mc{} Environment}]
%
% \begin{macro}{\multicols}
@@ -985,7 +1077,7 @@
%
%
% \begin{macro}{\mult@footnotetext}
-%
+%
% \begin{macrocode}
\long\def\mult@footnotetext#1{\begingroup
\columnwidth\textwidth
@@ -1063,7 +1155,7 @@
% \end{macrocode}
% Now we output the first argument and produce vertical space
% above the columns. (Note that this argument corresponds to the
-% first optional argument of the {\sf multicols} environment.)
+% first optional argument of the {\sf multicols} environment.)
% For many releases this argument was typeset in a group to get
% a similar effect as |\twocolumn[..]| where the argument is
% also implicitly surrounded by braces. However, this conflicts
@@ -1089,7 +1181,7 @@
% \changes{v1.5z1}{2003/02/17}{Add a kern to cancel potential depth of
% previous line}
% \begin{macrocode}
- \ifdim \prevdepth = -\@m\p@
+ \ifdim \prevdepth = -\@m\p@
\else
% \end{macrocode}
% The actual generation of this corrective space is a little bit
@@ -1125,11 +1217,17 @@
\if@boxedmulticols
\setbox\mult@box\vbox\bgroup
% \end{macrocode}
+%
+% \changes{v1.8c}{2013/11/03}{Add \cs{color@setgroup} to prevent color leak}
+% \begin{macrocode}
+ \color@setgroup
+% \end{macrocode}
% \changes{v1.5?}{1994/?/?}{Penalty moved to later point}
% We may have to reset some parameters at this point,
% perhaps |\@parboxrestore|
% would be the right action but I leave it for the moment.
-% \changes{v1.4l}{1992/08/17}{\cs{@totalleftmargin} now in \cs{prepare@multicols}}
+% \changes{v1.4l}{1992/08/17}{\cs{@totalleftmargin} now in
+% \cs{prepare@multicols}}
% \begin{macrocode}
\fi
% \end{macrocode}
@@ -1158,7 +1256,7 @@
% correct since it doesn't take the `shrinking' (i.e.\
% |\pageshrink|) into account. The `recent contribution list'
% might be nonempty so we start with |\par| and an explicit
-% |\penalty|.\footnote{See the documentation of
+% |\penalty|.\footnote{See the documentation of
% \cs{endmulticols} for further details.}
% Actually, we use |\addpenalty| to ensure that a following
% |\addvspace| will `see' the vertical space that might be
@@ -1518,7 +1616,7 @@
% \end{macro}
%
% \begin{macro}{\set@mult@vsize}
-%
+%
% Since we have to set |\col@umber| columns on one page,
% each with a height of |\@colroom|, we have to assign
% $
@@ -1574,12 +1672,14 @@
% \end{macrocode}
% In boxed mode we have to close the box in which we have gathered
% all material for the columns.
+% \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak}
% \begin{macrocode}
- \egroup
+ \color@endgroup\egroup
% \end{macrocode}
% Now we call |\balance@columns| the routine that balances material
% stored in the box |\mult@box|.
-% \changes{v1.5?}{1994/?/?}{Splitting off zero box moved to \cs{balance@columns}}
+% \changes{v1.5?}{1994/?/?}{Splitting off zero box moved to
+% \cs{balance@columns}}
% \begin{macrocode}
\balance@columns
% \end{macrocode}
@@ -1631,7 +1731,7 @@
\fi
%</colbreak>
% \end{macrocode}
-%
+%
% If we are in an unrestricted \mc{} environment we end the current
% paragraph above with |\par| but this isn't sufficient since \TeX{}s
% {\it page\_builder} will not totally empty the contribution
@@ -1868,7 +1968,7 @@
% First we ensure that the columns have equal width. We use
% |\process@cols| for this purpose, starting with
% $|\count@|=|\mult@rightbox|$. Therefore |\count@| loops through
-% |\mult@rightbox|, $|\mult@rightbox| + 2$,\ldots
+% |\mult@rightbox|, $|\mult@rightbox| + 2$,\ldots
% (to |\doublecol@number|).
% \changes{v1.5a}{1992/11/04}{New box mechanism}
% \begin{macrocode}
@@ -1893,7 +1993,7 @@
% \begin{macrocode}
\count@\col@number \advance\count@\m@ne
\mult@info\z@
- {Column spec: \the\full@width\space = indent
+ {Column spec: \the\full@width\space = indent
+ columns + sep =\MessageBreak
\the\multicol@leftmargin\space
+ \the\col@number\space
@@ -1923,7 +2023,7 @@
% calculations are used. We therefore better cancel that process.
% \changes{v1.5z1}{2003/02/17}{Suppress interline glue at this point}
% \begin{macrocode}
- \nointerlineskip
+ \nointerlineskip
% \end{macrocode}
% As mentioned earlier we want to have the reference point of the
% box we put on the page being at the baseline of the last line of
@@ -1942,55 +2042,28 @@
% \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
% \begin{macrocode}
\setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
-% \end{macrocode}
-% If the document is written in a language that is typeset right-to-left
-% then, of course, the multicol columns should be also typeset
-% right-to-left. To support this we call |\maybe@reverse@columns| which
-% either does nothin (in the LR case) or re-sorts the columns so that they
-% come out in reverse order (for the RL case).
-% \changes{v1.7a}{2010/10/24}{}
-% \begin{macrocode}
- \maybe@reverse@columns
-% \end{macrocode}
-% After that we can output all columns regardless of typesetting direction
-% in the same way.
-% \begin{macrocode}
\moveright\multicol@leftmargin
\hbox to\full@width{%
- \process@cols\mult@gfirstbox{%
-% \end{macrocode}
-% If the depth of the current box is larger than the maximum found
-% so far in |\dimen2| we update that register.
-% \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
-% \begin{macrocode}
- \ifdim\dp\count@>\dimen\tw@
- \global\dimen\tw@\dp\count@ \fi
- \box\count@
- \hss{\columnseprulecolor\vrule
- \@width\columnseprule}\hss}%
% \end{macrocode}
-% As you will have noticed, we started with box register
-% |\mult@gfirstbox| (i.e.\
-% the left column). So this time |\count@| looped through 2,
-% 4,\ldots\ (plus the appropriate offset).
-% Finally we add box 0 and close the |\hbox|.
-% \changes{v1.5a}{1992/11/04}{New box mechanism}
-% \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
-% Again we may have to update |\dimen\tw@|.
+% If the document is written in a language that is typeset right-to-left
+% then, of course, the multicol columns should be also typeset
+% right-to-left. To support this we call |\mc@align@columns| which
+% with execute different code depending on the typesetting direction.
+% \changes{v1.7b}{2011/12/18}{RL language support fixed}
% \begin{macrocode}
- \ifdim\dp\mult@rightbox>\dimen\tw@
- \global\dimen\tw@\dp\mult@rightbox \fi
- \box\mult@rightbox
+ \mc@align@columns
% \end{macrocode}
% The depths of the columns depend on their last lines. To ensure
% that we will always get a similar look as far as the rules are
-% concerned we force the depth at least the depth of a letter~`p'.
+% concerned we force the depth to be at least the depth of a
+% letter~`p' (which is what we initialized |\dimen2| to aboved).
% \begin{macrocode}
- \rlap{\phantom p}%
+ \rlap{\phantom p}%
}%
% \end{macrocode}
% Now after typesetting the box we back up to its baseline by using
-% the value stored in |\dimen2|.
+% the value stored in |\dimen2| (which will hold the largest depth
+% found on any column).
% \changes{v1.6a}{2003/03/15}{Now adjusting \cs{prevdepth}}
% \begin{macrocode}
\kern-\dimen\tw@
@@ -2014,7 +2087,7 @@
%
% \begin{macro}{\columnseprulecolor}
% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
-% By default the vertical rule between columns will be in |\normalcolor|.
+% By default the vertical rule between columns will be in |\normalcolor|.
% \begin{macrocode}
\def\columnseprulecolor{\normalcolor}
% \end{macrocode}
@@ -2062,7 +2135,7 @@
% \end{macrocode}
% otherwise we construct the final page.
% \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}}
-% \changes{v1.5v}{1999/07/18}{Added debug statements for
+% \changes{v1.5v}{1999/07/18}{Added debug statements for
% column break support}
% For the next block of code see comments in section~\ref{sec:colbreak}.
% \begin{macrocode}
@@ -2103,6 +2176,28 @@
\leave@mult@footins
\fi
% \end{macrocode}
+% And there is one more adjustment that we have to make: if the
+% user has issue a |\enlargethispage| command then the height the
+% |\@kludgeins| box will be the negation of the size by which the
+% page should be enlarged. If the star form of this command has
+% been used then we also need to shrink the resulting column. As we
+% don't know whether or not shrinking is already generally
+% requested with save the current value of |\ifshr@king| and
+% restore it afterwards.
+% \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
+% \begin{macrocode}
+ \let\ifshr@kingsaved\ifshr@king
+ \ifvbox \@kludgeins
+ \advance \dimen@ -\ht\@kludgeins
+% \end{macrocode}
+% The star form of |\enlargethispage| makes the width of the box
+% greater than zero (sneaky isn't it?).
+% \begin{macrocode}
+ \ifdim \wd\@kludgeins>\z@
+ \shr@nkingtrue
+ \fi
+ \fi
+% \end{macrocode}
% Now we are able to |\vsplit| off all but the last column.
% Recall that these columns should be saved in the box registers 2,
% 4,\ldots\ (plus offset).
@@ -2118,32 +2213,54 @@
% \end{macrocode}
% If |\raggedcolumns| is in force we add a |vfill| at the bottom by
% unboxing the split box.
+% But we need to unbox anyway to ensure that at the end of the box
+% we do not have unwanted space. This can sneak in in certain
+% situations, for example, if two lists follow each other and we
+% break between them. While sich space is usually zero it still has
+% an effect because it hides depth of the last line in the column
+% and that will result in incorrect placement.
% \changes{v1.3c}{1990/03/03}{\cs{unbox}ing avoided.}
+% \changes{v1.8b}{2013/08/28}{And 20odd years later conclude that
+% this was wrong and unboxing is always needed.}
+% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
+% end of split boxes}
% \begin{macrocode}
- \ifshr@nking
- \setbox\count@
+ \setbox\count@
\vbox to\dimen@
- {\unvbox\count@\vfill}%
- \fi
+ {\unvbox\count@
+ \remove@discardable@items
+ \ifshr@nking\vfill\fi}%
}%
% \end{macrocode}
% Then the last column follows.
% \changes{v1.5a}{1992/11/04}{New box mechanism}
+% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
+% end of split boxes}
% \begin{macrocode}
\setbox\mult@rightbox
\vsplit\@cclv to\dimen@
\set@keptmarks
- \ifshr@nking
- \setbox\mult@rightbox\vbox to\dimen@
- {\unvbox\mult@rightbox\vfill}%
- \fi
+ \setbox\mult@rightbox\vbox to\dimen@
+ {\unvbox\mult@rightbox
+ \remove@discardable@items
+ \ifshr@nking\vfill\fi}%
+% \end{macrocode}
+% Now that we are done with the boxes, we restored the current
+% setting for shrinking in case it got changed:
+% \begin{macrocode}
+ \let\ifshr@king\ifshr@kingsaved
% \end{macrocode}
% Having done this we hope that box 255 is emptied. If not, we
% reinsert its contents.
+% \changes{v1.8a}{2011/12/20}{Only re-add output penalty if it was
+% explictly set}
% \begin{macrocode}
\ifvoid\@cclv \else
\unvbox\@cclv
- \penalty\outputpenalty
+ \ifnum\outputpenalty=\@M
+ \else
+ \penalty\outputpenalty
+ \fi
% \end{macrocode}
% In this case a footnote that happens to fall into the leftover
% bit will be typeset on the wrong page. Therefore we warn the user
@@ -2195,10 +2312,10 @@
\mult@info\tw@
{Use kept top mark:\MessageBreak
\meaning\kept@topmark
- \MessageBreak
+ \MessageBreak
Use kept first mark:\MessageBreak
\meaning\kept@firstmark
- \MessageBreak
+ \MessageBreak
Use kept bot mark:\MessageBreak
\meaning\kept@botmark
\MessageBreak
@@ -2256,8 +2373,12 @@
% \end{macrocode}
% Now we reset |\@colroom| to |\@colht| which is \LaTeX's
% saved value of |\textheight|.
+% We also ahve to reset the recorded position of the last
+% |\marginpar| as we are now on a new page.
+% \changes{v1.8d}{2014/04/23}{Reset \cs{@mparbottom} after page finishes}
% \begin{macrocode}
\global\@colroom\@colht
+ \global \@mparbottom \z@
% \end{macrocode}
% Then we process deferred floats waiting for their chance to be
% placed on the next page.
@@ -2296,7 +2417,7 @@
%
% \begin{macro}{\leave@mult@footins}
% This macro is used to subtract the amount of space
-% occupied by footnotes for the current space from the
+% occupied by footnotes for the current space from the
% space available for the current column. The space current column
% is stored in |\dimen@|. See above for the description of the default
% action.
@@ -2313,7 +2434,7 @@
%
% \begin{macro}{\speci@ls}
% We left out two macros: |\process@deferreds| and
-% |\speci@ls|.
+% |\speci@ls|.
% \changes{v1.5c}{1993/04/18}{Support \cs{clearpage}}
% \begin{macrocode}
\def\speci@ls{%
@@ -2322,21 +2443,21 @@
% If the document ends in the middle of a multicols environment, e.g.,
% if the user forgot the |\end{multicols}|, \TeX{} adds a very
% negative penalty to the end of the galley which is intended to signal
-% the output routine that it is time to prepare for shipping out
-% everything remaining. Since inside multicols the output routine of
-% \LaTeX{} is disabled sometimes we better check for this case: if we
+% the output routine that it is time to prepare for shipping out
+% everything remaining. Since inside multicols the output routine of
+% \LaTeX{} is disabled sometimes we better check for this case: if we
% find a very negative penalty we produce an error message and run
% the default output routine for this case.
% \changes{v1.5s}{1998/09/10}{check for \cs{stop} penalty pr/2873}
% \begin{macrocode}
- \ifnum \outputpenalty<-\@MM
+ \ifnum \outputpenalty<-\@MM
\PackageError{multicol}{Document end
inside multicols environment}\@ehd
\@specialoutput
\else
% \end{macrocode}
% \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}}
-% \changes{v1.5v}{1999/07/18}{Added debug statements for
+% \changes{v1.5v}{1999/07/18}{Added debug statements for
% column break support}
% For the next block of code see comments in section~\ref{sec:colbreak}.
% \begin{macrocode}
@@ -2349,7 +2470,7 @@
\vbox{\ifvoid\colbreak@box
\else
\unvbox\colbreak@box
- \penalty-\@Mv
+ \penalty-\@Mv
\fi
\unvbox\@cclv}
\reinsert@footnotes
@@ -2466,7 +2587,7 @@
%<-colbreak> \vbox{\unvbox\@cclv}%
% \end{macrocode}
% \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}}
-% \changes{v1.5v}{1999/07/18}{Added debug statements for
+% \changes{v1.5v}{1999/07/18}{Added debug statements for
% column break support}
% For the next block of code see comments in section~\ref{sec:colbreak}.
% \begin{macrocode}
@@ -2481,24 +2602,68 @@
%</colbreak>
\balance@columns
% \end{macrocode}
-% This will bring us into the position to apply |\page@sofar|.
-% But first we have to set |\vsize| to a value suitable for
-% one column output.
+% If during balancing the columns got too long the flag
+% |\iftoo@bad| is set to true.
+% \changes{v1.8a}{2011/12/20}{Balancing concept improved}
+% \begin{macrocode}
+ \iftoo@bad
+ \mult@info\@ne
+ {Balancing failed ...
+ cut a normal page}%
+% \end{macrocode}
+% In that case we put the material back in box 255. The curious set of
+% |\vskip|s we add is necessary to cancel out the |\splittopskip|
+% that got added for balancing.
+% \begin{macrocode}
+ \setbox\@cclv\vbox
+ {\vskip\topskip
+ \vskip-\splittopskip
+ \unvbox\mult@box}%
+% \end{macrocode}
+% We then call the standard multicol output routine which will
+% produce a normal page for us (remember we are still within the
+% OR).
+% This also means that if there was an |\enlargethispage| present
+% it will apply to this page as |\multi@column@out| will look at
+% the status of |\@kludgeins|.
+% \begin{macrocode}
+ \multi@column@out
+% \end{macrocode}
+% Because balancing made the columns too long we are sure that there
+% will be some material remaining which was put back onto the main
+% vertical list by |\multi@column@out|. We therefore add another
+% breakpoint so that this material will then be processed by the
+% balancing OR to finish off the multicol environment.
+% \begin{macrocode}
+ \break
+ \else
+% \end{macrocode}
+% If the balancing went ok, we are in the position
+% to apply |\page@sofar|. But first we have to set |\vsize| to a
+% value suitable for one column output.
% \begin{macrocode}
- \global\vsize\@colroom
- \global\advance\vsize\ht\partial@page
+ \global\vsize\@colroom
+ \global\advance\vsize\ht\partial@page
+% \end{macrocode}
+% We also have to look at |\@kludgeins| and generate a new
+% |\insert| in case there was one present due to an
+% |\enlargethispage| command.
+% \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
+% \begin{macrocode}
+ \ifvbox\@kludgeins\insert\@kludgeins
+ {\unvbox\@kludgeins}\fi
% \end{macrocode}
% Then we |\unvbox| the |\partial@page| (which may be void if we
-% are not prcessing the first page of this \mc{} environment.
+% are not processing the first page of this \mc{} environment.
% \begin{macrocode}
- \unvbox\partial@page
+ \unvbox\partial@page
% \end{macrocode}
% Then we return the first and bottom mark and the gathered
% material to the main vertical list.
% \begin{macrocode}
- \return@nonemptymark{first}\kept@firstmark
- \return@nonemptymark{bot}\kept@botmark
- \page@sofar
+ \return@nonemptymark{first}\kept@firstmark
+ \return@nonemptymark{bot}\kept@botmark
+ \page@sofar
% \end{macrocode}
% We need to add a penalty at this point which allows to break at
% this point since calling the output routine may have removed the
@@ -2507,7 +2672,8 @@
% for |\multicolsep| etc. this could produce funny results.
% \changes{v1.5c}{1993/04/18}{added penalty at output routine exit}
% \begin{macrocode}
- \penalty\z@
+ \penalty\z@
+ \fi
}
% \end{macrocode}
% As we already know, reinserting of footnotes will be done in the
@@ -2523,7 +2689,7 @@
% We start by setting the kept marks by updating them with any
% marks from this box. This has to be done \emph{before} we add a
% penalty of $-10000$ to the top of the box, otherwise only an
-% empty box will be considered.
+% empty box will be considered.
% \changes{v1.5h}{1994/08/26}{Get kept marks first}
% \begin{macrocode}
\get@keptmarks\mult@box
@@ -2638,12 +2804,12 @@
% it.
% \changes{v1.2a}{1990/02/05}{Group around main loop removed.}
% \begin{macrocode}
- \vbadness\@M
+ \vbadness\@M
% \end{macrocode}
% We also allow for overfull boxes while we trying to split the
% columns.
% \begin{macrocode}
- \vfuzz \col@number\baselineskip
+ \vfuzz \col@number\baselineskip
% \end{macrocode}
% The variable |\last@try| will hold the dimension used in the
% previous trial splitting. We initialize it with a negative value.
@@ -2679,7 +2845,7 @@
% \changes{v1.5b}{1992/11/05}{New badness mechanism}
% \begin{macrocode}
%<*badness>
- \global\too@badfalse
+ \too@badfalse
%</badness>
% \end{macrocode}
% Using |\vsplit| we extract the other columns from box register
@@ -2691,6 +2857,16 @@
\global\setbox\count@
\vsplit\mult@grightbox to\dimen@
% \end{macrocode}
+% After splitting we need to ensure that there isn't any space at
+% the bottom, so we rebox once more.
+% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
+% end of split boxes}
+% \begin{macrocode}
+ \global\setbox\count@
+ \vbox to\dimen@
+ {\unvbox\count@
+ \remove@discardable@items}%
+% \end{macrocode}
% After every split we check the badness of the resulting column,
% normally the amount of extra white in the column.
% \begin{macrocode}
@@ -2699,8 +2875,8 @@
\@tempcnta\count@
\advance\@tempcnta-\mult@grightbox
\divide\@tempcnta \tw@
- \message{^^JColumn
- \number\@tempcnta\space
+ \message{^^JColumn
+ \number\@tempcnta\space
badness: \the\badness\space}%
\fi
% \end{macrocode}
@@ -2709,10 +2885,10 @@
% \begin{macrocode}
\ifnum\badness>\c@columnbadness
\ifnum\c@tracingmulticols>\@ne
- \message{too bad
+ \message{too bad
(>\the\c@columnbadness)}%
\fi
- \global\too@badtrue
+ \too@badtrue
\fi
%</badness>
}}%
@@ -2765,13 +2941,13 @@
% |\raggedcolumns| means allows for all columns to run slightly short.
% \changes{v1.5q}{1998/01/19}{Do not reset \cs{mult@firstbox} (pr2739)}
% \begin{macrocode}
-% \ifshr@nking
+% \ifshr@nking
% \global\setbox\mult@firstbox
% \copy\mult@nat@firstbox
% \fi
% \end{macrocode}
% Then we give information about the last column.\footnote{With
-% \TeX{} version 3.141 it is now possible to use \LaTeX's
+% \TeX{} version 3.141 it is now possible to use \LaTeX's
% \cs{newlinechar} in the \cs{message} command, but
% people with older \TeX{} versions will now get
% \texttt{\string^\string^J} instead of a new line on the screen.}
@@ -2807,9 +2983,9 @@
% \begin{macrocode}
\ifdim\ht\mult@grightbox >\dimen@
% \end{macrocode}
-% If the height of the last box is too large we mark this trial as
+% If the height of the last box is too large we mark this trial as
% unsuccessful.
-% \changes{v1.5v}{1999/07/18}{Added tracing statements for
+% \changes{v1.5v}{1999/07/18}{Added tracing statements for
% trial unsuccesful}
% \begin{macrocode}
%<*badness>
@@ -2837,8 +3013,8 @@
\ifvoid\@tempboxa
%</colbreak>
% \end{macrocode}
-% Thus if |\@tempboxa| is void we have a valid solution.
-% In this case we take a closer
+% Thus if |\@tempboxa| is void we have a valid solution.
+% In this case we take a closer
% look at the last column to decide if this column should be made
% as long as all other columns or if it should be allowed to be
% shorter.
@@ -2850,7 +3026,7 @@
\vbox to\dimen@
{\unvbox\mult@grightbox}%
\ifnum\c@tracingmulticols>\@ne
- \message{Final badness:
+ \message{Final badness:
\the\badness}%
\fi
% \end{macrocode}
@@ -2901,7 +3077,7 @@
\last@try\dimen@
\advance\dimen@-\p@
\fi
- \fi
+ \fi
% \end{macrocode}
% Finally the switch |too@bad| is tested. If it was made true
% either earlier on or due to a rightmost column being too large
@@ -2909,7 +3085,7 @@
% \begin{macrocode}
\iftoo@bad
%</badness>
- \advance\dimen@\p@
+ \advance\dimen@\p@
\repeat
% \end{macrocode}
% At that point |\dimen@| holds the height that was determined by
@@ -2949,6 +3125,11 @@
\process@cols\mult@rightbox
{\@tempcnta\count@
\advance\@tempcnta\@ne
+% \end{macrocode}
+% when putting the final column together we want overfull
+% information:
+% \begin{macrocode}
+ \vfuzz\z@
\setbox\count@\vbox to\dimen@
{%
% \end{macrocode}
@@ -2958,11 +3139,58 @@
\@plus-\multicolundershoot
\@minus-\multicolovershoot
\unvbox\@tempcnta
- \ifshr@nking\vfill\fi}}%
+ \ifshr@nking\vfill\fi
+ }%
+% \end{macrocode}
+% If the resulting box is overfull there was too much material to
+% fit into the available space. The question though is how much? If
+% it wasn't more than |\maxbalancingoverflow| we accept it still to
+% avoid getting very little material for the next page (which we
+% would then have difficulties to balance).
+% \changes{v1.8a}{2011/12/20}{Balancing concept improved}
+% \begin{macrocode}
+ \ifnum\badness>\@M
+ \vfuzz\maxdimen % no overfull warning
+ \setbox\@tempboxa \vbox to\dimen@
+ {\vskip-\maxbalancingoverflow
+ \unvcopy\count@}%
+ \ifnum\badness>\@M
+ \mult@info\@ne
+ {Balanced column more than
+ \the\maxbalancingoverflow\space
+ too large}%
+% \end{macrocode}
+% Fail the balancing attempt:
+% \begin{macrocode}
+ \too@badtrue
+ \else
+% \end{macrocode}
+% Otherwise report that there is a problem but within the accepted
+% boundary.
+% \begin{macrocode}
+ \mult@info\@ne
+ {Balanced column
+ too large, but less than
+ \the\maxbalancingoverflow}%
+ \fi
+ \fi
+ }%
}
% \end{macrocode}
% \end{macro}
%
+%
+% \begin{macro}{\maxbalancingoverflow}
+% Amount that balancing is allowed to overflow the available column
+% space. We default to 12pt which means about one line in most
+% layouts.
+% \changes{v1.8a}{2011/12/20}{\cs{maxbalancingoverflow} parameter added}
+% \begin{macrocode}
+\newdimen\maxbalancingoverflow
+\maxbalancingoverflow=12pt
+% \end{macrocode}
+% \end{macro}
+
% \end{multicols}
%
% \begin{multicols}{2}[\subsection{The box allocations}]
@@ -2998,7 +3226,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+%
%
% \end{multicols}
%
@@ -3275,7 +3503,10 @@
%
%
% \begin{macro}{\remove@discardable@items}
-%
+% There are situations when we may have some space at the end of a
+% column and this macro here will attempt to get rid of it. This
+% will not remove an extremly long sequence of spaces and
+% penalties, but in nearly all cases this will be enough.
% \begin{macrocode}
\def\remove@discardable@items{%
%<*debug>
@@ -3313,6 +3544,8 @@
% \begin{macrocode}
%<*badness>
\newif\iftoo@bad
+\def\too@badtrue{\global\let\iftoo@bad\iftrue}
+\def\too@badfalse{\global\let\iftoo@bad\iffalse}
% \end{macrocode}
%
% \begin{macro}{\c@columnbadness}
@@ -3326,8 +3559,8 @@
\newdimen\last@try
% \end{macrocode}
-%
-% \changes{v1.5z1}{2003/02/17}{Change wrong default for
+%
+% \changes{v1.5z1}{2003/02/17}{Change wrong default for
% \cs{multicolovershoot} to zero (pr/3465).}
% \begin{macrocode}
\newdimen\multicolovershoot
@@ -3356,7 +3589,7 @@
% \end{multicols}
%
%
-% \begin{multicols}{2}[\section{Fixing the
+% \begin{multicols}{2}[\section{Fixing the
% \cs{columnwidth}}]
%
% \begin{macro}{\@footnotetext}
@@ -3367,11 +3600,11 @@
% \changes{v1.5r}{1998/08/17}{Macro removed again.}
% If we store the current column width in |\columnwidth| we have
% to redefine the internal |\@footnotetext| macro to use |\textwidth|
-% for the width of the footnotes rather than using the original
+% for the width of the footnotes rather than using the original
% definition.
%
% Starting with version v1.5r this is now done in a way that the original
-% definition is still used, execpt that locally |\columnwidth| is set to
+% definition is still used, execpt that locally |\columnwidth| is set to
% |\textwidth|.
%
% This solves two problems: first redefinitions of |\@footnotetext|
@@ -3398,7 +3631,7 @@
%
% This is fairly trivial to implement. we just have to disable the
% balancing output routine and replace it by the one that ships out
-% the other pages.
+% the other pages.
%
% \begin{macro}{\multicols*}
% \changes{v1.5q}{1998/01/19}{Macro added}
@@ -3413,7 +3646,7 @@
% \begin{macrocode}
\ifinner
\PackageWarning{multicol}%
- {multicols* inside a box does
+ {multicols* inside a box does
not make sense.\MessageBreak
Going to balance anyway}%
\else
@@ -3447,7 +3680,7 @@
% quite what is desired. On the other hand, using a penalty like -9999
% would mean that there would be occasions where the |\vsplit|ing
% operations within \mc{} would ignore that penalty and still choose a
-% different break point.
+% different break point.
%
% For this reason the current implementation
% uses a completely different approach. In a nutshell it extends the \LaTeX{}
@@ -3460,7 +3693,7 @@
% we do two things: save the galley up to this point in a special box
% for later use and reduce the |\vsize| by the height of the material
% seen. This way the forcing penalty is now hidden in that box and we
-% can restart the collection process for the remaining
+% can restart the collection process for the remaining
% columns. (This is done in |\speci@ls| above.)
%
% In the output routines that do the |\vsplit|ting either for
@@ -3472,7 +3705,7 @@
% \begin{macro}{\columnbreak}
% \changes{v1.5u}{1999/05/25}{Macro added}
% |\columnbreak| is modelled after |\pagebreak| except that we
-% generate a penalty -10005.
+% generate a penalty -10005.
% \begin{macrocode}
%<*colbreak>
\mathchardef\@Mv=10005
@@ -3513,22 +3746,158 @@
%
% \subsection{Supporting right-to-left languages} \label{sec:RL}
%
-%
+%
% \changes{v1.7a}{2010/10/24}{RL language support added}
+% \changes{v1.7b}{2011/12/18}{RL language support fixed}
+%
+% \begin{macro}{\LR@column@boxes}
+% |\LR@column@boxes| is called when we are assembling the columns for left
+% to right typesetting. When we start we are inside an |\hbox| of
+% full width.
+% Left to right typesetting is fairly easy, we basically output
+% each column box intermixed with vertical rules and proper
+% spacing. As this happens inside a box of a defined width the
+% rules and the columns automatically get into the right positions.
+% \begin{macrocode}
+\def\LR@column@boxes{%
+% \end{macrocode}
+% We loop through the columns with |\process@cols|
+% \begin{macrocode}
+ \process@cols\mult@gfirstbox{%
+% \end{macrocode}
+% If the depth of the current box is larger than the maximum found
+% so far in |\dimen2| we update that register for later use.
+% \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
+% \begin{macrocode}
+ \ifdim\dp\count@>\dimen\tw@
+ \global\dimen\tw@\dp\count@ \fi
+% \end{macrocode}
+% If the \texttt{colaction} option is given we write out status
+% information about the current column, otherwise the next command
+% does nothing.
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+% \begin{macrocode}
+ \mc@col@status@write
+% \end{macrocode}
+% The typeset box followed by the column rule material
+% \begin{macrocode}
+ \box\count@
+ \hss{\columnseprulecolor\vrule
+ \@width\columnseprule}\hss}%
+% \end{macrocode}
+% As you will have noticed, we started with box register
+% |\mult@gfirstbox| (i.e.\
+% the left column). So this time |\count@| looped through 2,
+% 4,\ldots\ (plus the appropriate offset).
+% Finally we add box |\mult@rightbox| and we are done.
+% \changes{v1.5a}{1992/11/04}{New box mechanism}
+% \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
+% Again we may have to update |\dimen\tw@|.
+% \begin{macrocode}
+ \ifdim\dp\mult@rightbox>\dimen\tw@
+ \global\dimen\tw@\dp\mult@rightbox \fi
+% \end{macrocode}
+% If the \texttt{colaction} option is given we write out status
+% information about the last column, otherwise the next command
+% does nothing.
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+% \begin{macrocode}
+ \mc@lastcol@status@write
+ \box\mult@rightbox
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\RL@column@boxes}
+% Assembling the boxes for right to left typesetting is far more
+% complicated. When I first tried to build a solution for this my
+% thinking was that all that is necessary to do is to reverse the
+% order of the columns. But such an approach produces a subtle bug:
+% If we work this way then the first column put on the page will be
+% the last column of the text to read. and this means that the
+% order in which \TeX{} executes write statements or assembles mark
+% material will not happen in the order of the textual flow. So if,
+% for example each column contains a section command then these
+% sections will appear in reverse order in the table of content.
+%
+% For this reason some amount of gymnastics is needed to add the
+% columns in their natural flow.
+% \begin{macrocode}
+\def\RL@column@boxes{%
+% \end{macrocode}
+% First step is to put all rules in the right place (without adding
+% the comes which are instead represented by a space of |\hsize|.
+% \begin{macrocode}
+ \process@cols\mult@gfirstbox{%
+ \hskip\hsize
+ \hss{\columnseprulecolor\vrule
+ \@width\columnseprule}\hss
+ }%
+ \hskip\hsize
+% \end{macrocode}
+% At this point in the code our typesetting reference point is at
+% the right end of the rightmost column (or rather where that column
+% should appear).
+%
+% We are now typesetting all columns by first backing up by their
+% width (which is |\hsize|) then typesetting the box and then
+% backing up again, but this time further, i.e., also across the
+% column separation. That will then enable us to typeset the next
+% column using the same approach until we are done with all but the
+% final column.
+% \begin{macrocode}
+ \process@cols\mult@gfirstbox{%
+ \ifdim\dp\count@>\dimen\tw@
+ \global\dimen\tw@\dp\count@ \fi
+ \hskip-\hsize
+% \end{macrocode}
+%
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+% \begin{macrocode}
+ \mc@col@status@write
+ \box\count@
+ \hskip-\hsize
+ \hskip-\columnsep
+ }%
+% \end{macrocode}
+% The approach for the final column is similar only that we do not
+% have to back up over any column gap.
+% \begin{macrocode}
+ \ifdim\dp\mult@rightbox>\dimen\tw@
+ \global\dimen\tw@\dp\mult@rightbox \fi
+ \hskip-\hsize
+% \end{macrocode}
+%
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+% \begin{macrocode}
+ \mc@lastcol@status@write
+ \box\mult@rightbox
+ \hskip-\hsize
+% \end{macrocode}
+% However we do have to move the reference point to its right
+% place: to make the rules appear at the expected places, we should
+% get the typesetting position to the far right again. As we at the
+% moment at the far left we skip to the far right like this:
+% \begin{macrocode}
+ \hskip\full@width
+ }
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\RLmulticolcolumns}
% \begin{macro}{\LRmulticolcolumns}
-% \begin{macro}{\maybe@reverse@columns}
-% Macros to switch between left-right and right-left typesetting. In RL
-% typesetting the |\reverse@column@boxes| is executed prior to typesetting
-% the columns. In LR typesetting this resorting is omitted as the boxes are
-% already in the right order.
+% \begin{macro}{\mc@align@columns}
+% Macros to switch between left-right and right-left typesetting. In LR
+% typesetting the |\LR@column@boxes| is used to combine
+% the columns. When typesetting right to left the |\RL@column@boxes|
+% is used instead.
% \begin{macrocode}
\newcommand\RLmulticolcolumns
- {\let\maybe@reverse@columns
- \reverse@column@boxes}
+ {\let\mc@align@columns
+ \RL@column@boxes}
\newcommand\LRmulticolcolumns
- {\let\maybe@reverse@columns\relax}
+ {\let\mc@align@columns
+ \LR@column@boxes}
% \end{macrocode}
% The default is left-to-right:
% \begin{macrocode}
@@ -3537,110 +3906,175 @@
% \end{macro}
% \end{macro}
% \end{macro}
-
-
-% \begin{macro}{\multicol@sort@counter}
-% We need a counter to resort the column boxes if we are typesetting
-% right-to-left.
+%
+%
+% \subsection{Supporting \texttt{\textbackslash docolaction}}
+%
+% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
+%
+% Whenever we want to do something that depends on the current
+% column we execute \verb=\docolaction=. This command takes one
+% optional and three mandatory arguments. The mandatory ones denote
+% what to do if this is a ``left'', ``middle'', or ``right'' column
+% and the optional one is simply there to say what to do if we don't
+% know (default is to use the ``left'' column action in that case).
+%
+% \begin{macro}{\mc@col@check@num}
+% We use one counter \verb=\mc@col@check@num= to generate us unique
+% label names. Each time we execute \verb=\docolaction= we increment
+% this counter to get a new name.
% \begin{macrocode}
-\newcount\multicol@sort@counter
+\newcount\mc@col@check@num
% \end{macrocode}
% \end{macro}
+%
+% The generated ``labels'' are named
+%\begin{verbatim}
+%\mc@col-\the\mc@col@check@num
+%\end{verbatim}
+% and they hold as values the
+% numbers 1, 2, or 3 denoting the current column type.
-
-% \begin{macro}{\reverse@column@boxes}
-% This macro is called to re-sort the assembled column boxes when we are
-% typesetting right-to-left. The first step is to reverse the columns.
+% \begin{macro}{\docolaction}
+%
% \begin{macrocode}
-\def\reverse@column@boxes {%
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{reversing columns ...}
+\newcommand\docolaction[4][1]{%
+ \ifx\mc@col@status@write\relax
+ \PackageError{multicol}%
+ {Option 'colaction' not selected}%
+ {\string\docolaction\space
+ requires the use of the 'colaction'
+ option on the package}%
+ \fi
+ \global\advance\mc@col@check@num\@ne
+ \edef\mc@col@type{\expandafter\ifx
+ \csname mc@col-\the\mc@col@check@num
+ \endcsname\relax
+ 0\else
+ \csname mc@col-\the\mc@col@check@num
+ \endcsname
+ \fi}%
+% \end{macrocode}
+% We prefix with 0 so that an unknown label (that returns
+% \verb=\relax=) will result in case 0
+% \begin{macrocode}
+ \ifcase \mc@col@type\relax
+% \end{macrocode}
+% If column is unknown we use the default action or the action
+% denoted by the optional argument (so that arg can take the value
+% 1, 2, 3).
+% \begin{macrocode}
+ \ifcase #1\or #2\or#3\or#4\fi
+ \or
+% \end{macrocode}
+% Otherwise we know (or think we know) that this is a first, middle,
+% or last column:
+% \begin{macrocode}
+ #2% % 1 First col
+ \or
+ #3% % 2 any middle col
+ \or
+ #4% % 3 last col
+ \else
+ \ERROR
\fi
% \end{macrocode}
-% The columns are at this point in the boxes with register numbers
-% |\mult@gfirstbox|, $|\mult@gfirstbox|+2$, \ldots{} but the last column
-% is in |\mult@rightbox| which is equal to $|\mult@gfirstbox|-2$.
-%
-% So to re-sort we use |\process@cols| with |\count@| starting at
-% |\mult@gfirstbox| and incrementing by 2 and |\multicol@sort@counter|
-% starting at the high end of the now unused intermediate boxes and
-% decrementing by 2.
-% \begin{macrocode}
- \multicol@sort@counter\doublecol@number
- \advance\multicol@sort@counter\m@ne
- \process@cols\mult@gfirstbox{%
- \setbox\multicol@sort@counter
- \box\count@
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{Setting
- \the\multicol@sort@counter\space
- <- \the\count@}%
- \fi
- \advance \multicol@sort@counter -\tw@
- }%
-% \end{macrocode}
-% For example with 4 columns we would see something like
-% this:
-% What remains to do is to move the last box out of the way:
+% But how does the column number get associated with our label? We
+% do do this by writing another line into the aux file at this point:
% \begin{macrocode}
+ \edef\next{\write\@auxout
+ {\string\mc@set@col@status
+ {mc@col-\the\mc@col@check@num}%
+ {\mc@col@type}}}%
+ \next
+}
+% \end{macrocode}
+% \end{macro}
%
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{Setting last:
- \the\mult@grightbox\space
- <- \the\mult@rightbox}%
- \fi
- \setbox \mult@grightbox \box\mult@rightbox
+% Because of extra data writing to the aux file the aux file will
+% now contain something like the following after the document is
+% processed the first time:
+%\begin{verbatim}
+%\relax
+%\mc@col@status{1}
+%\mc@set@col@status{lcol-1}{0}
+%\mc@col@status{2}
+%\mc@set@col@status{lcol-2}{0}
+%\mc@col@status{3}
+%\mc@set@col@status{lcol-3}{0}
+%\mc@col@status{1}
+%\mc@col@status{2}
+%\mc@col@status{3}
+%\mc@set@col@status{lcol-4}{0}
+%\end{verbatim}
+% The \verb=\mc@col@status= line denotes the column type and has been
+% writting out just before corresponding the column box was placed
+% onto the page.
+% The\verb=\mc@set@col@status= lines have been written out as part
+% of shipping the column boxes out, e.g.,
+% \verb=\mc@set@col@status{lcol-1}{0}= was therefore somewhere within
+% the first column as it appears between \verb=\mc@col@status{1}=
+% and \verb=\mc@col@status{2}=
+% The second argument in that line is the value used in the previous
+% run (or zero if there was no previous run. We can use this to
+% determine if a rerun is necessary.
+%
+% Thus with this knowledge we can set things up to get the labels
+% working.
+%
+%
+% \begin{macro}{\mc@col@status}
+%
+% When the aux file is read in \verb=\mc@col@status= is used to set
+% \verb=\mc@curr@col@status=:
+% \begin{macrocode}
+\def\mc@col@status#1{%
+ \gdef\mc@curr@col@status{#1}}
% \end{macrocode}
-% Now the boxes are more or less resorted but the register numbers are off
-% by one, so we shift the boxes again using |\process@cols|. This time
-% |\multicol@sort@counter| trails one behind |\count@|.
+% \end{macro}
+%
+%
+%
+% \begin{macro}{\mc@set@col@status}
+%
+% And when \verb=\mc@set@col@status= is executed we can simply set
+% up the label by associating it with the \verb=\mc@curr@col@status=
+% and ignore the second argument:
% \begin{macrocode}
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{shifting ...}
- \fi
- \multicol@sort@counter\mult@gfirstbox
- \advance\multicol@sort@counter \m@ne
- \process@cols\mult@gfirstbox{%
- \global\setbox\count@
- \box\multicol@sort@counter
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{Setting \the\count@\space
- <- \the\multicol@sort@counter}%
- \fi
- \advance \multicol@sort@counter \tw@
- }%
-% \end{macrocode}
-% With 4 columns this would do the following register moves:
-% \begin{verbatim}
-% Setting 31 <- 30
-% Setting 33 <- 32
-% Setting 35 <- 34
-% \end{verbatim}
-% Now all columns except the last one are in the right place. That one is
-% now in highest register we used which corresponds to
-% $|\doublecol@number|-1$ if you look back to the first loop. And it has to
-% move to |\mult@rightbox| which happens in the following code.
-% \begin{macrocode}
- \multicol@sort@counter\doublecol@number
- \advance\multicol@sort@counter\m@ne
- \ifnum\c@tracingmulticols>\thr@@
- \typeout{Setting last:
- \the\mult@rightbox\space
- <- \the\multicol@sort@counter}%
- \fi
- \global\setbox \mult@rightbox
- \box\multicol@sort@counter
+\def\mc@set@col@status#1#2{%
+ \global\expandafter\let\csname #1\endcsname
+ \mc@curr@col@status}
% \end{macrocode}
-% After that the columns are in the same boxes as before but sorted the
-% other way around and thus can be processed without further adjustments by
-% the normal multicol code.
+% The above definition is being used when the \texttt{.aux} file is
+% read in at the beginning. At the end we need a different
+% definition to test if another typesetting run is needed. There we
+% compare the value used in the current run (stored in the second
+% argument) with the value used on the next run. If those two values
+% differ we set \verb=@tempswa= to false which will trigger the
+% ``Label(s) may have changed'' warning.
% \begin{macrocode}
+\AtEndDocument{\def\mc@set@col@status#1#2{%
+ \ifnum #2=\mc@curr@col@status\else
+ \@tempswatrue
+ \fi}%
}
% \end{macrocode}
% \end{macro}
%
+%
+% \begin{macro}{mc@firstcol}
+% Finally, as part of determining in which column we are, we used a
+% switch inside |\mc@col@status@write| to determine if we are in the
+% first column or not.
+% \begin{macrocode}
+\newif\ifmc@firstcol
+\mc@firstcoltrue
+% \end{macrocode}
+% \end{macro}
% \end{multicols*}
%
% \Finale
%
\endinput
+
+
diff --git a/Master/texmf-dist/source/latex/tools/multicol.ins b/Master/texmf-dist/source/latex/tools/multicol.ins
new file mode 100644
index 00000000000..d1bb5709742
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/multicol.ins
@@ -0,0 +1,70 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+
+\generateFile{multicol.sty}{t}{%
+ \from{multicol.dtx}{package,badness,check,marktrace,nobalance,colbreak}}
+
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index fa1c839c592..579d5d1122d 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \title{The \textsf{rawfonts} package}
% \date{v0.01}
@@ -29,13 +29,13 @@
%
% \section*{Overview}
%
-% The |rawfonts| \LaTeXe{} package is used to provide emulation
-% of \LaTeX~2.09 documents which used low-level commands such as
+% The |rawfonts| \LaTeXe{} package is used to provide emulation
+% of \LaTeX~2.09 documents which used low-level commands such as
% |\tenrm|. If you say:
% \begin{verbatim}
% \usepackage{rawfonts}
% \end{verbatim}
-% then over sixty fonts such as |\tenrm| will be loaded into \LaTeX.
+% then over sixty fonts such as |\tenrm| will be loaded into \LaTeX.
% This has a large overhead, for example this document uses:
% \begin{verbatim}
% 8221 words of font info for 30 fonts
@@ -44,17 +44,17 @@
% \begin{verbatim}
% 19294 words of font info for 73 fonts
% \end{verbatim}
-% That is |rawfonts| can cause your document to load twice as many
-% fonts. (This overhead is why \LaTeXe{} does not define |\tenrm| and
+% That is |rawfonts| can cause your document to load twice as many
+% fonts. (This overhead is why \LaTeXe{} does not define |\tenrm| and
% friends by default.)
%
-% If you want to only load a small
-% number of fonts, you can use the |only|
+% If you want to only load a small
+% number of fonts, you can use the |only|
% option, for example to only load |\tenrm| and |\tensf|:
% \begin{verbatim}
% \usepackage[only,tenrm,tensf]{rawfonts}
% \end{verbatim}
-% The |rawfonts| package is intended mainly for use with \LaTeX~2.09
+% The |rawfonts| package is intended mainly for use with \LaTeX~2.09
% documents, and you might want to have the package loaded every time
% you use \LaTeXe{} in compatibility mode. In this case, you should add
% the line:
@@ -87,7 +87,7 @@
% \begin{macrocode}
\RequirePackage{somedefs}
% \end{macrocode}
-% By default, all the fonts are loaded, but the |only| option says
+% By default, all the fonts are loaded, but the |only| option says
% that only the ones specified as options should be.
% \begin{macrocode}
\UseAllDefinitions
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index 4e55633b15d..8419ba1c98b 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -1,28 +1,28 @@
% \iffalse meta-comment
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009
+% 2006 2008 2009 2011
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006-2007 David Carlisle, LaTeX3 Project
+%% File: showkeys.dtx Copyright (C) 2006-2014 David Carlisle, LaTeX3 Project
%
%<*dtx>
\ProvidesFile{showkeys.dtx}
@@ -32,7 +32,7 @@
%<driver> \ProvidesFile{showkeys.drv}
% \fi
% \ProvidesFile{showkeys.dtx}
- [2007/08/07 v3.15 Show cite and label keys (DPC, MH)]
+ [2014/04/24 v3.17 Show cite and label keys (DPC, MH)]
%
% \iffalse
%<*driver>
@@ -58,7 +58,7 @@
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \CheckSum{596}
+% \CheckSum{595}
%
%
% \changes{v1.01}{1992/08/25}{Initial version}
@@ -111,7 +111,7 @@
% \end{description}
% The colours may be changed by redefining the following two colours
% after the package is loaded.
-% |refkey| (also used for |\cite|) and
+% |refkey| (also used for |\cite|) and
% |labelkey| (also used for |\bibitem|).
% The defaults are:
%\begin{verbatim}
@@ -442,7 +442,7 @@
% skip. (This may slightly move the surrounding text (but perhaps not
% now that |\prevdepth| is restored.)
% \changes{v3.00}{1994/09/07}
-% {Back up over a previous skip because of the new
+% {Back up over a previous skip because of the new
% \cs{belowcaptionskip}}
% \changes{v3.04}{1995/10/30}
% {\cs{advance} added, to total two successive skips.}
@@ -517,8 +517,8 @@
\vadjust{\llap{\SK@lab\kern\marginparsep}}%
\fi
\SK@lab@relax
- \fi
- \fi
+ \fi
+ \fi
\fi}
% \end{macrocode}
% \end{macro}
@@ -732,7 +732,7 @@
\csname\@tempa\space\endcsname}%
\expandafter\def\expandafter#1\expandafter{%
\expandafter\protect\csname\@tempa\space\endcsname}%
- \expandafter\def\csname\@tempa\space\endcsname}
+ \expandafter\def\csname\@tempa\space\endcsname}
% \end{macrocode}
% \end{macro}
%
@@ -788,7 +788,7 @@
\leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%
\def\vr@f#1{%
\leavevmode\unskip\vref@space
- \ref{#1}%
+ \ref{#1}%
\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
\vpageref[\unskip]{#1}}%
}{}}
@@ -800,7 +800,7 @@
% \end{macro}
% \end{macro}
%
-% Now redefine |\cite| unless \texttt{notcite} option given.
+% Now redefine |\cite| unless \texttt{notcite} option given.
% \begin{macrocode}
\ifx\SK@cite\@empty
% \end{macrocode}
@@ -832,13 +832,15 @@
% {Add \cs{citefullauthor}}
% \changes{v3.12}{1997/06/12}
% {Support cite package. tools/2490}
+% \changes{v3.17}{2014/04/24}
+% {rededine \cs{@citex} rather than \cs{cite} for tools/4162}
%
% If \textsf{cite} or \textsf{overcite} is being used, redefine |\citen|
% rather than |\cite| so as not to spoil the space and punctuation
% calculations done by those packages.
% \begin{macrocode}
\ifx\citen\@undefined
- \SK@def\cite#1#{\SK@citea{#1}}%
+ \SK@def\@citex[#1]#2{\SK@citex[{#1}]{#2}}%
\else
\SK@def\citen#1{\SK@\SK@@ref{#1}\SK@citen{#1}}%
\fi
@@ -865,9 +867,11 @@
\fi}
% \end{macrocode}
%
+% \changes{v3.17}{2014/04/24}
+% {Change name, rededine \cs{@citex} rather than \cs{cite} for tools/4162}
% \begin{macrocode}
-\def\SK@citea#1#2{%
- \SK@\SK@@ref{#2}\SK@cite#1{#2}}
+\def\SK@citex[#1]#2{%
+ \SK@\SK@@ref{#2}\SK@@citex[{#1}]{#2}}
% \end{macrocode}
%
% \begin{macrocode}
@@ -877,14 +881,15 @@
%
% \begin{macro}{\SK@@ref}
% This is much simpler than the printing of the label, as we know
-% that we can be in horizontal mode. We temporarily set the switch
-% \cs{if@inlabel} false in order to avoid problems with the pdf\TeX\
-% color driver.
-% \changes{v3.14}{2006/09/25}
+% that we can be in horizontal mode.
+% Note extra group for colour safety.
+% \changes{v3.14}{2006/09/25}
% {Add fix for pdf\TeX.}
+% \changes{v3.16}{2011/11/24}
+% {revert change made at v3.14 because of tools/4173}
% \begin{macrocode}
\def\SK@@ref#1>#2\SK@{%
- {\@inlabelfalse\leavevmode\vbox to\z@{%
+ \leavevmode\vbox to\z@{{%
\vss
\SK@refcolor
\rlap{\vrule\raise .75em%
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index bf00286e678..f611912d0bc 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \title{The \textsf{somedefs} toolkit package}
% \date{long time ago in a different century\ldots}
@@ -35,14 +35,14 @@
%
% \section*{Overview}
%
-% This is an example `programmers toolkit' package, for use by package
-% writers. It allows package writers to provide options which switch
-% definitions on and off. For example, a package |fred| might define a
+% This is an example `programmers toolkit' package, for use by package
+% writers. It allows package writers to provide options which switch
+% definitions on and off. For example, a package |fred| might define a
% large number of commands, including |\foo| and |\baz|, so:
% \begin{verbatim}
% \usepackage{fred}
% \end{verbatim}
-% would use a lot of memory, even if |\foo| and |\baz| were the only
+% would use a lot of memory, even if |\foo| and |\baz| were the only
% commands needed. However, if the author of |fred| used the |somedefs|
% package, then the user would be able to say:
% \begin{verbatim}
@@ -57,13 +57,13 @@
% \end{verbatim}
% You can then use four new commands:
% \begin{flushleft}\begin{itemize}
-% \item |\UseAllDefinitions| which says that all the commands in the
-% file should be defined.
-% \item |\UseSomeDefinitions| which says that only the commands
+% \item |\UseAllDefinitions| which says that all the commands in the
+% file should be defined.
+% \item |\UseSomeDefinitions| which says that only the commands
% specified by |\UseDefinition| should be defined.
-% \item |\UseDefinition{|\meta{name}|}| which says that the command
+% \item |\UseDefinition{|\meta{name}|}| which says that the command
% |\name| should be defined.
-% \item |\ProvidesDefinition{|\meta{definition}|}| which provides one
+% \item |\ProvidesDefinition{|\meta{definition}|}| which provides one
% definition, of the form |\definingcommand{\command}...|
% \end{itemize}\end{flushleft}
% For example, the package |fred| could say:
@@ -76,9 +76,9 @@
% \ProvidesDefinition{\newcommand{\foo}{...}}
% \ProvidesDefinition{\newcommand{\baz}{...}}
% \end{verbatim}
-% One of the commands |\UseAllDefinitions| or |\UseSomeDefinitions|
-% should always be used. You may have some commands which need other
-% commands, in which case you have to declare the options by hand. For
+% One of the commands |\UseAllDefinitions| or |\UseSomeDefinitions|
+% should always be used. You may have some commands which need other
+% commands, in which case you have to declare the options by hand. For
% example, if the command |\bar| needs the command |\foo|, you could
% say:
% \begin{verbatim}
@@ -113,13 +113,13 @@
% \begin{macro}{\@providesdefinition}
% \begin{macro}{\@provides@definition}
% \begin{macro}{\@unprovided@definition}
-% The package works by having |\UseDefinition{|\meta{name}|}| define
-% |\name| to be |\@unprovided@definition|.
-% If |\UseSomeDefinitions| has been called,
-% then |\ProvidesDefinition| looks to see if |\name|
-% is |\@unprovided@definition|. If
-% |\UseAllDefinitions| has been called, then |\ProvidesDefinition|
-% does nothing. If neither has been called, then
+% The package works by having |\UseDefinition{|\meta{name}|}| define
+% |\name| to be |\@unprovided@definition|.
+% If |\UseSomeDefinitions| has been called,
+% then |\ProvidesDefinition| looks to see if |\name|
+% is |\@unprovided@definition|. If
+% |\UseAllDefinitions| has been called, then |\ProvidesDefinition|
+% does nothing. If neither has been called, then
% |\ProvidesDefinition| produces an error message.
% \begin{macrocode}
\def\UseSomeDefinitions{%
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index 70272ef32e0..960a8345958 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -1,27 +1,27 @@
% \iffalse meta-comment
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009
+% 2006 2008 2009 2014
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
-%% File: tabularx.dtx Copyright (C) 1991-1999 David Carlisle
+%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 David Carlisle
%
%<*dtx>
\ProvidesFile{tabularx.dtx}
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{tabularx.drv}
% \fi
% \ProvidesFile{tabularx.dtx}
- [1999/01/07 v2.07 `tabularx' package (DPC)]
+ [2014/04/22 v2.09 `tabularx' package (DPC)]
% \iffalse
%<*driver>
\documentclass{ltxdoc}
@@ -66,7 +66,7 @@
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
%
-% \CheckSum{456}
+% \CheckSum{500}
%
% \GetFileInfo{tabularx.dtx}
% \title{The \textsf{tabularx} package\thanks{This file
@@ -249,8 +249,8 @@
% \subsection{If the algorithm fails\ldots}
% It may be that the widths of the `normal' columns of the table
% already total more than the requested total
-% width. \textsf{tabularx} refuses to set the
-% \texttt{X} columns to a negative width, so in this case you get a
+% width. \textsf{tabularx} refuses to set the
+% \texttt{X} columns to a negative width, so in this case you get a
% warning ``X Columns too narrow (table too wide)''.
%
% The \texttt{X} columns will in this case be set to a width of 1em
@@ -330,8 +330,10 @@
%\end{verbatim}
% The scanner now looks for the end of the current environment ("foo" in
% this example.) There are some restrictions on this usage, the
-% principal one being that "\endtabularx" is the \emph{first} token of
-% the `end code' of the environment.
+% principal one being that "\endtabularx" must not be inside any "{ }" pairs
+% ao that the code before "\endtabularx" may be extracted and added to the table body
+% (prior to version 2.09 "\endtabularx" had to be
+% the \emph{first} token of the `end code' of the environment).
% \begin{macrocode}
\def\tabularx#1{%
% \end{macrocode}
@@ -387,6 +389,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\TX@find@endtabularxa}
+% \changes{v2.09}{2014/04/22}{macro added}
+% split up the end code, and extract the part that lives in the table body.
+% \begin{macrocode}
+\long\def\TX@find@endtabularxa#1\endtabularx#2\TX@find@endtabularxa{%
+ \toks@\expandafter{\the\toks@#1}}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\TX@find@endtabularxa}
+% \changes{v2.09}{2014/04/22}{macro added}
+% split up the end code, and extract the part that lives outside the table body.
+% \begin{macrocode}
+\long\def\TX@find@endtabularxb#1\endtabularx#2\TX@find@endtabularxb{#2}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\TX@}
% The string {\ttfamily tabularx} as a macro for testing with "\ifx".
% \begin{macrocode}
@@ -415,6 +433,11 @@
% \begin{macrocode}
\def\TX@endtabularx{%
% \end{macrocode}
+% \changes{v2.09}{2014/04/22}{call to \cs{TX@find@endtabularxa} added}
+% \begin{macrocode}
+ \expandafter\expandafter\expandafter
+ \TX@find@endtabularxa\csname end\TX@\endcsname\TX@find@endtabularxa
+% \end{macrocode}
% Define the {\ttfamily X} column, with an internal version of the
% "\newcolumntype" command. The "\expandafter" commands enable
% "\NC@newcol" to get the {\em expansion} of\\
@@ -504,7 +527,11 @@
% the macro "\tabularx".
% \begin{macrocode}
\ifnum0=`{\fi}%
- \expandafter\end\expandafter{\TX@}}
+% \end{macrocode}
+% \changes{v2.09}{2014/04/22}{call to \cs{TX@find@endtabularxb} added}
+% \begin{macrocode}
+ \expandafter\TX@find@endtabularxb\romannumeral-`X%
+ \expandafter\end\expandafter{\TX@}\TX@find@endtabularxb}
% \end{macrocode}
% \end{macro}
%
@@ -515,6 +542,15 @@
% \begin{macrocode}
\def\TX@arith{%
\TX@false
+% \end{macrocode}
+% \changes{v2.08}{2012/02/06}{Avoid exceeding maxdimen during trials}
+% \begin{macrocode}
+ \@tempdimb\maxdimen
+ \divide\@tempdimb\TX@cols
+ \ifdim\TX@col@width>\@tempdimb
+ \TX@typeout@{Don't exceed \maxdimen}%
+ \wd\@tempboxa\maxdimen
+ \fi
\ifdim\TX@old@table=\wd\@tempboxa
% \end{macrocode}
% If we have reduced the column width, but the table width has not
@@ -556,7 +592,7 @@
%
% Prior to v2.03, if the loop was aborted here, the X columns were left
% with the width of the previous run, but this may make the table far
-% too wide as initial guesses are always too big. Now force to
+% too wide as initial guesses are always too big. Now force to
% "\TX@error@width" which defaults to be 1em. If you want to
% get the old behaviour stick\\
% "\renewcommand\TX@error@width{\TX@col@width}"\\
@@ -702,8 +738,11 @@
%
% \begin{macro}{\arraybackslash}
% "\\" hack.
+% \changes{v2.08}{2012/02/06}{Dont define this if already defined by newer array package and use tabularnewline now this is in 2e.}
% \begin{macrocode}
-\def\arraybackslash{\let\\\@arraycr}
+\ifx\arraybackslash\@undefined
+\def\arraybackslash{\let\\\tabularnewline}
+\fi
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.ins b/Master/texmf-dist/source/latex/tools/tabularx.ins
new file mode 100644
index 00000000000..b5d0515cd6f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/tabularx.ins
@@ -0,0 +1,67 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+\generate{\file{tabularx.sty}{\from{tabularx.dtx}{package}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index 285aae6b632..d2a27596562 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% \CheckSum{467}
@@ -37,7 +37,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-%%
+%%
%
%
\def\FMithmInfo{1995/11/23 v2.2c Theorem extension package (FMi)}
@@ -161,7 +161,7 @@
% into general use:
% \begin{enumerate}
% \item The number of the theorem is shown in the margin.
-% \item There is a line break at
+% \item There is a line break at
% the end of the theorem header.
% \end{enumerate}
%
@@ -191,7 +191,7 @@
% \item[\ttfamily \bslash newtheorem\{foo2\}{[foo]}\{bar2\}]
% The theorem set {\envfont foo2} (printed name \texttt{bar2})
% uses the same counter as the theorem set \texttt{foo}.
-% \item[\ttfamily \bslash newtheorem\{foo3\}\{bar3\}{[section]}]
+% \item[\ttfamily \bslash newtheorem\{foo3\}\{bar3\}{[section]}]
% The theorem set {\envfont foo3} (printed name \texttt{bar3}) is
% enumerated within the counter \texttt{section}, i.e.\ with every
% new |\section| the enumeration begins again with 1, and
@@ -272,7 +272,7 @@
% The theorem number is set in the margin, and there is a line
% break as in \texttt{break}.
% \item[changebreak]
-% Like \texttt{break}, but with header number and text
+% Like \texttt{break}, but with header number and text
% interchanged.
% \item[change]
% Header number and text are interchanged, without a line break.
@@ -281,7 +281,7 @@
% \end{deflist}
% All styles (except \texttt{plain}) select |\slshape| as the default
% |\theorembodyfont|.
-%
+%
%
% \subsection{Examples}
%
@@ -350,7 +350,7 @@
% help of Christina Busse (translating the manuscript into English),
% Joachim Pense (playing the r\^ole of typist), Chris Rowley
% (looking everything over) and many others providing useful
-% suggestions.
+% suggestions.
%
% \StopEventually{%
% \begin{thebibliography}{9}
@@ -360,12 +360,12 @@
% \newblock
% Addison-Wesley, Reading, Massachusetts, 1994.
% \bibitem{latex:source} \textsc{Lamport, Leslie.} \newblock
-% \texttt{latex.tex}, version 2.09, date
-% Feb. 1990.
+% \texttt{latex.tex}, version 2.09, date
+% Feb. 1990.
% \end{thebibliography}
% \PrintIndex
% \PrintChanges}
-%
+%
%
% \section{The documentation driver file}
%
@@ -517,7 +517,7 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
%
% \begin{macro}{\theoremheaderfont}
% \changes{v2.0g}{89/09/19}{Macro added.}
@@ -534,7 +534,7 @@
only once.}}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\theorem@headerfont}
% \changes{v2.0g}{89/09/19}{Macro added.}
% To set the |\theorem@headerfont| default we first test if
@@ -549,7 +549,7 @@
% \begin{macrocode}
\gdef\theorem@headerfont{\bfseries}
% \end{macrocode}
-% Otherwise we reset the current shape before calling |\bfseries|.
+% Otherwise we reset the current shape before calling |\bfseries|.
% \begin{macrocode}
\else \gdef\theorem@headerfont{\normalfont\bfseries}\fi
% \end{macrocode}
@@ -838,7 +838,7 @@
%
%
% \subsection{Definition of the theorem substyles}
-%
+%
% As already pointed out, the theorem substyles, defined below, are
% only loaded when necessary. Note that all these substyles, except
% \texttt{plain}, have |\slshape| as the default body font.
@@ -908,7 +908,7 @@
% \end{macro}
% \end{macro}
%
-% \noindent
+% \noindent
% We conclude with an |\endgroup| to restore the
% |\catcode| of |@|.
% \begin{macrocode}
@@ -1070,7 +1070,7 @@
%
% \subsubsection{The \texttt{margin} style}
%
-% This style option is stored in the file |thm.sty|.
+% This style option is stored in the file |thm.sty|.
% \begin{macrocode}
%<*thm>
\begingroup \makeatletter
@@ -1101,7 +1101,7 @@
% \begin{macro}{\theorempreskipamount}
% \begin{macro}{\theorempostskipamount}
% The \textsf{skip} parameters that regulate the vertical empty space
-% before and after the {\envfont theorem} environment have
+% before and after the {\envfont theorem} environment have
% to be allocated as well.
% \changes{v2.0f}{89/07/20}{Unnecessary `global' removed.}
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins
index 291e49316af..0ef92ae22a5 100644
--- a/Master/texmf-dist/source/latex/tools/tools.ins
+++ b/Master/texmf-dist/source/latex/tools/tools.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -41,10 +41,9 @@
This is a generated file.
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-2006 2008 2009
+Copyright 1993-2014
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -54,7 +53,7 @@ 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
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -72,23 +71,21 @@ given in the file `manifest.txt'.
\SimplePackage{delarray}
-\SimplePackage{tabularx}
+\batchinput{tabularx.ins}
\SimplePackage{dcolumn}
\SimplePackage{hhline}
-\SimplePackage{longtable}
+\batchinput{longtable.ins}
% Multicolumn
%%%%%%%%%%%%%
-\generate{\file{multicol.sty}{%
- \from{multicol.dtx}{package,badness,check,marktrace,nobalance,colbreak}}}
-
+\batchinput{multicol.ins}
% Bold Math Symbols
%%%%%%%%%%%%%%%%%%%
-\SimplePackage{bm}
+\batchinput{bm.ins}
% Footnote Right
%%%%%%%%%%%%%%%
@@ -113,7 +110,7 @@ given in the file `manifest.txt'.
% Smart Page references
%%%%%%%%%%%%%%%%%%%%%%%
-\SimplePackage{varioref}
+\batchinput{varioref.ins}
% External references
%%%%%%%%%%%%%%%%%%%%%
@@ -144,8 +141,7 @@ given in the file `manifest.txt'.
% After Page Package
%%%%%%%%%%%%%%%%%%%%
-\SimplePackage{afterpage}
-
+\batchinput{afterpage.ins}
% Enumerate Package
%%%%%%%%%%%%%%%%%%%%
@@ -162,7 +158,7 @@ given in the file `manifest.txt'.
\SimplePackage{layout}
-% Infix Arithmetic
+% Infix Arithmetic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\SimplePackage{calc}
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index 3d5f040f211..172c6d7a461 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -1,30 +1,29 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009
+% Copyright 1993-2014
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%%
%% $Id: trace.dtx 5291 2003-06-29 14:44:49Z mittelba $
%%
-%% (C) Copyright 1999-2001 Frank Mittelbach
+%% (C) Copyright 1999-2014 Frank Mittelbach
%% All rights reserved.
%%
%<*dtx>
@@ -35,7 +34,7 @@
%<driver>\ProvidesFile{trace.drv}
% \fi
% \ProvidesFile{trace.dtx}
- [2003/04/30 v1.1c trace LaTeX code]
+ [2014/04/21 v1.1d trace LaTeX code]
%
% \iffalse
%<*driver>
@@ -112,31 +111,31 @@
% \fontshape\updefault
% \footnotesize}%
%\begin{verbatim}
-% \setlength ->\protect \setlength
+% \setlength ->\protect \setlength
% {\relax}
-%
-% \setlength ->\calc@assign@skip
-%
-% \calc@assign@skip ->\calc@assign@generic \calc@Askip \calc@Bskip
-%
+%
+% \setlength ->\calc@assign@skip
+%
+% \calc@assign@skip ->\calc@assign@generic \calc@Askip \calc@Bskip
+%
% \calc@assign@generic #1#2#3#4->\let \calc@A #1\let \calc@B #2\expandafter \calc
-% @open \expandafter (#4!\global \calc@A \calc@B \endgroup #3\calc@B
-% #1<-\calc@Askip
-% #2<-\calc@Bskip
-% #3<-\linewidth
+% @open \expandafter (#4!\global \calc@A \calc@B \endgroup #3\calc@B
+% #1<-\calc@Askip
+% #2<-\calc@Bskip
+% #3<-\linewidth
% #4<-1cm
% {\let}
% {\let}
% {\expandafter}
% {\expandafter}
-%
+%
% \calc@open (->\begingroup \aftergroup \calc@initB \begingroup \aftergroup \calc
-% @initB \calc@pre@scan
+% @initB \calc@pre@scan
% {\begingroup}
% {\aftergroup}
% {\begingroup}
% {\aftergroup}
-%
+%
% \calc@pre@scan #1->\ifx (#1\expandafter \calc@open \else \ifx \widthof #1\expan
% dafter \expandafter \expandafter \calc@textsize \else \calc@numeric \fi \fi #1
% #1<-1
@@ -144,18 +143,18 @@
% {false}
% {\ifx}
% {false}
-%
-% \calc@numeric ->\afterassignment \calc@post@scan \global \calc@A
+%
+% \calc@numeric ->\afterassignment \calc@post@scan \global \calc@A
% {\afterassignment}
% {\global}
% {\fi}
% {\fi}
-%
+%
% \calc@post@scan #1->\ifx #1!\let \calc@next \endgroup \else \ifx #1+\let \calc@
-% next \calc@add \else \ifx #1-\let \calc@next \calc@subtract \else \ifx #1*\let
+% next \calc@add \else \ifx #1-\let \calc@next \calc@subtract \else \ifx #1*\let
% \calc@next \calc@multiplyx \else \ifx #1/\let \calc@next \calc@dividex \else \i
% fx #1)\let \calc@next \calc@close \else \calc@error #1\fi \fi \fi \fi \fi \fi \
-% calc@next
+% calc@next
% #1<-!
% {\ifx}
% {true}
@@ -163,14 +162,14 @@
% {\else}
% {\endgroup}
% {restoring \calc@next=undefined}
-%
-% \calc@initB ->\calc@B \calc@A
+%
+% \calc@initB ->\calc@B \calc@A
% {\skip44}
% {\global}
% {\endgroup}
% {restoring \skip44=0.0pt}
-%
-% \calc@initB ->\calc@B \calc@A
+%
+% \calc@initB ->\calc@B \calc@A
% {\skip44}
% {\dimen27}
%\end{verbatim}
@@ -185,35 +184,35 @@
% slightly, the above tracing output can be reduced to:
%
%\begin{verbatim}
-% \setlength ->\protect \setlength
+% \setlength ->\protect \setlength
% {\relax}
-%
-% \setlength ->\calc@assign@skip
-%
-% \calc@assign@skip ->\calc@assign@generic \calc@Askip \calc@Bskip
-%
+%
+% \setlength ->\calc@assign@skip
+%
+% \calc@assign@skip ->\calc@assign@generic \calc@Askip \calc@Bskip
+%
% \calc@assign@generic #1#2#3#4->\let \calc@A #1\let \calc@B #2\expandafter \calc
-% @open \expandafter (#4!\global \calc@A \calc@B \endgroup #3\calc@B
-% #1<-\calc@Askip
-% #2<-\calc@Bskip
-% #3<-\linewidth
+% @open \expandafter (#4!\global \calc@A \calc@B \endgroup #3\calc@B
+% #1<-\calc@Askip
+% #2<-\calc@Bskip
+% #3<-\linewidth
% #4<-1cm
% {\let}
% {\let}
% {\expandafter}
% {\expandafter}
-%
+%
% \calc@open (->\begingroup \conditionally@traceoff \aftergroup \calc@initB \begi
-% ngroup \aftergroup \calc@initB \calc@pre@scan
+% ngroup \aftergroup \calc@initB \calc@pre@scan
% {\begingroup}
%
% \conditionally@traceoff ->\tracingrestores \z@ \tracingcommands \z@ \tracingpag
-% es \z@ \tracingmacros \z@ \tracingparagraphs \z@
+% es \z@ \tracingmacros \z@ \tracingparagraphs \z@
% {\tracingrestores}
% {\tracingcommands}
% {restoring \tracingrestores=1}
-%
-% \calc@initB ->\calc@B \calc@A
+%
+% \calc@initB ->\calc@B \calc@A
% {\skip44}
% {\dimen27}
%\end{verbatim}
@@ -241,7 +240,7 @@
% document.
%
% \DescribeMacro\conditionally@traceon
-% \DescribeMacro\conditionally@traceoff
+% \DescribeMacro\conditionally@traceoff
% There are also two internal macros that turn tracing on and off, but
% only if the user requested tracing in the first place. These are the
% ones that are used internally within the code below.
@@ -271,14 +270,14 @@
% \documentclass{article}
% \usepackage{calc}
% %\usepackage{trace} % uncomment to see difference
-%
+%
% \begin{document}
% \ifx\traceon\undefined \tracingall \else \traceon \fi
-%
+%
% \setlength\linewidth{1cm}
-%
+%
% $foo=\bar a$
-%
+%
% \small \texttt{\$} \stop
%\end{verbatim}
%
@@ -388,15 +387,15 @@
% {\tracingparagraphs}
% {\tracingrestores}
% {\errorcontextlines}
-%
+%
% \showoutput ->\tracingoutput \@ne \showboxbreadth \maxdimen \showboxdepth \maxd
-% imen \errorstopmode \showoverfull
+% imen \errorstopmode \showoverfull
% {\tracingoutput}
% {\showboxbreadth}
% {\showboxdepth}
% {\errorstopmode}
-%
-% \showoverfull ->\tracingonline \@ne
+%
+% \showoverfull ->\tracingonline \@ne
% {\tracingonline}
%\end{verbatim}
%\endgroup
@@ -460,7 +459,7 @@
% \begin{macrocode}
\def\conditionally@traceoff{%
\tracingrestores\z@
- \tracingcommands\z@
+ \tracingcommands\z@
\tracingpages\z@
\tracingmacros\z@
\tracingparagraphs\z@
@@ -537,7 +536,7 @@
\def\conditionally@traceoff{%
\tracingassigns\z@
\tracingrestores\z@
- \tracingcommands\z@
+ \tracingcommands\z@
\tracingpages\z@
\tracingmacros\z@
\tracingoutput\z@
@@ -663,7 +662,7 @@
% with |\conditionally@traceoff| and |\conditionally@traceon|
% thereby avoiding all this uninteresting output.
% \begin{macrocode}
-\frozen@everymath =
+\frozen@everymath =
{\conditionally@traceoff \check@mathfonts \conditionally@traceon
\the\everymath}
\frozen@everydisplay =
@@ -683,16 +682,18 @@
% end. This involves looping through the |\nocorrlist| which
% outputs a lot of tracing lines we are normally not interested
% in. So we disable tracing for this part of the processing.
+% \changes{v1.1d}{2014/04/21}{Use \cs{ifmaybe@ic} not
+% \cs{if@tempswa} as the kernel does (pr/4200)}
% \begin{macrocode}
\def \maybe@ic@ {%
\ifdim \fontdimen\@ne\font>\z@
\else
\conditionally@traceoff
- \@tempswatrue
+ \maybe@ictrue
\expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=%
\nocorrlist
\do \t@st@ic
- \if@tempswa \sw@slant \fi
+ \ifmaybe@ic \sw@slant \fi
\conditionally@traceon
\fi
}
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index 3cf17801dc7..5a1d3375fa0 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -2,22 +2,22 @@
%
% Copyright 1993-2011
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% Package varioref to use with LaTeX2e
@@ -212,7 +212,7 @@
% \newcommand\amusingversion[2]{%
% \vrefpagenum\firstnum{#1}%
% \vrefpagenum\secondnum{#2}%
-% the definition%
+% the definition%
% \ifthenelse{\equal\firstnum\secondnum}%
% {s of \ref{#1} and \ref{#2} \vpageref{#1}}%
% { of \ref{#1} \vpageref{#1} and of \ref{#2} \vpageref{#2}}%
@@ -312,7 +312,7 @@
% The package supports all options defined by the babel package to
% translate the fixed strings into other languages than English.
% (Some languages need updating, however.)
-% It also supports languages currently not in babel;
+% It also supports languages currently not in babel;
% check the section on options later on.
%
% You can also modify some or all of the strings by redefining the
@@ -381,7 +381,7 @@
% \section{Options}
%
% As mentioned above the package supports all standard options offered
-% by the Babel system to customize the strings produced. In addition it
+% by the Babel system to customize the strings produced. In addition it
% offers the option \texttt{draft} to turn error messages into warnings
% during development. The default \texttt{final} produces error message
% when a generated string falls onto a page boundary (see next section).
@@ -432,7 +432,7 @@
%
% The next bit of code contains the documentation driver file for
% \TeX{}, i.e., the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the
+% currently reading. It will be extracted from this file by the
% \texttt{docstrip} program.
% \begin{macrocode}
%<*driver>
@@ -440,7 +440,7 @@
\usepackage{varioref}
\GetFileInfo{varioref.sty}
\setlength\hfuzz{1pt} % ignore slight overfulls
-\EnableCrossrefs
+\EnableCrossrefs
%\DisableCrossrefs % Say \DisableCrossrefs if index is ready
\RecordChanges % Gather update information
@@ -477,7 +477,7 @@
%\ProvidesPackage{varioref}[\filedate\space\fileversion\space
% LaTeX2e package for extended references (FMi)]
% \end{macrocode}
-%
+%
%
% \begin{macro}{\vref@addto}
% \changes{v1.0b}{1994/01/31}{Avoid using babel `addto}
@@ -511,7 +511,7 @@
% \changes{v1.0q}{1995/04/06}{Use `PackageWarning}
% \begin{macrocode}
\def\vref@excuse#1{%
- \PackageWarningNoLine{varioref}{Sorry, language `#1'
+ \PackageWarningNoLine{varioref}{Sorry, language `#1'
not supported%
\MessageBreak
in this version.
@@ -519,7 +519,7 @@
\MessageBreak
Please modify \protect\reftext... commands manually.%
\MessageBreak\MessageBreak
- If you can suggest translations for
+ If you can suggest translations for
this language,%
\MessageBreak
please mail them
@@ -538,7 +538,7 @@
produced by \protect#1\on@line.\MessageBreak
English string used instead.\MessageBreak
\MessageBreak
- If you can suggest translations for
+ If you can suggest translations for
the current\MessageBreak
language, please mail them
to the author of this\MessageBreak package}}
@@ -624,7 +624,7 @@
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
% \end{macrocode}
-% Text for basque defaults was contributed by
+% Text for basque defaults was contributed by
% I\~naki Larra\~naga Murgoitio (aka dooteo)
% (|<dooteo@euskalgnu.org>|).
% \changes{v1.4k}{2005/04/09}{Basque defaults added.}
@@ -641,7 +641,7 @@
\def\reftextlabelrange#1#2{\ref{#1}.etik \ref{#2}.eraino}%
}}
% \end{macrocode}
-% Text for the Bahasa Malaysia defaults was contributed by
+% Text for the Bahasa Malaysia defaults was contributed by
% Bob Margolis 2005-12-02.
%
% Notes: pada muka surat translates as ``on the page'' though BM has no
@@ -665,7 +665,7 @@
\def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
% \end{macrocode}
-% Text for brazil defaults was contributed by
+% Text for brazil defaults was contributed by
% Alcino Dall Igna Junior\\
% (|adij@di.ufpe.br|).
% \changes{v1.0g}{1994/05/18}{Brazil defaults added.}
@@ -674,13 +674,13 @@
% \begin{macrocode}
\DeclareOption{brazil}
{\vref@addto\extrasbrazil{%
- \def\reftextfaceafter {na \reftextvario{p\'agina oposta}{pr\'oxima
+ \def\reftextfaceafter {na \reftextvario{p\'agina oposta}{pr\'oxima
p\'agina}}%
\def\reftextfacebefore{na p\'agina \reftextvario{oposta}{anterior}}%
\def\reftextafter {na \reftextvario{p\'agina seguinte}{pr\'oxima
p\'agina}}%
\def\reftextbefore{na p\'agina \reftextvario{anterior}{precedente}}%
- \def\reftextcurrent {\reftextvario{nesta p\'agina}{na p\'agina
+ \def\reftextcurrent {\reftextvario{nesta p\'agina}{na p\'agina
corrente}}%
\def\reftextfaraway#1{na p\'agina~\pageref{#1}}%
\def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
@@ -714,29 +714,29 @@
% \begin{macrocode}
\DeclareOption{bulgarian}%
{\vref@addto\extrasbulgarian{%
- \def\reftextfaceafter{\cyrn\cyra\
+ \def\reftextfaceafter{\cyrn\cyra\
\reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
{\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
- \def\reftextfacebefore{\cyrn\cyra\
+ \def\reftextfacebefore{\cyrn\cyra\
\reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
{\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
- \def\reftextafter{\cyrn\cyra\
+ \def\reftextafter{\cyrn\cyra\
\reftextvario{\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}%
{\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
- \def\reftextbefore{\cyrn\cyra\
+ \def\reftextbefore{\cyrn\cyra\
\reftextvario{\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
{\cyrp\cyrr\cyre\cyrd\cyri\cyrsh\cyrn\cyra\cyrt\cyra}
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
- \def\reftextcurrent{\cyrn\cyra\
+ \def\reftextcurrent{\cyrn\cyra\
\reftextvario{\cyrt\cyra\cyrz\cyri}%
{\cyrt\cyre\cyrk\cyru\cyrshch\cyra\cyrt\cyra}
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
\def\reftextfaraway#1{\cyrn\cyra\ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra
~\pageref{#1}}%
- \def\reftextpagerange#1#2{\cyrn\cyra\
+ \def\reftextpagerange#1#2{\cyrn\cyra\
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyri
~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} \cyrd\cyro~\ref{#2}}%
@@ -755,12 +755,12 @@
\let\reftextbefore \reftextfacebefore
\def\reftextcurrent {en aquesta p\`agina}%
\def\reftextfaraway#1{a la p\`agina~\pageref{#1}}%
- \def\reftextpagerange#1#2{a les
+ \def\reftextpagerange#1#2{a les
p\`agines~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
-% Text for croatian defaults was contributed by Sime Ungar
+% Text for croatian defaults was contributed by Sime Ungar
% (\verb=ungar@math.hr=).
% \changes{v1.4p}{2006/05/13}{Added defaults for croatian}
% \begin{macrocode}
@@ -794,7 +794,7 @@
}}
% \end{macrocode}
% Defaults for Danish provided by Torsten Martinsen
-% (\verb=tmar91@kom.auc.dk=). Further defaults by Ole Laursen
+% (\verb=tmar91@kom.auc.dk=). Further defaults by Ole Laursen
% (\verb=olau@hardworking.dk=).
% \changes{v1.0n}{1994/09/25}{Added Danish defaults}
% \changes{v1.2h}{2000/12/30}{Updates to Danish defaults}
@@ -843,7 +843,7 @@
% \end{macrocode}
% Concerning the next defaults I received the following comment by
% Frederik Fouvry \texttt{<fouvry@coli.uni-sb.de>}:
-% ``In the Dutch options (where I can exert a proper language
+% ``In the Dutch options (where I can exert a proper language
% judgement ;-), `t/m' is not used in formal (scientific) texts. I
% would either use `--' or `tot en met' (the abbreviation written
% out). ''
@@ -871,16 +871,16 @@
\def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
}}
% \end{macrocode}
-%
+%
% The esperanto strings were suggested by Albert Reiner
% (\verb=areiner@tph.tuwien.ac.at=).
% \changes{v1.4x}{2010/08/04}{Defaults for esperanto added}
% \begin{macrocode}
\DeclareOption{esperanto}
{\vref@addto\extrasesperanto{%
- \def\reftextfaceafter{en la
+ \def\reftextfaceafter{en la
\reftextvario{flanka}{sekva} pa\^go}%
- \def\reftextfacebefore{en la
+ \def\reftextfacebefore{en la
\reftextvario{flanka}{anta\u ua} pa\^go}%
\def\reftextafter{en la sekva pa\^go}%
\def\reftextbefore{en la anta\u ua pa\^go}%
@@ -892,7 +892,7 @@
}}
% \end{macrocode}
% The finnish strings were suggested by Matti Rintala
-% (\verb=bitti@cs.tut.fi=) and Hillevi Gavel
+% (\verb=bitti@cs.tut.fi=) and Hillevi Gavel
% \verb=Hillevi.Gavel@mdh.se=.
% \changes{v1.0m}{1994/09/23}{Added finnish strings}
% \changes{v1.4o}{2005/11/07}{Added a few more finnish strings}
@@ -911,10 +911,10 @@
% \end{macrocode}
% Can't combine numbers with the necessary suffix well.
% \begin{macrocode}
- \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
% \end{macrocode}
-% French defaults are provided by Daniel Flippo
+% French defaults are provided by Daniel Flippo
% (\verb=Daniel.Flipo@univ-lille1.fr=).
% \changes{v1.0j}{1994/06/21}{Added french defaults}
% \changes{v1.2a}{1998/08/22}{Added french defaults for
@@ -949,7 +949,7 @@
\def\reftextfaraway#1{na p\'axina~\pageref{#1}}%
\def\reftextpagerange#1#2{%
nas p\'axinas~\pageref{#1}-\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
% There are no good variants for German (I think and still think but
@@ -966,11 +966,11 @@
% \def\reftextfacebefore {auf der \reftextvario
% {gegen\"uberliegenden}{anderen} Seite}%
% \def\reftextafter {auf der \reftextvario
-% {n\"achsten}{folgenden} Seite}%
+% {n\"achsten}{folgenden} Seite}%
% \def\reftextbefore {auf der \reftextvario
% {vorigen}{vorhergehenden} Seite}%
% \def\reftextcurrent {\reftextvario
-% {auf dieser}{diese} Seite}%
+% {auf dieser}{diese} Seite}%
%\end{verbatim}
% \changes{v1.4n}{2005/07/24}{Small change}
% \begin{macrocode}
@@ -1048,7 +1048,7 @@
% \changes{v1.2a}{1998/08/22}{Removed incorrect warning}
% \changes{v1.4k}{2004/10/30}{Added missing defaults supplied by Lapo Mori}
% \changes{v1.4n}{2005/07/24}{Small change}
-% \changes{v1.4u}{2009/03/21}{Correction for \cs{reftextfaraway} suggested
+% \changes{v1.4u}{2009/03/21}{Correction for \cs{reftextfaraway} suggested
% by Lorenzo Pantieri}
% \begin{macrocode}
\DeclareOption{italian}
@@ -1066,7 +1066,7 @@
\def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
-% Defaults for Hungarian by Jeff Goldberg
+% Defaults for Hungarian by Jeff Goldberg
% (\verb=jeffrey@goldmark.org=).
% There is a problem with the use of the definite article
% \textit{a} or \textit{az} in Hungarian before expansions
@@ -1103,7 +1103,7 @@
% --\pageref{#2}.~ol\-da\-la\-kon}%
% \def\reftextlabelrange#1#2{{}\csname @@magyar@told\endcsname\ref{#1}+tol
% \ref{#2}-ig}% Dat: `{}' is here for anti-\capitalize
-%\end{verbatim}
+%\end{verbatim}
% \begin{macrocode}
\def\reftextfaraway#1{\aza{\pageref{#1}} \pageref{#1}.~ol\-da\-lon}%
\def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
@@ -1166,7 +1166,7 @@
% The polish translations have been provided by
% Tomasz Michniewski \\
% \verb=<tomekm@ias.wat.waw.pl>=.
-% The use of the command \verb=\eob= and \verb=aob= etc.\
+% The use of the command \verb=\eob= and \verb=aob= etc.\
% requires appropriate definitions as provided, for example, by
% the babel system. This should probably be handled differently
% but it would require modifications in babel's language support.
@@ -1198,7 +1198,7 @@
% \begin{macrocode}
\DeclareOption{portuges}
{\vref@addto\extrasportuges{%
- \def\reftextfaceafter {na \reftextvario{p\'agina ao lado}{pr\'oxima
+ \def\reftextfaceafter {na \reftextvario{p\'agina ao lado}{pr\'oxima
p\'agina}}%
\def\reftextfacebefore{na p\'agina \reftextvario{ao lado}{anterior}}%
\def\reftextafter {na \reftextvario{p\'agina seguinte}{pr\'oxima
@@ -1228,7 +1228,7 @@
% \end{macrocode}
% The text for russian was taken from the book in Russian by
% I.~A.~Kotelnikov and P.~Z.~Chebotaev, and adapted
-% to the encoding-independent form by Vladimir Volovich
+% to the encoding-independent form by Vladimir Volovich
% (\verb=vvv@vsu.ru=).
% \changes{v1.2a}{1998/11/23}{Added russion strings}
% \changes{v1.2a}{1998/11/24}{Added defaults for
@@ -1242,7 +1242,7 @@
\cyrr\cyra\cyrn\cyri\cyrc\cyre}%
\def\reftextfacebefore{\cyrn\cyra\ \reftextvario{\cyrp\cyrr\cyro
\cyrt\cyri\cyrv\cyro\cyrp\cyro\cyrl\cyro\cyrzh\cyrn\cyro\cyrishrt}%
- {\cyrp\cyrr\cyre\cyrd\cyrery\cyrd\cyru\cyrshch\cyre\cyrishrt}\
+ {\cyrp\cyrr\cyre\cyrd\cyrery\cyrd\cyru\cyrshch\cyre\cyrishrt}\
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyre}%
\def\reftextafter{\cyrn\cyra\ \cyrs\cyrl\cyre\cyrd\cyru\cyryu\cyrshch
\cyre\cyrishrt\ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyre}%
@@ -1332,7 +1332,7 @@
\def\reftextbefore {p\aa\ f\"{o}reg\aa ende sida}%
\def\reftextcurrent {p\aa\ denna sida}%
\def\reftextfaraway#1{p\aa\ sidan~\pageref{#1}}%
- \def\reftextpagerange#1#2{p\aa\
+ \def\reftextpagerange#1#2{p\aa\
sidorna~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} till~\ref{#2}}%
}}
@@ -1393,8 +1393,8 @@
% \end{macro}
% \end{macro}
%
-% During document preparation errors due to |\vref| are usually of
-% not much interest. For this reason the draft option turns them into
+% During document preparation errors due to |\vref| are usually of
+% not much interest. For this reason the draft option turns them into
% warnings by issuing a |\vrefwarning| command. The final option
% (default) stops with an error message when varioref detects a possible
% loop.
@@ -1468,7 +1468,7 @@
\let\vref@space\space
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\@vpageref}
% More parsing\ldots
% \begin{macrocode}
@@ -1767,7 +1767,7 @@
% \begin{macrocode}
\def\vrefshowerrors{\def\vref@err##1{\PackageError{varioref}{##1}%
{Please check the pages in question. You might need to replace
- the \string\vref\MessageBreak
+ the \string\vref\MessageBreak
or \noexpand\vpageref by a normal \noexpand\(page)ref to
stop LaTeX running forever.}}}
% \end{macrocode}
@@ -1792,7 +1792,7 @@
\def\vr@f#1{%
% \end{macrocode}
% The use of|\nobreakspace| or |~| after the |\unskip| means that
-% this command will always produce a normal space while
+% this command will always produce a normal space while
% something like |\nobreak\space| will
% react to settings of |\nonfrenchspacing|.
% Unfortunately the latter will also act in cases where one really
@@ -1896,7 +1896,7 @@
% \subsubsection{Supporting ranges}
%
% \begin{macro}{\vref@pagenum}
-% \changes{v1.2a}{1998/08/01}{Macro added}
+% \changes{v1.2a}{1998/08/01}{Macro added}
% This command takes a label as |#1| extracts the page number
% associated with it and saves the result in a csname which is
% passed as |#1|. If the label isn't associated with a page number
@@ -1917,7 +1917,7 @@
% if the label contained active characters, e.g., a ``:'' in French. So now
% we use even more |\expandafter| commands to avoid any expansion other
% than what is absolutely required---I'm sure there is now a simpler way
-% to code this, but \ldots\ in fact we didn't use enough initially resulting in another
+% to code this, but \ldots\ in fact we didn't use enough initially resulting in another
% bug (pr/4159):
% \changes{v1.4w}{2009/09/13}{Use \cs{protected@edef} to avoid problems
% in complicated setups, e.g., microtype (pr/4080)}
@@ -1942,7 +1942,7 @@
% \begin{macrocode}
\def\vrefpagenum#1#2{%
\@ifundefined{r@#2}%
- {\G@refundefinedtrue
+ {\G@refundefinedtrue
\@latex@warning{Reference `#2' on page \thepage \space
undefined}}{}%
\vref@pagenum{#1}{#2}}
@@ -2057,7 +2057,7 @@
% letter) one has to surround everything that needs uppercasing in
% a brace group in the definition of |\labelformat|.\footnote{There
% is one problem with this approach: the braces are kept in a
-% normal \texttt{\textbackslash ref} which might spoil kerning.
+% normal \texttt{\textbackslash ref} which might spoil kerning.
% Perhaps one day this needs redoing.}
% \begin{macrocode}
\DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
diff --git a/Master/texmf-dist/source/latex/tools/varioref.ins b/Master/texmf-dist/source/latex/tools/varioref.ins
new file mode 100644
index 00000000000..e973ebd9c14
--- /dev/null
+++ b/Master/texmf-dist/source/latex/tools/varioref.ins
@@ -0,0 +1,69 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993-2014
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `Tools Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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.
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/tools}
+
+\preamble
+
+This is a generated file.
+
+Copyright 1993-2014
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+--------------------------------------------------------------------------
+
+It 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 file may only be distributed together with a copy of the LaTeX
+`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+without such generated files.
+
+The list of all files belonging to the LaTeX `Tools Bundle' is
+given in the file `manifest.txt'.
+
+\endpreamble
+
+
+\generateFile{varioref.sty}{t}{\from{varioref.dtx}{package}}
+
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index 155b5042ed1..5e47e414580 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009 2011
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \CheckSum{625}
%
@@ -39,7 +39,7 @@
%
% \section{Producing the documentation}
%
-% We provide a short driver file that can be extracted by the
+% We provide a short driver file that can be extracted by the
% \textsf{DocStrip} program using the conditional `\textsf{driver}'.
%
% \begin{macrocode}
@@ -309,8 +309,8 @@
% \endgraf\begin{verbatim}}%
%{\end{verbatim}}
%\newenvironment{fred}
-%{\begin{minipage}{30mm}\verbatim}
-%{\endverbatim\end{minipage}}
+%{\begin{minipage}{30mm}\verbatim}
+%{\endverbatim\end{minipage}}
%\end{verbatim*}
% If you try these examples, \TeX{} will report a
% ``runaway argument'' error.
@@ -321,7 +321,7 @@
% would be
% \begin{verbatim*}
%\newenvironment{fred}
-%{\minipage{30mm}\verbatim}
+%{\minipage{30mm}\verbatim}
%{\endverbatim\endminipage}
%\end{verbatim*}
% \item
@@ -725,7 +725,7 @@
% The latter space has to be zero since we do not want to add
% extra space between lines.
% \begin{macrocode}
- \@beginparpenalty \predisplaypenalty
+ \@beginparpenalty \predisplaypenalty
\leftskip\@totalleftmargin\rightskip\z@
\parindent\z@\parfillskip\@flushglue\parskip\z@
% \end{macrocode}
@@ -1599,7 +1599,7 @@
% used anywhere that the verbatim text is required. It can be used in
% arguments, even moving ones, but it is fragile (at least, the
% version here is).
-%
+%
% Here is some code which claims to provide this. It is a much revised
% version of something I (Chris) did about 2 years ago. Maybe it needs
% further revision.
@@ -1615,11 +1615,11 @@
%
% \begin{verbatim}
% \newverbtext{\myverb}"^%{ &~_\}}@ #"
-% \end{verbatim}
-%
+% \end{verbatim}
+%
% The rules for delimiting the verbatim text are the same as those for
-% |\verb|.
-%
+% |\verb|.
+%
% \begin{macrocode}
%<*verbtext>
\def \newverbtext {%
@@ -1638,7 +1638,7 @@
\begingroup
\let\do\@makeother \dospecials
\let\do\do@noligs \verbatim@nolig@list
- \@vobeyspaces
+ \@vobeyspaces
\catcode`#2\active
\catcode`~\active
\lccode`\~`#2%
@@ -1646,7 +1646,7 @@
% \end{macrocode}
% We use a temporary macro here and a trick so that the definition of
% the command itself can be done inside the group and be a local
-% definition (there may be better ways to achieve this).
+% definition (there may be better ways to achieve this).
% \begin{macrocode}
{\def \@tempa ##1~%
{\whitespaces
@@ -1674,10 +1674,10 @@
\relax\ifmmode
\hbox
\else
- \leavevmode
+ \leavevmode
\null
\fi
-}
+}
% \end{macrocode}
% This contains other things which should not be expanded during the
% definition.
@@ -1860,7 +1860,7 @@ asdfa<fsa
%</testdriver>
% \end{macrocode}
%
-%
+%
% \Finale
%
\endinput
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index afa4c15acb0..2ca7c7fed8d 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: xr.dtx Copyright (C) 1994-1994 David Carlisle
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index a8a11f8a097..b01314aea2b 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -3,22 +3,22 @@
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: xspace.dtx Copyright (C) 1991-1997 David Carlisle
@@ -65,7 +65,7 @@
% \changes{v1.00}{1991/08/30}{Initial version}
% \changes{v1.01}{1992/06/26}{Re-issue for the new doc and docstrip}
% \changes{v1.02}{1994/01/31}{Re-issue for LaTeX2e (no change to
-% code)}
+% code)}
% \changes{v1.07}{2004/12/07}{Make extensible. tools/3712}
% \changes{v1.07}{2004/12/07}{Fix active characters. tools/3747}
% \changes{v1.07}{2004/12/07}{Update documentation}
@@ -73,7 +73,7 @@
% \changes{v1.09}{2005/07/26}{Improve test by exiting if
% \cs{@let@token} is a letter}
% \changes{v1.10}{2005/10/04}{Use higher level functions for
-% conditional processing}
+% conditional processing}
% \changes{v1.10}{2005/10/04}{Improve expansion method}
%
% \begin{abstract}
@@ -179,22 +179,22 @@
% \cs{unskip} to remove the space inserted if \cs{@let@token} matches
% something special. Below is an example of how one can make sure an
% endash gets a space inserted before it but a single dash not.
-% \begin{verbatim}
-% \xspaceremoveexception{-}
+% \begin{verbatim}
+% \xspaceremoveexception{-}
% \makeatletter
% \renewcommand*\@xspace@hook{%
-% \ifx\@let@token-%
-% \expandafter\@xspace@dash@i
+% \ifx\@let@token-%
+% \expandafter\@xspace@dash@i
% \fi
% }
-% \def\@xspace@dash@i-{\futurelet\@let@token\@xspace@dash@ii}
-% \def\@xspace@dash@ii{%
-% \ifx\@let@token-%
-% \else
+% \def\@xspace@dash@i-{\futurelet\@let@token\@xspace@dash@ii}
+% \def\@xspace@dash@ii{%
+% \ifx\@let@token-%
+% \else
% \unskip
-% \fi
-% -%
-% }
+% \fi
+% -%
+% }
% \makeatother
% \end{verbatim}
%
@@ -267,7 +267,7 @@
% \end{macro}
% \begin{macro}{\xspaceremoveexception}
% \changes{v1.10}{2005/10/04}{Use higher level functions for
-% conditional processing}
+% conditional processing}
% This command removes an exception globally.
% \begin{macrocode}
\newcommand*\xspaceremoveexception[1]{%
@@ -286,7 +286,7 @@
}%
\expandafter\reserved@a\@xspace@exceptions@tlp#1\@xspace@q@nil\@@
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@xspace@break@loop}
@@ -327,10 +327,10 @@
% \begin{macrocode}
\catcode`\,=\active \catcode`\'=\active \catcode`\-=\active
\xspaceaddexceptions{;:?!,'-}
- \endgroup
+ \endgroup
\let\@xspace@eTeX@setup\relax
% \end{macrocode}
-% \begin{macro}{\@xspace@eTeX@setup}
+% \begin{macro}{\@xspace@eTeX@setup}
% \changes{v1.10}{2005/10/04}{Added macro}
% \changes{v1.12}{2006/05/08}{Bug fix for verbatim in output routine}
% When we're running \eTeX, we have the advantage of \cs{scantokens}
@@ -375,7 +375,7 @@
% \changes{v1.08}{2005/05/07}{Use recursive loop instead of \cs{@tfor}}
% \changes{v1.09}{2005/07/26}{Only check non-letters and add hook}
% \changes{v1.10}{2005/10/04}{Use higher level functions for
-% conditional processing}
+% conditional processing}
% \changes{v1.10}{2005/10/04}{Improve expansion method}
% If the next token is one of a specified list of characters,
% do nothing, otherwise add a space. With version~1.07 the
@@ -433,9 +433,9 @@
% \changes{v1.07}{2004/12/07}{Added macro}
% \changes{v1.08}{2005/05/07}{Made function recursive}
% \changes{v1.10}{2005/10/04}{Use higher level functions for
-% conditional processing}
+% conditional processing}
% \changes{v1.11}{2006/02/12}{Modified so the \cs{@let@token} can be
-% \cs{outer}}
+% \cs{outer}}
% This macro just checks the current item in the exception list
% against the \cs{@let@token}. If they are equal we make sure that no
% space is inserted and break the loop.