diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-13 23:12:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-13 23:12:08 +0000 |
commit | 89aa998bcb48fde73fb8c02e28350ca8b9042bc6 (patch) | |
tree | 5d32265a3f46be10802647d7fb209fd650415341 /Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def | |
parent | 5a237aa2394aa120794c276d4af43957742d3da4 (diff) |
microtype (8jul17)
git-svn-id: svn://tug.org/texlive/trunk@44791 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index 91f36c2301f..af7746eddb2 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} - [2016/05/14 v2.6a + [2017/07/07 v2.7 Definitions specific to pdftex (RS)] @@ -234,7 +234,7 @@ \MT@if@list@exists{% \ifMT@nofamily \MT@ifdefined@n@TF{\MT@encoding-\MT@family-settings}\relax{% - \MT@info@nl{Loading generic settings for font family\MessageBreak + \MT@info@nl{Loading generic protrusion settings for font family\MessageBreak `\MT@family' (encoding: \MT@encoding).\MessageBreak For optimal results, create family-specific settings.\MessageBreak See the microtype manual for details}% @@ -416,7 +416,8 @@ \MT@do@font{\efcode\MT@font\@tempcnta=#1\relax}% } \def\MT@reset@ef@codes@{\MT@set@all@ex\MT@ex@factor@} -\MT@requires@pdftex4{ +\MT@requires@pdftex4 +{ \def\MT@reset@ef@codes{% \ifnum\MT@ex@factor@=\@m \else \MT@reset@ef@codes@ @@ -684,18 +685,19 @@ \MT@afteraftergroup{% \MT@set@curr@os \MT@set@curr@ok - \MT@glet\noexpand\glb@currsize\noexpand\@empty \noexpand\MT@tr@outer@r }% \fi }% } \def\MT@afteraftergroup#1{% - \MT@ifdefined@n@TF{MT@aftergroup@\number\currentgrouplevel}\relax{% - \MT@exp@cs\xdef{MT@aftergroup@\number\currentgrouplevel}% - {\MT@exp@cs\MT@glet{MT@aftergroup@\number\currentgrouplevel}\noexpand\@undefined#1}% - \expandafter\aftergroup\expandafter\aftergroup\MT@exp@cs\aftergroup - {MT@aftergroup@\number\currentgrouplevel}% + \MT@maybe@gobble@with@tikz{% + \MT@ifdefined@n@TF{MT@aftergroup@\number\currentgrouplevel}\relax{% + \MT@exp@cs\xdef{MT@aftergroup@\number\currentgrouplevel}% + {\MT@exp@cs\MT@glet{MT@aftergroup@\number\currentgrouplevel}\noexpand\@undefined#1}% + \expandafter\aftergroup\expandafter\aftergroup\MT@exp@cs\aftergroup + {MT@aftergroup@\number\currentgrouplevel}% + }% }% } \def\MT@get@tr@opt{% @@ -727,7 +729,7 @@ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% \not@math@alphabet\lsstyle\textls - \MT@glet\glb@currsize\@empty + \MT@maybe@gobble@with@tikz{\aftergroup\glb@settings}% \def\MT@feat{tr}% \let\MT@tracking\MT@set@tr@codes \selectfont @@ -841,19 +843,13 @@ \fi \fi } -\MT@addto@setup{% - \@ifpackageloaded{tikz} - {\def\MT@tr@outer@r{% - \ifnum\tikz@expandcount>\z@ \else - \expandafter\MT@tr@outer@r@\fi}} - {\let\MT@tr@outer@r\MT@tr@outer@r@}} -\def\MT@tr@outer@r@{% - \futurelet\MT@tr@outer@next\MT@tr@outer@r@@ +\def\MT@tr@outer@r{% + \futurelet\MT@tr@outer@next\MT@tr@outer@r@ } \def\MT@if@outer@next#1{% \ifx\MT@tr@outer@next#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } -\def\MT@tr@outer@r@@{% +\def\MT@tr@outer@r@{% \def\MT@temp*{}% \ifmmode \else \ifnum\currentgrouptype=10 \else @@ -862,14 +858,14 @@ \expandafter\ifcat\expandafter\noexpand\csname MT@tr@outer@next\endcsname\egroup \ifhmode\unkern\fi\egroup \MT@set@curr@ok \MT@set@curr@os - \def\MT@temp*{\afterassignment\MT@tr@outer@r@\let\MT@temp=}% + \def\MT@temp*{\afterassignment\MT@tr@outer@r\let\MT@temp=}% \else \MT@if@outer@next\maybe@ic{% \MT@set@curr@ok \MT@set@curr@os \def\MT@temp*{\afterassignment\MT@tr@outer@icr\let\MT@temp=}% }{% \MT@if@outer@next\check@icr{% - \def\MT@temp*{\aftergroup\MT@tr@outer@r@\check@icr\let\MT@temp=}% + \def\MT@temp*{\aftergroup\MT@tr@outer@r\check@icr\let\MT@temp=}% }{% \MT@if@outer@next\@sptoken{% \def\MT@temp* {\ifhmode\hskip\MT@outer@space @@ -892,7 +888,7 @@ \fi\fi \MT@temp*% } -\def\MT@tr@outer@icr{\afterassignment\MT@tr@outer@icr@\MT@tr@outer@r@} +\def\MT@tr@outer@icr{\afterassignment\MT@tr@outer@icr@\MT@tr@outer@r} \def\MT@tr@outer@icr@{% \let\@let@token= \MT@tr@outer@next \maybe@ic@ |