diff options
author | Norbert Preining <preining@logic.at> | 2013-05-27 01:20:20 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2013-05-27 01:20:20 +0000 |
commit | f07b7c015a77f69963eb08048aba8c5621cdb0c1 (patch) | |
tree | 416117265306e535a623b7d29544a300865d02db /Master/texmf-dist/tex/latex | |
parent | a310e63ad62aa521c7903a0f499d8b9ca8124681 (diff) |
microtype 5/27
git-svn-id: svn://tug.org/texlive/trunk@30696 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
26 files changed, 354 insertions, 179 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 3fc1de4ec15..3afa0048c1e 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a Robust letterspacing (RS)] \def\MT@MT @@ -156,6 +156,9 @@ \def\MT@ifdefined@n@T#1{% ^^X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi } +\def\MT@ifdefined@n@TF#1{% +^^X \ifcsname#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +} \begingroup \catcode`\%=12 \catcode`\&=14 @@ -267,11 +270,21 @@ \MT@outer@kern=-\dimexpr\MT@letterspace@ sp * \fontdimen6\font@name/2000\relax \MT@ls@outer@k \xdef\MT@set@curr@ok{\MT@outer@kern=\the\MT@outer@kern\relax}% - \aftergroup\aftergroup\aftergroup\MT@ls@aftergroup + \MT@afteraftergroup{% + \MT@set@curr@ok + \noexpand\MT@ls@outer@k + }% \fi \fi } -\def\MT@ls@aftergroup{\MT@set@curr@ok\MT@ls@outer@k} +\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@requires@latex2{ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% @@ -299,7 +312,7 @@ \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern \font@name #1% - \kern\MT@outer@kern% + \kern\MT@outer@kern }{#1}}% } \def\MT@get@ls@basefont{% @@ -354,7 +367,20 @@ \fi } \newdimen\MT@outer@kern -\def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi} +\def\MT@ls@outer@k{% + \ifhmode + \ifdim\lastkern=-3sp \unkern + \ifdim\lastkern=3sp \kern-3sp + \expandafter\expandafter\expandafter\@gobble + \else \unkern + \expandafter\expandafter\expandafter\@firstofone + \fi + \else + \expandafter\@firstofone + \fi + {\kern\MT@outer@kern\kern3sp\kern-3sp\relax}% + \fi +} \MT@requires@latex2{ \MT@addto@setup{% \@ifpackageloaded{CJK}{% diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index c560e4fe160..fe2e8000886 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a Definitions specific to luatex (RS)] @@ -48,12 +48,8 @@ #1{\ifnum \MT@luatex@no <#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi} -\MT@lua{ - if (luatextra and luatextra.use_module) then - luatextra.use_module("microtype") - else - dofile(kpse.find_file("microtype.lua")) - end} +\RequirePackage{luatexbase} +\RequireLuaModule{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} @@ -63,15 +59,13 @@ \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching ledmac to enable character protrusion}% - \newdimen\MT@led@kern + \MT@info@nl{Patching (e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% - \MT@led@kern=\rightmarginkern##1% \kern\leftmarginkern##1% - \MT@led@unhbox@line##1% - \kern\MT@led@kern + \expandafter\MT@led@unhbox@line\expandafter##1\expandafter + \kern\rightmarginkern##1% \fi }% }{% @@ -405,10 +399,10 @@ \MT@ifdefined@c@T\MT@tr@ligatures\MT@tr@noligatures \MT@do@font{\lpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax \rpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax}% - \let\MT@the@pr@code\MT@the@pr@code@tr \fi \aftergroup\MT@set@lsfont \let\MT@font\MT@lsfont + \ifMT@fontspec\MT@font\fi \xdef\MT@set@curr@ls{\def\noexpand\MT@curr@ls{\MT@letterspace@}}% \aftergroup\MT@set@curr@ls \MT@outer@space=\csname MT@outer@space\expandafter\string\font@name\endcsname\relax @@ -425,8 +419,21 @@ \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax \fi \xdef\MT@set@curr@ok{\MT@outer@kern=\the\MT@outer@kern\relax}% - \aftergroup\aftergroup\aftergroup\MT@ls@aftergroup + \MT@afteraftergroup{% + \MT@set@curr@os + \MT@set@curr@ok + \noexpand\MT@tr@outer@r + }% \fi + \MT@protrusionfalse + }% +} +\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}% }% } \def\MT@get@tr@opt{% @@ -470,7 +477,7 @@ \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern \font@name #1% - \kern\MT@outer@kern% + \kern\MT@outer@kern }{#1}}% } \def\MT@get@ls@basefont{% @@ -563,13 +570,19 @@ \fi \fi } -\def\MT@tr@outer@r{% - \futurelet\MT@tr@outer@next\MT@tr@outer@r@ +\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@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 @@ -578,14 +591,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 @@ -598,18 +611,28 @@ \MT@if@outer@next\ \relax{% \MT@if@outer@next\space\relax{% \MT@if@outer@next\@xobeysp\relax{% - \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k - \fi}% - \MT@let@nc{MT@tr@outer@next}\relax - }}}}}}}\fi + \MT@if@outer@next\xspace{% + \def\MT@temp*\xspace{\futurelet\@let@token\MT@xspace}% + }{% + \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k + \fi}% + \MT@let@nc{MT@tr@outer@next}\relax + }}}}}}}}\fi \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@ } +\def\MT@xspace{\@xspace@firsttrue\@xspace + \ifdim\lastskip>5sp + \unskip \hskip\MT@outer@space + \else + \ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k \fi + \fi +} }{ \DeclareRobustCommand\lsstyle{% \MT@error{Letterspacing only works with \MT@engine tex version @@ -640,7 +663,20 @@ * \fontdimen6\MT@lsfont/2000\relax \edef\MT@temp{\MT@temp{\the\@tempdima}}% } -\def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi} +\def\MT@ls@outer@k{% + \ifhmode + \ifdim\lastkern=-3sp \unkern + \ifdim\lastkern=3sp \kern-3sp + \expandafter\expandafter\expandafter\@gobble + \else \unkern + \expandafter\expandafter\expandafter\@firstofone + \fi + \else + \expandafter\@firstofone + \fi + {\kern\MT@outer@kern\kern3sp\kern-3sp\relax}% + \fi +} \def\MT@noligatures{% \MT@dotrue \let\@tempa\MT@nl@setname @@ -678,8 +714,8 @@ \ifnum\MT@char > \m@ne \ifnum\MT@char=47\relax \ifMT@norest \else - \@tempcnta=\directlua{ - local glyph = microtype.name_to_slot([[\expandafter\@gobble\@tempa]]) + \@tempcnta=\MT@lua{ + local glyph = microtype.name_to_slot([[\expandafter\@gobble\@tempa]],true) if glyph then tex.write(glyph) else tex.write(-1) end diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index be537a1ff4b..2729281d6cb 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a Definitions specific to pdftex (RS)] @@ -142,15 +142,13 @@ \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching ledmac to enable character protrusion}% - \newdimen\MT@led@kern + \MT@info@nl{Patching (e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% - \MT@led@kern=\rightmarginkern##1% \kern\leftmarginkern##1% - \MT@led@unhbox@line##1% - \kern\MT@led@kern + \expandafter\MT@led@unhbox@line\expandafter##1\expandafter + \kern\rightmarginkern##1% \fi }% }{% @@ -684,10 +682,22 @@ \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax \fi \xdef\MT@set@curr@ok{\MT@outer@kern=\the\MT@outer@kern\relax}% - \aftergroup\aftergroup\aftergroup\MT@ls@aftergroup + \MT@afteraftergroup{% + \MT@set@curr@os + \MT@set@curr@ok + \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}% + }% +} \def\MT@get@tr@opt{% \MT@set@listname \MT@ifdefined@n@T{MT@tr@c@\MT@tr@c@name}{% @@ -729,7 +739,7 @@ \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern \font@name #1% - \kern\MT@outer@kern% + \kern\MT@outer@kern }{#1}}% } \def\MT@get@ls@basefont{% @@ -831,13 +841,19 @@ \fi \fi } -\def\MT@tr@outer@r{% - \futurelet\MT@tr@outer@next\MT@tr@outer@r@ +\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@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 @@ -846,14 +862,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 @@ -866,18 +882,28 @@ \MT@if@outer@next\ \relax{% \MT@if@outer@next\space\relax{% \MT@if@outer@next\@xobeysp\relax{% - \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k - \fi}% - \MT@let@nc{MT@tr@outer@next}\relax - }}}}}}}\fi + \MT@if@outer@next\xspace{% + \def\MT@temp*\xspace{\futurelet\@let@token\MT@xspace}% + }{% + \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k + \fi}% + \MT@let@nc{MT@tr@outer@next}\relax + }}}}}}}}\fi \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@ } +\def\MT@xspace{\@xspace@firsttrue\@xspace + \ifdim\lastskip>5sp + \unskip \hskip\MT@outer@space + \else + \ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k \fi + \fi +} }{ \DeclareRobustCommand\lsstyle{% \MT@error{Letterspacing only works with \MT@engine tex version @@ -908,7 +934,20 @@ * \fontdimen6\MT@lsfont/2000\relax \edef\MT@temp{\MT@temp{\the\@tempdima}}% } -\def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi} +\def\MT@ls@outer@k{% + \ifhmode + \ifdim\lastkern=-3sp \unkern + \ifdim\lastkern=3sp \kern-3sp + \expandafter\expandafter\expandafter\@gobble + \else \unkern + \expandafter\expandafter\expandafter\@firstofone + \fi + \else + \expandafter\@firstofone + \fi + {\kern\MT@outer@kern\kern3sp\kern-3sp\relax}% + \fi +} \MT@requires@pdftex5{ \def\MT@noligatures{% \MT@dotrue diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def index 581695e43d5..86a169114dd 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a Definitions specific to xetex (RS)] @@ -85,15 +85,13 @@ \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching ledmac to enable character protrusion}% - \newdimen\MT@led@kern + \MT@info@nl{Patching (e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% - \MT@led@kern=\rightmarginkern##1% \kern\leftmarginkern##1% - \MT@led@unhbox@line##1% - \kern\MT@led@kern + \expandafter\MT@led@unhbox@line\expandafter##1\expandafter + \kern\rightmarginkern##1% \fi }% }{% diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index f1d91115c63..bf5ea4ede82 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a microtype main configuration file (RS)] @@ -767,40 +767,6 @@ } \SetExtraSpacing - [ name = T2A, - load = default ] - { encoding = T2A, - family = cmr } - { - \cyrg = { ,-300,300}, - \cyrb = { ,-200,200}, - \cyrk = { ,-200,200}, - \cyrs = { ,-100,100}, - \cyrr = { ,-100,100}, - \cyrh = { ,-100,100}, - \cyru = { ,-100,100}, - \cyrt = { , 50, -50}, - \cyrp = { , 50, -50}, - \cyri = { , 50, -50}, - \cyrishrt = { , 50, -50}, - } - -\SetExtraSpacing - [ name = nonfrench-cmr, - load = default, - context = nonfrench ] - { encoding = {OT1,T1,LY1,OT4,QX,T5}, - family = cmr } - { - . = {333,2000,-667}, - ? = {333,2000,-667}, - ! = {333,2000,-667}, - : = {333,1000,-500}, - ; = { , 500,-333}, - {,}= { , 250,-200} - } - -\SetExtraSpacing [ name = nonfrench-default, load = default, context = nonfrench ] diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua index 8f800c38598..2da38c7d643 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.lua +++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua @@ -29,63 +29,82 @@ -- It was contributed by Elie Roux <elie.roux{at}telecom-bretagne.eu>. -- ------------------------------------------------------------------------ -- -if microtype then - -- we simply don't load -else - -microtype = {} +microtype = microtype or {} +local microtype = microtype -microtype.module = { +local microtype_module = { name = "microtype", version = 2.5, - date = "2013/03/13", + date = "2013/05/15", description = "microtype module.", - author = "Elie Roux & R Schlicht", - copyright = "Elie Roux & R Schlicht", + author = "E. Roux, R. Schlicht and P. Gesang", + copyright = "E. Roux, R. Schlicht and P. Gesang", license = "LPPL", } -if luatextra and luatextra.provides_module then - luatextra.provides_module(microtype.module) +if luatexbase and luatexbase.provides_module then + luatexbase.provides_module(microtype_module) end -function microtype.if_int(s) - if string.find(s,"^-*[0-9]+ *$") then - tex.write("@firstoftwo") +local find = string.find +local tex_write = tex.write + +local function if_int(s) + if find(s,"^-*[0-9]+ *$") then + tex_write("@firstoftwo") else - tex.write("@secondoftwo") + tex_write("@secondoftwo") end end +microtype.if_int = if_int -function microtype.if_dimen(s) - if (string.find(s, "^-*[0-9]+(%a*) *$") or - string.find(s, "^-*[0-9]*[.,][0-9]+(%a*) *$")) then - tex.write("@firstoftwo") +local function if_dimen(s) + if (find(s, "^-*[0-9]+(%a*) *$") or + find(s, "^-*[0-9]*[.,][0-9]+(%a*) *$")) then + tex_write("@firstoftwo") else - tex.write("@secondoftwo") + tex_write("@secondoftwo") end end +microtype.if_dimen = if_dimen -function microtype.if_str_eq(s1, s2) +local function if_str_eq(s1, s2) if s1 == s2 then - tex.write("@firstoftwo") + tex_write("@firstoftwo") else - tex.write("@secondoftwo") + tex_write("@secondoftwo") end end +microtype.if_str_eq = if_str_eq -function microtype.name_to_slot(name) - if fonts then - local tfmdata = fonts.ids[font.current()] - if tfmdata and tfmdata.shared then - local otfdata = tfmdata.shared.otfdata - local unicode = otfdata.luatex.unicodes[name] - return unicode and (type(unicode) == "number" and unicode or unicode[1]) +if luaotfload and luaotfload.aux and luaotfload.aux.slot_of_name then + local slot_of_name = luaotfload.aux.slot_of_name + microtype.name_to_slot = function(name, unsafe) + return slot_of_name(font.current(), name, unsafe) + end +else + -- we dig into internal structure (should be avoided) + local function name_to_slot(name, unsafe) + if fonts then + local unicodes + if fonts.ids then --- legacy luaotfload + local tfmdata = fonts.ids[font.current()] + if not tfmdata then return end + unicodes = tfmdata.shared.otfdata.luatex.unicodes + else --- new location + local tfmdata = fonts.hashes.identifiers[font.current()] + if not tfmdata then return end + unicodes = tfmdata.resources.unicodes + end + local unicode = unicodes[name] + if unicode then --- does the 'or' branch actually exist? + return type(unicode) == "number" and unicode or unicode[1] + end end end + microtype.name_to_slot = name_to_slot end -end -- -- -- End of file `microtype.lua'. diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index 5c925868330..8f3a382b467 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} - [2013/03/13 v2.5 + [2013/05/23 v2.5a Micro-typographical refinements (RS)] \def\MT@MT @@ -449,6 +449,7 @@ So does the `\MT@MT' package. Using both packages at the same\MessageBreak time will almost certainly lead to undesired results. Have your choice!}% }% \MT@with@package@T{ledmac}\MT@ledmac@setup + \MT@with@package@T{eledmac}\MT@ledmac@setup \MT@with@package@T{xunicode}\MT@xunicodetrue \MT@with@package@T{fontspec}\MT@fontspectrue \let\MT@setupfont@hook\@empty @@ -762,12 +763,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \inputencoding{\@nameuse{\@tempa}}% } \newif\ifMT@nonselected -\MT@addto@setup{% - \@ifpackageloaded{tikz} - {\def\MT@ls@aftergroup{% - \ifnum\tikz@expandcount>\z@ \else - \MT@set@curr@os\MT@set@curr@ok\expandafter\MT@tr@outer@r\fi}} - {\def\MT@ls@aftergroup{\MT@set@curr@os\MT@set@curr@ok\MT@tr@outer@r}}} \DeclareRobustCommand\textls{% \@ifstar{\let\MT@ls@adjust@\MT@ls@adjust@empty\MT@textls}% {\let\MT@ls@adjust@\MT@ls@adjust@relax\MT@textls}% @@ -923,9 +918,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \ifx\MT@familyalias\@empty \else \edef\@tempa{\MT@encoding /\MT@familyalias - /\ifnum#2=\@ne \MT@series\fi - /\ifnum#3=\@ne \MT@shape\fi - /\ifnum#4=\@ne *\fi + /\ifnum#2=\@ne \MT@series\fi + /\ifnum#3=\@ne \MT@shape\fi + /\ifnum#4=\@ne *\fi \MT@context}% \MT@ifdefined@n@T{MT@\@tempb @\@tempa}{% \MT@next@listname@#4% diff --git a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg index c8388555dfb..8111bb4a8f8 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg @@ -1,36 +1,41 @@ %% -%% This is file `mt-CharisSIL.cfg'. +%% This is file `mt-CharisSIL.cfg', +%% generated with the docstrip utility. %% -%% ------------------------------------------------------------------------ +%% The original source files were: %% +%% microtype-utf.dtx (with options: `CharisSIL') +%% +%% ------------------------------------------------------------------------ +%% %% The `microtype' package %% Subliminal refinements towards typographical perfection %% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> -%% +%% %% 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 %% your option) any later version. The latest version of this license is in: %% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part %% of all distributions of LaTeX version 2005/12/01 or later. -%% +%% %% This work has the LPPL maintenance status `author-maintained'. -%% +%% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived files microtype.sty, microtype-pdftex.def, microtype-xetex.def, %% microtype-luatex.def, microtype.lua and letterspace.sty. -%% +%% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. %% It may contain settings for font expansion and character protrusion, %% tracking, interword spacing and additional kerning, as well as %% character inheritance declarations. %% Please consult the documentation for details. -%% +%% %% If you think you have found improvements to these settings, please %% let me know. -%% +%% %% When modifying this file, also change the identification line below. -%% ------------------------------------------------------------------------ +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-CharisSIL.cfg}[2013/03/13 v1.0 microtype config. file: Charis SIL (RS)] @@ -38,7 +43,7 @@ %%% ----------------------------------------------------------------------- %%% INHERITANCE -% for xetex (EU1) and luatex (EU2) +%% for xetex (EU1) and luatex (EU2) \DeclareCharacterInheritance { encoding = {EU1,EU2}, family = Charis SIL } @@ -161,7 +166,7 @@ П = {Π}, % Greek } -% missing: tipa, math, symbols, ... + % missing: tipa, math, symbols, ... %%% ----------------------------------------------------------------------- %%% PROTRUSION @@ -235,7 +240,7 @@ « = {200,200}, » = {150,300}, ¡ = {100, }, ¿ = {100, }, ( = {200, }, ) = { ,200}, - < = {200,150}, > = {100,200}, + < = {200,150}, > = {100,200}, [ = {100, }, ] = { ,100}, /braceleft = {200, }, /braceright = { ,300}, † = { 80, 80}, @@ -395,7 +400,7 @@ ‹ = {300,400}, › = {200,500}, « = {200,300}, » = {150,400}, ( = {200, }, ) = { ,200}, - < = {200,200}, > = {200,200}, + < = {200,200}, > = {200,200}, /braceleft = {300, }, /braceright = { ,200}, % Cyrillic Ж = {50,30}, @@ -450,7 +455,7 @@ family = Charis SIL, shape = {sc} } { -% ᴀ = {100,100}, % etc., doesn't work with \textsc + % ᴀ = {100,100}, % etc., doesn't work with \textsc /a.SC = {100,100}, /c.SC = {50, }, /d.SC = { ,50}, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg index 8f142d8f849..4c1927acaa6 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg @@ -1,36 +1,41 @@ %% -%% This is file `mt-LatinModernRoman.cfg'. +%% This is file `mt-LatinModernRoman.cfg', +%% generated with the docstrip utility. %% -%% ------------------------------------------------------------------------ +%% The original source files were: %% +%% microtype-utf.dtx (with options: `LatinModernRoman') +%% +%% ------------------------------------------------------------------------ +%% %% The `microtype' package %% Subliminal refinements towards typographical perfection %% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> -%% +%% %% 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 %% your option) any later version. The latest version of this license is in: %% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part %% of all distributions of LaTeX version 2005/12/01 or later. -%% +%% %% This work has the LPPL maintenance status `author-maintained'. -%% +%% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived files microtype.sty, microtype-pdftex.def, microtype-xetex.def, %% microtype-luatex.def, microtype.lua and letterspace.sty. -%% +%% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. %% It may contain settings for font expansion and character protrusion, %% tracking, interword spacing and additional kerning, as well as %% character inheritance declarations. %% Please consult the documentation for details. -%% +%% %% If you think you have found improvements to these settings, please %% let me know. -%% +%% %% When modifying this file, also change the identification line below. -%% ------------------------------------------------------------------------ +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-LatinModernRoman.cfg}[2013/03/13 v1.0 microtype config. file: Latin Modern Roman (RS)] @@ -38,7 +43,7 @@ %%% ----------------------------------------------------------------------- %%% INHERITANCE -% for xetex (EU1) and luatex (EU2) +%% for xetex (EU1) and luatex (EU2) \DeclareCharacterInheritance { encoding = {EU1,EU2}, family = Latin Modern Roman } @@ -160,7 +165,7 @@ « = {300,200}, » = {100,400}, ¡ = {100, }, ¿ = {100, }, ( = {300, }, ) = { ,300}, - < = {200,100}, > = {100,200}, + < = {200,100}, > = {100,200}, /braceleft = {400,200}, /braceright = {200,400}, /angleleft = {400, }, /angleright = { ,400}, † = {100,100}, @@ -193,13 +198,10 @@ Δ = {100,100}, % /Delta Θ = { 50, 50}, % /Theta Λ = {100,100}, % /Lambda -% Ξ = {,}, % /Xi -% Π = {,}, % /Pi Σ = { 50, 50}, % /Sigma Υ = {100,100}, % /Upsilon Φ = { 50, 50}, % /Phi Ψ = { 50, 50}, % /Psi -% Ω = {,}, % /Omega } \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg b/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg index e92feeaa8cf..cadb4a0a4d1 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg @@ -1,25 +1,58 @@ -%% mt-PalatinoLinotype.cfg: -%% Microtype configuration file for -%% Hermann Zapf’s Palatino font and -%% close substitutes %% -%% Copyright © 2012 Loren B. Davis. ALL RIGHTS RESERVED. This is a derived -%% work and a modified component of R. Schlicht’s microtype package. The na- -%% ture of the changes to the mt-ppl.cfg component is: supporting character -%% protrusion for Unicode versions of Palatino and similar fonts. +%% This is file `mt-PalatinoLinotype.cfg', +%% generated with the docstrip utility. %% +%% The original source files were: +%% +%% microtype-utf.dtx (with options: `PalatinoLinotype') +%% +%% ------------------------------------------------------------------------ +%% +%% The `microtype' package +%% Subliminal refinements towards typographical perfection +%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% %% 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 %% your option) any later version. The latest version of this license is in: %% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part %% of all distributions of LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of the files microtype.dtx and microtype.ins and the +%% derived files microtype.sty, microtype-pdftex.def, microtype-xetex.def, +%% microtype-luatex.def, microtype.lua and letterspace.sty. +%% +%% ------------------------------------------------------------------------ +%% This is a font-specific configuration file for the `microtype' package. +%% It may contain settings for font expansion and character protrusion, +%% tracking, interword spacing and additional kerning, as well as +%% character inheritance declarations. +%% Please consult the documentation for details. +%% +%% If you think you have found improvements to these settings, please +%% let me know. +%% +%% When modifying this file, also change the identification line below. +%% ------------------------------------------------------------------------ +%% +%% These settings have been prepared by, and are copied with the +%% generous permission of: +%% Loren B. Davis. (c) 2012 +%% +%% ------------------------------------------------------------------------ +%% Palatino is a registered trademark of Linotype GmbH. +%% Used without permission. +%% ------------------------------------------------------------------------ %% -%% Palatino is a registered trademark of Linotype GmbH. Used without permis- -%% sion. - \ProvidesFile - {mt-PalatinoLinotype.cfg}[2012/03/10 v1.0 microtype config. file: Palatino Linotype and similar fonts (LBD)] + {mt-PalatinoLinotype.cfg}[2012/03/10 v1.0 microtype config. file: Palatino Linotype and similar fonts (LBD)] +%%% ----------------------------------------------------------------------- +%%% INHERITANCE + +%% for xetex (EU1) and luatex (EU2) \DeclareCharacterInheritance { encoding = {EU1,EU2}, family = {PalatinoLinotype} } @@ -75,6 +108,9 @@ z = {ź,ż,ž,ẑ,ẓ,ẕ}, } +%%% ----------------------------------------------------------------------- +%%% PROTRUSION + \SetProtrusion [ name = palatino-default ] { encoding = {EU1,EU2}, @@ -168,7 +204,6 @@ ‐ = {400,500}, ‑ = {400,500}, ‒ = {200,300}, – = {205,305}, — = {200,300}, ― = {50,150}, • = {125,200}, -% /a.sc = {50,50}, } \SetProtrusion @@ -178,7 +213,7 @@ shape = {it,sl} } { A = {50,50}, - Æ = {50, }, + Æ = {50, }, B = {50, }, C = {50, }, D = {50,50}, @@ -189,7 +224,7 @@ K = {50, }, L = {50, }, O = {50, }, - Œ = {50, }, + Œ = {50, }, P = {50, }, Q = {50, }, R = {50, }, @@ -271,7 +306,7 @@ shape = sc } { a = {50,50}, - æ = {50, }, + æ = {50, }, b = { 0, 0}, d = { 0, 0}, f = { 0, 0}, @@ -291,3 +326,5 @@ } \endinput +%% +%% End of file `mt-PalatinoLinotype.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 7cd6391674a..7df10b52389 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg @@ -308,6 +308,7 @@ \textdiv = {150,200} } + \endinput %% %% End of file `mt-bch.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg index ec675c344cb..1db4079a31d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg @@ -177,6 +177,7 @@ \textdiv = {100,100} } + \endinput %% %% End of file `mt-blg.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg index d1560da8983..a6e2d5bd6ec 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg @@ -38,7 +38,7 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-cmr.cfg}[2011/04/09 v2.1 microtype config. file: Computer Modern Roman (RS)] + {mt-cmr.cfg}[2013/05/19 v2.2 microtype config. file: Computer Modern Roman (RS)] %%% ----------------------------------------------------------------------- %%% PROTRUSION @@ -795,6 +795,43 @@ "7F = {100,100} % \spadesuit } +%%% ----------------------------------------------------------------------- +%%% INTERWORD SPACING + +\SetExtraSpacing + [ name = T2A, + load = default ] + { encoding = T2A, + family = cmr } + { + \cyrg = { ,-300,300}, + \cyrb = { ,-200,200}, + \cyrk = { ,-200,200}, + \cyrs = { ,-100,100}, + \cyrr = { ,-100,100}, + \cyrh = { ,-100,100}, + \cyru = { ,-100,100}, + \cyrt = { , 50, -50}, + \cyrp = { , 50, -50}, + \cyri = { , 50, -50}, + \cyrishrt = { , 50, -50}, + } + +\SetExtraSpacing + [ name = nonfrench-cmr, + load = default, + context = nonfrench ] + { encoding = {OT1,T1,LY1,OT4,QX,T5}, + family = cmr } + { + . = {333,2000,-667}, + ? = {333,2000,-667}, + ! = {333,2000,-667}, + : = {333,1000,-500}, + ; = { , 500,-333}, + {,}= { , 250,-200} + } + \endinput %% %% End of file `mt-cmr.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index 563f4b94b7d..816760339c9 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg @@ -89,6 +89,7 @@ ] = { ,200} } + \endinput %% %% End of file `mt-euf.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg index c5a1ec24b1c..0e7be3b2277 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg @@ -120,6 +120,7 @@ "82 = {100,200} } + \endinput %% %% End of file `mt-eur.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg index 8153724ece1..8bf2256adfd 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg @@ -58,6 +58,7 @@ E = {100,} } + \endinput %% %% End of file `mt-euroitc.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg index 16e6c8f5f2d..6a133c6c50c 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg @@ -169,6 +169,7 @@ "DE = {200,200} } + \endinput %% %% End of file `mt-eus.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg index f1d0f86c162..16bfe648ce7 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg @@ -145,6 +145,7 @@ "7F = { 50, 50} % \circleddash } + \endinput %% %% End of file `mt-msa.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg index d1c8b11eed3..4a3f19fc457 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg @@ -147,6 +147,7 @@ "7F = {200, } % \backepsilon } + \endinput %% %% End of file `mt-msb.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg index dd6f18e18e3..2b5e1901cc7 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg @@ -59,6 +59,7 @@ 068 = {50,-100} % \EURdig } + \endinput %% %% End of file `mt-mvs.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg index 1325e42f228..0da1afc6f33 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg @@ -318,6 +318,7 @@ \textdiv = {200,200} } + \endinput %% %% End of file `mt-pad.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg index eaa6fbbd3c4..603f65a6e35 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg @@ -610,6 +610,7 @@ \textdiv = {150,200} } + \endinput %% %% End of file `mt-pmn.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg index ba214018f7f..c9e705db381 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg @@ -223,6 +223,7 @@ \textdegree = {300,300}, } + \endinput %% %% End of file `mt-ppl.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg index 51da99cbcf9..18480aa61b1 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg @@ -369,6 +369,7 @@ \textperthousand = { ,50} } + \endinput %% %% End of file `mt-ptm.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg index 7fc0bd74f0f..07b6c18d449 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg @@ -252,6 +252,7 @@ \textsurd = { ,100} } + \endinput %% %% End of file `mt-ugm.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg index 3570dae991e..bf8c8dc943d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg @@ -81,6 +81,7 @@ E = {200, } } + \endinput %% %% End of file `mt-zpeu.cfg'. |