From 5f7d0d6c9c581dd584154903b848da6ab55f359d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Mar 2022 19:58:42 +0000 Subject: microtype (15mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62718 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/microtype/letterspace.sty | 7 +++++-- Master/texmf-dist/tex/latex/microtype/microtype-luatex.def | 5 +++-- Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def | 9 ++++++--- Master/texmf-dist/tex/latex/microtype/microtype-show.sty | 2 +- Master/texmf-dist/tex/latex/microtype/microtype-xetex.def | 6 ++++-- Master/texmf-dist/tex/latex/microtype/microtype.cfg | 2 +- Master/texmf-dist/tex/latex/microtype/microtype.lua | 4 ++-- Master/texmf-dist/tex/latex/microtype/microtype.sty | 9 ++------- 8 files changed, 24 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 6392bca21c0..14ee42263e9 100644 --- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty +++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty @@ -34,7 +34,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {letterspace} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Robust letterspacing (RS)] \def\MT@MT @@ -341,6 +341,9 @@ \DeclareRobustCommand\lslig[1]{% {\MT@ifdefined@c@TF\MT@curr@ls{% \escapechar\m@ne + \MT@requires@latex2{% + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + }\relax% \MT@get@ls@basefont \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern @@ -353,7 +356,7 @@ \expandafter\ifx\MT@ls@basefont\relax \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else - \MT@exp@two@c\let\font@name\MT@ls@basefont + \MT@set@lsbasefont \fi } \def\MT@set@lsbasefont{\MT@exp@two@c\let\font@name\MT@ls@basefont} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index 9949d9480ee..188a1d018ad 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def @@ -31,7 +31,7 @@ %% \ProvidesFile {microtype-luatex.def} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Definitions specific to luatex (RS)] @@ -523,6 +523,7 @@ \DeclareRobustCommand\lslig[1]{% {\MT@ifdefined@c@TF\MT@curr@ls{% \escapechar\m@ne + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \MT@get@ls@basefont \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern @@ -535,7 +536,7 @@ \expandafter\ifx\MT@ls@basefont\relax \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else - \MT@exp@two@c\let\font@name\MT@ls@basefont + \MT@set@lsbasefont \fi } \def\MT@set@lsbasefont{\MT@exp@two@c\let\font@name\MT@ls@basefont} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index 81524cbf3f7..892d82ca52f 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def @@ -31,7 +31,7 @@ %% \ProvidesFile {microtype-pdftex.def} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Definitions specific to pdftex (RS)] @@ -104,7 +104,9 @@ } \MT@requires@pdftex5{ \def\MT@ifstreq#1#2{% - \ifnum\pdfstrcmp{#1}{#2}=\z@ + \ifnum + \pdfstrcmp + {#1}{#2}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -726,6 +728,7 @@ \DeclareRobustCommand\lslig[1]{% {\MT@ifdefined@c@TF\MT@curr@ls{% \escapechar\m@ne + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \MT@get@ls@basefont \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern @@ -738,7 +741,7 @@ \expandafter\ifx\MT@ls@basefont\relax \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else - \MT@exp@two@c\let\font@name\MT@ls@basefont + \MT@set@lsbasefont \fi } \def\MT@set@lsbasefont{\MT@exp@two@c\let\font@name\MT@ls@basefont} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-show.sty b/Master/texmf-dist/tex/latex/microtype/microtype-show.sty index 14a61419b9e..226ba8c8e1c 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-show.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype-show.sty @@ -34,7 +34,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype-show} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Visual debugging for the microtype package (RS)] \RequirePackage{iftex} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def index 82a0d132d8d..c909b45431d 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def @@ -31,7 +31,7 @@ %% \ProvidesFile {microtype-xetex.def} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Definitions specific to xetex (RS)] @@ -53,7 +53,9 @@ }% } \def\MT@ifstreq#1#2{% - \ifnum\strcmp{#1}{#2}=\z@ + \ifnum + \strcmp + {#1}{#2}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index 05719ca98b8..28f93c09fad 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg @@ -41,7 +41,7 @@ %% \ProvidesFile {microtype.cfg} - [2022/02/22 v3.0c + [2022/03/14 v3.0d 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 a160ae2b419..250e56f0d6a 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.lua +++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua @@ -35,8 +35,8 @@ microtype = microtype or {} local microtype = microtype microtype.module = { name = "microtype", - version = "3.0c", - date = "2022/02/22", + version = "3.0d", + date = "2022/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 f953fef438c..cc7777a1002 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -30,7 +30,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2022/02/22 v3.0c + [2022/03/14 v3.0d Micro-typographical refinements (RS)] \def\MT@MT @@ -1047,10 +1047,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi \def\MT@get@prot#1#2{% \begingroup - \def\@elt##1{\global\value{##1}\the\value{##1}\relax}% - \edef\MT@ckpt{\cl@@ckpt}% - \let\@elt\relax - \@fileswfalse \setbox\MT@tempbox\vbox{% \everypar{}% \parfillskip=\z@skip @@ -1071,7 +1067,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \global\setbox\MT@tempbox=\lastbox \fi }% - \MT@ckpt \endgroup \leavevmode \ifhbox\MT@tempbox @@ -1127,7 +1122,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \@gobble }\@firstofone } -\def\MT@prot@group#{\bgroup\afterassignment\MT@prot@get@firstchar\let\MT@temp= } +\def\MT@prot@group{\bgroup\afterassignment\MT@prot@get@firstchar\let\MT@temp= } \def\MT@prot@get@firstchar{\futurelet\MT@prot@next\MT@prot@get@first@char} \def\MT@prot@get@nextchar{\futurelet\MT@prot@next\MT@prot@get@next@char} \def\MT@prot@get@first@char{% -- cgit v1.2.3