From b198b0b1f82978c1347030bf5679b0cf50a48356 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Jan 2018 22:21:32 +0000 Subject: microtype (15jan18) git-svn-id: svn://tug.org/texlive/trunk@46323 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/microtype/microtype-luatex.def | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/microtype/microtype-luatex.def') diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index 8bea43098a0..8191589453e 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2016 R Schlicht +%% Copyright (c) 2004--2018 R Schlicht %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3c of this license or (at @@ -30,7 +30,7 @@ %% \ProvidesFile {microtype-luatex.def} - [2017/07/07 v2.7 + [2018/01/14 v2.7a Definitions specific to luatex (RS)] @@ -101,6 +101,7 @@ \ifMT@inlist@ \else \MT@vinfo{Setting up font `\MT@@font'\on@line}% + \MT@info@notracking \MT@protrusion \MT@expansion } @@ -293,7 +294,6 @@ \let\MT@stretch@ \MT@stretch \let\MT@shrink@ \MT@shrink \let\MT@step@ \MT@step - \let\MT@auto@ \MT@auto \let\MT@ex@factor@\MT@ex@factor }% \MT@reset@ef@codes @@ -355,8 +355,6 @@ \MT@get@ex@opt@{stretch}{Setting stretch limit to \number\MT@stretch@}% \MT@get@ex@opt@{shrink} {Setting shrink limit to \number\MT@shrink@}% \MT@get@ex@opt@{step} {Setting expansion step to \number\MT@step@}% - \def\@tempa{autoexpand}% - \MT@get@ex@opt@{auto}{\ifx\@tempa\MT@auto@ En\else Dis\fi abling automatic expansion}% \MT@ifdefined@n@T{MT@ex@c@\MT@ex@c@name @preset}{% \MT@preset@ex \let\MT@reset@ef@codes\relax @@ -916,9 +914,9 @@ \define@key{MT@ex@c}{auto}[true]{% \def\@tempa{#1}% \csname if\@tempa\endcsname - \MT@gdef@n{MT@ex@c@\MT@curr@set@name @auto}{autoexpand}% \else - \MT@glet@nc{MT@ex@c@\MT@curr@set@name @auto}\@empty + \MT@warning{Non-automatic font expansion doesn't work with\MessageBreak + luatex}% \fi } \MT@define@opt@key{tr}{spacing} @@ -966,8 +964,8 @@ } \ifnum\pdfoutput<\@ne \else \MT@expansiontrue - \MT@autotrue \fi +\MT@autotrue \def\MT@define@optionX#1#2{% \define@key{MTX}{#1}[true]{% \edef\@tempb{\csname MT@rbba@#1\endcsname}% @@ -1110,9 +1108,13 @@ Setting it to one}% \def\MT@step{1 }% \fi - \let\MT@auto\@empty + \let\MT@auto@\@empty \ifMT@auto - \def\MT@auto{autoexpand}% + \else + \ifMT@opt@auto + \MT@error{Non-automatic font expansion does not work with\MessageBreak + luatex}{Remove `auto=false' from the package options, or use pdftex.}% + \fi \fi \ifMT@selected \let\MT@set@ex@codes\MT@set@ex@codes@s -- cgit v1.2.3