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-luatex.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-luatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/microtype/microtype-luatex.def | 97 |
1 files changed, 40 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index 957efc99d22..8bea43098a0 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def @@ -30,19 +30,22 @@ %% \ProvidesFile {microtype-luatex.def} - [2016/05/14 v2.6a + [2017/07/07 v2.7 Definitions specific to luatex (RS)] \def\MT@lua{\directlua} -\def\MT@luatex@no{4} -\ifnum\luatexversion<85 - \def\MT@luatex@no{3} - \ifnum\luatexversion<62 - \def\MT@luatex@no{2} - \ifnum\luatexversion<36 - \def\MT@lua{\directlua0} - \def\MT@luatex@no{1} +\def\MT@luatex@no{5} +\ifnum\luatexversion<90 + \def\MT@luatex@no{4} + \ifnum\luatexversion<85 + \def\MT@luatex@no{3} + \ifnum\luatexversion<62 + \def\MT@luatex@no{2} + \ifnum\luatexversion<36 + \def\MT@lua{\directlua0} + \def\MT@luatex@no{1} + \fi \fi \fi \fi @@ -51,9 +54,9 @@ #1{\ifnum \MT@luatex@no <#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi} -\RequirePackage{luatexbase} +\@ifl@t@r\fmtversion{2016/01/01}\relax{\RequirePackage{luatexbase}} \RequirePackage{luaotfload} -\RequireLuaModule{microtype} +\MT@lua{require("microtype")} \def\MT@ifint#1{\csname\MT@lua{microtype.if_int([[#1]])}\endcsname} \def\MT@ifdimen#1{\csname\MT@lua{microtype.if_dimen([[#1]])}\endcsname} \def\MT@ifstreq#1#2{\csname\MT@lua{microtype.if_str_eq([[#1]],[[#2]])}\endcsname} @@ -141,7 +144,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}% @@ -306,7 +309,16 @@ \MT@do@font{\efcode\MT@font\@tempcnta=#1\relax}% } \def\MT@reset@ef@codes@{\MT@set@all@ex\MT@ex@factor@} +\MT@requires@luatex5 +{ + \def\MT@reset@ef@codes{% + \ifnum\MT@ex@factor@=\@m \else + \MT@reset@ef@codes@ + \fi + } +}{ \let\MT@reset@ef@codes\MT@reset@ef@codes@ +} \def\MT@ex@split@val#1\relax{% \@tempcntb=#1\relax \ifnum\MT@ex@factor@=\@m \else @@ -442,23 +454,24 @@ \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@ls@fontspec@colon#1:#2:#3\@nil{#1:#2} +\def\MT@ls@fontspec@colon#1:#2:#3:#4\@nil{\ifx\\#3\\#1:#2\else#1:#2:#3\fi} \def\MT@ls@fontspec@font#1 #2\@nil{% - "\MT@ls@fontspec@colon#1::\@nil + "\MT@ls@fontspec@colon#1:::\relax\@nil 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 @@ -494,7 +507,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 @@ -599,19 +612,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 @@ -620,14 +627,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 @@ -650,7 +657,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@ @@ -1105,20 +1112,7 @@ \fi \let\MT@auto\@empty \ifMT@auto - \ifnum\pdfoutput<\@ne - \ifMT@opt@auto - \MT@error{% - Automatic font expansion only works for PDF output.\MessageBreak - However, you are creating a DVI file} - {If you have created expanded fonts instances, remove `auto' from% - \MessageBreak the package options. Otherwise, you have to switch - off expansion\MessageBreak completely.}% - \fi - \MT@autofalse - \else \def\MT@auto{autoexpand}% - \fi - \else \fi \ifMT@selected \let\MT@set@ex@codes\MT@set@ex@codes@s @@ -1207,21 +1201,10 @@ \def\MT@setup@spacing {\MT@error@doesnt@work{spacing}} \def\MT@setup@warntracking {% - \ifnum\pdfoutput<\@ne - \def\MT@warn@tracking@DVI{% - \MT@warning@nl{% - You are using tracking/letterspacing in DVI mode.\MessageBreak - This will probably not work, unless the post-\MessageBreak - processing program (dvips, dvipdfm(x), ...) is\MessageBreak - able to create the virtual fonts on the fly}% - \MT@glet\MT@warn@tracking@DVI\relax - }% - \else \def\MT@warn@tracking@DVI{% \ifnum\pdfprotrudechars<\@ne \global\pdfprotrudechars\@ne \fi \MT@glet\MT@warn@tracking@DVI\relax }% - \fi \ifnum\MT@letterspace=\m@ne \let\MT@letterspace\MT@letterspace@default \else |