From 61708ee48576253b5b4bd021bcb68f8244cd0d18 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Nov 2019 00:01:37 +0000 Subject: microtype (19nov19) git-svn-id: svn://tug.org/texlive/trunk@52853 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/microtype/letterspace.sty | 2 +- .../tex/latex/microtype/microtype-luatex.def | 20 +++++++++++++++++--- .../tex/latex/microtype/microtype-pdftex.def | 2 +- .../tex/latex/microtype/microtype-xetex.def | 2 +- 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 | 13 ++++++++++--- 7 files changed, 33 insertions(+), 12 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 43662f328e8..07b08c0a3cd 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d 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 08daa2166eb..5bdb98dc2bf 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d Definitions specific to luatex (RS)] @@ -113,7 +113,6 @@ \fi } \let\MT@copy@font\relax -\MT@requires@luatex4{\let\pdfcopyfont\copyfont}\relax \def\MT@copy@font@{% \xdef\MT@font@copy{\csname\MT@@font/\MT@pr@context/\MT@ex@context\endcsname}% \expandafter\ifx\MT@font@copy\relax @@ -123,7 +122,7 @@ \else \MT@exp@two@c\let\font@name\MT@font@orig \fi - \global\MT@exp@two@c\pdfcopyfont\MT@font@copy\font@name + \MT@exp@two@c\MT@lua@copyfont\meaning\font@name\@nil \MT@map@clist@c\MT@active@features{% \MT@exp@cs\ifx{MT@\@nameuse{MT@abbr@##1}}\relax\else \def\@tempa{##1}% @@ -133,6 +132,7 @@ \fi \MT@exp@two@c\let\MT@font\MT@font@copy \let\font@name\MT@font@copy + \aftergroup\MT@exp@two@c \aftergroup\let\aftergroup\font@name\aftergroup\MT@font@copy } \def\MT@rem@from@list#1{% @@ -141,6 +141,8 @@ \MT@font \csname MT@\@tempa @#1font@list\endcsname \fi } +\def\MT@lua@copyfont #1 #2 #3\@nil{% + \global\expandafter\font\MT@font@copy=#3\relax} \def\MT@protrusion{\MT@maybe@do{pr}} \def\MT@set@pr@codes{% \MT@nofamilyfalse @@ -303,10 +305,22 @@ \MT@nonselectedfalse } \let\MT@set@ex@codes\MT@set@ex@codes@n +\directlua{\detokenize{ + if font.setexpansion == nil then + tex.print("\\@firstoftwo") + else + tex.print("\\@secondoftwo") + end +}}{ \MT@requires@luatex4{\let\pdffontexpand\expandglyphsinfont}\relax \def\MT@expandfont{% \pdffontexpand\MT@font \MT@stretch@ \MT@shrink@ \MT@step@ \MT@auto@\relax } +}{ +\def\MT@expandfont{% + \directlua{font.setexpansion(font.current(),\MT@stretch@,\MT@shrink@,\MT@step@)}% +} +} \def\MT@set@all@ex#1{% \MT@do@font{\efcode\MT@font\@tempcnta=#1\relax}% } diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index 1b68bdd1b94..eff2fd5ba14 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d 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 a0422a3a6df..b9f2d478b2c 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d 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 83c73b47ace..212b37910cd 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d 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 54ccd668ae3..c12ec1b9d8d 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.7c", - date = "2019/10/10", + version = "2.7d", + date = "2019/11/18", 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 ff823d55f97..302589147d3 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} - [2019/10/10 v2.7c + [2019/11/18 v2.7d Micro-typographical refinements (RS)] \def\MT@MT @@ -1289,8 +1289,13 @@ time will almost certainly lead to undesired results. Have your choice!}% } \def\MT@check@font{\MT@exp@one@n\MT@in@clist\MT@font\MT@font@list} \def\MT@register@font{\xdef\MT@font@list{\MT@font@list\MT@font,}} -\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list - \ifMT@inlist@\else\xdef\MT@font@list{\MT@font@list\font@name,}\fi} +\def\MT@register@subst@font{% + \MT@exp@one@n\MT@in@clist\font@name\MT@font@list + \ifMT@inlist@\else + \xdef\MT@font@list{\MT@font@list\font@name,}% + \expandafter\MT@rem@from@clist\MT@font\MT@font@list + \fi +} \let\MT@active@features\@empty \def\MT@check@font@cx{% \MT@if@true @@ -1313,6 +1318,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@exp@cs\MT@xadd {MT@##1@\csname MT@##1@context\endcsname font@list}% {\font@name,}% + \expandafter\MT@exp@one@n\expandafter\MT@rem@from@clist\expandafter\MT@font + \csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname \fi }% } -- cgit v1.2.3