From 54aa09d5d6925008eb25609ce953c1b99fd2d2c7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Apr 2016 22:19:48 +0000 Subject: latex2e (1apr16), now including amsmath git-svn-id: svn://tug.org/texlive/trunk@40218 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tools/array.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/bm.sty | 32 +++++++++++++++----- Master/texmf-dist/tex/latex/tools/fontsmpl.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/fontsmpl.tex | 15 ---------- Master/texmf-dist/tex/latex/tools/ftnright.sty | 16 ---------- Master/texmf-dist/tex/latex/tools/multicol.sty | 20 ++----------- Master/texmf-dist/tex/latex/tools/shellesc.sty | 2 +- Master/texmf-dist/tex/latex/tools/tabularx.sty | 6 ++-- Master/texmf-dist/tex/latex/tools/thb.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/thc.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/thcb.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/theorem.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/thm.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/thmb.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/thp.sty | 15 ---------- Master/texmf-dist/tex/latex/tools/trace.sty | 2 -- Master/texmf-dist/tex/latex/tools/varioref.sty | 41 +++++++++++--------------- 17 files changed, 48 insertions(+), 221 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tools') diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index 74f11a0f62b..dc4a9c2bed8 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -40,21 +40,6 @@ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{array} [2014/10/28 v2.4c Tabular extension package (FMi)] -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty index 9a37a9c020e..0b2d9e4a14f 100644 --- a/Master/texmf-dist/tex/latex/tools/bm.sty +++ b/Master/texmf-dist/tex/latex/tools/bm.sty @@ -34,13 +34,14 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% Copyright 1996 1997 1998 1999 2002 2003 2004 David Carlisle Frank Mittelbach +%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 +%% David Carlisle Frank Mittelbach %% %% Development of this package was commissioned by Y&Y Inc. %% http://www.yandy.com \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bm} - [2014/10/28 v1.1c Bold Symbol Support (DPC/FMi)] + [2016/02/27 v1.2a Bold Symbol Support (DPC/FMi)] \def\bm#1#2{% \let\bm@pmb\install@mathalphabet \let\bm@pmb@\getanddefine@fonts @@ -268,7 +269,7 @@ \let\bm@next\bm@add \else\ifcat\noexpand#1\relax \xdef\meaning@{\meaning#1}% - \expandafter\bm@mchar@test\meaning@""\@nil#1% + \expandafter\bm@mchar@test\meaning@""""\@nil#1% \else\ifcat.\ifcat a#1.\else#1\fi \count@\mathcode`#1\relax \ifnum\count@=\mathcode`\'% @@ -333,6 +334,16 @@ \noexpand\@tempa{\mathchar\the\count@\space}}% \@tempb \fi} +\def\bm@umathchar#1#2#3{% +\@tempcnta#2\relax +\count@\bm@table +\ifx\count@=\m@ne +\else + \advance\@tempcnta\count@ +\fi +\bm@xadd{\Umathchar#1\space + \the\@tempcnta\space\space + #3\space}} \def\bm@pmb#1{% \bm@add{\bm@pmb@{#1}}} \def\bm@pmb@#1{{% @@ -390,18 +401,23 @@ \bm@changefam{000}% \bm@xadd{\radical\the\count@\space}}% \edef\bm@mchar@{\meaning\mathchar} -\def\bm@mchar@test#1"#2"#3\@nil#4{% +\edef\bm@umchar@{\string\U\expandafter\@gobble\meaning\mathchar} +\def\bm@mchar@test#1"#2"#3"#4"#5\@nil#6{% \xdef\meaning@{#1}% \ifx\meaning@\bm@mchar@ \count@"#2\relax \bm@mathchar \else - \ifx\bm@previous\@empty - \ifx\relax#4% - \gdef\bm@first{#4}% + \ifx\meaning@\bm@umchar@ + \bm@umathchar{"#2}{"#3}{"#4}% + \else + \ifx\bm@previous\@empty + \ifx\relax#6% + \gdef\bm@first{#6}% + \fi \fi + \bm@add{#6}% \fi - \bm@add{#4}% \fi} \def\bm@changefam#1{% \@tempcnta\count@ diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty index 88ae686131c..a5225af80a2 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fontsmpl}[1994/10/29 Font sample package] diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex index 4535f78ff54..f0363d0fffa 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} \documentclass{article} diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty index e1bbb1dab5d..4f7fb2f2e98 100644 --- a/Master/texmf-dist/tex/latex/tools/ftnright.sty +++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty @@ -41,22 +41,6 @@ \ProvidesPackage{ftnright} [2014/10/28 v1.1f footnote layout package (FMi)] %% -%% \CheckSum{431} -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\preparefootins{% \global\rcol@footinsskip\skip\footins diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index f55e8e2d9bb..72440eda2e6 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -100,23 +100,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2015/08/19 v1.8n multicolumn formatting (FMi)] -%% \CheckSum{1894} -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} + [2016/02/08 v1.8o multicolumn formatting (FMi)] %% \DeclareOption{twocolumn} {\PackageWarning{multicol}{May not work @@ -370,7 +354,6 @@ \newbox\last@line \c@unbalance = 0 \c@collectmore = 0 -\col@number = 1 \multicoltolerance = 9999 \multicolpretolerance = -1 \premulticols = 50pt @@ -937,6 +920,7 @@ \begin{multicols} } \@namedef{endmulticols*}{% + \par \ifdim\lastskip>\z@ \vskip-\lastskip \fi \ifdim \prevdepth>\z@ \vskip-\ifdim\prevdepth>\boxmaxdepth diff --git a/Master/texmf-dist/tex/latex/tools/shellesc.sty b/Master/texmf-dist/tex/latex/tools/shellesc.sty index 154e68b6a7f..9f3c1d45c29 100644 --- a/Master/texmf-dist/tex/latex/tools/shellesc.sty +++ b/Master/texmf-dist/tex/latex/tools/shellesc.sty @@ -44,7 +44,7 @@ \def\next#1#2[#3]{\wlog{#2 #3}} \expandafter\next\fi \ProvidesPackage{shellesc} - [2015/12/05 v0.01 unified shell escape interface for LaTeX] + [2016/02/02 v0.01b unified shell escape interface for LaTeX] \ifcase \ifx\pdfshellescape\@undefined \ifx\shellescape\@undefined diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty index c7b361bfcb8..36b095675d3 100644 --- a/Master/texmf-dist/tex/latex/tools/tabularx.sty +++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty @@ -34,10 +34,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 2012 2014 David Carlisle +%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 2016 David Carlisle \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tabularx} - [2014/10/28 v2.10 `tabularx' package (DPC)] + [2016/02/03 v2.11 `tabularx' package (DPC)] \DeclareOption{infoshow}{\AtEndOfPackage\tracingtabularx} \DeclareOption{debugshow}{\AtEndOfPackage\tracingtabularx} \ProcessOptions @@ -66,7 +66,7 @@ {\the\toks@\end{#1}}\expandafter\TX@get@body\fi} \long\def\TX@find@endtabularxa #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{% - \ifx\TX@#2\else + \ifx\TX@#2\relax\else \toks@\expandafter{\the\toks@#1}% \fi} \long\def\TX@find@endtabularxb diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty index b2b9fca0b29..8d07539f513 100644 --- a/Master/texmf-dist/tex/latex/tools/thb.sty +++ b/Master/texmf-dist/tex/latex/tools/thb.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty index 402902ae89a..5f5f59d703f 100644 --- a/Master/texmf-dist/tex/latex/tools/thc.sty +++ b/Master/texmf-dist/tex/latex/tools/thc.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty index 036d10fe8d5..0a7348b1186 100644 --- a/Master/texmf-dist/tex/latex/tools/thcb.sty +++ b/Master/texmf-dist/tex/latex/tools/thcb.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty index b31badc4597..b2cb74d0543 100644 --- a/Master/texmf-dist/tex/latex/tools/theorem.sty +++ b/Master/texmf-dist/tex/latex/tools/theorem.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty index 22388785279..6a1e45733be 100644 --- a/Master/texmf-dist/tex/latex/tools/thm.sty +++ b/Master/texmf-dist/tex/latex/tools/thm.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty index 8b329a14f81..2e8903752a9 100644 --- a/Master/texmf-dist/tex/latex/tools/thmb.sty +++ b/Master/texmf-dist/tex/latex/tools/thmb.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty index c41a856a9f5..5a914dc090c 100644 --- a/Master/texmf-dist/tex/latex/tools/thp.sty +++ b/Master/texmf-dist/tex/latex/tools/thp.sty @@ -35,21 +35,6 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} %% \def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)} %% diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty index 926cddc2a65..c97467785e2 100644 --- a/Master/texmf-dist/tex/latex/tools/trace.sty +++ b/Master/texmf-dist/tex/latex/tools/trace.sty @@ -36,8 +36,6 @@ %% given in the file `manifest.txt'. %% %% -%% $Id: trace.dtx 5291 2003-06-29 14:44:49Z mittelba $ -%% %% (C) Copyright 1999-2014 Frank Mittelbach %% All rights reserved. %% diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index c333ac0603d..3bb0f149ec9 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -35,7 +35,7 @@ %% given in the file `manifest.txt'. %% %% Package varioref to use with LaTeX2e -%% Copyright (C) 1992-2015 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1992-2016 Frank Mittelbach, all rights reserved. %% %% For additions or updates to the language options please contact %% the author at @@ -46,24 +46,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/05/16] \ProvidesPackage{varioref} - [2015/09/22 v1.5b package for extended references (FMi)] -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} + [2016/02/16 v1.5c package for extended references (FMi)] %% + \def\vref@addto#1#2{% #2% \@temptokena{#2}% @@ -649,12 +635,17 @@ \global\advance\c@vrcnt\@ne \vref@pagenum\@tempa{\the\c@vrcnt @vr}% \vref@pagenum\@tempb{\the\c@vrcnt @xvr}% - \vref@label{\the\c@vrcnt @xvr}% - \ifx\@tempa\@tempb\else - \vref@err{\noexpand\vref or \noexpand\vpageref at page boundary + \vref@label{\the\c@vrcnt @xvr}% + \ifx\@tempa\@tempb + \let\vref@may@loop\relax + \else + \edef\vref@may@loop{% + \noexpand\vref@err{\noexpand\vref or \noexpand\vpageref + at page boundary \@tempb-\@tempa\space (may loop)% }% - \fi + }% + \fi \vrefpagenum\thevpagerefnum{#3}% \vref@space \ifx\@tempa\thevpagerefnum @@ -696,13 +687,17 @@ \fi \fi \else - \reftextfaraway{#3}% + \let\vref@may@loop\relax % added + \reftextfaraway{#3}% \fi \fi }% - {\reftextfaraway{#3}}% + {% + \let\vref@may@loop\relax %added + \reftextfaraway{#3}}% \fi \vref@label{\the\c@vrcnt @vr}% + \vref@may@loop } \def\vref@label#1{\@bsphack \protected@write\@auxout{}% -- cgit v1.2.3