microtype (15mar21)

git-svn-id: svn://tug.org/texlive/trunk@58394 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 104 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/microtype/README.md b/Master/texmf-dist/doc/latex/microtype/README.md
index 446ef0cbf9f..80aaec18110 100644
--- a/Master/texmf-dist/doc/latex/microtype/README.md
+++ b/Master/texmf-dist/doc/latex/microtype/README.md
@@ -4,7 +4,7 @@ The `microtype` package
 
 **Subliminal refinements towards typographical perfection**
 
-  (v2.8b -- 2021/02/25)
+  (v2.8c -- 2021/03/14)
 
 
 Overview
diff --git a/Master/texmf-dist/doc/latex/microtype/microtype.pdf b/Master/texmf-dist/doc/latex/microtype/microtype.pdf
index 041531c8aac..f88c1676275 100644
--- a/Master/texmf-dist/doc/latex/microtype/microtype.pdf
+++ b/Master/texmf-dist/doc/latex/microtype/microtype.pdf
diff --git a/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx b/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
index 1f64521c5b5..c553e53e2da 100644
--- a/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
+++ b/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
@@ -26,7 +26,7 @@
 %
 \ProvidesFile
 %<*driver>
-    {\jobname.dtx}[2021/02/25 v2.8b]
+    {\jobname.dtx}[2021/03/14 v2.8c]
 %</driver>
 %<CharisSIL>  {mt-CharisSIL.cfg}[2017/07/07 v1.1 microtype config. file: Charis SIL (RS)]
 %<LatinModernRoman>  {mt-LatinModernRoman.cfg}[2021/02/21 v1.1 microtype config. file: Latin Modern Roman (RS)]
diff --git a/Master/texmf-dist/source/latex/microtype/microtype.dtx b/Master/texmf-dist/source/latex/microtype/microtype.dtx
index a4a45649471..088b55ea1f9 100644
--- a/Master/texmf-dist/source/latex/microtype/microtype.dtx
+++ b/Master/texmf-dist/source/latex/microtype/microtype.dtx
@@ -1,7 +1,7 @@
 %\iffalse meta-comment
 % !Mode:: "TeX:DTX:UK"
 % !smartQuote:: "English"
-% !DTXversion:: "2.8b"
+% !DTXversion:: "2.8c"
 % ------------------------------------------------------------------------
 %                       The `microtype' package
 %         Subliminal refinements towards typographical perfection
@@ -37,7 +37,7 @@
 %<luatex-def>  {microtype-luatex.def}
 %<xetex-def>  {microtype-xetex.def}
 %<*package|letterspace|m-t|pdftex-def|luatex-def|xetex-def>
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
 %<package>   Micro-typographical refinements
 %<letterspace>   Robust letterspacing
 %<m-t>   microtype main configuration file
@@ -51,8 +51,8 @@
 %<luafile>local microtype  = microtype
 %<luafile>microtype.module = {
 %<luafile>    name         = "microtype",
-%<luafile>    version      = "2.8b",
-%<luafile>    date         = "2021/02/25",
+%<luafile>    version      = "2.8c",
+%<luafile>    date         = "2021/03/14",
 %<luafile>    description  = "microtype module.",
 %<luafile>    author       = "E. Roux, R. Schlicht and P. Gesang",
 %<luafile>    copyright    = "E. Roux, R. Schlicht and P. Gesang",
@@ -3052,7 +3052,9 @@
 %
 %\VersionDate{\expandafter\@gobble\fileversion}{\filedate}
 %
-%\VersionDate{2.8a}{2020/02/22}
+%\VersionDate{2.8b}{2021/02/25}
+%
+%\VersionDate{2.8a}{2021/02/22}
 %
 %\Version{2.8}{2020/12/07}
 %  \item New default font sets for expansion and spacing: `|alltext-nott|'
