From 761416b406bc9791be798bf1808637ef6bb739f9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Mar 2021 22:14:01 +0000 Subject: microtype (15mar21) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58405 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/microtype/letterspace.sty | 2 +- .../tex/latex/microtype/microtype-luatex.def | 2 +- .../tex/latex/microtype/microtype-pdftex.def | 2 +- .../tex/latex/microtype/microtype-xetex.def | 2 +- .../texmf-dist/tex/latex/microtype/microtype.cfg | 2 +- .../texmf-dist/tex/latex/microtype/microtype.lua | 4 +-- .../texmf-dist/tex/latex/microtype/microtype.sty | 36 ++++++++++++++++------ Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg | 2 +- 8 files changed, 34 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/microtype') 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 = {ù,ú,û,ü}, -- cgit v1.2.3