From b2ba0afced5c10391750914c16a2aa06cfaa6a96 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Jan 2017 23:37:33 +0000 Subject: latex2e (22jan17) git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/amsmath/amsmath.sty | 86 +++- Master/texmf-dist/tex/latex/base/fixltx2e.sty | 503 +++++++++++++++++++++- Master/texmf-dist/tex/latex/base/flafter.sty | 2 +- Master/texmf-dist/tex/latex/base/fleqn.clo | 2 +- Master/texmf-dist/tex/latex/base/fltrace.sty | 23 +- Master/texmf-dist/tex/latex/base/fontenc.sty | 2 +- Master/texmf-dist/tex/latex/base/fontmath.cfg | 2 +- Master/texmf-dist/tex/latex/base/fontmath.ltx | 2 +- Master/texmf-dist/tex/latex/base/fonttext.cfg | 2 +- Master/texmf-dist/tex/latex/base/fonttext.ltx | 24 +- Master/texmf-dist/tex/latex/base/latex.ltx | 199 +++++---- Master/texmf-dist/tex/latex/base/latexrelease.sty | 321 ++++++++++++-- Master/texmf-dist/tex/latex/base/leqno.clo | 2 +- Master/texmf-dist/tex/latex/base/ltluatex.lua | 4 +- Master/texmf-dist/tex/latex/base/ltluatex.tex | 2 +- Master/texmf-dist/tex/latex/base/omlenc.def | 2 +- Master/texmf-dist/tex/latex/base/omsenc.def | 2 +- Master/texmf-dist/tex/latex/base/ot1enc.def | 2 +- Master/texmf-dist/tex/latex/base/ot4enc.def | 2 +- Master/texmf-dist/tex/latex/base/preload.cfg | 2 +- Master/texmf-dist/tex/latex/base/source2e.tex | 4 + Master/texmf-dist/tex/latex/base/t1enc.def | 2 +- Master/texmf-dist/tex/latex/base/textcomp.sty | 2 +- Master/texmf-dist/tex/latex/base/tuenc.def | 394 +++++++++++++++++ Master/texmf-dist/tex/latex/base/tulmr.fd | 43 ++ Master/texmf-dist/tex/latex/base/tulmss.fd | 36 ++ Master/texmf-dist/tex/latex/base/tulmtt.fd | 68 +++ Master/texmf-dist/tex/latex/graphics/graphics.sty | 4 +- Master/texmf-dist/tex/latex/graphics/rotating.sty | 2 +- Master/texmf-dist/tex/latex/tools/array.sty | 8 +- Master/texmf-dist/tex/latex/tools/bm.sty | 21 +- 31 files changed, 1613 insertions(+), 157 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/base/tuenc.def create mode 100644 Master/texmf-dist/tex/latex/base/tulmr.fd create mode 100644 Master/texmf-dist/tex/latex/base/tulmss.fd create mode 100644 Master/texmf-dist/tex/latex/base/tulmtt.fd (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty index 2b82aeaaac8..6835f3ce120 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later -\ProvidesPackage{amsmath}[2016/06/28 v2.15d AMS math features] +\ProvidesPackage{amsmath}[2016/11/05 v2.16a AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -71,8 +71,22 @@ \fi }% } +\DeclareOption{alignedleftspaceyes}{\def\alignedspace@left{\null\,}} +\DeclareOption{alignedleftspaceno}{\def\alignedspace@left{\null}} +\DeclareOption{alignedleftspaceyesifneg}{% +\def\alignedspace@left{% + \edef\@tempa{\expandafter\@car\the\lastskip\@nil}% + \if-\@tempa\null\,% + \else + \edef\@tempa{\expandafter\@car\the\lastkern\@nil}% + \if-\@tempa\null\,% + \else\null + \fi + \fi}% +} \DeclareOption{?}{} -\ExecuteOptions{nointlimits,sumlimits,namelimits,centertags} +\ExecuteOptions{% + nointlimits,sumlimits,namelimits,centertags,alignedleftspaceyesifneg} \ProcessOptions\par \@ifpackagewith{amsmath}{?}{% \typeout{^^J% @@ -202,12 +216,76 @@ Foreign command \@backslashchar#1;\MessageBreak \DeclareRobustCommand{\binom}{\genfrac()\z@{}} \newcommand{\dbinom}{\genfrac(){0pt}0} \newcommand{\tbinom}{\genfrac(){0pt}1} +\ifx\directlua\@undefined +\ifx\XeTeXcharclass\@undefined \DeclareRobustCommand{\genfrac}[4]{% \def\@tempa{#1#2}% \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}% \csname @@\ifx @#3@over\else above\fi \ifx\@tempa\@empty \else withdelims\fi\endcsname} \@tempb{#1#2#3}} +\else +\def\genfrac@rule#1#2#3#4{% +\hbox{$\left#1\vcenter{\hrule \@width\z@ + \@height + \ifdim\fontdimen#2#3\tw@=\z@ + #4\fontdimen6#3\tw@ + \else + \fontdimen#2#3\tw@ + \fi + }\right.$}} +\def\genfrac@choice#1#2{% +\ifx @#2@\else +{\delimitershortfall\z@\delimiterfactor\@m + \mathsurround\z@\nulldelimiterspace\z@ +\ifx c#1\kern-\nulldelimiterspace\fi +\mathchoice +{\genfrac@rule{#2}{20}\textfont{2.39}}% +{\genfrac@rule{#2}{21}\textfont{1}}% +{\genfrac@rule{#2}{21}\scriptfont{1.45}}% +{\genfrac@rule{#2}{21}\scriptscriptfont{1.35}}% +}% +\ifx o#1\kern-\nulldelimiterspace\fi +\fi +} +\DeclareRobustCommand{\genfrac}[6]{{% +\@mathstyle{#4}% +\genfrac@choice o{#1}% +{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}% +\genfrac@choice c{#2}% +}} +\fi +\else +\def\genfrac@rule#1#2#3{% +\hbox{$\left#1\vcenter{\hrule \@width\z@ + \@height + \ifdim\Umathfractiondelsize#2=\z@ + #3\fontdimen6#3\tw@ + \else + \Umathfractiondelsize#2% + \fi + }\right.$}} +\def\genfrac@choice#1#2{% +\ifx @#2@\else +{\delimitershortfall\z@\delimiterfactor\@m + \mathsurround\z@\nulldelimiterspace\z@ +\ifx c#1\kern-\nulldelimiterspace\fi +\mathchoice +{\genfrac@rule{#2}\displaystyle{2.39}}% +{\genfrac@rule{#2}\textstyle{1}}% +{\genfrac@rule{#2}\scriptstyle{1.45}}% +{\genfrac@rule{#2}\scriptscriptstyle{1.35}}% +}% +\ifx o#1\kern-\nulldelimiterspace\fi +\fi +} +\DeclareRobustCommand{\genfrac}[6]{{% +\@mathstyle{#4}% +\genfrac@choice o{#1}% +{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}% +\genfrac@choice c{#2}% +}} +\fi \def\@genfrac#1#2#3#4#5{{#1{\begingroup#4\endgroup#2#3\relax#5}}} \def\@mathstyle#1{% \ifx\@empty#1\@empty\relax @@ -1264,7 +1342,7 @@ and fix things up.} \nonmatherr@{\begin{\@currenvir}}% \fi \savecolumn@ % Assumption: called inside a group - \null\,% + \alignedspace@left \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup \maxfields@#2\relax \ifnum\maxfields@>\m@ne @@ -1328,7 +1406,7 @@ and fix things up.} \RIfM@\else \nonmatherr@{\begin{gathered}}% \fi - \null\,% + \alignedspace@left \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup \Let@ \chardef\dspbrk@context\@ne \restore@math@cr \spread@equation diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty index 5b461f84165..4f5ae2220e8 100644 --- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty +++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty @@ -42,12 +42,513 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesPackage{fixltx2e} - [2015/06/22 v2.0b fixes to LaTeX (obsolete)] + [2016/12/29 v2.1a fixes to LaTeX (obsolete)] +\IncludeInRelease{2015/01/01}{\fixltxe}{Old fixltx2e package} \NeedsTeXFormat{LaTeX2e} \PackageWarningNoLine{fixltx2e}{% fixltx2e is not required with releases after 2015\MessageBreak All fixes are now in the LaTeX kernel.\MessageBreak See the latexrelease package for details} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\fixltxe}{Old fixltx2e package} +\def\@outputdblcol{% + \if@firstcolumn + \global\@firstcolumnfalse + \global\setbox\@leftcolumn\copy\@outputbox + \splitmaxdepth\maxdimen + \vbadness\maxdimen + \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}% + \setbox\@outputbox\vsplit\@outputbox to\maxdimen + \toks@\expandafter{\topmark}% + \xdef\@firstcoltopmark{\the\toks@}% + \toks@\expandafter{\splitfirstmark}% + \xdef\@firstcolfirstmark{\the\toks@}% + \ifx\@firstcolfirstmark\@empty + \global\let\@setmarks\relax + \else + \gdef\@setmarks{% + \let\firstmark\@firstcolfirstmark + \let\topmark\@firstcoltopmark}% + \fi + \else + \global\@firstcolumntrue + \setbox\@outputbox\vbox{% + \hb@xt@\textwidth{% + \hb@xt@\columnwidth{\box\@leftcolumn \hss}% + \hfil + {\normalcolor\vrule \@width\columnseprule}% + \hfil + \hb@xt@\columnwidth{\box\@outputbox \hss}}}% + \@combinedblfloats + \@setmarks + \@outputpage + \begingroup + \@dblfloatplacement + \@startdblcolumn + \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}% + \endgroup + \fi} +\def\end@dblfloat{% + \if@twocolumn + \@endfloatbox + \ifnum\@floatpenalty <\z@ + \@largefloatcheck + \global\dp\@currbox1sp % + \@cons\@currlist\@currbox + \ifnum\@floatpenalty <-\@Mii + \penalty -\@Miv + \@tempdima\prevdepth + \vbox{}% + \prevdepth\@tempdima + \penalty\@floatpenalty + \else + \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack + \fi + \fi + \else + \end@float + \fi +} +\def\@testwrongwidth #1{% + \ifdim\dp#1=\f@depth + \else + \global\@testtrue + \fi} +\let\f@depth\z@ +\def\@dblfloatplacement{\global\@dbltopnum\c@dbltopnumber + \global\@dbltoproom \dbltopfraction\@colht + \@textmin \@colht + \advance \@textmin -\@dbltoproom + \@fpmin \dblfloatpagefraction\textheight + \@fptop \@dblfptop + \@fpsep \@dblfpsep + \@fpbot \@dblfpbot + \def\f@depth{1sp}} +\def \@doclearpage {% + \ifvoid\footins + \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa + \setbox\@tempboxa\box\@cclv + \xdef\@deferlist{\@toplist\@botlist\@deferlist}% + \global \let \@toplist \@empty + \global \let \@botlist \@empty + \global \@colroom \@colht + \ifx \@currlist\@empty + \else + \@latexerr{Float(s) lost}\@ehb + \global \let \@currlist \@empty + \fi + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% + \if@twocolumn + \if@firstcolumn + \xdef\@deferlist{\@dbltoplist\@deferlist}% + \global \let \@dbltoplist \@empty + \global \@colht \textheight + \begingroup + \@dblfloatplacement + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@outputpage + \@makefcolumn\@deferlist}% + \endgroup + \else + \vbox{}\clearpage + \fi + \fi + \ifx\@deferlist\@empty \else\clearpage \fi + \else + \setbox\@cclv\vbox{\box\@cclv\vfil}% + \@makecol\@opcol + \clearpage + \fi +} +\def \@startdblcolumn {% + \@tryfcolumn \@deferlist + \if@fcolmade + \else + \begingroup + \let \reserved@b \@deferlist + \global \let \@deferlist \@empty + \let \@elt \@sdblcolelt + \reserved@b + \endgroup + \fi +} +\def\@addtonextcol{% + \begingroup + \@insertfalse + \@setfloattypecounts + \ifnum \@fpstype=8 + \else + \ifnum \@fpstype=24 + \else + \@flsettextmin + \@reqcolroom \ht\@currbox + \advance \@reqcolroom \@textmin + \ifdim \@colroom>\@reqcolroom + \@flsetnum \@colnum + \ifnum\@colnum>\z@ + \@bitor\@currtype\@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@addtotoporbot + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@cons\@deferlist\@currbox + \fi + \endgroup +} +\def\@addtodblcol{% + \begingroup + \@insertfalse + \@setfloattypecounts + \@getfpsbit \tw@ + \ifodd\@tempcnta + \@flsetnum \@dbltopnum + \ifnum \@dbltopnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dbltoplist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dbltopnum \m@ne + \@cons \@dbltoplist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \if@insert + \else + \@cons\@deferlist\@currbox + \fi + \endgroup +} +\def \@addtocurcol {% + \@insertfalse + \@setfloattypecounts + \ifnum \@fpstype=8 + \else + \ifnum \@fpstype=24 + \else + \@flsettextmin + \advance \@textmin \@textfloatsheight + \@reqcolroom \@pageht + \ifdim \@textmin>\@reqcolroom + \@reqcolroom \@textmin + \fi + \advance \@reqcolroom \ht\@currbox + \ifdim \@colroom>\@reqcolroom + \@flsetnum \@colnum + \ifnum \@colnum>\z@ + \@bitor\@currtype\@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@bitor\@currtype\@botlist + \if@test + \@addtobot + \else + \ifodd \count\@currbox + \advance \@reqcolroom \intextsep + \ifdim \@colroom>\@reqcolroom + \global \advance \@colnum \m@ne + \global \advance \@textfloatsheight \ht\@currbox + \global \advance \@textfloatsheight 2\intextsep + \@cons \@midlist \@currbox + \if@nobreak + \nobreak + \@nobreakfalse + \everypar{}% + \else + \addpenalty \interlinepenalty + \fi + \vskip \intextsep + \box\@currbox + \penalty\interlinepenalty + \vskip\intextsep + \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi + \outputpenalty \z@ + \@inserttrue + \fi + \fi + \if@insert + \else + \@addtotoporbot + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@resethfps + \@cons\@deferlist\@currbox + \fi +} +\def\@xtryfc #1{% + \@next\reserved@a\@trylist{}{}% + \@currtype \count #1% + \divide\@currtype\@xxxii + \multiply\@currtype\@xxxii + \@bitor \@currtype \@failedlist + \@testfp #1% + \@testwrongwidth #1% + \ifdim \ht #1>\@colht + \@testtrue + \fi + \if@test + \@cons\@failedlist #1% + \else + \@ytryfc #1% + \fi} +\def\@ztryfc #1{% + \@tempcnta\count #1% + \divide\@tempcnta\@xxxii + \multiply\@tempcnta\@xxxii + \@bitor \@tempcnta {\@failedlist \@flfail}% + \@testfp #1% + \@testwrongwidth #1% + \@tempdimb\@tempdima + \advance\@tempdimb\ht #1% + \advance\@tempdimb\@fpsep + \ifdim \@tempdimb >\@colht + \@testtrue + \fi + \if@test + \@cons\@flfail #1% + \else + \@cons\@flsucceed #1% + \@tempdima\@tempdimb + \fi} +\def\@{\spacefactor\@m{}} +\def\@tempa#1#2{#1#2\relax} +\ifx\setlength\@tempa + \def\setlength#1#2{#1 #2\relax} +\fi +\def\addpenalty#1{% + \ifvmode + \if@minipage + \else + \if@nobreak + \else + \ifdim\lastskip=\z@ + \penalty#1\relax + \else + \@tempskipb\lastskip + \begingroup + \advance \@tempskipb + \ifdim\prevdepth>\maxdepth\maxdepth\else + \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi + \fi + \vskip -\@tempskipb + \penalty#1% + \vskip\@tempskipb + \endgroup + \vskip -\@tempskipb + \vskip \@tempskipb + \fi + \fi + \fi + \else + \@noitemerr + \fi} +\def\@fnsymbol#1{% + \ifcase#1\or \TextOrMath\textasteriskcentered *\or + \TextOrMath \textdagger \dagger\or + \TextOrMath \textdaggerdbl \ddagger \or + \TextOrMath \textsection \mathsection\or + \TextOrMath \textparagraph \mathparagraph\or + \TextOrMath \textbardbl \|\or + \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or + \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or + \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else + \@ctrerr \fi +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname eTeXversion\endcsname\relax +\DeclareRobustCommand\TextOrMath{% + \ifmmode \expandafter\@secondoftwo + \else \expandafter\@firstoftwo \fi} +\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}} +\else +\protected\expandafter\def\csname TextOrMath\space\endcsname{% + \ifmmode \expandafter\@secondoftwo + \else \expandafter\@firstoftwo \fi} +\edef\TextOrMath#1#2{% + \expandafter\noexpand\csname TextOrMath\space\endcsname + {#1}{#2}} +\fi +\def\@esphack{% + \relax + \ifhmode + \spacefactor\@savsf + \ifdim\@savsk>\z@ + \nobreak \hskip\z@skip % <------ + \ignorespaces + \fi + \fi} +\def\@Esphack{% + \relax + \ifhmode + \spacefactor\@savsf + \ifdim\@savsk>\z@ + \nobreak \hskip\z@skip % <------ + \@ignoretrue + \ignorespaces + \fi + \fi} +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \itshape \fi} +\def\eminnershape{\upshape} +\DeclareRobustCommand*\textsubscript[1]{% + \@textsubscript{\selectfont#1}} +\def\@textsubscript#1{% + {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} +\def\@DeclareMathSizes #1#2#3#4#5{% + \@defaultunits\dimen@ #2pt\relax\@nnil + \if $#3$% + \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse + \else + \@defaultunits\dimen@ii #3pt\relax\@nnil + \@defaultunits\@tempdima #4pt\relax\@nnil + \@defaultunits\@tempdimb #5pt\relax\@nnil + \toks@{#1}% + \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{% + \gdef\noexpand\tf@size{\strip@pt\dimen@ii}% + \gdef\noexpand\sf@size{\strip@pt\@tempdima}% + \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}% + \the\toks@ + }% + \fi +} +\providecommand*\MakeRobust[1]{% + \@ifundefined{\expandafter\@gobble\string#1}{% + \@latex@error{The control sequence `\string#1' is undefined!% + \MessageBreak There is nothing here to make robust}% + \@eha + }% + {% + \@ifundefined{\expandafter\@gobble\string#1\space}% + {% + \expandafter\let\csname + \expandafter\@gobble\string#1\space\endcsname=#1% + \edef\reserved@a{\string#1}% + \def\reserved@b{#1}% + \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}% + \edef#1{% + \ifx\reserved@a\reserved@b + \noexpand\x@protect\noexpand#1% + \fi + \noexpand\protect\expandafter\noexpand + \csname\expandafter\@gobble\string#1\space\endcsname}% + }% + {\@latex@info{The control sequence `\string#1' is already robust}}% + }% +} +\MakeRobust\( +\MakeRobust\) +\MakeRobust\[ +\MakeRobust\] +\MakeRobust\makebox +\MakeRobust\savebox +\MakeRobust\framebox +\MakeRobust\parbox +\MakeRobust\rule +\MakeRobust\raisebox +\def\@xfloat #1[#2]{% + \@nodocument + \def \@captype {#1}% + \def \@fps {#2}% + \@onelevel@sanitize \@fps + \def \reserved@b {!}% + \ifx \reserved@b \@fps + \@fpsadddefault + \else + \ifx \@fps \@empty + \@fpsadddefault + \fi + \fi + \ifhmode + \@bsphack + \@floatpenalty -\@Mii + \else + \@floatpenalty-\@Miii + \fi + \ifinner + \@parmoderr\@floatpenalty\z@ + \else + \@next\@currbox\@freelist + {% + \@tempcnta \sixt@@n + \expandafter \@tfor \expandafter \reserved@a + \expandafter :\expandafter =\@fps + \do + {% + \if \reserved@a h% + \ifodd \@tempcnta + \else + \advance \@tempcnta \@ne + \fi + \else\if \reserved@a t% + \@setfpsbit \tw@ + \else\if \reserved@a b% + \@setfpsbit 4% + \else\if \reserved@a p% + \@setfpsbit 8% + \else\if \reserved@a !% + \ifnum \@tempcnta>15 + \advance\@tempcnta -\sixt@@n\relax + \fi + \else + \@latex@error{Unknown float option `\reserved@a'}% + {Option `\reserved@a' ignored and `p' used.}% + \@setfpsbit 8% + \fi\fi\fi\fi\fi + }% + \@tempcntb \csname ftype@\@captype \endcsname + \multiply \@tempcntb \@xxxii + \advance \@tempcnta \@tempcntb + \global \count\@currbox \@tempcnta + }% + \@fltovf + \fi + \global \setbox\@currbox + \color@vbox + \normalcolor + \vbox \bgroup + \hsize\columnwidth + \@parboxrestore + \@floatboxreset +} + \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}} +\EndIncludeInRelease \endinput %% %% End of file `fixltx2e.sty'. diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty index 750fcc366a8..83890eff763 100644 --- a/Master/texmf-dist/tex/latex/base/flafter.sty +++ b/Master/texmf-dist/tex/latex/base/flafter.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutput.dtx \ProvidesPackage{flafter} - [2015/09/05 v1.3a + [2016/10/04 v1.3b Standard LaTeX floats after reference (FMi)] \IncludeInRelease{2015/01/01}% {\@addtocurcol}{float order in 2-column}% diff --git a/Master/texmf-dist/tex/latex/base/fleqn.clo b/Master/texmf-dist/tex/latex/base/fleqn.clo index 1212f4196b2..e070424dafc 100644 --- a/Master/texmf-dist/tex/latex/base/fleqn.clo +++ b/Master/texmf-dist/tex/latex/base/fleqn.clo @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltmath.dtx \ProvidesFile{fleqn.clo} - [2015/03/31 v1.1i Standard LaTeX option + [2016/12/29 v1.2a Standard LaTeX option (flush left equations)] \newdimen\mathindent \AtEndOfClass{\mathindent\leftmargini} diff --git a/Master/texmf-dist/tex/latex/base/fltrace.sty b/Master/texmf-dist/tex/latex/base/fltrace.sty index 255ca166058..529383b2e96 100644 --- a/Master/texmf-dist/tex/latex/base/fltrace.sty +++ b/Master/texmf-dist/tex/latex/base/fltrace.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutput.dtx \ProvidesPackage{fltrace} - [2015/09/05 v1.3a + [2016/10/04 v1.3b Tracing LaTeX floats algorithm (FMi)] \def\onecolumn{% \clearpage @@ -1087,9 +1087,11 @@ (flcheckspace \string#1 \string#2)}% \fi } +\IncludeInRelease{2017/01/01}% + {\@makefcolumn}{negative height floats}% \def\@makefcolumn #1{% \begingroup - \@fpmin \z@ + \@fpmin -\maxdimen \let \@testfp \@gobble \@tryfcolumn #1% \endgroup @@ -1099,6 +1101,23 @@ \fl@trace{----- float column/page completed from \string#1}% \fi } +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@makefcolumn}{negative height floats}% +\def\@makefcolumn #1{% + \begingroup + \@fpmin \z@ + \let \@testfp \@gobble + \@tryfcolumn #1% + \endgroup + \if@fcolmade + \fl@trace{PAGE: in \string\clearpage + \if@twocolumn ---twocolumn\fi---}% + \fl@trace{----- float column/page completed + from \string#1}% + \fi +} +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\@outputdblcol}{2 column marks}% \def\@outputdblcol{% diff --git a/Master/texmf-dist/tex/latex/base/fontenc.sty b/Master/texmf-dist/tex/latex/base/fontenc.sty index 8829e7cd00e..4252a0ab93b 100644 --- a/Master/texmf-dist/tex/latex/base/fontenc.sty +++ b/Master/texmf-dist/tex/latex/base/fontenc.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesPackage{fontenc} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX package] \def\update@uclc@with@cyrillic{% \expandafter\def\expandafter\@uclclist\expandafter diff --git a/Master/texmf-dist/tex/latex/base/fontmath.cfg b/Master/texmf-dist/tex/latex/base/fontmath.cfg index 11085c60efe..5f289bfac53 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.cfg +++ b/Master/texmf-dist/tex/latex/base/fontmath.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.cfg} - [2014/09/29 v2.3a LaTeX Kernel + [2016/12/03 v3.0a LaTeX Kernel (Uncustomised math font setup)] %% diff --git a/Master/texmf-dist/tex/latex/base/fontmath.ltx b/Master/texmf-dist/tex/latex/base/fontmath.ltx index 31c04ccdf7d..fceefefedb8 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.ltx +++ b/Master/texmf-dist/tex/latex/base/fontmath.ltx @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.ltx} - [2014/09/29 v2.3a LaTeX Kernel + [2016/12/03 v3.0a LaTeX Kernel (Math font setup)] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} diff --git a/Master/texmf-dist/tex/latex/base/fonttext.cfg b/Master/texmf-dist/tex/latex/base/fonttext.cfg index dfabbb69e62..c568976ee75 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.cfg +++ b/Master/texmf-dist/tex/latex/base/fonttext.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.cfg} - [2014/09/29 v2.3a LaTeX Kernel + [2016/12/03 v3.0a LaTeX Kernel (Uncustomised text font setup)] %% diff --git a/Master/texmf-dist/tex/latex/base/fonttext.ltx b/Master/texmf-dist/tex/latex/base/fonttext.ltx index a9a3afcd9e2..a6191f92b2f 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.ltx +++ b/Master/texmf-dist/tex/latex/base/fonttext.ltx @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.ltx} - [2014/09/29 v2.3a LaTeX Kernel + [2016/12/03 v3.0a LaTeX Kernel (Text font setup)] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} @@ -45,7 +45,20 @@ \input {t1enc.def} \input {ot1enc.def} % <- should come after T1 for speed \input {omsenc.def} +\ifx\Umathchar\@undefined \fontencoding{OT1} +\else +\input {tuenc.def} +\fontencoding{TU} +\DeclareFontSubstitution{TU}{lmr}{m}{n} +\begingroup +\nfss@catcodes +\input {tulmr.fd} +\input {tulmss.fd} +\input {tulmtt.fd} +\endgroup +\DeclareFontSubstitution{TU}{lmr}{m}{n} +\fi \DeclareFontEncodingDefaults{}{} \DeclareFontSubstitution{T1}{cmr}{m}{n} \DeclareFontSubstitution{OT1}{cmr}{m}{n} @@ -60,16 +73,23 @@ \input {ot1cmtt.fd} \endgroup \DeclareErrorFont{OT1}{cmr}{m}{n}{10} +\ifx\Umathchar\@undefined +\newcommand\encodingdefault{OT1} \newcommand\rmdefault{cmr} \newcommand\sfdefault{cmss} \newcommand\ttdefault{cmtt} +\else +\newcommand\encodingdefault{TU} +\newcommand\rmdefault{lmr}\fontfamily{\rmdefault} +\newcommand\sfdefault{lmss} +\newcommand\ttdefault{lmtt} +\fi \newcommand\bfdefault{bx} \newcommand\mddefault{m} \newcommand\itdefault{it} \newcommand\sldefault{sl} \newcommand\scdefault{sc} \newcommand\updefault{n} -\newcommand\encodingdefault{OT1} \newcommand\familydefault{\rmdefault} \newcommand\seriesdefault{\mddefault} \newcommand\shapedefault{\updefault} diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index d07e888c1a4..98f07a3dafc 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -93,6 +93,11 @@ tex.extraprimitives("omega", "aleph", "luatex"))} \fi \fi +\ifx\eTeXversion\undefined + \errmessage + {LaTeX requires e-TeX} + \expandafter\endinput +\fi \catcode`\#=6 \catcode`\^=7 \chardef\active=13 @@ -283,7 +288,7 @@ \catcode`\_=8 % underline and downarrow are for subscripts \catcode`\^^I=10 % ascii tab is a blank space \chardef\active=13 \catcode`\~=\active % tilde is active -\catcode`\^^L=\active \outer\def^^L{\par}% ascii form-feed is \outer\par +\catcode`\^^L=\active \def^^L{\par}% ascii form-feed is \par \message{catcodes,} \def\dospecials{\do\ \do\\\do\{\do\}\do\$\do\&% \do\#\do\^\do\_\do\%\do\~} @@ -345,8 +350,12 @@ \fi \def\new@mathgroup {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top} -\def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi} \let\newfam\new@mathgroup +\ifx\directlua\@undefined + \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi} +\else + \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne{16384}} +\fi \ifx\directlua\@undefined \ifx\widowpenalties\@undefined \mathchardef\e@alloc@top=255 @@ -468,22 +477,6 @@ \newdimen\z@ \z@=0pt % can be used both for 0pt and 0 \newskip\z@skip \z@skip=0pt plus0pt minus0pt \newbox\voidb@x % permanently void box register -\message{compatibility for TeX 2, } -\ifx\@undefined\inputlineno - \newcount\inputlineno - \inputlineno-1 - \ifx\@undefined\language - \newcount\language - \fi - \newcount\lefthyphenmin - \newcount\righthyphenmin - \newcount\errorcontextlines - \newcount\holdinginserts - \newdimen\emergencystretch - \newcount\badness - \let\noboundary\relax - \newcount\setlanguage -\fi \message{parameters,} \pretolerance=100 \tolerance=200 % INITEX sets this to 10000 @@ -578,7 +571,7 @@ \def\hglue{\afterassignment\hgl@\skip@=} \def\hgl@{\leavevmode \count@\spacefactor \vrule \@width\z@ \nobreak\hskip\skip@ \spacefactor\count@} -\def\slash{/\penalty\exhyphenpenalty} % a `/' that acts like a `-' +\def\slash{/\penalty\exhyphenpenalty} \def\break{\penalty-\@M} \def\nobreak{\penalty \@M} \def\allowbreak{\penalty \z@} @@ -704,8 +697,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2016/03/31} -\def\patch@level{3} + {2017/01/01} +\def\patch@level{0} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -1288,11 +1281,7 @@ Type H for immediate help.}% \@latex@info{#1\@gobble}} \let\c@errorcontextlines\errorcontextlines \c@errorcontextlines=-1 -\ifnum\inputlineno=\m@ne - \let\on@line\@empty -\else - \def\on@line{ on input line \the\inputlineno} -\fi +\def\on@line{ on input line \the\inputlineno} \let\@warning\@latex@warning \let\@@warning\@latex@warning@no@line \global\let\@latexerr\@latex@error @@ -2164,7 +2153,7 @@ Type H for immediate help.}% \@ctrerr \fi }% \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname eTeXversion\endcsname\relax +\expandafter\ifx\csname protected\endcsname\relax \DeclareRobustCommand\TextOrMath{% \ifmmode \expandafter\@secondoftwo \else \expandafter\@firstoftwo \fi} @@ -2588,6 +2577,7 @@ Type H for immediate help.}% \ifx\noaccents@\@undefined \let\noaccents@\@empty \fi +\ifx\XeTeXcharclass\@undefined \gdef\showhyphens#1{% \setbox0\vbox{% \color@begingroup @@ -2596,6 +2586,54 @@ Type H for immediate help.}% \normalfont \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1% \color@endgroup}} +\else +\long\def\showhyphens#1{% + \setbox0\vbox{% + \usefont{TU}{lmr}{m}{n}% + \hsize 1sp % + \hbadness\@M + \hfuzz\maxdimen + \tracingonline\z@ + \everypar={}% + \leftskip\z@skip + \rightskip\z@skip + \parfillskip\z@skip + \hyphenpenalty=-\@M + \pretolerance\m@ne + \interlinepenalty\z@ + \clubpenalty\z@ + \widowpenalty\z@ + \brokenpenalty1127 % + \setbox\z@\hbox{}% + \noindent + \hskip\z@skip + #1% + \par + \loop + \@tempswafalse + \ifnum\lastnodetype=11\unskip\@tempswatrue\fi + \ifnum\lastnodetype=12\unkern\@tempswatrue\fi + \ifnum\lastnodetype=13 % + \count@\lastpenalty + \unpenalty\@tempswatrue + \fi + \ifnum\lastnodetype=\@ne + \setbox\tw@\lastbox\@tempswatrue + \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty + \ifnum\count@=1127 \else\ \fi + \unhbox0}% + \count@\z@ + \fi + \if@tempswa + \repeat + \hbadness\z@ + \hsize\maxdimen + \showboxdepth\z@ + \tolerance\m@ne + \hyphenpenalty\z@ + \noindent\unhbox\z@ +}} +\fi \long\def\addto@hook#1#2{#1\expandafter{\the#1#2}} \def\@vpt{5} \def\@vipt{6} @@ -3460,7 +3498,8 @@ Type H for immediate help.}% \advance\count\tw@-\count@ \if\relax\noexpand#1% is command? \edef\reserved@a - {\noexpand\in@{\expandafter\@gobble\string\mathchar}{\meaning#1}}% + {\noexpand\in@{\expandafter\@gobble\string\mathchar}% + {\meaning#1}}% \reserved@a \ifin@ \expandafter\set@mathsymbol @@ -3851,25 +3890,6 @@ Type H for immediate help.}% \DeclareErrorFont{OT1}{cmr}{m}{n}{10} %% don't modify this setting %% overwrite it in fontdef.cfg %% if necessary -\ifnum\inputlineno=\m@ne -\InputIfFileExists{fonttext.cfg} - {\typeout{====================================^^J% - ^^J% - Local config file fonttext.cfg used^^J% - ^^J% - ====================================}% - \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}% - } - {\typeout{!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J% - !^^J% - ! You MUST use a fonttext.cfg file!^^J% - ! As you are still using TeX2!!!!!^^J% - !^^J% - ! See the documentation file tex2.txt^^J% - !^^J% - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}% - \batchmode \@@end} -\else \InputIfFileExists{fonttext.cfg} {\typeout{====================================^^J% ^^J% @@ -3879,7 +3899,6 @@ Type H for immediate help.}% \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}% } {\input{fonttext.ltx}} -\fi \let\@addtofilelist\@gobble \InputIfFileExists{fontmath.cfg} {\typeout{====================================^^J% @@ -7388,7 +7407,7 @@ Type H for immediate help.}% } \def\@makefcolumn #1{% \begingroup - \@fpmin \z@ + \@fpmin -\maxdimen \let \@testfp \@gobble \@tryfcolumn #1% \endgroup @@ -7546,7 +7565,8 @@ Type H for immediate help.}% \@onlypreamble\@if@ptions \def\@if@pti@ns#1#2{% \let\reserved@a\@firstoftwo - \@for\reserved@b:=#2\do{% + \edef\reserved@b{\zap@space#2 \@empty}% + \@for\reserved@b:=\reserved@b\do{% \ifx\reserved@b\@empty \else \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}% @@ -7669,8 +7689,10 @@ Type H for immediate help.}% \csname ds@\CurrentOption\endcsname} \@onlypreamble\@use@ption \def\ExecuteOptions#1{% + \edef\@fortmp{\zap@space#1 \@empty}% \def\reserved@a##1\@nil{% - \@for\CurrentOption:=#1\do{\csname ds@\CurrentOption\endcsname}% + \@for\CurrentOption:=\@fortmp\do + {\csname ds@\CurrentOption\endcsname}% \edef\CurrentOption{##1}}% \expandafter\reserved@a\CurrentOption\@nil} \@onlypreamble\ExecuteOptions @@ -7766,15 +7788,15 @@ Type H for immediate help.}% \fi \else \def\reserved@b##1,{% - \ifx\@nil##1\relax\else - \ifx\relax##1\relax\else + \ifx\@nnil##1\relax\else + \ifx\@nnil##1\@nnil\else \noexpand\@onefilewithoptions##1[{#2}][{#4}]% \noexpand\@pkgextension \fi \expandafter\reserved@b \fi}% \edef\reserved@a{\zap@space#3 \@empty}% - \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nil,}% + \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}% \fi \reserved@a} \@onlypreamble\@fileswith@pti@ns @@ -8142,6 +8164,30 @@ Type H for immediate help.}% \directlua{require("ltluatex")} \endgroup } +\everyjob\expandafter{% + \the\everyjob + \directlua{% +%% Horrible hack, locally reset the luatex version number +%% This is not required for the source version of luaotfload +%% but is required due to an error in the version check in the +%% public version (January 2017) +%% https://github.com/lualatex/luaotfload/issues/387 +%% It is expected that this will be removed before TeXLive 2017 + local tmp_version=tex.luatexversion % + tex.luatexversion=199 % + if xpcall(function ()% + require('luaotfload-main')% + end,texio.write_nl) then % + local _void = luaotfload.main ()% + else % + texio.write_nl('Error in luaotfload: reverting to OT1')% + tex.print('\string\\def\string\\encodingdefault{OT1}')% + end % + tex.luatexversion=tmp_version% + }% + \let\f@encoding\encodingdefault + \expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion + } \fi %%% From File: ltfinal.dtx \tracingstats1 @@ -8204,10 +8250,8 @@ Type H for immediate help.}% \lccode#1=#1 } \reserved@a{`\a}{`\z} -\ifnum\inputlineno=\m@ne\else - \reserved@a{"A0}{"BC} - \reserved@a{"E0}{"FF} -\fi +\reserved@a{"A0}{"BC} +\reserved@a{"E0}{"FF} \def\reserved@c#1{% \count@=#1\advance\count@ by "20 \uccode#1=#1 @@ -8215,20 +8259,16 @@ Type H for immediate help.}% \sfcode#1=999 } \reserved@a{`\A}{`\Z} -\ifnum\inputlineno=\m@ne\else - \reserved@a{"80}{"9C} - \reserved@a{"C0}{"DF} -\fi +\reserved@a{"80}{"9C} +\reserved@a{"C0}{"DF} \uccode`\^^Y=`\I % dotless i \lccode`\^^Y=`\^^Y % dotless i \uccode`\^^Z=`\J % dotless j, ae in OT1 \lccode`\^^Z=`\^^Z % dotless j, ae in OT1 -\ifnum\inputlineno=\m@ne\else - \lccode`\^^9d=`\i % dotted I - \uccode`\^^9d=`\^^9d % dotted I - \lccode`\^^9e=`\^^9e % d-bar - \uccode`\^^9e=`\^^d0 % d-bar -\fi +\lccode`\^^9d=`\i % dotted I +\uccode`\^^9d=`\^^9d % dotted I +\lccode`\^^9e=`\^^9e % d-bar +\uccode`\^^9e=`\^^d0 % d-bar \lccode`\^^[=`\^^[ % oe in OT1 \lccode`\- =`\- % default hyphen char \lccode 127=127 % alternate hyphen char @@ -8303,7 +8343,6 @@ Type H for immediate help.}% \reserved@a{0}{`\^^H} \reserved@c{`\^^K} \reserved@a{`\^^N}{31} - \catcode"7F=15 \ifnum 0% \ifx\Umathcode\@undefined\else 1\fi \ifx\XeTeXmathcode\@undefined\else 1\fi @@ -8315,10 +8354,8 @@ Type H for immediate help.}% \lccode#1=#1 } \reserved@a{`\a}{`\z} -\ifnum\inputlineno=\m@ne\else - \reserved@a{"A0}{"BC} - \reserved@a{"E0}{"FF} -\fi +\reserved@a{"A0}{"BC} +\reserved@a{"E0}{"FF} \def\reserved@c#1{% \count@=#1\advance\count@ by "20 \uccode#1=#1 @@ -8326,20 +8363,16 @@ Type H for immediate help.}% \sfcode#1=999 } \reserved@a{`\A}{`\Z} -\ifnum\inputlineno=\m@ne\else - \reserved@a{"80}{"9C} - \reserved@a{"C0}{"DF} -\fi +\reserved@a{"80}{"9C} +\reserved@a{"C0}{"DF} \uccode`\^^Y=`\I % dotless i \lccode`\^^Y=`\^^Y % dotless i \uccode`\^^Z=`\J % dotless j, ae in OT1 \lccode`\^^Z=`\^^Z % dotless j, ae in OT1 -\ifnum\inputlineno=\m@ne\else - \lccode`\^^9d=`\i % dotted I - \uccode`\^^9d=`\^^9d % dotted I - \lccode`\^^9e=`\^^9e % d-bar - \uccode`\^^9e=`\^^d0 % d-bar -\fi +\lccode`\^^9d=`\i % dotted I +\uccode`\^^9d=`\^^9d % dotted I +\lccode`\^^9e=`\^^9e % d-bar +\uccode`\^^9e=`\^^d0 % d-bar \lccode`\^^[=`\^^[ % oe in OT1 \fi % End of reset block for 8-bit engines \DeclareRobustCommand{\MakeUppercase}[1]{{% diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 2b373673db6..d0c4ba71b84 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -16,6 +16,7 @@ %% ltlength.dtx (with options: `latexrelease') %% ltfloat.dtx (with options: `latexrelease') %% ltoutput.dtx (with options: `latexrelease') +%% ltclass.dtx (with options: `latexrelease') %% ltspace.dtx (with options: `latexrelease') %% ltplain.dtx (with options: `latexrelease') %% ltfssdcl.dtx (with options: `latexrelease') @@ -62,7 +63,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltvers.dtx \edef\latexreleaseversion - {2016/03/31} + {2017/01/01} \def\IncludeInRelease#1{\kernel@ifnextchar[% {\@IncludeInRelease{#1}} {\@IncludeInRelease{#1}[#1]}} @@ -86,7 +87,7 @@ \long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{} \let\EndIncludeInRelease\relax \ProvidesPackage{latexrelease} - [2016/07/04 v1.0g LaTeX release emulation and tests] + [2016/12/29 v1.0h LaTeX release emulation and tests] \NeedsTeXFormat{LaTeX2e}[1996/06/01] \DeclareOption*{% \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}% @@ -218,6 +219,7 @@ of this package available from CTAN} \@ifnextchar(%) \@makepicbox {\@ifnextchar[\@makebox\mbox}}% +\expandafter\let\csname makebox \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\savebox}{Make \savebox robust}% @@ -230,6 +232,7 @@ of this package available from CTAN} \def\savebox#1{% \@ifnextchar(%) {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}% +\expandafter\let\csname savebox \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\framebox}{Make \framebox robust}% @@ -242,6 +245,7 @@ of this package available from CTAN} \def\framebox{% \@ifnextchar(%) \@framepicbox{\@ifnextchar[\@framebox\fbox}}% +\expandafter\let\csname framebox \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\parbox}{Make \parbox robust}% @@ -256,6 +260,7 @@ of this package available from CTAN} \@ifnextchar[%] \@iparbox {\@iiiparbox c\relax[s]}}% +\expandafter\let\csname parbox \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\rule}{Make \rule robust}% @@ -264,6 +269,7 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}% {\rule}{Make \rule robust}% \def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% +\expandafter\let\csname rule \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\raisebox}{Make \raisebox robust}% @@ -276,6 +282,7 @@ of this package available from CTAN} \def\raisebox#1{% \leavevmode \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}} +\expandafter\let\csname raisebox \endcsname\@undefined \EndIncludeInRelease %%% From File: ltmath.dtx \IncludeInRelease{2015/01/01}{\(}{Make \( robust}% @@ -287,8 +294,10 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}{\(}{Make \( robust}% \def\({% \relax\ifmmode\@badmath\else$\fi}% +\expandafter\let\csname\string( \endcsname\@undefined \def\){% \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}% +\expandafter\let\csname\string) \endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2015/01/01}{\[}{Make \[ robust}% \DeclareRobustCommand\[{% @@ -327,6 +336,7 @@ of this package available from CTAN} $$%%$$ BRACE MATCH HACK \fi }% +\expandafter\let\csname\string[ \endcsname\@undefined \def\]{% \relax\ifmmode \ifinner @@ -339,6 +349,7 @@ of this package available from CTAN} \fi \ignorespaces }% +\expandafter\let\csname\string] \endcsname\@undefined \EndIncludeInRelease %%% From File: ltpictur.dtx \IncludeInRelease{2016/03/31}% @@ -435,15 +446,24 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}% \let\textcommabelow\@undefined -\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-G\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-K\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-k\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-L\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-l\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-N\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-n\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-R\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-r\endcsname\@undefined \EndIncludeInRelease \IncludeInRelease{2016/02/01}{\textcommaabove}{comma above}% \DeclareTextCommandDefault\textcommaabove[1]{% @@ -461,8 +481,10 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}% \let\textcommaabove\@undefined -\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined -\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined +\expandafter + \let\csname\string\OT1\string\c-g\endcsname\@undefined +\expandafter + \let\csname\string\T1\string\c-g\endcsname\@undefined \EndIncludeInRelease %%% From File: ltcounts.dtx \IncludeInRelease{2015/01/01}{\@stpelt} @@ -495,7 +517,7 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{2015/01/01}{\TextOrMath}{\TextOrMath}% \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname eTeXversion\endcsname\relax +\expandafter\ifx\csname protected\endcsname\relax \DeclareRobustCommand\TextOrMath{% \ifmmode \expandafter\@secondoftwo \else \expandafter\@firstoftwo \fi} @@ -1241,6 +1263,26 @@ of this package available from CTAN} \endgroup }% \EndIncludeInRelease +\IncludeInRelease{2017/01/01}% + {\@makefcolumn}{negative height floats}% +\def\@makefcolumn #1{% + \begingroup + \@fpmin -\maxdimen + \let \@testfp \@gobble + \@tryfcolumn #1% + \endgroup +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@makefcolumn}{negative height floats}% +\def\@makefcolumn #1{% + \begingroup + \@fpmin \z@ + \let \@testfp \@gobble + \@tryfcolumn #1% + \endgroup +} +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\@outputdblcol}{2 column marks}% \def\@outputdblcol{% @@ -1314,6 +1356,112 @@ of this package available from CTAN} \fi }% \EndIncludeInRelease +%%% From File: ltclass.dtx +\IncludeInRelease{2017/01/01}% + {\@if@pti@ns}{Spaces in option clash check}% +\def\@if@pti@ns#1#2{% + \let\reserved@a\@firstoftwo + \edef\reserved@b{\zap@space#2 \@empty}% + \@for\reserved@b:=\reserved@b\do{% + \ifx\reserved@b\@empty + \else + \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}% + \ifin@ + \else + \let\reserved@a\@secondoftwo + \fi + \fi + }% + \reserved@a} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@if@pti@ns}{Spaces in option clash check}% +\def\@if@pti@ns#1#2{% + \let\reserved@a\@firstoftwo + \@for\reserved@b:=#2\do{% + \ifx\reserved@b\@empty + \else + \expandafter\in@\expandafter + {\expandafter,\reserved@b,}{,#1,}% + \ifin@ + \else + \let\reserved@a\@secondoftwo + \fi + \fi + }% + \reserved@a} +\IncludeInRelease{2017/01/01}% + {\@if@pti@ns}{Spaces in \ExecuteOptions}% +\def\ExecuteOptions#1{% + \edef\@fortmp{\zap@space#1 \@empty}% + \def\reserved@a##1\@nil{% + \@for\CurrentOption:=\@fortmp\do + {\csname ds@\CurrentOption\endcsname}% + \edef\CurrentOption{##1}}% + \expandafter\reserved@a\CurrentOption\@nil} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@if@pti@ns}{Spaces in \ExecuteOptions}% +\def\ExecuteOptions#1{% + \def\reserved@a##1\@nil{% + \@for\CurrentOption:=#1\do + {\csname ds@\CurrentOption\endcsname}% + \edef\CurrentOption{##1}}% + \expandafter\reserved@a\CurrentOption\@nil} +\IncludeInRelease{2017/01/01}% + {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}% +\def\@fileswith@pti@ns#1[#2]#3[#4]{% + \ifx#1\@clsextension + \ifx\@classoptionslist\relax + \xdef\@classoptionslist{\zap@space#2 \@empty}% + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1% + \@documentclasshook}% + \else + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1}% + \fi + \else + \def\reserved@b##1,{% + \ifx\@nnil##1\relax\else + \ifx\@nnil##1\@nnil\else + \noexpand\@onefilewithoptions##1[{#2}][{#4}]% + \noexpand\@pkgextension + \fi + \expandafter\reserved@b + \fi}% + \edef\reserved@a{\zap@space#3 \@empty}% + \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}% + \fi + \reserved@a} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}% +\def\@fileswith@pti@ns#1[#2]#3[#4]{% + \ifx#1\@clsextension + \ifx\@classoptionslist\relax + \xdef\@classoptionslist{\zap@space#2 \@empty}% + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1% + \@documentclasshook}% + \else + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1}% + \fi + \else + \def\reserved@b##1,{% + \ifx\@nil##1\relax\else + \ifx\relax##1\relax\else + \noexpand\@onefilewithoptions##1[{#2}][{#4}]% + \noexpand\@pkgextension + \fi + \expandafter\reserved@b + \fi}% + \edef\reserved@a{\zap@space#3 \@empty}% + \edef\reserved@a{% + \expandafter\reserved@b\reserved@a,\@nil,}% + \fi + \reserved@a} %%% From File: ltspace.dtx \IncludeInRelease{2015/10/01}% {\@esphack}{hyphenation after space hack}% @@ -1470,8 +1618,12 @@ of this package available from CTAN} \fi \def\new@mathgroup {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top} -\def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi} \let\newfam\new@mathgroup +\ifx\directlua\@undefined + \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi} +\else + \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne{16384}} +\fi \EndIncludeInRelease \IncludeInRelease{0000/00/00}% {\newcount}{Extended Allocation}% @@ -1984,6 +2136,78 @@ of this package available from CTAN} \csname\curr@fontshape/\f@size\endcsname}% \pickup@font} \EndIncludeInRelease +\IncludeInRelease{2017/01/01}{\showhyphens}% + {XeTeX support for \showhyphens}% +\ifx\XeTeXcharclass\@undefined +\gdef\showhyphens#1{% + \setbox0\vbox{% + \color@begingroup + \everypar{}% + \parfillskip\z@skip\hsize\maxdimen + \normalfont + \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1% + \color@endgroup}} +\else +\long\def\showhyphens#1{% + \setbox0\vbox{% + \usefont{TU}{lmr}{m}{n}% + \hsize 1sp % + \hbadness\@M + \hfuzz\maxdimen + \tracingonline\z@ + \everypar={}% + \leftskip\z@skip + \rightskip\z@skip + \parfillskip\z@skip + \hyphenpenalty=-\@M + \pretolerance\m@ne + \interlinepenalty\z@ + \clubpenalty\z@ + \widowpenalty\z@ + \brokenpenalty1127 % + \setbox\z@\hbox{}% + \noindent + \hskip\z@skip + #1% + \par + \loop + \@tempswafalse + \ifnum\lastnodetype=11\unskip\@tempswatrue\fi + \ifnum\lastnodetype=12\unkern\@tempswatrue\fi + \ifnum\lastnodetype=13 % + \count@\lastpenalty + \unpenalty\@tempswatrue + \fi + \ifnum\lastnodetype=\@ne + \setbox\tw@\lastbox\@tempswatrue + \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty + \ifnum\count@=1127 \else\ \fi + \unhbox0}% + \count@\z@ + \fi + \if@tempswa + \repeat + \hbadness\z@ + \hsize\maxdimen + \showboxdepth\z@ + \tolerance\m@ne + \hyphenpenalty\z@ + \noindent\unhbox\z@ +}} +\fi +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\showhyphens}% + {XeTeX support for \showhyphens}% +\gdef\showhyphens#1{% + \setbox0\vbox{% + \color@begingroup + \everypar{}% + \parfillskip\z@skip\hsize\maxdimen + \normalfont + \pretolerance\m@ne\tolerance\m@ne + \hbadness\z@\showboxdepth\z@\ #1% + \color@endgroup}} +\EndIncludeInRelease %%% From File: ltfsscmp.dtx %% Copyright (C) 1989-1995 Frank Mittelbach and Rainer Sch\"opf, %% all rights reserved. @@ -2307,6 +2531,37 @@ of this package available from CTAN} \let\e@alloc@luachunk@count\@undefined \directlua{luatexbase.uninstall()} \EndIncludeInRelease +\IncludeInRelease{2017/01/01}% + {\fontencoding}{TU in everyjob}% +\fontencoding{TU}\let\encodingdefault\f@encoding +\ifx\directlua\@undefined\else + \directlua{% +%% Horrible hack, locally reset the luatex version number +%% This is not required for the source version of luaotfload +%% but is required due to an error in the version check in the +%% public version (January 2017) +%% https://github.com/lualatex/luaotfload/issues/387 +%% It is expected that this will be removed before TeXLive 2017 + local tmp_version=tex.luatexversion % + tex.luatexversion=199 % + if xpcall(function ()% + require('luaotfload-main')% + end,texio.write_nl) then % + local _void = luaotfload.main ()% + else % + texio.write_nl('Error in luaotfload: reverting to OT1')% + tex.print('\string\\def\string\\encodingdefault{OT1}')% + end % + tex.luatexversion=tmp_version% + }% + \let\f@encoding\encodingdefault + \expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion +\fi +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\fontencoding}{TU in everyjob}% +\fontencoding{OT1}\let\encodingdefault\f@encoding +\EndIncludeInRelease \fi %%% From File: ltfinal.dtx \IncludeInRelease{2015/01/01}% @@ -2412,24 +2667,24 @@ of this package available from CTAN} {\XeTeXintercharclasses}{XeTeX character classes}% \ifx\XeTeXinterchartoks\undefined \else - \input{load-unicode-xetex-classes} - \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax} - \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax} - \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace} - \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace} - \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace} - \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace} - \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace} - \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace} - \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue} - \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue} - \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue} - \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue} - \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue} - \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue} - \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue} - \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue} - \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue} + \input{load-unicode-xetex-classes} + \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax} + \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax} + \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace} + \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace} + \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace} + \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace} + \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace} + \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace} + \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue} + \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue} + \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue} + \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue} + \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue} + \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue} + \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue} + \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue} + \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue} \fi \EndIncludeInRelease \endinput diff --git a/Master/texmf-dist/tex/latex/base/leqno.clo b/Master/texmf-dist/tex/latex/base/leqno.clo index 69916d1b21e..de8aa6a9570 100644 --- a/Master/texmf-dist/tex/latex/base/leqno.clo +++ b/Master/texmf-dist/tex/latex/base/leqno.clo @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltmath.dtx \ProvidesFile{leqno.clo} - [2015/03/31 v1.1i Standard LaTeX option + [2016/12/29 v1.2a Standard LaTeX option (left equation numbers)] \renewcommand\@eqnnum{\hb@xt@.01\p@{}% \rlap{\normalfont\normalcolor diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index cbd933531eb..8ee866ffa16 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -261,6 +261,7 @@ local callbacktypes = callbacktypes or { process_jobname = data, contribute_filter = simple, buildpage_filter = simple, + build_page_insert = exclusive, pre_linebreak_filter = list, linebreak_filter = list, append_to_vlist_filter = list, @@ -287,6 +288,7 @@ local callbacktypes = callbacktypes or { show_lua_error_hook = simple, start_file = simple, stop_file = simple, + call_edit = simple, finish_pdffile = data, finish_pdfpage = data, define_font = exclusive, @@ -353,7 +355,7 @@ local function create_callback(name, ctype, default) end if callbacktypes[name] then luatexbase_error("Unable to create callback `" .. name .. - "':\ncallback type disallowed as name") + "':\ncallback is already defined") end if default ~= false and type (default) ~= "function" then luatexbase_error("Unable to create callback `" .. name .. diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index fd748d582d3..32d9335027a 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex} -[2016/03/13 v1.0n +[2017/01/20 v1.1b LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex/base/omlenc.def b/Master/texmf-dist/tex/latex/base/omlenc.def index fec56a72743..6c9f3a80ebc 100644 --- a/Master/texmf-dist/tex/latex/base/omlenc.def +++ b/Master/texmf-dist/tex/latex/base/omlenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omlenc.def} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX file] \DeclareFontEncoding{OML}{}{} \DeclareTextSymbol{\textless}{OML}{`\<} diff --git a/Master/texmf-dist/tex/latex/base/omsenc.def b/Master/texmf-dist/tex/latex/base/omsenc.def index 2e4aca88d1c..5d65c205a9c 100644 --- a/Master/texmf-dist/tex/latex/base/omsenc.def +++ b/Master/texmf-dist/tex/latex/base/omsenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omsenc.def} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX file] \DeclareFontEncoding{OMS}{}{} \DeclareTextSymbol{\textasteriskcentered}{OMS}{3} % "03 diff --git a/Master/texmf-dist/tex/latex/base/ot1enc.def b/Master/texmf-dist/tex/latex/base/ot1enc.def index 217d3db5bb9..3d5e0306ea6 100644 --- a/Master/texmf-dist/tex/latex/base/ot1enc.def +++ b/Master/texmf-dist/tex/latex/base/ot1enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot1enc.def} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX file] \DeclareFontEncoding{OT1}{}{} \DeclareTextAccent{\"}{OT1}{127} diff --git a/Master/texmf-dist/tex/latex/base/ot4enc.def b/Master/texmf-dist/tex/latex/base/ot4enc.def index f7b8f65a1dc..b46a2150dee 100644 --- a/Master/texmf-dist/tex/latex/base/ot4enc.def +++ b/Master/texmf-dist/tex/latex/base/ot4enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot4enc.def} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX file] \DeclareFontEncoding{OT4}{}{} \DeclareFontSubstitution{OT4}{cmr}{m}{n} diff --git a/Master/texmf-dist/tex/latex/base/preload.cfg b/Master/texmf-dist/tex/latex/base/preload.cfg index 5c36c170784..85d52fd3780 100644 --- a/Master/texmf-dist/tex/latex/base/preload.cfg +++ b/Master/texmf-dist/tex/latex/base/preload.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{preload.cfg} - [2014/09/29 v2.3a LaTeX Kernel + [2016/12/03 v3.0a LaTeX Kernel (Uncustomised preload font setup)] %% diff --git a/Master/texmf-dist/tex/latex/base/source2e.tex b/Master/texmf-dist/tex/latex/base/source2e.tex index be9c8a951d0..8abcd3abdce 100644 --- a/Master/texmf-dist/tex/latex/base/source2e.tex +++ b/Master/texmf-dist/tex/latex/base/source2e.tex @@ -127,6 +127,10 @@ page_precedence "rnaA" \fi :\levelchar #3}}% \@tempa\endgroup\@esphack} + +% Section numbers now reach eg 74.17.2 which need more space +\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.8em}} +\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{3.4em}} \makeatother % Produce a Change Log and (2 column) Index. diff --git a/Master/texmf-dist/tex/latex/base/t1enc.def b/Master/texmf-dist/tex/latex/base/t1enc.def index bdd4769bcf4..358ad130583 100644 --- a/Master/texmf-dist/tex/latex/base/t1enc.def +++ b/Master/texmf-dist/tex/latex/base/t1enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{t1enc.def} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX file] \DeclareFontEncoding{T1}{}{} \DeclareTextAccent{\`}{T1}{0} diff --git a/Master/texmf-dist/tex/latex/base/textcomp.sty b/Master/texmf-dist/tex/latex/base/textcomp.sty index 95b1c84e58b..3b1b1462efb 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesPackage{textcomp} - [2016/06/19 v1.99m + [2016/12/11 v2.0a Standard LaTeX package] \PackageInfo{textcomp}{Sub-encoding information:\MessageBreak diff --git a/Master/texmf-dist/tex/latex/base/tuenc.def b/Master/texmf-dist/tex/latex/base/tuenc.def new file mode 100644 index 00000000000..9800bd7e73e --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/tuenc.def @@ -0,0 +1,394 @@ +%% +%% This is file `tuenc.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ltoutenc.dtx (with options: `TU') +%% +%% This is a generated file. +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at http://latex-project.org/bugs.html +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright 1993-2016 +%% The LaTeX3 Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the LaTeX base system. +%% -------------------------------------------------------------- +%% +%% 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 has the LPPL maintenance status "maintained". +%% +%% This file may only be distributed together with a copy of the LaTeX +%% base system. You may however distribute the LaTeX base system without +%% such generated files. +%% +%% The list of all files belonging to the LaTeX base distribution is +%% given in the file `manifest.txt'. See also `legal.txt' for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +%%% From File: ltoutenc.dtx +\ProvidesFile{tuenc.def} + [2016/12/11 v2.0a + Standard LaTeX file] +\providecommand\UnicodeEncodingName{TU} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname XeTeXrevision\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname directlua\endcsname\relax + \PackageWarningNoLine{fontenc} + {\UnicodeEncodingName\space + encoding is only available with XeTeX and LuaTeX.\MessageBreak + Defaulting to T1 encoding} + \def\encodingdefault{T1} + \expandafter\expandafter\expandafter\endinput + \else + \def\UnicodeFontTeXLigatures{mapping=tex-text;} + \fi +\else + \def\UnicodeFontTeXLigatures{+tlig;} % "+trep;" no longer needed +\fi +\def\UnicodeFontFile#1#2{"[#1]:#2"} +\def\UnicodeFontName#1#2{"#1:#2"} +\DeclareFontEncoding\UnicodeEncodingName{}{} +\def\add@unicode@accent#1#2{#2\char#1\relax} +\def\DeclareUnicodeAccent#1#2#3{% + \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}% +} +\DeclareTextSymbol{\textexclamdown} \UnicodeEncodingName{"00A1} +\DeclareTextSymbol{\textcent} \UnicodeEncodingName{"00A2} +\DeclareTextSymbol{\textsterling} \UnicodeEncodingName{"00A3} +\DeclareTextSymbol{\textcurrency} \UnicodeEncodingName{"00A4} +\DeclareTextSymbol{\textyen} \UnicodeEncodingName{"00A5} +\DeclareTextSymbol{\textbrokenbar} \UnicodeEncodingName{"00A6} +\DeclareTextSymbol{\textsection} \UnicodeEncodingName{"00A7} +\DeclareTextSymbol{\textasciidieresis} \UnicodeEncodingName{"00A8} +\DeclareTextSymbol{\textcopyright} \UnicodeEncodingName{"00A9} +\DeclareTextSymbol{\textordfeminine} \UnicodeEncodingName{"00AA} +\DeclareTextSymbol{\guillemotleft} \UnicodeEncodingName{"00AB} +\DeclareTextSymbol{\textlnot} \UnicodeEncodingName{"00AC} +\DeclareTextSymbol{\textregistered} \UnicodeEncodingName{"00AE} +\DeclareTextSymbol{\textasciimacron} \UnicodeEncodingName{"00AF} +\DeclareTextSymbol{\textdegree} \UnicodeEncodingName{"00B0} +\DeclareTextSymbol{\textpm} \UnicodeEncodingName{"00B1} +\DeclareTextSymbol{\texttwosuperior} \UnicodeEncodingName{"00B2} +\DeclareTextSymbol{\textthreesuperior} \UnicodeEncodingName{"00B3} +\DeclareTextSymbol{\textasciiacute} \UnicodeEncodingName{"00B4} +\DeclareTextSymbol{\textmu} \UnicodeEncodingName{"00B5} +\DeclareTextSymbol{\textparagraph} \UnicodeEncodingName{"00B6} +\DeclareTextSymbol{\textperiodcentered} \UnicodeEncodingName{"00B7} +\DeclareTextSymbol{\textonesuperior} \UnicodeEncodingName{"00B9} +\DeclareTextSymbol{\textordmasculine} \UnicodeEncodingName{"00BA} +\DeclareTextSymbol{\guillemotright} \UnicodeEncodingName{"00BB} +\DeclareTextSymbol{\textonequarter} \UnicodeEncodingName{"00BC} +\DeclareTextSymbol{\textonehalf} \UnicodeEncodingName{"00BD} +\DeclareTextSymbol{\textthreequarters} \UnicodeEncodingName{"00BE} +\DeclareTextSymbol{\textquestiondown} \UnicodeEncodingName{"00BF} +\DeclareTextSymbol{\AE} \UnicodeEncodingName{"00C6} +\DeclareTextSymbol{\DH} \UnicodeEncodingName{"00D0} +\DeclareTextSymbol{\texttimes} \UnicodeEncodingName{"00D7} +\DeclareTextSymbol{\O} \UnicodeEncodingName{"00D8} +\DeclareTextSymbol{\TH} \UnicodeEncodingName{"00DE} +\DeclareTextSymbol{\ss} \UnicodeEncodingName{"00DF} +\DeclareTextSymbol{\ae} \UnicodeEncodingName{"00E6} +\DeclareTextSymbol{\dh} \UnicodeEncodingName{"00F0} +\DeclareTextSymbol{\textdiv} \UnicodeEncodingName{"00F7} +\DeclareTextSymbol{\o} \UnicodeEncodingName{"00F8} +\DeclareTextSymbol{\th} \UnicodeEncodingName{"00FE} +\DeclareTextSymbol{\DJ} \UnicodeEncodingName{"0110} +\DeclareTextSymbol{\dj} \UnicodeEncodingName{"0111} +\DeclareTextSymbol{\i} \UnicodeEncodingName{"0131} +\DeclareTextSymbol{\IJ} \UnicodeEncodingName{"0132} +\DeclareTextSymbol{\ij} \UnicodeEncodingName{"0133} +\DeclareTextSymbol{\L} \UnicodeEncodingName{"0141} +\DeclareTextSymbol{\l} \UnicodeEncodingName{"0142} +\DeclareTextSymbol{\NG} \UnicodeEncodingName{"014A} +\DeclareTextSymbol{\ng} \UnicodeEncodingName{"014B} +\DeclareTextSymbol{\OE} \UnicodeEncodingName{"0152} +\DeclareTextSymbol{\oe} \UnicodeEncodingName{"0153} +\DeclareTextSymbol{\textflorin} \UnicodeEncodingName{"0192} +\DeclareTextSymbol{\j} \UnicodeEncodingName{"0237} +\DeclareTextSymbol{\textasciicircum} \UnicodeEncodingName{"02C6} +\DeclareTextSymbol{\textasciicaron} \UnicodeEncodingName{"02C7} +\DeclareTextSymbol{\textasciitilde} \UnicodeEncodingName{"02DC} +\DeclareTextSymbol{\textasciibreve} \UnicodeEncodingName{"02D8} +\DeclareTextSymbol{\textacutedbl} \UnicodeEncodingName{"02DD} +\DeclareTextSymbol{\textgravedbl} \UnicodeEncodingName{"02F5} +\DeclareTextSymbol{\texttildelow} \UnicodeEncodingName{"02F7} +\DeclareTextSymbol{\textbaht} \UnicodeEncodingName{"0E3F} +\DeclareTextSymbol{\SS} \UnicodeEncodingName{"1E9E} +\DeclareTextSymbol{\textcompwordmark} \UnicodeEncodingName{"200C} +\DeclareTextSymbol{\textendash} \UnicodeEncodingName{"2013} +\DeclareTextSymbol{\textemdash} \UnicodeEncodingName{"2014} +\DeclareTextSymbol{\textbardbl} \UnicodeEncodingName{"2016} +\DeclareTextSymbol{\textquoteleft} \UnicodeEncodingName{"2018} +\DeclareTextSymbol{\textquoteright} \UnicodeEncodingName{"2019} +\DeclareTextSymbol{\quotesinglbase} \UnicodeEncodingName{"201A} +\DeclareTextSymbol{\textquotedblleft} \UnicodeEncodingName{"201C} +\DeclareTextSymbol{\textquotedblright} \UnicodeEncodingName{"201D} +\DeclareTextSymbol{\quotedblbase} \UnicodeEncodingName{"201E} +\DeclareTextSymbol{\textdagger} \UnicodeEncodingName{"2020} +\DeclareTextSymbol{\textdaggerdbl} \UnicodeEncodingName{"2021} +\DeclareTextSymbol{\textbullet} \UnicodeEncodingName{"2022} +\DeclareTextSymbol{\textellipsis} \UnicodeEncodingName{"2026} +\DeclareTextSymbol{\textperthousand} \UnicodeEncodingName{"2030} +\DeclareTextSymbol{\textpertenthousand} \UnicodeEncodingName{"2031} +\DeclareTextSymbol{\guilsinglleft} \UnicodeEncodingName{"2039} +\DeclareTextSymbol{\guilsinglright} \UnicodeEncodingName{"203A} +\DeclareTextSymbol{\textreferencemark} \UnicodeEncodingName{"203B} +\DeclareTextSymbol{\textinterrobang} \UnicodeEncodingName{"203D} +\DeclareTextSymbol{\textfractionsolidus} \UnicodeEncodingName{"2044} +\DeclareTextSymbol{\textlquill} \UnicodeEncodingName{"2045} +\DeclareTextSymbol{\textrquill} \UnicodeEncodingName{"2046} +\DeclareTextSymbol{\textasteriskcentered}\UnicodeEncodingName{"204E} +\DeclareTextSymbol{\textdiscount} \UnicodeEncodingName{"2052} +\DeclareTextSymbol{\textcolonmonetary} \UnicodeEncodingName{"20A1} +\DeclareTextSymbol{\textlira} \UnicodeEncodingName{"20A4} +\DeclareTextSymbol{\textnaira} \UnicodeEncodingName{"20A6} +\DeclareTextSymbol{\textwon} \UnicodeEncodingName{"20A9} +\DeclareTextSymbol{\textdong} \UnicodeEncodingName{"20AB} +\DeclareTextSymbol{\texteuro} \UnicodeEncodingName{"20AC} +\DeclareTextSymbol{\textpeso} \UnicodeEncodingName{"20B1} +\DeclareTextSymbol{\textcelsius} \UnicodeEncodingName{"2103} +\DeclareTextSymbol{\textnumero} \UnicodeEncodingName{"2116} +\DeclareTextSymbol{\textcircledP} \UnicodeEncodingName{"2117} +\DeclareTextSymbol{\textrecipe} \UnicodeEncodingName{"211E} +\DeclareTextSymbol{\textservicemark} \UnicodeEncodingName{"2120} +\DeclareTextSymbol{\texttrademark} \UnicodeEncodingName{"2122} +\DeclareTextSymbol{\textohm} \UnicodeEncodingName{"2126} +\DeclareTextSymbol{\textmho} \UnicodeEncodingName{"2127} +\DeclareTextSymbol{\textestimated} \UnicodeEncodingName{"212E} +\DeclareTextSymbol{\textleftarrow} \UnicodeEncodingName{"2190} +\DeclareTextSymbol{\textuparrow} \UnicodeEncodingName{"2191} +\DeclareTextSymbol{\textrightarrow} \UnicodeEncodingName{"2192} +\DeclareTextSymbol{\textdownarrow} \UnicodeEncodingName{"2193} +\DeclareTextSymbol{\textminus} \UnicodeEncodingName{"2212} +\DeclareTextSymbol{\textsurd} \UnicodeEncodingName{"221A} +\DeclareTextSymbol{\textlangle} \UnicodeEncodingName{"2329} +\DeclareTextSymbol{\textrangle} \UnicodeEncodingName{"232A} +\DeclareTextSymbol{\textblank} \UnicodeEncodingName{"2422} +\DeclareTextSymbol{\textvisiblespace} \UnicodeEncodingName{"2423} +\DeclareTextSymbol{\textopenbullet} \UnicodeEncodingName{"25E6} +\DeclareTextSymbol{\textbigcircle} \UnicodeEncodingName{"25EF} +\DeclareTextSymbol{\textmusicalnote} \UnicodeEncodingName{"266A} +\DeclareTextSymbol{\textmarried} \UnicodeEncodingName{"26AD} +\DeclareTextSymbol{\textdivorced} \UnicodeEncodingName{"26AE} +\DeclareTextSymbol{\textinterrobangdown} \UnicodeEncodingName{"2E18} +\DeclareUnicodeAccent{\`} \UnicodeEncodingName{"0300} +\DeclareUnicodeAccent{\'} \UnicodeEncodingName{"0301} +\DeclareUnicodeAccent{\^} \UnicodeEncodingName{"0302} +\DeclareUnicodeAccent{\~} \UnicodeEncodingName{"0303} +\DeclareUnicodeAccent{\"} \UnicodeEncodingName{"0308} +\DeclareUnicodeAccent{\H} \UnicodeEncodingName{"030B} +\DeclareUnicodeAccent{\r} \UnicodeEncodingName{"030A} +\DeclareUnicodeAccent{\v} \UnicodeEncodingName{"030C} +\DeclareUnicodeAccent{\u} \UnicodeEncodingName{"0306} +\DeclareUnicodeAccent{\=} \UnicodeEncodingName{"0304} +\DeclareUnicodeAccent{\.} \UnicodeEncodingName{"0307} +\DeclareUnicodeAccent{\b} \UnicodeEncodingName{"0332} +\DeclareUnicodeAccent{\c} \UnicodeEncodingName{"0327} +\DeclareUnicodeAccent{\d} \UnicodeEncodingName{"0323} +\DeclareUnicodeAccent{\k} \UnicodeEncodingName{"0328} +\DeclareTextComposite{\`} \UnicodeEncodingName{A}{"00C0} +\DeclareTextComposite{\'} \UnicodeEncodingName{A}{"00C1} +\DeclareTextComposite{\^} \UnicodeEncodingName{A}{"00C2} +\DeclareTextComposite{\~} \UnicodeEncodingName{A}{"00C3} +\DeclareTextComposite{\"} \UnicodeEncodingName{A}{"00C4} +\DeclareTextComposite{\r} \UnicodeEncodingName{A}{"00C5} +\DeclareTextComposite{\c} \UnicodeEncodingName{C}{"00C7} +\DeclareTextComposite{\`} \UnicodeEncodingName{E}{"00C8} +\DeclareTextComposite{\'} \UnicodeEncodingName{E}{"00C9} +\DeclareTextComposite{\^} \UnicodeEncodingName{E}{"00CA} +\DeclareTextComposite{\"} \UnicodeEncodingName{E}{"00CB} +\DeclareTextComposite{\`} \UnicodeEncodingName{I}{"00CC} +\DeclareTextComposite{\'} \UnicodeEncodingName{I}{"00CD} +\DeclareTextComposite{\^} \UnicodeEncodingName{I}{"00CE} +\DeclareTextComposite{\"} \UnicodeEncodingName{I}{"00CF} +\DeclareTextComposite{\~} \UnicodeEncodingName{N}{"00D1} +\DeclareTextComposite{\`} \UnicodeEncodingName{O}{"00D2} +\DeclareTextComposite{\'} \UnicodeEncodingName{O}{"00D3} +\DeclareTextComposite{\^} \UnicodeEncodingName{O}{"00D4} +\DeclareTextComposite{\~} \UnicodeEncodingName{O}{"00D5} +\DeclareTextComposite{\"} \UnicodeEncodingName{O}{"00D6} +\DeclareTextComposite{\`} \UnicodeEncodingName{U}{"00D9} +\DeclareTextComposite{\'} \UnicodeEncodingName{U}{"00DA} +\DeclareTextComposite{\^} \UnicodeEncodingName{U}{"00DB} +\DeclareTextComposite{\"} \UnicodeEncodingName{U}{"00DC} +\DeclareTextComposite{\'} \UnicodeEncodingName{Y}{"00DD} +\DeclareTextComposite{\`} \UnicodeEncodingName{a}{"00E0} +\DeclareTextComposite{\'} \UnicodeEncodingName{a}{"00E1} +\DeclareTextComposite{\^} \UnicodeEncodingName{a}{"00E2} +\DeclareTextComposite{\~} \UnicodeEncodingName{a}{"00E3} +\DeclareTextComposite{\"} \UnicodeEncodingName{a}{"00E4} +\DeclareTextComposite{\r} \UnicodeEncodingName{a}{"00E5} +\DeclareTextComposite{\c} \UnicodeEncodingName{c}{"00E7} +\DeclareTextComposite{\`} \UnicodeEncodingName{e}{"00E8} +\DeclareTextComposite{\'} \UnicodeEncodingName{e}{"00E9} +\DeclareTextComposite{\^} \UnicodeEncodingName{e}{"00EA} +\DeclareTextComposite{\"} \UnicodeEncodingName{e}{"00EB} +\DeclareTextComposite{\`} \UnicodeEncodingName\i {"00EC} +\DeclareTextComposite{\'} \UnicodeEncodingName\i {"00ED} +\DeclareTextComposite{\^} \UnicodeEncodingName\i {"00EE} +\DeclareTextComposite{\"} \UnicodeEncodingName\i {"00EF} +\DeclareTextComposite{\~} \UnicodeEncodingName{n}{"00F1} +\DeclareTextComposite{\`} \UnicodeEncodingName{o}{"00F2} +\DeclareTextComposite{\'} \UnicodeEncodingName{o}{"00F3} +\DeclareTextComposite{\^} \UnicodeEncodingName{o}{"00F4} +\DeclareTextComposite{\~} \UnicodeEncodingName{o}{"00F5} +\DeclareTextComposite{\"} \UnicodeEncodingName{o}{"00F6} +\DeclareTextComposite{\`} \UnicodeEncodingName{u}{"00F9} +\DeclareTextComposite{\'} \UnicodeEncodingName{u}{"00FA} +\DeclareTextComposite{\^} \UnicodeEncodingName{u}{"00FB} +\DeclareTextComposite{\"} \UnicodeEncodingName{u}{"00FC} +\DeclareTextComposite{\'} \UnicodeEncodingName{y}{"00FD} +\DeclareTextComposite{\"} \UnicodeEncodingName{y}{"00FF} +\DeclareTextComposite{\=} \UnicodeEncodingName{A}{"0100} +\DeclareTextComposite{\=} \UnicodeEncodingName{a}{"0101} +\DeclareTextComposite{\u} \UnicodeEncodingName{A}{"0102} +\DeclareTextComposite{\u} \UnicodeEncodingName{a}{"0103} +\DeclareTextComposite{\k} \UnicodeEncodingName{A}{"0104} +\DeclareTextComposite{\k} \UnicodeEncodingName{a}{"0105} +\DeclareTextComposite{\'} \UnicodeEncodingName{C}{"0106} +\DeclareTextComposite{\'} \UnicodeEncodingName{c}{"0107} +\DeclareTextComposite{\^} \UnicodeEncodingName{C}{"0108} +\DeclareTextComposite{\^} \UnicodeEncodingName{c}{"0109} +\DeclareTextComposite{\.} \UnicodeEncodingName{C}{"010A} +\DeclareTextComposite{\.} \UnicodeEncodingName{c}{"010B} +\DeclareTextComposite{\v} \UnicodeEncodingName{C}{"010C} +\DeclareTextComposite{\v} \UnicodeEncodingName{c}{"010D} +\DeclareTextComposite{\v} \UnicodeEncodingName{D}{"010E} +\DeclareTextComposite{\v} \UnicodeEncodingName{d}{"010F} +\DeclareTextComposite{\=} \UnicodeEncodingName{E}{"0112} +\DeclareTextComposite{\=} \UnicodeEncodingName{e}{"0113} +\DeclareTextComposite{\u} \UnicodeEncodingName{E}{"0114} +\DeclareTextComposite{\u} \UnicodeEncodingName{e}{"0115} +\DeclareTextComposite{\.} \UnicodeEncodingName{E}{"0116} +\DeclareTextComposite{\.} \UnicodeEncodingName{e}{"0117} +\DeclareTextComposite{\k} \UnicodeEncodingName{E}{"0118} +\DeclareTextComposite{\k} \UnicodeEncodingName{e}{"0119} +\DeclareTextComposite{\v} \UnicodeEncodingName{E}{"011A} +\DeclareTextComposite{\v} \UnicodeEncodingName{e}{"011B} +\DeclareTextComposite{\^} \UnicodeEncodingName{G}{"011C} +\DeclareTextComposite{\^} \UnicodeEncodingName{g}{"011D} +\DeclareTextComposite{\u} \UnicodeEncodingName{G}{"011E} +\DeclareTextComposite{\u} \UnicodeEncodingName{g}{"011F} +\DeclareTextComposite{\.} \UnicodeEncodingName{G}{"0120} +\DeclareTextComposite{\.} \UnicodeEncodingName{g}{"0121} +\DeclareTextComposite{\c} \UnicodeEncodingName{G}{"0122} +\DeclareTextComposite{\c} \UnicodeEncodingName{g}{"0123} +\DeclareTextComposite{\^} \UnicodeEncodingName{H}{"0124} +\DeclareTextComposite{\^} \UnicodeEncodingName{h}{"0125} +\DeclareTextComposite{\~} \UnicodeEncodingName{I}{"0128} +\DeclareTextComposite{\~} \UnicodeEncodingName\i {"0129} +\DeclareTextComposite{\=} \UnicodeEncodingName{I}{"012A} +\DeclareTextComposite{\=} \UnicodeEncodingName\i {"012B} +\DeclareTextComposite{\u} \UnicodeEncodingName{I}{"012C} +\DeclareTextComposite{\u} \UnicodeEncodingName\i {"012D} +\DeclareTextComposite{\k} \UnicodeEncodingName{I}{"012E} +\DeclareTextComposite{\k} \UnicodeEncodingName\i {"012F} +\DeclareTextComposite{\.} \UnicodeEncodingName{I}{"0130} +\DeclareTextComposite{\^} \UnicodeEncodingName{J}{"0134} +\DeclareTextComposite{\^} \UnicodeEncodingName\j {"0135} +\DeclareTextComposite{\c} \UnicodeEncodingName{K}{"0136} +\DeclareTextComposite{\c} \UnicodeEncodingName{k}{"0137} +\DeclareTextComposite{\'} \UnicodeEncodingName{L}{"0139} +\DeclareTextComposite{\'} \UnicodeEncodingName{l}{"013A} +\DeclareTextComposite{\c} \UnicodeEncodingName{L}{"013B} +\DeclareTextComposite{\c} \UnicodeEncodingName{l}{"013C} +\DeclareTextComposite{\v} \UnicodeEncodingName{L}{"013D} +\DeclareTextComposite{\v} \UnicodeEncodingName{l}{"013E} +\DeclareTextComposite{\'} \UnicodeEncodingName{N}{"0143} +\DeclareTextComposite{\'} \UnicodeEncodingName{n}{"0144} +\DeclareTextComposite{\c} \UnicodeEncodingName{N}{"0145} +\DeclareTextComposite{\c} \UnicodeEncodingName{n}{"0146} +\DeclareTextComposite{\v} \UnicodeEncodingName{N}{"0147} +\DeclareTextComposite{\v} \UnicodeEncodingName{n}{"0148} +\DeclareTextComposite{\=} \UnicodeEncodingName{O}{"014C} +\DeclareTextComposite{\=} \UnicodeEncodingName{o}{"014D} +\DeclareTextComposite{\u} \UnicodeEncodingName{O}{"014E} +\DeclareTextComposite{\u} \UnicodeEncodingName{o}{"014F} +\DeclareTextComposite{\H} \UnicodeEncodingName{O}{"0150} +\DeclareTextComposite{\H} \UnicodeEncodingName{o}{"0151} +\DeclareTextComposite{\'} \UnicodeEncodingName{R}{"0154} +\DeclareTextComposite{\'} \UnicodeEncodingName{r}{"0155} +\DeclareTextComposite{\c} \UnicodeEncodingName{R}{"0156} +\DeclareTextComposite{\c} \UnicodeEncodingName{r}{"0157} +\DeclareTextComposite{\v} \UnicodeEncodingName{R}{"0158} +\DeclareTextComposite{\v} \UnicodeEncodingName{r}{"0159} +\DeclareTextComposite{\'} \UnicodeEncodingName{S}{"015A} +\DeclareTextComposite{\'} \UnicodeEncodingName{s}{"015B} +\DeclareTextComposite{\^} \UnicodeEncodingName{S}{"015C} +\DeclareTextComposite{\^} \UnicodeEncodingName{s}{"015D} +\DeclareTextComposite{\c} \UnicodeEncodingName{S}{"015E} +\DeclareTextComposite{\c} \UnicodeEncodingName{s}{"015F} +\DeclareTextComposite{\v} \UnicodeEncodingName{S}{"0160} +\DeclareTextComposite{\v} \UnicodeEncodingName{s}{"0161} +\DeclareTextComposite{\c} \UnicodeEncodingName{T}{"0162} +\DeclareTextComposite{\c} \UnicodeEncodingName{t}{"0163} +\DeclareTextComposite{\v} \UnicodeEncodingName{T}{"0164} +\DeclareTextComposite{\v} \UnicodeEncodingName{t}{"0165} +\DeclareTextComposite{\~} \UnicodeEncodingName{U}{"0168} +\DeclareTextComposite{\~} \UnicodeEncodingName{u}{"0169} +\DeclareTextComposite{\=} \UnicodeEncodingName{U}{"016A} +\DeclareTextComposite{\=} \UnicodeEncodingName{u}{"016B} +\DeclareTextComposite{\u} \UnicodeEncodingName{U}{"016C} +\DeclareTextComposite{\u} \UnicodeEncodingName{u}{"016D} +\DeclareTextComposite{\r} \UnicodeEncodingName{U}{"016E} +\DeclareTextComposite{\r} \UnicodeEncodingName{u}{"016F} +\DeclareTextComposite{\H} \UnicodeEncodingName{U}{"0170} +\DeclareTextComposite{\H} \UnicodeEncodingName{u}{"0171} +\DeclareTextComposite{\k} \UnicodeEncodingName{U}{"0172} +\DeclareTextComposite{\k} \UnicodeEncodingName{u}{"0173} +\DeclareTextComposite{\^} \UnicodeEncodingName{W}{"0174} +\DeclareTextComposite{\^} \UnicodeEncodingName{w}{"0175} +\DeclareTextComposite{\^} \UnicodeEncodingName{Y}{"0176} +\DeclareTextComposite{\^} \UnicodeEncodingName{y}{"0177} +\DeclareTextComposite{\"} \UnicodeEncodingName{Y}{"0178} +\DeclareTextComposite{\'} \UnicodeEncodingName{Z}{"0179} +\DeclareTextComposite{\'} \UnicodeEncodingName{z}{"017A} +\DeclareTextComposite{\.} \UnicodeEncodingName{Z}{"017B} +\DeclareTextComposite{\.} \UnicodeEncodingName{z}{"017C} +\DeclareTextComposite{\v} \UnicodeEncodingName{Z}{"017D} +\DeclareTextComposite{\v} \UnicodeEncodingName{z}{"017E} +\DeclareTextComposite{\v} \UnicodeEncodingName{A}{"01CD} +\DeclareTextComposite{\v} \UnicodeEncodingName{a}{"01CE} +\DeclareTextComposite{\v} \UnicodeEncodingName{I}{"01CF} +\DeclareTextComposite{\v} \UnicodeEncodingName\i {"01D0} +\DeclareTextComposite{\v} \UnicodeEncodingName{O}{"01D1} +\DeclareTextComposite{\v} \UnicodeEncodingName{o}{"01D2} +\DeclareTextComposite{\v} \UnicodeEncodingName{U}{"01D3} +\DeclareTextComposite{\v} \UnicodeEncodingName{u}{"01D4} +\DeclareTextComposite{\=} \UnicodeEncodingName\AE{"01E2} +\DeclareTextComposite{\=} \UnicodeEncodingName\ae{"01E3} +\DeclareTextComposite{\v} \UnicodeEncodingName{G}{"01E6} +\DeclareTextComposite{\v} \UnicodeEncodingName{g}{"01E7} +\DeclareTextComposite{\v} \UnicodeEncodingName{K}{"01E8} +\DeclareTextComposite{\v} \UnicodeEncodingName{k}{"01E9} +\DeclareTextComposite{\k} \UnicodeEncodingName{O}{"01EA} +\DeclareTextComposite{\k} \UnicodeEncodingName{o}{"01EB} +\DeclareTextComposite{\v} \UnicodeEncodingName\j {"01F0} +\DeclareTextComposite{\'} \UnicodeEncodingName{G}{"01F4} +\DeclareTextComposite{\'} \UnicodeEncodingName{g}{"01F5} +\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{S}{"0218} +\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{s}{"0219} +\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{T}{"021A} +\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{t}{"021B} +\DeclareTextComposite{\.} \UnicodeEncodingName{B}{"1E02} +\DeclareTextComposite{\.} \UnicodeEncodingName{b}{"1E03} +\endinput +%% +%% End of file `tuenc.def'. diff --git a/Master/texmf-dist/tex/latex/base/tulmr.fd b/Master/texmf-dist/tex/latex/base/tulmr.fd new file mode 100644 index 00000000000..fe637c02f75 --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/tulmr.fd @@ -0,0 +1,43 @@ + +\ProvidesFile{tulmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{TU}{lmr}{} +\DeclareFontShape{TU}{lmr}{m}{n}% + {<-5.5> \UnicodeFontFile{lmroman5-regular}{\UnicodeFontTeXLigatures} <5.5-6.5> \UnicodeFontFile{lmroman6-regular}{\UnicodeFontTeXLigatures} + <6.5-7.5> \UnicodeFontFile{lmroman7-regular}{\UnicodeFontTeXLigatures} <7.5-8.5> \UnicodeFontFile{lmroman8-regular}{\UnicodeFontTeXLigatures} + <8.5-9.5> \UnicodeFontFile{lmroman9-regular}{\UnicodeFontTeXLigatures} <9.5-11> \UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures} + <11-15> \UnicodeFontFile{lmroman12-regular}{\UnicodeFontTeXLigatures} + <15-> \UnicodeFontFile{lmroman17-regular}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmr}{m}{sl}% + {<-8.5> \UnicodeFontFile{lmromanslant8-regular}{\UnicodeFontTeXLigatures} <8.5-9.5> \UnicodeFontFile{lmromanslant9-regular}{\UnicodeFontTeXLigatures} + <9.5-11> \UnicodeFontFile{lmromanslant10-regular}{\UnicodeFontTeXLigatures} <11-15> \UnicodeFontFile{lmromanslant12-regular}{\UnicodeFontTeXLigatures} + <15-> \UnicodeFontFile{lmromanslant17-regular}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmr}{m}{it}% + {<-7.5> \UnicodeFontFile{lmroman7-italic}{\UnicodeFontTeXLigatures} + <7.5-8.5> \UnicodeFontFile{lmroman8-italic}{\UnicodeFontTeXLigatures} <8.5-9.5> \UnicodeFontFile{lmroman9-italic}{\UnicodeFontTeXLigatures} + <9.5-11> \UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures} <11-> \UnicodeFontFile{lmroman12-italic}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmr}{m}{sc}% + {<-> \UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{m}{ui}% + {<-> ec-lmu10}{} +\DeclareFontShape{TU}{lmr}{m}{scsl}% + {<-> \UnicodeFontFile{lmromancaps10-oblique}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{b}{n} + {<-> \UnicodeFontFile{lmromandemi10-regular}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{b}{sl} + {<-> \UnicodeFontFile{lmromandemi10-oblique}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{bx}{n} + {<-5.5> \UnicodeFontFile{lmroman5-bold}{\UnicodeFontTeXLigatures} <5.5-6.5> \UnicodeFontFile{lmroman6-bold}{\UnicodeFontTeXLigatures} + <6.5-7.5> \UnicodeFontFile{lmroman7-bold}{\UnicodeFontTeXLigatures} <7.5-8.5> \UnicodeFontFile{lmroman8-bold}{\UnicodeFontTeXLigatures} + <8.5-9.5> \UnicodeFontFile{lmroman9-bold}{\UnicodeFontTeXLigatures} <9.5-11> \UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures} + <11-> \UnicodeFontFile{lmroman12-bold}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmr}{bx}{it} + {<-> \UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{bx}{sl} + {<-> \UnicodeFontFile{lmromanslant10-bold}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmr}{b}{it} + {<->sub * lmr/b/sl}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/base/tulmss.fd b/Master/texmf-dist/tex/latex/base/tulmss.fd new file mode 100644 index 00000000000..cecaba1f4c1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/tulmss.fd @@ -0,0 +1,36 @@ + +\ProvidesFile{tulmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{TU}{lmss}{} +\DeclareFontShape{TU}{lmss}{m}{n} + {<-8.5> \UnicodeFontFile{lmsans8-regular}{\UnicodeFontTeXLigatures} + <8.5-9.5> \UnicodeFontFile{lmsans9-regular}{\UnicodeFontTeXLigatures} <9.5-11> \UnicodeFontFile{lmsans10-regular}{\UnicodeFontTeXLigatures} + <11-15.5> \UnicodeFontFile{lmsans12-regular}{\UnicodeFontTeXLigatures} <15.5-> \UnicodeFontFile{lmsans17-regular}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmss}{m}{it} + {<->ssub*lmss/m/sl}{} +\DeclareFontShape{TU}{lmss}{m}{sl} + {<-8.5> \UnicodeFontFile{lmsans8-oblique}{\UnicodeFontTeXLigatures} + <8.5-9.5> \UnicodeFontFile{lmsans9-oblique}{\UnicodeFontTeXLigatures} <9.5-11> \UnicodeFontFile{lmsans10-oblique}{\UnicodeFontTeXLigatures} + <11-15.5> \UnicodeFontFile{lmsans12-oblique}{\UnicodeFontTeXLigatures} <15.5-> \UnicodeFontFile{lmsans17-oblique}{\UnicodeFontTeXLigatures} + }{} +\DeclareFontShape{TU}{lmss}{m}{sc} + {<->sub*lmr/m/sc}{} +\DeclareFontShape{TU}{lmss}{b}{n} + {<->ssub * lmss/bx/n}{} +\DeclareFontShape{TU}{lmss}{b}{sl} + {<->ssub * lmss/bx/sl}{} +\DeclareFontShape{TU}{lmss}{b}{it} + {<->ssub * lmss/bx/it}{} +\DeclareFontShape{TU}{lmss}{sbc}{n} + {<-> \UnicodeFontFile{lmsansdemicond10-regular}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmss}{sbc}{sl} + {<-> \UnicodeFontFile{lmsansdemicond10-oblique}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmss}{sbc}{it} + {<->ssub*lmss/sbc/sl}{} +\DeclareFontShape{TU}{lmss}{bx}{n} + {<-> \UnicodeFontFile{lmsans10-bold}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmss}{bx}{sl} + {<-> \UnicodeFontFile{lmsans10-boldoblique}{\UnicodeFontTeXLigatures}}{} +\DeclareFontShape{TU}{lmss}{bx}{it} + {<->ssub*lmss/bx/sl}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/base/tulmtt.fd b/Master/texmf-dist/tex/latex/base/tulmtt.fd new file mode 100644 index 00000000000..328dd3a7365 --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/tulmtt.fd @@ -0,0 +1,68 @@ + +\ProvidesFile{tulmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{TU}{lmtt}{\hyphenchar \font\m@ne} + +\ifx\lmtt@use@light@as@normal\@empty +\DeclareFontShape{TU}{lmtt}{sb}{n} + {<-8.5> \UnicodeFontFile{lmmono8-regular}{} <8.5-9.5> \UnicodeFontFile{lmmono9-regular}{} + <9.5-11> \UnicodeFontFile{lmmono10-regular}{} <11-> \UnicodeFontFile{lmmono12-regular}{} + }{} +\DeclareFontShape{TU}{lmtt}{sb}{it} + {<-> \UnicodeFontFile{lmmono10-italic}{}}{} +\DeclareFontShape{TU}{lmtt}{sb}{sl} + {<-> \UnicodeFontFile{lmmonoslant10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{sb}{sc} + {<-> \UnicodeFontFile{lmmonocaps10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{sb}{scsl} + {<-> \UnicodeFontFile{lmmonocaps10-oblique}{}}{} +\DeclareFontShape{TU}{lmtt}{m}{n} + {<-> \UnicodeFontFile{lmmonolt10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{m}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{TU}{lmtt}{m}{sl} + {<-> \UnicodeFontFile{lmmonolt10-oblique}{}}{} +\DeclareFontShape{TU}{lmtt}{c}{n} + {<-> \UnicodeFontFile{lmmonoltcond10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{c}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{TU}{lmtt}{c}{sl} + {<-> \UnicodeFontFile{lmmonoltcond10-oblique}{}}{} +\else +\DeclareFontShape{TU}{lmtt}{m}{n} + {<-8.5> \UnicodeFontFile{lmmono8-regular}{} <8.5-9.5> \UnicodeFontFile{lmmono9-regular}{} + <9.5-11> \UnicodeFontFile{lmmono10-regular}{} <11-> \UnicodeFontFile{lmmono12-regular}{} + }{} +\DeclareFontShape{TU}{lmtt}{m}{it} + {<-> \UnicodeFontFile{lmmono10-italic}{}}{} +\DeclareFontShape{TU}{lmtt}{m}{sl} + {<-> \UnicodeFontFile{lmmonoslant10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{m}{sc} + {<-> \UnicodeFontFile{lmmonocaps10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{m}{scsl} + {<-> \UnicodeFontFile{lmmonocaps10-oblique}{}}{} +\DeclareFontShape{TU}{lmtt}{l}{n} + {<-> \UnicodeFontFile{lmmonolt10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{l}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{TU}{lmtt}{l}{sl} + {<-> \UnicodeFontFile{lmmonolt10-oblique}{}}{} +\DeclareFontShape{TU}{lmtt}{lc}{n} + {<-> \UnicodeFontFile{lmmonoltcond10-regular}{}}{} +\DeclareFontShape{TU}{lmtt}{lc}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{TU}{lmtt}{lc}{sl} + {<-> \UnicodeFontFile{lmmonoltcond10-oblique}{}}{} +\fi +\DeclareFontShape{TU}{lmtt}{b}{n} + {<-> \UnicodeFontFile{lmmonolt10-bold}{}}{} +\DeclareFontShape{TU}{lmtt}{b}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{TU}{lmtt}{b}{sl} +{<-> \UnicodeFontFile{lmmonolt10-boldoblique}{}}{} +\DeclareFontShape{TU}{lmtt}{bx}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{TU}{lmtt}{bx}{n} + {<->ssub*lmtt/b/n}{} +\DeclareFontShape{TU}{lmtt}{bx}{sl} + {<->ssub*lmtt/b/sl}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index 7b1a3a8aed1..9890aedd371 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2016/07/10 v1.0t Standard LaTeX Graphics (DPC,SPQR)] + [2016/10/09 v1.0u Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -475,7 +475,7 @@ \fi \ifdim\dimen@>\z@ \loop - \ifdim\dimen@<8192\p@ + \ifdim\ifnum\count@<\tw@\maxdimen\else\dimen@\fi<8192\p@ \dimen@\tw@\dimen@ \divide\count@\tw@ \repeat diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty index 08fad184e88..757b61ba4d5 100644 --- a/Master/texmf-dist/tex/latex/graphics/rotating.sty +++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty @@ -16,7 +16,7 @@ %% Copyright 2016 LaTeX3 Project \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rotating}% - [2016/05/22 v2.16c + [2016/08/11 v2.16d rotated objects in LaTeX% ] \DeclareOption{clockwise}{% diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index dc4a9c2bed8..ab21a6aca04 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -39,7 +39,7 @@ %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{array} - [2014/10/28 v2.4c Tabular extension package (FMi)] + [2016/10/06 v2.4d Tabular extension package (FMi)] %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} @@ -214,13 +214,13 @@ \let\d@llarbegin\begingroup \let\d@llarend\endgroup \def\array{\col@sep\arraycolsep - \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}% + \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}% \@tabarray} \def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}} -\def\tabular{\gdef\@halignto{}\@tabular} +\def\tabular{\def\@halignto{}\@tabular} \expandafter\def\csname tabular*\endcsname#1{% \setlength\dimen@{#1}% - \xdef\@halignto{to\the\dimen@}\@tabular} + \edef\@halignto{to\the\dimen@}\@tabular} \def\@tabular{% \leavevmode \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty index 235db4e1b4d..3f53cec02f5 100644 --- a/Master/texmf-dist/tex/latex/tools/bm.sty +++ b/Master/texmf-dist/tex/latex/tools/bm.sty @@ -34,14 +34,13 @@ %% 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 2016 +%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017 %% David Carlisle Frank Mittelbach %% %% Development of this package was commissioned by Y&Y Inc. -%% http://www.yandy.com \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bm} - [2016/07/07 v1.2b Bold Symbol Support (DPC/FMi)] + [2017/01/16 v1.2c Bold Symbol Support (DPC/FMi)] \def\bm#1#2{% \let\bm@pmb\install@mathalphabet \let\bm@pmb@\getanddefine@fonts @@ -343,13 +342,17 @@ \def\bm@umathchar#1#2#3{% \@tempcnta#2\relax \count@\bm@table -\ifx\count@=\m@ne +\ifnum\count@=\z@ + \bm@gr@up\boldmath{\Umathchar#1 #2 #3 }% \else - \advance\@tempcnta\count@ -\fi -\bm@xadd{\Umathchar#1\space - \the\@tempcnta\space\space - #3\space}} + \ifnum\count@=\m@ne + \else + \advance\@tempcnta\count@ + \fi + \bm@xadd{\Umathchar#1\space + \the\@tempcnta\space\space + #3\space}% +\fi} \def\bm@pmb#1{% \bm@add{\bm@pmb@{#1}}} \def\bm@pmb@#1{{% -- cgit v1.2.3