@@ -3380,8 +3382,8 @@
 %  \write,\xdef}
 %^^A\DoNotIndex{\font,\fontdimen,\nullfont,\sfcode,\spacefactor,\spaceskip,
 %^^A  \xspaceskip}                                                           ^^A tex
-%\DoNotIndex{\currentgrouplevel,\currentgrouptype,\detokenize,\dimexpr,
-%  \eTeXversion,\ifcsname,\ifdefined,\numexpr}
+%\DoNotIndex{\currentgrouplevel,\currentgrouptype,\currentiflevel,\detokenize,
+%  \dimexpr,\eTeXversion,\ifcsname,\ifdefined,\numexpr}
 %^^A\DoNotIndex{\fontcharwd,\iffontchar}                                     ^^A e-tex
 %\DoNotIndex{\pdfannot,\pdfescapestring,\pdfmatch,\pdfoutput,\pdfstrcmp,
 %  \pdftexrevision,\pdftexversion}
@@ -3392,7 +3394,7 @@
 %\DoNotIndex{\XeTeXversion,\XeTeXrevision,\strcmp}                           ^^A xetex
 %^^A\DoNotIndex{\XeTeXcharglyph,\XeTeXfonttype,\XeTeXglyph,\XeTeXglyphindex,
 %^^A  \XeTeXglyphname,\XeTeXlastfontchar,\XeTeXprotrudechars}
-%\DoNotIndex{\directlua,\luatexversion}                                      ^^A luatex
+%\DoNotIndex{\directlua,\glet,\luatexversion}                                ^^A luatex
 %^^A\DoNotIndex{\adjustspacing,\copyfont,\expandglyphsinfont,
 %^^A  \ignoreligaturesinfont,\outputmode,\protrudechars,\tracingfonts}
 %\DoNotIndex{\eplain,\usepkg@pkg}                                            ^^A eplain
@@ -3409,7 +3411,7 @@
 %  \on@line,\p@,\set@display@protect,\strip@prefix,\strip@pt,\tw@,\z@,\z@skip,
 %  \zap@space,\active,\documentclass,\fmtversion,\leavevmode,\makeatletter,
 %  \mbox,\newcommand,\newcount,\newdimen,\newif,\newskip,\newtoks,\nobreak,
-%  \nonfrenchspacing,\normalsize,\renewcommand,\space,\AtBeginDocument,
+%  \nonfrenchspacing,\normalsize,\renewcommand,\space,\AddToHook,\AtBeginDocument,
 %  \AtEndOfPackage,\CheckCommand,\CurrentOption,\DeclareRobustCommand,\IfFileExists,
 %  \InputIfFileExists,\MessageBreak,\PackageError,\PackageInfo,\PackageWarning,
 %  \RequirePackage,\@@enc@update,\cf@encoding,\f@encoding}
@@ -5224,7 +5226,7 @@ microtype.do_font = do_font
 %                           ^^A private mail, 2012/06/30
 % They are also part of recent \xetex.
 %\changes{v2.5a}{2013/03/25}{support for \pkg{eledmac}}
-%\changes{v2.6}{2015/08/10}{support for \pkg{reledmac}}
+%\changes{v2.6}{2015/08/10}{support for \pkg{reledmac}}^^A
 % The successor packages \pkg{eledmac} and \pkg{reledmac} are also supported.
 %    \begin{macrocode}
 %</package>
@@ -5287,17 +5289,24 @@ microtype.do_font = do_font
 \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# }
 %    \end{macrocode}
 %\end{macro}
-%\begin{macro}{\ifMT@xunicode}
 %\begin{macro}{\ifMT@fontspec}
+%\begin{macro}{\ifMT@xunicode}
 % Two new conditionals for use with \xetex\ or \luatex.
 %    \begin{macrocode}
-\newif\ifMT@xunicode
-\MT@with@package@T{xunicode}\MT@xunicodetrue
 \newif\ifMT@fontspec
 \MT@with@package@T{fontspec}\MT@fontspectrue
