From 2e36532bb99dce0d6c5fba60f7adba7e2bfb7c37 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 15 Apr 2017 22:59:15 +0000 Subject: latex2e (15apr17, ltnews27) git-svn-id: svn://tug.org/texlive/trunk@43813 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/amsmath/amscd.sty | 2 +- Master/texmf-dist/tex/latex/base/docstrip.tex | 2 +- Master/texmf-dist/tex/latex/base/fixltx2e.sty | 2 +- Master/texmf-dist/tex/latex/base/flafter.sty | 2 +- Master/texmf-dist/tex/latex/base/fltrace.sty | 10 +- Master/texmf-dist/tex/latex/base/fontenc.sty | 2 +- Master/texmf-dist/tex/latex/base/latex.ltx | 81 ++-- Master/texmf-dist/tex/latex/base/latexrelease.sty | 396 +++++++++++++++++- Master/texmf-dist/tex/latex/base/ltluatex.lua | 9 +- Master/texmf-dist/tex/latex/base/ltluatex.tex | 2 +- Master/texmf-dist/tex/latex/base/ltnews.cls | 7 +- Master/texmf-dist/tex/latex/base/ltxdoc.cls | 4 +- 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/source2e.tex | 9 +- 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 | 484 ++++++++++++---------- Master/texmf-dist/tex/latex/graphics/graphics.sty | 8 +- Master/texmf-dist/tex/latex/tools/multicol.sty | 11 +- 22 files changed, 771 insertions(+), 272 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/amsmath/amscd.sty b/Master/texmf-dist/tex/latex/amsmath/amscd.sty index 9e2cbdf1772..eaa5c453458 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amscd.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amscd.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later -\ProvidesPackage{amscd}[1999/11/29 v2.0 AMS Commutatitive Diagrams] +\ProvidesPackage{amscd}[2017/04/14 v2.1 AMS Commutative Diagrams] \RequirePackage{amsgen} \@ifundefined{math@cr}{% \def\math@cr{{\ifnum0=`}\fi diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex index 6d41f4354c0..e3adc4ccbc5 100644 --- a/Master/texmf-dist/tex/latex/base/docstrip.tex +++ b/Master/texmf-dist/tex/latex/base/docstrip.tex @@ -46,7 +46,7 @@ \def\filename{docstrip.dtx} \def\fileversion{2.5e} \def\filedate{2014/09/29} -\def\docdate {2014/09/29} +\def\docdate {2017/03/13} %% %% The docstrip program for use with TeX. %% Copyright (C) 1989-1991 Frank Mittelbach diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty index 4f5ae2220e8..e31931d15c7 100644 --- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty +++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright 1993-2016 +%% Copyright 1993-2017 %% The LaTeX3 Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty index 83890eff763..dbad223d38b 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} - [2016/10/04 v1.3b + [2017/04/11 v1.4a 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/fltrace.sty b/Master/texmf-dist/tex/latex/base/fltrace.sty index 529383b2e96..d4db3742695 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} - [2016/10/04 v1.3b + [2017/04/11 v1.4a Tracing LaTeX floats algorithm (FMi)] \def\onecolumn{% \clearpage @@ -66,6 +66,14 @@ \fi \if@nobreak \@nobreakfalse \everypar{}\fi \par + \ifdim\prevdepth>\z@ + \vskip -% + \ifdim\prevdepth>\maxdepth + \maxdepth + \else + \prevdepth + \fi + \fi \vfil \penalty -\@M} \def \@emptycol {\vbox{}\penalty -\@M} diff --git a/Master/texmf-dist/tex/latex/base/fontenc.sty b/Master/texmf-dist/tex/latex/base/fontenc.sty index d306d19ec22..d595854b87a 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i Standard LaTeX package] \def\update@uclc@with@cyrillic{% \expandafter\def\expandafter\@uclclist\expandafter diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 32a77c5d1ff..2d76c20aff3 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -342,8 +342,11 @@ \def\newwrite {\e@alloc\write \chardef{\count17}\m@ne\sixt@@n} \else \def\newwrite {\e@alloc\write - {\ifnum\allocationnumber=18 \allocationnumber19\fi - \global\chardef}% + {\ifnum\allocationnumber=18 + \advance\count17\@ne + \allocationnumber\count17 % + \fi + \global\chardef}% {\count17}% \m@ne {128}} @@ -421,7 +424,7 @@ \fi}% \fi \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne - \ch@ck#1#4#2% make sure there's still room + \ch@ck#1#4#2% \allocationnumber\count1#1% \global#3#5\allocationnumber \wlog{\string#5=\string#2\the\allocationnumber}} @@ -697,8 +700,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2017/01/01} -\def\patch@level{3} + {2017-04-15} +\def\patch@level{0} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -769,9 +772,7 @@ \immediate\write\@unused{#1}\endgroup} \newlinechar`\^^J \let\@@par=\par -\let\@@hyph=\- % Save original primitive definition -\def\-{\discretionary{-}{}{}} -\let\@dischyph=\- +\let\@@hyph=\- \let\@@italiccorr=\/ \def\@height{height} \def\@depth{depth} \def\@width{width} \def\@minus{minus} @@ -1071,6 +1072,17 @@ \edef #1{\expandafter\strip@prefix \meaning #1}% } +\def\@latex@info#1{} +\DeclareRobustCommand{\-}{% + \discretionary{% + \char \ifnum\hyphenchar\font<\z@ + \defaulthyphenchar + \else + \hyphenchar\font + \fi + }{}{}% +} +\let\@dischyph=\- %%% From File: ltalloc.dtx \chardef\@xxxii=32 \mathchardef\@Mi=10001 @@ -1641,6 +1653,9 @@ Type H for immediate help.}% \let\normalsfcodes\nonfrenchspacing \fi \fi + \ifx\document@default@language\m@ne + \chardef\document@default@language\language + \fi \@noskipsecfalse \let \@refundefined \relax \let\AtBeginDocument\@firstofone @@ -1895,6 +1910,12 @@ Type H for immediate help.}% \def\hmode@bgroup{\leavevmode\bgroup} \def\DeclareTextCompositeCommand#1#2#3#4{% \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname + \ifx\reserved@a\relax + \DeclareTextCommand#1{#2}{% + \@latex@error{\string#1 undeclared in encoding #2}\@eha}% + \@latex@info{Composite with undeclared \string#1 in encoding #2}% + \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname + \fi \expandafter\expandafter\expandafter\ifx \expandafter\@car\reserved@a\relax\relax\@nil \@text@composite \else \edef\reserved@b##1{% @@ -1907,7 +1928,8 @@ Type H for immediate help.}% \expandafter\reserved@b\expandafter{\reserved@a{##1}}% \fi \expandafter\def\csname\expandafter\string\csname - #2\endcsname\string#1-\string#3\@empty\endcsname{#4}} + #2\endcsname\string#1-\string#3\@empty\endcsname{#4}% + } \@onlypreamble\DeclareTextCompositeCommand \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x @@ -4199,6 +4221,7 @@ Type H for immediate help.}% \leftskip\@totalleftmargin\rightskip\z@skip \parindent\z@\parfillskip\@flushglue\parskip\z@skip \@@par + \language\l@nohyphenation \@tempswafalse \def\par{% \if@tempswa @@ -4209,7 +4232,6 @@ Type H for immediate help.}% \fi}% \let\do\@makeother \dospecials \obeylines \verbatim@font \@noligs - \hyphenchar\font\m@ne \everypar \expandafter{\the\everypar \unpenalty}% } \def\verbatim{\@verbatim \frenchspacing\@vobeyspaces \@xverbatim} @@ -4230,6 +4252,7 @@ Type H for immediate help.}% \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs + \language\l@nohyphenation \@ifstar\@sverb\@verb} \def\@sverb#1{% \catcode`#1\active @@ -4943,7 +4966,9 @@ Type H for immediate help.}% \linewidth\hsize \@totalleftmargin\z@ \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip - \parfillskip\@flushglue \lineskip\normallineskip + \parfillskip\@flushglue + \lineskip\normallineskip + \lineskiplimit\normallineskiplimit \baselineskip\normalbaselineskip \sloppy} \def\@parboxrestore{\@arrayparboxrestore\let\\\@normalcr} @@ -6569,6 +6594,14 @@ Type H for immediate help.}% \fi \if@nobreak \@nobreakfalse \everypar{}\fi \par + \ifdim\prevdepth>\z@ + \vskip -% + \ifdim\prevdepth>\maxdepth + \maxdepth + \else + \prevdepth + \fi + \fi \vfil \penalty -\@M} \def \@emptycol {\vbox{}\penalty -\@M} @@ -6837,8 +6870,9 @@ Type H for immediate help.}% \let'\active@math@prime}% \endgroup \def\@outputpage{% -\begingroup % the \endgroup is put in by \aftergroup +\begingroup \let \protect \noexpand + \language\document@default@language \@resetactivechars \global\let\@@if@newlist\if@newlist \global\@newlistfalse @@ -6847,8 +6881,6 @@ Type H for immediate help.}% \set@typeset@protect \aftergroup \endgroup \aftergroup \set@typeset@protect - % correct? or just restore by ending - % the group? \if@specialpage \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% \fi @@ -6875,7 +6907,7 @@ Type H for immediate help.}% \normalcolor \hb@xt@\textwidth{\@thehead}% \color@endbox - }% %% 22 Feb 87 + }% \dp\@tempboxa \z@ \box\@tempboxa \vskip \headsep @@ -7555,7 +7587,11 @@ Type H for immediate help.}% \expandafter\@firstoftwo \fi} \@onlypreamble\@ifl@t@r -\def\@parse@version#1/#2/#3#4#5\@nil{#1#2#3#4 } +\def\@parse@version#1/#2/#3#4#5\@nil{% +\@parse@version@dash#1-#2-#3#4\@nil +} +\def\@parse@version@dash#1-#2-#3#4#5\@nil{% + \if\relax#2\relax\else#1\fi#2#3#4 } \def\@ifpackagewith{\@if@ptions\@pkgextension} \def\@ifclasswith{\@if@ptions\@clsextension} \@onlypreamble\@ifpackagewith @@ -8167,14 +8203,6 @@ Type H for immediate help.}% \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 % @@ -8183,7 +8211,6 @@ Type H for immediate help.}% 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 @@ -8287,6 +8314,10 @@ Type H for immediate help.}% } {\input{hyphen.ltx}} \let\@addtofilelist\@gobble +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +\let\document@default@language\m@ne \ifdim \font@submax >\z@ \@font@warning{Size substitutions with differences\MessageBreak up to \font@submax\space have occurred.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index d0c4ba71b84..aa674d456a8 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% ltclass.dtx (with options: `isodate') %% ltvers.dtx (with options: `latexrelease') %% latexrelease.dtx (with options: `latexrelease') %% ltdirchk.dtx (with options: `latexrelease') @@ -11,6 +12,7 @@ %% ltboxes.dtx (with options: `latexrelease') %% ltmath.dtx (with options: `latexrelease') %% ltpictur.dtx (with options: `latexrelease') +%% ltfiles.dtx (with options: `latexrelease') %% ltoutenc.dtx (with options: `latexrelease') %% ltcounts.dtx (with options: `latexrelease') %% ltlength.dtx (with options: `latexrelease') @@ -33,7 +35,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright 1993-2016 +%% Copyright 1993-2017 %% The LaTeX3 Project and any individual authors listed elsewhere %% in this file. %% @@ -61,9 +63,15 @@ %% 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: ltclass.dtx +\def\@parse@version#1/#2/#3#4#5\@nil{% +\@parse@version@dash#1-#2-#3#4\@nil +} +\def\@parse@version@dash#1-#2-#3#4#5\@nil{% + \if\relax#2\relax\else#1\fi#2#3#4 } %%% From File: ltvers.dtx \edef\latexreleaseversion - {2017/01/01} + {2017-04-15} \def\IncludeInRelease#1{\kernel@ifnextchar[% {\@IncludeInRelease{#1}} {\@IncludeInRelease{#1}[#1]}} @@ -203,6 +211,22 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}{\MakeRobust}{\MakeRobust}% \let\MakeRobust\@undefined \EndIncludeInRelease +\IncludeInRelease{2017/04/15}{\-}{Use \hyphenchar in \-}% +\DeclareRobustCommand{\-}{% + \discretionary{% + \char \ifnum\hyphenchar\font<\z@ + \defaulthyphenchar + \else + \hyphenchar\font + \fi + }{}{}% +} +\let\@dischyph=\- +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}% +\def\-{\discretionary{-}{}{}} +\let\@dischyph=\- +\EndIncludeInRelease %%% From File: ltboxes.dtx \IncludeInRelease{2015/01/01}% {\makebox}{Make \makebox robust}% @@ -262,6 +286,44 @@ of this package available from CTAN} {\@iiiparbox c\relax[s]}}% \expandafter\let\csname parbox \endcsname\@undefined \EndIncludeInRelease +\IncludeInRelease{2017-04-15}% + {\normallineskiplimit} + {reset \lineskiplimit}% +\def\@arrayparboxrestore{% + \let\if@nobreak\iffalse + \let\if@noskipsec\iffalse + \let\par\@@par + \let\-\@dischyph + \let\'\@acci\let\`\@accii\let\=\@acciii + \parindent\z@ \parskip\z@skip + \everypar{}% + \linewidth\hsize + \@totalleftmargin\z@ + \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip + \parfillskip\@flushglue + \lineskip\normallineskip + \lineskiplimit\normallineskiplimit + \baselineskip\normalbaselineskip + \sloppy} +\EndIncludeInRelease +\IncludeInRelease{0000-00-00}% + {\normallineskiplimit} + {reset \lineskiplimit}% +\def\@arrayparboxrestore{% + \let\if@nobreak\iffalse + \let\if@noskipsec\iffalse + \let\par\@@par + \let\-\@dischyph + \let\'\@acci\let\`\@accii\let\=\@acciii + \parindent\z@ \parskip\z@skip + \everypar{}% + \linewidth\hsize + \@totalleftmargin\z@ + \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip + \parfillskip\@flushglue \lineskip\normallineskip + \baselineskip\normalbaselineskip + \sloppy} +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\rule}{Make \rule robust}% \DeclareRobustCommand\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% @@ -437,7 +499,162 @@ of this package available from CTAN} \if@ovl \else \kern \@ovdx \fi \kern \@ovri}} \EndIncludeInRelease +%%% From File: ltfiles.dtx +\IncludeInRelease{2017/03/10}% + {\document}{Save language for hyphenation}% +\def\document{\endgroup + \ifx\@unusedoptionlist\@empty\else + \@latex@warning@no@line{Unused global option(s):^^J% + \@spaces[\@unusedoptionlist]}% + \fi + \@colht\textheight + \@colroom\textheight \vsize\textheight + \columnwidth\textwidth + \@clubpenalty\clubpenalty + \if@twocolumn + \advance\columnwidth -\columnsep + \divide\columnwidth\tw@ \hsize\columnwidth \@firstcolumntrue + \fi + \hsize\columnwidth \linewidth\hsize + \begingroup\@floatplacement\@dblfloatplacement + \makeatletter\let\@writefile\@gobbletwo + \global \let \@multiplelabels \relax + \@input{\jobname.aux}% + \endgroup + \if@filesw + \immediate\openout\@mainaux\jobname.aux + \immediate\write\@mainaux{\relax}% + \fi + \process@table + \let\glb@currsize\@empty %% Force math initialization. + \normalsize + \everypar{}% + \ifx\normalsfcodes\@empty + \ifnum\sfcode`\.=\@m + \let\normalsfcodes\frenchspacing + \else + \let\normalsfcodes\nonfrenchspacing + \fi + \fi + \ifx\document@default@language\m@ne + \chardef\document@default@language\language + \fi + \@noskipsecfalse + \let \@refundefined \relax + \let\AtBeginDocument\@firstofone + \@begindocumenthook + \ifdim\topskip<1sp\global\topskip 1sp\relax\fi + \global\@maxdepth\maxdepth + \global\let\@begindocumenthook\@undefined + \ifx\@listfiles\@undefined + \global\let\@filelist\relax + \global\let\@addtofilelist\@gobble + \fi + \gdef\do##1{\global\let ##1\@notprerr}% + \@preamblecmds + \global\let \@nodocument \relax + \global\let\do\noexpand + \ignorespaces} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\document}{Save language for hyphenation} +\def\document{\endgroup + \ifx\@unusedoptionlist\@empty\else + \@latex@warning@no@line{Unused global option(s):^^J% + \@spaces[\@unusedoptionlist]}% + \fi + \@colht\textheight + \@colroom\textheight \vsize\textheight + \columnwidth\textwidth + \@clubpenalty\clubpenalty + \if@twocolumn + \advance\columnwidth -\columnsep + \divide\columnwidth\tw@ \hsize\columnwidth + \@firstcolumntrue + \fi + \hsize\columnwidth \linewidth\hsize + \begingroup\@floatplacement\@dblfloatplacement + \makeatletter\let\@writefile\@gobbletwo + \global \let \@multiplelabels \relax + \@input{\jobname.aux}% + \endgroup + \if@filesw + \immediate\openout\@mainaux\jobname.aux + \immediate\write\@mainaux{\relax}% + \fi + \process@table + \let\glb@currsize\@empty + \normalsize + \everypar{}% + \ifx\normalsfcodes\@empty + \ifnum\sfcode`\.=\@m + \let\normalsfcodes\frenchspacing + \else + \let\normalsfcodes\nonfrenchspacing + \fi + \fi + \@noskipsecfalse + \let \@refundefined \relax + \let\AtBeginDocument\@firstofone + \@begindocumenthook + \ifdim\topskip<1sp\global\topskip 1sp\relax\fi + \global\@maxdepth\maxdepth + \global\let\@begindocumenthook\@undefined + \ifx\@listfiles\@undefined + \global\let\@filelist\relax + \global\let\@addtofilelist\@gobble + \fi + \gdef\do##1{\global\let ##1\@notprerr}% + \@preamblecmds + \global\let \@nodocument \relax + \global\let\do\noexpand + \ignorespaces} %%% From File: ltoutenc.dtx +\IncludeInRelease{2017/04/15}{\DeclareTextCompositeCommand} + {test for undeclared accent}% +\def\DeclareTextCompositeCommand#1#2#3#4{% + \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname + \ifx\reserved@a\relax + \DeclareTextCommand#1{#2}{% + \@latex@error{\string#1 undeclared in encoding #2}\@eha}% + \@latex@info{Composite with undeclared \string#1 in encoding #2}% + \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname + \fi + \expandafter\expandafter\expandafter\ifx + \expandafter\@car\reserved@a\relax\relax\@nil \@text@composite \else + \edef\reserved@b##1{% + \def\expandafter\noexpand + \csname#2\string#1\endcsname####1{% + \noexpand\@text@composite + \expandafter\noexpand\csname#2\string#1\endcsname + ####1\noexpand\@empty\noexpand\@text@composite + {##1}}}% + \expandafter\reserved@b\expandafter{\reserved@a{##1}}% + \fi + \expandafter\def\csname\expandafter\string\csname + #2\endcsname\string#1-\string#3\@empty\endcsname{#4}% + } +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\DeclareTextCompositeCommand} + {test for undeclared accent}% +\def\DeclareTextCompositeCommand#1#2#3#4{% + \expandafter\let\expandafter\reserved@a + \csname#2\string#1\endcsname + \expandafter\expandafter\expandafter\ifx + \expandafter\@car\reserved@a\relax\relax\@nil + \@text@composite \else + \edef\reserved@b##1{% + \def\expandafter\noexpand + \csname#2\string#1\endcsname####1{% + \noexpand\@text@composite + \expandafter\noexpand\csname#2\string#1\endcsname + ####1\noexpand\@empty\noexpand\@text@composite + {##1}}}% + \expandafter\reserved@b\expandafter{\reserved@a{##1}}% + \fi + \expandafter\def\csname\expandafter\string\csname + #2\endcsname\string#1-\string#3\@empty\endcsname{#4}} +\EndIncludeInRelease \IncludeInRelease{2015/10/01}{\textcommabelow}{comma accent}% \DeclareTextCommandDefault\textcommabelow[1] {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\raise-.31ex @@ -786,6 +1003,50 @@ of this package available from CTAN} \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R} \insc@unt=234 \EndIncludeInRelease +\IncludeInRelease{2017/04/15}% + {\newpage}{Check depth of page}% +\def \newpage {% + \if@noskipsec + \ifx \@nodocument\relax + \leavevmode + \global \@noskipsecfalse + \fi + \fi + \if@inlabel + \leavevmode + \global \@inlabelfalse + \fi + \if@nobreak \@nobreakfalse \everypar{}\fi + \par + \ifdim\prevdepth>\z@ + \vskip -% + \ifdim\prevdepth>\maxdepth + \maxdepth + \else + \prevdepth + \fi + \fi + \vfil + \penalty -\@M} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\newpage}{Check depth of page}% +\def \newpage {% + \if@noskipsec + \ifx \@nodocument\relax + \leavevmode + \global \@noskipsecfalse + \fi + \fi + \if@inlabel + \leavevmode + \global \@inlabelfalse + \fi + \if@nobreak \@nobreakfalse \everypar{}\fi + \par + \vfil + \penalty -\@M} +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\@testwrongwidth}{float order in 2-column}% \def\@testwrongwidth #1{% @@ -886,6 +1147,121 @@ of this package available from CTAN} \fi }% \EndIncludeInRelease +\IncludeInRelease{2017/03/10}% + {\@outputpage}{Reset language for hyphenation}% +\def\@outputpage{% +\begingroup + \let \protect \noexpand + \language\document@default@language + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout \vbox{% + \set@typeset@protect + \aftergroup \endgroup + \aftergroup \set@typeset@protect + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \let\@themargin\oddsidemargin + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot \let\@themargin\evensidemargin + \fi + \fi + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ + \@begindvi + \vskip \topmargin + \moveright\@themargin \vbox {% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@outputpage}{Reset language for hyphenation}% +\def\@outputpage{% +\begingroup + \let \protect \noexpand + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout \vbox{% + \set@typeset@protect + \aftergroup \endgroup + \aftergroup \set@typeset@protect + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ + \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \let\@themargin\oddsidemargin + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot \let\@themargin\evensidemargin + \fi + \fi + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ + \@begindvi + \vskip \topmargin + \moveright\@themargin \vbox {% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} \IncludeInRelease{2015/01/01}% {\@startdblcolumn}{float order in 2-column}% \def \@startdblcolumn {% @@ -1610,8 +1986,11 @@ of this package available from CTAN} \def\newwrite {\e@alloc\write \chardef{\count17}\m@ne\sixt@@n} \else \def\newwrite {\e@alloc\write - {\ifnum\allocationnumber=18 \allocationnumber19\fi - \global\chardef}% + {\ifnum\allocationnumber=18 + \advance\count17\@ne + \allocationnumber\count17 % + \fi + \global\chardef}% {\count17}% \m@ne {128}} @@ -2536,14 +2915,6 @@ of this package available from CTAN} \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 % @@ -2552,7 +2923,6 @@ of this package available from CTAN} 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 diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index a2524ca1fc0..095589e7509 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -171,7 +171,8 @@ return registernumber(key) or nil end} ) luatexbase.attributes = attributes -local attribute_count_name = attribute_count_name or "e@alloc@attribute@count" +local attribute_count_name = + attribute_count_name or "e@alloc@attribute@count" local function new_attribute(name) tex_setcount("global", attribute_count_name, tex_count[attribute_count_name] + 1) @@ -196,7 +197,8 @@ local function new_whatsit(name) return tex_count[whatsit_count_name] end luatexbase.new_whatsit = new_whatsit -local bytecode_count_name = bytecode_count_name or "e@alloc@bytecode@count" +local bytecode_count_name = + bytecode_count_name or "e@alloc@bytecode@count" local function new_bytecode(name) tex_setcount("global", bytecode_count_name, tex_count[bytecode_count_name] + 1) @@ -208,7 +210,8 @@ local function new_bytecode(name) return tex_count[bytecode_count_name] end luatexbase.new_bytecode = new_bytecode -local chunkname_count_name = chunkname_count_name or "e@alloc@luachunk@count" +local chunkname_count_name = + chunkname_count_name or "e@alloc@luachunk@count" local function new_chunkname(name) tex_setcount("global", chunkname_count_name, tex_count[chunkname_count_name] + 1) diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index c8b6861834d..5eba56b645b 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} -[2017/02/18 v1.1c +[2017/03/28 v1.1e LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex/base/ltnews.cls b/Master/texmf-dist/tex/latex/base/ltnews.cls index 2bd72b533e8..a9e5f765113 100644 --- a/Master/texmf-dist/tex/latex/base/ltnews.cls +++ b/Master/texmf-dist/tex/latex/base/ltnews.cls @@ -42,7 +42,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{ltnews}[2015/02/15 v1.04 Standard LaTeX class] +\ProvidesClass{ltnews}[2017/03/07 v1.05 Standard LaTeX class] % The configuration file, used for passing options. @@ -374,6 +374,11 @@ % % If pdf is being produced add some info to the pdf file and use hyperref. % But move this after other packages are, possibly, loaded. +% LuaTeX support. +\ifx\pdfoutput\@undefined + \let\pdfoutput\outputmode + \protected\def\pdfinfo{\pdfextension info } +\fi \ifx\pdfoutput\@undefined\else \ifx\pdfoutput\relax\else \ifcase\pdfoutput\else diff --git a/Master/texmf-dist/tex/latex/base/ltxdoc.cls b/Master/texmf-dist/tex/latex/base/ltxdoc.cls index 42417d4530a..e68a2976274 100644 --- a/Master/texmf-dist/tex/latex/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex/base/ltxdoc.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2015/03/26 v2.0w Standard LaTeX documentation class] + [2017/03/13 v2.0v Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \DeclareOption*{% @@ -198,7 +198,7 @@ \def\thepart{\aalph{part}}\def\filesep{\thepart-}% \let\filekey\@gobble \g@addto@macro\index@prologue{% - \gdef\@oddfoot{\parbox{\textwidth}{\strut\footnotesize + \gdef\@oddfoot{\parbox[t]{\textwidth}{\strut\footnotesize \raggedright{\bfseries File Key:} \filekey}}% \let\@evenfoot\@oddfoot}% \global\let\docincludeaux\relax diff --git a/Master/texmf-dist/tex/latex/base/omlenc.def b/Master/texmf-dist/tex/latex/base/omlenc.def index 5ba450a1c96..4e8b04ab9ac 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i 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 e51539bfc60..1565a2b991d 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i 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 365ed4d0d9e..efb4f02ea64 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i 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 21d76f904a6..5809dec253f 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i Standard LaTeX file] \DeclareFontEncoding{OT4}{}{} \DeclareFontSubstitution{OT4}{cmr}{m}{n} diff --git a/Master/texmf-dist/tex/latex/base/source2e.tex b/Master/texmf-dist/tex/latex/base/source2e.tex index 8abcd3abdce..1a257b9086d 100644 --- a/Master/texmf-dist/tex/latex/base/source2e.tex +++ b/Master/texmf-dist/tex/latex/base/source2e.tex @@ -110,9 +110,11 @@ page_precedence "rnaA" % The standard \changes command modified slightly to better cope with % this multiple file document. \makeatletter +\def\@changes@iso@date#1/#2/#3/#4\space{#1\if\relax#2\relax\else-#2-#3\fi\space} \def\changes@#1#2#3{% \let\protect\@unexpandable@protect - \edef\@tempa{\noexpand\glossary{#2\space\currentfile\space#1\levelchar + \edef\@tempa{\noexpand\glossary{\@changes@iso@date#2///\space + \currentfile\space#1\levelchar \ifx\saved@macroname\@empty \space \actualchar @@ -128,6 +130,11 @@ page_precedence "rnaA" :\levelchar #3}}% \@tempa\endgroup\@esphack} +% Move whole block up so that the file key is not so close +% to bottom of US letter page. +\addtolength\topmargin{-2\baselineskip} + + % 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}} diff --git a/Master/texmf-dist/tex/latex/base/t1enc.def b/Master/texmf-dist/tex/latex/base/t1enc.def index 0d37a31650d..d76ef1ca408 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i 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 8ada3fb76fc..8286f4dde95 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} - [2017/02/22 v2.0g + [2017/04/05 v2.0i 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 index f8131cef4a2..5dacb7a4575 100644 --- a/Master/texmf-dist/tex/latex/base/tuenc.def +++ b/Master/texmf-dist/tex/latex/base/tuenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{tuenc.def} - [2017/02/22 v2.0g + [2017/04/05 v2.0i Standard LaTeX file] \providecommand\UnicodeEncodingName{TU} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -86,6 +86,30 @@ \def\DeclareUnicodeAccent#1#2#3{% \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}% } +{ +\catcode\z@=11\relax +\gdef\DeclareUnicodeComposite#1#2#3{% + \def\reserved@a##1##2{% + \DeclareTextCompositeCommand#1\UnicodeEncodingName{#2}{% + \iffontchar\font#3 ##2% + \else ##1\fi}}% + \expandafter\expandafter\expandafter\extract@default@composite + \csname\UnicodeEncodingName\string#1\endcsname{#2}\@nil + \bgroup + \lccode\z@#3 % + \lowercase{\egroup + \expandafter\reserved@a\expandafter{\reserved@b}{^^@}}}% +} +\def\extract@default@composite#1{% + \ifx\@text@composite#1% + \expandafter\extract@default@composite@a + \else + \expandafter\extract@default@composite@b\expandafter#1% + \fi} +\def\extract@default@composite@a#1\@text@composite#2\@nil{% + \def\reserved@b{#2}} +\def\extract@default@composite@b#1#2\@nil{% + \def\reserved@b{#1#2}} \DeclareTextCommand\textquotesingle \UnicodeEncodingName{% \remove@tlig{"0027}} \DeclareTextCommand\textasciigrave \UnicodeEncodingName{% @@ -154,8 +178,6 @@ \DeclareTextSymbol{\OE} \UnicodeEncodingName{"0152} \DeclareTextSymbol{\oe} \UnicodeEncodingName{"0153} \DeclareTextSymbol{\textflorin} \UnicodeEncodingName{"0192} -\DeclareTextComposite{\=} \UnicodeEncodingName{Y}{"0232} -\DeclareTextComposite{\=} \UnicodeEncodingName{y}{"0232} \DeclareTextSymbol{\j} \UnicodeEncodingName{"0237} \DeclareTextSymbol{\textasciicaron} \UnicodeEncodingName{"02C7} \DeclareTextSymbol{\textasciibreve} \UnicodeEncodingName{"02D8} @@ -163,8 +185,6 @@ \DeclareTextSymbol{\textgravedbl} \UnicodeEncodingName{"02F5} \DeclareTextSymbol{\texttildelow} \UnicodeEncodingName{"02F7} \DeclareTextSymbol{\textbaht} \UnicodeEncodingName{"0E3F} -\DeclareTextComposite{\=} \UnicodeEncodingName{G}{"1E20} -\DeclareTextComposite{\=} \UnicodeEncodingName{g}{"1E21} \DeclareTextSymbol{\SS} \UnicodeEncodingName{"1E9E} \DeclareTextSymbol{\textcompwordmark} \UnicodeEncodingName{"200C} \DeclareTextSymbol{\textendash} \UnicodeEncodingName{"2013} @@ -237,216 +257,262 @@ \DeclareUnicodeAccent{\'} \UnicodeEncodingName{"0301} \DeclareUnicodeAccent{\^} \UnicodeEncodingName{"0302} \DeclareUnicodeAccent{\~} \UnicodeEncodingName{"0303} +\DeclareUnicodeAccent{\=} \UnicodeEncodingName{"0304} +\DeclareUnicodeAccent{\u} \UnicodeEncodingName{"0306} +\DeclareUnicodeAccent{\.} \UnicodeEncodingName{"0307} \DeclareUnicodeAccent{\"} \UnicodeEncodingName{"0308} -\DeclareUnicodeAccent{\H} \UnicodeEncodingName{"030B} \DeclareUnicodeAccent{\r} \UnicodeEncodingName{"030A} +\DeclareUnicodeAccent{\H} \UnicodeEncodingName{"030B} \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{\c} \UnicodeEncodingName{"0327} \DeclareUnicodeAccent{\k} \UnicodeEncodingName{"0328} -\DeclareTextComposite{\^} \UnicodeEncodingName {}{"005E} -\DeclareTextComposite{\~} \UnicodeEncodingName {}{"007E} -\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}{"00EC} -\DeclareTextComposite{\'} \UnicodeEncodingName\i {"00ED} -\DeclareTextComposite{\'} \UnicodeEncodingName{i}{"00ED} -\DeclareTextComposite{\^} \UnicodeEncodingName\i {"00EE} -\DeclareTextComposite{\^} \UnicodeEncodingName{i}{"00EE} -\DeclareTextComposite{\"} \UnicodeEncodingName\i {"00EF} -\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}{"0129} -\DeclareTextComposite{\=} \UnicodeEncodingName{I}{"012A} -\DeclareTextComposite{\=} \UnicodeEncodingName\i {"012B} -\DeclareTextComposite{\=} \UnicodeEncodingName{i}{"012B} -\DeclareTextComposite{\u} \UnicodeEncodingName{I}{"012C} -\DeclareTextComposite{\u} \UnicodeEncodingName\i {"012D} -\DeclareTextComposite{\u} \UnicodeEncodingName{i}{"012D} -\DeclareTextComposite{\k} \UnicodeEncodingName{I}{"012E} -\DeclareTextComposite{\k} \UnicodeEncodingName\i {"012F} -\DeclareTextComposite{\k} \UnicodeEncodingName{i}{"012F} -\DeclareTextComposite{\.} \UnicodeEncodingName{I}{"0130} -\DeclareTextComposite{\^} \UnicodeEncodingName{J}{"0134} -\DeclareTextComposite{\^} \UnicodeEncodingName\j {"0135} -\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{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{\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} +\DeclareTextCommand\textcommabelow \UnicodeEncodingName[1] + {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\raise-.31ex + \hbox{\check@mathfonts\fontsize\ssf@size\z@ + \math@fontsfalse\selectfont,}\hidewidth}\egroup} +\DeclareUnicodeComposite{\^} {}{"005E} +\DeclareUnicodeComposite{\~} {}{"007E} +\DeclareUnicodeComposite{\`} {A}{"00C0} +\DeclareUnicodeComposite{\'} {A}{"00C1} +\DeclareUnicodeComposite{\^} {A}{"00C2} +\DeclareUnicodeComposite{\~} {A}{"00C3} +\DeclareUnicodeComposite{\"} {A}{"00C4} +\DeclareUnicodeComposite{\r} {A}{"00C5} +\DeclareUnicodeComposite{\c} {C}{"00C7} +\DeclareUnicodeComposite{\`} {E}{"00C8} +\DeclareUnicodeComposite{\'} {E}{"00C9} +\DeclareUnicodeComposite{\^} {E}{"00CA} +\DeclareUnicodeComposite{\"} {E}{"00CB} +\DeclareUnicodeComposite{\`} {I}{"00CC} +\DeclareUnicodeComposite{\'} {I}{"00CD} +\DeclareUnicodeComposite{\^} {I}{"00CE} +\DeclareUnicodeComposite{\"} {I}{"00CF} +\DeclareUnicodeComposite{\~} {N}{"00D1} +\DeclareUnicodeComposite{\`} {O}{"00D2} +\DeclareUnicodeComposite{\'} {O}{"00D3} +\DeclareUnicodeComposite{\^} {O}{"00D4} +\DeclareUnicodeComposite{\~} {O}{"00D5} +\DeclareUnicodeComposite{\"} {O}{"00D6} +\DeclareUnicodeComposite{\`} {U}{"00D9} +\DeclareUnicodeComposite{\'} {U}{"00DA} +\DeclareUnicodeComposite{\^} {U}{"00DB} +\DeclareUnicodeComposite{\"} {U}{"00DC} +\DeclareUnicodeComposite{\'} {Y}{"00DD} +\DeclareUnicodeComposite{\`} {a}{"00E0} +\DeclareUnicodeComposite{\'} {a}{"00E1} +\DeclareUnicodeComposite{\^} {a}{"00E2} +\DeclareUnicodeComposite{\~} {a}{"00E3} +\DeclareUnicodeComposite{\"} {a}{"00E4} +\DeclareUnicodeComposite{\r} {a}{"00E5} +\DeclareUnicodeComposite{\c} {c}{"00E7} +\DeclareUnicodeComposite{\`} {e}{"00E8} +\DeclareUnicodeComposite{\'} {e}{"00E9} +\DeclareUnicodeComposite{\^} {e}{"00EA} +\DeclareUnicodeComposite{\"} {e}{"00EB} +\DeclareUnicodeComposite{\`} \i {"00EC} +\DeclareUnicodeComposite{\`} {i}{"00EC} +\DeclareUnicodeComposite{\'} \i {"00ED} +\DeclareUnicodeComposite{\'} {i}{"00ED} +\DeclareUnicodeComposite{\^} \i {"00EE} +\DeclareUnicodeComposite{\^} {i}{"00EE} +\DeclareUnicodeComposite{\"} \i {"00EF} +\DeclareUnicodeComposite{\"} {i}{"00EF} +\DeclareUnicodeComposite{\~} {n}{"00F1} +\DeclareUnicodeComposite{\`} {o}{"00F2} +\DeclareUnicodeComposite{\'} {o}{"00F3} +\DeclareUnicodeComposite{\^} {o}{"00F4} +\DeclareUnicodeComposite{\~} {o}{"00F5} +\DeclareUnicodeComposite{\"} {o}{"00F6} +\DeclareUnicodeComposite{\`} {u}{"00F9} +\DeclareUnicodeComposite{\'} {u}{"00FA} +\DeclareUnicodeComposite{\^} {u}{"00FB} +\DeclareUnicodeComposite{\"} {u}{"00FC} +\DeclareUnicodeComposite{\'} {y}{"00FD} +\DeclareUnicodeComposite{\"} {y}{"00FF} +\DeclareUnicodeComposite{\=} {A}{"0100} +\DeclareUnicodeComposite{\=} {a}{"0101} +\DeclareUnicodeComposite{\u} {A}{"0102} +\DeclareUnicodeComposite{\u} {a}{"0103} +\DeclareUnicodeComposite{\k} {A}{"0104} +\DeclareUnicodeComposite{\k} {a}{"0105} +\DeclareUnicodeComposite{\'} {C}{"0106} +\DeclareUnicodeComposite{\'} {c}{"0107} +\DeclareUnicodeComposite{\^} {C}{"0108} +\DeclareUnicodeComposite{\^} {c}{"0109} +\DeclareUnicodeComposite{\.} {C}{"010A} +\DeclareUnicodeComposite{\.} {c}{"010B} +\DeclareUnicodeComposite{\v} {C}{"010C} +\DeclareUnicodeComposite{\v} {c}{"010D} +\DeclareUnicodeComposite{\v} {D}{"010E} +\DeclareUnicodeComposite{\v} {d}{"010F} +\DeclareUnicodeComposite{\=} {E}{"0112} +\DeclareUnicodeComposite{\=} {e}{"0113} +\DeclareUnicodeComposite{\u} {E}{"0114} +\DeclareUnicodeComposite{\u} {e}{"0115} +\DeclareUnicodeComposite{\.} {E}{"0116} +\DeclareUnicodeComposite{\.} {e}{"0117} +\DeclareUnicodeComposite{\k} {E}{"0118} +\DeclareUnicodeComposite{\k} {e}{"0119} +\DeclareUnicodeComposite{\v} {E}{"011A} +\DeclareUnicodeComposite{\v} {e}{"011B} +\DeclareUnicodeComposite{\^} {G}{"011C} +\DeclareUnicodeComposite{\^} {g}{"011D} +\DeclareUnicodeComposite{\u} {G}{"011E} +\DeclareUnicodeComposite{\u} {g}{"011F} +\DeclareUnicodeComposite{\.} {G}{"0120} +\DeclareUnicodeComposite{\.} {g}{"0121} +\DeclareUnicodeComposite{\c} {G}{"0122} +\DeclareUnicodeComposite{\c} {g}{"0123} +\DeclareUnicodeComposite{\^} {H}{"0124} +\DeclareUnicodeComposite{\^} {h}{"0125} +\DeclareUnicodeComposite{\~} {I}{"0128} +\DeclareUnicodeComposite{\~} \i {"0129} +\DeclareUnicodeComposite{\~} {i}{"0129} +\DeclareUnicodeComposite{\=} {I}{"012A} +\DeclareUnicodeComposite{\=} \i {"012B} +\DeclareUnicodeComposite{\=} {i}{"012B} +\DeclareUnicodeComposite{\u} {I}{"012C} +\DeclareUnicodeComposite{\u} \i {"012D} +\DeclareUnicodeComposite{\u} {i}{"012D} +\DeclareUnicodeComposite{\k} {I}{"012E} +\DeclareUnicodeComposite{\k} \i {"012F} +\DeclareUnicodeComposite{\k} {i}{"012F} +\DeclareUnicodeComposite{\.} {I}{"0130} +\DeclareUnicodeComposite{\^} {J}{"0134} +\DeclareUnicodeComposite{\^} \j {"0135} +\DeclareUnicodeComposite{\^} {j}{"0135} +\DeclareUnicodeComposite{\c} {K}{"0136} +\DeclareUnicodeComposite{\c} {k}{"0137} +\DeclareUnicodeComposite{\'} {L}{"0139} +\DeclareUnicodeComposite{\'} {l}{"013A} +\DeclareUnicodeComposite{\c} {L}{"013B} +\DeclareUnicodeComposite{\c} {l}{"013C} +\DeclareUnicodeComposite{\v} {L}{"013D} +\DeclareUnicodeComposite{\v} {l}{"013E} +\DeclareUnicodeComposite{\'} {N}{"0143} +\DeclareUnicodeComposite{\'} {n}{"0144} +\DeclareUnicodeComposite{\c} {N}{"0145} +\DeclareUnicodeComposite{\c} {n}{"0146} +\DeclareUnicodeComposite{\v} {N}{"0147} +\DeclareUnicodeComposite{\v} {n}{"0148} +\DeclareUnicodeComposite{\=} {O}{"014C} +\DeclareUnicodeComposite{\=} {o}{"014D} +\DeclareUnicodeComposite{\u} {O}{"014E} +\DeclareUnicodeComposite{\u} {o}{"014F} +\DeclareUnicodeComposite{\H} {O}{"0150} +\DeclareUnicodeComposite{\H} {o}{"0151} +\DeclareUnicodeComposite{\'} {R}{"0154} +\DeclareUnicodeComposite{\'} {r}{"0155} +\DeclareUnicodeComposite{\c} {R}{"0156} +\DeclareUnicodeComposite{\c} {r}{"0157} +\DeclareUnicodeComposite{\v} {R}{"0158} +\DeclareUnicodeComposite{\v} {r}{"0159} +\DeclareUnicodeComposite{\'} {S}{"015A} +\DeclareUnicodeComposite{\'} {s}{"015B} +\DeclareUnicodeComposite{\^} {S}{"015C} +\DeclareUnicodeComposite{\^} {s}{"015D} +\DeclareUnicodeComposite{\c} {S}{"015E} +\DeclareUnicodeComposite{\c} {s}{"015F} +\DeclareUnicodeComposite{\v} {S}{"0160} +\DeclareUnicodeComposite{\v} {s}{"0161} +\DeclareUnicodeComposite{\c} {T}{"0162} +\DeclareUnicodeComposite{\c} {t}{"0163} +\DeclareUnicodeComposite{\v} {T}{"0164} +\DeclareUnicodeComposite{\v} {t}{"0165} +\DeclareUnicodeComposite{\~} {U}{"0168} +\DeclareUnicodeComposite{\~} {u}{"0169} +\DeclareUnicodeComposite{\=} {U}{"016A} +\DeclareUnicodeComposite{\=} {u}{"016B} +\DeclareUnicodeComposite{\u} {U}{"016C} +\DeclareUnicodeComposite{\u} {u}{"016D} +\DeclareUnicodeComposite{\r} {U}{"016E} +\DeclareUnicodeComposite{\r} {u}{"016F} +\DeclareUnicodeComposite{\H} {U}{"0170} +\DeclareUnicodeComposite{\H} {u}{"0171} +\DeclareUnicodeComposite{\k} {U}{"0172} +\DeclareUnicodeComposite{\k} {u}{"0173} +\DeclareUnicodeComposite{\^} {W}{"0174} +\DeclareUnicodeComposite{\^} {w}{"0175} +\DeclareUnicodeComposite{\^} {Y}{"0176} +\DeclareUnicodeComposite{\^} {y}{"0177} +\DeclareUnicodeComposite{\"} {Y}{"0178} +\DeclareUnicodeComposite{\'} {Z}{"0179} +\DeclareUnicodeComposite{\'} {z}{"017A} +\DeclareUnicodeComposite{\.} {Z}{"017B} +\DeclareUnicodeComposite{\.} {z}{"017C} +\DeclareUnicodeComposite{\v} {Z}{"017D} +\DeclareUnicodeComposite{\v} {z}{"017E} +\DeclareUnicodeComposite{\v} {A}{"01CD} +\DeclareUnicodeComposite{\v} {a}{"01CE} +\DeclareUnicodeComposite{\v} {I}{"01CF} +\DeclareUnicodeComposite{\v} \i {"01D0} +\DeclareUnicodeComposite{\v} {i}{"01D0} +\DeclareUnicodeComposite{\v} {O}{"01D1} +\DeclareUnicodeComposite{\v} {o}{"01D2} +\DeclareUnicodeComposite{\v} {U}{"01D3} +\DeclareUnicodeComposite{\v} {u}{"01D4} +\DeclareUnicodeComposite{\=} \AE{"01E2} +\DeclareUnicodeComposite{\=} \ae{"01E3} +\DeclareUnicodeComposite{\v} {G}{"01E6} +\DeclareUnicodeComposite{\v} {g}{"01E7} +\DeclareUnicodeComposite{\v} {K}{"01E8} +\DeclareUnicodeComposite{\v} {k}{"01E9} +\DeclareUnicodeComposite{\k} {O}{"01EA} +\DeclareUnicodeComposite{\k} {o}{"01EB} +\DeclareUnicodeComposite{\v} \j {"01F0} +\DeclareUnicodeComposite{\v} {j}{"01F0} +\DeclareUnicodeComposite{\'} {G}{"01F4} +\DeclareUnicodeComposite{\'} {g}{"01F5} +\DeclareUnicodeComposite{\textcommabelow}{S}{"0218} +\DeclareUnicodeComposite{\textcommabelow}{s}{"0219} +\DeclareUnicodeComposite{\textcommabelow}{T}{"021A} +\DeclareUnicodeComposite{\textcommabelow}{t}{"021B} +\DeclareUnicodeComposite{\=} {Y}{"0232} +\DeclareUnicodeComposite{\=} {y}{"0232} +\DeclareUnicodeComposite{\.} {B}{"1E02} +\DeclareUnicodeComposite{\.} {b}{"1E03} +\DeclareUnicodeComposite{\d} {B}{"1E04} +\DeclareUnicodeComposite{\d} {b}{"1E05} +\DeclareUnicodeComposite{\d} {D}{"1E0C} +\DeclareUnicodeComposite{\d} {d}{"1E0D} +\DeclareUnicodeComposite{\=} {G}{"1E20} +\DeclareUnicodeComposite{\=} {g}{"1E21} +\DeclareUnicodeComposite{\d} {H}{"1E24} +\DeclareUnicodeComposite{\d} {h}{"1E25} +\DeclareUnicodeComposite{\d} {K}{"1E32} +\DeclareUnicodeComposite{\d} {k}{"1E33} +\DeclareUnicodeComposite{\d} {L}{"1E36} +\DeclareUnicodeComposite{\d} {l}{"1E37} +\DeclareUnicodeComposite{\d} {M}{"1E42} +\DeclareUnicodeComposite{\d} {m}{"1E43} +\DeclareUnicodeComposite{\d} {N}{"1E46} +\DeclareUnicodeComposite{\d} {n}{"1E47} +\DeclareUnicodeComposite{\d} {R}{"1E5A} +\DeclareUnicodeComposite{\d} {r}{"1E5B} +\DeclareUnicodeComposite{\d} {S}{"1E62} +\DeclareUnicodeComposite{\d} {s}{"1E63} +\DeclareUnicodeComposite{\d} {T}{"1E6C} +\DeclareUnicodeComposite{\d} {t}{"1E6D} +\DeclareUnicodeComposite{\d} {V}{"1E7E} +\DeclareUnicodeComposite{\d} {v}{"1E7F} +\DeclareUnicodeComposite{\d} {W}{"1E88} +\DeclareUnicodeComposite{\d} {w}{"1E89} +\DeclareUnicodeComposite{\d} {Z}{"1E92} +\DeclareUnicodeComposite{\d} {z}{"1E93} +\DeclareUnicodeComposite{\d} {A}{"1EA0} +\DeclareUnicodeComposite{\d} {a}{"1EA1} +\DeclareUnicodeComposite{\d} {E}{"1EB8} +\DeclareUnicodeComposite{\d} {e}{"1EB9} +\DeclareUnicodeComposite{\d} {I}{"1ECA} +\DeclareUnicodeComposite{\d} {i}{"1ECB} +\DeclareUnicodeComposite{\d} {O}{"1ECC} +\DeclareUnicodeComposite{\d} {o}{"1ECD} +\DeclareUnicodeComposite{\d} {U}{"1EE4} +\DeclareUnicodeComposite{\d} {u}{"1EE5} +\DeclareUnicodeComposite{\d} {Y}{"1EF4} +\DeclareUnicodeComposite{\d} {y}{"1EF5} \endinput %% %% End of file `tuenc.def'. diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index 9890aedd371..ae2ca9ee453 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -12,7 +12,7 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--2016 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2016/10/09 v1.0u Standard LaTeX Graphics (DPC,SPQR)] + [2017/04/14 v1.1b Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -110,6 +110,7 @@ \edef\Gin@extensions{\zap@space#1 \@empty}} \providecommand\Gin@extensions{} \def\includegraphics{% + \leavevmode \@ifstar {\Gin@cliptrue\Gin@i}% {\Gin@clipfalse\Gin@i}} @@ -410,8 +411,7 @@ \ifdim#1\p@<\z@ \hb@xt@-#1\wd\z@{\kern-#1\wd\z@\box\tw@\hss}% \else - \wd\tw@#1\wd\z@ - \box\tw@ + \hb@xt@#1\wd\z@{\box\tw@\kern#1\wd\z@\hss}% \fi} \def\reflectbox{\Gscale@box-1[1]} \def\resizebox{% diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index 43165ca5f6d..10ebd6a17bb 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -100,7 +100,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2016/04/07 v1.8p multicolumn formatting (FMi)] + [2017/04/11 v1.8q multicolumn formatting (FMi)] %% \DeclareOption{twocolumn} {\PackageWarning{multicol}{May not work @@ -257,6 +257,15 @@ \output{\multi@column@out}% \init@mult@footins \reinsert@footnotes + \def\clearpage{% + \ifx\@deferlist\@empty\else + \PackageError{multicol}% + {Deferred floats not cleared}% + {A \string\clearpage\space inside multicols acts like + \string\newpage\space and doesn't clear floats.\MessageBreak + Move it before the multicols environment if you need it.}% + \fi + \newpage}% \fi \vbadness\@Mi \hbadness5000 \tolerance\multicoltolerance -- cgit v1.2.3