diff options
| author | Karl Berry <karl@freefriends.org> | 2014-05-09 22:39:48 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-05-09 22:39:48 +0000 |
| commit | 610c45beb863b008027a871701c889fe40bed7fb (patch) | |
| tree | 5b879b56850db183fd749a497edd1d91172edf69 /Master/texmf-dist/source/latex/tools | |
| parent | 18fa80c232cf479ae713b01b17d48bdc1d653aac (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/latex/tools')
32 files changed, 1733 insertions, 848 deletions
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. |