+\newif\ifMT@xunicode
+\MT@with@package@T{xunicode}\MT@xunicodetrue
 %    \end{macrocode}
 %\end{macro}
+%\changes{v2.8c}{2021/03/12}{add to hook for \pkg{fontspec}}
 %\end{macro}
+% We need the correct value of the former for configuration commands
+% inside the preamble (to get the default families right).
+%    \begin{macrocode}
+\@ifl@t@r\fmtversion{2020/10/01}
+  {\AddToHook{package/after/fontspec}{\MT@fontspectrue}}\relax
+%    \end{macrocode}
 %\begin{macro}{\MT@maybe@gobble@with@tikz}
 %\begin{macro}{\MT@tikz@setup}
 %\changes{v2.3e}{2009/11/02}{compatibility with \pkg{tikz} (first reported by
@@ -9045,13 +9054,19 @@ end
 \def\MT@is@symbol{%
   \expandafter\def\expandafter\MT@char\expandafter
       {\csname\MT@encoding\MT@detokenize@c\@tempa\endcsname}%
+%    \end{macrocode}
+% Since recently, some glyphs are defined optionally in \LaTeX\
+% by checking if the glyph actually exists in the font (\eg, \cmd\textasteriskcentered).
+%    \begin{macrocode}
+  \expandafter\expandafter\expandafter
+    \MT@is@opt@char\MT@char\iffontchar\char\else\fi\relax
   \expandafter\MT@exp@two@c\expandafter\MT@is@char\expandafter
-      \meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
+    \meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
   \ifnum\MT@char@ < \z@
 %    \end{macrocode}
 %\changes{v2.7c}{2019/08/13}{take care of \cs{remove@tlig}}
-% For <TU> encoding, the commands \cmd\textquotesingle, \cmd\textasciigrave\
-% and \cmd\textquotedbl\ are defined by means of the auxiliary macro
+% In <TU> encoding, some commands (currently, \cmd\textquotesingle, \cmd\textasciigrave\
+% and \cmd\textquotedbl) are defined by means of the auxiliary macro
 % \cmd\remove@tlig, which we take care of here.
 %    \begin{macrocode}
     \expandafter\expandafter\expandafter\MT@is@tlig\MT@char\relax\relax
@@ -9068,6 +9083,24 @@ end
 }
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\MT@is@opt@char}
+% This seems adventurous, but we're only redefining the text command within
+% the scope of our setup.
+%\changes{v2.8c}{2021/03/05}{fix for optionally defined glyphs
+%                            (reported by \contributor Frank Mittelbach <frank.mittelbach\at latex-project.org>)}
+%                            ^^A private mail, 2021/03/02
+%                            ^^A also: https://github.com/latex3/latex2e/issues/525
+%    \begin{macrocode}
+\def\MT@is@opt@char#1\iffontchar#2\char#3\else#4\fi\relax{%
+  \ifx\\#1\\%
+    \iffontchar#2%
+      \expandafter\chardef
+        \csname\MT@encoding\MT@detokenize@c\@tempa\endcsname=#3\relax
+    \fi
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\MT@is@char}
 %\begin{macro}{\MT@charstring}
 % A helper macro that inspects the \cmd\meaning\ of its argument.
@@ -9144,14 +9177,26 @@ end
 % This might have to change again with the next \LaTeX\ release, ^^A see https://github.com/latex3/latex2e/issues/165
 % \dots\ or so I feared, but it still seems to be fine.
 %    \begin{macrocode}
