diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype/microtype-luatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/microtype/microtype-luatex.def | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index d37b39b7763..957efc99d22 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} - [2016/05/01 v2.6 + [2016/05/14 v2.6a Definitions specific to luatex (RS)] @@ -397,9 +397,10 @@ \expandafter\ifx\MT@lsfont\relax \MT@get@ls@basefont \MT@if@fontspec@font{% + \ifnum\MT@letterspace@<\z@\def\MT@minus{-}\else\let\MT@minus\@empty\fi \global\expandafter\font\MT@lsfont=% \expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font - \expandafter\fontname\expandafter\MT@font\space \@nil + \expandafter\fontname\expandafter\font@name\space \@nil }{% \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@ }% @@ -458,16 +459,10 @@ \def\MT@ls@fontspec@colon#1:#2:#3\@nil{#1:#2} \def\MT@ls@fontspec@font#1 #2\@nil{% "\MT@ls@fontspec@colon#1::\@nil - kernfactor=% - \ifnum\MT@letterspace@<\z@ -0.% - \ifnum-\MT@letterspace@<100 0\fi - \ifnum-\MT@letterspace@<10 0\fi - \number-\MT@letterspace@ - \else 0.% - \ifnum\MT@letterspace@<100 0\fi - \ifnum\MT@letterspace@<10 0\fi - \number\MT@letterspace@ - \fi;" + kernfactor=\MT@minus \ifnum\MT@letterspace@=1000 1\else 0.% + \ifnum\MT@minus\MT@letterspace@<100 0\fi + \ifnum\MT@minus\MT@letterspace@<10 0\fi + \number\MT@minus\MT@letterspace@ \fi;" \ifx\\#2\\ at \f@size pt\else#2\fi\relax } \def\MT@get@tr@opt{% @@ -735,7 +730,8 @@ \KV@@sp@def\@tempa{##1}\MT@get@slot \ifnum\MT@char>\m@ne \tagcode#1\MT@char=\m@ne - \MT@if@fontspec@font{\MT@lua{microtype.noligatures([[#1]],[[\MT@char]])}}\relax + \MT@if@fontspec@font + {\MT@lua{microtype.noligatures([[#1]],[[\MT@char]])}}\relax \fi }% \MT@vinfo{... Disabling ligatures for characters: #2}% |