diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools')
39 files changed, 247 insertions, 175 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex index 054178befb4..d0be988b65b 100644 --- a/Master/texmf-dist/tex/latex/tools/.tex +++ b/Master/texmf-dist/tex/latex/tools/.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty index cfc4bb8d15c..88d8002e90d 100644 --- a/Master/texmf-dist/tex/latex/tools/afterpage.sty +++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index 583e37ee5f3..46e0ae1a195 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty index f5a7ef35304..0a850f94131 100644 --- a/Master/texmf-dist/tex/latex/tools/bm.sty +++ b/Master/texmf-dist/tex/latex/tools/bm.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty index 050015dfece..e181ee0df87 100644 --- a/Master/texmf-dist/tex/latex/tools/calc.sty +++ b/Master/texmf-dist/tex/latex/tools/calc.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty index bc57bc9888e..4608678f88c 100644 --- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty +++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty index 78d5fc82d7e..e9e227f10b5 100644 --- a/Master/texmf-dist/tex/latex/tools/delarray.sty +++ b/Master/texmf-dist/tex/latex/tools/delarray.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex index 9ad4e16ceb0..2784b30cd6c 100644 --- a/Master/texmf-dist/tex/latex/tools/e.tex +++ b/Master/texmf-dist/tex/latex/tools/e.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty index 2dddb1950c6..65f15610562 100644 --- a/Master/texmf-dist/tex/latex/tools/enumerate.sty +++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty index 9ba885fa962..6c69853387f 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex index 48f8cf893b0..0758db5351a 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty index 72c5c39f086..c595bbf87d2 100644 --- a/Master/texmf-dist/tex/latex/tools/ftnright.sty +++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex index c3ef92f861d..e5bd1486723 100644 --- a/Master/texmf-dist/tex/latex/tools/h.tex +++ b/Master/texmf-dist/tex/latex/tools/h.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty index f0c506f860f..06b72dbad84 100644 --- a/Master/texmf-dist/tex/latex/tools/hhline.sty +++ b/Master/texmf-dist/tex/latex/tools/hhline.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty index e2bec26a6c9..971fca81688 100644 --- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty +++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty index 1b541056fd1..e234aee44df 100644 --- a/Master/texmf-dist/tex/latex/tools/layout.sty +++ b/Master/texmf-dist/tex/latex/tools/layout.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty index d0ac964ed92..076fcb42e6a 100644 --- a/Master/texmf-dist/tex/latex/tools/longtable.sty +++ b/Master/texmf-dist/tex/latex/tools/longtable.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index 50284dc079f..974a431f34d 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -8,8 +8,7 @@ %% %% 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. %% @@ -32,7 +31,7 @@ %% given in the file `manifest.txt'. %% %% 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 @@ -97,8 +96,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2011/06/27 v1.7a multicolumn formatting (FMi)] -%% \CheckSum{1669} + [2014/04/23 v1.8e multicolumn formatting (FMi)] +%% \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 @@ -131,6 +130,18 @@ {\c@tracingmulticols5\relax} \let\mc@gridwarn\maxdimen \DeclareOption{grid}{\def\mc@gridwarn{\maxdepth}} +\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 \ProcessOptions \def\multicols#1{\col@number#1\relax \ifnum\col@number<\tw@ @@ -189,6 +200,7 @@ \prepare@multicols \if@boxedmulticols \setbox\mult@box\vbox\bgroup + \color@setgroup \fi \ignorespaces} \newif\if@boxedmulticols @@ -288,7 +300,7 @@ \newdimen\multicol@leftmargin \def\endmulticols{\par \if@boxedmulticols - \egroup + \color@endgroup\egroup \balance@columns \return@nonemptymark{first}% \kept@firstmark @@ -386,19 +398,10 @@ \ifvmode\else\errmessage{Multicol Error}\fi \nointerlineskip \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@ - \maybe@reverse@columns \moveright\multicol@leftmargin \hbox to\full@width{% - \process@cols\mult@gfirstbox{% - \ifdim\dp\count@>\dimen\tw@ - \global\dimen\tw@\dp\count@ \fi - \box\count@ - \hss{\columnseprulecolor\vrule - \@width\columnseprule}\hss}% - \ifdim\dp\mult@rightbox>\dimen\tw@ - \global\dimen\tw@\dp\mult@rightbox \fi - \box\mult@rightbox - \rlap{\phantom p}% + \mc@align@columns + \rlap{\phantom p}% }% \kern-\dimen\tw@ \ifdim\dimen\tw@ = \mc@gridwarn @@ -427,26 +430,37 @@ \ifvoid\footins \else \leave@mult@footins \fi + \let\ifshr@kingsaved\ifshr@king + \ifvbox \@kludgeins + \advance \dimen@ -\ht\@kludgeins + \ifdim \wd\@kludgeins>\z@ + \shr@nkingtrue + \fi + \fi \process@cols\mult@gfirstbox{% \setbox\count@ \vsplit\@cclv to\dimen@ \set@keptmarks - \ifshr@nking - \setbox\count@ + \setbox\count@ \vbox to\dimen@ - {\unvbox\count@\vfill}% - \fi + {\unvbox\count@ + \remove@discardable@items + \ifshr@nking\vfill\fi}% }% \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}% + \let\ifshr@king\ifshr@kingsaved \ifvoid\@cclv \else \unvbox\@cclv - \penalty\outputpenalty + \ifnum\outputpenalty=\@M + \else + \penalty\outputpenalty + \fi \ifvoid\footins\else \PackageWarning{multicol}% {I moved some lines to @@ -492,6 +506,7 @@ \meaning\kept@topmark \@gobbletwo}% \global\@colroom\@colht + \global \@mparbottom \z@ \process@deferreds \@whilesw\if@fcolmade\fi{\@outputpage \global\@colroom\@colht @@ -562,13 +577,27 @@ \fi \unvbox\@cclv}% \balance@columns - \global\vsize\@colroom - \global\advance\vsize\ht\partial@page - \unvbox\partial@page - \return@nonemptymark{first}\kept@firstmark - \return@nonemptymark{bot}\kept@botmark - \page@sofar - \penalty\z@ + \iftoo@bad + \mult@info\@ne + {Balancing failed ... + cut a normal page}% + \setbox\@cclv\vbox + {\vskip\topskip + \vskip-\splittopskip + \unvbox\mult@box}% + \multi@column@out + \break + \else + \global\vsize\@colroom + \global\advance\vsize\ht\partial@page + \ifvbox\@kludgeins\insert\@kludgeins + {\unvbox\@kludgeins}\fi + \unvbox\partial@page + \return@nonemptymark{first}\kept@firstmark + \return@nonemptymark{bot}\kept@botmark + \page@sofar + \penalty\z@ + \fi } \def\balance@columns{% \get@keptmarks\mult@box @@ -615,10 +644,14 @@ \box\voidb@x}}% \global\setbox\mult@grightbox \copy\mult@box - \global\too@badfalse + \too@badfalse {\process@cols\mult@firstbox{% \global\setbox\count@ \vsplit\mult@grightbox to\dimen@ + \global\setbox\count@ + \vbox to\dimen@ + {\unvbox\count@ + \remove@discardable@items}% \ifnum\c@tracingmulticols>\@ne \@tempcnta\count@ \advance\@tempcnta-\mult@grightbox @@ -632,7 +665,7 @@ \message{too bad (>\the\c@columnbadness)}% \fi - \global\too@badtrue + \too@badtrue \fi }}% \boxmaxdepth\maxdepth @@ -706,14 +739,38 @@ \process@cols\mult@rightbox {\@tempcnta\count@ \advance\@tempcnta\@ne + \vfuzz\z@ \setbox\count@\vbox to\dimen@ {% \vskip \z@ \@plus-\multicolundershoot \@minus-\multicolovershoot \unvbox\@tempcnta - \ifshr@nking\vfill\fi}}% + \ifshr@nking\vfill\fi + }% + \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}% + \too@badtrue + \else + \mult@info\@ne + {Balanced column + too large, but less than + \the\maxbalancingoverflow}% + \fi + \fi + }% } +\newdimen\maxbalancingoverflow +\maxbalancingoverflow=12pt + \newbox\mult@rightbox \newbox\mult@grightbox \newbox\mult@gfirstbox @@ -798,6 +855,8 @@ \unskip\unpenalty\unkern } \newif\iftoo@bad +\def\too@badtrue{\global\let\iftoo@bad\iftrue} +\def\too@badfalse{\global\let\iftoo@bad\iffalse} \newcount\c@columnbadness \c@columnbadness=10000 \newcount\c@finalcolumnbadness @@ -848,61 +907,98 @@ \fi \fi} \newbox\colbreak@box +\def\LR@column@boxes{% + \process@cols\mult@gfirstbox{% + \ifdim\dp\count@>\dimen\tw@ + \global\dimen\tw@\dp\count@ \fi + \mc@col@status@write + \box\count@ + \hss{\columnseprulecolor\vrule + \@width\columnseprule}\hss}% + \ifdim\dp\mult@rightbox>\dimen\tw@ + \global\dimen\tw@\dp\mult@rightbox \fi + \mc@lastcol@status@write + \box\mult@rightbox +} + +\def\RL@column@boxes{% + \process@cols\mult@gfirstbox{% + \hskip\hsize + \hss{\columnseprulecolor\vrule + \@width\columnseprule}\hss + }% + \hskip\hsize + \process@cols\mult@gfirstbox{% + \ifdim\dp\count@>\dimen\tw@ + \global\dimen\tw@\dp\count@ \fi + \hskip-\hsize + \mc@col@status@write + \box\count@ + \hskip-\hsize + \hskip-\columnsep + }% + \ifdim\dp\mult@rightbox>\dimen\tw@ + \global\dimen\tw@\dp\mult@rightbox \fi + \hskip-\hsize + \mc@lastcol@status@write + \box\mult@rightbox + \hskip-\hsize + \hskip\full@width + } \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} \LRmulticolcolumns +\newcount\mc@col@check@num -\newcount\multicol@sort@counter - -\def\reverse@column@boxes {% - \ifnum\c@tracingmulticols>\thr@@ - \typeout{reversing columns ...} - \fi - \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@ - }% - \ifnum\c@tracingmulticols>\thr@@ - \typeout{Setting last: - \the\mult@grightbox\space - <- \the\mult@rightbox}% - \fi - \setbox \mult@grightbox \box\mult@rightbox - \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@ - }% - \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}% +\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}% + \ifcase \mc@col@type\relax + \ifcase #1\or #2\or#3\or#4\fi + \or + #2% % 1 First col + \or + #3% % 2 any middle col + \or + #4% % 3 last col + \else + \ERROR \fi - \global\setbox \mult@rightbox - \box\multicol@sort@counter + \edef\next{\write\@auxout + {\string\mc@set@col@status + {mc@col-\the\mc@col@check@num}% + {\mc@col@type}}}% + \next +} +\def\mc@col@status#1{% + \gdef\mc@curr@col@status{#1}} +\def\mc@set@col@status#1#2{% + \global\expandafter\let\csname #1\endcsname + \mc@curr@col@status} +\AtEndDocument{\def\mc@set@col@status#1#2{% + \ifnum #2=\mc@curr@col@status\else + \@tempswatrue + \fi}% } +\newif\ifmc@firstcol +\mc@firstcoltrue \endinput %% %% End of file `multicol.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex index d2d0fdc6e62..0cb180593ff 100644 --- a/Master/texmf-dist/tex/latex/tools/q.tex +++ b/Master/texmf-dist/tex/latex/tools/q.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex index 530ec27e534..71dfeb9f34d 100644 --- a/Master/texmf-dist/tex/latex/tools/r.tex +++ b/Master/texmf-dist/tex/latex/tools/r.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty index b43cd9f30af..f1e3d2de6ec 100644 --- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty +++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex index 05a80909fb6..1bd553b16be 100644 --- a/Master/texmf-dist/tex/latex/tools/s.tex +++ b/Master/texmf-dist/tex/latex/tools/s.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty index bed1206b5af..aefb81115ce 100644 --- a/Master/texmf-dist/tex/latex/tools/showkeys.sty +++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty @@ -8,8 +8,7 @@ %% %% 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. %% @@ -32,10 +31,10 @@ %% given in the file `manifest.txt'. %% %% 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 \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showkeys} - [2007/08/07 v3.15 Show cite and label keys (DPC, MH)] + [2014/04/24 v3.17 Show cite and label keys (DPC, MH)] \DeclareOption{notref}{\let\SK@ref\@empty} \DeclareOption{notcite}{\let\SK@cite\@empty} \let\SK@refcolor\relax @@ -238,7 +237,7 @@ \AtBeginDocument{% \ifx\HAR@checkdef\@undefined \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 @@ -254,11 +253,11 @@ \expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{% \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}% \fi} -\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}} \fi \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/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty index 66af3d1b942..4c64f1b9e3e 100644 --- a/Master/texmf-dist/tex/latex/tools/somedefs.sty +++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty index 611addc07db..95ecd8ae9bf 100644 --- a/Master/texmf-dist/tex/latex/tools/tabularx.sty +++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty @@ -8,8 +8,7 @@ %% %% 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. %% @@ -31,10 +30,10 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% File: tabularx.dtx Copyright (C) 1991-1999 David Carlisle +%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 David Carlisle \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tabularx} - [1999/01/07 v2.07 `tabularx' package (DPC)] + [2014/04/22 v2.09 `tabularx' package (DPC)] \DeclareOption{infoshow}{\AtEndOfPackage\tracingtabularx} \DeclareOption{debugshow}{\AtEndOfPackage\tracingtabularx} \ProcessOptions @@ -61,8 +60,13 @@ \ifx\@tempa\TX@\expandafter\TX@endtabularx \else\toks@\expandafter {\the\toks@\end{#1}}\expandafter\TX@get@body\fi} +\long\def\TX@find@endtabularxa#1\endtabularx#2\TX@find@endtabularxa{% + \toks@\expandafter{\the\toks@#1}} +\long\def\TX@find@endtabularxb#1\endtabularx#2\TX@find@endtabularxb{#2} \def\TX@{tabularx} \def\TX@endtabularx{% + \expandafter\expandafter\expandafter + \TX@find@endtabularxa\csname end\TX@\endcsname\TX@find@endtabularxa \expandafter\TX@newcol\expandafter{\tabularxcolumn{\TX@col@width}}% \let\verb\TX@verb \def\@elt##1{\global\value{##1}\the\value{##1}\relax}% @@ -86,9 +90,16 @@ \csname endtabular*\endcsname}% \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn \ifnum0=`{\fi}% - \expandafter\end\expandafter{\TX@}} + \expandafter\TX@find@endtabularxb\romannumeral-`X% + \expandafter\end\expandafter{\TX@}\TX@find@endtabularxb} \def\TX@arith{% \TX@false + \@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 \TX@col@width\TX@old@col \TX@typeout@{Reached minimum width, backing up.}% @@ -149,7 +160,9 @@ \ifnum#1<\@m\space\fi \ifnum#1<\@M\space\fi #1.#2#3#4#5#6#7#8\space\space} -\def\arraybackslash{\let\\\@arraycr} +\ifx\arraybackslash\@undefined +\def\arraybackslash{\let\\\tabularnewline} +\fi \def\tracingtabularx{% \def\TX@typeout{\PackageWarningNoLine{tabularx}}% \def\TX@typeout@##1{\typeout{(tabularx) ##1}}} diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty index 78eea384212..2d05bf61200 100644 --- a/Master/texmf-dist/tex/latex/tools/thb.sty +++ b/Master/texmf-dist/tex/latex/tools/thb.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty index 8a2726055c3..482273da9c9 100644 --- a/Master/texmf-dist/tex/latex/tools/thc.sty +++ b/Master/texmf-dist/tex/latex/tools/thc.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty index 0d91ac94c6a..b20611c4c48 100644 --- a/Master/texmf-dist/tex/latex/tools/thcb.sty +++ b/Master/texmf-dist/tex/latex/tools/thcb.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty index 23898e71e58..e89ade53b67 100644 --- a/Master/texmf-dist/tex/latex/tools/theorem.sty +++ b/Master/texmf-dist/tex/latex/tools/theorem.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty index 94e6934a9b0..a6e8246ffda 100644 --- a/Master/texmf-dist/tex/latex/tools/thm.sty +++ b/Master/texmf-dist/tex/latex/tools/thm.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty index 5562d945ce4..2e27ec4f81b 100644 --- a/Master/texmf-dist/tex/latex/tools/thmb.sty +++ b/Master/texmf-dist/tex/latex/tools/thmb.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty index 354d949f52b..50aa8d5f449 100644 --- a/Master/texmf-dist/tex/latex/tools/thp.sty +++ b/Master/texmf-dist/tex/latex/tools/thp.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty index 3db9b0c59a5..a6801ad259b 100644 --- a/Master/texmf-dist/tex/latex/tools/trace.sty +++ b/Master/texmf-dist/tex/latex/tools/trace.sty @@ -8,8 +8,7 @@ %% %% 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. %% @@ -34,12 +33,12 @@ %% %% $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. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{trace} - [2003/04/30 v1.1c trace LaTeX code] + [2014/04/21 v1.1d trace LaTeX code] \NeedsTeXFormat{LaTeX2e}[1998/12/01] \DeclareOption{logonly} {\let\tracingonline@p\z@} @@ -150,11 +149,11 @@ \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/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index ababf87e083..0780913c3d0 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty index d3bc38388de..8a91cdd8865 100644 --- a/Master/texmf-dist/tex/latex/tools/verbatim.sty +++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex index 1649ea539d4..aa55de63d4c 100644 --- a/Master/texmf-dist/tex/latex/tools/verbtest.tex +++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex index 31408bf740f..805386d09c5 100644 --- a/Master/texmf-dist/tex/latex/tools/x.tex +++ b/Master/texmf-dist/tex/latex/tools/x.tex @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty index 869a5ec1492..b990457f12d 100644 --- a/Master/texmf-dist/tex/latex/tools/xr.sty +++ b/Master/texmf-dist/tex/latex/tools/xr.sty @@ -8,8 +8,7 @@ %% %% 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. %% diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty index a3fffe44379..96dda157625 100644 --- a/Master/texmf-dist/tex/latex/tools/xspace.sty +++ b/Master/texmf-dist/tex/latex/tools/xspace.sty @@ -8,8 +8,7 @@ %% %% 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. %% |