-\def\MT@is@tlig#1#2{%
-  \ifx#1\remove@tlig
+\def\MT@is@tlig#1#2\relax{%
+  \ifx\remove@tlig#1%
 %<debug>    \MT@dinfo@nl{3}{> `\the\MT@toks' (removing remove@tlig)}%
-    \MT@is@number #2\relax\relax
+    \MT@remove@tlig
   \fi
 }
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\MT@remove@tlig}
+% We remove the \cs{remove@tlig} command and only pass on the number.
+%\changes{v2.8c}{2020/03/04}{fix for text commands containing conditionals
+%                            (reported by \contributor Frank Mittelbach <frank.mittelbach\at latex-project.org>)}
+%                            ^^A private mail, 2021/03/02
+%    \begin{macrocode}
+\def\MT@remove@tlig{%
+  \expandafter\MT@exp@two@c\expandafter\MT@is@number
+  \expandafter\@secondoftwo\MT@char\relax\relax
+}
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\MT@is@composite}
 % Here, we are dealing with accented characters, specified as two tokens.
 %\changes{v1.7}{2005/03/10}{new macro: construct command for composite character;
@@ -9205,7 +9250,7 @@ end
 % Helper for \cs{DeclareUnicodeComposite}.
 %    \begin{macrocode}
 \def\MT@is@uni@comp#1\iffontchar#2\else#3\fi\relax{%
-  \ifx\\#2\\\else\edef\MT@char{\iffontchar#2\fi}\fi
+  \ifx\\#1\\\edef\MT@char{\iffontchar#2\fi}\fi
 }
 %    \end{macrocode}
 %\end{macro}
@@ -10162,10 +10207,10 @@ end
 ^^X  \def\MT@get@size@{%
 ^^X    \@tempcnta=\currentiflevel
 ^^X    \MT@get@size@@
-^^X    \loop
+^^X    \MT@loop
 ^^X      \ifnum\numexpr\currentiflevel-1>\@tempcnta
 ^^X      \csname fi\endcsname
-^^X    \repeat
+^^X    \MT@repeat
 ^^X  }%
 ^^X}{%
   \let\MT@get@size@\MT@get@size@@
@@ -17363,7 +17408,7 @@ normal, and shrunk by 5\%:
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \CheckSum{10800}
+% \CheckSum{10847}
 %
 % \Finale
 %
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
index fa5349dd6c9..01ccca6cf68 100644
--- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty
+++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
@@ -33,7 +33,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage
   {letterspace}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    Robust letterspacing
    (RS)]
 \def\MT@MT
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
index 137da62fe4f..8e0b2f954ba 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
@@ -30,7 +30,7 @@
 %%
 \ProvidesFile
   {microtype-luatex.def}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    Definitions specific to
    luatex
    (RS)]
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
index c963fa373c8..ead3d149558 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
@@ -30,7 +30,7 @@
 %%
 \ProvidesFile
   {microtype-pdftex.def}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    Definitions specific to
    pdftex
    (RS)]
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
index b9febf7159f..4296c842aca 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
@@ -30,7 +30,7 @@
 %%
 \ProvidesFile
   {microtype-xetex.def}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    Definitions specific to
    xetex
    (RS)]
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
index b64e40d8930..6fc34021702 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
@@ -40,7 +40,7 @@
 %%
 \ProvidesFile
   {microtype.cfg}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    microtype main configuration file
    (RS)]
 
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua
index ed62da0110e..fc5ace819f7 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.lua
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua
@@ -34,8 +34,8 @@ microtype        = microtype or {}
 local microtype  = microtype
 microtype.module = {
     name         = "microtype",
-    version      = "2.8b",
-    date         = "2021/02/25",
+    version      = "2.8c",
+    date         = "2021/03/14",
     description  = "microtype module.",
     author       = "E. Roux, R. Schlicht and P. Gesang",
     copyright    = "E. Roux, R. Schlicht and P. Gesang",
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty
index 31464240eed..f40ef5ecd60 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.sty
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty
@@ -29,7 +29,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage
   {microtype}
-  [2021/02/25 v2.8b
+  [2021/03/14 v2.8c
    Micro-typographical refinements
    (RS)]
 \def\MT@MT
@@ -426,10 +426,12 @@
   }\@gobble
 }
 \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# }
-\newif\ifMT@xunicode
-\MT@with@package@T{xunicode}\MT@xunicodetrue
 \newif\ifMT@fontspec
 \MT@with@package@T{fontspec}\MT@fontspectrue
+\newif\ifMT@xunicode
+\MT@with@package@T{xunicode}\MT@xunicodetrue
+\@ifl@t@r\fmtversion{2020/10/01}
+  {\AddToHook{package/after/fontspec}{\MT@fontspectrue}}\relax
 \let\MT@maybe@gobble@with@tikz\@firstofone
 \def\MT@tikz@setup{%
   \def\MT@maybe@gobble@with@tikz{%
@@ -1093,8 +1095,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \def\MT@is@symbol{%
   \expandafter\def\expandafter\MT@char\expandafter
       {\csname\MT@encoding\MT@detokenize@c\@tempa\endcsname}%
+  \expandafter\expandafter\expandafter
+    \MT@is@opt@char\MT@char\iffontchar\char\else\fi\relax
   \expandafter\MT@exp@two@c\expandafter\MT@is@char\expandafter
-      \meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
+    \meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
   \ifnum\MT@char@ < \z@
     \expandafter\expandafter\expandafter\MT@is@tlig\MT@char\relax\relax
     \ifnum\MT@char@ < \z@
@@ -1102,6 +1106,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
     \fi
   \fi
 }
+\def\MT@is@opt@char#1\iffontchar#2\char#3\else#4\fi\relax{%
+  \ifx\\#1\\%
+    \iffontchar#2%
+      \expandafter\chardef
+        \csname\MT@encoding\MT@detokenize@c\@tempa\endcsname=#3\relax
+    \fi
+  \fi
+}
 \begingroup
   \catcode`\/=\z@
   /MT@map@tlist@n{/\CHARLEX}/@makeother
@@ -1144,11 +1156,15 @@ time will almost certainly lead to undesired results. Have your choice!}%
     }%
   }
 /x
-\def\MT@is@tlig#1#2{%
-  \ifx#1\remove@tlig
-    \MT@is@number #2\relax\relax
+\def\MT@is@tlig#1#2\relax{%
+  \ifx\remove@tlig#1%
+    \MT@remove@tlig
   \fi
 }
+\def\MT@remove@tlig{%
+  \expandafter\MT@exp@two@c\expandafter\MT@is@number
+  \expandafter\@secondoftwo\MT@char\relax\relax
+}
 \def\MT@is@composite#1#2\relax{%
   \ifx\\#2\\\else
     \expandafter\def\expandafter\MT@char\expandafter{\csname\expandafter
@@ -1169,7 +1185,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \fi
 }
 \def\MT@is@uni@comp#1\iffontchar#2\else#3\fi\relax{%
-  \ifx\\#2\\\else\edef\MT@char{\iffontchar#2\fi}\fi
+  \ifx\\#1\\\edef\MT@char{\iffontchar#2\fi}\fi
 }
 \def\MT@set@listname{%
   \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list\noexpand\MessageBreak
@@ -1557,10 +1573,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
 ^^X  \def\MT@get@size@{%
 ^^X    \@tempcnta=\currentiflevel
 ^^X    \MT@get@size@@
-^^X    \loop
+^^X    \MT@loop
 ^^X      \ifnum\numexpr\currentiflevel-1>\@tempcnta
 ^^X      \csname fi\endcsname
-^^X    \repeat
+^^X    \MT@repeat
 ^^X  }%
 ^^X}{%
   \let\MT@get@size@\MT@get@size@@
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg b/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg
index 0762f7134f7..9020d15e42f 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg
@@ -62,7 +62,7 @@
      n = {ń,ñ},
      O = {Ø,Ò,Ó,Ô,Õ,Ö},
      o = {ø,ò,ó,ô,õ,ö},
-     S = {Ś,Š}, % \SS
+     S = {Ś,Š},
      s = {ś,š},
      U = {Ù,Ú,Û,Ü},
      u = {ù,ú,û,ü},